From f1bca26afcc7593d0124c216c0400a9e2e47fc1d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 26 Jan 2013 16:31:43 +0100 Subject: Remove redundant braces around for loops ...that had once been workarounds for compilers that did not yet support the C++98 scoping rules for declarations in for-init-statements. Change-Id: I51dc42982b30bf3adea6de1a10a91c0b4b4acfbe --- stoc/source/registry_tdprovider/tdiface.cxx | 12 ++++++------ stoc/source/registry_tdprovider/tdprovider.cxx | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'stoc') diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx index 303de97dd5ad..0ec64d9e4c8e 100644 --- a/stoc/source/registry_tdprovider/tdiface.cxx +++ b/stoc/source/registry_tdprovider/tdiface.cxx @@ -450,19 +450,19 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio TYPEREG_VERSION_1); sal_Int32 count = 0; sal_uInt16 methodCount = reader.getMethodCount(); - {for (sal_uInt16 i = 0; i < methodCount; ++i) { + for (sal_uInt16 i = 0; i < methodCount; ++i) { RTMethodMode flags = reader.getMethodFlags(i); if (flags != RT_MODE_ATTRIBUTE_GET && flags != RT_MODE_ATTRIBUTE_SET) { ++count; } - }} + } sal_uInt16 fieldCount = reader.getFieldCount(); count += fieldCount; _members.realloc(count); sal_Int32 index = 0; - {for (sal_uInt16 i = 0; i < fieldCount; ++i) { + for (sal_uInt16 i = 0; i < fieldCount; ++i) { rtl::OUString name(reader.getFieldName(i)); rtl::OUStringBuffer typeName(getName()); typeName.appendAscii(RTL_CONSTASCII_STRINGPARAM("::")); @@ -504,8 +504,8 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio (flags & RT_ACCESS_BOUND) != 0, getter, setter, _nBaseOffset + index); ++index; - }} - {for (sal_uInt16 i = 0; i < methodCount; ++i) { + } + for (sal_uInt16 i = 0; i < methodCount; ++i) { RTMethodMode flags = reader.getMethodFlags(i); if (flags != RT_MODE_ATTRIBUTE_GET && flags != RT_MODE_ATTRIBUTE_SET) @@ -520,7 +520,7 @@ Sequence< Reference< XInterfaceMemberTypeDescription > > InterfaceTypeDescriptio _aBytes, i, flags == RT_MODE_ONEWAY, _nBaseOffset + index); ++index; } - }} + } _membersInit = true; } return _members; diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx index a2d88ee0e7f2..87089a9adfb6 100644 --- a/stoc/source/registry_tdprovider/tdprovider.cxx +++ b/stoc/source/registry_tdprovider/tdprovider.cxx @@ -472,19 +472,19 @@ com::sun::star::uno::Reference< XTypeDescription > createTypeDescription( { sal_uInt16 n = aReader.getSuperTypeCount(); com::sun::star::uno::Sequence< rtl::OUString > aBaseTypeNames(n); - {for (sal_uInt16 i = 0; i < n; ++i) { + for (sal_uInt16 i = 0; i < n; ++i) { aBaseTypeNames[i] = aReader.getSuperTypeName(i).replace( '/', '.'); - }} + } sal_uInt16 n2 = aReader.getReferenceCount(); com::sun::star::uno::Sequence< rtl::OUString > aOptionalBaseTypeNames(n2); - {for (sal_uInt16 i = 0; i < n2; ++i) { + for (sal_uInt16 i = 0; i < n2; ++i) { OSL_ASSERT( aReader.getReferenceSort(i) == RT_REF_SUPPORTS && aReader.getReferenceFlags(i) == RT_ACCESS_OPTIONAL); aOptionalBaseTypeNames[i] = aReader.getReferenceTypeName(i); - }} + } return com::sun::star::uno::Reference< XTypeDescription >( new InterfaceTypeDescriptionImpl( xNameAccess, aName, -- cgit v1.2.3