diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-07-29 22:58:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-01 11:13:34 +0200 |
| commit | d76e3abe130007086099c62c5b425aaef82dc944 (patch) | |
| tree | da34a6e23d68b0e8556224a56658adb3aa792fab /framework/source/accelerators/presethandler.cxx | |
| parent | aa6bca0dfa0a58aae91eb5fa3564add642cd4238 (diff) | |
framework: stop adding silly empty accelerator/current.xml files
... to ODF packages. Somehow this is even skipped sometimes, but it's
much easier to just turn off the silliness than find out why.
Change-Id: Iff509dfd8325fd517e6434bcb56edbd06a3c27f1
Diffstat (limited to 'framework/source/accelerators/presethandler.cxx')
| -rw-r--r-- | framework/source/accelerators/presethandler.cxx | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 18456771a45c..628cfa2df675 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -586,7 +586,8 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString return xStream; } -css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget) +css::uno::Reference< css::io::XStream > PresetHandler::openTarget( + const OUString& sTarget, sal_Int32 const nMode) { css::uno::Reference< css::embed::XStorage > xFolder; { @@ -598,26 +599,9 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString if (!xFolder.is()) return css::uno::Reference< css::io::XStream >(); - OUString sFile(sTarget); - sFile += ".xml"; + OUString const sFile(sTarget + ".xml"); - // try it in read/write mode first and ignore errors. - css::uno::Reference< css::io::XStream > xStream; - try - { - xStream = xFolder->openStreamElement(sFile, css::embed::ElementModes::READWRITE); - return xStream; - } - catch(const css::uno::RuntimeException&) - { throw; } - catch(const css::uno::Exception&) - { xStream.clear(); } - - // try it readonly if it failed before. - // inform user about errors (use original exceptions!) - xStream = xFolder->openStreamElement(sFile, css::embed::ElementModes::READ); - - return xStream; + return xFolder->openStreamElement(sFile, nMode); } void PresetHandler::commitUserChanges() |