framework/source/accelerators/acceleratorconfiguration.cxx | 9 +++-
framework/source/accelerators/presethandler.cxx | 24 ++-----------
framework/source/inc/accelerators/presethandler.hxx | 3 +
3 files changed, 12 insertions(+), 24 deletions(-)
New commits:
commit 0c1ee03bf138f2af97e915ed0557bb334881223b
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jul 29 22:58:21 2016 +0200
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 <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index ae62a7a..3e27f5c 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 1845677..628cfa2 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 3451ef7..be781c2 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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
