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 /cui/source | |
| 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 'cui/source')
| -rw-r--r-- | cui/source/customize/macropg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 007ad3d2ab1e..4ca097865063 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -924,7 +924,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) { (void)pButton; //unused pPage->FillItemSet( *pOutSet ); - EndDialog( RET_CANCEL ); + EndDialog( RET_OK ); return 0; } |