diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 15:06:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 15:06:08 +0000 |
| commit | a7e693854464703ef585e3c2de105ae29556cedc (patch) | |
| tree | b45ffcf924b04ef3e9a7d08a8d120a5db403bc70 /sfx2 | |
| parent | be2d76454e1792bcaacac125e3e2082218e19f61 (diff) | |
INTEGRATION: CWS fwk41 (1.45.4); FILE MERGED
2006/07/21 10:55:55 mav 1.45.4.1: #i67548# fix impossibility to remove empty template groups
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docvor.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 27ce60e56e00..f6817054c419 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docvor.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: obo $ $Date: 2006-07-13 13:28:13 $ + * last change: $Author: ihi $ $Date: 2006-08-01 16:06:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1930,8 +1930,9 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( USHORT nId, Menu* _pMenu ) USHORT nDeleteInd = ( STR_DELETE_REGION == nResId? USHRT_MAX: nIndex ); if ( !aMgr.Delete( pFocusBox, nRegion, nDeleteInd ) ) ErrorDelete_Impl( - pDialog, pFocusBox->GetEntryText(pEntry), ( nDeleteInd == USHRT_MAX ) ); - + pDialog, + pFocusBox->GetEntryText(pEntry), + ( nDeleteInd == USHRT_MAX && pFocusBox->GetChildCount(pEntry) ) ); } } // Inhaltsformen |