[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source

Matteo Casalin matteo.casalin at yahoo.com
Tue Jun 12 03:36:33 UTC 2018


 vcl/source/filter/FilterConfigItem.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 43df64affb71e9cd17cfaf936d142dad95b280f7
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Wed May 16 23:26:44 2018 +0200

    Fix tdf#117410 - UI: Settings in PDF Options not remembered...
    
    for next export
    
    Change-Id: I6f066c81d96595a4560f5bb9e148001b004b38f0
    (cherry picked from commit 85613aa81a885488f99ed038f2254ddb0c8a1037)
    Reviewed-on: https://gerrit.libreoffice.org/55647
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index 170e4b956046..0eedb63b408d 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -68,7 +68,8 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory > const & rXCfgP
         }
         if ( xReadAccess.is() )
         {
-            while (bAvailable && nIdx>=0 )
+            const sal_Int32 nEnd {rTree.getLength()};
+            while (bAvailable && nIdx>=0 && nIdx<nEnd)
             {
                 Reference< XHierarchicalNameAccess > xHierarchicalNameAccess
                     ( xReadAccess, UNO_QUERY );


More information about the Libreoffice-commits mailing list