summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-11 20:56:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:50 +0100
commit00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
treefd1a9bb264fe15dcc129498e62060ecd256b1ee7 /winaccessibility
parentfa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/Library_winaccessibility.mk1
-rw-r--r--winaccessibility/inc/AccResource.hxx66
-rw-r--r--winaccessibility/source/service/AccObject.cxx1
-rw-r--r--winaccessibility/source/service/AccResource.cxx74
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: */