diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-12-31 13:02:04 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-12-31 13:02:04 -0800 |
commit | c1a5082b207742c028609a7906bd33cdaf01a809 (patch) | |
tree | 6de47b5c45e1a6f5406191b6df9f3a72bc7fbb28 /sfx2 | |
parent | 8f68d6d4ed5f2e2142894d7ab67d09a467369fa0 (diff) |
Remove DECLARE_LIST( SfxMediumList, SfxMedium* )
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/docinsert.hxx | 6 | ||||
-rw-r--r-- | sfx2/inc/sfx2/app.hxx | 6 | ||||
-rw-r--r-- | sfx2/inc/sfx2/docfile.hxx | 9 | ||||
-rw-r--r-- | sfx2/source/doc/docinsert.cxx | 4 |
4 files changed, 14 insertions, 11 deletions
diff --git a/sfx2/inc/docinsert.hxx b/sfx2/inc/docinsert.hxx index 8541b3ab17..40969a76db 100644 --- a/sfx2/inc/docinsert.hxx +++ b/sfx2/inc/docinsert.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 @@ -32,15 +32,17 @@ #include <tools/errcode.hxx> #include <tools/link.hxx> #include <tools/string.hxx> +#include <vector> #include "sfx2/dllapi.h" namespace sfx2 { class FileDialogHelper; } class SfxMedium; -class SfxMediumList; class SfxItemSet; class SvStringsDtor; +typedef ::std::vector< SfxMedium* > SfxMediumList; + // ============================================================================ namespace sfx2 { diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 09d9a4231b..b6cfd0e5d3 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.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 @@ -45,6 +45,7 @@ #include <vcl/svapp.hxx> #include <sfx2/shell.hxx> +#include <vector> class Timer; class ApplicationEvent; @@ -68,7 +69,6 @@ class SfxEventHint; class SfxItemSet; class SfxMacroConfig; class SfxMedium; -class SfxMediumList; class SfxMenuCtrlFactArr_Impl; class SfxNewFileDialog; class SfxObjectShell; @@ -100,6 +100,8 @@ struct SfxTbxCtrlFactory; class SimpleResMgr; class ModalDialog; +typedef ::std::vector< SfxMedium* > SfxMediumList; + namespace sfx2 { class SvLinkSource; diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index 57293a0bce..64145b6aa6 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.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 @@ -52,6 +52,8 @@ #include <cppuhelper/weak.hxx> #include <ucbhelper/content.hxx> +#include <vector> + class SvKeyValueIterator; class SfxObjectFactory; class SfxFilter; @@ -334,10 +336,7 @@ public: SV_DECL_IMPL_REF( SfxMedium ) SV_DECL_COMPAT_WEAK( SfxMedium ) -#ifndef SFXMEDIUM_LIST -#define SFXMEDIUM_LIST -DECLARE_LIST( SfxMediumList, SfxMedium* ) -#endif +typedef ::std::vector< SfxMedium* > SfxMediumList; #endif diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 6456b3a5c0..7850670971 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.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 @@ -162,7 +162,7 @@ SfxMediumList* DocumentInserter::CreateMediumList() DELETEZ( pMedium ); if( pMedium && CheckPasswd_Impl( 0, SFX_APP()->GetPool(), pMedium ) != ERRCODE_ABORT ) - pMediumList->Insert( pMedium ); + pMediumList->push_back( pMedium ); else delete pMedium; } |