diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-25 19:54:08 +0100 |
| commit | 5879e44bafec55e5a9b76cb38c992645948ec607 (patch) | |
| tree | fb4b3eb2b43104421a8cb979ea9b082290cac49b /sw/inc/unocoll.hxx | |
| parent | a00760d9c1a79cb4e54c6e7c55772b81caf3dce7 (diff) | |
| parent | 7e12418df527339d4a78416596ea12ed3cd6133a (diff) | |
sw33a11y01: merge with DEV300_m72, resolution of merge conflicts, adjustments due to changes on master
Diffstat (limited to 'sw/inc/unocoll.hxx')
| -rw-r--r-- | sw/inc/unocoll.hxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index b630668f8965..cc65666d8fd4 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unocoll.hxx,v $ - * $Revision: 1.26 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -481,7 +478,6 @@ class SwXBookmarks : public SwCollectionBaseClass, virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); - static SwXBookmark* GetObject( ::sw::mark::IMark& rBkm, SwDoc* pDoc); }; class SwXNumberingRulesCollection : public cppu::WeakImplHelper1 |