[Libreoffice-commits] core.git: sc/source sot/source svtools/source vcl/source
Jens Carl
j.carl43 at gmx.de
Mon Jul 3 11:29:11 UTC 2017
sc/source/core/tool/doubleref.cxx | 4 -
sc/source/ui/unoobj/cellsuno.cxx | 90 ++++++++++++++++++--------------------
sot/source/sdstor/stgdir.cxx | 2
sot/source/sdstor/storage.cxx | 39 +++++++---------
svtools/source/svhtml/parhtml.cxx | 3 -
vcl/source/filter/sgvtext.cxx | 2
6 files changed, 66 insertions(+), 74 deletions(-)
New commits:
commit 6e0a152350dbb476ef70ad9b17d57607fadc0666
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri Jun 30 06:22:40 2017 +0000
tdf#39468 Translate German comments/terms
Change-Id: I9edef3138964d3f43745be39956bc6bb66d0cc4d
Reviewed-on: https://gerrit.libreoffice.org/39403
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Johnny_M <klasse at partyheld.de>
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index 76d9d878b38f..5f25cc5b2648 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -226,13 +226,13 @@ bool lcl_fillQueryEntries(
nCount = pParam->GetEntryCount();
if (bValid)
{
- // bQueryByString muss gesetzt sein
+ // bQueryByString must be set
for (SCSIZE i = 0; i < nCount; ++i)
pParam->GetEntry(i).GetQueryItem().meType = ScQueryEntry::ByString;
}
else
{
- // nix
+ // nothing
for (SCSIZE i = 0; i < nCount; ++i)
pParam->GetEntry(i).Clear();
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 467cb4b7418b..730142d36ae8 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2480,7 +2480,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
SfxItemSet* pDataSet = GetCurrentDataSet();
if ( pDataSet )
{
- switch ( pEntry->nWID ) // fuer Item-Spezial-Behandlungen
+ switch ( pEntry->nWID ) // for special handling of items
{
case ATTR_VALUE_FORMAT:
{
@@ -2976,7 +2976,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas
void SAL_CALL ScCellRangesBase::decrementIndent()
{
SolarMutexGuard aGuard;
- if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun
+ if ( pDocShell && !aRanges.empty() )
{
//#97041#; put only MultiMarked ScMarkData in ChangeIndent
ScMarkData aMarkData(*GetMarkData());
@@ -2988,7 +2988,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent()
void SAL_CALL ScCellRangesBase::incrementIndent()
{
SolarMutexGuard aGuard;
- if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun
+ if ( pDocShell && !aRanges.empty() )
{
//#97041#; put only MultiMarked ScMarkData in ChangeIndent
ScMarkData aMarkData(*GetMarkData());
@@ -3536,7 +3536,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
bAdd = true;
else
{
- // Date/Time Erkennung
+ // date/time identification
sal_uLong nIndex = (sal_uLong)static_cast<const SfxUInt32Item*>(rDoc.GetAttr(
aIter.GetPos(), ATTR_VALUE_FORMAT))->GetValue();
@@ -3580,7 +3580,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
if (aMarkData.IsMultiMarked())
aMarkData.FillRangeListWithMarks( &aNewRanges, false );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges can be empty
}
return nullptr;
@@ -3596,7 +3596,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
ScMarkData aMarkData;
- // passende Zellen selektieren
+ // select matching cells
for ( size_t i = 0, nCount = aRanges.size(); i < nCount; ++i )
{
ScRange aRange = *aRanges[ i ];
@@ -3634,7 +3634,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
if (aMarkData.IsMultiMarked())
aMarkData.FillRangeListWithMarks( &aNewRanges, false );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges can be empty
}
return nullptr;
@@ -3719,7 +3719,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
if (aMarkData.IsMultiMarked())
aMarkData.FillRangeListWithMarks( &aNewRanges, false );
- return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges kann leer sein
+ return new ScCellRangesObj( pDocShell, aNewRanges ); // aNewRanges can be empty
}
return nullptr;
}
@@ -3758,7 +3758,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec
std::min( aTemp.aEnd.Tab(), aMask.aEnd.Tab() ) ) );
}
- return new ScCellRangesObj( pDocShell, aNew ); // kann leer sein
+ return new ScCellRangesObj( pDocShell, aNew ); // can be empty
}
// XFormulaQuery
@@ -4072,7 +4072,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
else
{
delete pUndoDoc;
- // nReplaced bleibt 0
+ // nReplaced stays zero
}
}
}
@@ -4134,8 +4134,6 @@ ScCellRangesObj::~ScCellRangesObj()
void ScCellRangesObj::RefChanged()
{
ScCellRangesBase::RefChanged();
-
- // nix weiter...
}
uno::Any SAL_CALL ScCellRangesObj::queryInterface( const uno::Type& rType )
@@ -4503,7 +4501,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName )
size_t nIndex = 0;
if ( lcl_FindRangeByName( rRanges, pDocSh, aName, nIndex ) )
{
- // einzelnen Range weglassen
+ // skip a single range
ScRangeList aNew;
for ( size_t i = 0, nCount = rRanges.size(); i < nCount; i++ )
if (i != nIndex)
@@ -4560,7 +4558,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName )
void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement )
{
SolarMutexGuard aGuard;
- //! zusammenfassen?
+ //! combine?
removeByName( aName );
insertByName( aName, aElement );
}
@@ -4715,7 +4713,7 @@ ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) :
pRangePropSet( lcl_GetRangePropertySet() ),
aRange( rR )
{
- aRange.PutInOrder(); // Anfang / Ende richtig
+ aRange.PutInOrder(); // beginning / end correct
}
ScCellRangeObj::~ScCellRangeObj()
@@ -4727,7 +4725,7 @@ void ScCellRangeObj::RefChanged()
ScCellRangesBase::RefChanged();
const ScRangeList& rRanges = GetRangeList();
- OSL_ENSURE(rRanges.size() == 1, "was fuer Ranges ?!?!");
+ OSL_ENSURE(rRanges.size() == 1, "What ranges ?!?!");
if ( !rRanges.empty() )
{
const ScRange* pFirst = rRanges[0];
@@ -5006,8 +5004,8 @@ OUString SAL_CALL ScCellRangeObj::getArrayFormula()
ScAddress aStart2;
if (pFCell1->GetMatrixOrigin(aStart1) && pFCell2->GetMatrixOrigin(aStart2))
{
- if (aStart1 == aStart2) // beides dieselbe Matrix
- pFCell1->GetFormula(aFormula); // egal, von welcher Zelle
+ if (aStart1 == aStart2) // both the same matrix
+ pFCell1->GetFormula(aFormula); // it doesn't matter from which cell
}
}
return aFormula;
@@ -5980,7 +5978,7 @@ void ScCellObj::RefChanged()
ScCellRangeObj::RefChanged();
const ScRangeList& rRanges = GetRangeList();
- OSL_ENSURE(rRanges.size() == 1, "was fuer Ranges ?!?!");
+ OSL_ENSURE(rRanges.size() == 1, "What ranges ?!?!");
if ( !rRanges.empty() )
{
const ScRange* pFirst = rRanges[ 0 ];
@@ -6048,9 +6046,9 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-// Hilfsfunktionen
+// helper methods
-OUString ScCellObj::GetInputString_Impl(bool bEnglish) const // fuer getFormula / FormulaLocal
+OUString ScCellObj::GetInputString_Impl(bool bEnglish) const // for getFormula / FormulaLocal
{
if (GetDocShell())
return lcl_GetInputString( GetDocShell()->GetDocument(), aCellPos, bEnglish );
@@ -6197,7 +6195,7 @@ OUString SAL_CALL ScCellObj::getString()
void SAL_CALL ScCellObj::setString( const OUString& aText )
{
SolarMutexGuard aGuard;
- SetString_Impl(aText, false, false); // immer Text
+ SetString_Impl(aText, false, false); // always text
// don't create pUnoText here if not there
if (mxUnoText.is())
@@ -6526,7 +6524,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters()
return nullptr;
}
-// XPropertySet extended for Zell-Properties
+// XPropertySet extended for Cell-Properties
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo()
{
@@ -6563,7 +6561,7 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, u
{
if ( pEntry->nWID == SC_WID_UNO_FORMLOC )
{
- // sal_False = lokal
+ // sal_False = local
rAny <<= GetInputString_Impl(false);
}
else if ( pEntry->nWID == SC_WID_UNO_FORMRT )
@@ -6785,7 +6783,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId()
SCTAB ScTableSheetObj::GetTab_Impl() const
{
const ScRangeList& rRanges = GetRangeList();
- OSL_ENSURE(rRanges.size() == 1, "was fuer Ranges ?!?!");
+ OSL_ENSURE(rRanges.size() == 1, "What ranges ?!?!");
if ( !rRanges.empty() )
{
const ScRange* pFirst = rRanges[ 0 ];
@@ -6924,11 +6922,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage
SCTAB nTab = GetTab_Impl();
Size aSize(rDoc.GetPageSize( nTab ));
- if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt?
+ if (aSize.Width() && aSize.Height()) // effective size already set?
rDoc.UpdatePageBreaks( nTab );
else
{
- // Umbrueche updaten wie in ScDocShell::PageStyleModified:
+ // update breaks like in ScDocShell::PageStyleModified:
ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab );
aPrintFunc.UpdatePages();
}
@@ -6969,11 +6967,11 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre
SCTAB nTab = GetTab_Impl();
Size aSize(rDoc.GetPageSize( nTab ));
- if (aSize.Width() && aSize.Height()) // effektive Groesse schon gesetzt?
+ if (aSize.Width() && aSize.Height()) // effective size already set?
rDoc.UpdatePageBreaks( nTab );
else
{
- // Umbrueche updaten wie in ScDocShell::PageStyleModified:
+ // update breaks like in ScDocShell::PageStyleModified:
ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab );
aPrintFunc.UpdatePages();
}
@@ -7076,13 +7074,13 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang
case sheet::CellInsertMode_ROWS: eCmd = INS_INSROWS_BEFORE; break;
case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS_BEFORE; break;
default:
- OSL_FAIL("insertCells: falscher Mode");
+ OSL_FAIL("insertCells: wrong mode");
bDo = false;
}
if (bDo)
{
- OSL_ENSURE( rRangeAddress.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
+ OSL_ENSURE( rRangeAddress.Sheet == GetTab_Impl(), "wrong table in CellRangeAddress" );
ScRange aScRange;
ScUnoConversion::FillScRange( aScRange, rRangeAddress );
(void)pDocSh->GetDocFunc().InsertCells( aScRange, nullptr, eCmd, true, true );
@@ -7107,13 +7105,13 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang
case sheet::CellDeleteMode_ROWS: eCmd = DEL_DELROWS; break;
case sheet::CellDeleteMode_COLUMNS: eCmd = DEL_DELCOLS; break;
default:
- OSL_FAIL("deleteCells: falscher Mode");
+ OSL_FAIL("deleteCells: wrong mode");
bDo = false;
}
if (bDo)
{
- OSL_ENSURE( rRangeAddress.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
+ OSL_ENSURE( rRangeAddress.Sheet == GetTab_Impl(), "wrong table in CellRangeAddress" );
ScRange aScRange;
ScUnoConversion::FillScRange( aScRange, rRangeAddress );
(void)pDocSh->GetDocFunc().DeleteCells( aScRange, nullptr, eCmd, true );
@@ -7128,7 +7126,7 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- OSL_ENSURE( aSource.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
+ OSL_ENSURE( aSource.Sheet == GetTab_Impl(), "wrong table in CellRangeAddress" );
ScRange aSourceRange;
ScUnoConversion::FillScRange( aSourceRange, aSource );
ScAddress aDestPos( (SCCOL)aDestination.Column, (SCROW)aDestination.Row, aDestination.Sheet );
@@ -7143,7 +7141,7 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- OSL_ENSURE( aSource.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
+ OSL_ENSURE( aSource.Sheet == GetTab_Impl(), "wrong table in CellRangeAddress" );
ScRange aSourceRange;
ScUnoConversion::FillScRange( aSourceRange, aSource );
ScAddress aDestPos( (SCCOL)aDestination.Column, (SCROW)aDestination.Row, aDestination.Sheet );
@@ -7249,7 +7247,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas(
}
if ( rDoc.IsUndoEnabled() )
- PrintAreaUndo_Impl( pOldRanges ); // Undo, Umbrueche, Modified etc.
+ PrintAreaUndo_Impl( pOldRanges ); // Undo, Page Breaks, Modified etc.
}
}
@@ -8556,7 +8554,7 @@ void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ )
throw uno::RuntimeException(); // read-only
}
-// XPropertySet extended for Spalten-Properties
+// XPropertySet extended for Column-Properties
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySetInfo()
{
@@ -8639,7 +8637,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
ScDocument& rDoc = pDocSh->GetDocument();
const ScRange& rRange = GetRange();
- OSL_ENSURE(rRange.aStart.Col() == rRange.aEnd.Col(), "zuviele Spalten");
+ OSL_ENSURE(rRange.aStart.Col() == rRange.aEnd.Col(), "too many columns");
SCCOL nCol = rRange.aStart.Col();
SCTAB nTab = rRange.aStart.Tab();
@@ -8658,7 +8656,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
}
else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
{
- //! momentan immer gesetzt ??!?!
+ //! at the moment always set ??!?!
bool bOpt = !(rDoc.GetColFlags( nCol, nTab ) & CRFlags::ManualSize);
rAny <<= bOpt;
}
@@ -8692,7 +8690,7 @@ ScTableRowObj::~ScTableRowObj()
{
}
-// XPropertySet extended for Zeilen-Properties
+// XPropertySet extended for Row-Properties
uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetInfo()
{
@@ -8720,7 +8718,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
return; //! Exception or so?
ScDocument& rDoc = pDocSh->GetDocument();
const ScRange& rRange = GetRange();
- OSL_ENSURE(rRange.aStart.Row() == rRange.aEnd.Row(), "zuviele Zeilen");
+ OSL_ENSURE(rRange.aStart.Row() == rRange.aEnd.Row(), "too many rows");
SCROW nRow = rRange.aStart.Row();
SCTAB nTab = rRange.aStart.Tab();
ScDocFunc &rFunc = pDocSh->GetDocFunc();
@@ -8785,7 +8783,7 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
throw uno::RuntimeException();
ScDocument& rDoc = pDocSh->GetDocument();
const ScRange& rRange = GetRange();
- OSL_ENSURE(rRange.aStart.Row() == rRange.aEnd.Row(), "zuviele Zeilen");
+ OSL_ENSURE(rRange.aStart.Row() == rRange.aEnd.Row(), "too many rows");
SCROW nRow = rRange.aStart.Row();
SCTAB nTab = rRange.aStart.Tab();
@@ -8883,7 +8881,7 @@ sal_Bool SAL_CALL ScCellsObj::hasElements()
bool bHas = false;
if ( pDocShell )
{
- //! schneller selber testen?
+ //! faster if test ourself?
uno::Reference<container::XEnumeration> xEnum(new ScCellsEnumeration( pDocShell, aRanges ));
bHas = xEnum->hasMoreElements();
@@ -9027,7 +9025,7 @@ ScCellFormatsObj::ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) :
ScDocument& rDoc = pDocShell->GetDocument();
rDoc.AddUnoObject(*this);
- OSL_ENSURE( aTotalRange.aStart.Tab() == aTotalRange.aEnd.Tab(), "unterschiedliche Tabellen" );
+ OSL_ENSURE( aTotalRange.aStart.Tab() == aTotalRange.aEnd.Tab(), "different tables" );
}
ScCellFormatsObj::~ScCellFormatsObj()
@@ -9412,7 +9410,7 @@ ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange
{
pDocShell->GetDocument().AddUnoObject(*this);
- OSL_ENSURE( aTotalRange.aStart.Tab() == aTotalRange.aEnd.Tab(), "unterschiedliche Tabellen" );
+ OSL_ENSURE( aTotalRange.aStart.Tab() == aTotalRange.aEnd.Tab(), "different tables" );
ScDocument& rDoc = pDocShell->GetDocument();
SCTAB nTab = aTotalRange.aStart.Tab();
@@ -9539,7 +9537,7 @@ uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement()
if ( !hasMoreElements() || !pDocShell )
throw container::NoSuchElementException(); // no more elements
- // Interface-Typ muss zu ScCellFormatsObj::getElementType passen
+ // interface type must match ScCellFormatsObj::getElementType
return uno::makeAny(uno::Reference<sheet::XSheetCellRangeContainer>(new ScCellRangesObj(pDocShell, aRangeLists[nCurrentPosition++])));
}
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index ffc6d38ce76b..0af9b5ada18d 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -280,7 +280,7 @@ void StgDirEntry::OpenStream( StgIo& rIo )
// Close the open stream without committing. If the entry is marked as
// temporary, delete it.
// Do not delete pCurStrm here!
-// (TLX:??? Zumindest pStgStrm muss deleted werden.)
+// (TLX:??? At least pStgStrm must be deleted.)
void StgDirEntry::Close()
{
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index ee8f72949834..df3caff95a85 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -170,7 +170,7 @@ void SotStorageStream::SetSize(sal_uInt64 const nNewSize)
SvStream::SetSize( nNewSize );
if( nNewSize < nPos )
- // ans Ende setzen
+ // jump to the end
Seek( nNewSize );
}
@@ -250,27 +250,22 @@ bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any&
}
}
-/************************************************************************
-|*
-|* SotStorage::SotStorage()
-|*
-|* Beschreibung Es muss ein I... Objekt an SvObject uebergeben
-|* werden, da es sonst selbst ein IUnknown anlegt und
-|* festlegt, dass alle weiteren I... Objekte mit
-|* delete zerstoert werden (Owner() == true).
-|* Es werden aber nur IStorage Objekte benutzt und nicht
-|* selbst implementiert, deshalb wird so getan, als ob
-|* das IStorage Objekt von aussen kam und es wird mit
-|* Release() freigegeben.
-|* Die CreateStorage Methoden werden benoetigt, um
-|* ein IStorage Objekt vor dem Aufruf von SvObject
-|* zu erzeugen (Own, !Own automatik).
-|* Hat CreateStorage ein Objekt erzeugt, dann wurde
-|* der RefCounter schon um 1 erhoet.
-|* Die Uebergabe erfolgt in pStorageCTor. Die Variable
-|* ist NULL, wenn es nicht geklappt hat.
-|*
-*************************************************************************/
+/**
+ * SotStorage::SotStorage()
+ *
+ * A I.. object must be passed to SvObject, because otherwise itself will
+ * create and define an IUnknown, so that all other I... objects would be
+ * destroyed with delete (Owner() == true).
+ * But IStorage objects are only used and not implemented by ourselves,
+ * therefore we pretend the IStorage object was passed from the outside
+ * and it will be freed with Release().
+ * The CreateStorage methods are needed to create an IStorage object before the
+ * call of SvObject (Own, !Own automatic).
+ * If CreateStorage has created an object, then the RefCounter was already
+ * incremented.
+ * The transfer is done in pStorageCTor and the variable is NULL, if it didn't
+ * work.
+ */
#define INIT_SotStorage() \
: m_pOwnStg( nullptr ) \
, m_pStorStm( nullptr ) \
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index a1f34835330a..1a753bcecb8e 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1986,8 +1986,7 @@ bool HTMLParser::ParseMetaOptionsImpl(
break;
case HtmlMeta::Refresh:
- DBG_ASSERT( !bHTTPEquiv || i_pHTTPHeader,
- "Reload-URL aufgrund unterlassener MUSS-Aenderung verlorengegangen" );
+ DBG_ASSERT( !bHTTPEquiv || i_pHTTPHeader, "Lost Reload-URL because of omitted MUST change." );
break;
case HtmlMeta::ContentType:
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 282766a2ae52..32ce4f1d44a2 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -99,7 +99,7 @@
// EscSMstr,EscSFarb,EscSBFrb,EscSInts,EscSXDst,EscSYDst,EscSDist,
// EscBold, EscLSlnt,EscRSlnt,EscUndln,EscDbUnd,EscKaptF,EscStrik,EscDbStk,
// EscSupSc,EscSubSc,Esc2DShd,Esc3DShd,Esc4DShd];
-// Justify muss spaetestens am Anfang des Absatzes stehen
+// Justify must be set no later than at the beginning of the paragraph
#define EscSet '\x1e' /* set flag */
#define EscReset '\x1f' /* reset flag */
#define EscDeflt '\x11' /* set flag to default */
More information about the Libreoffice-commits
mailing list