[Libreoffice-commits] .: 3 commits - binfilter/bf_basic binfilter/bf_sd binfilter/bf_svtools binfilter/bf_svx binfilter/inc
Michael Stahl
mst at kemper.freedesktop.org
Wed Aug 8 11:48:34 PDT 2012
binfilter/bf_basic/source/basmgr/basmgr.cxx | 2
binfilter/bf_sd/source/core/sd_cusshow.cxx | 2
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx | 2
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx | 2
binfilter/bf_svtools/source/items1/svt_slstitm.cxx | 2
binfilter/bf_svtools/source/memtools/tl_contnr.cxx | 26 ++++
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 2
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx | 2
binfilter/bf_svx/source/outliner/svx_outliner.cxx | 2
binfilter/inc/bf_sc/global.hxx | 2
binfilter/inc/bf_sd/cusshow.hxx | 2
binfilter/inc/bf_sd/sdpage.hxx | 2
binfilter/inc/bf_sd/stlpool.hxx | 2
binfilter/inc/bf_so3/ref.hxx | 2
binfilter/inc/bf_starmath/dynary.hxx | 4
binfilter/inc/bf_svtools/cntnrsrt.hxx | 2
binfilter/inc/bf_svtools/imap.hxx | 2
binfilter/inc/bf_svtools/svdde.hxx | 2
binfilter/inc/bf_svx/svdetc.hxx | 2
binfilter/inc/bf_svx/svdglue.hxx | 2
binfilter/inc/bf_svx/svdhdl.hxx | 2
binfilter/inc/bf_svx/svdhlpln.hxx | 2
binfilter/inc/bf_svx/svdlayer.hxx | 2
binfilter/inc/bf_svx/svdmark.hxx | 2
binfilter/inc/bf_svx/svdundo.hxx | 2
binfilter/inc/bf_svx/xtable.hxx | 2
binfilter/inc/bf_tools/contnr.hxx | 2
binfilter/inc/bf_tools/list.hxx | 71 +++++++++++
binfilter/inc/bf_tools/ownlist.hxx | 2
29 files changed, 126 insertions(+), 27 deletions(-)
New commits:
commit d9d28e0fc77470eb9621bd53d98ae682dc520b65
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Aug 8 20:40:42 2012 +0200
copy tools/list.hxx to binfilter
Change-Id: I445e58707b562ffdbebfd55b7de0657f7167aee2
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index d9453b8..b7372a4 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -29,7 +29,7 @@
#include <sot/storinfo.hxx>
#include <bf_svtools/pathoptions.hxx>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <sbmod.hxx>
diff --git a/binfilter/bf_sd/source/core/sd_cusshow.cxx b/binfilter/bf_sd/source/core/sd_cusshow.cxx
index 5bfd47a..fad516c 100644
--- a/binfilter/bf_sd/source/core/sd_cusshow.cxx
+++ b/binfilter/bf_sd/source/core/sd_cusshow.cxx
@@ -27,7 +27,7 @@
#include "sdpage.hxx"
#include "drawdoc.hxx"
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
// #90477#
#include <tools/tenccvt.hxx>
namespace binfilter {
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index 5db698a..eaaaa3f 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -24,7 +24,7 @@
#include <comphelper/processfactory.hxx>
#include <ucbhelper/content.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <tools/urlobj.hxx>
#include <vcl/salctype.hxx>
#include <vcl/pngread.hxx>
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index 9b35135..d0ef560 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -31,7 +31,7 @@
#include <sot/object.hxx>
#include <boost/shared_ptr.hpp>
#include <tools/debug.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
diff --git a/binfilter/bf_svtools/source/items1/svt_slstitm.cxx b/binfilter/bf_svtools/source/items1/svt_slstitm.cxx
index e951e31..be2791e 100644
--- a/binfilter/bf_svtools/source/items1/svt_slstitm.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_slstitm.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <tools/stream.hxx>
namespace binfilter
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index 643e73c..a769652 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -27,7 +27,7 @@
************************************************************************/
#include <tools/debug.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <unotools/charclass.hxx>
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 56637e3..271f6aa 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -36,7 +36,7 @@
#include <bf_svtools/whiter.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include "scene3d.hxx"
diff --git a/binfilter/bf_svx/source/outliner/svx_outliner.cxx b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
index 96b98c6..b64e8fa 100644
--- a/binfilter/bf_svx/source/outliner/svx_outliner.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
@@ -52,7 +52,7 @@
#include "lrspitem.hxx"
#include <bf_svtools/undo.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_sc/global.hxx b/binfilter/inc/bf_sc/global.hxx
index 539c789..c6fd7a2 100644
--- a/binfilter/inc/bf_sc/global.hxx
+++ b/binfilter/inc/bf_sc/global.hxx
@@ -24,7 +24,7 @@
#include <bf_tools/string.hxx>
#include <i18npool/lang.h>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <tools/stream.hxx>
#include <osl/endian.h>
namespace com { namespace sun { namespace star { namespace lang {
diff --git a/binfilter/inc/bf_sd/cusshow.hxx b/binfilter/inc/bf_sd/cusshow.hxx
index 2dddc27..fc6ea19 100644
--- a/binfilter/inc/bf_sd/cusshow.hxx
+++ b/binfilter/inc/bf_sd/cusshow.hxx
@@ -21,7 +21,7 @@
#define _SD_CUSSHOW_HXX
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <tools/stream.hxx>
#include <cppuhelper/weakref.hxx>
diff --git a/binfilter/inc/bf_sd/sdpage.hxx b/binfilter/inc/bf_sd/sdpage.hxx
index e3619db..cfa3218 100644
--- a/binfilter/inc/bf_sd/sdpage.hxx
+++ b/binfilter/inc/bf_sd/sdpage.hxx
@@ -33,7 +33,7 @@
#ifndef _PRESENTATION
#include <bf_sd/pres.hxx>
#endif
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
namespace binfilter {
class SfxStyleSheet;
diff --git a/binfilter/inc/bf_sd/stlpool.hxx b/binfilter/inc/bf_sd/stlpool.hxx
index a5451c8..82448d2 100644
--- a/binfilter/inc/bf_sd/stlpool.hxx
+++ b/binfilter/inc/bf_sd/stlpool.hxx
@@ -22,7 +22,7 @@
#include <bf_svtools/style.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
namespace binfilter {
class SdStyleSheet;
diff --git a/binfilter/inc/bf_so3/ref.hxx b/binfilter/inc/bf_so3/ref.hxx
index 43bab15..2425aa4 100644
--- a/binfilter/inc/bf_so3/ref.hxx
+++ b/binfilter/inc/bf_so3/ref.hxx
@@ -19,7 +19,7 @@
#ifndef _BF_REF_HXX
#define _BF_REF_HXX
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <vector>
/************************** S v R e f L i s t ****************************/
diff --git a/binfilter/inc/bf_svtools/imap.hxx b/binfilter/inc/bf_svtools/imap.hxx
index 5f8a812..9f4dd5f 100644
--- a/binfilter/inc/bf_svtools/imap.hxx
+++ b/binfilter/inc/bf_svtools/imap.hxx
@@ -24,7 +24,7 @@
#include <bf_tools/string.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <tools/stream.hxx>
class Point;
diff --git a/binfilter/inc/bf_svtools/svdde.hxx b/binfilter/inc/bf_svtools/svdde.hxx
index 9b9fe52..0bfca04 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -26,7 +26,7 @@
#include <sot/exchange.hxx>
#include <bf_tools/string.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <tools/link.hxx>
// ----------------
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index a6dd942..f8750f6 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -39,7 +39,7 @@
#include <bf_svx/xlnasit.hxx>
#include <tools/color.hxx>
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
#include <bf_tools/string.hxx>
diff --git a/binfilter/inc/bf_tools/list.hxx b/binfilter/inc/bf_tools/list.hxx
new file mode 100644
index 0000000..d4b205c
--- /dev/null
+++ b/binfilter/inc/bf_tools/list.hxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef BF_LIST_HXX
+#define BF_LIST_HXX
+
+#include <bf_tools/contnr.hxx>
+
+// --------
+// - List -
+// --------
+
+#define LIST_APPEND CONTAINER_APPEND
+#define LIST_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
+
+namespace binfilter {
+
+class List : private Container
+{
+public:
+ using Container::Insert;
+ using Container::Remove;
+ using Container::Replace;
+ using Container::Clear;
+ using Container::Count;
+ using Container::GetCurObject;
+ using Container::GetCurPos;
+ using Container::GetObject;
+ using Container::GetPos;
+ using Container::Seek;
+ using Container::First;
+ using Container::Last;
+ using Container::Next;
+ using Container::Prev;
+
+ List( sal_uInt16 _nInitSize = 16, sal_uInt16 _nReSize = 16 ) :
+ Container( 1024, _nInitSize, _nReSize ) {}
+ List( sal_uInt16 _nBlockSize, sal_uInt16 _nInitSize, sal_uInt16 _nReSize ) :
+ Container( _nBlockSize, _nInitSize, _nReSize ) {}
+ List( const List& rList ) : Container( rList ) {}
+
+ List& operator =( const List& rList )
+ { Container::operator =( rList ); return *this; }
+
+ sal_Bool operator ==( const List& rList ) const
+ { return Container::operator ==( rList ); }
+ sal_Bool operator !=( const List& rList ) const
+ { return Container::operator !=( rList ); }
+};
+
+} // namespace binfilter
+
+#endif // _LIST_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_tools/ownlist.hxx b/binfilter/inc/bf_tools/ownlist.hxx
index d958ae1..06c65fa 100644
--- a/binfilter/inc/bf_tools/ownlist.hxx
+++ b/binfilter/inc/bf_tools/ownlist.hxx
@@ -20,7 +20,7 @@
#ifndef _TOOLS_OWNLIST_HXX
#define _TOOLS_OWNLIST_HXX
-#include <tools/list.hxx>
+#include <bf_tools/list.hxx>
namespace binfilter {
/*************************************************************************
commit cb9a39e6e40ceb264702018b590837077d27874f
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Aug 8 20:32:25 2012 +0200
use binfilter's Container copy
Change-Id: Iccb94f37e47e244b200a0d50c6e4f9203e283635
diff --git a/binfilter/inc/bf_starmath/dynary.hxx b/binfilter/inc/bf_starmath/dynary.hxx
index 6850de8..5e6e60b 100644
--- a/binfilter/inc/bf_starmath/dynary.hxx
+++ b/binfilter/inc/bf_starmath/dynary.hxx
@@ -21,7 +21,7 @@
#define _DYNARY_HXX
#include <tools/solar.h>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
// ------------
// - DynArray -
@@ -29,7 +29,7 @@
#define DYNARRAY_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-class DynArray : private Container
+class DynArray : private binfilter::Container
{
public:
using Container::SetSize;
diff --git a/binfilter/inc/bf_svtools/cntnrsrt.hxx b/binfilter/inc/bf_svtools/cntnrsrt.hxx
index 42b30e2..932e4bd 100644
--- a/binfilter/inc/bf_svtools/cntnrsrt.hxx
+++ b/binfilter/inc/bf_svtools/cntnrsrt.hxx
@@ -21,7 +21,7 @@
#include <bf_svtools/bf_solar.h>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/svdetc.hxx b/binfilter/inc/bf_svx/svdetc.hxx
index 4aa214a..6ba05df 100644
--- a/binfilter/inc/bf_svx/svdetc.hxx
+++ b/binfilter/inc/bf_svx/svdetc.hxx
@@ -24,7 +24,7 @@
#include <bf_tools/string.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <vcl/outdev.hxx>
diff --git a/binfilter/inc/bf_svx/svdglue.hxx b/binfilter/inc/bf_svx/svdglue.hxx
index 7c7159b..b46372c 100644
--- a/binfilter/inc/bf_svx/svdglue.hxx
+++ b/binfilter/inc/bf_svx/svdglue.hxx
@@ -28,7 +28,7 @@ class SvStream;
namespace binfilter {
class SdrObject;
}//end of namespace binfilter
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <tools/gen.hxx>
namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/inc/bf_svx/svdhdl.hxx b/binfilter/inc/bf_svx/svdhdl.hxx
index 5a9a072..ebef0e9 100644
--- a/binfilter/inc/bf_svx/svdhdl.hxx
+++ b/binfilter/inc/bf_svx/svdhdl.hxx
@@ -26,7 +26,7 @@
#include <vcl/pointr.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <bf_svx/svdoedge.hxx>
diff --git a/binfilter/inc/bf_svx/svdhlpln.hxx b/binfilter/inc/bf_svx/svdhlpln.hxx
index 690ae77..c61d246 100644
--- a/binfilter/inc/bf_svx/svdhlpln.hxx
+++ b/binfilter/inc/bf_svx/svdhlpln.hxx
@@ -25,7 +25,7 @@
#include <tools/gen.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
class OutputDevice;
namespace binfilter {
diff --git a/binfilter/inc/bf_svx/svdlayer.hxx b/binfilter/inc/bf_svx/svdlayer.hxx
index 7693a3c..ea2bba5 100644
--- a/binfilter/inc/bf_svx/svdlayer.hxx
+++ b/binfilter/inc/bf_svx/svdlayer.hxx
@@ -23,7 +23,7 @@
#include <bf_svtools/bf_solar.h>
#include <bf_tools/string.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <tools/stream.hxx>
#include <bf_svx/svdsob.hxx>
#include <bf_svx/svdtypes.hxx> // fuer typedef SdrLayerID
diff --git a/binfilter/inc/bf_svx/svdmark.hxx b/binfilter/inc/bf_svx/svdmark.hxx
index 200f076..21e5376 100644
--- a/binfilter/inc/bf_svx/svdmark.hxx
+++ b/binfilter/inc/bf_svx/svdmark.hxx
@@ -22,7 +22,7 @@
#include <bf_svtools/bf_solar.h>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <bf_tools/string.hxx>
class Rectangle;
diff --git a/binfilter/inc/bf_svx/svdundo.hxx b/binfilter/inc/bf_svx/svdundo.hxx
index b9c5de7..3f56e40 100644
--- a/binfilter/inc/bf_svx/svdundo.hxx
+++ b/binfilter/inc/bf_svx/svdundo.hxx
@@ -22,7 +22,7 @@
#include <bf_svtools/bf_solar.h>
#include <bf_svtools/undo.hxx>
-#include <tools/contnr.hxx>
+#include <bf_tools/contnr.hxx>
#include <tools/gen.hxx>
#include <bf_svx/svdtypes.hxx> // fuer enum RepeatFuncts
#include <tools/debug.hxx>
commit b3c68592d40cf969af545b4e7c51904b9fdbd897
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Aug 8 20:28:21 2012 +0200
Revert "callcatcher: strip Container down"
This reverts commit baa2838ed4a0d1a9dd4b2ff88e5e033a37bf31cd.
Actually used binfilter, where it currently still uses tools/contnr.hxx
diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index 9e7e441..b86680c 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -779,6 +779,17 @@ void Container::ImpInsert( void* p, CBlock* pBlock, sal_uInt16 nIndex )
|*
*************************************************************************/
+void Container::Insert( void* p )
+{
+ ImpInsert( p, pCurBlock, nCurIndex );
+}
+
+/*************************************************************************
+|*
+|* Container::Insert()
+|*
+*************************************************************************/
+
void Container::Insert( void* p, sal_uIntPtr nIndex )
{
if ( nCount <= nIndex )
@@ -883,6 +894,21 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16 nIndex )
|*
*************************************************************************/
+void* Container::Remove()
+{
+ // Wenn kein Item vorhanden ist, NULL zurueckgeben
+ if ( !nCount )
+ return NULL;
+ else
+ return ImpRemove( pCurBlock, nCurIndex );
+}
+
+/*************************************************************************
+|*
+|* Container::Remove()
+|*
+*************************************************************************/
+
void* Container::Remove( sal_uIntPtr nIndex )
{
// Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
diff --git a/binfilter/inc/bf_tools/contnr.hxx b/binfilter/inc/bf_tools/contnr.hxx
index 5e0da55..eda287d 100644
--- a/binfilter/inc/bf_tools/contnr.hxx
+++ b/binfilter/inc/bf_tools/contnr.hxx
@@ -70,8 +70,10 @@ public:
Container( const Container& rContainer );
~Container();
+ void Insert( void* p );
void Insert( void* p, sal_uIntPtr nIndex );
+ void* Remove();
void* Remove( sal_uIntPtr nIndex );
void* Remove( void* p )
{ return Remove( GetPos( p ) ); }
More information about the Libreoffice-commits
mailing list