#87913# Now building a static xmloff lib, which is linked only against the player. Stuff not needed for player is disabled with SVX_LIGHT define

29 files changed, 664 insertions, 147 deletions

diff --git a/xmloff/inc/xmlreg.hxx b/xmloff/inc/xmlreg.hxx
new file mode 100644
index 000000000000..0aa49ed3162e
--- /dev/null
+++ b/xmloff/inc/xmlreg.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ *  $RCSfile: xmlreg.hxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:06 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library 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 for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _XMLOFF_XMLREG_HXX
+#define _XMLOFF_XMLREG_HXX
+
+#ifndef _RTL_REF_HXX_
+#include <rtl/ref.hxx>
+#endif
+
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+
+/**
+ *  Register subset of UNO services from XML Office library. This is necessary when
+ *  linking against the static "xol.lib".
+ *
+ *  @return returns sal_False if at least one component could not be registered.
+ */
+sal_Bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > ); /// [all] ServiceProvider to register in.
+
+#endif  //  _XMLOFF_XMLREG_HXX
+
diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst
index e50cf4c4bce6..7577d7c3f936 100644
--- a/xmloff/prj/d.lst
+++ b/xmloff/prj/d.lst
@@ -2,6 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\xmloff
 
 ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
 ..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib
+..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
 ..\dtd\*.* %_DEST%\bin%_EXT%\*.*
@@ -32,6 +33,7 @@ hedabu: ..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx
 hedabu: ..\inc\xmlnumfi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfi.hxx
 hedabu: ..\inc\xmlnumfe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumfe.hxx
 hedabu: ..\inc\xmlexp.hxx %_DEST%\inc%_EXT%\xmloff\xmlexp.hxx
+hedabu: ..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx
 hedabu: ..\inc\xmlnumi.hxx %_DEST%\inc%_EXT%\xmloff\xmlnumi.hxx
 hedabu: ..\inc\xmlnume.hxx %_DEST%\inc%_EXT%\xmloff\xmlnume.hxx
 hedabu: ..\inc\xmltabi.hxx %_DEST%\inc%_EXT%\xmloff\xmltabi.hxx
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index d5f47705ae8d..64bd221fb1e3 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: facreg.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-27 22:01:58 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,6 +61,10 @@
 
 #include <string.h>
 
+#ifndef _COM_SUN_STAR_CONTAINER_XSET_HPP_
+#include <com/sun/star/container/XSet.hpp>
+#endif
+
 #ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #endif
@@ -69,8 +73,10 @@
 #include <osl/diagnose.h>
 #endif
 
+
 #include <cppuhelper/factory.hxx>
 #include <uno/lbnames.h>
+#include "xmlreg.hxx"
 
 using namespace rtl;
 using namespace com::sun::star;
@@ -100,6 +106,8 @@ extern uno::Sequence< OUString > SAL_CALL SdImpressXMLImport_Settings_getSupport
 extern OUString SAL_CALL SdImpressXMLImport_Settings_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL SdImpressXMLImport_Settings_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
 
+// for every module, export functionality is disabled for SVX_LIGHT (which means: SOPlayer)
+#ifndef SVX_LIGHT
 // impress export
 extern uno::Sequence< OUString > SAL_CALL SdImpressXMLExport_getSupportedServiceNames() throw();
 extern OUString SAL_CALL SdImpressXMLExport_getImplementationName() throw();
@@ -124,6 +132,7 @@ extern uno::Reference< uno::XInterface > SAL_CALL SdImpressXMLExport_Meta_create
 extern uno::Sequence< OUString > SAL_CALL SdImpressXMLExport_Settings_getSupportedServiceNames() throw();
 extern OUString SAL_CALL SdImpressXMLExport_Settings_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL SdImpressXMLExport_Settings_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+#endif // #ifndef SVX_LIGHT
 
 // draw import
 extern uno::Sequence< OUString > SAL_CALL SdDrawXMLImport_getSupportedServiceNames() throw();
@@ -150,6 +159,7 @@ extern uno::Sequence< OUString > SAL_CALL SdDrawXMLImport_Settings_getSupportedS
 extern OUString SAL_CALL SdDrawXMLImport_Settings_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL SdDrawXMLImport_Settings_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
 
+#ifndef SVX_LIGHT
 // draw export
 extern uno::Sequence< OUString > SAL_CALL SdDrawXMLExport_getSupportedServiceNames() throw();
 extern OUString SAL_CALL SdDrawXMLExport_getImplementationName() throw();
@@ -174,7 +184,10 @@ extern uno::Reference< uno::XInterface > SAL_CALL SdDrawXMLExport_Meta_createIns
 extern uno::Sequence< OUString > SAL_CALL SdDrawXMLExport_Settings_getSupportedServiceNames() throw();
 extern OUString SAL_CALL SdDrawXMLExport_Settings_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL SdDrawXMLExport_Settings_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+#endif // #ifndef SVX_LIGHT
 
+// complete chart is disabled for SVX_LIGHT
+#ifndef SVX_LIGHT
 // chart import
 // ------------
 extern uno::Sequence< OUString > SAL_CALL SchXMLImport_getSupportedServiceNames() throw();
@@ -216,22 +229,27 @@ extern uno::Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createIns
 extern uno::Sequence< OUString > SAL_CALL SchXMLExport_Meta_getSupportedServiceNames() throw();
 extern OUString SAL_CALL SchXMLExport_Meta_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL SchXMLExport_Meta_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+#endif // #ifndef SVX_LIGHT
 
 
+#ifndef SVX_LIGHT
 // meta export
 extern uno::Sequence< OUString > SAL_CALL XMLMetaExportComponent_getSupportedServiceNames() throw();
 extern OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+#endif // #ifndef SVX_LIGHT
 
 // meta import
 extern uno::Sequence< OUString > SAL_CALL XMLMetaImportComponent_getSupportedServiceNames() throw();
 extern OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
 
+#ifndef SVX_LIGHT
 // writer autotext event export
 extern uno::Sequence< OUString > SAL_CALL XMLAutoTextEventExport_getSupportedServiceNames() throw();
 extern OUString SAL_CALL XMLAutoTextEventExport_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
+#endif // #ifndef SVX_LIGHT
 
 // writer autotext event import
 extern uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImport_getSupportedServiceNames() throw();
@@ -239,6 +257,9 @@ extern OUString SAL_CALL XMLAutoTextEventImport_getImplementationName() throw();
 extern uno::Reference< uno::XInterface > SAL_CALL XMLAutoTextEventImport_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception );
 
 
