diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-10-30 07:13:59 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-10-30 07:13:59 +0000 |
| commit | f0cf4835b8717c87108b3cb0d133cf4378c9f4aa (patch) | |
| tree | 297d818a4b30e73344b1ad9d1fdedbc4a07ccba4 /app-office/oooqs/files | |
| parent | add support for USE=cdinstall (diff) | |
| download | gentoo-2-f0cf4835b8717c87108b3cb0d133cf4378c9f4aa.tar.gz gentoo-2-f0cf4835b8717c87108b3cb0d133cf4378c9f4aa.tar.bz2 gentoo-2-f0cf4835b8717c87108b3cb0d133cf4378c9f4aa.zip | |
New release, with some fixes to work with OpenOffice.org 2.0.0
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'app-office/oooqs/files')
| -rw-r--r-- | app-office/oooqs/files/digest-oooqs-2.0.3-r2 | 1 | ||||
| -rw-r--r-- | app-office/oooqs/files/oooqs-20.patch | 86 |
2 files changed, 87 insertions, 0 deletions
diff --git a/app-office/oooqs/files/digest-oooqs-2.0.3-r2 b/app-office/oooqs/files/digest-oooqs-2.0.3-r2 new file mode 100644 index 000000000000..5d78f6742d54 --- /dev/null +++ b/app-office/oooqs/files/digest-oooqs-2.0.3-r2 @@ -0,0 +1 @@ +MD5 5d401aa7250f80734d785d4c286f635b oooqs-2.0.3.tar.gz 584849 diff --git a/app-office/oooqs/files/oooqs-20.patch b/app-office/oooqs/files/oooqs-20.patch new file mode 100644 index 000000000000..7f62486a6672 --- /dev/null +++ b/app-office/oooqs/files/oooqs-20.patch @@ -0,0 +1,86 @@ +--- src/oooqs.cpp ++++ src/oooqs.cpp +@@ -18,17 +18,12 @@ + #include <ksimpleconfig.h> + + #include "oooqs.h" +-#include "oooqsselectordialog.h" + + OOoQs::OOoQs() + : KSystemTray( 0, "OOoQs" ), + _quickProcess( 0 ), _okToRun( true ) { + + QMap<QString, QString> versions; +- +- KConfig* oooConfig = 0; +- +- OOoQsSelectorDialog* selector = 0; + + /** + Get the global config-object. +@@ -86,51 +81,11 @@ + Read the configuration. + */ + _autostart->setChecked( _config->readBoolEntry( "Autostart", true ) ); +- _exec = _config->readEntry( "Exec" ); +- +- /** +- Try to autodetect settings if they aren't found in our own config. +- */ +- if ( _exec.length() < 2 ) { +- oooConfig = new KSimpleConfig( +- QDir::homeDirPath() + QDir::separator() +- + ".sversionrc", true ); +- oooConfig->setGroup( "Versions" ); +- versions = oooConfig->entryMap( "Versions" ); +- /** +- If there are more than one possible configurations, +- ask the user which one to use. +- */ +- if ( versions.count() > 1 ) { +- selector = new OOoQsSelectorDialog( versions, this ); +- if ( selector->exec() == QDialog::Accepted ) { +- _exec = versions[ selector->selected() ]; +- _exec = _exec.section( ':', 1 ); +- _exec += QDir::separator(); +- _exec += "soffice"; +- _exec = QDir::cleanDirPath( _exec ); +- _config->writeEntry( "Exec", _exec ); +- } else { +- /** +- Kill the app here if the user hadn't chosen a configuration. +- */ +- _okToRun = false; +- return ; +- } +- /** +- Added by Sergio Visinoni <piffio@piffio.org> +- +- I (Christian) simply forgot it (shame on me!) +- */ +- } else { +- _exec = versions.begin().data(); +- _exec = _exec.section( ':', 1 ); +- _exec += QDir::separator(); +- _exec += "soffice"; +- _exec = QDir::cleanDirPath( _exec ); +- _config->writeEntry( "Exec", _exec ); +- } +- } ++ ++ /** ++ Fixed place for the exec now ++ */ ++ _exec += "/usr/bin/ooffice2"; + + /** + Make sure that OpenOffice.org is killed +@@ -182,7 +137,7 @@ + */ + process->setExecutable( _exec ); + ( *process ) << "-plugin"; +- ( *process ) << "-quickstart"; ++ ( *process ) << "-nologo" << "-nodefault"; + connect ( process, SIGNAL( processExited( KProcess* ) ), + this, SLOT( restartQuickInstance( KProcess* ) ) ); + /** |