[Libreoffice-commits] .: filter/inc hwpfilter/source lotuswordpro/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Nov 28 11:19:38 PST 2010
filter/inc/filter/msfilter/msocximex.hxx | 4 -
hwpfilter/source/hwpreader.hxx | 6 +-
lotuswordpro/source/filter/genericfilter.cxx | 2
lotuswordpro/source/filter/lwp9reader.cxx | 6 +-
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 26 ++++-----
lotuswordpro/source/filter/lwpdrawobj.cxx | 18 +++---
lotuswordpro/source/filter/lwpdrawobj.hxx | 4 -
lotuswordpro/source/filter/lwpfilter.cxx | 20 +++----
lotuswordpro/source/filter/lwpfont.cxx | 2
lotuswordpro/source/filter/lwpfribmark.cxx | 2
lotuswordpro/source/filter/lwpsilverbullet.cxx | 40 +++++++-------
lotuswordpro/source/filter/schxmlwrapper.cxx | 2
lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx | 2
lotuswordpro/source/filter/xfilter/xftextcontent.cxx | 4 -
lotuswordpro/source/filter/xfilter/xftextstyle.cxx | 12 ++--
15 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit d9d740bd0b5b9dd8fe1863bd2e6f5e0c0bd09395
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 28 20:19:16 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 13
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 8c80070..345e29a 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -721,7 +721,7 @@ public:
OCX_OptionButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionButton" )))
{
msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
- //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
+ //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel"));
msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
@@ -848,7 +848,7 @@ class OCX_ListBox : public OCX_ModernControl
public:
OCX_ListBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))){
msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
- //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
+ //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel"));
msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
mnBackColor = 0x80000005;
mnForeColor = 0x80000008;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 3300c94..97d8337 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -259,11 +259,11 @@ HwpImportFilter::HwpImportFilter( const Reference< XMultiServiceFactory > xFact
p->setDocumentHandler( xHandler );
Sequence< Any > aArgs( 2 );
- aArgs[0] <<= OUString::createFromAscii( "Local" );
- aArgs[1] <<= OUString::createFromAscii( "Office" );
+ aArgs[0] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+ aArgs[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
Reference< XInterface > xUCB
( xFact->createInstanceWithArguments
- (OUString::createFromAscii("com.sun.star.ucb.UniversalContentBroker"),
+ (OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.UniversalContentBroker")),
aArgs));
p->setUCB( xUCB );
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index d628535..0e5a6da 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -36,7 +36,7 @@ sal_Bool SAL_CALL component_writeInfo(
sal_Int32 nPos = 0;
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( LotusWordProImportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
const Sequence< OUString > & rSNL = LotusWordProImportFilter_getSupportedServiceNames();
const OUString * pArray = rSNL.getConstArray();
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index 7184fd5..ac9ca62 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -206,7 +206,7 @@ void Lwp9Reader::ParseDocument()
pChangeMgr->ConvertAllChange(m_pStream);
doc->Parse(m_pStream);
- m_pStream->EndElement(::rtl::OUString::createFromAscii("office:body"));
+ m_pStream->EndElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:body")));
WriteDocEnd();
}
@@ -242,7 +242,7 @@ void Lwp9Reader::WriteDocHeader()
pAttrList->AddAttribute( A2OUSTR("office:class"), A2OUSTR("text"));
pAttrList->AddAttribute( A2OUSTR("office:version"), A2OUSTR("1.0"));
- m_pStream->StartElement( ::rtl::OUString::createFromAscii("office:document") );
+ m_pStream->StartElement( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document")) );
pAttrList->Clear();
}
@@ -251,7 +251,7 @@ void Lwp9Reader::WriteDocHeader()
*/
void Lwp9Reader::WriteDocEnd()
{
- m_pStream->EndElement(::rtl::OUString::createFromAscii("office:document"));
+ m_pStream->EndElement(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document")));
m_pStream->EndDocument();
}
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 8ac4356..652b975 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -103,21 +103,21 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
if(!pPara || !pIndent || !pBullOver)
{
// assert(false);
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
LwpSilverBullet* pSilverBullet = pPara->GetSilverBullet();
if (!pSilverBullet)
{
assert(false);
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
if (!pBulletPara)
{
assert(false);
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
LwpParaProperty* pProp = pPara->GetProperty(PP_LOCAL_INDENT);
@@ -185,7 +185,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
}
else
{
- rtl::OUString aPrefix = rtl::OUString::createFromAscii("");
+ rtl::OUString aPrefix = rtl::OUString();
LwpFrib* pFrib = pBulletParaFribs->HasFrib(FRIB_TAG_DOCVAR);
LwpFribDocVar* pDocVarFrib = NULL;
@@ -210,7 +210,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
{
for (sal_uInt8 nPos = 1; nPos < 10; nPos++)
{
- aPrefix = rtl::OUString::createFromAscii("");
+ aPrefix = rtl::OUString();
if (pParaNumber->GetStyleID() != NUMCHAR_other)
{
XFNumFmt aFmt;
@@ -223,7 +223,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
rtl::OUString aNumber = LwpSilverBullet::GetNumCharByStyleID(pParaNumber);
if (pParaNumber->GetStyleID() == NUMCHAR_01 || pParaNumber->GetStyleID() == NUMCHAR_Chinese4)
{
- aPrefix += rtl::OUString::createFromAscii("0");
+ aPrefix += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
}
aFmt.SetPrefix(aPrefix);
@@ -251,7 +251,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
}
pListStyle->SetListBullet(nPos, LwpSilverBullet::GetNumCharByStyleID(pParaNumber).toChar(),
- rtl::OUString::createFromAscii("Times New Roman"), aPrefix, aSuffix);
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Times New Roman")), aPrefix, aSuffix);
}
pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
@@ -281,7 +281,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
if (!m_pFoundry)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
LwpFontManager* pFontMgr = m_pFoundry->GetFontManger();
@@ -293,7 +293,7 @@ rtl::OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOv
for (sal_uInt8 nC = 1; nC < 11; nC++)
{
- pListStyle->SetListBullet(nC, cBulletChar, aFontName, rtl::OUString::createFromAscii(""), aSuffix);
+ pListStyle->SetListBullet(nC, cBulletChar, aFontName, rtl::OUString(), aSuffix);
if (pIndent->GetMRest() > 0.001)
{
@@ -555,10 +555,10 @@ rtl::OUString LwpBulletStyleMgr::GetDivisionName()
{
if (!m_pFoundry)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
- rtl::OUString aRet = rtl::OUString::createFromAscii("");
+ rtl::OUString aRet = rtl::OUString();
LwpDocument* pDoc = m_pFoundry->GetDocument();
if (pDoc)
@@ -578,13 +578,13 @@ rtl::OUString LwpBulletStyleMgr::GetSectionName(LwpPara* pPara)
LwpObjectID* pStoryID = pPara->GetStoryID();
if (pStoryID->IsNull())
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
LwpStory* pStory = static_cast<LwpStory*>(pStoryID->obj(VO_STORY));
if (!pStory)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
return pStory->GetSectionName();
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 9632dfa..e237310 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -340,31 +340,31 @@ rtl::OUString LwpDrawObj::GetArrowName(sal_uInt8 nArrowStyle)
{
default:
case AH_ARROW_FULLARROW:
- aArrowName = rtl::OUString::createFromAscii("Symmetric arrow");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Symmetric arrow"));
break;
case AH_ARROW_HALFARROW:
- aArrowName = rtl::OUString::createFromAscii("Arrow concave");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Arrow concave"));
break;
case AH_ARROW_LINEARROW:
- aArrowName = rtl::OUString::createFromAscii("arrow100");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("arrow100"));
break;
case AH_ARROW_INVFULLARROW:
- aArrowName = rtl::OUString::createFromAscii("reverse arrow");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reverse arrow"));
break;
case AH_ARROW_INVHALFARROW:
- aArrowName = rtl::OUString::createFromAscii("reverse concave arrow");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reverse concave arrow"));
break;
case AH_ARROW_INVLINEARROW:
- aArrowName = rtl::OUString::createFromAscii("reverse line arrow");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("reverse line arrow"));
break;
case AH_ARROW_TEE:
- aArrowName = rtl::OUString::createFromAscii("Dimension lines");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dimension lines"));
break;
case AH_ARROW_SQUARE:
- aArrowName = rtl::OUString::createFromAscii("Square");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Square"));
break;
case AH_ARROW_CIRCLE:
- aArrowName = rtl::OUString::createFromAscii("Circle");
+ aArrowName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Circle"));
break;
}
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 80c124e..e0e8f80 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -156,7 +156,7 @@ public:
protected:
virtual void Read() {}
- virtual rtl::OUString RegisterStyle() { return rtl::OUString::createFromAscii(""); }
+ virtual rtl::OUString RegisterStyle() { return rtl::OUString(); }
virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
};
@@ -350,7 +350,7 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle() {return rtl::OUString::createFromAscii("");}
+ virtual rtl::OUString RegisterStyle() {return rtl::OUString();}
virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
};
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx
index 4b740b4..8508414 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -117,9 +117,9 @@ sal_Bool LWPFilterReader::filter( const Sequence< PropertyValue >& aDescriptor )
::rtl::OUString sURL;
for( sal_Int32 i = 0; i < aDescriptor.getLength(); i++ )
{
- if( aDescriptor[i].Name == OUString::createFromAscii( "InputStream" ) )
+ if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
aDescriptor[i].Value >>= xInputStream;
- if( aDescriptor[i].Name == OUString::createFromAscii( "URL" ) )
+ if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
aDescriptor[i].Value >>= sURL;
}
@@ -261,7 +261,7 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
{
OUString strTemp;
aDescriptor[i].Value >>= strTemp;
- if( aDescriptor[i].Name == OUString::createFromAscii( "InputStream" ) )
+ if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")) )
{
uno::Reference< XInputStream> rInputStream;
aDescriptor[i].Value >>= rInputStream;
@@ -276,19 +276,19 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(!bOpenAsTemplate)
{
aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+ aDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
aDescriptor[nPropertyCount].Value <<= sal_True;
}
- return OUString::createFromAscii("wordpro_template");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template"));
}
else
{
- return OUString::createFromAscii("wordpro");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro"));
}
}
return ret;
}
- else if( aDescriptor[i].Name == OUString::createFromAscii( "URL" ) )
+ else if( aDescriptor[i].Name == OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) )
{
OUString sURL;
OUString sFileName;
@@ -311,14 +311,14 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro
if(!bOpenAsTemplate)
{
aDescriptor.realloc( nPropertyCount + 1 );
- aDescriptor[nPropertyCount].Name = ::rtl::OUString::createFromAscii("AsTemplate");
+ aDescriptor[nPropertyCount].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AsTemplate"));
aDescriptor[nPropertyCount].Value <<= sal_True;
}
- return OUString::createFromAscii("wordpro_template");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro_template"));
}
else
{
- return OUString::createFromAscii("wordpro");
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("wordpro"));
}
}
return ret;
diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx
index 30b0f2d..38966cf 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -269,7 +269,7 @@ OUString LwpFontTable::GetFaceName(sal_uInt16 index) //index: start from 1
{
assert(index>0);
if (index < 1)//add by , for fix crash,2005/12/20
- return OUString::createFromAscii("");//add end
+ return OUString();//add end
return m_pFontEntries[index-1].GetFaceName();
}
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index a4f17ed..3499f79 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -657,7 +657,7 @@ void LwpFribField::RegisterDateTimeStyle(OUString sFormula)
else if (sFormula == A2OUSTR("%FLeeeeoa") || sFormula == A2OUSTR("%FLffffooaa") || sFormula == A2OUSTR("%FLEEEEOA"))
{
pDateStyle = new XFDateStyle;
- // OUString lang = OUString::createFromAscii("zh-CN");
+ // OUString lang(RTL_CONSTASCII_USTRINGPARAM("zh-CN"));
// pDateStyle->SetLanguage( lang);
rtl::OUString sText;
pDateStyle->AddYear();
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index 40132db..1c109c5 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -181,7 +181,7 @@ void LwpSilverBullet::RegisterStyle()
}
pListStyle->SetListBullet(nPos, this->GetNumCharByStyleID(pParaNumber).toChar(),
- rtl::OUString::createFromAscii("Times New Roman"), aPrefix, aSuffix);
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Times New Roman")), aPrefix, aSuffix);
}
pListStyle->SetListPosition(nPos, 0.0, 0.635, 0.0);
@@ -215,13 +215,13 @@ rtl::OUString LwpSilverBullet::GetBulletFontName()
//foundry has been set?
if (!m_pFoundry)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
LwpFontManager* pFontMgr = m_pFoundry->GetFontManger();
if (!pFontMgr)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
sal_uInt32 nBulletFontID = m_pBulletPara->GetBulletFontID();
@@ -230,7 +230,7 @@ rtl::OUString LwpSilverBullet::GetBulletFontName()
//final fontid is valid?
if (nFinalFont > 255 || nFinalFont == 0)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
//get font name from font manager.
@@ -252,12 +252,12 @@ UChar32 LwpSilverBullet::GetBulletChar()
rtl::OUString LwpSilverBullet::GetPrefix()
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
rtl::OUString LwpSilverBullet::GetSuffix()
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
/**
* @short: Get the LwpPara object through story id.
@@ -290,10 +290,10 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
if (!pParaNumber)
{
assert(false);
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
- rtl::OUString strNumChar = rtl::OUString::createFromAscii("1");
+ rtl::OUString strNumChar(RTL_CONSTASCII_USTRINGPARAM("1"));
sal_uInt16 nStyleID = pParaNumber->GetStyleID();
UChar32 uC = 0x0000;
@@ -302,19 +302,19 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
case NUMCHAR_1:
case NUMCHAR_01:
case NUMCHAR_Chinese4:
- strNumChar = rtl::OUString::createFromAscii("1");
+ strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
break;
case NUMCHAR_A :
- strNumChar = rtl::OUString::createFromAscii("A");
+ strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("A"));
break;
case NUMCHAR_a:
- strNumChar = rtl::OUString::createFromAscii("a");
+ strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"));
break;
case NUMCHAR_I:
- strNumChar = rtl::OUString::createFromAscii("I");
+ strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("I"));
break;
case NUMCHAR_i:
- strNumChar = rtl::OUString::createFromAscii("i");
+ strNumChar = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("i"));
break;
case NUMCHAR_other:
uC = static_cast<UChar32>(pParaNumber->GetNumberChar());
@@ -339,7 +339,7 @@ rtl::OUString LwpSilverBullet::GetNumCharByStyleID(LwpFribParaNumber* pParaNumbe
}
break;
case NUMCHAR_none:
- strNumChar = rtl::OUString::createFromAscii("");
+ strNumChar = rtl::OUString();
break;
default:
break;
@@ -390,7 +390,7 @@ sal_uInt16 LwpSilverBullet::GetDisplayLevel(sal_uInt8 nPos)
*/
rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
{
- rtl::OUString aRet = rtl::OUString::createFromAscii("");
+ rtl::OUString aRet = rtl::OUString();
sal_uInt16 nHideBit = (1 << nPos);
sal_Bool bDivisionName = sal_False;
sal_Bool bSectionName = sal_False;
@@ -398,7 +398,7 @@ rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
LwpFrib* pParaFrib = m_pBulletPara->GetFribs()->GetFribs();
if (!pParaFrib)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
while (pParaFrib)
@@ -408,7 +408,7 @@ rtl::OUString LwpSilverBullet::GetAdditionalName(sal_uInt8 nPos)
ModifierInfo* pMoInfo = pParaFrib->GetModifiers();
if (!pMoInfo)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
sal_uInt16 nHideLevels = pMoInfo->aTxtAttrOverride.GetHideLevels();
sal_uInt16 nType = static_cast<LwpFribDocVar*>(pParaFrib)->GetType();
@@ -444,10 +444,10 @@ rtl::OUString LwpSilverBullet::GetDivisionName()
{
if (!m_pFoundry)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
- rtl::OUString aRet = rtl::OUString::createFromAscii("");
+ rtl::OUString aRet = rtl::OUString();
LwpDocument* pDoc = m_pFoundry->GetDocument();
if (pDoc)
@@ -467,7 +467,7 @@ rtl::OUString LwpSilverBullet::GetSectionName()
LwpStory* pStory = static_cast<LwpStory*>(m_aStory.obj(VO_STORY));
if (!pStory)
{
- return rtl::OUString::createFromAscii("");
+ return rtl::OUString();
}
return pStory->GetSectionName();
diff --git a/lotuswordpro/source/filter/schxmlwrapper.cxx b/lotuswordpro/source/filter/schxmlwrapper.cxx
index bf8e74d..bd847e3 100644
--- a/lotuswordpro/source/filter/schxmlwrapper.cxx
+++ b/lotuswordpro/source/filter/schxmlwrapper.cxx
@@ -290,7 +290,7 @@ sal_Int32 SchXMLWrapper::Import()
// get the sax parser component
uno::Reference< xml::sax::XParser > xXMLParser(
- xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )),
+ xServiceFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
uno::UNO_QUERY );
if( ! xXMLParser.is() )
diff --git a/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx b/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx
index 97d5036..25c3f42 100644
--- a/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfchartstreamtools.cxx
@@ -89,7 +89,7 @@ void XFChartStreamTools::ParseStream(SvStorageStreamRef rInpStream, Reference<XD
return;
}
xParser = uno::Reference< xml::sax::XParser > (
- xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Parser" )),
+ xServiceFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
uno::UNO_QUERY );
if( ! xParser.is() )
diff --git a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
index 78d4705..f538ecb 100644
--- a/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextcontent.cxx
@@ -90,8 +90,8 @@ rtl::OUString XFTextContent::GetText()
void XFTextContent::ToXml(IXFStream *pStrm)
{
// pStrm->Characters(m_strText);
- rtl::OUString sSpaceToken = rtl::OUString::createFromAscii(" ");
- sSpaceToken += rtl::OUString::createFromAscii(" ");
+ rtl::OUString sSpaceToken(RTL_CONSTASCII_USTRINGPARAM(" "));
+ sSpaceToken += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
rtl::OUString sSubString;
sal_Int32 nIndex = 0;
sal_Int32 nSize = m_strText.getLength();
diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
index cdebbc4..9104805 100644
--- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx
@@ -120,12 +120,12 @@ void XFTextStyle::ToXml(IXFStream *strm)
pAttrList->Clear();
if( style.getLength() )
- pAttrList->AddAttribute(rtl::OUString::createFromAscii("style:name"),GetStyleName());
+ pAttrList->AddAttribute(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:name")),GetStyleName());
if( GetParentStyleName().getLength() > 0 )
pAttrList->AddAttribute(A2OUSTR("style:parent-style-name"),GetParentStyleName());
- pAttrList->AddAttribute(rtl::OUString::createFromAscii("style:family"),A2OUSTR("text") );
- strm->StartElement(rtl::OUString::createFromAscii("style:style"));
+ pAttrList->AddAttribute(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:family")),A2OUSTR("text") );
+ strm->StartElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:style")));
//Font properties:
pAttrList->Clear();
@@ -133,10 +133,10 @@ void XFTextStyle::ToXml(IXFStream *strm)
if( m_pFont )
m_pFont->ToXml(strm);
- strm->StartElement(rtl::OUString::createFromAscii("style:properties"));
- strm->EndElement(rtl::OUString::createFromAscii("style:properties"));
+ strm->StartElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:properties")));
+ strm->EndElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:properties")));
- strm->EndElement(rtl::OUString::createFromAscii("style:style"));
+ strm->EndElement(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("style:style")));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list