gbuildize hwpfilter

26 files changed, 8 insertions, 133 deletions

diff --git a/hwpfilter/source/cspline.cpp b/hwpfilter/source/cspline.cxx
index 8493ff339bb4..8493ff339bb4 100644
--- a/hwpfilter/source/cspline.cpp
+++ b/hwpfilter/source/cspline.cxx
diff --git a/hwpfilter/source/fontmap.cpp b/hwpfilter/source/fontmap.cxx
index d3f9906f3eb2..d3f9906f3eb2 100644
--- a/hwpfilter/source/fontmap.cpp
+++ b/hwpfilter/source/fontmap.cxx
diff --git a/hwpfilter/source/formula.cpp b/hwpfilter/source/formula.cxx
index d2a73ac72d07..d2a73ac72d07 100644
--- a/hwpfilter/source/formula.cpp
+++ b/hwpfilter/source/formula.cxx
diff --git a/hwpfilter/source/grammar.cpp b/hwpfilter/source/grammar.cxx
index 2afc1d897490..2afc1d897490 100644
--- a/hwpfilter/source/grammar.cpp
+++ b/hwpfilter/source/grammar.cxx
diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cxx
index fcdd706a3fdb..fcdd706a3fdb 100644
--- a/hwpfilter/source/hbox.cpp
+++ b/hwpfilter/source/hbox.cxx
diff --git a/hwpfilter/source/hcode.cpp b/hwpfilter/source/hcode.cxx
index 65ab7d662b5c..9a31e0ad5680 100644
--- a/hwpfilter/source/hcode.cpp
+++ b/hwpfilter/source/hcode.cxx
@@ -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 12c8705ba17f..12c8705ba17f 100644
--- a/hwpfilter/source/hfont.cpp
+++ b/hwpfilter/source/hfont.cxx
diff --git a/hwpfilter/source/hgzip.cpp b/hwpfilter/source/hgzip.cxx
index 13811d2069a8..13811d2069a8 100644
--- a/hwpfilter/source/hgzip.cpp
+++ b/hwpfilter/source/hgzip.cxx
diff --git a/hwpfilter/source/himgutil.cpp b/hwpfilter/source/himgutil.cxx
index 3d94280f6135..3d94280f6135 100644
--- a/hwpfilter/source/himgutil.cpp
+++ b/hwpfilter/source/himgutil.cxx
diff --git a/hwpfilter/source/hinfo.cpp b/hwpfilter/source/hinfo.cxx
index fb57e49d6de3..fb57e49d6de3 100644
--- a/hwpfilter/source/hinfo.cpp
+++ b/hwpfilter/source/hinfo.cxx
diff --git a/hwpfilter/source/hiodev.cpp b/hwpfilter/source/hiodev.cxx
index 0416a96c7091..0416a96c7091 100644
--- a/hwpfilter/source/hiodev.cpp
+++ b/hwpfilter/source/hiodev.cxx
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cxx
index 06a5786d90ea..06a5786d90ea 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cxx
diff --git a/hwpfilter/source/hstream.cpp b/hwpfilter/source/hstream.cxx
index c6b8c24a2152..c6b8c24a2152 100644
--- a/hwpfilter/source/hstream.cpp
+++ b/hwpfilter/source/hstream.cxx
diff --git a/hwpfilter/source/hstyle.cpp b/hwpfilter/source/hstyle.cxx
index 8cce811067a0..8cce811067a0 100644
--- a/hwpfilter/source/hstyle.cpp
+++ b/hwpfilter/source/hstyle.cxx
diff --git a/hwpfilter/source/htags.cpp b/hwpfilter/source/htags.cxx
index 30244a83f9b8..30244a83f9b8 100644
--- a/hwpfilter/source/htags.cpp
+++ b/hwpfilter/source/htags.cxx
diff --git a/hwpfilter/source/hutil.cpp b/hwpfilter/source/hutil.cxx
index 2827bda4e88a..2827bda4e88a 100644
--- a/hwpfilter/source/hutil.cpp
+++ b/hwpfilter/source/hutil.cxx
diff --git a/hwpfilter/source/hwp.component b/hwpfilter/source/hwp.component
index 5280cfbbd46b..972c6a61d5b3 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 0808d5100b55..0808d5100b55 100644
--- a/hwpfilter/source/hwpeq.cpp
+++ b/hwpfilter/source/hwpeq.cxx
diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cxx
index b77cc1dad25f..b77cc1dad25f 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cxx
diff --git a/hwpfilter/source/hwpread.cpp b/hwpfilter/source/hwpread.cxx
index b67b814fe211..b67b814fe211 100644
--- a/hwpfilter/source/hwpread.cpp
+++ b/hwpfilter/source/hwpread.cxx
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 07eee5d7e581..e23e2d9fc6c2 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 3c73a66ff48e..3c73a66ff48e 100644
--- a/hwpfilter/source/lexer.cpp
+++ b/hwpfilter/source/lexer.cxx
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index cbc8d56b0ff2..c4df08e0a0f3 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 a8e137b6851b..000000000000
--- 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 c8d7e977bdac..c8d7e977bdac 100644
--- a/hwpfilter/source/mzstring.cpp
+++ b/hwpfilter/source/mzstring.cxx
diff --git a/hwpfilter/source/solver.cpp b/hwpfilter/source/solver.cxx
index 9748769b5d24..9748769b5d24 100644
--- a/hwpfilter/source/solver.cpp
+++ b/hwpfilter/source/solver.cxx