[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

Joseph Powers jpowers at kemper.freedesktop.org
Wed May 18 20:47:30 PDT 2011


 binfilter/bf_sc/source/ui/inc/ui_pch.hxx |    1 
 binfilter/inc/bf_svtools/ownlist.hxx     |    4 -
 binfilter/inc/bf_tools/ownlist.hxx       |   98 +++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 3 deletions(-)

New commits:
commit 6c30a0d5c26314eeb4d6a10a9d661021c111e076
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Wed May 18 19:42:48 2011 -0700

    Remove dependance on libs-gui/inc/tools/ownlist.hxx
    
    I've created a private copy for binfilter because I'm remving the one in
    libs-gui.

diff --git a/binfilter/bf_sc/source/ui/inc/ui_pch.hxx b/binfilter/bf_sc/source/ui/inc/ui_pch.hxx
index 22596bc..065b8ae 100644
--- a/binfilter/bf_sc/source/ui/inc/ui_pch.hxx
+++ b/binfilter/bf_sc/source/ui/inc/ui_pch.hxx
@@ -76,7 +76,6 @@
 #include <sot/object.hxx>
 #include <sot/sotdata.hxx>
 #include <sot/factory.hxx>
-#include <tools/ownlist.hxx>
 #include <vcl/font.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/settings.hxx>
diff --git a/binfilter/inc/bf_svtools/ownlist.hxx b/binfilter/inc/bf_svtools/ownlist.hxx
index 44b8001..ca825a7 100644
--- a/binfilter/inc/bf_svtools/ownlist.hxx
+++ b/binfilter/inc/bf_svtools/ownlist.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,7 +32,7 @@
 #include "bf_svtools/svtdllapi.h"
 
 #include <tools/stream.hxx>
-#include <tools/ownlist.hxx>
+#include <bf_tools/ownlist.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 
diff --git a/binfilter/inc/bf_tools/ownlist.hxx b/binfilter/inc/bf_tools/ownlist.hxx
new file mode 100644
index 0000000..0447b80
--- /dev/null
+++ b/binfilter/inc/bf_tools/ownlist.hxx
@@ -0,0 +1,98 @@
+/* -*- 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>
+
+namespace binfilter {
+/*************************************************************************
+*************************************************************************/
+
+#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