Retire the --disable-export option

It was never fully implemented, and its usefulness is unclear.

Change-Id: I86dee8ee6326bdfaa178260c76188261aef2fb4c

8 files changed, 4 insertions, 62 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 95385825c677..1abb21e94f1a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -97,7 +97,6 @@ export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
 export DISABLE_ATL=@DISABLE_ATL@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
-export DISABLE_EXPORT=@DISABLE_EXPORT@
 export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DLOPEN_LIBS=@DLOPEN_LIBS@
diff --git a/configure.ac b/configure.ac
index 589aff437212..bcc29ef62277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -967,13 +967,6 @@ libo_FUZZ_ARG_ENABLE(extension-integration,
          product. Use this switch to disable the integration.])
 )
 
-libo_FUZZ_ARG_ENABLE(export,
-    AS_HELP_STRING([--disable-export],
-        [Disable (some) code for document export. Useful when building viewer-only apps that lack
-         save/export functionality, to avoid having an excessive amount of code and data used
-         only for exporrt linked in. Work in progress, use only if you are hacking on it.])
-)
-
 AC_ARG_ENABLE(avmedia,
     AS_HELP_STRING([--disable-avmedia],
         [Disable displaying and inserting AV media in documents. Work in progress, use only if you are hacking on it.])
@@ -2464,15 +2457,6 @@ if test $_os != iOS -a $_os != Android; then
     AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
 fi
 
-DISABLE_EXPORT=''
-if test "$enable_export" != no; then
-    BUILD_TYPE="$BUILD_TYPE EXPORT"
-else
-    DISABLE_EXPORT='TRUE'
-    SCPDEFS="$SCPDES -DDISABLE_EXPORT"
-fi
-AC_SUBST(DISABLE_EXPORT)
-
 # Whether to build "avmedia" functionality or not.
 
 if test -z "$enable_avmedia"; then
diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf
index a72a25204b58..93396c75dca7 100644
--- a/distro-configs/LibreOfficeEmscripten.conf
+++ b/distro-configs/LibreOfficeEmscripten.conf
@@ -21,7 +21,6 @@
 --disable-systray
 --disable-gltf
 --disable-collada
---disable-export
 --disable-report-builder
 --disable-lpsolve
 --disable-coinmp
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 9d647b5c0a62..82f3aeedb615 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -70,10 +70,9 @@ $(eval $(call gb_Library_add_exception_objects,svgfilter,\
 	filter/source/svg/svgreader \
 	filter/source/svg/tokenmap \
 	filter/source/svg/units \
-	$(if $(filter EXPORT,$(BUILD_TYPE)), \
-		filter/source/svg/svgexport \
-		filter/source/svg/svgfontexport \
-		filter/source/svg/svgwriter) \
+	filter/source/svg/svgexport \
+	filter/source/svg/svgfontexport \
+	filter/source/svg/svgwriter \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index c1faa06469b5..a47ac1819869 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -103,7 +103,6 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
 
     if( mxDstDoc.is() )
         bRet = implImport( rDescriptor );
-#ifndef DISABLE_EXPORT
     else if( mxSrcDoc.is() )
     {
         // #i124608# detect selection
@@ -274,7 +273,6 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
             bRet = implExport( rDescriptor );
         }
     }
-#endif
     else
         bRet = false;
 
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 8571653785d1..9f27ef90744b 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -218,10 +218,8 @@ private:
     UCharSetMapMap                      mTextFieldCharSets;
     Reference< XInterface >             mCreateOjectsCurrentMasterPage;
     UOStringMap                         mTextShapeIdListMap;
-#ifndef DISABLE_EXPORT
     MetaBitmapActionSet                 mEmbeddedBitmapActionSet;
     ObjectMap                           mEmbeddedBitmapActionMap;
-#endif
     ObjectMap*                          mpObjects;
     Reference< XComponent >             mxSrcDoc;
     Reference< XComponent >             mxDstDoc;
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 747c1d6110d3..8409702a636a 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -236,7 +236,6 @@ endif
 gb_GLOBALDEFS += \
 	$(call gb_Helper_define_if_set,\
 		DISABLE_DYNLOADING \
-		DISABLE_EXPORT \
 		ENABLE_LTO \
 	)
 
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 632c692e836c..9057a50f0ff8 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -103,8 +103,6 @@ public:
     explicit ImpFilterOutputStream( SvStream& rStm ) : mrStm( rStm ) {}
 };
 
-#ifndef DISABLE_EXPORT
-
 static bool DirEntryExists( const INetURLObject& rObj )
 {
     bool bExists = false;
@@ -153,8 +151,6 @@ static void KillDirEntry( const OUString& rMainUrl )
     }
 }
 
-#endif // !DISABLE_EXPORT
-
 // Helper functions
 
 sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLong nComp, sal_uLong nSize )
@@ -821,8 +817,6 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream&
     return GRFILTER_OK;
 }
 
-#ifndef DISABLE_EXPORT
-
 static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem )
 {
     Graphic     aGraphic;
@@ -919,8 +913,6 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r
     return aGraphic;
 }
 
-#endif
-
 static OUString ImpCreateFullFilterPath( const OUString& rPath, const OUString& rFilterName )
 {
     OUString aPathURL;
@@ -1797,14 +1789,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
 sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
     sal_uInt16 nFormat, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData )
 {
-#ifdef DISABLE_EXPORT
-    (void) rGraphic;
-    (void) rPath;
-    (void) nFormat;
-    (void) pFilterData;
-
-    return GRFILTER_FORMATERROR;
-#else
     SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
     sal_uInt16  nRetValue = GRFILTER_FORMATERROR;
     SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NotValid" );
@@ -1821,35 +1805,19 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
             KillDirEntry( aMainUrl );
     }
     return nRetValue;
-#endif
 }
 
 #ifdef DISABLE_DYNLOADING
 
-#ifndef DISABLE_EXPORT
-
 extern "C" bool egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
 extern "C" bool epsGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
 extern "C" bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
 
 #endif
 
-#endif
-
 sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& rPath,
     SvStream& rOStm, sal_uInt16 nFormat, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData )
 {
-#ifdef DISABLE_EXPORT
-    (void) rGraphic;
-    (void) rPath;
-    (void) rOStm;
-    (void) nFormat;
-    (void) pFilterData;
-
-    (void) nExpGraphHint;
-
-    return GRFILTER_FORMATERROR;
-#else
     SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" );
     sal_uInt16 nFormatCount = GetExportFormatCount();
 
@@ -2150,7 +2118,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
         ImplSetError( nStatus, &rOStm );
     }
     return nStatus;
-#endif
 }
 
 
@@ -2194,14 +2161,13 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
         nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) );
         bRet = ImportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0;
     }
-#ifndef DISABLE_EXPORT
     else if( !aShortName.isEmpty() )
     {
         // Export
         nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
         bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0;
     }
-#endif
+
     return bRet;
 }