[PATCH 7/7] Spelling mistakes, translations, dead code
Wol
anthony at youngman.org.uk
Wed Nov 10 14:43:10 PST 2010
---
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 -
dbaccess/source/ui/control/FieldDescControl.cxx | 219 +++++++++----------
dbaccess/source/ui/control/RelationControl.cxx | 97 +++++-----
dbaccess/source/ui/control/TableGrantCtrl.cxx | 6 +-
dbaccess/source/ui/control/dbtreelistbox.cxx | 4 +-
dbaccess/source/ui/control/marktree.cxx | 8 +-
dbaccess/source/ui/control/sqledit.cxx | 10 +-
dbaccess/source/ui/control/tabletree.cxx | 2 +-
dbaccess/source/ui/control/toolboxcontroller.cxx | 2 -
9 files changed, 171 insertions(+), 179 deletions(-)
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 8dc0b41..5786aa2 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -73,7 +73,6 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
-// case tpAutoIncrement:
case tpColumnName:
break;
default:
@@ -87,7 +86,6 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
-// case tpAutoIncrement:
case tpColumnName:
break;
default:
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index e058296..62bfe57 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -29,10 +29,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
-#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
-#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK
-#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN
+#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
+#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
+#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK
+#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN
#include "FieldDescControl.hxx"
#include "FieldControls.hxx"
@@ -51,7 +51,7 @@
#include <svx/svxids.hrc>
#include <svx/algitem.hxx>
#include <svl/itempool.hxx>
-#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx>
+#define _ZFORLIST_DECLARE_TABLE // without this we get a compiler error in <svl/zforlist.hxx>
#include <svl/zforlist.hxx>
#include <svl/rngitem.hxx>
#include <svl/intitem.hxx>
@@ -83,19 +83,19 @@ using namespace ::com::sun::star::util;
//==================================================================
-// fuer die Controls auf der OFieldDescGenPage
-#define CONTROL_SPACING_X 18 // 6
-#define CONTROL_SPACING_Y 4
-#define CONTROL_WIDTH_1 160 // 100
-#define CONTROL_WIDTH_2 100 // 60
-#define CONTROL_WIDTH_3 250
-#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5)
+// for the controls on OFieldDescGenPage
+#define CONTROL_SPACING_X 18 // 6
+#define CONTROL_SPACING_Y 4
+#define CONTROL_WIDTH_1 160 // 100
+#define CONTROL_WIDTH_2 100 // 60
+#define CONTROL_WIDTH_3 250
+#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5)
-#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem
-#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format
-#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem
+#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem
+#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format
+#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem
-#define HSCROLL_STEP 20
+#define HSCROLL_STEP 20
namespace
@@ -105,7 +105,7 @@ namespace
{
double nValue = _nValue;
sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey);
- if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
+ if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
|| (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME )
{
nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue);
@@ -263,18 +263,17 @@ OFieldDescControl::~OFieldDescControl()
{
::std::auto_ptr<Window> aTemp(m_pVertScroll);
- m_pVertScroll = NULL;
+ m_pVertScroll = NULL;
}
{
::std::auto_ptr<Window> aTemp(m_pHorzScroll);
- m_pHorzScroll = NULL;
+ m_pHorzScroll = NULL;
}
if ( m_bAdded )
::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
pLastFocusWindow = NULL;
- //////////////////////////////////////////////////////////////////////
- // Childs zerstoeren
+ // destroy children
DeactivateAggregate( tpDefault );
DeactivateAggregate( tpRequired );
DeactivateAggregate( tpTextLen );
@@ -312,7 +311,7 @@ String OFieldDescControl::BoolStringUI(const String& rPersistentString) const
static String aOne('1');
static String aNone(ModuleRes(STR_VALUE_NONE));
- // FS - 66161 - 14.05.1999 - aeltere Versionen haben eventuell einen sprachabhaengigen String als Default gespeichert
+ // FS - 66161 - 14.05.1999 - other versions have possibly stored a language-dependent string as default
if (rPersistentString.Equals(aYes) || rPersistentString.Equals(aNo))
return rPersistentString;
@@ -352,7 +351,7 @@ namespace
//------------------------------------------------------------------------------
void OFieldDescControl::CheckScrollBars()
{
- // ein paar Berechnungen zur neuen Position der ScrollBars
+ // a few calculations for the new position of the scroll bars
Size szOverallSize = GetSizePixel();
long nHScrollHeight = m_pHorzScroll->GetSizePixel().Height();
long nVScrollWidth = m_pVertScroll->GetSizePixel().Width();
@@ -362,8 +361,7 @@ void OFieldDescControl::CheckScrollBars()
sal_Bool bNeedHScrollBar(sal_False), bNeedVScrollBar(sal_False);
- // die Bereiche anpassen
- // brauche ich ScrollBars eigentlich ?
+ // adapt the ranges - do we actually need scrollbars?
// horizontal :
long lMaxXPosition = 0;
Control* ppAggregates[] = { pRequired, pNumType, pAutoIncrement, pDefault, pTextLen, pLength, pScale, pFormat, m_pColumnName, m_pType,m_pAutoIncrementValue};
@@ -375,12 +373,12 @@ void OFieldDescControl::CheckScrollBars()
long lMaxXAvailable = szOverallSize.Width();
bNeedHScrollBar = lMaxXPosition > lMaxXAvailable;
- // aendert sich vielleicht noch
+ // Any more changes?
- // vertikal
- // wieviel Controls habe ich
+ // vertical
+ // how many controls do I have?
sal_uInt16 nActive = CountActiveAggregates();
- // welches ist das letzte, was ganz drauf passt ?
+ // ?which is the latter, which fits completely drauf? (babelfish)
sal_uInt16 nLastVisible;
const sal_Int32 nControlHeight = GetMaxControlHeight();
const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MAP_APPFONT).Height();
@@ -392,25 +390,25 @@ void OFieldDescControl::CheckScrollBars()
if (bNeedVScrollBar)
{
- // in die urspruengliche Berechnung von lMaxXAvailable ist nicht mit eingegangen, dass ich eine VScrollBar habe, also muss ich
- // das nachholen
+ // The original computation of lMaxXAvailable assumed
+ // that I have a VScrollBar, therefore must I retrieve it
lMaxXAvailable -= nVScrollWidth;
if (!bNeedHScrollBar && (lMaxXPosition > lMaxXAvailable))
{
- // durch die vertikale brauche ich jetzt ploetzlich doch eine horizontale
+ // Whoops - now I've got a vertical bar I need a horizontal one too.
bNeedHScrollBar = sal_True;
- // nLastVisible anpassen
+ // adapt nLastVisible
nLastVisible = static_cast<sal_uInt16>((szOverallSize.Height() - nControl_Spacing_y - nHScrollHeight) / (nControl_Spacing_y + nControlHeight));
- // bNeedVScrollBar aendert sich nicht : es ist schon auf sal_True und nLastVisible wird hoechstens kleiner
+ // bNeedVScrollBar does not change: it is already set to sal_True
+ // and nLastVisible becomes smaller ?hoechstens?
}
}
- // jetzt kann ich sie wirklich positionieren und ihre Parameter setzen
+ // now I can really position it and set their parameters
if (bNeedVScrollBar)
{
m_pVertScroll->Show();
m_pVertScroll->SetRangeMax(nActive - nLastVisible);
-// m_pVertScroll->SetThumbPos(0);
m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) );
}
@@ -425,7 +423,6 @@ void OFieldDescControl::CheckScrollBars()
{
m_pHorzScroll->Show();
m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP);
-// m_pHorzScroll->SetThumbPos(0);
m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) );
}
@@ -475,12 +472,12 @@ void OFieldDescControl::ScrollAllAggregates()
if (nDeltaX || nDeltaY)
{
- Control* ppAggregates[] = { pRequired, pNumType
+ Control* ppAggregates[] = { pRequired, pNumType
, pAutoIncrement, pDefault
, pTextLen, pLength
, pScale, m_pColumnName
, m_pType, m_pAutoIncrementValue};
- Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
+ Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
, pAutoIncrementText, pDefaultText
, pTextLenText, pLengthText
, pScaleText, m_pColumnNameText
@@ -516,7 +513,7 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
const Size aTemp( ppAggregates[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
if ( aTemp.Height() > aHeight.Height() )
aHeight.Height() = aTemp.Height();
- } // if ( ppAggregates[i] )
+ }
}
return aHeight.Height();
@@ -525,15 +522,15 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
- // Controls enablen/disablen
- Control* ppAggregates[] = { pRequired, pNumType
+
+ // enable/disable controls
+ Control* ppAggregates[] = { pRequired, pNumType
, pAutoIncrement, pDefault
, pTextLen, pLength
, pScale, m_pColumnName
, m_pType, m_pAutoIncrementValue
, pFormat};
- Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
+ Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
, pAutoIncrementText, pDefaultText
, pTextLenText, pLengthText
, pScaleText, m_pColumnNameText
@@ -555,8 +552,8 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
- // Texte der Controls auslesen
+
+ // select the Controls texts
switch( nControlId )
{
case FIELD_PROPERTY_BOOL_DEFAULT:
@@ -613,8 +610,8 @@ String OFieldDescControl::GetControlText( sal_uInt16 nControlId )
void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const String& rText )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
- // Texte der Controls setzen
+
+ // set the Controls texts
switch( nControlId )
{
case FIELD_PROPERTY_BOOL_DEFAULT:
@@ -693,8 +690,8 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const String& rTe
IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
- // Temporaere Column erzeugen, mit der Datenaustausch mit Dialog erfolgt
+
+ // ?Temporary Column produce, with which data exchange with dialogue takes place?
if( !pActFieldDescr )
return 0;
@@ -742,17 +739,18 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() )
SetModified(sal_True);
- // Sonderbehandlund f"ur Bool Felder
+ // Special treatment for boolean fields
if(pListBox == pRequired && pBoolDefault )
{
- // wenn pRequired auf sal_True gesetzt ist, dann darf das sal_Bool Feld nicht den Eintrag <<keiner>> besitzen
+ // if pRequired is set to sal_True,
+ // then sal_Bool the field may possess not the entry
String sDef = BoolStringUI(::comphelper::getString(pActFieldDescr->GetControlDefault()));
- if(pRequired->GetSelectEntryPos() == 0) // JA
+ if(pRequired->GetSelectEntryPos() == 0) // YES
{
pBoolDefault->RemoveEntry(String(ModuleRes(STR_VALUE_NONE)));
if (!sDef.Equals(aYes) && !sDef.Equals(aNo))
- pBoolDefault->SelectEntryPos(1); // nein als Default
+ pBoolDefault->SelectEntryPos(1); // "no" as Default
else
pBoolDefault->SelectEntry(sDef);
}
@@ -763,7 +761,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
}
}
- // nur fuer AutoIncrement eine Sonderbehandlung
+ // ?Only for auto-incrementing a special treatment?
if (pListBox == pAutoIncrement)
{
if(pListBox->GetSelectEntryPos() == 1)
@@ -790,7 +788,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
DeactivateAggregate( tpDefault );
ActivateAggregate( tpAutoIncrementValue );
}
- // und jetzt alle nach oben schieben
+ //and now push everything to the top
ArrangeAggregates();
}
@@ -806,17 +804,17 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox )
return 0;
}
//------------------------------------------------------------------------------
-// alle Control neu anordnen, so dass sie in fester Reihenfolge und wirklich
-// OBEN auf der DescriptionPage stehen
+// rearrange all the controls, so that they really stand ABOVE in firm order and
+// on the DescriptionPage
void OFieldDescControl::ArrangeAggregates()
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- // die Beschreibung eines Controls
+ // the description of a control
struct AGGREGATE_DESCRIPTION
{
- Control* pctrlInputControl; // das eigentliche Control zur Eingabe
- Control* pctrlTextControl; // das Label dazu
- USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize
+ Control* pctrlInputControl; // the actual control to the input
+ Control* pctrlTextControl; // the control Label
+ USHORT nPosSizeArgument; // the second argument for SetPosSize
};
AGGREGATE_DESCRIPTION adAggregates[] = {
{ m_pColumnName, m_pColumnNameText, 1},
@@ -854,8 +852,8 @@ void OFieldDescControl::ArrangeAggregates()
SetPosSize(&adAggregates[i].pctrlTextControl, nCurrentControlPos, 0);
SetPosSize(&adAggregates[i].pctrlInputControl, nCurrentControlPos, adAggregates[i].nPosSizeArgument);
- // die Z-Order so, dass die Controls auch wirklich in derselben Reihenfolge durchwandert werden koennen, in der sie
- // hier angeordnet wurden
+ // the Z-order so that the controls are also really wandered through
+ // in the same order koennen, in that it were arranged here (babelfish)
adAggregates[i].pctrlTextControl->SetZOrder(pZOrderPredecessor, pZOrderPredecessor ? WINDOW_ZORDER_BEHIND : WINDOW_ZORDER_FIRST);
adAggregates[i].pctrlInputControl->SetZOrder(adAggregates[i].pctrlTextControl, WINDOW_ZORDER_BEHIND );
pZOrderPredecessor = adAggregates[i].pctrlInputControl;
@@ -870,7 +868,7 @@ void OFieldDescControl::ArrangeAggregates()
}
}
- // eine Sonderbehandlung fuer die Format-Controls
+ // a special treatment for the format controls
if (pFormat)
{
Point ptSamplePos(pFormatSample->GetPosPixel());
@@ -878,7 +876,7 @@ void OFieldDescControl::ArrangeAggregates()
pFormat->SetPosPixel(Point(ptSamplePos.X() + szSampleSize.Width() + 5, ptSamplePos.Y()));
}
- // als letztes noch die ScrollBars in der ZOrder ganz nach oben
+ // now move the ScrollBars to the top of the ZOrder
m_pVertScroll->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
m_pHorzScroll->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
}
@@ -888,7 +886,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
//////////////////////////////////////////////////////////////////////
- // Controls erzeugen
+ // produce the Controls
switch( eType )
{
case tpDefault:
@@ -1094,7 +1092,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s
OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
pControl->SetDecimalDigits(0);
pControl->SetMin(0);
- pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig
+ pControl->SetMax(0x7FFFFFFF); // is to be changed outside, if necessary
pControl->SetStrictFormat(TRUE);
InitializeControl(pControl,_nHelpId,false);
@@ -1106,8 +1104,8 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
pLastFocusWindow = NULL;
- //////////////////////////////////////////////////////////////////////
- // Controls zerstoeren
+
+ // destroy the Controls
switch( eType )
{
case tpDefault:
@@ -1171,8 +1169,7 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
- // Groesse ermitteln
+ // determine the size
const sal_Int32 nControlHeight = GetMaxControlHeight();
Size aSize(0,nControlHeight);
if ( isRightAligned() && nCol )
@@ -1197,9 +1194,7 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
} // switch( nCol )
}
-
- //////////////////////////////////////////////////////////////////////
- // Position ermitteln
+ // determine the Position
Point aPosition;
switch( nCol )
{
@@ -1229,8 +1224,7 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
aPosition.Y() += ((nRow+1)*nControl_Spacing_y) +
(nRow*nControlHeight);
- //////////////////////////////////////////////////////////////////////
- // Control anzeigen
+ // show the Control
(*ppControl)->SetPosSizePixel( aPosition, aSize );
aSize = (*ppControl)->GetSizePixel();
@@ -1256,8 +1250,8 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
DeactivateAggregate( tpType );
DeactivateAggregate( tpAutoIncrementValue );
m_pPreviousType = TOTypeInfoSP();
- //////////////////////////////////////////////////////////////////////
- // Zeiger des gespeicherten Focus zuruecksetzen
+
+ // restore pointers to the saved focus
pLastFocusWindow = NULL;
if ( m_bAdded )
{
@@ -1281,19 +1275,16 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
ActivateAggregate( tpType );
OSL_ENSURE(pFieldType.get(),"We need a type information here!");
- //////////////////////////////////////////////////////////////////////
- // Wenn sich der Typ geaendert hat, Controls austauschen
+
+ // if the type has changed, swap the controls
if( m_pPreviousType != pFieldType )
{
- //////////////////////////////////////////////////////////////////////
- // Zeiger des gespeicherten Focus zuruecksetzen
+ // restore pointers to the stored focus
pLastFocusWindow = NULL;
- //////////////////////////////////////////////////////////////////////
- // Controls, die nicht mehr angezeigt werden duerfen
+ // ?durfen? controls which are no longer needed
DeactivateAggregate( tpNumType );
- //////////////////////////////////////////////////////////////////////
// determine which controls we should show and which not
// 1. the required control
@@ -1445,7 +1436,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
}
}
//////////////////////////////////////////////////////////////////////
- // Controls initialisieren
+ // initialise Controls
if( pAutoIncrement )
{
if ( pFieldDescr->IsAutoIncrement() )
@@ -1461,9 +1452,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
{
// disable autoincrement value because it should only be visible when autoincrement is to true
DeactivateAggregate( tpAutoIncrementValue );
- pAutoIncrement->SelectEntryPos( 1 ); // no
+ pAutoIncrement->SelectEntryPos( 1 ); // no
ActivateAggregate( tpDefault );
- // hat Auswirkungen auf pRequired
+ // has effects on pRequired
if(!pFieldDescr->IsPrimaryKey())
ActivateAggregate( tpRequired );
}
@@ -1477,19 +1468,20 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
if( pBoolDefault )
{
- // wenn pRequired auf sal_True gesetzt ist, dann darf das sal_Bool Feld nicht den Eintrag <<keiner>> besitzen
+ // if pRequired is set to sal_True, then sal_Bool the field may possess not the entry
::rtl::OUString sValue;
pFieldDescr->GetControlDefault() >>= sValue;
String sDef = BoolStringUI(sValue);
// sicher stellen das <<keiner>> nur vorhanden ist, wenn das Feld NULL sein darf
+ // reliably none places that is only present, if the field may be ZERO (babelfish)
if ( ( pFieldType.get() && !pFieldType->bNullable ) || !pFieldDescr->IsNullable() )
{
- pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); // der Typ sagt das
+ pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); // the type says that
pBoolDefault->RemoveEntry(String(ModuleRes(STR_VALUE_NONE)));
if ( !sDef.Equals(aYes) && !sDef.Equals(aNo) )
- pBoolDefault->SelectEntryPos(1); // nein als Default
+ pBoolDefault->SelectEntryPos(1); // "no" as Default
else
pBoolDefault->SelectEntry(sDef);
@@ -1507,9 +1499,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
if( pRequired )
{
if( pFieldDescr->IsNullable() )
- pRequired->SelectEntryPos( 1 ); // no
+ pRequired->SelectEntryPos( 1 ); // no
else
- pRequired->SelectEntryPos( 0 ); // yes
+ pRequired->SelectEntryPos( 0 ); // yes
}
if( pTextLen )
@@ -1540,7 +1532,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
USHORT nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND;
if(nPos == LISTBOX_ENTRY_NOTFOUND)
{
- const OTypeInfoMap* pMap = getTypeInfo();
+ const OTypeInfoMap* pMap = getTypeInfo();
OTypeInfoMap::const_iterator aIter = pMap->find(pFieldType.get() ? pFieldDescr->getTypeInfo()->nType : pFieldDescr->GetType());
if(aIter == pMap->end() && !pMap->empty())
{
@@ -1564,7 +1556,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
//////////////////////////////////////////////////////////////////////
- // Controls Enablen/Disablen
+ // enable/disable Controls
sal_Bool bRead(IsReadOnly());
@@ -1669,8 +1661,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
if( !pFieldDescr )
return;
- //////////////////////////////////////////////////////////////////////
- // Controls auslesen
+ // select Controls
::rtl::OUString sDefault;
if (pDefault)
{
@@ -1710,7 +1701,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
catch(const Exception&)
{
}
- } // if ( sDefault.getLength() )
+ }
else
pFieldDescr->SetControlDefault(Any());
@@ -1747,8 +1738,8 @@ void OFieldDescControl::UpdateFormatSample(OFieldDescription* pFieldDescr)
void OFieldDescControl::GetFocus()
{
DBG_CHKTHIS(OFieldDescControl,NULL);
- //////////////////////////////////////////////////////////////////////
- // Setzt den Focus auf das zuletzt aktive Control
+
+ // Sets the focus on the last active control
TabPage::GetFocus();
if( pLastFocusWindow )
{
@@ -1763,13 +1754,11 @@ void OFieldDescControl::implFocusLost(Window* _pWhich)
DBG_CHKTHIS(OFieldDescControl,NULL);
DBG_ASSERT(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !");
- //////////////////////////////////////////////////////////////////////
- // Das aktive Control merken
+ // take not of the active control
if (!pLastFocusWindow)
pLastFocusWindow = _pWhich;
- //////////////////////////////////////////////////////////////////////
- // HelpText zuruecksetzen
+ // put the HelpText back
if (pHelp && !pHelp->HasChildPathFocus())
pHelp->SetHelpText( String() );
}
@@ -1787,9 +1776,9 @@ void OFieldDescControl::LoseFocus()
sal_Bool OFieldDescControl::isCopyAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
- (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
- m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
- m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
+ (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
+ m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
+ m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue) &&
static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0;
@@ -1799,9 +1788,9 @@ sal_Bool OFieldDescControl::isCopyAllowed()
sal_Bool OFieldDescControl::isCutAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
- (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
- m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
- m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
+ (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
+ m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
+ m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue) &&
static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0;
return bAllowed;
@@ -1810,9 +1799,9 @@ sal_Bool OFieldDescControl::isCutAllowed()
sal_Bool OFieldDescControl::isPasteAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
- (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
- m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
- m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
+ (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
+ m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
+ m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue);
if ( bAllowed )
{
@@ -1915,7 +1904,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale;
sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey);
- if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
+ if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
|| (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME )
{
nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index d4a7009..5ec94a5 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -49,8 +49,8 @@
#include <algorithm>
-#define SOURCE_COLUMN 1
-#define DEST_COLUMN 2
+#define SOURCE_COLUMN 1
+#define DEST_COLUMN 2
namespace dbaui
{
@@ -67,20 +67,20 @@ namespace dbaui
friend class OTableListBoxControl;
::std::auto_ptr< ::svt::ListBoxControl> m_pListCell;
- TTableConnectionData::value_type m_pConnData;
- const OJoinTableView::OTableWindowMap* m_pTableMap;
- OTableListBoxControl* m_pBoxControl;
- long m_nDataPos;
- Reference< XPropertySet> m_xSourceDef;
- Reference< XPropertySet> m_xDestDef;
+ TTableConnectionData::value_type m_pConnData;
+ const OJoinTableView::OTableWindowMap* m_pTableMap;
+ OTableListBoxControl* m_pBoxControl;
+ long m_nDataPos;
+ Reference< XPropertySet> m_xSourceDef;
+ Reference< XPropertySet> m_xDestDef;
void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,USHORT nColumnId);
/** returns the column id for the editbrowsebox
- @param _nColId
+ @param _nColId
the column id SOURCE_COLUMN or DEST_COLUMN
- @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data
+ @return the current column id either SOURCE_COLUMN or DEST_COLUMN depends on the connection data
*/
USHORT getColumnIdent( USHORT _nColId ) const;
public:
@@ -88,16 +88,16 @@ namespace dbaui
virtual ~ORelationControl();
/** searches for a connection between these two tables
- @param _pSource
+ @param _pSource
the left table
- @param _pDest
+ @param _pDest
the right window
*/
void setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest);
/** allows to access the connection data from outside
- @return rthe connection data
+ @return the connection data
*/
inline TTableConnectionData::value_type getData() const { return m_pConnData; }
@@ -177,12 +177,12 @@ namespace dbaui
//////////////////////////////////////////////////////////////////////
// set browse mode
- SetMode( BROWSER_COLUMNSELECTION |
- BROWSER_HLINESFULL |
- BROWSER_VLINESFULL |
- BROWSER_HIDECURSOR |
- BROWSER_HIDESELECT |
- BROWSER_AUTO_HSCROLL |
+ SetMode( BROWSER_COLUMNSELECTION |
+ BROWSER_HLINESFULL |
+ BROWSER_VLINESFULL |
+ BROWSER_HIDECURSOR |
+ BROWSER_HIDESELECT |
+ BROWSER_AUTO_HSCROLL |
BROWSER_AUTO_VSCROLL);
}
else
@@ -234,8 +234,8 @@ namespace dbaui
long nRow = GetCurRow();
USHORT nCol = GetCurColumnId();
- BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1)))
- || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0)));
+ BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1)))
+ || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0)));
return bRet && EditBrowseBox::IsTabAllowed(bForward);
}
@@ -311,11 +311,11 @@ namespace dbaui
switch ( getColumnIdent(nColumnId) )
{
case SOURCE_COLUMN:
- xDef = m_xSourceDef;
+ xDef = m_xSourceDef;
nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
break;
case DEST_COLUMN:
- xDef = m_xDestDef;
+ xDef = m_xDestDef;
nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL;
break;
default:
@@ -359,7 +359,7 @@ namespace dbaui
DBG_CHKTHIS(ORelationControl,NULL);
String aText =const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId );
- Point aPos( rRect.TopLeft() );
+ Point aPos( rRect.TopLeft() );
Size aTextSize( GetDataWindow().GetTextHeight(),GetDataWindow().GetTextWidth( aText ));
if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() ||
@@ -379,7 +379,6 @@ namespace dbaui
{
if ( _xDest.is() )
{
- //sal_Int32 nRows = GetRowCount();
Reference<XColumnsSupplier> xSup(_xDest,UNO_QUERY);
Reference<XNameAccess> xColumns = xSup->getColumns();
Sequence< ::rtl::OUString> aNames = xColumns->getElementNames();
@@ -400,7 +399,7 @@ namespace dbaui
// -----------------------------------------------------------------------------
void ORelationControl::setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest)
{
- // wenn ich hier gerade editiere, ausblenden
+ // ?if I edit here straight, fade out? (Babelfish)
BOOL bWasEditing = IsEditing();
if ( bWasEditing )
DeactivateCell();
@@ -436,7 +435,7 @@ namespace dbaui
m_pConnData->normalizeLines();
}
- // neu zeichnen
+ // redraw
Invalidate();
if ( bWasEditing )
@@ -465,8 +464,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
,IRelationControlInterface* _pParentDialog)
: Window(_pParent,_rResId)
, m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES,*_rResId.GetResMgr()))
- , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr()))
- , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr()))
+ , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr()))
+ , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr()))
, m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS,*_rResId.GetResMgr()))
, m_pTableMap(_pTableMap)
, m_pParentDialog(_pParentDialog)
@@ -500,7 +499,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
OTableWindow* pInitialLeft = NULL;
OTableWindow* pInitialRight = NULL;
- // die Namen aller TabWins einsammeln
+ // collect all the TabWin names
OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->begin();
OJoinTableView::OTableWindowMap::const_iterator aEnd = m_pTableMap->end();
for(;aIter != aEnd;++aIter)
@@ -518,7 +517,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
pInitialRight = aIter->second;
m_strCurrentRight = aIter->first;
}
- } // for(;aIter != m_pTableMap->end();++aIter)
+ }
if ( !pInitialRight )
{
@@ -526,10 +525,10 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_strCurrentRight = m_strCurrentLeft;
}
- // die entsprechenden Defs an mein Controls
+ // ?the appropriate Defs at my controls? (Babelfish)
m_pRC_Tables->setWindowTables(pInitialLeft,pInitialRight);
- // die in einer ComboBox ausgewaehlte Tabelle darf nicht in der anderen zur Verfuegung stehen
+ // the table selected in one combo box may not be available in the other one
if ( m_pTableMap->size() > 2 )
{
@@ -537,7 +536,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_lmbRightTable.RemoveEntry(m_strCurrentLeft);
}
- // links das erste, rechts das zweite selektieren
+ // ?on the left of first, on the right of which second select? (babelfish)
m_lmbLeftTable.SelectEntry(m_strCurrentLeft);
m_lmbRightTable.SelectEntry(m_strCurrentRight);
@@ -547,10 +546,11 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox*, pListBox )
{
String strSelected(pListBox->GetSelectEntry());
- OTableWindow* pLeft = NULL;
- OTableWindow* pRight = NULL;
+ OTableWindow* pLeft = NULL;
+ OTableWindow* pRight = NULL;
// eine Sonderbehandlung : wenn es nur zwei Tabellen gibt, muss ich bei Wechsel in einer LB auch in der anderen umschalten
+ // special treatment - if there are only two tables, if there's a change in one I must do it in the other
if ( m_pTableMap->size() == 2 )
{
ListBox* pOther;
@@ -567,18 +567,18 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
if ( m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetName()) )
{
- pLeft = pFirst;
- pRight = pSecond;
+ pLeft = pFirst;
+ pRight = pSecond;
}
else
{
- pLeft = pSecond;
- pRight = pFirst;
+ pLeft = pSecond;
+ pRight = pFirst;
}
}
else
{
- // zuerst brauche ich die TableDef zur Tabelle, dazu das TabWin
+ // First apply the table defs to the tables, then to the tabwins
OJoinTableView::OTableWindowMap::const_iterator aFind = m_pTableMap->find(strSelected);
OTableWindow* pLoop = NULL;
if( aFind != m_pTableMap->end() )
@@ -586,13 +586,16 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
DBG_ASSERT(pLoop != NULL, "ORelationDialog::OnTableChanged : ungueltiger Eintrag in ListBox !");
// da ich die ListBoxen selber mit eben diesen Tabellennamen, mit denen ich sie jetzt vergleiche, gefuellt habe,
// MUSS ich strSelected finden
+ // ?since I filled the cunning ruse themselves with evenly this table names, with which I compare her now, I MUST find
+ // strSelected? (Babelfish)
if (pListBox == &m_lmbLeftTable)
{
// den vorher links selektierten Eintrag wieder rein rechts
+ // ?before on the left of selected entry again purely right ? (babelfish)
m_lmbRightTable.InsertEntry(m_strCurrentLeft);
- // und den jetzt selektierten raus
+ // and remove the selection
m_lmbRightTable.RemoveEntry(strSelected);
- m_strCurrentLeft = strSelected;
+ m_strCurrentLeft = strSelected;
pLeft = pLoop;
@@ -606,8 +609,9 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
else
{
// den vorher rechts selektierten Eintrag wieder rein links
+ // ?before on the right of selected entry again purely left ? (babelfish)
m_lmbLeftTable.InsertEntry(m_strCurrentRight);
- // und den jetzt selektierten raus
+ // and remove the selection
m_lmbLeftTable.RemoveEntry(strSelected);
m_strCurrentRight = strSelected;
@@ -629,7 +633,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
// -----------------------------------------------------------------------------
void OTableListBoxControl::NotifyCellChange()
{
- // den Ok-Button en- oder disablen, je nachdem, ob ich eine gueltige Situation habe
+ // enable or disable the OK button, depending on whether I have a valid situation
TTableConnectionData::value_type pConnData = m_pRC_Tables->getData();
const OConnectionLineDataVec* pLines = pConnData->GetConnLineDataList();
m_pParentDialog->setValid(!pLines->empty());
@@ -668,7 +672,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
{
_pTableSeparator->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND);
m_pRC_Tables->SetZOrder(_pTableSeparator, WINDOW_ZORDER_BEHIND);
- //aDlgPoint = m_pTableSeparator->GetPosPixel() + Point(0,aSize.Height()) + LogicToPixel( Point(0,6), MAP_APPFONT );
_pTableSeparator->SetPosPixel(Point(0,m_aFL_InvolvedFields.GetPosPixel().Y()));
const Size aSize = _pTableSeparator->GetSizePixel();
aDlgPoint.Y() = _pTableSeparator->GetPosPixel().Y() + aSize.Height();
@@ -700,7 +703,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
return bRet;
}
// -----------------------------------------------------------------------------
- TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const
+ TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const
{
return m_pRC_Tables->getData()->getReferencingTable();
}
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 57ea25f..1f1b8db 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -70,7 +70,7 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
{
DBG_CTOR(OTableGrantControl,NULL);
//////////////////////////////////////////////////////////////////////
- // Spalten einfuegen
+ // Insert columns
USHORT i=1;
InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75);
FreezeColumn(i++);
@@ -140,7 +140,7 @@ void OTableGrantControl::Init()
EditBrowseBox::Init();
//////////////////////////////////////////////////////////////////////
- // ComboBox instanzieren
+ // instantiate ComboBox
if(!m_pCheckCell)
{
m_pCheckCell = new CheckBoxControl( &GetDataWindow() );
@@ -153,7 +153,7 @@ void OTableGrantControl::Init()
UpdateTables();
//////////////////////////////////////////////////////////////////////
- // Browser Mode setzen
+ // set Browser Mode
BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL |
BROWSER_HIDECURSOR | BROWSER_HIDESELECT;
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index c2d0570..b2aa28c 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -515,7 +515,7 @@ namespace
{
lcl_adjustMenuItemIDs( *pPopup, _rCommandController );
continue;
- } // if ( pPopup )
+ }
const USHORT nCommandId = _rCommandController.registerCommandURL( aCommand );
_rMenu.InsertItem( nCommandId, _rMenu.GetItemText( nId ), _rMenu.GetItemImage( nId ),
@@ -553,7 +553,7 @@ namespace
{
lcl_insertMenuItemImages( *pPopup, _rCommandController );
continue;
- } // if ( pPopup )
+ }
if ( xFrame.is() )
_rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE,bHiContrast));
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index bca4ebe..ed197aa 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -163,9 +163,9 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
}
}
else
- // none if the children is in tristate
+ // none if the children are in tristate
if (nCheckedChildren)
- // we have at least one chil checked
+ // we have at least one child checked
if (nCheckedChildren != nChildrenOverall)
// not all children are checked
eState = SV_BUTTON_TRISTATE;
@@ -205,7 +205,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
{
SvButtonState eState = GetCheckButtonState( _pEntry);
- if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken
+ if (GetModel()->HasChilds(_pEntry)) // check children, if any
{
SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry);
@@ -220,7 +220,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
while(pEntry)
{
SetCheckButtonState(pEntry,eState);
- if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken
+ if(GetModel()->HasChilds(pEntry)) // check children, if any
{
SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry);
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 066085d..d862303 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -89,7 +89,7 @@ void OSqlEdit::KeyInput( const KeyEvent& rKEvt )
rController.InvalidateFeature(SID_CUT);
rController.InvalidateFeature(SID_COPY);
- // Ist dies ein Cut, Copy, Paste Event?
+ // is this a cut, copy or paste event?
KeyFuncType aKeyFunc = rKEvt.GetKeyCode().GetFunction();
if( (aKeyFunc==KEYFUNC_CUT)||(aKeyFunc==KEYFUNC_COPY)||(aKeyFunc==KEYFUNC_PASTE) )
m_bAccelAction = sal_True;
@@ -108,7 +108,11 @@ sal_Bool OSqlEdit::IsInAccelAct()
// auch die entsprechenden Slots aus. Die Aktionen finden also zweimal statt.
// Um dies zu verhindern, kann im View beim SlotExec diese Funktion
// aufgerufen werden.
-
+ // Babelfish translation - don't understand code or comment so daren't clean it up...
+ // the CUT, CoPy, paste by Accel. leads apart from the action in the Edit in the View
+ // also the appropriate Slots out. The actions take place thus twice.
+ // around this to prevent, knows this function in the View with the SlotExec
+ // to be called.
return m_bAccelAction;
}
@@ -175,7 +179,7 @@ void OSqlEdit::SetText(const String& rNewText)
{
DBG_CHKTHIS(OSqlEdit,NULL);
if (m_timerUndoActionCreation.IsActive())
- { // die noch anstehenden Undo-Action erzeugen
+ { // ?process the outstanding undo action?
m_timerUndoActionCreation.Stop();
LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL);
}
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 9af5da4..7b4a13b 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -390,7 +390,7 @@ void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
{
OMarkableTreeListBox::checkedButton_noBroadcast(_pEntry);
- // if an entry has children, it makes a difference if the entry is checked because alls children are checked
+ // if an entry has children, it makes a difference if the entry is checked because all children are checked
// or if the user checked it explicitly.
// So we track explicit (un)checking
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index ad90d8a..cf8d09b 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -273,8 +273,6 @@ namespace dbaui
}
return Reference< ::com::sun::star::awt::XWindow >();
}
- // -----------------------------------------------------------------------------
- // -----------------------------------------------------------------------------
//..........................................................................
} // dbaui
//..........................................................................
--
1.7.2.2
--------------040302010001090100070407--
More information about the LibreOffice
mailing list