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
The following commit(s) were added to refs/heads/AOO42X by this push:
new 206e4df Fixed typos, removed whitespace
206e4df is described below
commit 206e4dff78ceca8f75cfc9eb2494a808bf063860
Author: mseidel <[email protected]>
AuthorDate: Tue May 11 14:49:54 2021 +0200
Fixed typos, removed whitespace
(cherry picked from commit ab40857287c6726927810e0521e53d699ee4888e)
---
main/l10ntools/source/filter/utils/XMLHelper.java | 56 +++++++++++------------
main/sw/source/filter/ww8/writerhelper.hxx | 51 +++++++++++----------
2 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/main/l10ntools/source/filter/utils/XMLHelper.java
b/main/l10ntools/source/filter/utils/XMLHelper.java
index 77f85c2..e6fa172 100644
--- a/main/l10ntools/source/filter/utils/XMLHelper.java
+++ b/main/l10ntools/source/filter/utils/XMLHelper.java
@@ -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.
- *
+ *
*************************************************************/
@@ -43,46 +43,46 @@ public class XMLHelper
//___________________________________________
// public const
- /** its a possible value of the xml attribute "oor:type" and identify an
integer type. */
+ /** it's a possible value of the xml attribute "oor:type" and identify an
integer type. */
public static final java.lang.String XMLTYPE_INTEGER = "xs:int";
- /** its a possible value of the xml attribute "oor:type" and identify an
boolean type. */
+ /** it's a possible value of the xml attribute "oor:type" and identify an
boolean type. */
public static final java.lang.String XMLTYPE_BOOLEAN = "xs:boolean";
- /** its a possible value of the xml attribute "oor:type" and identify an
string type. */
+ /** it's a possible value of the xml attribute "oor:type" and identify an
string type. */
public static final java.lang.String XMLTYPE_STRING = "xs:string";
- /** its a possible value of the xml attribute "oor:type" and identify an
string list type. */
+ /** it's a possible value of the xml attribute "oor:type" and identify an
string list type. */
public static final java.lang.String XMLTYPE_STRINGLIST =
"oor:string-list";
- /** its a xml attribute, which specify a property name. */
+ /** it's a xml attribute, which specify a property name. */
public static final java.lang.String XMLATTRIB_OOR_NAME = "oor:name";
- /** its a xml attribute, which specify a property type. */
+ /** it's a xml attribute, which specify a property type. */
public static final java.lang.String XMLATTRIB_OOR_TYPE = "oor:type";
- /** its a xml attribute, which specify a list separator. */
+ /** it's a xml attribute, which specify a list separator. */
public static final java.lang.String XMLATTRIB_OOR_SEPARATOR =
"oor:separator";
- /** its a xml attribute, which specify a localized value. */
+ /** it's a xml attribute, which specify a localized value. */
public static final java.lang.String XMLATTRIB_OOR_LOCALIZED =
"oor:localized";
- /** its a xml attribute, which specify a merge operation for cfg layering.
*/
+ /** it's a xml attribute, which specify a merge operation for cfg
layering. */
public static final java.lang.String XMLATTRIB_OOR_OP = "oor:op";
/** can be used as value for XMLATTRIB_OOR_OP. */
public static final java.lang.String XMLATTRIB_OP_REPLACE = "replace";
- /** its a xml attribute, which specify a locale value. */
+ /** it's a xml attribute, which specify a locale value. */
public static final java.lang.String XMLATTRIB_XML_LANG = "xml:lang";
- /** its the tag name of a <value ...> entry. */
+ /** it's the tag name of a <value ...> entry. */
public static final java.lang.String XMLTAG_VALUE = "value";
- /** its the tag name of a <prop ...> entry. */
+ /** it's the tag name of a <prop ...> entry. */
public static final java.lang.String XMLTAG_PROP = "prop";
- /** its the tag name of a <node ...> entry. */
+ /** it's the tag name of a <node ...> entry. */
public static final java.lang.String XMLTAG_NODE = "node";
//___________________________________________
@@ -92,7 +92,7 @@ public class XMLHelper
private static final java.lang.String[] DELIMS = {" ", ",", ";", ".", ":",
"-", "_", "#", "'", "+", "*", "~", "=", "?"};
/** index of the default separator inside list DELIMS.
- * Its necessary to know such default separator; because it can
+ * It's necessary to know such default separator; because it can
* be suppressed as xml attribute of the corresponding value tag. */
private static final int DEFAULT_SEPARATOR = 0;
@@ -141,7 +141,7 @@ public class XMLHelper
{
/** Special patch:
* If an xml tag has no type information set ... we can
restore it
- * by analyzing the already readed tag name :-)
+ * by analyzing the already read tag name :-)
* Not very nice - but it can help to read stripped xml
files too. */
sChildType = XMLHelper.getTypeForTag(sChildName);
if (sChildType == null)
@@ -327,7 +327,7 @@ public class XMLHelper
continue;
}
- // its a localized value?
+ // it's a localized value?
if (aVal instanceof java.util.HashMap)
{
java.util.HashMap lVal = (java.util.HashMap)aVal;
@@ -480,8 +480,8 @@ public class XMLHelper
// (we use a list of possible ones!) clash with an item.
// If it clash - we step to the next possible separator.
// If our list of possible separator values runs out of range we throw
- // an exception :-) Its better then generating of wrong values
- // If we found a valid seperator - we use it to replace our "\n" place
holder
+ // an exception :-) It's better then generating of wrong values
+ // If we found a valid separator - we use it to replace our "\n" place
holder
// at the end of the following loop ...
int d = 0;
@@ -497,7 +497,7 @@ public class XMLHelper
sValue = encodeHTMLSigns(sValue);
- // append item with default separator, which isn a valid separator
at all
+ // append item with default separator, which isn't a valid
separator at all
// But suppress adding of the separator if last element is reached.
sValBuff.append(sValue);
if (i<(c-1))
@@ -574,7 +574,7 @@ public class XMLHelper
for (int t=0; t<nPrettyTabs; ++t)
sXML.append("\t");
- // !Our localized values must be formatted at a deeper coloum
+ // !Our localized values must be formatted at a deeper column
// then its property name!
++nPrettyTabs;
@@ -620,8 +620,8 @@ public class XMLHelper
/** returns the value of an attribute of the given node.
*
- * If the given node represent an lement node, may it supports some
attributes.
- * Then this method search for an attribute with the specified name and
return it's value.
+ * If the given node represent an element node, may it supports some
attributes.
+ * Then this method search for an attribute with the specified name and
return its value.
* If nothing could be found ... or the given node isn't a suitable node
... it returns null.
*
* @param aNode
@@ -762,7 +762,7 @@ public class XMLHelper
* @param sPackage
* name of the configuration package.
*
- * @param bLanguagepack
+ * @param bLanguagepack
* force creation of a special header,
* which is needed for language packs only.
*
@@ -807,7 +807,7 @@ public class XMLHelper
sHeader.append(sPackage);
sHeader.append("\">\n");
}
-
+
return sHeader.toString();
}
diff --git a/main/sw/source/filter/ww8/writerhelper.hxx
b/main/sw/source/filter/ww8/writerhelper.hxx
index 5d3fca7..a5c246d 100644
--- a/main/sw/source/filter/ww8/writerhelper.hxx
+++ b/main/sw/source/filter/ww8/writerhelper.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,19 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
/// @HTML
@@ -88,18 +89,18 @@ namespace sw
/** Make exporting a Writer Frame easy
In word all frames are effectively anchored to character or as
- character. This is nice and simple, writer is massively complex in this
+ character. This is nice and simple, Writer is massively complex in this
area, so this sw::Frame simplies matters by providing a single unified
- view of the multitute of elements in writer and their differing quirks.
+ view of the multitude of elements in Writer and their differing quirks.
- A sw::Frame wraps a writer frame and is guaranted to have a suitable
+ A sw::Frame wraps a Writer frame and is guaranted to have a suitable
anchor position available from it. It hides much of the needless
- complexity of the multitude of floating/inline elements in writer,
it...
+ complexity of the multitude of floating/inline elements in Writer,
it...
Guarantees an anchor position for a frame.
Provides a readable way to see if we are anchored inline. (as
character)
Provides a simple way to flag what type of entity this frame describes.
- Provides the size of the element as drawn by writer.
+ Provides the size of the element as drawn by Writer.
@author
<a href="mailto:[email protected]";>Caolán McNamara</a>
@@ -127,7 +128,7 @@ namespace sw
Frame(const SwFrmFmt &rFlyFrm, const SwPosition &rPos);
Frame(const Graphic&, const SwPosition &);
//End
- /** Get the writer SwFrmFmt that this object describes
+ /** Get the Writer SwFrmFmt that this object describes
@return
The wrapped SwFrmFmt
@@ -167,7 +168,7 @@ namespace sw
/** Even if the frame isn't an inline frame, force it to behave as one
There are a variety of circumstances where word cannot have
- anything except inline elements, e.g. inside frames. So its easier
+ anything except inline elements, e.g. inside frames. So it's easier
to force this sw::Frame into behaving as one, instead of special
casing export code all over the place.
@@ -184,10 +185,10 @@ namespace sw
bool HasGraphic() const { return mbForBullet; }
- /** Does this sw::Frame refer to the same writer content as another
+ /** Does this sw::Frame refer to the same Writer content as another
@return
- if the two sw::Frames are handling the same writer frame
+ if the two sw::Frames are handling the same Writer frame
*/
bool RefersToSameFrameAs(const Frame &rOther) const
{
@@ -232,7 +233,7 @@ namespace sw
/** Provide a dynamic_cast style cast for SfxPoolItems
A SfxPoolItem generally need to be cast back to its original type
- to be useful, which is both tedious and errorprone. So item_cast is
+ to be useful, which is both tedious and error prone. So item_cast
is
a helper template to aid the process and test if the cast is
correct.
@@ -548,7 +549,7 @@ namespace sw
/** Get a Character Style which fits a given name
- Its surprisingly tricky to get a style when all you have is a name,
+ It's surprisingly tricky to get a style when all you have is a
name,
but that's what this does
@param rDoc
@@ -669,7 +670,7 @@ namespace sw
*/
Frames GetFramesInNode(const Frames &rFrames, const SwNode &rNode);
-#if 0
+#if 0
/** Get the Frames anchored for all nodes between two points
Given a container of frames, find the ones anchored to the nodes
@@ -739,7 +740,7 @@ namespace sw
/** Does a node have a "page break before" applied
- Both text nodes and tables in writer can have "page break before"
+ Both text nodes and tables in Writer can have "page break before"
This function gives a unified view to both entities
@param rNode
@@ -755,7 +756,7 @@ namespace sw
/** Make a best fit Polygon from a PolyPolygon
- For custom contours in writer we use a PolyPolygon, while word uses
+ For custom contours in Writer we use a PolyPolygon, while word uses
a simple polygon, so we need to try and make the best polygon from
a PolyPolygon
@@ -840,8 +841,8 @@ namespace sw
another SfxItemPool
This arises because the drawing layer uses the same properties as
- writer e.g. SvxWeight, but for some reason uses different ids
- for the same properties as writer.
+ Writer e.g. SvxWeight, but for some reason uses different ids
+ for the same properties as Writer.
@param rDestPool
The SfxItemPool in whose terms the Id is returned
@@ -867,8 +868,8 @@ namespace sw
for a given SfxItemSet.
This arises because the drawing layer uses the same properties as
- writer e.g. SvxWeight, but for some reason uses different ids
- for the same properties as writer.
+ Writer e.g. SvxWeight, but for some reason uses different ids
+ for the same properties as Writer.
This is effectively the same as TransformWhichBetweenPools except
at a slightly different layer.
@@ -880,7 +881,7 @@ namespace sw
The SwDoc in whose terms the Id is passed in
@param nWhich
- The Id to transform from writer to the SfxItemSet's domain
+ The Id to transform from Writer to the SfxItemSet's domain
@return 0 on failure, the correct SfxItemSet Id on success
@@ -956,11 +957,11 @@ namespace sw
#ifdef DEBUGDUMP
/** Create a SvStream to dump data to during debugging
- This creates a file in the program dir of OOo, delete the SvStream
+ This creates a file in the program dir of AOO, delete the SvStream
after you are done with it
@param rSuffix
- The suffix that will be appened to this debugging file
+ The suffix that will be appended to this debugging file
@return a SvStream to dump data to