+// component register functionality only for shared lib
+#ifndef SVX_LIGHT
+
 //
 #ifdef __cplusplus
 extern "C"
@@ -585,4 +606,96 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
     return pRet;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
+#else
+
+// register necessary services manually
+sal_Bool XMLRegisterServices( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory )
+{
+    // ask the MultiServiceFactory for the XSet interface
+    uno::Reference< ::com::sun::star::container::XSet > xSet( xServiceFactory, uno::UNO_QUERY );
+
+    if ( !xSet.is() )
+        return sal_False;
+
+    try
+    {
+        uno::Any    aAny;
+
+        // SdImpressXMLImport
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdImpressXMLImport_getImplementationName(),
+                                              SdImpressXMLImport_createInstance,
+                                              SdImpressXMLImport_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdImpressXMLImport_Style_getImplementationName(),
+                                              SdImpressXMLImport_Style_createInstance,
+                                              SdImpressXMLImport_Style_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdImpressXMLImport_Content_getImplementationName(),
+                                              SdImpressXMLImport_Content_createInstance,
+                                              SdImpressXMLImport_Content_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdImpressXMLImport_Meta_getImplementationName(),
+                                              SdImpressXMLImport_Meta_createInstance,
+                                              SdImpressXMLImport_Meta_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdImpressXMLImport_Settings_getImplementationName(),
+                                              SdImpressXMLImport_Settings_createInstance,
+                                              SdImpressXMLImport_Settings_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        // SdDrawXMLImport
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdDrawXMLImport_getImplementationName(),
+                                              SdDrawXMLImport_createInstance,
+                                              SdDrawXMLImport_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdDrawXMLImport_Style_getImplementationName(),
+                                              SdDrawXMLImport_Style_createInstance,
+                                              SdDrawXMLImport_Style_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdDrawXMLImport_Content_getImplementationName(),
+                                              SdDrawXMLImport_Content_createInstance,
+                                              SdDrawXMLImport_Content_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdDrawXMLImport_Meta_getImplementationName(),
+                                              SdDrawXMLImport_Meta_createInstance,
+                                              SdDrawXMLImport_Meta_getSupportedServiceNames() );
+        xSet->insert( aAny );
+
+        aAny <<= ::cppu::createSingleFactory( xServiceFactory,
+                                              SdDrawXMLImport_Settings_getImplementationName(),
+                                              SdDrawXMLImport_Settings_createInstance,
+                                              SdDrawXMLImport_Settings_getSupportedServiceNames() );
+        xSet->insert( aAny );
+    }
+    catch( uno::Exception& )
+    {
+#ifdef DBG_UTIL
+        DBG_ERROR( "Cannot register XMLOFF services" );
+#endif
+        return sal_False;
+    }
+
+    return sal_True;
 }
+
+#endif // #ifndef SVX_LIGHT
diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk
index c945d5df552f..6898d032541a 100644
--- a/xmloff/source/core/makefile.mk
+++ b/xmloff/source/core/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.15 $
+#   $Revision: 1.16 $
 #
-#   last change: $Author: mib $ $Date: 2001-06-19 14:49:24 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:06 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -106,6 +106,26 @@ SLOFILES =	\
         $(SLO)$/XMLBase64Export.obj \
         $(SLO)$/XMLBase64ImportContext.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/facreg.obj		\
+        $(OBJ)$/xmlcnitm.obj	\
+        $(OBJ)$/attrlist.obj	\
+        $(OBJ)$/i18nmap.obj		\
+        $(OBJ)$/nmspmap.obj		\
+        $(OBJ)$/unoatrcn.obj	\
+        $(OBJ)$/xmlehelp.obj	\
+        $(OBJ)$/xmlictxt.obj	\
+        $(OBJ)$/xmlimp.obj		\
+        $(OBJ)$/xmlkywd.obj		\
+        $(OBJ)$/xmltkmap.obj	\
+        $(OBJ)$/xmltoken.obj	\
+        $(OBJ)$/xmluconv.obj	\
+        $(OBJ)$/ProgressBarHelper.obj	\
+        $(OBJ)$/PropertySetMerger.obj	\
+        $(OBJ)$/DocumentSettingsContext.obj \
+        $(OBJ)$/XMLEmbeddedObjectImportContext.obj \
+        $(OBJ)$/XMLBase64ImportContext.obj
+
 CPPUMAKERFLAGS=
 UNOUCRDEP=  $(SOLARBINDIR)$/offapi.rdb
 UNOUCRRDB=  $(SOLARBINDIR)$/offapi.rdb
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2ae92115fc47..4f9396ab9b62 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimp.cxx,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: mtg $ $Date: 2001-07-10 17:04:42 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -676,17 +676,22 @@ XMLShapeImportHelper* SvXMLImport::CreateShapeImport()
     return new XMLShapeImportHelper( *this, xModel );
 }
 
+#ifndef SVX_LIGHT
 SchXMLImportHelper* SvXMLImport::CreateChartImport()
 {
     return new SchXMLImportHelper();
 }
+#endif
 
+#ifndef SVX_LIGHT
 #if SUPD>615 || defined(PRIV_DEBUG)
 ::xmloff::OFormLayerXMLImport* SvXMLImport::CreateFormImport()
 {
     return new ::xmloff::OFormLayerXMLImport(*this);
 }
 #endif
+#endif // #ifndef SVX_LIGHT
+
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -989,6 +994,7 @@ void SvXMLImport::AddNumberStyle(sal_Int32 nKey, const OUString& rName)
 
 XMLEventImportHelper& SvXMLImport::GetEventImport()
 {
+#ifndef SVX_LIGHT
     if (!pEventImportHelper)
     {
         // construct event helper and register StarBasic handler and standard
@@ -999,6 +1005,7 @@ XMLEventImportHelper& SvXMLImport::GetEventImport()
                                             new XMLStarBasicContextFactory());
         pEventImportHelper->AddTranslationTable(aStandardEventTable);
     }
+#endif
 
     return *pEventImportHelper;
 }
@@ -1045,8 +1052,10 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles )
     xAutoStyles = pAutoStyles;
     GetTextImport()->SetAutoStyles( pAutoStyles );
     GetShapeImport()->SetAutoStylesContext( pAutoStyles );
+#ifndef SVX_LIGHT
     GetChartImport()->SetAutoStylesContext( pAutoStyles );
     GetFormImport()->setAutoStyleContext( pAutoStyles );
