summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-08-19 16:46:42 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-08-24 23:31:13 +0000
commita5dfea5a55cce6db0ca002f56e57a6f522a717eb (patch)
tree1367433b9b6a9fc53e4ef23e7eb10d00931f6591
parent16d5b5195c2550aaec856376b7016d723f6950b6 (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/28251 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--basic/source/runtime/dllmgr-x64.cxx2
-rw-r--r--basic/source/runtime/dllmgr-x86.cxx2
-rw-r--r--include/basic/sbxvar.hxx2
3 files changed, 4 insertions, 2 deletions
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 11a514ba5ef1..b78ff5da9681 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -315,7 +315,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 bd8c5be476af..fd41317c6a1f 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -330,7 +330,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 a0800cf40e04..9b9715910da8 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -118,6 +118,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;