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 | 4ce1e4e639490d620f3dcd8a5cf5bcbbc9c14bb2 (patch) | |
| tree | c6f009b49b7acf7d3b1cd0eb67644a7f8d2f105d /extensions/source/propctrlr | |
| parent | 19ed36590e990b5281da9c54bd962031bd56ae82 (diff) | |
| parent | 574d1f2004244c86d4b73d0623674d7fe4c88aa0 (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')
| -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 eb6b9119a..0fe072a6d 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 |