[Libreoffice-commits] .: l10ntools/layout l10ntools/source
Gert Faller
gfaller at kemper.freedesktop.org
Mon Nov 22 08:56:55 PST 2010
l10ntools/layout/tralay.cxx | 4 ++--
l10ntools/source/help/HelpCompiler.cxx | 2 +-
l10ntools/source/help/HelpLinker.cxx | 6 +++---
l10ntools/source/srciter.cxx | 14 +++++++-------
l10ntools/source/xmlparse.cxx | 20 ++++++++++----------
5 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit f1975882a763f1fd5d50c20166f2f6f263e32455
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Mon Nov 22 17:56:15 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs-gui 04
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index f2b16b0..11582b0 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -247,9 +247,9 @@ static void insertMarker( XMLParentNode *p, ByteString const& file )
if ( lst->Count() > 1
&& lst->GetObject( 2 )->GetNodeType() == XML_NODE_TYPE_DEFAULT )
i++;
- OUString marker = OUString::createFromAscii( "\n NOTE: This file has been generated automagically by transex3/layout/tralay,\n from source template: " )
+ OUString marker = OUString(RTL_CONSTASCII_USTRINGPARAM("\n NOTE: This file has been generated automagically by transex3/layout/tralay,\n from source template: "))
+ STRING( file )
- + OUString::createFromAscii( ".\n Do not edit, changes will be lost.\n" );
+ + OUString(RTL_CONSTASCII_USTRINGPARAM(".\n Do not edit, changes will be lost.\n"));
lst->Insert( new XMLComment( marker, 0 ), i );
}
}
diff --git a/l10ntools/source/help/HelpCompiler.cxx b/l10ntools/source/help/HelpCompiler.cxx
index 9ab709e..7c73aae 100644
--- a/l10ntools/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.cxx
@@ -567,7 +567,7 @@ namespace fs
rtl::OUString suFilename = aStatus.getFileName();
rtl::OUString suFullFileURL;
suFullFileURL += _suDirURL;
- suFullFileURL += rtl::OUString::createFromAscii("/");
+ suFullFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
suFullFileURL += suFilename;
if (aStatus.getFileType() == osl::FileStatus::Directory)
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 7d88db5..d6c8247 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -999,7 +999,7 @@ void HelpLinker::main( std::vector<std::string> &args,
//This part is used when compileExtensionHelp is called from the extensions manager.
//If extension help is compiled using helplinker in the build process
rtl::OUString aIdxCaptionPathFileURL( *pOfficeHelpPath );
- aIdxCaptionPathFileURL += rtl::OUString::createFromAscii( "/idxcaption.xsl" );
+ aIdxCaptionPathFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/idxcaption.xsl"));
rtl::OString aOStr_IdxCaptionPathFileURL( rtl::OUStringToOString
( aIdxCaptionPathFileURL, fs::getThreadTextEncoding() ) );
@@ -1024,7 +1024,7 @@ void HelpLinker::main( std::vector<std::string> &args,
//then -idxcontent must be supplied
//This part is used when compileExtensionHelp is called from the extensions manager.
rtl::OUString aIdxContentPathFileURL( *pOfficeHelpPath );
- aIdxContentPathFileURL += rtl::OUString::createFromAscii( "/idxcontent.xsl" );
+ aIdxContentPathFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/idxcontent.xsl"));
rtl::OString aOStr_IdxContentPathFileURL( rtl::OUStringToOString
( aIdxContentPathFileURL, fs::getThreadTextEncoding() ) );
@@ -1189,7 +1189,7 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
// i83624: Tree files
::rtl::OUString aTreeFileURL = aExtensionLanguageRoot;
- aTreeFileURL += rtl::OUString::createFromAscii( "/help.tree" );
+ aTreeFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/help.tree"));
osl::DirectoryItem aTreeFileItem;
osl::FileBase::RC rcGet = osl::DirectoryItem::get( aTreeFileURL, aTreeFileItem );
osl::FileStatus aFileStatus( FileStatusMask_FileSize );
diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index 9c9efe2..0d047e8 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -64,13 +64,13 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
if ( bInExecute ) {
rtl::OUString sDirName = aDirectory.getDirectoryName();
- static rtl::OUString WCARD1 ( rtl::OUString::createFromAscii( "unxlng" ) );
- static rtl::OUString WCARD2 ( rtl::OUString::createFromAscii( "unxsol" ) );
- static rtl::OUString WCARD3 ( rtl::OUString::createFromAscii( "wntmsc" ) );
- static rtl::OUString WCARD4 ( rtl::OUString::createFromAscii( "common" ) );
- static rtl::OUString WCARD5 ( rtl::OUString::createFromAscii( "unxmac" ) );
- static rtl::OUString WCARD6 ( rtl::OUString::createFromAscii( "unxubt" ) );
- static rtl::OUString WCARD7 ( rtl::OUString::createFromAscii( ".svn" ) );
+ static rtl::OUString WCARD1 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unxlng")) );
+ static rtl::OUString WCARD2 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unxsol")) );
+ static rtl::OUString WCARD3 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wntmsc")) );
+ static rtl::OUString WCARD4 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("common")) );
+ static rtl::OUString WCARD5 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unxmac")) );
+ static rtl::OUString WCARD6 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unxubt")) );
+ static rtl::OUString WCARD7 ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".svn")) );
if( sDirName.indexOf( WCARD1 , 0 ) > -1 ||
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 8267a5d..40aa199 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -899,7 +899,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
/*****************************************************************************/
//YD FIXME somewhere COMMENT is defined as 4!
static const String _COMMENT = String::CreateFromAscii("comment");
- static const OUString XML_LANG ( OUString::createFromAscii("xml-lang") );
+ static const OUString XML_LANG ( OUString(RTL_CONSTASCII_USTRINGPARAM("xml-lang")) );
if(pCur!=NULL){
if(rootelement){
@@ -921,16 +921,16 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
XMLElement *pElement = ( XMLElement * ) pCur;
if( !pElement->GetName().EqualsIgnoreCaseAscii( _COMMENT ) ){
- buffer.append( OUString::createFromAscii("\\<") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\<")) );
buffer.append( pElement->GetName() );
if ( pElement->GetAttributeList()){
for ( ULONG j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
OUString aAttrName( *pElement->GetAttributeList()->GetObject( j ) );
if( !aAttrName.equalsIgnoreAsciiCase( XML_LANG ) ) {
- buffer.append( OUString::createFromAscii(" ") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) );
buffer.append( aAttrName );
- buffer.append( OUString::createFromAscii("=") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("=")) );
buffer.append( OUString::createFromAscii("\\\"") );
buffer.append( pElement->GetAttributeList()->GetObject( j )->GetValue() );
buffer.append( OUString::createFromAscii("\\\"") );
@@ -938,17 +938,17 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
}
}
if ( !pElement->GetChildList())
- buffer.append( OUString::createFromAscii("/\\>") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("/\\>")) );
else {
- buffer.append( OUString::createFromAscii("\\>") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\>")) );
XMLChildNode* tmp=NULL;
for ( ULONG k = 0; k < pElement->GetChildList()->Count(); k++ ){
tmp=pElement->GetChildList()->GetObject( k );
Print( tmp, buffer , false);
}
- buffer.append( OUString::createFromAscii("\\</") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\</")) );
buffer.append( pElement->GetName() );
- buffer.append( OUString::createFromAscii("\\>") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\>")) );
}
}
}
@@ -961,9 +961,9 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
break;
case XML_NODE_TYPE_COMMENT: {
XMLComment *pComment = ( XMLComment * ) pCur;
- buffer.append( OUString::createFromAscii("<!--") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("<!--")) );
buffer.append( pComment->GetComment() );
- buffer.append( OUString::createFromAscii("-->") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("-->")) );
}
break;
case XML_NODE_TYPE_DEFAULT: {
More information about the Libreoffice-commits
mailing list