From 66cd1800618abef9aa9cdef8cafca32cdfd8e93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 13 Jun 2008 08:15:54 +0000 Subject: [PATCH] INTEGRATION: CWS swlists01 (1.3.306); FILE MERGED 2008/05/08 16:10:18 od 1.3.306.3: RESYNC: (1.3-1.4); FILE MERGED 2008/03/11 14:32:37 od 1.3.306.2: #i86923# sorry, I have commited the previous changes with the wrong issue ID 2008/03/11 13:12:47 od 1.3.306.1: #i86932# class - a item set with ignorable items can be now passed to a instance - method has no two optional parameters in order to control, if unused item sets have to be skipped and if ignorable items have to be skipped by the created iterator --- svtools/inc/stylepool.hxx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/svtools/inc/stylepool.hxx b/svtools/inc/stylepool.hxx index c91e322c55df..1b1f129d7f4c 100644 --- a/svtools/inc/stylepool.hxx +++ b/svtools/inc/stylepool.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: stylepool.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -45,7 +45,9 @@ private: public: typedef boost::shared_ptr SfxItemSet_Pointer_t; - StylePool(); + // --> OD 2008-03-07 #i86923# + explicit StylePool( SfxItemSet* pIgnorableItems = 0 ); + // <-- /** Insert a SfxItemSet into the style pool. @@ -61,13 +63,23 @@ public: /** Create an iterator The iterator walks through the StylePool + OD 2008-03-07 #i86923# + introduce optional parameter to control, if unused SfxItemsSet are skipped or not + introduce optional parameter to control, if ignorable items are skipped or not @attention every change, e.g. destruction, of the StylePool could cause undefined effects. + @param bSkipUnusedItemSets + input parameter - boolean, indicating if unused SfxItemSets are skipped or not + + @param bSkipIgnorableItems + input parameter - boolean, indicating if ignorable items are skipped or not + @postcond the iterator "points before the first" SfxItemSet of the pool. The first StylePoolIterator::getNext() call will deliver the first SfxItemSet. */ - virtual IStylePoolIteratorAccess* createIterator(); + virtual IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, + const bool bSkipIgnorableItems = false ); /** Returns the number of styles */ @@ -88,5 +100,4 @@ public: virtual ::rtl::OUString getName() = 0; virtual ~IStylePoolIteratorAccess() {}; }; - #endif