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

Don't use local types as template arguments (C++11 only feature)

Browse source 
Change-Id: I19b7105b62464234cb72de701b07176f951a7951
This commit is contained in:
Stephan Bergmann 2013-03-02 00:01:08 +01:00
parent 12353c7386
commit 97b3bf8b03
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
unoidl/source/reg2unoidl.cxx
View file

@ -246,19 +246,31 @@ void writeKind(
write8(file, v);
}
struct Item {
explicit Item(rtl::Reference< unoidl::Entity > const & theEntity):
entity(theEntity)
{}
rtl::Reference< unoidl::Entity > entity;
sal_uInt64 nameOffset;
sal_uInt64 dataOffset;
};
struct ConstItem {
explicit ConstItem(unoidl::ConstantValue const & theConstant):
constant(theConstant)
{}
unoidl::ConstantValue constant;
sal_uInt64 nameOffset;
sal_uInt64 dataOffset;
};
sal_uInt64 writeMap(
osl::File & file, rtl::Reference< unoidl::MapCursor > const & cursor,
std::size_t * rootSize)
{
assert(cursor.is());
struct Item {
explicit Item(rtl::Reference< unoidl::Entity > const & theEntity):
entity(theEntity)
{}
rtl::Reference< unoidl::Entity > entity;
sal_uInt64 nameOffset;
sal_uInt64 dataOffset;
};
std::map< OUString, Item > map;
for (;;) {
OUString name;
@ -468,15 +480,6 @@ sal_uInt64 writeMap(
rtl::Reference< unoidl::ConstantGroupEntity > ent2(
static_cast< unoidl::ConstantGroupEntity * >(
i->second.entity.get()));
struct ConstItem {
explicit ConstItem(
unoidl::ConstantValue const & theConstant):
constant(theConstant)
{}
unoidl::ConstantValue constant;
sal_uInt64 nameOffset;
sal_uInt64 dataOffset;
};
std::map< OUString, ConstItem > cmap;
for (std::vector< unoidl::ConstantGroupEntity::Member >::
const_iterator j(ent2->getMembers().begin());