diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:17:26 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:17:26 +0000 |
| commit | 7c16d5830f3bd35e28e837db948853f991de2e57 (patch) | |
| tree | 0985715f2817160cd0af62f121cead6628a9b545 /basegfx | |
| parent | 6c1630289534477ab1503bdd1d32cd8a95459d75 (diff) | |
INTEGRATION: CWS tune04 (1.2.26); FILE MERGED
2004/06/15 07:23:32 cmc 1.2.26.1: #i29636# turn global objects into local static data protected with swishy double-locked templated template
Diffstat (limited to 'basegfx')
| -rw-r--r-- | basegfx/inc/basegfx/tuple/b3i64tuple.hxx | 14 | ||||
| -rw-r--r-- | basegfx/inc/basegfx/tuple/b3ituple.hxx | 14 |
2 files changed, 8 insertions, 20 deletions
diff --git a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx index c65ff8eab44d..7ca300a4e6ff 100644 --- a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx +++ b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b3i64tuple.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: thb $ $Date: 2004-02-16 17:03:09 $ + * last change: $Author: hjs $ $Date: 2004-06-25 17:17:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,9 +83,6 @@ namespace basegfx */ class B3I64Tuple { - private: - static B3I64Tuple maEmptyTuple; - protected: sal_Int64 mnX; sal_Int64 mnY; @@ -248,7 +245,7 @@ namespace basegfx bool equalZero() const { - return (this == &maEmptyTuple || + return (this == &getEmptyTuple() || (mnX == 0 && mnY == 0 && mnZ == 0)); } @@ -270,10 +267,7 @@ namespace basegfx return *this; } - static const B3I64Tuple& getEmptyTuple() - { - return maEmptyTuple; - } + static const B3I64Tuple& getEmptyTuple(); }; // external operators diff --git a/basegfx/inc/basegfx/tuple/b3ituple.hxx b/basegfx/inc/basegfx/tuple/b3ituple.hxx index 8b14726f6c19..1e10ba1a273a 100644 --- a/basegfx/inc/basegfx/tuple/b3ituple.hxx +++ b/basegfx/inc/basegfx/tuple/b3ituple.hxx @@ -2,9 +2,9 @@ * * $RCSfile: b3ituple.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: thb $ $Date: 2004-02-16 17:03:09 $ + * last change: $Author: hjs $ $Date: 2004-06-25 17:17:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,9 +83,6 @@ namespace basegfx */ class B3ITuple { - private: - static B3ITuple maEmptyTuple; - protected: sal_Int32 mnX; sal_Int32 mnY; @@ -248,7 +245,7 @@ namespace basegfx bool equalZero() const { - return (this == &maEmptyTuple || + return (this == &getEmptyTuple() || (mnX == 0 && mnY == 0 && mnZ == 0)); } @@ -270,10 +267,7 @@ namespace basegfx return *this; } - static const B3ITuple& getEmptyTuple() - { - return maEmptyTuple; - } + static const B3ITuple& getEmptyTuple(); }; // external operators |