diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 14:40:55 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 14:40:55 +0000 |
commit | 1f21853746e0da8651473f418cee0f48145bb775 (patch) | |
tree | bccbe040ef65856e78e2b589e2f4ba833250146a /sfx2 | |
parent | 9927e1ca23c8353c880a3ae0a196caabdf747c4b (diff) |
INTEGRATION: CWS fwk45 (1.34.8); FILE MERGED
2006/08/07 17:32:43 mav 1.34.8.1: #i68196# clean the cache; check/set hierarchy url
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index be8eacdb39e8..e375a57b6807 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -4,9 +4,9 @@ * * $RCSfile: doctemplates.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: ihi $ $Date: 2006-08-01 16:05:50 $ + * last change: $Author: hr $ $Date: 2006-08-11 15:40:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2766,7 +2766,15 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, } else { - pData->setInUse(); + if ( rHierURL.getLength() ) + { + pData->setHierarchyURL( rHierURL ); + pData->setHierarchy( sal_True ); + } + + if ( pData->getInHierarchy() ) + pData->setInUse(); + if ( rTargetURL != pData->getTargetURL() ) { pData->setTargetURL( rTargetURL ); |