summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2010-03-03 13:05:39 +0100
committerIvo Hinkelmann <ihi@openoffice.org>2010-03-03 13:05:39 +0100
commit2245eadb5d23c2df70aeccef8b00121afed80a0a (patch)
tree5c1c31a2ede06c2c46b68040ff6376b555306fc7
parent2e7d9a031bd8facc86f8fab2793469fc350ca37c (diff)
parent96372859c9e31c80a3da5022c6328c7fc390e254 (diff)
CWS-TOOLING: integrate CWS sdk330
Notes
split repo tag: sdk_ooo/DEV300_m74 split repo tag: sdk_ooo/DEV300_m75
Diffstat
-rw-r--r--autodoc/source/display/html/cfrstd.cxx4
-rw-r--r--odk/docs/images/sdk_head-1.gifbin10980 -> 10949 bytes
-rw-r--r--odk/docs/install.html4
-rw-r--r--odk/docs/notsupported.html2
-rw-r--r--odk/docs/tools.html5
-rw-r--r--odk/examples/DevelopersGuide/examples.html4
-rw-r--r--odk/examples/examples.html4
-rw-r--r--odk/index.html8
-rw-r--r--odk/pack/copying/apiref-autodoc.since27
-rw-r--r--odk/pack/copying/makefile.mk7
-rw-r--r--odk/util/makefile.pmk2
11 files changed, 19 insertions, 48 deletions
diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx
index 1093932699ce..3bf56afb07cc 100644
--- a/autodoc/source/display/html/cfrstd.cxx
+++ b/autodoc/source/display/html/cfrstd.cxx
@@ -336,9 +336,9 @@ MakeCopyRight()
plt = localtime(&gt);
int year = 1900 + plt->tm_year;
- cr << "Copyright &copy; "
+ cr << "Copyright &copy; 1995, "
<< year
- << " Oracle";
+ << ", Oracle and/or its affiliates. All rights reserved.";
return String(cr.c_str());
}
diff --git a/odk/docs/images/sdk_head-1.gif b/odk/docs/images/sdk_head-1.gif
index 015250e0e612..53bf8a54685a 100644
--- a/odk/docs/images/sdk_head-1.gif
+++ b/odk/docs/images/sdk_head-1.gif
Binary files differ
diff --git a/odk/docs/install.html b/odk/docs/install.html
index f29b099334b0..e11440538bb5 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -407,12 +407,12 @@
</tr>
<tr>
<td colspan="3">
- <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
+ <div align="center"><p>Copyright &copy; 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div>
</td>
</tr>
</table>
<map name="Map">
- <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
+ <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
</map>
</body>
</html>
diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html
index c3e40cc60ee1..ce02acedb3c0 100644
--- a/odk/docs/notsupported.html
+++ b/odk/docs/notsupported.html
@@ -1 +1 @@
-<html> <head> <title>[TITLE] - Not supported page</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="J&uuml;rgen Schmidt"> <meta name="created" content="2004-12-14"> </head> <body class="sdkbody"> <table class="table1" cellpadding=0> <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; "> <td colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> <td align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"> <table class="table2"> <tr> <td> <p align="center"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></p> </td> </tr> <tr> <td><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> <td> <p class="note">This page is currently not supported!</p> </td> </tr> </table> </td> </tr> <tr> <td colspan="3"><img class="nothing30" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td colspan="3"> <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div> </td> </tr> </table> <map name="Map"> <area shape="rect" coords="10,68,93,105" href="http://www.sun.com"> </map> </body> </html> \ No newline at end of file
+<html> <head> <title>[TITLE] - Not supported page</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="J&uuml;rgen Schmidt"> <meta name="created" content="2004-12-14"> </head> <body class="sdkbody"> <table class="table1" cellpadding=0> <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; "> <td colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> <td align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"> <table class="table2"> <tr> <td> <p align="center"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></p> </td> </tr> <tr> <td><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> <td> <p class="note">This page is currently not supported!</p> </td> </tr> </table> </td> </tr> <tr> <td colspan="3"><img class="nothing30" src="images/nada.gif"></td> </tr> <tr> <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td colspan="3"> <div align="center"><p>Copyright &copy; 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div> </td> </tr> </table> <map name="Map"> <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com"> </map> </body> </html> \ No newline at end of file
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 21d2fbe56833..b02265dfb488 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -1081,13 +1081,12 @@ types the specified types depend on.</p>
</tr>
<tr>
<td colspan="3">
- <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
+ <div align="center"><p>Copyright &copy; 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div>
</td>
</tr>
</table>
<map name="Map">
- <area shape="rect" coords="10,10,80,50" href="http://www.sun.com">
- <area shape="rect" coords="155,65,335,85" href="../index.html">
+ <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
</map>
</body>
</html>
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index edf21ce4e2ba..da1453107f49 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -3022,14 +3022,14 @@ for the Office application.</td>
<tr>
<td colspan="3">
<div align="center">
- <p>Copyright 2009 Sun Microsystems, Inc.</p>
+ <p>Copyright &copy; 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p>
</div>
</td>
</tr>
</tbody>
</table>
<map name="Map">
-<area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
+<area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
</map>
</body>
</html>
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index 03ca9f1c9d8d..395c59682b2a 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -737,12 +737,12 @@
</tr>
<tr>
<td colspan="3">
- <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
+ <div align="center"><p>Copyright &copy; 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div>
</td>
</tr>
</table>
<map name="Map">
- <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
+ <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
</map>
</body>
</html>
diff --git a/odk/index.html b/odk/index.html
index 723a65c406d5..ace6cbeb65a0 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -166,8 +166,8 @@
</tr>
<tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
- <td colspan="2"><a target="_blank" href="http://www.sun.com/developers/" title="link to the Sun Developer Resources (online)">Sun Developer Resources</a></td>
- <td class="content70">Sun's one-stop location for Developers.</td>
+ <td colspan="2"><a target="_blank" href="http://www.sun.com/developers/" title="link to the Sun Developer Resources (online)">Oracle Developer Network</a></td>
+ <td class="content70">A Community for Developers</td>
</tr>
<tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
@@ -202,12 +202,12 @@
</tr>
<tr>
<td colspan="3">
- <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
+ <div align="center"><p>Copyright &copy; 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div>
</td>
</tr>
</table>
<map name="Map">
- <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
+ <area shape="rect" coords="10,68,93,105" href="http://www.oracle.com">
</map>
</body>
</html>
diff --git a/odk/pack/copying/apiref-autodoc.since b/odk/pack/copying/apiref-autodoc.since
deleted file mode 100644
index c374a1d23740..000000000000
--- a/odk/pack/copying/apiref-autodoc.since
+++ /dev/null
@@ -1,27 +0,0 @@
-"3.3.0" "OpenOffice 3.3.0"
-"3.3" "OpenOffice 3.3"
-"3.2.0" "OpenOffice 3.2.0"
-"3.2" "OpenOffice 3.2"
-"3.1.0" "OpenOffice 3.1.0"
-"3.1" "OpenOffice 3.1"
-"3.0.1" "OpenOffice 3.0.1"
-"3.0.0" "OpenOffice 3.0.0"
-"3.0" "OpenOffice 3.0"
-"2.4.1" "OpenOffice 2.4.1"
-"2.4.0" "OpenOffice 2.4.0"
-"2.4" "OpenOffice 2.4"
-"2.3.1" "OpenOffice 2.3.1"
-"2.3.0" "OpenOffice 2.3.0"
-"2.3" "OpenOffice 2.3"
-"2.2.1" "OpenOffice 2.2.1"
-"2.2.0" "OpenOffice 2.2.0"
-"2.2" "OpenOffice 2.2"
-"2.1" "OpenOffice 2.1"
-"2.0.6" "OpenOffice 2.0.6"
-"2.0.4" "OpenOffice 2.0.4"
-"2.0.3" "OpenOffice 2.0.3"
-"2.0.2" "OpenOffice 2.0.2"
-"2.0.1" "OpenOffice 2.0.1"
-"2.0.0" "OpenOffice 2.0"
-"2.0" "OpenOffice 2.0"
-"1.1.2" "OpenOffice 1.1.2"
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 76838708b150..5396496e1a3a 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -46,7 +46,6 @@ IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)$/module-ix.html
IDL_DOCU_CLEANUP_FLAG = $(MISC)$/idl_docu_cleanup.flag
IDL_CHAPTER_REFS=idl_chapter_refs.txt
-IDL_SINCE_TAGS=apiref-autodoc.since
EXELIST = \
$(DESTDIRBIN)$/cppumaker$(EXEPOSTFIX) \
@@ -245,14 +244,14 @@ $(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
$(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
@echo "tags converted" > $@
-$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(IDL_SINCE_TAGS) $(PRJ)$/docs$/common$/ref$/idl.css
+$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)$/docs$/common$/ref$/idl.css
@@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF)
$(TOUCH) $@
$(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG)
-$(MKDIRHIER) $(@:d)
- $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" -sincefile $(IDL_SINCE_TAGS) -name $(IDLDOCREFNAME) -lg \
- idl -dvgfile $(IDL_CHAPTER_REFS) -t $(DESTDIRIDL)
+ $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" \
+ -name $(IDLDOCREFNAME) -lg idl -dvgfile $(IDL_CHAPTER_REFS) -t $(DESTDIRIDL)
-rm $(@:d)$/idl.css
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/common$/ref$/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/idl.css
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index e48a3032860c..0eb4c76b625d 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -26,7 +26,7 @@
#*************************************************************************
# used for sdk common files
-PRODUCT_RELEASE=3.2
+PRODUCT_RELEASE=3.3
OFFICENAME=OpenOffice.org
SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 12:23:17 +0000