#i103496#: reactivate xmloff base code

6 files changed, 5 insertions, 19 deletions

diff --git a/linguistic/prj/build.lst b/linguistic/prj/build.lst
index 3444532530..8e09e3fd42 100644
--- a/linguistic/prj/build.lst
+++ b/linguistic/prj/build.lst
@@ -1,4 +1,4 @@
-lg  linguistic  :   xmloff NULL
+lg  linguistic  :   svl xmloff ucbhelper vos comphelper ICU:icu NULL
 lg	linguistic								usr1	-	all	lg_mkout NULL
 lg	linguistic\prj							get		-	all	lg_prj NULL
 lg	linguistic\inc							nmake	-	all	lg_inc NULL
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 33e25fd9a6..30129b01ac 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -68,7 +68,7 @@
 
 
 #include "convdic.hxx"
-//#include "convdicxml.hxx"
+#include "convdicxml.hxx"
 #include "misc.hxx"
 #include "defs.hxx"
 
@@ -87,7 +87,6 @@ using namespace linguistic;
 
 
 ///////////////////////////////////////////////////////////////////////////
-#if XML
 void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
 {
     if (rMainURL.Len() == 0)
@@ -165,7 +164,6 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport )
     {
     }
 }
-#endif
 
 BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
 {
@@ -186,7 +184,6 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
     // first argument being 0 should stop the file from being parsed
     // up to the end (reading all entries) when the required
     // data (language, conversion type) is found.
-#if XML
     ConvDicXMLImport *pImport = new ConvDicXMLImport( 0, rFileURL );
     
     //!! keep a first reference to ensure the lifetime of the object !!
@@ -202,7 +199,6 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType )
         nLang       = pImport->GetLanguage();
         nConvType   = pImport->GetConversionType();
     }
-#endif
 
     return bRes;
 }
@@ -268,12 +264,10 @@ void ConvDic::Load()
 
     //!! prevent function from being called recursively via HasEntry, AddEntry
     bNeedEntries = FALSE;
-#if XML    
     ConvDicXMLImport *pImport = new ConvDicXMLImport( this, aMainURL );
     //!! keep a first reference to ensure the lifetime of the object !!
     uno::Reference< XInterface > xRef( (document::XFilter *) pImport, UNO_QUERY );
     ReadThroughDic( aMainURL, *pImport );    // will implicitly add the entries
-#endif
     bIsModified = FALSE;
 }
 
@@ -328,7 +322,6 @@ void ConvDic::Save()
 
         // prepare arguments (prepend doc handler to given arguments)
         uno::Reference< xml::sax::XDocumentHandler > xDocHandler( xSaxWriter, UNO_QUERY );
-#if XML
         ConvDicXMLExport *pExport = new ConvDicXMLExport( *this, aMainURL, xDocHandler );
         //!! keep a first(!) reference until everything is done to
         //!! ensure the proper lifetime of the object
@@ -337,7 +330,6 @@ void ConvDic::Save()
         DBG_ASSERT( !pStream->GetError(), "I/O error while writing to stream" );
         if (bRet)
             bIsModified = FALSE;
-#endif
     }
     DBG_ASSERT( !bIsModified, "dictionary still modified after save. Save failed?" );
 }
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 1a6243fa6c..37a536ba87 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -36,7 +36,6 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/lingucfg.hxx>
-//#include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
 #include <cppuhelper/factory.hxx>	// helper for factories
 #include <unotools/localfilehelper.hxx>
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 86c6aee38b..1ada0a8fb8 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -77,7 +77,7 @@ public:
     void _ExportAutoStyles()    {}
     void _ExportMasterStyles()  {}
     void _ExportContent();
-//    sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass );
+    sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass );
 
     sal_Bool    Export();
 };
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 931f9455a0..8df73a1b18 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -34,7 +34,6 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/linguistic2/XGrammarChecker.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-//#include <vcl/unohelp.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 6db2fae4da..bdf0b297d2 100644
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -41,12 +41,10 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-#        $(SLO)$/convdicxml.obj\
-
-
 SLOFILES = \
         $(SLO)$/convdiclist.obj\
         $(SLO)$/convdic.obj\
+        $(SLO)$/convdicxml.obj\
         $(SLO)$/dicimp.obj\
         $(SLO)$/dlistimp.obj\
         $(SLO)$/hhconvdic.obj\
@@ -76,12 +74,10 @@ SHL1STDLIBS= \
         $(I18NISOLANGLIB) \
         $(SVLLIB)	\
         $(SALLIB)		\
+        $(XMLOFFLIB)    \
         $(UCBHELPERLIB)	\
         $(UNOTOOLSLIB)  \
         $(ICUUCLIB)
-
-#		$(VCLLIB)		\
-#        $(XMLOFFLIB)    \
         
 # build DLL
 SHL1LIBS=		$(SLB)$/$(TARGET).lib