Skip to content

C
core
Kaydet (Commit) fe969399 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

fdo#37290: allow also access to StringList resources

üst 21cdeb7b
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 33 deletions
extensions/source/resource/ResourceStringIndexAccess.cxx → extensions/source/resource/ResourceIndexAccess.cxx
Dosyayı görüntüle @ fe969399
......@@ -28,8 +28,11 @@
* instead of those above.
*/
#include <ResourceStringIndexAccess.hxx>
#include <ResourceIndexAccess.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/stlunosequence.hxx>
#include <osl/mutex.hxx>
#include <tools/rcid.h>
#include <tools/resary.hxx>
......@@ -39,34 +42,82 @@
using namespace ::extensions::resource;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using ::rtl::OUString;
using ::comphelper::stl_begin;
using ::comphelper::stl_end;
using ::rtl::OString;
using ::rtl::OUString;
using ::rtl::OUStringToOString;
namespace
{
static ::std::auto_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
static ::boost::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
{
if(rArgs.getLength()!=1)
return ::std::auto_ptr<ResMgr>();
return ::boost::shared_ptr<ResMgr>();
OUString sFilename;
rArgs[0] >>= sFilename;
SolarMutexGuard aGuard;
const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding()));
return ::std::auto_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName));
return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName));
}
}
class ResourceIndexAccessBase : public cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
{
public:
ResourceIndexAccessBase( ::boost::shared_ptr<ResMgr> pResMgr)
: m_pResMgr(pResMgr)
{
OSL_ENSURE(m_pResMgr, "no ressource manager given");
}
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException)
{ return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; };
// XElementAccess
virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException)
{ return static_cast<bool>(m_pResMgr.get()); };
ResourceStringIndexAccess::ResourceStringIndexAccess(Sequence<Any> const& rArgs, Reference<XComponentContext> const&)
protected:
// m_pResMgr should never be NULL
const ::boost::shared_ptr<ResMgr> m_pResMgr;
};
class ResourceStringIndexAccess : public ResourceIndexAccessBase
{
public:
ResourceStringIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr)
: ResourceIndexAccessBase(pResMgr) {}
// XIndexAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XElementAccessBase
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
{ return ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)); };
};
class ResourceStringListIndexAccess : public ResourceIndexAccessBase
{
public:
ResourceStringListIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr)
: ResourceIndexAccessBase(pResMgr) {}
// XIndexAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
// XElementAccessBase
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
{ return ::getCppuType(reinterpret_cast<Sequence<PropertyValue> * >(NULL)); };
};
}
ResourceIndexAccess::ResourceIndexAccess(Sequence<Any> const& rArgs, Reference<XComponentContext> const&)
: m_pResMgr(GetResMgr(rArgs))
{};
Reference<XInterface> initResourceStringIndexAccess(ResourceStringIndexAccess* pResourceStringIndexAccess)
Reference<XInterface> initResourceIndexAccess(ResourceIndexAccess* pResourceIndexAccess)
{
Reference<XInterface> xResult(static_cast<cppu::OWeakObject*>(pResourceStringIndexAccess));
if(!pResourceStringIndexAccess->hasElements())
Reference<XInterface> xResult(static_cast<cppu::OWeakObject*>(pResourceIndexAccess));
if(!pResourceIndexAccess->hasElements())
// xResult does not help the client to analyse the problem
// and will crash on getByIndex calls, better just give back an empty Reference
// so that such ResourceStringIndexAccess instances are never release into the wild
......@@ -76,6 +127,45 @@ Reference<XInterface> initResourceStringIndexAccess(ResourceStringIndexAccess* p
return xResult;
}
Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName)
throw (NoSuchElementException, WrappedTargetException, RuntimeException)
{
const Sequence<OUString> aNames(getElementNames());
Reference<XIndexAccess> xResult;
switch(::std::find(stl_begin(aNames), stl_end(aNames), aName)-stl_begin(aNames))
{
case 0:
xResult = Reference<XIndexAccess>(new ResourceStringIndexAccess(m_pResMgr));
break;
case 1:
xResult = Reference<XIndexAccess>(new ResourceStringListIndexAccess(m_pResMgr));
break;
default:
throw NoSuchElementException();
}
return makeAny(xResult);
}
Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames( )
throw (RuntimeException)
{
static Sequence<OUString> aResult;
if( aResult.getLength() == 0)
{
aResult.realloc(2);
aResult[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("String"));
aResult[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("StringList"));
}
return aResult;
}
::sal_Bool SAL_CALL ResourceIndexAccess::hasByName(const OUString& aName)
throw (RuntimeException)
{
const Sequence<OUString> aNames(getElementNames());
return (::std::find(stl_begin(aNames), stl_end(aNames), aName) != stl_end(aNames));
}
Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
......@@ -91,4 +181,28 @@ Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx)
return makeAny(OUString(String(aId)));
}
Any SAL_CALL ResourceStringListIndexAccess::getByIndex(sal_Int32 nIdx)
throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
{
if(nIdx > SAL_MAX_UINT16 || nIdx < 0)
throw IndexOutOfBoundsException();
SolarMutexGuard aGuard;
const ResId aId(static_cast<sal_uInt16>(nIdx), *m_pResMgr);
aId.SetRT(RSC_STRINGARRAY);
if(!m_pResMgr->IsAvailable(aId))
throw RuntimeException(
OUString(RTL_CONSTASCII_USTRINGPARAM("string list ressource for id not available")),
Reference<XInterface>());
const ResStringArray aStringList(aId);
Sequence<PropertyValue> aPropList(aStringList.Count());
for(sal_Int32 nCount = 0; nCount != aPropList.getLength(); ++nCount)
{
aPropList[nCount].Name = aStringList.GetString(nCount);
aPropList[nCount].Handle = -1;
aPropList[nCount].Value <<= aStringList.GetValue(nCount);
aPropList[nCount].State = PropertyState_DIRECT_VALUE;
}
return makeAny(aPropList);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
extensions/source/resource/ResourceStringIndexAccess.hxx → extensions/source/resource/ResourceIndexAccess.hxx
Dosyayı görüntüle @ fe969399
......@@ -33,39 +33,43 @@
#include "precompiled_extensions.hxx"
#include <com/sun/star/container/XIndexAccess.hpp>
#include <boost/shared_ptr.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <cppuhelper/implbase1.hxx>
#include <memory>
class ResMgr;
namespace extensions { namespace resource
{
class ResourceStringIndexAccess : public cppu::WeakImplHelper1< ::com::sun::star::container::XIndexAccess>
/** This class provides access to tools library text resources */
class ResourceIndexAccess : public cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess>
{
public:
ResourceStringIndexAccess(::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> const& rArgs, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&);
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException)
{ return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; };
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
/** The ctor takes a sequence with one element: the name of the resource, e.g. svt */
ResourceIndexAccess(::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> const& rArgs, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&);
// XNameAccess
// The XNameAccess provides access to two named elements:
// "String" returns a XIndexAccess to String resources
// "StringList" returns a XIndexAccess to StringList/StringArray resources
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException)
{ return ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)); };
{ return ::getCppuType(reinterpret_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(NULL)); };
virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException)
{ return static_cast<bool>(m_pResMgr.get()); };
private:
// m_pResMgr should never be NULL, see initResourceStringIndexAccess
const ::std::auto_ptr<ResMgr> m_pResMgr;
// m_pResMgr should never be NULL
const ::boost::shared_ptr<ResMgr> m_pResMgr;
};
}}
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> initResourceStringIndexAccess(::extensions::resource::ResourceStringIndexAccess*);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> initResourceIndexAccess(::extensions::resource::ResourceIndexAccess*);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
extensions/source/resource/makefile.mk
Dosyayı görüntüle @ fe969399
......@@ -40,7 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files --------------------------------------------------------
SLOFILES= \
$(SLO)$/ResourceStringIndexAccess.obj \
$(SLO)$/ResourceIndexAccess.obj \
$(SLO)$/oooresourceloader.obj \
$(SLO)$/resourceservices.obj
......
extensions/source/resource/res.component
Dosyayı görüntüle @ fe969399
......@@ -32,7 +32,7 @@
<service name="com.sun.star.resource.OfficeResourceLoader"/>
<singleton name="com.sun.star.resource.OfficeResourceLoader"/>
</implementation>
<implementation name="org.libreoffice.extensions.resource.ResourceStringIndexAccess">
<service name="org.libreoffice.resource.ResourceStringIndexAccess"/>
<implementation name="org.libreoffice.extensions.resource.ResourceIndexAccess">
<service name="org.libreoffice.resource.ResourceIndexAccess"/>
</implementation>
</component>
extensions/source/resource/resourceservices.cxx
Dosyayı görüntüle @ fe969399
......@@ -30,20 +30,20 @@
#include "precompiled_extensions.hxx"
#include <ResourceStringIndexAccess.hxx>
#include <ResourceIndexAccess.hxx>
#include <oooresourceloader.hxx>
#include <comphelper/servicedecl.hxx>
#include <uno/environment.h>
namespace sdecl = ::comphelper::service_decl;
sdecl::class_< ::extensions::resource::ResourceStringIndexAccess, sdecl::with_args<true> > ResourceStringIndexAccessServiceImpl;
sdecl::class_< ::extensions::resource::ResourceIndexAccess, sdecl::with_args<true> > ResourceIndexAccessServiceImpl;
sdecl::class_< ::extensions::resource::OpenOfficeResourceLoader> OpenOfficeResourceLoaderServiceImpl;
const sdecl::ServiceDecl ResourceStringIndexAccessDecl(
ResourceStringIndexAccessServiceImpl,
"org.libreoffice.extensions.resource.ResourceStringIndexAccess",
"org.libreoffice.resource.ResourceStringIndexAccess");
const sdecl::ServiceDecl ResourceIndexAccessDecl(
ResourceIndexAccessServiceImpl,
"org.libreoffice.extensions.resource.ResourceIndexAccess",
"org.libreoffice.resource.ResourceIndexAccess");
const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl(
OpenOfficeResourceLoaderServiceImpl,
......@@ -51,7 +51,7 @@ const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl(
"com.sun.star.resource.OfficeResourceLoader");
COMPHELPER_SERVICEDECL_EXPORTS2(
ResourceStringIndexAccessDecl,
ResourceIndexAccessDecl,
OpenOfficeResourceLoaderDecl
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment