diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 15:06:44 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 15:06:44 +0000 |
| commit | 5052b7a43e2c18662d040f9ba38be57931a39d57 (patch) | |
| tree | d9aaf475456a64b72f94a13e19784d14f731b74d /sfx2 | |
| parent | 2e45b433b203c37f49bc7f8eb09e658067567cd5 (diff) | |
INTEGRATION: CWS fwk41 (1.20.6); FILE MERGED
2006/07/21 10:55:55 mav 1.20.6.1: #i67548# fix impossibility to remove empty template groups
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/orgmgr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx index 5dbf0ac322a5..026df6487bca 100644 --- a/sfx2/source/view/orgmgr.cxx +++ b/sfx2/source/view/orgmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: orgmgr.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-07-13 13:29:16 $ + * last change: $Author: ihi $ $Date: 2006-08-01 16:06:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -548,7 +548,7 @@ BOOL SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller, if ( pEntriesToDelete[nInd] ) pCaller->GetModel()->Remove( pEntriesToDelete[nInd] ); - if ( !pGroupToDelete->ItemCount() && ( bOk = pTemplates->Delete( nRegion, nIdx ) ) ) + if ( !pCaller->GetModel()->GetChildCount( pGroupToDelete ) && ( bOk = pTemplates->Delete( nRegion, nIdx ) ) ) pCaller->GetModel()->Remove( pGroupToDelete ); } } |