[Libreoffice-commits] core.git: sc/source
Jens Carl
j.carl43 at gmx.de
Wed Apr 5 10:18:03 UTC 2017
sc/source/core/data/drwlayer.cxx | 2 -
sc/source/core/data/formulacell.cxx | 4 +-
sc/source/core/tool/callform.cxx | 2 -
sc/source/core/tool/dbdata.cxx | 2 -
sc/source/core/tool/interpr3.cxx | 4 +-
sc/source/core/tool/queryparam.cxx | 2 -
sc/source/core/tool/unitconv.cxx | 2 -
sc/source/ui/undo/undoblk.cxx | 2 -
sc/source/ui/unoobj/afmtuno.cxx | 50 +++++++++++++++++-----------------
sc/source/ui/unoobj/chartuno.cxx | 28 +++++++++----------
sc/source/ui/unoobj/condformatuno.cxx | 2 -
sc/source/ui/unoobj/confuno.cxx | 4 +-
sc/source/ui/unoobj/cursuno.cxx | 20 ++++++-------
sc/source/ui/unoobj/datauno.cxx | 48 ++++++++++++++++----------------
sc/source/ui/unoobj/docuno.cxx | 2 -
sc/source/ui/unoobj/editsrc.cxx | 10 +++---
sc/source/ui/unoobj/fielduno.cxx | 8 ++---
sc/source/ui/unoobj/fmtuno.cxx | 6 ++--
sc/source/ui/unoobj/notesuno.cxx | 8 ++---
sc/source/ui/unoobj/scdetect.cxx | 30 ++++++++++----------
sc/source/ui/unoobj/servuno.cxx | 6 ++--
sc/source/ui/unoobj/styleuno.cxx | 35 +++++++++++------------
sc/source/ui/unoobj/textuno.cxx | 6 ++--
sc/source/ui/unoobj/viewuno.cxx | 14 ++++-----
sc/source/ui/view/tabvwsh3.cxx | 2 -
sc/source/ui/view/viewdata.cxx | 2 -
26 files changed, 150 insertions(+), 151 deletions(-)
New commits:
commit a4712a3251dfa4122d039595bd897bd06e255f03
Author: Jens Carl <j.carl43 at gmx.de>
Date: Wed Apr 5 01:32:18 2017 +0000
tdf#39468 Translate German comments
Translate German comments and terms in sc/source/core and sc/source/ui
Change-Id: I214565e73893688963d99c0f0ddfc356b5ad63be
Reviewed-on: https://gerrit.libreoffice.org/36107
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 6d43f59c4f14..c4add975c7a7 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -578,7 +578,7 @@ void ScDrawLayer::SetPageSize( sal_uInt16 nPageNo, const Size& rSize, bool bUpda
if ( rSize != pPage->GetSize() )
{
pPage->SetSize( rSize );
- Broadcast( ScTabSizeChangedHint( static_cast<SCTAB>(nPageNo) ) ); // SetWorkArea() an den Views
+ Broadcast( ScTabSizeChangedHint( static_cast<SCTAB>(nPageNo) ) ); // SetWorkArea() on the views
}
// Implement Detective lines (adjust to new heights / widths)
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 80179ae9aaac..b1de235299b0 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3460,7 +3460,7 @@ void ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
}
EndListeningTo( pDocument );
- // IncTab _after_ EndListeningTo und _before_ Compiler UpdateDeleteTab!
+ // IncTab _after_ EndListeningTo and _before_ Compiler UpdateDeleteTab!
ScAddress aOldPos = aPos;
if (bPosChanged)
aPos.IncTab(-1*rCxt.mnSheets);
@@ -3487,7 +3487,7 @@ void ScFormulaCell::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTab
EndListeningTo(pDocument);
ScAddress aOldPos = aPos;
- // SetTab _after_ EndListeningTo und _before_ Compiler UpdateMoveTab !
+ // SetTab _after_ EndListeningTo and _before_ Compiler UpdateMoveTab !
aPos.SetTab(nTabNo);
// no StartListeningTo because pTab[nTab] not yet correct!
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 65f1d0c21265..35687f0f7068 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -359,7 +359,7 @@ void LegacyFuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16
sal_Char pcName[256];
sal_Char pcDesc[256];
*pcName = *pcDesc = 0;
- sal_uInt16 nFuncNo = nNumber; // nicht per Reference versauen lassen..
+ sal_uInt16 nFuncNo = nNumber; // don't let it mess up via reference...
reinterpret_cast< ::GetParamDesc>(fProc)( nFuncNo, nParam, pcName, pcDesc );
aName = OUString( pcName, 256, osl_getThreadTextEncoding() );
aDesc = OUString( pcDesc, 256, osl_getThreadTextEncoding() );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index ebfa42084d79..7196db50201b 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -535,7 +535,7 @@ void ScDBData::UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos)
GetArea( aRange );
SCTAB nTab = aRange.aStart.Tab(); // a database range is only on one sheet
- // anpassen wie die aktuelle Tabelle bei ScTablesHint (tabvwsh5.cxx)
+ // customize as the current table as ScTablesHint (tabvwsh5.cxx)
if ( nTab == nOldPos ) // moved sheet
nTab = nNewPos;
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index f0f1d843fd54..959023e5466a 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1607,7 +1607,7 @@ void ScInterpreter::ScExpDist()
{
if ( MustHaveParamCount( GetByte(), 3 ) )
{
- double kum = GetDouble(); // 0 oder 1
+ double kum = GetDouble(); // 0 or 1
double lambda = GetDouble(); // lambda
double x = GetDouble(); // x
if (lambda <= 0.0)
@@ -1755,7 +1755,7 @@ void ScInterpreter::ScWeibull()
{
if ( MustHaveParamCount( GetByte(), 4 ) )
{
- double kum = GetDouble(); // 0 oder 1
+ double kum = GetDouble(); // 0 or 1
double beta = GetDouble(); // beta
double alpha = GetDouble(); // alpha
double x = GetDouble(); // x
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index eee6cf7ef893..0a5ae116c630 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -350,7 +350,7 @@ bool ScQueryParam::operator==( const ScQueryParam& rOther ) const
{
bool bEqual = false;
- // Anzahl der Queries gleich?
+ // Are the number of queries equal?
SCSIZE nUsed = 0;
SCSIZE nOtherUsed = 0;
SCSIZE nEntryCount = GetEntryCount();
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 45215f512cea..0868ef58bb82 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -26,7 +26,7 @@
using namespace utl;
using namespace com::sun::star::uno;
-const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To
+const sal_Unicode cDelim = 0x01; // delimiter between From and To
// ScUnitConverterData
ScUnitConverterData::ScUnitConverterData(
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index c9f626c8a4e7..217022845109 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1969,7 +1969,7 @@ ScUndoClearItems::ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData&
pUndoDoc( pNewUndoDoc ),
pWhich( nullptr )
{
- OSL_ENSURE( pW, "ScUndoClearItems: Which-Pointer ist 0" );
+ OSL_ENSURE( pW, "ScUndoClearItems: Which-Pointer is Null" );
sal_uInt16 nCount = 0;
while ( pW[nCount] )
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index bd5775c03b20..1802478ef5d6 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -60,10 +60,10 @@
using namespace ::com::sun::star;
-// ein AutoFormat hat immer 16 Eintraege
+// a AutoFormat has always 16 entries
#define SC_AF_FIELD_COUNT 16
-// AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs
+// AutoFormat map only for PropertySetInfo without Which-IDs
static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap()
{
@@ -80,7 +80,7 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap()
return aAutoFormatMap_Impl;
}
-//! Zahlformat (String/Language) ??? (in XNumberFormat nur ReadOnly)
+//! number format (String/Language) ??? (in XNumberFormat only ReadOnly)
//! table::TableBorder ??!?
static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
@@ -159,13 +159,13 @@ static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUStrin
return true;
}
}
- return false; // is nich
+ return false;
}
ScAutoFormatsObj::ScAutoFormatsObj()
{
- //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten
- //! bekannt sein, damit Aenderungen gebroadcasted werden koennen
+ //! This object should only exist once and it must be known to Auto-Format-Data,
+ //! so that changes can be broadcasted
}
ScAutoFormatsObj::~ScAutoFormatsObj()
@@ -205,12 +205,12 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::
{
SolarMutexGuard aGuard;
bool bDone = false;
- // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
+ // Reflection need not be uno::XInterface, can be any interface...
uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY);
if ( xInterface.is() )
{
ScAutoFormatObj* pFormatObj = ScAutoFormatObj::getImplementation( xInterface );
- if ( pFormatObj && !pFormatObj->IsInserted() ) // noch nicht eingefuegt?
+ if ( pFormatObj && !pFormatObj->IsInserted() )
{
ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat();
@@ -222,19 +222,19 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::
if (pFormats->insert(pNew))
{
- //! Notify fuer andere Objekte
- pFormats->Save(); // sofort speichern
+ //! notify to other objects
+ pFormats->Save();
sal_uInt16 nNewIndex;
if (lcl_FindAutoFormatIndex( *pFormats, aName, nNewIndex ))
{
- pFormatObj->InitFormat( nNewIndex ); // kann jetzt benutzt werden
+ pFormatObj->InitFormat( nNewIndex ); // can be used now
bDone = true;
}
}
else
{
- OSL_FAIL("AutoFormat konnte nicht eingefuegt werden");
+ OSL_FAIL("AutoFormat could not be inserted");
throw uno::RuntimeException();
}
}
@@ -357,8 +357,8 @@ ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) :
ScAutoFormatObj::~ScAutoFormatObj()
{
- // Wenn ein AutoFormat-Objekt losgelassen wird, werden eventuelle Aenderungen
- // gespeichert, damit sie z.B. im Writer sichtbar sind
+ // If a AutoFormat object is released, then eventually changes are saved
+ // so that they become visible in e.g Writer
if (IsInserted())
{
@@ -366,13 +366,13 @@ ScAutoFormatObj::~ScAutoFormatObj()
if ( pFormats && pFormats->IsSaveLater() )
pFormats->Save();
- // Save() setzt SaveLater Flag zurueck
+ // Save() resets flag SaveLater
}
}
void ScAutoFormatObj::InitFormat( sal_uInt16 nNewIndex )
{
- OSL_ENSURE( nFormatIndex == SC_AFMTOBJ_INVALID, "ScAutoFormatObj::InitFormat mehrfach" );
+ OSL_ENSURE( nFormatIndex == SC_AFMTOBJ_INVALID, "ScAutoFormatObj::InitFormat is multiple" );
nFormatIndex = nNewIndex;
}
@@ -486,7 +486,7 @@ void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName )
ScAutoFormat::iterator it = pFormats->begin();
std::advance(it, nFormatIndex);
ScAutoFormatData *const pData = it->second.get();
- OSL_ENSURE(pData,"AutoFormat Daten nicht da");
+ OSL_ENSURE(pData,"AutoFormat data not available");
ScAutoFormatData* pNew = new ScAutoFormatData(*pData);
pNew->SetName( aNewName );
@@ -498,13 +498,13 @@ void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName )
ScAutoFormat::iterator itBeg = pFormats->begin();
nFormatIndex = std::distance(itBeg, it);
- //! Notify fuer andere Objekte
+ //! notify to other objects
pFormats->SetSaveLater(true);
}
else
{
- OSL_FAIL("AutoFormat konnte nicht eingefuegt werden");
- nFormatIndex = 0; //! alter Index ist ungueltig
+ OSL_FAIL("AutoFormat could not be inserted");
+ nFormatIndex = 0; //! old index invalid
}
}
else
@@ -531,7 +531,7 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue(
if (IsInserted() && nFormatIndex < pFormats->size())
{
ScAutoFormatData* pData = pFormats->findByIndex(nFormatIndex);
- OSL_ENSURE(pData,"AutoFormat Daten nicht da");
+ OSL_ENSURE(pData,"AutoFormat data not available");
bool bBool;
if (aPropertyName == SC_UNONAME_INCBACK && (aValue >>= bBool))
@@ -547,9 +547,9 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue(
else if (aPropertyName == SC_UNONAME_INCWIDTH && (aValue >>= bBool))
pData->SetIncludeWidthHeight( bBool );
- // else Fehler
+ // else error
- //! Notify fuer andere Objekte
+ //! notify to other objects
pFormats->SetSaveLater(true);
}
}
@@ -563,7 +563,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyNa
if (IsInserted() && nFormatIndex < pFormats->size())
{
ScAutoFormatData* pData = pFormats->findByIndex(nFormatIndex);
- OSL_ENSURE(pData,"AutoFormat Daten nicht da");
+ OSL_ENSURE(pData,"AutoFormat data not available");
bool bValue;
bool bError = false;
@@ -581,7 +581,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyNa
else if (aPropertyName == SC_UNONAME_INCWIDTH)
bValue = pData->GetIncludeWidthHeight();
else
- bError = true; // unbekannte Property
+ bError = true; // unknown property
if (!bError)
aAny <<= bValue;
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 20c3f9e1f989..63bc43a72400 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -73,11 +73,11 @@ ScChartsObj::~ScChartsObj()
void ScChartsObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Referenz-Update
+ //! update reference
if ( rHint.GetId() == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
}
}
@@ -91,7 +91,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const
if (pDrawLayer)
{
SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
- OSL_ENSURE(pPage, "Page nicht gefunden");
+ OSL_ENSURE(pPage, "Page not found");
if (pPage)
{
long nPos = 0;
@@ -106,7 +106,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const
uno::Reference < embed::XEmbeddedObject > xObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef();
if ( xObj.is() )
aName = pDocShell->GetEmbeddedObjectContainer().GetEmbeddedObjectName( xObj );
- break; // nicht weitersuchen
+ break; // stop searching
}
++nPos;
}
@@ -142,7 +142,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
ScDocument& rDoc = pDocShell->GetDocument();
ScDrawLayer* pModel = pDocShell->MakeDrawLayer();
SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab));
- OSL_ENSURE(pPage,"addChart: keine Page");
+ OSL_ENSURE(pPage,"addChart: no Page");
if (!pPage)
return;
@@ -176,8 +176,8 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
xObj = pDocShell->GetEmbeddedObjectContainer().CreateEmbeddedObject( SvGlobalName( SO3_SCH_CLASSID ).GetByteSequence(), aName );
if ( xObj.is() )
{
- // Rechteck anpassen
- //! Fehler/Exception, wenn leer/ungueltig ???
+ // adjust rectangle
+ //! error/exception, if empty/invalid ???
Point aRectPos( aRect.X, aRect.Y );
bool bLayoutRTL = rDoc.IsLayoutRTL( nTab );
if ( ( aRectPos.X() < 0 && !bLayoutRTL ) || ( aRectPos.X() > 0 && bLayoutRTL ) )
@@ -269,8 +269,8 @@ void SAL_CALL ScChartsObj::removeByName( const OUString& aName )
{
ScDocument& rDoc = pDocShell->GetDocument();
rDoc.GetChartListenerCollection()->removeByName(aName);
- ScDrawLayer* pModel = rDoc.GetDrawLayer(); // ist nicht 0
- SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab)); // ist nicht 0
+ ScDrawLayer* pModel = rDoc.GetDrawLayer(); // is not zero
+ SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab)); // is not zero
pModel->AddUndo( new SdrUndoDelObj( *pObj ) );
pPage->RemoveObject( pObj->GetOrdNum() );
@@ -300,7 +300,7 @@ sal_Int32 SAL_CALL ScChartsObj::getCount()
if (pDrawLayer)
{
SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
- OSL_ENSURE(pPage, "Page nicht gefunden");
+ OSL_ENSURE(pPage, "Page not found");
if (pPage)
{
SdrObjListIter aIter( *pPage, SdrIterMode::DeepNoGroups );
@@ -365,7 +365,7 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames()
if (pDrawLayer)
{
SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
- OSL_ENSURE(pPage, "Page nicht gefunden");
+ OSL_ENSURE(pPage, "Page not found");
if (pPage)
{
SdrObjListIter aIter( *pPage, SdrIterMode::DeepNoGroups );
@@ -426,11 +426,11 @@ ScChartObj::~ScChartObj()
void ScChartObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- //! Referenz-Update
+ //! update reference
if ( rHint.GetId() == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
}
}
@@ -677,7 +677,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges()
return aSeq;
}
- OSL_FAIL("ScChartObj::getRanges: keine Ranges");
+ OSL_FAIL("ScChartObj::getRanges: no Ranges");
return uno::Sequence<table::CellRangeAddress>();
}
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index 2e541a5912dd..d49993b69b8a 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -326,7 +326,7 @@ void ScCondFormatsObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
if ( rHint.GetId() == SfxHintId::Dying )
{
- mpDocShell = nullptr; // ungueltig geworden
+ mpDocShell = nullptr;
}
}
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 2918c8601d83..d69751056a65 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -100,11 +100,11 @@ ScDocumentConfiguration::~ScDocumentConfiguration()
void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update does not matter here
if ( rHint.GetId() == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
}
}
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 43a2a76e7a16..21da6fbc7c08 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -145,8 +145,8 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray()
// about a exception
/*if (!bFound)
{
- OSL_FAIL("keine Matrix");
- //! Exception, oder was?
+ OSL_FAIL("no matrix");
+ //! Exception, or what?
}*/
}
@@ -199,8 +199,8 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
SolarMutexGuard aGuard;
if ( nColumns <= 0 || nRows <= 0 )
{
- OSL_FAIL("leerer Range geht nicht");
- //! und dann?
+ OSL_FAIL("Empty range not allowed");
+ //! and then?
}
else
{
@@ -216,12 +216,12 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
if ( nEndX > MAXCOL ) nEndX = MAXCOL;
if ( nEndY < 0 ) nEndY = 0;
if ( nEndY > MAXROW ) nEndY = MAXROW;
- //! Fehler/Exception oder so, wenn zu gross/zu klein?
+ //! error/exception or so, if too big/small
aNewRange.aEnd.SetCol((SCCOL)nEndX);
aNewRange.aEnd.SetRow((SCROW)nEndY);
- aNewRange.PutInOrder(); //! wirklich?
+ aNewRange.PutInOrder(); //! really?
SetNewRange( aNewRange );
}
@@ -349,7 +349,7 @@ void SAL_CALL ScCellCursorObj::gotoNext()
ScRange aOneRange( *rRanges[ 0 ] );
aOneRange.PutInOrder();
- ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen
+ ScAddress aCursor(aOneRange.aStart); // always use start of block
ScMarkData aMark; // not used with bMarked=FALSE
SCCOL nNewX = aCursor.Col();
@@ -358,7 +358,7 @@ void SAL_CALL ScCellCursorObj::gotoNext()
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
pDocSh->GetDocument().GetNextPos( nNewX,nNewY, nTab, 1,0, false,true, aMark );
- //! sonst Exception oder so
+ //! otherwise exception or so
SetNewRange( ScRange( nNewX, nNewY, nTab ) );
}
@@ -371,7 +371,7 @@ void SAL_CALL ScCellCursorObj::gotoPrevious()
ScRange aOneRange( *rRanges[ 0 ] );
aOneRange.PutInOrder();
- ScAddress aCursor(aOneRange.aStart); // bei Block immer den Start nehmen
+ ScAddress aCursor(aOneRange.aStart); // always use start of block
ScMarkData aMark; // not used with bMarked=FALSE
SCCOL nNewX = aCursor.Col();
@@ -380,7 +380,7 @@ void SAL_CALL ScCellCursorObj::gotoPrevious()
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
pDocSh->GetDocument().GetNextPos( nNewX,nNewY, nTab, -1,0, false,true, aMark );
- //! sonst Exception oder so
+ //! otherwise exception or so
SetNewRange( ScRange( nNewX, nNewY, nTab ) );
}
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 9abb7521f5e3..910e01ec3a57 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -64,7 +64,7 @@
using namespace com::sun::star;
-// alles ohne Which-ID, Map nur fuer PropertySetInfo
+// everything without Which-ID, map only for PropertySetInfo
static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap()
{
@@ -154,7 +154,7 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e
case SUBTOTAL_FUNC_VAR: eGeneral = sheet::GeneralFunction_VAR; break;
case SUBTOTAL_FUNC_VARP: eGeneral = sheet::GeneralFunction_VARP; break;
default:
- OSL_FAIL("SubTotalToGeneral: falscher enum");
+ OSL_FAIL("SubTotalToGeneral: wrong enum");
eGeneral = sheet::GeneralFunction_NONE;
break;
}
@@ -163,7 +163,7 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e
void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScImportParam& rParam )
{
- OSL_ENSURE( rSeq.getLength() == GetPropertyCount(), "falscher Count" );
+ OSL_ENSURE( rSeq.getLength() == GetPropertyCount(), "wrong Count" );
beans::PropertyValue* pArray = rSeq.getArray();
@@ -175,7 +175,7 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS
else if ( rParam.nType == ScDbQuery )
eMode = sheet::DataImportMode_QUERY;
else
- eMode = sheet::DataImportMode_TABLE; // Type ist immer ScDbQuery oder ScDbTable
+ eMode = sheet::DataImportMode_TABLE; // type always ScDbQuery or ScDbTable
}
svx::ODataAccessDescriptor aDescriptor;
@@ -450,7 +450,7 @@ ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uIn
rParent( *pDesc ),
nPos( nP )
{
- OSL_ENSURE(pDesc, "ScSubTotalFieldObj: Parent ist 0");
+ OSL_ENSURE(pDesc, "ScSubTotalFieldObj: Parent is 0");
}
ScSubTotalFieldObj::~ScSubTotalFieldObj()
@@ -527,7 +527,7 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns(
aParam.pFunctions[nPos] = nullptr;
}
}
- //! sonst Exception oder so? (zuviele Spalten)
+ //! otherwise exception or so? (too many columns)
rParent.PutData(aParam);
}
@@ -559,7 +559,7 @@ void SAL_CALL ScSubTotalDescriptorBase::clear()
for (bool & rn : aParam.bGroupActive)
rn = false;
- //! Notify oder so fuer die Field-Objekte???
+ //! notify the field objects???
PutData(aParam);
}
@@ -883,7 +883,7 @@ void SAL_CALL ScConsolidationDescriptor::setSources(
static_cast<SCCOL>(pAry[i].StartColumn), pAry[i].StartRow,
static_cast<SCCOL>(pAry[i].EndColumn), pAry[i].EndRow );
- aParam.SetAreas( pNew.get(), nCount ); // kopiert alles
+ aParam.SetAreas( pNew.get(), nCount ); // copy everything
for (i=0; i<nCount; i++)
delete pNew[i];
@@ -1139,9 +1139,9 @@ void fillQueryParam(
}
}
- size_t nParamCount = rParam.GetEntryCount(); // Param wird nicht unter 8 resized
+ size_t nParamCount = rParam.GetEntryCount(); // if below eight Param isn't resized
for (size_t i = nCount; i < nParamCount; ++i)
- rParam.GetEntry(i).bDoQuery = false; // ueberzaehlige Felder zuruecksetzen
+ rParam.GetEntry(i).bDoQuery = false; // reset surplus fields
}
void fillQueryParam(
@@ -1182,9 +1182,9 @@ void fillQueryParam(
}
}
- size_t nParamCount = rParam.GetEntryCount(); // Param wird nicht unter 8 resized
+ size_t nParamCount = rParam.GetEntryCount(); // if below eight Param isn't resized
for (size_t i = nCount; i < nParamCount; ++i)
- rParam.GetEntry(i).bDoQuery = false; // ueberzaehlige Felder zuruecksetzen
+ rParam.GetEntry(i).bDoQuery = false; // reset surplus fields
}
}
@@ -1195,8 +1195,8 @@ uno::Sequence<sheet::TableFilterField2> SAL_CALL ScFilterDescriptorBase::getFilt
ScQueryParam aParam;
GetData(aParam);
- SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
- SCSIZE nCount = 0; // aktive
+ SCSIZE nEntries = aParam.GetEntryCount(); // allocated entries in Param
+ SCSIZE nCount = 0; // active
while ( nCount < nEntries &&
aParam.GetEntry(nCount).bDoQuery )
++nCount;
@@ -1351,14 +1351,14 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields(
rEntry.SetQueryByNonEmpty();
break;
default:
- OSL_FAIL("Falscher Query-enum");
+ OSL_FAIL("Wrong query enum");
rEntry.eOp = SC_EQUAL;
}
}
- SCSIZE nParamCount = aParam.GetEntryCount(); // Param wird nicht unter 8 resized
+ SCSIZE nParamCount = aParam.GetEntryCount(); // if below eight Param isn't resized
for (i=nCount; i<nParamCount; i++)
- aParam.GetEntry(i).bDoQuery = false; // ueberzaehlige Felder zuruecksetzen
+ aParam.GetEntry(i).bDoQuery = false; // reset surplus fields
PutData(aParam);
}
@@ -1598,7 +1598,7 @@ void ScDatabaseRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( rHint.GetId() == SfxHintId::Dying )
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
else if ( dynamic_cast<const ScDBRangeRefreshedHint*>(&rHint) )
{
ScDBData* pDBData = GetDBData_Impl();
@@ -1849,7 +1849,7 @@ void SAL_CALL ScDatabaseRangeObj::refresh()
{
ScDBDocFunc aFunc(*pDocShell);
- // Import zu wiederholen?
+ // repeat import?
bool bContinue = true;
ScImportParam aImportParam;
pData->GetImportParam( aImportParam );
@@ -1862,7 +1862,7 @@ void SAL_CALL ScDatabaseRangeObj::refresh()
bContinue = aFunc.DoImport( nTab, aImportParam, nullptr ); //! Api-Flag as parameter
}
- // interne Operationen (sort, query, subtotal) nur, wenn kein Fehler
+ // if no error then internal operations (sort, query, subtotal)
if (bContinue)
aFunc.RepeatDB( pData->GetName(), true, bIsUnnamed, aTab );
}
@@ -2144,11 +2144,11 @@ ScDatabaseRangesObj::~ScDatabaseRangesObj()
void ScDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update does not matter here
if ( rHint.GetId() == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
}
}
@@ -2328,11 +2328,11 @@ ScUnnamedDatabaseRangesObj::~ScUnnamedDatabaseRangesObj()
void ScUnnamedDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update does not matter here
if ( rHint.GetId() == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
}
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 31c0e1123624..c35c98f2fee6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3052,7 +3052,7 @@ uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(sal_Int
if (pDocShell)
{
ScDrawLayer* pDrawLayer = pDocShell->MakeDrawLayer();
- OSL_ENSURE(pDrawLayer,"kann Draw-Layer nicht anlegen");
+ OSL_ENSURE(pDrawLayer,"Cannot create Draw-Layer");
if ( pDrawLayer && nIndex >= 0 && nIndex < pDocShell->GetDocument().GetTableCount() )
{
SdrPage* pPage = pDrawLayer->GetPage((sal_uInt16)nIndex);
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 678dc4a1488c..15475b3dcb4b 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -143,7 +143,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
{
if (!pEditEngine)
{
- // Notizen haben keine Felder
+ // notes don't have fields
if ( pDocShell )
{
pEditEngine = new ScNoteEditEngine( pDocShell->GetDocument().GetNoteEngine() );
@@ -189,7 +189,7 @@ void ScAnnotationEditSource::UpdateData()
aModificator.SetDocumentModified();
- // bDataValid wird bei SetDocumentModified zurueckgesetzt
+ // SetDocumentModified will reset bDataValid
}
}
@@ -197,20 +197,20 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if ( dynamic_cast<const ScUpdateRefHint*>(&rHint) )
{
- //! Ref-Update
+ //! reference update
}
else
{
const SfxHintId nId = rHint.GetId();
if ( nId == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
DELETEZ( pForwarder );
DELETEZ( pEditEngine ); // EditEngine uses document's pool
}
else if ( nId == SfxHintId::DataChanged )
- bDataValid = false; // Text muss neu geholt werden
+ bDataValid = false; // text must be retrieved again
}
}
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 5b75e72f42a5..944f27144a80 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -639,7 +639,7 @@ void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::
// don't care about the type (only URLs can be found in the cells)
SvxFieldData* pField = aTempEngine.FindByPos(
aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED);
- OSL_ENSURE(pField,"setPropertyValue: Feld nicht gefunden");
+ OSL_ENSURE(pField,"setPropertyValue: Field not found");
if (!pField)
return;
@@ -712,7 +712,7 @@ uno::Any ScEditFieldObj::getPropertyValueURL(const OUString& rName)
// don't care about the type (only URLs can be found in the cells)
const SvxFieldData* pField = aTempEngine.FindByPos(
aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED);
- OSL_ENSURE(pField,"getPropertyValue: Feld nicht gefunden");
+ OSL_ENSURE(pField,"getPropertyValue: Field not found");
if (!pField)
throw uno::RuntimeException();
@@ -1026,7 +1026,7 @@ void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any
// don't care about the type (only URLs can be found in the cells)
SvxFieldData* pField = aTempEngine.FindByPos(
aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED);
- OSL_ENSURE(pField,"setPropertyValue: Feld nicht gefunden");
+ OSL_ENSURE(pField,"setPropertyValue: Field not found");
if (!pField)
return;
@@ -1158,7 +1158,7 @@ OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand )
// don't care about the type (only URLs can be found in the cells)
const SvxFieldData* pField = aTempEngine.FindByPos(
aSelection.nStartPara, aSelection.nStartPos, text::textfield::Type::UNSPECIFIED);
- OSL_ENSURE(pField,"getPresentation: Feld nicht gefunden");
+ OSL_ENSURE(pField,"getPresentation: Field not found");
if (!pField)
return OUString();
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 59bed5182426..9035d1326d3d 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -38,7 +38,7 @@
using namespace ::com::sun::star;
using namespace ::formula;
-// Map nur fuer PropertySetInfo
+// map only for PropertySetInfo
static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap()
{
@@ -192,9 +192,9 @@ FormulaGrammar::Grammar lclResolveGrammar( FormulaGrammar::Grammar eExtGrammar,
void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat,
ScDocument* pDoc, FormulaGrammar::Grammar eGrammar) const
{
- // ScConditionalFormat = Core-Struktur, muss leer sein
+ // ScConditionalFormat = Core-Struktur, has to be empty
- OSL_ENSURE( rFormat.IsEmpty(), "FillFormat: Format nicht leer" );
+ OSL_ENSURE( rFormat.IsEmpty(), "FillFormat: format not empty" );
for (const auto & i : maEntries)
{
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 4a5c68638680..a01fa9dff550 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -93,8 +93,8 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent()
{
SolarMutexGuard aGuard;
- // Parent der Notiz ist die zugehoerige Zelle
- //! existierendes Objekt finden und zurueckgeben ???
+ // parent of note is the related cell
+ //! find and reset existing object ???
if (pDocShell)
return static_cast<cppu::OWeakObject*>(new ScCellObj( pDocShell, aCellPos ));
@@ -113,7 +113,7 @@ void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>&
uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor()
{
SolarMutexGuard aGuard;
- // Notizen brauchen keine Extrawurst
+ // notes does not need special treatment
return GetUnoText().createTextCursor();
}
@@ -121,7 +121,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRa
const uno::Reference<text::XTextRange>& aTextPosition )
{
SolarMutexGuard aGuard;
- // Notizen brauchen keine Extrawurst
+ // notes does not need special treatment
return GetUnoText().createTextCursorByRange(aTextPosition);
}
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index f0372bae38c7..24715d9aad80 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -35,12 +35,12 @@ using utl::MediaDescriptor;
namespace {
-// Tabelle mit Suchmustern
-// Bedeutung der Sequenzen
-// 0x00??: genau Byte 0x?? muss an dieser Stelle stehen
-// 0x0100: ein Byte ueberlesen (don't care)
-// 0x02nn: ein Byte aus 0xnn Alternativen folgt
-// 0x8000: Erkennung abgeschlossen
+// table with search pattern
+// meaning of the sequences
+// 0x00??: the exact byte 0x?? must be at that place
+// 0x0100: read over a byte (don't care)
+// 0x02nn: a byte of 0xnn variations follows
+// 0x8000: recognition finished
#define M_DC 0x0100
#define M_ALT(ANZ) (0x0200+(ANZ))
@@ -71,7 +71,7 @@ const sal_uInt16 pQPro[] =
0x0010,
M_ENDE };
-const sal_uInt16 pDIF1[] = // DIF mit CR-LF
+const sal_uInt16 pDIF1[] = // DIF with CR-LF
{
'T', 'A', 'B', 'L', 'E',
M_DC, M_DC,
@@ -80,7 +80,7 @@ const sal_uInt16 pDIF1[] = // DIF mit CR-LF
'\"',
M_ENDE };
-const sal_uInt16 pDIF2[] = // DIF mit CR oder LF
+const sal_uInt16 pDIF2[] = // DIF with CR or LF
{
'T', 'A', 'B', 'L', 'E',
M_DC,
@@ -98,7 +98,7 @@ const sal_uInt16 pSylk[] = // Sylk
bool detectThisFormat(SvStream& rStr, const sal_uInt16* pSearch)
{
sal_uInt8 nByte;
- rStr.Seek( 0 ); // am Anfang war alles Uebel...
+ rStr.Seek( 0 ); // in the beginning everything was bad...
rStr.ReadUChar( nByte );
bool bSync = true;
while( !rStr.IsEof() && bSync )
@@ -106,27 +106,27 @@ bool detectThisFormat(SvStream& rStr, const sal_uInt16* pSearch)
sal_uInt16 nMuster = *pSearch;
if( nMuster < 0x0100 )
- { // direkter Byte-Vergleich
+ { // compare bytes
if( ( sal_uInt8 ) nMuster != nByte )
bSync = false;
}
else if( nMuster & M_DC )
- { // don't care
+ { // don't care
}
else if( nMuster & M_ALT(0) )
- { // alternative Bytes
+ { // alternative Bytes
sal_uInt8 nAnzAlt = ( sal_uInt8 ) nMuster;
- bSync = false; // zunaechst unsynchron
+ bSync = false; // first unsynchron
while( nAnzAlt > 0 )
{
pSearch++;
if( ( sal_uInt8 ) *pSearch == nByte )
- bSync = true; // jetzt erst Synchronisierung
+ bSync = true; // only now synchronization
nAnzAlt--;
}
}
else if( nMuster & M_ENDE )
- { // Format detected
+ { // Format detected
return true;
}
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 04fb81f7776f..65b97bdc6cff 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -394,7 +394,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
switch (nType)
{
case Type::SHEET:
- // noch nicht eingefuegt - DocShell=Null
+ // not inserted yet - DocShell=Null
xRet.set(static_cast<sheet::XSpreadsheet*>(new ScTableSheetObj(nullptr,0)));
break;
case Type::URLFIELD:
@@ -421,8 +421,8 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
xRet.set(static_cast<container::XIndexAccess*>(new ScAutoFormatObj( SC_AFMTOBJ_INVALID )));
break;
case Type::CELLRANGES:
- // wird nicht eingefuegt, sondern gefuellt
- // -> DocShell muss gesetzt sein, aber leere Ranges
+ // isn't inserted, rather filled
+ // -> DocShell must be set, but empty ranges
if (pDocShell)
xRet.set(static_cast<sheet::XSheetCellRanges*>(new ScCellRangesObj( pDocShell, ScRangeList() )));
break;
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index f43a0723d8e4..0a468e66cd95 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -366,7 +366,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
return &aFooterStyleMap;
}
-// Index-Access auf die Style-Typen: 0 = Cell, 1 = Page
+// access index on the style types: 0 = Cell, 1 = Page
#define SC_STYLE_FAMILY_COUNT 2
@@ -412,11 +412,11 @@ ScStyleFamiliesObj::~ScStyleFamiliesObj()
void ScStyleFamiliesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update does not matter here
if ( rHint.GetId() == SfxHintId::Dying )
{
- pDocShell = nullptr; // ungueltig geworden
+ pDocShell = nullptr;
}
}
@@ -610,7 +610,7 @@ ScStyleFamilyObj::~ScStyleFamilyObj()
void ScStyleFamilyObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update does not matter here
if ( rHint.GetId() == SfxHintId::Dying )
{
@@ -656,7 +656,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::
{
SolarMutexGuard aGuard;
bool bDone = false;
- // Reflection muss nicht uno::XInterface sein, kann auch irgendein Interface sein...
+ // reflection does not need to be uno::XInterface, can be any interface...
uno::Reference< uno::XInterface > xInterface(aElement, uno::UNO_QUERY);
if ( xInterface.is() )
{
@@ -669,7 +669,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::
ScDocument& rDoc = pDocShell->GetDocument();
ScStyleSheetPool* pStylePool = rDoc.GetStyleSheetPool();
- //! DocFunc-Funktion??
+ //! DocFunc function ???
//! Undo ?????????????
if ( !pStylePool->Find( aNameStr, eFamily ) ) // not available yet
@@ -682,7 +682,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::
pStyleObj->InitDoc( pDocShell, aNameStr ); // object can be used
if (!rDoc.IsImportingXML())
- pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht
+ pDocShell->SetDocumentModified(); // new style not used yet
bDone = true;
}
else
@@ -918,7 +918,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c
OSL_FAIL( "###unexpected!" );
}
-// Default-ctor wird fuer die Reflection gebraucht
+// default ctor is needed for reflection
ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName)
: pPropSet( (eFam == SfxStyleFamily::Para) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() )
@@ -927,7 +927,7 @@ ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString&
, aStyleName(rName)
, pStyle_cached(nullptr)
{
- // pDocShell ist Null, wenn per ServiceProvider erzeugt
+ // if create by ServiceProvider then pDocShell is NULL
if (pDocShell)
pDocShell->GetDocument().AddUnoObject(*this);
@@ -986,7 +986,7 @@ ScStyleObj* ScStyleObj::getImplementation(const uno::Reference<uno::XInterface>&
void ScStyleObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update does not matter here
if ( rHint.GetId() == SfxHintId::Dying )
{
@@ -1077,7 +1077,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle )
}
else
{
- //! ModifyStyleSheet am Dokument (alte Werte merken)
+ //! ModifyStyleSheet on document (save old values)
pDocShell->PageStyleModified( aStyleName, true );
}
@@ -1260,8 +1260,8 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName )
// Default is default from ItemPool, not from Standard-Style,
// so it is the same as in setPropertyToDefault
SfxItemSet aEmptySet( *pStyleSet->GetPool(), pStyleSet->GetRanges() );
- // Default-Items mit falscher Slot-ID funktionieren im SfxItemPropertySet3 nicht
- //! Slot-IDs aendern...
+ // default items with wrong Slot-ID are not functional in SfxItemPropertySet3
+ //! change Slot-IDs...
if ( aEmptySet.GetPool()->GetSlotId(nWhich) == nWhich &&
aEmptySet.GetItemState(nWhich, false) == SfxItemState::DEFAULT )
{
@@ -1269,7 +1269,7 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName )
}
const SfxItemSet* pItemSet = &aEmptySet;
- switch ( nWhich ) // fuer Item-Spezial-Behandlungen
+ switch ( nWhich ) // special item handling
{
case ATTR_VALUE_FORMAT:
// default has no language set
@@ -1697,9 +1697,8 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx
}
break;
default:
- // Default-Items mit falscher Slot-ID
- // funktionieren im SfxItemPropertySet3 nicht
- //! Slot-IDs aendern...
+ // default items with wrong Slot-ID are not working in SfxItemPropertySet3
+ //! change Slot-IDs...
if ( rSet.GetPool()->GetSlotId(pEntry->nWID) == pEntry->nWID &&
rSet.GetItemState(pEntry->nWID, false) == SfxItemState::DEFAULT )
{
@@ -1787,7 +1786,7 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx
}
else
{
- //! ModifyStyleSheet am Dokument (alte Werte merken)
+ //! ModifyStyleSheet on document (save old values)
pDocShell->PageStyleModified( aStyleName, true );
}
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 4af1cc4be2a5..5abda13658b7 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -424,7 +424,7 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent(
pForwarder->QuickInsertField( aItem, aSelection );
pEditSource->UpdateData();
- // neue Selektion: ein Zeichen
+ // new selection: a digit
aSelection.Adjust();
aSelection.nEndPara = aSelection.nStartPara;
aSelection.nEndPos = aSelection.nStartPos + 1;
@@ -473,7 +473,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent(
ScEditFieldObj* pHeaderField = ScEditFieldObj::getImplementation(xContent);
if ( pHeaderField && pHeaderField->IsInserted() )
{
- //! Testen, ob das Feld in dieser Zelle ist
+ //! check if the field is in this cell
pHeaderField->DeleteField();
return;
}
@@ -518,7 +518,7 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge
uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters()
{
- // sowas gibts nicht im Calc (?)
+ // this does not exists in Calc (?)
return nullptr;
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 661617800cad..2223c804cbfe 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1845,16 +1845,16 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
SetZoom(nIntVal);
}
- // Optionen werden an der View und am Dokument (fuer neue Views) gesetzt,
- // damit sie beim Speichern erhalten bleiben.
- //! An der App (Module) braeuchte man noch eine Extra-Moeglichkeit,
- //! das einzustellen (fuer neue Dokumente)
+ // Options are set on the view and document (for new views),
+ // so that they remain during saving.
+ //! In the app (module) we need a extra options to tune that
+ //! (for new documents)
if ( aNewOpt != rOldOpt )
{
rViewData.SetOptions( aNewOpt );
rViewData.GetDocument()->SetViewOptions( aNewOpt );
- rViewData.GetDocShell()->SetDocumentModified(); //! wirklich?
+ rViewData.GetDocShell()->SetDocumentModified(); //! really?
pViewSh->UpdateFixPos();
pViewSh->PaintGrid();
@@ -1864,7 +1864,7 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
pViewSh->InvalidateBorder();
SfxBindings& rBindings = pViewSh->GetViewFrame()->GetBindings();
- rBindings.Invalidate( FID_TOGGLEHEADERS ); // -> Checks im Menue
+ rBindings.Invalidate( FID_TOGGLEHEADERS ); // -> check in menu
rBindings.Invalidate( FID_TOGGLESYNTAX );
}
}
@@ -1941,7 +1941,7 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPr
for (XViewPropertyChangeListenerVector::iterator it = aPropertyChgListeners.begin();
it != aPropertyChgListeners.end(); ++it )
{
- if ( *it == xListener ) //! wozu der Mumpitz mit queryInterface?
+ if ( *it == xListener ) //! Why the nonsense with queryInterface?
{
aPropertyChgListeners.erase(it);
break;
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 1ef15d9f6ed6..82a812a4ae4a 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -557,7 +557,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SfxCallMode::ASYNCHRON );
}
- // else Fehler (z.B. Ole)
+ // else error (e.g. Ole)
}
break;
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 0da60a9de675..cc48581aaaaa 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1027,7 +1027,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
SfxLokHelper::forEachOtherView(pThisViewShell, lAddWindows);
}
- // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576)
+ // if view is gone then during IdleFormat sometimes a cursor is drawn
EEControlBits nEC = pNewEngine->GetControlWord();
pNewEngine->SetControlWord(nEC & ~EEControlBits::DOIDLEFORMAT);
More information about the Libreoffice-commits
mailing list