sc/source/filter/dif/difimp.cxx | 2 +- sc/source/filter/html/htmlimp.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit d06039e7c93362a88ba394a178d3fcb85fc5d779 Author: Christian M. Heller <christian.helle...@gmail.com> Date: Fri Oct 3 22:11:01 2014 -0400 fdo#39468 Translate German Comments - difimp and htmlimp Change-Id: I221d07c56822905c500f11f3f738231259743acd Reviewed-on: https://gerrit.libreoffice.org/11802 Reviewed-by: Noel Grandin <noelgran...@gmail.com> Tested-by: Noel Grandin <noelgran...@gmail.com> diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 2a8e187..8b009f4 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -383,7 +383,7 @@ TOPIC DifParser::GetNextTopic( void ) // skip 2 lines ReadNextLine( aLine ); // fall-through - case S_ERROR_L2: // Fehler in Line 2 aufgetreten + case S_ERROR_L2: // error happened in line 2 // skip 1 line ReadNextLine( aLine ); eS = S_END; diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 9eec75b..0a05a6a7 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -100,9 +100,9 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const S ScHTMLImport::~ScHTMLImport() { - // Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem Dtor! - // Ist gewaehrleistet, da ScEEImport Basisklasse ist - delete (ScHTMLParser*) mpParser; // vor EditEngine! + // Ordering is important, otherwise we get an error in some other Dtor! + // OK, as ScEEImport is the Base Class + delete (ScHTMLParser*) mpParser; // before EditEngine! } void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const OUString& rName, const ScRange& rRange ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits