You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/03/17 16:58:16 UTC

[openoffice] branch AOO42X updated (1740fc3 -> 200c3ff)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


    from 1740fc3  Small change to Help text
     new e1c3313  translated various comments
     new c2b90b9  wording fixes according to PR 121, plus one forgotten translation
     new adbb6a7  rework of comments in line 413 and 370
     new ac7ac30  workin of Remarks PR121
     new 200c3ff  fixed longnames spelling and missing translation

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/sw/inc/shellio.hxx | 134 +++++++++++++++++++++++-------------------------
 1 file changed, 65 insertions(+), 69 deletions(-)


[openoffice] 04/05: workin of Remarks PR121

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit ac7ac300cd585f3e7bf167a179185fcbf9b5a5de
Author: Peter Kovacs <pe...@apache.org>
AuthorDate: Sun Feb 28 09:27:37 2021 +0100

    workin of Remarks PR121
    
    (cherry picked from commit 41ba718885e7da3cd753323fbd79ec4432e79158)
---
 main/sw/inc/shellio.hxx | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/main/sw/inc/shellio.hxx b/main/sw/inc/shellio.hxx
index d7fc99f..ac2a59b 100644
--- a/main/sw/inc/shellio.hxx
+++ b/main/sw/inc/shellio.hxx
@@ -65,7 +65,8 @@ class SwTextBlocks;
 struct SwPosition;
 struct Writer_Impl;
 
-//beyond following number  ASCII/W4W-reader is used. Must be greater then 200
+//defines the amount of maximal characters in a paragraph.
+//The force wrap is done by ASCII/W4W-reader. Must be greater than 200
 #define MAX_ASCII_PARA 10000
 
 
@@ -168,7 +169,7 @@ class SwReader: public SwDocFac
 
 public:
 	/*
-	 * Initial read. document is created when function Read(...) is called
+	 * Initial read. Document is created when function Read(...) is called
 	 * JP 25.04.95: or if it has been passed in that one.
 	 *				special case if loaded with Sw3Reader
 	 */
@@ -176,7 +177,7 @@ public:
     //SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwDoc *pDoc = 0 );
     SwReader( SfxMedium&, const String& rFilename, SwDoc *pDoc = 0 );
 	/*
-	 * read into an nexisting document. Document and
+	 * read into an existing document. Document and
 	 * position within the document are taken from SwPaM.
 	 */
     SwReader( SvStream&, const String& rFilename, const String& rBaseURL, SwPaM& );
@@ -204,7 +205,7 @@ protected:
 
 
 /* */
-/****************  SPECIALE Readers ************************/
+/****************  SPECIAL Readers ************************/
 
 // special - Reader can be both!! (Excel, W4W, .. )
 #define SW_STREAM_READER	1
@@ -251,10 +252,10 @@ public:
 	// fit the item-set of a Frm-Formats to the old Format
 	static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet );
 
-	// convert frame /grafic-/OLE-Templates to old Format (without frame etc.)
+	// convert frame /graphic-/OLE-Templates to old Format (without border etc.)
 	static void ResetFrmFmts( SwDoc& rDoc );
 
-	// load filter template, position and free again
+	// load filter-template, position it and then set it free again
 	SwDoc* GetTemplateDoc();
 	sal_Bool SetTemplate( SwDoc& rDoc );
 	void ClearTemplate();
@@ -286,7 +287,7 @@ public:
 private:
     virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0;
 
-	// every object which does not need streams / object must overload following
+	// all streams / storages that do need to open it must overload the method
 	// (W4W!!)
 	virtual int SetStrmStgPtr();
 };
@@ -336,7 +337,7 @@ public:
 /* */
 ////////////////////////////////////////////////////////////////////////////
 // The passed stream has to be dynamic created and before deletion of the
-// instance per Stream() requested and deleted
+// instance per Stream() requested and deleted!
 
 class SwImpBlocks;
 
@@ -499,7 +500,7 @@ public:
 
     // search next bookmark position from the bookmark table
 	sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const;
-	// build a bookmark table, which is sort by the node position. The
+	// build a bookmark table, which is sorted by the node position. The
 	// OtherPos of the bookmarks also inserted.
 	void CreateBookmarkTbl();
 	// search all bookmarks in the range and return it in the Array
@@ -511,16 +512,16 @@ public:
     static SwPaM * NewSwPaM(SwDoc & rDoc,
                             sal_uLong const nStartIdx, sal_uLong const nEndIdx);
 
-	// upload a local file to the internet / cloud
+	// if applicable, copy a local file into internet / cloud
 	sal_Bool CopyLocalFileToINet( String& rFileNm );
 
-	// Stream-specific routines, DO NOT USE IN Storage-Writer!
+	// Stream-specific routines, DO NOT USE in Storage-Writer!
 
-	// optimization of the output stream
+	// Optimizing output on stream
 	SvStream& OutLong( SvStream& rStrm, long nVal );
 	SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
 
-	// print hexadecimal number, default is 2. digit number
+	// print hexadecimal number, default is 2-digit number
 	SvStream& OutHex( SvStream& rStrm, sal_uLong nHex, sal_uInt8 nLen = 2 );
 	// print 4-digit hexadecimal number
 	inline SvStream& OutHex4( SvStream& rStrm, sal_uInt16 nHex )


[openoffice] 01/05: translated various comments

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit e1c33130cfd1d9793e9d3ddd31c5bc39460b54fa
Author: LordofNoob <le...@gmail.com>
AuthorDate: Tue Jan 26 22:56:45 2021 +0100

    translated various comments
    
    (cherry picked from commit 483981ee50fcb709a2f6964ee0364db1390cf13a)
---
 main/sw/inc/shellio.hxx | 126 +++++++++++++++++++++++-------------------------
 1 file changed, 61 insertions(+), 65 deletions(-)

diff --git a/main/sw/inc/shellio.hxx b/main/sw/inc/shellio.hxx
index d6056f6..2806ba7 100644
--- a/main/sw/inc/shellio.hxx
+++ b/main/sw/inc/shellio.hxx
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -45,7 +45,7 @@
 #include <errhdl.hxx>
 #include <iodetect.hxx>
 
-// einige Forward - Deklarationen
+// some forward declerations
 class SfxFilterContainer;
 class SfxFilter;
 class SfxItemPool;
@@ -65,8 +65,7 @@ class SwTextBlocks;
 struct SwPosition;
 struct Writer_Impl;
 
-// ab so vielen chars wird ein mit einem ASCII/W4W-Reader eingelesener
-// Absatz zwangsweise umgebrochen. Muss immer groesser als 200 sein !!!
+//beyond following number  ASCII/W4W-reader is used. Must be greater then 200
 #define MAX_ASCII_PARA 10000
 
 
@@ -106,11 +105,11 @@ public:
 };
 
 /**************** SwReader/Reader ************************/
-// Basisklasse der moeglichen Optionen fuer einen speziellen Reader
+// base class for different specialized readers
 class Reader;
-// Ruft den Reader mit seinen Optionen, Dokument, Cursor etc.
+//  calls a document with its options, document, cursor etc.
 class SwReader;
-// SwRead ist der Pointer auf die Read-Optionen-Basisklasse
+// SwRead is a pointer on the read options of the base class
 typedef Reader *SwRead;
 
 class SwgReaderOption
@@ -161,7 +160,7 @@ class SwReader: public SwDocFac
 	SvStream* pStrm;
     SotStorageRef pStg;
     com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
-	SfxMedium* pMedium;		// wer ein Medium haben will (W4W)
+	SfxMedium* pMedium;		// describes file or storage (W4W)
 
 	SwPaM* pCrsr;
 	String aFileName;
@@ -169,16 +168,16 @@ class SwReader: public SwDocFac
 
 public:
 	/*
-	 * Initiales Einlesen. Dokument wird erst beim Read(..) angelegt.
-	 * JP 25.04.95: oder falls es mitgegeben wird, in dieses.
-	 *				Sonderfall fuer Load mit Sw3Reader
+	 * Initial read. document is created when function Read(...) os called
+	 * JP 25.04.95: or if it has been passed in that one.
+	 *				special case if loaded with Sw3Reader
 	 */
     //SwReader( SotStorage&, const String& rFilename, SwDoc *pDoc = 0 );
     //SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwDoc *pDoc = 0 );
     SwReader( SfxMedium&, const String& rFilename, SwDoc *pDoc = 0 );
 	/*
-	 * In ein existierendes Dokument einlesen, Dokument und
-	 * Position im Dokument werden aus dem SwPaM uebernommen.
+	 * read into an nexisting document. Document and
+	 * position within the document are taken from SwPaM.
 	 */
     SwReader( SvStream&, const String& rFilename, const String& rBaseURL, SwPaM& );
     //SwReader( SotStorage&, const String& rFilename, SwPaM& );
@@ -186,7 +185,7 @@ public:
     SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFilename, SwPaM& );
 
 	/*
- 	* Nur SwReader::Read(...) ist die Export-Schnittstelle!!!
+ 	* only SwReader::Read(...) is the Export-Interface!!!
  	*/
 	sal_Bool NeedsPasswd( const Reader& );
 	sal_Bool CheckPasswd( const String&, const Reader& );
@@ -204,10 +203,10 @@ protected:
 
 
 
-/*  */
-/****************  SPEZIELLE Reader ************************/
+/* */
+/****************  SPECIALE Readers ************************/
 
-// spezielle - Reader koennen beides sein !! (Excel, W4W, .. )
+// special - Reader can be both!! (Excel, W4W, .. )
 #define SW_STREAM_READER	1
 #define SW_STORAGE_READER	2
 
@@ -226,12 +225,12 @@ protected:
 	SvStream* pStrm;
     SotStorageRef pStg;
     com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
-	SfxMedium* pMedium;		// wer ein Medium haben will (W4W)
+	SfxMedium* pMedium;		// describes file or storage  (W4W)
 
 	SwgReaderOption aOpt;
 	sal_Bool bInsertMode : 1;
 	sal_Bool bTmplBrowseMode : 1;
-	sal_Bool bReadUTF8: 1;		// Stream als UTF-8 interpretieren
+	sal_Bool bReadUTF8: 1;		// interpred stream as UTF-8
 	sal_Bool bBlockMode: 1;
 	sal_Bool bOrganizerMode : 1;
 	sal_Bool bHasAskTemplateName : 1;
@@ -249,14 +248,13 @@ public:
 	virtual void SetFltName( const String& rFltNm );
 	static void SetNoOutlineNum( SwDoc& rDoc );
 
-	// den Item-Set eines Frm-Formats an das alte Format anpassen
+	// fit the item-set of a Frm-Formats to the old Format
 	static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet );
 
-	// die Rahmen-/Grafik-/OLE-Vorlagen an das alte Format (ohne
-	// Umrandung etc.) anpassen
+	// convert frame /grafic-/OLE-Templates to old Format (without frame etc.)
 	static void ResetFrmFmts( SwDoc& rDoc );
 
-	// Die Filter-Vorlage laden, setzen und wieder freigeben
+	// load filter template, position and free again
 	SwDoc* GetTemplateDoc();
 	sal_Bool SetTemplate( SwDoc& rDoc );
 	void ClearTemplate();
@@ -288,8 +286,8 @@ public:
 private:
     virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0;
 
-	// alle die die Streams / Storages nicht geoeffnet brauchen,
-	// muessen die Methode ueberladen (W4W!!)
+	// every object which does not need streams / object must overload following
+	// (W4W!!)
 	virtual int SetStrmStgPtr();
 };
 
@@ -335,12 +333,10 @@ public:
 								SvStrings& rStrings ) const;
 };*/
 
-/*  */
+/* */
 ////////////////////////////////////////////////////////////////////////////
-
-// Der uebergebene Stream muss dynamisch angelegt werden und
-// vor dem Loeschen der Instanz per Stream() angefordert
-// und geloescht werden!
+// The passed stream has to be dynamic created and before deletion of the
+// instance per Stream() requested and deleted
 
 class SwImpBlocks;
 
@@ -358,7 +354,7 @@ public:
     void Flush(){}
 
 	SwDoc* GetDoc();
-	void   ClearDoc();					// Doc-Inhalt loeschen
+	void   ClearDoc();					// delete doc content
 	const  String& GetName();
 	void   SetName( const String& );
 	sal_uLong GetError() const { return nErr; }
@@ -367,32 +363,32 @@ public:
     void   SetBaseURL( const String& rURL );
 
 	sal_Bool   IsOld() const;
-	sal_uLong  ConvertToNew();				// Textbausteine konvertieren
+	sal_uLong  ConvertToNew();				// convert AutoText entries (ger: Textbausteine)
 
-	sal_uInt16 GetCount() const;						// Anzahl Textbausteine ermitteln
-	sal_uInt16 GetIndex( const String& ) const;			// Index fuer Kurznamen ermitteln
+	sal_uInt16 GetCount() const;						// return amount of AutoText entries
+	sal_uInt16 GetIndex( const String& ) const;			// return Index of shortnames
 	sal_uInt16 GetLongIndex( const String& ) const;		//Index fuer Langnamen ermitteln
-	const  String& GetShortName( sal_uInt16 ) const; 	// Kurzname fuer Index zurueck
-	const  String& GetLongName( sal_uInt16 ) const;  	// Langname fuer Index zurueck
+	const  String& GetShortName( sal_uInt16 ) const; 	// return a shortname of an index
+	const  String& GetLongName( sal_uInt16 ) const;  	// return longname of an index
 
-	sal_Bool   Delete( sal_uInt16 );			// Loeschen
-	sal_uInt16 Rename( sal_uInt16, const String*, const String* ); // Umbenennen
+	sal_Bool   Delete( sal_uInt16 );			// delete
+	sal_uInt16 Rename( sal_uInt16, const String*, const String* ); // rename
 	sal_uLong  CopyBlock( SwTextBlocks& rSource, String& rSrcShort,
-									const String& rLong ); // Block kopieren
+									const String& rLong ); // copy block
 
-	sal_Bool   BeginGetDoc( sal_uInt16 );			// Textbaustein einlesen
-	void   EndGetDoc();						// Textbaustein wieder loslassen
+	sal_Bool   BeginGetDoc( sal_uInt16 );			// read AutoText entry
+	void   EndGetDoc();						// release AutoText entry
 
-	sal_Bool   BeginPutDoc( const String&, const String& ); // Speichern Beginn
-	sal_uInt16 PutDoc(); 								// Speichern Ende
+	sal_Bool   BeginPutDoc( const String&, const String& ); // start save
+	sal_uInt16 PutDoc(); 								// End save
 
-	sal_uInt16 PutText( const String&, const String&, const String& ); // Speichern( Kurzn., Text)
+	sal_uInt16 PutText( const String&, const String&, const String& ); // save (short., Text)
 
 	sal_Bool IsOnlyTextBlock( sal_uInt16 ) const;
 	sal_Bool IsOnlyTextBlock( const String& rShort ) const;
 
-	const String& GetFileName() const;		// Dateiname von pImp
-	sal_Bool IsReadOnly() const;  				// ReadOnly-Flag von pImp
+	const String& GetFileName() const;		// filename of pImp
+	sal_Bool IsReadOnly() const;  				// ReadOnly-Flag of pImp
 
 	sal_Bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl );
 	sal_Bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl );
@@ -414,18 +410,18 @@ SW_DLLPUBLIC SwRead SwGetReaderXML();
 // END source/filter/basflt/fltini.cxx
 
 
-extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx
+extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); // HTML templates (pre?)load shellio.cxx
 
 
-/*  */
+/* */
 /////////////////////////////////////////////////////////////////////////////
 
 /*
- * Schreiben, Writer
+ * write, Writer
  */
 
 
-/* Basis-Klasse aller Writer */
+/* base class of all Writer */
 
 class IDocumentSettingAccess;
 class IDocumentStylePoolAccess;
@@ -444,7 +440,7 @@ class SW_DLLPUBLIC Writer
 
 protected:
 
-	SwPaM* pOrigPam;			// der letze zu bearbeitende Pam
+	SwPaM* pOrigPam;			// last Pam to work on
 	const String* pOrigFileName;
 
 	void ResetWriter();
@@ -501,32 +497,32 @@ public:
 
     const String&       GetBaseURL() const { return sBaseURL;}
 
-    // suche die naechste Bookmark-Position aus der Bookmark-Tabelle
+    // search next bookmark position from the bookmark table
 	sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const;
 	// build a bookmark table, which is sort by the node position. The
 	// OtherPos of the bookmarks also inserted.
 	void CreateBookmarkTbl();
-	// search alle Bookmarks in the range and return it in the Array
+	// search all bookmarks in the range and return it in the Array
 	sal_uInt16 GetBookmarks( const SwCntntNode& rNd,
 						xub_StrLen nStt, xub_StrLen nEnd,
 						SvPtrarr& rArr );
 
-	// lege einen neuen PaM an der Position an
+	// create a new PaM at the position
     static SwPaM * NewSwPaM(SwDoc & rDoc,
                             sal_uLong const nStartIdx, sal_uLong const nEndIdx);
 
-	// kopiere ggfs. eine lokale Datei ins Internet
+	// upload a local file to the internet / cloud
 	sal_Bool CopyLocalFileToINet( String& rFileNm );
 
-	// Stream-spezifische Routinen, im Storage-Writer NICHT VERWENDEN!
+	// Stream-specific routines, DO NOT USE IN Storage-Writer!
 
-	// Optimierung der Ausgabe auf den Stream.
+	// Optimize of the output stream
 	SvStream& OutLong( SvStream& rStrm, long nVal );
 	SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
 
-	// Hex-Zahl ausgeben, default ist 2.stellige Zahl
+	// print Hex-Zahl, default is 2. digit number
 	SvStream& OutHex( SvStream& rStrm, sal_uLong nHex, sal_uInt8 nLen = 2 );
-	// 4-st. Hex-Zahl ausgeben
+	// print 4-digit Hex number
 	inline SvStream& OutHex4( SvStream& rStrm, sal_uInt16 nHex )
 		{   return OutHex( rStrm, nHex, 4 ); }
 
@@ -547,7 +543,7 @@ SV_DECL_REF(Writer)
 #endif
 SV_IMPL_REF(Writer)
 
-// Basisklasse fuer alle Storage-Writer
+// baseclass of all Storage-Writer
 class SW_DLLPUBLIC StgWriter : public Writer
 {
 protected:
@@ -555,7 +551,7 @@ protected:
     SotStorageRef pStg;
     com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg;
 
-	// Fehler beim Aufruf erzeugen
+	// create error at call
 	virtual sal_uLong WriteStream();
 	virtual sal_uLong WriteStorage() = 0;
 	virtual sal_uLong WriteMedium( SfxMedium& ) = 0;
@@ -626,7 +622,7 @@ public:
 };
 
 
-/*  */
+/* */
 /////////////////////////////////////////////////////////////////////////////
 
 typedef Reader* (*FnGetReader)();


[openoffice] 02/05: wording fixes according to PR 121, plus one forgotten translation

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit c2b90b9705f1cb0fc9a9f1faabfab73e7bc92160
Author: Peter Kovacs <le...@gmail.com>
AuthorDate: Wed Jan 27 22:53:35 2021 +0100

    wording fixes according to PR 121, plus one forgotten translation
    
    (cherry picked from commit 521ca9a93b328418910ab601cc051c2d6ac409a4)
---
 main/sw/inc/shellio.hxx | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/main/sw/inc/shellio.hxx b/main/sw/inc/shellio.hxx
index 2806ba7..b8fbaaa 100644
--- a/main/sw/inc/shellio.hxx
+++ b/main/sw/inc/shellio.hxx
@@ -45,7 +45,7 @@
 #include <errhdl.hxx>
 #include <iodetect.hxx>
 
-// some forward declerations
+// some forward declarations
 class SfxFilterContainer;
 class SfxFilter;
 class SfxItemPool;
@@ -107,7 +107,7 @@ public:
 /**************** SwReader/Reader ************************/
 // base class for different specialized readers
 class Reader;
-//  calls a document with its options, document, cursor etc.
+//  calls the reader with its options, document, cursor etc.
 class SwReader;
 // SwRead is a pointer on the read options of the base class
 typedef Reader *SwRead;
@@ -168,7 +168,7 @@ class SwReader: public SwDocFac
 
 public:
 	/*
-	 * Initial read. document is created when function Read(...) os called
+	 * Initial read. document is created when function Read(...) is called
 	 * JP 25.04.95: or if it has been passed in that one.
 	 *				special case if loaded with Sw3Reader
 	 */
@@ -230,7 +230,7 @@ protected:
 	SwgReaderOption aOpt;
 	sal_Bool bInsertMode : 1;
 	sal_Bool bTmplBrowseMode : 1;
-	sal_Bool bReadUTF8: 1;		// interpred stream as UTF-8
+	sal_Bool bReadUTF8: 1;		// interpreted stream as UTF-8
 	sal_Bool bBlockMode: 1;
 	sal_Bool bOrganizerMode : 1;
 	sal_Bool bHasAskTemplateName : 1;
@@ -382,7 +382,7 @@ public:
 	sal_Bool   BeginPutDoc( const String&, const String& ); // start save
 	sal_uInt16 PutDoc(); 								// End save
 
-	sal_uInt16 PutText( const String&, const String&, const String& ); // save (short., Text)
+	sal_uInt16 PutText( const String&, const String&, const String& ); // save (shortname, Text)
 
 	sal_Bool IsOnlyTextBlock( sal_uInt16 ) const;
 	sal_Bool IsOnlyTextBlock( const String& rShort ) const;
@@ -516,13 +516,13 @@ public:
 
 	// Stream-specific routines, DO NOT USE IN Storage-Writer!
 
-	// Optimize of the output stream
+	// optimization of the output stream
 	SvStream& OutLong( SvStream& rStrm, long nVal );
 	SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
 
-	// print Hex-Zahl, default is 2. digit number
+	// print hexadecimal number, default is 2. digit number
 	SvStream& OutHex( SvStream& rStrm, sal_uLong nHex, sal_uInt8 nLen = 2 );
-	// print 4-digit Hex number
+	// print 4-digit hexadecimal number
 	inline SvStream& OutHex4( SvStream& rStrm, sal_uInt16 nHex )
 		{   return OutHex( rStrm, nHex, 4 ); }
 
@@ -585,8 +585,7 @@ public:
 
 */
 
-// Schnittstellenklasse fuer den allgemeinen Zugriff auf die
-// speziellen Writer
+// Interface class for a generic access on special writer
 
 class SwWriter
 {


[openoffice] 05/05: fixed longnames spelling and missing translation

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 200c3ff2c99469ee4d98025e1f721105f912add6
Author: Peter Kovacs <pe...@apache.org>
AuthorDate: Sun Feb 28 18:19:59 2021 +0100

    fixed longnames spelling and missing translation
    
    (cherry picked from commit 0f07801e4988ee0a7fd20346f7164dea5b233e2c)
---
 main/sw/inc/shellio.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/sw/inc/shellio.hxx b/main/sw/inc/shellio.hxx
index ac2a59b..a8b3d0b 100644
--- a/main/sw/inc/shellio.hxx
+++ b/main/sw/inc/shellio.hxx
@@ -367,10 +367,10 @@ public:
 	sal_uLong  ConvertToNew();				// convert AutoText entries (ger: Textbausteine)
 
 	sal_uInt16 GetCount() const;						// return amount of AutoText entries
-	sal_uInt16 GetIndex( const String& ) const;			// return Index-Number of shortnames
-	sal_uInt16 GetLongIndex( const String& ) const;		//return Index-Number of langnamen
-	const  String& GetShortName( sal_uInt16 ) const; 	// return a shortname of an index
-	const  String& GetLongName( sal_uInt16 ) const;  	// return longname of an index
+	sal_uInt16 GetIndex( const String& ) const;			// return Index-Number of short names
+	sal_uInt16 GetLongIndex( const String& ) const;		//return Index-Number of long names
+	const  String& GetShortName( sal_uInt16 ) const; 	// return a short name of an index
+	const  String& GetLongName( sal_uInt16 ) const;  	// return long name of an index
 
 	sal_Bool   Delete( sal_uInt16 );			// delete
 	sal_uInt16 Rename( sal_uInt16, const String*, const String* ); // rename


[openoffice] 03/05: rework of comments in line 413 and 370

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit adbb6a775de2a282d6e19298f40c7a07af9e076a
Author: Peter Kovacs <pe...@apache.org>
AuthorDate: Sun Feb 28 09:04:26 2021 +0100

    rework of comments in line 413 and 370
    
    (cherry picked from commit 1a58a4dd8de890f5ad11c73e8cf7b6c3f003a7d4)
---
 main/sw/inc/shellio.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/sw/inc/shellio.hxx b/main/sw/inc/shellio.hxx
index b8fbaaa..d7fc99f 100644
--- a/main/sw/inc/shellio.hxx
+++ b/main/sw/inc/shellio.hxx
@@ -366,8 +366,8 @@ public:
 	sal_uLong  ConvertToNew();				// convert AutoText entries (ger: Textbausteine)
 
 	sal_uInt16 GetCount() const;						// return amount of AutoText entries
-	sal_uInt16 GetIndex( const String& ) const;			// return Index of shortnames
-	sal_uInt16 GetLongIndex( const String& ) const;		//Index fuer Langnamen ermitteln
+	sal_uInt16 GetIndex( const String& ) const;			// return Index-Number of shortnames
+	sal_uInt16 GetLongIndex( const String& ) const;		//return Index-Number of langnamen
 	const  String& GetShortName( sal_uInt16 ) const; 	// return a shortname of an index
 	const  String& GetLongName( sal_uInt16 ) const;  	// return longname of an index
 
@@ -410,7 +410,7 @@ SW_DLLPUBLIC SwRead SwGetReaderXML();
 // END source/filter/basflt/fltini.cxx
 
 
-extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); // HTML templates (pre?)load shellio.cxx
+extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); // load templates from HTML.vor (see shellio.cxx)
 
 
 /* */