diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-07-29 22:58:21 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-09 12:15:17 +0000 |
commit | 0c1ee03bf138f2af97e915ed0557bb334881223b (patch) | |
tree | cf2c31e453741c2ecd1681e6992f09ff210a00ea /framework | |
parent | 1449d36eaf926ef321568253b68c546acee2f4db (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
(cherry picked from commit d76e3abe130007086099c62c5b425aaef82dc944)
Reviewed-on: https://gerrit.libreoffice.org/27900
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/accelerators/acceleratorconfiguration.cxx | 9 | ||||
-rw-r--r-- | framework/source/accelerators/presethandler.cxx | 24 | ||||
-rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 3 |
3 files changed, 12 insertions, 24 deletions
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index ae62a7a789dc..3e27f5c8c85f 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -232,7 +232,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload() css::uno::Reference< css::io::XStream > xStreamNoLang; { SolarMutexGuard g; - xStream = m_aPresetHandler.openTarget(TARGET_CURRENT); // open or create! + xStream = m_aPresetHandler.openTarget(TARGET_CURRENT, + css::embed::ElementModes::READ); try { xStreamNoLang = m_aPresetHandler.openPreset(PRESET_DEFAULT); @@ -273,7 +274,8 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store() css::uno::Reference< css::io::XStream > xStream; { SolarMutexGuard g; - xStream = m_aPresetHandler.openTarget(TARGET_CURRENT); // open or create! + xStream = m_aPresetHandler.openTarget(TARGET_CURRENT, + css::embed::ElementModes::READWRITE); // open or create! } css::uno::Reference< css::io::XOutputStream > xOut; @@ -329,7 +331,8 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() css::uno::Reference< css::io::XStream > xStream; { SolarMutexGuard g; - xStream = m_aPresetHandler.openTarget(TARGET_CURRENT); // open or create! + xStream = m_aPresetHandler.openTarget(TARGET_CURRENT, + css::embed::ElementModes::READWRITE); // open or create! } css::uno::Reference< css::io::XOutputStream > xOut; 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() diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 3451ef7cc16f..be781c2f2444 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -297,7 +297,8 @@ class PresetHandler @return The opened target stream ... or NULL if the target does not exists or couldnt be created as new one. */ - css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget); + css::uno::Reference< css::io::XStream > openTarget( + const OUString& sTarget, sal_Int32 nMode); /** @short do anything which is necessary to flush all changes back to disk. |