summaryrefslogtreecommitdiff
path: root/comphelper
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 /comphelper
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 'comphelper')
-rw-r--r--comphelper/Library_comphelper.mk1
-rw-r--r--comphelper/source/misc/officeresourcebundle.cxx208
2 files changed, 0 insertions, 209 deletions
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index ec5ac9d3240c..6f8b9d07a83a 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/namedvaluecollection \
comphelper/source/misc/numberedcollection \
comphelper/source/misc/numbers \
- comphelper/source/misc/officeresourcebundle \
comphelper/source/misc/officerestartmanager \
comphelper/source/misc/profilezone \
comphelper/source/misc/proxyaggregation \
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
deleted file mode 100644
index 1e7b54433dee..000000000000
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ /dev/null
@@ -1,208 +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 <comphelper/officeresourcebundle.hxx>
-
-#include <com/sun/star/resource/MissingResourceException.hpp>
-#include <com/sun/star/resource/XResourceBundle.hpp>
-#include <com/sun/star/resource/XResourceBundleLoader.hpp>
-#include <osl/mutex.hxx>
-#include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
-
-
-namespace comphelper
-{
-
-
- using ::com::sun::star::uno::Reference;
- using com::sun::star::resource::XResourceBundle;
- using com::sun::star::resource::XResourceBundleLoader;
- using com::sun::star::resource::MissingResourceException;
- using ::com::sun::star::uno::XComponentContext;
- using ::com::sun::star::uno::Exception;
- using ::com::sun::star::uno::Any;
-
- class ResourceBundle_Impl
- {
- private:
- Reference< XComponentContext > m_xContext;
- OUString m_sBaseName;
- Reference< XResourceBundle > m_xBundle;
- bool m_bAttemptedCreate;
- mutable ::osl::Mutex m_aMutex;
-
- public:
- ResourceBundle_Impl( const Reference< XComponentContext >& _context, const OUString& _baseName )
- :m_xContext( _context )
- ,m_sBaseName( _baseName )
- ,m_bAttemptedCreate( false )
- {
- }
-
- public:
- /** loads the string with the given resource id from the resource bundle
- @param _resourceId
- the id of the string to load
- @return
- the requested resource string. If no string with the given id exists in the resource bundle,
- an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
- then.
- */
- OUString loadString( sal_Int32 _resourceId ) const;
-
- /** determines whether the resource bundle has a string with the given id
- @param _resourceId
- the id of the string whose existence is to be checked
- @return
- <TRUE/> if and only if a string with the given ID exists in the resource
- bundle.
- */
- bool hasString( sal_Int32 _resourceId ) const;
-
- private:
- /** loads the bundle represented by the instance
-
- The method is safe against multiple calls: If a previous call succeeded or failed, the
- previous result will be returned, without any other processing.
-
- @precond
- Our mutex is locked.
- */
- bool impl_loadBundle_nothrow();
-
- /** returns the resource bundle key for a string with a given resource id
- */
- static OUString
- impl_getStringResourceKey( sal_Int32 _resourceId );
- };
-
-
- OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId )
- {
- OUStringBuffer key;
- key.append( "string:" );
- key.append( _resourceId );
- return key.makeStringAndClear();
- }
-
-
- OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const
- {
- ::osl::MutexGuard aGuard( m_aMutex );
-
- OUString sString;
-
- if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() )
- {
- try
- {
- OSL_VERIFY( m_xBundle->getByName( impl_getStringResourceKey( _resourceId ) ) >>= sString );
- }
- catch( const Exception& )
- {
- OSL_FAIL( "ResourceBundle_Impl::loadString: caught an exception!" );
- }
- }
- return sString;
- }
-
-
- bool ResourceBundle_Impl::hasString( sal_Int32 _resourceId ) const
- {
- ::osl::MutexGuard aGuard( m_aMutex );
-
- bool has = false;
-
- if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() )
- {
- try
- {
- has = m_xBundle->hasByName( impl_getStringResourceKey( _resourceId ) );
- }
- catch( const Exception& )
- {
- OSL_FAIL( "ResourceBundle_Impl::hasString: caught an exception!" );
- }
- }
- return has;
- }
-
-
- bool ResourceBundle_Impl::impl_loadBundle_nothrow()
- {
- if ( m_bAttemptedCreate )
- return m_xBundle.is();
-
- m_bAttemptedCreate = true;
-
- Reference< XResourceBundleLoader > xLoader;
- try
- {
- Any aValue( m_xContext->getValueByName( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) );
- OSL_VERIFY( aValue >>= xLoader );
- }
- catch( const Exception& )
- {
- OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: could not create the resource loader!" );
- }
-
- if ( !xLoader.is() )
- return false;
-
- try
- {
- m_xBundle = xLoader->loadBundle_Default( m_sBaseName );
- }
- catch( const MissingResourceException& )
- {
- OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: missing the given resource bundle!" );
- }
-
- return m_xBundle.is();
- }
-
-
- OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName )
- :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) )
- {
- }
-
-
- OfficeResourceBundle::~OfficeResourceBundle()
- {
- }
-
-
- OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const
- {
- return m_pImpl->loadString( _resourceId );
- }
-
-
- bool OfficeResourceBundle::hasString( sal_Int32 _resourceId ) const
- {
- return m_pImpl->hasString( _resourceId );
- }
-
-
-} // namespace comphelper
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */