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 /xmloff | |
| 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 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLIndexTabStopEntryContext.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index 51764f72b047..1822fd251b0a 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -129,8 +129,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( // right aligned? pValues[nNextEntry].Name = rTemplateContext.sTabStopRightAligned; - pValues[nNextEntry].Value.setValue( &bTabRightAligned, - cppu::UnoType<bool>::get()); + pValues[nNextEntry].Value <<= bTabRightAligned; nNextEntry++; // position @@ -151,8 +150,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( // tab character #i21237# pValues[nNextEntry].Name = "WithTab"; - pValues[nNextEntry].Value.setValue( &bWithTab, - cppu::UnoType<bool>::get()); + pValues[nNextEntry].Value <<= bWithTab; nNextEntry++; // check whether we really filled all elements of the sequence |