[Libreoffice-commits] .: shell/inc shell/source

[Jesús Corrius]

 shell/inc/internal/fileextensions.hxx                   |    2 
 shell/source/win32/shlxthandler/util/fileextensions.cxx |   44 ++++++++--------
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 14e0ac4c662cb9a61a50772fe428379a7c1093ab
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Thu Feb 3 18:14:33 2011 +0100

    Revert: Win32 shell extensions have to use the new registry file extension IDs

diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/internal/fileextensions.hxx
old mode 100755
new mode 100644
index b668209..f60769c
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/internal/fileextensions.hxx
@@ -45,7 +45,7 @@ struct FileExtensionEntry
 {
     char*    ExtensionAnsi;			// e.g. ".sxw"
     wchar_t* ExtensionUnicode;		// e.g. L".sxw"
-    char*    RegistryForwardKey;	// e.g. "LibreOffice.StarWriterDocument.6"
+    char*    RegistryForwardKey;	// e.g. "soffice.StarWriterDocument.6"
 };
 
 extern FileExtensionEntry OOFileExtensionTable[];
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index 267f7ec..b5baed8 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -44,28 +44,28 @@ const std::string WEB_FILE_EXTENSIONS      = "oth";
 const std::string DATABASE_FILE_EXTENSIONS = "odb";
     
 FileExtensionEntry OOFileExtensionTable[] = {
-    { ".sxw", L".sxw", "LibreOffice.StarWriterDocument.6"      },
-    { ".sxc", L".sxc", "LibreOffice.StarCalcDocument.6"        },
-    { ".sxi", L".sxi", "LibreOffice.StarImpressDocument.6"     },
-    { ".sxd", L".sxd", "LibreOffice.StarDrawDocument.6"        },
-    { ".sxm", L".sxm", "LibreOffice.StarMathDocument.6"        },
-    { ".stw", L".stw", "LibreOffice.StarWriterTemplate.6"      },
-    { ".sxg", L".sxg", "LibreOffice.StarWriterGlobalDocument.6"},
-    { ".std", L".std", "LibreOffice.StarDrawTemplate.6"        },
-    { ".sti", L".sti", "LibreOffice.StarImpressTemplate.6"     },
-    { ".stc", L".stc", "LibreOffice.StarCalcTemplate.6"        },
-    { ".odt", L".odt", "LibreOffice.WriterDocument.1"       },
-    { ".ott", L".ott", "LibreOffice.WriterTemplate.1"       },
-    { ".odm", L".odm", "LibreOffice.WriterGlobalDocument.1" },
-    { ".oth", L".oth", "LibreOffice.WriterWebTemplate.1"    },
-    { ".ods", L".ods", "LibreOffice.CalcDocument.1"         },
-    { ".ots", L".ots", "LibreOffice.CalcTemplate.1"         },
-    { ".odg", L".odg", "LibreOffice.DrawDocument.1"         },
-    { ".otg", L".otg", "LibreOffice.DrawTemplate.1"         },
-    { ".odp", L".odp", "LibreOffice.ImpressDocument.1"      },
-    { ".otp", L".otp", "LibreOffice.ImpressTemplate.1"      },
-    { ".odf", L".odf", "LibreOffice.MathDocument.1"         },
-    { ".odb", L".odb", "LibreOffice.DatabaseDocument.1"     }
+    { ".sxw", L".sxw", "soffice.StarWriterDocument.6"      },
+    { ".sxc", L".sxc", "soffice.StarCalcDocument.6"        },
+    { ".sxi", L".sxi", "soffice.StarImpressDocument.6"     },
+    { ".sxd", L".sxd", "soffice.StarDrawDocument.6"        },
+    { ".sxm", L".sxm", "soffice.StarMathDocument.6"        },
+    { ".stw", L".stw", "soffice.StarWriterTemplate.6"      },
+    { ".sxg", L".sxg", "soffice.StarWriterGlobalDocument.6"},
+    { ".std", L".std", "soffice.StarDrawTemplate.6"        },
+    { ".sti", L".sti", "soffice.StarImpressTemplate.6"     },
+    { ".stc", L".stc", "soffice.StarCalcTemplate.6"        },
+    { ".odt", L".odt", "opendocument.WriterDocument.1"       },
+    { ".ott", L".ott", "opendocument.WriterTemplate.1"       },
+    { ".odm", L".odm", "opendocument.WriterGlobalDocument.1" },
+    { ".oth", L".oth", "opendocument.WriterWebTemplate.1"    },
+    { ".ods", L".ods", "opendocument.CalcDocument.1"         },
+    { ".ots", L".ots", "opendocument.CalcTemplate.1"         },
+    { ".odg", L".odg", "opendocument.DrawDocument.1"         },
+    { ".otg", L".otg", "opendocument.DrawTemplate.1"         },
+    { ".odp", L".odp", "opendocument.ImpressDocument.1"      },
+    { ".otp", L".otp", "opendocument.ImpressTemplate.1"      },
+    { ".odf", L".odf", "opendocument.MathDocument.1"         },
+    { ".odb", L".odb", "opendocument.DatabaseDocument.1"     }
     };