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

[Noel Grandin]

 vcl/source/filter/FilterConfigCache.cxx |    7 +++++++
 vcl/source/filter/FilterConfigCache.hxx |    1 +
 2 files changed, 8 insertions(+)

New commits:
commit 39293397dd4438f62d989a6bd390ac8396b6ca17
Author: Noel Grandin <noelgran...@gmail.com>
Date:   Thu Sep 22 21:39:48 2016 +0200

    fix windows build
    
    by reverting part of commit
        c4cd079b8f613084a99a83b95c3968b65cbd8900
        Author: Noel Grandin <n...@peralex.com>
        Date:   Thu Sep 22 15:08:42 2016 +0200
        loplugin:unusedmethods in sc..vcl
    
    Change-Id: I4d925532369b37e13d97edd907c12f59a350e6ea
    Reviewed-on: https://gerrit.libreoffice.org/29196
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 8a0678f..33f0aa9 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -370,6 +370,13 @@ OUString FilterConfigCache::GetImportFormatName( 
sal_uInt16 nFormat )
     return OUString("");
 }
 
+OUString FilterConfigCache::GetImportFormatMediaType( sal_uInt16 nFormat )
+{
+    if( nFormat < aImport.size() )
+        return aImport[ nFormat ].sMediaType;
+    return OUString("");
+}
+
 OUString FilterConfigCache::GetImportFormatShortName( sal_uInt16 nFormat )
 {
     if( nFormat < aImport.size() )
diff --git a/vcl/source/filter/FilterConfigCache.hxx 
b/vcl/source/filter/FilterConfigCache.hxx
index 0a6c537..eb32218 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -86,6 +86,7 @@ public:
     OUString    GetImportFilterName( sal_uInt16 nFormat );
     OUString    GetImportFormatName( sal_uInt16 nFormat );
     OUString    GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry 
= 0);
+    OUString    GetImportFormatMediaType( sal_uInt16 nFormat );
     OUString    GetImportFormatShortName( sal_uInt16 nFormat );
     OUString    GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry );
     OUString    GetImportFilterType( sal_uInt16 nFormat );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits