basctl/source/dlged/dlged.cxx | 8 bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk | 2 bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk | 2 bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_intel/abi.cxx | 48 + bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 8 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 24 bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk | 5 bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 14 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx | 8 bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk | 2 bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 2 bridges/source/jni_uno/jni_data.cxx | 35 - cppu/inc/com/sun/star/uno/Any.hxx | 95 +-- cppu/source/threadpool/threadident.cxx | 9 cppu/source/uno/copy.hxx | 52 - cppu/source/uno/data.cxx | 10 cppu/source/uno/destr.hxx | 2 cppu/source/uno/lbenv.cxx | 16 dev/null |binary graphite/makefile.mk | 4 instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp |binary instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 20 instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp |binary instsetoo_native/inc_ure/windows/msi_templates/Binary/Image.bmp |binary odk/docs/images/blueball.png |binary odk/docs/images/sdk-footer-logo.png |binary odk/docs/images/sdk_head-1.png |binary odk/docs/images/sdk_head-2.png |binary odk/docs/images/sdk_line-1.gif |binary odk/docs/install.html | 87 +-- odk/docs/notsupported.html | 66 +- odk/docs/sdk_styles.css | 99 +-- odk/docs/tools.html | 74 +- odk/examples/DevelopersGuide/GUI/oologo.gif |binary odk/examples/DevelopersGuide/examples.html | 282 ++++------ odk/examples/examples.html | 62 +- odk/index.html | 18 odk/pack/copying/makefile.mk | 7 odk/util/check.pl | 6 odk/util/makefile.mk | 1 odk/util/makefile.pmk | 2 sal/inc/sal/mathconf.h | 5 sal/osl/unx/pipe.c | 40 - sal/osl/unx/sockimpl.h | 6 set_soenv.in | 2 setup_native/source/mac/ooo/osxdndinstall.png |binary setup_native/source/mac/ooo/osxdndinstall_beta.png |binary setup_native/source/mac/ooo/osxdndinstall_lang.png |binary setup_native/source/mac/ooo/osxdndinstall_lang_beta.png |binary setup_native/source/mac/ooo/osxdndinstall_nologo.png |binary setup_native/source/mac/sdk/osxdndinstall_sdk.png |binary setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png |binary setup_native/source/win32/nsis/ooobanner.bmp |binary setup_native/source/win32/nsis/ooobitmap.bmp |binary setup_native/source/win32/nsis/ooosdkbanner.bmp |binary setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary setup_native/source/win32/nsis/ooosetup.ico |binary setup_native/source/win32/nsis/urebanner.bmp |binary setup_native/source/win32/nsis/urebitmap.bmp |binary solenv/gbuild/platform/linux.mk | 15 solenv/inc/tg_compv.mk | 2 solenv/inc/unx.mk | 26 solenv/inc/unxlng.mk | 4 sw/source/filter/xml/swxml.cxx | 1 tools/source/stream/stream.cxx | 29 - 81 files changed, 665 insertions(+), 557 deletions(-)
New commits: commit b012d64a9c1feed68e76fcdeaba7160053bf9c28 Author: Matthias Seidel <[email protected]> Date: Tue Feb 21 21:07:24 2017 +0000 Resized banner for Windows installer diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp old mode 100755 new mode 100644 index 24b76f5..3ed1fe3 Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp old mode 100755 new mode 100644 index 24b76f5..3ed1fe3 Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp old mode 100755 new mode 100644 index 24b76f5..3ed1fe3 Binary files a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp differ diff --git a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp index f697d5d..3ed1fe3 100644 Binary files a/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_ure/windows/msi_templates/Binary/Banner.bmp differ diff --git a/setup_native/source/win32/nsis/ooobanner.bmp b/setup_native/source/win32/nsis/ooobanner.bmp old mode 100755 new mode 100644 index f697d5d..3ed1fe3 Binary files a/setup_native/source/win32/nsis/ooobanner.bmp and b/setup_native/source/win32/nsis/ooobanner.bmp differ diff --git a/setup_native/source/win32/nsis/ooosdkbanner.bmp b/setup_native/source/win32/nsis/ooosdkbanner.bmp index f697d5d..3ed1fe3 100644 Binary files a/setup_native/source/win32/nsis/ooosdkbanner.bmp and b/setup_native/source/win32/nsis/ooosdkbanner.bmp differ diff --git a/setup_native/source/win32/nsis/urebanner.bmp b/setup_native/source/win32/nsis/urebanner.bmp index f697d5d..3ed1fe3 100644 Binary files a/setup_native/source/win32/nsis/urebanner.bmp and b/setup_native/source/win32/nsis/urebanner.bmp differ commit e6b5e5859d9283521e9b881113edbf5c540a5441 Author: Matthias Seidel <[email protected]> Date: Sun Feb 19 19:06:33 2017 +0000 Further HTML code cleanup, removed unused graphic diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png index 9d5ba437..6966042 100644 Binary files a/odk/docs/images/sdk_head-1.png and b/odk/docs/images/sdk_head-1.png differ diff --git a/odk/docs/images/sdk_head-2.png b/odk/docs/images/sdk_head-2.png index 61adc6f..fa9070f 100644 Binary files a/odk/docs/images/sdk_head-2.png and b/odk/docs/images/sdk_head-2.png differ diff --git a/odk/docs/images/sdk_line-1.gif b/odk/docs/images/sdk_line-1.gif index f3b27f9..8c4dd92 100644 Binary files a/odk/docs/images/sdk_line-1.gif and b/odk/docs/images/sdk_line-1.gif differ diff --git a/odk/docs/images/sdk_line-2.gif b/odk/docs/images/sdk_line-2.gif deleted file mode 100644 index 44ef014..0000000 Binary files a/odk/docs/images/sdk_line-2.gif and /dev/null differ diff --git a/odk/docs/install.html b/odk/docs/install.html index 232572c..c278959 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -68,16 +68,15 @@ </td> </tr> <tr valign="top"> - <td><b>Apache OpenOffice %PRODUCT_RELEASE% installation</b></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> - </tr> - <tr valign="middle"> - <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> - </tr> - <tr valign="top"> - <td><b>JDK (1.5 or higher)</b></td> + <td><b>Apache OpenOffice %PRODUCT_RELEASE% installation</b></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> + <tr valign="middle"> + <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> + </tr> + <tr valign="top"> + <td><b>JDK (1.5 or higher)</b></td> <td class="content80"> <p>A JDK is necessary for developing Java components or applications. An appropriate Java SDK can be found on <a target="_blank" href="http://java.sun.com/products"; title="link to the Java SDK download page (online)">http://java.sun.com/products</a>.</p> <p>Recommendation is to use Java 6 excepting for Mac OS because initially Mac OS supported a 64bit version of Java 6 only.</p> @@ -310,7 +309,7 @@ </tr> <tr valign="top"> <td class="cell20">OO_SDK_OFFICE_JAVA_DIR</td> - <td class="cell80">The path to the classes direcgtory in the office program directory where Java JARs are located (e.g. + <td class="cell80">The path to the classes directory in the office program directory where Java JARs are located (e.g. <i>$OFFICE_HOME/program/classes</i>).</td> </tr> <tr valign="top"> @@ -439,14 +438,14 @@ <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> + <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo"> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> + <area shape="rect" coords="25,100,400,25" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index ef4d2f4..444eba4 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -24,55 +24,55 @@ <html> <head> <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Not supported page</title> - <link rel="stylesheet" type="text/css" href="sdk_styles.css"> + <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"> + <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.png)"> +<table class="table1" cellpadding=0> + <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> - </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> + <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> + <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"> + </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="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> + <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo"> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> + <area shape="rect" coords="25,100,400,25" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index 96e7e28..c258b0a 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -108,9 +108,7 @@ a:hover { color: #107EC0; text-decoration: underline; } border: 0; } .line { width: 100%; - height: 1px; - border: 0; - vertical-align: middle; } + height: 1px; } .arrow { width: 16px; diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 0e90cc5..b78bcea 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -1103,14 +1103,14 @@ <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> + <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo"> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> + <area shape="rect" coords="25,100,400,25" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 248ca50..468f8d5 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -157,7 +157,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">OpenOffice %PRODUCT_RELEASE% Basic and + title="link to the Basic And Dialogs examples">Apache OpenOffice Basic and Dialogs</a></td> </tr> <tr valign="top"> @@ -301,7 +301,7 @@ drawing document.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="ProfessionalUNO">Professional UNO examples</a></td> + name="ProfessionalUNO"></a>Professional UNO examples</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 @@ -802,7 +802,7 @@ for the image shrink component and instantiates it.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="OfficeDevelopment">Office Development examples</a></td> + name="OfficeDevelopment"></a>Office Development examples</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 @@ -1333,7 +1333,7 @@ instance of this type may be returned by the spell checker.</td> <td class="cell80">This code example creates the service <a href="../../docs/common/ref/com/sun/star/util/PathSettings.html" - title="link to the reference documentation of com.sun.star.util.PathSettingst"> + title="link to the reference documentation of com.sun.star.util.PathSettings"> <code>com.sun.star.util.PathSettings</code></a> and retrieves all path properties from it. It shows how a developer can change the path properties using the <a @@ -1885,7 +1885,7 @@ changes.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="BasicandDialogs">OpenOffice %PRODUCT_RELEASE% Basic and Dialogs examples</a></td> + name="BasicandDialogs"></a>Apache OpenOffice Basic and Dialogs examples</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 @@ -1908,7 +1908,7 @@ changes.</td> <td class="cell20"><a href="./BasicAndDialogs/FirstStepsBasic.odt" title="link to BasicAndDialogs/FirstStepsBasic.odt">FirstStepsBasic.odt</a></td> - <td class="cell80">This OpenOffice Basic example shows how to + <td class="cell80">This Apache OpenOffice Basic example shows how to create an own dialog which inserts a graphics object into a text document.</td> </tr> @@ -2539,8 +2539,8 @@ pressed key on the console.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="UniversalContentBroker(UCB)">Universal Content Broker (UCB) -examples</a></td> + name="UniversalContentBroker(UCB)"></a>Universal Content Broker (UCB) +examples</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 @@ -2906,7 +2906,7 @@ about the currently focused object like its name, description, and role.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="ScriptingFramework">Scripting Framework Examples</a></td> + name="ScriptingFramework"></a>Scripting Framework Examples</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 @@ -2963,8 +2963,8 @@ for the Office application.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a - name="GraphicalUserInterfaces">Graphical User Interfaces</a></td> + <td colspan="2" class="head1"><a name="GraphicalUserInterfaces"></a> + Graphical User Interfaces</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 @@ -3037,14 +3037,14 @@ for the Office application.</td> <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="../../docs/images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> + <p><img class="apachelogo" src="../../docs/images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo"> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> + <area shape="rect" coords="25,100,400,25" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/examples/examples.html b/odk/examples/examples.html index 7db9b8b..cd58eef 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -764,14 +764,14 @@ <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="../docs/images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> + <p><img class="apachelogo" src="../docs/images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo"> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> + <area shape="rect" coords="25,100,400,25" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/index.html b/odk/index.html index f192832..8c9ab78 100644 --- a/odk/index.html +++ b/odk/index.html @@ -206,14 +206,14 @@ <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="docs/images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> + <p><img class="apachelogo" src="docs/images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo"> Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> + <area shape="rect" coords="25,100,400,25" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index a451d05..6fa62c4 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -143,8 +143,7 @@ DOCUFILES= \ $(DESTDIRDOCUIMAGES)/nav_up.png \ $(DESTDIRDOCUIMAGES)/sdk_head-1.png \ $(DESTDIRDOCUIMAGES)/sdk_head-2.png \ - $(DESTDIRDOCUIMAGES)/sdk_line-1.gif \ - $(DESTDIRDOCUIMAGES)/sdk_line-2.gif + $(DESTDIRDOCUIMAGES)/sdk_line-1.gif .IF "$(GUI)"=="UNX" INSTALLSCRIPT= \ diff --git a/odk/util/check.pl b/odk/util/check.pl index 9699ba4..f1290d9 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -86,7 +86,7 @@ if (-d "$StartDir") { "images/nav_home.png","images/nav_left.png", "images/nav_right.png","images/nav_up.png", "images/sdk_head-1.png", "images/sdk_head-2.png", - "images/sdk_line-1.gif", "images/sdk_line-2.gif", + "images/sdk_line-1.gif", "common/ref/idl.css", "images/nada.gif", "images/arrow-2.gif", "images/blueball.png", "images/ooo-main-app_32.png"); diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk index a3bc51f..aa16c1a 100644 --- a/odk/util/makefile.mk +++ b/odk/util/makefile.mk @@ -68,7 +68,6 @@ ODK_OO_FILES=\ $(PRJ)$/docs$/images$/sdk_head-2.gif \ $(PRJ)$/docs$/images$/sdk_head-3.gif \ $(PRJ)$/docs$/images$/sdk_line-1.gif \ - $(PRJ)$/docs$/images$/sdk_line-2.gif \ $(PRJ)$/examples$/examples.html \ $(PRJ)$/examples$/DevelopersGuide$/examples.html commit f706d6215c72896507b8285646b97c3a0a3df4c6 Author: Matthias Seidel <[email protected]> Date: Sat Feb 18 23:41:44 2017 +0000 Further HTML code cleanup diff --git a/odk/docs/install.html b/odk/docs/install.html index 039d53b..232572c 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -29,7 +29,7 @@ <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> -<body class="sdkbody"><a name="install"/> +<body class="sdkbody"><a name="install"></a> <table class="table1" cellpadding=0> <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> @@ -198,7 +198,7 @@ installation, e.g. "/opt/openoffice4". Be sure that it is not a user installation only.</td> </tr> - <tr><a name="oosdkname"/> + <tr><a name="oosdkname"></a> <td class="cell20"><b>OO_SDK_NAME</b></td> <td class="cell80">The configuration uses the directory name of the SDK, but you can use another name as well. diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 71e6ce6..0e90cc5 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -29,7 +29,7 @@ <meta name="author" content="Jürgen Schmidt"> </head> -<body class="sdkbody"><a name="tools"/> +<body class="sdkbody"><a name="tools"></a> <table class="table1" cellpadding=0> <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> @@ -59,14 +59,14 @@ <table class="table3"> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#unopkg" title="link to the unopkg tool description">unopkg</a></td> + <td><a href="#unopkg" title="link to the unopkg tool description">unopkg</a></td> <td class="content87">The new UNO package deployment tool. It comes with the office installation and can be found in the program directory of the office installation.</td> </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#unoexe" title="link to the uno tool description">uno</a></td> + <td><a href="#unoexe" title="link to the uno tool description">uno</a></td> <td class="content87">Tool to provide a UNO runtime environment and provide configured (deployed) or single components. This tool comes with the office installation and can be found in the program @@ -74,13 +74,13 @@ </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#regmerge" title="link to the regmerge tool description">regmerge</a></td> + <td><a href="#regmerge" title="link to the regmerge tool description">regmerge</a></td> <td class="content87">Tool to merge several registry (e.g. type libraries) files into one file. <b>Note:</b> Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the <b>ure</b>.</td> </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#regview" title="link to the regview tool description">regview</a></td> + <td><a href="#regview" title="link to the regview tool description">regview</a></td> <td class="content87">Tool to view the content of a registry file in a human readable manner. Special support for type library nodes. <b>Note:</b> Since OpenOffice.org 3 it is not longer part of the SDK but it comes directly with the office as part of the <b>ure</b>.</td> @@ -120,12 +120,12 @@ </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#regcomp" title="link to the regcomp tool description">regcomp</a></td> + <td><a href="#regcomp" title="link to the regcomp tool description">regcomp</a></td> <td class="content87">A simple UNO component registration tool.</td> </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#regmerge" title="link to the regmerge tool description">regmerge</a></td> + <td><a href="#regmerge" title="link to the regmerge tool description">regmerge</a></td> <td class="content87">Tool to merge several registry (e.g. type libraries) files into one file.</td> </tr> @@ -138,7 +138,7 @@ </tr> <tr valign="top"> <td class="content3"><img src="images/arrow-1.gif"></td> - <td><a href="#autodoc" title="link to the autodoc tool description">autodoc</a></td> + <td><a href="#autodoc" title="link to the autodoc tool description">autodoc</a></td> <td class="content87">Tool to generate javadoc-like documentation for C/C++ and UNOIDL files.</td> </tr> @@ -157,7 +157,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="unopkg"/>unopkg</td> + <td colspan="2" class="head1"><a name="unopkg"></a>unopkg</td> <td align="right"> <a style="a:link:visited #FFFFFF;" href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td> @@ -266,7 +266,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="unoexe"/>uno</td> + <td colspan="2" class="head1"><a name="unoexe"></a>uno</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -367,7 +367,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="idlc">idlc</td> + <td colspan="2" class="head1"><a name="idlc"></a>idlc</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -442,7 +442,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="cppumaker"/>cppumaker</td> + <td colspan="2" class="head1"><a name="cppumaker"></a>cppumaker</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -532,7 +532,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="javamaker"/>javamaker</td> + <td colspan="2" class="head1"><a name="javamaker"></a>javamaker</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -610,7 +610,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="climaker"/>climaker</td> + <td colspan="2" class="head1"><a name="climaker"></a>climaker</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -704,7 +704,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="uno-skeletonmaker"/>uno-skeletonmaker</td> + <td colspan="2" class="head1"><a name="uno-skeletonmaker"></a>uno-skeletonmaker</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -831,7 +831,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="regcomp"/>regcomp</td> + <td colspan="2" class="head1"><a name="regcomp"></a>regcomp</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -894,7 +894,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="regmerge"/>regmerge</td> + <td colspan="2" class="head1"><a name="regmerge"></a>regmerge</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -948,7 +948,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="regview"/>regview</td> + <td colspan="2" class="head1"><a name="regview"></a>regview</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -995,7 +995,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="autodoc"/>autodoc</td> + <td colspan="2" class="head1"><a name="autodoc"></a>autodoc</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 9a40647..248ca50 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -230,8 +230,7 @@ Content Broker (UCB)</a></td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="FirstSteps">First Steps -examples</a></td> + <td colspan="2" class="head1"><a name="FirstSteps"></a>First Steps examples</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 @@ -495,8 +494,8 @@ bootstraps the component context from a UNO installation.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Components">Writing -UNO components examples</a></td> + <td colspan="2" class="head1"><a name="Components"></a>Writing +UNO components examples</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 @@ -1413,8 +1412,8 @@ runtime.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Text">Text -Documents examples</a></td> + <td colspan="2" class="head1"><a name="Text"></a>Text +Documents examples</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 @@ -1486,8 +1485,8 @@ definition to match your installation!</p> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Spreadsheet">Spreadsheet -Documents examples</a></td> + <td colspan="2" class="head1"><a name="Spreadsheet"></a>Spreadsheet +Documents examples</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 @@ -1589,8 +1588,8 @@ settings like splitting sheeting sheets and selecting cells.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Drawing">Drawing -and Presentation Documents examples</a></td> + <td colspan="2" class="head1"><a name="Drawing"></a>Drawing +and Presentation Documents examples</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 @@ -1767,8 +1766,8 @@ text styles in shapes.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Charts">Charts -examples</a></td> + <td colspan="2" class="head1"><a name="Charts"></a>Charts +examples</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 @@ -1976,8 +1975,8 @@ bar </li> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Database">Database -Access examples</a></td> + <td colspan="2" class="head1"><a name="Database"></a>Database +Access examples</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 @@ -2223,8 +2222,8 @@ class.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Forms">Forms -examples</a></td> + <td colspan="2" class="head1"><a name="Forms"></a>Forms +examples</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 @@ -2662,8 +2661,8 @@ resources.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Configuration">Configuration -Management examples</a></td> + <td colspan="2" class="head1"><a name="Configuration"></a>Configuration +Management examples</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 @@ -2716,8 +2715,8 @@ configuration in various ways.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="OfficeBean">Office -Bean example</a></td> + <td colspan="2" class="head1"><a name="OfficeBean"></a>Office +Bean example</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 @@ -2770,8 +2769,8 @@ documents as well as how to control toolbar visibility.</td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="Accessibility">Accessibility -examples</a></td> + <td colspan="2" class="head1"><a name="Accessibility"></a>Accessibility +examples</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 diff --git a/odk/examples/examples.html b/odk/examples/examples.html index 2f618fd..7db9b8b 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -30,7 +30,7 @@ <meta name="created" content="2004-12-14"> </head> -<body class="sdkbody"><a name="examples"/> +<body class="sdkbody"><a name="examples"></a> <table class="table1" cellpadding=0> <tr style="background-image:url(../docs/images/sdk_head-2.png); background-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> @@ -106,9 +106,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 Apache OpenOffice %PRODUCT_RELEASE% Basic examples section">Apache OpenOffice %PRODUCT_RELEASE% Basic examples</a></td> + <td><a href="#Basic_examples" title="link to the Apache OpenOffice Basic examples section">Apache OpenOffice Basic examples</a></td> <td class="content75">Small set of examples which shows the use of - the API from Apache OpenOffice %PRODUCT_RELEASE% Basic.</td> + the API from Apache OpenOffice Basic.</td> </tr> <tr valign="top"> <td class="content3"><img src="../docs/images/arrow-1.gif"></td> @@ -139,7 +139,7 @@ <td> <table class="table3"> <tr> - <td colspan="2" class="head1"><a name="Java_examples">Java examples</td> + <td colspan="2" class="head1"><a name="Java_examples"></a>Java 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> @@ -395,7 +395,7 @@ <td> <table class="table3"> <tr> - <td colspan="2" class="head1"><a name="Cpp_examples">C++ examples</td> + <td colspan="2" class="head1"><a name="Cpp_examples"></a>C++ 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> @@ -487,7 +487,7 @@ <td> <table class="table3"> <tr> - <td colspan="2" class="head1"><a name="Basic_examples">Apache OpenOffice %PRODUCT_RELEASE% Basic examples</td> + <td colspan="2" class="head1"><a name="Basic_examples"></a>Apache OpenOffice 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> @@ -496,7 +496,7 @@ <tr> <td colspan="3"> <p>The example programs are embedded in Apache OpenOffice %PRODUCT_RELEASE% documents in the - samples directory. To view or edit the Apache OpenOffice %PRODUCT_RELEASE% Basic source, + samples directory. To view or edit the Apache OpenOffice 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 @@ -621,7 +621,7 @@ <table class="table3"> <tr> <td colspan="3"> - Additional information: <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/OpenOffice.org_Basic"; title="link to the "OpenOffice.org %PRODUCT_RELEASE% Basic language binding" chapter in the Developer's Guide">OpenOffice.org %PRODUCT_RELEASE% Basic language binding</a> + Additional information: <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/OpenOffice.org_Basic"; title="link to the "Apache OpenOffice Basic language binding" chapter in the Developer's Guide">Apache OpenOffice Basic language binding</a> </td> </tr> </table> @@ -642,7 +642,7 @@ <td> <table class="table3"> <tr> - <td colspan="2" class="head1"><a name="OLE_examples">Object Linking and Embedding (OLE) examples</td> + <td colspan="2" class="head1"><a name="OLE_examples"></a>Object Linking and Embedding (OLE) 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> @@ -707,7 +707,7 @@ <td> <table class="table3"> <tr> - <td colspan="2" class="head1"><a name="CLI_examples">Common Language Infrastructure (CLI) examples</td> + <td colspan="2" class="head1"><a name="CLI_examples"></a>Common Language Infrastructure (CLI) 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> commit b160330c34367bc355031a3850bb2910535049c4 Author: Matthias Seidel <[email protected]> Date: Sat Feb 18 22:39:16 2017 +0000 Fixed typos, HTML code cleanup diff --git a/odk/docs/install.html b/odk/docs/install.html index 0da104b..039d53b 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -41,33 +41,33 @@ <td class="content1"><img class="nothing8" src="images/nada.gif"></td> <td> <table class="table2"> - <tr> - <td colspan="3"><img class="nothing1" src="images/nada.gif"></td> + <tr> + <td colspan="3"><img class="nothing1" src="images/nada.gif"></td> </tr> <tr> - <td> - <table class="table3"> - <tr> - <td colspan="2" class="head1">Installation Guide</td> - <td align="right"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td> - </tr> - </table> - </td> + <td> + <table class="table3"> + <tr> + <td colspan="2" class="head1">Installation Guide</td> + <td align="right"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></td> + </tr> + </table> + </td> </tr> - <tr> + <tr> <td> - <table class="table3"> - <tr> - <td colspan="2"> + <table class="table3"> + <tr> + <td colspan="2"> <p>The Apache OpenOffice %PRODUCT_RELEASE% 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 Apache OpenOffice %PRODUCT_RELEASE% application in - your own programs, or to use the API (scripting or remote control the + 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> + </tr> + <tr valign="top"> <td><b>Apache OpenOffice %PRODUCT_RELEASE% installation</b></td> <td class="content80">The SDK works on top of an existing office installation and uses the same libraries as the office installation.</td> @@ -95,7 +95,7 @@ <table class="table4"> <tr> <td class="cell15">Solaris</td> - <td class="cell85">Sun Studion 8 (20070730)</td> + <td class="cell85">Sun Studio 8 (20070730)</td> </tr> <tr> <td class="cell15">Linux</td> @@ -123,7 +123,7 @@ <tr valign="top"> <td><b>GNU make (3.79.1 or higher)</b></td> <td class="content80"> - <p>GNU make is used to build the examples of the SDK. GNU make is available from <a target="_blank" href="http://www.gnu.org"; title="link to www.gnu.org (online)">http://www.gnu.org</a>. It can be ftped via <a target="_blank" href="ftp://ftp.gnu.org/gnu/make"; title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make</a></p> + <p>GNU make is used to build the examples of the SDK. GNU make is available from <a target="_blank" href="http://www.gnu.org"; title="link to www.gnu.org (online)">http://www.gnu.org</a>. It can be downloaded via FTP from <a target="_blank" href="ftp://ftp.gnu.org/gnu/make"; title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make</a></p> <p><b>Note</b>: Windows user can find an executable of gnu make under <a target="_blank" href="http://www.mingw.org/wiki/Getting_Started"; title="link to the MinGW Getting Started wiki (online)">http://www.mingw.org/wiki/Getting_Started</a> (see the mingw32-make link under "Manual Installation"). Do not use the Cygwin make, because it does not work well. On Solaris gnu make can be found often under <b><i>/usr/sfw/bin/gmake</i></b>, but keep in mind that you have to use <b>'gmake'</b> then. Or you can find gnu make also under <a target="_blank" href="http://www.sunfreeware.com/"; title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a>.</td> </tr> @@ -144,7 +144,7 @@ <td><b>cat and sed tools</b></td> <td class="content80">The cat and set tools are used to create some extensions. <p><b>Note for Windows users</b>: If you do not have these already, you can download them from - <a target="_blank" href="https://sourceforge.net/projects/unxutils/files/latest/downloadg"; title="link to UnxUtils (online)">https://sourceforge.net/projects/unxutils/files/latest/download</a>.</p> + <a target="_blank" href="https://sourceforge.net/projects/unxutils/files/latest/download"; title="link to UnxUtils (online)">https://sourceforge.net/projects/unxutils/files/latest/download</a>.</p> </td> </tr> <tr valign="middle"> @@ -168,7 +168,7 @@ <p>The SDK provides an implicit configuration mechanism, which configures the SDK build environment to your personal needs the first time you use the SDK environment. This configuration step creates a - new setsdkenv_XXX script in the user's home directory:</P> + new setsdkenv_XXX script in the user's home directory:</p> <ul> <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b> -> for Unix <li><b>C:\Documents and Settings\<username>\Application Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b> -> for Windows2000/XP or later @@ -358,7 +358,7 @@ </tr> <tr valign="top"> <td class="cell20">PATH</td> - <td class="cell80">=<i>$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_OFFICE_BIN_DIR: $PATH</i></b><br> + <td class="cell80">=<i>$OO_SDK_HOME/(solsparc|solintel)/bin:$OO_SDK_MAKE_HOME: $OO_SDK_ZIP_HOME: [$OO_SDK_CPP_HOME:] [$OO_SDK_JAVA_HOME/bin:] $OO_SDK_OFFICE_BIN_DIR: $PATH</i><br> <p>The PATH variable will be extended by the paths for the SDK development tools, the compiler, the JDK, GNU make, the zip tool and the OO_SDK_OFFICE_BIN_DIR, where the compiler or the JDK are @@ -366,7 +366,7 @@ </td> </tr> <tr> - <td colspan="2" class="cell80">Based OFFICE_HOME, the script + <td colspan="2" class="cell80">Based on OFFICE_HOME, the script additionally creates symbolic links to the public dynamic libraries of the office UNO runtime in <i>$OO_SDK_HOME/(solsparc|solintel)/lib</i>, which are needed for linking.</td> diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index 1dc32bf..96e7e28 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -143,6 +143,6 @@ a:hover { color: #107EC0; text-decoration: underline; } .content80 { width: 80%; } .content87 { width: 87%; } -.centertext { padding-left:20px; padding-bottom:5px; text-align:left; font-size: 12px; line-height:10pt; } +.centertext { padding-left:20px; padding-top:3px; padding-bottom:5px; text-align:left; font-size: 12px; line-height:10pt; } .apachelogo { float: right; text-align: left; padding-bottom: 12px; padding-right: 8px; padding-left: 5px; width: 188px; height: 76px; } diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 3de9561..71e6ce6 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -769,18 +769,18 @@ </tr> <tr> <td class="cell15"><code>-sn, --shortnames</code></td> - <td class="cell85">using namespace abbreviation 'css:': for '::com::sun::star::', only valid for sub-command 'dump' and target language 'cpp'. It is default for the sub-command 'component'.</td> + <td class="cell85">using namespace abbreviation 'css:': for '::com::sun::star::', only valid for sub-command 'dump' and target language 'cpp'. It is default for the sub-command 'component'.</td> </tr> <tr> <td class="cell15"><code>--propertysetmixin</code></td> <td class="cell85">the generated skeleton implements the cppu::PropertySetMixin helper if a referenced new style service specifies an interface which provides attributes (directly or inherited).</td> </tr> <tr> - <td class="cell15"><code>-lh --licenseheader</code></td> + <td class="cell15"><code>-lh, --licenseheader</code></td> <td class="cell85">generates a default OpenOffice.org LGPL license header at the beginning of a component source file. This option is taken into account in 'component' mode only and if -o is unequal 'stdout'.</td> </tr> <tr> - <td class="cell15"><code>-bc<br>--backward-compatible</code></td> + <td class="cell15"><code>-bc,<br>--backward-compatible</code></td> <td class="cell85">specifies that the generated calc add-in is backward compatible to older office versions and implement the former required add-in interfaces where the implementation is mapped on the new add-in configuration. In this case the config schema needs to be bundled with the extension add-in as well. Default is a minimal add-in component skeleton based on the add-in configuration coming with the office since OO.org 2.0.4.</td> </tr> <tr> diff --git a/odk/examples/examples.html b/odk/examples/examples.html index bbc2163..2f618fd 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -348,11 +348,11 @@ component calculates the start date, day of week of the start date, the end date, and the day of week of the end date. All calculations are dependent upon the values of "Needed Days", "Due Date" - and "Status". The columns "Needed Days" and + and "Status". The columns "Needed Days" and "Status" are mandatory. The first to-do should be placed in row nine. The date to start the calculation should be placed in cell C6. The private holidays should be placed in cell K4/K5 and below.<br> - All rows will be calculated up to the first empty cell in the first + All rows will be calculated up to the first empty cell in the first column. If a cell in the column "Due Date" is colored red, you should take a look at your entries.</td> </tr> @@ -579,12 +579,12 @@ </tr> <tr> <td class="cell20"><a href="basic/sheet/" title="link to the source directory of the Apache OpenOffice %PRODUCT_RELEASE% 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 + <td class="cell80">Most of the members of the European Union have abandoned + their old currency in favor of the Euro in 2001. This requires modifications to all programs using the old currencies. Since the exchange rates for the old currencies have been fixed at the end of 1999, one can - already convert old data. The following program does this for all values - in a table that are formatted with the currency string DM.</td> + simply convert old data. The following program does this for all values + in a table that is formatted with the currency string DM.</td> </tr> <tr> <td class="cell20"><a href="basic/drawing/" title="link to the source directory of the Apache OpenOffice %PRODUCT_RELEASE% Basic drawing example">Import/Export of ASCII Files</a></td> commit ab3fbdc3c92121f02f2430283a085cfa1185ad3b Author: Matthias Seidel <[email protected]> Date: Sat Feb 18 00:31:33 2017 +0000 Rebranding in HTML SDK documentation (OpenOffice.org->Apache OpenOffice diff --git a/odk/examples/DevelopersGuide/GUI/oologo.gif b/odk/examples/DevelopersGuide/GUI/oologo.gif index eb5e679..71a8d87 100644 Binary files a/odk/examples/DevelopersGuide/GUI/oologo.gif and b/odk/examples/DevelopersGuide/GUI/oologo.gif differ diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index ed4b369..9a40647 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -157,7 +157,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">OpenOffice.org %PRODUCT_RELEASE% Basic and + title="link to the Basic And Dialogs examples">OpenOffice %PRODUCT_RELEASE% Basic and Dialogs</a></td> </tr> <tr valign="top"> @@ -230,7 +230,7 @@ Content Broker (UCB)</a></td> <table class="table3"> <tbody> <tr> - <td colspan="2" class="head1"><a name="FirstSteps">FirstSteps + <td colspan="2" class="head1"><a name="FirstSteps">First Steps examples</a></td> <td align="right"> <a href="#examples" title="link to the Developer's Guide examples overview"><img @@ -256,7 +256,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 OpenOffice.org %PRODUCT_RELEASE% in a +get a remote office service manager from a running Apache OpenOffice %PRODUCT_RELEASE% in a different process space.</td> </tr> <tr> @@ -265,7 +265,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 OpenOffice.org %PRODUCT_RELEASE% by a Java application.</td> +component into Apache OpenOffice %PRODUCT_RELEASE% by a Java application.</td> </tr> <tr> <td class="cell20"><img @@ -356,15 +356,15 @@ 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 OpenOffice.org %PRODUCT_RELEASE%.</td> +of losing connection to Apache OpenOffice %PRODUCT_RELEASE%.</td> </tr> <tr> <td class="cell20"><img src="../../docs/images/blueball.png"> <a href="./ProfUNO/InterprocessConn/UrlResolver.java" title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver</a></td> - <td class="cell80">Builds a connection to -OpenOffice.org %PRODUCT_RELEASE% using the URL given on the command line. This example + <td class="cell80">Builds a connection to Apache +OpenOffice %PRODUCT_RELEASE% 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> @@ -386,8 +386,8 @@ shows the usage of <a src="../../docs/images/blueball.png"> <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 -OpenOffice.org %PRODUCT_RELEASE% using C++.</td> + <td class="cell80">Builds a connection to Apache +OpenOffice %PRODUCT_RELEASE% using C++.</td> </tr> <tr> <td class="cell20"><img @@ -748,8 +748,8 @@ 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 OpenOffice.org %PRODUCT_RELEASE% Basic IDE. The component provides methods that - can be bound to dialog respectively control events .</td> + with the Apache OpenOffice %PRODUCT_RELEASE% Basic IDE. The component provides methods that + can be bound to dialog respectively control events.</td> </tr> <tr> <td class="cell20"><a @@ -965,7 +965,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 OpenOffice.org %PRODUCT_RELEASE% via system +interception. It integrates windows from Apache OpenOffice %PRODUCT_RELEASE% 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> @@ -980,8 +980,8 @@ and it's actions.</td> <td class="cell20"><a href="./OfficeDev/DesktopEnvironment/FunctionHelper.java" title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper</a></td> - <td class="cell80">This helper comprises all -OpenOffice.org %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these + <td class="cell80">This helper comprises all Apache +OpenOffice %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these aspects separately from the rest of the application example.</td> </tr> <tr> @@ -996,7 +996,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 OpenOffice.org %PRODUCT_RELEASE%.</td> +clean up on shutdown of Apache OpenOffice %PRODUCT_RELEASE%.</td> </tr> <tr> <td class="cell20"><a @@ -1026,8 +1026,8 @@ get the window handle of the Java window.</td> <td class="cell20"><a href="./OfficeDev/DesktopEnvironment/OfficeConnect.java" title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect</a></td> - <td class="cell80">Builds the remote bridge to -OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of + <td class="cell80">Builds the remote bridge to Apache +OpenOffice %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of the application.</td> </tr> <tr> @@ -1058,7 +1058,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 OpenOffice.org %PRODUCT_RELEASE% shutdown.</td> +side on Apache OpenOffice %PRODUCT_RELEASE% shutdown.</td> </tr> </tbody> </table> @@ -1076,8 +1076,8 @@ side on OpenOffice.org %PRODUCT_RELEASE% shutdown.</td> <td class="cell20"><a href="./OfficeDev/OfficeConnect.java" title="link to OfficeDev/OfficeConnect.java">OfficeConnect</a></td> - <td class="cell80">Builds the remote bridge to -OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td> + <td class="cell80">Builds the remote bridge to Apache +OpenOffice %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td> </tr> <tr> <td class="cell20"><img @@ -1133,7 +1133,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 OpenOffice.org %PRODUCT_RELEASE% terminates.</td> +when Apache OpenOffice %PRODUCT_RELEASE% terminates.</td> </tr> </tbody> </table> @@ -1199,7 +1199,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 OpenOffice.org %PRODUCT_RELEASE% linguistic API.</td> +the functionality from the Apache OpenOffice %PRODUCT_RELEASE% linguistic API.</td> </tr> <tr> <td class="cell20"><a @@ -1680,7 +1680,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 OpenOffice.org %PRODUCT_RELEASE% and open or create a drawing +other examples to connect to Apache OpenOffice %PRODUCT_RELEASE% and open or create a drawing document.</td> </tr> <tr> @@ -1830,8 +1830,8 @@ is not implemented. To be more precise.</td> <tr> <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 -OpenOffice.org %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This + <td class="cell80">Shows how to connect to Apache +OpenOffice %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This class is used as a helper class for the other examples.</td> </tr> <tr> @@ -1886,7 +1886,7 @@ changes.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="BasicandDialogs">OpenOffice.org %PRODUCT_RELEASE% Basic and Dialogs examples</a></td> + name="BasicandDialogs">OpenOffice %PRODUCT_RELEASE% 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 @@ -1909,7 +1909,7 @@ changes.</td> <td class="cell20"><a href="./BasicAndDialogs/FirstStepsBasic.odt" title="link to BasicAndDialogs/FirstStepsBasic.odt">FirstStepsBasic.odt</a></td> - <td class="cell80">This StarBasic example shows how to + <td class="cell80">This OpenOffice Basic example shows how to create an own dialog which inserts a graphics object into a text document.</td> </tr> @@ -2007,8 +2007,8 @@ the example. </td> src="../../docs/images/blueball.png"> <a href="./Database/CodeSamples.java" title="link to Database/CodeSamples.java">CodeSamples</a></td> - <td class="cell80">Creates the connection to -OpenOffice.org %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td> + <td class="cell80">Creates the connection to Apache +OpenOffice %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td> </tr> <tr> <td class="cell20"><img @@ -2687,8 +2687,8 @@ Management examples</a></td> src="../../docs/images/blueball.png"> <a href="./Config/ConfigExamples.java" title="link to Config/ConfigExamples.java">ConfigExamples</a></td> - <td class="cell80">This example connects to a -OpenOffice.org %PRODUCT_RELEASE%, gets the configuration manager and accesses the + <td class="cell80">This example connects to Apache +OpenOffice %PRODUCT_RELEASE%, gets the configuration manager and accesses the configuration in various ways.</td> </tr> </tbody> commit 6eff9d3f057f39d27947fd45cbfdd7fecc7eb2c7 Author: Matthias Seidel <[email protected]> Date: Fri Feb 17 19:03:17 2017 +0000 Changed %PRODUCT_RELEASE% for SDK from 4.2.0 to 4.2, removed unused graphics, fixed typos, changed makefiles diff --git a/odk/docs/images/bluball.gif b/odk/docs/images/bluball.gif deleted file mode 100644 index dc7c020..0000000 Binary files a/odk/docs/images/bluball.gif and /dev/null differ diff --git a/odk/docs/images/odk-footer-logo.gif b/odk/docs/images/odk-footer-logo.gif deleted file mode 100644 index 65452c9..0000000 Binary files a/odk/docs/images/odk-footer-logo.gif and /dev/null differ diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index 81c3136..1dc32bf 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -19,10 +19,9 @@ * *************************************************************/ -a { text-decoration: none; } -a:link { color: #107EC0; } -a:visited { color: #638093; } -a:active { color: #4dadea; } +a:link { color: #107EC0; text-decoration: none; } +a:visited { color: #638093; text-decoration: none; } +a:hover { color: #107EC0; text-decoration: underline; } .sdkbody { background-color: #FFFFFF; color: #333333; diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 0985d26..ed4b369 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -82,7 +82,7 @@ comes with a wide range of examples from all application areas which shows the use of the API in the context of the different functional areas. Furthermore the examples can be used as a first starting point to modify an existing example to their own needs.</p> - <p>Some fo the examples need a running office + <p>Some of the examples need a running office instance listening on a port. If this is necessary you will get further information in the makefiles.</p> <p>All examples marked with a <img @@ -302,7 +302,7 @@ drawing document.</td> <tbody> <tr> <td colspan="2" class="head1"><a - name="ProfessionalUNO">Professional UNO examples1</a></td> + name="ProfessionalUNO">Professional UNO 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 diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index a64a174..a451d05 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -128,9 +128,9 @@ DOCUFILES= \ $(DESTDIRGENIDLREF)/idl.css \ $(DESTDIRDOCUIMAGES)/nada.gif \ $(DESTDIRDOCUIMAGES)/arrow-2.gif \ - $(DESTDIRDOCUIMAGES)/bluball.gif \ + $(DESTDIRDOCUIMAGES)/blueball.png \ $(DESTDIRDOCUIMAGES)/ooo-main-app_32.png \ - $(DESTDIRDOCUIMAGES)/odk-footer-logo.gif \ + $(DESTDIRDOCUIMAGES)/sdk-footer-logo.png \ $(DESTDIRDOCUIMAGES)/arrow-1.gif \ $(DESTDIRDOCUIMAGES)/arrow-3.gif \ $(DESTDIRDOCUIMAGES)/bg_table.png \ diff --git a/odk/util/check.pl b/odk/util/check.pl index 2f10d73..9699ba4 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -80,7 +80,7 @@ if (-d "$StartDir") { my @filelist = ( "install.html", "notsupported.html","sdk_styles.css","tools.html", "images/arrow-1.gif", "images/arrow-3.gif", - "images/odk-footer-logo.gif", + "images/sdk-footer-logo.png", "images/bg_table.png","images/bg_table2.png", "images/bg_table3.png", "images/nav_down.png", "images/nav_home.png","images/nav_left.png", @@ -88,7 +88,7 @@ if (-d "$StartDir") { "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/arrow-2.gif", "images/blueball.png", "images/ooo-main-app_32.png"); foreach $i (@filelist) diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 3f00a0d..4ec6cf2 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -22,7 +22,7 @@ # used for sdk common files -PRODUCT_RELEASE=4.2.0 +PRODUCT_RELEASE=4.2 OFFICENAME=OpenOffice .IF "$(GUI)"=="WNT" SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK commit 5fc3e0d811fd42081c0dfd755e0a77fc8a705106 Author: Matthias Seidel <[email protected]> Date: Thu Feb 16 21:39:04 2017 +0000 Changed %PRODUCT_RELEASE% for SDK from 4.1 to 4.2.0 diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index eb1d4c0..3f00a0d 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -22,7 +22,7 @@ # used for sdk common files -PRODUCT_RELEASE=4.1 +PRODUCT_RELEASE=4.2.0 OFFICENAME=OpenOffice .IF "$(GUI)"=="WNT" SDKDIRNAME=OpenOffice_$(PRODUCT_RELEASE)_SDK commit e35bf00078b9e02148ec24904ddba566fe7ae4e4 Author: Matthias Seidel <[email protected]> Date: Thu Feb 16 18:10:50 2017 +0000 Uploaded missing graphics for SDK HTML doc, HTML code changes diff --git a/odk/docs/images/blueball.png b/odk/docs/images/blueball.png new file mode 100644 index 0000000..a86369f Binary files /dev/null and b/odk/docs/images/blueball.png differ diff --git a/odk/docs/images/sdk-footer-logo.png b/odk/docs/images/sdk-footer-logo.png new file mode 100644 index 0000000..c72e34b Binary files /dev/null and b/odk/docs/images/sdk-footer-logo.png differ diff --git a/odk/docs/images/sdk_line-1.gif b/odk/docs/images/sdk_line-1.gif index 199d3a8..f3b27f9 100644 Binary files a/odk/docs/images/sdk_line-1.gif and b/odk/docs/images/sdk_line-1.gif differ diff --git a/odk/docs/install.html b/odk/docs/install.html index eaae3f3..0da104b 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -25,7 +25,7 @@ <head> <title>Apache OpenOffice %PRODUCT_RELEASE% 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 http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> @@ -106,7 +106,7 @@ <td class="cell80">Microsoft C++ Compiler, Microsoft Visual Studio 2008 or the Express version (cl, version 15.00.21022)</td> </tr> </table> - <p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF&displaylang=en";>Microsoft Visual Studio 2008 Redistributable Package</a> is also installed. You can download this package from Microsoft directly.</p></td> + <p><b>Note</b>: The C++ compiler is <b><u>optional</u></b>! If you use the Express edition you have to ensure that the <a href="https://www.microsoft.com/en-us/download/details.aspx?id=29";>Microsoft Visual C++ 2008 Redistributable Package (x86)</a> is also installed. You can download this package from Microsoft directly.</p></td> </tr> <tr valign="middle"> <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> @@ -144,7 +144,7 @@ <td><b>cat and sed tools</b></td> <td class="content80">The cat and set tools are used to create some extensions. <p><b>Note for Windows users</b>: If you do not have these already, you can download them from - <a target="_blank" href="http://sourceforge.net/projects/unxutils/files/latest/downloadg"; title="link to UnxUtils (online)">http://sourceforge.net/projects/unxutils/files/latest/download</a>.</p> + <a target="_blank" href="https://sourceforge.net/projects/unxutils/files/latest/downloadg"; title="link to UnxUtils (online)">https://sourceforge.net/projects/unxutils/files/latest/download</a>.</p> </td> </tr> <tr valign="middle"> @@ -152,7 +152,7 @@ </tr> <td><b>Boost (<b>Unix only</b> and optional)</b></td> <td class="content80">The boost library is used today on Unix systems as replacement for the stlport library. The stlport library is removed and replaced by either the compiler stl (on Windows) or the boost stl on all Unix based systems. We are planning to switch to the compiler stl completely as soon as possible. The boost headers/library are <b>optional</b> and for C++ development only if stl containers are used. - <p><b>Download:</b> <a target="_blank" href="http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download"; title="link to boost version 1.48.0 (online)">http://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download</a>.</p> + <p><b>Download:</b> <a target="_blank" href="https://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download"; title="link to boost version 1.48.0 (online)">https://sourceforge.net/projects/boost/files/boost/1.48.0/boost_1_48_0.tar.bz2/download</a>.</p> </td> <tr valign="middle"> <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td> @@ -267,7 +267,7 @@ <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td> <td class="cell80">If this variable is set, the component examples are automatically deployed into the Office installation referenced by OFFICE_HOME. See also chapter <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; title="link to the "Extension Manager - unopkg" chapter in the Developer's Guide">"Extension Manager - unopkg"</a> from the Developer's Guide. - This variable is only relevant when OFFICE_HOME is set.</td> + This variable is only relevant when OFFICE_HOME is set.</td> </tr> </table> <p>You must run the <b>setsdkenv_XXX</b> script every time you want to @@ -446,7 +446,7 @@ </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="http://www.openoffice.org";> + <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index d72f160..ef4d2f4 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -25,7 +25,7 @@ <head> <title>Apache OpenOffice %PRODUCT_RELEASE% 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 http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> @@ -72,7 +72,7 @@ </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="http://www.openoffice.org";> + <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index b79b9e6..81c3136 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -32,7 +32,7 @@ a:active { color: #4dadea; } margin-right: 0; font-family: Arial, Helvetica, sans-serif; } -.note { font-size: 20; +.note { font-size: 20px; font-weight: bold; font-style: italic; text-align: center; } @@ -44,94 +44,93 @@ a:active { color: #4dadea; } .table2 { width: 100%; border-style: none; - border-spacing: 8; - padding: 5; } + border-spacing: 8px; + padding: 5px; } .table3 { width: 100%; border-style: none; - border-spacing: 6; + border-spacing: 0px 6px; padding: 0; } .table4 { width: 100%; - border-width: 2px; - border-style: groove; - border-color: #CCCCCC; + border-width: 1px; + border-style: solid; + border-color: #555555; border-spacing: 0; border-collapse: collapse; } .cell15 { width: 15%; - border-width: 2px; - border-style: groove; - border-color: #CCCCCC; + border-width: 1px; + border-style: solid; + border-color: #555555; border-spacing: 0; border-collapse: collapse; - padding: 4; } + padding: 4px; } .cell20 { width: 20%; - border-width: 2px; - border-style: groove; - border-color: #CCCCCC; + border-width: 1px; + border-style: solid; + border-color: #555555; border-spacing: 0; border-collapse: collapse; - padding: 4; } + padding: 4px; } .cell80 { width: 80%; - border-width: 2px; - border-style: groove; - border-color: #CCCCCC; + border-width: 1px; + border-style: solid; + border-color: #555555; border-spacing: 0; border-collapse: collapse; - padding: 4; } + padding: 4px; } .cell85 { width: 85%; - border-width: 2px; - border-style: groove; - border-color: #CCCCCC; + border-width: 1px; + border-style: solid; + border-color: #555555; border-spacing: 0; border-collapse: collapse; - padding: 4; } + padding: 4px; } -.nothing1 { width: 20; - height: 1; } +.nothing1 { width: 20px; + height: 1px; } -.nothing8 { width: 20; - height: 8; } +.nothing8 { width: 20px; + height: 8px; } -.nothing10 { width: 20; - height: 10; } +.nothing10 { width: 20px; + height: 10px; } -.nothing30 { width: 20; - height: 30; } +.nothing30 { width: 20px; + height: 30px; } -.appicon { width: 32; - height: 32; +.appicon { width: 32px; + height: 32px; border: 0; } .line { width: 100%; - height: 2px; + height: 1px; border: 0; vertical-align: middle; } -.arrow { width: 16; - height: 13; } +.arrow { width: 16px; + height: 13px; } -.head1 { font-size: 20; +.head1 { font-size: 20px; font-weight: bold; } -.head2 { font-size: 18; +.head2 { font-size: 18px; font-weight: bold; } -.head3 { font-size: 17; +.head3 { font-size: 17px; font-weight: bold; } -.head4 { font-size: 16; +.head4 { font-size: 16px; font-weight: bold; } .thead { font-weight: bold; - background-image:url(../docs/images/bg_table.png); - background-position: middle; } + background-color: #CCCCCC; } .navigate { border: 0; } @@ -146,5 +145,5 @@ a:active { color: #4dadea; } .content87 { width: 87%; } .centertext { padding-left:20px; padding-bottom:5px; text-align:left; font-size: 12px; line-height:10pt; } -.apachelogo { float: right; text-align: left; padding-bottom: 12px; padding-right: 8px; width: 188px; height: 76px; } +.apachelogo { float: right; text-align: left; padding-bottom: 12px; padding-right: 8px; padding-left: 5px; width: 188px; height: 76px; } diff --git a/odk/docs/tools.html b/odk/docs/tools.html index c6791c3..3de9561 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -25,7 +25,7 @@ <head> <title>Apache OpenOffice %PRODUCT_RELEASE% 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 http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="Jürgen Schmidt"> </head> @@ -316,7 +316,7 @@ <tr> <td class="cell15"><code><HostName></code></td> <td class="cell85">Specifying a host name might be necessary to - distinguish the network interface to be used,if a machine is part of + distinguish the network interface to be used, if a machine is part of two networks.</td> </tr> <tr> @@ -367,7 +367,7 @@ <td> <table class="table2"> <tr> - <td colspan="2" class="head1"><a name="idlc"/>idlc</td> + <td colspan="2" class="head1"><a name="idlc">idlc</td> <td align="right"> <a href="#tools" title="link to the tools overview"><img class="navigate" src="images/nav_up.png"></a> <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a> @@ -1110,7 +1110,7 @@ </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="http://www.openoffice.org";> + <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index 78501c0..0985d26 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -27,7 +27,7 @@ <link rel="stylesheet" type="text/css" href="../../docs/sdk_styles.css"> <meta http-equiv="Content-Type" - content="text/html; charset=iso-8859-1"> + content="text/html; charset=UTF-8"> <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> @@ -1909,7 +1909,7 @@ changes.</td> <td class="cell20"><a href="./BasicAndDialogs/FirstStepsBasic.odt" title="link to BasicAndDialogs/FirstStepsBasic.odt">FirstStepsBasic.odt</a></td> - <td class="cell80">This StarBasc example shows how to + <td class="cell80">This StarBasic example shows how to create an own dialog which inserts a graphics object into a text document.</td> </tr> @@ -2189,7 +2189,7 @@ implementation of the class declared in SStatement.hxx.</td> href="./Database/DriverSkeleton/propertyids.hxx" title="link to Database/DriverSkeleton/propertyids.hxx">propertyids.hxx</a></td> <td class="cell80">Defines some common used strings -and declare a helper class for properties.</td> +and declares a helper class for properties.</td> </tr> <tr> <td class="cell20"><a @@ -2313,8 +2313,7 @@ fields from these tables.</td> <td class="cell20"><a href="./Forms/DateValidator.java" title="link to Forms/DateValidator.java">DateValidator</a></td> - <td class="cell80">The class <code>DateValidator</code> -implements an <a + <td class="cell80">The class <code>DateValidator</code> implements an <a href="../../docs/common/ref/com/sun/star/form/validation/XValidator.html" title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a> for a form control, which can check the content of a form date field. </td> @@ -2408,8 +2407,7 @@ control.</td> <td class="cell20"><a href="./Forms/NumericValidator.java" title="link to Forms/NumericValidator.java">NumericValidator</a></td> - <td class="cell80">The class <code>NumericValidator</code> -implements an <a + <td class="cell80">The class <code>NumericValidator</code> implements an <a href="../../docs/common/ref/com/sun/star/form/validation/XValidator.html" title="link to the reference documentation of com.sun.star.form.validation.XValidator">validator</a> for a form control, which can veto certain values in every control @@ -2499,8 +2497,7 @@ for a form control, which can monitor the content of a form time field. <tr> <td class="cell20"><a href="./Forms/UNO.java" title="link to Forms/UNO.java">UNO</a></td> - <td class="cell80">A small UNO-syntax related helper -class.</td> + <td class="cell80">A small UNO-syntax related helper class.</td> </tr> <tr> <td class="cell20"><img @@ -3048,7 +3045,7 @@ for the Office application.</td> </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="http://www.openoffice.org";> + <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/examples/examples.html b/odk/examples/examples.html index f29bd32..bbc2163 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -25,7 +25,7 @@ <head> <title>Apache OpenOffice %PRODUCT_RELEASE% 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 http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> @@ -318,7 +318,7 @@ <td class="cell80">Description</td> </tr> <tr> - <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="cell20"><a href="https://wiki.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 Apache OpenOffice %PRODUCT_RELEASE% API at run-time. Depending on the object to be inspected, @@ -329,7 +329,7 @@ expanded with the help of the mouse. For each non primitive object, five categories are offered to the user, as long as those are available with that object. The Object Inspector is currently available as a NetBeans project - only because of major code changes. Please see the <a href="http://wiki.services.openoffice.org/wiki/Object_Inspector"; title="link to the Object Inspector project page in the wiki">project page</a> for further details.</td> + only because of major code changes. Please see the <a href="https://wiki.openoffice.org/wiki/Object_Inspector"; title="link to the Object Inspector project page in the wiki">project page</a> for further details.</td> </tr> <tr> <td class="cell20"><a href="java/MinimalComponent/" title="link to the source directory of the Java MinimalComponent example">MinimalComponent</a></td> @@ -340,7 +340,7 @@ <tr> <td class="cell20"><a href="java/PropertySet/" title="link to the source directory of the Java PropertySet example">PropTest</a></td> <td class="cell80">Contains a component that provides property set - interfaces by means of inheriting <a href="../docs/java/ref/com/sun/star/lib/uno/helper/PropertySet.html" title="link into the Java UNO reference to the PropertySet helper class">com.sun.star.lib.uno.helper.ProperterSet</a>.</td> + interfaces by means of inheriting <a href="../docs/java/ref/com/sun/star/lib/uno/helper/PropertySet.html" title="link into the Java UNO reference to the PropertySet helper class">com.sun.star.lib.uno.helper.PropertySet</a>.</td> </tr> <tr> <td class="cell20"><a href="java/ToDo/" title="link to the source directory of the Java ToDo example">ToDo</a></td> @@ -771,7 +771,7 @@ </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="http://www.openoffice.org";> + <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> </map> </body> </html> diff --git a/odk/index.html b/odk/index.html index b3a3f45..f192832 100644 --- a/odk/index.html +++ b/odk/index.html @@ -25,7 +25,7 @@ <head> <title>Apache OpenOffice %PRODUCT_RELEASE% SDK - Overview</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 http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="Jürgen Schmidt"> <meta name="created" content="2004-12-14"> </head> @@ -150,7 +150,7 @@ </tr> <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> - <td colspan="2"><a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office"; title="link to the OASIS Open Office XML Format TC (online)">OASIS Open Document Format for Office Applications (OpenDocument) TC</a></td> + <td colspan="2"><a href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office"; title="link to the OASIS Open Office XML Format TC (online)">OASIS Open Document Format for Office Applications (OpenDocument) TC</a></td> <td class="content70">Link to the OASIS Open Document Format for Office Applications (OpenDocument) Technical Committee where you can find the latest information about the OASIS Open Document XML @@ -159,7 +159,7 @@ </tr> <tr valign="top"> <td class="content4"><img src="docs/images/arrow-1.gif"></td> - <td colspan="2"><a href="http://xml.openoffice.org/xml_specification.pdf"; title="link to the OpenOffice.org XML File Format Specification">OpenOffice.org XML File Format</a></td> + <td colspan="2"><a href="https://xml.openoffice.org/xml_specification.pdf"; title="link to the OpenOffice.org XML File Format Specification">OpenOffice.org XML File Format</a></td> <td class="content70">Specification of the initial OpenOffice.org XML File Format.</td> </tr> <tr valign="middle"> @@ -186,8 +186,8 @@ </tr> <tr valign="middle"> <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 Apache OpenOffice 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 Apache OpenOffice homepage (online)">Apache OpenOffice™</a></td> + <td width="5%"><a target="_blank" href="https://www.openoffice.org/"; title="link to the Apache OpenOffice homepage (online)"><img class="appicon" src="docs/images/ooo-main-app_32.png"></a></td> + <td width="21%"><a target="_blank" href="https://www.openoffice.org/"; title="link to the Apache OpenOffice homepage (online)">Apache OpenOffice™</a></td> <td class="content70">Open Source community project of office-productivity software.</td> </tr> </table> @@ -213,7 +213,7 @@ </tr> </table> <map name="Map"> - <area shape="rect" coords="10,68,400,105" href="http://www.openoffice.org";> + <area shape="rect" coords="10,68,400,105" href="https://www.openoffice.org";> </map> </body> </html> commit 637cb4c20f4a89a35775ee691ba5f29931284e79 Author: Matthias Seidel <[email protected]> Date: Wed Feb 15 14:31:16 2017 +0000 Updated footer with new ASF logo, updated graphic (bluball.gif->blueball.png), fixed Wiki links and some smal typos diff --git a/odk/docs/install.html b/odk/docs/install.html index 5f94d66..eaae3f3 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -266,7 +266,7 @@ <tr> <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td> <td class="cell80">If this variable is set, the component examples are automatically deployed into the Office installation referenced by - OFFICE_HOME. See also chapter <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; title="link to the "Extension Manager - unopkg" chapter in the Developer's Guide">"Extension Manager - unopkg"</a> from the Developer's Guide. + OFFICE_HOME. See also chapter <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; title="link to the "Extension Manager - unopkg" chapter in the Developer's Guide">"Extension Manager - unopkg"</a> from the Developer's Guide. This variable is only relevant when OFFICE_HOME is set.</td> </tr> </table> @@ -439,7 +439,7 @@ <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" /> + <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index b33c29f..d72f160 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -65,7 +65,7 @@ <tr> <td colspan="3"> <div class="centertext"> - <p><img class="apachelogo" src="images/odk-footer-logo.gif" title="Apache Feather" alt="Apache Feather" /> + <p><img class="apachelogo" src="images/sdk-footer-logo.png" title="Apache Logo" alt="Apache Logo" /> Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache, the Apache feather logo, Apache OpenOffice and OpenOffice.org are trademarks of The Apache Software Foundation. Other names may be trademarks of their respective owners.<p> </div> </td> diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index 95c6f8d..b79b9e6 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -20,12 +20,12 @@ *************************************************************/ a { text-decoration: none; } -a:link { color: #0e85cd; } +a:link { color: #107EC0; } a:visited { color: #638093; } a:active { color: #4dadea; } .sdkbody { background-color: #FFFFFF; - color: #000000; + color: #333333; margin-top: 0; margin-bottom: 0; margin-left: 0; @@ -109,7 +109,7 @@ a:active { color: #4dadea; } border: 0; } .line { width: 100%; - height: 5; + height: 2px; border: 0; vertical-align: middle; } @@ -145,7 +145,6 @@ a:active { color: #4dadea; } .content80 { width: 80%; } .content87 { width: 87%; } -.centertext {align:center; text-align:center; font-size: 12;} -.apachelogo {vertical-align:middle;} - +.centertext { padding-left:20px; padding-bottom:5px; text-align:left; font-size: 12px; line-height:10pt; } +.apachelogo { float: right; text-align: left; padding-bottom: 12px; padding-right: 8px; width: 188px; height: 76px; } diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 25a6c8e..c6791c3 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -172,7 +172,7 @@ 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 - Developer's Guide: <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; title="link to the "Extension Manager - unopkg" chapter in the Developer's Guide">Extension Manager - <i>unopkg</i></a>.</p> + Developer's Guide: <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/unopkg"; title="link to the "Extension Manager - unopkg" chapter in the Developer's Guide">Extension Manager - <i>unopkg</i></a>.</p> <p><b>Note:</b> This tool works only in the <i><office>/program</i> directory!</p> <p class="head2">Usage:</p> @@ -379,7 +379,7 @@ to check UNODL type definitions and transform valid type definitions into a binary type library format, which is later used by all codemaker tools. It is also used as a dynamic type library for UNO at runtime.<br> - You can find a syntax description for UNOIDL <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/AppendixD/UNOIDL_Syntax_Specification"; title="link to the "UNOIDL Syntax Specification" chapter in the Developer's Guide">here</a>.</p> + You can find a syntax description for UNOIDL <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide/AppendixD/UNOIDL_Syntax_Specification"; title="link to the "UNOIDL Syntax Specification" chapter in the Developer's Guide">here</a>.</p> <p class="head2">Usage:</p> <blockquote> <b><code>idlc [-options] file_1 ... file_n | @<filename></code></b> @@ -452,8 +452,8 @@ <td colspan="3"> <p>The 'cppumaker' generates a C++ representation for idl types. The cppumaker works on a typelibrary, which is generated by the UNOIDL - compiler (<a href="#idlc" link="link to the idlc tool description"> - idlc</a>). It generates the output for all specified types and for all + compiler (<a href="#idlc" link="link to the idlc tool description">idlc</a>). + It generates the output for all specified types and for all types the specified types depend on.</p> <p class="head2">Usage:</p> <blockquote> @@ -542,9 +542,9 @@ <td colspan="3"> <p>The 'javamaker' generates the appropriate Java class file for each idl type. The javamaker works on a typelibrary which is generated by the - UNOIDL compiler (<a href="#idlc" link="link to the idlc tool description"> - idlc</a>). It generates the output for all specified types and for all -types the specified types depend on.</p> + UNOIDL compiler (<a href="#idlc" link="link to the idlc tool description">idlc</a>). ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
