gbuildize hwpfilter

32 files changed, 222 insertions, 192 deletions

diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
new file mode 100644
index 000000000..321d4bee4
--- /dev/null
+++ b/hwpfilter/Library_hwp.mk
@@ -0,0 +1,98 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,hwp))
+
+$(eval $(call gb_Library_add_precompiled_header,hwp,$(SRCDIR)/hwpfilter/inc/pch/precompiled_hwpfilter))
+
+$(eval $(call gb_Library_set_include,hwp,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/hwpfilter/inc/pch) \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hwp,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_set_cxxflags,hwp,\
+    $$(CXXFLAGS) \
+    -DSYSTEM_ZLIB \
+))
+$(eval $(call gb_Library_add_linked_libs,hwp,\
+    z \
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,hwp,\
+    zlib \
+))
+endif
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_linked_libs,hwp,\
+    ole32 \
+    uuid \
+))
+
+endif
+
+$(eval $(call gb_Library_set_componentfile,hwp,hwpfilter/source/hwp))
+
+$(eval $(call gb_Library_add_exception_objects,hwp,\
+    hwpfilter/source/attributes \
+    hwpfilter/source/cspline \
+    hwpfilter/source/fontmap \
+    hwpfilter/source/formula \
+    hwpfilter/source/grammar \
+    hwpfilter/source/hbox \
+    hwpfilter/source/hcode \
+    hwpfilter/source/hfont \
+    hwpfilter/source/hgzip \
+    hwpfilter/source/himgutil \
+    hwpfilter/source/hinfo \
+    hwpfilter/source/hiodev \
+    hwpfilter/source/hpara \
+    hwpfilter/source/hstream \
+    hwpfilter/source/hstyle \
+    hwpfilter/source/htags \
+    hwpfilter/source/hutil \
+    hwpfilter/source/hwpeq \
+    hwpfilter/source/hwpfile \
+    hwpfilter/source/hwpread \
+    hwpfilter/source/hwpreader \
+    hwpfilter/source/lexer \
+    hwpfilter/source/mzstring \
+    hwpfilter/source/solver \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile
new file mode 100644
index 000000000..a79aff831
--- /dev/null
+++ b/hwpfilter/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk
new file mode 100644
index 000000000..b4e55302d
--- /dev/null
+++ b/hwpfilter/Module_hwpfilter.mk
@@ -0,0 +1,34 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s): 
+# 
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,hwpfilter))
+
+$(eval $(call gb_Module_add_targets,hwpfilter,\
+    Library_hwp \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/hwpfilter/prj/build.lst b/hwpfilter/prj/build.lst
index 512404534..f17ca9d58 100644
--- a/hwpfilter/prj/build.lst
+++ b/hwpfilter/prj/build.lst
@@ -1,5 +1,2 @@
-hw	hwpfilter	:	offuh cppuhelper ZLIB:zlib LIBXSLT:libxslt NULL
-hw	hwpfilter							usr1	-	all	hw_mkout NULL
-hw	hwpfilter\prj						get		-	all	hw_prj NULL
-hw	hwpfilter\inc						nmake	-	all	hw_inc NULL
-hw	hwpfilter\source					nmake	-	all	hw_source hw_inc NULL
+hw	hwpfilter	:	offuh cppuhelper ZLIB:zlib LIBXSLT:libxslt ure NULL
+hw	hwpfilter\prj	nmake	-	all	hw_prj NULL
diff --git a/hwpfilter/prj/d.lst b/hwpfilter/prj/d.lst
index 24f09e93a..e69de29bb 100644
--- a/hwpfilter/prj/d.lst
+++ b/hwpfilter/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\bin\hwp.dll %_DEST%\bin\hwp.dll
-..\%__SRC%\lib\ihwp*.lib %_DEST%\bin\ihwp*.lib
-..\%__SRC%\lib\libhwp.so %_DEST%\lib\libhwp.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\misc\hwp.component %_DEST%\xml\hwp.component
diff --git a/hwpfilter/inc/makefile.mk b/hwpfilter/prj/makefile.mk
index 12bc00212..e312a7cca 100644..100755
--- a/hwpfilter/inc/makefile.mk
+++ b/hwpfilter/prj/makefile.mk
@@ -24,24 +24,17 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-PRJ=..
-
-PRJNAME=hwpfilter
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
+PRJ=..
+TARGET=prj
 
-.INCLUDE :  target.mk
+.INCLUDE : settings.mk
 
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
 
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/hwpfilter/source/cspline.cpp b/hwpfilter/source/cspline.cxx
index 07eecbde3..8493ff339 100644
--- a/hwpfilter/source/cspline.cpp
+++ b/hwpfilter/source/cspline.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/fontmap.cpp b/hwpfilter/source/fontmap.cxx
index 40016c97a..d3f9906f3 100644
--- a/hwpfilter/source/fontmap.cpp
+++ b/hwpfilter/source/fontmap.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/formula.cpp b/hwpfilter/source/formula.cxx
index eecc013ae..d2a73ac72 100644
--- a/hwpfilter/source/formula.cpp
+++ b/hwpfilter/source/formula.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -134,7 +134,7 @@ void Formula::makeExprList(Node *res)
     else
          makeExpr( tmp );
 }
-    
+
 void Formula::makeExpr(Node *res)
 {
   if( !res ) return;
@@ -144,7 +144,7 @@ void Formula::makeExpr(Node *res)
         case ID_PRIMARYEXPR:
              if( tmp->next ){
 #ifdef DEBUG
-                 inds; 
+                 inds;
                  fprintf(stderr,"<math:mrow>\n");
 #else
                  rstartEl(ascii("math:mrow"), rList);
@@ -631,7 +631,7 @@ int Formula::parse()
                      break;
           }
          // fprintf(stderr,"\n\n[RESULT]\n[%s]\n",a.c_str());
-          if( strlen(buf) > 0 ) 
+          if( strlen(buf) > 0 )
                 res = mainParse( a.c_str() );
           else
                 res = 0L;
diff --git a/hwpfilter/source/grammar.cpp b/hwpfilter/source/grammar.cxx
index 3bd95288c..52adb245d 100644
--- a/hwpfilter/source/grammar.cpp
+++ b/hwpfilter/source/grammar.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 
 #define YYBISON 1  /* Identify Bison output.  */
 
-#ifndef YYDEBUG 
+#ifndef YYDEBUG
 #define YYDEBUG 0
 #endif
 #ifndef YYMAXDEPTH
@@ -539,7 +539,7 @@ int yydebug;			/*  nonzero means print parse trace	*/
    definitions require.  With GCC, __builtin_memcpy takes an arg
    of type size_t, but it can handle unsigned int.  */
 
-#if defined __GNUC__ 
+#if defined __GNUC__
 #if __GNUC__ > 1        /* GNU C and GNU C++ define this.  */
 #define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
 #endif
diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cxx
index 274608486..fcdd706a3 100644
--- a/hwpfilter/source/hbox.cpp
+++ b/hwpfilter/source/hbox.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hcode.cpp b/hwpfilter/source/hcode.cxx
index 2c513a67c..978a08dbd 100644
--- a/hwpfilter/source/hcode.cpp
+++ b/hwpfilter/source/hcode.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -575,7 +575,7 @@ static const hchar jaso_hh_code[] =
     34465, 34497, 34529, 34625, 34657, 34689, 34721
 };
 
-/* os: unused 
+/* os: unused
 static int is_jaso(hchar hh)
 {
     unsigned int i;
@@ -1222,7 +1222,7 @@ int hstr2ksstr(hchar* hstr, char* buf)
           for( j = 0 ; j < res ; j++ ){
               c = dest[j];
               if( c < 32 ) c = ' ';
-              else if( c < 256 ) 
+              else if( c < 256 )
                     tmp[i++] = sal::static_int_cast<char>(c);
               else
               {
@@ -1426,7 +1426,7 @@ char *urltowin(const char *src, char *dest )
           char ext[4];
           strncpy(ext,src + srclen - 3,3);
           ext[3]=0;
-          //printf("hcode.cpp : ext = %s\n",ext);
+          //printf("hcode.cxx : ext = %s\n",ext);
 
           if( !_strnicmp(ext,"HWP",3) || !_strnicmp(ext,"HWT",3)){
                 strcpy(dest,src);
diff --git a/hwpfilter/source/hfont.cpp b/hwpfilter/source/hfont.cxx
index dbca9df6d..12c8705ba 100644
--- a/hwpfilter/source/hfont.cpp
+++ b/hwpfilter/source/hfont.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hgzip.cpp b/hwpfilter/source/hgzip.cxx
index ff5ebf6a7..13811d206 100644
--- a/hwpfilter/source/hgzip.cpp
+++ b/hwpfilter/source/hgzip.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/himgutil.cpp b/hwpfilter/source/himgutil.cxx
index 6fe86da6a..3d94280f6 100644
--- a/hwpfilter/source/himgutil.cpp
+++ b/hwpfilter/source/himgutil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hinfo.cpp b/hwpfilter/source/hinfo.cxx
index 1d4f0c77f..fb57e49d6 100644
--- a/hwpfilter/source/hinfo.cpp
+++ b/hwpfilter/source/hinfo.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hiodev.cpp b/hwpfilter/source/hiodev.cxx
index 86062293b..0416a96c7 100644
--- a/hwpfilter/source/hiodev.cpp
+++ b/hwpfilter/source/hiodev.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cxx
index 065eaa82a..06a5786d9 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hstream.cpp b/hwpfilter/source/hstream.cxx
index 4bd64a8e8..c6b8c24a2 100644
--- a/hwpfilter/source/hstream.cpp
+++ b/hwpfilter/source/hstream.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hstyle.cpp b/hwpfilter/source/hstyle.cxx
index 45dee1446..8cce81106 100644
--- a/hwpfilter/source/hstyle.cpp
+++ b/hwpfilter/source/hstyle.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/htags.cpp b/hwpfilter/source/htags.cxx
index b648a96e0..30244a83f 100644
--- a/hwpfilter/source/htags.cpp
+++ b/hwpfilter/source/htags.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hutil.cpp b/hwpfilter/source/hutil.cxx
index bd01bb4cd..2827bda4e 100644
--- a/hwpfilter/source/hutil.cpp
+++ b/hwpfilter/source/hutil.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hwp.component b/hwpfilter/source/hwp.component
index 5280cfbbd..972c6a61d 100644
--- a/hwpfilter/source/hwp.component
+++ b/hwpfilter/source/hwp.component
@@ -30,5 +30,6 @@
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.comp.hwpimport.HwpImportFilter">
     <service name="com.sun.star.document.ImportFilter"/>
+    <service name="com.sun.star.document.ExtendedTypeDetection"/>
   </implementation>
 </component>
diff --git a/hwpfilter/source/hwpeq.cpp b/hwpfilter/source/hwpeq.cxx
index 60d00d5a7..e3b2de737 100644
--- a/hwpfilter/source/hwpeq.cpp
+++ b/hwpfilter/source/hwpeq.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cxx
index 9ad4a9098..b77cc1dad 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hwpread.cpp b/hwpfilter/source/hwpread.cxx
index f4c86fb29..b67b814fe 100644
--- a/hwpfilter/source/hwpread.cpp
+++ b/hwpfilter/source/hwpread.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 8b024e200..a179a5f58 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -134,14 +134,8 @@ HwpReader::~HwpReader()
 }
 
 
-#ifndef UDK100
 sal_Bool HwpReader::filter(const Sequence< PropertyValue >& aDescriptor) throw(RuntimeException)
-#else
-void HwpReader::parseStream(const InputSource & structSource)
-throw(SAXException, IOException, RuntimeException)
-#endif
 {
-#ifndef UDK100
     Reference< XInputStream> rInputStream;
     for ( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
     {
@@ -175,9 +169,6 @@ throw(SAXException, IOException, RuntimeException)
             break;
         }
     }
-#else
-    Reference< XInputStream> rInputStream = structSource.aInputStream;
-#endif
 
     HStream stream;
     Sequence < sal_Int8 > aBuffer;
@@ -190,18 +181,11 @@ throw(SAXException, IOException, RuntimeException)
         stream.addData( (byte *)aBuffer.getConstArray(), nRead );
         nTotal += nRead;
     }
-#ifndef UDK100
+
     if( nTotal == 0 ) return sal_False;
-#endif
 
     if (hwpfile.ReadHwpFile(stream))
-    {
-#ifdef UDK100
-        throw SAXException();
-#else
           return sal_False;
-#endif
-    }
 
     if (m_rxDocumentHandler.is())
         m_rxDocumentHandler->startDocument();
@@ -239,10 +223,7 @@ throw(SAXException, IOException, RuntimeException)
 
     if (m_rxDocumentHandler.is())
         m_rxDocumentHandler->endDocument();
-#ifndef UDK100
     return sal_True;
-#endif
-
 }
 
 
@@ -3762,17 +3743,13 @@ void HwpReader::makeFormula(TxtBox * hbox)
         pPar = pPar->Next();
     }
     mybuf[l] = '\0';
-//	 rchars(ascii(mybuf));
-//#ifndef UDK100
+
     Formula *form = new Formula(mybuf);
     form->setDocumentHandler(m_rxDocumentHandler);
     form->setAttributeListImpl(pList);
     form->parse();
 
     delete form;
-//#endif
-
-
 }
 
 
diff --git a/hwpfilter/source/lexer.cpp b/hwpfilter/source/lexer.cxx
index 8b323c076..6d1ae197c 100644
--- a/hwpfilter/source/lexer.cpp
+++ b/hwpfilter/source/lexer.cxx
@@ -16,7 +16,7 @@
 #define YY_NEVER_INTERACTIVE 0
 #endif
 #ifndef YY_MAIN
-#define YY_MAIN 0        
+#define YY_MAIN 0
 #endif
 
 #define FLEX_SCANNER
@@ -1458,7 +1458,7 @@ YY_RULE_SETUP
 case 37:
 YY_RULE_SETUP
 #line 130 "lexer.l"
-{ yylval.str = yytext;   token_debug("	==>Operator[%s]\n",yytext); return OPERATOR; }	
+{ yylval.str = yytext;   token_debug("	==>Operator[%s]\n",yytext); return OPERATOR; }
     //YY_BREAK
 case 38:
 YY_RULE_SETUP
@@ -1488,12 +1488,12 @@ YY_RULE_SETUP
 case 43:
 YY_RULE_SETUP
 #line 136 "lexer.l"
-{ yylval.str = yytext;  token_debug("	==>String[%s]\n",yytext); return STRING; }	
+{ yylval.str = yytext;  token_debug("	==>String[%s]\n",yytext); return STRING; }
     //YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 137 "lexer.l"
-{ yylval.str = yytext;  token_debug("	==>Else[%s]\n",yytext); return CHARACTER; }	
+{ yylval.str = yytext;  token_debug("	==>Else[%s]\n",yytext); return CHARACTER; }
     //YY_BREAK
 case 45:
 YY_RULE_SETUP
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index 02f6e00a8..af31cfc71 100644
--- a/hwpfilter/source/list.hxx
+++ b/hwpfilter/source/list.hxx
@@ -36,7 +36,7 @@
  * USE STL CONTAINERS FOR NEW CODE!
  *
  * The classes LinkedList and LinkedListIterator were originally
- * implemented in two files LinkedList.cpp/.h, whose license would not
+ * implemented in two files LinkedList.cxx/.h, whose license would not
  * allow re-distribution through OpenOffice.org. This file
  * re-implements the same functionality, based on the STL.
  */
@@ -92,7 +92,7 @@ public:
 
     void reset( );              /// set iterator to first element
 
-    // bug-compatible with original LinkedList.h/cpp: Ignore parameter!
+    // bug-compatible with original LinkedList.h/cxx: Ignore parameter!
     void operator++( int );   /// advance iterator by one step (ignore n !!!)
     void operator--( int );   /// go one step backwards (ignore n !!!)
 
@@ -261,7 +261,7 @@ void LinkedListIterator<T>::operator++( int )
 {
     ASSERT( mpList != NULL );
 
-    // bug-compatible with LinkedList.cpp: ignore parameter!
+    // bug-compatible with LinkedList.cxx: ignore parameter!
     mnPosition ++;
 }
 
@@ -270,7 +270,7 @@ void LinkedListIterator<T>::operator--( int )
 {
     ASSERT( mpList != NULL );
 
-    // bug-compatible with LinkedList.cpp: ignore parameter!
+    // bug-compatible with LinkedList.cxx: ignore parameter!
     mnPosition --;
 }
 
diff --git a/hwpfilter/source/makefile.mk b/hwpfilter/source/makefile.mk
deleted file mode 100644
index a8e137b68..000000000
--- a/hwpfilter/source/makefile.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-#************************************************************************* NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=hwpfilter
-TARGET=hwp
-
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-
-SLOFILES =	\
-        $(SLO)$/attributes.obj \
-        $(SLO)$/cspline.obj \
-        $(SLO)$/fontmap.obj \
-        $(SLO)$/formula.obj \
-        $(SLO)$/grammar.obj \
-        $(SLO)$/hbox.obj \
-        $(SLO)$/hcode.obj \
-        $(SLO)$/hfont.obj \
-        $(SLO)$/hgzip.obj \
-        $(SLO)$/himgutil.obj \
-        $(SLO)$/hinfo.obj \
-        $(SLO)$/hiodev.obj \
-        $(SLO)$/hpara.obj \
-        $(SLO)$/hstream.obj \
-        $(SLO)$/hstyle.obj \
-        $(SLO)$/htags.obj \
-        $(SLO)$/hutil.obj \
-        $(SLO)$/hwpeq.obj \
-        $(SLO)$/hwpfile.obj \
-        $(SLO)$/hwpread.obj \
-        $(SLO)$/hwpreader.obj \
-        $(SLO)$/lexer.obj \
-        $(SLO)$/mzstring.obj \
-        $(SLO)$/solver.obj
-
-# --- Shared-Library -----------------------------------------------
-
-SHL1TARGET= $(TARGET)
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB)	\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)\
-        $(SALLIB)		\
-        $(ZLIB3RDLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
-        $(OLE32LIB) $(UUIDLIB)
-.ENDIF			# "$(GUI)"=="WNT"		
-
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=   $(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/hwp.component
-
-$(MISC)/hwp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        hwp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt hwp.component
diff --git a/hwpfilter/source/mzstring.cpp b/hwpfilter/source/mzstring.cxx
index a5610c65e..c8d7e977b 100644
--- a/hwpfilter/source/mzstring.cpp
+++ b/hwpfilter/source/mzstring.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/hwpfilter/source/solver.cpp b/hwpfilter/source/solver.cxx
index 2fa13361e..9748769b5 100644
--- a/hwpfilter/source/solver.cpp
+++ b/hwpfilter/source/solver.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite