summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKorrawit Pruegsanusak <detective.conan.1412@gmail.com>2011-05-31 00:14:23 +0700
committerMichael Meeks <michael.meeks@novell.com>2011-05-30 19:09:24 +0100
commit6630b196941390019b2f015e94c0ce63dd0983f6 (patch)
tree10a975b4135e29d5aaf3011de3e7776b85b27c61
parent5e5181c1e57c4a6aaa25b57bea2f1c095b0f0745 (diff)
Code Cleanup in filters
* Fix typos in comments * Remove bogus comments * Remove dead codes Released under LGPLv3+/MPL
-rw-r--r--filter/inc/filter/msfilter/msdffimp.hxx2
-rw-r--r--filter/source/config/cache/cacheitem.hxx2
-rw-r--r--filter/source/config/cache/constant.hxx2
-rw-r--r--filter/source/config/cache/filtercache.cxx16
-rw-r--r--filter/source/config/cache/filtercache.hxx12
-rw-r--r--filter/source/config/tools/split/FCFGSplit.java10
-rw-r--r--filter/source/xslt/odf2xhtml/export/xhtml/body.xsl5
-rw-r--r--hwpfilter/source/hcode.cpp17
-rw-r--r--hwpfilter/source/hwpfile.cpp2
-rw-r--r--hwpfilter/source/hwpreader.cxx24
-rw-r--r--hwpfilter/source/lexer.cpp46
-rw-r--r--oox/inc/oox/xls/scenariobuffer.hxx2
-rw-r--r--oox/source/xls/workbookhelper.cxx2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java2
16 files changed, 31 insertions, 119 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index e2deb12c0fac..81b4403f3938 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -169,13 +169,11 @@ typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer;
#define SVEXT_PERSIST_STREAM "\002OlePres000"
// nach der Reihenfolge des Auftretens sortiert werden:
-//
SV_DECL_PTRARR_DEL(SvxMSDffBLIPInfos, SvxMSDffBLIPInfo_Ptr, 16,16)
SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders, SvxMSDffShapeOrder_Ptr, 16,16)
// explizit sortiert werden:
-//
SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr, 16,16, MSFILTER_DLLPUBLIC)
SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder_Ptr, 16,16, MSFILTER_DLLPUBLIC)
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 742e994ad3e0..2260e076c4bc 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -163,7 +163,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
@param sActLocale
must specify the current office locale.
- Its needed to adress the UIName property inside
+ Its needed to address the UIName property inside
the list of possible ones.
*/
void validateUINames(const ::rtl::OUString& sActLocale);
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index c175f59dbb70..f1dd5c96d715 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -101,7 +101,7 @@ extern rtl::OUString pFilterStrings[];
#define CFGSET_FRAMELOADERS _FILTER_CONFIG_FROM_ASCII_("FrameLoaders" )
#define CFGSET_CONTENTHANDLERS _FILTER_CONFIG_FROM_ASCII_("ContentHandlers")
-/** @short used to adress some configuration keys directly.
+/** @short used to address some configuration keys directly.
@descr Such direct keys should be used with function
FilterCache::impl_getDirectCFGValue() only!
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index d0de462e5e8a..95814a6aef6c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1057,7 +1057,7 @@ void FilterCache::impl_validateAndOptimize()
}
// Create a log for all detected problems, which
- // occure in the next feew lines.
+ // occur in the next few lines.
// If there are some real errors throw a RuntimException!
// If there are some warnings only, show an assertion.
sal_Int32 nErrors = 0;
@@ -1117,8 +1117,8 @@ void FilterCache::impl_validateAndOptimize()
// its set list of extensions/url pattern. If its a "normal" type
// set it at the end of this optimized list. But if its
// a "Preferred" one - set it to the front of this list.
- // Of course multiple "Preferred" registrations can occure
- // (they shouldnt - but they can!) ... Ignore it. The last
+ // Of course multiple "Preferred" registrations can occur
+ // (they shouldn't - but they can!) ... Ignore it. The last
// preferred type is useable in the same manner then every
// other type!
sal_Bool bPreferred = sal_False;
@@ -1127,7 +1127,7 @@ void FilterCache::impl_validateAndOptimize()
const ::rtl::OUString* pExtensions = lExtensions.getConstArray();
for (sal_Int32 e=0; e<ce; ++e)
{
- // Note: We must be shure that adress the right hash entry
+ // Note: We must be sure that address the right hash entry
// does not depend from any upper/lower case problems ...
::rtl::OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase();
@@ -1372,7 +1372,7 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::
EItemFlushState eState( E_ITEM_UNCHANGED );
- // !? ... such situation can occure, if an item was added and(!) removed before it was flushed :-)
+ // !? ... such situation can occur, if an item was added and(!) removed before it was flushed :-)
if (!bExistsInConfigLayer && !bExistsInMemory)
eState = E_ITEM_UNCHANGED;
else
@@ -1741,7 +1741,6 @@ void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::containe
}
/*-----------------------------------------------
- 29.10.2003 13:17
TODO
clarify, how the real problem behind the
wrong constructed CacheItem instance (which
@@ -1755,7 +1754,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
throw(css::uno::Exception)
{
// try to get an API object, which points directly to the
- // requested item. If it fail an exception should occure and
+ // requested item. If it fail an exception should occur and
// break this operation. Of course returned API object must be
// checked too.
css::uno::Reference< css::container::XNameAccess > xItem;
@@ -2053,7 +2052,6 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName
}
/*-----------------------------------------------
- 20.10.2003 09:45
static! => no locks neccessary
-----------------------------------------------*/
css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags)
@@ -2089,7 +2087,6 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam
}
/*-----------------------------------------------
- 27.06.2003 09:26
static! => no locks neccessary
-----------------------------------------------*/
sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames)
@@ -2302,7 +2299,6 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue,
}
/*-----------------------------------------------
- 12.02.2004 08:30
TODO work on a cache copy first, which can be flushed afterwards
That would be usefully to gurantee a consistent cache.
-----------------------------------------------*/
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index ba4eb7903ebd..3b81401ccf19 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -161,7 +161,7 @@ class FilterCache : public BaseLock
*/
enum EItemFlushState
{
- /// indicates an unchanged item (can occure e.g. if an item was added and(!) removed before it was flushed ...
+ /// indicates an unchanged item (can occur e.g. if an item was added and(!) removed before it was flushed ...
E_ITEM_UNCHANGED = 0,
/// indicates an item, which exists inside config layer but not inside our own cache
E_ITEM_REMOVED = 1,
@@ -848,7 +848,7 @@ class FilterCache : public BaseLock
points to the cache member, which should be filled or updated.
@throw [css::uno::Exception]
- if an unrecoverable error occure inside this operation.
+ if an unrecoverable error occurs inside this operation.
*/
void impl_loadSet(const css::uno::Reference< css::container::XNameAccess >& xConfig,
EItemType eType ,
@@ -870,15 +870,15 @@ class FilterCache : public BaseLock
specify, which container item type must be readed.
@param sItem
- means the internal name, which can be used to adress the item
- properties relativ to the given configuration set.
+ means the internal name, which can be used to address the item
+ properties relative to the given configuration set.
@param eOption
regulate, which properties of the requested item should be read.
See defintion of EReadOption for further informations.
@throw [css::uno::Exception]
- if an unrecoverable error occure inside this operation.
+ if an unrecoverable error occurs inside this operation.
*/
CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet ,
EItemType eType ,
@@ -911,7 +911,7 @@ class FilterCache : public BaseLock
if the item does not exists inside the configuration layer too!
@throw [css::uno::Exception]
- if an unrecoverable error occure inside this operation.
+ if an unrecoverable error occurs inside this operation.
*/
CacheItemList::iterator impl_loadItemOnDemand( EItemType eType,
const ::rtl::OUString& sItem)
diff --git a/filter/source/config/tools/split/FCFGSplit.java b/filter/source/config/tools/split/FCFGSplit.java
index 4693db4cdf83..abf0e0f4e04e 100644
--- a/filter/source/config/tools/split/FCFGSplit.java
+++ b/filter/source/config/tools/split/FCFGSplit.java
@@ -167,23 +167,23 @@ public class FCFGSplit
private static java.lang.String m_sFragmentExtension;
/** specify the sub directory to generate type fragments.
- * Its meaned relativ to m_sOutDir. */
+ * Its meaned relative to m_sOutDir. */
private static java.lang.String m_sSubDirTypes;
/** specify the sub directory to generate filter fragments.
- * Its meaned relativ to m_sOutDir. */
+ * Its meaned relative to m_sOutDir. */
private static java.lang.String m_sSubDirFilters;
/** specify the sub directory to generate detect service fragments.
- * Its meaned relativ to m_sOutDir. */
+ * Its meaned relative to m_sOutDir. */
private static java.lang.String m_sSubDirDetectServices;
/** specify the sub directory to generate frame loader fragments.
- * Its meaned relativ to m_sOutDir. */
+ * Its meaned relative to m_sOutDir. */
private static java.lang.String m_sSubDirFrameLoaders;
/** specify the sub directory to generate content handler fragments.
- * Its meaned relativ to m_sOutDir. */
+ * Its meaned relative to m_sOutDir. */
private static java.lang.String m_sSubDirContentHandlers;
/** enable/disable generating of filter groups - seperated by
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index e16f2fb27abd..d56955e030bc 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -885,7 +885,7 @@
- <!-- As draw:fame may occure within more elements than in text:p and draw:page -->
+ <!-- As draw:frame may occur within more elements than in text:p and draw:page -->
<xsl:template match="draw:frame">
<xsl:param name="globalData"/>
<xsl:param name="previousFrameWidths" select="0"/>
@@ -993,7 +993,7 @@
<!-- if the frame is anchored on a paragraph -->
<xsl:if test="@text:anchor-type='paragraph'">
<xsl:comment>Next 'div' is emulating the top hight of a draw:frame.</xsl:comment>
- <!-- When the svg:y is set relativ to the paragraph content, the best way to emulate a positive height,
+ <!-- When the svg:y is set relative to the paragraph content, the best way to emulate a positive height,
is to add an invisbile division inbetween with a height.
Often text will flow into this 'gap', which is handled separately!
-->
@@ -1079,7 +1079,6 @@
<xsl:element name="{$elem-name}">
<xsl:attribute name="style">
<xsl:call-template name="widthAndHeight"/>
- <!-- MIB -->
<xsl:text> padding:0; </xsl:text>
<xsl:if test="@text:anchor-type!='as-char'">
<!-- all images float (CSS float reltaive) with a left position calculated by svg:x - parentMarginLeft - previousFrameWidths -->
diff --git a/hwpfilter/source/hcode.cpp b/hwpfilter/source/hcode.cpp
index 02651926d0de..728d9e077ccb 100644
--- a/hwpfilter/source/hcode.cpp
+++ b/hwpfilter/source/hcode.cpp
@@ -405,23 +405,6 @@ static unsigned hhtg_tg[] =
0xD4D8, 0xD4F7, 0xD4FA, 0xD4FE, 0xD4DC, 0xD4DD, 0xD4DE, 0xD4DF
};
-/* os: unused
-static unsigned compatible_jamo[] =
-{
- 0x8000, 0x8001, 0x8002, 0x8003, 0x8004, 0x8005, 0x8006, 0x8007,
- 0x8008, 0x8009, 0x800a, 0x800b, 0x800c, 0x800d, 0x800e, 0x800f,
- 0x8010, 0x8011, 0x8012, 0x8013, 0x8014, 0x8015, 0x8016, 0x8017,
- 0x8018, 0x8019, 0x801a, 0x801b, 0x801c, 0x801d, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x8441, 0x840d, 0x840e, 0x8410,
- 0x8411, 0x8415, 0x8417, 0x841c, 0x8800, 0x8409, 0x8805, 0x8806,
- 0x8808, 0x880b, 0x801e, 0x801f, 0x880e, 0x880f, 0x8400, 0x8814,
- 0x8406, 0x8817, 0x8401, 0x8818, 0x8402, 0x8403, 0x8404, 0x8407,
- 0x8c0e, 0x8408, 0x8c14, 0x8c15, 0x9000, 0x8405, 0x9005, 0x9014,
- 0x9015, 0x8621, 0x8701, 0x9400, 0x8721, 0x87c1, 0x87e1
-};*/
-
#define LINEBASE 0x3013
// ?
diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cpp
index af458bea444f..088fcc5883ec 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cpp
@@ -418,8 +418,6 @@ ColumnDef *HWPFile::GetColumnDef(int num)
int HWPFile::GetPageMasterNum(int page)
{
LinkedListIterator<ColumnInfo> it(&columnlist);
- //os: unused
- //ColumnInfo *prev = 0;
ColumnInfo *now = 0;
int i;
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 76f318b2a77f..9906680ab99d 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3622,8 +3622,6 @@ void HwpReader::makeTextBox(TxtBox * hbox)
case PAGE_ANCHOR:
case PAPER_ANCHOR:
{
- // os unused
- // HWPInfo *hwpinfo = hwpfile.GetHWPInfo();
padd(ascii("text:anchor-type"), sXML_CDATA, ascii("page"));
padd(ascii("text:anchor-page-number"), sXML_CDATA,
ascii(Int2Str(hbox->pgno +1, "%d", buf)));
@@ -3656,8 +3654,6 @@ void HwpReader::makeTextBox(TxtBox * hbox)
ascii(Int2Str(hbox->zorder, "%d", buf)));
}
- // os unused
- // static int draw_name_id = 0;
padd(ascii("draw:style-name"), sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "Txtbox%d", buf)));
padd(ascii("draw:name"), sXML_CDATA,
@@ -3678,8 +3674,6 @@ void HwpReader::makeTextBox(TxtBox * hbox)
case PAGE_ANCHOR:
case PAPER_ANCHOR:
{
- // os unused
- // HWPInfo *hwpinfo = hwpfile.GetHWPInfo();
padd(ascii("text:anchor-type"), sXML_CDATA, ascii("page"));
padd(ascii("text:anchor-page-number"), sXML_CDATA,
ascii(Int2Str(hbox->pgno +1, "%d", buf)));
@@ -3889,8 +3883,6 @@ void HwpReader::makePicture(Picture * hbox)
case PAGE_ANCHOR:
case PAPER_ANCHOR:
{
- // os unused
- // HWPInfo *hwpinfo = hwpfile.GetHWPInfo();
padd(ascii("text:anchor-type"), sXML_CDATA, ascii("page"));
padd(ascii("text:anchor-page-number"), sXML_CDATA,
ascii(Int2Str(hbox->pgno +1, "%d", buf)));
@@ -3942,10 +3934,6 @@ void HwpReader::makePicture(Picture * hbox)
padd(ascii("draw:name"), sXML_CDATA,
ascii(Int2Str(hbox->style.boxnum, "Image%d", buf)));
- // os unused
- // int x = 0;
- // int y = 0;
-
if( hbox->style.cap_len <= 0 )
{
padd(ascii("draw:z-index"), sXML_CDATA,
@@ -3961,8 +3949,6 @@ void HwpReader::makePicture(Picture * hbox)
case PAGE_ANCHOR:
case PAPER_ANCHOR:
{
- // os unused
- // HWPInfo *hwpinfo = hwpfile.GetHWPInfo();
padd(ascii("text:anchor-type"), sXML_CDATA, ascii("page"));
padd(ascii("text:anchor-page-number"), sXML_CDATA,
ascii(Int2Str(hbox->pgno +1, "%d", buf)));
@@ -4438,12 +4424,10 @@ void HwpReader::makePictureDRAW(HWPDrawingObject *drawobj, Picture * hbox)
}
case HWPDO_CURVE: /* ???? : ?????????? ????. */
{
- sal_Bool bIsNatural = sal_True;
- // os unused
- // int nCount = drawobj->u.freeform.npt;
- if( drawobj->property.flag >> 5 & 0x01){
- bIsNatural = sal_False;
- }
+ sal_Bool bIsNatural = sal_True;
+ if( drawobj->property.flag >> 5 & 0x01){
+ bIsNatural = sal_False;
+ }
if( !bIsRotate )
{
padd(ascii("svg:x"), sXML_CDATA,
diff --git a/hwpfilter/source/lexer.cpp b/hwpfilter/source/lexer.cpp
index 690cda7eb076..3c73a66ff48e 100644
--- a/hwpfilter/source/lexer.cpp
+++ b/hwpfilter/source/lexer.cpp
@@ -1836,52 +1836,6 @@ yy_state_type yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
-/* yyunput unused
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
- {
- register char *yy_cp = yy_c_buf_p;
-
- // undo effects of setting up yytext
- *yy_cp = yy_hold_char;
-
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- { // need to shift things up to make room
- // +2 for EOB chars.
- register int number_to_move = yy_n_chars + 2;
- register char *dest = &yy_current_buffer->yy_ch_buf[
- yy_current_buffer->yy_buf_size + 2];
- register char *source =
- &yy_current_buffer->yy_ch_buf[number_to_move];
-
- while ( source > yy_current_buffer->yy_ch_buf )
- *--dest = *--source;
-
- yy_cp += (int) (dest - source);
- yy_bp += (int) (dest - source);
- yy_current_buffer->yy_n_chars =
- yy_n_chars = yy_current_buffer->yy_buf_size;
-
- if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
-
- *--yy_cp = (char) c;
-
-
- yytext_ptr = yy_bp;
- yy_hold_char = *yy_cp;
- yy_c_buf_p = yy_cp;
- }
-#endif // ifndef YY_NO_UNPUT
-*/
-
#ifdef __cplusplus
static int yyinput()
#else
diff --git a/oox/inc/oox/xls/scenariobuffer.hxx b/oox/inc/oox/xls/scenariobuffer.hxx
index e9e987db9d31..e484e418473d 100644
--- a/oox/inc/oox/xls/scenariobuffer.hxx
+++ b/oox/inc/oox/xls/scenariobuffer.hxx
@@ -140,7 +140,7 @@ public:
/** Creates and returns a scenario collection for the passed sheet. */
SheetScenarios& createSheetScenarios( sal_Int16 nSheet );
- /** Creates all scenarios in the Calc dcument. */
+ /** Creates all scenarios in the Calc document. */
void finalizeImport();
private:
diff --git a/oox/source/xls/workbookhelper.cxx b/oox/source/xls/workbookhelper.cxx
index bf93ef25608b..d5936d68e57f 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -253,7 +253,7 @@ private:
FilterType meFilterType; /// File type of the filter.
ProgressBarPtr mxProgressBar; /// The progress bar.
StorageRef mxVbaPrjStrg; /// Storage containing the VBA project.
- sal_Int16 mnCurrSheet; /// Current sheet index in Calc dcument.
+ sal_Int16 mnCurrSheet; /// Current sheet index in Calc document.
bool mbWorkbook; /// True = multi-sheet file.
// buffers
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 59b6db6aa84c..0548d099394e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -86,7 +86,7 @@ public class Convert implements Cloneable {
/**
* Adds an <code>InputStream</code> to be used as input by the
* <code>Convert</code> class. It is possible that many files
- * need to be converted into a single output <code>Documetn</code>,
+ * need to be converted into a single output <code>Document</code>,
* so this function may be called more than one time. It is the
* plug-in's responsibility to know how to handle the input.
*
@@ -111,7 +111,7 @@ public class Convert implements Cloneable {
/**
* Adds an <code>InputStream</code> to be used as input by the
* <code>Convert</code> class. It is possible that many files
- * need to be converted into a single output <code>Documetn</code>,
+ * need to be converted into a single output <code>Document</code>,
* so this function may be called more than one time. It is the
* plug-in's responsibility to know how to handle the input.
*
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
index 315ebc0cf051..717419a775c4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
@@ -29,7 +29,7 @@ package org.openoffice.xmerge;
/**
* <p>A <code>DocumentDeserializer</code> object is used to convert
- * from the &quot;Device&quot; <code>Documetn</code> format to the
+ * from the &quot;Device&quot; <code>Document</code> format to the
* &quot;Office&quot; <code>Document</code> format.</p>
*
* <p>All plug-in implementations of the <code>PluginFactory</code>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
index 99038df73cc6..7e7eb0f8ab9c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDocument.java
@@ -38,7 +38,7 @@ import org.openoffice.xmerge.Document;
/**
* <p> A <code>PalmDocument</code> is palm implementaion of the
- * <code>Docuemnt</code> interface.</p>
+ * <code>Document</code> interface.</p>
*
* <p>This implementation allows the Palm device format to be
* read via an <code>InputStream</code> and written via an