[Libreoffice-commits] .: sot/source tools/inc tools/Package_inc.mk
Joseph Powers
jpowers at kemper.freedesktop.org
Wed May 18 20:48:21 PDT 2011
sot/source/sdstor/stg.cxx | 1
tools/Package_inc.mk | 3 -
tools/inc/tools/ownlist.hxx | 95 --------------------------------------------
3 files changed, 1 insertion(+), 98 deletions(-)
New commits:
commit 90d338164986f9ec5dd30a0f0f22afb34c30085e
Author: Joseph Powers <jpowers27 at cox.net>
Date: Wed May 18 20:06:04 2011 -0700
Remove all the #include <tools/ownlist.hxx>
I'm deleting the header since it's no longer used.
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 9229fcf..04d4f3e 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -32,7 +32,6 @@
#include <sot/storinfo.hxx>
#include <osl/file.hxx>
#include <tools/tempfile.hxx>
-#include <tools/ownlist.hxx>
#include <tools/string.hxx>
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index adaa0c7..9dd746d 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -1,7 +1,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
@@ -62,7 +62,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h))
diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx
deleted file mode 100644
index 60a5141..0000000
--- a/tools/inc/tools/ownlist.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _TOOLS_OWNLIST_HXX
-#define _TOOLS_OWNLIST_HXX
-
-#include <tools/list.hxx>
-/*************************************************************************
-*************************************************************************/
-
-#define PRV_SV_DECL_OWNER_LIST(ClassName,Type) \
- List aTypes; \
-public: \
- ClassName( sal_uInt16 nInitSize = 16, \
- sal_uInt16 nReSize = 16 ) \
- : aTypes( nInitSize, nReSize ) {} \
- ClassName( const ClassName & rObj ) \
- { *this = rObj; } \
- ClassName & operator = ( const ClassName & ); \
- ~ClassName() \
- { Clear(); } \
- void Clear(); \
- void Remove() \
- { delete (Type *)aTypes.Remove(); } \
- void Remove( Type * pObj ) \
- { delete (Type *)aTypes.Remove( pObj ); } \
- void Remove( sal_uIntPtr nPos ) \
- { delete (Type *)aTypes.Remove( nPos ); } \
- Type & Insert( const Type &, sal_uIntPtr nPos ); \
- Type & Insert( const Type & rType ) \
- { return Insert( rType, aTypes.GetCurPos() ); } \
- Type & Append( const Type & rType ) \
- { return Insert( rType, LIST_APPEND ); } \
- Type & GetObject( sal_uIntPtr nPos ) const \
- { return *(Type *)aTypes.GetObject( nPos ); } \
- Type & operator []( sal_uIntPtr nPos ) const \
- { return *(Type *)aTypes.GetObject( nPos ); } \
- sal_uIntPtr Count() const { return aTypes.Count(); }
-
-#define PRV_SV_IMPL_OWNER_LIST(ClassName,Type) \
-ClassName & ClassName::operator = ( const ClassName & rObj ) \
-{ \
- if( this != &rObj ) \
- { \
- Clear(); \
- for( sal_uIntPtr i = 0; i < rObj.Count(); i++ ) \
- Append( rObj.GetObject( i ) ); \
- } \
- return *this; \
-} \
-void ClassName::Clear() \
-{ \
- Type * p = (Type *)aTypes.First(); \
- while( p ) \
- { \
- delete p; \
- p = (Type *)aTypes.Next(); \
- } \
- aTypes.Clear(); \
-} \
-Type & ClassName::Insert( const Type & rType, sal_uIntPtr nPos ) \
-{ \
- Type * pType = new Type( rType ); \
- aTypes.Insert( pType, nPos ); \
- return *pType; \
-}
-
-#endif // _TOOLS_OWNLIST_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list