summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2010-04-14 12:17:56 +0200
committerKurt Zenker <kz@openoffice.org>2010-04-14 12:17:56 +0200
commit3367f86b048d6d14dd05ed99265dfaa6fd1be8ff (patch)
tree14dfd04dd9c483af201542bb83917f18825a8cf0
parent4c8cad6567cd3ec7ec6eee25beff861767ff8d9f (diff)
parent7587ad653bea00f4acd0cd91a0de8039a391d711 (diff)
CWS-TOOLING: integrate CWS nativea2ooo/OOO320_m15
-rw-r--r--rsc/source/parser/erscerr.cxx2
-rw-r--r--sot/source/sdstor/sdintern.hdb22
2 files changed, 1 insertions, 23 deletions
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index cd7d99439c..dfb7c7c1bd 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -199,7 +199,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
case ERR_NOINPUT:
StdLstErr( "Input file was not specified.\n");
case ERR_USAGE:
- StdLstOut( "Copyright (C) 1990-92 STAR DIVISION GmbH\n" );
+ StdLstOut( "Copyright (C) 2000, 2010 Oracle and/or its affiliates.\n" );
{
char buf[40];
diff --git a/sot/source/sdstor/sdintern.hdb b/sot/source/sdstor/sdintern.hdb
deleted file mode 100644
index 4dfbc69be0..0000000000
--- a/sot/source/sdstor/sdintern.hdb
+++ /dev/null
@@ -1,22 +0,0 @@
-write "/*************************************************************************"
-write "* SDINTERN.HXX"
-write "* __DATE__"
-write "* (c) 1992-1995 STAR DIVISION"
-write "*************************************************************************/"
-write "#ifndef _SDINTERN_HXX"
-write "#define _SDINTERN_HXX"
-write "#ifndef _SOLAR_H"
-write "#include <tools/solar.h>"
-write "#endif"
-write "#ifndef _STREAM_HXX"
-write "#include <tools/stream.hxx>"
-write "#endif"
-file stg.hxx
-file stgelem.hxx
-file stgcache.hxx
-file stgio.hxx
-file stgstrms.hxx
-file stgavl.hxx
-file stgdir.hxx
-write "#endif"
-