rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity
libreoffice/bash-completion-for-loffice.diff

89 lines
4.5 KiB
Diff
Raw Normal View History

Accepting request 89119 from LibreOffice:Unstable - correctly-init-xthreads-in-qt.diff: let Qt call XInitThreads(), so that it knows it's been called (fdo#40298) - avoid-wrong-asserts.diff: fix a bad assert; the following fix depends on it - horizontal-scrollbars-with-kde-oxygen-style.diff: horizontal scrollbars with KDE Oxygen style (bnc#722918) - kde4-tooltips-style.diff: tooltips are all black in KDE4 (bnc#723074, fdo#40461) - do-not-display-math-in-desktop-menu.diff: do not display math in desktop menu (fdo#41681) - desktop-submenu.diff: display LO application in the right desktop submenu (bnc#718694) - bash-completion-for-loffice.diff: define bash completion for 'loffice' wrapper (bnc#719656) - legacy-fragment-import-*.diff: legacy fragment PPTX import (bnc#699334) OBS-URL: https://build.opensuse.org/request/show/89119 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=25
2011-10-24 10:37:06 +00:00
--- bin/generate-bash-completion.old 2011-07-11 20:30:31.000000000 +0200
+++ bin/generate-bash-completion 2011-10-19 16:23:32.000000000 +0200
@@ -43,6 +43,7 @@ my @EXTENSIONS=("oxt");
# use "" if you want to disable any wrapper
my %APPS = (
office => "libreoffice",
+ office_short => "loffice",
master => "",
base => "lobase",
calc => "localc",
@@ -65,6 +66,7 @@ sub usage()
print " $0 [--binsuffix=suffix]\n";
print "\t\t[--compat-oowrappers]\n";
print "\t\t[--office=wrapper_name]\n";
+ print "\t\t[--office-short=wrapper_name]\n";
print "\t\t[--master=wrapper_name]\n";
print "\t\t[--base=wrapper_name]\n";
print "\t\t[--calc=wrapper_name]\n";
@@ -97,22 +99,25 @@ foreach my $arg (@ARGV) {
usage();
exit 0;
} elsif ( $arg =~ /--compat-oowrappers/ ) {
- $APPS{'office'} = "ooffice";
- $APPS{'master'} = "";
- $APPS{'base'} = "oobase";
- $APPS{'calc'} = "oocalc";
- $APPS{'draw'} = "oodraw";
- $APPS{'impress'} = "ooimpress";
- $APPS{'math'} = "oomath";
- $APPS{'template'} = "oofromtemplate";
- $APPS{'unopkg'} = "unopkg";
- $APPS{'web'} = "ooweb";
- $APPS{'writer'} = "oowriter";
+ $APPS{'office'} = "openoffice";
+ $APPS{'office_short'} = "ooffice";
+ $APPS{'master'} = "";
+ $APPS{'base'} = "oobase";
+ $APPS{'calc'} = "oocalc";
+ $APPS{'draw'} = "oodraw";
+ $APPS{'impress'} = "ooimpress";
+ $APPS{'math'} = "oomath";
+ $APPS{'template'} = "oofromtemplate";
+ $APPS{'unopkg'} = "unopkg";
+ $APPS{'web'} = "ooweb";
+ $APPS{'writer'} = "oowriter";
$office_shell_function = "_ooexp_";
} elsif ( $arg =~ /--binsuffix=(.*)/ ) {
$binsuffix = "$1";
} elsif ( $arg =~ /--office=(.*)/ ) {
$APPS{'office'} = "$1";
+ } elsif ( $arg =~ /--office-short=(.*)/ ) {
+ $APPS{'office_short'} = "$1";
} elsif ( $arg =~ /--master=(.*)/ ) {
$APPS{'master'} = "$1";
} elsif ( $arg =~ /--base=(.*)/ ) {
@@ -182,19 +187,20 @@ sub print_suffixes_checks {
# skip the disabled wrapper
next if ( $APPS{$app} eq "" );
- if ($app eq "draw" ) { print_suffixes_check ($APPS{$app}, @DRAWDOCS); }
- if ($app eq "writer") { print_suffixes_check ($APPS{$app}, @WRITERDOCS, @MASTERDOCS); }
- if ($app eq "web") { print_suffixes_check ($APPS{$app}, @WEBDOCS); }
- if ($app eq "math") { print_suffixes_check ($APPS{$app}, @MATHDOCS); }
- if ($app eq "impress") { print_suffixes_check ($APPS{$app}, @IMPRESSDOCS); }
- if ($app eq "base") { print_suffixes_check ($APPS{$app}, @BASEDOCS); }
- if ($app eq "calc") { print_suffixes_check ($APPS{$app}, @CALCDOCS); }
- if ($app eq "master") { print_suffixes_check ($APPS{$app}, @MASTERDOCS); }
- if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
- # libreoffice should contain all...
- if ($app eq "office") { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, @MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
+ if ($app eq "draw" ) { print_suffixes_check ($APPS{$app}, @DRAWDOCS); }
+ if ($app eq "writer") { print_suffixes_check ($APPS{$app}, @WRITERDOCS, @MASTERDOCS); }
+ if ($app eq "web") { print_suffixes_check ($APPS{$app}, @WEBDOCS); }
+ if ($app eq "math") { print_suffixes_check ($APPS{$app}, @MATHDOCS); }
+ if ($app eq "impress") { print_suffixes_check ($APPS{$app}, @IMPRESSDOCS); }
+ if ($app eq "base") { print_suffixes_check ($APPS{$app}, @BASEDOCS); }
+ if ($app eq "calc") { print_suffixes_check ($APPS{$app}, @CALCDOCS); }
+ if ($app eq "master") { print_suffixes_check ($APPS{$app}, @MASTERDOCS); }
+ if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
+ # libreoffice should contain all...
+ if (($app eq "office") || ($app eq "office_short"))
+ { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, @MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
# unopkg is a standalone tool
- if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
+ if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
}
}
Copy Permalink