+#endif
 }
 
 void SvXMLImport::SetMasterStyles( SvXMLStylesContext *pMasterStyles )
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 0189481e72a2..65e4606d8bfd 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLNumberStyles.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -374,6 +374,12 @@ const SdXMLFixedDataStyle* aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] =
     &aSdXML_TimeStyle_7
 };
 
+
+///////////////////////////////////////////////////////////////////////
+// export
+
+#ifndef SVX_LIGHT
+
 static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* pStyle )
 {
     OUString sAttrValue;
@@ -467,6 +473,8 @@ OUString SdXMLNumberStylesExporter::getDateStyleName(const sal_Int32 nDateFormat
     }
 }
 
+#endif // #ifndef SVX_LIGHT
+
 
 ///////////////////////////////////////////////////////////////////////
 // import
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 06232539b914..e685ea907eaa 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLShapeStyleContext.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -156,6 +156,8 @@ SvXMLImportContext *XMLShapeStyleContext::CreateChildContext(
 void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet > & rPropSet )
 {
     XMLPropStyleContext::FillPropertySet(rPropSet);
+
+#ifndef SVX_LIGHT
     if (m_sControlDataStyleName.getLength())
     {   // we had a data-style-name attribute
 
@@ -172,6 +174,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
             }
         }
     }
+#endif // #ifndef SVX_LIGHT
 }
 
 void XMLShapeStyleContext::Finish( sal_Bool bOverwrite )
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 4f24a31d150b..7838628ccdbe 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: animexp.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,61 +122,6 @@ using namespace ::com::sun::star::presentation;
 using namespace ::xmloff::token;
 
 
-SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] =
-{
-    { XML_NONE,         EK_none },
-    { XML_FADE,         EK_fade },
-    { XML_MOVE,         EK_move },
-    { XML_STRIPES,      EK_stripes },
-    { XML_OPEN,         EK_open },
-    { XML_CLOSE,        EK_close },
-    { XML_DISSOLVE,     EK_dissolve },
-    { XML_WAVYLINE,     EK_wavyline },
-    { XML_RANDOM,       EK_random },
-    { XML_LINES,        EK_lines },
-    { XML_LASER,        EK_laser },
-    { XML_APPEAR,       EK_appear },
-    { XML_HIDE,         EK_hide },
-    { XML_MOVE_SHORT,   EK_move_short },
-    { XML_CHECKERBOARD, EK_checkerboard },
-    { XML_ROTATE,       EK_rotate },
-    { XML_STRETCH,      EK_stretch },
-    { XML_TOKEN_INVALID, 0 }
-};
-
-SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
-{
-    { XML_NONE,             ED_none },
-    { XML_FROM_LEFT,        ED_from_left },
-    { XML_FROM_TOP,         ED_from_top },
-    { XML_FROM_RIGHT,       ED_from_right },
-    { XML_FROM_BOTTOM,      ED_from_bottom },
-    { XML_FROM_CENTER,      ED_from_center },
-    { XML_FROM_UPPER_LEFT,  ED_from_upperleft },
-    { XML_FROM_UPPER_RIGHT, ED_from_upperright },
-    { XML_FROM_LOWER_LEFT,  ED_from_lowerleft },
-    { XML_FROM_LOWER_RIGHT, ED_from_lowerright },
-    { XML_TO_LEFT,          ED_to_left },
-    { XML_TO_TOP,           ED_to_top },
-    { XML_TO_RIGHT,         ED_to_right },
-    { XML_TO_BOTTOM,        ED_to_bottom },
-    { XML_TO_UPPER_LEFT,    ED_to_upperleft },
-    { XML_TO_UPPER_RIGHT,   ED_to_upperright },
-    { XML_TO_LOWER_RIGHT,   ED_to_lowerright },
-    { XML_TO_LOWER_LEFT,    ED_to_lowerleft },
-    { XML_PATH,             ED_path },
-    { XML_SPIRAL_INWARD_LEFT, ED_spiral_inward_left },
-    { XML_SPIRAL_INWARD_RIGHT,ED_spiral_inward_right },
-    { XML_SPIRAL_OUTWARD_LEFT, ED_spiral_outward_left },
-    { XML_SPIRAL_OUTWARD_RIGHT, ED_spiral_outward_right },
-    { XML_VERTICAL,         ED_vertical },
-    { XML_HORIZONTAL,       ED_horizontal },
-    { XML_TO_CENTER,        ED_to_center },
-    { XML_CLOCKWISE,        ED_clockwise },
-    { XML_COUNTER_CLOCKWISE,ED_cclockwise },
-    { XML_TOKEN_INVALID, 0 }
-};
-
 const struct Effect
 {
     XMLEffect meKind;
@@ -315,14 +260,6 @@ void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDir
     bIn = rEffect.mbIn;
 }
 
-SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
-{
-    { XML_SLOW,     AnimationSpeed_SLOW },
-    { XML_MEDIUM,   AnimationSpeed_MEDIUM },
-    { XML_FAST,     AnimationSpeed_FAST },
-    { XML_TOKEN_INVALID, 0 }
-};
-
 enum XMLActionKind
 {
     XMLE_SHOW,
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 19860ccbea4d..f08e7228219c 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: animimp.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,6 +133,69 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::presentation;
 using namespace ::xmloff::token;
 
+SvXMLEnumMapEntry aXML_AnimationEffect_EnumMap[] =
+{
+    { XML_NONE,         EK_none },
+    { XML_FADE,         EK_fade },
+    { XML_MOVE,         EK_move },
+    { XML_STRIPES,      EK_stripes },
+    { XML_OPEN,         EK_open },
+    { XML_CLOSE,        EK_close },
+    { XML_DISSOLVE,     EK_dissolve },
+    { XML_WAVYLINE,     EK_wavyline },
+    { XML_RANDOM,       EK_random },
+    { XML_LINES,        EK_lines },
+    { XML_LASER,        EK_laser },
+    { XML_APPEAR,       EK_appear },
+    { XML_HIDE,         EK_hide },
+    { XML_MOVE_SHORT,   EK_move_short },
+    { XML_CHECKERBOARD, EK_checkerboard },
+    { XML_ROTATE,       EK_rotate },
+    { XML_STRETCH,      EK_stretch },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+SvXMLEnumMapEntry aXML_AnimationDirection_EnumMap[] =
+{
+    { XML_NONE,             ED_none },
+    { XML_FROM_LEFT,        ED_from_left },
+    { XML_FROM_TOP,         ED_from_top },
+    { XML_FROM_RIGHT,       ED_from_right },
+    { XML_FROM_BOTTOM,      ED_from_bottom },
+    { XML_FROM_CENTER,      ED_from_center },
+    { XML_FROM_UPPER_LEFT,  ED_from_upperleft },
+    { XML_FROM_UPPER_RIGHT, ED_from_upperright },
+    { XML_FROM_LOWER_LEFT,  ED_from_lowerleft },
+    { XML_FROM_LOWER_RIGHT, ED_from_lowerright },
+    { XML_TO_LEFT,          ED_to_left },
+    { XML_TO_TOP,           ED_to_top },
+    { XML_TO_RIGHT,         ED_to_right },
+    { XML_TO_BOTTOM,        ED_to_bottom },
+    { XML_TO_UPPER_LEFT,    ED_to_upperleft },
+    { XML_TO_UPPER_RIGHT,   ED_to_upperright },
+    { XML_TO_LOWER_RIGHT,   ED_to_lowerright },
+    { XML_TO_LOWER_LEFT,    ED_to_lowerleft },
+    { XML_PATH,             ED_path },
+    { XML_SPIRAL_INWARD_LEFT, ED_spiral_inward_left },
+    { XML_SPIRAL_INWARD_RIGHT,ED_spiral_inward_right },
+    { XML_SPIRAL_OUTWARD_LEFT, ED_spiral_outward_left },
+    { XML_SPIRAL_OUTWARD_RIGHT, ED_spiral_outward_right },
+    { XML_VERTICAL,         ED_vertical },
+    { XML_HORIZONTAL,       ED_horizontal },
+    { XML_TO_CENTER,        ED_to_center },
+    { XML_CLOCKWISE,        ED_clockwise },
+    { XML_COUNTER_CLOCKWISE,ED_cclockwise },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[] =
+{
+    { XML_SLOW,     AnimationSpeed_SLOW },
+    { XML_MEDIUM,   AnimationSpeed_MEDIUM },
+    { XML_FAST,     AnimationSpeed_FAST },
+    { XML_TOKEN_INVALID, 0 }
+};
+
 AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, sal_Bool bIn )
 {
     switch( eKind )
diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk
index e2f34473cc59..a4d61f2aaa04 100644
--- a/xmloff/source/draw/makefile.mk
+++ b/xmloff/source/draw/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.14 $
+#   $Revision: 1.15 $
 #
-#   last change: $Author: cl $ $Date: 2001-05-09 14:40:42 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -107,6 +107,32 @@ SLOFILES =	\
         $(SLO)$/XMLShapeStyleContext.obj \
         $(SLO)$/ximppage.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/XMLNumberStyles.obj\
+        $(OBJ)$/XMLGraphicsDefaultStyle.obj\
+        $(OBJ)$/viewcontext.obj\
+        $(OBJ)$/eventimp.obj\
+        $(OBJ)$/layerimp.obj\
+        $(OBJ)$/ximpshow.obj\
+        $(OBJ)$/animimp.obj\
+        $(OBJ)$/numithdl.obj\
+        $(OBJ)$/sdxmlimp.obj \
+        $(OBJ)$/ximpstyl.obj \
+        $(OBJ)$/ximpbody.obj \
+        $(OBJ)$/ximpshap.obj \
+        $(OBJ)$/ximpgrp.obj \
+        $(OBJ)$/ximp3dscene.obj \
+        $(OBJ)$/ximp3dobject.obj \
+        $(OBJ)$/ximpnote.obj \
+        $(OBJ)$/sdpropls.obj \
+        $(OBJ)$/propimp0.obj \
+        $(OBJ)$/xexptran.obj \
+        $(OBJ)$/shapeimport.obj \
+        $(OBJ)$/XMLImageMapContext.obj \
+        $(OBJ)$/XMLShapePropertySetContext.obj \
+        $(OBJ)$/XMLShapeStyleContext.obj \
+        $(OBJ)$/ximppage.obj
+
 # --- Targets --------------------------------------------------------------
 
 .INCLUDE : target.mk
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 0d009772643c..5fce15582ff6 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdpropls.cxx,v $
  *
- *  $Revision: 1.49 $
+ *  $Revision: 1.50 $
  *
- *  last change: $Author: dvo $ $Date: 2001-07-13 16:08:24 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1057,6 +1057,7 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper()
 {
 }
 
+#ifndef SVX_LIGHT
 // ----------------------------------------
 
 XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, XMLTextListAutoStylePool *pListAutoPool, SvXMLExport& rExport ) :
@@ -1509,3 +1510,5 @@ void XMLPageExportPropertyMapper::handleElementItem(
             break;
     }
 }
+
+#endif // #ifndef SVX_LIGHT
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 6a050e0814df..ef088256feca 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: shapeexport.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -936,31 +936,8 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
 #endif
 #include "xmlnmspe.hxx"
 
-SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] =
-{
-    { XML_TOP_LEFT,     drawing::Alignment_TOP_LEFT },
-    { XML_TOP,          drawing::Alignment_TOP },
-    { XML_TOP_RIGHT,    drawing::Alignment_TOP_RIGHT },
-    { XML_LEFT,         drawing::Alignment_LEFT },
-    { XML_CENTER,       drawing::Alignment_CENTER },
-    { XML_RIGHT,        drawing::Alignment_RIGHT },
-    { XML_BOTTOM_LEFT,  drawing::Alignment_BOTTOM_LEFT },
-    { XML_BOTTOM,       drawing::Alignment_BOTTOM },
-    { XML_BOTTOM_RIGHT, drawing::Alignment_BOTTOM_RIGHT },
-    { XML_TOKEN_INVALID, 0 }
-};
-
-SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] =
-{
-    { XML_AUTO,         drawing::EscapeDirection_SMART },
-    { XML_LEFT,         drawing::EscapeDirection_LEFT },
-    { XML_RIGHT,        drawing::EscapeDirection_RIGHT },
-    { XML_UP,           drawing::EscapeDirection_UP },
-    { XML_DOWN,         drawing::EscapeDirection_DOWN },
-    { XML_HORIZONTAL,   drawing::EscapeDirection_HORIZONTAL },
-    { XML_VERTICAL,     drawing::EscapeDirection_VERTICAL },
-    { XML_TOKEN_INVALID, 0 }
-};
+extern SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[];
+extern SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[];
 
 /** exports all user defined glue points */
 void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape >& xShape )
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index de2d1badeab4..06bc1ca2c72e 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximppage.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -127,8 +127,10 @@ void SdXMLGenericPageContext::StartElement( const ::com::sun::star::uno::Referen
 {
     GetImport().GetShapeImport()->pushGroupForSorting( mxShapes );
 
+#ifndef SVX_LIGHT
     if( GetImport().IsFormsSupported() )
         GetImport().GetFormImport()->startPage( uno::Reference< drawing::XDrawPage >::query( mxShapes ) );
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -145,8 +147,10 @@ SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( USHORT nPrefix,
     }
     else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) )
     {
+#ifndef SVX_LIGHT
         if( GetImport().IsFormsSupported() )
             pContext = GetImport().GetFormImport()->createOfficeFormsContext( GetImport(), nPrefix, rLocalName );
+#endif
     }
     else
     {
@@ -168,8 +172,10 @@ void SdXMLGenericPageContext::EndElement()
 {
     GetImport().GetShapeImport()->popGroupAndSort();
 
+#ifndef SVX_LIGHT
     if( GetImport().IsFormsSupported() )
         GetImport().GetFormImport()->endPage();
+#endif
 }
 
 void SdXMLGenericPageContext::SetLayout()
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 7ba677cff4d6..a621aaf864f0 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpshap.cxx,v $
  *
- *  $Revision: 1.56 $
+ *  $Revision: 1.57 $
  *
- *  last change: $Author: aw $ $Date: 2001-07-12 16:58:15 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -187,8 +187,31 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 
-extern SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[];
-extern SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[];
+SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[] =
+{
+    { XML_TOP_LEFT,     drawing::Alignment_TOP_LEFT },
+    { XML_TOP,          drawing::Alignment_TOP },
+    { XML_TOP_RIGHT,    drawing::Alignment_TOP_RIGHT },
+    { XML_LEFT,         drawing::Alignment_LEFT },
+    { XML_CENTER,       drawing::Alignment_CENTER },
+    { XML_RIGHT,        drawing::Alignment_RIGHT },
+    { XML_BOTTOM_LEFT,  drawing::Alignment_BOTTOM_LEFT },
+    { XML_BOTTOM,       drawing::Alignment_BOTTOM },
+    { XML_BOTTOM_RIGHT, drawing::Alignment_BOTTOM_RIGHT },
+    { XML_TOKEN_INVALID, 0 }
+};
+
+SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] =
+{
+    { XML_AUTO,         drawing::EscapeDirection_SMART },
+    { XML_LEFT,         drawing::EscapeDirection_LEFT },
+    { XML_RIGHT,        drawing::EscapeDirection_RIGHT },
+    { XML_UP,           drawing::EscapeDirection_UP },
+    { XML_DOWN,         drawing::EscapeDirection_DOWN },
+    { XML_HORIZONTAL,   drawing::EscapeDirection_HORIZONTAL },
+    { XML_VERTICAL,     drawing::EscapeDirection_VERTICAL },
+    { XML_TOKEN_INVALID, 0 }
+};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1462,6 +1485,7 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
         DBG_ASSERT( maFormId.getLength(), "draw:control without a form:id attribute!" );
         if( maFormId.getLength() )
         {
+#ifndef SVX_LIGHT
             if( GetImport().IsFormsSupported() )
             {
                 uno::Reference< awt::XControlModel > xControlModel( GetImport().GetFormImport()->lookupControl( maFormId ), uno::UNO_QUERY );
@@ -1473,6 +1497,7 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
 
                 }
             }
