diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-03 15:19:21 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-03 15:25:44 +0200 |
commit | ab3d2e568fe1595584c66c2ff07843e72f608944 (patch) | |
tree | f8490f9286c1cb3012c74743a864d6d9bb4ce7e4 /cui | |
parent | 2ce95e838260ed1e7e64ac8f5662aa2e2234ab9e (diff) |
Prevent Any ctor from reinterpreting bool* as sal_Bool*
...which only happens to work in environments where sizeof (bool) == 1. The
simpler alternative is to use the Any ctor template without passing explicit UNO
type information, anyway.
The std::nullptr_t overloads are needed to disambiguate calls with a nullptr
argument. (Which can at least be meaningful for VOID, but for other types what
it happens to do is store a default value of the given type.) As std::nullptr_t
is only C++11, this all needs to be LIBO_INTERNAL_ONLY.
Change-Id: I0f72c73a088ef96e069c3ed8c78546b16d89b50a
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/options/connpoolconfig.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 31423f5431a8..00b46cde8e1d 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -186,7 +186,7 @@ namespace offapp // set the values aThisDriverSettings.setNodeValue(getDriverNameNodeName(), makeAny(sThisDriverName)); - aThisDriverSettings.setNodeValue(getEnableNodeName(), Any(&aLoop->bEnabled, cppu::UnoType<bool>::get())); + aThisDriverSettings.setNodeValue(getEnableNodeName(), Any(aLoop->bEnabled)); aThisDriverSettings.setNodeValue(getTimeoutNodeName(), makeAny(aLoop->nTimeoutSeconds)); } bNeedCommit = true; |