diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-05-16 09:32:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-05-18 10:27:02 +0200 |
| commit | 12e49e422e5244173d97bcf61f5354fd90d7fab3 (patch) | |
| tree | fff98c1cd17287bea1ab0ff1971c17589614d003 | |
| parent | 3a91ffeefdd442b28e982053379e9be75d090013 (diff) | |
fdo#46074 fdo#49948 Ignore corrupted items in Recent Documents
...following up on 4ccb4bda483eb548eb6efb5e2f1952f094522320 "fdo#46074 Ignore
corrupted items in Recent Documents" with another problematic scenario found
with fdo#49948.
Conflicts:
unotools/source/config/historyoptions.cxx
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
(cherry picked from commit fcac9e82d3233d85a6da11bd716a7dc357d5eed2)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Jan Holesovsky <kendy@suse.cz>
Change-Id: I3e7c803813f09c1f031defc2c18cfab6732b1621
| -rw-r--r-- | unotools/source/config/historyoptions.cxx | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 5ba204544e93..94385f1a1e6b 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -583,7 +583,23 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , ::rtl::OUString sRemove; xOrderList->getByName(::rtl::OUString::valueOf(nLength-1)) >>= xSet; xSet->getPropertyValue(s_sHistoryItemRef) >>= sRemove; - xItemList->removeByName(sRemove); + try + { + xItemList->removeByName(sRemove); + } + catch (css::container::NoSuchElementException &) + { + // <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 added: + if (!sRemove.isEmpty()) + { + throw; + } + } } if ( nLength != nMaxSize ) { |