re-base on ALv2 code. Includes:

Patches contributed by: Armin Le Grand.
#118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task.
http://svn.apache.org/viewvc?view=revision&revision=1195906
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles
http://svn.apache.org/viewvc?view=revision&revision=1293316
#119337# Solves the wrong get/setPropertyValue calls in
SvxShapeText (and thus in SvxOle2Shape)
http://svn.apache.org/viewvc?view=revision&revision=1344156

Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
cws mba34issues01: #i117717#: remove wrong assertion
http://svn.apache.org/viewvc?view=revision&revision=1172349

Patch contributed by Herbert Duerr
goodbye Registration and License dialogs, don't let the door hit you
http://svn.apache.org/viewvc?view=revision&revision=1172613
help gcc 4.6.0 on 32bit ubuntu 11.10"
http://svn.apache.org/viewvc?view=revision&revision=1245357

Do not add targets for junit tests when junit is disabled.
Patch contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1241508

Revert "sb140: #i117082# avoid unncessary static class data members
commit 21d97438e2944861e26e4984195f959a0cce1e41.
remove obsolete FreeBSD visibility special case.
retain consolidated BSD bridge code, remove OS/2 pieces.

4 files changed, 74 insertions, 2 deletions

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
index 3b3595d03635..ed072eda09b5 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 regarding copyright
+#   ownership. The ASF licenses this file 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 .
+#
+
 [PRODUCTCODE]
 en-US = "{0F961BE5-98E8-408E-9F74-23CBA0523922}"
 pt = "{2C127D50-B7E4-46C3-A845-CF6684481024}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
index 6310159e960c..477c091c7c4d 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 regarding copyright
+#   ownership. The ASF licenses this file 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 .
+#
+
 [PRODUCTCODE]
 en-US = "{0FA6115B-EB2C-4878-AE77-A6BB9BD95DE3}"
 pt = "{5908E447-DD83-466C-989A-4DD73EEB9E1C}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
index 4831c3b2105e..c00c9c983237 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 regarding copyright
+#   ownership. The ASF licenses this file 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 .
+#
+
 # OpenOffice 2 UpgradeCodes
 
-{7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3}	# OOo UpgradeCode
\ No newline at end of file
+{7C35B9AB-2CE3-4C18-BE7C-5B97EA089EB3}	# OOo UpgradeCode
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
index cbc09ea89684..4d884b364afb 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt
@@ -1,3 +1,21 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   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 regarding copyright
+#   ownership. The ASF licenses this file 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 .
+#
+
 # OpenOffice Dev UpgradeCode
 
-{E54FAE36-AEA4-4964-B4BB-CE9D4CEB4B3E}	# OOo Dev UpgradeCode
\ No newline at end of file
+{E54FAE36-AEA4-4964-B4BB-CE9D4CEB4B3E}	# OOo Dev UpgradeCode