[Libreoffice-commits] .: scp2/source

Jesús Corrius jcorrius at kemper.freedesktop.org
Tue May 22 00:41:39 PDT 2012


 scp2/source/base/registryitem_base.scp       |    2 ++
 scp2/source/calc/registryitem_calc.scp       |    8 ++++++++
 scp2/source/draw/registryitem_draw.scp       |    9 +++++++++
 scp2/source/impress/registryitem_impress.scp |    9 +++++++++
 scp2/source/math/registryitem_math.scp       |    4 ++++
 scp2/source/writer/registryitem_writer.scp   |   15 +++++++++++++++
 6 files changed, 47 insertions(+)

New commits:
commit 19e5bf6c2ffa7aedeae8e30d673680316b337a48
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Tue May 22 09:39:50 2012 +0200

    don't set registry keys for Windows Vista+ on other systems

diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index e763fd3..f277212 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -97,6 +97,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Base_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.DatabaseDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Base";
@@ -115,6 +116,7 @@ End
 RegistryItem gid_Regitem_odb_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Base_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".odb";
     Value = "Document";
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 08dfece..6bcd1ce 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -289,6 +289,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarCalcDocument.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -394,6 +395,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarCalcTemplate.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -525,6 +527,7 @@ End
 RegistryItem gid_Regitem_stc_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".stc";
     Value = "Document";
@@ -691,6 +694,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.CalcDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -709,6 +713,7 @@ End
 RegistryItem gid_Regitem_ods_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".ods";
     Value = "Document";
@@ -841,6 +846,7 @@ End
 RegistryItem gid_Regitem_fods_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".fods";
     Value = "Document";
@@ -908,6 +914,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.CalcTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -926,6 +933,7 @@ End
 RegistryItem gid_Regitem_ots_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Calc_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".ots";
     Value = "Document";
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index c461a4f..73670eb 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -289,6 +289,7 @@ End
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarDrawDocument.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -394,6 +395,7 @@ End
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarDrawTemplate.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -497,6 +499,7 @@ End
 RegistryItem gid_Regitem_std_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".std";
     Value = "Document";
@@ -575,6 +578,7 @@ End
 RegistryItem gid_Regitem_sxd_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".sxd";
     Value = "Document";
@@ -690,6 +694,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.DrawDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -708,6 +713,7 @@ End
 RegistryItem gid_Regitem_odg_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".odg";
     Value = "Document";
@@ -840,6 +846,7 @@ End
 RegistryItem gid_Regitem_fodg_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".fodg";
     Value = "Document";
@@ -907,6 +914,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.DrawTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -925,6 +933,7 @@ End
 RegistryItem gid_Regitem_otg_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Draw_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".otg";
     Value = "Document";
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 01bfb64..b97027e 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -289,6 +289,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarImpressDocument.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -408,6 +409,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarImpressTemplate.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -511,6 +513,7 @@ End
 RegistryItem gid_Regitem_sti_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".sti";
     Value = "Document";
@@ -589,6 +592,7 @@ End
 RegistryItem gid_Regitem_sxi_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".sxi";
     Value = "Document";
@@ -705,6 +709,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.ImpressDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -723,6 +728,7 @@ End
 RegistryItem gid_Regitem_odp_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".odp";
     Value = "Document";
@@ -869,6 +875,7 @@ End
 RegistryItem gid_Regitem_fodp_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".fodp";
     Value = "Document";
@@ -936,6 +943,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.ImpressTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -954,6 +962,7 @@ End
 RegistryItem gid_Regitem_otp_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Impress_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".otp";
     Value = "Document";
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 5e80329..8fb4375 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -288,6 +288,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarMathDocument.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Math";
@@ -449,6 +450,7 @@ End
 RegistryItem gid_Regitem_sxm_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Math_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".sxm";
     Value = "Document";
@@ -556,6 +558,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.MathDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Math";
@@ -574,6 +577,7 @@ End
 RegistryItem gid_Regitem_odf_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Math_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".odf";
     Value = "Document";
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 4ba855a..4aaca22 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -289,6 +289,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarWriterDocument.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -401,6 +402,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarWriterGlobalDocument.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -479,6 +481,7 @@ End
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "soffice.StarWriterTemplate.6";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -575,6 +578,7 @@ End
 RegistryItem gid_Regitem_stw_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".stw";
     Value = "Document";
@@ -637,6 +641,7 @@ End
 RegistryItem gid_Regitem_sxg_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".sxg";
     Value = "Document";
@@ -715,6 +720,7 @@ End
 RegistryItem gid_Regitem_sxw_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".sxw";
     Value = "Document";
@@ -830,6 +836,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.WriterDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -854,6 +861,7 @@ End
 RegistryItem gid_Regitem_odt_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".odt";
     Value = "Document";
@@ -1003,6 +1011,7 @@ End
 RegistryItem gid_Regitem_fodt_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".fodt";
     Value = "Document";
@@ -1070,6 +1079,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.WriterTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -1088,6 +1098,7 @@ End
 RegistryItem gid_Regitem_ott_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".ott";
     Value = "Document";
@@ -1212,6 +1223,7 @@ End
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.WriterGlobalDocument.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -1230,6 +1242,7 @@ End
 RegistryItem gid_Regitem_odm_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".odm";
     Value = "Document";
@@ -1354,6 +1367,7 @@ End
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "opendocument.WriterWebTemplate.1";
     Name = "AppUserModelID";
     Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -1414,6 +1428,7 @@ End
 RegistryItem gid_Regitem_oth_KindMap
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     ModuleID = gid_Module_Prg_Wrt_Bin;
+    ComponentCondition = "VersionNT >= 600";
     Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
     Name = ".oth";
     Value = "Document";


More information about the Libreoffice-commits mailing list