[PATCH] remove dead class SfxPtrAr and it's header sfx/inc/sfx2/mina...
Noel Grandin (via Code Review)
gerrit at gerrit.libreoffice.org
Mon Apr 15 06:42:11 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3399
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3399/1
remove dead class SfxPtrAr and it's header sfx/inc/sfx2/minarray.hxx
Change-Id: I23c9f905e6f679299f95baa6d8d4bafa97a3f19a
---
M cui/source/inc/acccfg.hxx
M cui/source/inc/cfg.hxx
M cui/source/inc/selector.hxx
M sfx2/Library_sfx.mk
M sfx2/Package_inc.mk
M sfx2/inc/arrdecl.hxx
M sfx2/inc/sfx2/bindings.hxx
D sfx2/inc/sfx2/minarray.hxx
D sfx2/source/bastyp/minarray.cxx
M sfx2/source/control/msgpool.cxx
M sfx2/source/control/objface.cxx
M sfx2/source/dialog/tabdlg.cxx
M sfx2/source/inc/workwin.hxx
13 files changed, 0 insertions(+), 351 deletions(-)
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 19eba29..2354998 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -43,7 +43,6 @@
#include <svtools/treelistbox.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
-#include <sfx2/minarray.hxx>
#include "cfgutil.hxx"
class SfxMacroInfoItem;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 84ecf04..62686df 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <sfx2/minarray.hxx>
#include <sfx2/tabdlg.hxx>
#include <vector>
#include <vcl/msgbox.hxx>
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 4c14e99..40c8a64 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include <sfx2/minarray.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#define SVX_CFGGROUP_FUNCTION 1
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 98adaa9..cf0ed52 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -122,7 +122,6 @@
sfx2/source/bastyp/frmhtmlw \
sfx2/source/bastyp/helper \
sfx2/source/bastyp/mieclip \
- sfx2/source/bastyp/minarray \
sfx2/source/bastyp/progress \
sfx2/source/bastyp/sfxhtml \
sfx2/source/bastyp/sfxresid \
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 4c08af5..0b49d4b 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -72,7 +72,6 @@
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx))
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 04ea256..0cfdf60 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -19,7 +19,6 @@
#ifndef _SFX_ARRDECL_HXX
#define _SFX_ARRDECL_HXX
-#include <sfx2/minarray.hxx>
#include <vector>
class SfxObjectShell;
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 9479e8f..664673c 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -34,7 +34,6 @@
// some other includes
//________________________________________________________________________________________________________________
-#include <sfx2/minarray.hxx>
#include <sfx2/viewfrm.hxx>
//________________________________________________________________________________________________________________
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
deleted file mode 100644
index 48ea05b..0000000
--- a/sfx2/inc/sfx2/minarray.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- 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 _SFXVARARR_HXX
-#define _SFXVARARR_HXX
-
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
-#include <limits.h>
-#include <string.h>
-#include <tools/solar.h>
-#include <tools/debug.hxx>
-
-class SFX2_DLLPUBLIC SfxPtrArr
-{
-private:
- void** pData;
- sal_uInt16 nUsed;
- sal_uInt8 nGrow;
- sal_uInt8 nUnused;
-public:
- SfxPtrArr( sal_uInt8 nInitSize = 0, sal_uInt8 nGrowSize = 8 );
- SfxPtrArr( const SfxPtrArr& rOrig );
- ~SfxPtrArr();
- SfxPtrArr& operator= ( const SfxPtrArr& rOrig );
- void* GetObject( sal_uInt16 nPos ) const { return operator[](nPos); }
- void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
- void Insert( sal_uInt16 nPos, void* rElem );
- void Append( void* rElem );
- sal_Bool Remove( void* rElem );
- sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
- sal_uInt16 Count() const { return nUsed; }
- inline void** operator*();
- inline void* operator[]( sal_uInt16 nPos ) const;
- inline void*& operator[]( sal_uInt16 nPos );
- sal_Bool Contains( const void* rItem ) const;
- void Clear() { Remove( 0, Count() ); }
-};
-
-inline void** SfxPtrArr::operator*()
-{
- return ( nUsed==0 ? 0 : pData );
-}
-
-inline void* SfxPtrArr::operator[]( sal_uInt16 nPos ) const
-{
- DBG_ASSERT( nPos < nUsed, "" );
- return *(pData+nPos);
-}
-
-inline void*& SfxPtrArr::operator [] (sal_uInt16 nPos)
-{
- DBG_ASSERT( nPos < nUsed, "" );
- return *(pData+nPos);
-}
-
-
-#define DECL_PTRARRAY(ARR, T, nI, nG)\
-class ARR: public SfxPtrArr\
-{\
-public:\
- ARR( sal_uInt8 nIni=nI, sal_uInt8 nGrowValue=nG ):\
- SfxPtrArr(nIni,nGrowValue) \
- {}\
- ARR( const ARR& rOrig ):\
- SfxPtrArr(rOrig) \
- {}\
- T GetObject( sal_uInt16 nPos ) const { return operator[](nPos); } \
- T& GetObject( sal_uInt16 nPos ) { return operator[](nPos); } \
- void Insert( sal_uInt16 nPos, T aElement ) {\
- SfxPtrArr::Insert(nPos,(void *)aElement);\
- }\
- void Append( T aElement ) {\
- SfxPtrArr::Append((void *)aElement);\
- }\
- void Remove( T aElement ) {\
- SfxPtrArr::Remove((void*)aElement);\
- }\
- void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ) {\
- SfxPtrArr::Remove( nPos, nLen ); \
- }\
- T* operator *() {\
- return (T*) SfxPtrArr::operator*();\
- }\
- T operator[]( sal_uInt16 nPos ) const { \
- return (T) SfxPtrArr::operator[](nPos); } \
- T& operator[]( sal_uInt16 nPos ) { \
- return (T&) SfxPtrArr::operator[](nPos); } \
- void Clear() { Remove( 0, Count() ); }\
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
deleted file mode 100644
index 23d2dbe..0000000
--- a/sfx2/source/bastyp/minarray.cxx
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- 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 .
- */
-
-
-#include <sfx2/minarray.hxx>
-
-// -----------------------------------------------------------------------
-
-SfxPtrArr::SfxPtrArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
- nUsed( 0 ),
- nGrow( nGrowSize ? nGrowSize : 1 ),
- nUnused( nInitSize )
-{
- sal_uInt16 nMSCBug = nInitSize;
-
- if ( nMSCBug > 0 )
- pData = new void*[nMSCBug];
- else
- pData = 0;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPtrArr::SfxPtrArr( const SfxPtrArr& rOrig )
-{
- nUsed = rOrig.nUsed;
- nGrow = rOrig.nGrow;
- nUnused = rOrig.nUnused;
-
- if ( rOrig.pData != 0 )
- {
- pData = new void*[nUsed+nUnused];
- memcpy( pData, rOrig.pData, nUsed*sizeof(void*) );
- }
- else
- pData = 0;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPtrArr::~SfxPtrArr()
-{
- delete [] pData;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPtrArr& SfxPtrArr::operator=( const SfxPtrArr& rOrig )
-{
-
- delete [] pData;
-
- nUsed = rOrig.nUsed;
- nGrow = rOrig.nGrow;
- nUnused = rOrig.nUnused;
-
- if ( rOrig.pData != 0 )
- {
- pData = new void*[nUsed+nUnused];
- memcpy( pData, rOrig.pData, nUsed*sizeof(void*) );
- }
- else
- pData = 0;
- return *this;
-}
-
-// -----------------------------------------------------------------------
-
-void SfxPtrArr::Append( void* aElem )
-{
- DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
- // Does the Array need to be copied?
- if ( nUnused == 0 )
- {
- sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
- void** pNewData = new void*[nNewSize];
- if ( pData )
- {
- DBG_ASSERT( nUsed <= nNewSize, "" );
- memcpy( pNewData, pData, sizeof(void*)*nUsed );
- delete [] pData;
- }
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
- pData = pNewData;
- }
-
- // now write at the back in the open space
- pData[nUsed] = aElem;
- ++nUsed;
- --nUnused;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt16 SfxPtrArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
-{
- // Adjust nLen, thus to avoid deleting beyond the end
- nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
-
- // simple problems require simple solutions!
- if ( nLen == 0 )
- return 0;
-
- // Maybe no one will remain
- if ( (nUsed-nLen) == 0 )
- {
- delete [] pData;
- pData = 0;
- nUsed = 0;
- nUnused = 0;
- return nLen;
- }
-
- // Determine whether the array has physically shrunk...
- if ( (nUnused+nLen) >= nGrow )
- {
- // reduce (rounded up) to the next Grow-border
- sal_uInt16 nNewUsed = nUsed-nLen;
- sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
- DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
- "shrink size computation failed" );
- void** pNewData = new void*[nNewSize];
- if ( nPos > 0 )
- {
- DBG_ASSERT( nPos <= nNewSize, "" );
- memcpy( pNewData, pData, sizeof(void*)*nPos );
- }
- if ( nNewUsed != nPos )
- memcpy( pNewData+nPos, pData+nPos+nLen,
- sizeof(void*)*(nNewUsed-nPos) );
- delete [] pData;
- pData = pNewData;
- nUsed = nNewUsed;
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
- return nLen;
- }
-
- // in all other cases, only push together
- if ( nUsed-nPos-nLen > 0 )
- memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(void*) );
- nUsed = nUsed - nLen;
- nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
- return nLen;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SfxPtrArr::Remove( void* aElem )
-{
- // simple tasks ...
- if ( nUsed == 0 )
- return sal_False;
-
- // backwards, since most of the last is first removed
- void* *pIter = pData + nUsed - 1;
- for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
- if ( *pIter == aElem )
- {
- Remove(nUsed-n-1, 1);
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SfxPtrArr::Contains( const void* rItem ) const
-{
- if ( !nUsed )
- return sal_False;
-
- for ( sal_uInt16 n = 0; n < nUsed; ++n )
- {
- void* p = GetObject(n);
- if ( p == rItem )
- return sal_True;
- }
-
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
-{
- DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
- // Does the Array have to be copied?
- if ( nUnused == 0 )
- {
- // increase (rounded up ) to the next Grow-border
- sal_uInt16 nNewSize = nUsed+nGrow;
- void** pNewData = new void*[nNewSize];
-
- if ( pData )
- {
- DBG_ASSERT( nUsed < nNewSize, "" );
- memcpy( pNewData, pData, sizeof(void*)*nUsed );
- delete [] pData;
- }
- nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
- pData = pNewData;
- }
-
- // Now move the rear part
- if ( nPos < nUsed )
- memmove( pData+nPos+1, pData+nPos, (nUsed-nPos)*sizeof(void*) );
-
- // Now write into the free space.
- memmove( pData+nPos, &rElem, sizeof(void*) );
- nUsed += 1;
- nUnused -= 1;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index e8946e1..f7bd1a0 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -23,7 +23,6 @@
// due to pSlotPool
#include "appdata.hxx"
#include <sfx2/msgpool.hxx>
-#include <sfx2/minarray.hxx>
#include <sfx2/msg.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objface.hxx>
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 8b9e0f9..2d48db3 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -28,7 +28,6 @@
#include <sfx2/app.hxx>
#include <sfx2/msgpool.hxx>
#include "sfx2/sfxresid.hxx"
-#include <sfx2/minarray.hxx>
#include <sfx2/objsh.hxx>
#include <rtl/strbuf.hxx>
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index cefa164..cc46328 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -27,7 +27,6 @@
#include "appdata.hxx"
#include "sfxtypes.hxx"
-#include <sfx2/minarray.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/app.hxx>
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 60efbe5..1d83bef 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -35,7 +35,6 @@
#include <sfx2/sfx.hrc>
#include <sfx2/childwin.hxx>
#include <sfx2/shell.hxx>
-#include <sfx2/minarray.hxx>
#include <sfx2/ctrlitem.hxx>
#include <sfx2/viewfrm.hxx>
--
To view, visit https://gerrit.libreoffice.org/3399
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23c9f905e6f679299f95baa6d8d4bafa97a3f19a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin <noelgrandin at gmail.com>
More information about the LibreOffice
mailing list