mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS jl49 (1.4.40); FILE MERGED

Browse Source 
2006/12/19 09:47:29 jl 1.4.40.1: #i70481# changes for throbber
This commit is contained in:
Ivo Hinkelmann
2006-12-20 12:54:52 +00:00
parent 4ff34b86be
commit a190102809
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
toolkit/source/helper/tkresmgr.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: tkresmgr.cxx,v $ * $RCSfile: tkresmgr.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 12:23:01 $ * last change: $Author: ihi $ $Date: 2006-12-20 13:54:52 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -43,6 +43,10 @@
#ifndef _TOOLS_SIMPLERESMGR_HXX_ #ifndef _TOOLS_SIMPLERESMGR_HXX_
#include <tools/simplerm.hxx> #include <tools/simplerm.hxx>
#endif #endif
#ifndef _TOOLS_RESMGR_HXX_
#include <tools/resmgr.hxx>
#endif
#ifndef _SV_SVAPP_HXX #ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
@@ -53,20 +57,22 @@
// TkResMgr // TkResMgr
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
SimpleResMgr* TkResMgr::m_pImpl = NULL; SimpleResMgr* TkResMgr::m_pSimpleResMgr = NULL;
ResMgr* TkResMgr::m_pResMgr = NULL;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
TkResMgr::EnsureDelete::~EnsureDelete() TkResMgr::EnsureDelete::~EnsureDelete()
{ {
delete TkResMgr::m_pImpl; delete TkResMgr::m_pSimpleResMgr;
// delete TkResMgr::m_pResMgr;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void TkResMgr::ensureImplExists() void TkResMgr::ensureImplExists()
{ {
if (m_pImpl) if (m_pSimpleResMgr)
return; return;
::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
@@ -74,9 +80,10 @@ void TkResMgr::ensureImplExists()
ByteString sResMgrName( "tk" ); ByteString sResMgrName( "tk" );
sResMgrName += ByteString::CreateFromInt32( (sal_Int32)SUPD ); sResMgrName += ByteString::CreateFromInt32( (sal_Int32)SUPD );
m_pImpl = SimpleResMgr::Create( sResMgrName.GetBuffer(), aLocale ); m_pSimpleResMgr = SimpleResMgr::Create( sResMgrName.GetBuffer(), aLocale );
m_pResMgr = ResMgr::CreateResMgr( sResMgrName.GetBuffer() );
if (m_pImpl) if (m_pSimpleResMgr)
{ {
// now that we have a impl class, make sure it's deleted on unloading the library // now that we have a impl class, make sure it's deleted on unloading the library
static TkResMgr::EnsureDelete s_aDeleteTheImplClass; static TkResMgr::EnsureDelete s_aDeleteTheImplClass;
@@ -84,16 +91,27 @@ void TkResMgr::ensureImplExists()
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::rtl::OUString TkResMgr::loadString( sal_uInt16 nResId ) ::rtl::OUString TkResMgr::loadString( sal_uInt16 nResId )
{ {
::rtl::OUString sReturn; ::rtl::OUString sReturn;
ensureImplExists(); ensureImplExists();
if ( m_pImpl ) if ( m_pSimpleResMgr )
sReturn = m_pImpl->ReadString( nResId ); sReturn = m_pSimpleResMgr->ReadString( nResId );
return sReturn; return sReturn;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
Image TkResMgr::loadImage( sal_uInt16 nResId )
{
Image aReturn;
ensureImplExists();
if ( m_pResMgr )
aReturn = Image( ResId( nResId, m_pResMgr ) );
return aReturn;
}
// -----------------------------------------------------------------------------