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

[Stephan Bergmann]

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

New commits:
commit 88343308e4126b7df9b94ce0bce691bfc246792b
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Mon Jan 18 10:03:02 2016 +0100

    FilterConfigCache::GetImportFormatMediaType still needed on WNT
    
    Change-Id: I462474b3d53c57aade13256d84db77ed4865ada6

diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index 4e315b8..3d5ad91 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 7cde7dd..0bc7bc9 100644
--- a/vcl/source/filter/FilterConfigCache.hxx
+++ b/vcl/source/filter/FilterConfigCache.hxx
@@ -88,6 +88,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
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits