diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-10 22:11:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 11:55:04 +0000 |
| commit | 6ddb02bad568be58c8728a40c43b81232c1ca4a0 (patch) | |
| tree | b6883ad68c870f9ce7e0ee2676956e673f2848d8 /sc/source/ui/docshell/docsh3.cxx | |
| parent | c437b033748733273c43d071ab42a1863ed80416 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'sc/source/ui/docshell/docsh3.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 23355664b27b..b392c2dc170e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -39,20 +39,21 @@ #include "scitems.hxx" #include "rangelst.hxx" #include <editeng/flstitem.hxx> -#include <svx/pageitem.hxx> #include <editeng/paperinf.hxx> -#include <svx/postattr.hxx> #include <editeng/sizeitem.hxx> -#include <unotools/misccfg.hxx> +#include <rtl/strbuf.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> +#include <svx/pageitem.hxx> +#include <svx/postattr.hxx> +#include <unotools/localedatawrapper.hxx> +#include <unotools/misccfg.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> -#include <unotools/localedatawrapper.hxx> #include "docsh.hxx" #include "docshimp.hxx" @@ -963,9 +964,10 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck String aValue; if ( eSourceType == SC_CAT_CONTENT ) ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); - ByteString aError( aValue, gsl_getSystemTextEncoding() ); - aError += " weggelassen"; - OSL_FAIL( aError.GetBuffer() ); + rtl::OStringBuffer aError(rtl::OUStringToOString(aValue, + osl_getThreadTextEncoding())); + aError.append(RTL_CONSTASCII_STRINGPARAM(" weggelassen")); + OSL_FAIL( aError.getStr() ); #endif } else |