desktop/win32/source/applauncher/launcher.cxx | 5 -
desktop/win32/source/applauncher/launcher.hxx | 1
desktop/win32/source/applauncher/sbase.cxx | 2
desktop/win32/source/applauncher/scalc.cxx | 2
desktop/win32/source/applauncher/sdraw.cxx | 2
desktop/win32/source/applauncher/simpress.cxx | 2
desktop/win32/source/applauncher/smath.cxx | 2
desktop/win32/source/applauncher/sweb.cxx | 2
desktop/win32/source/applauncher/swriter.cxx | 2
extensions/source/nsplugin/source/npshell.cxx | 28 ++++-
extensions/source/nsplugin/source/nsplugin_oo.rc | 108 ++++++++++++++++++++---
scp2/source/base/registryitem_base.scp | 2
scp2/source/calc/registryitem_calc.scp | 8 -
scp2/source/draw/registryitem_draw.scp | 8 -
scp2/source/impress/registryitem_impress.scp | 8 -
scp2/source/math/registryitem_math.scp | 4
scp2/source/writer/registryitem_writer.scp | 14 +-
17 files changed, 144 insertions(+), 56 deletions(-)
New commits:
commit 33d37468d07ae9f298c97797712a088562e686cd
Author: Andras Timar <ati...@suse.com>
Date: Wed May 8 21:39:48 2013 +0200
support MS Office and Flat ODF file types in Mozilla Plug-in
Change-Id: I9bb3b67551dc14fd74e02defa0404e1f83359f2b
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index 133e00b..01a9f62 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -338,11 +338,25 @@ bool sendMsg( PLUGIN_MSG* pMsg, size_t len, int iEnsure)
extern "C"
{
-char* pMimeTypes = const_cast< char* >( "application/msword:doc:MS Word
document;"
-"application/msword:dot:MS Word document template;"
-"application/vnd.ms-excel:xls:MS Excel spreadsheet;"
-"application/vnd.ms-excel:xlt:MS Excel spreadsheet template;"
-"application/vnd.ms-excel:xla:MS Excel spreadsheet;"
+char* pMimeTypes = const_cast< char* >( "application/msword:doc:MS Word
97-2003 document;"
+"application/msword:dot:MS Word 97-2003 document template;"
+"application/vnd.openxmlformats-officedocument.wordprocessingml.document:docx:MS
Word document;"
+"application/vnd.ms-word.document.macroenabled.12:docm:MS Word document with
macros;"
+"application/vnd.openxmlformats-officedocument.wordprocessingml.template:dotx:MS
Word document template;"
+"application/vnd.ms-word.template.macroenabled.12:dotm:MS Word document
template with macros;"
+"application/rtf:rtf:Rich Text Format;"
+"application/vnd.ms-excel:xls:MS Excel 97-2003 spreadsheet;"
+"application/vnd.ms-excel:xlt:MS Excel 97-2003 spreadsheet template;"
+"application/vnd.ms-excel:xla:MS Excel 97-2003 spreadsheet;"
+"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet:xlsx:MS
Excel spreadsheet;"
+"application/vnd.ms-excel.sheet.macroenabled.12:xlsm:MS Excel spreadsheet with
macros;"
+"application/vnd.openxmlformats-officedocument.spreadsheetml.template:xltx:MS
Excel spreadsheet template;"
+"application/vnd.ms-excel.template.macroenabled.12:xltm:MS Excel spreadsheet
template with macros;"
+"application/vnd.ms-powerpoint:ppt:MS PowerPoint 97-2003 presentation;"
+"application/vnd.openxmlformats-officedocument.presentationml.presentation:pptx:MS
PowerPoint presentation;"
+"application/vnd.ms-powerpoint.presentation.macroenabled.12:pptm:MS PowerPoint
presentation with macros;"
+"application/vnd.openxmlformats-officedocument.presentationml.template:potx:MS
PowerPoint presentation template;"
+"application/vnd.ms-powerpoint.template.macroenabled.12:potm:MS PowerPoint
presentation template with macros;"
MIMETYPE_VND_SUN_XML_CALC_ASCII ":sxc:StarOffice 6.0/7 Spreadsheet;"
MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII":stc:StarOffice 6.0/7 Spreadsheet
Template;"
MIMETYPE_VND_SUN_XML_DRAW_ASCII ":sxd:StarOffice 6.0/7 Drawing;"
@@ -354,14 +368,18 @@ MIMETYPE_VND_SUN_XML_WRITER_ASCII ":sxw:StarOffice 6.0/7
Text Document;"
MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ":sxg:StarOffice 6.0/7 Master
Document;"
MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII ":stw:StarOffice 6.0/7 Text
Document Template;"
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ":odt:OpenDocument Text;"
+MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII "-flat-xml:fodt:OpenDocument Text Flat
XML;"
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ":ott:OpenDocument Text
Template;"
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ":odm:OpenDocument Master
Document;"
MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ":oth:HTML Document Template;"
MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ":ods:OpenDocument Spreadsheet;"
+MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII "-flat-xml:fods:OpenDocument
Spreadsheet Flat XML;"
MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ":ots:OpenDocument
Spreadsheet Template;"
MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ":odg:OpenDocument Drawing;"
+MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII "-flat-xml:fodg:OpenDocument Drawing
Flat XML;"
MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ":otg:OpenDocument Drawing
Template;"
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument
Presentation;"
+MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII "-flat-xml:fodp:OpenDocument
Presentation Flat XML;"
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument
Presentation Template;"
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc
b/extensions/source/nsplugin/source/nsplugin_oo.rc
index 6284abe..dd00b9d 100644
--- a/extensions/source/nsplugin/source/nsplugin_oo.rc
+++ b/extensions/source/nsplugin/source/nsplugin_oo.rc
@@ -24,12 +24,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define ADDITIONAL_VERINFO1 VALUE "FileExtents",
"sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
- VALUE "FileOpenName", "StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7
Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing
Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation
Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice
6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument
Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document
Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet
Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument
Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "LibreOffice Plug-in
handles all its documents" VALUE "ProductName", "LibreOffice Plug-in" VALUE
"MIMEType",
"application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
-#define ADDITIONAL_VERINFO3
"application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
-#define ORG_NAME npsoplugin.dll
-#define INTERNAL_NAME npsoplugin
#include <windows.h>
#include "version.hrc"
@@ -55,15 +49,105 @@ VS_VERSION_INFO VERSIONINFO
{
// International StringTable
VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "ProductName", "LibreOffice\0"
+ VALUE "ProductName", "LibreOffice Plug-in\0"
VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
VALUE "FileVersion", PPS(VER_LEVEL) "\0"
- VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
- VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
+ VALUE "FileDescription", "LibreOffice Plug-in handles all its
documents\0"
+ VALUE "OriginalFilename", "npsoplugin.dll\0"
+ VALUE "InternalName", "npsoplugin\0"
VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors
and/or their affiliates. All rights reserved.\0"
- ADDITIONAL_VERINFO1
- ADDITIONAL_VERINFO2
- ADDITIONAL_VERINFO3
+ VALUE "FileExtents",
"sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|"
+
"odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf|"
+ "fodt|fods|fogd|fodp|"
+
"doc|dot|docx|docm|dotx|dotm|rtf|xls|xlt|xla|xlsx|xlsm|xltx|xltm|ppt|pptx|pptm|potx|potm\0"
+ VALUE "FileOpenName", "StarOffice 6.0/7 Spreadsheet|"
+ "StarOffice 6.0/7 Spreadsheet
Template|"
+ "StarOffice 6.0/7 Drawing|"
+ "StarOffice 6.0/7 Drawing Template|"
+ "StarOffice 6.0/7 Presentation|"
+ "StarOffice 6.0/7 Presentation
Template|"
+ "StarOffice 6.0/7 Formula|"
+ "StarOffice 6.0/7 Text Document|"
+ "StarOffice 6.0/7 Master Document|"
+ "StarOffice 6.0/7 Text Document
Template|"
+ "OpenDocument Text|"
+ "OpenDocument Text Template|"
+ "OpenDocument Master Document|"
+ "HTML Document Template|"
+ "OpenDocument Spreadsheet|"
+ "OpenDocument Spreadsheet Template|"
+ "OpenDocument Drawing|"
+ "OpenDocument Drawing Template|"
+ "OpenDocument Presentation|"
+ "OpenDocument Presentation Template|"
+ "OpenDocument Formula|"
+ "OpenDocument Text Flat XML|"
+ "OpenDocument Spreadsheet Flat XML|"
+ "OpenDocument Drawing Flat XML|"
+ "OpenDocument Presentation Flat XML|"
+ "MS Word 97-2003 document|"
+ "MS Word 97-2003 document template|"
+ "MS Word document|"
+ "MS Word document with macros|"
+ "MS Word document template|"
+ "MS Word document template with
macros|"
+ "Rich Text Format|"
+ "MS Excel 97-2003 spreadsheet|"
+ "MS Excel 97-2003 spreadsheet
template|"
+ "MS Excel 97-2003 spreadsheet|"
+ "MS Excel spreadsheet|"
+ "MS Excel spreadsheet with macros|"
+ "MS Excel spreadsheet template|"
+ "MS Excel spreadsheet template with
macros|"
+ "MS PowerPoint 97-2003 presentation|"
+ "MS PowerPoint presentation|"
+ "MS PowerPoint presentation with
macros|"
+ "MS PowerPoint presentation
template|"
+ "MS PowerPoint presentation template
with macros\0"
+ VALUE "MIMEType", "application/vnd.sun.xml.calc|"
+
"application/vnd.sun.xml.calc.template|"
+ "application/vnd.sun.xml.draw|"
+
"application/vnd.sun.xml.draw.template|"
+ "application/vnd.sun.xml.impress|"
+
"application/vnd.sun.xml.impress.template|"
+ "application/vnd.sun.xml.math|"
+ "application/vnd.sun.xml.writer|"
+
"application/vnd.sun.xml.writer.global|"
+
"application/vnd.sun.xml.writer.template|"
+
"application/vnd.oasis.opendocument.text|"
+
"application/vnd.oasis.opendocument.text-template|"
+
"application/vnd.oasis.opendocument.text-master|"
+
"application/vnd.oasis.opendocument.text-web|"
+
"application/vnd.oasis.opendocument.spreadsheet|"
+
"application/vnd.oasis.opendocument.spreadsheet-template|"
+
"application/vnd.oasis.opendocument.graphics|"
+
"application/vnd.oasis.opendocument.graphics-template|"
+
"application/vnd.oasis.opendocument.presentation|"
+
"application/vnd.oasis.opendocument.presentation-template|"
+
"application/vnd.oasis.opendocument.formula|"
+
"application/vnd.oasis.opendocument.text-flat-xml|"
+
"application/vnd.oasis.opendocument.spreadsheet-flat-xml|"
+
"application/vnd.oasis.opendocument.graphics-flat-xml|"
+
"application/vnd.oasis.opendocument.presentation-flat-xml|"
+ "application/msword|"
+ "application/msword|"
+
"application/vnd.openxmlformats-officedocument.wordprocessingml.document|"
+
"application/vnd.ms-word.document.macroenabled.12|"
+
"application/vnd.openxmlformats-officedocument.wordprocessingml.template|"
+
"application/vnd.ms-word.template.macroenabled.12|"
+ "application/rtf|"
+ "application/vnd.ms-excel|"
+ "application/vnd.ms-excel|"
+ "application/vnd.ms-excel|"
+
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet|"
+
"application/vnd.ms-excel.sheet.macroenabled.12|"
+
"application/vnd.openxmlformats-officedocument.spreadsheetml.template|"
+
"application/vnd.ms-excel.template.macroenabled.12|"
+ "application/vnd.ms-powerpoint|"
+
"application/vnd.openxmlformats-officedocument.presentationml.presentation|"
+
"application/vnd.ms-powerpoint.presentation.macroenabled.12|"
+
"application/vnd.openxmlformats-officedocument.presentationml.template|"
+
"application/vnd.ms-powerpoint.template.macroenabled.12\0"
}
}
commit 79d7fc0750df962a962c914acf8c7e0e59fdf09d
Author: Jesús Corrius <jcorr...@gmail.com>
Date: Fri Apr 26 14:17:56 2013 +0200
fdo#35785 restore recent documents feature of the Windows 7 Start menu
See developer mailing list for discussion, subject "LibreOffice is one or
several applications?"
Reviewed-on: https://gerrit.libreoffice.org/3623
Reviewed-by: Tor Lillqvist <t...@iki.fi>
Tested-by: Tor Lillqvist <t...@iki.fi>
Signed-off-by: Andras Timar <ati...@suse.com>
diff --git a/desktop/win32/source/applauncher/launcher.cxx
b/desktop/win32/source/applauncher/launcher.cxx
index c504af4..c6a40d3 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -35,6 +35,7 @@
#include <malloc.h>
#define PACKVERSION(major,minor) MAKELONG(minor,major)
+#define APPUSERMODELID L"TheDocumentFoundation.LibreOffice"
#ifdef __MINGW32__
@@ -44,7 +45,7 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE,
LPTSTR, int )
#endif
{
// Set an explicit Application User Model ID for the process
-
+
WCHAR szShell32[MAX_PATH];
GetSystemDirectoryW(szShell32, MAX_PATH);
wcscat(szShell32, L"\\Shell32.dll");
@@ -76,7 +77,7 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE,
LPTSTR, int )
}
}
}
- FreeLibrary(hinstDll);
+ FreeLibrary(hinstDll);
// Retreive startup info
diff --git a/desktop/win32/source/applauncher/launcher.hxx
b/desktop/win32/source/applauncher/launcher.hxx
index a937c8f..1ea51cf 100644
--- a/desktop/win32/source/applauncher/launcher.hxx
+++ b/desktop/win32/source/applauncher/launcher.hxx
@@ -43,6 +43,5 @@
#define OFFICE_IMAGE_NAME _T("soffice")
extern _TCHAR APPLICATION_SWITCH[];
-extern LPCWSTR APPUSERMODELID;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sbase.cxx
b/desktop/win32/source/applauncher/sbase.cxx
index 4b51080..e6123a6 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--base" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Base";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/scalc.cxx
b/desktop/win32/source/applauncher/scalc.cxx
index 356c719..4d11124 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--calc" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Calc";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sdraw.cxx
b/desktop/win32/source/applauncher/sdraw.cxx
index 8202f3a..57112523 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--draw" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Draw";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/simpress.cxx
b/desktop/win32/source/applauncher/simpress.cxx
index 35b828f..53a0dcc 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--impress" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Impress";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/smath.cxx
b/desktop/win32/source/applauncher/smath.cxx
index c52ee37..e71c84b 100644
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--math" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Math";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/sweb.cxx
b/desktop/win32/source/applauncher/sweb.cxx
index dc9b8b1..3824ece 100644
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--web" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Writer";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/win32/source/applauncher/swriter.cxx
b/desktop/win32/source/applauncher/swriter.cxx
index ba1f2b9..013ce9e 100644
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
@@ -21,6 +21,4 @@
_TCHAR APPLICATION_SWITCH[] = _T( "--writer" );
-LPCWSTR APPUSERMODELID = L"TheDocumentFoundation.LibreOffice.Writer";
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/base/registryitem_base.scp
b/scp2/source/base/registryitem_base.scp
index d12ea13..bc5e23b 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -93,7 +93,7 @@ RegistryItem
gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.DatabaseDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Base";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Databasedocument_1_FriendlyTypeName
diff --git a/scp2/source/calc/registryitem_calc.scp
b/scp2/source/calc/registryitem_calc.scp
index 6f886a4..f9c2935 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -292,7 +292,7 @@ RegistryItem
gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarCalcDocument.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Calc";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_FriendlyTypeName
@@ -406,7 +406,7 @@ RegistryItem
gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarCalcTemplate.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Calc";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_FriendlyTypeName
@@ -713,7 +713,7 @@ RegistryItem
gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.CalcDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Calc";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Calcdocument_1_FriendlyTypeName
@@ -920,7 +920,7 @@ RegistryItem
gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.CalcTemplate.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Calc";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Calctemplate_1_FriendlyTypeName
diff --git a/scp2/source/draw/registryitem_draw.scp
b/scp2/source/draw/registryitem_draw.scp
index 2caa0bc..3673936 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -292,7 +292,7 @@ RegistryItem
gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarDrawDocument.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Draw";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_FriendlyTypeName
@@ -406,7 +406,7 @@ RegistryItem
gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarDrawTemplate.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Draw";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_FriendlyTypeName
@@ -713,7 +713,7 @@ RegistryItem
gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.DrawDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Draw";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Drawdocument_1_FriendlyTypeName
@@ -920,7 +920,7 @@ RegistryItem
gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.DrawTemplate.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Draw";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_FriendlyTypeName
diff --git a/scp2/source/impress/registryitem_impress.scp
b/scp2/source/impress/registryitem_impress.scp
index 0c76dbd..ee1bebf 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -292,7 +292,7 @@ RegistryItem
gid_Regitem_Soffice_Starimpressdocument_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarImpressDocument.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Impress";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_FriendlyTypeName
@@ -420,7 +420,7 @@ RegistryItem
gid_Regitem_Soffice_Starimpresstemplate_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarImpressTemplate.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Impress";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_FriendlyTypeName
@@ -728,7 +728,7 @@ RegistryItem
gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.ImpressDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Impress";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Impressdocument_1_FriendlyTypeName
@@ -949,7 +949,7 @@ RegistryItem
gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.ImpressTemplate.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Impress";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_FriendlyTypeName
diff --git a/scp2/source/math/registryitem_math.scp
b/scp2/source/math/registryitem_math.scp
index c4f808f..1486522 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -291,7 +291,7 @@ RegistryItem
gid_Regitem_Soffice_Starmathdocument_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarMathDocument.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Math";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starmathdocument_6_FriendlyTypeName
@@ -569,7 +569,7 @@ RegistryItem
gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.MathDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Math";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Mathdocument_1_FriendlyTypeName
diff --git a/scp2/source/writer/registryitem_writer.scp
b/scp2/source/writer/registryitem_writer.scp
index 2de4a8b..9537f1b 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -292,7 +292,7 @@ RegistryItem
gid_Regitem_Soffice_Starwriterdocument_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarWriterDocument.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_FriendlyTypeName
@@ -413,7 +413,7 @@ RegistryItem
gid_Regitem_Soffice_Starwriterglobaldocument_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarWriterGlobalDocument.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_FriendlyTypeName
@@ -500,7 +500,7 @@ RegistryItem
gid_Regitem_Soffice_Starwritertemplate_6_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarWriterTemplate.6";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_FriendlyTypeName
@@ -863,7 +863,7 @@ RegistryItem
gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Writerdocument_1_FriendlyTypeName
@@ -1093,7 +1093,7 @@ RegistryItem
gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterTemplate.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Writertemplate_1_FriendlyTypeName
@@ -1245,7 +1245,7 @@ RegistryItem
gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterGlobalDocument.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_FriendlyTypeName
@@ -1397,7 +1397,7 @@ RegistryItem
gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterWebTemplate.1";
Name = "AppUserModelID";
- Value = "TheDocumentFoundation.LibreOffice.Writer";
+ Value = "TheDocumentFoundation.LibreOffice";
End
RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_FriendlyTypeName
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
