diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-14 23:17:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-15 16:38:26 +0200 |
| commit | 6e0d836ff120ba292ba52f3623a3dd9be04aefc2 (patch) | |
| tree | a8deb1dd85481c0d09d5cdc29d5440722548889b /sw/source/filter/rtf/swparrtf.cxx | |
| parent | 6b9d91c924a5b2f41c4cab5f1e86291b5997a681 (diff) | |
String to OUString, some formatting
Conflicts:
sw/source/filter/basflt/fltini.cxx
sw/source/ui/dialog/ascfldlg.cxx
Change-Id: Ifa12105aa6f747e2797891b6c71128bd96f78bf3
Diffstat (limited to 'sw/source/filter/rtf/swparrtf.cxx')
| -rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index ad43cc9879fb..cfbc9154e716 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -42,10 +42,10 @@ using namespace ::com::sun::star; /// Glue class to call RtfImport as an internal filter, needed by copy&paste support. class SwRTFReader : public Reader { - virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); + virtual sal_uLong Read( SwDoc &, const OUString& rBaseURL, SwPaM &,const OUString &); }; -sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String& /*rBaseURL*/, SwPaM& rPam, const String &) +sal_uLong SwRTFReader::Read( SwDoc &rDoc, const OUString& /*rBaseURL*/, SwPaM& rPam, const OUString &) { if (!pStrm) return ERR_SWG_READ_ERROR; |