[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sd binfilter/bf_svtools binfilter/bf_sw binfilter/inc

Joseph Powers jpowers at kemper.freedesktop.org
Wed Jan 19 07:23:43 PST 2011


 binfilter/bf_sc/source/core/data/sc_stlpool.cxx   |  104 ++++-----
 binfilter/bf_sd/source/core/sd_stlpool.cxx        |  238 +++++++++++-----------
 binfilter/bf_svtools/source/items/svt_style.cxx   |   96 +++++---
 binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx |   48 ++--
 binfilter/inc/bf_svtools/style.hxx                |    7 
 5 files changed, 258 insertions(+), 235 deletions(-)

New commits:
commit 5ca29369f2f955de0b6be9a998dc4c7d45afb78b
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Wed Jan 19 07:23:26 2011 -0800

    Remove DECLARE_LIST( SfxStyles, SfxStyleSheetBase* )

diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index 422766d..ba59bef 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -109,14 +109,14 @@ namespace binfilter {
 /*N*/ 	//	When updating styles from a template, Office 5.1 sometimes created
 /*N*/ 	//	files with multiple default styles.
 /*N*/ 	//	Create new styles in that case:
-/*N*/ 
+/*N*/
 /*N*/ 	//!	only when loading?
-/*N*/ 
+/*N*/
 /*N*/ 	if ( rName.EqualsAscii(STRING_STANDARD) && Find( rName, eFam ) != NULL )
 /*N*/ 	{
 /*?*/ 		DBG_ERROR("renaming additional default style");
-/*?*/ 		long nCount = aStyles.Count();
-/*?*/ 		for ( long nAdd = 1; nAdd <= nCount; nAdd++ )
+/*?*/ 		size_t nCount = aStyles.size();
+/*?*/ 		for ( size_t nAdd = 1; nAdd <= nCount; nAdd++ )
 /*?*/ 		{
 /*?*/ 			String aNewName = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
 /*?*/ 			aNewName += String::CreateFromInt32( nAdd );
@@ -124,7 +124,7 @@ namespace binfilter {
 /*?*/ 				return SfxStyleSheetPool::Make( aNewName, eFam, mask, nPos );
 /*?*/ 		}
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ 	return SfxStyleSheetPool::Make( rName, eFam, mask, nPos );
 /*N*/ }
 
@@ -138,7 +138,7 @@ namespace binfilter {
 /*N*/ 	ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nInMask );
 /*N*/ 	if ( eFamily == SFX_STYLE_FAMILY_PARA && ScGlobal::GetRscString(STR_STYLENAME_STANDARD) != rName )
 /*N*/ 		pSheet->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) );
-/*N*/ 
+/*N*/
 /*N*/ 	return pSheet;
 /*N*/ }
 
@@ -184,7 +184,7 @@ namespace binfilter {
 /*N*/ void ScStyleSheetPool::CreateStandardStyles()
 /*N*/ {
 /*N*/ 	//	neue Eintraege auch bei CopyStdStylesFrom eintragen
-/*N*/ 
+/*N*/
 /*N*/ 	Color			aColBlack	( COL_BLACK );
 /*N*/ 	Color			aColGrey	( COL_LIGHTGRAY );
 /*N*/ 	String			aStr;
@@ -204,28 +204,28 @@ namespace binfilter {
 /*N*/ 	SvxBorderLine	aBorderLine		( &aColBlack, DEF_LINE_WIDTH_2 );
 /*N*/ 	SvxBoxItem		aBoxItem		( ATTR_BORDER );
 /*N*/ 	SvxBoxInfoItem	aBoxInfoItem	( ATTR_BORDER_INNER );
-/*N*/ 
+/*N*/
 /*N*/ 	String aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD);
-/*N*/ 
+/*N*/
 /*N*/ 	//==========================================================
 /*N*/ 	// Zellformatvorlagen:
 /*N*/ 	//==========================================================
-/*N*/ 
+/*N*/
 /*N*/ 	//------------
 /*N*/ 	// 1. Standard
 /*N*/ 	//------------
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD );
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD );
-/*N*/ 
+/*N*/
 /*N*/ 	//	if default fonts for the document's languages are different from the pool default,
 /*N*/ 	//	put them into the default style
 /*N*/ 	//	(not as pool defaults, because pool defaults can't be changed by the user)
 /*N*/ 	//	the document languages must be set before creating the default styles!
-/*N*/ 
+/*N*/
 /*N*/ 	pSet = &pSheet->GetItemSet();
 /*N*/ 	LanguageType eLatin, eCjk, eCtl;
 /*N*/ 	pDoc->GetLanguage( eLatin, eCjk, eCtl );
-/*N*/ 
+/*N*/
 /*N*/ 	//	#108374# / #107782#: If the UI language is Korean, the default Latin font has to
 /*N*/ 	//	be queried for Korean, too (the Latin language from the document can't be Korean).
 /*N*/ 	//	This is the same logic as in SwDocShell::InitNew.
@@ -237,15 +237,15 @@ namespace binfilter {
 /*N*/ 			eLatin = eUiLanguage;
 /*N*/ 		break;
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ 	lcl_CheckFont( *pSet, eLatin, DEFAULTFONT_LATIN_SPREADSHEET, ATTR_FONT );
 /*N*/ 	lcl_CheckFont( *pSet, eCjk, DEFAULTFONT_CJK_SPREADSHEET, ATTR_CJK_FONT );
 /*N*/ 	lcl_CheckFont( *pSet, eCtl, DEFAULTFONT_CTL_SPREADSHEET, ATTR_CTL_FONT );
-/*N*/ 
+/*N*/
 /*N*/ 	//------------
 /*N*/ 	// 2. Ergebnis
 /*N*/ 	//------------
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ),
 /*N*/ 									SFX_STYLE_FAMILY_PARA,
 /*N*/ 									SCSTYLEBIT_STANDARD );
@@ -255,30 +255,30 @@ namespace binfilter {
 /*N*/ 	pSet->Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) );
 /*N*/ 	pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
 /*N*/ 	pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) );
-/*N*/ 
+/*N*/
 /*N*/ 	//-------------
 /*N*/ 	// 3. Ergebnis1
 /*N*/ 	//-------------
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ),
 /*N*/ 									SFX_STYLE_FAMILY_PARA,
 /*N*/ 									SCSTYLEBIT_STANDARD );
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) );
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 );
 /*N*/ 	pSet = &pSheet->GetItemSet();
 /*N*/ 	nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY,
 /*N*/ 														ScGlobal::eLnge );
 /*N*/ 	pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------------
 /*N*/ 	// 4. Ueberschrift
 /*N*/ 	//----------------
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ),
 /*N*/ 									SFX_STYLE_FAMILY_PARA,
 /*N*/ 									SCSTYLEBIT_STANDARD );
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet->SetParent( aStrStandard );
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_UEB );
 /*N*/ 	pSet = &pSheet->GetItemSet();
@@ -286,41 +286,41 @@ namespace binfilter {
 /*N*/ 	pSet->Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) );
 /*N*/ 	pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
 /*N*/ 	pSet->Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
-/*N*/ 
+/*N*/
 /*N*/ 	//-----------------
 /*N*/ 	// 5. Ueberschrift1
 /*N*/ 	//-----------------
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ),
 /*N*/ 									SFX_STYLE_FAMILY_PARA,
 /*N*/ 									SCSTYLEBIT_STANDARD );
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet->SetParent( SCSTR( STR_STYLENAME_HEADLINE ) );
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_UEB1 );
 /*N*/ 	pSet = &pSheet->GetItemSet();
 /*N*/ 	pSet->Put( SvxOrientationItem( SVX_ORIENTATION_BOTTOMTOP, ATTR_ORIENTATION ) );
-/*N*/ 
+/*N*/
 /*N*/ 	//==========================================================
 /*N*/ 	// Seitenformat-Vorlagen:
 /*N*/ 	//==========================================================
-/*N*/ 
+/*N*/
 /*N*/ 	//------------
 /*N*/ 	// 1. Standard
 /*N*/ 	//------------
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( aStrStandard,
 /*N*/ 									SFX_STYLE_FAMILY_PAGE,
 /*N*/ 									SCSTYLEBIT_STANDARD );
-/*N*/ 
+/*N*/
 /*N*/ 	pSet = &pSheet->GetItemSet();
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_PAGE_STD );
-/*N*/ 
+/*N*/
 /*N*/ 	// Abstand der Kopf-/Fusszeilen von der Tabelle
 /*N*/ 	pHFSetItem = new SvxSetItem( ((SvxSetItem&)pSet->Get( ATTR_PAGE_HEADERSET ) ) );
 /*N*/ 	pSet->Put( *pHFSetItem, ATTR_PAGE_HEADERSET );
 /*N*/ 	pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
 /*N*/ 	DELETEZ( pHFSetItem );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------------------------------------
 /*N*/ 	// Kopfzeile:
 /*N*/ 	// [leer][\TABELLE\][leer]
@@ -333,7 +333,7 @@ namespace binfilter {
 /*N*/ 	pHeaderItem->SetRightArea ( *pEmptyTxtObj );
 /*N*/ 	pSet->Put( *pHeaderItem );
 /*N*/ 	DELETEZ( pTxtObj );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------------------------------------
 /*N*/ 	// Fusszeile:
 /*N*/ 	// [leer][Seite \SEITE\][leer]
@@ -348,17 +348,17 @@ namespace binfilter {
 /*N*/ 	pFooterItem->SetRightArea ( *pEmptyTxtObj );
 /*N*/ 	pSet->Put( *pFooterItem );
 /*N*/ 	DELETEZ( pTxtObj );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------
 /*N*/ 	// 2. Report
 /*N*/ 	//----------
-/*N*/ 
+/*N*/
 /*N*/ 	pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ),
 /*N*/ 									SFX_STYLE_FAMILY_PAGE,
 /*N*/ 									SCSTYLEBIT_STANDARD );
 /*N*/ 	pSet = &pSheet->GetItemSet();
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_PAGE_REP );
-/*N*/ 
+/*N*/
 /*N*/ 	// Hintergrund und Umrandung
 /*N*/ 	aBoxItem.SetLine( &aBorderLine, BOX_LINE_TOP );
 /*N*/ 	aBoxItem.SetLine( &aBorderLine, BOX_LINE_BOTTOM );
@@ -372,17 +372,17 @@ namespace binfilter {
 /*N*/ 	aBoxInfoItem.SetValid( VALID_DISTANCE, TRUE );
 /*N*/ 	aBoxInfoItem.SetTable( FALSE );
 /*N*/ 	aBoxInfoItem.SetDist ( TRUE );
-/*N*/ 
+/*N*/
 /*N*/ 	pHFSetItem = new SvxSetItem( ((SvxSetItem&)pSet->Get( ATTR_PAGE_HEADERSET ) ) );
 /*N*/ 	pHFSet = &(pHFSetItem->GetItemSet());
-/*N*/ 
+/*N*/
 /*N*/ 	pHFSet->Put( SvxBrushItem( aColGrey, ATTR_BACKGROUND ) );
 /*N*/ 	pHFSet->Put( aBoxItem );
 /*N*/ 	pHFSet->Put( aBoxInfoItem );
 /*N*/ 	pSet->Put( *pHFSetItem, ATTR_PAGE_HEADERSET );
 /*N*/ 	pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
 /*N*/ 	DELETEZ( pHFSetItem );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------------------------------------
 /*N*/ 	// Kopfzeile:
 /*N*/ 	// [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\]
@@ -404,7 +404,7 @@ namespace binfilter {
 /*N*/ 	pHeaderItem->SetRightArea( *pTxtObj );
 /*N*/ 	DELETEZ( pTxtObj );
 /*N*/ 	pSet->Put( *pHeaderItem );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------------------------------------
 /*N*/ 	// Fusszeile:
 /*N*/ 	// [leer][Seite: \SEITE\ / \SEITEN\][leer]
@@ -422,7 +422,7 @@ namespace binfilter {
 /*N*/ 	pFooterItem->SetRightArea ( *pEmptyTxtObj );
 /*N*/ 	pSet->Put( *pFooterItem );
 /*N*/ 	DELETEZ( pTxtObj );
-/*N*/ 
+/*N*/
 /*N*/ 	//----------------------------------------------------
 /*N*/ 	DELETEZ( pEmptyTxtObj );
 /*N*/ 	DELETEZ( pHeaderItem );
@@ -435,18 +435,18 @@ namespace binfilter {
 /*N*/ void ScStyleSheetPool::UpdateStdNames()
 /*N*/ {
 /*N*/ 	//	Standard-Styles den richtigen Namen in der Programm-Sprache geben
-/*N*/ 
+/*N*/
 /*N*/ 	String aHelpFile;
-/*N*/ 	ULONG nCount = aStyles.Count();
-/*N*/ 	for (ULONG n=0; n<nCount; n++)
+/*N*/ 	size_t nCount = aStyles.size();
+/*N*/ 	for (size_t n=0; n<nCount; n++)
 /*N*/ 	{
-/*N*/ 		SfxStyleSheetBase* pStyle = aStyles.GetObject(n);
+/*N*/ 		SfxStyleSheetBase* pStyle = aStyles[ n ];
 /*N*/ 		if (!pStyle->IsUserDefined())
 /*N*/ 		{
 /*N*/ 			String aOldName		= pStyle->GetName();
 /*N*/ 			ULONG nHelpId		= pStyle->GetHelpId( aHelpFile );
 /*N*/ 			SfxStyleFamily eFam	= pStyle->GetFamily();
-/*N*/ 
+/*N*/
 /*N*/ 			BOOL bHelpKnown = TRUE;
 /*N*/ 			String aNewName;
 /*N*/ 			USHORT nNameId = 0;
@@ -467,13 +467,13 @@ namespace binfilter {
 /*N*/ 			{
 /*N*/ 				if ( nNameId )
 /*N*/ 					aNewName = SCSTR( nNameId );
-/*N*/ 
+/*N*/
 /*N*/ 				if ( aNewName.Len() && aNewName != aOldName && !Find( aNewName, eFam ) )
 /*N*/ 				{
 /*N*/ 					DBG_TRACE( "Renaming style..." );
-/*N*/ 
+/*N*/
 /*N*/ 					pStyle->SetName( aNewName );	// setzt auch Parents um
-/*N*/ 
+/*N*/
 /*N*/ 					//	Styles in Patterns sind schon auf Pointer umgesetzt
 /*N*/ 					if (eFam == SFX_STYLE_FAMILY_PAGE)
 /*N*/ 					{
@@ -488,12 +488,12 @@ namespace binfilter {
 /*N*/ 			else
 /*N*/ 			{
 /*N*/ 				//	wrong or no HelpId -> set new HelpId
-/*N*/ 
+/*N*/
 /*N*/ 				//	no assertion for wrong HelpIds because this happens
 /*N*/ 				//  with old files (#67218#) or with old files that were
 /*N*/ 				//	saved again with a new version in a different language
 /*N*/ 				//	(so SrcVersion doesn't help)
-/*N*/ 
+/*N*/
 /*N*/ 				USHORT nNewId = 0;
 /*N*/ 				if ( eFam == SFX_STYLE_FAMILY_PARA )
 /*N*/ 				{
@@ -515,7 +515,7 @@ namespace binfilter {
 /*N*/ 					else if ( aOldName == SCSTR( STR_STYLENAME_REPORT ) )
 /*N*/ 						nNewId = HID_SC_SHEET_PAGE_REP;
 /*N*/ 				}
-/*N*/ 
+/*N*/
 /*N*/ 				if ( nNewId )				// new ID found from name -> set ID
 /*N*/ 				{
 /*?*/ 					pStyle->SetHelpId( aHelpFile, nNewId );
diff --git a/binfilter/bf_sd/source/core/sd_stlpool.cxx b/binfilter/bf_sd/source/core/sd_stlpool.cxx
index 165e0f2..bf58b4c 100644
--- a/binfilter/bf_sd/source/core/sd_stlpool.cxx
+++ b/binfilter/bf_sd/source/core/sd_stlpool.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -173,61 +173,61 @@ namespace binfilter {
 /*N*/ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bool /*bCheck*/ )
 /*N*/ {
 /*N*/ 	sal_Bool bCreated = sal_False;
-/*N*/ 
+/*N*/
 /*N*/ 	SfxStyleSheetBase* pSheet = NULL;
-/*N*/ 
+/*N*/
 /*N*/ 	String aPrefix(rLayoutName);
 /*N*/ 	String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
 /*N*/ 	aPrefix.Insert(aSep);
-/*N*/ 
+/*N*/
 /*N*/ 	Font aLatinFont, aCJKFont, aCTLFont;
-/*N*/ 
+/*N*/
 /*N*/ 	pDoc->getDefaultFonts( aLatinFont, aCJKFont, aCTLFont );
-/*N*/ 
+/*N*/
 /*N*/ 	// Font fuer Titel und Gliederung
 /*N*/ 	SvxFontItem aSvxFontItem( aLatinFont.GetFamily(), aLatinFont.GetName(), aLatinFont.GetStyleName(), aLatinFont.GetPitch(),
 /*N*/ 		                      aLatinFont.GetCharSet(), EE_CHAR_FONTINFO );
-/*N*/ 
+/*N*/
 /*N*/ 	SvxFontItem aSvxFontItemCJK( aCJKFont.GetFamily(), aCJKFont.GetName(), aCJKFont.GetStyleName(), aCJKFont.GetPitch(),
 /*N*/ 		                         aCJKFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
-/*N*/ 
+/*N*/
 /*N*/ 	SvxFontItem aSvxFontItemCTL( aCTLFont.GetFamily(), aCTLFont.GetName(), aCTLFont.GetStyleName(), aCTLFont.GetPitch(),
 /*N*/ 		                         aCTLFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
-/*N*/ 
+/*N*/
 /*N*/ 	Font aBulletFont( GetBulletFont() );
-/*N*/ 
+/*N*/
     /**************************************************************************
     * Gliederungsebenen
     **************************************************************************/
 /*N*/ 	String aName(SdResId(STR_LAYOUT_OUTLINE));
 /*N*/ 	String aHelpFile;
-/*N*/ 
+/*N*/
 /*N*/ 	SfxStyleSheetBase* pParent = NULL;
 /*N*/ 	SvxLRSpaceItem aSvxLRSpaceItem;
 /*N*/ 	SvxULSpaceItem aSvxULSpaceItem;
 /*N*/ 	USHORT nLevel;
-/*N*/ 
+/*N*/
 /*N*/ 	for( nLevel = 1; nLevel < 10; nLevel++)
 /*N*/ 	{
 /*N*/ 		String aLevelName(aName);
 /*N*/ 		aLevelName.Append( sal_Unicode( ' ' ));
 /*N*/ 		aLevelName.Append( String::CreateFromInt32( sal_Int32( nLevel )));
-/*N*/ 
+/*N*/
 /*N*/ 		aLevelName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 		if (!Find(aLevelName, SD_LT_FAMILY))
 /*N*/ 		{
 /*N*/ 			bCreated = sal_True;
 /*N*/ 			pSheet = &Make(aLevelName, SD_LT_FAMILY);
 /*N*/ 			pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_OUTLINE + nLevel );
-/*N*/ 
+/*N*/
 /*N*/ 			pSheet->SetParent( String() );
-/*N*/ 
+/*N*/
 /*N*/ 			// Attributierung fuer Level 1, die anderen Ebenen "erben"
 /*N*/ 			if (nLevel == 1)
 /*N*/ 			{
 /*N*/ 				SfxItemSet&     rSet = pSheet->GetItemSet();
-/*N*/ 
+/*N*/
 /*N*/ 				rSet.Put(aSvxFontItem);
 /*N*/ 				rSet.Put(aSvxFontItemCJK);
 /*N*/ 				rSet.Put(aSvxFontItemCTL);
@@ -246,19 +246,19 @@ namespace binfilter {
 /*N*/ 				rSet.Put( SvxColorItem( Color(COL_AUTO)) );
 /*N*/ 				rSet.Put( XLineStyleItem(XLINE_NONE) );
 /*N*/ 				rSet.Put( XFillStyleItem(XFILL_NONE) );
-/*N*/ 
+/*N*/
 /*N*/ 				if( nLevel == 1 )
 /*N*/ 				{
 /*N*/ 					Font aLclBulletFont( GetBulletFont() );
 /*N*/ 					PutNumBulletItem( pSheet, aLclBulletFont );
 /*N*/ 				}
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*N*/ 			ULONG nFontSize = 20;
 /*N*/ 			short nFirstIndent = -600;
 /*N*/ 			USHORT nIndent = nLevel * 1200;
 /*N*/ 			USHORT nLower = 100;
-/*N*/ 
+/*N*/
 /*N*/ 			switch (nLevel)
 /*N*/ 			{
 /*N*/ 				case 1:
@@ -268,7 +268,7 @@ namespace binfilter {
 /*N*/ 					nFirstIndent = -900;
 /*N*/ 				}
 /*N*/ 				break;
-/*N*/ 
+/*N*/
 /*N*/ 				case 2:
 /*N*/ 				{
 /*N*/ 					nFontSize = 28;
@@ -276,45 +276,45 @@ namespace binfilter {
 /*N*/ 					nFirstIndent = -800;
 /*N*/ 				}
 /*N*/ 				break;
-/*N*/ 
+/*N*/
 /*N*/ 				case 3:
 /*N*/ 				{
 /*N*/ 					nFontSize = 24;
 /*N*/ 					nLower = 300;
 /*N*/ 				}
 /*N*/ 				break;
-/*N*/ 
+/*N*/
 /*N*/ 				case 4:
 /*N*/ 				{
 /*N*/ 					nLower = 200;
 /*N*/ 				}
 /*N*/ 				break;
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*N*/ 			// FontSize
 /*N*/ 			nFontSize = (USHORT)((nFontSize * 2540L) / 72);  // Pt --> 1/100 mm
 /*N*/ 			SfxItemSet& rOutlineSet = pSheet->GetItemSet();
 /*N*/ 			rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT ) );
 /*N*/ 			rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) );
 /*N*/ 			rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CTL ) );
-/*N*/ 
+/*N*/
 /*N*/ 			// Einzuege
 /*N*/ 			aSvxLRSpaceItem.SetTxtFirstLineOfst(nFirstIndent);
 /*N*/ 			aSvxLRSpaceItem.SetTxtLeft(nIndent);
 /*N*/ 			aSvxLRSpaceItem.SetRight(0);
 /*N*/ 			aSvxLRSpaceItem.SetBulletFI(TRUE);
 /*N*/ 			pSheet->GetItemSet().Put(aSvxLRSpaceItem);
-/*N*/ 
+/*N*/
 /*N*/ 			// Zeilendurchschuss (Abstand nach unten)
 /*N*/ 			aSvxULSpaceItem.SetLower(nLower);
 /*N*/ 			pSheet->GetItemSet().Put(aSvxULSpaceItem);
-/*N*/ 
+/*N*/
 /*N*/ 			if (nLevel == 1)
 /*N*/ 			{
 /*N*/ 				SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 1); // Bullets sichtbar
 /*N*/ 				pSheet->GetItemSet().Put(aBulletStateItem);
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*
             // Gliederungsvorlagen haben die naechsthoehere Ebene als Parent
             if (pParent)
@@ -323,7 +323,7 @@ namespace binfilter {
 */
 /*N*/ 		}
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ 	// if we created outline styles, we need to chain them
 /*N*/ 	if( bCreated )
 /*N*/ 	{
@@ -333,13 +333,13 @@ namespace binfilter {
 /*N*/ 			String aLevelName(aName);
 /*N*/ 			aLevelName.Append( sal_Unicode( ' ' ));
 /*N*/ 			aLevelName.Append( String::CreateFromInt32( sal_Int32( nLevel )));
-/*N*/ 
+/*N*/
 /*N*/ 			aLevelName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 			pSheet = Find(aLevelName, SD_LT_FAMILY);
-/*N*/ 
+/*N*/
 /*N*/ 			DBG_ASSERT( pSheet, "missing layout style!");
-/*N*/ 
+/*N*/
 /*N*/ 			if( pSheet )
 /*N*/ 			{
 /*N*/ 				if (pParent)
@@ -348,17 +348,17 @@ namespace binfilter {
 /*N*/ 			}
 /*N*/ 		}
 /*N*/ 	}
-/*N*/ 
+/*N*/
     /**************************************************************************
     * Titel
     **************************************************************************/
 /*N*/ 	aName = String(SdResId(STR_LAYOUT_TITLE));
 /*N*/ 	aName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 	if (!Find(aName, SD_LT_FAMILY))
 /*N*/ 	{
 /*N*/ 		bCreated = sal_True;
-/*N*/ 
+/*N*/
 /*N*/ 		pSheet = &Make(aName, SD_LT_FAMILY);
 /*N*/ 		pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
 /*N*/ 		pSheet->SetParent(String());
@@ -390,18 +390,18 @@ namespace binfilter {
 /*N*/ 		aBulletFont.SetSize(Size(0,1552));					// 44 pt
 /*N*/ 		PutNumBulletItem( pSheet, aBulletFont );
 /*N*/ 	}
-/*N*/ 
+/*N*/
     /**************************************************************************
     * Untertitel
     * Aenderugen auch in AdjustLRSpaceItems() vornehmen!
     **************************************************************************/
 /*N*/ 	aName = String(SdResId(STR_LAYOUT_SUBTITLE));
 /*N*/ 	aName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 	if (!Find(aName, SD_LT_FAMILY))
 /*N*/ 	{
 /*N*/ 		bCreated = sal_True;
-/*N*/ 
+/*N*/
 /*N*/ 		pSheet = &Make(aName, SD_LT_FAMILY);
 /*N*/ 		pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
 /*N*/ 		pSheet->SetParent(String());
@@ -436,17 +436,17 @@ namespace binfilter {
 /*N*/ 		aLclBulletFont.SetSize(Size(0, 1129));		// 32 pt
 /*N*/ 		PutNumBulletItem( pSheet, aLclBulletFont );
 /*N*/ 	}
-/*N*/ 
+/*N*/
     /**************************************************************************
     * Notizen
     **************************************************************************/
 /*N*/ 	aName = String(SdResId(STR_LAYOUT_NOTES));
 /*N*/ 	aName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 	if (!Find(aName, SD_LT_FAMILY))
 /*N*/ 	{
 /*N*/ 		bCreated = sal_True;
-/*N*/ 
+/*N*/
 /*N*/ 		pSheet = &Make(aName, SD_LT_FAMILY);
 /*N*/ 		pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_NOTES );
 /*N*/ 		pSheet->SetParent(String());
@@ -474,26 +474,26 @@ namespace binfilter {
 /*N*/ 		rNotesSet.Put( SvxColorItem( Color(COL_AUTO)) );
 /*N*/ 		rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
 /*N*/ 		rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600 ) );
-/*N*/ 
+/*N*/
 /*N*/ 		SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rNotesSet.Get(EE_PARA_NUMBULLET) );
-/*N*/ 
+/*N*/
 /*N*/ 		EditEngine::ImportBulletItem( aNumBullet, 0, NULL,
 /*N*/ 								&(const SvxLRSpaceItem&) rNotesSet.Get( EE_PARA_LRSPACE ) );
-/*N*/ 
+/*N*/
 /*N*/ 		( (SfxItemSet&) rNotesSet).Put( aNumBullet );
-/*N*/ 
+/*N*/
 /*N*/ 	}
-/*N*/ 
+/*N*/
     /**************************************************************************
     * Hintergrundobjekte
     **************************************************************************/
 /*N*/ 	aName = String(SdResId(STR_LAYOUT_BACKGROUNDOBJECTS));
 /*N*/ 	aName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 	if (!Find(aName, SD_LT_FAMILY))
 /*N*/ 	{
 /*N*/ 		bCreated = sal_True;
-/*N*/ 
+/*N*/
 /*N*/ 		pSheet = &Make(aName, SD_LT_FAMILY);
 /*N*/ 		pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
 /*N*/ 		pSheet->SetParent(String());
@@ -503,17 +503,17 @@ namespace binfilter {
 /*N*/ 		rBackgroundObjectsSet.Put(SdrShadowXDistItem(300));	// 3 mm Schattendistanz
 /*N*/ 		rBackgroundObjectsSet.Put(SdrShadowYDistItem(300));
 /*N*/ 	}
-/*N*/ 
+/*N*/
     /**************************************************************************
     * Hintergrund
     **************************************************************************/
 /*N*/ 	aName = String(SdResId(STR_LAYOUT_BACKGROUND));
 /*N*/ 	aName.Insert(aPrefix, 0);
-/*N*/ 
+/*N*/
 /*N*/ 	if (!Find(aName, SD_LT_FAMILY))
 /*N*/ 	{
 /*N*/ 		bCreated = sal_True;
-/*N*/ 
+/*N*/
 /*N*/ 		pSheet = &Make(aName, SD_LT_FAMILY);
 /*N*/ 		pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
 /*N*/ 		pSheet->SetParent(String());
@@ -521,7 +521,7 @@ namespace binfilter {
 /*N*/ 		rBackgroundSet.Put(XLineStyleItem(XLINE_NONE));
 /*N*/ 		rBackgroundSet.Put(XFillStyleItem(XFILL_NONE));
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ }
 
 /*************************************************************************
@@ -585,9 +585,9 @@ namespace binfilter {
 /*N*/ 	String aHelpFile;
 /*N*/ 	SfxStyleSheetBase* pSheet = NULL;
 /*N*/ 	SfxStyleSheetBase* pParent = NULL;
-/*N*/ 
+/*N*/
 /*N*/ 	USHORT nLclMask = SFXSTYLEBIT_USED;
-/*N*/ 
+/*N*/
 /*N*/ 	aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
 /*N*/ 	if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
 /*N*/ 	{
@@ -596,7 +596,7 @@ namespace binfilter {
 /*N*/ 		((SfxStyleSheet*)pSheet)->StartListening(*this);
 /*N*/ 	}
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
-/*N*/ 
+/*N*/
 /*N*/ 	aName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
 /*N*/ 	if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
 /*N*/ 	{
@@ -605,7 +605,7 @@ namespace binfilter {
 /*N*/ 		((SfxStyleSheet*)pSheet)->StartListening(*this);
 /*N*/ 	}
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
-/*N*/ 
+/*N*/
 /*N*/ 	aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS));
 /*N*/ 	if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
 /*N*/ 	{
@@ -614,7 +614,7 @@ namespace binfilter {
 /*N*/ 		((SfxStyleSheet*)pSheet)->StartListening(*this);
 /*N*/ 	}
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
-/*N*/ 
+/*N*/
 /*N*/ 	aName = String(SdResId(STR_PSEUDOSHEET_BACKGROUND));
 /*N*/ 	if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
 /*N*/ 	{
@@ -623,7 +623,7 @@ namespace binfilter {
 /*N*/ 		((SfxStyleSheet*)pSheet)->StartListening(*this);
 /*N*/ 	}
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
-/*N*/ 
+/*N*/
 /*N*/ 	aName = String(SdResId(STR_PSEUDOSHEET_NOTES));
 /*N*/ 	if (!(pSheet = Find(aName, SFX_STYLE_FAMILY_PSEUDO)))
 /*N*/ 	{
@@ -632,7 +632,7 @@ namespace binfilter {
 /*N*/ 		((SfxStyleSheet*)pSheet)->StartListening(*this);
 /*N*/ 	}
 /*N*/ 	pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_NOTES );
-/*N*/ 
+/*N*/
 /*N*/ 	pParent = NULL;
 /*N*/ 	SetSearchMask(SFX_STYLE_FAMILY_PSEUDO);
 /*N*/ 	aName = String(SdResId(STR_PSEUDOSHEET_OUTLINE));
@@ -641,11 +641,11 @@ namespace binfilter {
 /*N*/ 		String aLevelName(aName);
 /*N*/ 		aLevelName.Append( sal_Unicode( ' ' ));
 /*N*/ 		aLevelName.Append( String::CreateFromInt32( sal_Int32( nLevel )));
-/*N*/ 
+/*N*/
 /*N*/ 		if (!(pSheet = Find(aLevelName, SFX_STYLE_FAMILY_PSEUDO)))
 /*N*/ 		{
 /*N*/ 			pSheet = &Make(aLevelName, SFX_STYLE_FAMILY_PSEUDO, nLclMask);
-/*N*/ 
+/*N*/
 /*N*/ 			if (pSheet)
 /*N*/ 			{
 /*N*/ 				if (pParent)
@@ -669,19 +669,19 @@ namespace binfilter {
 /*N*/ {
 /*N*/ 	BOOL bNewHelpIds = FALSE;
 /*N*/ 	String aHelpFile;
-/*N*/ 	ULONG  nCount = aStyles.Count();
+/*N*/ 	size_t  nCount = aStyles.size();
 /*N*/ 	List* pEraseList = NULL;
-/*N*/ 
-/*N*/ 	for( ULONG n=0; n < nCount; n++ )
+/*N*/
+/*N*/ 	for( size_t n=0; n < nCount; n++ )
 /*N*/ 	{
-/*N*/ 		SfxStyleSheetBase* pStyle = aStyles.GetObject( n );
-/*N*/ 
+/*N*/ 		SfxStyleSheetBase* pStyle = aStyles[ n ];
+/*N*/
 /*N*/ 		if( !pStyle->IsUserDefined() )
 /*N*/ 		{
 /*N*/ 			String aOldName		= pStyle->GetName();
 /*N*/ 			ULONG nHelpId		= pStyle->GetHelpId( aHelpFile );
 /*N*/ 			SfxStyleFamily eFam	= pStyle->GetFamily();
-/*N*/ 
+/*N*/
 /*N*/ 			BOOL bHelpKnown = TRUE;
 /*N*/ 			String aNewName;
 /*N*/ 			USHORT nNameId = 0;
@@ -702,7 +702,7 @@ namespace binfilter {
 /*N*/ 				case HID_POOLSHEET_HEADLINE1:		nNameId = STR_POOLSHEET_HEADLINE1;		break;
 /*N*/ 				case HID_POOLSHEET_HEADLINE2:		nNameId = STR_POOLSHEET_HEADLINE2;		break;
 /*N*/ 				case HID_POOLSHEET_MEASURE:			nNameId = STR_POOLSHEET_MEASURE;		break;
-/*N*/ 
+/*N*/
 /*N*/ 				case HID_PSEUDOSHEET_TITLE:			nNameId = STR_PSEUDOSHEET_TITLE; 		break;
 /*N*/ 				case HID_PSEUDOSHEET_SUBTITLE:	 	nNameId = STR_PSEUDOSHEET_SUBTITLE; 	break;
 /*N*/ 				case HID_PSEUDOSHEET_OUTLINE1:
@@ -717,7 +717,7 @@ namespace binfilter {
 /*N*/ 				case HID_PSEUDOSHEET_BACKGROUNDOBJECTS:	nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break;
 /*N*/ 				case HID_PSEUDOSHEET_BACKGROUND:	nNameId = STR_PSEUDOSHEET_BACKGROUND; 	break;
 /*N*/ 				case HID_PSEUDOSHEET_NOTES:			nNameId = STR_PSEUDOSHEET_NOTES; 		break;
-/*N*/ 
+/*N*/
 /*N*/ 				default:
 /*N*/ 					// 0 oder falsche (alte) HelpId
 /*N*/ 					bHelpKnown = FALSE;
@@ -733,11 +733,11 @@ namespace binfilter {
 /*N*/ 						aNewName.Append( String::CreateFromInt32( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )));
 /*N*/ 					}
 /*N*/ 				}
-/*N*/ 
+/*N*/
 /*N*/ 				if( aNewName.Len() && aNewName != aOldName )
 /*N*/ 				{
 /*N*/ 					SfxStyleSheetBase* pSheetFound = Find( aNewName, eFam );
-/*N*/ 
+/*N*/
 /*N*/ 					if ( !pSheetFound )
 /*N*/ 					{
 /*N*/ 						// Sheet existiert noch nicht: Altes Sheet wird umbenannt
@@ -750,7 +750,7 @@ namespace binfilter {
 /*N*/ 						{
 /*N*/ 							pEraseList = new List();
 /*N*/ 						}
-/*N*/ 
+/*N*/
 /*N*/ 						pEraseList->Insert( pStyle );
 /*N*/ 					}
 /*N*/ 				}
@@ -758,14 +758,14 @@ namespace binfilter {
 /*N*/ 			else
 /*N*/ 			{
 /*N*/ 				//	falsche oder keine HelpId -> neue generieren
-/*N*/ 
+/*N*/
 /*N*/ 				DBG_WARNING("Default-Vorlage mit falscher oder keiner HelpId");
-/*N*/ 
+/*N*/
 /*N*/ 				// Da bisher nur deutsche Dokumente erzeugt worden sein koennen,
 /*N*/ 				// kann hier auch der deutsche Text abgefragt werden, damit man
 /*N*/ 				// nicht in einer anderssprachigen Version auf die deutsche
 /*N*/ 				// Version zurueckgreifen muss!
-/*N*/ 
+/*N*/
 /*N*/ 				USHORT nNewId = 0;
 /*N*/ 				if( eFam == SFX_STYLE_FAMILY_PARA )
 /*N*/ 				{
@@ -828,7 +828,7 @@ namespace binfilter {
 /*N*/ 					String aStr( SdResId( STR_PSEUDOSHEET_OUTLINE ) );
 /*N*/ 					aStr.Append( sal_Unicode( ' ' ));
 /*N*/ 					String aStr2( RTL_CONSTASCII_USTRINGPARAM( "Gliederung " ));
-/*N*/ 
+/*N*/
 /*N*/ 					if( aOldName == String( SdResId( STR_PSEUDOSHEET_TITLE ) ) ||
 /*N*/ 						aOldName.EqualsAscii( "Titel", 0, RTL_CONSTASCII_LENGTH( "Titel" )))
 /*N*/ 						nNewId = HID_PSEUDOSHEET_TITLE;
@@ -872,7 +872,7 @@ namespace binfilter {
 /*N*/ 						     aOldName.Equals( String( String( aStr2 ).Append( String( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "9" ) ) ) ) ) ) )
 /*N*/ 						nNewId = HID_PSEUDOSHEET_OUTLINE9;
 /*N*/ 				}
-/*N*/ 
+/*N*/
 /*N*/ 				if ( nNewId )
 /*N*/ 				{
 /*N*/ 					bNewHelpIds = TRUE;
@@ -881,7 +881,7 @@ namespace binfilter {
 /*N*/ 			}
 /*N*/ 		}
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ 	if ( pEraseList )
 /*N*/ 	{
 /*N*/ 		// Styles, welche nicht umbenannt werden konnten, muessen entfernt werden
@@ -890,11 +890,11 @@ namespace binfilter {
 /*N*/ 			SfxStyleSheetBase* pEraseSheet = ( SfxStyleSheetBase* ) pEraseList->GetObject( i );
 /*N*/ 			Erase( pEraseSheet );
 /*N*/ 		}
-/*N*/ 
+/*N*/
 /*N*/ 		delete pEraseList;
 /*N*/ 		pEraseList = NULL;
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ 	// Wenn neue HelpIDs gefunden wurden koennen die Namen auch gleich ersetzt werden
 /*N*/ 	if( bNewHelpIds )
 /*N*/ 		UpdateStdNames();
@@ -912,18 +912,18 @@ namespace binfilter {
 
 /*N*/ void SdStyleSheetPool::AdjustLRSpaceItems()
 /*N*/ {
-/*N*/ 	ULONG nCount = aStyles.Count();
-/*N*/ 
+/*N*/ 	size_t nCount = aStyles.size();
+/*N*/
 /*N*/ 	// #63254# Aenderungen nicht mehr broadcasten,statt dessen nach
 /*N*/ 	// AdjustLRSpaceItems() ein UpdateStyleSheets am Outliner
-/*N*/ 
+/*N*/
 /*N*/ 	if ( nCount > 0 )
 /*N*/ 	{
         /**************************************************************************
         * All LayoutStyleSheets loaded? (e.g. new Subtitle LayoutStyleSheet)
         **************************************************************************/
 /*N*/ 		USHORT nMasterPageCount = pDoc->GetMasterSdPageCount(PK_STANDARD);
-/*N*/ 
+/*N*/
 /*N*/ 		for ( USHORT i = 0; i < nMasterPageCount; i++ )
 /*N*/ 		{
 /*N*/ 			String aName(pDoc->GetMasterSdPage(i, PK_STANDARD)->GetLayoutName());
@@ -931,7 +931,7 @@ namespace binfilter {
 /*N*/ 			CreateLayoutStyleSheets(aName);
 /*N*/ 		}
 /*N*/ 	}
-/*N*/ 
+/*N*/
 /*N*/ 	String aOutlineName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
 /*N*/ 	aOutlineName += String(SdResId(STR_PSEUDOSHEET_OUTLINE));
 /*N*/ 	String aTitleName( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
@@ -940,15 +940,15 @@ namespace binfilter {
 /*N*/ 	aSubtitleName += String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
 /*N*/ 	String aStandardName(SdResId(STR_STANDARD_STYLESHEET_NAME));
 /*N*/ 	SfxStyleSheet* pSheetOutlineLevelOne = NULL;
-/*N*/ 
-/*N*/ 	for (ULONG n = 0; n < nCount; n++)
+/*N*/
+/*N*/ 	for (size_t n = 0; n < nCount; n++)
 /*N*/ 	{
-/*N*/ 		SfxStyleSheet* pSheet = (SfxStyleSheet*)aStyles.GetObject(n);
+/*N*/ 		SfxStyleSheet* pSheet = (SfxStyleSheet*)aStyles[ n ];
 /*N*/ 		SfxItemSet& rSet = pSheet->GetItemSet();
 /*N*/ 		String aName( pSheet->GetName() );
 /*N*/ 		String aHelpFile;
 /*N*/ 		ULONG nHelpId = pSheet->GetHelpId( aHelpFile );
-/*N*/ 
+/*N*/
 /*N*/ 		if( nHelpId == 0)
 /*N*/ 		{
 /*N*/ 			if( aName.Len() == aOutlineName.Len() + 1 &&
@@ -959,7 +959,7 @@ namespace binfilter {
 /*?*/ 					nHelpId = HID_PSEUDOSHEET_OUTLINE + nNumber;
 /*N*/ 			}
 /*N*/ 		}
-/*N*/ 
+/*N*/
 /*N*/ 		if ( nHelpId &&
 /*N*/ 			 ( HID_PSEUDOSHEET_OUTLINE + 1 <= nHelpId &&
 /*N*/ 			   nHelpId <= HID_PSEUDOSHEET_OUTLINE + 9 ))
@@ -976,18 +976,18 @@ namespace binfilter {
 /*N*/ 					rSet.Put(aBulletStateItem);
 /*N*/ 				}
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*N*/ 			// Gliederungs-Vorlage
 /*N*/ 			const SvxBulletItem* pOldBullet = NULL;
 /*N*/ 			if ( rSet.GetItemState( EE_PARA_BULLET ) == SFX_ITEM_ON )
 /*N*/ 				pOldBullet = &(const SvxBulletItem&) rSet.Get(EE_PARA_BULLET);
-/*N*/ 
+/*N*/
 /*N*/ 			const SvxLRSpaceItem* pOldLRSpace = NULL;
 /*N*/ 			if ( rSet.GetItemState( EE_PARA_LRSPACE ) == SFX_ITEM_ON )
 /*N*/ 				pOldLRSpace = &(const SvxLRSpaceItem&) rSet.Get(EE_PARA_LRSPACE);
-/*N*/ 
+/*N*/
 /*N*/ 			USHORT nLevel = (USHORT) (nHelpId - HID_PSEUDOSHEET_OUTLINE);
-/*N*/ 
+/*N*/
 /*N*/ 			if ( nHelpId == HID_PSEUDOSHEET_OUTLINE + 1 )
 /*N*/ 			{
 /*N*/ 				pSheetOutlineLevelOne = pSheet;
@@ -995,14 +995,14 @@ namespace binfilter {
 /*N*/ 				aDefaultNumBullet.GetNumRule()->SetNumRuleType( SVX_RULETYPE_PRESENTATION_NUMBERING );
 /*N*/ 				EditEngine::ImportBulletItem( aDefaultNumBullet, nLevel, pOldBullet, pOldLRSpace );
 /*N*/ 				rSet.Put( aDefaultNumBullet );
-/*N*/ 
+/*N*/
 /*N*/ 				if (rSet.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_ON )
 /*N*/ 				{
 /*N*/ 					// Flaechenattribute sind nun unsichtbar
 /*N*/ 					XFillStyleItem aFillStyleItem(XFILL_NONE);
 /*N*/ 					rSet.Put(aFillStyleItem);
 /*N*/ 				}
-/*N*/ 
+/*N*/
 /*N*/ 				if (rSet.GetItemState( XATTR_LINESTYLE ) != SFX_ITEM_ON )
 /*N*/ 				{
 /*N*/ 					// Linienattribute sind nun unsichtbar
@@ -1016,16 +1016,16 @@ namespace binfilter {
 /*N*/ 				SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rSetOutlineLevelOne.Get(EE_PARA_NUMBULLET) );
 /*N*/ 				EditEngine::ImportBulletItem( aNumBullet, nLevel, pOldBullet, pOldLRSpace );
 /*N*/ 				rSetOutlineLevelOne.Put( aNumBullet );
-/*N*/ 
+/*N*/
 /*N*/ 				// SvxNumBulletItems darf es nur in der ersten Gliederungsebene geben!
 /*N*/ 				if ( rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
 /*N*/ 					rSet.ClearItem( EE_PARA_NUMBULLET );
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*N*/ 			if (rSet.GetItemState(EE_PARA_LRSPACE) == SFX_ITEM_ON)
 /*N*/ 			{
 /*N*/ 				const SvxLRSpaceItem& rLRItem = (const SvxLRSpaceItem&) rSet.Get(EE_PARA_LRSPACE);
-/*N*/ 
+/*N*/
 /*N*/ 				if (rLRItem.GetTxtFirstLineOfst() == 0)
 /*N*/ 				{
 /*N*/ 					SvxLRSpaceItem aNewLRItem(rLRItem);
@@ -1043,14 +1043,14 @@ namespace binfilter {
 /*N*/ 		{
 /*N*/ 			// Titel- oder Untertitel-Vorlage
 /*N*/ 			SfxItemSet& rLclSet = pSheet->GetItemSet();
-/*N*/ 
+/*N*/
 /*N*/ 			if (rLclSet.GetItemState(EE_PARA_BULLETSTATE) != SFX_ITEM_ON ||
 /*N*/ 				((const SfxUInt16Item&) rLclSet.Get(EE_PARA_BULLETSTATE)).GetValue() == 1)
 /*N*/ 			{
 /*N*/ 				SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar
 /*N*/ 				rLclSet.Put(aBulletStateItem);
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*N*/ 			if( nHelpId == HID_PSEUDOSHEET_TITLE ||
 /*N*/ 				aName.Search(aTitleName) != STRING_NOTFOUND )
 /*N*/ 			{
@@ -1077,7 +1077,7 @@ namespace binfilter {
 /*N*/ 		{
 /*N*/ 			// SvxLRSpaceItem hart gesetzt: NumBulletItem anpassen
 /*N*/ 			SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rSet.Get(EE_PARA_NUMBULLET) );
-/*N*/ 
+/*N*/
 /*N*/ 			EditEngine::ImportBulletItem( aNumBullet, 0, NULL, &(const SvxLRSpaceItem&) rSet.Get( EE_PARA_LRSPACE ) );
 /*N*/ 			rSet.Put( aNumBullet );
 /*N*/ 		}
@@ -1097,7 +1097,7 @@ namespace binfilter {
 /*N*/ 	String aHelpFile;
 /*N*/ 	ULONG nHelpId = pSheet->GetHelpId( aHelpFile );
 /*N*/ 	SfxItemSet& rSet = pSheet->GetItemSet();
-/*N*/ 
+/*N*/
 /*N*/ 	switch ( nHelpId )
 /*N*/ 	{
 /*N*/ 		case HID_STANDARD_STYLESHEET_NAME :
@@ -1110,13 +1110,13 @@ namespace binfilter {
 /*N*/ 			aNumberFormat.SetBulletColor(Color(COL_AUTO));
 /*N*/ 			aNumberFormat.SetStart(1);
 /*N*/ 			aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
-/*N*/ 
+/*N*/
 /*N*/ 			SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , FALSE);
 /*N*/ 			aNumberFormat.SetLSpace( 0 );
 /*N*/ 			aNumberFormat.SetAbsLSpace( 0 );
 /*N*/ 			aNumberFormat.SetFirstLineOffset( 0 );
 /*N*/ 			aNumRule.SetLevel( 0, aNumberFormat );
-/*N*/ 
+/*N*/
 /*N*/ 			for( USHORT i = 1; i < 10; i++ )
 /*N*/ 			{
 /*N*/ 				const short nLSpace = (i + 1) * 600;
@@ -1125,12 +1125,12 @@ namespace binfilter {
 /*N*/ 				aNumberFormat.SetFirstLineOffset(-600);
 /*N*/ 				aNumRule.SetLevel( i, aNumberFormat );
 /*N*/ 			}
-/*N*/ 
+/*N*/
 /*N*/ 			rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) );
 /*N*/ 			((SfxStyleSheet*)pSheet)->Broadcast(SfxSimpleHint( SFX_HINT_DATACHANGED ) );
 /*N*/ 		}
 /*N*/ 		break;
-/*N*/ 
+/*N*/
 /*N*/ 		case HID_PSEUDOSHEET_TITLE:
 /*N*/ 			/* #84013# title gets same bullet as subtitle and not that page symbol anymore */
 /*N*/  		case HID_PSEUDOSHEET_SUBTITLE :
@@ -1138,7 +1138,7 @@ namespace binfilter {
 /*N*/  			// Untertitel-Vorlage
 /*N*/  			SvxNumRule* pDefaultRule = ((SvxNumBulletItem*) rSet.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET))->GetNumRule();
 /*N*/  			DBG_ASSERT( pDefaultRule, "Wo ist mein Default? [CL]" );
-/*N*/  
+/*N*/
 /*N*/  			if(pDefaultRule)
 /*N*/  			{
 /*N*/  				SvxNumRule aNumRule(pDefaultRule->GetFeatureFlags(), 9, FALSE);
@@ -1152,13 +1152,13 @@ namespace binfilter {
 /*N*/  					aFrmt.SetBulletFont(&rBulletFont);
 /*N*/  					aNumRule.SetLevel(i, aFrmt);
 /*N*/  				}
-/*N*/  
+/*N*/
 /*N*/  				rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) );
 /*N*/  				((SfxStyleSheet*)pSheet)->Broadcast(SfxSimpleHint( SFX_HINT_DATACHANGED ) );
 /*N*/  			}
 /*N*/  		}
 /*N*/  		break;
-/*N*/  
+/*N*/
 /*N*/  		case HID_PSEUDOSHEET_OUTLINE + 1 :
 /*N*/  		{
 /*N*/  			// Gliederungs-Vorlage
@@ -1166,7 +1166,7 @@ namespace binfilter {
 /*N*/  			aNumberFormat.SetBulletColor(Color(COL_AUTO));
 /*N*/  			aNumberFormat.SetStart(1);
 /*N*/  			aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT);
-/*N*/  
+/*N*/
 /*N*/  			SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT,
 /*N*/  								 10, FALSE, SVX_RULETYPE_PRESENTATION_NUMBERING );
 /*N*/  			for( UINT16 i = 0; i < 10; i++ )
@@ -1177,7 +1177,7 @@ namespace binfilter {
 /*N*/  				aNumberFormat.SetLSpace(nLSpace);
 /*N*/  				aNumberFormat.SetAbsLSpace(nLSpace);
 /*N*/  				USHORT nFirstLineOffset = -600;
-/*N*/  
+/*N*/
 /*N*/  				ULONG nFontSize = 20;
 /*N*/  				switch(i)
 /*N*/  				{
@@ -1188,7 +1188,7 @@ namespace binfilter {
 /*N*/  						nFirstLineOffset = -900;
 /*N*/  					}
 /*N*/  					break;
-/*N*/  
+/*N*/
 /*N*/  					case 2:
 /*N*/  					{
 /*N*/  						nFontSize = 28;
@@ -1197,13 +1197,13 @@ namespace binfilter {
 /*N*/  						aNumberFormat.SetBulletRelSize(75);
 /*N*/  					}
 /*N*/  					break;
-/*N*/  
+/*N*/
 /*N*/  					case 3:
 /*N*/  					{
 /*N*/  						nFontSize = 24;
 /*N*/  					}
 /*N*/  					break;
-/*N*/  
+/*N*/
 /*N*/  					case 4:
 /*N*/  					{
 /*N*/  						aNumberFormat.SetBulletChar( 0x2013 ); // StarBats: 0xF000 + 150
@@ -1211,14 +1211,14 @@ namespace binfilter {
 /*N*/  					}
 /*N*/  					break;
 /*N*/  				}
-/*N*/  
+/*N*/
 /*N*/  				aNumberFormat.SetFirstLineOffset(nFirstLineOffset);
 /*N*/  				nFontSize = (USHORT)((nFontSize * 2540L) / 72);  // Pt --> 1/100 mm
 /*N*/  				rBulletFont.SetSize(Size(0,846));		// 24 pt
 /*N*/  				aNumberFormat.SetBulletFont(&rBulletFont);
 /*N*/  				aNumRule.SetLevel( i, aNumberFormat );
 /*N*/  			}
-/*N*/  
+/*N*/
 /*N*/  			rSet.Put( SvxNumBulletItem( aNumRule, EE_PARA_NUMBULLET ) );
 /*N*/  			((SfxStyleSheet*)pSheet)->Broadcast(SfxSimpleHint( SFX_HINT_DATACHANGED ) );
 /*N*/  		}
@@ -1244,7 +1244,7 @@ namespace binfilter {
 /*N*/ 	aBulletFont.SetShadow(FALSE);
 /*N*/ 	aBulletFont.SetColor(Color(COL_AUTO));
 /*N*/ 	aBulletFont.SetTransparent(TRUE);
-/*N*/ 
+/*N*/
 /*N*/ 	return aBulletFont;
 /*N*/ }
 
diff --git a/binfilter/bf_svtools/source/items/svt_style.cxx b/binfilter/bf_svtools/source/items/svt_style.cxx
index 4844552..005631b 100644
--- a/binfilter/bf_svtools/source/items/svt_style.cxx
+++ b/binfilter/bf_svtools/source/items/svt_style.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -353,11 +353,11 @@ USHORT SfxStyleSheetIterator::Count()
 {
     USHORT n = 0;
     if( IsTrivialSearch())
-        n = (USHORT) pBasePool->aStyles.Count();
+        n = (USHORT) pBasePool->aStyles.size();
     else
-        for(USHORT i=0; i<pBasePool->aStyles.Count(); i++)
+        for(USHORT i=0; i<pBasePool->aStyles.size(); i++)
         {
-            SfxStyleSheetBase* pStyle = pBasePool->aStyles.GetObject(i);
+            SfxStyleSheetBase* pStyle = pBasePool->aStyles[ i ];
             if(DoesStyleMatch(pStyle))
                 n++;
         }
@@ -367,13 +367,13 @@ USHORT SfxStyleSheetIterator::Count()
 SfxStyleSheetBase* SfxStyleSheetIterator::operator[](USHORT nIdx)
 {
     if( IsTrivialSearch())
-        return pBasePool->aStyles.GetObject(nIdx);
+        return ( nIdx < pBasePool->aStyles.size() ) ? pBasePool->aStyles[ nIdx ] : NULL;
 
     USHORT z = 0;
-    for(USHORT n=0; n<pBasePool->aStyles.Count(); n++)
+    for( size_t n = 0; n < pBasePool->aStyles.size(); n++ )
     {
-        SfxStyleSheetBase* pStyle = pBasePool->aStyles.GetObject(n);
-        if( DoesStyleMatch(pStyle))
+        SfxStyleSheetBase* pStyle = pBasePool->aStyles[ n ];
+        if( DoesStyleMatch(pStyle) )
         {
             if(z == nIdx)
             {
@@ -391,12 +391,12 @@ SfxStyleSheetBase* SfxStyleSheetIterator::First()
 {
     INT32 nIdx = -1;
 
-    if ( IsTrivialSearch() && pBasePool->aStyles.Count() )
+    if ( IsTrivialSearch() && pBasePool->aStyles.size() )
         nIdx = 0;
     else
-        for( USHORT n = 0; n < pBasePool->aStyles.Count(); n++ )
+        for( size_t n = 0; n < pBasePool->aStyles.size(); n++ )
         {
-            SfxStyleSheetBase* pStyle = pBasePool->aStyles.GetObject(n);
+            SfxStyleSheetBase* pStyle = pBasePool->aStyles[ n ];
 
             if ( DoesStyleMatch( pStyle ) )
             {
@@ -408,7 +408,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::First()
     if ( nIdx != -1 )
     {
         nAktPosition = (USHORT)nIdx;
-        return pAktStyle = pBasePool->aStyles.GetObject(nIdx);
+        return pAktStyle = pBasePool->aStyles[ nIdx ];
     }
     return 0;
 }
@@ -419,12 +419,12 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
     INT32 nIdx = -1;
 
     if ( IsTrivialSearch() &&
-         (USHORT)pBasePool->aStyles.Count() > nAktPosition + 1 )
+         (USHORT)pBasePool->aStyles.size() > nAktPosition + 1 )
         nIdx = nAktPosition + 1;
     else
-        for( USHORT n = nAktPosition + 1; n < pBasePool->aStyles.Count(); n++ )
+        for( size_t n = nAktPosition + 1; n < pBasePool->aStyles.size(); n++ )
         {
-            SfxStyleSheetBase* pStyle = pBasePool->aStyles.GetObject(n);
+            SfxStyleSheetBase* pStyle = pBasePool->aStyles[ n ];
 
             if ( DoesStyleMatch( pStyle ) )
             {
@@ -436,7 +436,7 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
     if ( nIdx != -1 )
     {
         nAktPosition = (USHORT)nIdx;
-        return pAktStyle = pBasePool->aStyles.GetObject(nIdx);
+        return pAktStyle = pBasePool->aStyles[ nIdx ];
     }
     return 0;
 }
@@ -444,9 +444,9 @@ SfxStyleSheetBase* SfxStyleSheetIterator::Next()
 
 SfxStyleSheetBase* SfxStyleSheetIterator::Find(const XubString& rStr)
 {
-    for ( USHORT n = 0; n < pBasePool->aStyles.Count(); n++ )
+    for ( size_t n = 0; n < pBasePool->aStyles.size(); n++ )
     {
-        SfxStyleSheetBase* pStyle = pBasePool->aStyles.GetObject(n);
+        SfxStyleSheetBase* pStyle = pBasePool->aStyles[ n ];
 
         // #98454# performance: in case of bSearchUsed==TRUE it may be
         // significant to first compare the name and only if it matches to call
@@ -597,13 +597,23 @@ SfxStyleSheetBase& SfxStyleSheetBasePool::Make( const XubString& rName,
     if( !p )
     {
         p = Create( rName, eFam, mask );
-        if(0xffff == nPos || nPos == aStyles.Count() ||
+        if(0xffff == nPos || nPos == aStyles.size() ||
            nPos == rIter.Count())
-            aStyles.Insert( p, aStyles.Count() );
+            aStyles.push_back( p );
         else
         {
             rIter[nPos];
-            aStyles.Insert(p, rIter.GetPos());
+            size_t i = rIter.GetPos();
+            if ( i < aStyles.size() )
+            {
+                SfxStyles::iterator it = aStyles.begin();
+                ::std::advance( it, i );
+                aStyles.insert( it, p );
+            }
+            else
+            {
+                aStyles.push_back( p );
+            }
         }
         Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
     }
@@ -622,7 +632,7 @@ SfxStyleSheetBase& SfxStyleSheetBasePool::Add( SfxStyleSheetBase& rSheet )
     SfxStyleSheetBase* pOld = aIter.Find( rSheet.GetName() );
     Erase( pOld );
     SfxStyleSheetBase* pNew = Create( rSheet );
-    aStyles.Insert( pNew, aStyles.Count() );
+    aStyles.push_back( pNew );
     Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CHANGED, *pNew ) );
     return *pNew;
 }
@@ -643,9 +653,8 @@ SfxStyleSheetBasePool& SfxStyleSheetBasePool::operator+=( const SfxStyleSheetBas
     {
         // kopieren
         SfxStyleSheetBasePool& r = (SfxStyleSheetBasePool&) rP;
-        for( SfxStyleSheetBase* p = r.aStyles.First(); p; p = r.aStyles.Next() )
-            Add(*p);
-
+        for ( size_t i = 0, n = r.aStyles.size(); i < n; ++i )
+            Add( *r.aStyles[ i ] );
     }
     return *this;
 }
@@ -688,7 +697,14 @@ SfxStyleSheetBase* SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
     {
         // Alle Styles umsetzen, deren Parent dieser hier ist
         ChangeParent( p->GetName(), p->GetParent() );
-        aStyles.Remove( p );
+        for ( SfxStyles::iterator it = aStyles.begin(); it < aStyles.end(); ++it )
+        {
+            if ( *it == p )
+            {
+                aStyles.erase( it );
+                break;
+            }
+        }
         Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );
     }
     return p;
@@ -698,7 +714,14 @@ void SfxStyleSheetBasePool::Erase( SfxStyleSheetBase* p )
 {
     if( p )
     {
-        Remove(p);
+        for ( SfxStyles::iterator it = aStyles.begin(); it < aStyles.end(); ++it )
+        {
+            if ( *it == p )
+            {
+                aStyles.erase( it );
+                break;
+            }
+        }
         delete p;
     }
 }
@@ -715,16 +738,17 @@ void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
         pOld = aIter.Find( p->GetParent() );
         DBG_ASSERT( pOld, "Parent nicht mehr vorhanden" );
     }
-    aStyles.Insert( p, aStyles.Count() );
+    aStyles.push_back( p );
     Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
 }
 
 void SfxStyleSheetBasePool::Clear()
 {
-    while( aStyles.Count() )
+    while( aStyles.size() )
     {
-        SfxStyleSheetBase* p = aStyles.First();
-        aStyles.Remove( p );
+        SfxStyles::iterator it = aStyles.begin();
+        SfxStyleSheetBase* p = aStyles[ 0 ];
+        aStyles.erase( aStyles.begin() );
         Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );
         delete p;
     }
@@ -736,7 +760,6 @@ void SfxStyleSheetBasePool::ChangeParent(const XubString& rOld,
                                          const XubString& rNew,
                                          BOOL bVirtual)
 {
-    const ULONG nPos = aStyles.GetCurPos();
     const USHORT nTmpMask = GetSearchMask();
     SetSearchMask(GetSearchFamily(), 0xffff);
     for( SfxStyleSheetBase* p = First(); p; p = Next() )
@@ -750,7 +773,6 @@ void SfxStyleSheetBasePool::ChangeParent(const XubString& rOld,
         }
     }
     SetSearchMask(GetSearchFamily(), nTmpMask);
-    aStyles.Seek(nPos);
 }
 
 /////////////////////////// Laden/Speichern /////////////////////////////////
@@ -845,15 +867,15 @@ BOOL SfxStyleSheetBasePool::Load( SvStream& rStream )
         }
 
         //	#72939# only loop through the styles that were really inserted
-        ULONG n = aStyles.Count();
+        size_t n = aStyles.size();
 
         //! delete pTmpPool;
         // Jetzt Parent und Follow setzen. Alle Sheets sind geladen.
         // Mit Setxxx() noch einmal den String eintragen, da diese
         // virtuellen Methoden evtl. ueberlagert sind.
-        for ( ULONG i = 0; i < n; i++ )
+        for ( size_t i = 0; i < n; i++ )
         {
-            SfxStyleSheetBase* p = aStyles.GetObject( i );
+            SfxStyleSheetBase* p = aStyles[ i ];
             XubString aText = p->aParent;
             p->aParent.Erase();
             p->SetParent( aText );
@@ -950,7 +972,7 @@ BOOL SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
     // virtuellen Methoden evtl. ueberlagert sind.
     for ( i = 0; i < nStyles; i++ )
     {
-        SfxStyleSheetBase* p = aStyles.GetObject( i );
+        SfxStyleSheetBase* p = aStyles[ i ];
         XubString aText = p->aParent;
         p->aParent.Erase();
         p->SetParent( aText );
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
index 3e7bdca..3d299a0 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -705,9 +705,9 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/ {
 /*N*/ 	SwFmt* pFmt;
         SwStyleSheet* p;
-/*N*/ 	for( p = (SwStyleSheet*) aStyles.First(); p;
-/*N*/ 		 p = (SwStyleSheet*) aStyles.Next() )
-/*N*/ 	{
+        for( size_t i = 0; i < aStyles.size(); ++i )
+        {
+            p = (SwStyleSheet*)aStyles[ i ];
 /*N*/ 		if( !p->pFmt &&	(eMask & p->nFamily) )
 /*N*/ 		{
 /*N*/ 			BOOL bNewFmt = FALSE;
@@ -729,7 +729,7 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*?*/ 				// mit dem neuen Namen existiert, damit die abgeleiteten
 /*?*/ 				// und Folgevorlagen umgehaengt wenrden.
 /*?*/ 				Rename( p->GetName(), aNewName, p->nFamily );
-/*?*/ 				aStyles.First();
+                    i = 0;
 /*?*/
 /*?*/ 				if( bPresent )
 /*?*/ 				{
@@ -889,7 +889,7 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/ 						Rename( p->GetName(), pFmt->GetName(), p->GetFamily() );
 /*N*/ 						// Da Rename() selbst eine Schleife hat, muss von
 /*N*/ 						// vorne gearbeitet werden.
-/*N*/ 						aStyles.First();
+                            i = 0;
 /*N*/ 					}
 /*N*/ 				}
 /*N*/ 			}
@@ -976,9 +976,9 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/ 		}
 /*N*/ 	}
 /*N*/ 	// Nun sind alle Vorlagen drin, sie koennen also verbunden werden
-/*N*/ 	for( p = (SwStyleSheet*) aStyles.First(); p;
-/*N*/ 		 p = (SwStyleSheet*) aStyles.Next() )
-/*N*/ 	{
+        for ( size_t i = 0; i < aStyles.size(); ++i )
+        {
+            p = (SwStyleSheet*)aStyles[ i ];
 /*N*/ 		if( p->bNew )
 /*N*/ 		{
 /*N*/ 			p->ConnectParent( p->GetParent() );
@@ -991,9 +991,9 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/
 /*N*/ //FEATURE::CONDCOLL
 /*N*/ 	// dann koennen auch alle bedingten Vorlagen verbunden werden
-/*N*/ 	for( p = (SwStyleSheet*) aStyles.First(); p;
-/*N*/ 		 p = (SwStyleSheet*) aStyles.Next() )
-/*N*/ 	{
+        for ( size_t i = 0; i < aStyles.size(); ++i )
+        {
+            p = (SwStyleSheet*)aStyles[ i ];
 /*N*/ 		if( p->bNew && p->pCondColls )
 /*N*/ 			for( USHORT n = 0; n < p->pCondColls->Count(); ++n )
 /*N*/ 			{
@@ -1031,9 +1031,9 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/ 	// da mit Referenzen gearbeitet wird, muss der Name zwischen-
 /*N*/ 	// gelagert werden!
 /*N*/ 	String aOld( rOld );
-/*N*/ 	for( SwStyleSheet* p = (SwStyleSheet*) aStyles.First(); p;
-/*N*/ 		 p = (SwStyleSheet*) aStyles.Next() )
-/*N*/ 	{
+        for( size_t i = 0; i < aStyles.size(); ++i )
+        {
+            SwStyleSheet* p = (SwStyleSheet*)aStyles[ i ];
 /*N*/ 		if( p->GetFamily() == eFam )
 /*N*/ 		{
 /*N*/ 			if( p->GetName() == aOld )
@@ -1059,10 +1059,10 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/ SwStyleSheet *SwStyleSheetPool::FindByPoolId( USHORT nPoolId )
 /*N*/ {
 /*N*/ 	SwStyleSheet *pS = 0;
-/*N*/ 	ULONG nCount = aStyles.Count();
-/*N*/ 	for( ULONG i=0; i<nCount; i++ )
+/*N*/ 	size_t nCount = aStyles.size();
+/*N*/ 	for( size_t i = 0; i < nCount; i++ )
 /*N*/ 	{
-/*N*/ 		SwStyleSheet *p = (SwStyleSheet *)aStyles.GetObject( i );
+/*N*/ 		SwStyleSheet *p = (SwStyleSheet *)aStyles[ i ];
 /*N*/ 		if( p->nId == nPoolId )
 /*N*/ 		{
 /*?*/ 			pS = p;
@@ -1205,26 +1205,26 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*?*/ 				const SvxLRSpaceItem& rLR = pColl->GetLRSpace();
 /*?*/ 				const SwNumFmt& rNFmt = pOutlRule->Get( nLevel );
 /*?*/ 				SwNumFmt aTmp( rNFmt );
-/*?*/ 
+/*?*/
 /*?*/ 				// ohne Nummer immer ohne FirstLineOffset!!!!
 /*?*/ 				if( pColl->GetOutlineLevel() & NO_NUMLEVEL )
 /*?*/ 					aTmp.SetFirstLineOffset( 0 );
 /*?*/ 				else
 /*?*/ 					aTmp.SetFirstLineOffset( rLR.GetTxtFirstLineOfst() );
-/*?*/ 
+/*?*/
 /*?*/ 				aTmp.SetAbsLSpace( rLR.GetTxtLeft() );
 /*?*/ 				if( aTmp != rNFmt )
 /*?*/ 					pOutlRule->Set( nLevel, aTmp );
 /*?*/ 			}
 /*?*/ 	}
-/*?*/ 
+/*?*/
 /*?*/ 	//JP 21.07.98: Bug 53390
 /*?*/ 	if( !bNormal && !bAdditive && bTxtColls )
 /*?*/ 	{
 /*?*/ 		pDoc->SetOutlineNumRule( *pDoc->GetOutlineNumRule() );
 /*?*/ 	}
 /*N*/ #endif
-/*N*/ 
+/*N*/
 /*N*/ 	delete p;
 /*N*/ 	delete pPool;
 /*N*/ 	if( !pConvToSymbolFmts->Count() )
@@ -1241,12 +1241,12 @@ sal_Char const SW_CONSTASCII_DEF( sHTML_listing, "LISTING" );
 /*N*/ 	// kann es hier noch gar keine RecSizes geben. Besser ist aber besser ...
 /*N*/ 	if( HasRecSizes() )
             {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ 		FlushRecSizes();
-/*N*/ 
+/*N*/
 /*N*/ 	SfxItemPool *pTmp = pDoc->GetAttrPool().GetSecondaryPool();
 /*N*/ 	pDoc->GetAttrPool().SetSecondaryPool( 0 );
 /*N*/ 	SfxItemPool* pPool = pDoc->GetAttrPool().Clone();
 /*N*/ 	pDoc->GetAttrPool().SetSecondaryPool( pTmp );
-/*N*/ 
+/*N*/
 /*N*/ 	pStyles->Seek( 0L );
 /*N*/ 	pStyles->SetSize( 0L );
 /*N*/ 	pStyles->SetBufferSize( SW3_BSW_STYLES );
diff --git a/binfilter/inc/bf_svtools/style.hxx b/binfilter/inc/bf_svtools/style.hxx
index 6aaf8bd..5a5aefa 100644
--- a/binfilter/inc/bf_svtools/style.hxx
+++ b/binfilter/inc/bf_svtools/style.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -43,6 +43,8 @@
 
 #include <bf_svtools/style.hrc>
 
+#include <vector>
+
 class SvStream;
 
 namespace binfilter
@@ -50,7 +52,6 @@ namespace binfilter
 
 class SfxItemSet;
 class SfxItemPool;
-
 class SfxStyleSheetBasePool;
 
 
@@ -149,7 +150,7 @@ public:
 
 //=========================================================================
 
-DECLARE_LIST( SfxStyles, SfxStyleSheetBase* )
+typedef ::std::vector< SfxStyleSheetBase* > SfxStyles;
 
 //=========================================================================
 


More information about the Libreoffice-commits mailing list