diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:30 +0200 |
| commit | 88c1a56d1127376284095465cf85f5b4e71a08e5 (patch) | |
| tree | 4b7ae852d8a8b86f9125b9218d36faf574b9a1a7 /extensions/source/propctrlr/eventhandler.cxx | |
| parent | 779b389116e7112c7ca29cb08e56cfcb043ecc4d (diff) | |
| parent | 84d9f0ceb2048550acf763879993348fb1cfb473 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
extensions/source/svg/svgaction.cxx
extensions/source/svg/svguno.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/xstorage.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
Diffstat (limited to 'extensions/source/propctrlr/eventhandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/eventhandler.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index ca4baaca2afb..62314f1ac7e6 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -75,6 +75,7 @@ #include <svx/svxdlg.hxx> #include <svx/svxids.hrc> #include <tools/diagnose_ex.h> +#include <vcl/msgbox.hxx> #include <map> #include <algorithm> @@ -942,7 +943,7 @@ namespace pcr // DF definite problem here // OK & Cancel seem to be both returning 0 - if ( pDialog->Execute() != 0 ) + if ( pDialog->Execute() == RET_CANCEL ) return InteractiveSelectionResult_Cancelled; try |