diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-05-03 15:26:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-05-03 15:26:01 +0200 |
| commit | 0b1e4a306705d8c25db6e233244101ba6c4c16b6 (patch) | |
| tree | e3ce34a2d884bb5469aa0e15e8d66b6aa08a876e /extensions | |
| parent | ab3d2e568fe1595584c66c2ff07843e72f608944 (diff) | |
Prevent Any::setValue from reinterpreting bool* as sal_Bool*
...which only happens ot work in environments where sizeof (bool) == 1. The
simpler alternative is to use the operator <<= 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: Iff06a6ba94250bd4ae4afc937c2a2bfa75f0888f
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/bibliography/bibconfig.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index e5779e2249aa..a5d9733b8301 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -234,9 +234,7 @@ void BibConfig::ImplCommit() case 4: pValues[nProp] <<= nViewSize; break; case 5: pValues[nProp] <<= sQueryText; break; case 6: pValues[nProp] <<= sQueryField; break; - case 7: - pValues[nProp].setValue(&bShowColumnAssignmentWarning, cppu::UnoType<bool>::get()); - break; + case 7: pValues[nProp] <<= bShowColumnAssignmentWarning; break; } } PutProperties(aPropertyNames, aValues); |