summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx12
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx8
6 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 42b003705411..8e95869b7ebc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -766,7 +766,7 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos )
// Replace tabs by </instrText><tab/><instrText>
if ( i < ( nNbToken - 1 ) )
- RunText( String::CreateFromAscii( "\t" ) );
+ RunText( rtl::OUString( "\t" ) );
}
m_pSerializer->endElementNS( XML_w, XML_r );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index bf1b1931952b..0a946b8dba3b 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -119,17 +119,17 @@ static String lcl_getFieldCode( const IFieldmark* pFieldmark ) {
if ( !pFieldmark) {
return String();
} else if ( pFieldmark->GetFieldname( ) == ODF_FORMTEXT ) {
- return String::CreateFromAscii(" FORMTEXT ");
+ return rtl::OUString(" FORMTEXT ");
} else if ( pFieldmark->GetFieldname( ) == ODF_FORMDROPDOWN ) {
- return String::CreateFromAscii(" FORMDROPDOWN ");
+ return rtl::OUString(" FORMDROPDOWN ");
} else if ( pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX ) {
- return String::CreateFromAscii(" FORMCHECKBOX ");
+ return rtl::OUString(" FORMCHECKBOX ");
} else if ( pFieldmark->GetFieldname( ) == ODF_TOC ) {
- return String::CreateFromAscii(" TOC ");
+ return rtl::OUString(" TOC ");
} else if ( pFieldmark->GetFieldname( ) == ODF_HYPERLINK ) {
- return String::CreateFromAscii(" HYPERLINK ");
+ return rtl::OUString(" HYPERLINK ");
} else if ( pFieldmark->GetFieldname( ) == ODF_PAGEREF ) {
- return String::CreateFromAscii(" PAGEREF ");
+ return rtl::OUString(" PAGEREF ");
} else {
return pFieldmark->GetFieldname();
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 9c662da10bb9..80ec3bcc8707 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3176,7 +3176,7 @@ void WW8Export::PrepareStorage()
SvGlobalName aGName( nId1, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x46 );
- GetWriter().GetStorage().SetClass( aGName, 0, String::CreateFromAscii( pName ));
+ GetWriter().GetStorage().SetClass( aGName, 0, rtl::OUString::createFromAscii( pName ));
SvStorageStreamRef xStor( GetWriter().GetStorage().OpenSotStream(sCompObj) );
xStor->Write( pData, nLen );
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index e45e0e6989c4..bdaded82da3a 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -52,7 +52,7 @@ WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion,
if (aWwFib.nFibBack >= 0x6A) //Word97
{
- xTableStream = pStg->OpenSotStream(String::CreateFromAscii(
+ xTableStream = pStg->OpenSotStream(rtl::OUString::createFromAscii(
aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 2f3c47fcf8b5..e4e0f7d25d95 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -967,7 +967,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(String &rString, WW8_CP nS
rString = comphelper::string::remove(rString, 0x1);
rString = comphelper::string::remove(rString, 0x5);
rString = comphelper::string::remove(rString, 0x8);
- rString.SearchAndReplaceAllAscii("\007\007", String::CreateFromAscii("\007\012"));
+ rString.SearchAndReplaceAllAscii("\007\007", rtl::OUString("\007\012"));
rString.SearchAndReplaceAll(0x7, ' ');
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 536b1bbcc622..e4f747b076c4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4331,10 +4331,10 @@ bool SwWW8ImplReader::ReadGlobalTemplateSettings( const rtl::OUString& sCreatedF
aBasicImporter.import( mpDocShell->GetMedium()->GetInputStream() );
lcl_createTemplateToProjectEntry( xPrjNameCache, aURL, aBasicImporter.getProjectName() );
// Read toolbars & menus
- SvStorageStreamRef refMainStream = rRoot->OpenSotStream( String::CreateFromAscii( "WordDocument" ));
+ SvStorageStreamRef refMainStream = rRoot->OpenSotStream( rtl::OUString( "WordDocument" ));
refMainStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
WW8Fib aWwFib( *refMainStream, 8 );
- SvStorageStreamRef xTableStream = rRoot->OpenSotStream(String::CreateFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
+ SvStorageStreamRef xTableStream = rRoot->OpenSotStream(rtl::OUString::createFromAscii( aWwFib.fWhichTblStm ? SL::a1Table : SL::a0Table), STREAM_STD_READ);
if (xTableStream.Is() && SVSTREAM_OK == xTableStream->GetError())
{
@@ -4767,7 +4767,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
break;
}
- rTableStream = pStg->OpenSotStream( String::CreateFromAscii(
+ rTableStream = pStg->OpenSotStream( rtl::OUString::createFromAscii(
pWwFib->fWhichTblStm ? SL::a1Table : SL::a0Table),
STREAM_STD_READ);
@@ -5463,7 +5463,7 @@ sal_uLong WW8Reader::OpenMainStream( SvStorageStreamRef& rRef, sal_uInt16& rBuff
{
sal_uLong nRet = ERR_SWG_READ_ERROR;
OSL_ENSURE( pStg, "wo ist mein Storage?" );
- rRef = pStg->OpenSotStream( String::CreateFromAscii( "WordDocument" ), STREAM_READ | STREAM_SHARE_DENYALL);
+ rRef = pStg->OpenSotStream( rtl::OUString("WordDocument"), STREAM_READ | STREAM_SHARE_DENYALL);
if( rRef.Is() )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 05:31:40 +0000