[Libreoffice-commits] core.git: sw/source
Jens Carl
j.carl43 at gmx.de
Fri May 5 10:45:55 UTC 2017
sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
sw/source/filter/ww8/ww8graf2.cxx | 4 ++--
sw/source/filter/ww8/ww8par.cxx | 4 ++--
sw/source/filter/ww8/ww8par3.cxx | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 2a1e91f0d8b58dfe3c507a660cd816f3466a3c5f
Author: Jens Carl <j.carl43 at gmx.de>
Date: Fri May 5 05:43:21 2017 +0000
tdf#39468: Translate German comments and terms in sw/source/filter/ww8/
Change-Id: I5becfe1131ba1dbd17cde2595f37c068cb9fcbc5
Reviewed-on: https://gerrit.libreoffice.org/37273
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 4a01c61039de..a8ea66c5d50d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2951,7 +2951,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFormat, const P
{
bool bDone = false;
- // Hole vom Node und vom letzten Node die Position in der Section
+ // Fetch from node and last node the position in the section
const SwNodeIndex* pNodeIndex = rFrameFormat.GetContent().GetContentIdx();
sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1 : 0;
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 88fa9c7c000c..6f41f57aab17 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -389,10 +389,10 @@ SwFrameFormat* SwWW8ImplReader::MakeGrafInContent(const WW8_PIC& rPic,
SwFrameFormat* pFlyFormat = nullptr;
- if (rFileName.isEmpty() && m_nObjLocFc) // dann sollte ists ein OLE-Object
+ if (rFileName.isEmpty() && m_nObjLocFc) // then it should be a OLE-Object
pFlyFormat = ImportOle(pGraph, &aFlySet, &rGrfSet);
- if( !pFlyFormat ) // dann eben als Graphic
+ if( !pFlyFormat ) // then just as graphic
{
pFlyFormat = m_rDoc.getIDocumentContentOperations().Insert( *m_pPaM, rFileName, OUString(), pGraph, &aFlySet,
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f30757fec6c1..e6c87cf0d852 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4992,8 +4992,8 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss)
m_pLstManager = new WW8ListManager( *m_pTableStream, *this );
/*
- zuerst(!) alle Styles importieren (siehe WW8PAR2.CXX)
- VOR dem Import der Listen !!
+ first (1) import all styles (see WW8PAR2.CXX)
+ BEFORE the import of the lists !!
*/
::SetProgressState(m_nProgress, m_pDocShell); // Update
m_pStyles = new WW8RStyle( *m_pWwFib, this ); // Styles
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 03b5ea95e532..f563c56cefa9 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2559,7 +2559,7 @@ bool SwMSConvertControls::InsertControl(
uno::Reference< drawing::XShape > xShape =
uno::Reference< drawing::XShape >(xCreate, uno::UNO_QUERY);
- OSL_ENSURE(xShape.is(), "XShape nicht erhalten");
+ OSL_ENSURE(xShape.is(), "Did not get XShape");
xShape->setSize(rSize);
uno::Reference< beans::XPropertySet > xShapePropSet(
More information about the Libreoffice-commits
mailing list