summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
Diffstat (limited to 'scp2')
-rwxr-xr-x[-rw-r--r--]scp2/inc/macros.inc15
-rwxr-xr-x[-rw-r--r--]scp2/source/calc/registryitem_calc.scp4
-rwxr-xr-x[-rw-r--r--]scp2/source/draw/registryitem_draw.scp6
-rwxr-xr-x[-rw-r--r--]scp2/source/impress/registryitem_impress.scp8
-rw-r--r--scp2/source/ooo/file_library_ooo.scp5
-rw-r--r--scp2/source/ooo/makefile.mk4
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp1
-rwxr-xr-x[-rw-r--r--]scp2/source/writer/registryitem_writer.scp14
8 files changed, 37 insertions, 20 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 48a1ae148777..91c74499a916 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -424,6 +424,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; \
@@ -501,7 +510,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
@@ -511,7 +520,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
@@ -530,7 +539,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) \
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index efc71ac73f63..a4708523640f 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -800,7 +800,7 @@ End
RegistryItem gid_Regitem_ots_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
- Subkey = "opendocument.Calctemplate.1";
+ Subkey = "opendocument.CalcTemplate.1";
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".ots\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Calc_Bin;
- Name = "opendocument.CalcDocument.1";
+ Name = "opendocument.CalcTemplate.1";
Value = " ";
End
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 0ecb21536613..63dde34437a1 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".otg\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Draw_Bin;
- Name = "opendocument.DrawDocument.1";
+ Name = "opendocument.DrawTemplate.1";
Value = " ";
End
@@ -881,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".std\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Draw_Bin;
- Name = "soffice.StarDrawDocument.6";
+ Name = "soffice.StarDrawTemplate.6";
Value = " ";
End
@@ -891,7 +891,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Draw_Bin;
Name = ".otg";
- Value = "opendocument.DrawDocument.1";
+ Value = "opendocument.DrawTemplate.1";
Styles = ();
End
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cce7f1d85ad3..7b270e5aca30 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -892,7 +892,7 @@ RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".otp\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Impress_Bin;
- Name = "opendocument.ImpressDocument.1";
+ Name = "opendocument.ImpressTemplate.1";
Value = " ";
End
@@ -910,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".sti\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Impress_Bin;
- Name = "soffice.StarImpressDocument.6";
+ Name = "soffice.StarImpressTemplate.6";
Value = " ";
End
@@ -938,7 +938,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Impress_Bin;
Name = ".otp";
- Value = "opendocument.ImpressDocument.1";
+ Value = "opendocument.ImpressTemplate.1";
Styles = ();
End
@@ -947,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Impress_Bin;
Name = ".sti";
- Value = "soffice.StarImpressDocument.6";
+ Value = "soffice.StarImpressTemplate.6";
Styles = ();
End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 404a1588f344..d930b2dc9fa2 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1583,7 +1583,10 @@ STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
// AVMedia
STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
-#if defined UNX
+#if defined UNX
+#if defined ENABLE_GSTREAMER
+SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
+#endif
#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
#endif
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0777febdc869..a671447b5758 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -72,6 +72,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
SCPDEFS+=-DENABLE_SYSTRAY_GTK
.ENDIF
+.IF "$(ENABLE_GSTREAMER)" != ""
+SCPDEFS+=-DENABLE_GSTREAMER
+.ENDIF
+
.IF "$(ENABLE_KDE)" != ""
SCPDEFS+=-DENABLE_KDE
.ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 19bdd6cc3c25..e8c20f99ca94 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Svx,
gid_File_Lib_AVMedia,
gid_File_Lib_AVMediaWin,
+ gid_File_Lib_AVMediaGst,
gid_File_Lib_BaseGfx,
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 8c3f0a5b82ad..903a48af7d44 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1256,7 +1256,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".ott\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Wrt_Bin;
- Name = "opendocument.WriterDocument.1";
+ Name = "opendocument.WriterTemplate.1";
Value = " ";
End
@@ -1265,7 +1265,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".oth\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Wrt_Bin;
- Name = "opendocument.WriterDocument.1";
+ Name = "opendocument.WriterWebTemplate.1";
Value = " ";
End
@@ -1274,7 +1274,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Subkey = ".odm\OpenWithProgIDs";
ModuleID = gid_Module_Prg_Wrt_Bin;
- Name = "opendocument.WriterDocument.1";
+ Name = "opendocument.WriterGlobalDocument.1";
Value = " ";
End
@@ -1365,7 +1365,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Wrt_Bin;
Name = ".ott";
- Value = "opendocument.WriterDocument.1";
+ Value = "opendocument.WriterTemplate.1";
Styles = ();
End
@@ -1374,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Wrt_Bin;
Name = ".stw";
- Value = "soffice.StarWriterDocument.6";
+ Value = "soffice.StarWriterTemplate.6";
Styles = ();
End
@@ -1446,7 +1446,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Wrt_Bin;
Name = ".oth";
- Value = "opendocument.WriterDocument.1";
+ Value = "opendocument.WriterWebTemplate.1";
Styles = ();
End
@@ -1455,7 +1455,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
ModuleID = gid_Module_Prg_Wrt_Bin;
Name = ".odm";
- Value = "opendocument.WriterDocument.1";
+ Value = "opendocument.WriterGlobalDocument.1";
Styles = ();
End
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 20:43:41 +0000