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

random OUString to String conversions

Browse Source 
Change-Id: I9cfb8e7183b9cce7c690f3a43a64b61a2aa8c754
This commit is contained in:
Noel Grandin
2013-10-16 15:43:54 +02:00
parent 218775e19c
commit d08ef4d265
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/source/dlgprov/dlgevtatt.cxx
View File

@@ -633,7 +633,7 @@ namespace dlgprov
ResMgr* pResMgr = SFX_APP()->GetSfxResManager(); ResMgr* pResMgr = SFX_APP()->GetSfxResManager();
if( pResMgr ) if( pResMgr )
{ {
String aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) ); OUString aRes( ResId(STR_ERRUNOEVENTBINDUNG, *pResMgr) );
OUString aQuoteChar( "\"" ); OUString aQuoteChar( "\"" );
OUString aOURes = aRes; OUString aOURes = aRes;

3
slideshow/source/engine/rehearsetimingsactivity.cxx
View File

@@ -163,8 +163,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
blackHole.SetMapMode( MAP_PIXEL ); blackHole.SetMapMode( MAP_PIXEL );
Rectangle rect; Rectangle rect;
const FontMetric metric( blackHole.GetFontMetric() ); const FontMetric metric( blackHole.GetFontMetric() );
blackHole.GetTextBoundRect( blackHole.GetTextBoundRect( rect, OUString("XX:XX:XX") );
rect, String("XX:XX:XX") );
maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 ); maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 ); maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 );
mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20)); mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20));

6
starmath/qa/cppunit/test_nodetotextvisitors.cxx
View File

@@ -20,14 +20,14 @@
namespace CppUnit { namespace CppUnit {
template<> template<>
struct assertion_traits<String> struct assertion_traits<OUString>
{ {
static bool equal(const String& x, const String& y) static bool equal(const OUString& x, const OUString& y)
{ {
return x == y; return x == y;
} }
static std::string toString(const String& x) static std::string toString(const OUString& x)
{ {
OStringStream ost; OStringStream ost;
ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr(); ost << OUStringToOString(x, RTL_TEXTENCODING_UTF8).getStr();

2
starmath/source/cfgitem.cxx
View File

@@ -819,7 +819,7 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
SmFontFormatList &rFntFmtList = GetFontFormatList(); SmFontFormatList &rFntFmtList = GetFontFormatList();
size_t nCnt = rFntFmtList.GetCount(); size_t nCnt = rFntFmtList.GetCount();
SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ]; SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ];
String *pId = new String [ nCnt ]; OUString *pId = new OUString [ nCnt ];
size_t k; size_t k;
for (k = 0; k < nCnt; ++k) for (k = 0; k < nCnt; ++k)
{ {

2
sw/qa/core/macros-test.cxx
View File

@@ -135,7 +135,7 @@ void SwMacrosTest::testVba()
sMsg.append ( aFileName ); sMsg.append ( aFileName );
CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() ); CPPUNIT_ASSERT_MESSAGE( OUStringToOString( sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
String sUrl = testInfo[i].sMacroUrl; OUString sUrl = testInfo[i].sMacroUrl;
Any aRet; Any aRet;
Sequence< sal_Int16 > aOutParamIndex; Sequence< sal_Int16 > aOutParamIndex;
Sequence< Any > aOutParam; Sequence< Any > aOutParam;