[Libreoffice-commits] core.git: vcl/source

[Miklos Vajna]

 vcl/source/filter/graphicfilter.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit fb60f000525427af3b331a746f8cedc54fd32922
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 2 10:45:20 2015 +0100

    GraphicFilter::ExportGraphic: adapt to removed expGraphicExport
    
    Implementation was removed in 630ec7110ec822d1d380d5181bcbb2570a129a21
    (tdf#92925 Remove XPM export, 2015-12-01), this would only fail at
    runtime on the desktop when doing a dlopen(), but gets detected on
    Android at link-time.
    
    Change-Id: I0345c23ef52fb87c9d56bc54490ba0302fc08ac1

diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index de2477a..603f9d9 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1829,7 +1829,6 @@ extern "C" bool epgGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterCo
 extern "C" bool eppGraphicExport( 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 );
-extern "C" bool expGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
 
 #endif
 
@@ -2131,8 +2130,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
                     pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("epsGraphicExport"));
                 else if (tmpFilterName == "eti")
                     pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("etiGraphicExport"));
-                else if (tmpFilterName == "exp")
-                    pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol("expGraphicExport"));
                  // Execute dialog in DLL
  #else
                 PFilterCall pFunc = NULL;
@@ -2150,8 +2147,6 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
                     pFunc = epsGraphicExport;
                 else if (aFilterName == "eti")
                     pFunc = etiGraphicExport;
-                else if (aFilterName == "exp")
-                    pFunc = expGraphicExport;
  #endif
                 if( pFunc )
                 {