diff options
| author | Noel Power <noel.power@suse.com> | 2013-04-19 12:52:06 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-04-19 19:31:09 +0100 |
| commit | ffc7a6e2a133ab443e253368217482454e646e88 (patch) | |
| tree | cbcd3c7405cc1fb5c167c8c8fd7c93017516dc0a /scripting | |
| parent | 1e2442a9f145bfc2d234cb09212bc3abd5e668d0 (diff) | |
handle various ReturnXXXX types for forms
Change-Id: I6d017da640804d95c605739ca70566b34c4c5e5a
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 575fe2fd50fd..e7f90e29c62d 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -58,8 +58,6 @@ #include <com/sun/star/awt/XRadioButton.hpp> #include <com/sun/star/awt/XListBox.hpp> -#include <ooo/vba/msforms/ReturnInteger.hpp> - #include <sfx2/objsh.hxx> #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> @@ -67,6 +65,7 @@ #include <basic/sbmod.hxx> #include <basic/sbx.hxx> #include <filter/msfilter/msvbahelper.hxx> +#include <vbahelper/vbareturntypes.hxx> // for debug #include <comphelper/anytostring.hxx> @@ -162,9 +161,8 @@ Sequence< Any > ooKeyPressedToVBAKeyPressed( const Sequence< Any >& params ) translatedParams.realloc(1); - msforms::ReturnInteger keyCode; - keyCode.Value = evt.KeyCode; - translatedParams[0] <<= keyCode; + Reference< msforms::XReturnInteger> xKeyCode = new ReturnInteger( sal_Int32( evt.KeyCode ) ); + translatedParams[0] <<= xKeyCode; return translatedParams; } @@ -178,12 +176,11 @@ Sequence< Any > ooKeyPressedToVBAKeyUpDown( const Sequence< Any >& params ) translatedParams.realloc(2); - msforms::ReturnInteger keyCode; + Reference< msforms::XReturnInteger> xKeyCode = new ReturnInteger( evt.KeyCode ); sal_Int8 shift = sal::static_int_cast<sal_Int8>( evt.Modifiers ); // #TODO check whether values from OOO conform to values generated from vba - keyCode.Value = evt.KeyCode; - translatedParams[0] <<= keyCode; + translatedParams[0] <<= xKeyCode; translatedParams[1] <<= shift; return translatedParams; } |