no use of SVX_LIGHT

5 files changed, 26 insertions, 44 deletions

diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index 870601010bb7..a385e8c6b39c 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FilterConfigCache.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: sj $ $Date: 2001-04-25 09:19:03 $
+ *  last change: $Author: sj $ $Date: 2001-04-25 16:55:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,7 +69,6 @@
 #include <tools/debug.hxx>
 #endif
 
-#ifndef SVX_LIGHT
 #ifndef _COM_SUN_STAR_UNO_ANY_H_
 #include <com/sun/star/uno/Any.h>
 #endif
@@ -93,7 +92,6 @@ using namespace ::com::sun::star::container     ;   // XNameAccess
 using namespace ::com::sun::star::uno           ;   // Reference
 using namespace ::com::sun::star::beans         ;   // PropertyValue
 using namespace ::utl                           ;   // getProcessServiceFactory();
-#endif SVX_LIGHT
 using namespace ::rtl                           ;
 
 const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] =
@@ -144,8 +142,6 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt
     return sFilterName.Len() != 0;
 }
 
-#ifndef SVX_LIGHT
-
 sal_Bool FilterConfigCache::ImplIsOwnFilter( const Sequence< PropertyValue >& rFilterProperties )
 {
     static OUString sUserData   ( RTL_CONSTASCII_USTRINGPARAM( "UserData" ) );
@@ -305,8 +301,6 @@ void FilterConfigCache::ImplInit()
     }
 };
 
-#else   // SVX_LIGHT
-
 const char* FilterConfigCache::InternalFilterListForSvxLight[] =
 {
     "bmp","1","SVBMP",
@@ -353,7 +347,7 @@ const char* FilterConfigCache::InternalFilterListForSvxLight[] =
     NULL
 };
 
-void FilterConfigCache::ImplInit()
+void FilterConfigCache::ImplInitSmart()
 {
     const char** pPtr;
     for ( pPtr = InternalFilterListForSvxLight; *pPtr; pPtr++ )
@@ -379,13 +373,15 @@ void FilterConfigCache::ImplInit()
     }
 }
 
-#endif
-
 // ------------------------------------------------------------------------
 
-FilterConfigCache::FilterConfigCache()
+FilterConfigCache::FilterConfigCache( sal_Bool bConfig ) :
+    bUseConfig ( bConfig )
 {
-    ImplInit();
+    if ( bUseConfig )
+        ImplInit();
+    else
+        ImplInitSmart();
 }
 
 FilterConfigCache::~FilterConfigCache()
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
index 9298978d0bc5..cafd46532f51 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FilterConfigCache.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sj $ $Date: 2001-04-25 09:19:32 $
+ *  last change: $Author: sj $ $Date: 2001-04-25 16:55:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,6 @@
 #include <tools/string.hxx>
 #endif
 
-#ifndef SVX_LIGHT
 #ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_
 #include <com/sun/star/uno/Sequence.h>
 #endif
@@ -79,7 +78,6 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
 #endif
-#endif  // SVX_LIGHT
 
 #include <vector>
 
@@ -114,10 +112,11 @@ class FilterConfigCache
 
         typedef std::vector< FilterConfigCacheEntry > CacheVector;
 
+
         CacheVector         aImport;
         CacheVector         aExport;
+        sal_Bool            bUseConfig;
 
-#ifndef SVX_LIGHT
 
         sal_Bool            ImplIsOwnFilter( const ::com::sun::star::uno::Sequence<
                                                 ::com::sun::star::beans::PropertyValue >& rFilterProperties );
@@ -125,11 +124,11 @@ class FilterConfigCache
                                                 ::com::sun::star::beans::PropertyValue >& rFilterProperties,
                                                     const ::com::sun::star::uno::Reference<
                                                         ::com::sun::star::container::XNameAccess >& xTypeAccess );
-#else
+
         static const char*  InternalFilterListForSvxLight[];
-#endif
 
         void                ImplInit();
+        void                ImplInitSmart();
 
     public :
 
@@ -163,7 +162,7 @@ class FilterConfigCache
         sal_Bool    IsExportPixelFormat( sal_uInt16 nFormat );
         sal_Bool    IsExportDialog( sal_uInt16 nFormat );
 
-                    FilterConfigCache();
+                    FilterConfigCache( sal_Bool bUseConfig );
                     ~FilterConfigCache();
 
 };
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index c09bfdf18025..63df68875010 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FilterConfigItem.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: sj $ $Date: 2001-04-25 09:17:53 $
+ *  last change: $Author: sj $ $Date: 2001-04-25 16:55:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,7 +63,6 @@
 #include "FilterConfigItem.hxx"
 #endif
 
-#ifndef SVX_LIGHT
 #include <tools/debug.hxx>
 #ifndef _UTL_CONFIGMGR_HXX_
 #include <unotools/configmgr.hxx>
@@ -415,13 +414,4 @@ void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue )
     }
 }
 
-#else
-
-FilterConfigItem::FilterConfigItem( const ::rtl::OUString& rSubTree )
-{
-};
-
-#endif // SVX_LIGHT
-
-
 // ------------------------------------------------------------------------
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index ac58e9b839b5..a9d13926d07e 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filter.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: sj $ $Date: 2001-04-25 09:17:00 $
+ *  last change: $Author: sj $ $Date: 2001-04-25 16:55:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,11 +136,9 @@
 #include <unotools/localfilehelper.hxx>
 #endif
 
-#ifndef SVX_LIGHT
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
 #include <pathoptions.hxx>
 #endif
-#endif
 
 #if defined WIN || (defined OS2 && !defined ICC)
 
@@ -1058,7 +1056,8 @@ static ImpFilterLibCache aCache;
 // - GraphicFilter -
 // -----------------
 
-GraphicFilter::GraphicFilter()
+GraphicFilter::GraphicFilter( sal_Bool bConfig ) :
+    bUseConfig  ( bConfig )
 {
     ImplInit();
 }
@@ -1080,13 +1079,11 @@ GraphicFilter::~GraphicFilter()
 void GraphicFilter::ImplInit()
 {
 
-#ifndef SVX_LIGHT
     SvtPathOptions aPathOpt;
     aFilterPath = aPathOpt.GetFilterPath();
-#endif
 
     pErrorEx = new FilterErrorEx;
-    pConfig = new FilterConfigCache();
+    pConfig = new FilterConfigCache( bUseConfig );
     nPercent = 0;
     bAbort = sal_False;
 
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index 0af497821069..112908782b2e 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filter2.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: sj $ $Date: 2001-02-22 11:32:21 $
+ *  last change: $Author: sj $ $Date: 2001-04-25 16:56:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1412,7 +1412,7 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
 
     if ( aKeyName.Len() )
     {
-        FilterConfigCache aFilterConfigCache;
+        FilterConfigCache aFilterConfigCache( sal_True );
         nKeyNumber = aFilterConfigCache.GetImportFormatNumberForShortName( String( RTL_CONSTASCII_USTRINGPARAM( aKeyName ) ) );
     }
     return nKeyNumber;