[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/index.html rsc/Executable_rsc2.mk rsc/Executable_rsc.mk rsc/Executable_rscpp.mk rsc/Module_rsc.mk rsc/Package_inc.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 11 10:10:59 UTC 2018
odk/index.html | 120 ++++++++++++++++++++++++------------------------
rsc/Executable_rsc.mk | 8 +--
rsc/Executable_rsc2.mk | 12 ++--
rsc/Executable_rscpp.mk | 8 +--
rsc/Module_rsc.mk | 1
rsc/Package_inc.mk | 2
6 files changed, 76 insertions(+), 75 deletions(-)
New commits:
commit 970fe081158a12d0db4fc6bad9449b8c9aa51f1d
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Thu Oct 11 09:49:52 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Thu Oct 11 09:49:52 2018 +0000
Minor cleanup according to vim modeline
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index fbeff1d390ed..621e98619539 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -26,9 +26,9 @@ $(eval $(call gb_Executable_Executable,rsc))
$(eval $(call gb_Executable_add_precompiled_header,rsc,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
$(eval $(call gb_Executable_set_include,rsc,\
- $$(INCLUDE) \
- -I$(SRCDIR)/rsc/inc \
- -I$(SRCDIR)/rsc/inc/pch \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/rsc/inc \
+ -I$(SRCDIR)/rsc/inc/pch \
))
$(eval $(call gb_Executable_add_linked_libs,rsc,\
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_linked_libs,rsc,\
tl \
vos3 \
stl \
- $(gb_STDLIBS) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_exception_objects,rsc,\
diff --git a/rsc/Executable_rsc2.mk b/rsc/Executable_rsc2.mk
index 897f39b3d199..d1587a16ce59 100644
--- a/rsc/Executable_rsc2.mk
+++ b/rsc/Executable_rsc2.mk
@@ -26,14 +26,14 @@ $(eval $(call gb_Executable_Executable,rsc2))
$(eval $(call gb_Executable_add_precompiled_header,rsc2,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
$(eval $(call gb_Executable_set_include,rsc2,\
- $$(INCLUDE) \
- -I$(SRCDIR)/rsc/inc \
- -I$(SRCDIR)/rsc/inc/pch \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/rsc/inc \
+ -I$(SRCDIR)/rsc/inc/pch \
))
$(eval $(call gb_Executable_add_api,rsc2,\
- offapi \
- udkapi \
+ offapi \
+ udkapi \
))
$(eval $(call gb_Executable_add_linked_libs,rsc2,\
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_add_linked_libs,rsc2,\
tl \
vos3 \
stl \
- $(gb_STDLIBS) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_bison_files,rsc2,\
diff --git a/rsc/Executable_rscpp.mk b/rsc/Executable_rscpp.mk
index 4011a52e2fbf..1b30d7ecf5c1 100644
--- a/rsc/Executable_rscpp.mk
+++ b/rsc/Executable_rscpp.mk
@@ -26,9 +26,9 @@ $(eval $(call gb_Executable_Executable,rscpp))
$(eval $(call gb_Executable_add_precompiled_header,rscpp,$(SRCDIR)/rsc/inc/pch/precompiled_rsc))
$(eval $(call gb_Executable_set_include,rscpp,\
- $$(INCLUDE) \
- -I$(SRCDIR)/rsc/inc \
- -I$(SRCDIR)/rsc/inc/pch \
+ $$(INCLUDE) \
+ -I$(SRCDIR)/rsc/inc \
+ -I$(SRCDIR)/rsc/inc/pch \
))
$(eval $(call gb_Executable_add_defs,rscpp,\
@@ -47,7 +47,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscpp,\
tl \
vos3 \
stl \
- $(gb_STDLIBS) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_cobjects,rscpp,\
diff --git a/rsc/Module_rsc.mk b/rsc/Module_rsc.mk
index ef22d34dac0d..b75fc942ec89 100644
--- a/rsc/Module_rsc.mk
+++ b/rsc/Module_rsc.mk
@@ -30,5 +30,4 @@ $(eval $(call gb_Module_add_targets,rsc,\
Package_inc \
))
-
# vim: set noet sw=4 ts=4:
diff --git a/rsc/Package_inc.mk b/rsc/Package_inc.mk
index 48c082d5afb0..bf24f85e749c 100644
--- a/rsc/Package_inc.mk
+++ b/rsc/Package_inc.mk
@@ -23,3 +23,5 @@
$(eval $(call gb_Package_Package,rsc_inc,$(SRCDIR)/rsc/inc))
$(eval $(call gb_Package_add_file,rsc_inc,inc/rsc/rscsfx.hxx,rsc/rscsfx.hxx))
+
+# vim: set noet ts=4 sw=4:
commit 1af1316ff68444084fa19402da483d223ed89503
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Thu Oct 11 09:43:49 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Thu Oct 11 09:43:49 2018 +0000
Deleted whitespace, updated copyright year
diff --git a/odk/index.html b/odk/index.html
index 3469cbcb3c8c..a44101d8ffa9 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -45,146 +45,146 @@
<td><img class="nothing8" src="docs/images/nada.gif"></td>
<td>
<p>Apache OpenOffice %PRODUCT_RELEASE% software is a complete, feature-rich
- office productivity suite that provides, in combination with this
- SDK, all the essential tools for building and deploying custom
- solutions that build on, or integrate with, the Apache OpenOffice %PRODUCT_RELEASE% suite
+ office productivity suite that provides, in combination with this
+ SDK, all the essential tools for building and deploying custom
+ solutions that build on, or integrate with, the Apache OpenOffice %PRODUCT_RELEASE% suite
of products.</p>
- <p>The SDK is a development kit for Apache OpenOffice %PRODUCT_RELEASE%, which
- eases the development of office components. It provides a set of
- libraries, binaries, header, and IDL files which have final API's
+ <p>The SDK is a development kit for Apache OpenOffice %PRODUCT_RELEASE%, which
+ eases the development of office components. It provides a set of
+ libraries, binaries, header, and IDL files which have final API's
and can only be extended with new functionality. This set of libraries
- and binaries is the minimum set of functions needed to use system
- abstraction for base functionality and for using UNO (Universal
+ and binaries is the minimum set of functions needed to use system
+ abstraction for base functionality and for using UNO (Universal
Network Objects) component technology. The UNO component model is the
- base of the whole Office API. The SDK provides everything necessary
- to use the Office API from external programs (e.g. Java, C++) or to
- extend the Office functionality with new components (e.g. new filter
- components, CalcAddin functions). It is compatible over several
+ base of the whole Office API. The SDK provides everything necessary
+ to use the Office API from external programs (e.g. Java, C++) or to
+ extend the Office functionality with new components (e.g. new filter
+ components, CalcAddin functions). It is compatible over several
versions because the API remains unaffected and will only be extended
with new functions.</p>
- <p>The SDK provides the basic building blocks for external developers
- to develop components in any language for which a binding exists.
- Currently, there are language bindings for Apache OpenOffice %PRODUCT_RELEASE% Basic, Java,
+ <p>The SDK provides the basic building blocks for external developers
+ to develop components in any language for which a binding exists.
+ Currently, there are language bindings for Apache OpenOffice %PRODUCT_RELEASE% Basic, Java,
and different C++ compilers on different platforms, for Apache OpenOffice %PRODUCT_RELEASE%,
- thus covering the two most commonly used programming languages. There
+ thus covering the two most commonly used programming languages. There
will be no limit for office automation in heterogeneous environments.
- Currently supported platforms of the SDK are Linux, Solaris (sparc,
+ Currently supported platforms of the SDK are Linux, Solaris (sparc,
x86), and Windows.</p>
- <p>The SDK also contains <a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation"> reference</a> documentation
- for the API and a complete <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is available online in the Apache OpenOffice Wiki, with
+ <p>The SDK also contains <a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation"> reference</a> documentation
+ for the API and a complete <a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a> is available online in the Apache OpenOffice Wiki, with
lots of examples, which introduce the API, explain the concepts behind
- it, and make it possible for all users to quickly get started with
+ it, and make it possible for all users to quickly get started with
the Office API.</p>
</td>
<td><img class="nothing8" src="docs/images/nada.gif"></td>
</tr>
- <tr>
+ <tr>
<td><img class="nothing8" src="docs/images/nada.gif"></td>
<td><img class="line" src="docs/images/sdk_line-1.gif"></td>
<td><img class="nothing8" src="docs/images/nada.gif"></td>
</tr>
- <tr>
+ <tr>
<td><img class="nothing8" src="docs/images/nada.gif"></td>
- <td>
+ <td>
<table class="table3">
- <tr valign="top">
+ <tr valign="top">
<td colspan="4" class="head1">Content</td>
</tr>
- <tr>
+ <tr>
<td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="docs/install.html" title="link to the installation guide">Installation Guide</a></td>
- <td class="content70">An overview of all necessary
+ <td class="content70">An overview of all necessary
installation steps (e.g. environment variables) to use this SDK.</td>
</tr>
- <tr valign="middle">
+ <tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
<td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="https://wiki.openoffice.org/wiki/Documentation/DevGuide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td>
- <td class="content70">Detailed documentation, explaining the Apache OpenOffice %PRODUCT_RELEASE%
- API and the concepts behind it, with a rich set of examples,
- implemented mainly in Java. This documentation is online in the
+ <td class="content70">Detailed documentation, explaining the Apache OpenOffice %PRODUCT_RELEASE%
+ API and the concepts behind it, with a rich set of examples,
+ implemented mainly in Java. This documentation is online in the
Apache OpenOffice Wiki.</td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></td>
<td class="content70">Complete Apache OpenOffice %PRODUCT_RELEASE% API reference.</td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="docs/java/ref/index.html" title="link to the Java UNO runtime API reference documentation">Java UNO Runtime Reference </a></td>
<td class="content70">Reference documentation of the Java UNO runtime API.</td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="docs/cpp/ref/names/index.html" title="link to the C++ API reference documentation">C++ Reference</a></td>
- <td class="content70">Reference documentation of the C++ UNO runtime and a
+ <td class="content70">Reference documentation of the C++ UNO runtime and a
set of C/C++ base and helper functions and classes to abstract from
the system layer.</td>
</tr>
- <tr valign="middle">
+ <tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
<td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="docs/tools.html" title="link to the tools overview page">Development Tools</a></td>
- <td class="content70">Overview and a short description of the UNO
+ <td class="content70">Overview and a short description of the UNO
development tools.</td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="examples/examples.html" title="link to the examples overview page">Examples</a></td>
- <td class="content70">A collection of examples in different
+ <td class="content70">A collection of examples in different
programming languages (Java, C++, Basic, OLE, CLI).</td>
</tr>
- <tr valign="middle">
+ <tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
<td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></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
- file format which is the default document format
+ <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
+ file format which is the default document format
for Apache OpenOffice %PRODUCT_RELEASE%.</td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></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">
+ <tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
<td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td class="content4"><img src="docs/images/arrow-1.gif"></td>
<td colspan="2"><a href="LICENSE" title="link to the SDK license file">License</a></td>
<td class="content70">The license for the Apache OpenOffice %PRODUCT_RELEASE% SDK.</td>
</tr>
- <tr valign="middle">
+ <tr valign="middle">
<td><img class="nothing10" src="docs/images/nada.gif"></td>
<td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td colspan="4" class="head1">Additional Resources</td>
</tr>
- <tr valign="top">
+ <tr valign="top">
<td colspan="4"><img class="nothing8" src="docs/images/nada.gif"></td>
</tr>
- <tr valign="middle">
+ <tr valign="middle">
<td class="content4"><img class="arrow" src="docs/images/arrow-1.gif"></td>
<td width="5%"><a target="_blank" href="https://www.openoffice.org/api" 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/api" title="link to the Apache OpenOffice homepage (online)">Apache OpenOffice™</a></td>
@@ -197,17 +197,17 @@
</table>
</td>
</tr>
- <tr>
+ <tr>
<td colspan="3"><img class="nothing30" src="docs/images/nada.gif"></td>
</tr>
- <tr>
+ <tr>
<td colspan="3"><img class="line" src="docs/images/sdk_line-1.gif"></td>
</tr>
- <tr>
- <td colspan="3">
+ <tr>
+ <td colspan="3">
<div class="centertext">
<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>
+ Copyright © 2018 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>
More information about the Libreoffice-commits
mailing list