strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: Experimental new binary type.rdb format

Browse source 
Move unoidl functionality into a module of its own, as a prerequisite to use it
in codemaker etc.  (This is intended to ultimately remove modules store and
registry, modulo backwards compatibility constraints.)

Change-Id: If5274cbd3a595951e6cf7a9664bc542f01833f38
This commit is contained in:
Stephan Bergmann 2013-02-25 15:31:05 +01:00
parent b324cbefb0
commit 320571bf70
24 changed files with 1002 additions and 751 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Module_cross_toolset.mk
View file

@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
ucbhelper \
udkapi \
udm \
unoidl \
unoil \
unotest \
unotools \

1
Module_tail_build.mk
View file

@ -205,6 +205,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
UnoControls \
unodevtools \
unoil \
unoidl \
unotest \
unotools \
unoxml \

1
Repository.mk
View file

@ -443,6 +443,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
sal_textenc \
sunjavaplugin \
sunpro5_uno \
unoidl \
unsafe_uno \
xmlreader \
))

1
RepositoryModule_ooo.mk
View file

@ -212,6 +212,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
UnoControls \
unodevtools \
unoil \
unoidl \
unotest \
unotools \
unoxml \

3
cppuhelper/Library_cppuhelper.mk
View file

@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\
reg \
sal \
salhelper \
unoidl \
xmlreader \
$(gb_UWINAPI) \
))
@ -76,8 +77,6 @@ $(eval $(call gb_Library_add_exception_objects,cppuhelper,\
cppuhelper/source/tdmgr \
cppuhelper/source/typedescriptionprovider \
cppuhelper/source/typeprovider \
cppuhelper/source/unoidl \
cppuhelper/source/unoidlprovider \
cppuhelper/source/unourl \
cppuhelper/source/weak \
))

1
cppuhelper/Package_inc.mk
View file

@ -77,7 +77,6 @@ $(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/queryinterface.h
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/shlib.hxx,cppuhelper/shlib.hxx))
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/supportsservice.hxx,cppuhelper/supportsservice.hxx))
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/typeprovider.hxx,cppuhelper/typeprovider.hxx))
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unoidl.hxx,cppuhelper/unoidl.hxx))
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/unourl.hxx,cppuhelper/unourl.hxx))
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weakagg.hxx,cppuhelper/weakagg.hxx))
$(eval $(call gb_Package_add_file,cppuhelper_inc,inc/cppuhelper/weak.hxx,cppuhelper/weak.hxx))

2
cppuhelper/prj/build.lst
View file

@ -1,2 +1,2 @@
ch cppuhelper : BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi registry salhelper xmlreader NULL
ch cppuhelper : BOOST:boost LIBXSLT:libxslt DESKTOP:codemaker cppu offapi registry salhelper unoidl xmlreader NULL
ch cppuhelper\prj nmake - all ch_prj NULL

612
cppuhelper/source/typedescriptionprovider.cxx
View file

@ -49,16 +49,16 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "cppuhelper/compbase2.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/unoidl.hxx"
#include "osl/file.hxx"
#include "osl/mutex.hxx"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "unoidl/unoidl.hxx"
#include "unoidl/unoidlprovider.hxx"
#include "paths.hxx"
#include "typedescriptionprovider.hxx"
#include "unoidlprovider.hxx"
namespace {
@ -108,7 +108,7 @@ public:
ModuleDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::ModuleEntity > const & entity):
rtl::Reference< unoidl::ModuleEntity > const & entity):
context_(context), name_(name), entity_(entity)
{ assert(entity.is()); }
@ -129,20 +129,26 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::ModuleEntity > entity_;
rtl::Reference< unoidl::ModuleEntity > entity_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
ModuleDescription::getMembers() throw (css::uno::RuntimeException) {
std::vector< rtl::OUString > names(entity_->getMemberNames());
assert(names.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(names.size());
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = resolve(context_, name_ + "." + names[i]);
try {
std::vector< rtl::OUString > names(entity_->getMemberNames());
assert(names.size() <= SAL_MAX_INT32);
sal_Int32 n = static_cast< sal_Int32 >(names.size());
css::uno::Sequence<
css::uno::Reference< css::reflection::XTypeDescription > > s(n);
for (sal_Int32 i = 0; i != n; ++i) {
s[i] = resolve(context_, name_ + "." + names[i]);
}
return s;
} catch (unoidl::FileFormatException & e) {
throw css::uno::DeploymentException(
e.getUri() + ": " + e.getDetail(),
static_cast< cppu::OWeakObject * >(this));
}
return s;
}
typedef cppu::ImplInheritanceHelper1<
@ -153,7 +159,7 @@ class EnumTypeDescription: public EnumTypeDescription_Base {
public:
EnumTypeDescription(
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::EnumTypeEntity > const & entity):
rtl::Reference< unoidl::EnumTypeEntity > const & entity):
EnumTypeDescription_Base(entity->isPublished()), name_(name),
entity_(entity)
{ assert(entity.is()); }
@ -179,7 +185,7 @@ private:
throw (css::uno::RuntimeException);
rtl::OUString name_;
rtl::Reference< cppu::unoidl::EnumTypeEntity > entity_;
rtl::Reference< unoidl::EnumTypeEntity > entity_;
};
css::uno::Sequence< rtl::OUString > EnumTypeDescription::getEnumNames()
@ -215,7 +221,7 @@ public:
PlainStructTypeDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::PlainStructTypeEntity > const & entity):
rtl::Reference< unoidl::PlainStructTypeEntity > const & entity):
PlainStructTypeDescription_Base(entity->isPublished()),
context_(context), name_(name), entity_(entity)
{ assert(entity.is()); }
@ -259,7 +265,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::PlainStructTypeEntity > entity_;
rtl::Reference< unoidl::PlainStructTypeEntity > entity_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
@ -321,8 +327,8 @@ public:
PolymorphicStructTypeTemplateDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::PolymorphicStructTypeTemplateEntity >
const & entity):
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > const &
entity):
PolymorphicStructTypeTemplateDescription_Base(entity->isPublished()),
context_(context), name_(name), entity_(entity)
{ assert(entity.is()); }
@ -362,7 +368,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::PolymorphicStructTypeTemplateEntity > entity_;
rtl::Reference< unoidl::PolymorphicStructTypeTemplateEntity > entity_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
@ -417,7 +423,7 @@ public:
ExceptionTypeDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::ExceptionTypeEntity > const & entity):
rtl::Reference< unoidl::ExceptionTypeEntity > const & entity):
ExceptionTypeDescription_Base(entity->isPublished()), context_(context),
name_(name), entity_(entity)
{ assert(entity.is()); }
@ -449,7 +455,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::ExceptionTypeEntity > entity_;
rtl::Reference< unoidl::ExceptionTypeEntity > entity_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XTypeDescription > >
@ -551,7 +557,7 @@ public:
AttributeDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
cppu::unoidl::InterfaceTypeEntity::Attribute const & attribute,
unoidl::InterfaceTypeEntity::Attribute const & attribute,
sal_Int32 position):
context_(context), name_(name), attribute_(attribute),
position_(position)
@ -596,7 +602,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
cppu::unoidl::InterfaceTypeEntity::Attribute attribute_;
unoidl::InterfaceTypeEntity::Attribute attribute_;
sal_Int32 position_;
};
@ -637,7 +643,7 @@ class MethodParameter:
public:
MethodParameter(
css::uno::Reference< css::uno::XComponentContext > const & context,
cppu::unoidl::InterfaceTypeEntity::Method::Parameter const & parameter,
unoidl::InterfaceTypeEntity::Method::Parameter const & parameter,
sal_Int32 position):
context_(context), parameter_(parameter), position_(position)
{}
@ -655,20 +661,18 @@ private:
virtual sal_Bool SAL_CALL isIn() throw (css::uno::RuntimeException) {
return
(parameter_.direction
== cppu::unoidl::InterfaceTypeEntity::Method::Parameter::
DIRECTION_IN)
== unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_IN)
|| (parameter_.direction
== cppu::unoidl::InterfaceTypeEntity::Method::Parameter::
== unoidl::InterfaceTypeEntity::Method::Parameter::
DIRECTION_IN_OUT);
}
virtual sal_Bool SAL_CALL isOut() throw (css::uno::RuntimeException) {
return
(parameter_.direction
== cppu::unoidl::InterfaceTypeEntity::Method::Parameter::
DIRECTION_OUT)
== unoidl::InterfaceTypeEntity::Method::Parameter::DIRECTION_OUT)
|| (parameter_.direction
== cppu::unoidl::InterfaceTypeEntity::Method::Parameter::
== unoidl::InterfaceTypeEntity::Method::Parameter::
DIRECTION_IN_OUT);
}
@ -676,7 +680,7 @@ private:
{ return position_; }
css::uno::Reference< css::uno::XComponentContext > context_;
cppu::unoidl::InterfaceTypeEntity::Method::Parameter parameter_;
unoidl::InterfaceTypeEntity::Method::Parameter parameter_;
sal_Int32 position_;
};
@ -689,8 +693,7 @@ public:
MethodDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
cppu::unoidl::InterfaceTypeEntity::Method const & method,
sal_Int32 position):
unoidl::InterfaceTypeEntity::Method const & method, sal_Int32 position):
context_(context), name_(name), method_(method), position_(position)
{}
@ -730,7 +733,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
cppu::unoidl::InterfaceTypeEntity::Method method_;
unoidl::InterfaceTypeEntity::Method method_;
sal_Int32 position_;
};
@ -767,7 +770,7 @@ public:
InterfaceTypeDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::InterfaceTypeEntity > const & entity):
rtl::Reference< unoidl::InterfaceTypeEntity > const & entity):
InterfaceTypeDescription_Base(entity->isPublished()), context_(context),
name_(name), entity_(entity)
{ assert(entity.is()); }
@ -810,7 +813,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::InterfaceTypeEntity > entity_;
rtl::Reference< unoidl::InterfaceTypeEntity > entity_;
};
css::uno::Sequence<
@ -905,7 +908,7 @@ public:
ConstantGroupDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::ConstantGroupEntity > const & entity):
rtl::Reference< unoidl::ConstantGroupEntity > const & entity):
ConstantGroupDescription_Base(entity->isPublished()), context_(context),
name_(name), entity_(entity)
{ assert(entity.is()); }
@ -927,7 +930,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::ConstantGroupEntity > entity_;
rtl::Reference< unoidl::ConstantGroupEntity > entity_;
};
css::uno::Sequence<
@ -955,7 +958,7 @@ public:
TypedefDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::TypedefEntity > const & entity):
rtl::Reference< unoidl::TypedefEntity > const & entity):
TypedefDescription_Base(entity->isPublished()), context_(context),
name_(name), entity_(entity)
{ assert(entity.is()); }
@ -976,7 +979,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::TypedefEntity > entity_;
rtl::Reference< unoidl::TypedefEntity > entity_;
};
class ConstructorParameter:
@ -986,7 +989,7 @@ class ConstructorParameter:
public:
ConstructorParameter(
css::uno::Reference< css::uno::XComponentContext > const & context,
cppu::unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter
unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter
const & parameter,
sal_Int32 position):
context_(context), parameter_(parameter), position_(position)
@ -1016,7 +1019,7 @@ private:
{ return parameter_.rest; }
css::uno::Reference< css::uno::XComponentContext > context_;
cppu::unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter
unoidl::SingleInterfaceBasedServiceEntity::Constructor::Parameter
parameter_;
sal_Int32 position_;
};
@ -1029,7 +1032,7 @@ class ConstructorDescription:
public:
ConstructorDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
cppu::unoidl::SingleInterfaceBasedServiceEntity::Constructor const &
unoidl::SingleInterfaceBasedServiceEntity::Constructor const &
constructor):
context_(context), constructor_(constructor)
{}
@ -1055,7 +1058,7 @@ private:
SAL_CALL getExceptions() throw (css::uno::RuntimeException);
css::uno::Reference< css::uno::XComponentContext > context_;
cppu::unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_;
unoidl::SingleInterfaceBasedServiceEntity::Constructor constructor_;
};
css::uno::Sequence< css::uno::Reference< css::reflection::XParameter > >
@ -1097,8 +1100,8 @@ public:
SingleInterfaceBasedServiceDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::SingleInterfaceBasedServiceEntity >
const & entity):
rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > const &
entity):
SingleInterfaceBasedServiceDescription_Base(entity->isPublished()),
context_(context), name_(name), entity_(entity)
{ assert(entity.is()); }
@ -1176,7 +1179,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::SingleInterfaceBasedServiceEntity > entity_;
rtl::Reference< unoidl::SingleInterfaceBasedServiceEntity > entity_;
};
css::uno::Sequence<
@ -1203,8 +1206,7 @@ class PropertyDescription:
public:
PropertyDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
cppu::unoidl::AccumulationBasedServiceEntity::Property const &
property):
unoidl::AccumulationBasedServiceEntity::Property const & property):
context_(context), property_(property)
{}
@ -1227,7 +1229,7 @@ private:
{ return resolve(context_, property_.type); }
css::uno::Reference< css::uno::XComponentContext > context_;
cppu::unoidl::AccumulationBasedServiceEntity::Property property_;
unoidl::AccumulationBasedServiceEntity::Property property_;
};
typedef cppu::ImplInheritanceHelper1<
@ -1241,7 +1243,7 @@ public:
AccumulationBasedServiceDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::AccumulationBasedServiceEntity > const &
rtl::Reference< unoidl::AccumulationBasedServiceEntity > const &
entity):
AccumulationBasedServiceDescription_Base(entity->isPublished()),
context_(context), name_(name), entity_(entity)
@ -1302,7 +1304,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::AccumulationBasedServiceEntity > entity_;
rtl::Reference< unoidl::AccumulationBasedServiceEntity > entity_;
};
css::uno::Sequence<
@ -1411,8 +1413,7 @@ public:
InterfaceBasedSingletonDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::InterfaceBasedSingletonEntity > const &
entity):
rtl::Reference< unoidl::InterfaceBasedSingletonEntity > const & entity):
InterfaceBasedSingletonDescription_Base(entity->isPublished()),
context_(context), name_(name), entity_(entity)
{ assert(entity.is()); }
@ -1444,7 +1445,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::InterfaceBasedSingletonEntity > entity_;
rtl::Reference< unoidl::InterfaceBasedSingletonEntity > entity_;
};
typedef cppu::ImplInheritanceHelper1<
@ -1458,8 +1459,7 @@ public:
ServiceBasedSingletonDescription(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & name,
rtl::Reference< cppu::unoidl::ServiceBasedSingletonEntity > const &
entity):
rtl::Reference< unoidl::ServiceBasedSingletonEntity > const & entity):
ServiceBasedSingletonDescription_Base(entity_->isPublished()),
context_(context), name_(name), entity_(entity)
{ assert(entity.is()); }
@ -1491,7 +1491,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::OUString name_;
rtl::Reference< cppu::unoidl::ServiceBasedSingletonEntity > entity_;
rtl::Reference< unoidl::ServiceBasedSingletonEntity > entity_;
};
class Enumeration:
@ -1503,7 +1503,7 @@ public:
Enumeration(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & prefix,
rtl::Reference< cppu::unoidl::MapCursor > const & cursor,
rtl::Reference< unoidl::MapCursor > const & cursor,
css::uno::Sequence< css::uno::TypeClass > const & types, bool deep):
context_(context), types_(types), deep_(deep)
{
@ -1536,22 +1536,22 @@ private:
struct Position {
Position(
rtl::OUString const & thePrefix,
rtl::Reference< cppu::unoidl::MapCursor > const & theCursor):
rtl::Reference< unoidl::MapCursor > const & theCursor):
prefix(thePrefix), cursor(theCursor)
{ assert(theCursor.is()); }
Position(
rtl::OUString const & thePrefix,
rtl::Reference< cppu::unoidl::ConstantGroupEntity > const &
rtl::Reference< unoidl::ConstantGroupEntity > const &
theConstantGroup):
prefix(thePrefix), constantGroup(theConstantGroup),
constantGroupIndex(constantGroup->getMembers().begin())
{ assert(theConstantGroup.is()); }
rtl::OUString prefix;
rtl::Reference< cppu::unoidl::MapCursor > cursor;
rtl::Reference< cppu::unoidl::ConstantGroupEntity > constantGroup;
std::vector< cppu::unoidl::ConstantGroupEntity::Member >::const_iterator
rtl::Reference< unoidl::MapCursor > cursor;
rtl::Reference< unoidl::ConstantGroupEntity > constantGroup;
std::vector< unoidl::ConstantGroupEntity::Member >::const_iterator
constantGroupIndex;
};
@ -1595,87 +1595,93 @@ bool Enumeration::matches(css::uno::TypeClass tc) const {
}
void Enumeration::findNextMatch() {
for (;;) {
assert(!positions_.empty());
rtl::OUString name;
if (positions_.top().cursor.is()) { // root or module
rtl::Reference< cppu::unoidl::Entity > ent(
positions_.top().cursor->getNext(&name));
if (!ent.is()) {
positions_.pop();
if (positions_.empty()) {
try {
for (;;) {
assert(!positions_.empty());
rtl::OUString name;
if (positions_.top().cursor.is()) { // root or module
rtl::Reference< unoidl::Entity > ent(
positions_.top().cursor->getNext(&name));
if (!ent.is()) {
positions_.pop();
if (positions_.empty()) {
break;
}
continue;
}
name = positions_.top().prefix + name;
css::uno::TypeClass tc;
switch (ent->getSort()) {
case unoidl::Entity::SORT_MODULE:
tc = css::uno::TypeClass_MODULE;
if (deep_) {
positions_.push(
Position(
name + ".",
static_cast< unoidl::ModuleEntity * >(
ent.get())->createCursor()));
}
break;
case unoidl::Entity::SORT_ENUM_TYPE:
tc = css::uno::TypeClass_ENUM;
break;
case unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
case unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
tc = css::uno::TypeClass_STRUCT;
break;
case unoidl::Entity::SORT_EXCEPTION_TYPE:
tc = css::uno::TypeClass_EXCEPTION;
break;
case unoidl::Entity::SORT_INTERFACE_TYPE:
tc = css::uno::TypeClass_INTERFACE;
break;
case unoidl::Entity::SORT_TYPEDEF:
tc = css::uno::TypeClass_TYPEDEF;
break;
case unoidl::Entity::SORT_CONSTANT_GROUP:
tc = css::uno::TypeClass_CONSTANTS;
if (deep_ && matches(css::uno::TypeClass_CONSTANT)) {
positions_.push(
Position(
name + ".",
static_cast< unoidl::ConstantGroupEntity * >(
ent.get())));
}
break;
case unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
case unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
tc = css::uno::TypeClass_SERVICE;
break;
case unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
case unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
tc = css::uno::TypeClass_SINGLETON;
break;
default:
for (;;) { std::abort(); } // this cannot happen
}
if (matches(tc)) {
current_ = name;
break;
}
continue;
}
name = positions_.top().prefix + name;
css::uno::TypeClass tc;
switch (ent->getSort()) {
case cppu::unoidl::Entity::SORT_MODULE:
tc = css::uno::TypeClass_MODULE;
if (deep_) {
positions_.push(
Position(
name + ".",
static_cast< cppu::unoidl::ModuleEntity * >(
ent.get())->createCursor()));
} else { // constant group
if (positions_.top().constantGroupIndex
== positions_.top().constantGroup->getMembers().end())
{
positions_.pop();
if (positions_.empty()) {
break;
}
continue;
}
break;
case cppu::unoidl::Entity::SORT_ENUM_TYPE:
tc = css::uno::TypeClass_ENUM;
break;
case cppu::unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
case cppu::unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
tc = css::uno::TypeClass_STRUCT;
break;
case cppu::unoidl::Entity::SORT_EXCEPTION_TYPE:
tc = css::uno::TypeClass_EXCEPTION;
break;
case cppu::unoidl::Entity::SORT_INTERFACE_TYPE:
tc = css::uno::TypeClass_INTERFACE;
break;
case cppu::unoidl::Entity::SORT_TYPEDEF:
tc = css::uno::TypeClass_TYPEDEF;
break;
case cppu::unoidl::Entity::SORT_CONSTANT_GROUP:
tc = css::uno::TypeClass_CONSTANTS;
if (deep_ && matches(css::uno::TypeClass_CONSTANT)) {
positions_.push(
Position(
name + ".",
static_cast< cppu::unoidl::ConstantGroupEntity * >(
ent.get())));
}
break;
case cppu::unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
case cppu::unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
tc = css::uno::TypeClass_SERVICE;
break;
case cppu::unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
case cppu::unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
tc = css::uno::TypeClass_SINGLETON;
break;
default:
for (;;) { std::abort(); } // this cannot happen
}
if (matches(tc)) {
current_ = name;
current_ = positions_.top().prefix
+ positions_.top().constantGroupIndex++->name;
break;
}
} else { // constant group
if (positions_.top().constantGroupIndex
== positions_.top().constantGroup->getMembers().end())
{
positions_.pop();
if (positions_.empty()) {
break;
}
continue;
}
current_ = positions_.top().prefix
+ positions_.top().constantGroupIndex++->name;
break;
}
} catch (unoidl::FileFormatException & e) {
throw css::uno::DeploymentException(
e.getUri() + ": " + e.getDetail(),
static_cast< cppu::OWeakObject * >(this));
}
}
@ -1688,11 +1694,12 @@ class Provider:
private osl::Mutex, public Provider_Base, private boost::noncopyable
{
public:
// throws unoidl::FileFormatException, unoidl::NoSuchFileException:
Provider(
css::uno::Reference< css::uno::XComponentContext > const & context,
rtl::OUString const & uri):
Provider_Base(*static_cast< osl::Mutex * >(this)), context_(context),
provider_(new cppu::UnoidlProvider(uri))
provider_(new unoidl::UnoidlProvider(uri))
{}
using Provider_Base::acquire;
@ -1709,8 +1716,7 @@ private:
css::container::NoSuchElementException, css::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasByHierarchicalName(
rtl::OUString const & aName) throw (css::uno::RuntimeException)
{ return provider_->find(aName) != 0; }
rtl::OUString const & aName) throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::reflection::XTypeDescriptionEnumeration >
SAL_CALL createTypeDescriptionEnumeration(
@ -1723,117 +1729,169 @@ private:
css::uno::RuntimeException);
css::uno::Reference< css::uno::XComponentContext > context_;
rtl::Reference< cppu::UnoidlProvider > provider_;
rtl::Reference< unoidl::UnoidlProvider > provider_;
};
css::uno::Any Provider::getByHierarchicalName(rtl::OUString const & aName)
throw (css::container::NoSuchElementException, css::uno::RuntimeException)
{
bool cnst;
sal_uInt32 off = provider_->find(aName, &cnst);
if (off == 0) {
throw css::container::NoSuchElementException(
aName, static_cast< cppu::OWeakObject * >(this));
}
if (cnst) {
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ConstantDescription(aName, provider_->getConstant(off)));
} else {
rtl::Reference< cppu::unoidl::Entity > ent(provider_->getEntity(off));
switch (ent->getSort()) {
case cppu::unoidl::Entity::SORT_MODULE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ModuleDescription(
context_, aName,
static_cast< cppu::unoidl::ModuleEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_ENUM_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new EnumTypeDescription(
aName,
static_cast< cppu::unoidl::EnumTypeEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new PlainStructTypeDescription(
context_, aName,
static_cast< cppu::unoidl::PlainStructTypeEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new PolymorphicStructTypeTemplateDescription(
context_, aName,
static_cast<
cppu::unoidl::PolymorphicStructTypeTemplateEntity *
>(ent.get())));
case cppu::unoidl::Entity::SORT_EXCEPTION_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ExceptionTypeDescription(
context_, aName,
static_cast< cppu::unoidl::ExceptionTypeEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_INTERFACE_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new InterfaceTypeDescription(
context_, aName,
static_cast< cppu::unoidl::InterfaceTypeEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_TYPEDEF:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new TypedefDescription(
context_, aName,
static_cast< cppu::unoidl::TypedefEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_CONSTANT_GROUP:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ConstantGroupDescription(
context_, aName,
static_cast< cppu::unoidl::ConstantGroupEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new SingleInterfaceBasedServiceDescription(
context_, aName,
static_cast<
cppu::unoidl::SingleInterfaceBasedServiceEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new AccumulationBasedServiceDescription(
context_, aName,
static_cast<
cppu::unoidl::AccumulationBasedServiceEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new InterfaceBasedSingletonDescription(
context_, aName,
static_cast<
cppu::unoidl::InterfaceBasedSingletonEntity * >(
ent.get())));
case cppu::unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ServiceBasedSingletonDescription(
context_, aName,
static_cast<
cppu::unoidl::ServiceBasedSingletonEntity * >(
ent.get())));
default:
for (;;) { std::abort(); } // this cannot happen
try {
bool cnst;
sal_uInt32 off = provider_->find(aName, &cnst);
if (off == 0) {
throw css::container::NoSuchElementException(
aName, static_cast< cppu::OWeakObject * >(this));
}
if (cnst) {
unoidl::ConstantValue val1(provider_->getConstant(off));
css::uno::Any val2;
switch (val1.type) {
case unoidl::ConstantValue::TYPE_BOOLEAN:
val2 <<= val1.booleanValue;
break;
case unoidl::ConstantValue::TYPE_BYTE:
val2 <<= val1.byteValue;
break;
case unoidl::ConstantValue::TYPE_SHORT:
val2 <<= val1.shortValue;
break;
case unoidl::ConstantValue::TYPE_UNSIGNED_SHORT:
val2 <<= val1.unsignedShortValue;
break;
case unoidl::ConstantValue::TYPE_LONG:
val2 <<= val1.longValue;
break;
case unoidl::ConstantValue::TYPE_UNSIGNED_LONG:
val2 <<= val1.unsignedLongValue;
break;
case unoidl::ConstantValue::TYPE_HYPER:
val2 <<= val1.hyperValue;
break;
case unoidl::ConstantValue::TYPE_UNSIGNED_HYPER:
val2 <<= val1.unsignedHyperValue;
break;
case unoidl::ConstantValue::TYPE_FLOAT:
val2 <<= val1.floatValue;
break;
case unoidl::ConstantValue::TYPE_DOUBLE:
val2 <<= val1.doubleValue;
break;
default:
for (;;) { std::abort(); } // this cannot happen
}
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ConstantDescription(aName, val2));
} else {
rtl::Reference< unoidl::Entity > ent(provider_->getEntity(off));
switch (ent->getSort()) {
case unoidl::Entity::SORT_MODULE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ModuleDescription(
context_, aName,
static_cast< unoidl::ModuleEntity * >(ent.get())));
case unoidl::Entity::SORT_ENUM_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new EnumTypeDescription(
aName,
static_cast< unoidl::EnumTypeEntity * >(
ent.get())));
case unoidl::Entity::SORT_PLAIN_STRUCT_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new PlainStructTypeDescription(
context_, aName,
static_cast< unoidl::PlainStructTypeEntity * >(
ent.get())));
case unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new PolymorphicStructTypeTemplateDescription(
context_, aName,
static_cast<
unoidl::PolymorphicStructTypeTemplateEntity * >(
ent.get())));
case unoidl::Entity::SORT_EXCEPTION_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ExceptionTypeDescription(
context_, aName,
static_cast< unoidl::ExceptionTypeEntity * >(
ent.get())));
case unoidl::Entity::SORT_INTERFACE_TYPE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new InterfaceTypeDescription(
context_, aName,
static_cast< unoidl::InterfaceTypeEntity * >(
ent.get())));
case unoidl::Entity::SORT_TYPEDEF:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new TypedefDescription(
context_, aName,
static_cast< unoidl::TypedefEntity * >(ent.get())));
case unoidl::Entity::SORT_CONSTANT_GROUP:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ConstantGroupDescription(
context_, aName,
static_cast< unoidl::ConstantGroupEntity * >(
ent.get())));
case unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new SingleInterfaceBasedServiceDescription(
context_, aName,
static_cast<
unoidl::SingleInterfaceBasedServiceEntity * >(
ent.get())));
case unoidl::Entity::SORT_ACCUMULATION_BASED_SERVICE:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new AccumulationBasedServiceDescription(
context_, aName,
static_cast<
unoidl::AccumulationBasedServiceEntity * >(
ent.get())));
case unoidl::Entity::SORT_INTERFACE_BASED_SINGLETON:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new InterfaceBasedSingletonDescription(
context_, aName,
static_cast<
unoidl::InterfaceBasedSingletonEntity * >(
ent.get())));
case unoidl::Entity::SORT_SERVICE_BASED_SINGLETON:
return css::uno::makeAny<
css::uno::Reference< css::reflection::XTypeDescription > >(
new ServiceBasedSingletonDescription(
context_, aName,
static_cast<
unoidl::ServiceBasedSingletonEntity * >(
ent.get())));
default:
for (;;) { std::abort(); } // this cannot happen
}
}
} catch (unoidl::FileFormatException & e) {
throw css::uno::DeploymentException(
e.getUri() + ": " + e.getDetail(),
static_cast< cppu::OWeakObject * >(this));
}
}
sal_Bool Provider::hasByHierarchicalName(
rtl::OUString const & aName) throw (css::uno::RuntimeException)
{
try {
return provider_->find(aName) != 0;
} catch (unoidl::FileFormatException & e) {
throw css::uno::DeploymentException(
e.getUri() + ": " + e.getDetail(),
static_cast< cppu::OWeakObject * >(this));
}
}
@ -1846,33 +1904,39 @@ Provider::createTypeDescriptionEnumeration(
css::reflection::NoSuchTypeNameException,
css::reflection::InvalidTypeNameException, css::uno::RuntimeException)
{
rtl::OUString prefix;
rtl::Reference< cppu::unoidl::MapCursor > cursor;
if (moduleName.isEmpty()) {
cursor = provider_->createRootCursor();
} else {
prefix = moduleName + ".";
bool cnst;
sal_uInt32 off = provider_->find(moduleName, &cnst);
if (off == 0) {
throw css::reflection::NoSuchTypeNameException(
moduleName, static_cast< cppu::OWeakObject * >(this));
try {
rtl::OUString prefix;
rtl::Reference< unoidl::MapCursor > cursor;
if (moduleName.isEmpty()) {
cursor = provider_->createRootCursor();
} else {
prefix = moduleName + ".";
bool cnst;
sal_uInt32 off = provider_->find(moduleName, &cnst);
if (off == 0) {
throw css::reflection::NoSuchTypeNameException(
moduleName, static_cast< cppu::OWeakObject * >(this));
}
if (cnst) {
throw css::reflection::InvalidTypeNameException(
moduleName, static_cast< cppu::OWeakObject * >(this));
}
rtl::Reference< unoidl::Entity > ent(provider_->getEntity(off));
if (ent->getSort() != unoidl::Entity::SORT_MODULE) {
throw css::reflection::InvalidTypeNameException(
moduleName, static_cast< cppu::OWeakObject * >(this));
}
cursor = static_cast< unoidl::ModuleEntity * >(ent.get())->
createCursor();
}
if (cnst) {
throw css::reflection::InvalidTypeNameException(
moduleName, static_cast< cppu::OWeakObject * >(this));
}
rtl::Reference< cppu::unoidl::Entity > ent(provider_->getEntity(off));
if (ent->getSort() != cppu::unoidl::Entity::SORT_MODULE) {
throw css::reflection::InvalidTypeNameException(
moduleName, static_cast< cppu::OWeakObject * >(this));
}
cursor = static_cast< cppu::unoidl::ModuleEntity * >(ent.get())->
createCursor();
return new Enumeration(
context_, prefix, cursor, types,
depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
} catch (unoidl::FileFormatException & e) {
throw css::uno::DeploymentException(
e.getUri() + ": " + e.getDetail(),
static_cast< cppu::OWeakObject * >(this));
}
return new Enumeration(
context_, prefix, cursor, types,
depth == css::reflection::TypeDescriptionSearchDepth_INFINITE);
}
css::uno::Reference< css::container::XHierarchicalNameAccess >
@ -1916,7 +1980,7 @@ void readRdbFile(
css::uno::Reference< css::container::XHierarchicalNameAccess > prov;
try {
prov = new Provider(context, uri);
} catch (css::container::NoSuchElementException &) {
} catch (unoidl::NoSuchFileException &) {
if (optional) {
SAL_INFO("cppuhelper", "Ignored optional " << uri);
return;
@ -1924,7 +1988,7 @@ void readRdbFile(
throw css::uno::DeploymentException(
uri + ": no such file",
css::uno::Reference< css::uno::XInterface >());
} catch (css::registry::InvalidRegistryException &) {
} catch (unoidl::FileFormatException &) {
prov = readLegacyRdbFile(uri, serviceManager, context);
}
assert(prov.is());

54
cppuhelper/source/unoidlprovider.hxx
View file

@ -1,54 +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/.
*/
#ifndef INCLUDED_CPPUHELPER_SOURCE_UNOIDLPROVIDER_HXX
#define INCLUDED_CPPUHELPER_SOURCE_UNOIDLPROVIDER_HXX
#include "sal/config.h"
#include "cppuhelper/unoidl.hxx"
#include "rtl/ref.hxx"
#include "sal/types.h"
namespace com { namespace sun { namespace star { namespace uno {
class Any;
} } } }
namespace cppu {
class MappedFile;
struct MapEntry;
}
namespace rtl { class OUString; }
namespace cppu {
class UnoidlProvider: public unoidl::Provider {
public:
explicit UnoidlProvider(rtl::OUString const & uri);
virtual rtl::Reference< unoidl::MapCursor > createRootCursor() const;
sal_uInt32 find(rtl::OUString const & name, bool * constant = 0) const;
rtl::Reference< unoidl::Entity > getEntity(sal_uInt32 offset) const;
css::uno::Any getConstant(sal_uInt32 offset) const;
private:
virtual ~UnoidlProvider() throw ();
rtl::Reference< MappedFile > file_;
MapEntry const * mapBegin_;
sal_uInt32 mapSize_;
};
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
sal/inc/sal/log-areas.dox
View file

@ -290,6 +290,7 @@ certain functionality.
@li @c svg
@li @c svx
@li @c ucbhelper
@li @c unoidl
@li @c xmlhelp
@li @c xmloff
@li @c xmlreader

8
scp2/source/ooo/ure.scp
View file

@ -277,6 +277,13 @@ File gid_File_Dl_Store
End
File gid_File_Dl_Unoidl
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("unoidl");
Styles = (PACKED);
End
File gid_File_Dl_Xmlreader
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@ -998,6 +1005,7 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Rmcxt,
gid_File_Dl_Store,
gid_Unixlink_File_Dl_Store,
gid_File_Dl_Unoidl,
gid_File_Dl_Xmlreader,
gid_File_Dl_Jvmaccess,
gid_Unixlink_File_Dl_Jvmaccess,

26
unoidl/Library_unoidl.mk Normal file
View file

@ -0,0 +1,26 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Library_Library,unoidl))
$(eval $(call gb_Library_add_defs,unoidl,-DLO_DLLIMPLEMENTATION_UNOIDL))
$(eval $(call gb_Library_add_exception_objects,unoidl, \
unoidl/source/unoidl \
unoidl/source/unoidlprovider \
))
$(eval $(call gb_Library_use_libraries,unoidl, \
sal \
salhelper \
))
$(eval $(call gb_Library_use_package,unoidl,unoidl_inc))
# vim: set noet sw=4 ts=4:

14
unoidl/Makefile Normal file
View file

@ -0,0 +1,14 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:

17
unoidl/Module_unoidl.mk Normal file
View file

@ -0,0 +1,17 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Module_Module,unoidl))
$(eval $(call gb_Module_add_targets,unoidl, \
Library_unoidl \
Package_inc \
))
# vim: set noet sw=4 ts=4:

16
unoidl/Package_inc.mk Normal file
View file

@ -0,0 +1,16 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Package_Package,unoidl_inc,$(SRCDIR)/unoidl/inc/unoidl))
$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/detail/dllapi.hxx,detail/dllapi.hxx))
$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/unoidl.hxx,unoidl.hxx))
$(eval $(call gb_Package_add_file,unoidl_inc,inc/unoidl/unoidlprovider.hxx,unoidlprovider.hxx))
# vim: set noet sw=4 ts=4:

26
unoidl/inc/unoidl/detail/dllapi.hxx Normal file
View file

@ -0,0 +1,26 @@
/* -*- 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/.
*/
#ifndef INCLUDED_UNOIDL_DETAIL_DLLAPI_HXX
#define INCLUDED_UNOIDL_DETAIL_DLLAPI_HXX
#include "sal/config.h"
#include "sal/types.h"
#if defined LO_DLLIMPLEMENTATION_UNOIDL
#define LO_DLLPUBLIC_UNOIDL SAL_DLLPUBLIC_EXPORT
#else
#define LO_DLLPUBLIC_UNOIDL SAL_DLLPUBLIC_IMPORT
#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

26
unoidl/inc/unoidl/detail/unoidldllapi.hxx Normal file
View file

@ -0,0 +1,26 @@
/* -*- 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/.
*/
#ifndef INCLUDED_UNOIDL_DETAIL_UNOIDLDLLAPI_HXX
#define INCLUDED_UNOIDL_DETAIL_UNOIDLDLLAPI_HXX
#include "sal/config.h"
#include "sal/types.h"
#if defined LO_DLLIMPLEMENTATION_UNOIDL
#define LO_DLLPUBLIC_UNOIDL SAL_DLLPUBLIC_EXPORT
#else
#define LO_DLLPUBLIC_UNOIDL SAL_DLLPUBLIC_IMPORT
#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

