mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle various ReturnXXXX types for forms

Browse Source 
Change-Id: Idcbfbebafb02c734b42428c5b1d6df8d0d4a23d6
This commit is contained in:
Noel Power
2013-04-19 12:52:06 +01:00
parent 063709590e
commit 04eb03cc0b
7 changed files with 101 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripting/source/vbaevents/eventhelper.cxx
View File

@@ -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>
@@ -160,9 +159,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;
}
@@ -176,12 +174,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;
}