[Libreoffice-commits] core.git: dbaccess/source
Jens Carl
j.carl43 at gmx.de
Mon Mar 27 13:04:00 UTC 2017
dbaccess/source/ui/browser/brwctrlr.cxx | 4 ++--
dbaccess/source/ui/dlg/RelationDlg.cxx | 2 +-
dbaccess/source/ui/inc/QEnumTypes.hxx | 2 +-
dbaccess/source/ui/inc/WTabPage.hxx | 2 +-
dbaccess/source/ui/misc/DExport.cxx | 4 ++--
dbaccess/source/ui/misc/HtmlReader.cxx | 2 +-
dbaccess/source/ui/querydesign/JoinController.cxx | 2 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 16 ++++++++--------
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 2 +-
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 2 +-
dbaccess/source/ui/querydesign/querydlg.cxx | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit f924422a05ada16d21e5a44da5c30aa0e2c10efd
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri Mar 24 08:26:23 2017 +0000
tdf#39468 Translate German comments
Translate German comments in dbaccess/
Change-Id: Ib8e5e737c5d3cd6cd968be45e74d8d015c855e16
Reviewed-on: https://gerrit.libreoffice.org/35620
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index e891ab85c1d0..361575afdf50 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2170,7 +2170,7 @@ bool SbaXDataBrowserController::SaveModified(bool bAskFor)
}
}
- if ( !CommitCurrent() ) // das aktuelle Control committen lassen
+ if ( !CommitCurrent() ) // Commit the current control
return false;
Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
@@ -2211,7 +2211,7 @@ bool SbaXDataBrowserController::CommitCurrent()
bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock();
if (xActiveControl.is() && !bControlIsLocked)
{
- // zunaechst das Control fragen ob es das IFace unterstuetzt
+ // At first check Control if it supports the IFace
Reference< css::form::XBoundComponent > xBoundControl(xActiveControl, UNO_QUERY);
if (!xBoundControl.is())
xBoundControl.set(xActiveControl->getModel(), UNO_QUERY);
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 98bbba66ae03..f3953eecacdd 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -68,7 +68,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
m_xConnection = pParent->getDesignView()->getController().getConnection();
- // Connection kopieren
+ // Copy connection
m_pConnData.reset( static_cast<ORelationTableConnectionData*>(pConnectionData->NewInstance()) );
m_pConnData->CopyFrom( *pConnectionData );
diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx
index 9f49df789b78..d88a7f4d6fa8 100644
--- a/dbaccess/source/ui/inc/QEnumTypes.hxx
+++ b/dbaccess/source/ui/inc/QEnumTypes.hxx
@@ -35,7 +35,7 @@ namespace dbaui
FKT_AGGREGATE =0x00000002,
FKT_CONDITION =0x00000004,
FKT_NUMERIC =0x00000008
- // if this function type is set, it is either EXISTS oder UNIQUE,
+ // if this function type is set, it is either EXISTS or UNIQUE,
// the FieldName contains the complete statement
};
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index b3e77bc958c4..bf06ce71205d 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -30,7 +30,7 @@ namespace dbaui
{
protected:
VclPtr<OCopyTableWizard> m_pParent;
- bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode
+ bool m_bFirstTime; // Page is called the first time; should be set in the reset methode
OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription );
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 02d9322ed598..aa4196996db7 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -521,7 +521,7 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
case NumberFormat::TEXT:
case NumberFormat::UNDEFINED:
case NumberFormat::LOGICAL:
- nNumberFormat = NumberFormat::TEXT; // Text "uberschreibt alles
+ nNumberFormat = NumberFormat::TEXT; // Text overwrites everything
break;
case NumberFormat::DATETIME:
switch(_nOldNumberFormat)
@@ -546,7 +546,7 @@ sal_Int16 ODatabaseExport::CheckString(const OUString& aCheckToken, sal_Int16 _n
}
catch(Exception&)
{
- nNumberFormat = NumberFormat::TEXT; // Text "uberschreibt alles
+ nNumberFormat = NumberFormat::TEXT; // Text overwrites everything
}
return nNumberFormat;
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 11c36b66d404..ce3a60321bf1 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -384,7 +384,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
const OUString& rOptVal = rOption.GetString();
if ( rOptVal.indexOf('%') != -1 )
{ // percentage
- OSL_ENSURE( m_nColumnWidth, "WIDTH Option: m_nColumnWidth==0 und Width%" );
+ OSL_ENSURE( m_nColumnWidth, "WIDTH Option: m_nColumnWidth==0 and Width%" );
return (sal_Int16)((rOption.GetNumber() * m_nColumnWidth) / 100);
}
else
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 84044841c6ed..e894ee567e37 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -189,7 +189,7 @@ void OJoinController::SaveTabWinPosSize(OTableWindow* pTabWin, long nOffsetX, lo
{
// the data for the window
TTableWindowData::value_type pData = pTabWin->GetData();
- OSL_ENSURE(pData != nullptr, "SaveTabWinPosSize : TabWin hat keine Daten !");
+ OSL_ENSURE(pData != nullptr, "SaveTabWinPosSize : TabWin has no data !");
// set Position & Size of data anew (with current window parameters)
Point aPos = pTabWin->GetPosPixel();
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index d391c68c7353..46de39c070f3 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -428,7 +428,7 @@ CellController* OSelectionBrowseBox::GetController(long nRow, sal_uInt16 nColId)
if ( nColId > getFields().size() )
return nullptr;
OTableFieldDescRef pEntry = getFields()[nColId-1];
- OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::GetController : keine FieldDescription !");
+ OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::GetController : invalid FieldDescription !");
if (!pEntry.is())
return nullptr;
@@ -463,7 +463,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
if ( nPos == 0 || nPos == BROWSER_INVALIDID || nPos > getFields().size() )
return;
OTableFieldDescRef pEntry = getFields()[nPos-1];
- OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::InitController : keine FieldDescription !");
+ OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::InitController : invalid FieldDescription !");
long nCellIndex = GetRealRow(nRow);
switch (nCellIndex)
@@ -683,7 +683,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _
if ( _pEntry->isAggreateFunction() )
{
- OSL_ENSURE(!_pEntry->GetFunction().isEmpty(),"Functionname darf hier nicht leer sein! ;-(");
+ OSL_ENSURE(!_pEntry->GetFunction().isEmpty(),"No empty Function name allowed here! ;-(");
sQuotedFullFieldName = _pEntry->GetFunction() + "(" + sQuotedFullFieldName + ")";
sFullFieldName = _pEntry->GetFunction() + "(" + sFullFieldName + ")";
}
@@ -1633,7 +1633,7 @@ void OSelectionBrowseBox::AddGroupBy( const OTableFieldDescRef& rInfo )
Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
if(!xConnection.is())
return;
- OSL_ENSURE(!rInfo->IsEmpty(),"AddGroupBy:: OTableFieldDescRef sollte nicht Empty sein!");
+ OSL_ENSURE(!rInfo->IsEmpty(),"AddGroupBy:: OTableFieldDescRef should not be empty!");
OTableFieldDescRef pEntry;
const Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
const ::comphelper::UStringMixEqual bCase(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers());
@@ -1713,7 +1713,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O
Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
if(!xConnection.is())
return;
- OSL_ENSURE(rInfo.is() && !rInfo->IsEmpty(),"AddCondition:: OTableFieldDescRef sollte nicht Empty sein!");
+ OSL_ENSURE(rInfo.is() && !rInfo->IsEmpty(),"AddCondition:: OTableFieldDescRef should not be Empty!");
OTableFieldDescRef pLastEntry;
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
@@ -2056,7 +2056,7 @@ long OSelectionBrowseBox::GetRealRow(long nRowId) const
break;
}
}
- OSL_ENSURE(nErg <= long(m_bVisibleRow.size()),"nErg kann nicht groesser als BROW_ROW_CNT sein!");
+ OSL_ENSURE(nErg <= long(m_bVisibleRow.size()),"nErg cannot be greater than BROW_ROW_CNT!");
return i;
}
@@ -2316,9 +2316,9 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
// but the changes aren't permanent ...
sal_uInt16 nPos = GetColumnPos(nColId);
- OSL_ENSURE(nPos <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!");
+ OSL_ENSURE(nPos <= getFields().size(),"ColumnResized:: nColId should not be greater than List::count!");
OTableFieldDescRef pEntry = getEntry(nPos-1);
- OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::ColumnResized : keine FieldDescription !");
+ OSL_ENSURE(pEntry.is(), "OSelectionBrowseBox::ColumnResized : invalid FieldDescription !");
static_cast<OQueryController&>(getDesignView()->getController()).setModified( true );
EditBrowseBox::ColumnResized(nColId);
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 059f0a5549bf..a852494943d0 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -42,7 +42,7 @@ OTableConnectionData::OTableConnectionData(const TTableWindowData::value_type& _
void OTableConnectionData::Init()
{
// initialise linedatalist with defaults
- OSL_ENSURE(m_vConnLineData.empty(), "OTableConnectionData::Init() : nur mit leere Linienliste aufzurufen !");
+ OSL_ENSURE(m_vConnLineData.empty(), "OTableConnectionData::Init() : call only with empty line list!");
ResetConnLines();
// this creates the defaults
}
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 39e005747b9e..e45cccad0525 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool )
{
// tell my parent
vcl::Window* pParent = Window::GetParent();
- OSL_ENSURE(pParent != nullptr, "OTableWindowListBox::OnDoubleClick : habe kein Parent !");
+ OSL_ENSURE(pParent != nullptr, "OTableWindowListBox::OnDoubleClick : have no Parent !");
static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry());
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 97268bab13b9..ccf4d190a256 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -65,7 +65,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
get(m_pPB_OK, "ok");
m_pML_HelpText->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
- // Connection kopieren
+ // Copy connection
m_pConnData.reset(_pData->NewInstance());
m_pConnData->CopyFrom(*_pData);
More information about the Libreoffice-commits
mailing list