applied_patches/0333-win32-installer-register-moox-types.diff

   1 --- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
   2 +++ setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
   3 @@ -42,6 +42,14 @@
   4         std::wstring GetWordDocumentDefaultIconEntry() const;
   5         std::wstring GetWordDocumentDefaultShellCommand() const;
   6
   7 +       /** MOOX Word document information
   8 +               The icon index is the index of the icon
   9 +               in soffice.exe to be associated with
  10 +               word document files
  11 +       */
  12 +       std::wstring GetMOOXWordDocumentDisplayName() const;
  13 +       std::wstring GetMOOXWordDocumentFileExtension() const;
  14 +
  15         /** Word template information
  16                 The icon index is the index of the icon
  17                 in soffice.exe to be associated with
  18 @@ -72,6 +72,9 @@
  19         std::wstring GetExcelSheetDefaultIconEntry() const;
  20         std::wstring GetExcelSheetDefaultShellCommand() const;
  21
  22 +       std::wstring GetMOOXExcelSheetDisplayName() const;
  23 +       std::wstring GetMOOXExcelSheetFileExtension() const;
  24 +
  25         /** Excel template information
  26                 The icon index is the index of the icon
  27                 in soffice.exe to be associated with
  28 @@ -92,6 +92,9 @@
  29         std::wstring GetPowerPointDocumentDefaultIconEntry() const;
  30         std::wstring GetPowerPointDocumentDefaultShellCommand() const;
  31
  32 +       std::wstring GetMOOXPowerPointDocumentDisplayName() const;
  33 +       std::wstring GetMOOXPowerPointDocumentFileExtension() const;
  34 +
  35         /** PowerPoint template information
  36                 The icon index is the index of the icon
  37                 in soffice.exe to be associated with
  38 dummy line to avoid confusing diff-mode
  39 --- setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
  40 +++ setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
  41 @@ -59,6 +59,18 @@
  42         return std::wstring(TEXT("open"));
  43  }
  44
  45 +std::wstring RegistrationContextInformation::GetMOOXWordDocumentDisplayName() const
  46 +{
  47 +       std::wstring str;
  48 +       str = TEXT("Microsoft Word 2007 Document");
  49 +       return str;
  50 +}
  51 +
  52 +std::wstring RegistrationContextInformation::GetMOOXWordDocumentFileExtension() const
  53 +{
  54 +       return std::wstring(TEXT(".docx"));
  55 +}
  56 +
  57  std::wstring RegistrationContextInformation::GetWordTemplateDisplayName() const
  58  {
  59         std::wstring str;
  60 @@ -131,6 +131,18 @@
  61         return std::wstring(TEXT("open"));
  62  }
  63
  64 +std::wstring RegistrationContextInformation::GetMOOXExcelSheetDisplayName() const
  65 +{
  66 +       std::wstring str;
  67 +       str = TEXT("Microsoft Excel 2007 Spreadsheet");
  68 +       return str;
  69 +}
  70 +
  71 +std::wstring RegistrationContextInformation::GetMOOXExcelSheetFileExtension() const
  72 +{
  73 +       return std::wstring(TEXT(".xlsx"));
  74 +}
  75 +
  76  std::wstring RegistrationContextInformation::GetExcelTemplateDisplayName() const
  77  {
  78         std::wstring str;
  79 @@ -179,6 +179,18 @@
  80         return std::wstring(TEXT("open"));
  81  }
  82
  83 +std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentDisplayName() const
  84 +{
  85 +       std::wstring str;
  86 +       str = TEXT("Microsoft PowerPoint 2007 Presentation");
  87 +       return str;
  88 +}
  89 +
  90 +std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentFileExtension() const
  91 +{
  92 +       return std::wstring(TEXT(".pptx"));
  93 +}
  94 +
  95  std::wstring RegistrationContextInformation::GetPowerPointTemplateDisplayName() const
  96  {
  97         std::wstring str;
  98 dummy line to avoid confusing diff-mode
  99 --- setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
 100 +++ setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
 101 @@ -68,6 +68,14 @@
 102          m_ContextInformation.ShellNewCommandDisplayName(),
 103          RegistrationContextInformation::Writer);
 104
 105 +    RegisterForMsOfficeApplication(
 106 +        m_ContextInformation.GetMOOXWordDocumentFileExtension(),
 107 +        m_ContextInformation.GetMOOXWordDocumentDisplayName(),
 108 +        m_ContextInformation.GetWordDocumentDefaultIconEntry(),
 109 +        m_ContextInformation.GetWordDocumentDefaultShellCommand(),
 110 +        m_ContextInformation.ShellNewCommandDisplayName(),
 111 +        RegistrationContextInformation::Writer);
 112 +
 113      RegisterForMsOfficeApplication(
 114          m_ContextInformation.GetWordTemplateFileExtension(),
 115          m_ContextInformation.GetWordTemplateDisplayName(),
 116 @@ -99,6 +99,14 @@
 117         catch(RegistryKeyNotFoundException&)
 118         {}
 119
 120 +       try
 121 +       {
 122 +               UnregisterForMsOfficeApplication(
 123 +                       m_ContextInformation.GetMOOXWordDocumentFileExtension());
 124 +       }
 125 +       catch(RegistryKeyNotFoundException&)
 126 +       {}
 127 +
 128         try
 129         {
 130                 UnregisterForMsOfficeApplication(
 131 @@ -165,6 +165,14 @@
 132                 m_ContextInformation.ShellNewCommandDisplayName(),
 133          RegistrationContextInformation::Calc);
 134
 135 +    RegisterForMsOfficeApplication(
 136 +        m_ContextInformation.GetMOOXExcelSheetFileExtension(),
 137 +        m_ContextInformation.GetMOOXExcelSheetDisplayName(),
 138 +        m_ContextInformation.GetExcelSheetDefaultIconEntry(),
 139 +        m_ContextInformation.GetExcelSheetDefaultShellCommand(),
 140 +        m_ContextInformation.ShellNewCommandDisplayName(),
 141 +        RegistrationContextInformation::Calc);
 142 +
 143         RegisterForMsOfficeApplication(
 144                 m_ContextInformation.GetExcelTemplateFileExtension(),
 145                 m_ContextInformation.GetExcelTemplateDisplayName(),
 146 @@ -188,6 +188,14 @@
 147         catch(RegistryKeyNotFoundException&)
 148         {}
 149
 150 +       try
 151 +       {
 152 +               UnregisterForMsOfficeApplication(
 153 +                       m_ContextInformation.GetMOOXExcelSheetFileExtension());
 154 +       }
 155 +       catch(RegistryKeyNotFoundException&)
 156 +       {}
 157 +
 158         try
 159         {
 160                 UnregisterForMsOfficeApplication(
 161 @@ -217,6 +217,14 @@
 162          m_ContextInformation.ShellNewCommandDisplayName(),
 163          RegistrationContextInformation::Impress);
 164
 165 +    RegisterForMsOfficeApplication(
 166 +        m_ContextInformation.GetMOOXPowerPointDocumentFileExtension(),
 167 +        m_ContextInformation.GetMOOXPowerPointDocumentDisplayName(),
 168 +        m_ContextInformation.GetPowerPointDocumentDefaultIconEntry(),
 169 +        m_ContextInformation.GetPowerPointDocumentDefaultShellCommand(),
 170 +        m_ContextInformation.ShellNewCommandDisplayName(),
 171 +        RegistrationContextInformation::Impress);
 172 +
 173      RegisterForMsOfficeApplication(
 174          m_ContextInformation.GetPowerPointShowFileExtension(),
 175          m_ContextInformation.GetPowerPointShowDisplayName(),
 176 @@ -248,6 +248,14 @@
 177         catch(RegistryKeyNotFoundException&)
 178         {}
 179
 180 +       try
 181 +       {
 182 +               UnregisterForMsOfficeApplication(
 183 +                       m_ContextInformation.GetMOOXPowerPointDocumentFileExtension());
 184 +       }
 185 +       catch(RegistryKeyNotFoundException&)
 186 +       {}
 187 +
 188         try
 189         {
 190                 UnregisterForMsOfficeApplication(
 191 dummy line to avoid confusing diff-mode