diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-28 05:55:44 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-28 05:55:44 +0000 |
| commit | 8161bc0e4880d2c6019ba28033619a6418a37282 (patch) | |
| tree | 3522219b0f6f1d5ed3d2972490c06ff9d21984c1 /vcl/source/window/split.cxx | |
| parent | 94f55d2e332732706f178e12037bfbab7fc38da7 (diff) | |
INTEGRATION: CWS dclocking (1.12.90); FILE MERGED
2004/10/11 12:50:26 dbo 1.12.90.1: #i35272# revised rtl/instance.hxx
Diffstat (limited to 'vcl/source/window/split.cxx')
| -rw-r--r-- | vcl/source/window/split.cxx | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 52ad538f68fa..4f64e63a4968 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -3,9 +3,9 @@ * * $RCSfile: split.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hjs $ $Date: 2004-06-25 17:09:38 $ + * last change: $Author: pjunck $ $Date: 2004-10-28 06:55:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,26 +95,18 @@ namespace { - struct BlackInstance - { - Wallpaper * operator ()() - { - static Wallpaper instance(COL_BLACK); - return &instance; + struct ImplBlackWall + : public rtl::StaticWithInit<Wallpaper, ImplBlackWall> { + Wallpaper operator () () { + return Wallpaper(COL_BLACK); } }; - - struct WhiteInstance - { - Wallpaper * operator ()() - { - static Wallpaper instance(COL_LIGHTGRAY); - return &instance; + struct ImplWhiteWall + : public rtl::StaticWithInit<Wallpaper, ImplWhiteWall> { + Wallpaper operator () () { + return Wallpaper(COL_LIGHTGRAY); } }; - - struct ImplBlackWall : public rtl::Static< Wallpaper, ImplBlackWall, BlackInstance > {}; - struct ImplWhiteWall : public rtl::Static< Wallpaper, ImplWhiteWall, WhiteInstance > {}; } // ======================================================================= |