editeng/source/editeng/impedit4.cxx | 5 ++++- sd/source/ui/inc/filedlg.hxx | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 03737426620f570e33b93f92a4bd4e4b6d2deba3 Author: Ivan Timofeev <timofeev....@gmail.com> Date: Tue Sep 3 10:25:24 2013 +0400 fix string conversion regression from 710f41b7aec8e7d35a0da8be332aa289f98942af Change-Id: I7c5e41294e072eceb036a24397fbb899a568587c diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index e746a14..946391b 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -127,7 +127,10 @@ EditPaM ImpEditEngine::ReadText( SvStream& rInput, EditSelection aSel ) bool bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet() ); while ( bDone ) { - aTmpStr = aTmpStr.copy(0, MAXCHARSINPARA ); + if (aTmpStr.getLength() > MAXCHARSINPARA) + { + aTmpStr = aTmpStr.copy(0, MAXCHARSINPARA); + } aPaM = ImpInsertText( EditSelection( aPaM, aPaM ), aTmpStr ); aPaM = ImpInsertParaBreak( aPaM ); bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet() ); commit a5e59d4509b145f02993d85fa6de9afd5bf8a122 Author: Ivan Timofeev <timofeev....@gmail.com> Date: Tue Sep 3 09:59:21 2013 +0400 remove stray method declaration Change-Id: Ia536eadc80a969ce16f5d9fb995adfab048b77c1 diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx index d6fab5e..ebef74e 100644 --- a/sd/source/ui/inc/filedlg.hxx +++ b/sd/source/ui/inc/filedlg.hxx @@ -21,7 +21,6 @@ #ifndef _FILEDLG_HXX #define _FILEDLG_HXX -#include <tools/string.hxx> #include <tools/errcode.hxx> #include <memory> @@ -54,8 +53,6 @@ public: ErrCode Execute(); OUString GetPath() const; void SetPath( const OUString& rPath ); - - String ReqDisplayDirectory() const; }; #endif // _FILEDLG_HXX _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits