Remove DECLARE_LIST( TargetList, String* )

4 files changed, 16 insertions, 34 deletions

diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 1ec5f08394..cc7687adf3 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.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
@@ -254,7 +254,6 @@ public:
 
 // class SfxInternetPage -------------------------------------------------
 
-class TargetList;
 namespace sfx2
 {
     class FileDialogHelper;
@@ -386,13 +385,13 @@ class CustomPropertiesDurationField : public Edit
     com::sun::star::util::Duration  m_aDuration;
 protected:
     virtual void    RequestHelp(const HelpEvent& rEvt);
-public:    
+public:
     CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
     ~CustomPropertiesDurationField();
 
     void SetDuration( const com::sun::star::util::Duration& rDuration );
     const com::sun::star::util::Duration& GetDuration() const { return m_aDuration; }
-};    
+};
 
 class CustomPropertiesEditButton : public PushButton
 {
@@ -403,7 +402,7 @@ public:
     ~CustomPropertiesEditButton();
 
     DECL_LINK(ClickHdl, PushButton*);
-};    
+};
 
 class CustomPropertiesRemoveButton : public ImageButton
 {
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index ab07c981a4..3ff0ab5f9f 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.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
@@ -70,6 +70,7 @@ namespace com
 #include <tools/list.hxx>
 #include <svl/poolitem.hxx>
 #include <comphelper/namedvaluecollection.hxx>
+#include <vector>
 
 class SvBorder;
 class SfxWorkWindow;
@@ -94,7 +95,7 @@ class SystemWindow;
 typedef SfxFrame* SfxFramePtr;
 class SfxFrameArr_Impl;
 
-DECLARE_LIST( TargetList, String* )
+typedef ::std::vector< String* > TargetList;
 
 #define SFXFRAME_HASTITLE     0x0001
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1f238b3652..9e404e8416 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -403,7 +403,6 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
         i_xDocProps->setAutoloadURL(::rtl::OUString());
     }
     i_xDocProps->setDefaultTarget(getDefaultTarget());
-//    i_xDocProps->setTemplateName(getTemplateName());
     i_xDocProps->setAuthor(getAuthor());
     i_xDocProps->setCreationDate(getCreationDate());
     i_xDocProps->setModifiedBy(getModifiedBy());
@@ -978,20 +977,6 @@ BOOL SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
             SfxDocumentInfoItem* pInfoItem = (SfxDocumentInfoItem*)pItem;
             BOOL bUseData = ( STATE_CHECK == aUseUserDataCB.GetState() );
             pInfoItem->SetUseUserData( bUseData );
-/*
-            if ( !bUseData )
-            {
-                // "Benutzerdaten verwenden" ausgeschaltet ->
-                // den Benutzer aus den Stamps l"oschen
-                String aEmptyUser;
-                aInfo.SetCreated(
-                    SfxStamp( aEmptyUser, aInfo.GetCreated().GetTime() ) );
-                aInfo.SetChanged(
-                    SfxStamp( aEmptyUser, aInfo.GetChanged().GetTime() ) );
-                aInfo.SetPrinted(
-                    SfxStamp( aEmptyUser, aInfo.GetPrinted().GetTime() ) );
-            }
-*/
             rSet.Put( SfxDocumentInfoItem( *pInfoItem ) );
             bRet = TRUE;
         }
@@ -1127,12 +1112,10 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     aCreateValFt.SetText( ConvertDateTime_Impl( pInfoItem->getAuthor(),
         pInfoItem->getCreationDate(), aLocaleWrapper ) );
     util::DateTime aTime( pInfoItem->getModificationDate() );
-//	if ( aTime.IsValid() )
     if ( aTime.Month > 0 )
         aChangeValFt.SetText( ConvertDateTime_Impl(
             pInfoItem->getModifiedBy(), aTime, aLocaleWrapper ) );
     aTime = pInfoItem->getPrintDate();
-//	if ( aTime.IsValid())
     if ( aTime.Month > 0 )
         aPrintValFt.SetText( ConvertDateTime_Impl( pInfoItem->getPrintedBy(),
             aTime, aLocaleWrapper ) );
@@ -1197,10 +1180,10 @@ SfxInternetPage::SfxInternetPage( Window* pParent, const SfxItemSet& rItemSet )
         {
             pFrame->GetTargetList( aList );
 
-            String*			pObj;
-            for( USHORT nPos = ( USHORT ) aList.Count() ; nPos ; )
+            String* pObj;
+            for( size_t nPos = aList.size() ; nPos ; )
             {
-                pObj = aList.GetObject( --nPos );
+                pObj = aList[ --nPos ];
                 aCBFrame.InsertEntry( *pObj );
                 delete pObj;
             }
@@ -2335,7 +2318,6 @@ CustomPropertiesControl::CustomPropertiesControl( Window* pParent, const ResId&
 
     Link aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl );
     m_aVertScroll.SetScrollHdl( aScrollLink );
-//    m_aVertScroll.SetEndScrollHdl( aScrollLink );
 }
 
 CustomPropertiesControl::~CustomPropertiesControl()
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 52587cbf1a..41452da24c 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.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
@@ -493,11 +493,11 @@ void SfxFrame::GetTargetList( TargetList& rList ) const
     if ( !GetParentFrame() )
     {
         // Einen Leerstring f"ur 'Kein Target'
-        rList.Insert( new String() );
-        rList.Insert( new String( DEFINE_CONST_UNICODE( "_top" ) ) );
-        rList.Insert( new String( DEFINE_CONST_UNICODE( "_parent" ) ) );
-        rList.Insert( new String( DEFINE_CONST_UNICODE( "_blank" ) ) );
-        rList.Insert( new String( DEFINE_CONST_UNICODE( "_self" ) ) );
+        rList.push_back( new String() );
+        rList.push_back( new String( DEFINE_CONST_UNICODE( "_top" ) ) );
+        rList.push_back( new String( DEFINE_CONST_UNICODE( "_parent" ) ) );
+        rList.push_back( new String( DEFINE_CONST_UNICODE( "_blank" ) ) );
+        rList.push_back( new String( DEFINE_CONST_UNICODE( "_self" ) ) );
     }
 
     SfxViewFrame* pView = GetCurrentViewFrame();