[Libreoffice-commits] .: 19 commits - sfx2/source sysui/desktop
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jul 28 09:41:11 PDT 2011
sfx2/source/doc/objstor.cxx | 2
sysui/desktop/man/README | 1
sysui/desktop/man/libreoffice.1 | 246 +++++++++++++++++++++++++++++++++++++
sysui/desktop/man/unopkg.1 | 80 ++++++++++++
sysui/desktop/share/create_tree.sh | 2
5 files changed, 329 insertions(+), 2 deletions(-)
New commits:
commit 807445d6ccc804435e910a2381c285715db31f68
Merge: d9d9abf... fffa070...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jul 28 18:38:38 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-core
commit d9d9abfd697e6f41cff842b11cab1911ac27335a
Merge: e334d57... 1a914af...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jul 28 18:35:36 2011 +0200
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
desktop/source/app/app.cxx
desktop/source/app/dispatchwatcher.cxx
desktop/unx/source/splashx.c
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/source/bastyp/fltfnc.cxx
diff --cc sfx2/source/doc/objstor.cxx
index 31ee8f0,3b29f52..415f731
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@@ -2685,10 -2809,9 +2685,10 @@@ sal_Bool SfxObjectShell::PreDoSaveAs_Im
SfxAllItemSet* pMergedParams = new SfxAllItemSet( *pMedium->GetItemSet() );
// in "SaveAs" title and password will be cleared ( maybe the new itemset contains new values, otherwise they will be empty )
+ pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
pMergedParams->ClearItem( SID_PASSWORD );
pMergedParams->ClearItem( SID_DOCINFO_TITLE );
-
+ pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
pMergedParams->ClearItem( SID_INPUTSTREAM );
pMergedParams->ClearItem( SID_STREAM );
pMergedParams->ClearItem( SID_CONTENT );
diff --cc sysui/desktop/man/libreoffice.1
index 0000000,ee814cf..06c4cab
mode 000000,100644..100644
--- a/sysui/desktop/man/libreoffice.1
+++ b/sysui/desktop/man/libreoffice.1
@@@ -1,0 -1,246 +1,246 @@@
+ .TH libreoffice "1" "2010-12-18" "LibreOffice" "User Commands"
+ .SH Name
+ libreoffice \- LibreOffice office suite
+
+ .SH SYNOPSIS
+ .B libreoffice
+ [\fB\-accept\=\fIaccept\-string\fR] [\fB\-base\fR] [\fB\-calc\fR]
+ [\fB\-convert\-to\fR output_file_extension[:output_filter_name] [\-outdir output_dir] \fIfile\fR]...
+ [\fB\-display \fIdisplay\fR] [\fB\-draw\fR] [\fB\-global\fR] [\fB\-headless\fR]
+ [\fB\-help\fR|\fB\-h\fR|\fB\-?\fR] [\fB\-impress\fR] [\fB\-invisible\fR] [\fB\-infilter="<filter>"\fR]
+ [\fB\-math\fR] [\fB\-minimized\fR] [\fB\-n \fIfile\fR]... [\fB\-nodefault\fR]
+ [\fB\-nolockcheck\fR] [\fB\-nologo\fR] [\fB\-norestore\fR]
+ [\fB\-o \fIfile\fR]... [\fB\-p \fIfile\fR...]
+ [\fB\-print\-to\-file [\-printer\-name printer_name] [\-outdir output_dir] file]...
+ [\fB\-pt \fIprintername\fR \fIfile\fR...]
+ [\fB\-show \fIImpress file\fR]... [\fB\-unaccept=\fIaccept\-string\fR]
+ [\fB\-terminate_after_init\fR] [\fB\-view \fIfile\fR]... [\fB\-web\fR]
+ [\fB\-writer\fR] [\fIfile\fR...]
+ .br
+ .B lobase
+ .br
+ .B localc
+ .br
+ .B lodraw
+ .br
+ .B lofromtemplate
+ .br
+ .B loimpress
+ .br
+ .B lomath
+ .br
+ .B loweb
+ .br
+ .B lowriter
+ .br
+
+ .SH DESCRIPTION
+ LibreOffice (LO for short) is a multi-platform office productivity suite.
+ It was derived from OpenOffice.org 3.3 Beta on September 28, 2010.
+
+ \fBlibreoffice\fR is a shell script that sets up the environment and
+ passes the command line arguments to the \fBsoffice.bin\fR binary.
+
+ Alternatively, the following helper scripts start the respective module:
+
+ sbase, scalc, sdraw, simpress, smath, sofficerc, spadmin, swriter
+
+ .SH OPTIONS
+ .TP
+ \fB\-accept=\fIaccept\-string\fR
+ Specify a UNO connect-string to create a UNO acceptor through which other
+ programs can connect to access the API.
+
+ .TP
+ \fB\-base\fR
+ Starts the wizard for a new Base document.
+
+ .TP
+ \fB\-calc\fR
+ Starts with a new Calc document.
+
+ .TP
+ \fB\-convert\-to\fR output_file_extension[:output_filter_name] [\-outdir output_dir] \fIfile\fR...
+ Batch converts files.
+ If \fI-outdir\fR is not specified then the current working directory is used as the output directory
+ for the converted files.
+
+ Examples:
+
+ \fB\-convert\-to\fR pdf *.doc
+
+ Converts all .doc files to PDFs.
+
+ \fB\-convert\-to\fR pdf:writer_pdf_Export \-outdir /home/user *.doc
+
+ Converts all .doc files to PDFs using the settings in the Writer PDF export dialog and saving them
+ in /home/user.
+
+ .TP
+ \fB\-display \fIdisplay\fR
+ This option specifies the X server to use; see \fBX\fR(7)
+
+ .TP
+ \fB\-draw\fR
+ Starts with a new Draw document.
+
+ .TP
+ \fB\-global\fR
+ Starts with a new Global document.
+
+ .TP
+ \fB\-headless\fR
+ Starts in "headless mode", which allows using the application without user a
+ interface.
+
+ This special mode can be used when the application is controlled by external
+ clients via the API.
+
+ It implies \-invisible and strictly ignores any GUI environment.
+ \-quickstart does not work with this parameter.
+
+ .TP
+ \fB\-help\fR|\fB\-h\fR|\fB\-?\fR
+ Lists LibreOffice command line parameters.
+
+ .TP
+ \fB\-impress\fR
+ Starts with a new Impress document.
+
+ .TP
+ \fB\-invisible\fR
+ Starts in invisible mode.
+
+ Neither the start\-up logo nor the initial program window will be visible.
+ LO can be controlled and documents and dialogs can be opened via the API.
+
+ When started with this parameter, it can only be quit using the taskmanager (Windows)
+ or the kill command (UNIX based systems).
+
+ \-quickstart does not work with this parameter.
+
+ .TP
+ \fB\-infilter="<filter>"\fR
+ Force an input filter type if possible.
-For example -infilter="Calc Office Open XML" only
++For example -infilter="Calc Office Open XML" only
+
+ .TP
+ \fB\-math\fR
+ Starts with a new Math document.
+
+ .TP
+ \fB\-minimized\fR
+ Keeps the splash screen minimized.
+
+ .TP
+ \fB\-n \fItemplate\fR...
+ Creates the a new document from the given templates.
+
+ .TP
+ \fB\-nodefault\fR
+ Starts LO without creating an new document.
+ The next time you start LO, the welcome screen is show.
+
+ It's used together with \fB\-nologo\fR by quick starters. Note that \fB\-quickstart\fR
+ has no longer been supported since OpenOffice.org 2.0.0.
+
+ .TP
+ \fB\-nolockcheck\fR
+ Disables the check for remote instances using the installation.
+
+ .TP
+ \fB\-nologo\fR
+ Disables the splash screen at program start.
+
+ .TP
+ \fB\-norestore\fR
+ Disables restart and file recovery after a system crash. It is possible that LO
+ will try to restore a file it keeps crashing on, if that happens \fB\-norestore\fR
+ is the only way to start LO.
+
+ .TP
+ \fB\-nosplash\fR
+ Disables the splash screen at program start.
+
+ .TP
+ \fB\-o \fIfile\fR...
+ Opens the given files for editing, even templates.
+
+ Without \fb\-o\fR a template file would create a new document derived from that template.
+
+ .TP
+ \fB\-p \fIfile\fR...
+ Prints the given files to the default printer and ends. The splash screen
+ does not appear.
+
+ If the file name contains spaces, then it must be enclosed in quotation marks.
+
+ .TP
+ \fB\-print\-to\-file [\-printer\-name printer_name] [\-outdir output_dir] file...
+ Batch print files to file.
+ If \-printer\-name is not specified the default printer is used.
+ If \-outdir is not specified then the current working directory is used as the output directory
+ for the converted files.
+
+ Examples:
+
+ \-print\-to\-file *.doc
+
+ Prints all .doc files to the current working directory using the default printer.
+
+ \-print\-to\-file \-printer\-name nasty_lowres_printer \-outdir /home/user *.doc
+
+ Prints all .doc files to /home/user directory using the nasty_lowres_printer.
+
+ .TP
+ \fB\-pt \fIprintername\fR \fIfile\fR...
+ Prints the given files to the printer \fIprintername\fR and ends. The splash
+ screen does not appear.
+
+ If a file name contains spaces, then it must be enclosed in quotation marks.
+
+ .TP
+ \fB\-quickstart \fB\-quickstart=no
+ Starts LO with it's quick starter.
+ \fB\-quickstart disable the quick starter.
+
+ Does not work with \-invisible or \-headless.
+
+ .TP
+ \fB\-show \fIImpress file\fR...
+ Opens the given Impress files, starts the presentation and quits after they have finished.
+
+ .TP
+ \fB\-unaccept=\fIaccept\-string\fR
+ Closes an acceptor that was created with \fB\-accept\fR option.
+
+ Use \fB\-unaccept\fR=\fIall\fR to close all open acceptors.
+
+ .TP
+ \fB\-terminate_after_init\fR
+ Starts LO and terminates after it registers some UNO services.
+ Doesn't show the splash during startup.
+
+ .TP
+ \fB\-view \fIfile\fR...
+ Opens the given files read-only creating a temporary copy of them at $TMPDIR.
+
+ .TP
+ \fB\-web\fR
+ Starts with a new HTML document.
+
+ .TP
+ \fB\-writer\fR
+ Starts with a new Writer document.
+
+ .SH TROUBLESHOOTING PROBLEMS
+ See \fBhttp://wiki.documentfoundation.org/BugReport\fR for more details on how to report
+ bugs in LibreOffice.
+ .SH SEE ALSO
+ .BR http://www.documentfoundation.org/
+
+ .SH AUTHOR
+ This manual page was created by Rene Engelhard <rene at debian.org> for
+ the Debian GNU/Linux Distribution, because the original package does not have
+ one. It was updated for Novell by Petr Mladek <petr.mladek at novell.com> and
+ adapted for LibreOffice by Philipp Weissenbacher <philipp.weissenbacher at gmail.com>.
commit 1a914af75f6cfb9f958d2ca1d0dcf721364cf147
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jul 25 20:28:43 2011 +0200
Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit 0dcefc9f4d52d72c3a9909e699cd081bd13b446e
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Jul 20 23:49:47 2011 +0200
Fix wrong RTTI baseclass for SfxViewEventHint
Fixes fdo#38768 and likely a bunch of other nasty side effects.
SfxBaseModel::Notify was simply ignoring all kinds of messages
without this fix.
Signed-off-by: David Tardon <dtardon at redhat.com>
Signed-off-by: Petr Mladek <pmladek at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 5adbc48..10bc5a4 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -60,7 +60,7 @@
// -----------------------------------------------------------------------
TYPEINIT1(SfxEventHint, SfxHint);
TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
-TYPEINIT1(SfxViewEventHint, SfxHint);
+TYPEINIT1(SfxViewEventHint, SfxEventHint);
using namespace com::sun::star;
commit 8f6fa0b468d1873801fc1365263b922ee53e3a49
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Jul 19 17:31:57 2011 +0300
On recovery from an autosave file use DefaultFilter, seems to fix fdo#34805
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
Signed-off-by: Petr Mladek <pmladek at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 3420a4f..100c1d7 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2639,7 +2639,10 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL
// put the filter name into the descriptor - we're not going to involve any type detection, so
// the document might be lost without the FilterName property
- lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
+ if ( (rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_ORIGINAL) == AutoRecovery::E_TRY_LOAD_ORIGINAL)
+ lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter;
+ else
+ lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.DefaultFilter;
if ( sURL == rInfo.FactoryURL )
{
commit 1e04395cfe49ce0440dc2dd923eceb44ef52e22d
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jul 19 17:07:59 2011 +0200
Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit 8588ed1abda9973ac724e55adb38dadabddf6a05
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Jul 13 19:19:45 2011 +0200
null the display pointer after closing the display, fixes fdo#37579
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
Signed-off-by: Noel Power <nopower at novell.com>
Signed-off-by: Kohei Yoshida <kyoshida at novell.com>
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 711671f..4f5d4b2 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -620,6 +620,7 @@ void splash_draw_progress( int progress )
void splash_close_window()
{
XCloseDisplay( display );
+ display = NULL;
#ifdef USE_LIBPNG
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
#else
commit 7d49e0a90917c8ede66d4ef260276306f914f30f
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jul 12 16:41:10 2011 +0200
Branch libreoffice-3-4-2
This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit 9dc34e6217cc4ae92734c5964933126274394f78
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jul 12 15:49:40 2011 +0200
Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit b5df417be2d690fe1282df7f2e9c317f67f8ce06
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jul 8 12:30:30 2011 +0200
Support distro packaging
allow to redefine prefix via OFFICE_PREFIX variable in create_tree.sh
add libreoffice and unopg man pages
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Miklos Vajna <vmiklos at frugalware.org>
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen at gmail.com>
diff --git a/sysui/desktop/man/README b/sysui/desktop/man/README
new file mode 100644
index 0000000..1536ae5
--- /dev/null
+++ b/sysui/desktop/man/README
@@ -0,0 +1 @@
+FIXME: These man pages are used for distro packaging using "make distro-pack-install"
diff --git a/sysui/desktop/man/libreoffice.1 b/sysui/desktop/man/libreoffice.1
new file mode 100644
index 0000000..ee814cf
--- /dev/null
+++ b/sysui/desktop/man/libreoffice.1
@@ -0,0 +1,246 @@
+.TH libreoffice "1" "2010-12-18" "LibreOffice" "User Commands"
+.SH Name
+libreoffice \- LibreOffice office suite
+
+.SH SYNOPSIS
+.B libreoffice
+[\fB\-accept\=\fIaccept\-string\fR] [\fB\-base\fR] [\fB\-calc\fR]
+[\fB\-convert\-to\fR output_file_extension[:output_filter_name] [\-outdir output_dir] \fIfile\fR]...
+[\fB\-display \fIdisplay\fR] [\fB\-draw\fR] [\fB\-global\fR] [\fB\-headless\fR]
+[\fB\-help\fR|\fB\-h\fR|\fB\-?\fR] [\fB\-impress\fR] [\fB\-invisible\fR] [\fB\-infilter="<filter>"\fR]
+[\fB\-math\fR] [\fB\-minimized\fR] [\fB\-n \fIfile\fR]... [\fB\-nodefault\fR]
+[\fB\-nolockcheck\fR] [\fB\-nologo\fR] [\fB\-norestore\fR]
+[\fB\-o \fIfile\fR]... [\fB\-p \fIfile\fR...]
+[\fB\-print\-to\-file [\-printer\-name printer_name] [\-outdir output_dir] file]...
+[\fB\-pt \fIprintername\fR \fIfile\fR...]
+[\fB\-show \fIImpress file\fR]... [\fB\-unaccept=\fIaccept\-string\fR]
+[\fB\-terminate_after_init\fR] [\fB\-view \fIfile\fR]... [\fB\-web\fR]
+[\fB\-writer\fR] [\fIfile\fR...]
+.br
+.B lobase
+.br
+.B localc
+.br
+.B lodraw
+.br
+.B lofromtemplate
+.br
+.B loimpress
+.br
+.B lomath
+.br
+.B loweb
+.br
+.B lowriter
+.br
+
+.SH DESCRIPTION
+LibreOffice (LO for short) is a multi-platform office productivity suite.
+It was derived from OpenOffice.org 3.3 Beta on September 28, 2010.
+
+\fBlibreoffice\fR is a shell script that sets up the environment and
+passes the command line arguments to the \fBsoffice.bin\fR binary.
+
+Alternatively, the following helper scripts start the respective module:
+
+sbase, scalc, sdraw, simpress, smath, sofficerc, spadmin, swriter
+
+.SH OPTIONS
+.TP
+\fB\-accept=\fIaccept\-string\fR
+Specify a UNO connect-string to create a UNO acceptor through which other
+programs can connect to access the API.
+
+.TP
+\fB\-base\fR
+Starts the wizard for a new Base document.
+
+.TP
+\fB\-calc\fR
+Starts with a new Calc document.
+
+.TP
+\fB\-convert\-to\fR output_file_extension[:output_filter_name] [\-outdir output_dir] \fIfile\fR...
+Batch converts files.
+If \fI-outdir\fR is not specified then the current working directory is used as the output directory
+for the converted files.
+
+Examples:
+
+\fB\-convert\-to\fR pdf *.doc
+
+Converts all .doc files to PDFs.
+
+\fB\-convert\-to\fR pdf:writer_pdf_Export \-outdir /home/user *.doc
+
+Converts all .doc files to PDFs using the settings in the Writer PDF export dialog and saving them
+in /home/user.
+
+.TP
+\fB\-display \fIdisplay\fR
+This option specifies the X server to use; see \fBX\fR(7)
+
+.TP
+\fB\-draw\fR
+Starts with a new Draw document.
+
+.TP
+\fB\-global\fR
+Starts with a new Global document.
+
+.TP
+\fB\-headless\fR
+Starts in "headless mode", which allows using the application without user a
+interface.
+
+This special mode can be used when the application is controlled by external
+clients via the API.
+
+It implies \-invisible and strictly ignores any GUI environment.
+\-quickstart does not work with this parameter.
+
+.TP
+\fB\-help\fR|\fB\-h\fR|\fB\-?\fR
+Lists LibreOffice command line parameters.
+
+.TP
+\fB\-impress\fR
+Starts with a new Impress document.
+
+.TP
+\fB\-invisible\fR
+Starts in invisible mode.
+
+Neither the start\-up logo nor the initial program window will be visible.
+LO can be controlled and documents and dialogs can be opened via the API.
+
+When started with this parameter, it can only be quit using the taskmanager (Windows)
+or the kill command (UNIX based systems).
+
+\-quickstart does not work with this parameter.
+
+.TP
+\fB\-infilter="<filter>"\fR
+Force an input filter type if possible.
+For example -infilter="Calc Office Open XML" only
+
+.TP
+\fB\-math\fR
+Starts with a new Math document.
+
+.TP
+\fB\-minimized\fR
+Keeps the splash screen minimized.
+
+.TP
+\fB\-n \fItemplate\fR...
+Creates the a new document from the given templates.
+
+.TP
+\fB\-nodefault\fR
+Starts LO without creating an new document.
+The next time you start LO, the welcome screen is show.
+
+It's used together with \fB\-nologo\fR by quick starters. Note that \fB\-quickstart\fR
+has no longer been supported since OpenOffice.org 2.0.0.
+
+.TP
+\fB\-nolockcheck\fR
+Disables the check for remote instances using the installation.
+
+.TP
+\fB\-nologo\fR
+Disables the splash screen at program start.
+
+.TP
+\fB\-norestore\fR
+Disables restart and file recovery after a system crash. It is possible that LO
+will try to restore a file it keeps crashing on, if that happens \fB\-norestore\fR
+is the only way to start LO.
+
+.TP
+\fB\-nosplash\fR
+Disables the splash screen at program start.
+
+.TP
+\fB\-o \fIfile\fR...
+Opens the given files for editing, even templates.
+
+Without \fb\-o\fR a template file would create a new document derived from that template.
+
+.TP
+\fB\-p \fIfile\fR...
+Prints the given files to the default printer and ends. The splash screen
+does not appear.
+
+If the file name contains spaces, then it must be enclosed in quotation marks.
+
+.TP
+\fB\-print\-to\-file [\-printer\-name printer_name] [\-outdir output_dir] file...
+Batch print files to file.
+If \-printer\-name is not specified the default printer is used.
+If \-outdir is not specified then the current working directory is used as the output directory
+for the converted files.
+
+Examples:
+
+\-print\-to\-file *.doc
+
+Prints all .doc files to the current working directory using the default printer.
+
+\-print\-to\-file \-printer\-name nasty_lowres_printer \-outdir /home/user *.doc
+
+Prints all .doc files to /home/user directory using the nasty_lowres_printer.
+
+.TP
+\fB\-pt \fIprintername\fR \fIfile\fR...
+Prints the given files to the printer \fIprintername\fR and ends. The splash
+screen does not appear.
+
+If a file name contains spaces, then it must be enclosed in quotation marks.
+
+.TP
+\fB\-quickstart \fB\-quickstart=no
+Starts LO with it's quick starter.
+\fB\-quickstart disable the quick starter.
+
+Does not work with \-invisible or \-headless.
+
+.TP
+\fB\-show \fIImpress file\fR...
+Opens the given Impress files, starts the presentation and quits after they have finished.
+
+.TP
+\fB\-unaccept=\fIaccept\-string\fR
+Closes an acceptor that was created with \fB\-accept\fR option.
+
+Use \fB\-unaccept\fR=\fIall\fR to close all open acceptors.
+
+.TP
+\fB\-terminate_after_init\fR
+Starts LO and terminates after it registers some UNO services.
+Doesn't show the splash during startup.
+
+.TP
+\fB\-view \fIfile\fR...
+Opens the given files read-only creating a temporary copy of them at $TMPDIR.
+
+.TP
+\fB\-web\fR
+Starts with a new HTML document.
+
+.TP
+\fB\-writer\fR
+Starts with a new Writer document.
+
+.SH TROUBLESHOOTING PROBLEMS
+See \fBhttp://wiki.documentfoundation.org/BugReport\fR for more details on how to report
+bugs in LibreOffice.
+.SH SEE ALSO
+.BR http://www.documentfoundation.org/
+
+.SH AUTHOR
+This manual page was created by Rene Engelhard <rene at debian.org> for
+the Debian GNU/Linux Distribution, because the original package does not have
+one. It was updated for Novell by Petr Mladek <petr.mladek at novell.com> and
+adapted for LibreOffice by Philipp Weissenbacher <philipp.weissenbacher at gmail.com>.
diff --git a/sysui/desktop/man/unopkg.1 b/sysui/desktop/man/unopkg.1
new file mode 100644
index 0000000..b98a30d
--- /dev/null
+++ b/sysui/desktop/man/unopkg.1
@@ -0,0 +1,80 @@
+.TH unopkg "1" "2008-03-18" "LibreOffice Extension Manager" "User Command"
+.SH "Name"
+unopkg \- LibreOffice Extension Manager
+.SH SYNOPSIS
+.B unopkg
+[\fBadd\fR] <\fIoptions\fR> \fIextension-path...\fR
+.br
+.B unopkg
+[\fBremove\fR] <\fIoptions\fR> \fIextension-identifier...\fR
+.br
+.B unopkg
+[\fBlist\fR] <\fIoptions\fR> \fIextension-identifier...\fR
+.br
+.B unopkg
+[\fBreinstall\fR] <\fIoptions\fR>
+.br
+.B unopkg
+[\fBgui\fR]
+.br
+.B unopkg
+[\fB--help\fR|\fB-h\fR]
+
+.SH DESCRIPTION
+LibreOffice is a fully featured office suite for the daily use with all
+features you would normally expect in an office suite.
+
+There exists many LibreOffice extensions all over the word. For example, see
+\fBhttp://extensions.services.openoffice.org/\fR
+
+This tool allows to manage the extensions from the command line.
+
+.SH SUB\-COMMANDS
+.TP
+\fBadd\fR
+add the given extensions
+.TP
+\fBremove\fR
+remove extensions by the given identifiers
+.TP
+\fBreinstall\fR
+reinstall all deployed extensions (only for experts)
+.TP
+\fBlist\fR
+list information about the deployed extensions
+.TP
+\fBgui\fR
+raise Extension Manager Graphical User Interface (GUI)
+
+.SH OPTIONS
+.TP
+\fB\-\-help\fR|\fB\-h\fR
+display help and exit
+.TP
+\fB\-\-version\fR|\fB\-V\fR
+output version information and exit
+.TP
+\fB--verbose\fR|\fB\-v\fR
+verbose output
+.TP
+\fB\-\-force\fR|\fB\-f\fR
+force overwriting existing extensions
+.TP
+\fB\-\-log\-file\fR <\fIfile\fR>
+custom log file; the default one is <cache-dir>/log.txt
+.TP
+\fB\-\-shared\fR|\fB\-f\fR
+operate on the system installation deployment context; use only when no
+concurrent Office process(es) are running! (only for experts)
+.TP
+\fB\-\-deployment\-context\fR <\fIcontext\fR>
+operate on explicit deployment context (only for experts)
+
+
+.SH TROUBLESHOOTING PROBLEMS
+See \fBhttp://wiki.documentfoundation.org/BugReport\fR for more details about how to report
+bugs in LibreOffice.
+.SH SEE ALSO
+.BR http://www.documentfoundation.org/
+.SH AUTHOR
+This manual page was created by Petr Mladek <pmladek at suse.cz>.
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 365155f..3c4a678 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -43,7 +43,7 @@ fi
mkdir -p ${DESTDIR}/usr/bin
-office_prefix=/opt
+test -n "$OFFICE_PREFIX" && office_prefix="$OFFICE_PREFIX" || office_prefix=/opt
office_root=${office_prefix}/${PREFIX}
#this symlink is needed to have the API boostrap functions running right
commit 5dd688864821845afb48d093a90be2df9b4dafc5
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Jul 11 12:05:47 2011 +0100
fdo#36733: Add useronly read permission, while creating tmpfile.
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6c09670..e6e9620 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3330,11 +3330,12 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const ::rtl::OUString& aURL )
{
sal_uInt64 nAttributes = aFileStatus.getAttributes();
- nAttributes &= ~(Attribute_OwnWrite |
- Attribute_GrpWrite |
- Attribute_OthWrite |
- Attribute_ReadOnly);
- nAttributes |= Attribute_OwnWrite;
+ nAttributes &= ~(osl_File_Attribute_OwnWrite |
+ osl_File_Attribute_GrpWrite |
+ osl_File_Attribute_OthWrite |
+ osl_File_Attribute_ReadOnly);
+ nAttributes |= (osl_File_Attribute_OwnWrite |
+ osl_File_Attribute_OwnRead);
bResult = ( osl::File::setAttributes( aURL, nAttributes ) == ::osl::FileBase::E_None );
}
commit b44017797dc8060b497a521e7c42a6a6e81bd32f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 4 09:27:39 2011 +0100
Related: #i35066# ole props buglet
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 7f4b8bc..3dd6f37 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -1156,7 +1156,7 @@ void SfxOlePropertySet::ImplLoad( SvStream& rStrm )
sal_uInt16 nOsMinor;
sal_uInt16 nOsType;
SvGlobalName aGuid;
- sal_Int32 nSectCount;
+ sal_Int32 nSectCount(0);
rStrm >> nByteOrder >> nVersion >> nOsMinor >> nOsType >> aGuid >> nSectCount;
// read sections
commit 467d7370f54a7c7ed3b583ec2a9213e01a8d2dc9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jul 9 14:58:31 2011 +0100
Resolves: fdo#39091 use UTF-8 encoding for gstreamer uris
Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 1e2d0b7..222fbc3 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -270,7 +270,7 @@ void Player::preparePlaybin( const ::rtl::OUString& rURL, bool bFakeVideo )
mbFakeVideo = bFakeVideo;
- rtl::OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_ASCII_US );
+ rtl::OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 );
g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL );
pBus = gst_element_get_bus( mpPlaybin );
commit 58cf0f84601756399c6f8ba4ca976d402aeb99e4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Wed Jun 22 15:51:02 2011 +0200
fix for fdo#37880
we need to save the information if we have a global range name or a
local range name in the uno api too
Signed-off-by: Kohei Yoshida <kyoshida at novell.com>
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index f82dc2c..24b56ac 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -299,14 +299,16 @@ class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken
{
private:
sal_uInt16 nIndex;
+ bool mbGlobal;
public:
- FormulaIndexToken( OpCode e, sal_uInt16 n ) :
- FormulaToken( svIndex, e ), nIndex( n ) {}
+ FormulaIndexToken( OpCode e, sal_uInt16 n, bool bGlobal = true ) :
+ FormulaToken( svIndex, e ), nIndex( n ), mbGlobal( bGlobal ) {}
FormulaIndexToken( const FormulaIndexToken& r ) :
- FormulaToken( r ), nIndex( r.nIndex ) {}
+ FormulaToken( r ), nIndex( r.nIndex ), mbGlobal( r.mbGlobal ) {}
virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); }
- virtual sal_uInt16 GetIndex() const;
+ virtual sal_uInt16 GetIndex() const;
+ virtual sal_uInt8 GetByte() const;
virtual void SetIndex( sal_uInt16 n );
virtual bool operator==( const FormulaToken& rToken ) const;
};
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 182459d..0034466 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -298,7 +298,7 @@ bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken& _aToken,Exter
{
// long is svIndex, used for name / database area, or "byte" for spaces
sal_Int32 nValue = _aToken.Data.get<sal_Int32>();
- if ( eOpCode == ocName || eOpCode == ocDBArea )
+ if ( eOpCode == ocDBArea )
AddToken( formula::FormulaIndexToken( eOpCode, static_cast<sal_uInt16>(nValue) ) );
else if ( eOpCode == ocSpaces )
AddToken( formula::FormulaByteToken( ocSpaces, static_cast<sal_uInt8>(nValue) ) );
@@ -1326,6 +1326,7 @@ bool FormulaStringOpToken::operator==( const FormulaToken& r ) const
}
sal_uInt16 FormulaIndexToken::GetIndex() const { return nIndex; }
+sal_uInt8 FormulaIndexToken::GetByte() const {return static_cast<sal_uInt8>(mbGlobal); }
void FormulaIndexToken::SetIndex( sal_uInt16 n ) { nIndex = n; }
bool FormulaIndexToken::operator==( const FormulaToken& r ) const
{
commit 3b66549a40f52d32578dd72d838b7401591c30f5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Jul 2 13:33:06 2011 +0200
unable to save protected file without pw fdo#38561
Signed-off-by: Andras Timar <atimar at suse.com>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index f0db081..3b29f52 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2811,7 +2811,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
// in "SaveAs" title and password will be cleared ( maybe the new itemset contains new values, otherwise they will be empty )
pMergedParams->ClearItem( SID_PASSWORD );
pMergedParams->ClearItem( SID_DOCINFO_TITLE );
-
+ pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
pMergedParams->ClearItem( SID_INPUTSTREAM );
pMergedParams->ClearItem( SID_STREAM );
pMergedParams->ClearItem( SID_CONTENT );
commit 933f19eb99435b09b61fa2d221e955c2adb3104f
Author: David Tardon <dtardon at redhat.com>
Date: Thu Jun 30 09:20:51 2011 +0200
avoid overwriting stack after early return
Also make the original hack less noisome.
(cherry picked from commit 01096e7487d9e60fcd24eea8131b650588845f2b)
Conflicts:
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index a0f4137..6e0ca0e 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -29,6 +29,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sfx2.hxx"
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
+
#include <vcl/menu.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
@@ -116,6 +119,39 @@ SFX_IMPL_DOCKINGWINDOW(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
//-------------------------------------------------------------------------
+class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
+{
+ typedef void (DeletionWatcher::* bool_type)();
+
+public:
+ explicit DeletionWatcher(SfxCommonTemplateDialog_Impl& rDialog)
+ : m_pDialog(&rDialog)
+ {
+ m_pDialog->impl_setDeletionWatcher(this);
+ }
+
+ ~DeletionWatcher()
+ {
+ if (m_pDialog)
+ m_pDialog->impl_setDeletionWatcher(0);
+ }
+
+ // Signal that the dialog was deleted
+ void signal()
+ {
+ m_pDialog = 0;
+ }
+
+ // Return true if the dialog was deleted
+ operator bool_type() const
+ {
+ return m_pDialog ? 0 : &DeletionWatcher::signal;
+ }
+
+private:
+ SfxCommonTemplateDialog_Impl* m_pDialog;
+};
+
// Re-direct functions
SfxTemplateDialog::SfxTemplateDialog
@@ -741,7 +777,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx
pCurObjShell ( NULL ),
xModuleManager ( ::comphelper::getProcessServiceFactory()->createInstance(
DEFINE_CONST_UNICODE("com.sun.star.frame.ModuleManager") ), UNO_QUERY ),
- pbDeleted ( NULL ),
+ m_pDeletionWatcher ( NULL ),
aFmtLb ( this, WB_BORDER | WB_TABSTOP | WB_SORT | WB_QUICK_SEARCH ),
aFilterLb ( pW, WB_BORDER | WB_DROPDOWN | WB_TABSTOP ),
@@ -786,7 +822,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Mod
pStyleSheetPool ( NULL ),
pTreeBox ( NULL ),
pCurObjShell ( NULL ),
- pbDeleted ( NULL ),
+ m_pDeletionWatcher ( NULL ),
aFmtLb ( this, SfxResId( BT_VLIST ) ),
aFilterLb ( pW, SfxResId( BT_FLIST ) ),
@@ -959,6 +995,11 @@ void SfxCommonTemplateDialog_Impl::ClearResource()
DELETEZ( m_pStyleFamiliesId );
}
+void SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(DeletionWatcher* pNewWatcher)
+{
+ m_pDeletionWatcher = pNewWatcher;
+}
+
//-------------------------------------------------------------------------
void SfxCommonTemplateDialog_Impl::Initialize()
@@ -997,11 +1038,8 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
pStyleSheetPool = NULL;
delete pTreeBox;
delete pTimer;
- if ( pbDeleted )
- {
- pbDeleted->bDead = true;
- pbDeleted = NULL;
- }
+ if ( m_pDeletionWatcher )
+ m_pDeletionWatcher->signal();
}
//-------------------------------------------------------------------------
@@ -1695,15 +1733,15 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
pItems[ nCount++ ] = 0;
- Deleted aDeleted;
- pbDeleted = &aDeleted;
+ DeletionWatcher aDeleted(*this);
sal_uInt16 nModi = pModifier ? *pModifier : 0;
const SfxPoolItem* pItem = rDispatcher.Execute(
nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
pItems, nModi );
- // FIXME: Dialog can be destroyed while in Execute() check stack variable for dtor flag!
- if ( !pItem || aDeleted() )
+ // Dialog can be destroyed while in Execute() because started
+ // subdialogs are not modal to it (#i97888#).
+ if ( !pItem || aDeleted )
return sal_False;
if ( nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId )
@@ -1725,10 +1763,6 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
}
}
- // Reset destroyed flag otherwise we use the pointer in the dtor
- // where the local stack object is already destroyed. This would
- // overwrite objects on the stack!! See #i100110
- pbDeleted = NULL;
return sal_True;
}
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 576e93e..aa7cb6c 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -102,18 +102,12 @@ public:
// class SfxCommonTemplateDialog_Impl ------------------------------------
-struct Deleted
-{
- bool bDead;
-
- Deleted() : bDead(false) {}
-
- inline bool operator()() { return bDead; }
-};
-
class SfxCommonTemplateDialog_Impl : public SfxListener
{
private:
+ class DeletionWatcher;
+ friend class DeletionWatcher;
+
class ISfxTemplateCommon_Impl : public ISfxTemplateCommon
{
private:
@@ -129,6 +123,8 @@ private:
void ReadResource();
void ClearResource();
+ void impl_setDeletionWatcher(DeletionWatcher* pNewWatcher);
+
protected:
#define MAX_FAMILIES 5
#define COUNT_BOUND_FUNC 13
@@ -155,7 +151,7 @@ protected:
SfxObjectShell* pCurObjShell;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager >
xModuleManager;
- Deleted* pbDeleted;
+ DeletionWatcher* m_pDeletionWatcher;
SfxActionListBox aFmtLb;
ListBox aFilterLb;
commit 48f79d786a01fc51939243e4ad26f76fd183cdd8
Author: Muthu Subramanian <sumuthu at novell.com>
Date: Mon May 2 16:57:21 2011 +0530
Fixed a crasher. Also, improved batch conversion (fdo#37412, bnc#690798)
* The pointer is not removed from the array before 'delete'
* FilterMatcher now uses (input) content to guess better.
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index f89e662..87ae3d3 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -33,6 +33,7 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include "osl/file.hxx"
+#include "sfx2/app.hxx"
#include <svl/fstathelper.hxx>
#include "dispatchwatcher.hxx"
@@ -96,10 +97,14 @@ static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
SfxMedium* pMedium = new SfxMedium( aUrl,
STREAM_STD_READ, sal_False );
const SfxFilter *pSfxFilter = NULL;
- SfxFilterMatcher aMatcher;
if( nFlags == SFX_FILTER_EXPORT )
- aMatcher = SfxFilterMatcher( aAppl );
- aMatcher.GuessFilterIgnoringContent( *pMedium, &pSfxFilter, nFlags, 0 );
+ {
+ SfxFilterMatcher( aAppl ).GuessFilterIgnoringContent( *pMedium, &pSfxFilter, nFlags, 0 );
+ }
+ else
+ {
+ SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pSfxFilter, nFlags, 0 );
+ }
if( pSfxFilter )
aFilter = ( nFlags == SFX_FILTER_EXPORT ) ? pSfxFilter->GetFilterName() :
pSfxFilter->GetServiceName();
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 93fb392..f8fcc10 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -302,8 +302,12 @@ SfxFilterMatcher::SfxFilterMatcher()
SfxFilterMatcher::~SfxFilterMatcher()
{
if ( !pImpl->aName.getLength() )
+ {
// only the global Matcher owns his ImplData
+ if( pImplArr )
+ pImplArr->Remove( pImpl );
delete pImpl;
+ }
}
void SfxFilterMatcher_Impl::Update()
commit 9c17674951760b8a64276ee8e1c6496e21ad756e
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Jun 20 11:59:42 2011 +0200
fix fdo#37110 --quickstart shouldn't show start center
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1544b20..873588d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1767,7 +1767,7 @@ int Desktop::Main()
if ( !pExecGlobals->bRestartRequested )
{
- if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsHeadless() ) &&
+ if ((!pCmdLineArgs->WantsToLoadDocument() && !pCmdLineArgs->IsInvisible() && !pCmdLineArgs->IsHeadless() && !pCmdLineArgs->IsQuickstart()) &&
(SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) &&
(!bExistsRecoveryData ) &&
(!bExistsSessionData ) &&
commit 0a5a7727e34787b7f1ee6e1e5e07aeb13bdf9ed5
Author: Robert Nagy <robert at openbsd.org>
Date: Mon Jun 20 11:43:55 2011 +0200
correctly build GTK systray icon
the setting was lost during move the GNU make
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 0709f60..e46a581 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -44,6 +44,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\
-DENABLE_QUICKSTART_APPLET \
))
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Library_set_defs,qstart_gtk,\
+ $$(DEFS) \
+ -DENABLE_SYSTRAY_GTK \
+))
+endif
+
$(eval $(call gb_Library_set_cflags,qstart_gtk,\
$$(CFLAGS) \
$(filter-out -I%,$(GTK_CFLAGS)) \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 4d2396b..c9ec52c 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -56,6 +56,15 @@ $(eval $(call gb_Library_set_defs,sfx,\
-DSFX2_DLLIMPLEMENTATION \
))
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Library_set_defs,sfx,\
+ $$(DEFS) \
+ -DENABLE_QUICKSTART_APPLET \
+ -DENABLE_SYSTRAY_GTK \
+ -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
+))
+endif
+
$(eval $(call gb_Library_add_linked_libs,sfx,\
comphelper \
cppu \
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 36dd915..6cab935 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
# endif
#endif
-#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
+#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) && !defined(PLUGIN_NAME)
#define PLUGIN_NAME "libqstart_gtkli.so"
#endif
More information about the Libreoffice-commits
mailing list