diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:54:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:54:24 +0000 |
| commit | 0a869c54d1c20512ed5c45600031838cc0b76d69 (patch) | |
| tree | 3534df821e9657ce057296c3c429c521ed5df217 /sfx2/source/doc/doctempl.cxx | |
| parent | 7ce78796cc6eb2804856e6c46cfc53daf9787d59 (diff) | |
INTEGRATION: CWS fwk53 (1.70.20); FILE MERGED
2006/10/18 10:27:30 mav 1.70.20.1: #i70342# the template group may have no target URL
Diffstat (limited to 'sfx2/source/doc/doctempl.cxx')
| -rw-r--r-- | sfx2/source/doc/doctempl.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index ecdfce182fc3..3f4848f5aa33 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: doctempl.cxx,v $ * - * $Revision: 1.70 $ + * $Revision: 1.71 $ * - * last change: $Author: obo $ $Date: 2006-09-17 16:40:18 $ + * last change: $Author: vg $ $Date: 2006-11-01 14:54:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1846,9 +1846,7 @@ sal_Bool SfxDocumentTemplates::GetLogicNames aFullPath.SetSmartProtocol( INET_PROT_FILE ); aFullPath.SetURL( rPath ); - aFullPath.CutLastName(); - - OUString aPathTo = aFullPath.GetMainURL( INetURLObject::NO_DECODE ); + OUString aPath( aFullPath.GetMainURL( INetURLObject::NO_DECODE ) ); RegionData_Impl *pData = NULL; DocTempl_EntryData_Impl *pEntry = NULL; @@ -1859,10 +1857,9 @@ sal_Bool SfxDocumentTemplates::GetLogicNames for ( ULONG i=0; !bFound && (i<nCount); i++ ) { pData = pImp->GetRegion( i ); - if ( pData->GetTargetURL() == aPathTo ) + if ( pData ) { ULONG nChildCount = pData->GetCount(); - OUString aPath( rPath ); for ( ULONG j=0; !bFound && (j<nChildCount); j++ ) { |