You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/07/09 15:22:01 UTC

(openoffice) branch trunk updated: pre-commit: auto remove unneeded trailing whitespace from Makefiles (#378)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 4437c02e18 pre-commit: auto remove unneeded trailing whitespace from Makefiles (#378)
4437c02e18 is described below

commit 4437c02e18a852c4a5e7d7e7c198180f06b2b9fc
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Thu Jul 10 01:21:51 2025 +1000

    pre-commit: auto remove unneeded trailing whitespace from Makefiles (#378)
    
    Cleaned up some whitespace in the Makefiles
---
 .pre-commit-config.yaml                            |  2 +-
 ext_libraries/gtest/win/Makefile                   |  8 +++----
 main/GNUmakefile                                   |  8 +++----
 main/MathMLDTD/Makefile                            |  8 +++----
 main/UnoControls/Makefile                          |  8 +++----
 main/accessibility/Makefile                        |  8 +++----
 main/accessibility/workben/makefile                |  8 +++----
 .../workben/org/openoffice/accessibility/Makefile  |  8 +++----
 .../org/openoffice/accessibility/awb/Makefile      |  8 +++----
 .../openoffice/accessibility/awb/canvas/Makefile   |  8 +++----
 .../org/openoffice/accessibility/awb/tree/Makefile |  8 +++----
 .../org/openoffice/accessibility/awb/view/Makefile |  8 +++----
 .../accessibility/awb/view/text/Makefile           |  8 +++----
 .../org/openoffice/accessibility/misc/Makefile     | 10 ++++----
 main/animations/Makefile                           |  8 +++----
 main/apple_remote/Makefile                         |  8 +++----
 main/autodoc/Makefile                              |  8 +++----
 main/automation/Makefile                           |  8 +++----
 main/avmedia/Makefile                              |  8 +++----
 main/basctl/Makefile                               |  8 +++----
 main/basebmp/Makefile                              |  8 +++----
 main/basegfx/Makefile                              |  8 +++----
 main/basic/Makefile                                |  8 +++----
 main/bean/Makefile                                 |  8 +++----
 main/binaryurp/Makefile                            |  8 +++----
 main/bridges/Makefile                              |  8 +++----
 main/canvas/Makefile                               |  8 +++----
 main/codemaker/Makefile                            |  8 +++----
 main/comphelper/Makefile                           |  8 +++----
 main/configmgr/Makefile                            |  8 +++----
 main/cppcanvas/Makefile                            |  8 +++----
 main/cppuhelper/Makefile                           |  8 +++----
 main/cpputools/Makefile                            |  8 +++----
 main/cui/Makefile                                  |  8 +++----
 main/dbaccess/Makefile                             |  8 +++----
 main/drawinglayer/Makefile                         |  8 +++----
 main/dtrans/Makefile                               |  8 +++----
 main/editeng/Makefile                              |  8 +++----
 main/embeddedobj/Makefile                          |  8 +++----
 main/eventattacher/Makefile                        |  8 +++----
 main/fileaccess/Makefile                           |  8 +++----
 main/formula/Makefile                              |  8 +++----
 main/fpicker/Makefile                              |  8 +++----
 main/framework/Makefile                            |  8 +++----
 main/i18npool/Makefile                             |  8 +++----
 main/i18nutil/Makefile                             |  8 +++----
 main/idl/Makefile                                  |  8 +++----
 main/idlc/Makefile                                 |  8 +++----
 main/io/Makefile                                   |  8 +++----
 main/javaunohelper/Makefile                        |  8 +++----
 main/jurt/Makefile                                 |  8 +++----
 main/jvmaccess/Makefile                            |  8 +++----
 main/jvmfwk/Makefile                               |  8 +++----
 main/lingucomponent/Makefile                       |  8 +++----
 main/linguistic/Makefile                           |  8 +++----
 main/o3tl/Makefile                                 |  8 +++----
 main/odk/examples/CLI/CSharp/Spreadsheet/Makefile  | 14 +++++------
 main/odk/examples/CLI/VB.NET/WriterDemo/Makefile   |  4 ++--
 .../DevelopersGuide/Accessibility/Makefile         | 12 +++++-----
 .../BasicAndDialogs/CreatingDialogs/Makefile       | 14 +++++------
 .../BasicAndDialogs/ToolkitControls/Makefile       | 18 +++++++-------
 main/odk/examples/DevelopersGuide/Charts/Makefile  | 14 +++++------
 .../Components/Addons/JobsAddon/Makefile           | 14 +++++------
 .../Addons/ProtocolHandlerAddon_cpp/Makefile       | 20 ++++++++--------
 .../Addons/ProtocolHandlerAddon_java/Makefile      | 14 +++++------
 .../Components/CppComponent/Makefile               | 20 ++++++++--------
 .../Components/JavaComponent/Makefile              | 16 ++++++-------
 .../Components/SimpleLicense/Makefile              | 16 ++++++-------
 .../DevelopersGuide/Components/Thumbs/Makefile     |  8 +++----
 .../Thumbs/org/openoffice/comp/test/Makefile       | 12 +++++-----
 .../Components/Thumbs/org/openoffice/test/Makefile |  8 +++----
 .../Components/dialogcomponent/Makefile            | 16 ++++++-------
 main/odk/examples/DevelopersGuide/Config/Makefile  |  8 +++----
 .../Database/DriverSkeleton/Makefile               | 26 ++++++++++----------
 .../odk/examples/DevelopersGuide/Database/Makefile | 14 +++++------
 main/odk/examples/DevelopersGuide/Drawing/Makefile |  8 +++----
 .../Extensions/DialogWithHelp/Makefile             | 12 +++++-----
 .../examples/DevelopersGuide/FirstSteps/Makefile   |  8 +++----
 main/odk/examples/DevelopersGuide/Forms/Makefile   | 12 +++++-----
 main/odk/examples/DevelopersGuide/GUI/Makefile     |  8 +++----
 .../examples/DevelopersGuide/OfficeBean/Makefile   | 10 ++++----
 .../DevelopersGuide/OfficeDev/Clipboard/Makefile   |  8 +++----
 .../OfficeDev/DesktopEnvironment/Makefile          | 16 ++++++-------
 .../DesktopEnvironment/nativelib/unix/Makefile     | 10 ++++----
 .../DesktopEnvironment/nativelib/windows/Makefile  |  8 +++----
 .../OfficeDev/DisableCommands/Makefile             |  8 +++----
 .../FilterDevelopment/AsciiFilter/Makefile         | 16 ++++++-------
 .../FlatXmlFilterDetection/Makefile                | 20 ++++++++--------
 .../FilterDevelopment/FlatXmlFilter_cpp/Makefile   | 20 ++++++++--------
 .../FilterDevelopment/FlatXmlFilter_java/Makefile  | 14 +++++------
 .../DevelopersGuide/OfficeDev/Linguistic/Makefile  | 28 +++++++++++-----------
 .../examples/DevelopersGuide/OfficeDev/Makefile    |  8 +++----
 .../OfficeDev/PathSettings/Makefile                |  8 +++----
 .../OfficeDev/PathSubstitution/Makefile            |  8 +++----
 .../OfficeDev/TerminationTest/Makefile             |  8 +++----
 .../DevelopersGuide/ProfUNO/CppBinding/Makefile    | 18 +++++++-------
 .../ProfUNO/InterprocessConn/Makefile              |  8 +++----
 .../DevelopersGuide/ProfUNO/Lifetime/Makefile      | 10 ++++----
 .../ProfUNO/SimpleBootstrap_cpp/Makefile           | 10 ++++----
 .../ProfUNO/SimpleBootstrap_java/Makefile          | 10 ++++----
 .../ScriptingFramework/SayHello/Makefile           | 18 +++++++-------
 .../ScriptingFramework/ScriptSelector/Makefile     | 20 ++++++++--------
 .../examples/DevelopersGuide/Spreadsheet/Makefile  | 26 ++++++++++----------
 main/odk/examples/DevelopersGuide/Text/Makefile    |  8 +++----
 main/odk/examples/DevelopersGuide/UCB/Makefile     | 12 +++++-----
 main/odk/examples/OLE/activex/Makefile             | 14 +++++------
 main/odk/examples/cpp/DocumentLoader/Makefile      | 14 +++++------
 .../examples/cpp/complextoolbarcontrols/Makefile   | 10 ++++----
 main/odk/examples/cpp/counter/Makefile             | 16 ++++++-------
 main/odk/examples/cpp/remoteclient/Makefile        | 24 +++++++++----------
 main/odk/examples/java/ConverterServlet/Makefile   | 16 ++++++-------
 main/odk/examples/java/DocumentHandling/Makefile   | 14 +++++------
 main/odk/examples/java/Drawing/Makefile            |  8 +++----
 .../java/EmbedDocument/Container1/Makefile         | 10 ++++----
 .../java/EmbedDocument/EmbeddedObject/Makefile     | 20 ++++++++--------
 main/odk/examples/java/Inspector/Makefile          | 10 ++++----
 main/odk/examples/java/MinimalComponent/Makefile   | 16 ++++++-------
 main/odk/examples/java/NotesAccess/Makefile        | 18 +++++++-------
 main/odk/examples/java/PropertySet/Makefile        | 14 +++++------
 main/odk/examples/java/Spreadsheet/Makefile        | 16 ++++++-------
 main/odk/examples/java/Storage/Makefile            | 10 ++++----
 main/odk/examples/java/Text/Makefile               | 14 +++++------
 main/odk/examples/java/ToDo/Makefile               | 16 ++++++-------
 main/offapi/Makefile                               |  8 +++----
 main/oovbaapi/Makefile                             |  8 +++----
 main/oox/Makefile                                  |  8 +++----
 main/oox/source/token/Makefile                     |  8 +++----
 main/package/Makefile                              |  8 +++----
 main/padmin/Makefile                               |  8 +++----
 main/psprint_config/Makefile                       |  8 +++----
 main/pyuno/Makefile                                |  8 +++----
 main/qadevOOo/Makefile                             |  8 +++----
 main/rdbmaker/Makefile                             |  8 +++----
 main/registry/Makefile                             |  8 +++----
 main/remotebridges/Makefile                        |  8 +++----
 main/reportdesign/Makefile                         |  8 +++----
 main/ridljar/Makefile                              |  8 +++----
 main/rsc/Makefile                                  |  8 +++----
 main/salhelper/Makefile                            |  8 +++----
 main/sane/Makefile                                 |  8 +++----
 main/sax/Makefile                                  |  8 +++----
 main/sc/Makefile                                   |  8 +++----
 main/scaddins/Makefile                             |  8 +++----
 main/sccomp/Makefile                               |  8 +++----
 main/sd/Makefile                                   |  8 +++----
 main/sd/workben/testdll/makefile                   |  8 +++----
 main/sfx2/Makefile                                 |  8 +++----
 main/slideshow/Makefile                            |  8 +++----
 main/solenv/Makefile                               |  8 +++----
 main/solenv/gbuild/templates/Makefile              |  8 +++----
 main/sot/Makefile                                  |  8 +++----
 main/starmath/Makefile                             |  8 +++----
 main/store/Makefile                                |  8 +++----
 main/svgio/Makefile                                |  8 +++----
 main/svl/Makefile                                  |  8 +++----
 main/svtools/Makefile                              |  8 +++----
 main/svx/Makefile                                  |  8 +++----
 main/sw/Makefile                                   |  8 +++----
 main/test/Makefile                                 |  8 +++----
 main/testgraphical/Makefile                        |  8 +++----
 main/toolkit/Makefile                              |  8 +++----
 main/tools/Makefile                                |  8 +++----
 main/twain/Makefile                                |  8 +++----
 main/ucb/Makefile                                  |  8 +++----
 main/ucbhelper/Makefile                            |  8 +++----
 main/udkapi/Makefile                               |  8 +++----
 main/unixODBC/Makefile                             |  8 +++----
 main/unodevtools/Makefile                          |  8 +++----
 main/unotools/Makefile                             |  8 +++----
 main/unoxml/Makefile                               |  8 +++----
 main/ure/Makefile                                  |  8 +++----
 main/ure/source/uretest/Makefile                   |  8 +++----
 main/uui/Makefile                                  |  8 +++----
 main/vbahelper/Makefile                            |  8 +++----
 main/vcl/Makefile                                  |  8 +++----
 main/vcl/os2/source/window/makefile                |  8 +++----
 main/vos/Makefile                                  |  8 +++----
 main/wizards/Makefile                              |  8 +++----
 main/writerfilter/Makefile                         |  8 +++----
 main/writerfilter/source/Makefile                  |  8 +++----
 main/x11_extensions/Makefile                       |  8 +++----
 main/xmerge/Makefile                               |  8 +++----
 main/xml2cmp/Makefile                              |  8 +++----
 main/xmlhelp/Makefile                              |  8 +++----
 main/xmloff/Makefile                               |  8 +++----
 main/xmlreader/Makefile                            |  8 +++----
 main/xmlscript/Makefile                            |  8 +++----
 187 files changed, 931 insertions(+), 931 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 18d9717233..44971f0be1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
       - id: mixed-line-ending
         files: ^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|cl|common|dxp|el|h|hrc|idl|in|ini|m|md|mk|mm|mod|pas|php|pl|pm|py|rc|sh|xba|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$
       - id: trailing-whitespace
-        files: \.(asp|bat|cl|common|el|hrc|in|ini|m|mk|mm|mod|pas|php|pl|pm|py|rc|sh|xba|xcs|xdl|xmi|xsd|ya?ml)$
+        files: (m|M)akefile$|\.(asp|bat|cl|common|el|hrc|in|ini|m|mk|mm|mod|pas|php|pl|pm|py|rc|sh|xba|xcs|xdl|xmi|xsd|ya?ml)$
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
     hooks:
diff --git a/ext_libraries/gtest/win/Makefile b/ext_libraries/gtest/win/Makefile
index 8dfd47b297..3204db1019 100644
--- a/ext_libraries/gtest/win/Makefile
+++ b/ext_libraries/gtest/win/Makefile
@@ -1,5 +1,5 @@
 #/**************************************************************
-# * 
+# *
 # * Licensed to the Apache Software Foundation (ASF) under one
 # * or more contributor license agreements.  See the NOTICE file
 # * distributed with this work for additional information
@@ -7,16 +7,16 @@
 # * to you under the Apache License, Version 2.0 (the
 # * "License"); you may not use this file except in compliance
 # * with the License.  You may obtain a copy of the License at
-# * 
+# *
 # *   http://www.apache.org/licenses/LICENSE-2.0
-# * 
+# *
 # * Unless required by applicable law or agreed to in writing,
 # * software distributed under the License is distributed on an
 # * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # * KIND, either express or implied.  See the License for the
 # * specific language governing permissions and limitations
 # * under the License.
-# * 
+# *
 # *************************************************************/
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/GNUmakefile b/main/GNUmakefile
index 1a38027886..5823ef57e1 100644
--- a/main/GNUmakefile
+++ b/main/GNUmakefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # if no environment is set, try to find one, source it and re-exec
diff --git a/main/MathMLDTD/Makefile b/main/MathMLDTD/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/MathMLDTD/Makefile
+++ b/main/MathMLDTD/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/UnoControls/Makefile b/main/UnoControls/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/UnoControls/Makefile
+++ b/main/UnoControls/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/accessibility/Makefile b/main/accessibility/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/accessibility/Makefile
+++ b/main/accessibility/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/accessibility/workben/makefile b/main/accessibility/workben/makefile
index bae563a8a6..4485133ee3 100644
--- a/main/accessibility/workben/makefile
+++ b/main/accessibility/workben/makefile
@@ -1,5 +1,5 @@
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
 all:
 	cd source/org/openoffice/accessibility ; $(MAKE) all
diff --git a/main/accessibility/workben/org/openoffice/accessibility/Makefile b/main/accessibility/workben/org/openoffice/accessibility/Makefile
index 3748cf79eb..66725cda21 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/Makefile
@@ -1,5 +1,5 @@
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
 all : subdirs
 
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile b/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile
index 4974adf1ac..693051c204 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/Makefile
@@ -1,5 +1,5 @@
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:18 af Exp $
 
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile b/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
index 788d862107..0f335ccdf2 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
@@ -1,5 +1,5 @@
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:21 af Exp $
 
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile b/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
index 37c505d696..ad1984fa48 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 all : package
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile b/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
index 7f684ef230..7bf082746f 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/Makefile
@@ -1,5 +1,5 @@
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:34 af Exp $
 
diff --git a/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile b/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
index 6dc19b5d6d..53b4bcb2c6 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/view/text/Makefile
@@ -1,5 +1,5 @@
 # *************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # *************************************************************
 #	$Id: Makefile,v 1.1 2003/06/13 16:30:41 af Exp $
 
diff --git a/main/accessibility/workben/org/openoffice/accessibility/misc/Makefile b/main/accessibility/workben/org/openoffice/accessibility/misc/Makefile
index 77c7318a60..d06ac669d4 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/misc/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/misc/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,23 +7,23 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 all : package
 
 ROOT=../../../..
 PACKAGE = org.openoffice.accessibility.misc
-SUBDIRS = 
+SUBDIRS =
 
 include makefile.common
 
diff --git a/main/animations/Makefile b/main/animations/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/animations/Makefile
+++ b/main/animations/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/apple_remote/Makefile b/main/apple_remote/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/apple_remote/Makefile
+++ b/main/apple_remote/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/autodoc/Makefile b/main/autodoc/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/autodoc/Makefile
+++ b/main/autodoc/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/automation/Makefile b/main/automation/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/automation/Makefile
+++ b/main/automation/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/avmedia/Makefile b/main/avmedia/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/avmedia/Makefile
+++ b/main/avmedia/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/basctl/Makefile b/main/basctl/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/basctl/Makefile
+++ b/main/basctl/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/basebmp/Makefile b/main/basebmp/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/basebmp/Makefile
+++ b/main/basebmp/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/basegfx/Makefile b/main/basegfx/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/basegfx/Makefile
+++ b/main/basegfx/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/basic/Makefile b/main/basic/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/basic/Makefile
+++ b/main/basic/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/bean/Makefile b/main/bean/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/bean/Makefile
+++ b/main/bean/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/binaryurp/Makefile b/main/binaryurp/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/binaryurp/Makefile
+++ b/main/binaryurp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/bridges/Makefile b/main/bridges/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/bridges/Makefile
+++ b/main/bridges/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/canvas/Makefile b/main/canvas/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/canvas/Makefile
+++ b/main/canvas/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/codemaker/Makefile b/main/codemaker/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/codemaker/Makefile
+++ b/main/codemaker/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/comphelper/Makefile b/main/comphelper/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/comphelper/Makefile
+++ b/main/comphelper/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/configmgr/Makefile b/main/configmgr/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/configmgr/Makefile
+++ b/main/configmgr/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/cppcanvas/Makefile b/main/cppcanvas/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/cppcanvas/Makefile
+++ b/main/cppcanvas/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/cppuhelper/Makefile b/main/cppuhelper/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/cppuhelper/Makefile
+++ b/main/cppuhelper/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/cpputools/Makefile b/main/cpputools/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/cpputools/Makefile
+++ b/main/cpputools/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/cui/Makefile b/main/cui/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/cui/Makefile
+++ b/main/cui/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/dbaccess/Makefile b/main/dbaccess/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/dbaccess/Makefile
+++ b/main/dbaccess/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/drawinglayer/Makefile b/main/drawinglayer/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/drawinglayer/Makefile
+++ b/main/drawinglayer/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/dtrans/Makefile b/main/dtrans/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/dtrans/Makefile
+++ b/main/dtrans/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/editeng/Makefile b/main/editeng/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/editeng/Makefile
+++ b/main/editeng/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/embeddedobj/Makefile b/main/embeddedobj/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/embeddedobj/Makefile
+++ b/main/embeddedobj/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/eventattacher/Makefile b/main/eventattacher/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/eventattacher/Makefile
+++ b/main/eventattacher/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/fileaccess/Makefile b/main/fileaccess/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/fileaccess/Makefile
+++ b/main/fileaccess/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/formula/Makefile b/main/formula/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/formula/Makefile
+++ b/main/formula/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/fpicker/Makefile b/main/fpicker/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/fpicker/Makefile
+++ b/main/fpicker/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/framework/Makefile b/main/framework/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/framework/Makefile
+++ b/main/framework/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/i18npool/Makefile b/main/i18npool/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/i18npool/Makefile
+++ b/main/i18npool/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/i18nutil/Makefile b/main/i18nutil/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/i18nutil/Makefile
+++ b/main/i18nutil/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/idl/Makefile b/main/idl/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/idl/Makefile
+++ b/main/idl/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/idlc/Makefile b/main/idlc/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/idlc/Makefile
+++ b/main/idlc/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/io/Makefile b/main/io/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/io/Makefile
+++ b/main/io/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/javaunohelper/Makefile b/main/javaunohelper/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/javaunohelper/Makefile
+++ b/main/javaunohelper/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/jurt/Makefile b/main/jurt/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/jurt/Makefile
+++ b/main/jurt/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/jvmaccess/Makefile b/main/jvmaccess/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/jvmaccess/Makefile
+++ b/main/jvmaccess/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/jvmfwk/Makefile b/main/jvmfwk/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/jvmfwk/Makefile
+++ b/main/jvmfwk/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/lingucomponent/Makefile b/main/lingucomponent/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/lingucomponent/Makefile
+++ b/main/lingucomponent/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/linguistic/Makefile b/main/linguistic/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/linguistic/Makefile
+++ b/main/linguistic/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/o3tl/Makefile b/main/o3tl/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/o3tl/Makefile
+++ b/main/o3tl/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile b/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index 12fa0d7d4b..219d2c3dce 100644
--- a/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -46,14 +46,14 @@ CLI_LIB_LOCATION = $(PRJ)\cli
 
 # Targets
 .PHONY : ALL
-ALL : Info	
+ALL : Info
 
 include $(SETTINGS)/stdtarget.mk
 
 
 # build executables
-#csc -lib:"d:\OpenOffice 4" does not work. csc does not understand the quotes. 
-#but they are needed if the path contains a space. Therefore we use full path 
+#csc -lib:"d:\OpenOffice 4" does not work. csc does not understand the quotes.
+#but they are needed if the path contains a space. Therefore we use full path
 #with the -reference switch
 $(SPREADSHEET_OUT)/%.exe : %.cs SpreadsheetDocHelper.cs
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -67,9 +67,9 @@ $(SPREADSHEET_OUT)/%.exe : %.cs SpreadsheetDocHelper.cs
 		-reference:"$(CLI_LIB_LOCATION)"\cli_cppuhelper.dll \
 		$^
 
-SpreadsheetSample : $(SPREADSHEET_OUT)/SpreadsheetSample.exe 
+SpreadsheetSample : $(SPREADSHEET_OUT)/SpreadsheetSample.exe
 
-GeneralTableSample : $(SPREADSHEET_OUT)/GeneralTableSample.exe 
+GeneralTableSample : $(SPREADSHEET_OUT)/GeneralTableSample.exe
 
 ViewSample : $(SPREADSHEET_OUT)/ViewSample.exe
 
@@ -84,7 +84,7 @@ Info : SpreadsheetSample GeneralTableSample ViewSample
 	@echo $(MAKE) ViewSample.run
 	@echo -------------------------------------------------------------------------------
 else
-Info : 
+Info :
 	@echo --------------------------------------------------------------------------------
 	@echo This example works only under Windows!
 	@echo --------------------------------------------------------------------------------
@@ -94,7 +94,7 @@ endif
 	@echo -------------------------------------------------------------------------------
 	@echo Executing sample $@ $(UNORC) $(CONNECT_STRING)...
 	@echo -------------------------------------------------------------------------------
-	cd $(subst /,\\,$(SPREADSHEET_OUT)) && $(basename $@).exe 
+	cd $(subst /,\\,$(SPREADSHEET_OUT)) && $(basename $@).exe
 
 .PHONY: clean
 clean :
diff --git a/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile b/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
index 634b72d12b..00834957f4 100644
--- a/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
+++ b/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
@@ -48,7 +48,7 @@ ALL : WriterDemo
 include $(SETTINGS)/stdtarget.mk
 
 # build executables
-$(WRITERDEMO_OUT)/%.exe: %.vb 
+$(WRITERDEMO_OUT)/%.exe: %.vb
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	vbc $(VBC_FLAGS) \
 		-target:exe \
@@ -72,7 +72,7 @@ WriterDemo : $(WRITERDEMO_OUT)/WriterDemo.exe
 	@echo $(MAKE) WriterDemo.run
 	@echo -------------------------------------------------------------------------------
 else
-WriterDemo : 
+WriterDemo :
 	@echo --------------------------------------------------------------------------------
 	@echo This example works only under Windows!
 	@echo --------------------------------------------------------------------------------
diff --git a/main/odk/examples/DevelopersGuide/Accessibility/Makefile b/main/odk/examples/DevelopersGuide/Accessibility/Makefile
index ceaf0bc8db..c0fb79c3b7 100644
--- a/main/odk/examples/DevelopersGuide/Accessibility/Makefile
+++ b/main/odk/examples/DevelopersGuide/Accessibility/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,19 +7,19 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
-# Build the simple screen reader (SSR) described in the Developers 
+# Build the simple screen reader (SSR) described in the Developers
 # Guide Accessibility chapter.
 
 PRJ=../../..
@@ -85,7 +85,7 @@ $(APP1_JAR) : $(OUT_APP_CLASS)/$(APP1_NAME).mf $(APP1_CLASSFILES)
 
 $(EXAMPLE_NAME) : $(APP1_JAR)
 	@echo --------------------------------------------------------------------------------
-	@echo Before you run this example you should start your office with at least a 
+	@echo Before you run this example you should start your office with at least a
 	@echo new empty document and you should have enabled the accessibility support.
 	@echo Please use the following command to execute the Simple Screen Reader example!
 	@echo -
diff --git a/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile b/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
index 4651ce839f..bbddccd0c9 100644
--- a/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
+++ b/main/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the CreatingDialogs example of the Developers Guide.
@@ -41,7 +41,7 @@ COMPONENT_MANIFESTFILE = $(OUT_COMP_CLASS)/$(COMPONENT_NAME).uno.Manifest
 COMPONENT_UNOPKG_MANIFEST = $(OUT_COMP_CLASS)/$(COMPONENT_NAME)/META-INF/manifest.xml
 REGISTERFLAG = $(OUT_MISC)/devguide_basicanddialogs_creatingdialogs_register_component.flag
 
-# often the java files are structured in a hierarchy similar to the package, 
+# often the java files are structured in a hierarchy similar to the package,
 # for the example we know the package
 PACKAGE = com.sun.star.comp.sdk.examples
 
@@ -102,8 +102,8 @@ ifneq "$(SDK_AUTO_DEPLOYMENT)" ""
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile b/main/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile
index 69f8ba569d..3676f0444f 100644
--- a/main/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile
+++ b/main/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the CreatingDialogs example of the Developers Guide.
@@ -76,7 +76,7 @@ $(COMP_PACKAGE) : $(COMP_UNOPKG_MANIFEST) $(COMP_LIBRARY_FILES)
 	ToolkitControls/MultiPage.xba ToolkitControls/MultiPageDlg.xdl \
 	ToolkitControls/ProgressBar.xba ToolkitControls/ProgressBarDlg.xdl \
 	ToolkitControls/script.xlb ToolkitControls/ScrollBar.xba \
-	ToolkitControls/ScrollBarDlg.xdl 
+	ToolkitControls/ScrollBarDlg.xdl
 	cd $(subst /,$(PS),$(COMP_GEN_OUT)) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
 
 $(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
@@ -88,8 +88,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
@@ -97,8 +97,8 @@ $(SAMPLE_NAME) : $(COMP_REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
 	@echo The "$(QM)ToolkitControls$(QM)" library was installed in your office installation
 	@echo if SDK_AUTO_DEPLOYMENT = YES. You can use it in the BASIC IDE as a normal
-	@echo Basic library. 
-	@echo You can also load the document "$(QM)$(COMP_NAME).odt$(QM)" and press a button 
+	@echo Basic library.
+	@echo You can also load the document "$(QM)$(COMP_NAME).odt$(QM)" and press a button
 	@echo to run one of the example macros.
 	@echo -
 	@echo $(MAKE) $(COMP_NAME).odt.load
diff --git a/main/odk/examples/DevelopersGuide/Charts/Makefile b/main/odk/examples/DevelopersGuide/Charts/Makefile
index feacecadb3..ae05de63bd 100644
--- a/main/odk/examples/DevelopersGuide/Charts/Makefile
+++ b/main/odk/examples/DevelopersGuide/Charts/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Charts examples of the Developers Guide.
@@ -91,7 +91,7 @@ $(SAMPLE_CLASS_OUT)/%.class : %.java $(APP_JAVAFILES)
 
 $(COMPCLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(SAMPLE_CLASS_OUT) $(COMPJAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(SAMPLE_CLASS_OUT) $(COMPJAVAFILES)
 
 # rule for client/example application manifest file
 $(SAMPLE_CLASS_OUT)/%.mf :
@@ -142,8 +142,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile
index 4b78d9d474..fb18064915 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the DevGuide Jobs Addon component example of the SDK.
@@ -61,7 +61,7 @@ $(OUT_COMP_CLASS)/%.Manifest :
 
 $(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
 # rule for component jar file
 $(COMP_JAR) : $(COMP_MANIFESTFILE) $(CLASSFILES)
@@ -101,8 +101,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index 06d9a14747..68af5bb96b 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the ProtocolHandlerAddon C++ component example of the SDK.
@@ -60,7 +60,7 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
 
 #$(COMP_MAPFILE) : $(SLOFILES)
 #	-$(MKDIR) $(subst /,$(PS),$(@D))
-#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) 
+#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE)
 #ifeq "$(OS)" "MACOSX"
 #	nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE)
 #endif
@@ -82,7 +82,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
-endif	
+endif
 
 # rule for component package manifest
 $(OUT_COMP_GEN)/%/manifest.xml :
@@ -112,7 +112,7 @@ $(COMP_COMPONENTS) :
 # rule for component package file
 $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
 	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))	 
+	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) ../../bin/$(@F) $(COMP_NAME).components
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
@@ -127,12 +127,12 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
-Example : $(REGISTERFLAG) 
+Example : $(REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
 	@echo The "$(QM)ProtocolHandler$(QM)" addon component was installed if SDK_AUTO_DEPLOYMENT = YES.
 	@echo You can use this component inside your office installation, see the example
diff --git a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
index 2866fb9704..09b0d8b16e 100644
--- a/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the ProtoclHandlerAddon Java component example of the SDK.
@@ -62,7 +62,7 @@ $(OUT_COMP_CLASS)/%.Manifest :
 
 $(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
 # rule for component jar file
 $(COMP_JAR) : $(COMP_MANIFESTFILE) $(CLASSFILES)
@@ -103,8 +103,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index cc55d879f7..d2f4c69780 100644
--- a/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the C++ component example of the Developers Guide.
@@ -64,7 +64,7 @@ GENURDFILES = $(patsubst %.idl,$(SAMPLE_GEN_OUT)/%.urd,$(IDLFILES))
 TYPELIST=-Tmy_module.XSomething  \
 	-Tmy_modules.MyService1 \
 	-Tmy_module.MyService2
- 
+
 # Targets
 .PHONY: ALL
 ALL : \
@@ -93,7 +93,7 @@ $(SAMPLE_SLO_OUT)/%.$(OBJ_EXT) : %.cxx $(COMP_TYPEFLAG)
 
 #$(COMP_MAPFILE) : $(SLOFILES)
 #	-$(MKDIR) $(subst /,$(PS),$(@D))
-#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) 
+#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE)
 #ifeq "$(OS)" "MACOSX"
 #	nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE)
 #endif
@@ -115,7 +115,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
-endif	
+endif
 
 # rule for component package manifest
 $(SAMPLE_GEN_OUT)/%/manifest.xml :
@@ -146,7 +146,7 @@ $(COMP_COMPONENTS) :
 $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) $(COMP_RDB) $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT)/$(UNOPKG_PLATFORM))	 
+	-$(MKDIR) $(subst /,$(PS),$(SAMPLE_GEN_OUT)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(SAMPLE_GEN_OUT)/$(UNOPKG_PLATFORM))
 	cd $(subst /,$(PS),$(SAMPLE_GEN_OUT)) && $(SDK_ZIP) ../../bin/$(@F) $(COMP_NAME).components
 	cd $(subst /,$(PS),$(SAMPLE_GEN_OUT)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_RDB_NAME) $(UNOPKG_PLATFORM)/$(<F)
@@ -162,8 +162,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile b/main/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
index fe942b55e8..431fdb4f4e 100644
--- a/main/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the SpreadSheet examples of the Developers Guide.
@@ -53,7 +53,7 @@ IDLFILES = XSomethingA.idl \
 	SomethingA.idl \
 	SomethingB.idl
 
-# normally the idl file should be stored in a directory tree fitting the module 
+# normally the idl file should be stored in a directory tree fitting the module
 # structure, for the example we know the module structure
 PACKAGE = com/sun/star/test
 
@@ -108,7 +108,7 @@ $(OUT_COMP_CLASS)/%.class : %.java $(GENCLASSFILES)
 
 $(COMPCLASSFILES) : $(COMPJAVAFILES) $(GENCLASSFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(COMPJAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(COMPJAVAFILES)
 
 # rule for client/example application manifest file
 $(OUT_COMP_CLASS)/%.mf :
@@ -163,8 +163,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile b/main/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
index c4619febbe..98778ee285 100644
--- a/main/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the License Test component example of the SDK.
@@ -30,7 +30,7 @@ include $(SETTINGS)/dk.mk
 
 # Define non-platform/compiler specific settings
 
-# we use the sample directory name dor separating this example 
+# we use the sample directory name dor separating this example
 # from others in the output directory
 SAMPLE_NAME=LicenseTest
 SAMPLE_CLASS_OUT=$(OUT_CLASS)/$(SAMPLE_NAME)
@@ -74,7 +74,7 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLA
 
 
 # Targets
-.PHONY: ALL 
+.PHONY: ALL
 ALL : JavaLicenseTestExample
 
 include $(SETTINGS)/stdtarget.mk
@@ -141,8 +141,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/Thumbs/Makefile b/main/odk/examples/DevelopersGuide/Components/Thumbs/Makefile
index f7f7c3f477..f7503919e3 100644
--- a/main/odk/examples/DevelopersGuide/Components/Thumbs/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/Thumbs/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Component Thumbs of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile b/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile
index ea1525bd3d..e944d5509f 100644
--- a/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the SpreadSheet examples of the Developers Guide.
@@ -103,8 +103,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile b/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
index 55e05957d1..e835017a15 100644
--- a/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the SpreadSheet examples of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile b/main/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
index c487272fd9..d7fe6e61ef 100644
--- a/main/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
+++ b/main/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java dialog component example of the SDK.
@@ -30,7 +30,7 @@ include $(SETTINGS)/dk.mk
 
 # Define non-platform/compiler specific settings
 
-# we use the sample directory name dor separating this example 
+# we use the sample directory name dor separating this example
 # from others in the output directory
 SAMPLE_NAME=DialogComponentSample
 SAMPLE_CLASS_OUT=$(OUT_CLASS)/$(SAMPLE_NAME)
@@ -75,7 +75,7 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLA
 
 
 # Targets
-.PHONY: ALL 
+.PHONY: ALL
 ALL : DialogComponentExample
 
 include $(SETTINGS)/stdtarget.mk
@@ -141,8 +141,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Config/Makefile b/main/odk/examples/DevelopersGuide/Config/Makefile
index 224c1d5fd7..3dbea8d753 100644
--- a/main/odk/examples/DevelopersGuide/Config/Makefile
+++ b/main/odk/examples/DevelopersGuide/Config/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Configuration example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
index 0a78ddcc3a..419889c332 100644
--- a/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/main/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Database SDBC driver skeleton example of the Developers Guide.
@@ -63,12 +63,12 @@ ALL : \
 include $(SETTINGS)/stdtarget.mk
 
 $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
-	-$(MKDIR) $(subst /,$(PS),$(@D))	 
+	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(CC) $(CC_FLAGS) $(CC_INCLUDES) $(STL_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
 #$(COMP_MAPFILE) : $(SLOFILES)
-#	-$(MKDIR) $(subst /,$(PS),$(@D))	 
-#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) 
+#	-$(MKDIR) $(subst /,$(PS),$(@D))
+#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE)
 #ifeq "$(OS)" "MACOSX"
 #	nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE)
 #endif
@@ -83,7 +83,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 	$(LINK_MANIFEST)
 else
 $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
-	-$(MKDIR) $(subst /,$(PS),$(@D))	 
+	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \
 	$(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB)
 ifeq "$(OS)" "MACOSX"
@@ -113,8 +113,8 @@ $(COMP_COMPONENTS) :
 	@echo $(OSEP)/components$(CSEP) >> $@
 
 $(COMP_PACKAGE) : $(COMP_LIBRARY) $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
-	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))	 
-	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC)/$(UNOPKG_PLATFORM))	 
+	-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
+	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_MISC)/$(UNOPKG_PLATFORM))
 	cd $(subst /,$(PS),$(OUT_COMP_MISC)) && $(SDK_ZIP) ../../bin/$(@F) $(COMP_NAME).components
 	cd $(subst /,$(PS),$(OUT_COMP_MISC)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
@@ -122,15 +122,15 @@ $(COMP_PACKAGE) : $(COMP_LIBRARY) $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
 
 $(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
 ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
-	-$(MKDIR) $(subst /,$(PS),$(@D))	 
+	-$(MKDIR) $(subst /,$(PS),$(@D))
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	$(DEPLOYTOOL) $(COMP_PACKAGE_URL)
 	@echo flagged > $(subst /,$(PS),$@)
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/Database/Makefile b/main/odk/examples/DevelopersGuide/Database/Makefile
index 1a3caab5eb..3e0c11a569 100644
--- a/main/odk/examples/DevelopersGuide/Database/Makefile
+++ b/main/odk/examples/DevelopersGuide/Database/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Database examples of the Developers Guide.
@@ -67,11 +67,11 @@ include $(SETTINGS)/stdtarget.mk
 
 $(APP1_CLASSFILES) : $(APP1_JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(APP1_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(APP1_JAVAFILES)
 
 $(APP3_CLASSFILES) : $(APP3_JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(APP3_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(APP3_JAVAFILES)
 
 $(OUT_APP_CLASS)/%.class : %.java
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -104,7 +104,7 @@ $(APP3_JAR) : $(OUT_APP_CLASS)/$(APP3_NAME).mf $(APP3_CLASSFILES)
 
 $(EXAMPLE_NAME) : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR)
 	@echo --------------------------------------------------------------------------------
-	@echo This examples needs a running database with name "$(QM)MYDB0$(QM)". Make sure that you 
+	@echo This examples needs a running database with name "$(QM)MYDB0$(QM)". Make sure that you
 	@echo have created such a database and have established a connection to it.
 	@echo Please use one of the following commands to execute the examples!
 	@echo -
diff --git a/main/odk/examples/DevelopersGuide/Drawing/Makefile b/main/odk/examples/DevelopersGuide/Drawing/Makefile
index e84326c033..8732e3dee9 100644
--- a/main/odk/examples/DevelopersGuide/Drawing/Makefile
+++ b/main/odk/examples/DevelopersGuide/Drawing/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Drawing examples of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile
index 9403aa13f0..3fd2d12d59 100644
--- a/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile
+++ b/main/odk/examples/DevelopersGuide/Extensions/DialogWithHelp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the DialogWithHelp example of the Developers Guide.
@@ -81,8 +81,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/FirstSteps/Makefile b/main/odk/examples/DevelopersGuide/FirstSteps/Makefile
index dafb066023..355f606046 100644
--- a/main/odk/examples/DevelopersGuide/FirstSteps/Makefile
+++ b/main/odk/examples/DevelopersGuide/FirstSteps/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the FirstSteps examples of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/Forms/Makefile b/main/odk/examples/DevelopersGuide/Forms/Makefile
index 22cef50d78..bf3186e3c4 100644
--- a/main/odk/examples/DevelopersGuide/Forms/Makefile
+++ b/main/odk/examples/DevelopersGuide/Forms/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Forms example of the Developers Guide.
@@ -134,7 +134,7 @@ $(APP2_JAR) : $(SAMPLE_GEN_OUT)/$(APP2_NAME).mf $(APP2_CLASS_OUT)/$(APP2_NAME).c
 	+$(SDK_JAR) uvf $@ -C $(COMMON_CLASS_OUT) .
 	+$(SDK_JAR) uvf $@ $(SDK_JAVA_UNO_BOOTSTRAP_FILES)
 
-$(APP3_JAR) : $(SAMPLE_GEN_OUT)/$(APP3_NAME).mf $(APP3_CLASS_OUT)/$(APP3_NAME).class $(COMMON_CLASSFILES) 
+$(APP3_JAR) : $(SAMPLE_GEN_OUT)/$(APP3_NAME).mf $(APP3_CLASS_OUT)/$(APP3_NAME).class $(COMMON_CLASSFILES)
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	+$(SDK_JAR) cvfm $@ $< -C $(APP3_CLASS_OUT) .
@@ -166,7 +166,7 @@ FormsExample : $(APP1_JAR)  $(APP2_JAR)  $(APP3_JAR)  $(APP4_JAR)
 	@echo $(SQM)      $(SQM)"$(QM)OO_SDK_Demo_DB$(QM)". Make sure that you have created such a data source,
 	@echo -
 	@echo The document "$(QM)ProgrammaticScriptAssignment.odt$(QM)" demonstrates
-	@echo how you can programmatically create form controls, and associated 
+	@echo how you can programmatically create form controls, and associated
 	@echo scripts with certain events.
 	@echo -
 	@echo $(MAKE) ProgrammaticScriptAssignment.odt.load
diff --git a/main/odk/examples/DevelopersGuide/GUI/Makefile b/main/odk/examples/DevelopersGuide/GUI/Makefile
index 16ec257b32..315c6e3adc 100644
--- a/main/odk/examples/DevelopersGuide/GUI/Makefile
+++ b/main/odk/examples/DevelopersGuide/GUI/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the GUI examples of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeBean/Makefile b/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
index 1ee36d98ee..d9286a066c 100644
--- a/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OOoBean of the Developers Guide
@@ -53,7 +53,7 @@ ALL : \
 
 include $(SETTINGS)/stdtarget.mk
 
-$(CLASSFILES) : $(JAVAFILES) 
+$(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	javac $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile
index 8f7c2b9618..5325ded1f3 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevClipboard example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
index f2fa948302..a7d9e070c2 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevDestopEnvironment example of the Developers Guide.
@@ -62,9 +62,9 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLA
 		$(PATH_SEPARATOR)$(OUT_APP_CLASS))
 
 ifeq "$(OS)" "WIN"
-SUBDIR= nativelib/windows 
+SUBDIR= nativelib/windows
 else
-SUBDIR= nativelib/unix 
+SUBDIR= nativelib/unix
 endif
 
 # Targets
@@ -76,11 +76,11 @@ include $(SETTINGS)/stdtarget.mk
 
 .PHONY : $(SUBDIR)
 $(SUBDIR) :
-	$(MAKE) -C $@	  
+	$(MAKE) -C $@
 
 $(APP1_CLASSFILES) : $(APP1_JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(APP1_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(APP1_JAVAFILES)
 
 $(OUT_APP_CLASS)/$(APP1_NAME).mf :
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
index abd78270a5..930a906cfd 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevDesktopEnvironment native library of the Developers Guide.
@@ -49,7 +49,7 @@ $(OUT_SHL_SLO)/%.$(OBJ_EXT) : %.c
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(CC) $(CC_FLAGS_JNI) $(CC_INCLUDES) $(SDK_JAVA_INCLUDES) $(CC_DEFINES_JNI) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
 
-$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES) 
+$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(SHL_NAME).$(SHAREDLIB_EXT) : $(SLOFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(LINK) $(LIBRARY_LINK_FLAGS) $(LINK_LIBS) $(LINK_JAVA_LIBS) -o $@ $< \
 	-ljawt $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STDC++LIB)
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
index 6fe6691f80..632d5e329a 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevDesktopEnvironment native library of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile
index fe42394981..d9dd58fd09 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevDisableCommandsTest example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
index d97a895d6b..00f342396a 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevFilter example of the Developers Guide.
@@ -44,7 +44,7 @@ COMP_UNOPKG_MANIFEST = $(SAMPLE_GEN_OUT)/$(COMP_NAME)/META-INF/manifest.xml
 COMP_REGISTERFLAG = $(SAMPLE_GEN_OUT)/devguide_$(COMP_NAME)_component.flag
 COMP_COMPONENTS=$(COMP_NAME).components
 
-# often the java files are structured in a hierarchy similar to the package, 
+# often the java files are structured in a hierarchy similar to the package,
 # for the example we know the package
 PACKAGE = OfficeDev/samples/Filter
 
@@ -70,7 +70,7 @@ $(SAMPLE_GEN_OUT)/%.Manifest :
 
 $(COMP_CLASSFILES) : $(COMP_JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMP_CLASS_OUT) $(COMP_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMP_CLASS_OUT) $(COMP_JAVAFILES)
 
 # rule for component jar file
 $(COMP_JAR) : $(COMP_MANIFESTFILE) $(COMP_CLASSFILES)
@@ -108,8 +108,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
index f77c8c9c0c..2c15c1d0cd 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the filterdetection component for the FlatXmlFilter of the Developers Guide.
@@ -62,7 +62,7 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
 
 #$(COMP_MAPFILE) : $(SLOFILES)
 #	-$(MKDIR) $(subst /,$(PS),$(@D))
-#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) 
+#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE)
 #ifeq "$(OS)" "MACOSX"
 #	nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE)
 #endif
@@ -83,7 +83,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
-endif	
+endif
 
 # rule for component package manifest
 $(OUT_COMP_GEN)/%/manifest.xml :
@@ -112,7 +112,7 @@ $(COMP_COMPONENTS) :
 $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) FlatXmlTypeDetection.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))	 
+	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(SDK_ZIP) $@ FlatXmlTypeDetection.xcu
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components
@@ -128,12 +128,12 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
-XMLFilterDetect : $(REGISTERFLAG) 
+XMLFilterDetect : $(REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
 	@echo The FlatXMLFilterDetection component is installed if SDK_AUTO_DEPLOYMENT = YES.
 	@echo You will use this component implicitly in your office installation when you have
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
index 95b1412e50..b18c3d2e86 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the C++ FlatXmlFilter component example of the Developers Guide.
@@ -59,7 +59,7 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
 
 #$(COMP_MAPFILE) : $(SLOFILES)
 #	-$(MKDIR) $(subst /,$(PS),$(@D))
-#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) 
+#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE)
 #ifeq "$(OS)" "MACOSX"
 #	nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE)
 #endif
@@ -80,7 +80,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
-endif	
+endif
 
 # rule for component package manifest
 $(OUT_COMP_GEN)/%/manifest.xml :
@@ -109,7 +109,7 @@ $(COMP_COMPONENTS) :
 $(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) FlatXmlFilter_cpp.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))	 
+	-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
 	$(SDK_ZIP) $@ FlatXmlFilter_cpp.xcu
 	cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components
@@ -125,12 +125,12 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
-FlatXmlFilterCppExample : $(COMP_REGISTERFLAG) 
+FlatXmlFilterCppExample : $(COMP_REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
 	@echo The C++ FlatXmlFilter component is installed if SDK_AUTO_DEPLOYMENT = YES.
 	@echo You can use the filters "$(QM)DevGuide FlatXML ...$(QM)" inside your office installation
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile
index c0742fb83f..53c71497d3 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java FlatXMLFilter component example of the Developers Guide.
@@ -48,7 +48,7 @@ CLASSFILES = $(patsubst %.java,$(OUT_COMP_CLASS)/%.class,$(JAVAFILES))
 
 #$(COMP_NAME)_CLASSFILES = FlatXml.class FlatXml$(dlr)_FlatXml.class
 
-$(COMP_NAME)_CLASSFILES = *.class 
+$(COMP_NAME)_CLASSFILES = *.class
 
 SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLASSPATH)\
 		$(PATH_SEPARATOR)$(OUT_COMP_CLASS))
@@ -105,8 +105,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile
index a03c838fb5..8349ca9bc2 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/Linguistic/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevLinguistic examples of the Developers Guide.
@@ -110,10 +110,10 @@ $(OUT_COMP_CLASS)/%.Manifest :
 
 $(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
-# NOTE: because of gnu make problems with full qualified paths, the pattern 
-# rules for the component jars and the packages doesn't work proper and we 
+# NOTE: because of gnu make problems with full qualified paths, the pattern
+# rules for the component jars and the packages doesn't work proper and we
 # defined explicit rules
 
 # rule for component package manifest
@@ -173,8 +173,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
@@ -189,21 +189,21 @@ $(OUT_COMP_CLASS)/%.mf :
 	@echo Name: com/sun/star/lib/loader/Loader.class>> $@
 	@echo Application-Class: $*>> $@
 
-$(APP1_JAR) : $(OUT_COMP_CLASS)/$(APP1_NAME).mf $(OUT_COMP_CLASS)/$(APP1_NAME).class 
+$(APP1_JAR) : $(OUT_COMP_CLASS)/$(APP1_NAME).mf $(OUT_COMP_CLASS)/$(APP1_NAME).class
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	+cd $(subst /,$(PS),$(OUT_COMP_CLASS)) && $(SDK_JAR) cvfm $(@F) $(basename $(@F)).mf $(basename $(@F)).class $(basename $(@F))$(QUOTE)$$Client.class
 	+$(SDK_JAR) uvf $@ $(SDK_JAVA_UNO_BOOTSTRAP_FILES)
 
 
-$(EXAMPLE_NAME) : $(REGISTERFLAG) $(APP1_JAR) 
+$(EXAMPLE_NAME) : $(REGISTERFLAG) $(APP1_JAR)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use the following command to execute the example!
 	@echo -
-	@echo $(MAKE) $(APP1_NAME).run 
+	@echo $(MAKE) $(APP1_NAME).run
 	@echo --------
-	@echo Before you can run the examples the components "$(QM)$(COMP1_NAME)$(QM)", 
-	@echo "$(QM)$(COMP2_NAME)$(QM)" and "$(QM)$(COMP3_NAME)$(QM)" must be deployed. 
+	@echo Before you can run the examples the components "$(QM)$(COMP1_NAME)$(QM)",
+	@echo "$(QM)$(COMP2_NAME)$(QM)" and "$(QM)$(COMP3_NAME)$(QM)" must be deployed.
 	@echo The components will be automatically deployed if SDK_AUTO_DEPLOYMENT = YES.
 	@echo --------------------------------------------------------------------------------
 
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/Makefile
index d22c0509d2..b1a1c2630f 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDev examples of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile
index 2d4ce328f9..c99f2e1e86 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/PathSettings/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevPathSettingsTest example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile
index 79faa918ab..544968b544 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevPathSettingsTest example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile b/main/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile
index dfc56c3e02..31d7f265fe 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/TerminationTest/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OfficeDevClipboard example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile b/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
index 21d6e49353..18342a615c 100644
--- a/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
+++ b/main/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the ProfUNO cpp binding example of the Developers Guide
@@ -71,15 +71,15 @@ ifeq "$(OS)" "MACOSX"
 endif
 endif
 
-$(OUT_BIN)/office_connect$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/office_connect.$(OBJ_EXT) 
+$(OUT_BIN)/office_connect$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/office_connect.$(OBJ_EXT)
 
 $(OUT_BIN)/string_samples$(EXE_EXT) : $(SAMPLE_OBJ_OUT)/string_samples.$(OBJ_EXT)
 
 ProUNOCppBindingExample : $(APP1_BINARY) $(APP2_BINARY)
 	@echo --------------------------------------------------------------------------------
 	@echo Note: For the "$(QM)$(APP1_NAME)$(QM)" example you need a running office listening
-	@echo $(SQM)      $(SQM)on port 2083. The example use the defaultBootstrap_InitialComponentContext method and provides 
-	@echo $(SQM)      $(SQM)the additional office types via the UNO environment variable -env:URE_MORE_TYPES=... 
+	@echo $(SQM)      $(SQM)on port 2083. The example use the defaultBootstrap_InitialComponentContext method and provides
+	@echo $(SQM)      $(SQM)the additional office types via the UNO environment variable -env:URE_MORE_TYPES=...
 	@echo $(SQM)      $(SQM)Before you can run this example you have to start your office in listening mode.
 	@echo -
 	@echo $(SQM)  $(SQM)soffice "$(QM)-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)"
@@ -90,10 +90,10 @@ ProUNOCppBindingExample : $(APP1_BINARY) $(APP2_BINARY)
 	@echo $(MAKE) $(APP2_NAME).run
 	@echo --------------------------------------------------------------------------------
 
-%.run: $(OUT_BIN)/%$(EXE_EXT) 
+%.run: $(OUT_BIN)/%$(EXE_EXT)
 	cd $(subst /,$(PS),$(OUT_BIN)) && $(basename $@)
 
-$(API1_NAME).run: $(API1_BINARY) 
+$(API1_NAME).run: $(API1_BINARY)
 	cd $(subst /,$(PS),$(OUT_BIN)) && $(basename $@) $(ENV_OFFICE_TYPES)
 
 .PHONY: clean
diff --git a/main/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile b/main/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile
index ea4563c1ce..45700b5a3e 100644
--- a/main/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile
+++ b/main/odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the ProfUNO interprocess example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile b/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
index aad42a277b..987479bb1a 100644
--- a/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
+++ b/main/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the ProfUNO lifetime example of the Developers Guide
@@ -88,7 +88,7 @@ ProUNOLifetimeExamples : $(OUT_BIN)/$(COMPONENT_NAME)$(EXE_EXT) $(OUT_COMP_CLASS
 %.run: $(OUT_COMP_CLASS)/%.class
 	$(SDK_JAVA) -classpath "$(SDK_CLASSPATH)" $(basename $@)
 
-%.runexe: $(OUT_BIN)/%$(EXE_EXT) 
+%.runexe: $(OUT_BIN)/%$(EXE_EXT)
 	cd $(subst /,$(PS),$(OUT_BIN)) && $(basename $@)
 
 .PHONY: clean
diff --git a/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile b/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
index a817c9b970..2736e02cc4 100644
--- a/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
+++ b/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the SimpleBootstrap_cpp example of the SDK.
@@ -75,7 +75,7 @@ SimpleBootstrapCppExample : $(OUT_BIN)/$(APP_NAME)$(EXE_EXT)
 	@echo Please use the following command to execute the example!
 	@echo -
 	@echo $(MAKE) SimpleBootstrap_cpp.run
-	@echo --------------------------------------------------------------------------------	
+	@echo --------------------------------------------------------------------------------
 
 %.run: $(OUT_BIN)/SimpleBootstrap_cpp$(EXE_EXT)
 	cd $(subst /,$(PS),$(OUT_BIN)) && $(basename $@)
diff --git a/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile b/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile
index 8f92fbfb09..9bf1595ff4 100644
--- a/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile
+++ b/main/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the SimpleBootstrap_java example.
@@ -52,7 +52,7 @@ include $(SETTINGS)/stdtarget.mk
 
 $(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
 $(OUT_CLASS)/%.jar : manifest.mf $(CLASSFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile b/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
index 69691bd115..84ed063cbc 100644
--- a/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
+++ b/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OOoBean of the Developers Guide
@@ -57,7 +57,7 @@ ALL : \
 
 include $(SETTINGS)/stdtarget.mk
 
-$(CLASSFILES) : $(JAVAFILES) 
+$(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(SCRIPT_CLASS_OUT) $(JAVAFILES)
 
@@ -82,16 +82,16 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
 
 SayHelloExample : $(SCRIPT_REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
-	@echo The "$(QM)$(SCRIPT_NAME)$(QM)" scripting package was installed in your office installation 
-	@echo if SDK_AUTO_DEPLOYMENT = YES. If you want to run the script, start the Office 
+	@echo The "$(QM)$(SCRIPT_NAME)$(QM)" scripting package was installed in your office installation
+	@echo if SDK_AUTO_DEPLOYMENT = YES. If you want to run the script, start the Office
 	@echo and use the Tools/Macros/Run Macro menu item.
 	@echo You can also load the document "$(QM)$(SCRIPT_NAME).odt$(QM)" and press the button to run the
 	@echo script.
diff --git a/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile b/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
index b8e29238f7..0dca855fca 100644
--- a/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
+++ b/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OOoBean of the Developers Guide
@@ -56,7 +56,7 @@ ALL : ScriptSelectorExample
 
 include $(SETTINGS)/stdtarget.mk
 
-$(CLASSFILES) : $(JAVAFILES) 
+$(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(SCRIPT_CLASS_OUT) $(JAVAFILES)
 
@@ -69,7 +69,7 @@ $(SCRIPT_JAR) : $(CLASSFILES) $(SCRIPT_NAME)/container.gif $(SCRIPT_NAME)/script
 	$(SDK_JAR) cvf $@ -C $(SCRIPT_CLASS_OUT) .
 
 # rule for component package file
-$(SCRIPT_PACKAGE) : $(SCRIPT_JAR) META-INF/manifest.xml $(SCRIPT_NAME)/parcel-descriptor.xml 
+$(SCRIPT_PACKAGE) : $(SCRIPT_JAR) META-INF/manifest.xml $(SCRIPT_NAME)/parcel-descriptor.xml
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	$(SDK_ZIP) $@ META-INF/manifest.xml $(SCRIPT_NAME)/parcel-descriptor.xml
@@ -84,16 +84,16 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
 
 ScriptSelectorExample : $(SCRIPT_REGISTERFLAG)
 	@echo --------------------------------------------------------------------------------
-	@echo The "$(QM)$(SCRIPT_NAME)$(QM)" scripting package was installed in your office installation 
-	@echo if SDK_AUTO_DEPLOYMENT = YES. If you want to run the script, start the Office 
+	@echo The "$(QM)$(SCRIPT_NAME)$(QM)" scripting package was installed in your office installation
+	@echo if SDK_AUTO_DEPLOYMENT = YES. If you want to run the script, start the Office
 	@echo and use the Tools/Macros/Run Macro menu item.
 	@echo You can also load the document "$(QM)$(SCRIPT_NAME).odt$(QM)" and press the button to run
 	@echo the script.
diff --git a/main/odk/examples/DevelopersGuide/Spreadsheet/Makefile b/main/odk/examples/DevelopersGuide/Spreadsheet/Makefile
index a1bf17a273..744aa0624c 100644
--- a/main/odk/examples/DevelopersGuide/Spreadsheet/Makefile
+++ b/main/odk/examples/DevelopersGuide/Spreadsheet/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the SpreadSheet examples of the Developers Guide.
@@ -81,7 +81,7 @@ APP3_JAR=$(SAMPLE_CLASS_OUT)/$(APP3_NAME).jar
 
 COMP1_IDLFILES = XExampleAddIn.idl
 
-# normally the idl file should be stored in a directory tree fitting the 
+# normally the idl file should be stored in a directory tree fitting the
 # module structure, for the example we know the module structure
 PACKAGE = org/openoffice/sheet/addin
 
@@ -203,8 +203,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
@@ -217,14 +217,14 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
 $(APP_CLASSFILES) : $(APP_JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(SAMPLE_CLASS_OUT) $(APP_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(SAMPLE_CLASS_OUT) $(APP_JAVAFILES)
 
 $(APP1_CLASS_OUT)/%.class : %.java $(APP_CLASSFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -266,7 +266,7 @@ $(APP3_JAR) : $(APP3_GEN_OUT)/$(APP3_NAME).mf $(APP3_CLASS_OUT)/$(APP3_NAME).cla
 	+$(SDK_JAR) uvf $@ $(SDK_JAVA_UNO_BOOTSTRAP_FILES)
 	+cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)) && $(SDK_JAR) uvf $(@F) $(APP_CLASSNAMES)
 
-$(SAMPLE_NAME) : $(COMP1_REGISTERFLAG) $(COMP2_REGISTERFLAG) $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) 
+$(SAMPLE_NAME) : $(COMP1_REGISTERFLAG) $(COMP2_REGISTERFLAG) $(APP1_JAR) $(APP2_JAR) $(APP3_JAR)
 	@echo --------------------------------------------------------------------------------
 	@echo Please use one of the following commands to execute the examples!
 	@echo -
@@ -275,9 +275,9 @@ $(SAMPLE_NAME) : $(COMP1_REGISTERFLAG) $(COMP2_REGISTERFLAG) $(APP1_JAR) $(APP2_
 	@echo $(MAKE) $(APP3_NAME).run
 	@echo --------
 	@echo The "$(QM)$(COMP1_NAME)$(QM)" and "$(QM)$(COMP2_NAME)$(QM)"  component are installed if
-	@echo SDK_AUTO_DEPLOYMENT = YES. You can use this components inside your office 
+	@echo SDK_AUTO_DEPLOYMENT = YES. You can use this components inside your office
 	@echo installation, see the example descriptions. You can also load the "$(QM)ExampleAddIn.ods$(QM)"
-	@echo  document to see how the add-in functions can be used. For more details about the 
+	@echo  document to see how the add-in functions can be used. For more details about the
 	@echo "$(QM)$(COMP2_NAME)$(QM)" component see the "$(QM)DataPilotReadme.txt"$(QM).
 	@echo -
 	@echo $(MAKE) ExampleAddIn.ods.load
diff --git a/main/odk/examples/DevelopersGuide/Text/Makefile b/main/odk/examples/DevelopersGuide/Text/Makefile
index c2c27125c2..6ff78b00fe 100644
--- a/main/odk/examples/DevelopersGuide/Text/Makefile
+++ b/main/odk/examples/DevelopersGuide/Text/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Text example of the Developers Guide.
diff --git a/main/odk/examples/DevelopersGuide/UCB/Makefile b/main/odk/examples/DevelopersGuide/UCB/Makefile
index 7cbdd4bf57..c3f571374e 100644
--- a/main/odk/examples/DevelopersGuide/UCB/Makefile
+++ b/main/odk/examples/DevelopersGuide/UCB/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the UCB examples of the Developers Guide.
@@ -99,13 +99,13 @@ $(OUT_APP_CLASS)/%.jar : $(OUT_APP_CLASS)/%.mf $(OUT_APP_CLASS)/%.class $(APP_CL
 	+cd $(subst /,$(PS),$(OUT_APP_CLASS)) && $(SDK_JAR) cvfm $(@F) $*.mf $*.class $(APP_CLASSNAMES)
 	+$(SDK_JAR) uvf $@ $(SDK_JAVA_UNO_BOOTSTRAP_FILES)
 
-$(APP2_JAR) : $(OUT_APP_CLASS)/$(APP2_NAME).mf $(OUT_APP_CLASS)/$(APP2_NAME).class $(OUT_APP_CLASS)/DataStreamRetriever.class $(APP_CLASSFILES) 
+$(APP2_JAR) : $(OUT_APP_CLASS)/$(APP2_NAME).mf $(OUT_APP_CLASS)/$(APP2_NAME).class $(OUT_APP_CLASS)/DataStreamRetriever.class $(APP_CLASSFILES)
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	+cd $(subst /,$(PS),$(OUT_APP_CLASS)) && $(SDK_JAR) cvfm $(@F) $(basename $(@F)).mf $(basename $(@F)).class DataStreamRetriever.class $(APP_CLASSNAMES)
 	+$(SDK_JAR) uvf $@ $(SDK_JAVA_UNO_BOOTSTRAP_FILES)
 
-$(APP6_JAR) : $(OUT_APP_CLASS)/$(APP6_NAME).mf $(OUT_APP_CLASS)/$(APP6_NAME).class $(OUT_APP_CLASS)/DataStreamRetriever.class $(APP_CLASSFILES) 
+$(APP6_JAR) : $(OUT_APP_CLASS)/$(APP6_NAME).mf $(OUT_APP_CLASS)/$(APP6_NAME).class $(OUT_APP_CLASS)/DataStreamRetriever.class $(APP_CLASSFILES)
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	+cd $(subst /,$(PS),$(OUT_APP_CLASS)) && $(SDK_JAR) cvfm $(@F) $(basename $(@F)).mf $(basename $(@F)).class DataStreamRetriever.class $(APP_CLASSNAMES)
diff --git a/main/odk/examples/OLE/activex/Makefile b/main/odk/examples/OLE/activex/Makefile
index 817142adf6..7ee506a08b 100644
--- a/main/odk/examples/OLE/activex/Makefile
+++ b/main/odk/examples/OLE/activex/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the OLE activex C++ component example of the SDK.
@@ -30,8 +30,8 @@ include $(SETTINGS)/dk.mk
 
 # Define non-platform/compiler specific settings
 COMPONENT_NAME=so_activex
-COMPONENT_IMPL_NAME=$(SHAREDLIB_PRE)$(COMPONENT_NAME).$(SHAREDLIB_EXT) 
-COMPONENT_IMPL=$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(COMPONENT_NAME).$(SHAREDLIB_EXT) 
+COMPONENT_IMPL_NAME=$(SHAREDLIB_PRE)$(COMPONENT_NAME).$(SHAREDLIB_EXT)
+COMPONENT_IMPL=$(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)$(COMPONENT_NAME).$(SHAREDLIB_EXT)
 OUT_COMP_INC = $(OUT_INC)/$(COMPONENT_NAME)
 OUT_COMP_GEN = $(OUT_MISC)/$(COMPONENT_NAME)
 OUT_COMP_SLO=$(OUT_SLO)/$(COMPONENT_NAME)
@@ -62,7 +62,7 @@ $(OUT_COMP_INC)/so_activex.h : so_activex.idl
 
 $(OUT_COMP_GEN)/so_activex.res : so_activex.rc $(OUT_COMP_INC)/so_activex.h
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	rc $(CC_INCLUDES) /R /FO$@ so_activex.rc			       
+	rc $(CC_INCLUDES) /R /FO$@ so_activex.rc
 
 $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cpp
 	-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/main/odk/examples/cpp/DocumentLoader/Makefile b/main/odk/examples/cpp/DocumentLoader/Makefile
index ab75621593..db9e9a2325 100644
--- a/main/odk/examples/cpp/DocumentLoader/Makefile
+++ b/main/odk/examples/cpp/DocumentLoader/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the C++ DocumentLoader example of the SDK.
@@ -69,7 +69,7 @@ endif
 CppDocumentLoaderExample : $(OUT_BIN)/DocumentLoader$(EXE_EXT)
 	@echo --------------------------------------------------------------------------------
 	@echo The example loads the "$(QM)test.odt$(QM)" document in the DocumentLoader example directory.
-	@echo If you want to load your own document, please use: 
+	@echo If you want to load your own document, please use:
 	@echo $(SQM)  $(SQM)DocumentLoader -env:URE_MORE_TYPES="$(QM)<fileurl_office_types_rdb>$(QM)" "$(QM)filename$(QM)" [connection_url]
 	@echo -
 	@echo Use the following command to execute the example!
@@ -77,8 +77,8 @@ CppDocumentLoaderExample : $(OUT_BIN)/DocumentLoader$(EXE_EXT)
 	@echo $(MAKE) DocumentLoader.run
 	@echo -
 	@echo NOTE: This example does not use the new UNO bootstrap mechanism, it uses still a socket
-	@echo $(SQM)      $(SQM)connection. The example use the defaultBootstrap_InitialComponentContext method and provides 
-	@echo $(SQM)      $(SQM)the additional office types via the UNO environment variable -env:URE_MORE_TYPES=... 
+	@echo $(SQM)      $(SQM)connection. The example use the defaultBootstrap_InitialComponentContext method and provides
+	@echo $(SQM)      $(SQM)the additional office types via the UNO environment variable -env:URE_MORE_TYPES=...
 	@echo $(SQM)      $(SQM)Before you can run this example you have to start your office in listening mode.
 	@echo -
 	@echo $(SQM)  $(SQM)soffice "$(QM)-accept=socket,host=localhost,port=2083;urp;StarOffice.ServiceManager$(QM)"
diff --git a/main/odk/examples/cpp/complextoolbarcontrols/Makefile b/main/odk/examples/cpp/complextoolbarcontrols/Makefile
index 14cf999a52..9cffbdba67 100644
--- a/main/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/main/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the complextoolbarcontrols C++ component example of the SDK.
@@ -65,7 +65,7 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
 
 #$(COMP_MAPFILE) : $(SLOFILES)
 #	-$(MKDIR) $(subst /,$(PS),$(@D))
-#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) 
+#	cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE)
 #ifeq "$(OS)" "MACOSX"
 #	nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE)
 #endif
diff --git a/main/odk/examples/cpp/counter/Makefile b/main/odk/examples/cpp/counter/Makefile
index 6ea958ff02..a2267525f0 100644
--- a/main/odk/examples/cpp/counter/Makefile
+++ b/main/odk/examples/cpp/counter/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the C++ counter example of the SDK.
@@ -38,7 +38,7 @@ OUT_COMP_INC = $(OUT_INC)/$(COMP_NAME)
 OUT_COMP_GEN = $(OUT_MISC)/$(COMP_NAME)
 OUT_COMP_OBJ = $(OUT_OBJ)/$(COMP_NAME)
 OUT_COMP_SLO = $(OUT_SLO)/$(COMP_NAME)
-COMP_SERVICES=$(SHAREDLIB_OUT)/counterservices.rdb 
+COMP_SERVICES=$(SHAREDLIB_OUT)/counterservices.rdb
 
 ENV_EXAMPLE_TYPES=-env:URE_MORE_TYPES=$(URLPREFIX)$(COMP_RDB)
 ENV_COMP_SERVICES=-env:URE_MORE_SERVICES=$(URLPREFIX)$(COMP_SERVICES)
@@ -74,7 +74,7 @@ $(OUT_BIN)/%.rdb : $(GENURDFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
 	$(REGMERGE) $@ /UCR $(GENURDFILES)
-#	$(REGMERGE) $@ / $(URE_TYPES) 
+#	$(REGMERGE) $@ / $(URE_TYPES)
 
 $(COMP_TYPEFLAG) : $(COMP_RDB) $(SDKTYPEFLAG)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -108,7 +108,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
-endif	
+endif
 
 $(OUT_BIN)/countermain$(EXE_EXT) : $(OUT_COMP_OBJ)/countermain.$(OBJ_EXT) $(SHAREDLIB_OUT)/counter.uno.$(SHAREDLIB_EXT)
 ifeq "$(OS)" "WIN"
@@ -143,7 +143,7 @@ CppCounterExample : $(OUT_BIN)/countermain$(EXE_EXT) $(COMP_IMPL) $(COMP_SERVICE
 	@echo $(SQM)      $(SQM)The additional example IDL types are provided via the UNO environment variable -env:URE_MORE_TYPES=...
 	@echo $(SQM)      $(SQM)and the example component is made available via -env:URE_MORE_SERVICES=...
 	@echo $(SQM)      $(SQM)Please check the generated $(QM)$(COMP_SERVICES)$(QM) to see how you can specify your own components in such an environment
-	@echo $(SQM)      $(SQM)and how to use the passive UNO registration.  
+	@echo $(SQM)      $(SQM)and how to use the passive UNO registration.
 	@echo --------------------------------------------------------------------------------
 
 %.run: $(OUT_BIN)/countermain$(EXE_EXT) $(COMP_IMPL)
diff --git a/main/odk/examples/cpp/remoteclient/Makefile b/main/odk/examples/cpp/remoteclient/Makefile
index d80ee9fd18..ff5c9fdc83 100644
--- a/main/odk/examples/cpp/remoteclient/Makefile
+++ b/main/odk/examples/cpp/remoteclient/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the C++ remoteclient example of the SDK.
@@ -34,7 +34,7 @@ COMP_IMPL_NAME=$(COMP_NAME).uno.$(SHAREDLIB_EXT)
 COMP_IMPL=$(SHAREDLIB_OUT)/$(COMP_IMPL_NAME)
 COMP_RDB_NAME = $(COMP_NAME).uno.rdb
 COMP_RDB = $(OUT_BIN)/$(COMP_RDB_NAME)
-COMP_SERVICES=$(SHAREDLIB_OUT)/remoteclientsample.rdb 
+COMP_SERVICES=$(SHAREDLIB_OUT)/remoteclientsample.rdb
 
 ENV_COMP_SERVICES=-env:URE_MORE_SERVICES=$(URLPREFIX)$(COMP_SERVICES)
 
@@ -59,7 +59,7 @@ include $(SETTINGS)/stdtarget.mk
 $(OUT_BIN)/%.rdb :
 	-$(MKDIR) $(subst /,$(PS),$(@D))
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-	$(REGMERGE) $@ / $(URE_TYPES) 
+	$(REGMERGE) $@ / $(URE_TYPES)
 
 $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -81,7 +81,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES)
 ifeq "$(OS)" "MACOSX"
 	$(INSTALL_NAME_URELIBS)  $@
 endif
-endif	
+endif
 
 $(COMP_SERVICES) :
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -98,16 +98,16 @@ $(COMP_SERVICES) :
 #CppClientExample : $(COMP_IMPL) $(COMP_ENV_FLAG)
 CppClientExample : $(COMP_IMPL) $(COMP_SERVICES)
 	@echo --------------------------------------------------------------------------------
-	@echo The remoteclient C++ component can be used by using the uno binary. Use the 
-	@echo the follwong command to start the example. The run target starts a remote 
+	@echo The remoteclient C++ component can be used by using the uno binary. Use the
+	@echo the follwong command to start the example. The run target starts a remote
 	@echo server and connect with the client to this server.
-	@echo - 
+	@echo -
 	@echo $(MAKE) remoteclient.run
-	@echo - 
+	@echo -
 	@echo NOTE: The example uses the $(QM)uno$(QM) tool to prepare a working UNO environment.
 	@echo $(SQM)      $(SQM)The example component is made available via -env:URE_MORE_SERVICES=...
 	@echo $(SQM)      $(SQM)Please check the generated $(QM)$(COMP_SERVICES)$(QM) to see how you can specify your own components in such an environment
-	@echo $(SQM)      $(SQM)and how to use the passive UNO registration.  
+	@echo $(SQM)      $(SQM)and how to use the passive UNO registration.
 	@echo --------------------------------------------------------------------------------
 
 %.run: $(COMP_IMPL)
diff --git a/main/odk/examples/java/ConverterServlet/Makefile b/main/odk/examples/java/ConverterServlet/Makefile
index 8240f1e064..e2a7d62bad 100644
--- a/main/odk/examples/java/ConverterServlet/Makefile
+++ b/main/odk/examples/java/ConverterServlet/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java ConverterServlet example of the SDK.
@@ -49,14 +49,14 @@ ALL : \
 
 include $(SETTINGS)/stdtarget.mk
 
-$(OFFICE_CLASSES_DIR)/cos.jar : 
+$(OFFICE_CLASSES_DIR)/cos.jar :
 	@echo --------------------------------------------------------------------------------
 	@echo You need the servlet support Java archive "$(QM)cos.jar$(QM)" for this example.
 	@echo You can download it from "$(QM)http://www.servlets.com/cos/index.html$(QM)"
 	@echo and then please copy it into your "$(QM)$(OFFICE_CLASSES_DIR)$(QM)" directory.
 	@echo --------------------------------------------------------------------------------
 
-$(OFFICE_CLASSES_DIR)/servlet.jar : 
+$(OFFICE_CLASSES_DIR)/servlet.jar :
 	@echo --------------------------------------------------------------------------------
 	@echo You need the servlet API "$(QM)servlet.jar$(QM)" for this example.
 	@echo You can download it from "$(QM)http://java.sun.com/products/servlet/index.html$(QM)"
@@ -65,11 +65,11 @@ $(OFFICE_CLASSES_DIR)/servlet.jar :
 
 $(CLASSFILES) : $(JAVAFILES) $(OFFICE_CLASSES_DIR)/cos.jar $(OFFICE_CLASSES_DIR)/servlet.jar
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
 ConverterServletExample : $(CLASSFILES)
 	@echo --------------------------------------------------------------------------------
-	@echo Please see the README file for more information how to use the converter 
+	@echo Please see the README file for more information how to use the converter
 	@echo servlet.
 	@echo --------------------------------------------------------------------------------
 
diff --git a/main/odk/examples/java/DocumentHandling/Makefile b/main/odk/examples/java/DocumentHandling/Makefile
index 514fca2aaf..ea8b162189 100644
--- a/main/odk/examples/java/DocumentHandling/Makefile
+++ b/main/odk/examples/java/DocumentHandling/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java DocumentHandling examples of the SDK.
@@ -81,7 +81,7 @@ $(SAMPLE_NAME) : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR)
 	@echo The $(APP1_NAME) search the "$(QM)./test$(QM)" directory for documents, convert
 	@echo them using using the "$(QM)MS Word 97$(QM)" filter and the extension "$(QM).doc$(QM)".
 	@echo The converted files are store in "$(QM)$(SAMPLE_GEN_OUT)/converted_files$(QM)".
-	@echo The list of possible filter names can change. Normally an updated list can be found 
+	@echo The list of possible filter names can change. Normally an updated list can be found
 	@echo on "$(QM)http://www.openoffice.org/files/documents/25/111/filter_description.html$(QM)".
 	@echo -
 	@echo The $(APP2_NAME) loads the document "$(QM)./test/test1.odt$(QM)".
@@ -99,8 +99,8 @@ $(SAMPLE_NAME) : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR)
 	@echo $(MAKE) $(APP3_NAME).run
 	@echo $(MAKE) $(APP4_NAME).run
 	@echo --------
-	@echo The examples need parameters. Please use one the following commands to 
-	@echo start the demo if you do not want the default parameters specified in the 
+	@echo The examples need parameters. Please use one the following commands to
+	@echo start the demo if you do not want the default parameters specified in the
 	@echo this makefile. Starting without parameters print a command line help:
 	@echo --- $(APP1_NAME) ---
 	@echo java -jar $(APP1_NAME).jar "$(QM)directory$(QM)" "$(QM)filter name$(QM)" "$(QM)extension$(QM)" "$(QM)output_directory$(QM)"
diff --git a/main/odk/examples/java/Drawing/Makefile b/main/odk/examples/java/Drawing/Makefile
index 3d34fa870a..2fadf9fa21 100644
--- a/main/odk/examples/java/Drawing/Makefile
+++ b/main/odk/examples/java/Drawing/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java Drawing example of the SDK.
diff --git a/main/odk/examples/java/EmbedDocument/Container1/Makefile b/main/odk/examples/java/EmbedDocument/Container1/Makefile
index 4fd2d078f4..8317d569e9 100644
--- a/main/odk/examples/java/EmbedDocument/Container1/Makefile
+++ b/main/odk/examples/java/EmbedDocument/Container1/Makefile
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 # Builds the Java Storage test example of the SDK.
@@ -51,7 +51,7 @@ include $(SETTINGS)/stdtarget.mk
 
 $(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
 JavaStorageTestExample : $(CLASSFILES)
 	@echo --------------------------------------------------------------------------------
diff --git a/main/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile b/main/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
index df7c89932a..8f1a4d35f5 100644
--- a/main/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
+++ b/main/odk/examples/java/EmbedDocument/EmbeddedObject/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 PRJ=../../../..
@@ -28,7 +28,7 @@ include $(SETTINGS)/std.mk
 
 # Define non-platform/compiler specific settings
 
-# we use the sample directory name for separating this example 
+# we use the sample directory name for separating this example
 # from others in the output directory
 SAMPLE_NAME=EmbeddedObject
 SAMPLE_CLASS_OUT=$(OUT_CLASS)/$(SAMPLE_NAME)
@@ -61,7 +61,7 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLA
 
 
 # Targets
-.PHONY: ALL 
+.PHONY: ALL
 ALL : $(COMP_NAME)
 
 include $(SETTINGS)/stdtarget.mk
@@ -111,16 +111,16 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
 $(COMP_NAME) : $(COMP_REGISTERFLAG)
 	@echo ------
 	@echo The $(COMP_NAME) component was installed if SDK_AUTO_DEPLOYMENT = YES.
-	@echo Load the "$(QM)$(SAMPLE_NAME).odt$(QM)" document to see how this component works. 
-	@echo You can use this component inside your office installation, see the example 
+	@echo Load the "$(QM)$(SAMPLE_NAME).odt$(QM)" document to see how this component works.
+	@echo You can use this component inside your office installation, see the example
 	@echo description.
 	@echo -
 	@echo $(MAKE) $(SAMPLE_NAME).odt.load
diff --git a/main/odk/examples/java/Inspector/Makefile b/main/odk/examples/java/Inspector/Makefile
index 60ed255e90..79fb1d0eb4 100644
--- a/main/odk/examples/java/Inspector/Makefile
+++ b/main/odk/examples/java/Inspector/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java InstanceInspector component example of the SDK.
@@ -57,7 +57,7 @@ IDLFILES = InstanceInspector.idl \
 # module structure, for the example we know the module structure
 PACKAGE = org/openoffice
 
-COMP_JAVAFILES = XDialogProvider.java XTreeControlProvider.java XTreePathProvider.java MethodParametersDialog.java HideableMutableTreeNode.java HideableTreeModel.java Introspector.java XUnoNode.java SwingUnoNode.java UnoNode.java XUnoMethodNode.java SwingUnoMethodNode.java UnoMethodNode.java XUnoPropertyNode.java SwingUnoPropertyNode.java UnoPropertyNode.java XUnoFacetteNode.java SwingUnoFacetteNode.java TDocSupplier.java UnoTreeRenderer.java InspectorAddon.java XLanguageSourceCodeGenera [...]
+COMP_JAVAFILES = XDialogProvider.java XTreeControlProvider.java XTreePathProvider.java MethodParametersDialog.java HideableMutableTreeNode.java HideableTreeModel.java Introspector.java XUnoNode.java SwingUnoNode.java UnoNode.java XUnoMethodNode.java SwingUnoMethodNode.java UnoMethodNode.java XUnoPropertyNode.java SwingUnoPropertyNode.java UnoPropertyNode.java XUnoFacetteNode.java SwingUnoFacetteNode.java TDocSupplier.java UnoTreeRenderer.java InspectorAddon.java XLanguageSourceCodeGenera [...]
 COMP_CLASSFILES = $(patsubst %.java,$(COMP_CLASS_OUT)/%.class,$(COMP_JAVAFILES))
 
 GEN_CLASSFILES = $(patsubst %.idl,$(SAMPLE_CLASS_OUT)/$(PACKAGE)/%.class,$(IDLFILES))
diff --git a/main/odk/examples/java/MinimalComponent/Makefile b/main/odk/examples/java/MinimalComponent/Makefile
index 23d1f6ee99..f2bdba74d1 100644
--- a/main/odk/examples/java/MinimalComponent/Makefile
+++ b/main/odk/examples/java/MinimalComponent/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java Minimal component example of the SDK.
@@ -30,7 +30,7 @@ include $(SETTINGS)/dk.mk
 
 # Define non-platform/compiler specific settings
 
-# we use the sample directory name dor separating this example 
+# we use the sample directory name dor separating this example
 # from others in the output directory
 SAMPLE_NAME=MinimalComponent
 SAMPLE_CLASS_OUT=$(OUT_CLASS)/$(SAMPLE_NAME)
@@ -79,7 +79,7 @@ SDK_CLASSPATH = $(subst $(EMPTYSTRING) $(PATH_SEPARATOR),$(PATH_SEPARATOR),$(CLA
 
 
 # Targets
-.PHONY: ALL 
+.PHONY: ALL
 ALL : JavaMinimalComponentExample
 
 include $(SETTINGS)/stdtarget.mk
@@ -166,8 +166,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/java/NotesAccess/Makefile b/main/odk/examples/java/NotesAccess/Makefile
index 4130d12445..54315c39ad 100644
--- a/main/odk/examples/java/NotesAccess/Makefile
+++ b/main/odk/examples/java/NotesAccess/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java NotesAccess example of the SDK.
@@ -51,9 +51,9 @@ ALL : \
 
 include $(SETTINGS)/stdtarget.mk
 
-NotesAPIs : 
+NotesAPIs :
 	@echo --------------------------------------------------------------------------------
-	@echo This example uses external APIs from Lotus Notes/Domino. You can download a 
+	@echo This example uses external APIs from Lotus Notes/Domino. You can download a
 	@echo trial version from "$(QM)http://www.lotus.com/downloads$(QM)". After installation
 	@echo please do the following:
 	@echo  1. Add the install path to the PATH or LD_LIBRARY_PATH of this shell.
@@ -63,9 +63,9 @@ NotesAPIs :
 	@echo --------------------------------------------------------------------------------
 
 
-$(CLASSFILES) : $(JAVAFILES) 
+$(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_APP_CLASS) $(JAVAFILES)
 
 $(OUT_APP_CLASS)/%.mf :
 	-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -86,7 +86,7 @@ JavaNotesAccessExample : NotesAPIs $(APP_JAR)
 	@echo NOTE: Before you run this example make sure that the exaternal "$(QM)Notes.jar$(QM)" can
 	@echo be found besides "$(QM)$(APP_JAR)"$(QM)
 	@echo and that the PATH variable includes the Notes installation directory.
-	@echo -   
+	@echo -
 	@echo Please use the following command to execute the example!
 	@echo -
 	@echo $(MAKE) NotesAccess.run
diff --git a/main/odk/examples/java/PropertySet/Makefile b/main/odk/examples/java/PropertySet/Makefile
index 98ca4dada2..b8bb48c8ac 100644
--- a/main/odk/examples/java/PropertySet/Makefile
+++ b/main/odk/examples/java/PropertySet/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java PropertySet component example of the SDK.
@@ -63,7 +63,7 @@ $(COMP_CLASS_OUT)/%.Manifest :
 
 $(COMP_CLASSFILES) : $(COMP_JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMP_CLASS_OUT) $(COMP_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMP_CLASS_OUT) $(COMP_JAVAFILES)
 
 # rule for component jar file
 $(COMP_JAR) : $(COMP_JAR_MANIFEST) $(COMP_CLASSFILES)
@@ -99,8 +99,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/odk/examples/java/Spreadsheet/Makefile b/main/odk/examples/java/Spreadsheet/Makefile
index 5394fde5b7..bf0047bf30 100644
--- a/main/odk/examples/java/Spreadsheet/Makefile
+++ b/main/odk/examples/java/Spreadsheet/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java Spreadsheet examples of the SDK.
@@ -110,7 +110,7 @@ $(OUT_COMP_CLASS)/%.class : %.java
 # only the component depends on the generated types
 $(COMPCLASSFILES) : $(JAVAFILES) $(GENCLASSFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(COMPJAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(COMPJAVAFILES)
 
 # rule for client/example application manifest file
 $(OUT_COMP_CLASS)/%.mf :
@@ -163,8 +163,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
@@ -182,7 +182,7 @@ $(EXAMPLE_NAME) : $(COMP_REGISTERFLAG) $(APP1_JAR) $(APP2_JAR) $(APP3_JAR)
 	@echo --------------------------------------------------------------------------------
 	@echo The Calc add-in component was installed if SDK_AUTO_DEPLOYMENT = YES.
 	@echo You can use this component inside your office installation, see the example
-	@echo description. You can also load the "$(QM)CalcAddins.ods$(QM)" document to see 
+	@echo description. You can also load the "$(QM)CalcAddins.ods$(QM)" document to see
 	@echo how the add-in functions works.
 	@echo -
 	@echo $(MAKE) CalcAddins.ods.load
diff --git a/main/odk/examples/java/Storage/Makefile b/main/odk/examples/java/Storage/Makefile
index 7842e1e286..099cbba32e 100644
--- a/main/odk/examples/java/Storage/Makefile
+++ b/main/odk/examples/java/Storage/Makefile
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,16 +7,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 # Builds the Java Storage test example of the SDK.
@@ -61,7 +61,7 @@ include $(SETTINGS)/stdtarget.mk
 
 $(CLASSFILES) : $(JAVAFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(OUT_COMP_CLASS) $(JAVAFILES)
 
 JavaStorageTestExample : $(CLASSFILES)
 	@echo --------------------------------------------------------------------------------
diff --git a/main/odk/examples/java/Text/Makefile b/main/odk/examples/java/Text/Makefile
index 62d70dd320..28ed1b51f7 100644
--- a/main/odk/examples/java/Text/Makefile
+++ b/main/odk/examples/java/Text/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java Text examples of the SDK.
@@ -90,7 +90,7 @@ $(APP9_JAR) : $(OUT_APP_CLASS)/$(APP9_NAME).mf $(OUT_APP_CLASS)/$(APP9_NAME).cla
 
 $(EXAMPLE_NAME) : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR) $(APP5_JAR) $(APP6_JAR) $(APP7_JAR) $(APP8_JAR) $(APP9_JAR)
 	@echo --------------------------------------------------------------------------------
-	@echo The GraphicsInserter example loads the graphic "$(QM)./oo_smiley.gif$(QM)" into a 
+	@echo The GraphicsInserter example loads the graphic "$(QM)./oo_smiley.gif$(QM)" into a
 	@echo new document.
 	@echo -
 	@echo Please use one of the following commands to execute the examples!
@@ -105,8 +105,8 @@ $(EXAMPLE_NAME) : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR) $(APP5_JAR) $(
 	@echo $(MAKE) WriterSelector.run
 	@echo $(MAKE) GraphicsInserter.run
 	@echo --------
-	@echo The GraphicsInserter needs parameters. Please use the following command to 
-	@echo start the demo if you do not want the default parameters specified in the 
+	@echo The GraphicsInserter needs parameters. Please use the following command to
+	@echo start the demo if you do not want the default parameters specified in the
 	@echo this makefile. Starting without parameters print a command line help:
 	@echo --- GraphicsInserter ---
 	@echo java -jar GraphicsInserter.jar "$(QM)graphic Url|path$(QM)"
diff --git a/main/odk/examples/java/ToDo/Makefile b/main/odk/examples/java/ToDo/Makefile
index 2540d05e4f..15764357a5 100644
--- a/main/odk/examples/java/ToDo/Makefile
+++ b/main/odk/examples/java/ToDo/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # Builds the Java Calc Addin example of the SDK.
@@ -46,7 +46,7 @@ COMP_COMPONENTS=$(COMP_NAME).components
 IDLFILES = XToDo.idl \
 	ToDo.idl
 
-# normally the idl file should be stored in a directory tree fitting the module 
+# normally the idl file should be stored in a directory tree fitting the module
 # structure, for the example we know the module structure
 PACKAGE = org/openoffice
 
@@ -93,7 +93,7 @@ $(GEN_CLASSFILES) : $(COMP_RDB)
 
 $(COMP_CLASSFILES) : $(COMP_JAVAFILES) $(GEN_CLASSFILES)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMP_CLASS_OUT) $(COMP_JAVAFILES) 
+	$(SDK_JAVAC) $(JAVAC_FLAGS) -classpath "$(SDK_CLASSPATH)" -d $(COMP_CLASS_OUT) $(COMP_JAVAFILES)
 
 # rule for component jar file
 $(COMP_JAR) : $(COMP_JAR_MANIFEST) $(COMP_CLASSFILES)
@@ -131,8 +131,8 @@ ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 else
 	@echo --------------------------------------------------------------------------------
 	@echo  If you want to install your component automatically, please set the environment
-	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only 
-	@echo  possible if no office instance is running. 
+	@echo  variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only
+	@echo  possible if no office instance is running.
 	@echo --------------------------------------------------------------------------------
 endif
 
diff --git a/main/offapi/Makefile b/main/offapi/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/offapi/Makefile
+++ b/main/offapi/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/oovbaapi/Makefile b/main/oovbaapi/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/oovbaapi/Makefile
+++ b/main/oovbaapi/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/oox/Makefile b/main/oox/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/oox/Makefile
+++ b/main/oox/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/oox/source/token/Makefile b/main/oox/source/token/Makefile
index 65f8728208..dfd761ab36 100644
--- a/main/oox/source/token/Makefile
+++ b/main/oox/source/token/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/package/Makefile b/main/package/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/package/Makefile
+++ b/main/package/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/padmin/Makefile b/main/padmin/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/padmin/Makefile
+++ b/main/padmin/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/psprint_config/Makefile b/main/psprint_config/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/psprint_config/Makefile
+++ b/main/psprint_config/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/pyuno/Makefile b/main/pyuno/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/pyuno/Makefile
+++ b/main/pyuno/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/qadevOOo/Makefile b/main/qadevOOo/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/qadevOOo/Makefile
+++ b/main/qadevOOo/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/rdbmaker/Makefile b/main/rdbmaker/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/rdbmaker/Makefile
+++ b/main/rdbmaker/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/registry/Makefile b/main/registry/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/registry/Makefile
+++ b/main/registry/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/remotebridges/Makefile b/main/remotebridges/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/remotebridges/Makefile
+++ b/main/remotebridges/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/reportdesign/Makefile b/main/reportdesign/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/reportdesign/Makefile
+++ b/main/reportdesign/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/ridljar/Makefile b/main/ridljar/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/ridljar/Makefile
+++ b/main/ridljar/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/rsc/Makefile b/main/rsc/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/rsc/Makefile
+++ b/main/rsc/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/salhelper/Makefile b/main/salhelper/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/salhelper/Makefile
+++ b/main/salhelper/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/sane/Makefile b/main/sane/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/sane/Makefile
+++ b/main/sane/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/sax/Makefile b/main/sax/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/sax/Makefile
+++ b/main/sax/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/sc/Makefile b/main/sc/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/sc/Makefile
+++ b/main/sc/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/scaddins/Makefile b/main/scaddins/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/scaddins/Makefile
+++ b/main/scaddins/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/sccomp/Makefile b/main/sccomp/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/sccomp/Makefile
+++ b/main/sccomp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/sd/Makefile b/main/sd/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/sd/Makefile
+++ b/main/sd/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/sd/workben/testdll/makefile b/main/sd/workben/testdll/makefile
index 7e121b4a03..aa1ca49a46 100644
--- a/main/sd/workben/testdll/makefile
+++ b/main/sd/workben/testdll/makefile
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 # -------------------------------------------------------------
 PRJ=..
 
diff --git a/main/sfx2/Makefile b/main/sfx2/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/sfx2/Makefile
+++ b/main/sfx2/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/slideshow/Makefile b/main/slideshow/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/slideshow/Makefile
+++ b/main/slideshow/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/solenv/Makefile b/main/solenv/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/solenv/Makefile
+++ b/main/solenv/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/solenv/gbuild/templates/Makefile b/main/solenv/gbuild/templates/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/solenv/gbuild/templates/Makefile
+++ b/main/solenv/gbuild/templates/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/sot/Makefile b/main/sot/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/sot/Makefile
+++ b/main/sot/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/starmath/Makefile b/main/starmath/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/starmath/Makefile
+++ b/main/starmath/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/store/Makefile b/main/store/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/store/Makefile
+++ b/main/store/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/svgio/Makefile b/main/svgio/Makefile
index 631870fb09..b2906c8527 100644
--- a/main/svgio/Makefile
+++ b/main/svgio/Makefile
@@ -1,5 +1,5 @@
 #/**************************************************************
-# * 
+# *
 # * Licensed to the Apache Software Foundation (ASF) under one
 # * or more contributor license agreements.  See the NOTICE file
 # * distributed with this work for additional information
@@ -7,16 +7,16 @@
 # * to you under the Apache License, Version 2.0 (the
 # * "License"); you may not use this file except in compliance
 # * with the License.  You may obtain a copy of the License at
-# * 
+# *
 # *   http://www.apache.org/licenses/LICENSE-2.0
-# * 
+# *
 # * Unless required by applicable law or agreed to in writing,
 # * software distributed under the License is distributed on an
 # * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # * KIND, either express or implied.  See the License for the
 # * specific language governing permissions and limitations
 # * under the License.
-# * 
+# *
 # *************************************************************/
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/svl/Makefile b/main/svl/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/svl/Makefile
+++ b/main/svl/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/svtools/Makefile b/main/svtools/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/svtools/Makefile
+++ b/main/svtools/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/svx/Makefile b/main/svx/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/svx/Makefile
+++ b/main/svx/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/sw/Makefile b/main/sw/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/sw/Makefile
+++ b/main/sw/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/test/Makefile b/main/test/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/test/Makefile
+++ b/main/test/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/testgraphical/Makefile b/main/testgraphical/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/testgraphical/Makefile
+++ b/main/testgraphical/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/toolkit/Makefile b/main/toolkit/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/toolkit/Makefile
+++ b/main/toolkit/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/tools/Makefile b/main/tools/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/tools/Makefile
+++ b/main/tools/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/twain/Makefile b/main/twain/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/twain/Makefile
+++ b/main/twain/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/ucb/Makefile b/main/ucb/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/ucb/Makefile
+++ b/main/ucb/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/ucbhelper/Makefile b/main/ucbhelper/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/ucbhelper/Makefile
+++ b/main/ucbhelper/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/udkapi/Makefile b/main/udkapi/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/udkapi/Makefile
+++ b/main/udkapi/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/unixODBC/Makefile b/main/unixODBC/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/unixODBC/Makefile
+++ b/main/unixODBC/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/unodevtools/Makefile b/main/unodevtools/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/unodevtools/Makefile
+++ b/main/unodevtools/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/unotools/Makefile b/main/unotools/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/unotools/Makefile
+++ b/main/unotools/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/unoxml/Makefile b/main/unoxml/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/unoxml/Makefile
+++ b/main/unoxml/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/ure/Makefile b/main/ure/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/ure/Makefile
+++ b/main/ure/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/ure/source/uretest/Makefile b/main/ure/source/uretest/Makefile
index 9fb428bd05..3c62c884c1 100644
--- a/main/ure/source/uretest/Makefile
+++ b/main/ure/source/uretest/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 # The following variable can be set, if necessary (see README):
diff --git a/main/uui/Makefile b/main/uui/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/uui/Makefile
+++ b/main/uui/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/vbahelper/Makefile b/main/vbahelper/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/vbahelper/Makefile
+++ b/main/vbahelper/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/vcl/Makefile b/main/vcl/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/vcl/Makefile
+++ b/main/vcl/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/vcl/os2/source/window/makefile b/main/vcl/os2/source/window/makefile
index 9569c44266..fdfb7c780b 100644
--- a/main/vcl/os2/source/window/makefile
+++ b/main/vcl/os2/source/window/makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 PRJ=..\..\..
diff --git a/main/vos/Makefile b/main/vos/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/vos/Makefile
+++ b/main/vos/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/wizards/Makefile b/main/wizards/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/wizards/Makefile
+++ b/main/wizards/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/writerfilter/Makefile b/main/writerfilter/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/writerfilter/Makefile
+++ b/main/writerfilter/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/writerfilter/source/Makefile b/main/writerfilter/source/Makefile
index 4ea6ae1f9f..4b8196773a 100644
--- a/main/writerfilter/source/Makefile
+++ b/main/writerfilter/source/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/x11_extensions/Makefile b/main/x11_extensions/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/x11_extensions/Makefile
+++ b/main/x11_extensions/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/xmerge/Makefile b/main/xmerge/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/xmerge/Makefile
+++ b/main/xmerge/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/xml2cmp/Makefile b/main/xml2cmp/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/xml2cmp/Makefile
+++ b/main/xml2cmp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/xmlhelp/Makefile b/main/xmlhelp/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/xmlhelp/Makefile
+++ b/main/xmlhelp/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/xmloff/Makefile b/main/xmloff/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/xmloff/Makefile
+++ b/main/xmloff/Makefile
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 ifeq ($(strip $(SOLARENV)),)
diff --git a/main/xmlreader/Makefile b/main/xmlreader/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/xmlreader/Makefile
+++ b/main/xmlreader/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################
 
 
diff --git a/main/xmlscript/Makefile b/main/xmlscript/Makefile
index dbdce7b281..c0cc39631a 100644
--- a/main/xmlscript/Makefile
+++ b/main/xmlscript/Makefile
@@ -1,5 +1,5 @@
 ###############################################################
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 ###############################################################