Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (500 commits)
masterfix DEV300: #i10000# remove hard dep
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i10000# usage of L10N build_type
masterfix DEV300: #i100000# dep. fix
masterfix DEV300: #i10000# removed one hard dep
masterfix DEV300: #i10000# fixed patch handling
masterfix DEV300: #i10000# new configure
DEV300
masterfix DEV300: #i10000# nawk -> awk
l10nmove: adjust repository handling
l10nmove: fixed regex
l10nmove: minor fixes
l10nmove: add l10n repo to gb_REPOS
DEV300 masterfix: gnumake3: subsequenttests requires  in environment
ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
DEV300 masterfix: #i10000#: windows: more bizare hacks ...
locales34: have a matching configure as well
DEV300
locales34: back out change from autoreconf
gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
...

Conflicts:
configure
configure.in
instsetoo_native/prj/build.lst
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
instsetoo_native/util/pack.lst
ooo.lst
scp2/source/canvas/canvascommons.scp
scp2/source/canvas/mtfrenderer.scp
scp2/source/ooo/common_brand.scp
scp2/source/ooo/directory_ooo.scp
scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/file_ooo.scp
scp2/source/ooo/makefile.mk
scp2/source/ooo/module_hidden_ooo.scp
scp2/source/ooo/module_langpack.ulf
scp2/source/ooo/ure.scp
scp2/source/python/file_python.scp
scp2/source/sdkoo/sdkoo.scp
scp2/source/templates/module_langpack_accessories_templates.sct
scp2/source/templates/module_langpack_accessories_templates_root.sct
set_soenv.in
soldep/bootstrp/appdef.cxx
soldep/bootstrp/dep.cxx
soldep/bootstrp/hashtbl.cxx
soldep/bootstrp/makefile.mk
soldep/bootstrp/minormk.cxx
soldep/bootstrp/prj.cxx
soldep/bootstrp/prodmap.cxx
soldep/inc/dep.hxx
soldep/inc/minormk.hxx
soldep/inc/prodmap.hxx
soldep/inc/soldep/appdef.hxx
soldep/inc/soldep/connctr.hxx
soldep/inc/soldep/depper.hxx
soldep/inc/soldep/depwin.hxx
soldep/inc/soldep/hashtbl.hxx
soldep/inc/soldep/objwin.hxx
soldep/inc/soldep/prj.hxx
soldep/inc/soldep/sdtresid.hxx
soldep/inc/soldep/soldep.hxx
soldep/inc/soldep/soldlg.hxx
soldep/inc/soldep/tbox.hxx
soldep/prj/d.lst
soldep/source/connctr.cxx
soldep/source/depapp.hxx
soldep/source/depper.cxx
soldep/source/depwin.cxx
soldep/source/makefile.mk
soldep/source/objwin.cxx
soldep/source/soldep.cxx
soldep/source/soldlg.cxx
soldep/source/soldlg.src
soldep/source/tbox.cxx
solenv/bin/build.pl
solenv/bin/cws.pl
solenv/bin/make_installer.pl
solenv/bin/mhids.pl
solenv/bin/modules/CwsConfig.pm
solenv/bin/modules/RepositoryHelper.pm
solenv/bin/modules/installer/regmerge.pm
solenv/bin/modules/installer/scriptitems.pm
solenv/bin/modules/installer/servicesfile.pm
solenv/bin/modules/installer/simplepackage.pm
solenv/bin/modules/installer/substfilenamefiles.pm
solenv/config/ssolar.cmn
solenv/inc/_tg_rslb.mk
solenv/inc/extension_post.mk
solenv/inc/libs.mk
solenv/inc/minor.mk
solenv/inc/postset.mk
solenv/inc/settings.mk
solenv/inc/tg_rslb.mk
solenv/inc/unxlng.mk
solenv/inc/wntmsc.mk
soltools/HIDCompiler/hidclex.l
stlport/prj/d.lst
stlport/systemstlguards/postextstl.h

1 files changed, 16 insertions, 70 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8bf6350d7465..f6101b677464 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -300,24 +300,6 @@
         Styles   = (PACKED,DONT_OVERWRITE,PATCH); \
     End
 
-#define UNO_JAR_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        RegistryID = gid_Starregistry_Services_Rdb; \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED,DONT_OVERWRITE, UNO_COMPONENT); \
-    End
-
-#define UNO_JAR_FILE_PATCH(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        RegistryID = gid_Starregistry_Services_Rdb; \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED,DONT_OVERWRITE,UNO_COMPONENT,PATCH); \
-    End
-
 #define JARFILENAME(name) STRING(CONCAT2(name,.jar))
 
 #define PACKED_SHELLNEW_FILE_BODY \
@@ -332,52 +314,16 @@
         Name      = STRING(name) ; \
     End
 
-#define PACKED_UNO_LIB_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,UNO_COMPONENT); \
-        Dir    = SCP2_OOO_BIN_DIR; \
-        RegistryID = gid_Starregistry_Services_Rdb
-
-#define PACKED_UNO_LIB_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,UNO_COMPONENT,PATCH); \
-        Dir    = SCP2_OOO_BIN_DIR; \
-        RegistryID = gid_Starregistry_Services_Rdb
-
-#define STD_UNO_LIB_FILE(id,name) \
-    File id \
-        Name    = LIBNAME(name); \
-        PACKED_UNO_LIB_FILE_BODY; \
-    End
-
-#define STD_UNO_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name    = LIBNAME(name); \
-        PACKED_UNO_LIB_FILE_BODY_PATCH; \
-    End
-
-#define SPECIAL_UNO_LIB_FILE(id,name) \
-    File id \
-        Name    = SPECIAL_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY; \
-    End
-
-#define SPECIAL_UNO_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name    = SPECIAL_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY_PATCH; \
-    End
-
-#define SPECIAL_UNO_COMPONENT_LIB_FILE(id,name) \
+#define SPECIAL_COMPONENT_LIB_FILE(id,name) \
     File id \
         Name     = SPECIAL_COMPONENT_LIB_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY; \
+        PACKED_LIB_FILE_BODY; \
     End
 
-#define SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(id,name) \
+#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \
     File id \
         Name     = SPECIAL_COMPONENT_LIB_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY_PATCH; \
+        PACKED_LIB_FILE_BODY_PATCH; \
     End
 
 #define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll))
@@ -406,15 +352,6 @@
         Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \
     End
 
-#define SPECIAL_UNO_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name = LIBNAME(name); \
-        Dir = SCP2_OOO_BIN_DIR; \
-        Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \
-        RegistryID = gid_Starregistry_Services_Rdb; \
-    End
-
 // ---------------------------------------
 #define CONDITIONAL_MODULE_ENTRY(name,modid) \
     Module gid_Module_Root_Reg_##name \
@@ -434,6 +371,15 @@ End
         Value = " "; \
     End
 
+#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
+    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
+        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = " "; \
+    End
+
 #define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     RegistryItem gid_Regitem__##name \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
@@ -511,7 +457,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -521,7 +467,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -540,7 +486,7 @@ End
 
 #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
-    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
     CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     REGISTRY_ENTRY_DOC(name,modid,disp_name) \
     REGISTRY_ENTRY_ICON(name,modid,icon_id) \