[Libreoffice-commits] core.git: 2 commits - external/curl framework/source
Michael Stahl
mstahl at redhat.com
Mon Aug 1 09:17:10 UTC 2016
external/curl/UnpackedTarball_curl.mk | 6 ---
external/curl/curl-android.patch | 16 --------
framework/source/accelerators/acceleratorconfiguration.cxx | 9 +++-
framework/source/accelerators/presethandler.cxx | 24 ++-----------
framework/source/inc/accelerators/presethandler.hxx | 3 +
5 files changed, 12 insertions(+), 46 deletions(-)
New commits:
commit 4b2cabedaa479913e72d827983f9a60f985f4424
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Aug 1 11:11:59 2016 +0200
curl: drop curl-android.patch
fixed in new upstream autoconf
Change-Id: I8c88330b2ed522a160fedac6abd962f92b32d2f0
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 4cde155..f1e9209 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -31,10 +31,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
))
endif
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,curl,\
- external/curl/curl-android.patch \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/curl/curl-android.patch b/external/curl/curl-android.patch
deleted file mode 100644
index 8a74fb9..0000000
--- a/external/curl/curl-android.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh
---- curl-7.26.0/ltmain.sh 2012-07-02 14:05:04.256112279 +0200
-+++ misc/build/curl-7.26.0/ltmain.sh 2012-07-02 14:07:23.775119842 +0200
-@@ -8784,6 +8784,12 @@
- func_warning "'-release' is ignored for convenience libraries"
- else
-
-+ # Force no versioning suffix for Android thanks to silly
-+ # apkbuilder which doesn't add extra native libs unless their
-+ # name ends with .so
-+
-+ version_type=none
-+
- # Parse the version information argument.
- save_ifs=$IFS; IFS=:
- set dummy $vinfo 0 0 0
commit d76e3abe130007086099c62c5b425aaef82dc944
Author: Michael Stahl <mstahl at 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
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.
More information about the Libreoffice-commits
mailing list