diff options
author | Noel Grandin <noel@peralex.com> | 2013-04-15 15:18:43 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-04-16 20:25:41 +0000 |
commit | e2ce3538943c510efa8041fca3c83728acf3a155 (patch) | |
tree | 677ea9ca83afe71c26372e6790aad24148d0a56a /sfx2/inc | |
parent | c6e9926468b1ab7eade9c1afc9e2216dd7c97330 (diff) |
remove dead class SfxPtrAr and it's header sfx/inc/sfx2/minarray.hxx
Change-Id: I23c9f905e6f679299f95baa6d8d4bafa97a3f19a
Reviewed-on: https://gerrit.libreoffice.org/3399
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sfx2/inc')
-rw-r--r-- | sfx2/inc/arrdecl.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/bindings.hxx | 1 | ||||
-rw-r--r-- | sfx2/inc/sfx2/minarray.hxx | 110 |
3 files changed, 0 insertions, 112 deletions
diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index 04ea25633aba..0cfdf6009c7b 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 9479e8f6cb31..664673cf66d5 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 48ea05b27987..000000000000 --- 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: */ |