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 d13ddb8257 Fixed typo (possibel -> possible) and some others
d13ddb8257 is described below
commit d13ddb8257991fd8b69407e38f9fc0504fe0aa83
Author: mseidel <[email protected]>
AuthorDate: Sun Sep 17 14:37:03 2023 +0200
Fixed typo (possibel -> possible) and some others
(cherry picked from commit 4ff439bb6886f3bed33191fca8cb2e1ca650bbd9)
---
main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 122 ++++++++++++------------
main/l10ntools/source/filter/utils/Cache.java | 97 +++++++++----------
2 files changed, 111 insertions(+), 108 deletions(-)
diff --git a/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
b/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index 8e614e1742..d7c9761411 100644
--- a/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/main/basegfx/inc/basegfx/polygon/b2dpolygon.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.
- *
+ *
*************************************************************/
@@ -40,7 +40,7 @@ namespace basegfx
class B2DPoint;
class B2DVector;
class B2DHomMatrix;
- class B2DCubicBezier;
+ class B2DCubicBezier;
} // end of namespace basegfx
//////////////////////////////////////////////////////////////////////////////
@@ -49,12 +49,12 @@ namespace basegfx
{
class BASEGFX_DLLPUBLIC B2DPolygon
{
- public:
- typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
+ public:
+ typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
private:
// internal data.
- ImplType mpPolygon;
+ ImplType
mpPolygon;
public:
/// diverse constructors
@@ -66,8 +66,8 @@ namespace basegfx
/// assignment operator
B2DPolygon& operator=(const B2DPolygon& rPolygon);
- /// unshare this polygon with all internally shared instances
- void makeUnique();
+ /// unshare this polygon with all internally shared instances
+ void makeUnique();
/// compare operators
bool operator==(const B2DPolygon& rPolygon) const;
@@ -77,7 +77,7 @@ namespace basegfx
sal_uInt32 count() const;
/// Coordinate interface
- basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
+ basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
void setB2DPoint(sal_uInt32 nIndex, const basegfx::B2DPoint&
rValue);
/// Coordinate insert/append
@@ -108,36 +108,36 @@ namespace basegfx
bool isNextControlPointUsed(sal_uInt32 nIndex) const;
B2VectorContinuity getContinuityInPoint(sal_uInt32 nIndex)
const;
- /** check edge for being a bezier segment
-
- This test the existence of control vectors, but do not apply
- testAndSolveTrivialBezier() to the bezier segment, so it is still
useful
- to do so.
- Since it can use internal data representations, it is faster
- than using getBezierSegment() and applying isBezier() on it.
-
- @param nIndex
- Index of the addressed edge's start point
-
- @return
- true if edge exists and at least one control vector is used
- */
- bool isBezierSegment(sal_uInt32 nIndex) const;
-
- /** bezier segment access
-
- This method also works when it is no bezier segment at all and
will fill
- the given B2DCubicBezier as needed.
- In any case, the given B2DCubicBezier will be filled, if necessary
with
- the single start point (if no valid edge exists).
-
- @param nIndex
- Index of the addressed edge's start point
-
- @param rTarget
- The B2DCubicBezier to be filled. It's data WILL be changed.
- */
- void getBezierSegment(sal_uInt32 nIndex, B2DCubicBezier& rTarget)
const;
+ /** check edge for being a bezier segment
+
+ This test the existence of control vectors, but do not
apply
+ testAndSolveTrivialBezier() to the bezier segment, so
it is still useful
+ to do so.
+ Since it can use internal data representations, it is
faster
+ than using getBezierSegment() and applying isBezier()
on it.
+
+ @param nIndex
+ Index of the addressed edge's start point
+
+ @return
+ true if edge exists and at least one control vector is
used
+ */
+ bool isBezierSegment(sal_uInt32 nIndex) const;
+
+ /** bezier segment access
+
+ This method also works when it is no bezier segment at
all and will fill
+ the given B2DCubicBezier as needed.
+ In any case, the given B2DCubicBezier will be filled,
if necessary with
+ the single start point (if no valid edge exists).
+
+ @param nIndex
+ Index of the addressed edge's start point
+
+ @param rTarget
+ The B2DCubicBezier to be filled. It's data WILL be
changed.
+ */
+ void getBezierSegment(sal_uInt32 nIndex, B2DCubicBezier&
rTarget) const;
/** Default adaptive subdivision access
@@ -168,27 +168,27 @@ namespace basegfx
be this polygon itself when it has no bezier segments.
It is guaranteed
to have no more bezier segments
*/
- B2DPolygon getDefaultAdaptiveSubdivision() const;
+ B2DPolygon getDefaultAdaptiveSubdivision() const;
- /** Get the B2DRange (Rectangle dimensions) of this B2DPolygon
+ /** Get the B2DRange (Rectangle dimensions) of this B2DPolygon
A polygon may have up to three ranges:
(a) the range of the polygon points
(b) the range of the polygon points and control points
(c) the outer range of the subdivided bezier curve
-
- Ranges (a) and (c) are produced by tools::getRange();
resp. this
- getB2DRange(). tools::getRangeWithControlPoints handles case (b).
-
- To get range (c) a simple solution would be to
subdivide the polygon
- and use getRange() on it. Since subdivision is
expensive and decreases
+
+ Ranges (a) and (c) are produced by tools::getRange();
resp. this
+ getB2DRange(). tools::getRangeWithControlPoints handles
case (b).
+
+ To get range (c) a simple solution would be to
subdivide the polygon
+ and use getRange() on it. Since subdivision is
expensive and decreases
the polygon quality, i added this new method. It will
use a
methodology suggested by HDU. First, it gets the range
(a).
Then it iterates over the bezier segments and for each
it
first tests if the outer range of the bezier segment is
already
contained in the result range.
-
+
The subdivision itself uses getAllExtremumPositions()
to only
calculate extremum points and to expand the result
accordingly.
Thus it calculates maximal four extremum points on the
bezier
@@ -196,8 +196,8 @@ namespace basegfx
@return
The outer range of the bezier curve/polygon
- */
- B2DRange getB2DRange() const;
+ */
+ B2DRange getB2DRange() const;
/** insert other 2D polygons
@@ -232,7 +232,7 @@ namespace basegfx
@param nCount
The number of points to append from rPoly, starting
- from nIndex. If zero, as much as possibel is appended
+ from nIndex. If zero, as much as possible is appended
*/
void append(const B2DPolygon& rPoly, sal_uInt32 nIndex = 0,
sal_uInt32 nCount = 0);
@@ -258,18 +258,20 @@ namespace basegfx
/// apply transformation given in matrix form
void transform(const basegfx::B2DHomMatrix& rMatrix);
- // point iterators (same iterator validity conditions as for vector)
- const B2DPoint* begin() const;
- const B2DPoint* end() const;
- B2DPoint* begin();
- B2DPoint* end();
+ // point iterators (same iterator validity conditions as for
vector)
+ const B2DPoint* begin() const;
+ const B2DPoint* end() const;
+ B2DPoint* begin();
+ B2DPoint* end();
};
- // typedef for a vector of B2DPolygons
- typedef ::std::vector< B2DPolygon > B2DPolygonVector;
+ // typedef for a vector of B2DPolygons
+ typedef ::std::vector< B2DPolygon > B2DPolygonVector;
} // end of namespace basegfx
//////////////////////////////////////////////////////////////////////////////
#endif /* _BGFX_POLYGON_B2DPOLYGON_HXX */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/l10ntools/source/filter/utils/Cache.java
b/main/l10ntools/source/filter/utils/Cache.java
index ef9f7b693b..0141d19886 100644
--- a/main/l10ntools/source/filter/utils/Cache.java
+++ b/main/l10ntools/source/filter/utils/Cache.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,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.
- *
+ *
*************************************************************/
+
package com.sun.star.filter.config.tools.utils;
//_______________________________________________
@@ -33,7 +34,7 @@ import java.io.*;
/**
* It implements a container for all possible entries which are part of the
type
* and filter mechanism of an office - means all items of the configuration
file
- * "TypeDetection". How these entries will be readed or written can be switch
+ * "TypeDetection". How these entries will be read or written can be switch
* in different modes. That would make it possible to edit an xml directly or
* to contact a running office instance.
*
@@ -123,19 +124,19 @@ public class Cache
private static final java.lang.String FILTERSERVICE_NATIVEWARPPER =
"com.sun.star.filter.NativeFilterWrapper";
private static final java.lang.String GENERIC_DETECTSERVICE =
"com.sun.star.comp.office.FrameLoader";
- /** its the name of the cfg set, which contains all types. */
+ /** it's the name of the cfg set, which contains all types. */
private static final java.lang.String CFGNODE_TYPES = "Types";
- /** its the name of the cfg set, which contains all filters. */
+ /** it's the name of the cfg set, which contains all filters. */
private static final java.lang.String CFGNODE_FILTERS = "Filters";
- /** its the name of the cfg set, which contains all detect services. */
+ /** it's the name of the cfg set, which contains all detect services. */
private static final java.lang.String CFGNODE_DETECTSERVICES =
"DetectServices";
- /** its the name of the cfg set, which contains all frame loaders. */
+ /** it's the name of the cfg set, which contains all frame loaders. */
private static final java.lang.String CFGNODE_FRAMELOADERS =
"FrameLoaders";
- /** its the name of the cfg set, which contains all content handlers. */
+ /** it's the name of the cfg set, which contains all content handlers. */
private static final java.lang.String CFGNODE_CONTENTHANDLERS =
"ContentHandlers";
// names for filter flags
@@ -231,7 +232,7 @@ public class Cache
private int m_nTypesForFrameLoaders;
private int m_nTypesForContentHandlers;
- /** can be used to log different informations. */
+ /** can be used to log different information. */
private Logger m_aDebug;
//___________________________________________
@@ -352,8 +353,8 @@ public class Cache
// parse it
javax.xml.parsers.DocumentBuilderFactory aFactory =
javax.xml.parsers.DocumentBuilderFactory.newInstance();
/* Attention:
- * This call is important. It force right handling of entities during
parsing and(!)
- * writing. It let all possible signs for entities or it's quoted
representations
+ * This call is important. It forces right handling of entities
during parsing and(!)
+ * writing. It let all possible signs for entities or its quoted
representations
* untouched. So this class don't change the original signs of the
original file.
* Means:
* <ul>
@@ -366,7 +367,7 @@ public class Cache
* <li>...</li>
* </ul>
*/
-
+
System.out.println("TODO: must be adapted to java 1.3 :-(");
System.exit(-1);
//TODO_JAVA aFactory.setExpandEntityReferences(false);
@@ -480,7 +481,7 @@ public class Cache
//___________________________________________
- /** create some hml views of the current content of this cache.
+ /** create some html views of the current content of this cache.
*
* The given directory is used to create different html files
* there. Every of them show another aspect of this cache.
@@ -1042,15 +1043,15 @@ public class Cache
aResultMap.put(PROPNAME_UINAME, aMap.get(PROPNAME_UINAME));
// generate new property "UIOrder"
- // Its the moved property "Order" of filters for versions >=
6.y!
+ // It's the moved property "Order" of filters for versions >=
6.y!
aResultMap.put(PROPNAME_UIORDER, new java.lang.Integer(0));
// generate new property "PreferredFilter"
- // Its a the moved filter flag "Preferred" for versions >= 6.y!
+ // It's a the moved filter flag "Preferred" for versions >=
6.y!
aResultMap.put(PROPNAME_PREFERREDFILTER, new
java.lang.String());
// generate new property "DetectService"
- // Every type know its detector diretcly from now. No search
+ // Every type knows its detector directly from now. No search
// will be necessary any longer.
aResultMap.put(PROPNAME_DETECTSERVICE, new java.lang.String());
@@ -1075,7 +1076,7 @@ public class Cache
break;
case 2 :
{
- /*HACK ersetze %20 mit " " ...*/
+ /*HACK replace %20 with " " ...*/
int ni = sToken.indexOf("%20");
if (ni!=-1)
{
@@ -1210,11 +1211,11 @@ public class Cache
++t;
}
- // its an optional property :-)
+ // it's an optional property :-)
if (!aResultMap.containsKey(PROPNAME_TEMPLATENAME))
aResultMap.put(PROPNAME_TEMPLATENAME, new
java.lang.String(""));
- // its an optional property :-)
+ // it's an optional property :-)
if (!aResultMap.containsKey(PROPNAME_UICOMPONENT))
aResultMap.put(PROPNAME_UICOMPONENT, new
java.lang.String(""));
}
@@ -1550,7 +1551,7 @@ public class Cache
//___________________________________________
/** get a list of all item names of the specified
- * sub coontainer, where items match to given property set.
+ * sub container, where items match to given property set.
*
* Note: The given property set must exist at all
* returned items as minimum and every checked property
@@ -1747,7 +1748,7 @@ public class Cache
/** split the given string (using the specified delimiter)
* and return alist of found string tokens.
*
- * Note: Against the normal behaviour of the StringTokenizer class
+ * Note: Against the normal behavior of the StringTokenizer class
* this method returns empty tokens too.
* E.g: "0,,1" will return "0" - "" - "1"
*
@@ -1755,7 +1756,7 @@ public class Cache
* the string value, which should be analyzed.
*
* @param sDelim
- * the delimiter, which will be used to differe between tokens.
+ * the delimiter, which will be used to differ between tokens.
*
* @return [java.util.Vector]
* a list of string tokens. Can be empty - but not null!
@@ -1903,14 +1904,14 @@ public class Cache
*
* It checks if all made registrations are valid;
* try to repair some simple problems;
- * create missing informations on demand ...
+ * create missing information on demand ...
*
* @param nFormat
* specify, which configuration format
* must be checked.
*
* @throws [java.lang.Exception]
- * if an unrecoverable problem occure.
+ * if an unrecoverable problem occurs.
*/
public synchronized void validate(int nFormat)
throws java.lang.Exception
@@ -1928,7 +1929,7 @@ public class Cache
* must be checked.
*
* @throws [java.lang.Exception]
- * if an unrecoverable problem occure.
+ * if an unrecoverable problem occurs.
*/
private void validateTypes(int nFormat)
throws java.lang.Exception
@@ -2012,7 +2013,7 @@ public class Cache
* must be checked.
*
* @throws [java.lang.Exception]
- * if an unrecoverable problem occure.
+ * if an unrecoverable problem occurs.
*/
public synchronized void validateFilters(int nFormat)
throws java.lang.Exception
@@ -2088,7 +2089,7 @@ public class Cache
boolean bSetDefaultDetector
)
throws java.lang.Exception
{
- // remove some superflous cache entries ...
+ // remove some superfluous cache entries ...
// everything related to "load macros"
// Macros should be dispatched instead of loaded!
if (m_lTypes.containsKey("macro"))
@@ -2112,7 +2113,7 @@ public class Cache
java.util.HashMap aFilter =
(java.util.HashMap)m_lFilters.get(sFilter);
// remove the "graphic helper filters" used by draw and impress
- // They dont have any valid document service name set and can't be
handled
+ // They don't have any valid document service name set and can't
be handled
// by our generic FrameLoader!
// They must be moved to her own configuration ...
@@ -2132,7 +2133,7 @@ public class Cache
java.util.HashMap lFilterUINames =
(java.util.HashMap)aFilter.get(PROPNAME_UINAME);
java.util.HashMap lTypeUINames =
(java.util.HashMap)aType.get(PROPNAME_UINAME);
java.util.HashMap lPatchUINames = new java.util.HashMap();
-
+
java.util.Iterator pUINames = lTypeUINames.keySet().iterator();
while(pUINames.hasNext())
{
@@ -2140,7 +2141,7 @@ public class Cache
java.lang.String sValue =
(java.lang.String)lTypeUINames.get(sLocale);
lPatchUINames.put(sLocale, sValue);
}
-
+
pUINames = lFilterUINames.keySet().iterator();
while(pUINames.hasNext())
{
@@ -2149,7 +2150,7 @@ public class Cache
lPatchUINames.put(sFilter+":"+sLocale, sValue);
}
aType.put(PROPNAME_UINAME, lPatchUINames);
-
+
// set generic filter service wrapper for our own native filters!
// By the way: The format types of such filters can be detected by
our
// generic detector too.
@@ -2172,19 +2173,19 @@ public class Cache
/* Attention!
*
* Don't remove the preferred flag from any filter! ... not here.
- * Otherwise next loop can't detect ambigous preferred
registrations!
+ * Otherwise next loop can't detect ambiguous preferred
registrations!
* Add filter to a temp. list, which can be used later to remove
the preferred
* flag ...
*/
int flags1 =
((java.lang.Integer)aFilter.get(PROPNAME_FLAGS)).intValue();
java.lang.String sDocSrv =
(java.lang.String)aFilter.get(PROPNAME_DOCUMENTSERVICE);
- if (sDocSrv.length()>0)// without a doc service its not a real
filter - its a graphic filter!
- {
+ if (sDocSrv.length()>0)// without a doc service it's not a real
filter - it's a graphic filter!
+ {
boolean preferred1 = ((flags1 & FLAGVAL_PREFERRED) ==
FLAGVAL_PREFERRED);
if (preferred1)
lPreferredFilters.add(aFilter);
-
+
java.lang.String sAlreadyRegisteredFilter =
(java.lang.String)aType.get(PROPNAME_PREFERREDFILTER);
// no registration => set this filter as "any possible one"!
if (sAlreadyRegisteredFilter.length() < 1)
@@ -2194,7 +2195,7 @@ public class Cache
java.util.HashMap aAlreadyRegisteredFilter =
(java.util.HashMap)m_lFilters.get(sAlreadyRegisteredFilter);
int flags2 =
((java.lang.Integer)aAlreadyRegisteredFilter.get(PROPNAME_FLAGS)).intValue();
boolean preferred2 = ((flags2 &
FLAGVAL_PREFERRED) == FLAGVAL_PREFERRED);
-
+
// two preferred filters for the same type! => error
if (preferred1 && preferred2)
{
@@ -2211,7 +2212,7 @@ public class Cache
aType.put(PROPNAME_PREFERREDFILTER, sFilter);
}
}
-
+
// create the new combined filter flag if required
if (bCreateCombineFilterFlag)
{
@@ -2240,7 +2241,7 @@ public class Cache
aFilter.put(PROPNAME_FLAGS, new java.lang.Integer(flags1));
}
- // if its a filter with an UI order ...
+ // if it's a filter with an UI order ...
// move this information to the registered type.
// Note: Because more then one filter can be registered for the
same type.
// Handle it as an error ... till we find a better transformation!
@@ -2278,15 +2279,15 @@ public class Cache
}
}
- // NOW ... remove all "no real filters" like the graphich helper
filters of
- // draw and impress!
+ // NOW ... remove all "no real filters" like the graphic helper
filters of
+ // Draw and Impress!
aIt2 = lNoRealFilters.elements();
while (aIt2.hasMoreElements())
m_lFilters.remove(aIt2.nextElement());
// step over all detect services and move this information directly to
// the corresponding types
- // Overwrite possibel default registrations with a real existing one!
+ // Overwrite possible default registrations with a real existing one!
aIt1 = m_lDetectServices.keySet().iterator();
while(aIt1.hasNext())
{
@@ -2309,7 +2310,7 @@ public class Cache
if (aAlreadyRegisteredDetector != null &&
((java.lang.String)aAlreadyRegisteredDetector).length() > 0)
{
java.lang.StringBuffer sMsg = new
java.lang.StringBuffer(256);
- sMsg.append("type \""+sTypeReg+"\" has ambigous
registrations of a detect service\n");
+ sMsg.append("type \""+sTypeReg+"\" has ambiguous
registrations of a detect service\n");
sMsg.append("\tdetect service[1] =
\""+(java.lang.String)aAlreadyRegisteredDetector+"\"\n");
sMsg.append("\tdetect service[2] = \""+sDetector+"\"\n");
m_aDebug.setWarning(sMsg.toString());
@@ -2325,7 +2326,7 @@ public class Cache
// step over all frame loader and move this information directly to
// the corresponding types
- // Overwrite possibel default registrations with a real existing one!
+ // Overwrite possible default registrations with a real existing one!
aIt1 = m_lFrameLoaders.keySet().iterator();
while(aIt1.hasNext())
{
@@ -2341,7 +2342,7 @@ public class Cache
if (sAlreadyRegisteredLoader != null &&
sAlreadyRegisteredLoader.length() > 0)
{
java.lang.StringBuffer sMsg = new
java.lang.StringBuffer(256);
- sMsg.append("type \""+sTypeReg+"\" has ambigous
registrations of a frame loader\n");
+ sMsg.append("type \""+sTypeReg+"\" has ambiguous
registrations of a frame loader\n");
sMsg.append("\tframe loader[1] =
\""+sAlreadyRegisteredLoader+"\"\n");
sMsg.append("\tframe loader[2] = \""+sLoader+"\"\n");
m_aDebug.setWarning(sMsg.toString());
@@ -2355,7 +2356,7 @@ public class Cache
// step over all content handler and move this information directly to
// the corresponding types
- // Overwrite possibel default registrations with a real existing one!
+ // Overwrite possible default registrations with a real existing one!
aIt1 = m_lContentHandlers.keySet().iterator();
while(aIt1.hasNext())
{
@@ -2371,7 +2372,7 @@ public class Cache
if (sAlreadyRegisteredHandler != null &&
sAlreadyRegisteredHandler.length() > 0)
{
java.lang.StringBuffer sMsg = new
java.lang.StringBuffer(256);
- sMsg.append("type \""+sTypeReg+"\" has ambigous
registrations of a content handler\n");
+ sMsg.append("type \""+sTypeReg+"\" has ambiguous
registrations of a content handler\n");
sMsg.append("\tcontent handler[1] =
\""+sAlreadyRegisteredHandler+"\"\n");
sMsg.append("\tcontent handler[2] = \""+sHandler+"\"\n");
m_aDebug.setWarning(sMsg.toString());
