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
Show 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) {
css::uno::TypeClass typeClass;
};
static Simple const simple[] = {
{ "void", css::uno::TypeClass_VOID },
{ "boolean", css::uno::TypeClass_BOOLEAN },
{ "byte", css::uno::TypeClass_BYTE },
{ "short", css::uno::TypeClass_SHORT },
{ "unsigned short", css::uno::TypeClass_UNSIGNED_SHORT },
{ "long", css::uno::TypeClass_LONG },
{ "unsigned long", css::uno::TypeClass_UNSIGNED_LONG },
{ "hyper", css::uno::TypeClass_HYPER },
{ "unsigned hyper", css::uno::TypeClass_UNSIGNED_HYPER },
{ "float", css::uno::TypeClass_FLOAT },
{ "double", css::uno::TypeClass_DOUBLE },
{ "char", css::uno::TypeClass_CHAR },
{ "string", css::uno::TypeClass_STRING },
{ "type", css::uno::TypeClass_TYPE },
{ "any", css::uno::TypeClass_ANY } };
{ OUStringLiteral("void"), css::uno::TypeClass_VOID },
{ OUStringLiteral("boolean"), css::uno::TypeClass_BOOLEAN },
{ OUStringLiteral("byte"), css::uno::TypeClass_BYTE },
{ OUStringLiteral("short"), css::uno::TypeClass_SHORT },
{ OUStringLiteral("unsigned short"),
css::uno::TypeClass_UNSIGNED_SHORT },
{ OUStringLiteral("long"), css::uno::TypeClass_LONG },
{ OUStringLiteral("unsigned long"), css::uno::TypeClass_UNSIGNED_LONG },
{ OUStringLiteral("hyper"), css::uno::TypeClass_HYPER },
{ OUStringLiteral("unsigned hyper"),
css::uno::TypeClass_UNSIGNED_HYPER },
{ OUStringLiteral("float"), css::uno::TypeClass_FLOAT },
{ OUStringLiteral("double"), css::uno::TypeClass_DOUBLE },
{ OUStringLiteral("char"), css::uno::TypeClass_CHAR },
{ 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) {
if (name == simple[i].name) {
return css::uno::makeAny<
......
extensions/source/logging/loggerconfig.cxx
Dosyayı görüntüle @ 3b53a4cd
......@@ -123,11 +123,11 @@ namespace logging
Variable const aVariables[] =
{
{"$(loggername)", sLoggerName},
{"$(date)", sDate},
{"$(time)", sTime},
{"$(datetime)", sDateTime},
{"$(pid)", aPID}
{OUStringLiteral("$(loggername)"), sLoggerName},
{OUStringLiteral("$(date)"), sDate},
{OUStringLiteral("$(time)"), sTime},
{OUStringLiteral("$(datetime)"), sDateTime},
{OUStringLiteral("$(pid)"), aPID}
};
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)
};
static const ColorConfigEntryData_Impl cNames[] =
{
{ "/DocColor" ,false },
{ "/DocBoundaries" ,true },
{ "/AppBackground" ,false },
{ "/ObjectBoundaries",true },
{ "/TableBoundaries" ,true },
{ "/FontColor" ,false },
{ "/Links" ,true },
{ "/LinksVisited" ,true },
{ "/Spell" ,false },
{ "/SmartTags" ,false },
{ "/Shadow" , true },
{ "/WriterTextGrid" ,false },
{ "/WriterFieldShadings",true },
{ "/WriterIdxShadings" ,true },
{ "/WriterDirectCursor" ,true },
{ "/WriterScriptIndicator" ,false },
{ "/WriterSectionBoundaries" ,true },
{ "/WriterHeaderFooterMark" ,false },
{ "/WriterPageBreaks" ,false },
{ "/HTMLSGML" ,false },
{ "/HTMLComment" ,false },
{ "/HTMLKeyword" ,false },
{ "/HTMLUnknown" ,false },
{ "/CalcGrid" ,false },
{ "/CalcPageBreak", false },
{ "/CalcPageBreakManual", false },
{ "/CalcPageBreakAutomatic", false },
{ "/CalcDetective" ,false },
{ "/CalcDetectiveError" ,false },
{ "/CalcReference" ,false },
{ "/CalcNotesBackground" ,false },
{ "/DrawGrid" ,true },
{ "/BASICIdentifier", false },
{ "/BASICComment" , false },
{ "/BASICNumber" , false },
{ "/BASICString" , false },
{ "/BASICOperator" , false },
{ "/BASICKeyword" , false },
{ "/BASICError", false },
{ "/SQLIdentifier", false },
{ "/SQLNumber", false },
{ "/SQLString", false },
{ "/SQLOperator", false },
{ "/SQLKeyword", false },
{ "/SQLParameter", false },
{ "/SQLComment", false }
{ OUStringLiteral("/DocColor") ,false },
{ OUStringLiteral("/DocBoundaries") ,true },
{ OUStringLiteral("/AppBackground") ,false },
{ OUStringLiteral("/ObjectBoundaries"),true },
{ OUStringLiteral("/TableBoundaries") ,true },
{ OUStringLiteral("/FontColor") ,false },
{ OUStringLiteral("/Links") ,true },
{ OUStringLiteral("/LinksVisited") ,true },
{ OUStringLiteral("/Spell") ,false },
{ OUStringLiteral("/SmartTags") ,false },
{ OUStringLiteral("/Shadow") , true },
{ OUStringLiteral("/WriterTextGrid") ,false },
{ OUStringLiteral("/WriterFieldShadings"),true },
{ OUStringLiteral("/WriterIdxShadings") ,true },
{ OUStringLiteral("/WriterDirectCursor") ,true },
{ OUStringLiteral("/WriterScriptIndicator") ,false },
{ OUStringLiteral("/WriterSectionBoundaries") ,true },
{ OUStringLiteral("/WriterHeaderFooterMark") ,false },
{ OUStringLiteral("/WriterPageBreaks") ,false },
{ OUStringLiteral("/HTMLSGML") ,false },
{ OUStringLiteral("/HTMLComment") ,false },
{ OUStringLiteral("/HTMLKeyword") ,false },
{ OUStringLiteral("/HTMLUnknown") ,false },
{ OUStringLiteral("/CalcGrid") ,false },
{ OUStringLiteral("/CalcPageBreak"), false },
{ OUStringLiteral("/CalcPageBreakManual"), false },
{ OUStringLiteral("/CalcPageBreakAutomatic"), false },
{ OUStringLiteral("/CalcDetective") ,false },
{ OUStringLiteral("/CalcDetectiveError") ,false },
{ OUStringLiteral("/CalcReference") ,false },
{ OUStringLiteral("/CalcNotesBackground") ,false },
{ OUStringLiteral("/DrawGrid") ,true },
{ OUStringLiteral("/BASICIdentifier"), false },
{ OUStringLiteral("/BASICComment") , false },
{ OUStringLiteral("/BASICNumber") , false },
{ OUStringLiteral("/BASICString") , false },
{ OUStringLiteral("/BASICOperator") , false },
{ OUStringLiteral("/BASICKeyword") , false },
{ OUStringLiteral("/BASICError"), false },
{ OUStringLiteral("/SQLIdentifier"), false },
{ OUStringLiteral("/SQLNumber"), false },
{ OUStringLiteral("/SQLString"), false },
{ OUStringLiteral("/SQLOperator"), false },
{ OUStringLiteral("/SQLKeyword"), false },
{ OUStringLiteral("/SQLParameter"), false },
{ OUStringLiteral("/SQLComment"), false }
};
int nIndex = 0;
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