601058e269
- 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
28 lines
892 B
Diff
28 lines
892 B
Diff
commit 02a6406a39e9b683ea6677f19e8423d6a6dc31e6
|
|
Author: Muthu Subramanian K <sumuthu@suse.com>
|
|
Date: Fri Oct 7 19:39:14 2011 +0530
|
|
|
|
n#699334: Legacy Diagram Text Import.
|
|
|
|
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
|
|
index 4cbfff4..026da80 100644
|
|
--- svl/source/misc/strmadpt.cxx
|
|
+++ svl/source/misc/strmadpt.cxx
|
|
@@ -629,6 +629,16 @@ sal_uLong SvInputStream::SeekPos(sal_uLong nPos)
|
|
m_nSeekedFrom = STREAM_SEEK_TO_END;
|
|
return nPos;
|
|
}
|
|
+ else if ( nPos > Tell() )
|
|
+ {
|
|
+ // Read out the bytes
|
|
+ sal_Int32 nRead = nPos - Tell();
|
|
+ uno::Sequence< sal_Int8 > aBuffer;
|
|
+ m_xStream->readBytes( aBuffer, nRead );
|
|
+ return nPos;
|
|
+ }
|
|
+ else if ( nPos == Tell() )
|
|
+ return nPos;
|
|
}
|
|
SetError(ERRCODE_IO_CANTSEEK);
|
|
return Tell();
|