summaryrefslogtreecommitdiff
path: root/stoc/test
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 11:01:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-27 11:01:26 +0000
commit414c097c65bb7925eef9ddc158b112228b49ed12 (patch)
treede9571ec116da8f9a4c0033c55a7ad6c4fb890c5 /stoc/test
parent45bb07d39bdd63e741b4fe692a3a0d421a642a79 (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'stoc/test')
-rw-r--r--stoc/test/makefile.mk5
-rw-r--r--stoc/test/testintrosp.cxx8
-rw-r--r--stoc/test/testsmgr.cxx7
3 files changed, 10 insertions, 10 deletions
diff --git a/stoc/test/makefile.mk b/stoc/test/makefile.mk
index 8dab660c32de..de90b5a645ab 100644
--- a/stoc/test/makefile.mk
+++ b/stoc/test/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.19 $
+# $Revision: 1.20 $
#
-# last change: $Author: dbo $ $Date: 2002-11-13 11:00:23 $
+# last change: $Author: hr $ $Date: 2003-03-27 12:01:24 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -262,6 +262,7 @@ $(BIN)$/stoctest.rdb: $(ALLIDLFILES)
+idlc -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
+regmerge $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
+regmerge $@ / $(SOLARBINDIR)$/udkapi.rdb
+ +regcomp -register -r $@ -c corefl
touch $@
$(MISC)$/test_types_generated.flag : $(BIN)$/stoctest.rdb makefile.mk
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 7fe0d8c45606..f3aaa4b02fcf 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testintrosp.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hr $ $Date: 2002-08-19 14:16:58 $
+ * last change: $Author: hr $ $Date: 2003-03-27 12:01:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -201,7 +201,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
{
float f;
aValue >>= f;
- sprintf( pBuffer, "%f", f );
+ snprintf( pBuffer, sizeof( pBuffer ), "%f", f );
aRetStr = OUString( pBuffer, strlen( pBuffer ), RTL_TEXTENCODING_ASCII_US );
break;
}
@@ -209,7 +209,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
{
double d;
aValue >>= d;
- sprintf( pBuffer, "%f", d );
+ snprintf( pBuffer, sizeof( pBuffer ), "%f", d );
aRetStr = OUString( pBuffer, strlen( pBuffer ), RTL_TEXTENCODING_ASCII_US );
break;
}
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index 056be4fdcbea..e51e3aba87f9 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: testsmgr.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: hr $ $Date: 2001-10-31 16:02:09 $
+ * last change: $Author: hr $ $Date: 2003-03-27 12:01:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -141,7 +141,7 @@ void setStarUserRegistry()
-int SAL_CALL main()
+void SAL_CALL main()
{
printf( "ServiceManagerTest : \r");
setStarUserRegistry();
@@ -149,5 +149,4 @@ int SAL_CALL main()
test_ServiceManager();
printf( "ServiceManagerTest : OK\n" );
- return 0;
}