+#endif // #ifndef SVX_LIGHT
         }
 
         SetStyle();
@@ -2118,12 +2143,14 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
                 aAny <<= aCLSID;
                 xProps->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID") ), aAny );
 
+#ifndef SVX_LIGHT
                 aAny = xProps->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Model") ) );
                 uno::Reference< frame::XModel > xChartModel;
                 if( aAny >>= xChartModel )
                 {
                     mpChartContext = GetImport().GetChartImport()->CreateChartContext( GetImport(), XML_NAMESPACE_SVG, GetXMLToken(XML_CHART), xChartModel, xAttrList );
                 }
+#endif
             }
         }
 
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index e4a9e6911fd4..400d1b6c1ceb 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpstyl.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:13 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1223,8 +1223,10 @@ void SdXMLStylesContext::EndElement()
         // AutoStyles for text import
         GetImport().GetTextImport()->SetAutoStyles( this );
 
+#ifndef SVX_LIGHT
         // AutoStyles for chart
         GetImport().GetChartImport()->SetAutoStylesContext( this );
+#endif
 
         // associate AutoStyles with styles in preparation to setting Styles on shapes
         for(sal_uInt32 a(0L); a < GetStyleCount(); a++)
diff --git a/xmloff/source/forms/formsimp.cxx b/xmloff/source/forms/formsimp.cxx
index ef4418249f70..e90c7deee198 100644
--- a/xmloff/source/forms/formsimp.cxx
+++ b/xmloff/source/forms/formsimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: formsimp.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-18 14:53:32 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,5 +95,9 @@ 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/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk
index ff7b0dc85a83..4e309d2d8e09 100644
--- a/xmloff/source/forms/makefile.mk
+++ b/xmloff/source/forms/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: fs $ $Date: 2001-03-20 13:41:57 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -122,6 +122,18 @@ SLOFILES =	\
         $(SLO)$/formsimp.obj \
         $(SLO)$/strings.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/controlpropertyhdl.obj \
+        $(OBJ)$/controlpropertymap.obj \
+        $(OBJ)$/attriblistmerge.obj \
+        $(OBJ)$/elementimport.obj \
+        $(OBJ)$/layerimport.obj \
+        $(OBJ)$/propertyimport.obj \
+        $(OBJ)$/formlayerimport.obj \
+        $(OBJ)$/formattributes.obj \
+        $(OBJ)$/formenums.obj \
+        $(OBJ)$/strings.obj
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk
index a54c72467da3..93155781f0f9 100644
--- a/xmloff/source/meta/makefile.mk
+++ b/xmloff/source/meta/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: hjs $ $Date: 2001-06-20 17:04:38 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:08 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -80,6 +80,10 @@ SLOFILES =	\
         $(SLO)$/MetaExportComponent.obj \
         $(SLO)$/MetaImportComponent.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/xmlmetai.obj \
+        $(OBJ)$/MetaImportComponent.obj
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk
index fea0d0178119..3856c43ceb1e 100644
--- a/xmloff/source/script/makefile.mk
+++ b/xmloff/source/script/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: hjs $ $Date: 2001-06-20 16:14:25 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -83,6 +83,11 @@ SLOFILES =	\
         $(SLO)$/XMLStarBasicContextFactory.obj \
         $(SLO)$/XMLStarBasicExportHandler.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/xmlscripti.obj \
