fpicker/source/win32/filepicker/FileOpenDlg.cxx | 8 ++++---- fpicker/source/win32/filepicker/filepickerstate.cxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit d624a657a8f47a4d970e7b1c0d15d9b2b7d1437d Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Oct 5 14:12:02 2011 +0200 Fix fpicker windows build diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx index cb1c446..8bcbe48 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx @@ -243,7 +243,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getFullFileName() const rtl::OUString SAL_CALL CFileOpenDialog::getFileName() const { - return rtl::OUString(m_fileTitleBuffer); + return rtl::OUString(m_fileTitleBuffer.getStr()); } //------------------------------------------------------------------------ @@ -374,7 +374,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const if (nLen > 0) { m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1); - return rtl::OUString(m_helperBuffer); + return rtl::OUString(m_helperBuffer.getStr()); } return rtl::OUString(); } @@ -396,7 +396,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const if (nLen > 0) { m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1); - return rtl::OUString(m_helperBuffer); + return rtl::OUString(m_helperBuffer.getStr()); } return rtl::OUString(); } @@ -418,7 +418,7 @@ rtl::OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const if (nLen > 0) { m_helperBuffer.setLength((nLen * sizeof(sal_Unicode)) - 1); - return rtl::OUString(m_helperBuffer); + return rtl::OUString(m_helperBuffer.getStr()); } return rtl::OUString(); } diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index aec50c5..eeba2e7 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -213,7 +213,7 @@ OUString MatchFixBrokenPath(const OUString& path) if (path[1] == ':' && path[2] == '.' && path[3] == '\\') { // skip the '.' - return OUString(path, 2) + path.copy(3, path.getLength() - 3); + return OUString(path.getStr(), 2) + path.copy(3, path.getLength() - 3); } return path; }
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits