officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- solenv/bin/modules/installer/windows/msp.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit cf5b7457ea61e67819464f837bfe80ccf9d892db Author: Andras Timar <[email protected]> AuthorDate: Thu Jul 5 23:27:53 2018 -0700 Commit: Andras Timar <[email protected]> CommitDate: Mon Sep 16 21:20:50 2019 +0200 Take MsiMsp.Exe from Windows SDK 7.1A Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da Reviewed-on: https://gerrit.libreoffice.org/78988 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 1bbeea8d20cb..1e76947df7b0 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -198,7 +198,7 @@ sub execute_msimsp { my ($fullpcpfilename, $mspfilename, $localmspdir) = @_; - my $msimsp = "msimsp.exe"; # Has to be in the path + my $msimsp = "/cygdrive/c/PROGRA~2/MICROS~1/Windows/v7.1A/Bin/MsiMsp.Exe"; # FIXME Higher versions of Windows SDK do not have mspatchc.dll :( my $infoline = ""; my $systemcall = ""; my $returnvalue = ""; commit 388c15f4859e88043402b2bd6b263087e09c999e Author: Aron Budea <[email protected]> AuthorDate: Wed Jan 9 12:24:03 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Sep 16 21:20:36 2019 +0200 [cp] Revert rename of Master Slide Design Change-Id: I50ee049317c5d16b8ab00bb340357dea34fb36c4 Reviewed-on: https://gerrit.libreoffice.org/78986 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index cd81624dc785..30192416dd86 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1029,7 +1029,7 @@ </node> <node oor:name=".uno:PresentationLayout" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Master Slide...</value> + <value xml:lang="en-US">Master Slide D~esign...</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
