[Libreoffice-commits] core.git: connectivity/source sc/source sot/source
Jens Carl
j.carl43 at gmx.de
Fri Apr 28 20:11:23 UTC 2017
connectivity/source/drivers/file/fcomp.cxx | 8 +++----
sc/source/ui/pagedlg/areasdlg.cxx | 18 ++++++++--------
sot/source/sdstor/storage.cxx | 32 ++++++++++++++---------------
3 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 488d850fd24cd636557bb86b6e4e7cced49a5dd5
Author: Jens Carl <j.carl43 at gmx.de>
Date: Wed Apr 26 03:15:02 2017 +0000
tdf#39486: Translate some randomly found German comments
Change-Id: I4c2950180f504c06666f055d166c51e32a6d5294
Reviewed-on: https://gerrit.libreoffice.org/36969
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index c5d948c24197..ed41ce9343db 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -554,8 +554,8 @@ bool OPredicateInterpreter::evaluate(OCodeList& rCodeList)
OOperand* pOperand = m_aStack.top();
m_aStack.pop();
- DBG_ASSERT(m_aStack.empty(), "StackFehler");
- DBG_ASSERT(pOperand, "StackFehler");
+ DBG_ASSERT(m_aStack.empty(), "Stack error");
+ DBG_ASSERT(pOperand, "Stack error");
bResult = pOperand->isValid();
if (typeid(OOperandResult) == typeid(*pOperand))
@@ -581,8 +581,8 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD
OOperand* pOperand = m_aStack.top();
m_aStack.pop();
- DBG_ASSERT(m_aStack.empty(), "StackFehler");
- DBG_ASSERT(pOperand, "StackFehler");
+ DBG_ASSERT(m_aStack.empty(), "Stack error");
+ DBG_ASSERT(pOperand, "Stack error");
(*_rVal) = pOperand->getValue();
if (typeid(OOperandResult) == typeid(*pOperand))
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 628f2c6ce216..e182575863f3 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -142,7 +142,7 @@ ScPrintAreasDlg::~ScPrintAreasDlg()
void ScPrintAreasDlg::dispose()
{
- // Extra-Data an ListBox-Entries abraeumen
+ // clean extra data of ListBox entries
ListBox* aLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
for (ListBox* pBox : aLb)
@@ -271,7 +271,7 @@ void ScPrintAreasDlg::Impl_Reset()
Impl_FillLists();
- // Druckbereich
+ // printing area
aStrRange.clear();
OUString aOne;
@@ -291,12 +291,12 @@ void ScPrintAreasDlg::Impl_Reset()
}
pEdPrintArea->SetText( aStrRange );
- // Wiederholungszeile
+ // repeat row
lcl_GetRepeatRangeString(pRepeatRowRange, pDoc, true, aStrRange);
pEdRepeatRow->SetText( aStrRange );
- // Wiederholungsspalte
+ // repeat column
lcl_GetRepeatRangeString(pRepeatColRange, pDoc, false, aStrRange);
pEdRepeatCol->SetText( aStrRange );
@@ -307,7 +307,7 @@ void ScPrintAreasDlg::Impl_Reset()
if( pDoc->IsPrintEntireSheet( nCurTab ) )
pLbPrintArea->SelectEntryPos( SC_AREASDLG_PR_ENTIRE );
- pEdPrintArea->SaveValue(); // fuer FillItemSet() merken:
+ pEdPrintArea->SaveValue(); // save for FillItemSet():
pEdRepeatRow->SaveValue();
pEdRepeatCol->SaveValue();
}
@@ -369,7 +369,7 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings()
if ( !bRepeatColOk )
bRepeatColOk = lcl_CheckRepeatString(aStrRepeatCol, pDoc, false, nullptr);
- // Fehlermeldungen
+ // error messages
bOk = (bPrintAreaOk && bRepeatRowOk && bRepeatColOk);
@@ -478,7 +478,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void )
SfxStringItem aRepeatRow( FN_PARAM_2, aStr );
SfxStringItem aRepeatCol( FN_PARAM_3, aStr );
- // Druckbereich veraendert?
+ // Printing area changed?
// first try the list box, if "Entire sheet" is selected
bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE);
@@ -491,11 +491,11 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void )
bDataChanged |= Impl_GetItem( pEdPrintArea, aPrintArea );
}
- // Wiederholungszeile veraendert?
+ // Repeat row changed?
bDataChanged |= Impl_GetItem( pEdRepeatRow, aRepeatRow );
- // Wiederholungsspalte veraendert?
+ // Repeat column changed?
bDataChanged |= Impl_GetItem( pEdRepeatCol, aRepeatCol );
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index eb3ddae6169c..ea5d4007b45f 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -193,14 +193,14 @@ sal_uInt64 SotStorageStream::remainingSize()
void SotStorageStream::CopyTo( SotStorageStream * pDestStm )
{
- Flush(); // alle Daten schreiben
+ Flush(); // write all data
pDestStm->ClearBuffer();
if( !pOwnStm || !pDestStm->pOwnStm )
{
- // Wenn Ole2 oder nicht nur eigene StorageStreams
- sal_uLong nPos = Tell(); // Position merken
+ // If Ole2 or not only own StorageStreams
+ sal_uLong nPos = Tell(); // save position
Seek( 0L );
- pDestStm->SetSize( 0 ); // Ziel-Stream leeren
+ pDestStm->SetSize( 0 ); // empty target stream
std::unique_ptr<sal_uInt8[]> pMem(new sal_uInt8[ 8192 ]);
sal_uLong nRead;
@@ -213,7 +213,7 @@ void SotStorageStream::CopyTo( SotStorageStream * pDestStm )
}
}
pMem.reset();
- // Position setzen
+ // set position
pDestStm->Seek( nPos );
Seek( nPos );
}
@@ -284,7 +284,7 @@ bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any&
SotStorage::SotStorage( const OUString & rName, StreamMode nMode )
INIT_SotStorage()
{
- m_aName = rName; // Namen merken
+ m_aName = rName; // save name
CreateStorage( true, nMode );
if ( IsOLEStorage() )
m_nVersion = SOFFICE_FILEFORMAT_50;
@@ -383,7 +383,7 @@ SotStorage::SotStorage( BaseStorage * pStor )
{
if ( pStor )
{
- m_aName = pStor->GetName(); // Namen merken
+ m_aName = pStor->GetName(); // save name
SignAsRoot( pStor->IsRoot() );
SetError( pStor->GetError() );
}
@@ -472,7 +472,7 @@ SvMemoryStream * SotStorage::CreateMemoryStream()
}
else
{
- aStg.clear(); // Storage vorher freigeben
+ aStg.clear(); // release storage beforehand
delete pStm;
pStm = nullptr;
}
@@ -602,15 +602,15 @@ SotStorageStream * SotStorage::OpenSotStream( const OUString & rEleName,
SotStorageStream * pStm = nullptr;
if( m_pOwnStg )
{
- // volle Ole-Patches einschalten
- // egal was kommt, nur exclusiv gestattet
+ // enable full Ole patches,
+ // regardless what is coming, only exclusively allowed
nMode |= StreamMode::SHARE_DENYALL;
ErrCode nE = m_pOwnStg->GetError();
BaseStorageStream * p = m_pOwnStg->OpenStream( rEleName, nMode );
pStm = new SotStorageStream( p );
if( !nE )
- m_pOwnStg->ResetError(); // kein Fehler setzen
+ m_pOwnStg->ResetError(); // don't set error
if( nMode & StreamMode::TRUNC )
pStm->SetSize( 0 );
}
@@ -633,7 +633,7 @@ SotStorage * SotStorage::OpenSotStorage( const OUString & rEleName,
{
SotStorage * pStor = new SotStorage( p );
if( !nE )
- m_pOwnStg->ResetError(); // kein Fehler setzen
+ m_pOwnStg->ResetError(); // don't set error
return pStor;
}
@@ -646,7 +646,7 @@ SotStorage * SotStorage::OpenSotStorage( const OUString & rEleName,
bool SotStorage::IsStorage( const OUString & rEleName ) const
{
- // ein bisschen schneller
+ // a little bit faster
if( m_pOwnStg )
return m_pOwnStg->IsStorage( rEleName );
@@ -655,7 +655,7 @@ bool SotStorage::IsStorage( const OUString & rEleName ) const
bool SotStorage::IsStream( const OUString & rEleName ) const
{
- // ein bisschen schneller
+ // a little bit faster
if( m_pOwnStg )
return m_pOwnStg->IsStream( rEleName );
@@ -664,7 +664,7 @@ bool SotStorage::IsStream( const OUString & rEleName ) const
bool SotStorage::IsContained( const OUString & rEleName ) const
{
- // ein bisschen schneller
+ // a little bit faster
if( m_pOwnStg )
return m_pOwnStg->IsContained( rEleName );
@@ -701,7 +701,7 @@ bool SotStorage::CopyTo( const OUString & rEleName,
bool SotStorage::Validate()
{
- DBG_ASSERT( m_bIsRoot, "Validate nur an Rootstorage" );
+ DBG_ASSERT( m_bIsRoot, "Validate only if root storage" );
if( m_pOwnStg )
return m_pOwnStg->ValidateFAT();
else
More information about the Libreoffice-commits
mailing list