165
cppuhelper/inc/cppuhelper/unoidl.hxx → unoidl/inc/unoidl/unoidl.hxx
View file

@ -7,38 +7,71 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_CPPUHELPER_UNOIDL_HXX
#define INCLUDED_CPPUHELPER_UNOIDL_HXX
#ifndef INCLUDED_UNOIDL_UNOIDL_HXX
#define INCLUDED_UNOIDL_UNOIDL_HXX
#include "sal/config.h"
#include <cassert>
#include <vector>
#include "com/sun/star/uno/Any.hxx"
#include "cppuhelper/cppuhelperdllapi.h"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "salhelper/simplereferenceobject.hxx"
#include "unoidl/detail/dllapi.hxx"
namespace cppu { namespace unoidl {
namespace unoidl {
class CPPUHELPER_DLLPUBLIC Entity: public salhelper::SimpleReferenceObject {
class LO_DLLPUBLIC_UNOIDL NoSuchFileException {
public:
SAL_DLLPRIVATE NoSuchFileException(rtl::OUString const & uri): uri_(uri) {}
SAL_DLLPRIVATE NoSuchFileException(NoSuchFileException const & other):
uri_(other.uri_) {}
virtual SAL_DLLPRIVATE ~NoSuchFileException() throw ();
rtl::OUString getUri() const { return uri_; }
private:
void operator =(NoSuchFileException) SAL_DELETED_FUNCTION;
rtl::OUString uri_;
};
class LO_DLLPUBLIC_UNOIDL FileFormatException {
public:
SAL_DLLPRIVATE FileFormatException(
rtl::OUString const & uri, rtl::OUString const & detail):
uri_(uri), detail_(detail)
{}
SAL_DLLPRIVATE FileFormatException(FileFormatException const & other):
uri_(other.uri_), detail_(other.detail_)
{}
virtual SAL_DLLPRIVATE ~FileFormatException() throw ();
rtl::OUString getUri() const { return uri_; }
rtl::OUString getDetail() const { return detail_; }
private:
void operator =(FileFormatException) SAL_DELETED_FUNCTION;
rtl::OUString uri_;
rtl::OUString detail_;
};
class LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
public:
enum Sort {
SORT_MODULE,
SORT_ENUM_TYPE,
SORT_PLAIN_STRUCT_TYPE,
SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE,
SORT_EXCEPTION_TYPE,
SORT_INTERFACE_TYPE,
SORT_TYPEDEF,
SORT_CONSTANT_GROUP,
SORT_SINGLE_INTERFACE_BASED_SERVICE,
SORT_ACCUMULATION_BASED_SERVICE,
SORT_INTERFACE_BASED_SINGLETON,
SORT_SERVICE_BASED_SINGLETON
SORT_MODULE, SORT_ENUM_TYPE, SORT_PLAIN_STRUCT_TYPE,
SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE, SORT_EXCEPTION_TYPE,
SORT_INTERFACE_TYPE, SORT_TYPEDEF, SORT_CONSTANT_GROUP,
SORT_SINGLE_INTERFACE_BASED_SERVICE, SORT_ACCUMULATION_BASED_SERVICE,
SORT_INTERFACE_BASED_SINGLETON, SORT_SERVICE_BASED_SINGLETON
};
Sort getSort() const { return sort_; }
@ -52,8 +85,9 @@ private:
Sort sort_;
};
class CPPUHELPER_DLLPUBLIC MapCursor: public salhelper::SimpleReferenceObject {
class LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject {
public:
// throws FileFormatException:
virtual rtl::Reference< Entity > getNext(rtl::OUString * name) = 0;
protected:
@ -62,10 +96,12 @@ protected:
virtual SAL_DLLPRIVATE ~MapCursor() throw();
};
class CPPUHELPER_DLLPUBLIC ModuleEntity: public Entity {
class LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity {
public:
// throws FileFormatException:
virtual std::vector< rtl::OUString > getMemberNames() const = 0;
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createCursor() const = 0;
protected:
@ -74,7 +110,7 @@ protected:
virtual SAL_DLLPRIVATE ~ModuleEntity() throw ();
};
class CPPUHELPER_DLLPUBLIC PublishableEntity: public Entity {
class LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity {
public:
bool isPublished() const { return published_; }
@ -89,7 +125,7 @@ private:
bool published_;
};
class CPPUHELPER_DLLPUBLIC EnumTypeEntity: public PublishableEntity {
class LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity {
public:
struct Member {
Member(rtl::OUString const & theName, sal_Int32 theValue):
@ -114,7 +150,7 @@ private:
std::vector< Member > members_;
};
class CPPUHELPER_DLLPUBLIC PlainStructTypeEntity: public PublishableEntity {
class LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity {
public:
struct Member {
Member(rtl::OUString const & theName, rtl::OUString const & theType):
@ -145,7 +181,7 @@ private:
std::vector< Member > directMembers_;
};
class CPPUHELPER_DLLPUBLIC PolymorphicStructTypeTemplateEntity:
class LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
public PublishableEntity
{
public:
@ -182,7 +218,7 @@ private:
std::vector< Member > members_;
};
class CPPUHELPER_DLLPUBLIC ExceptionTypeEntity: public PublishableEntity {
class LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public PublishableEntity {
public:
struct Member {
Member(rtl::OUString const & theName, rtl::OUString const & theType):
@ -213,7 +249,7 @@ private:
std::vector< Member > directMembers_;
};
class CPPUHELPER_DLLPUBLIC InterfaceTypeEntity: public PublishableEntity {
class LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public PublishableEntity {
public:
struct Attribute {
Attribute(
@ -306,7 +342,7 @@ private:
std::vector< Method > directMethods_;
};
class CPPUHELPER_DLLPUBLIC TypedefEntity: public PublishableEntity {
class LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity {
public:
SAL_DLLPRIVATE TypedefEntity(bool published, rtl::OUString const & type):
PublishableEntity(SORT_TYPEDEF, published), type_(type)
@ -320,16 +356,69 @@ private:
rtl::OUString type_;
};
class CPPUHELPER_DLLPUBLIC ConstantGroupEntity: public PublishableEntity {
struct LO_DLLPUBLIC_UNOIDL ConstantValue {
enum Type {
TYPE_BOOLEAN, TYPE_BYTE, TYPE_SHORT, TYPE_UNSIGNED_SHORT, TYPE_LONG,
TYPE_UNSIGNED_LONG, TYPE_HYPER, TYPE_UNSIGNED_HYPER, TYPE_FLOAT,
TYPE_DOUBLE };
explicit ConstantValue(bool value): type(TYPE_BOOLEAN), booleanValue(value)
{}
explicit ConstantValue(sal_Int8 value): type(TYPE_BYTE), byteValue(value) {}
explicit ConstantValue(sal_Int16 value): type(TYPE_SHORT), shortValue(value)
{}
explicit ConstantValue(sal_uInt16 value):
type(TYPE_UNSIGNED_SHORT), unsignedShortValue(value)
{}
explicit ConstantValue(sal_Int32 value): type(TYPE_LONG), longValue(value)
{}
explicit ConstantValue(sal_uInt32 value):
type(TYPE_UNSIGNED_LONG), unsignedLongValue(value)
{}
explicit ConstantValue(sal_Int64 value): type(TYPE_HYPER), hyperValue(value)
{}
explicit ConstantValue(sal_uInt64 value):
type(TYPE_UNSIGNED_HYPER), unsignedHyperValue(value)
{}
explicit ConstantValue(float value): type(TYPE_FLOAT), floatValue(value) {}
explicit ConstantValue(double value): type(TYPE_DOUBLE), doubleValue(value)
{}
Type type;
union {
bool booleanValue;
sal_Int8 byteValue;
sal_Int16 shortValue;
sal_uInt16 unsignedShortValue;
sal_Int32 longValue;
sal_uInt32 unsignedLongValue;
sal_Int64 hyperValue;
sal_uInt64 unsignedHyperValue;
float floatValue;
double doubleValue;
};
};
class LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public PublishableEntity {
public:
struct Member {
Member(rtl::OUString const & theName, css::uno::Any const & theValue):
Member(rtl::OUString const & theName, ConstantValue const & theValue):
name(theName), value(theValue)
{}
rtl::OUString name;
css::uno::Any value;
ConstantValue value;
};
SAL_DLLPRIVATE ConstantGroupEntity(
@ -345,7 +434,7 @@ private:
std::vector< Member > members_;
};
class CPPUHELPER_DLLPUBLIC SingleInterfaceBasedServiceEntity:
class LO_DLLPUBLIC_UNOIDL SingleInterfaceBasedServiceEntity:
public PublishableEntity
{
public:
@ -402,7 +491,7 @@ private:
std::vector< Constructor > constructors_;
};
class CPPUHELPER_DLLPUBLIC AccumulationBasedServiceEntity:
class LO_DLLPUBLIC_UNOIDL AccumulationBasedServiceEntity:
public PublishableEntity
{
public:
@ -473,7 +562,7 @@ private:
std::vector< Property > directProperties_;
};
class CPPUHELPER_DLLPUBLIC InterfaceBasedSingletonEntity:
class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity:
public PublishableEntity
{
public:
@ -491,7 +580,7 @@ private:
rtl::OUString base_;
};
class CPPUHELPER_DLLPUBLIC ServiceBasedSingletonEntity: public PublishableEntity
class LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity
{
public:
SAL_DLLPRIVATE ServiceBasedSingletonEntity(
@ -507,8 +596,9 @@ private:
rtl::OUString base_;
};
class CPPUHELPER_DLLPUBLIC Provider: public salhelper::SimpleReferenceObject {
class LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
public:
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createRootCursor() const = 0;
protected:
@ -517,10 +607,11 @@ protected:
virtual SAL_DLLPRIVATE ~Provider() throw ();
};
CPPUHELPER_DLLPUBLIC rtl::Reference< Provider > loadProvider(
// throws FileFormatException, NoSuchFileException:
LO_DLLPUBLIC_UNOIDL rtl::Reference< Provider > loadProvider(
rtl::OUString const & uri);
} }
}
#endif

57
unoidl/inc/unoidl/unoidlprovider.hxx Normal file
View file

@ -0,0 +1,57 @@
/* -*- 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/.
*/
#ifndef INCLUDED_UNOIDL_UNOIDLPROVIDER_HXX
#define INCLUDED_UNOIDL_UNOIDLPROVIDER_HXX
#include "sal/config.h"
#include "rtl/ref.hxx"
#include "sal/types.h"
#include "unoidl/detail/dllapi.hxx"
#include "unoidl/unoidl.hxx"
namespace rtl { class OUString; }
namespace unoidl { namespace detail {
class MappedFile;
struct MapEntry;
} }
namespace unoidl {
class LO_DLLPUBLIC_UNOIDL UnoidlProvider: public Provider {
public:
// throws FileFormatException, NoSuchFileException:
explicit UnoidlProvider(rtl::OUString const & uri);
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createRootCursor() const;
// throws FileFormatException:
sal_uInt32 find(rtl::OUString const & name, bool * constant = 0) const;
// throws FileFormatException:
rtl::Reference< Entity > getEntity(sal_uInt32 offset) const;
// throws FileFormatException:
ConstantValue getConstant(sal_uInt32 offset) const;
private:
virtual SAL_DLLPRIVATE ~UnoidlProvider() throw ();
rtl::Reference< detail::MappedFile > file_;
detail::MapEntry const * mapBegin_;
sal_uInt32 mapSize_;
};
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
unoidl/prj/build.lst Normal file
View file

@ -0,0 +1,2 @@
un unoidl: sal salhelper NULL
un unoidl\prj nmake - all un_prj NULL

0
unoidl/prj/d.lst Normal file
View file

13
cppuhelper/source/unoidl.cxx → unoidl/source/unoidl.cxx
View file

@ -11,13 +11,16 @@
#include <vector>
#include "cppuhelper/unoidl.hxx"
#include "rtl/ref.hxx"
#include "rtl/ustring.hxx"
#include "unoidl/unoidl.hxx"
#include "unoidl/unoidlprovider.hxx"
#include "unoidlprovider.hxx"
namespace unoidl {
namespace cppu { namespace unoidl {
NoSuchFileException::~NoSuchFileException() throw () {}
FileFormatException::~FileFormatException() throw () {}
Entity::~Entity() throw () {}
@ -54,10 +57,10 @@ ServiceBasedSingletonEntity::~ServiceBasedSingletonEntity() throw () {}
Provider::~Provider() throw () {}
rtl::Reference< Provider > loadProvider(rtl::OUString const & uri) {
rtl::Reference< Provider > loadProvider(OUString const & uri) {
return new UnoidlProvider(uri);
}
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

704
cppuhelper/source/unoidlprovider.cxx → unoidl/source/unoidlprovider.cxx
View file

File diff suppressed because it is too large Load diff

2
ure/source/README
View file

@ -50,6 +50,7 @@ Linux x86, Solaris x86, and Solaris SPARC:
/opt/openoffice.org/ure/lib/unorc [private]
/opt/openoffice.org/ure/lib/libreg.so.3 [private]
/opt/openoffice.org/ure/lib/libstore.so.3 [private]
/opt/openoffice.org/ure/lib/libunoidl.so [private]
/opt/openoffice.org/ure/lib/libxmlreader.so [private]
/opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3 [private; Linux x86 only]
/opt/openoffice.org/ure/lib/libjvmaccessC52.so.3 [private; Solaris only]
@ -110,6 +111,7 @@ Program Files\URE\bin\libxml2.dll [external]
Program Files\URE\bin\uno.ini [private]
Program Files\URE\bin\reg3.dll [private]
Program Files\URE\bin\store3.dll [private]
Program Files\URE\bin\unoidl.dll [private]
Program Files\URE\bin\xmlreader.dll [private]
Program Files\URE\bin\jvmaccess3MSC.dll [private]
Program Files\URE\bin\jvmfwk3.dll [private]