Code cleanup

* Remove dead code
* Fix comment typos
Released under LGPLv3+/MPL

44 files changed, 63 insertions, 141 deletions

diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 6b30d2327845..a4a209772d3f 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -65,7 +65,7 @@ namespace filter{
                 should be available etc.
 
     @attention  The base class BaseLock must be the first of declared ones.
-                Otherwhise we cant be shure, that our own mutex member (which is
+                Otherwise we cant be shure, that our own mutex member (which is
                 present by this base class!) was full initialized inside our own
                 ctor as first!
  */
@@ -213,7 +213,7 @@ class BaseContainer : public BaseLock
 
             @note   The lifetime of this pointer is restricted to the time, where
                     the mutex of this BaseContainer instance is locked.
-                    Otherwhise may be the interface method flush() will destroy
+                    Otherwise may be the interface method flush() will destroy
                     m_pFlushCache and the here returned pointer will be invalid!
 
                     Use:
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 2260e076c4bc..d76aa92dd1ee 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -202,12 +202,12 @@ typedef ::boost::unordered_map< ::rtl::OUString                    ,
 
     @descr  E.g. a list of internal type names can be registered
             to an extension. Organization as an hash makes it
-            faster then searching inside vectors.
+            faster than searching inside vectors.
 
-            On the other side e.g. URLPattern cant be realy adressed
+            On the other side e.g. URLPattern cant be really addressed
             by a hash value ... because the use wildcards. But
             there we need key-value pairs too, which cant be provided
-            by a pur vector!
+            by a pure vector!
  */
 typedef ::boost::unordered_map< ::rtl::OUString                    ,
                          OUStringList                       ,
@@ -222,7 +222,7 @@ typedef ::boost::unordered_map< ::rtl::OUString                    ,
     @descr  Every type in this list is combined with an information,
             which property matched to the given URL. The user of this
             structure can decide then, if a deep detection should be
-            supressed e.g. if an URLPattern was used.
+            suppressed e.g. if an URLPattern was used.
  */
 struct  FlatDetectionInfo
 {
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 9901c812e85a..eeb8cd288c81 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -203,10 +203,10 @@ void SAL_CALL  CacheUpdateListener::changesOccurred(const css::util::ChangesEven
         catch(const css::container::NoSuchElementException&)
             {
                 // can be ignored! Because we must be aware that
-                // sItem was removed from the condfiguration and we forced an update of the cache.
+                // sItem was removed from the configuration and we forced an update of the cache.
                 // But we know, that the cache is up-to-date know and has thrown this exception afterwards .-)
             }
-        // NO FLUSH! Otherwhise we start a never ending story here .-)
+        // NO FLUSH! Otherwise we start a never ending story here .-)
         bNotifyRefresh = sal_True;
     }
 
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index f1dd5c96d715..097f8aa1117e 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -188,7 +188,7 @@ extern rtl::OUString pFilterStrings[];
 #define  SERVICE_URLTRANSFORMER             _FILTER_CONFIG_FROM_ASCII_("com.sun.star.util.URLTransformer"                     )
 #define  SERVICE_FILTERCONFIGREFRESH        _FILTER_CONFIG_FROM_ASCII_("com.sun.star.document.FilterConfigRefresh"            )
 
-/** @short  some configuration pathes.
+/** @short  some configuration paths.
  */
 #define  CFGPACKAGE_TD_TYPES           _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Types" )
 #define  CFGPACKAGE_TD_FILTERS         _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Filter")
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 95814a6aef6c..b3f5c91ab00c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -156,7 +156,7 @@ void FilterCache::takeOver(const FilterCache& rClone)
 
     // c)
     // Take over only changed items!
-    // Otherwhise we risk the following scenario:
+    // Otherwise we risk the following scenario:
     // c1) clone_1 contains changed filters
     // c2) clone_2 container changed types
     // c3) clone_1 take over changed filters and unchanged types
@@ -226,7 +226,7 @@ void FilterCache::load(EFillState eRequired,
     }
 #endif
 
-    // Otherwhise load the missing items.
+    // Otherwise load the missing items.
 
     // ------------------------------------------
     // a) load some const values from configration.
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 3b81401ccf19..afef5f6d4ad0 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -320,7 +320,7 @@ class FilterCache : public BaseLock
 
                     The original container will get these new data automaticly
                     because it listen for changes on the internal used configuration layer.
-                    If the new data are needed immediatly inside the original container,
+                    If the new data are needed immediately inside the original container,
                     the method takeOver() can be used to copy all changes back.
                     The may be following notifications of the configuration will be superflous then.
                     But they cant be stopped ...
@@ -346,7 +346,7 @@ class FilterCache : public BaseLock
 
             @descr      This method check if all requested items/properties already
                         exists. Only missing informations will be readed.
-                        Otherwhise this method does nothing!
+                        Otherwise this method does nothing!
 
                         This method must be called from every user of this cache
                         everytimes it need a filled cache. Normaly we load
diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx
index daff2deef08a..15ae1cfc5e85 100644
--- a/filter/source/config/cache/lateinitlistener.cxx
+++ b/filter/source/config/cache/lateinitlistener.cxx
@@ -54,8 +54,8 @@ LateInitListener::LateInitListener(const css::uno::Reference< css::lang::XMultiS
     , m_xSMGR (xSMGR)
 {
     // important to do so ...
-    // Otherwhise the temp. reference to ourselves
-    // will kill us at realeasing time!
+    // Otherwise the temp. reference to ourselves
+    // will kill us at releasing time!
     osl_incrementInterlockedCount( &m_refCount );
 
     m_xBroadcaster = css::uno::Reference< css::document::XEventBroadcaster >(
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index 90afbbea3d09..c7a18ef245cf 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -350,7 +350,7 @@ class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer
 
             @descr      This method works together with impl_validateAndSetTypeOnDescriptor()/
                         impl_validateAndSetFilterOnDescriptor(). All informations, which can be
-                        set by these two operations must be "removeable" by this method.
+                        set by these two operations must be "removable" by this method.
 
             @param      rDescriptor
                         reference to the MediaDescriptor (represented by an easy-to-use
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f33bf96a74f7..0b34fac649a6 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -583,7 +583,7 @@ void DffPropSet::Merge( DffPropSet& rMaster ) const
             sal_uInt32 nCurrentFlags = mpContents[ nRecType ];
             sal_uInt32 nMergeFlags = rMaster.mpContents[ nRecType ];
             nMergeFlags &=  ( nMergeFlags >> 16 ) | 0xffff0000;             // clearing low word
-            nMergeFlags &= ( ( nCurrentFlags & 0xffff0000 )                 // remove allready hard set
+            nMergeFlags &= ( ( nCurrentFlags & 0xffff0000 )                 // remove already hard set
                             | ( nCurrentFlags >> 16 ) ) ^ 0xffffffff;       // attributes from mergeflags
             nCurrentFlags &= ( ( nMergeFlags & 0xffff0000 )                 // apply zero master bits
                             | ( nMergeFlags >> 16 ) ) ^ 0xffffffff;
diff --git a/filter/source/xslt/import/wordml/wordml2ooo.xsl b/filter/source/xslt/import/wordml/wordml2ooo.xsl
index 849e4a7c662e..ed661265fe5c 100644
--- a/filter/source/xslt/import/wordml/wordml2ooo.xsl
+++ b/filter/source/xslt/import/wordml/wordml2ooo.xsl
@@ -237,7 +237,7 @@
     <xsl:template match="w:body">
         <xsl:element name="office:body">
             <xsl:element name="office:text">
-                <!-- to add the sequece variable declaration at the begining of the office:body  G.Y.-->
+                <!-- to add the sequece variable declaration at the beginning of the office:body  G.Y.-->
                 <text:sequence-decls>
                     <xsl:call-template name="default_seqence_declaration"/>
                     <xsl:apply-templates select="/w:wordDocument/w:body//w:instrText[substring(normalize-space(text()),1,3) = 'SEQ' ] | /w:wordDocument/w:body//w:fldSimple[substring(normalize-space(@w:instr),1,3) = 'SEQ' ]  " mode="sequence_declare"/>
diff --git a/hwpfilter/source/hinfo.cpp b/hwpfilter/source/hinfo.cpp
index e8768d0c9ea9..fb57e49d6de3 100644
--- a/hwpfilter/source/hinfo.cpp
+++ b/hwpfilter/source/hinfo.cpp
@@ -34,8 +34,6 @@
 
 // Info Block
 
-//int ParaShape::count = 0;
-//int CharShape::count = 0;
 
 static bool HWPReadInfoBlock(void *ptr, int len, HWPFile & hwpf)
 {
@@ -47,7 +45,7 @@ static bool HWPReadInfoBlock(void *ptr, int len, HWPFile & hwpf)
 }
 
 
-// Document Infomation
+// Document Information
 
 HWPInfo::HWPInfo(void)
 {
@@ -161,8 +159,6 @@ bool HWPSummary::Read(HWPFile & hwpf)
 }
 
 
-//
-
 bool ParaShape::Read(HWPFile & hwpf)
 {
      pagebreak = 0;
@@ -195,18 +191,8 @@ bool ParaShape::Read(HWPFile & hwpf)
 }
 
 
-/*
-CharShape::~CharShape()
-{
-}
-ParaShape::~ParaShape()
-{
-}
-
-*/
 bool CharShape::Read(HWPFile & hwpf)
 {
-//index = ++count;
     size = (short) hwpf.Read2b();
     hwpf.Read1b(font, NLanguage);
     hwpf.Read1b(ratio, NLanguage);
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cpp
index f781a311223d..06a5786d90ea 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cpp
@@ -94,7 +94,7 @@ int HWPPara::Read(HWPFile & hwpf, unsigned char flag)
     unsigned char same_cshape;
     register int ii;
     scflag = flag;
-// Paragraph Infomation
+// Paragraph Information
     hwpf.Read1b(&reuse_shape, 1);
     hwpf.Read2b(&nch, 1);
     hwpf.Read2b(&nline, 1);
@@ -213,7 +213,7 @@ HBox *HWPPara::readHBox(HWPFile & hwpf)
 
     if (hwpf.State() != HWP_NoError)
         return 0;
-//hbox = new HBox(hh);
+
     if (hh > 31 || hh == CH_END_PARA)
         hbox = new HBox(hh);
     else if (IS_SP_SKIP_BLOCK(hh))
@@ -313,7 +313,6 @@ HBox *HWPPara::readHBox(HWPFile & hwpf)
         }
     }
     return hbox;
-//return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cpp
index 088fcc5883ec..5d8b5f09e910 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cpp
@@ -117,18 +117,12 @@ int HWPFile::ReadHwpFile(HStream & stream)
 {
     if (Open(stream) != HWP_NoError)
         return State();
-//  printf("HWPFile::ReadHwpFile\n");
     InfoRead();
-//  printf("HWPFile::InfoRead Done.\n");
     FontRead();
-//  printf("HWPFile::FontRead Done.\n");
     StyleRead();
-//  printf("HWPFile::StyleRead Done.\n");
     AddColumnInfo();
     ParaListRead();
-//  printf("HWPFile::ParaListRead Done.\n");
     TagsRead();
-    //printf("HWPFile::TagsRead Done. State: %d\n", State());
 
     return State();
 }
@@ -326,7 +320,6 @@ bool HWPFile::TagsRead(void)
         tag = Read4b();
         size = Read4b();
         if (size <= 0 && tag > 0){
-            //return false;
             continue;
           }
 
@@ -402,7 +395,6 @@ bool HWPFile::TagsRead(void)
                 SkipBlock(size);
         }
     }
-//    return false;
 }
 
 
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 3ffc6a5c679e..cdf36c923274 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -35,10 +35,9 @@
 
 #include "hwpreader.hxx"
 #include <math.h>
-//#ifndef UDK100
 #include "formula.h"
 #include "cspline.h"
-//#endif
+
 extern int getRepFamilyName(const char* , char *, double &ratio);
 
 #include <iostream>
@@ -421,17 +420,6 @@ void HwpReader::makeMeta()
         }
         rendEl(ascii("meta:keywords"));
     }
-/*
-    padd(ascii("meta:name"), sXML_CDATA, ascii("BBSID"));
-    rstartEl(ascii("meta:user-defined"), rList);
-    pList->clear();
-    rchars((hconv(hwpinfo->summary.etc[2], gstr)));
-    rendEl(ascii("meta:user-defined"));
-
-    rstartEl(ascii("dc:language"), rList);
-    rchars(ascii("C"));
-    rendEl(ascii("dc:language"));
-*/
     rendEl(ascii("office:meta"));
 }
 
@@ -900,8 +888,6 @@ void HwpReader::makeAutoStyles()
             makeFStyle(hwpfile.getFBoxStyle(i));
     }
 
-// sal_Bool bIsLeft = sal_True, bIsMiddle = sal_True, bIsRight = sal_True;
-
     sal_Bool bIsLeft = sal_False, bIsMiddle = sal_False, bIsRight = sal_False;
     for( i = 0 ; i < hwpfile.getPageNumberCount() ; i++ )
     {
@@ -2094,16 +2080,8 @@ void HwpReader::makeDrawStyle( HWPDrawingObject * hdo, FBoxStyle * fstyle)
         switch (fstyle->txtflow)
         {
             case 0:
-//padd(ascii("style:wrap"), sXML_CDATA, ascii("none"));
                 break;
             case 1:
-                     /*
-                padd(ascii("style:run-through"), sXML_CDATA, ascii("foreground"));
-                padd(ascii("style:wrap"), sXML_CDATA, ascii("parallel"));
-                padd(ascii("style:number-wrapped-paragraphs"), sXML_CDATA, ascii("no-limit"));
-                padd(ascii("style:wrap-contour"), sXML_CDATA, ascii("true"));
-                padd(ascii("style:wrap-contour-mode"), sXML_CDATA, ascii("full"));
-                     */
                 padd(ascii("style:wrap"), sXML_CDATA, ascii("run-through"));
                 break;
             case 2:
@@ -2762,7 +2740,6 @@ char *HwpReader::getPStyleName(int index, char *_buf)
 }
 
 
-//void HwpReader::makeChars(char *str, int size)
 void HwpReader::makeChars(hchar *str, int size)
 {
     if (size)
@@ -3370,7 +3347,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
     pList->clear();
 
     bool add_zero = false;
-    int zero_check = 0/*, i=0*/;
+    int zero_check = 0;
     hbox->format[DATE_SIZE -1] = 0;
 
     hchar *fmt = hbox->format[0] ? hbox->format : defaultform;
@@ -3489,16 +3466,7 @@ void HwpReader::makeDateFormat(DateCode * hbox)
                 pList->clear();
                 rendEl(ascii("number:am-pm"));
                 break;
-            case '~':                             // Chiness Locale
-/*
-if( fmt[1] == 0 ) break;
-fmt++;
-if( *fmt == '6' ){
-    rstartEl(ascii("number:day-of-week"), rList);
-    pList->clear();
-    rendEl(ascii("number:day-of-week"));
-}
-*/
+            case '~':                             // Chinese Locale
                 break;
             default:
                 sbuf[0] = *fmt;
@@ -4766,26 +4734,8 @@ void HwpReader::makeAutoNum(AutoNum * hbox)
             rendEl(ascii("text:page-number"));
             break;
         case FNNUM_AUTO:
-/*
-padd(ascii("text:ref-name"), sXML_CDATA,
-     ascii(Int2Str(hbox->number + 1, "ftn%d", buf)));
-rstartEl(ascii("text:footnote-ref"), rList);
-pList->clear();
-//rchars(ascii(Int2Str(hbox->number + 1, "%d", buf)));
-rchars(ascii(""));
-rendEl(ascii("text:footnote-ref"));
-*/
             break;
         case ENNUM_AUTO:
-/*
-padd(ascii("text:ref-name"), sXML_CDATA,
-     ascii(Int2Str(hbox->number + 1, "edn%d", buf)));
-rstartEl(ascii("text:endnote-ref"), rList);
-pList->clear();
-//rchars(ascii(Int2Str(hbox->number + 1, "%d", buf)));
-rchars(ascii(""));
-rendEl(ascii("text:endnote-ref"));
-*/
             break;
         case EQUNUM_AUTO:
         case PICNUM_AUTO:
diff --git a/lotuswordpro/source/filter/lwpatomholder.cxx b/lotuswordpro/source/filter/lwpatomholder.cxx
index 147571e3a58e..de680fe9350a 100644
--- a/lotuswordpro/source/filter/lwpatomholder.cxx
+++ b/lotuswordpro/source/filter/lwpatomholder.cxx
@@ -70,7 +70,7 @@ LwpAtomHolder::~LwpAtomHolder()
 */
 void LwpAtomHolder::Read(LwpObjectStream *pStrm)
 {
-    //Refered to lwp: file40.cpp, QuickReadAtomHolder()
+    //Referred to lwp: file40.cpp, QuickReadAtomHolder()
 
     sal_uInt16 diskSize = pStrm->QuickReaduInt16();
     sal_uInt16 len = pStrm->QuickReaduInt16();
@@ -101,7 +101,7 @@ void LwpAtomHolder::Skip(LwpObjectStream *pStrm)
 */
 void LwpAtomHolder::ReadPathAtom(LwpObjectStream *pStrm)
 {
-    //Refered to lwp: file40.cpp, QuickReadPathAtom()
+    //Referred to lwp: file40.cpp, QuickReadPathAtom()
     // TODO:  Read the data. Now just skip it. The method to skip is same as above.
     Skip(pStrm);
 }
diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx
index 5653fd8d53f3..3471ad379616 100644
--- a/lotuswordpro/source/filter/lwpfilter.hxx
+++ b/lotuswordpro/source/filter/lwpfilter.hxx
@@ -164,7 +164,7 @@ public:
     sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw ();
 
     /**
-     * @descr   function of interface XExtendedFilterDetection. If this interface is registed, it will be called whenever
+     * @descr   function of interface XExtendedFilterDetection. If this interface is registered, it will be called whenever
      *          a file is to be loaded.
      */
     virtual ::rtl::OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index 88ce20601e2d..364550fd4fea 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -332,7 +332,7 @@ LwpObjectID * LwpFoundry::FindParaStyleByName(OUString name)
 }
 
 /**
-* @descr:   Get style name registed according the original style name
+* @descr:   Get style name registered according the original style name
 *
 */
 OUString LwpFoundry::FindActuralStyleName(OUString name)
@@ -358,7 +358,7 @@ void LwpVersionManager::Read(LwpObjectStream *pStrm)
 
 void LwpVersionManager::Skip(LwpObjectStream *pStrm)
 {
-    /*sal_uInt32 cNextUserVersionID =*/ pStrm->QuickReaduInt32();
+    pStrm->QuickReaduInt32();
     sal_uInt16 Count = pStrm->QuickReaduInt16();
 
     while(Count--)
@@ -369,7 +369,6 @@ void LwpVersionManager::Skip(LwpObjectStream *pStrm)
             case TAG_USER_VERSION:
                 // TODO: skip the CUserVersionControl
                 pStrm->SeekRel(pStrm->QuickReaduInt16());
-                //pStrm->SkipExtra(); //The length has included the extra
                 break;
 
             default:
diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx b/lotuswordpro/source/filter/lwplaypiece.cxx
index b8853dd6d449..05f8fab65d9c 100644
--- a/lotuswordpro/source/filter/lwplaypiece.cxx
+++ b/lotuswordpro/source/filter/lwplaypiece.cxx
@@ -57,10 +57,6 @@
  * @file
  *  For LWP filter architecture prototype
  ************************************************************************/
-/*************************************************************************
- * Change History
- Jan 28 2005            Created
- ************************************************************************/
 
 #include "lwplaypiece.hxx"
 
@@ -409,7 +405,7 @@ LwpLayoutRelativityGuts::LwpLayoutRelativityGuts()
     m_nFlags = 0;
 }
 /**************************************************************************
- * @descr: Read LayoutRelativityGuts' infomation.
+ * @descr: Read LayoutRelativityGuts' information.
  * @param:
  * @param:
  * @return:
diff --git a/lotuswordpro/source/filter/xfilter/ixfobject.hxx b/lotuswordpro/source/filter/xfilter/ixfobject.hxx
index 4ad884b2005e..150cfcca6dcb 100644
--- a/lotuswordpro/source/filter/xfilter/ixfobject.hxx
+++ b/lotuswordpro/source/filter/xfilter/ixfobject.hxx
@@ -63,7 +63,7 @@
 class IXFStream;
 /*************************************************************************
  * @descr
- * This is the root interface for all object which will ouput something to
+ * This is the root interface for all object which will output something to
  * the Sax Stream.
  * I'll add reference management code later.
  ************************************************************************/
diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
index c27aa22b6ff3..44a9c10fbfe6 100644
--- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.hxx
@@ -68,7 +68,7 @@
 
 /**
  * @brief
- * Config infomation for OOo document, ie, line count config, endnote and footnote config.
+ * Config information for OOo document, ie, line count config, endnote and footnote config.
  * This object should only exist one instance.
  * Don't make this obejct an singleton because it's managed by XFStyleManager.
  */
diff --git a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
index 7383738cf40f..d9729dc68fef 100644
--- a/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfnumfmt.hxx
@@ -100,7 +100,7 @@ public:
 
     /**********************************************************************
      * @descr:      set the display value. ie. if you set format to '1',then
-                    the ouput would be:
+                    the output would be:
                         1 item1
                         2 item2
                     or if you set the format to 'a', then the output would be:
diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
index 3d00d2a28116..e1db8df313dc 100644
--- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx
@@ -85,7 +85,7 @@ enumXFContent XFParagraph::GetContentType()
 }
 
 /**
- * The paragraph obejct serial function,the ouput will be like:
+ * The paragraph object serial function,the output will be like:
  *      <text:p>
  *          <text:span text:style-name="T1">text content</text:span>
  *              text.
diff --git a/oox/inc/oox/core/filterbase.hxx b/oox/inc/oox/core/filterbase.hxx
index 5a106354c769..4a58cc5ec9d9 100644
--- a/oox/inc/oox/core/filterbase.hxx
+++ b/oox/inc/oox/core/filterbase.hxx
@@ -213,7 +213,7 @@ public:
         the imported document. */
     ModelObjectHelper&  getModelObjectHelper() const;
 
-    /** Returns a helper for the handling of OLE obejcts. */
+    /** Returns a helper for the handling of OLE objects. */
     ::oox::ole::OleObjectHelper& getOleObjectHelper() const;
 
     /** Returns the VBA project manager. */
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index 4c0d0976ca74..2d5d71148b55 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -60,7 +60,7 @@ namespace oox {
     persistent graphic objects internally and store them in an internal
     container to prevent their early destruction. This makes it possible to use
     the returned URL of the graphic object in any way (e.g. insert it into a
-    property map) without needing to store it immediatly at an object that
+    property map) without needing to store it immediately at an object that
     resolves the graphic object from the passed URL and thus prevents it from
     being destroyed.
  */
diff --git a/oox/inc/oox/helper/refmap.hxx b/oox/inc/oox/helper/refmap.hxx
index 48e04efba61f..dc1089aeb61d 100644
--- a/oox/inc/oox/helper/refmap.hxx
+++ b/oox/inc/oox/helper/refmap.hxx
@@ -55,7 +55,7 @@ public:
     typedef typename container_type::key_compare                            key_compare;
 
 public:
-    /** Returns true, if the object accossiated to the passed key exists.
+    /** Returns true, if the object associated to the passed key exists.
         Returns false, if the key exists but points to an empty reference. */
     inline bool         has( key_type nKey ) const
                         {
@@ -63,7 +63,7 @@ public:
                             return pxRef && pxRef->get();
                         }
 
-    /** Returns a reference to the object accossiated to the passed key, or an
+    /** Returns a reference to the object associated to the passed key, or an
         empty reference on error. */
     inline mapped_type  get( key_type nKey ) const
                         {
diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx
index 5135452583c3..627da96e987a 100644
--- a/oox/inc/oox/vml/vmlformatting.hxx
+++ b/oox/inc/oox/vml/vmlformatting.hxx
@@ -192,12 +192,12 @@ struct FillModel
     OptValue< ::rtl::OUString > moColor;        /// Solid fill color.
     OptValue< double >  moOpacity;              /// Solid fill color opacity.
     OptValue< ::rtl::OUString > moColor2;       /// End color of gradient.
-    OptValue< double >  moOpacity2;             /// End color opycity of gradient.
+    OptValue< double >  moOpacity2;             /// End color opacity of gradient.
     OptValue< sal_Int32 > moType;               /// Fill type.
     OptValue< sal_Int32 > moAngle;              /// Gradient rotation angle.
     OptValue< double >  moFocus;                /// Linear gradient focus of second color.
-    OptValue< DoublePair > moFocusPos;          /// Rectanguar gradient focus position of second color.
-    OptValue< DoublePair > moFocusSize;         /// Rectanguar gradient focus size of second color.
+    OptValue< DoublePair > moFocusPos;          /// Rectangular gradient focus position of second color.
+    OptValue< DoublePair > moFocusSize;         /// Rectangular gradient focus size of second color.
     OptValue< ::rtl::OUString > moBitmapPath;   /// Path to fill bitmap fragment.
     OptValue< bool >    moRotate;               /// True = rotate gradient/bitmap with shape.
 
diff --git a/oox/inc/oox/vml/vmlshapecontainer.hxx b/oox/inc/oox/vml/vmlshapecontainer.hxx
index 96831dc8212a..288062566a00 100644
--- a/oox/inc/oox/vml/vmlshapecontainer.hxx
+++ b/oox/inc/oox/vml/vmlshapecontainer.hxx
@@ -73,7 +73,7 @@ public:
     /** Final processing after import of the drawing fragment. */
     void                finalizeFragmentImport();
 
-    /** Returns true, if this contaikner does not contain any shapes. */
+    /** Returns true, if this container does not contain any shapes. */
     inline bool         empty() const { return maShapes.empty(); }
 
     /** Returns the shape template with the passed identifier.
diff --git a/oox/inc/oox/xls/biffoutputstream.hxx b/oox/inc/oox/xls/biffoutputstream.hxx
index c58b86fa4496..2a4ea9d2c20b 100644
--- a/oox/inc/oox/xls/biffoutputstream.hxx
+++ b/oox/inc/oox/xls/biffoutputstream.hxx
@@ -69,7 +69,7 @@ public:
 private:
     typedef ::std::vector< sal_uInt8 > DataBuffer;
 
-    BinaryOutputStream& mrOutStrm;              /// Core ouput stream.
+    BinaryOutputStream& mrOutStrm;              /// Core output stream.
     DataBuffer          maData;                 /// Record data buffer.
     sal_uInt16          mnMaxRecSize;           /// Maximum size of record contents.
     sal_uInt16          mnRecId;                /// Current record identifier.
diff --git a/oox/inc/oox/xls/defnamesbuffer.hxx b/oox/inc/oox/xls/defnamesbuffer.hxx
index f7a6b0cdc53c..a4b9257189fd 100644
--- a/oox/inc/oox/xls/defnamesbuffer.hxx
+++ b/oox/inc/oox/xls/defnamesbuffer.hxx
@@ -192,7 +192,7 @@ public:
     /** Creates all defined names in the document. */
     void                finalizeImport();
 
-    /** Returns a defined name by zero-based index (order of appearence). */
+    /** Returns a defined name by zero-based index (order of appearance). */
     DefinedNameRef      getByIndex( sal_Int32 nIndex ) const;
     /** Returns a defined name by token index (index in XDefinedNames container). */
     DefinedNameRef      getByTokenIndex( sal_Int32 nIndex ) const;
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 98040dc60ace..5c01b2e0f8f0 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -549,7 +549,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
         BinaryXInputStream aInfoStrm( xEncryptionInfo, true );
         bool bValidInfo = lclReadEncryptionInfo( aEncryptInfo, aInfoStrm );
 
-        // check flags and agorithm IDs, requiered are AES128 and SHA-1
+        // check flags and algorithm IDs, required are AES128 and SHA-1
         bool bImplemented = bValidInfo &&
             getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_CRYPTOAPI ) &&
             getFlag( aEncryptInfo.mnFlags, ENCRYPTINFO_AES ) &&
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 233066377818..23e2e19a546d 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -2023,7 +2023,7 @@ if ( maShapePresetType.equals( sWedgeRoundedRectCallout ) ) {
             // to determine the correct adjustment handle that should be updated with the adjustment
             // position. here is the solution: the adjustment value that is used within the position
             // has to be updated, in case the position is a formula the first usage of a
-            // adjument value is decisive
+            // adjustment value is decisive
             if ( maAdjustHandleList[ i ].polar )
             {
                 aHandle[ PROP_Position ] <<= maAdjustHandleList[ i ].pos;
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 45bd03024c94..3edf483555da 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -221,7 +221,7 @@ void SAL_CALL LayoutNodeContext::endFastElement( ::sal_Int32 )
 }
 
 /** convert the XML tag to a variable index in the array
- * @param aTag the tag, wihout namespace
+ * @param aTag the tag, without namespace
  * @return the variable index. -1 is an error
  */
 sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag )
diff --git a/oox/source/export/preset-definitions-to-shape-types.pl b/oox/source/export/preset-definitions-to-shape-types.pl
index c185a07cdce3..be53eb88d756 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -853,7 +853,7 @@ sub start_element( $% )
             $path .= "x";
         }
         elsif ( $element eq "pt" ) {
-            # rememeber the last position for the arcTo
+            # remember the last position for the arcTo
             $last_pos_x = value( $attr{'x'} );
             $last_pos_y = value( $attr{'y'} );
 
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 1a317c14db0f..554d49faae53 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -102,7 +102,7 @@ void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
 
         m_pShapeStyle->ensureCapacity( 200 );
 
-        // postpone the ouput so that we are able to write even the elements
+        // postpone the output so that we are able to write even the elements
         // that we learn inside Commit()
         m_pSerializer->mark();
     }
diff --git a/oox/source/xls/formulaparser.cxx b/oox/source/xls/formulaparser.cxx
index 7260144ab9ab..fa96869afadc 100644
--- a/oox/source/xls/formulaparser.cxx
+++ b/oox/source/xls/formulaparser.cxx
@@ -372,7 +372,7 @@ const ApiToken* FormulaFinalizer::findParameters( ParameterPosVector& rParams,
 
 void FormulaFinalizer::appendEmptyParameter( const FunctionInfo& rFuncInfo, size_t nParam )
 {
-    // remeber old size of the token array
+    // remember old size of the token array
     size_t nTokenArraySize = maTokens.size();
 
     switch( rFuncInfo.mnBiff12FuncId )
diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx
index 5daf7cebb9ef..df6d93c3f53c 100644
--- a/oox/source/xls/stylesbuffer.cxx
+++ b/oox/source/xls/stylesbuffer.cxx
@@ -212,7 +212,7 @@ const sal_uInt8 BIFF_FONTUNDERL_DOUBLE_ACC  = 34;
 const sal_uInt16 BIFF_XF_LOCKED             = 0x0001;
 const sal_uInt16 BIFF_XF_HIDDEN             = 0x0002;
 const sal_uInt16 BIFF_XF_STYLE              = 0x0004;
-const sal_uInt16 BIFF_XF_STYLEPARENT        = 0x0FFF;   /// Syles don't have a parent.
+const sal_uInt16 BIFF_XF_STYLEPARENT        = 0x0FFF;   /// Styles don't have a parent.
 const sal_uInt16 BIFF_XF_WRAPTEXT           = 0x0008;   /// Automatic line break.
 const sal_uInt16 BIFF_XF_JUSTLASTLINE       = 0x0080;
 const sal_uInt16 BIFF_XF_SHRINK             = 0x0010;   /// Shrink to fit into cell.
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 4211bb4878f2..9259caa318e0 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -579,7 +579,7 @@ namespace DOM
                     reinterpret_cast<xmlNodePtr>(res)).get()),
             UNO_QUERY_THROW);
 
