diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 09:21:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 09:21:44 +0000 |
| commit | c0a1572c5da4b7f735108a0858165c093d46568d (patch) | |
| tree | ebe71cf7693d7e7825843131342786a024b804ee /desktop | |
| parent | 782c688564582235a9c286aee63db91fa3cb4606 (diff) | |
INTEGRATION: CWS cd04 (1.5.32); FILE MERGED
2005/01/19 10:17:50 dbo 1.5.32.1: #i35195##i40553#
- focus takeover
- invalid bootstraprc crash
- resmgr mutex cleanup
Issue number:
Submitted by:
Reviewed by:
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/inc/dp_resource.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index 1c97c4317d5e..7a1905bd5bcc 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -2,9 +2,9 @@ * * $RCSfile: dp_resource.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-12-07 10:52:13 $ + * last change: $Author: rt $ $Date: 2005-01-27 10:21:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,6 @@ #if ! defined INCLUDED_DP_RESOURCE_H #define INCLUDED_DP_RESOURCE_H -#include "vos/mutex.hxx" #include "tools/resmgr.hxx" #include "tools/string.hxx" #include "tools/resid.hxx" @@ -73,9 +72,6 @@ namespace dp_misc { -// xxx todo: remove when PL has inserted res mgr mutex in tools: -extern ::vos::IMutex * g_pResMgrMutex; - //============================================================================== ResId getResId( USHORT id ); @@ -84,8 +80,8 @@ String getResourceString( USHORT id ); template <typename Unique, USHORT id> struct StaticResourceString : - public rtl::StaticWithInit<const rtl::OUString, Unique> { - const rtl::OUString operator () () { return getResourceString(id); } + public ::rtl::StaticWithInit<const ::rtl::OUString, Unique> { + const ::rtl::OUString operator () () { return getResourceString(id); } }; //============================================================================== |