[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - sfx2/source

[Serge Krot (via logerrit)]

 sfx2/source/doc/guisaveas.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit db8c0c5a5dea59000386db8aeaf5d94d4bb700a5
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Fri Nov 15 19:30:36 2019 +0100
Commit:     Serge Krot (CIB) <Serge.Krot at cib.de>
CommitDate: Fri Nov 15 20:14:37 2019 +0100

    Warn user when output format does not support used encryption
    
    Change-Id: I346517445f358fe0e61497221dfde68bcb8ba25c
    Reviewed-on: https://gerrit.libreoffice.org/82963
    Reviewed-by: Serge Krot (CIB) <Serge.Krot at cib.de>
    Tested-by: Serge Krot (CIB) <Serge.Krot at cib.de>

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 508524b37220..654cfd1f5ed5 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -764,8 +764,10 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName )
         // if 'SupportedFilters' is empty assume that all filters are supported.
         if (!aSupportedFilters.isEmpty())
         {
+            const OUString aSelectedFilter = aFiltPropsHM.getUnpackedValueOrDefault("UIName", OUString());
+
             aSupportedFilters = ";" + aSupportedFilters + ";";
-            const OUString aSearchToken = ";" + aFilterName + ";";
+            const OUString aSearchToken = ";" + aSelectedFilter + ";";
             bAsk = (aSupportedFilters.indexOf(aSearchToken) < 0);
         }
     }