diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 16:46:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-25 11:34:35 +0000 |
| commit | 4221a87f03d823f9f8c8b92d5fba42bd359152fe (patch) | |
| tree | 9dee2cefa32d957dcd6588de15cfe7858bd9a699 | |
| parent | d011e37962494c09c25b30aba3a22998d6fd4c74 (diff) | |
Resolves: tdf#88953 byref args incorrectly passed in basic->c++
partial revert
of
commit 22b094f5d8e1e82375b135abd3a6f99a9a555244
Date: Tue Jul 14 14:50:07 2015 +0200
loplugin:unusedmethods basic
and partial revert of...
commit e2080e70fe8b085f18e868e46340454720fa94ca
Date: Wed Jun 18 12:14:29 2014 +0200
new compilerplugin returnbyref
and revert of...
commit 536051f8862203e0e115a5394a6379acd83cc8fe
Date: Wed Jul 15 14:04:01 2015 +0200
fix Windows build
after commit 22b094f5d8e1e82375b135abd3a6f99a9a555244
"loplugin:unusedmethods basic"
Change-Id: I612937334fdb75365080c98a9d4da5ed7ae647e3
(cherry picked from commit 4a647a04a7881964ce13b541399f89e4ab042ea8)
Reviewed-on: https://gerrit.libreoffice.org/28250
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | basic/source/runtime/dllmgr-x64.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/dllmgr-x86.cxx | 2 | ||||
| -rw-r--r-- | include/basic/sbxvar.hxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx index 78fb890f9446..2d61d28f47ca 100644 --- a/basic/source/runtime/dllmgr-x64.cxx +++ b/basic/source/runtime/dllmgr-x64.cxx @@ -312,7 +312,7 @@ SbError marshal( case SbxDOUBLE: case SbxBOOL: case SbxBYTE: - add(blob, variable->GetValues_Impl(), 8, offset); + add(blob, variable->data(), 8, offset); break; case SbxSTRING: { diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx index 2c32b4aa0192..66277234ce41 100644 --- a/basic/source/runtime/dllmgr-x86.cxx +++ b/basic/source/runtime/dllmgr-x86.cxx @@ -327,7 +327,7 @@ SbError marshal( case SbxDOUBLE: case SbxBOOL: case SbxBYTE: - add(blob, variable->GetValues_Impl(), 4, offset); + add(blob, variable->data(), 4, offset); break; case SbxSTRING: { diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 46092c79ebf7..bd17112fb643 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -132,6 +132,8 @@ public: const SbxValues& GetValues_Impl() const { return aData; } bool Put( const SbxValues& ); + SbxValues * data() { return &aData; } + sal_Unicode GetChar() const; sal_Int16 GetInteger() const; sal_Int32 GetLong() const; |