From 33cbf8066bc64c3ff2052f59c04838aceb847220 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Fri, 4 Nov 2011 20:10:38 -0700 Subject: Cleanup basegfx headers a little I deleted some unused headers. I also stopped exporting them for the same reason. --- basegfx/inc/basegfx/range/b3dvolume.hxx | 45 ------ basegfx/inc/basegfx/range/b3ibox.hxx | 261 -------------------------------- basegfx/inc/basegfx/range/b3ivolume.hxx | 45 ------ basegfx/inc/basegfx/vector/b3dsize.hxx | 45 ------ basegfx/inc/basegfx/vector/b3isize.hxx | 45 ------ 5 files changed, 441 deletions(-) delete mode 100644 basegfx/inc/basegfx/range/b3dvolume.hxx delete mode 100644 basegfx/inc/basegfx/range/b3ibox.hxx delete mode 100644 basegfx/inc/basegfx/range/b3ivolume.hxx delete mode 100644 basegfx/inc/basegfx/vector/b3dsize.hxx delete mode 100644 basegfx/inc/basegfx/vector/b3isize.hxx (limited to 'basegfx/inc/basegfx') diff --git a/basegfx/inc/basegfx/range/b3dvolume.hxx b/basegfx/inc/basegfx/range/b3dvolume.hxx deleted file mode 100644 index 50cac5188271..000000000000 --- a/basegfx/inc/basegfx/range/b3dvolume.hxx +++ /dev/null @@ -1,45 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_RANGE_B3DBOX_HXX -#define _BGFX_RANGE_B3DBOX_HXX - -#include - -namespace basegfx -{ - // syntactic sugar: a B3DRange exactly models a Volume in 3D, thus, - // for interface clarity, we provide an alias name - - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3DRange B3DVolume; -} - -#endif /* _BGFX_RANGE_B3DBOX_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/inc/basegfx/range/b3ibox.hxx b/basegfx/inc/basegfx/range/b3ibox.hxx deleted file mode 100644 index 32f021f5c8b9..000000000000 --- a/basegfx/inc/basegfx/range/b3ibox.hxx +++ /dev/null @@ -1,261 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_RANGE_B3IBOX_HXX -#define _BGFX_RANGE_B3IBOX_HXX - -#include -#include -#include -#include -#include -#include - -namespace basegfx -{ - class B3IBox - { - BasicBox maRangeX; - BasicBox maRangeY; - BasicBox maRangeZ; - - public: - B3IBox() {} - - explicit B3IBox(const B3ITuple& rTuple) : - maRangeX(rTuple.getX()), - maRangeY(rTuple.getY()), - maRangeZ(rTuple.getZ()) - { - } - - B3IBox(sal_Int32 x1, - sal_Int32 y1, - sal_Int32 z1, - sal_Int32 x2, - sal_Int32 y2, - sal_Int32 z2) : - maRangeX(x1), - maRangeY(y1), - maRangeZ(z1) - { - maRangeX.expand(x2); - maRangeY.expand(y2); - maRangeZ.expand(z2); - } - - B3IBox(const B3ITuple& rTuple1, - const B3ITuple& rTuple2) : - maRangeX(rTuple1.getX()), - maRangeY(rTuple1.getY()), - maRangeZ(rTuple1.getZ()) - { - expand(rTuple2); - } - - B3IBox(const B3IBox& rBox) : - maRangeX(rBox.maRangeX), - maRangeY(rBox.maRangeY), - maRangeZ(rBox.maRangeZ) - { - } - - bool isEmpty() const - { - return maRangeX.isEmpty() || maRangeY.isEmpty() || maRangeZ.isEmpty(); - } - - void reset() - { - maRangeX.reset(); - maRangeY.reset(); - maRangeZ.reset(); - } - - bool operator==( const B3IBox& rBox ) const - { - return (maRangeX == rBox.maRangeX - && maRangeY == rBox.maRangeY - && maRangeZ == rBox.maRangeZ); - } - - bool operator!=( const B3IBox& rBox ) const - { - return (maRangeX != rBox.maRangeX - || maRangeY != rBox.maRangeY - || maRangeZ != rBox.maRangeZ); - } - - void operator=(const B3IBox& rBox) - { - maRangeX = rBox.maRangeX; - maRangeY = rBox.maRangeY; - maRangeZ = rBox.maRangeZ; - } - - sal_Int32 getMinX() const - { - return maRangeX.getMinimum(); - } - - sal_Int32 getMinY() const - { - return maRangeY.getMinimum(); - } - - sal_Int32 getMinZ() const - { - return maRangeZ.getMinimum(); - } - - sal_Int32 getMaxX() const - { - return maRangeX.getMaximum(); - } - - sal_Int32 getMaxY() const - { - return maRangeY.getMaximum(); - } - - sal_Int32 getMaxZ() const - { - return maRangeZ.getMaximum(); - } - - sal_Int64 getWidth() const - { - return maRangeX.getRange(); - } - - sal_Int64 getHeight() const - { - return maRangeY.getRange(); - } - - sal_Int64 getDepth() const - { - return maRangeZ.getRange(); - } - - B3IPoint getMinimum() const - { - return B3IPoint( - maRangeX.getMinimum(), - maRangeY.getMinimum(), - maRangeZ.getMinimum() - ); - } - - B3IPoint getMaximum() const - { - return B3IPoint( - maRangeX.getMaximum(), - maRangeY.getMaximum(), - maRangeZ.getMaximum() - ); - } - - B3I64Tuple getRange() const - { - return B3I64Tuple( - maRangeX.getRange(), - maRangeY.getRange(), - maRangeZ.getRange() - ); - } - - B3DPoint getCenter() const - { - return B3DPoint( - maRangeX.getCenter(), - maRangeY.getCenter(), - maRangeZ.getCenter() - ); - } - - bool isInside(const B3ITuple& rTuple) const - { - return ( - maRangeX.isInside(rTuple.getX()) - && maRangeY.isInside(rTuple.getY()) - && maRangeZ.isInside(rTuple.getZ()) - ); - } - - bool isInside(const B3IBox& rBox) const - { - return ( - maRangeX.isInside(rBox.maRangeX) - && maRangeY.isInside(rBox.maRangeY) - && maRangeZ.isInside(rBox.maRangeZ) - ); - } - - bool overlaps(const B3IBox& rBox) const - { - return ( - maRangeX.overlaps(rBox.maRangeX) - && maRangeY.overlaps(rBox.maRangeY) - && maRangeZ.overlaps(rBox.maRangeZ) - ); - } - - void expand(const B3ITuple& rTuple) - { - maRangeX.expand(rTuple.getX()); - maRangeY.expand(rTuple.getY()); - maRangeZ.expand(rTuple.getZ()); - } - - void expand(const B3IBox& rBox) - { - maRangeX.expand(rBox.maRangeX); - maRangeY.expand(rBox.maRangeY); - maRangeZ.expand(rBox.maRangeZ); - } - - void intersect(const B3IBox& rBox) - { - maRangeX.intersect(rBox.maRangeX); - maRangeY.intersect(rBox.maRangeY); - maRangeZ.intersect(rBox.maRangeZ); - } - - void grow(sal_Int32 nValue) - { - maRangeX.grow(nValue); - maRangeY.grow(nValue); - maRangeZ.grow(nValue); - } - }; -} // end of namespace basegfx - -#endif /* _BGFX_RANGE_B3IBOX_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/inc/basegfx/range/b3ivolume.hxx b/basegfx/inc/basegfx/range/b3ivolume.hxx deleted file mode 100644 index 67fe3d2959f6..000000000000 --- a/basegfx/inc/basegfx/range/b3ivolume.hxx +++ /dev/null @@ -1,45 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_RANGE_B3IBOX_HXX -#define _BGFX_RANGE_B3IBOX_HXX - -#include - -namespace basegfx -{ - // syntactic sugar: a B3IRange exactly models a Box in 3D, thus, - // for interface clarity, we provide an alias name - - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3IRange B3IBox; -} - -#endif /* _BGFX_RANGE_B3IBOX_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/inc/basegfx/vector/b3dsize.hxx b/basegfx/inc/basegfx/vector/b3dsize.hxx deleted file mode 100644 index 757314cadcf1..000000000000 --- a/basegfx/inc/basegfx/vector/b3dsize.hxx +++ /dev/null @@ -1,45 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_VECTOR_B3DSIZE_HXX -#define _BGFX_VECTOR_B3DSIZE_HXX - -#include - -namespace basegfx -{ - // syntactic sugar: a B3DVector exactly models a Size3D object, - // thus, for interface clarity, we provide an alias name - - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3DVector B3DSize; -} - -#endif /* _BGFX_VECTOR_B3DSIZE_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basegfx/inc/basegfx/vector/b3isize.hxx b/basegfx/inc/basegfx/vector/b3isize.hxx deleted file mode 100644 index 5aa85d904751..000000000000 --- a/basegfx/inc/basegfx/vector/b3isize.hxx +++ /dev/null @@ -1,45 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _BGFX_VECTOR_B3ISIZE_HXX -#define _BGFX_VECTOR_B3ISIZE_HXX - -#include - -namespace basegfx -{ - // syntactic sugar: a B3IVector exactly models a Size3D object, - // thus, for interface clarity, we provide an alias name - - /// Alias name for interface clarity (not everybody is aware of the identity) - typedef B3IVector B3ISize; -} - -#endif /* _BGFX_VECTOR_B3ISIZE_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3