summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-29 09:16:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-29 11:20:32 +0100
commit9e0cbe5eb3f4785d8db26f87ce0208823c87c5ad (patch)
tree139e2a2af31e5ba6a1549cf93c12e951b8ad570b /sw
parent6c759da0442f5123a4a4355e8dc9c926a49d25d7 (diff)
some pesky XubStrings
Change-Id: Ib4095dee416cab6d954e1612d2e3f6e2d4464f48
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/dbg_lay.cxx6
-rw-r--r--sw/source/core/layout/newfrm.cxx2
-rw-r--r--sw/source/core/text/txtftn.cxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 660133328e65..fb9f94c77d23 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -301,7 +301,7 @@ void SwProtocol::Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAct,
void SwProtocol::Init()
{
nRecord = 0;
- XubString aName( "dbg_lay.go", RTL_TEXTENCODING_MS_1252 );
+ rtl::OUString aName("dbg_lay.go");
SvFileStream aStream( aName, STREAM_READ );
if( aStream.IsOpen() )
{
@@ -334,7 +334,7 @@ SwImplProtocol::SwImplProtocol()
sal_Bool SwImplProtocol::NewStream()
{
- XubString aName( "dbg_lay.out", RTL_TEXTENCODING_MS_1252 );
+ rtl::OUString aName("dbg_lay.out");
nLineCount = 0;
pStream = new SvFileStream( aName, STREAM_WRITE | STREAM_TRUNC );
if( pStream->GetError() )
@@ -466,7 +466,7 @@ void SwImplProtocol::CheckLine( rtl::OString& rLine )
* --------------------------------------------------*/
void SwImplProtocol::FileInit()
{
- XubString aName( "dbg_lay.ini", RTL_TEXTENCODING_MS_1252 );
+ rtl::OUString aName("dbg_lay.ini");
SvFileStream aStream( aName, STREAM_READ );
if( aStream.IsOpen() )
{
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index dd6091b0cf1d..64755d591a04 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -475,7 +475,7 @@ void InitCurrShells( SwRootFrm *pRoot )
SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
- XubString( "Root", RTL_TEXTENCODING_MS_1252 ), pFmt ), 0 ),
+ rtl::OUString("Root"), pFmt ), 0 ),
// --> PAGES01
maPagesArea(),
mnViewWidth( -1 ),
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 1cb527dd09a4..eb2c365854f0 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -1517,7 +1517,7 @@ sal_Bool SwQuoVadisPortion::Format( SwTxtFormatInfo &rInf )
if( bFull )
{
// zweiter Versuch, wir kuerzen den String:
- aExpand = XubString( "...", RTL_TEXTENCODING_MS_1252 );
+ aExpand = rtl::OUString("...");
bFull = SwFldPortion::Format( rInf );
SetLen( 0 );
if( bFull )