mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of OString("")

Browse Source 
Change-Id: I0874f81c35573048d05b3842806daa0db67f7887
Reviewed-on: https://gerrit.libreoffice.org/38386
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Arnaud Versini
2017-06-04 13:52:35 +02:00
committed by Noel Grandin
parent a9527c9524
commit c4ac732d81
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
codemaker/source/cppumaker/cppuoptions.cxx
View File

@@ -98,7 +98,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw IllegalArgument(tmp);
}
m_options["-nD"] = OString("");
m_options["-nD"] = OString();
break;
case 'T':
if (av[i][2] == '\0')
@@ -152,7 +152,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
OString tmp("'-L' could not be combined with '-C' or '-CS' option");
throw IllegalArgument(tmp);
}
m_options["-L"] = OString("");
m_options["-L"] = OString();
break;
case 'C':
if (av[i][2] == 'S')
@@ -173,7 +173,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
OString tmp("'-CS' could not be combined with '-L' or '-C' option");
throw IllegalArgument(tmp);
}
m_options["-CS"] = OString("");
m_options["-CS"] = OString();
break;
}
else if (av[i][2] != '\0')
@@ -192,7 +192,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
OString tmp("'-C' could not be combined with '-L' or '-CS' option");
throw IllegalArgument(tmp);
}
m_options["-C"] = OString("");
m_options["-C"] = OString();
break;
case 'G':
if (av[i][2] == 'c')
@@ -208,7 +208,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw IllegalArgument(tmp);
}
m_options["-Gc"] = OString("");
m_options["-Gc"] = OString();
break;
}
else if (av[i][2] != '\0')
@@ -222,7 +222,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw IllegalArgument(tmp);
}
m_options["-G"] = OString("");
m_options["-G"] = OString();
break;
case 'X': // support for eXtra type rdbs
{

6
codemaker/source/javamaker/javaoptions.cxx
View File

@@ -91,7 +91,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw IllegalArgument(tmp);
}
m_options["-nD"] = OString("");
m_options["-nD"] = OString();
break;
case 'T':
if (av[i][2] == '\0')
@@ -139,7 +139,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw IllegalArgument(tmp);
}
m_options["-Gc"] = OString("");
m_options["-Gc"] = OString();
break;
} else if (av[i][2] != '\0')
{
@@ -152,7 +152,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile)
throw IllegalArgument(tmp);
}
m_options["-G"] = OString("");
m_options["-G"] = OString();
break;
case 'X': // support for eXtra type rdbs
{

18
l10ntools/source/xrmmerge.cxx
View File

@@ -167,7 +167,7 @@ void XRMResParser::Execute( int nToken, char * pToken )
sGID = sNewGID;
}
bText = true;
sCurrentText = "";
sCurrentText = OString();
sCurrentOpenTag = rToken;
Output( rToken );
}
@@ -181,8 +181,8 @@ void XRMResParser::Execute( int nToken, char * pToken )
Output( sCurrentText );
EndOfText( sCurrentOpenTag, sCurrentCloseTag );
bText = false;
rToken = OString("");
sCurrentText = OString("");
rToken = OString();
sCurrentText = OString();
}
break;
@@ -200,7 +200,7 @@ void XRMResParser::Execute( int nToken, char * pToken )
if (bDisplayName) {
sGID = OString("dispname");
bText = true;
sCurrentText = "";
sCurrentText = OString();
sCurrentOpenTag = rToken;
Output( rToken );
}
@@ -216,8 +216,8 @@ void XRMResParser::Execute( int nToken, char * pToken )
Output( sCurrentText );
EndOfText( sCurrentOpenTag, sCurrentCloseTag );
bText = false;
rToken = OString("");
sCurrentText = OString("");
rToken = OString();
sCurrentText = OString();
}
}
break;
@@ -238,13 +238,13 @@ void XRMResParser::Execute( int nToken, char * pToken )
sResourceType = OString ( "description" );
sLangAttribute = OString ( "lang" );
sCurrentOpenTag = rToken;
sCurrentText = OString("");
sCurrentText = OString();
Output( rToken );
WorkOnDesc( sCurrentOpenTag, sCurrentText );
sCurrentCloseTag = rToken;
Output( sCurrentText );
rToken = OString("");
sCurrentText = OString("");
rToken = OString();
sCurrentText = OString();
}
}
break;

2
oox/source/export/drawingml.cxx
View File

@@ -2278,7 +2278,7 @@ void DrawingML::WritePresetShape( const char* pShape , std::vector< std::pair<sa
mpFS->startElementNS( XML_a, XML_avLst, FSEND );
for(auto iter = rAvList.begin() ; iter != rAvList.end() ; ++iter)
{
OString sName = OString("adj") + ( ( iter->first > 0 ) ? OString::number(iter->first) : OString("") );
OString sName = OString("adj") + ( ( iter->first > 0 ) ? OString::number(iter->first) : OString() );
OString sFmla = OString("val ") + OString::number( iter->second );
mpFS->singleElementNS( XML_a, XML_gd,

2
sw/source/filter/ww8/docxsdrexport.cxx
View File

@@ -978,7 +978,7 @@ OString lcl_ConvertTransparency(const Color& rColor)
return OString::number(nTransparencyPercent * oox::drawingml::PER_PERCENT);
}
else
return OString("");
return OString();
}
void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat)