summaryrefslogtreecommitdiff
path: root/cppuhelper/test
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-14 15:15:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-14 15:15:22 +0000
commitf2abd69d6adfa4e1ad0369519d61a226d9d56857 (patch)
tree2ec45bbcb152d352eb5eb2c2afaffb629cc951d6 /cppuhelper/test
parente2f14d9061ab4015a69ece02428ba30f2c48b0ae (diff)
get this to build again
Diffstat (limited to 'cppuhelper/test')
-rw-r--r--cppuhelper/test/cfg_test.cxx4
-rw-r--r--cppuhelper/test/makefile.mk14
-rw-r--r--cppuhelper/test/testdefaultbootstrapping.cxx1
-rw-r--r--cppuhelper/test/testpropshlp.cxx16
4 files changed, 18 insertions, 17 deletions
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 2a0671867157..dfee341e5109 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -263,7 +263,7 @@ SAL_IMPLEMENT_MAIN()
// show what is in context
xContext->getValueByName( OUSTR("dump_maps") );
- sal_Int32 n;
+ sal_Int32 n(0);
OSL_VERIFY( xContext->getValueByName( OUSTR("/global-context-properties/TestValue") ) >>= n );
::fprintf( stderr, "> n=%d\n", n );
@@ -272,7 +272,7 @@ SAL_IMPLEMENT_MAIN()
OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.script.theConverter") ) >>= x );
OSL_VERIFY( xContext->getValueByName( OUSTR("/singletons/com.sun.star.bootstrap.theTestComponent0") ) >>= x );
- ::fprintf( stderr, "> registering service...\n", n );
+ ::fprintf( stderr, "> registering service...\n");
#if defined(SAL_W32) || defined(SAL_OS2)
OUString libName( OUSTR("cfg_test.dll") );
#elif defined(SAL_UNX)
diff --git a/cppuhelper/test/makefile.mk b/cppuhelper/test/makefile.mk
index 26e1cb394d3e..2746b3f07c1c 100644
--- a/cppuhelper/test/makefile.mk
+++ b/cppuhelper/test/makefile.mk
@@ -141,15 +141,15 @@ $(UNO_OUT)$/%$(EXT_SO): $(UNO_PATH)$/%$(EXT_SO)
$(COPY) $^ $@
$(BIN)$/cpputest.rdb: $(ALLIDLFILES) $(UNO_OUT)$/invocadapt.uno$(EXT_SO) $(UNO_OUT)$/bootstrap.uno$(EXT_SO)
- idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $(ALLIDLFILES)
- regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
- regmerge $@ / $(UNOUCRRDB)
- regcomp -register -r $@ -c reflection.uno$(DLLPOST)
- touch $@
+ $(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $(ALLIDLFILES)
+ $(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
+ $(REGMERGE) $@ / $(UNOUCRRDB)
+ $(REGCOMP) -register -r $@ -c reflection.uno$(DLLPOST)
+ $(TOUCH) $@
unoheader: $(BIN)$/cpputest.rdb
- cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb
- cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(FACTORYTYPES)" $(BIN)$/cpputest.rdb
+ $(CPPUMAKER) $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb
+ $(CPPUMAKER) $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(FACTORYTYPES)" $(BIN)$/cpputest.rdb
$(BIN)$/testdefaultbootstrapping.pl: testdefaultbootstrapping.pl
diff --git a/cppuhelper/test/testdefaultbootstrapping.cxx b/cppuhelper/test/testdefaultbootstrapping.cxx
index fce0a1242a82..82172c26d838 100644
--- a/cppuhelper/test/testdefaultbootstrapping.cxx
+++ b/cppuhelper/test/testdefaultbootstrapping.cxx
@@ -39,6 +39,7 @@
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
using namespace ::cppu;
using namespace ::com::sun::star::lang;
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index da6597d58493..de5624bc90b1 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -495,7 +495,7 @@ public:
OSL_ENSURE( pExceptedListenerValues[nCurrent].getValueType().getTypeClass() == TypeClass_SHORT ,
"PropertySetHelper: wrong data type" );
- sal_Int16 nInt16, nOldInt16;
+ sal_Int16 nInt16(0), nOldInt16(0);
pExceptedListenerValues[nCurrent] >>= nInt16;
evt.OldValue >>= nOldInt16;
OSL_ENSURE( nInt16 == nOldInt16, "PropertySetHelper: wrong old value" );
@@ -511,7 +511,7 @@ public:
{
OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
- sal_Int32 nInt32,nOldInt32;
+ sal_Int32 nInt32(0),nOldInt32(0);
pExceptedListenerValues[nCurrent] >>= nInt32;
evt.OldValue >>= nOldInt32;
@@ -550,7 +550,7 @@ public:
{
OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
- sal_Int16 nInt16, nOldInt16;
+ sal_Int16 nInt16(0), nOldInt16(0);
pExceptedListenerValues[nCurrent] >>= nInt16;
evt.OldValue >>= nOldInt16;
@@ -572,7 +572,7 @@ public:
{
OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
- sal_Int32 nInt32,nOldInt32;
+ sal_Int32 nInt32(0),nOldInt32(0);
pExceptedListenerValues[nCurrent] >>= nInt32;
evt.OldValue >>= nOldInt32;
OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" );
@@ -613,7 +613,7 @@ public:
{
OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), "PropertySetHelper: wrong name" );
- sal_Int16 nInt16, nOldInt16;
+ sal_Int16 nInt16(0), nOldInt16(0);
pExceptedListenerValues[nCurrent] >>= nInt16;
evt.OldValue >>= nOldInt16;
OSL_ENSURE( nInt16 == nOldInt16 , "PropertySetHelper: wrong old value" );
@@ -630,7 +630,7 @@ public:
OSL_ENSURE( evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), "PropertySetHelper: wrong name" );
- sal_Int32 nInt32,nOldInt32;
+ sal_Int32 nInt32(0),nOldInt32(0);
pExceptedListenerValues[nCurrent] >>= nInt32;
evt.OldValue >>= nOldInt32;
OSL_ENSURE( nInt32 == nOldInt32 , "PropertySetHelper: wrong old value" );
@@ -1011,7 +1011,7 @@ void test_PropertySetHelper()
b = *((sal_Bool*)aValue.getValue());
OSL_ENSURE( !b, "PropertySetHelper: wrong BOOL value" );
- sal_Int16 n16;
+ sal_Int16 n16(0);
aValue <<=(sal_Int16)22;
xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ), aValue );
aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT16") ) );
@@ -1028,7 +1028,7 @@ void test_PropertySetHelper()
aValue <<= (sal_Int16)55;
xPS->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ), aValue );
aValue = xPS->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("INT32") ) );
- sal_Int32 n32;
+ sal_Int32 n32(0);
aValue >>= n32;
OSL_ENSURE( 55 == n32 , "PropertySetHelper: wrong INT32 value" );
aValue <<= (sal_Int16)66;