Retire the --disable-export option

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

Change-Id: I86dee8ee6326bdfaa178260c76188261aef2fb4c

1 files changed, 1 insertions, 35 deletions

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;
 }