[Libreoffice-commits] .: cui/source editeng/inc starmath/inc starmath/source svtools/source svx/inc tools/inc tools/Package_inc.mk
August Sodora
augsod at kemper.freedesktop.org
Fri Nov 18 20:25:11 PST 2011
cui/source/options/optlingu.cxx | 1
editeng/inc/pch/precompiled_editeng.hxx | 1
starmath/inc/symbol.hxx | 1
starmath/source/math_pch.cxx | 1
svtools/source/filter/wmf/winmtf.hxx | 1
svx/inc/pch/precompiled_svx.hxx | 1
tools/Package_inc.mk | 1
tools/inc/tools/dynary.hxx | 105 --------------------------------
8 files changed, 112 deletions(-)
New commits:
commit 89a783cde071d63120bfa63768b4680dd2e58fee
Author: August Sodora <augsod at gmail.com>
Date: Fri Nov 18 23:24:34 2011 -0500
Removed tools/dynarray.hxx
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 61ce1b2..d716f7f 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -32,7 +32,6 @@
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <tools/shl.hxx>
-#include <tools/dynary.hxx>
#include <i18npool/mslangid.hxx>
#include <unotools/lingucfg.hxx>
#include <editeng/unolingu.hxx>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 81f0cc6..450f381 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -785,7 +785,6 @@
#include "tools/contnr.hxx"
#include "tools/debug.hxx"
#include "tools/diagnose_ex.h"
-#include "tools/dynary.hxx"
#include "tools/errcode.hxx"
#include "tools/errinf.hxx"
#include "tools/fract.hxx"
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index d72df34..21f2c5c 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -30,7 +30,6 @@
#define SYMBOL_HXX
#include <vcl/font.hxx>
-#include <tools/dynary.hxx>
#include <svl/lstner.hxx>
#include <svl/svarray.hxx>
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 0c3e560..e85359b 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -134,7 +134,6 @@
#include <osl/thread.hxx>
#include <osl/thread.h>
#include <vcl/apptypes.hxx>
-#include <tools/dynary.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
#include <sfx2/app.hxx>
diff --git a/svtools/source/filter/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx
index 6dced91..58bb5bf 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -38,7 +38,6 @@
#include <tools/debug.hxx>
#include <tools/stack.hxx>
#include <tools/table.hxx>
-#include <tools/dynary.hxx>
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 19b3034..64d1f7c 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -855,7 +855,6 @@
#include "tools/contnr.hxx"
#include "tools/debug.hxx"
#include "tools/diagnose_ex.h"
-#include "tools/dynary.hxx"
#include "tools/errcode.hxx"
#include "tools/errinf.hxx"
#include "tools/fract.hxx"
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 22f034c..d1ca76b 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx))
diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx
deleted file mode 100644
index 7e17455..0000000
--- a/tools/inc/tools/dynary.hxx
+++ /dev/null
@@ -1,105 +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 _DYNARY_HXX
-#define _DYNARY_HXX
-
-#include <tools/solar.h>
-#include <tools/contnr.hxx>
-
-// ------------
-// - DynArray -
-// ------------
-
-#define DYNARRAY_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-
-class DynArray : private Container
-{
-public:
- using Container::SetSize;
- using Container::GetSize;
- using Container::Clear;
-
- DynArray( sal_uIntPtr nSize = 16 ) : Container( nSize ) {}
- DynArray( const DynArray& rAry ) : Container( rAry ) {}
-
- void* Put( sal_uIntPtr nIndex, void* p )
- { return Container::Replace( p, nIndex ); }
- void* Get( sal_uIntPtr nIndex ) const
- { return Container::GetObject( nIndex ); }
-
- sal_uIntPtr GetIndex( const void* p ) const
- { return Container::GetPos( p ); }
-
- DynArray& operator =( const DynArray& rAry )
- { Container::operator =( rAry ); return *this; }
-
- sal_Bool operator ==( const DynArray& rAry ) const
- { return Container::operator ==( rAry ); }
- sal_Bool operator !=( const DynArray& rAry ) const
- { return Container::operator !=( rAry ); }
-};
-
-// --------------------
-// - DECLARE_DYNARRAY -
-// --------------------
-
-#define DECLARE_DYNARRAY( ClassName, Type ) \
-class ClassName : private DynArray \
-{ \
-public: \
- using DynArray::SetSize; \
- using DynArray::GetSize; \
- using DynArray::Clear; \
- \
- ClassName( sal_uIntPtr nSize = 16 ) : \
- DynArray( nSize ) {} \
- ClassName( const ClassName& rClassName ) : \
- DynArray( rClassName ) {} \
- \
- Type Put( sal_uIntPtr nIndex, Type p ) \
- { return (Type)DynArray::Put( nIndex, (void*)p ); } \
- Type Get( sal_uIntPtr nIndex ) const \
- { return (Type)DynArray::Get( nIndex ); } \
- \
- sal_uIntPtr GetIndex( const Type p ) const \
- { return DynArray::GetIndex( (const void*)p ); } \
- \
- ClassName& operator =( const ClassName& rClassName ) \
- { DynArray::operator =( rClassName ); \
- return *this; } \
- \
- sal_Bool operator ==( const ClassName& rAry ) const \
- { return DynArray::operator ==( rAry ); } \
- sal_Bool operator !=( const ClassName& rAry ) const \
- { return DynArray::operator !=( rAry ); } \
-};
-
-#endif // _DYNARY_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list