summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-07-26 11:32:58 +0200
committerMichael Meeks <michael.meeks@suse.com>2013-07-26 09:55:53 +0000
commitfc999e60af23817e3689bfd423146915a7c2c7f4 (patch)
treeda41327f11c45318e043079a63ad2745a67463d5
parenta0fbb8b460114838a1c3fabb57274b04a78d3182 (diff)
Miscellaneous belts and braces around MsiShortcutProperty table
These two strings are non-nullable so fail if they are null Change-Id: I7ea1a8faff96aca54f6bad5e811841f58aadd382 (cherry picked from commit 60c19683b5897beefa0e799b7efdc3e2b4da528e) Shorten the idetifiers a bit not to be more the 32 chars Change-Id: I5ee50ae740aa113670dad97067e78e063cca1a61 (cherry picked from commit 4155bc56ad2910d8acc5d6468eb1ee2a3cffcd20) Reviewed-on: https://gerrit.libreoffice.org/5121 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
-rw-r--r--scp2/source/base/folderitem_base.scp2
-rw-r--r--scp2/source/calc/folderitem_calc.scp2
-rw-r--r--scp2/source/draw/folderitem_draw.scp2
-rw-r--r--scp2/source/impress/folderitem_impress.scp2
-rw-r--r--scp2/source/math/folderitem_math.scp2
-rw-r--r--scp2/source/ooo/folderitem_ooo.scp4
-rw-r--r--scp2/source/writer/folderitem_writer.scp2
-rw-r--r--solenv/bin/modules/installer/windows/idtglobal.pm2
8 files changed, 9 insertions, 9 deletions
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index 7c5420ba7178..2da4321a2b14 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sbase
ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
End
-FolderItemProperty git_Folderitemproperty_Sbase_AppID
+FolderItemProperty gid_Fip_Sbase_AppID
ShortcutID = gid_Folderitem_Sbase;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Base";
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index a5de0336d183..83dd82b63684 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Scalc
ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
End
-FolderItemProperty git_Folderitemproperty_Scalc_AppID
+FolderItemProperty gid_Fip_Scalc_AppID
ShortcutID = gid_Folderitem_Scalc;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Calc";
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 16b19b0aa27d..ba59ea722362 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sdraw
ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
End
-FolderItemProperty git_Folderitemproperty_Sdraw_AppID
+FolderItemProperty gid_Fip_Sdraw_AppID
ShortcutID = gid_Folderitem_Sdraw;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Draw";
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index 5419044b045e..fb5c1360e0b3 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Simpress
ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
End
-FolderItemProperty git_Folderitemproperty_Simpress_AppID
+FolderItemProperty gid_Fip_Simpress_AppID
ShortcutID = gid_Folderitem_Simpress;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Impress";
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 5ba71cc4de27..127773f52c83 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Smath
ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
End
-FolderItemProperty git_Folderitemproperty_Smath_AppID
+FolderItemProperty gid_Fip_Smath_AppID
ShortcutID = gid_Folderitem_Smath;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Math";
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index 1a1b52a943f5..de77ba12141b 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -35,7 +35,7 @@ FolderItem gid_Folderitem_LibreOffice
Parameter = "";
End
-FolderItemProperty git_Folderitemproperty_LibreOffice_AppID
+FolderItemProperty gid_Fip_LibreOffice_AppID
ShortcutID = gid_Folderitem_LibreOffice;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Startcenter";
@@ -59,7 +59,7 @@ FolderItem gid_Folderitem_Soffice_Desktop
ComponentCondition = "CREATEDESKTOPLINK=1";
End
-FolderItemProperty git_Folderitemproperty_Soffice_Desktop_AppID
+FolderItemProperty gid_Fip_Soffice_Desktop_AppID
ShortcutID = gid_Folderitem_Soffice_Desktop;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Startcenter";
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index b4aaee209067..0257a965aa51 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Swriter
ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
End
-FolderItemProperty git_Folderitemproperty_Swriter_AppID
+FolderItemProperty gid_Fip_Swriter_AppID
ShortcutID = gid_Folderitem_Swriter;
Key = "System.AppUserModel.ID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index d3495c91f448..8cbfcb24b2b8 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -479,7 +479,7 @@ sub write_idt_header
{
$oneline = "MsiShortcutProperty\tShortcut_\tPropertyKey\tPropVariantValue\n";
push(@{$idtref}, $oneline);
- $oneline = "s72\ts72\tS255\tS255\n";
+ $oneline = "s72\ts72\ts255\ts255\n";
push(@{$idtref}, $oneline);
$oneline = "MsiShortcutProperty\tMsiShortcutProperty\n";
push(@{$idtref}, $oneline);