diff options
| author | Noel Power <noel.power@suse.com> | 2012-09-11 08:48:02 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-09-12 12:49:49 +0100 |
| commit | 4597483e00bffcc4e30d379dcf6fad42bc565e56 (patch) | |
| tree | b590428b0e3ae3c7056e6c18f008d7179dc5ba38 /vcl | |
| parent | c414499bbd456389ac6cacf677327bff9e6b43f9 (diff) | |
targetted VBA re-work.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/vcl/dialog.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/combobox.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 11 |
3 files changed, 1 insertions, 19 deletions
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index c4dc0c6d1574..093ef1e0db69 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -54,7 +54,6 @@ private: sal_Bool mbOldSaveBack; sal_Bool mbInClose; sal_Bool mbModalMode; - sal_Int8 mnCancelClose; //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); @@ -89,9 +88,6 @@ public: virtual short Execute(); sal_Bool IsInExecute() const { return mbInExecute; } - sal_Int8 GetCloseFlag() const { return mnCancelClose; } //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event - void SetCloseFlag( sal_Int8 nCancel ) { mnCancelClose = nCancel; } //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event - //////////////////////////////////////// // Dialog::Execute replacement API public: diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 0de832ae06b0..90f5576a598d 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -457,10 +457,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) mbSyntheticModify = sal_True; Modify(); mbSyntheticModify = sal_False; - if (ImplGetWindowImpl() != NULL) //liuchen 2009-7-28, resolve the problem that soffice get crashed if in ComboBox_Change event a Worksheets("SheetX").Activate sentence needs to be executed - { - Select(); - } + Select(); } return 0; diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index bc7b73e30a97..3d6ad01f1c67 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -507,18 +507,7 @@ sal_Bool Dialog::Close() { ImplDelData aDelData; ImplAddDel( &aDelData ); - //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event - mnCancelClose = 0; ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE ); - // basic boolean ( and what the user might use in the event handler) can - // be ambiguous ( e.g. basic true = -1 ) - // test agains 0 ( false ) and assume anything else is true - // ( Note: ) this used to work ( something changes somewhere ) - if (mnCancelClose != 0) - { - return sal_False; - } - //liuchen 2009-7-22 if ( aDelData.IsDead() ) return sal_False; ImplRemoveDel( &aDelData ); |