-        // attribute adition event
+        // attribute addition event
         // dispatch DOMAttrModified event
         Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY);
         Reference< XMutationEvent > event(docevent->createEvent(
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
index 11240b4bceac..b224baafc48a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
@@ -76,7 +76,7 @@ public abstract class EmbeddedObject {
      * Retrieves the name of the embedded object represented by an instance of
      * this class.
      *
-     * <b>N.B.</b>The name referes to the name as found in the
+     * <b>N.B.</b>The name refers to the name as found in the
      * <code>META-INF/manifest.xml</code> file.
      *
      * @return  The name of the object.
@@ -113,4 +113,4 @@ public abstract class EmbeddedObject {
      * @return  Document    <code>Document</code> containing the manifest entries.
      */
     abstract void writeManifestData(Document manifestDoc) throws DOMException;
-}
\ No newline at end of file
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
index dcf82bd2ace6..6a6e2d239874 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
@@ -91,7 +91,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Returns the content data for this embedded object.
      *
-     * @return DOM represenation of "content.xml"
+     * @return DOM representation of "content.xml"
      *
      * @throws  SAXException    If any parser error occurs
      * @throws  IOException     If any IO error occurs
@@ -120,7 +120,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Returns the settings data for this embedded object.
      *
-     * @return DOM represenation of "settings.xml"
+     * @return DOM representation of "settings.xml"
      *
      * @throws  SAXException    If any parser error occurs
      * @throws  IOException     If any IO error occurs
@@ -149,7 +149,7 @@ public class EmbeddedXMLObject extends EmbeddedObject {
     /**
      * Returns the style data for this embedded object.
      *
-     * @return DOM represenation of "styles.xml"
+     * @return DOM representation of "styles.xml"
      *
      * @throws  SAXException    If any parser error occurs
      * @throws  IOException     If any IO error occurs
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
index 2eb507d09b7b..e47b750459a0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
@@ -199,7 +199,7 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants,
     }
 
     /**
-     * This initializes a font table so we can imclude some basic font
+     * This initializes a font table so we can include some basic font
      * support for spreadsheets.
      *
      */
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
index edb95cfd9cb2..742340a8158e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java
@@ -39,7 +39,7 @@ import org.openoffice.xmerge.merger.NodeMergeAlgorithm;
  *  The main difference between this implementation and
  *  <code>DocumentMerge</code>
  *  is that this merge will try to maintain unsupported features by
- *  examing the cell <code>node</code> objects one by one when it
+ *  examining the cell <code>node</code> objects one by one when it
  *  removes a node from the original <code>Iterator</code>.
  *
  * @author smak
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html b/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html
index ea56e3b6c118..5a8d9e091aa4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/package.html
@@ -67,7 +67,7 @@ implementation so that the merge logic knows what changes from the
 &quot;lossy&quot; format to merge into the original &quot;rich&quot;
 <code>Document</code>.</p>
 
-<p>Each plug-in must be registed via the singleton ConverterInfoMgr
+<p>Each plug-in must be registered via the singleton ConverterInfoMgr
 object via its {@link
 org.openoffice.xmerge.util.registry.ConverterInfoMgr#addPlugIn
 addPlugIn} method.</p>
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
index 30675c0889d5..d0fed6d39ce0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
@@ -120,7 +120,7 @@ public class ColourConverter {
     }
 
     /**
-     * Uses the colour table it it exists to translate default values to
+     * Uses the colour table if it exists to translate default values to
      * values in the colorTable
      */
     private short colourLookup(short colour) {
@@ -133,7 +133,7 @@ public class ColourConverter {
     }
 
     /**
-     * Uses the colour table it it exists to translate default values to
+     * Uses the colour table if it exists to translate default values to
      * values in the colorTable
      */
     private short indexLookup(short index) {
diff --git a/xmerge/workben/jstyle.pl b/xmerge/workben/jstyle.pl
index 3c300c29a227..177b1a2aff94 100644
--- a/xmerge/workben/jstyle.pl
+++ b/xmerge/workben/jstyle.pl
@@ -396,7 +396,7 @@ if (0) {
     if (/\S\*\//) {
         do err("missing blank before close comment");
     }
-    # allow // at beginnging of line, often used to comment out code
+    # allow // at beginning of line, often used to comment out code
     if (/.\/\/\S/) {        # C++ comments
         do err("missing blank after start comment");
     }