sw/source/filter/ww8/docxfootnotes.hxx | 2 - sw/source/filter/ww8/ww8par2.hxx | 42 ++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-)
New commits: commit 4bc76a73f42dc37a1e9792d89f846f9a9280e668 Author: Thomas Klausner <w...@netbsd.org> Date: Fri Aug 7 21:55:19 2015 +0200 Translate remaining German comments to English. Change-Id: Iad76b958db7eab849a1bfe18b486a30eacc276e3 diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 453dfb3..c5c3c90 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -47,27 +47,27 @@ struct WW8SwFlyPara { SwFlyFrameFormat* pFlyFormat; - // 1. Teil: daraus abgeleitete Sw-Attribute + // part 1: directly derived Sw attributes sal_Int16 nXPos, nYPos; // Position - sal_Int16 nLeMgn, nRiMgn; // Raender - sal_Int16 nUpMgn, nLoMgn; // Raender - sal_Int16 nWidth, nHeight; // Groesse + sal_Int16 nLeMgn, nRiMgn; // borders + sal_Int16 nUpMgn, nLoMgn; // borders + sal_Int16 nWidth, nHeight; // size sal_Int16 nNetWidth; - SwFrmSize eHeightFix; // Hoehe Fix oder Min - RndStdIds eAnchor; // Bindung - short eHRel; // Seite oder Seitenrand - short eVRel; // Seite oder Seitenrand - sal_Int16 eVAlign; // Oben, unten, mittig - sal_Int16 eHAlign; // links, rechts, mittig - SwSurround eSurround; // Wrap-Mode + SwFrmSize eHeightFix; // height fixed or min + RndStdIds eAnchor; // binding + short eHRel; // page or page border + short eVRel; // page or page border + sal_Int16 eVAlign; // up, down, centered + sal_Int16 eHAlign; // left, right, centered + SwSurround eSurround; // wrap mode - sal_uInt8 nXBind, nYBind; // relativ zu was gebunden + sal_uInt8 nXBind, nYBind; // bound relative to what - // 2.Teil: sich waehrend des Einlesens ergebende AEnderungen + // part 2: changes found during reading long nNewNetWidth; - SwPosition* pMainTextPos; // um nach Apo in Haupttext zurueckzukehren - sal_uInt16 nLineSpace; // LineSpace in tw fuer Graf-Apos + SwPosition* pMainTextPos; // to return to main text after apo + sal_uInt16 nLineSpace; // line space in tw for graf apos bool bAutoWidth; bool bToggelPos; @@ -89,15 +89,15 @@ class WW8RStyle: public WW8Style { friend class SwWW8ImplReader; wwSprmParser maSprmParser; - SwWW8ImplReader* pIo; // Parser-Klasse - SvStream* pStStrm; // Input-File + SwWW8ImplReader* pIo; // parser class + SvStream* pStStrm; // input file - SwNumRule* pStyRule; // Bullets und Aufzaehlungen in Styles + SwNumRule* pStyRule; // bullets and enumerations in styles - sal_uInt8* pParaSprms; // alle ParaSprms des UPX falls UPX.Papx - sal_uInt16 nSprmsLen; // Laenge davon + sal_uInt8* pParaSprms; // all ParaSprms of the UPX if UPX.Papx + sal_uInt16 nSprmsLen; // its length - sal_uInt8 nWwNumLevel; // fuer Bullets und Aufzaehlungen in Styles + sal_uInt8 nWwNumLevel; // for bullets and enumerations in styles bool bTextColChanged; bool bFontChanged; // For Simulating Default-Font commit 2724773573c68f5f4d0176c12a1deda0475a66e9 Author: Thomas Klausner <w...@netbsd.org> Date: Fri Aug 7 21:54:47 2015 +0200 Fix typo in comment. Change-Id: I4adabd4eedc6dd9156eb40476e2141dece1e448d diff --git a/sw/source/filter/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index 7969738..281d842 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -30,7 +30,7 @@ typedef ::std::vector< const SwFormatFootnote* > FootnotesVector; /** Remember footnotes/endnotes so that we can dump them in one go. - Also rememeber the last added footnote Id to be able to write it in the + Also remember the last added footnote Id to be able to write it in the DocxAttributeOutput::EndRunProperties() method. */ class FootnotesList { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits