diff options
Diffstat (limited to 'winaccessibility')
-rw-r--r-- | winaccessibility/Library_winaccessibility.mk | 1 | ||||
-rw-r--r-- | winaccessibility/inc/AccResource.hxx | 66 | ||||
-rw-r--r-- | winaccessibility/source/service/AccObject.cxx | 1 | ||||
-rw-r--r-- | winaccessibility/source/service/AccResource.cxx | 74 |
4 files changed, 0 insertions, 142 deletions
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk index 8ee963919832..1eb14246294c 100644 --- a/winaccessibility/Library_winaccessibility.mk +++ b/winaccessibility/Library_winaccessibility.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_exception_objects,winaccessibility,\ winaccessibility/source/service/AccTreeEventListener \ winaccessibility/source/service/AccTopWindowListener \ winaccessibility/source/service/msaaservice_impl \ - winaccessibility/source/service/AccResource \ )) $(eval $(call gb_Library_use_externals,winaccessibility,\ diff --git a/winaccessibility/inc/AccResource.hxx b/winaccessibility/inc/AccResource.hxx deleted file mode 100644 index 1eade13f70c9..000000000000 --- a/winaccessibility/inc/AccResource.hxx +++ /dev/null @@ -1,66 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX -#define INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX - -#include <rtl/ustring.hxx> - -class SimpleResMgr; - -#define ACC_RES_STRING(id) ResourceManager::loadString(id) - - -//= ResourceManager -//= handling resources within the FormLayer library - -class ResourceManager -{ - static SimpleResMgr* m_pImpl; - -private: - // no instantiation allowed - ResourceManager() - { } - ~ResourceManager() - { } - - // we'll instantiate one static member of the following class, which, in its dtor, - // ensures that m_pImpl will be deleted - class EnsureDelete - { - public: - EnsureDelete() - { } - ~EnsureDelete(); - }; - friend class EnsureDelete; - -protected: - static void ensureImplExists(); - -public: - /** loads the string with the specified resource id from the FormLayer resource file - */ - static ::rtl::OUString loadString(sal_uInt16 _nResId); -}; - -#endif // INCLUDED_WINACCESSIBILITY_INC_ACCRESOURCE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index a80db3bd2d0b..1ac198ea89f4 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -32,7 +32,6 @@ #include "AccObject.hxx" #include "AccEventListener.hxx" -#include "AccResource.hxx" #if defined __clang__ #pragma clang diagnostic push diff --git a/winaccessibility/source/service/AccResource.cxx b/winaccessibility/source/service/AccResource.cxx deleted file mode 100644 index a7575de38d7c..000000000000 --- a/winaccessibility/source/service/AccResource.cxx +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "AccResource.hxx" - -#include <tools/simplerm.hxx> - -// ---- needed as long as we have no contexts for components --- -#include <vcl/svapp.hxx> - - -//= ResourceManager - -SimpleResMgr* ResourceManager::m_pImpl = nullptr; - - -ResourceManager::EnsureDelete::~EnsureDelete() -{ - delete ResourceManager::m_pImpl; -} - - -void ResourceManager::ensureImplExists() -{ - //Comment the following code because the acc resource is not necessary now. Can open them if necessary - /* - if (m_pImpl) - return; - - LanguageType nType = Application::GetSettings().GetUILanguage(); - - ByteString sFileName("winaccessibility"); - sFileName += ByteString::CreateFromInt32( (sal_Int32)SOLARUPD ); - - m_pImpl = SimpleResMgr::Create(sFileName.GetBuffer(), nType); - - if (m_pImpl) - { - // no that we have a impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClas; - } - */ -} - - -::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId) -{ - ::rtl::OUString sReturn; - - ensureImplExists(); - if (m_pImpl) - sReturn = m_pImpl->ReadString(_nResId); - - return sReturn; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |