diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2008-05-17 14:52:28 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2008-05-17 14:52:28 +0000 |
| commit | 4765dd5c2f11f2fbc85e52f973a3aa71f4f40110 (patch) | |
| tree | 50bb3c4a99206b590f248b41b4e533fefe91f96c /app-office/kspread/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4765dd5c2f11f2fbc85e52f973a3aa71f4f40110.tar.gz gentoo-2-4765dd5c2f11f2fbc85e52f973a3aa71f4f40110.tar.bz2 gentoo-2-4765dd5c2f11f2fbc85e52f973a3aa71f4f40110.zip | |
kspread bump with gcc43 patch and desktop-validity fix
(Portage version: 2.1.5)
Diffstat (limited to 'app-office/kspread/files')
| -rw-r--r-- | app-office/kspread/files/kspread-1.6.3-validate-desktop.diff | 11 | ||||
| -rw-r--r-- | app-office/kspread/files/kspread-gcc43.patch | 46 |
2 files changed, 57 insertions, 0 deletions
diff --git a/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff b/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff new file mode 100644 index 000000000000..8b361026e483 --- /dev/null +++ b/app-office/kspread/files/kspread-1.6.3-validate-desktop.diff @@ -0,0 +1,11 @@ +--- koffice-1.6.3/kspread/kspread.desktop.orig 2008-05-17 16:04:28.000000000 +0200 ++++ koffice-1.6.3/kspread/kspread.desktop 2008-05-17 16:04:34.000000000 +0200 +@@ -70,7 +70,7 @@ + GenericName[wa]=Tåvleus + GenericName[zh_CN]=电子表格 + GenericName[zh_TW]=Spread 表格 +-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro ++MimeType=application/vnd.oasis.opendocument.spreadsheet;application/x-kspread;application/msexcel;text/x-csv;application/x-quattropro; + Type=Application + Icon=kspread + X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet diff --git a/app-office/kspread/files/kspread-gcc43.patch b/app-office/kspread/files/kspread-gcc43.patch new file mode 100644 index 000000000000..9ac8a6f6dfe6 --- /dev/null +++ b/app-office/kspread/files/kspread-gcc43.patch @@ -0,0 +1,46 @@ +diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp +--- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.cpp 2007-05-30 23:43:20.000000000 +0200 ++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.cpp 2008-03-12 00:59:07.000000000 +0100 +@@ -174,12 +174,7 @@ + return m_cell->text(); + } + +-bool Cell::setText(const QString& text, bool asString) { +- +- //FIXME: there is some problem with asString parameter, when it's set +- //to true KSpread says: ASSERT: "f" in Dependencies.cpp (621) +- //kspread: Cell at row 6, col 1 marked as formula, but formula is NULL +- ++bool Cell::setText(const QString& text) { + KSpread::ProtectedCheck prot; + prot.setSheet (m_sheet); + prot.add (QPoint (m_col, m_row)); +@@ -189,7 +184,7 @@ + KSpread::DataManipulator *dm = new KSpread::DataManipulator (); + dm->setSheet (m_sheet); + dm->setValue (text); +- dm->setParsing (!asString); ++ dm->setParsing (true); + dm->add (QPoint (m_col, m_row)); + dm->execute (); + +diff -Nrua koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h +--- koffice-1.6.3/kspread/plugins/scripting/kspreadcore/krs_cell.h 2007-05-30 23:43:20.000000000 +0200 ++++ koffice/kspread/plugins/scripting/kspreadcore/krs_cell.h 2008-03-12 00:59:07.000000000 +0100 +@@ -131,11 +131,10 @@ + */ + const QString text() const; + /** +- * Set the text of the cell. If asString is true, the text +- * will be handled as string else we try to parse the +- * string to the expected value. ++ * Set the text of the cell. the text ++ * will be handled as string + */ +- bool setText(const QString& text, bool asString = false); ++ bool setText(const QString& text); + + /** + * Return the textcolor as RGB-value in the format "#RRGGBB". + + |