#87913# Removed some more stuff for xmloff light

5 files changed, 19 insertions, 15 deletions

diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 64bd221fb1e3..f2be90217a51 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: facreg.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: thb $ $Date: 2001-07-24 17:06:06 $
+ *  last change: $Author: thb $ $Date: 2001-07-25 11:45:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,9 @@
 #include <osl/diagnose.h>
 #endif
 
+#ifndef _TOOLS_DEBUG_HXX
+#include <tools/debug.hxx>
+#endif
 
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 44a82d1e0583..a728dbcae182 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlimp.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: mtg $ $Date: 2001-07-10 17:05:53 $
+ *  last change: $Author: thb $ $Date: 2001-07-25 11:45:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -323,11 +323,13 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext(
         }
         case XML_TOK_DOC_META:
         {
+#ifndef SVX_LIGHT
             if( GetImport().getImportFlags() & IMPORT_META )
             {
                 // office:meta inside office:document
                 pContext = GetSdImport().CreateMetaContext(rLocalName, xAttrList);
             }
+#endif // #ifndef SVX_LIGHT
             break;
         }
         case XML_TOK_DOC_SCRIPT:
@@ -790,6 +792,7 @@ SvXMLImportContext *SdXMLImport::CreateContext(USHORT nPrefix,
 
 //////////////////////////////////////////////////////////////////////////////
 
+#ifndef SVX_LIGHT
 SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>& xAttrList)
 {
@@ -813,6 +816,7 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
 
     return pContext;
 }
+#endif // #ifndef SVX_LIGHT
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 1cd456787fc8..5a71028a825a 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlimp_impl.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cl $ $Date: 2001-05-28 13:32:20 $
+ *  last change: $Author: thb $ $Date: 2001-07-25 11:45:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -277,8 +277,10 @@ public:
     virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps);
 
     // namespace office
+#ifndef SVX_LIGHT
     SvXMLImportContext* CreateMetaContext(const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
+#endif
     SvXMLImportContext* CreateScriptContext( const ::rtl::OUString& rLocalName );
     SvXMLImportContext* CreateBodyContext(const rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index e90c7deee198..469638f5f092 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: formsimp.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2001-07-24 17:06:08 $
+ *  last change: $Author: thb $ $Date: 2001-07-25 11:45:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,9 +95,5 @@ XMLFormsContext::~XMLFormsContext()
 SvXMLImportContext * XMLFormsContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
 {
-#ifndef SVX_LIGHT
     return GetImport().GetFormImport()->createContext( nPrefix, rLocalName, xAttrList );
-#else
-    return NULL;
-#endif
 }
diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 4969c0ede282..c9203764def6 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: thb $ $Date: 2001-07-24 17:06:10 $
+#   last change: $Author: thb $ $Date: 2001-07-25 11:45:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -129,7 +129,6 @@ LIB2FILES=  \
             $(LB)$/sxl_core.lib\
             $(LB)$/sxl_draw.lib\
             $(LB)$/sxl_forms.lib\
-            $(LB)$/sxl_meta.lib\
             $(LB)$/sxl_script.lib\
             $(LB)$/sxl_style.lib\
             $(LB)$/sxl_text.lib