fdo#46074 Ignore corrupted items in Recent Documents

unotools/source/config/historyoptions.cxx

@@ -33,6 +33,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
+#include <cassert>
 #include <deque>
 #include <algorithm>
 
@@ -391,20 +392,37 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
 
             const sal_Int32 nLength = xOrderList->getElementNames().getLength();
             Sequence< Sequence< PropertyValue > > aRet(nLength);
+            sal_Int32 nCount = 0;
 
             for(sal_Int32 nItem=0; nItem<nLength; ++nItem)
             {
-                ::rtl::OUString sUrl;
-                xOrderList->getByName(::rtl::OUString::valueOf(nItem)) >>= xSet;
-                xSet->getPropertyValue(rtl::OUString(s_sHistoryItemRef)) >>= sUrl;
-
-                xItemList->getByName(sUrl) >>= xSet;
-                seqProperties[s_nOffsetURL  ].Value <<= sUrl;
-                xSet->getPropertyValue(rtl::OUString(s_sFilter))   >>= seqProperties[s_nOffsetFilter   ].Value;
-                xSet->getPropertyValue(rtl::OUString(s_sTitle))    >>= seqProperties[s_nOffsetTitle    ].Value;
-                xSet->getPropertyValue(rtl::OUString(s_sPassword)) >>= seqProperties[s_nOffsetPassword ].Value;
-                aRet[nItem] = seqProperties;
+                try
+                {
+                    ::rtl::OUString sUrl;
+                    xOrderList->getByName(::rtl::OUString::valueOf(nItem)) >>= xSet;
+                    xSet->getPropertyValue(rtl::OUString(s_sHistoryItemRef)) >>= sUrl;
+
+                    xItemList->getByName(sUrl) >>= xSet;
+                    seqProperties[s_nOffsetURL  ].Value <<= sUrl;
+                    xSet->getPropertyValue(rtl::OUString(s_sFilter))   >>= seqProperties[s_nOffsetFilter   ].Value;
+                    xSet->getPropertyValue(rtl::OUString(s_sTitle))    >>= seqProperties[s_nOffsetTitle    ].Value;
+                    xSet->getPropertyValue(rtl::OUString(s_sPassword)) >>= seqProperties[s_nOffsetPassword ].Value;
+                    aRet[nCount++] = seqProperties;
+                }
+                catch(const css::uno::Exception& ex)
+                {
+                    // <https://bugs.freedesktop.org/show_bug.cgi?id=46074>
+                    // "FILEOPEN: No Recent Documents..." discusses a problem
+                    // with corrupted /org.openoffice.Office/Histories/Histories
+                    // configuration items; to work around that problem, simply
+                    // ignore such corrupted individual items here, so that at
+                    // least newly added items are successfully reported back
+                    // from this function:
+                    LogHelper::logIt(ex);
+                }
             }
+            assert(nCount <= nLength);
+            aRet.realloc(nCount);
             seqReturn = aRet;
         }
     }