diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:20:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:20:58 +0000 |
| commit | af779e34fe5b236269fa0bd4679ffd014bd06839 (patch) | |
| tree | 65ae5358d9f4b2a346a7a9727ccb38c84a5363df /cppu | |
| parent | 80996b7b2ade760ed1adf72a56e261c955f82516 (diff) | |
INTEGRATION: CWS sb71 (1.3.38); FILE MERGED
2007/08/23 16:57:38 sb 1.3.38.4: RESYNC: (1.3-1.4); FILE MERGED
2007/06/22 13:27:17 sb 1.3.38.3: Made code warning-free on unxmacxi.pro.
2007/06/22 12:34:55 sb 1.3.38.2: #i75466# Support for dynamic loading of the reg shared library has been dropped.
2007/06/22 12:31:39 sb 1.3.38.1: #i78114# Merged in 1.3.36.1.
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/test/alignment/pass1.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cppu/test/alignment/pass1.cxx b/cppu/test/alignment/pass1.cxx index 4f41d455f047..50422a8d0334 100644 --- a/cppu/test/alignment/pass1.cxx +++ b/cppu/test/alignment/pass1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pass1.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2007-07-18 12:24:36 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:20:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,6 +55,8 @@ #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/registry/XSimpleRegistry.hpp> #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #define OSTR(x) ::rtl::OUStringToOString( x, RTL_TEXTENCODING_ASCII_US ) @@ -71,16 +73,13 @@ static void find_all_structs( Reference< registry::XRegistryKey > const & xKey, ::std::vector< OUString > * pNames ) { - static RegistryTypeReaderLoader s_loader; - OSL_VERIFY( s_loader.isLoaded() ); - if (xKey.is() && xKey->isValid()) { if (xKey->getValueType() == registry::RegistryValueType_BINARY) { Sequence< sal_Int8 > aBytes( xKey->getBinaryValue() ); RegistryTypeReader aReader( - s_loader, (const sal_uInt8 *)aBytes.getConstArray(), + (const sal_uInt8 *)aBytes.getConstArray(), aBytes.getLength(), sal_False ); switch (aReader.getTypeClass()) @@ -205,18 +204,19 @@ SAL_IMPLEMENT_MAIN() OString cppName( makeCppName( name ) ); fprintf( - hPass2, "\tBINTEST_VERIFYSIZE( %s, %d );\n", - cppName.getStr(), pTD->nSize ); + hPass2, "\tBINTEST_VERIFYSIZE( %s, %ld );\n", + cppName.getStr(), static_cast< long >(pTD->nSize) ); fprintf( - hPass2, "\tBINTEST_VERIFYALIGNMENT( %s, %d );\n", - cppName.getStr(), pTD->nAlignment ); + hPass2, "\tBINTEST_VERIFYALIGNMENT( %s, %ld );\n", + cppName.getStr(), static_cast< long >(pTD->nAlignment) ); // offset checks for ( sal_Int32 nPos2 = pCTD->nMembers; nPos2--; ) { OString memberName( OSTR(pCTD->ppMemberNames[ nPos2 ]) ); fprintf( - hPass2, "\tBINTEST_VERIFYOFFSET( %s, %s, %d );\n", - cppName.getStr(), memberName.getStr(), pCTD->pMemberOffsets[ nPos2 ] ); + hPass2, "\tBINTEST_VERIFYOFFSET( %s, %s, %ld );\n", + cppName.getStr(), memberName.getStr(), + static_cast< long >(pCTD->pMemberOffsets[ nPos2 ]) ); } typelib_typedescription_release( pTD ); } |