diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-01 15:03:56 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-01 15:03:56 +0200 |
| commit | 9e2ed49397eda707bca5326d09ff58b10fa05147 (patch) | |
| tree | 28b810ef116d4d876f584f6ccb0ecae17c5f2197 /svtools/source | |
| parent | ab3f1411d1644ed1bb227e69f6f85a75a9c27aa2 (diff) | |
unoawt: UNO/SVT wizzards: allow to completely reset the DefaultButton - for pages which have on own default button
Diffstat (limited to 'svtools/source')
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/uno/wizard/unowizard.cxx | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 5a5c094c1572..2053da80019d 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -355,8 +355,10 @@ namespace svt if (m_pCancel && (_nWizardButtonFlags & WZB_CANCEL)) pNewDefButton = m_pCancel; - if (pNewDefButton) - defaultButton(pNewDefButton); + if ( pNewDefButton ) + defaultButton( pNewDefButton ); + else + implResetDefault( this ); } //--------------------------------------------------------------------- diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index e310aceaca75..9440c0e69f26 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -83,6 +83,7 @@ namespace svt { namespace uno { switch ( i_nWizardButton ) { + case WizardButton::NONE: return WZB_NONE; case WizardButton::NEXT: return WZB_NEXT; case WizardButton::PREVIOUS: return WZB_PREVIOUS; case WizardButton::FINISH: return WZB_FINISH; @@ -90,7 +91,7 @@ namespace svt { namespace uno case WizardButton::HELP: return WZB_HELP; } OSL_ENSURE( false, "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); - return 0; + return WZB_NONE; } } |