+        $(OBJ)$/XMLEventImportHelper.obj \
+        $(OBJ)$/XMLEventsImportContext.obj
+
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 699f1d96fffb..21109ac76497 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ImageStyle.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:17 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,16 +147,13 @@ XMLImageStyle::~XMLImageStyle()
 {
 }
 
+#ifndef SVX_LIGHT
+
 sal_Bool XMLImageStyle::exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue, SvXMLExport& rExport )
 {
     return ImpExportXML( rStrName, rValue, rExport );
 }
 
-sal_Bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
-{
-    return ImpImportXML( xAttrList, rValue, rStrName, rImport );
-}
-
 sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rValue, SvXMLExport& rExport )
 {
     sal_Bool bRet = sal_False;
@@ -199,6 +196,13 @@ sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any&
     return bRet;
 }
 
+#endif // #ifndef SVX_LIGHT
+
+sal_Bool XMLImageStyle::importXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport )
+{
+    return ImpImportXML( xAttrList, rValue, rStrName, rImport );
+}
+
 sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttributeList >& xAttrList,
                                       uno::Any& rValue, OUString& rStrName,
                                       SvXMLImport& rImport )
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index 4f393b50c8c6..afc4f8260f60 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PagePropertySetContext.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dvo $ $Date: 2001-04-17 12:01:20 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,15 +146,27 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext(
                                            rProp.mnIndex-1,
                                            rProperties );
         break;
+
     case CTF_PM_TEXTCOLUMNS:
+#ifndef SVX_LIGHT
         pContext = new XMLTextColumnsContext( GetImport(), nPrefix,
                                               rLocalName, xAttrList, rProp,
                                               rProperties );
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         break;
+
     case CTF_PM_FTN_LINE_WEIGTH:
+#ifndef SVX_LIGHT
         pContext = new XMLFootnoteSeparatorImport(
             GetImport(), nPrefix, rLocalName, rProperties,
             xMapper->getPropertySetMapper(), rProp.mnIndex);
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName);
+#endif // #ifndef SVX_LIGHT
         break;
     }
 
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk
index 1fe35e3c609e..73afb9a07fb8 100644
--- a/xmloff/source/style/makefile.mk
+++ b/xmloff/source/style/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.22 $
+#   $Revision: 1.23 $
 #
-#   last change: $Author: mib $ $Date: 2001-07-04 13:52:07 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -248,6 +248,80 @@ SLOFILES =	\
         $(SLO)$/VisAreaContext.obj \
         $(SLO)$/DrawAspectHdl.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/XMLPercentOrMeasurePropertyHandler.obj \
+        $(OBJ)$/XMLIsPercentagePropertyHandler.obj \
+        $(OBJ)$/XMLRectangleMembersHandler.obj \
+        $(OBJ)$/adjushdl.obj	\
+        $(OBJ)$/backhdl.obj		\
+        $(OBJ)$/bordrhdl.obj	\
+        $(OBJ)$/breakhdl.obj	\
+        $(OBJ)$/cdouthdl.obj	\
+        $(OBJ)$/chrhghdl.obj	\
+        $(OBJ)$/chrlohdl.obj	\
+        $(OBJ)$/csmaphdl.obj	\
+        $(OBJ)$/escphdl.obj		\
+        $(OBJ)$/fonthdl.obj		\
+        $(OBJ)$/impastp1.obj    \
+        $(OBJ)$/impastp2.obj    \
+        $(OBJ)$/impastp3.obj    \
+        $(OBJ)$/impastp4.obj    \
+        $(OBJ)$/kernihdl.obj	\
+        $(OBJ)$/lspachdl.obj	\
+        $(OBJ)$/numehelp.obj	\
+        $(OBJ)$/opaquhdl.obj	\
+        $(OBJ)$/postuhdl.obj	\
+        $(OBJ)$/prhdlfac.obj	\
+        $(OBJ)$/prstylei.obj	\
+        $(OBJ)$/shadwhdl.obj	\
+        $(OBJ)$/shdwdhdl.obj	\
+        $(OBJ)$/splithdl.obj	\
+        $(OBJ)$/tabsthdl.obj	\
+        $(OBJ)$/undlihdl.obj	\
+        $(OBJ)$/uniref.obj		\
+        $(OBJ)$/weighhdl.obj	\
+        $(OBJ)$/xmlaustp.obj	\
+        $(OBJ)$/xmlbahdl.obj	\
+        $(OBJ)$/xmlimppr.obj	\
+        $(OBJ)$/xmlnumfi.obj	\
+        $(OBJ)$/xmlnumi.obj		\
+        $(OBJ)$/xmlprcon.obj	\
+        $(OBJ)$/xmlprhdl.obj	\
+        $(OBJ)$/xmlprmap.obj	\
+        $(OBJ)$/xmlstyle.obj	\
+        $(OBJ)$/xmltabi.obj		\
+        $(OBJ)$/DashStyle.obj					\
+        $(OBJ)$/EnumPropertyHdl.obj				\
+        $(OBJ)$/FillStyleContext.obj			\
+        $(OBJ)$/GradientStyle.obj				\
+        $(OBJ)$/HatchStyle.obj					\
+        $(OBJ)$/ImageStyle.obj					\
+        $(OBJ)$/MarkerStyle.obj					\
+        $(OBJ)$/MultiPropertySetHelper.obj		\
+        $(OBJ)$/NamedBoolPropertyHdl.obj		\
+        $(OBJ)$/TransGradientStyle.obj			\
+        $(OBJ)$/XMLBackgroundImageContext.obj	\
+        $(OBJ)$/XMLClipPropertyHandler.obj		\
+        $(OBJ)$/XMLConstantsPropertyHandler.obj	\
+        $(OBJ)$/AttributeContainerHandler.obj	\
+        $(OBJ)$/XMLElementPropertyContext.obj	\
+        $(OBJ)$/XMLFontAutoStylePool.obj		\
+        $(OBJ)$/XMLFontStylesContext.obj		\
+        $(OBJ)$/PageMasterPropHdl.obj			\
+        $(OBJ)$/PageMasterPropHdlFactory.obj	\
+        $(OBJ)$/PageMasterStyleMap.obj			\
+        $(OBJ)$/PageMasterPropMapper.obj		\
+        $(OBJ)$/PageMasterImportPropMapper.obj	\
+        $(OBJ)$/PageMasterImportContext.obj		\
+        $(OBJ)$/PagePropertySetContext.obj		\
+        $(OBJ)$/PageHeaderFooterContext.obj		\
+        $(OBJ)$/XMLBitmapRepeatOffsetPropertyHandler.obj \
+        $(OBJ)$/XMLFillBitmapSizePropertyHandler.obj	\
+        $(OBJ)$/XMLBitmapLogicalSizePropertyHandler.obj	\
+        $(OBJ)$/durationhdl.obj	\
+        $(OBJ)$/VisAreaContext.obj \
+        $(OBJ)$/DrawAspectHdl.obj
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index a373d937f902..6211d76deb59 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlstyle.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: rt $ $Date: 2001-07-11 09:52:41 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -570,27 +570,49 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext(
                                                     rLocalName, xAttrList, sal_True );
                 break;
             case XML_TOK_TEXT_FOOTNOTE_CONFIG:
+#ifndef SVX_LIGHT
                 pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
                                                                    nPrefix,
                                                                    rLocalName,
                                                                    xAttrList,
                                                                    sal_False);
+#else
+                // create default context to skip content
+                pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+#endif // #ifndef SVX_LIGHT
                 break;
+
             case XML_TOK_TEXT_ENDNOTE_CONFIG:
+#ifndef SVX_LIGHT
                 pStyle = new XMLFootnoteConfigurationImportContext(GetImport(),
                                                                    nPrefix,
                                                                    rLocalName,
                                                                    xAttrList,
                                                                    sal_True);
+#else
+                // create default context to skip content
+                pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+#endif // #ifndef SVX_LIGHT
                 break;
+
             case XML_TOK_TEXT_BIBLIOGRAPHY_CONFIG:
+#ifndef SVX_LIGHT
                 pStyle = new XMLIndexBibliographyConfigurationContext(
                     GetImport(), nPrefix, rLocalName, xAttrList);
+#else
+                // create default context to skip content
+                pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+#endif // #ifndef SVX_LIGHT
                 break;
 
             case XML_TOK_TEXT_LINENUMBERING_CONFIG:
+#ifndef SVX_LIGHT
                 pStyle = new XMLLineNumberingImportContext(
                     GetImport(), nPrefix, rLocalName, xAttrList);
+#else
+                // create default context to skip content
+                pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList );
+#endif // #ifndef SVX_LIGHT
                 break;
 
             //
@@ -652,9 +674,15 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleStyleChildContext(
                                               xAttrList, *this, nFamily );
             break;
         case XML_STYLE_FAMILY_SCH_CHART_ID:
+#ifndef SVX_LIGHT
             pStyle = new XMLChartStyleContext( GetImport(), nPrefix, rLocalName,
                                                xAttrList, *this, nFamily );
+#else
+            // create default context to skip content
+            pStyle = new SvXMLStyleContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily );
+#endif
             break;
+
         case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
         case XML_STYLE_FAMILY_SD_PRESENTATION_ID:
         case XML_STYLE_FAMILY_SD_POOL_ID:
@@ -795,6 +823,7 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty
         }
         xMapper = xShapeImpPropMapper;
         break;
+#ifndef SVX_LIGHT
     case XML_STYLE_FAMILY_SCH_CHART_ID:
         if( ! xChartImpPropMapper.is() )
         {
@@ -803,6 +832,7 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty
         }
         xMapper = xChartImpPropMapper;
         break;
+#endif
     case XML_STYLE_FAMILY_PAGE_MASTER:
         if( ! xPageImpPropMapper.is() )
         {
@@ -814,11 +844,13 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty
         }
         xMapper = xPageImpPropMapper;
         break;
+#ifndef SVX_LIGHT
 #if SUPD>615 || defined(PRIV_DEBUG)
     case XML_STYLE_FAMILY_CONTROL_ID:
         xMapper = const_cast<SvXMLImport&>(GetImport()).GetFormImport()->getStylePropertyMapper().getBodyPtr();
         break;
 #endif
+#endif // #ifndef SVX_LIGHT
     }
 
     return xMapper;
diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx
index 2d5e9e6b1b0d..63d8ad348779 100644
--- a/xmloff/source/text/XMLTextPropertySetContext.cxx
+++ b/xmloff/source/text/XMLTextPropertySetContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLTextPropertySetContext.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dvo $ $Date: 2001-04-17 12:01:21 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,10 +124,16 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
                                                    rProperties );
         break;
     case CTF_TEXTCOLUMNS:
+#ifndef SVX_LIGHT
         pContext = new XMLTextColumnsContext( GetImport(), nPrefix,
                                                    rLocalName, xAttrList, rProp,
                                                    rProperties );
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         break;
+
     case CTF_DROPCAPFORMAT:
         {
             DBG_ASSERT( rProp.mnIndex >= 2 &&
@@ -160,6 +166,7 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
                                            rProp.mnIndex-1,
                                            rProperties );
         break;
+#ifndef SVX_LIGHT
     case CTF_SECTION_FOOTNOTE_END:
         pContext = new XMLSectionFootnoteConfigImport(
             GetImport(), nPrefix, rLocalName, rProperties,
@@ -170,6 +177,7 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext(
             GetImport(), nPrefix, rLocalName, rProperties,
             xMapper->getPropertySetMapper(), rProp.mnIndex);
         break;
+#endif // #ifndef SVX_LIGHT
     }
 
     if( !pContext )
diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk
index 870b56c50ed9..1f3904e23921 100644
--- a/xmloff/source/text/makefile.mk
+++ b/xmloff/source/text/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.29 $
+#   $Revision: 1.30 $
 #
-#   last change: $Author: dvo $ $Date: 2001-04-17 11:38:57 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -157,6 +157,44 @@ SLOFILES =	\
         $(SLO)$/XMLTrackedChangesImportContext.obj \
         $(SLO)$/XMLCalculationSettingsContext.obj
 
+SVXLIGHTOBJFILES =	\
+        $(OBJ)$/txtdropi.obj \
+        $(OBJ)$/txtfldi.obj \
+        $(OBJ)$/txtimp.obj \
+        $(OBJ)$/txtimppr.obj \
+        $(OBJ)$/txtparai.obj \
+        $(OBJ)$/txtprhdl.obj \
+        $(OBJ)$/txtprmap.obj \
+        $(OBJ)$/txtstyli.obj \
+        $(OBJ)$/txtvfldi.obj \
+        $(OBJ)$/XMLAutoMarkFileContext.obj \
+        $(OBJ)$/XMLAutoTextEventImport.obj \
+        $(OBJ)$/XMLAutoTextContainerEventImport.obj \
+        $(OBJ)$/XMLChangedRegionImportContext.obj \
+        $(OBJ)$/XMLChangeElementImportContext.obj \
+        $(OBJ)$/XMLChangeInfoContext.obj \
+        $(OBJ)$/XMLLineNumberingExport.obj \
+        $(OBJ)$/XMLLineNumberingImportContext.obj \
+        $(OBJ)$/XMLLineNumberingSeparatorImportContext.obj \
+        $(OBJ)$/XMLPropertyBackpatcher.obj \
+        $(OBJ)$/XMLTextFrameContext.obj \
+        $(OBJ)$/XMLTextFrameHyperlinkContext.obj \
+        $(OBJ)$/XMLTextHeaderFooterContext.obj \
+        $(OBJ)$/XMLTextListAutoStylePool.obj \
+        $(OBJ)$/XMLTextListBlockContext.obj \
+        $(OBJ)$/XMLTextListItemContext.obj \
+        $(OBJ)$/XMLTextMarkImportContext.obj \
+        $(OBJ)$/XMLTextMasterPageContext.obj \
+        $(OBJ)$/XMLTextMasterPageExport.obj \
+        $(OBJ)$/XMLTextMasterStylesContext.obj \
+        $(OBJ)$/XMLTextNumRuleInfo.obj \
+        $(OBJ)$/XMLTextPropertySetContext.obj \
+        $(OBJ)$/XMLTextShapeImportHelper.obj \
+        $(OBJ)$/XMLTextShapeStyleContext.obj \
+        $(OBJ)$/XMLTextTableContext.obj \
+        $(OBJ)$/XMLChangeImportContext.obj \
+        $(OBJ)$/XMLStringBufferImportContext.obj
+
 # --- Tagets -------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index e836c3fa5884..bd8f4adbabc8 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtimp.cxx,v $
  *
- *  $Revision: 1.79 $
+ *  $Revision: 1.80 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1684,7 +1684,12 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
 
     case XML_TOK_TEXT_INDEX_TITLE:
     case XML_TOK_TEXT_SECTION:
+#ifndef SVX_LIGHT
         pContext = new XMLSectionImportContext( rImport, nPrefix, rLocalName );
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         break;
 
     case XML_TOK_TEXT_TOC:
@@ -1694,13 +1699,23 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
     case XML_TOK_TEXT_USER_INDEX:
     case XML_TOK_TEXT_ALPHABETICAL_INDEX:
     case XML_TOK_TEXT_BIBLIOGRAPHY_INDEX:
+#ifndef SVX_LIGHT
         if( XML_TEXT_TYPE_SHAPE != eType )
             pContext = new XMLIndexTOCContext( rImport, nPrefix, rLocalName );
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         break;
 
     case XML_TOK_TEXT_TRACKED_CHANGES:
+#ifndef SVX_LIGHT
         pContext = new XMLTrackedChangesImportContext( rImport, nPrefix,
                                                        rLocalName);
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         bContent = sal_False;
         break;
 
@@ -1715,7 +1730,12 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         break;
 
     case XML_TOK_TEXT_FORMS:
+#ifndef SVX_LIGHT
         pContext = rImport.GetFormImport()->createOfficeFormsContext(rImport, nPrefix, rLocalName);
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         bContent = sal_False;
         break;
 
@@ -1728,7 +1748,12 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         break;
 
     case XML_TOK_TEXT_CALCULATION_SETTINGS:
+#ifndef SVX_LIGHT
         pContext = new XMLCalculationSettingsContext ( rImport, nPrefix, rLocalName, xAttrList);
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         bContent = sal_False;
     break;
 
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 1cf6a6470331..c88bc9af7247 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtparai.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: mib $ $Date: 2001-07-09 12:34:23 $
+ *  last change: $Author: thb $ $Date: 2001-07-24 17:06:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1620,6 +1620,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
 
     case XML_TOK_TEXT_ENDNOTE:
     case XML_TOK_TEXT_FOOTNOTE:
+#ifndef SVX_LIGHT
         if (rImport.GetTextImport()->IsInFrame())
         {
             // we must not insert footnotes into text frames
@@ -1632,6 +1633,10 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                                                      *rImport.GetTextImport().get(),
                                                      nPrefix, rLocalName );
         }
+#else
+        // create default context to skip content
+        pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
+#endif // #ifndef SVX_LIGHT
         rIgnoreLeadingSpace = sal_False;
         break;
 
diff --git a/xmloff/util/defs/wntmsci7 b/xmloff/util/defs/wntmsci7
index c8c85b6b29e3..066673920257 100644
--- a/xmloff/util/defs/wntmsci7
+++ b/xmloff/util/defs/wntmsci7
@@ -9461,3 +9461,4 @@ _real@8@4003a000000000000000
 ?GetAttrPrefix@SvXMLAttrContainerData@@QBE?AVOUString@rtl@@G@Z

 ?exportTextContentEnumeration@XMLTextParagraphExport@@IAEEABV?$Reference@VXEnumeration@container@star@sun@com@@@uno@star@sun@com@@EABV?$Reference@VXTextSection@text@star@sun@com@@@3456@EEPBV?$Reference@VXPropertySet@beans@star@sun@com@@@3456@@Z

 ?exportTextRangeEnumeration@XMLTextParagraphExport@@IAEXABV?$Reference@VXEnumeration@container@star@sun@com@@@uno@star@sun@com@@EEE@Z

+?realloc@?$Sequence@VOUString@rtl@@@uno@star@sun@com@@QAAXJ@Z

diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk
index 6c3671917675..4969c0ede282 100644
--- a/xmloff/util/makefile.mk
+++ b/xmloff/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: mib $ $Date: 2001-06-20 05:03:53 $
+#   last change: $Author: thb $ $Date: 2001-07-24 17:06:10 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -120,6 +120,21 @@ SHL1STDLIBS+=-licg617mxp
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(LIB1TARGET)
 
+# --- Static-Lib ---------------------------------------------------------
+
+.IF "$(SVXLIGHT)" != "" 
+LIB2TARGET= $(LB)$/xol.lib
+LIB2ARCHIV= $(LB)$/libxol.a
+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
+.ENDIF
+
 # --- Def-File ---------------------------------------------------------
 
 DEF1NAME    =$(SHL1TARGET)