Skip to content

C
core
Kaydet (Commit) 3b53a4cd authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Blind fix for apparently buggy GCC 4.8 

cf. <http://ci.libreoffice.org/job/lo_tb_master_linux_dbg/10952/console>

Change-Id: If947e338be0ab17f41f74f8e70e6281f46a7f57c
üst 88692a2d
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 66 deletions
cppuhelper/source/typemanager.cxx
Dosyayı görüntüle @ 3b53a4cd
...@@ -1815,21 +1815,23 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) { ...@@ -1815,21 +1815,23 @@ css::uno::Any cppuhelper::TypeManager::find(rtl::OUString const & name) {
css::uno::TypeClass typeClass; css::uno::TypeClass typeClass;
}; };
static Simple const simple[] = { static Simple const simple[] = {
{ "void", css::uno::TypeClass_VOID }, { OUStringLiteral("void"), css::uno::TypeClass_VOID },
{ "boolean", css::uno::TypeClass_BOOLEAN }, { OUStringLiteral("boolean"), css::uno::TypeClass_BOOLEAN },
{ "byte", css::uno::TypeClass_BYTE }, { OUStringLiteral("byte"), css::uno::TypeClass_BYTE },
{ "short", css::uno::TypeClass_SHORT }, { OUStringLiteral("short"), css::uno::TypeClass_SHORT },
{ "unsigned short", css::uno::TypeClass_UNSIGNED_SHORT }, { OUStringLiteral("unsigned short"),
{ "long", css::uno::TypeClass_LONG }, css::uno::TypeClass_UNSIGNED_SHORT },
{ "unsigned long", css::uno::TypeClass_UNSIGNED_LONG }, { OUStringLiteral("long"), css::uno::TypeClass_LONG },
{ "hyper", css::uno::TypeClass_HYPER }, { OUStringLiteral("unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
{ "unsigned hyper", css::uno::TypeClass_UNSIGNED_HYPER }, { OUStringLiteral("hyper"), css::uno::TypeClass_HYPER },
{ "float", css::uno::TypeClass_FLOAT }, { OUStringLiteral("unsigned hyper"),
{ "double", css::uno::TypeClass_DOUBLE }, css::uno::TypeClass_UNSIGNED_HYPER },
{ "char", css::uno::TypeClass_CHAR }, { OUStringLiteral("float"), css::uno::TypeClass_FLOAT },
{ "string", css::uno::TypeClass_STRING }, { OUStringLiteral("double"), css::uno::TypeClass_DOUBLE },
{ "type", css::uno::TypeClass_TYPE }, { OUStringLiteral("char"), css::uno::TypeClass_CHAR },
{ "any", css::uno::TypeClass_ANY } }; { OUStringLiteral("string"), css::uno::TypeClass_STRING },
{ OUStringLiteral("type"), css::uno::TypeClass_TYPE },
{ OUStringLiteral("any"), css::uno::TypeClass_ANY } };
for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) { for (std::size_t i = 0; i != SAL_N_ELEMENTS(simple); ++i) {
if (name == simple[i].name) { if (name == simple[i].name) {
return css::uno::makeAny< return css::uno::makeAny<
......
extensions/source/logging/loggerconfig.cxx
Dosyayı görüntüle @ 3b53a4cd
...@@ -123,11 +123,11 @@ namespace logging ...@@ -123,11 +123,11 @@ namespace logging
Variable const aVariables[] = Variable const aVariables[] =
{ {
{"$(loggername)", sLoggerName}, {OUStringLiteral("$(loggername)"), sLoggerName},
{"$(date)", sDate}, {OUStringLiteral("$(date)"), sDate},
{"$(time)", sTime}, {OUStringLiteral("$(time)"), sTime},
{"$(datetime)", sDateTime}, {OUStringLiteral("$(datetime)"), sDateTime},
{"$(pid)", aPID} {OUStringLiteral("$(pid)"), aPID}
}; };
for (Variable const & aVariable : aVariables) for (Variable const & aVariable : aVariables)
......
svtools/source/config/colorcfg.cxx
Dosyayı görüntüle @ 3b53a4cd
...@@ -113,52 +113,52 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme) ...@@ -113,52 +113,52 @@ uno::Sequence< OUString> GetPropertyNames(const OUString& rScheme)
}; };
static const ColorConfigEntryData_Impl cNames[] = static const ColorConfigEntryData_Impl cNames[] =
{ {
{ "/DocColor" ,false }, { OUStringLiteral("/DocColor") ,false },
{ "/DocBoundaries" ,true }, { OUStringLiteral("/DocBoundaries") ,true },
{ "/AppBackground" ,false }, { OUStringLiteral("/AppBackground") ,false },
{ "/ObjectBoundaries",true }, { OUStringLiteral("/ObjectBoundaries"),true },
{ "/TableBoundaries" ,true }, { OUStringLiteral("/TableBoundaries") ,true },
{ "/FontColor" ,false }, { OUStringLiteral("/FontColor") ,false },
{ "/Links" ,true }, { OUStringLiteral("/Links") ,true },
{ "/LinksVisited" ,true }, { OUStringLiteral("/LinksVisited") ,true },
{ "/Spell" ,false }, { OUStringLiteral("/Spell") ,false },
{ "/SmartTags" ,false }, { OUStringLiteral("/SmartTags") ,false },
{ "/Shadow" , true }, { OUStringLiteral("/Shadow") , true },
{ "/WriterTextGrid" ,false }, { OUStringLiteral("/WriterTextGrid") ,false },
{ "/WriterFieldShadings",true }, { OUStringLiteral("/WriterFieldShadings"),true },
{ "/WriterIdxShadings" ,true }, { OUStringLiteral("/WriterIdxShadings") ,true },
{ "/WriterDirectCursor" ,true }, { OUStringLiteral("/WriterDirectCursor") ,true },
{ "/WriterScriptIndicator" ,false }, { OUStringLiteral("/WriterScriptIndicator") ,false },
{ "/WriterSectionBoundaries" ,true }, { OUStringLiteral("/WriterSectionBoundaries") ,true },
{ "/WriterHeaderFooterMark" ,false }, { OUStringLiteral("/WriterHeaderFooterMark") ,false },
{ "/WriterPageBreaks" ,false }, { OUStringLiteral("/WriterPageBreaks") ,false },
{ "/HTMLSGML" ,false }, { OUStringLiteral("/HTMLSGML") ,false },
{ "/HTMLComment" ,false }, { OUStringLiteral("/HTMLComment") ,false },
{ "/HTMLKeyword" ,false }, { OUStringLiteral("/HTMLKeyword") ,false },
{ "/HTMLUnknown" ,false }, { OUStringLiteral("/HTMLUnknown") ,false },
{ "/CalcGrid" ,false }, { OUStringLiteral("/CalcGrid") ,false },
{ "/CalcPageBreak", false }, { OUStringLiteral("/CalcPageBreak"), false },
{ "/CalcPageBreakManual", false }, { OUStringLiteral("/CalcPageBreakManual"), false },
{ "/CalcPageBreakAutomatic", false }, { OUStringLiteral("/CalcPageBreakAutomatic"), false },
{ "/CalcDetective" ,false }, { OUStringLiteral("/CalcDetective") ,false },
{ "/CalcDetectiveError" ,false }, { OUStringLiteral("/CalcDetectiveError") ,false },
{ "/CalcReference" ,false }, { OUStringLiteral("/CalcReference") ,false },
{ "/CalcNotesBackground" ,false }, { OUStringLiteral("/CalcNotesBackground") ,false },
{ "/DrawGrid" ,true }, { OUStringLiteral("/DrawGrid") ,true },
{ "/BASICIdentifier", false }, { OUStringLiteral("/BASICIdentifier"), false },
{ "/BASICComment" , false }, { OUStringLiteral("/BASICComment") , false },
{ "/BASICNumber" , false }, { OUStringLiteral("/BASICNumber") , false },
{ "/BASICString" , false }, { OUStringLiteral("/BASICString") , false },
{ "/BASICOperator" , false }, { OUStringLiteral("/BASICOperator") , false },
{ "/BASICKeyword" , false }, { OUStringLiteral("/BASICKeyword") , false },
{ "/BASICError", false }, { OUStringLiteral("/BASICError"), false },
{ "/SQLIdentifier", false }, { OUStringLiteral("/SQLIdentifier"), false },
{ "/SQLNumber", false }, { OUStringLiteral("/SQLNumber"), false },
{ "/SQLString", false }, { OUStringLiteral("/SQLString"), false },
{ "/SQLOperator", false }, { OUStringLiteral("/SQLOperator"), false },
{ "/SQLKeyword", false }, { OUStringLiteral("/SQLKeyword"), false },
{ "/SQLParameter", false }, { OUStringLiteral("/SQLParameter"), false },
{ "/SQLComment", false } { OUStringLiteral("/SQLComment"), false }
}; };
int nIndex = 0; int nIndex = 0;
OUString sBase = "ColorSchemes/" OUString sBase = "ColorSchemes/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment