diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-04-20 09:21:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-20 09:22:29 +0200 |
| commit | 4ccb4bda483eb548eb6efb5e2f1952f094522320 (patch) | |
| tree | a9490cb2c286b07a58088b5fbac2492793928f33 | |
| parent | cf0186de2df4ad2ffeb39088638aefafc5d4a823 (diff) | |
fdo#46074 Ignore corrupted items in Recent Documents
| -rw-r--r-- | unotools/source/config/historyoptions.cxx | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 20450740d69d..8ee53ccbadd8 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/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; } } |