[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300
Petr Mladek
pmladek at kemper.freedesktop.org
Wed Apr 27 11:02:13 PDT 2011
patches/dev300/apply | 2
patches/dev300/win32-installer-register-moox-types.diff | 196 ----------------
2 files changed, 198 deletions(-)
New commits:
commit 6ccde208dfc7da994eec1a69802e5cb0bc9da13f
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Apr 27 20:01:51 2011 +0200
pushed win32-installer-register-moox-types.diff into git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3094bf8..a6f808a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -925,8 +925,6 @@ SectionIssue => i#33654
#msaccess-db-create-dialog-fix.diff
[ OOXML ]
-win32-installer-register-moox-types.diff
-
# Ugly temporary fix
# FIXME 2011-04-04: Doesn't apply, unclear whether needed
# docx-ugly-fix.diff, n#548701, cbosdo
diff --git a/patches/dev300/win32-installer-register-moox-types.diff b/patches/dev300/win32-installer-register-moox-types.diff
deleted file mode 100644
index da68ee8..0000000
--- a/patches/dev300/win32-installer-register-moox-types.diff
+++ /dev/null
@@ -1,196 +0,0 @@
----
- .../win32/customactions/reg4msdoc/registrar.cxx | 48 ++++++++++++++++++++
- .../reg4msdoc/registrationcontextinformation.cxx | 36 +++++++++++++++
- .../reg4msdoc/registrationcontextinformation.hxx | 14 ++++++
- 3 files changed, 98 insertions(+), 0 deletions(-)
-
-diff --git setup_native/source/win32/customactions/reg4msdoc/registrar.cxx setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
-index 94be324..b67a377 100644
---- setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
-+++ setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
-@@ -82,6 +82,14 @@ void Registrar::RegisterForMsWord() const
- RegistrationContextInformation::Writer);
-
- RegisterForMsOfficeApplication(
-+ m_ContextInformation.GetMOOXWordDocumentFileExtension(),
-+ m_ContextInformation.GetMOOXWordDocumentDisplayName(),
-+ m_ContextInformation.GetWordDocumentDefaultIconEntry(),
-+ m_ContextInformation.GetWordDocumentDefaultShellCommand(),
-+ m_ContextInformation.ShellNewCommandDisplayName(),
-+ RegistrationContextInformation::Writer);
-+
-+ RegisterForMsOfficeApplication(
- m_ContextInformation.GetWordTemplateFileExtension(),
- m_ContextInformation.GetWordTemplateDisplayName(),
- m_ContextInformation.GetWordTemplateDefaultIconEntry(),
-@@ -115,6 +123,14 @@ void Registrar::UnregisterForMsWord() const
- try
- {
- UnregisterForMsOfficeApplication(
-+ m_ContextInformation.GetMOOXWordDocumentFileExtension());
-+ }
-+ catch(RegistryKeyNotFoundException&)
-+ {}
-+
-+ try
-+ {
-+ UnregisterForMsOfficeApplication(
- m_ContextInformation.GetWordTemplateFileExtension());
- }
- catch(RegistryKeyNotFoundException&)
-@@ -193,6 +209,14 @@ void Registrar::RegisterForMsExcel() const
- RegistrationContextInformation::Calc);
-
- RegisterForMsOfficeApplication(
-+ m_ContextInformation.GetMOOXExcelSheetFileExtension(),
-+ m_ContextInformation.GetMOOXExcelSheetDisplayName(),
-+ m_ContextInformation.GetExcelSheetDefaultIconEntry(),
-+ m_ContextInformation.GetExcelSheetDefaultShellCommand(),
-+ m_ContextInformation.ShellNewCommandDisplayName(),
-+ RegistrationContextInformation::Calc);
-+
-+ RegisterForMsOfficeApplication(
- m_ContextInformation.GetExcelTemplateFileExtension(),
- m_ContextInformation.GetExcelTemplateDisplayName(),
- m_ContextInformation.GetExcelTemplateDefaultIconEntry(),
-@@ -218,6 +242,22 @@ void Registrar::UnregisterForMsExcel() const
- try
- {
- UnregisterForMsOfficeApplication(
-+ m_ContextInformation.GetMOOXExcelSheetFileExtension());
-+ }
-+ catch(RegistryKeyNotFoundException&)
-+ {}
-+
-+ try
-+ {
-+ UnregisterForMsOfficeApplication(
-+ m_ContextInformation.GetMOOXPowerPointDocumentFileExtension());
-+ }
-+ catch(RegistryKeyNotFoundException&)
-+ {}
-+
-+ try
-+ {
-+ UnregisterForMsOfficeApplication(
- m_ContextInformation.GetExcelTemplateFileExtension());
- }
- catch(RegistryKeyNotFoundException&)
-@@ -245,6 +285,14 @@ void Registrar::RegisterForMsPowerPoint() const
- RegistrationContextInformation::Impress);
-
- RegisterForMsOfficeApplication(
-+ m_ContextInformation.GetMOOXPowerPointDocumentFileExtension(),
-+ m_ContextInformation.GetMOOXPowerPointDocumentDisplayName(),
-+ m_ContextInformation.GetPowerPointDocumentDefaultIconEntry(),
-+ m_ContextInformation.GetPowerPointDocumentDefaultShellCommand(),
-+ m_ContextInformation.ShellNewCommandDisplayName(),
-+ RegistrationContextInformation::Impress);
-+
-+ RegisterForMsOfficeApplication(
- m_ContextInformation.GetPowerPointShowFileExtension(),
- m_ContextInformation.GetPowerPointShowDisplayName(),
- m_ContextInformation.GetPowerPointShowDefaultIconEntry(),
-diff --git setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
-index f29f861..d11ea52 100644
---- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
-+++ setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
-@@ -53,6 +53,18 @@ std::wstring RegistrationContextInformation::GetWordDocumentDefaultShellCommand(
- return std::wstring(TEXT("open"));
- }
-
-+std::wstring RegistrationContextInformation::GetMOOXWordDocumentDisplayName() const
-+{
-+ std::wstring str;
-+ str = TEXT("Microsoft Word 2007 Document");
-+ return str;
-+}
-+
-+std::wstring RegistrationContextInformation::GetMOOXWordDocumentFileExtension() const
-+{
-+ return std::wstring(TEXT(".docx"));
-+}
-+
- std::wstring RegistrationContextInformation::GetWordTemplateDisplayName() const
- {
- std::wstring str;
-@@ -125,6 +137,18 @@ std::wstring RegistrationContextInformation::GetExcelSheetDefaultShellCommand()
- return std::wstring(TEXT("open"));
- }
-
-+std::wstring RegistrationContextInformation::GetMOOXExcelSheetDisplayName() const
-+{
-+ std::wstring str;
-+ str = TEXT("Microsoft Excel 2007 Spreadsheet");
-+ return str;
-+}
-+
-+std::wstring RegistrationContextInformation::GetMOOXExcelSheetFileExtension() const
-+{
-+ return std::wstring(TEXT(".xlsx"));
-+}
-+
- std::wstring RegistrationContextInformation::GetExcelTemplateDisplayName() const
- {
- std::wstring str;
-@@ -173,6 +197,18 @@ std::wstring RegistrationContextInformation::GetPowerPointDocumentDefaultShellCo
- return std::wstring(TEXT("open"));
- }
-
-+std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentDisplayName() const
-+{
-+ std::wstring str;
-+ str = TEXT("Microsoft PowerPoint 2007 Presentation");
-+ return str;
-+}
-+
-+std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentFileExtension() const
-+{
-+ return std::wstring(TEXT(".pptx"));
-+}
-+
- std::wstring RegistrationContextInformation::GetPowerPointTemplateDisplayName() const
- {
- std::wstring str;
-diff --git setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
-index e2d8364..0821837 100644
---- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
-+++ setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
-@@ -46,6 +46,14 @@ public:
- std::wstring GetWordDocumentDefaultIconEntry() const;
- std::wstring GetWordDocumentDefaultShellCommand() const;
-
-+ /** MOOX Word document information
-+ The icon index is the index of the icon
-+ in soffice.exe to be associated with
-+ word document files
-+ */
-+ std::wstring GetMOOXWordDocumentDisplayName() const;
-+ std::wstring GetMOOXWordDocumentFileExtension() const;
-+
- /** Word template information
- The icon index is the index of the icon
- in soffice.exe to be associated with
-@@ -76,6 +84,9 @@ public:
- std::wstring GetExcelSheetDefaultIconEntry() const;
- std::wstring GetExcelSheetDefaultShellCommand() const;
-
-+ std::wstring GetMOOXExcelSheetDisplayName() const;
-+ std::wstring GetMOOXExcelSheetFileExtension() const;
-+
- /** Excel template information
- The icon index is the index of the icon
- in soffice.exe to be associated with
-@@ -96,6 +107,9 @@ public:
- std::wstring GetPowerPointDocumentDefaultIconEntry() const;
- std::wstring GetPowerPointDocumentDefaultShellCommand() const;
-
-+ std::wstring GetMOOXPowerPointDocumentDisplayName() const;
-+ std::wstring GetMOOXPowerPointDocumentFileExtension() const;
-+
- /** PowerPoint template information
- The icon index is the index of the icon
- in soffice.exe to be associated with
---
-1.7.0.1
-
More information about the Libreoffice-commits
mailing list