diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-15 10:30:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-15 10:31:36 +0100 |
| commit | cef6dad4f6539c2fab0e02b24b71a15537f69034 (patch) | |
| tree | 8827f30387848811d4824c3432fd09a925f48e53 /toolkit | |
| parent | Add namespace to accessbility's TkResMgr. (diff) | |
| download | core-cef6dad4f6539c2fab0e02b24b71a15537f69034.tar.gz core-cef6dad4f6539c2fab0e02b24b71a15537f69034.zip | |
Remove unused parts of TkResMgr
Change-Id: I33f6bb8756a3bab054068a73c8e3d71b414ddfe0
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtabpagecontainer.cxx | 1 | ||||
| -rw-r--r-- | toolkit/source/helper/tkresmgr.cxx | 48 |
2 files changed, 2 insertions, 47 deletions
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 928b4bd3d63d..47447d422a96 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -20,6 +20,7 @@ #include <toolkit/awt/vclxtabpagecontainer.hxx> #include <com/sun/star/awt/tab/XTabPageModel.hpp> #include <com/sun/star/awt/XControl.hpp> +#include <vcl/image.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <vcl/svapp.hxx> diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index 5b9fbce8feb0..06d14c83c185 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -18,65 +18,19 @@ */ #include <toolkit/helper/tkresmgr.hxx> -#include <tools/simplerm.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/namedvaluecollection.hxx> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <tools/resmgr.hxx> #include <tools/diagnose_ex.h> -#include <vcl/svapp.hxx> +#include <vcl/image.hxx> using ::com::sun::star::uno::Reference; using ::com::sun::star::graphic::XGraphic; using ::com::sun::star::graphic::XGraphicProvider; using namespace ::com::sun::star; -// ----------------------------------------------------------------------------- -// TkResMgr -// ----------------------------------------------------------------------------- -SimpleResMgr* TkResMgr::m_pSimpleResMgr = NULL; -ResMgr* TkResMgr::m_pResMgr = NULL; - -// ----------------------------------------------------------------------------- - -TkResMgr::EnsureDelete::~EnsureDelete() -{ - delete TkResMgr::m_pSimpleResMgr; -// delete TkResMgr::m_pResMgr; -} - -// ----------------------------------------------------------------------------- - -void TkResMgr::ensureImplExists() -{ - if (m_pSimpleResMgr) - return; - - m_pSimpleResMgr = SimpleResMgr::Create( "tk", Application::GetSettings().GetUILanguageTag() ); - m_pResMgr = ResMgr::CreateResMgr( "tk" ); - - if (m_pSimpleResMgr) - { - // now that we have a impl class, make sure it's deleted on unloading the library - static TkResMgr::EnsureDelete s_aDeleteTheImplClass; - } -} - -// ----------------------------------------------------------------------------- -OUString TkResMgr::loadString( sal_uInt16 nResId ) -{ - OUString sReturn; - - ensureImplExists(); - if ( m_pSimpleResMgr ) - sReturn = m_pSimpleResMgr->ReadString( nResId ); - - return sReturn; -} - -// ----------------------------------------------------------------------------- Image TkResMgr::getImageFromURL( const OUString& i_rImageURL ) { if ( i_rImageURL.isEmpty() ) |