diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 13:29:10 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 13:29:10 +0200 |
| commit | 7ce3cfb11f2d4c0f6e8f41a4e3a37b984d71f883 (patch) | |
| tree | c86046b3633579fc64acbcb4de7dd67a4be5414f | |
| parent | 34713223a006e3c950aa9022f8746a0c7ee5f50e (diff) | |
| parent | 5e78aab210c94774781b86aa6489aea7fb747d06 (diff) | |
DEV300: merge masterfix ea9085d6db4c@DEV300
Notes
split repo tag: sdk_ooo/DEV300_m77
split repo tag: sdk_ooo/DEV300_m78
split repo tag: sdk_ooo/DEV300_m79
36 files changed, 406 insertions, 452 deletions
diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx index 3bf56afb07cc..3b45576c17ae 100644 --- a/autodoc/source/display/html/cfrstd.cxx +++ b/autodoc/source/display/html/cfrstd.cxx @@ -338,7 +338,7 @@ MakeCopyRight() cr << "Copyright © 1995, " << year - << ", Oracle and/or its affiliates. All rights reserved."; + << ", Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners."; return String(cr.c_str()); } diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css index 3fdb1a07a00c..6327b9243f80 100644 --- a/odk/docs/common/ref/idl.css +++ b/odk/docs/common/ref/idl.css @@ -6,9 +6,9 @@ body { background-color:#ffffff; } #adc-idlref a { text-decoration: none; } -#adc-idlref a:link { color: #C44B01; } +#adc-idlref a:link { color: #0e85cd; } #adc-idlref a:visited { color: #638093; } -#adc-idlref a:active { color: #9DCA12; } +#adc-idlref a:active { color: #4dadea; } #adc-idlref h3 { font-size:13pt; font-weight:bold; @@ -26,13 +26,13 @@ body { background-color:#ffffff; } #adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold; line-height:30pt; - background-image:url(../../images/bg_table.gif); + background-image:url(../../images/bg_table.png); text-align:center; } #adc-idlref td.subtitle { font-family: Arial; font-size:13pt; line-height:20pt; - background-image:url(../../images/bg_table.gif); } + background-image:url(../../images/bg_table.png); } #adc-idlref td.crosstitle { font-size:12pt; font-weight:bold; @@ -40,15 +40,15 @@ body { background-color:#ffffff; } #adc-idlref td.imdetail { width:100%; - background-image:url(../../images/bg_table3.gif); } + background-image:url(../../images/bg_table3.png); } #adc-idlref td.imsum_left { width:30%; } #adc-idlref td.imsum_right { width:70%; } -#adc-idlref table.navimain { background-image:url(../../images/bg_table2.gif); } +#adc-idlref table.navimain { background-image:url(../../images/bg_table2.png); } #adc-idlref td.navimain - { background-image:url(../../images/bg_table2.gif); + { background-image:url(../../images/bg_table2.png); text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; padding-left:7pt; padding-right:7pt; } @@ -79,13 +79,12 @@ body { background-color:#ffffff; } #adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; } -#adc-idlref a:link.navimain, #adc-idlref a:link.navisub { color:#C44B01; } +#adc-idlref a:link.navimain, #adc-idlref a:link.navisub { color:#0e85cd; } #adc-idlref a:visited.navimain, #adc-idlref a:visited.navisub { color: #638093; } -#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #9DCA12; } +#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #4dadea; } #adc-idlref .dt { font-weight:bold; } -#adc-idlref .namechain { font-size:13pt; font-weight:bold; - margin-top:3pt; margin-bottom:6pt; } +#adc-idlref .namechain { font-size:13pt; font-weight:bold; margin-top:3pt; margin-bottom:6pt; } #adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; } #adc-idlref table { empty-cells:show; } diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css index d657b2b17244..b8286999bf19 100755..100644 --- a/odk/docs/cpp/ref/cpp.css +++ b/odk/docs/cpp/ref/cpp.css @@ -4,9 +4,9 @@ body { background-color:#ffffff; } #adc-cppref a { text-decoration: none; } -#adc-cppref a:link { color: #C44B01; } +#adc-cppref a:link { color: #0e85cd; } #adc-cppref a:visited { color: #638093; } -#adc-cppref a:active { color: #9DCA12; } +#adc-cppref a:active { color: #4dadea; } #adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; } #adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; } @@ -14,7 +14,7 @@ body { background-color:#ffffff; } #adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } #adc-cppref dl { margin-top:1pt; margin-bottom:1pt; } #adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; - background-image:url(../../images/bg_table3.gif); } + background-image:url(../../images/bg_table3.png); } #adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } #adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } #adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; } @@ -25,43 +25,43 @@ body { background-color:#ffffff; } #adc-cppref tr { font-size:10pt; } #adc-cppref td { font-size:10pt; } -#adc-cppref dt.attention { color:#dd0000; } +#adc-cppref dt.attention { color:#ff0000; } #adc-cppref div.title { text-align:center; line-height:26pt; - background-image:url(../../images/bg_table.gif); } -#adc-cppref .subtitle { background-image:url(../../images/bg_table.gif); } + background-image:url(../../images/bg_table.png); } +#adc-cppref .subtitle { background-image:url(../../images/bg_table.png); } -#adc-cppref td.flagname { background-image:url(../../images/bg_table2.gif); +#adc-cppref td.flagname { background-image:url(../../images/bg_table2.png); font-family:Arial; font-size:8pt; font-weight:bold; } #adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; } #adc-cppref td.flagno { font-family:Arial; font-size:8pt; } #adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; } #adc-cppref td.navimain, td.navimain a - { background-image:url(../../images/bg_table2.gif); + { background-image:url(../../images/bg_table2.png); font-family:Arial; font-size:12pt; font-weight:bold; } /* background-color:#eeeeff; color:#000000; */ #adc-cppref td.navimainself - { background-color:#2222ad; color:#ffffff; + { background-color:#226bb0; color:#ffffff; font-family:Arial; font-size:12pt; font-weight:bold; } #adc-cppref td.navimainnone - { background-image:url(../../images/bg_table2.gif); + { background-image:url(../../images/bg_table2.png); font-family:Arial; font-size:12pt; } -#adc-cppref div.define { font-family:Arial; background-color:#ccccff; } +#adc-cppref div.define { font-family:Arial; background-color:#87c2e6; } #adc-cppref .nqclass { color:#008800; } -#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; } +#adc-cppref h3.help { background-color:#cfe7f5; margin-top:12pt; } -#adc-cppref .btpubl { color:#33ff33; } -#adc-cppref .btprot { color:#cc9933; } -#adc-cppref .btpriv { color:#ff6666; } -#adc-cppref .btvpubl { color:#33ff33; font-style:italic; } -#adc-cppref .btvprot { color:#cc9933; font-style:italic; } -#adc-cppref .btvpriv { color:#ff6666; font-style:italic; } +#adc-cppref .btpubl { color:#87c2e6; } +#adc-cppref .btprot { color:#226bb0; } +#adc-cppref .btpriv { color:#06348c; } +#adc-cppref .btvpubl { color:#87c2e6; font-style:italic; } +#adc-cppref .btvprot { color:#226bb0; font-style:italic; } +#adc-cppref .btvpriv { color:#06348c; font-style:italic; } #adc-cppref .btself { font-weight:bold; } #adc-cppref table { empty-cells:show; } diff --git a/odk/docs/images/arrow-1.gif b/odk/docs/images/arrow-1.gif Binary files differindex e58046ae9d5a..99da8a7d5b0f 100644 --- a/odk/docs/images/arrow-1.gif +++ b/odk/docs/images/arrow-1.gif diff --git a/odk/docs/images/arrow-2.gif b/odk/docs/images/arrow-2.gif Binary files differindex 94e7a2673e9e..2e2b20d7d325 100644 --- a/odk/docs/images/arrow-2.gif +++ b/odk/docs/images/arrow-2.gif diff --git a/odk/docs/images/arrow-3.gif b/odk/docs/images/arrow-3.gif Binary files differindex e58046ae9d5a..99da8a7d5b0f 100644 --- a/odk/docs/images/arrow-3.gif +++ b/odk/docs/images/arrow-3.gif diff --git a/odk/docs/images/bg_table.png b/odk/docs/images/bg_table.png Binary files differnew file mode 100644 index 000000000000..eb5d4f2f7381 --- /dev/null +++ b/odk/docs/images/bg_table.png diff --git a/odk/docs/images/bg_table2.png b/odk/docs/images/bg_table2.png Binary files differnew file mode 100644 index 000000000000..d0cafddfecaa --- /dev/null +++ b/odk/docs/images/bg_table2.png diff --git a/odk/docs/images/bg_table3.png b/odk/docs/images/bg_table3.png Binary files differnew file mode 100644 index 000000000000..2759066df928 --- /dev/null +++ b/odk/docs/images/bg_table3.png diff --git a/odk/docs/images/nav_down.png b/odk/docs/images/nav_down.png Binary files differindex 4f2cf361a3dd..fee3fbf30bea 100644 --- a/odk/docs/images/nav_down.png +++ b/odk/docs/images/nav_down.png diff --git a/odk/docs/images/nav_left.png b/odk/docs/images/nav_left.png Binary files differindex 605501566a97..b2f5da725fb0 100644 --- a/odk/docs/images/nav_left.png +++ b/odk/docs/images/nav_left.png diff --git a/odk/docs/images/nav_right.png b/odk/docs/images/nav_right.png Binary files differindex 6b8c2185b2c3..87310372a2f6 100644 --- a/odk/docs/images/nav_right.png +++ b/odk/docs/images/nav_right.png diff --git a/odk/docs/images/nav_up.png b/odk/docs/images/nav_up.png Binary files differindex 5576317aa47d..8267ada19789 100644 --- a/odk/docs/images/nav_up.png +++ b/odk/docs/images/nav_up.png diff --git a/odk/docs/images/odk-footer-logo.gif b/odk/docs/images/odk-footer-logo.gif Binary files differnew file mode 100644 index 000000000000..e79cd7143ac3 --- /dev/null +++ b/odk/docs/images/odk-footer-logo.gif diff --git a/odk/docs/images/ooo-main-app_32.png b/odk/docs/images/ooo-main-app_32.png Binary files differindex f2e6e9e4d451..296c6f4c58b1 100644 --- a/odk/docs/images/ooo-main-app_32.png +++ b/odk/docs/images/ooo-main-app_32.png diff --git a/odk/docs/images/orc-main-app_32.png b/odk/docs/images/orc-main-app_32.png Binary files differnew file mode 100644 index 000000000000..b596295abba1 --- /dev/null +++ b/odk/docs/images/orc-main-app_32.png diff --git a/odk/docs/images/sdk_head-1.gif b/odk/docs/images/sdk_head-1.gif Binary files differdeleted file mode 100644 index 53bf8a54685a..000000000000 --- a/odk/docs/images/sdk_head-1.gif +++ /dev/null diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png Binary files differnew file mode 100644 index 000000000000..1c13f7e7f072 --- /dev/null +++ b/odk/docs/images/sdk_head-1.png diff --git a/odk/docs/images/sdk_head-2.gif b/odk/docs/images/sdk_head-2.gif Binary files differdeleted file mode 100644 index 7fe80c4e48ce..000000000000 --- a/odk/docs/images/sdk_head-2.gif +++ /dev/null diff --git a/odk/docs/images/sdk_head-2.png b/odk/docs/images/sdk_head-2.png Binary files differnew file mode 100644 index 000000000000..61adc6f7c974 --- /dev/null +++ b/odk/docs/images/sdk_head-2.png diff --git a/odk/docs/images/sdk_head-3.gif b/odk/docs/images/sdk_head-3.gif Binary files differdeleted file mode 100644 index 053e5ec60a17..000000000000 --- a/odk/docs/images/sdk_head-3.gif +++ /dev/null diff --git a/odk/docs/images/sdk_line-1.gif b/odk/docs/images/sdk_line-1.gif Binary files differindex cf04e12891cd..199d3a80bc88 100644 --- a/odk/docs/images/sdk_line-1.gif +++ b/odk/docs/images/sdk_line-1.gif diff --git a/odk/docs/images/sdk_line-2.gif b/odk/docs/images/sdk_line-2.gif Binary files differindex 18c48453f0a1..44ef0146a5ad 100644 --- a/odk/docs/images/sdk_line-2.gif +++ b/odk/docs/images/sdk_line-2.gif diff --git a/odk/docs/images/so-main-app_32.png b/odk/docs/images/so-main-app_32.png Binary files differdeleted file mode 100644 index e79033ffe1ea..000000000000 --- a/odk/docs/images/so-main-app_32.png +++ /dev/null diff --git a/odk/docs/install.html b/odk/docs/install.html index e11440538bb5..21611d2abdf7 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -1,6 +1,6 @@ <html> <head> - <title>[TITLE] - Installation Guide</title> + <title>OpenOffice.org 3.2 SDK - Installation Guide</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ürgen Schmidt"> @@ -8,9 +8,8 @@ </head> <body class="sdkbody"><a name="install"/> <table class="table1" cellpadding=0> - <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; "> - <td class="background" colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> - <td class="background" align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td> + <tr style="background-image:url(images/sdk_head-2.png)"> + <td colspan="3" align="left"><img src="images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="images/nada.gif"></td> @@ -37,16 +36,16 @@ <table class="table3"> <tr> <td colspan="2"> - <p>The [PRODUCTNAME] SDK comes with a set of development tools, base + <p>The OpenOffice.org 3.2 SDK comes with a set of development tools, base libraries, header files and helper class files that can be used to - develop Java/C++ components, to embed the [PRODUCTNAME] application in + develop Java/C++ components, to embed the OpenOffice.org 3.2 application in your own programs, or to use the API (scripting or remote control the office). For a complete working environment, we have some additional requirements:</p> </td> </tr> <tr valign="top"> - <td><b>[PRODUCTNAME] installation</td> + <td><b>OpenOffice.org 3.2 installation</td> <td class="content80">The SDK works on top of an existing office installation and uses the same libraries as the office installation.</td> </tr> @@ -116,7 +115,7 @@ the 4NT shell. You have to use the native w32 version.</td> </tr> <tr valign="middle"> - <td colspan="2"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td><img class="nothing10" src="images/nada.gif"></td> @@ -219,7 +218,7 @@ the output is generated in the SDK directory itself. If an output directory is specified, the output is generated in a SDK dependent subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR> - /[PRODUCTNAME]/LINUXExample.out)</td> + /OpenOffice.org 3.2/LINUXExample.out)</td> </tr> <tr> <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td> @@ -238,7 +237,7 @@ </td> </tr> <tr valign="middle"> - <td colspan="2"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td><img class="nothing10" src="images/nada.gif"></td> @@ -407,7 +406,10 @@ </tr> <tr> <td colspan="3"> - <div align="center"><p>Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div> + <div class="centertext"> + <p><img class="oraclelogo" src="images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" /> + Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p> + </div> </td> </tr> </table> diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index ce02acedb3c0..446e83200762 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -1 +1,4 @@ -<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ü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 © 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 +<html><head> <title>OpenOffice.org 3.2 SDK - 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ü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 class="centertext"> + <p><img class="oraclelogo" src="images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" /> + Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p> + </div> </td> </tr></table><map name="Map"> <area shape="rect" coords="10,68,93,105" href="http://www.sun.com"></map></body></html> diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index a3fdd7b199ef..9a02576bc130 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -1,7 +1,7 @@ a { text-decoration: none; } -a:link { color: #C44B01; } +a:link { color: #0e85cd; } a:visited { color: #638093; } -a:active { color: #9DCA12; } +a:active { color: #4dadea; } .sdkbody { background-color: #FFFFFF; color: #000000; @@ -109,7 +109,7 @@ a:active { color: #9DCA12; } font-weight: bold; } .thead { font-weight: bold; - background-image:url(../docs/images/bg_table.gif); + background-image:url(../docs/images/bg_table.png); backgorund-position: middle; } .navigate { border: 0; } @@ -124,4 +124,7 @@ a:active { color: #9DCA12; } .content80 { width: 80%; } .content87 { width: 87%; } +.centertext {align:center; text-align:center; font-size: 12;} +.oraclelogo {vertical-align:middle;} + diff --git a/odk/docs/tools.html b/odk/docs/tools.html index b02265dfb488..8b9d604e7143 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -1,6 +1,6 @@ <html> <head> - <title>[TITLE] SDK - Development Tools</title> + <title>OpenOffice.org 3.2 SDK SDK - Development Tools</title> <link rel="stylesheet" type="text/css" href="sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="author" content="Jürgen Schmidt"> @@ -8,9 +8,8 @@ <body class="sdkbody"><a name="tools"/> <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 style="background-image:url(images/sdk_head-2.png)"> + <td colspan="3" align="left"><img src="images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="images/nada.gif"></td> @@ -128,7 +127,7 @@ <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -146,7 +145,7 @@ office installation. UNO packages are UNO components (single libraries or Jar files or more complex zip files that contains one or more libraries| Jar files, type libraries and configuration items), scripts and - [PRODUCTNAME] Basic libraries as zip package. 'unopkg' is not part of the + OpenOffice.org 3.2 Basic libraries as zip package. 'unopkg' is not part of the SDK but comes with the office directly and is a development tool as well as an end user tool to deploy extension into an office installation.</p> <p>More details concerning deployment and this tool can be find in the @@ -237,7 +236,7 @@ <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -339,7 +338,7 @@ <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -414,7 +413,7 @@ <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -504,7 +503,7 @@ <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -582,7 +581,7 @@ types the specified types depend on.</p> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -676,7 +675,7 @@ types the specified types depend on.</p> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -803,7 +802,7 @@ types the specified types depend on.</p> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -866,7 +865,7 @@ types the specified types depend on.</p> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -920,7 +919,7 @@ types the specified types depend on.</p> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -967,7 +966,7 @@ types the specified types depend on.</p> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="images/nada.gif"></td> @@ -1081,7 +1080,10 @@ types the specified types depend on.</p> </tr> <tr> <td colspan="3"> - <div align="center"><p>Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div> + <div class="centertext"> + <p><img class="oraclelogo" src="images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" /> + Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p> + </div> </td> </tr> </table> diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index da1453107f49..1a48788f0991 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -1,6 +1,6 @@ <html> <head> - <title>[TITLE] - Developer's Guide Examples</title> + <title>OpenOffice.org 3.2 SDK - Developer's Guide Examples</title> <link rel="stylesheet" type="text/css" href="../../docs/sdk_styles.css"> <meta http-equiv="Content-Type" @@ -12,13 +12,9 @@ <a name="examples"></a> <table class="table1" cellpadding="0"> <tbody> - <tr style="background-image: url(../../docs/images/sdk_head-2.gif);"> - <td class="background" colspan="2" align="left"><img - src="../../docs/images/sdk_head-1.gif" usemap="#Map" border="0" - height="109" width="335"></td> - <td class="background" align="right"><img - src="../../docs/images/sdk_head-3.gif" height="109" width="32"></td> - </tr> + <tr style="background-image:url(../../docs/images/sdk_head-2.png); backgorund-position: bottom; "> + <td class="background" colspan="3" align="left"><img src="../../docs/images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td> + </tr> <tr> <td colspan="3"><img class="nothing10" src="../../docs/images/nada.gif"></td> @@ -138,7 +134,7 @@ Presentation Documents</a></td> <td class="content3"><img src="../../docs/images/arrow-1.gif"></td> <td><a href="#BasicandDialogs" - title="link to the Basic And Dialogs examples">[PRODUCTNAME] Basic and + title="link to the Basic And Dialogs examples">OpenOffice.org 3.2 Basic and Dialogs</a></td> </tr> <tr valign="top"> @@ -198,7 +194,7 @@ Content Broker (UCB)</a></td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -237,7 +233,7 @@ examples</a></td> href="./FirstSteps/FirstUnoContact.java" title="link to FirstSteps/FirstUnoContact.java">FirstUnoContact</a></td> <td class="cell80">Shows how to initialize UNO and -get a remote office service manager from a running [PRODUCTNAME] in a +get a remote office service manager from a running OpenOffice.org 3.2 in a different process space.</td> </tr> <tr> @@ -246,7 +242,7 @@ different process space.</td> href="./FirstSteps/FirstLoadComponent.java" title="link to FirstSteps/FirstLoadComponent.java">FirstLoadComponent</a></td> <td class="cell80">Demonstrates how to load a -component into [PRODUCTNAME] by a Java application.</td> +component into OpenOffice.org 3.2 by a Java application.</td> </tr> <tr> <td class="cell20"><img @@ -269,7 +265,7 @@ drawing document.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -337,7 +333,7 @@ mechanism in C++.</td> href="./ProfUNO/InterprocessConn/ConnectionAwareClient.java" title="link to ProfUNO/InterprocessConn/ConnectionAwareClient/.java">ConnectionAwareClient</a></td> <td class="cell80">Implements a client which is aware -of losing connection to [PRODUCTNAME].</td> +of losing connection to OpenOffice.org 3.2.</td> </tr> <tr> <td class="cell20"><img @@ -345,7 +341,7 @@ of losing connection to [PRODUCTNAME].</td> href="./ProfUNO/InterprocessConn/UrlResolver.java" title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver</a></td> <td class="cell80">Builds a connection to -[PRODUCTNAME] using the URL given on the command line. This example +OpenOffice.org 3.2 using the URL given on the command line. This example shows the usage of <a href="../../docs/common/ref/com/sun/star/bridge/XUnoUrlResolver.html" title="link to the reference documentation of com.sun.star.bridge.XUnoResolver"><code>XUnoUrlResolver</code></a>.</td> @@ -368,7 +364,7 @@ shows the usage of <a href="./ProfUNO/CppBinding/office_connect.cxx" title="link to ProfUNO/CppBinding/office_connect.java">office_connect.cxx</a></td> <td class="cell80">Builds a connection to -[PRODUCTNAME] using C++.</td> +OpenOffice.org 3.2 using C++.</td> </tr> <tr> <td class="cell20"><img @@ -729,7 +725,7 @@ for the image shrink component and instantiates it.</td> href="./Components/DialogComponent/DialogComponent.java" title="link to Components/DialogComponent/DialogComponent.java">DialogComponent.java</a></td> <td class="cell80">Implements a component accessing a dialog created - with the [PRODUCTNAME] Basic IDE. The component provides methods that + with the OpenOffice.org 3.2 Basic IDE. The component provides methods that can be bound to dialog respectively control events .</td> </tr> <tr> @@ -770,7 +766,7 @@ for the image shrink component and instantiates it.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -946,7 +942,7 @@ document component.</td> <td class="cell80">This is the main part of a demo application based on the framework APIs. It mainly shows the mechanisms to load, store and convert documents, as well as dispatch and dispatch -interception. It integrates windows from [PRODUCTNAME] via system +interception. It integrates windows from OpenOffice.org 3.2 via system window handle. This is the same mechanism as used by the OOoBean, but the OOoBean itself is not used here, just the JNI window handle access.</td> </tr> @@ -962,7 +958,7 @@ and it's actions.</td> href="./OfficeDev/DesktopEnvironment/FunctionHelper.java" title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper</a></td> <td class="cell80">This helper comprises all -[PRODUCTNAME] API calls. Thus it is possible to learn about these +OpenOffice.org 3.2 API calls. Thus it is possible to learn about these aspects separately from the rest of the application example.</td> </tr> <tr> @@ -977,7 +973,7 @@ asynchronous events from UNO oneway calls.</td> href="./OfficeDev/DesktopEnvironment/IShutdownListener.java" title="link to OfficeDev/DesktopEnvironment/IShutdownListener.java">IShutdownListener</a></td> <td class="cell80">This is a listener interface to -clean up on shutdown of [PRODUCTNAME].</td> +clean up on shutdown of OpenOffice.org 3.2.</td> </tr> <tr> <td class="cell20"><a @@ -1008,7 +1004,7 @@ get the window handle of the Java window.</td> href="./OfficeDev/DesktopEnvironment/OfficeConnect.java" title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect</a></td> <td class="cell80">Builds the remote bridge to -[PRODUCTNAME] and exports its UNO service manager for the Java side of +OpenOffice.org 3.2 and exports its UNO service manager for the Java side of the application.</td> </tr> <tr> @@ -1039,7 +1035,7 @@ the application is registered as an event listener.</td> href="./OfficeDev/DesktopEnvironment/ViewContainer.java" title="link to OfficeDev/DesktopEnvironment/ViewContainer.java">ViewContainer</a></td> <td class="cell80">Performs a clean up on the Java -side on [PRODUCTNAME] shutdown.</td> +side on OpenOffice.org 3.2 shutdown.</td> </tr> </tbody> </table> @@ -1058,7 +1054,7 @@ side on [PRODUCTNAME] shutdown.</td> href="./OfficeDev/OfficeConnect.java" title="link to OfficeDev/OfficeConnect.java">OfficeConnect</a></td> <td class="cell80">Builds the remote bridge to -[PRODUCTNAME] and exports its UNO service manager to the Java side.</td> +OpenOffice.org 3.2 and exports its UNO service manager to the Java side.</td> </tr> <tr> <td class="cell20"><img @@ -1114,7 +1110,7 @@ TerminateListener and shows the use of them in a running program.</td> href="../../docs/common/ref/com/sun/star/frame/XTerminateListener.html" title="link to the reference documentation of com.sun.star.frame.XTerminationListener"> <code>XTerminateListener</code></a>. It is called -when [PRODUCTNAME] terminates.</td> +when OpenOffice.org 3.2 terminates.</td> </tr> </tbody> </table> @@ -1180,7 +1176,7 @@ of formats.</td> href="./OfficeDev/Linguistic/LinguisticExamples.java" title="link to OfficeDev/Linguistic/LinguisticExamples.java">LinguisticExamples</a></td> <td class="cell80">A short example that uses most of -the functionality from the [PRODUCTNAME] linguistic API.</td> +the functionality from the OpenOffice.org 3.2 linguistic API.</td> </tr> <tr> <td class="cell20"><a @@ -1381,7 +1377,7 @@ runtime.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -1454,7 +1450,7 @@ definition to match your installation!</p> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -1557,7 +1553,7 @@ settings like splitting sheeting sheets and selecting cells.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -1661,7 +1657,7 @@ URLs.</td> <td class="cell20"><a href="./Drawing/Helper.java" title="link to Drawing/Helper.java">Helper</a></td> <td class="cell80">Contains a helper class for the -other examples to connect to [PRODUCTNAME] and open or create a drawing +other examples to connect to OpenOffice.org 3.2 and open or create a drawing document.</td> </tr> <tr> @@ -1735,7 +1731,7 @@ text styles in shapes.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -1812,7 +1808,7 @@ is not implemented. To be more precise.</td> <td class="cell20"><a href="./Charts/Helper.java" title="link to Charts/Helper.java">Helper</a></td> <td class="cell80">Shows how to connect to -[PRODUCTNAME] and create text, drawing or spreadsheet document. This +OpenOffice.org 3.2 and create text, drawing or spreadsheet document. This class is used as a helper class for the other examples.</td> </tr> <tr> @@ -1853,7 +1849,7 @@ changes.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -1867,7 +1863,7 @@ changes.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="BasicandDialogs">[PRODUCTNAME] Basic and Dialogs examples</a></td> + name="BasicandDialogs">OpenOffice.org 3.2 Basic and Dialogs examples</a></td> <td align="right"> <a href="#examples" title="link to the Developer's Guide examples overview"><img class="navigate" src="../../docs/images/nav_up.png"></a> <a @@ -1944,7 +1940,7 @@ bar </li> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -1989,7 +1985,7 @@ the example. </td> href="./Database/CodeSamples.java" title="link to Database/CodeSamples.java">CodeSamples</a></td> <td class="cell80">Creates the connection to -[PRODUCTNAME] and executes the code SalesMan samples for database API.</td> +OpenOffice.org 3.2 and executes the code SalesMan samples for database API.</td> </tr> <tr> <td class="cell20"><img @@ -2191,7 +2187,7 @@ class.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -2510,7 +2506,7 @@ pressed key on the console.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -2633,7 +2629,7 @@ resources.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -2672,7 +2668,7 @@ Management examples</a></td> href="./Config/ConfigExamples.java" title="link to Config/ConfigExamples.java">ConfigExamples</a></td> <td class="cell80">This example connects to a -[PRODUCTNAME], gets the configuration manager and accesses the +OpenOffice.org 3.2, gets the configuration manager and accesses the configuration in various ways.</td> </tr> </tbody> @@ -2687,7 +2683,7 @@ configuration in various ways.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -2741,7 +2737,7 @@ documents as well as how to control toolbar visibility.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -2877,7 +2873,7 @@ about the currently focused object like its name, description, and role.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -2935,7 +2931,7 @@ for the Office application.</td> </tr> <tr> <td colspan="3"><img class="line" - src="../../docs/images/sdk_line-2.gif"></td> + src="../../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" @@ -3021,8 +3017,9 @@ for the Office application.</td> </tr> <tr> <td colspan="3"> - <div align="center"> - <p>Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p> + <div class="centertext"> + <p><img class="oraclelogo" src="../../docs/images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" /> + Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> diff --git a/odk/examples/examples.html b/odk/examples/examples.html index 395c59682b2a..12758ea3100d 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -1,6 +1,6 @@ <html> <head> - <title>[TITLE] - Examples</title> + <title>OpenOffice.org 3.2 SDK - Examples</title> <link rel="stylesheet" type="text/css" href="../docs/sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="Jürgen Schmidt"> @@ -9,9 +9,8 @@ <body class="sdkbody"><a name="examples"/> <table class="table1" cellpadding=0> - <tr style="background-image:url(../docs/images/sdk_head-2.gif); backgorund-position: bottom; "> - <td class="background" colspan="2" align="left"><img src="../docs/images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> - <td class="background" align=right><img src="../docs/images/sdk_head-3.gif" width="32" height="109"></td> + <tr style="background-image:url(../docs/images/sdk_head-2.png); backgorund-position: bottom; "> + <td class="background" colspan="3" align="left"><img src="../docs/images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td> </tr> <tr> <td colspan="3"><img class="nothing10" src="../docs/images/nada.gif"></td> @@ -39,10 +38,10 @@ <tr> <td colspan="3"> <p>The SDK provides a rich set of examples in different programming - languages (Java, C++, [PRODUCTNAME] Basic, OLE) to illustrate the use + languages (Java, C++, OpenOffice.org 3.2 Basic, OLE) to illustrate the use of the API and demonstrate how to benefit from the included word processor, spreadsheet, presentation software, graphics program and - database of [PRODUCTNAME].<br> + database of OpenOffice.org 3.2.<br> Some fo the examples need a running office instance listening on a port. If this is necessary you will get further information in the makefiles.</p> @@ -84,9 +83,9 @@ </tr> <tr valign="top"> <td class="content3"><img src="../docs/images/arrow-1.gif"></td> - <td><a href="#Basic_examples" title="link to the [PRODUCTNAME] Basic examples section">[PRODUCTNAME] Basic examples</a></td> + <td><a href="#Basic_examples" title="link to the OpenOffice.org 3.2 Basic examples section">OpenOffice.org 3.2 Basic examples</a></td> <td class="content75">Small set of examples which shows the use of - the API from [PRODUCTNAME] Basic.</td> + the API from OpenOffice.org 3.2 Basic.</td> </tr> <tr valign="top"> <td class="content3"><img src="../docs/images/arrow-1.gif"></td> @@ -107,7 +106,7 @@ <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="../docs/images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> @@ -215,7 +214,7 @@ </tr> <tr> <td class="cell20"><a href="java/Spreadsheet/" title="link to the source directory of the Java Spreadsheet examples">ChartTypeChange</a></td> - <td class="cell80">This class loads an [PRODUCTNAME] Calc document and + <td class="cell80">This class loads an OpenOffice.org 3.2 Calc document and changes the type of the embedded chart.</td> </tr> <tr> @@ -299,7 +298,7 @@ <td class="cell20"><a href="http://wiki.services.openoffice.org/wiki/Object_Inspector" title="link to the Object Inspector project page in the wiki">Object Inspector</a></td> <td class="cell80">The Object Inspector is primarily an auxiliary tool for the developer, which can present information about an object of the - [PRODUCTNAME] API at run-time. Depending on the object to be inspected, + OpenOffice.org 3.2 API at run-time. Depending on the object to be inspected, appropriate methods, interfaces, services, and attributes can be displayed to the developer. The methods, interfaces, services and attributes are represented in a predictable tree. If the attributes contained in an @@ -363,7 +362,7 @@ <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="../docs/images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> @@ -451,7 +450,7 @@ <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="../docs/images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> @@ -461,7 +460,7 @@ <td> <table class="table3"> <tr> - <td colspan="2" class="head1"><a name="Basic_examples">[PRODUCTNAME] Basic examples</td> + <td colspan="2" class="head1"><a name="Basic_examples">OpenOffice.org 3.2 Basic examples</td> <td align="right"> <a href="#examples" title="link to the examples overview"><img class="navigate" src="../docs/images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="../docs/images/nav_home.png"></a> @@ -469,8 +468,8 @@ </tr> <tr> <td colspan="3"> - <p>The example programs are embedded in [PRODUCTNAME] documents in the - samples directory. To view or edit the [PRODUCTNAME] Basic source, + <p>The example programs are embedded in OpenOffice.org 3.2 documents in the + samples directory. To view or edit the OpenOffice.org 3.2 Basic source, select the appropriate document and then select Tools->Macro.</p> <p>Most of the examples are stand-alone, but two of them (Creating an Index and Import/Export of ASCII Files) have an associated data file @@ -492,7 +491,7 @@ <td class="cell80">Description</td> </tr> <tr> - <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the [PRODUCTNAME] Basic text/modifying_text_automatically examples">Changing Appearance</a></td> + <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Changing Appearance</a></td> <td class="cell80"> To change the style used for certain words, you can start with the following example. This code searches for the regular expression <code>the[a-z]</code>, which stands for the text portion the @@ -503,7 +502,7 @@ must execute it from an open text document.</td> </tr> <tr> - <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the [PRODUCTNAME] Basic text/modifying_text_automatically examples">Replacing Text</a></td> + <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Replacing Text</a></td> <td class="cell80">If you regularly receive documents from other people for editing, you might want to make sure that certain words are always written the same. The next example illustrates this by forcing certain @@ -513,7 +512,7 @@ words from an external file.</td> </tr> <tr> - <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the [PRODUCTNAME] Basic text/modifying_text_automatically examples">Using Regular Expressions</a></td> + <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Using Regular Expressions</a></td> <td class="cell80">Another application of automatic text modification is related to stylistic questions. Suppose your company’s policy is to avoid the use of certain words. You want to replace these words, but you @@ -530,7 +529,7 @@ (plural, adjective etc.).</td> </tr> <tr> - <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the [PRODUCTNAME] Basic text/modifying_text_automatically examples">Inserting Bookmarks</a></td> + <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Inserting Bookmarks</a></td> <td class="cell80"> <p>The next example does something very similar. This time, however, we do not change the color of the words but insert a bookmark at each of @@ -545,14 +544,14 @@ word.</td> </tr> <tr> - <td class="cell20"><a href="basic/text/creating_an_index/" title="link to the source directory of the [PRODUCTNAME] Basic text/create_index example">Creating an Index</a></td> + <td class="cell20"><a href="basic/text/creating_an_index/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/create_index example">Creating an Index</a></td> <td class="cell80">Indices for text documents can be created manually in - [PRODUCTNAME] Writer by clicking on the words that should appear in the + OpenOffice.org 3.2 Writer by clicking on the words that should appear in the index. If the document is large, or if you have to generate indices for several documents, this task should be automated.</td> </tr> <tr> - <td class="cell20"><a href="basic/sheet/" title="link to the source directory of the [PRODUCTNAME] Basic sheet example">Adapting to Euroland</a></td> + <td class="cell20"><a href="basic/sheet/" title="link to the source directory of the OpenOffice.org 3.2 Basic sheet example">Adapting to Euroland</a></td> <td class="cell80">Most of the members of the European Union will abandon their old currency in favor of the new Euro in 2001. This requires modifications to all programs using the old currencies. Since the exchange @@ -561,14 +560,14 @@ in a table that are formatted with the currency string DM.</td> </tr> <tr> - <td class="cell20"><a href="basic/drawing/" title="link to the source directory of the [PRODUCTNAME] Basic drawing example">Import/Export of ASCII Files</a></td> + <td class="cell20"><a href="basic/drawing/" title="link to the source directory of the OpenOffice.org 3.2 Basic drawing example">Import/Export of ASCII Files</a></td> <td class="cell80">You can use the drawing facilities of StarOffice API to generate a picture from ASCII input. One application would be a hierarchical representation of a directory listing, based on textual data.</td> </tr> <tr> - <td class="cell20"><a href="basic/stock_quotes_updater/" title="link to the source directory of the [PRODUCTNAME] Basic stock_quotes_updater example">Stock Quotes Updater</a></td> + <td class="cell20"><a href="basic/stock_quotes_updater/" title="link to the source directory of the OpenOffice.org 3.2 Basic stock_quotes_updater example">Stock Quotes Updater</a></td> <td class="cell80">If you want to display stock charts for certain companies, you can open up your browser every day, go to a search engine, look up the quote and copy it by hand into a table. Or you can use a @@ -580,7 +579,7 @@ <code>UpdateValue()</code>, and <code>UpdateChart()</code>.</td> </tr> <tr> - <td class="cell20"><a href="basic/forms_and_controls/" title="link to the source directory of the [PRODUCTNAME] Basic forms_and_controls example">Forms and Controls</a></td> + <td class="cell20"><a href="basic/forms_and_controls/" title="link to the source directory of the OpenOffice.org 3.2 Basic forms_and_controls example">Forms and Controls</a></td> <td class="cell80">The example document Burger Factory offers some forms and controls, which you can use to order your desired burger type, beverage, topping, and sauce. By hitting the button @@ -595,7 +594,7 @@ <table class="table3"> <tr> <td colspan="3"> - Additional information: <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/OpenOffice.org_Basic" title="link to the "[PRODUCTNAME] Basic language binding" chapter in the Developer's Guide">[PRODUCTNAME] Basic language binding</a> + Additional information: <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/OpenOffice.org_Basic" title="link to the "OpenOffice.org 3.2 Basic language binding" chapter in the Developer's Guide">OpenOffice.org 3.2 Basic language binding</a> </td> </tr> </table> @@ -606,7 +605,7 @@ <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="../docs/images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> @@ -671,7 +670,7 @@ <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> </tr> <tr> - <td colspan="3"><img class="line" src="../docs/images/sdk_line-2.gif"></td> + <td colspan="3"><img class="line" src="../docs/images/sdk_line-1.gif"></td> </tr> <tr> <td class="content1"><img class="nothing8" src="../docs/images/nada.gif"></td> @@ -737,7 +736,10 @@ </tr> <tr> <td colspan="3"> - <div align="center"><p>Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div> + <div class="centertext"> + <p><img class="oraclelogo" src="../docs/images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" /> + Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p> + </div> </td> </tr> </table> diff --git a/odk/index.html b/odk/index.html index ace6cbeb65a0..f926fdc0d7b5 100644 --- a/odk/index.html +++ b/odk/index.html @@ -1,18 +1,16 @@ <html> <head> - <title>[TITLE] - SDK</title> + <title>OpenOffice.org 3.2 SDK - SDK</title> <link rel="stylesheet" type="text/css" href="docs/sdk_styles.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> - <body class="sdkbody"> <table class="table1" cellpadding=0> - <tr style="background-image:url(docs/images/sdk_head-2.gif)"> - <td colspan="2" align="left"><img src="docs/images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td> - <td align=right><img src="docs/images/sdk_head-3.gif" width="32" height="109"></td> + <tr style="background-image:url(docs/images/sdk_head-2.png)"> + <td colspan="3" align="left"><img src="docs/images/sdk_head-1.png" width="800" height="120" usemap="#Map" border="0"></td> </tr> <tr> <td colspan="3"><img class="nothing30" src="docs/images/nada.gif"></td> @@ -23,12 +21,12 @@ <tr> <td><img class="nothing8" src="docs/images/nada.gif"></td> <td> - <p>[PRODUCTNAME] software is a complete, feature-rich + <p>OpenOffice.org 3.2 software is a complete, feature-rich office productivity suite that provides, in combination with this SDK, all the essential tools for building and deploying custom - solutions that build on, or integrate with, the [PRODUCTNAME] suite + solutions that build on, or integrate with, the OpenOffice.org 3.2 suite of products.</p> - <p>The SDK is a development kit for [PRODUCTNAME], which + <p>The SDK is a development kit for OpenOffice.org 3.2, which eases the development of office components. It provides a set of libraries, binaries, header, and IDL files which have final API's and can only be extended with new functionality. This set of libraries @@ -43,8 +41,8 @@ with new functions.</p> <p>The SDK provides the basic building blocks for external developers to develop components in any language for which a binding exists. - Currently, there are language bindings for [PRODUCTNAME] Basic, Java, - and different C++ compilers on different platforms, for [PRODUCTNAME], + Currently, there are language bindings for OpenOffice.org 3.2 Basic, Java, + and different C++ compilers on different platforms, for OpenOffice.org 3.2, thus covering the two most commonly used programming languages. There will be no limit for office automation in heterogeneous environments. Currently supported platforms of the SDK are Linux, Solaris (sparc, @@ -85,7 +83,7 @@ <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> <td colspan="2"><a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td> - <td class="content70">Detailed documentation, explaining the [PRODUCTNAME] + <td class="content70">Detailed documentation, explaining the OpenOffice.org 3.2 API and the concepts behind it, with a rich set of examples, implemented mainly in Java. This documentation is online in the OpenOffice.org Wiki.</td> @@ -93,7 +91,7 @@ <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> <td colspan="2"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></td> - <td class="content70">Complete [PRODUCTNAME] API reference.</td> + <td class="content70">Complete OpenOffice.org 3.2 API reference.</td> </tr> <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> @@ -134,7 +132,7 @@ Office Applications (OpenDocument) Technical Committee where you can find the latest information about the OASIS Open Document XML file format which is the default document format - for [PRODUCTNAME].</td> + for OpenOffice.org 3.2.</td> </tr> <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> @@ -149,7 +147,7 @@ <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> <td colspan="2"><a href="share/readme/LICENSE_en-US.html" title="link to the SDK license file">License</a></td> - <td class="content70">The license for the [PRODUCTNAME] SDK.</td> + <td class="content70">The license for the OpenOffice.org 3.2 SDK.</td> </tr> <tr valign="middle"> <td><img class="nothing10" src="docs/images/nada.gif"></td> @@ -164,28 +162,17 @@ <tr valign="top"> <td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td> </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)">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> - <td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td> - </tr> <tr valign="middle"> - <td class="content4"><img class="arrow" src="docs/images/arrow-2.gif"</td> - <td width="5%"><a target="_blank" href="http://www.sun.com/staroffice/" title="link to the StarOffice homepage (online)"><img class="appicon" src="docs/images/so-main-app_32.png"></a></td> - <td width="21%"><a target="_blank" href="http://www.sun.com/staroffice/" title="link to the StarOffice homepage (online)">StarOffice™</a></td> - <td class="content70">Full-featured suite of office productivity - tools.</td> + <td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"</td> + <td width="5%"><a target="_blank" href="http://www.oracle.com/us/products/applications/open-office" title="link to the Oracle Open Office homepage (online)"><img class="appicon" src="docs/images/orc-main-app_32.png"></a></td> + <td width="21%"><a target="_blank" href="http://www.oracle.com/us/products/applications/open-office" title="link to the Oracle Open Office homepage (online)">Oracle Open Office™</a></td> + <td class="content70">Full-featured suite of office productivity tools.</td> </tr> <tr valign="middle"> - <td class="content4"><img class="arrow" src="docs/images/arrow-3.gif"</td> + <td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"</td> <td width="5%"><a target="_blank" href="http://www.openoffice.org/" title="link to the OpenOffice.org homepage (online)"><img class="appicon" src="docs/images/ooo-main-app_32.png"></a></td> - <td width="21%"><a target="_blank" href="http://www.openoffice.org/" title="link to the OpenOffice.org homepage (online)">OpenOffice.org</a></td> - <td class="content70">Open Source community project of - office-productivity software.</td> + <td width="21%"><a target="_blank" href="http://www.openoffice.org/" title="link to the OpenOffice.org homepage (online)">OpenOffice.org™</a></td> + <td class="content70">Open Source community project of office-productivity software.</td> </tr> </table> </td> @@ -202,7 +189,10 @@ </tr> <tr> <td colspan="3"> - <div align="center"><p>Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.</p></div> + <div class="centertext"> + <p><img class="oraclelogo" src="docs/images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" /> + Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p> + </div> </td> </tr> </table> diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 5396496e1a3a..b8a7b9a6cd48 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -25,149 +25,149 @@ # #************************************************************************* -PRJ=..$/.. +PRJ=../.. PRJNAME=odk TARGET=copying #---------------------------------------------------------------- .INCLUDE: settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk +.INCLUDE: $(PRJ)/util/makefile.pmk #---------------------------------------------------------------- -IDLLIST:={$(subst,/,$/ $(shell @$(FIND) $(IDLOUT) -type f | sed -e '/star.portal/d' -e'/star.webservices/d'))} +IDLLIST:={$(subst,/,/ $(shell @$(FIND) $(IDLOUT) -type f | sed -e '/star.portal/d' -e'/star.webservices/d'))} DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))} DESTINCLUDELIST={$(subst,$(SOLARINCDIR),$(DESTDIRINC) $(INCLUDELIST))} -DESTINCLUDELIST+=$(DESTDIRINC)$/udkversion.mk +DESTINCLUDELIST+=$(DESTDIRINC)/udkversion.mk DESTINCDIRLIST={$(subst,$(INCOUT),$(DESTDIRINC) $(INCLUDEDIRLIST))} -IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)$/module-ix.html -IDL_DOCU_CLEANUP_FLAG = $(MISC)$/idl_docu_cleanup.flag +IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)/module-ix.html +IDL_DOCU_CLEANUP_FLAG = $(MISC)/idl_docu_cleanup.flag IDL_CHAPTER_REFS=idl_chapter_refs.txt EXELIST = \ - $(DESTDIRBIN)$/cppumaker$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/regcompare$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/idlcpp$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/idlc$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/javamaker$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/autodoc$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/uno-skeletonmaker$(EXEPOSTFIX) + $(DESTDIRBIN)/cppumaker$(EXEPOSTFIX) \ + $(DESTDIRBIN)/regcompare$(EXEPOSTFIX) \ + $(DESTDIRBIN)/idlcpp$(EXEPOSTFIX) \ + $(DESTDIRBIN)/idlc$(EXEPOSTFIX) \ + $(DESTDIRBIN)/javamaker$(EXEPOSTFIX) \ + $(DESTDIRBIN)/autodoc$(EXEPOSTFIX) \ + $(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) \ + $(DESTDIRBIN)/uno-skeletonmaker$(EXEPOSTFIX) .IF "$(GUI)"=="WNT" EXELIST += \ - $(DESTDIRBIN)$/climaker$(EXEPOSTFIX) + $(DESTDIRBIN)/climaker$(EXEPOSTFIX) .ENDIF .IF "$(GUI)"=="WNT" CLILIST = \ - $(DESTDIRCLI)$/cli_basetypes.dll \ - $(DESTDIRCLI)$/cli_uretypes.dll \ - $(DESTDIRCLI)$/cli_oootypes.dll \ - $(DESTDIRCLI)$/cli_ure.dll \ - $(DESTDIRCLI)$/cli_cppuhelper.dll + $(DESTDIRCLI)/cli_basetypes.dll \ + $(DESTDIRCLI)/cli_uretypes.dll \ + $(DESTDIRCLI)/cli_oootypes.dll \ + $(DESTDIRCLI)/cli_ure.dll \ + $(DESTDIRCLI)/cli_cppuhelper.dll .ENDIF .IF "$(GUI)"=="WNT" LIBLIST = \ - $(DESTDIRLIB)$/istore.lib \ - $(DESTDIRLIB)$/ireg.lib \ - $(DESTDIRLIB)$/isal.lib \ - $(DESTDIRLIB)$/isalhelper.lib \ - $(DESTDIRLIB)$/icppu.lib \ - $(DESTDIRLIB)$/icppuhelper.lib \ - $(DESTDIRLIB)$/irmcxt.lib \ - $(DESTDIRLIB)$/ipurpenvhelper3MSC.lib + $(DESTDIRLIB)/istore.lib \ + $(DESTDIRLIB)/ireg.lib \ + $(DESTDIRLIB)/isal.lib \ + $(DESTDIRLIB)/isalhelper.lib \ + $(DESTDIRLIB)/icppu.lib \ + $(DESTDIRLIB)/icppuhelper.lib \ + $(DESTDIRLIB)/irmcxt.lib \ + $(DESTDIRLIB)/ipurpenvhelper3MSC.lib .IF "$(COMEX)"=="8" - LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib + LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib .ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12" - LIBLIST += $(DESTDIRLIB)$/stlport_vc71.lib + LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib .ELSE - LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib + LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib .ENDIF .ENDIF .IF "$(OS)"=="LINUX" - LIBLIST = $(DESTDIRLIB)$/libsalcpprt.a + LIBLIST = $(DESTDIRLIB)/libsalcpprt.a .ENDIF # note, that inner class files are copied implicitly DESTCLASSESLIST= \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/Loader.class \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/InstallationFinder.class \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/WinRegKey.class \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/WinRegKeyException.class -# $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/Loader$$CustomURLClassLoader.class \ -# $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/InstallationFinder$$StreamGobbler.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/Loader.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/InstallationFinder.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/WinRegKey.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/WinRegKeyException.class +# $(DESTDIRJAR)/com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \ +# $(DESTDIRJAR)/com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \ SETTINGSLIST= \ - $(DESTDIRSETTINGS)$/settings.mk \ - $(DESTDIRSETTINGS)$/std.mk \ - $(DESTDIRSETTINGS)$/stdtarget.mk \ - $(DESTDIRSETTINGS)$/dk.mk + $(DESTDIRSETTINGS)/settings.mk \ + $(DESTDIRSETTINGS)/std.mk \ + $(DESTDIRSETTINGS)/stdtarget.mk \ + $(DESTDIRSETTINGS)/dk.mk .IF "$(GUI)"=="WNT" -SETTINGSLIST+=$(DESTDIRSETTINGS)$/component.uno.def +SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.def .ENDIF .IF "$(GUI)"=="UNX" -SETTINGSLIST+=$(DESTDIRSETTINGS)$/component.uno.map +SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.map .ENDIF DOCUHTMLFILES+= \ - $(DESTDIR)$/index.html \ - $(DESTDIRDOCU)$/tools.html \ - $(DESTDIRDOCU)$/notsupported.html \ - $(DESTDIRDOCU)$/install.html \ - $(DESTDIREXAMPLES)$/examples.html \ - $(DESTDIREXAMPLES)$/DevelopersGuide$/examples.html + $(DESTDIR)/index.html \ + $(DESTDIRDOCU)/tools.html \ + $(DESTDIRDOCU)/notsupported.html \ + $(DESTDIRDOCU)/install.html \ + $(DESTDIREXAMPLES)/examples.html \ + $(DESTDIREXAMPLES)/DevelopersGuide/examples.html DOCUFILES= \ $(DOCUHTMLFILES) \ - $(DESTDIRDOCU)$/sdk_styles.css \ - $(DESTDIRGENIDLREF)$/idl.css \ - $(DESTDIRDOCUIMAGES)$/nada.gif \ - $(DESTDIRDOCUIMAGES)$/arrow-2.gif \ - $(DESTDIRDOCUIMAGES)$/bluball.gif \ - $(DESTDIRDOCUIMAGES)$/so-main-app_32.png \ - $(DESTDIRDOCUIMAGES)$/ooo-main-app_32.png \ - $(DESTDIRDOCUIMAGES)$/arrow-1.gif \ - $(DESTDIRDOCUIMAGES)$/arrow-3.gif \ - $(DESTDIRDOCUIMAGES)$/bg_table.gif \ - $(DESTDIRDOCUIMAGES)$/bg_table2.gif \ - $(DESTDIRDOCUIMAGES)$/bg_table3.gif \ - $(DESTDIRDOCUIMAGES)$/nav_down.png \ - $(DESTDIRDOCUIMAGES)$/nav_home.png \ - $(DESTDIRDOCUIMAGES)$/nav_left.png \ - $(DESTDIRDOCUIMAGES)$/nav_right.png \ - $(DESTDIRDOCUIMAGES)$/nav_up.png \ - $(DESTDIRDOCUIMAGES)$/sdk_head-1.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_head-2.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_head-3.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_line-1.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_line-2.gif + $(DESTDIRDOCU)/sdk_styles.css \ + $(DESTDIRGENIDLREF)/idl.css \ + $(DESTDIRDOCUIMAGES)/nada.gif \ + $(DESTDIRDOCUIMAGES)/arrow-2.gif \ + $(DESTDIRDOCUIMAGES)/bluball.gif \ + $(DESTDIRDOCUIMAGES)/orc-main-app_32.png \ + $(DESTDIRDOCUIMAGES)/ooo-main-app_32.png \ + $(DESTDIRDOCUIMAGES)/odk-footer-logo.gif \ + $(DESTDIRDOCUIMAGES)/arrow-1.gif \ + $(DESTDIRDOCUIMAGES)/arrow-3.gif \ + $(DESTDIRDOCUIMAGES)/bg_table.png \ + $(DESTDIRDOCUIMAGES)/bg_table2.png \ + $(DESTDIRDOCUIMAGES)/bg_table3.png \ + $(DESTDIRDOCUIMAGES)/nav_down.png \ + $(DESTDIRDOCUIMAGES)/nav_home.png \ + $(DESTDIRDOCUIMAGES)/nav_left.png \ + $(DESTDIRDOCUIMAGES)/nav_right.png \ + $(DESTDIRDOCUIMAGES)/nav_up.png \ + $(DESTDIRDOCUIMAGES)/sdk_head-1.png \ + $(DESTDIRDOCUIMAGES)/sdk_head-2.png \ + $(DESTDIRDOCUIMAGES)/sdk_line-1.gif \ + $(DESTDIRDOCUIMAGES)/sdk_line-2.gif .IF "$(GUI)"=="UNX" INSTALLSCRIPT= \ - $(DESTDIR)$/config.guess \ - $(DESTDIR)$/config.sub \ - $(DESTDIR)$/configure.pl \ - $(DESTDIR)$/setsdkenv_unix \ - $(DESTDIR)$/setsdkenv_unix.sh.in \ - $(DESTDIR)$/setsdkenv_unix.csh.in + $(DESTDIR)/config.guess \ + $(DESTDIR)/config.sub \ + $(DESTDIR)/configure.pl \ + $(DESTDIR)/setsdkenv_unix \ + $(DESTDIR)/setsdkenv_unix.sh.in \ + $(DESTDIR)/setsdkenv_unix.csh.in .ELSE INSTALLSCRIPT= \ - $(DESTDIR)$/setsdkenv_windows.bat \ - $(DESTDIR)$/setsdkenv_windows.template \ - $(DESTDIR)$/setsdkname.bat \ - $(DESTDIR)$/cfgWin.js + $(DESTDIR)/setsdkenv_windows.bat \ + $(DESTDIR)/setsdkenv_windows.template \ + $(DESTDIR)/setsdkname.bat \ + $(DESTDIR)/cfgWin.js .ENDIF DIR_FILE_LIST=\ @@ -184,25 +184,25 @@ DIR_FILE_LIST=\ $(CONVERTTAGFLAG) .IF "$(OS)"=="MACOSX" -DIR_FILE_LIST += $(DESTDIRBIN)$/addsym-macosx.sh +DIR_FILE_LIST += $(DESTDIRBIN)/addsym-macosx.sh .ENDIF .IF "$(SOLAR_JAVA)" != "" -DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll +DIR_FILE_LIST += $(DESTDIRJAR)/win/unowinreg.dll .ENDIF DIR_DIRECTORY_LIST:=$(uniq $(DIR_FILE_LIST:d)) -DIR_CREATE_FLAG:=$(MISC)$/copying_dirs_created.txt -DIR_FILE_FLAG:=$(MISC)$/copying_files.txt +DIR_CREATE_FLAG:=$(MISC)/copying_dirs_created.txt +DIR_FILE_FLAG:=$(MISC)/copying_files.txt .IF "$(SOLAR_JAVA)" != "" # Special work for simple uno bootstrap mechanism # zip uno loader class files and winreg helper library for later # use in the build process (e.g. helper tools) -MYZIPTARGET=$(BIN)$/uno_loader_classes.zip +MYZIPTARGET=$(BIN)/uno_loader_classes.zip MYZIPFLAGS=-u -r MYZIPDIR=$(DESTDIRJAR) -MYZIPLIST=com$/* win$/* +MYZIPLIST=com/* win/* .ENDIF @@ -221,21 +221,21 @@ all : CLEAN_DKVERSION_CHECK \ #-------------------------------------------------- # use global rules #-------------------------------------------------- -.INCLUDE: $(PRJ)$/util$/odk_rules.pmk +.INCLUDE: $(PRJ)/util/odk_rules.pmk -CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)$/dk.mk +CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)/dk.mk CLEAN_DKVERSION_CHECK: @@-rm -f $(CLEANUP_DKVERSION_FILE) -$(DESTDIRBIN)$/addsym-macosx.sh : addsym-macosx.sh +$(DESTDIRBIN)/addsym-macosx.sh : addsym-macosx.sh @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -chmod 755 $@ -$(DESTDIRSETTINGS)$/dk.mk : dk.mk +$(DESTDIRSETTINGS)/dk.mk : dk.mk @@-rm -f $@ -$(MKDIRHIER) $(@:d) tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@ @@ -244,7 +244,7 @@ $(CONVERTTAGFLAG) : $(DOCUHTMLFILES) $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES) @echo "tags converted" > $@ -$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)$/docs$/common$/ref$/idl.css +$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST) @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF) $(TOUCH) $@ @@ -252,11 +252,11 @@ $(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG) -$(MKDIRHIER) $(@:d) $(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 + -rm $(@:d)/idl.css + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)/docs/common/ref/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)/idl.css .IF "$(SOLAR_JAVA)" != "" -$(MYZIPTARGET) : $(BIN)$/unowinreg.dll $(DESTCLASSESLIST) - cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ..$/..$/..$/bin$/$(MYZIPTARGET:b) $(MYZIPLIST) +$(MYZIPTARGET) : $(BIN)/unowinreg.dll $(DESTCLASSESLIST) + cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ../../../bin/$(MYZIPTARGET:b) $(MYZIPLIST) .ENDIF diff --git a/odk/util/check.pl b/odk/util/check.pl index 43732adfaa08..0ba7f05a6ed2 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -84,16 +84,16 @@ if (-d "$StartDir") { my @filelist = ( "install.html", "notsupported.html","sdk_styles.css","tools.html", "images/arrow-1.gif", "images/arrow-3.gif", - "images/bg_table.gif","images/bg_table2.gif", - "images/bg_table3.gif", "images/nav_down.png", + "images/odk-footer-logo.gif", + "images/bg_table.png","images/bg_table2.png", + "images/bg_table3.png", "images/nav_down.png", "images/nav_home.png","images/nav_left.png", "images/nav_right.png","images/nav_up.png", - "images/sdk_head-1.gif", "images/sdk_head-2.gif", - "images/sdk_head-3.gif", "images/sdk_line-1.gif", - "images/sdk_line-2.gif", "common/ref/idl.css", - "images/nada.gif","images/arrow-2.gif", - "images/bluball.gif","images/so-main-app_32.png", - "images/ooo-main-app_32.png"); + "images/sdk_head-1.png", "images/sdk_head-2.png", + "images/sdk_line-1.gif", "images/sdk_line-2.gif", + "common/ref/idl.css", "images/nada.gif", + "images/arrow-2.gif", "images/bluball.gif", + "images/orc-main-app_32.png", "images/ooo-main-app_32.png"); foreach $i (@filelist) { diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk index ed836730a165..7f6517ed42a8 100644 --- a/odk/util/makefile.mk +++ b/odk/util/makefile.mk @@ -24,9 +24,7 @@ ALLTAR:\ $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS) cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@ -.ENDIF # "$(USE_SHELL)"!="4nt" # cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT) # cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT) diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 0eb4c76b625d..aa0f10ed035e 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -37,26 +37,26 @@ IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API" PRODUCT_NAME=odkcommon PRODUCTZIPFILE=$(PRODUCT_NAME).zip -DESTDIR=$(OUT)$/bin$/$(PRODUCT_NAME) -DESTDIRBIN=$(DESTDIR)$/bin -DESTDIRLIB=$(DESTDIR)$/lib +DESTDIR=$(OUT)/bin/$(PRODUCT_NAME) +DESTDIRBIN=$(DESTDIR)/bin +DESTDIRLIB=$(DESTDIR)/lib DESTDIRDLL=$(DESTDIRLIB) -DESTDIRIDL=$(DESTDIR)$/idl -DESTDIRINC=$(DESTDIR)$/include -DESTDIRJAR=$(DESTDIR)$/classes -DESTDIRXML=$(DESTDIR)$/xml -DESTDIRSETTINGS=$(DESTDIR)$/settings -DESTDIREXAMPLES=$(DESTDIR)$/examples -DESTDIRINC=$(DESTDIR)$/include -DESTDIRCLASSES=$(DESTDIR)$/classes -DESTDIRDOCU=$(DESTDIR)$/docs -DESTDIRCOMMONDOCU=$(DESTDIRDOCU)$/common -DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)$/ref -DESTDIRDOCUIMAGES=$(DESTDIRDOCU)$/images -DESTDIRCPPDOCU=$(DESTDIRDOCU)$/cpp -DESTDIRGENCPPREF=$(DESTDIRDOCU)$/cpp$/ref -DESTDIRJAVADOCU=$(DESTDIRDOCU)$/java -DESTDIRGENJAVAREF=$(DESTDIRDOCU)$/java$/ref +DESTDIRIDL=$(DESTDIR)/idl +DESTDIRINC=$(DESTDIR)/include +DESTDIRJAR=$(DESTDIR)/classes +DESTDIRXML=$(DESTDIR)/xml +DESTDIRSETTINGS=$(DESTDIR)/settings +DESTDIREXAMPLES=$(DESTDIR)/examples +DESTDIRINC=$(DESTDIR)/include +DESTDIRCLASSES=$(DESTDIR)/classes +DESTDIRDOCU=$(DESTDIR)/docs +DESTDIRCOMMONDOCU=$(DESTDIRDOCU)/common +DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)/ref +DESTDIRDOCUIMAGES=$(DESTDIRDOCU)/images +DESTDIRCPPDOCU=$(DESTDIRDOCU)/cpp +DESTDIRGENCPPREF=$(DESTDIRDOCU)/cpp/ref +DESTDIRJAVADOCU=$(DESTDIRDOCU)/java +DESTDIRGENJAVAREF=$(DESTDIRDOCU)/java/ref BINOUT=$(SOLARBINDIR) INCOUT=$(SOLARINCDIR) @@ -64,11 +64,11 @@ IDLOUT=$(SOLARIDLDIR) XMLOUT=$(SOLARXMLDIR) LIBOUT=$(SOLARLIBDIR) -CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl +CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl CONVERTTAGFLAGNAME=converttags_html_files.flag -CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME) +CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME) -MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc +MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" MY_COPY=$(GNUCOPY) @@ -83,19 +83,22 @@ MY_COPY_RECURSIVE=$(GNUCOPY) -urf .ENDIF .ENDIF +MY_DELETE_RECURSIVE=rm -rf +MY_TEXTCOPY=@cp + .IF "$(GUI)"=="WNT" #-------------------- # WNT ONLY #-------------------- -MY_DELETE_RECURSIVE=+del /sxyf -MY_TEXTCOPY=cat +#MY_DELETE_RECURSIVE=+del /sxyf +#MY_TEXTCOPY=cat MY_DLLPREFIX= MY_DLLPOSTFIX=.dll -MY_DLLOUT=$(OUT)$/bin +MY_DLLOUT=$(OUT)/bin EXEPOSTFIX=.exe DLLOUT=$(SOLARBINDIR) -DESTDIRCPPEXAMPLES=$(DESTDIR)$/examples$/cpp +DESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp .IF "$(COM)"=="GCC" DESTPLATFROM=mingw @@ -103,15 +106,15 @@ DESTPLATFROM=mingw DESTPLATFROM=windows .ENDIF DESTDIRDLL=$(DESTDIRBIN) -DESTDIRCLI=$(DESTDIR)$/cli +DESTDIRCLI=$(DESTDIR)/cli .ELSE #-------------------- -# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)$/examples$/cpp +# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp #-------------------- -MY_DELETE_RECURSIVE=rm -rf -MY_TEXTCOPY= tr -d "\015" +#MY_DELETE_RECURSIVE=rm -rf +#MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib .IF "$(OS)"=="MACOSX" @@ -119,7 +122,7 @@ MY_DLLPOSTFIX=.dylib .ELSE MY_DLLPOSTFIX=.so .ENDIF -MY_DLLOUT=$(OUT)$/lib +MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) .IF "$(OS)$(CPU)"=="SOLARISS" @@ -165,67 +168,57 @@ DESTPLATFROM=freebsd DESTPLATFROM=macosx .ENDIF -#DESTDIRBIN=$(DESTDIR)$/$(DESTPLATFROM)$/bin -#DESTDIRLIB=$(DESTDIR)$/$(DESTPLATFROM)$/lib +#DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin +#DESTDIRLIB=$(DESTDIR)/$(DESTPLATFROM)/lib #DESTDIRDLL=$(DESTDIRLIB) .ENDIF -MY_TEXTCOPY_SOURCEPRE=< -MY_TEXTCOPY_TARGETPRE=> +#MY_TEXTCOPY_SOURCEPRE=< +#MY_TEXTCOPY_TARGETPRE=> INCLUDETOPDIRLIST= \ - $(INCOUT)$/sal \ - $(INCOUT)$/salhelper \ - $(INCOUT)$/rtl \ - $(INCOUT)$/osl \ - $(INCOUT)$/store \ - $(INCOUT)$/typelib \ - $(INCOUT)$/uno \ - $(INCOUT)$/cppu \ - $(INCOUT)$/cppuhelper \ - $(INCOUT)$/bridges \ - $(INCOUT)$/registry \ - $(INCOUT)$/stl + $(INCOUT)/sal \ + $(INCOUT)/salhelper \ + $(INCOUT)/rtl \ + $(INCOUT)/osl \ + $(INCOUT)/store \ + $(INCOUT)/typelib \ + $(INCOUT)/uno \ + $(INCOUT)/cppu \ + $(INCOUT)/cppuhelper \ + $(INCOUT)/bridges \ + $(INCOUT)/registry \ + $(INCOUT)/stl .IF "$(GUI)"=="WNT" -INCLUDETOPDIRLIST += $(INCOUT)$/systools +INCLUDETOPDIRLIST += $(INCOUT)/systools .ENDIF -INCLUDEDIRLIST:={$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))} +INCLUDEDIRLIST:={$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))} INCLUDEFILELIST=\ - $(INCOUT)$/com$/sun$/star$/uno$/Any.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Any.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/genfunc.h \ - $(INCOUT)$/com$/sun$/star$/uno$/genfunc.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/Reference.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Reference.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/Sequence.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Sequence.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/Type.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Type.hxx - -.IF "$(USE_SHELL)"=="4nt" -# Quoted Open Bracket -QOB -# Quoted Close Bracket -QCB -QOB=( -QCB=) -.ELSE -QOB=\( -QCB=\) -.ENDIF + $(INCOUT)/com/sun/star/uno/Any.h \ + $(INCOUT)/com/sun/star/uno/Any.hxx \ + $(INCOUT)/com/sun/star/uno/genfunc.h \ + $(INCOUT)/com/sun/star/uno/genfunc.hxx \ + $(INCOUT)/com/sun/star/uno/Reference.h \ + $(INCOUT)/com/sun/star/uno/Reference.hxx \ + $(INCOUT)/com/sun/star/uno/Sequence.h \ + $(INCOUT)/com/sun/star/uno/Sequence.hxx \ + $(INCOUT)/com/sun/star/uno/Type.h \ + $(INCOUT)/com/sun/star/uno/Type.hxx INCLUDELIST:=\ - {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \ + {$(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! \( -name "*~" -o -name "*build.lst" -o -name "*deliver.log" \) -print)} \ $(INCLUDEFILELIST) SDK_CONTENT_CHECK_FILES= \ - $(MISC)$/copying_files.txt + $(MISC)/copying_files.txt SDK_CHECK_FLAGS= \ - $(MISC)$/checkbin.txt \ - $(MISC)$/checkidl.txt \ - $(MISC)$/checkinc.txt \ - $(MISC)$/checkinc2.txt + $(MISC)/checkbin.txt \ + $(MISC)/checkidl.txt \ + $(MISC)/checkinc.txt \ + $(MISC)/checkinc2.txt diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index cc80078de4a4..6c2fa72600a1 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -26,155 +26,124 @@ #************************************************************************* -$(DESTDIRDOCU)$/%.html : $(PRJ)$/docs$/%.html +$(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIREXAMPLES)$/%.html : $(PRJ)$/examples$/%.html +$(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/index.html : $(PRJ)$/index.html +$(DESTDIR)/index.html : $(PRJ)/index.html @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRDOCU)$/%.css : $(PRJ)$/docs$/%.css +$(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/% +$(DESTDIRDOCUIMAGES)/% : $(PRJ)/docs/images/% @@-rm -f $@ $(MY_COPY) $< $@ -$(DESTDIR)$/configure : $(PRJ)$/configure +$(DESTDIR)/configure : $(PRJ)/configure @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(PRJ)/configure $@ -$(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl +$(DESTDIR)/configure.pl : $(PRJ)/configure.pl @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(PRJ)/configure.pl $@ -$(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess +$(DESTDIR)/config.guess : $(SRC_ROOT)/config.guess @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(SRC_ROOT)/config.guess $@ -$(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub +$(DESTDIR)/config.sub : $(SRC_ROOT)/config.sub @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(SRC_ROOT)/config.sub $@ -$(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix +$(DESTDIR)/setsdkenv_unix : $(PRJ)/setsdkenv_unix @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF - -#.IF "$(USE_SHELL)"=="4nt" -# $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ -#.ELSE -# $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ -#.ENDIF + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in +$(DESTDIR)/setsdkenv_unix.%.in : $(PRJ)/setsdkenv_unix.%.in @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 644 $@ -.ENDIF + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat +$(DESTDIR)/setsdkenv_windows.bat : $(PRJ)/setsdkenv_windows.bat @@-rm -f $@ -.IF "$(USE_SHELL)"=="4nt" - $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ -.ELSE $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ -.ENDIF -$(DESTDIR)$/%.bat : $(PRJ)$/%.bat +$(DESTDIR)/%.bat : $(PRJ)/%.bat @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/setsdkenv_windows.template : $(PRJ)$/setsdkenv_windows.template +$(DESTDIR)/setsdkenv_windows.template : $(PRJ)/setsdkenv_windows.template @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/cfgWin.js : $(PRJ)$/cfgWin.js +$(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/cfgWin.js $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $(PRJ)/cfgWin.js $@ -$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk +$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk @@-rm -f $@ .IF "$(COMEX)"=="7" - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@ .ELSE - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ .ENDIF -$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd +$(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml + $(MY_TEXTCOPY) $(XMLOUT)/module-description.dtd $@ +$(DESTDIRXML)/%.xml : $(XMLOUT)/%.xml @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) +$(DESTDIRBIN)/%$(EXEPOSTFIX) : $(BINOUT)/%$(EXEPOSTFIX) @@-rm -f $@ - $(GNUCOPY) $(BINOUT)$/$(@:f) $@ + $(GNUCOPY) $(BINOUT)/$(@:f) $@ -$(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin +$(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin @@-rm -f $@ - $(GNUCOPY) $(BINOUT)$/$(@:f) $@ + $(GNUCOPY) $(BINOUT)/$(@:f) $@ -$(DESTDIRBIN)$/regcomp : $(BINOUT)$/regcomp +$(DESTDIRBIN)/regcomp : $(BINOUT)/regcomp @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $< $@ -$(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX) +$(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) : $(BIN)/unoapploader$(EXEPOSTFIX) @@-rm -f $@ - $(GNUCOPY) $(BIN)$/$(@:f) $@ + $(GNUCOPY) $(BIN)/$(@:f) $@ # special rule for special Java UNO native library # (used for all platforms but built only under windows; # otherwise provided in external) -$(DESTDIRJAR)$/win$/unowinreg.dll : $(BIN)$/unowinreg.dll +$(DESTDIRJAR)/win/unowinreg.dll : $(BIN)/unowinreg.dll @@-rm -f $@ $(GNUCOPY) $< $@ -$(DESTDIRCLI)$/%.dll : $(BINOUT)$/%.dll +$(DESTDIRCLI)/%.dll : $(BINOUT)/%.dll @@-rm -f $@ $(GNUCOPY) $< $@ -$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) +$(DESTDIRDLL)/%$(MY_DLLPOSTFIX) : $(DLLOUT)/%$(MY_DLLPOSTFIX) @@-rm -f $@ - $(GNUCOPY) $(DLLOUT)$/$(@:f) $@ + $(GNUCOPY) $(DLLOUT)/$(@:f) $@ -$(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/star$/lib$/loader$/%.class +$(DESTDIRJAR)/com/sun/star/lib/loader/%.class : $(CLASSDIR)/com/sun/star/lib/loader/%.class @@-$(RM) $(@:db).class $(COPY) $(<:db).class $(@:d) # deal with subclasses @@-$(RM) $(@:db)$(EMQ)$$*.class -$(COPY) $(<:db)$(EMQ)$$*.class $(@:d) -$(DESTDIRIDL)$/% : $(IDLOUT)$/% - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ - @touch $(IDL_DOCU_CLEANUP_FLAG) +$(DESTDIRIDL)/% : $(IDLOUT)/% + $(MY_TEXTCOPY) $< $@ +# @touch $(IDL_DOCU_CLEANUP_FLAG) -$(DESTDIRINC)$/udkversion.mk : +$(DESTDIRINC)/udkversion.mk : @@-rm -f $@ @echo #UDK version number > $@ @echo #major >> $@ @@ -184,38 +153,34 @@ $(DESTDIRINC)$/udkversion.mk : @echo #micro >> $@ @echo UDK_MICRO=$(UDK_MICRO) >> $@ -$(DESTDIRINC)$/% : $(INCOUT)$/% - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ +$(DESTDIRINC)/% : $(INCOUT)/% + $(MY_TEXTCOPY) $< $@ -$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib +$(DESTDIRLIB)/%.lib : $(LIBOUT)/%.lib @@-rm -f $@ - $(GNUCOPY) $(LIBOUT)$/$(@:f) $@ + $(GNUCOPY) $(LIBOUT)/$(@:f) $@ -$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a +$(DESTDIRLIB)/%.a : $(LIBOUT)/%.a @@-rm -f $@ - $(GNUCOPY) $(LIBOUT)$/$(@:f) $@ + $(GNUCOPY) $(LIBOUT)/$(@:f) $@ $(DIR_CREATE_FLAG) : -.IF "$(USE_SHELL)" != "4nt" $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@ -.ELSE - $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s#\#/#)) | $(XARGS) mkdir.exe -p && echo "dirs created" > $@ && touch $@ -.ENDIF $(DELAY) 2 -$(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def +$(DESTDIRSETTINGS)/component.uno.def : $(PRJ)/settings/component.uno.def @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRSETTINGS)$/component.uno.map : $(SOLARENV)$/bin$/addsym.awk $(SOLARENV)$/src$/component.map +$(DESTDIRSETTINGS)/component.uno.map : $(SOLARENV)/bin/addsym.awk $(SOLARENV)/src/component.map @@-$(RM) -f $@ .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SOLARENV)$/src$/component.map | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SOLARENV)/src/component.map | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .IF "$(OS)"=="MACOSX" - tr -d "\015" < $(SOLARENV)$/src$/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*$//' > $@ + tr -d "\015" < $(SOLARENV)/src/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*//' > $@ .ENDIF .ELSE # "$(COMID)"=="gcc3" - tr -d "\015" < $(SOLARENV)$/src$/component.map > $@ + tr -d "\015" < $(SOLARENV)/src/component.map > $@ .ENDIF # "$(COMID)"=="gcc3" @chmod 664 $@ |
