commit 24e66db0eb8605dec7f212a028993d3f1d9b2621 Author: Herbert Duerr Date: Thu Feb 7 13:20:32 2013 +0100 C++11: prepare for the hash->unordered conversion diff --git a/main/autodoc/source/display/html/cfrstd.cxx b/main/autodoc/source/display/html/cfrstd.cxx index 98dfd0e..fbda3b6 100644 --- a/main/autodoc/source/display/html/cfrstd.cxx +++ b/main/autodoc/source/display/html/cfrstd.cxx @@ -98,136 +98,136 @@ bool bUse_OOoFrameDiv = true; //*************** These are used for IDL currently only! ******************** const char * const C_sStdStyle = - "/*See bottom of file for explanations.*/"CRLF + "/*See bottom of file for explanations.*/" CRLF CRLF - "body { background-color:#ffffff; }"CRLF + "body { background-color:#ffffff; }" CRLF CRLF - "h3 { font-size:13pt; font-weight:bold;"CRLF - " margin-top:3pt; margin-bottom:1pt; }"CRLF - "p, dt, dd, pre { font-size:11pt;"CRLF - " margin-top:3pt; margin-bottom:1pt; }"CRLF - "pre { font-family:monospace; }"CRLF + "h3 { font-size:13pt; font-weight:bold;" CRLF + " margin-top:3pt; margin-bottom:1pt; }" CRLF + "p, dt, dd, pre { font-size:11pt;" CRLF + " margin-top:3pt; margin-bottom:1pt; }" CRLF + "pre { font-family:monospace; }" CRLF CRLF - "table.navimain { background-color:#eeeeff; }"CRLF - "table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF + "table.navimain { background-color:#eeeeff; }" CRLF + "table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF CRLF - "td { font-size:11pt; }"CRLF - "td.title { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF - " line-height:30pt; background-color:#ccccff; text-align:center; }"CRLF - "td.subtitle { font-family: Arial; font-size:13pt;"CRLF - " line-height:20pt; background-color:#ccccff; }"CRLF - "td.crosstitle { font-size:12pt; font-weight:bold;"CRLF - " line-height:15pt; background-color:#eeeeff; }"CRLF - "td.imdetail { width:100%; background-color:#eeeeff; }"CRLF + "td { font-size:11pt; }" CRLF + "td.title { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF + " line-height:30pt; background-color:#ccccff; text-align:center; }" CRLF + "td.subtitle { font-family: Arial; font-size:13pt;" CRLF + " line-height:20pt; background-color:#ccccff; }" CRLF + "td.crosstitle { font-size:12pt; font-weight:bold;" CRLF + " line-height:15pt; background-color:#eeeeff; }" CRLF + "td.imdetail { width:100%; background-color:#eeeeff; }" CRLF CRLF - "td.imsum_left { width:30%; }"CRLF - "td.imsum_right { width:70%; }"CRLF + "td.imsum_left { width:30%; }" CRLF + "td.imsum_right { width:70%; }" CRLF CRLF - "td.navimain, a.navimain"CRLF - " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF - "td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF - " color:#ffffff; background-color:#2222ad; }"CRLF - "td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }"CRLF - "td.navisub, a.navisub"CRLF - " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF - "td.navimain, td.navisub"CRLF - " { padding-left:7pt; padding-right:7pt; }"CRLF + "td.navimain, a.navimain" CRLF + " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF + "td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF + " color:#ffffff; background-color:#2222ad; }" CRLF + "td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }" CRLF + "td.navisub, a.navisub" CRLF + " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF + "td.navimain, td.navisub" CRLF + " { padding-left:7pt; padding-right:7pt; }" CRLF CRLF - "a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF - "a.navimain, a.navisub { color:#000000; }"CRLF - ".dt { font-weight:bold; }"CRLF - ".namechain { font-size:13pt; font-weight:bold;"CRLF - " margin-top:3pt; margin-bottom:6pt; }"CRLF - ".title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF + "a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF + "a.navimain, a.navisub { color:#000000; }" CRLF + ".dt { font-weight:bold; }" CRLF + ".namechain { font-size:13pt; font-weight:bold;" CRLF + " margin-top:3pt; margin-bottom:6pt; }" CRLF + ".title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF ; const char * const C_sCssExplanations = - "/* Explanation of CSS classes:"CRLF + "/* Explanation of CSS classes:" CRLF CRLF - ".navimain Text in main navigation bar."CRLF - ".navisub Text in lower navigation bar."CRLF - "td.navimainself Cell in main navigation bar with \"selected\" shadow: You are here."CRLF - "td.navimainnone Cell in main navigation bar with no link."CRLF + ".navimain Text in main navigation bar." CRLF + ".navisub Text in lower navigation bar." CRLF + "td.navimainself Cell in main navigation bar with \"selected\" shadow: You are here." CRLF + "td.navimainnone Cell in main navigation bar with no link." CRLF CRLF - ".namechain Line with current module path."CRLF + ".namechain Line with current module path." CRLF CRLF - "td.crosstitle Comment box for bases (base interfaces etc.)"CRLF - "td.imsum_left Left part of such boxes."CRLF - "td.imsum_right Right part of such boxes."CRLF + "td.crosstitle Comment box for bases (base interfaces etc.)" CRLF + "td.imsum_left Left part of such boxes." CRLF + "td.imsum_right Right part of such boxes." CRLF CRLF - "td.title Main title of the page like \"interface XYz\""CRLF - ".subtitle Tables, and head cells of those, which list members"CRLF - " like \"method summary\" and \"method details\"."CRLF + "td.title Main title of the page like \"interface XYz\"" CRLF + ".subtitle Tables, and head cells of those, which list members" CRLF + " like \"method summary\" and \"method details\"." CRLF CRLF - "td.imdetail Background table of method's detail description."CRLF - "a.membertitle Method name (as jump label) in method's detail"CRLF - " description."CRLF - ".title2 smaller font prefixes to page titles"CRLF - "*/"CRLF + "td.imdetail Background table of method's detail description." CRLF + "a.membertitle Method name (as jump label) in method's detail" CRLF + " description." CRLF + ".title2 smaller font prefixes to page titles" CRLF + "*/" CRLF ; const char * const C_sStdStyle_withDivFrame = - "/*See bottom of file for explanations.*/"CRLF + "/*See bottom of file for explanations.*/" CRLF CRLF - "body { background-color:#ffffff; }"CRLF + "body { background-color:#ffffff; }" CRLF CRLF - "#adc-idlref h3 { font-size:13pt; font-weight:bold;"CRLF - " margin-top:3pt; margin-bottom:1pt; }"CRLF - "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre"CRLF - " { font-size:11pt;"CRLF - " margin-top:3pt; margin-bottom:1pt; }"CRLF - "#adc-idlref pre { font-family:monospace; }"CRLF + "#adc-idlref h3 { font-size:13pt; font-weight:bold;" CRLF + " margin-top:3pt; margin-bottom:1pt; }" CRLF + "#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre" CRLF + " { font-size:11pt;" CRLF + " margin-top:3pt; margin-bottom:1pt; }" CRLF + "#adc-idlref pre { font-family:monospace; }" CRLF CRLF - "#adc-idlref table.navimain { background-color:#eeeeff; }"CRLF - "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF + "#adc-idlref table.navimain { background-color:#eeeeff; }" CRLF + "#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF CRLF - "#adc-idlref td { font-size:11pt; }"CRLF - "#adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF - " line-height:30pt; background-color:#ccccff; text-align:center; }"CRLF - "#adc-idlref td.subtitle { font-family: Arial; font-size:13pt;"CRLF - " line-height:20pt; background-color:#ccccff; }"CRLF - "#adc-idlref td.crosstitle { font-size:12pt; font-weight:bold;"CRLF - " line-height:15pt; background-color:#eeeeff; }"CRLF - "#adc-idlref td.imdetail { width:100%; background-color:#eeeeff; }"CRLF + "#adc-idlref td { font-size:11pt; }" CRLF + "#adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF + " line-height:30pt; background-color:#ccccff; text-align:center; }" CRLF + "#adc-idlref td.subtitle { font-family: Arial; font-size:13pt;" CRLF + " line-height:20pt; background-color:#ccccff; }" CRLF + "#adc-idlref td.crosstitle { font-size:12pt; font-weight:bold;" CRLF + " line-height:15pt; background-color:#eeeeff; }" CRLF + "#adc-idlref td.imdetail { width:100%; background-color:#eeeeff; }" CRLF CRLF - "#adc-idlref td.imsum_left { width:30%; }"CRLF - "#adc-idlref td.imsum_right { width:70%; }"CRLF + "#adc-idlref td.imsum_left { width:30%; }" CRLF + "#adc-idlref td.imsum_right { width:70%; }" CRLF CRLF - "#adc-idlref td.navimain, #adc-idlref a.navimain"CRLF - " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF - "#adc-idlref td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF - " color:#ffffff; background-color:#2222ad; }"CRLF - "#adc-idlref td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }"CRLF - "#adc-idlref td.navisub, #adc-idlref a.navisub"CRLF - " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF - "#adc-idlref td.navimain, #adc-idlref td.navisub"CRLF - " { padding-left:7pt; padding-right:7pt; }"CRLF + "#adc-idlref td.navimain, #adc-idlref a.navimain" CRLF + " { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF + "#adc-idlref td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF + " color:#ffffff; background-color:#2222ad; }" CRLF + "#adc-idlref td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }" CRLF + "#adc-idlref td.navisub, #adc-idlref a.navisub" CRLF + " { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF + "#adc-idlref td.navimain, #adc-idlref td.navisub" CRLF + " { padding-left:7pt; padding-right:7pt; }" CRLF CRLF - "#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF - "#adc-idlref a.navimain, #adc-idlref a.navisub { color:#000000; }"CRLF - "#adc-idlref .dt { font-weight:bold; }"CRLF - "#adc-idlref .namechain { font-size:13pt; font-weight:bold;"CRLF - " margin-top:3pt; margin-bottom:6pt; }"CRLF - "#adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF - ""CRLF - "#adc-idlref table { empty-cells:show; }"CRLF - ""CRLF - "#adc-idlref .childlist td, "CRLF - "#adc-idlref .commentedlinks td, "CRLF - "#adc-idlref .memberlist td, "CRLF - "#adc-idlref .subtitle td, "CRLF - "#adc-idlref .crosstitle td { border: .1pt solid #000000; }"CRLF - ""CRLF - "#adc-idlref .flag-table td { border: .1pt solid #cccccc; } "CRLF - ""CRLF - "#adc-idlref .title-table td, "CRLF - "#adc-idlref .table-in-method td, "CRLF - "#adc-idlref .table-in-data td, "CRLF - "#adc-idlref .navimain td, "CRLF - "#adc-idlref .navisub td, "CRLF - "#adc-idlref .expl-table td, "CRLF - "#adc-idlref .param-table td { border: none; }"CRLF + "#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF + "#adc-idlref a.navimain, #adc-idlref a.navisub { color:#000000; }" CRLF + "#adc-idlref .dt { font-weight:bold; }" CRLF + "#adc-idlref .namechain { font-size:13pt; font-weight:bold;" CRLF + " margin-top:3pt; margin-bottom:6pt; }" CRLF + "#adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF + "" CRLF + "#adc-idlref table { empty-cells:show; }" CRLF + "" CRLF + "#adc-idlref .childlist td, " CRLF + "#adc-idlref .commentedlinks td, " CRLF + "#adc-idlref .memberlist td, " CRLF + "#adc-idlref .subtitle td, " CRLF + "#adc-idlref .crosstitle td { border: .1pt solid #000000; }" CRLF + "" CRLF + "#adc-idlref .flag-table td { border: .1pt solid #cccccc; } " CRLF + "" CRLF + "#adc-idlref .title-table td, " CRLF + "#adc-idlref .table-in-method td, " CRLF + "#adc-idlref .table-in-data td, " CRLF + "#adc-idlref .navimain td, " CRLF + "#adc-idlref .navisub td, " CRLF + "#adc-idlref .expl-table td, " CRLF + "#adc-idlref .param-table td { border: none; }" CRLF ; diff --git a/main/autodoc/source/display/html/outfile.cxx b/main/autodoc/source/display/html/outfile.cxx index 5f4bf4f..0f31dff 100644 --- a/main/autodoc/source/display/html/outfile.cxx +++ b/main/autodoc/source/display/html/outfile.cxx @@ -45,176 +45,176 @@ using csi::xml::AnAttribute; const char * const C_sStdStyle = - "body { background-color:#ffffff; }"CRLF - "h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF - "h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF - "h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF - "h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF - "dl { margin-top:1pt; margin-bottom:1pt; }"CRLF - "dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF - "dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF - "dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF - "dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF - "dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF - "dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF - "p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF - "pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF - "tr { font-size:10pt; }"CRLF - "td { font-size:10pt; }"CRLF + "body { background-color:#ffffff; }" CRLF + "h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF + "h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF + "h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF + "h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF + "dl { margin-top:1pt; margin-bottom:1pt; }" CRLF + "dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF + "dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF + "dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF + "dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF + "dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF + "dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF + "p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF + "pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF + "tr { font-size:10pt; }" CRLF + "td { font-size:10pt; }" CRLF CRLF - "dt.attention { color:#dd0000; }"CRLF + "dt.attention { color:#dd0000; }" CRLF CRLF - "div.title { text-align:center; line-height:26pt; background-color:#ccccff; }"CRLF - ".subtitle { background-color:#ccccff; }"CRLF + "div.title { text-align:center; line-height:26pt; background-color:#ccccff; }" CRLF + ".subtitle { background-color:#ccccff; }" CRLF CRLF - "td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF - "td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF - "td.flagno { font-family:Arial; font-size:8pt; }"CRLF - "td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF + "td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF + "td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF + "td.flagno { font-family:Arial; font-size:8pt; }" CRLF + "td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF CRLF - "td.navimain, td.navimain a"CRLF - " { background-color:#eeeeff; color:#000000;"CRLF - " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF - "td.navimainself"CRLF - " { background-color:#2222ad; color:#ffffff;"CRLF - " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF - "td.navimainnone"CRLF - " { background-color:#eeeeff; color:#000000;"CRLF - " font-family:Arial; font-size:12pt; }"CRLF + "td.navimain, td.navimain a" CRLF + " { background-color:#eeeeff; color:#000000;" CRLF + " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF + "td.navimainself" CRLF + " { background-color:#2222ad; color:#ffffff;" CRLF + " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF + "td.navimainnone" CRLF + " { background-color:#eeeeff; color:#000000;" CRLF + " font-family:Arial; font-size:12pt; }" CRLF CRLF - "div.define { font-family:Arial; background-color:#ccccff; }"CRLF + "div.define { font-family:Arial; background-color:#ccccff; }" CRLF CRLF - ".nqclass { color:#008800; }"CRLF + ".nqclass { color:#008800; }" CRLF CRLF - "h3.help { background-color:#eeeeff; margin-top:12pt; }"CRLF + "h3.help { background-color:#eeeeff; margin-top:12pt; }" CRLF CRLF - ".btpubl { color:#33ff33; }"CRLF - ".btprot { color:#cc9933; }"CRLF - ".btpriv { color:#ff6666; }"CRLF - ".btvpubl { color:#33ff33; font-style:italic; }"CRLF - ".btvprot { color:#cc9933; font-style:italic; }"CRLF - ".btvpriv { color:#ff6666; font-style:italic; }"CRLF - ".btself { font-weight:bold; }"CRLF + ".btpubl { color:#33ff33; }" CRLF + ".btprot { color:#cc9933; }" CRLF + ".btpriv { color:#ff6666; }" CRLF + ".btvpubl { color:#33ff33; font-style:italic; }" CRLF + ".btvprot { color:#cc9933; font-style:italic; }" CRLF + ".btvpriv { color:#ff6666; font-style:italic; }" CRLF + ".btself { font-weight:bold; }" CRLF ; const char * const C_sCssExplanations = - "/* Explanation of CSS classes:"CRLF + "/* Explanation of CSS classes:" CRLF CRLF - "dl.member provides coloured frame for function descriptions."CRLF - "dd.member makes the content of this frame white"CRLF + "dl.member provides coloured frame for function descriptions." CRLF + "dd.member makes the content of this frame white" CRLF CRLF - "dt.attention special colour for @attention remarks"CRLF + "dt.attention special colour for @attention remarks" CRLF CRLF - "div.title HTML page headline"CRLF - ".subtitle headline of lists of members and similar"CRLF + "div.title HTML page headline" CRLF + ".subtitle headline of lists of members and similar" CRLF CRLF - " These are for the flagtables in classes:"CRLF - "td.flagname Flag name."CRLF - "td.flagyes flag value \"yes\""CRLF - "td.flagno flag value \"no\""CRLF - "td.flagtext other flag value"CRLF + " These are for the flagtables in classes:" CRLF + "td.flagname Flag name." CRLF + "td.flagyes flag value \"yes\"" CRLF + "td.flagno flag value \"no\"" CRLF + "td.flagtext other flag value" CRLF CRLF CRLF - " These are for the main navigationbar:"CRLF - "td.navimain, td.navimain a"CRLF - " Links in navibar."CRLF - "td.navimainself Text in navibar which refers to current page."CRLF - "td.navimainnone Text which links to nothing."CRLF + " These are for the main navigationbar:" CRLF + "td.navimain, td.navimain a" CRLF + " Links in navibar." CRLF + "td.navimainself Text in navibar which refers to current page." CRLF + "td.navimainnone Text which links to nothing." CRLF CRLF CRLF - "div.define Subtitles on the #define/macro descriptions page"CRLF + "div.define Subtitles on the #define/macro descriptions page" CRLF CRLF - ".nqclass special color for classes in the qualification"CRLF - " on top of type pages like in:"CRLF - " ::nsp1::nsp2::_ClassXY_::"CRLF + ".nqclass special color for classes in the qualification" CRLF + " on top of type pages like in:" CRLF + " ::nsp1::nsp2::_ClassXY_::" CRLF CRLF - "h3.help Subtitles on the help page"CRLF + "h3.help Subtitles on the help page" CRLF CRLF - " These are for the base class tree on class pages:"CRLF - ".btpubl public base class"CRLF - ".btprot protected"CRLF - ".btpriv private"CRLF - ".btvpubl virtual public"CRLF - ".btvprot virtual protected"CRLF - ".btvpriv virtual private"CRLF - ".btself placeholder for currently displayed class"CRLF + " These are for the base class tree on class pages:" CRLF + ".btpubl public base class" CRLF + ".btprot protected" CRLF + ".btpriv private" CRLF + ".btvpubl virtual public" CRLF + ".btvprot virtual protected" CRLF + ".btvpriv virtual private" CRLF + ".btself placeholder for currently displayed class" CRLF CRLF - "*/"CRLF + "*/" CRLF ; const char * const C_sStdStyle_withDivFrame = - "body { background-color:#ffffff; }"CRLF - "#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF - "#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF - "#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF - "#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF - "#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; }"CRLF - "#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF - "#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF - "#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF - "#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF - "#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF - "#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF - "#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF - "#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF - "#adc-cppref tr { font-size:10pt; }"CRLF - "#adc-cppref td { font-size:10pt; }"CRLF + "body { background-color:#ffffff; }" CRLF + "#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF + "#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF + "#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF + "#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF + "#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; }" CRLF + "#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF + "#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF + "#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF + "#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF + "#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF + "#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF + "#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF + "#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF + "#adc-cppref tr { font-size:10pt; }" CRLF + "#adc-cppref td { font-size:10pt; }" CRLF CRLF - "#adc-cppref dt.attention { color:#dd0000; }"CRLF + "#adc-cppref dt.attention { color:#dd0000; }" CRLF CRLF - "#adc-cppref div.title { text-align:center; line-height:26pt; background-color:#ccccff; }"CRLF - "#adc-cppref .subtitle { background-color:#ccccff; }"CRLF + "#adc-cppref div.title { text-align:center; line-height:26pt; background-color:#ccccff; }" CRLF + "#adc-cppref .subtitle { background-color:#ccccff; }" CRLF CRLF - "#adc-cppref td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF - "#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF - "#adc-cppref td.flagno { font-family:Arial; font-size:8pt; }"CRLF - "#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF + "#adc-cppref td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF + "#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF + "#adc-cppref td.flagno { font-family:Arial; font-size:8pt; }" CRLF + "#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF CRLF - "#adc-cppref td.navimain, #adc-cppref td.navimain a"CRLF - " { background-color:#eeeeff; color:#000000;"CRLF - " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF - "#adc-cppref td.navimainself"CRLF - " { background-color:#2222ad; color:#ffffff;"CRLF - " font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF - "#adc-cppref td.navimainnone"CRLF - " { background-color:#eeeeff; color:#000000;"CRLF - " font-family:Arial; font-size:12pt; }"CRLF + "#adc-cppref td.navimain, #adc-cppref td.navimain a" CRLF + " { background-color:#eeeeff; color:#000000;" CRLF + " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF + "#adc-cppref td.navimainself" CRLF + " { background-color:#2222ad; color:#ffffff;" CRLF + " font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF + "#adc-cppref td.navimainnone" CRLF + " { background-color:#eeeeff; color:#000000;" CRLF + " font-family:Arial; font-size:12pt; }" CRLF CRLF - "#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }"CRLF + "#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }" CRLF CRLF - "#adc-cppref .nqclass { color:#008800; }"CRLF + "#adc-cppref .nqclass { color:#008800; }" CRLF CRLF - "#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; }"CRLF + "#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; }" CRLF CRLF - "#adc-cppref .btpubl { color:#33ff33; }"CRLF - "#adc-cppref .btprot { color:#cc9933; }"CRLF - "#adc-cppref .btpriv { color:#ff6666; }"CRLF - "#adc-cppref .btvpubl { color:#33ff33; font-style:italic; }"CRLF - "#adc-cppref .btvprot { color:#cc9933; font-style:italic; }"CRLF - "#adc-cppref .btvpriv { color:#ff6666; font-style:italic; }"CRLF - "#adc-cppref .btself { font-weight:bold; }"CRLF - ""CRLF - "#adc-cppref table { empty-cells:show; }"CRLF - ""CRLF - "#adc-cppref .childlist td, "CRLF - "#adc-cppref .commentedlinks td, "CRLF - "#adc-cppref .memberlist td, "CRLF - "#adc-cppref .subtitle td, "CRLF - "#adc-cppref .crosstitle td { border: .1pt solid #000000; }"CRLF - ""CRLF - "#adc-cppref .flag-table td { border: .1pt solid #cccccc; } "CRLF - ""CRLF - "#adc-cppref .title-table td, "CRLF - "#adc-cppref .table-in-method td, "CRLF - "#adc-cppref .table-in-data td, "CRLF - "#adc-cppref .navimain td, "CRLF - "#adc-cppref .navisub td, "CRLF - "#adc-cppref .expl-table td, "CRLF - "#adc-cppref .param-table td { border: none; }"CRLF + "#adc-cppref .btpubl { color:#33ff33; }" CRLF + "#adc-cppref .btprot { color:#cc9933; }" CRLF + "#adc-cppref .btpriv { color:#ff6666; }" CRLF + "#adc-cppref .btvpubl { color:#33ff33; font-style:italic; }" CRLF + "#adc-cppref .btvprot { color:#cc9933; font-style:italic; }" CRLF + "#adc-cppref .btvpriv { color:#ff6666; font-style:italic; }" CRLF + "#adc-cppref .btself { font-weight:bold; }" CRLF + "" CRLF + "#adc-cppref table { empty-cells:show; }" CRLF + "" CRLF + "#adc-cppref .childlist td, " CRLF + "#adc-cppref .commentedlinks td, " CRLF + "#adc-cppref .memberlist td, " CRLF + "#adc-cppref .subtitle td, " CRLF + "#adc-cppref .crosstitle td { border: .1pt solid #000000; }" CRLF + "" CRLF + "#adc-cppref .flag-table td { border: .1pt solid #cccccc; } " CRLF + "" CRLF + "#adc-cppref .title-table td, " CRLF + "#adc-cppref .table-in-method td, " CRLF + "#adc-cppref .table-in-data td, " CRLF + "#adc-cppref .navimain td, " CRLF + "#adc-cppref .navisub td, " CRLF + "#adc-cppref .expl-table td, " CRLF + "#adc-cppref .param-table td { border: none; }" CRLF ; diff --git a/main/basebmp/source/intconversion.hxx b/main/basebmp/source/intconversion.hxx index 31c6015..5cf552f 100644 --- a/main/basebmp/source/intconversion.hxx +++ b/main/basebmp/source/intconversion.hxx @@ -55,8 +55,8 @@ namespace basebmp /// Get converter from given data type to sal_uInt32 template< typename DataType > struct uInt32Converter { - typedef std::identity to; - typedef std::identity from; + typedef std_identity to; + typedef std_identity from; }; template< unsigned int RedIndex, unsigned int GreenIndex, diff --git a/main/boost/makefile.mk b/main/boost/makefile.mk index f825d12..85cd58a 100644 --- a/main/boost/makefile.mk +++ b/main/boost/makefile.mk @@ -115,6 +115,7 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math $(INCCOM)$/$(PRJNAME) + @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/move $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME) @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm $(INCCOM)$/$(PRJNAME) diff --git a/main/boost/prj/d.lst b/main/boost/prj/d.lst index 0bc3717..898b926 100644 --- a/main/boost/prj/d.lst +++ b/main/boost/prj/d.lst @@ -1037,8 +1037,9 @@ mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail ..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail ..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools ..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail -..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives +..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move ..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi +..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives ..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail ..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python ..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config diff --git a/main/cppu/source/uno/EnvStack.cxx b/main/cppu/source/uno/EnvStack.cxx index 5c2c71c..a8ab1c9 100644 --- a/main/cppu/source/uno/EnvStack.cxx +++ b/main/cppu/source/uno/EnvStack.cxx @@ -80,7 +80,8 @@ static void s_setCurrent(uno_Environment * pEnv) else { ThreadMap::iterator iEnv = s_threadMap.find(threadId); - s_threadMap.erase(iEnv); + if( iEnv != s_threadMap.end()) + s_threadMap.erase(iEnv); } } diff --git a/main/dbaccess/source/ui/browser/genericcontroller.cxx b/main/dbaccess/source/ui/browser/genericcontroller.cxx index 414d7d0..7722865 100644 --- a/main/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/main/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1665,7 +1665,7 @@ Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD ::std::transform( aInformationList.begin(), aInformationList.end(), aInformation.getArray(), - ::std::identity< DispatchInformation >() + std_identity< DispatchInformation >() ); return aInformation; diff --git a/main/desktop/source/migration/services/jvmfwk.cxx b/main/desktop/source/migration/services/jvmfwk.cxx index 197bd77..9ece830 100644 --- a/main/desktop/source/migration/services/jvmfwk.cxx +++ b/main/desktop/source/migration/services/jvmfwk.cxx @@ -324,7 +324,7 @@ void JavaMigration::migrateJavarc() return; OUString sValue; - rtl::Bootstrap javaini(m_sUserDir + OUSTR("/user/config/"SAL_CONFIGFILE("java"))); + rtl::Bootstrap javaini(m_sUserDir + OUSTR( "/user/config/" SAL_CONFIGFILE("java"))); sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue); OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME "] XJob::execute: Could not get Home entry from java.ini/javarc."); diff --git a/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 945ab24..eda2de0 100644 --- a/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -269,7 +269,7 @@ extern "C" int unopkg_main() return 0; } else if (isOption( info_version, &nPos )) { - dp_misc::writeConsole("\n"APP_NAME" Version 3.3\n"); + dp_misc::writeConsole( "\n" APP_NAME " Version 3.3\n"); return 0; } //consume all bootstrap variables which may occur before the subcommannd @@ -649,7 +649,7 @@ extern "C" int unopkg_main() } if (option_verbose) - dp_misc::writeConsole(OUSTR("\n"APP_NAME" done.\n")); + dp_misc::writeConsole( OUSTR( "\n" APP_NAME " done.\n")); //Force to release all bridges which connect us to the child processes disposeBridges(xLocalComponentContext); return 0; @@ -661,7 +661,7 @@ extern "C" int unopkg_main() } catch (ucb::CommandAbortedException &) { - dp_misc::writeConsoleError("\n"APP_NAME" aborted!\n"); + dp_misc::writeConsoleError( "\n" APP_NAME " aborted!\n"); } catch (deployment::DeploymentException & exc) { @@ -699,7 +699,7 @@ extern "C" int unopkg_main() OUSTR("\n")); } if (!bNoOtherErrorMsg) - dp_misc::writeConsoleError("\n"APP_NAME" failed.\n"); + dp_misc::writeConsoleError( "\n" APP_NAME " failed.\n"); disposeBridges(xLocalComponentContext); return 1; } diff --git a/main/external_deps.lst b/main/external_deps.lst index f20e911..155e51c 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -168,24 +168,6 @@ if ( true ) URL1 = http://archive.apache.org/dist/apr/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) -if ( true ) - MD5 = c441926f3a552ed3e5b274b62e86af16 - name = STLport-4.0.tar.gz - # This seems to be the original host, but the MD5 sum does not match. - # URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download - URL2 = $(OOO_EXTRAS)$(MD5)-$(name) - -if ( true ) - MD5 = 18f577b374d60b3c760a3a3350407632 - name = STLport-4.5.tar.gz - URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download - URL2 = $(OOO_EXTRAS)$(MD5)-$(name) - -if ( true ) - MD5 = 7376930b0d3f3d77a685d94c4a3acda8 - name = STLport-4.5-0119.tar.gz - URL1 = $(OOO_EXTRAS)$(MD5)-$(name) - if (SYSTEM_LIBXML != YES) MD5 = 8127a65e8c3b08856093099b52599c86 name = libxml2-2.7.8.tar.gz diff --git a/main/filter/source/graphicfilter/ieps/ieps.cxx b/main/filter/source/graphicfilter/ieps/ieps.cxx index 4bb3435..998d5a3 100644 --- a/main/filter/source/graphicfilter/ieps/ieps.cxx +++ b/main/filter/source/graphicfilter/ieps/ieps.cxx @@ -204,7 +204,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r TempFile aTemp; aTemp.EnableKillingFile(); rtl::OUString fileName = - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"EXESUFFIX)); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "pstoedit" EXESUFFIX)); rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f")); rtl::OUString arg2 = @@ -305,7 +305,7 @@ static bool RenderAsPNGThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe Graphic &rGraphic) { rtl::OUString fileName = - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"EXESUFFIX)); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "convert" EXESUFFIX)); // density in pixel/inch rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density")); // since the preview is also used for PDF-Export & printing on non-PS-printers, @@ -328,10 +328,10 @@ static bool RenderAsPNGThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, { #ifdef WNT rtl::OUString fileName = - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"EXESUFFIX)); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gswin32c" EXESUFFIX)); #else rtl::OUString fileName = - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"EXESUFFIX)); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gs" EXESUFFIX)); #endif rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q")); diff --git a/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx index 46cf3ab..8737016 100644 --- a/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -41,9 +41,9 @@ IndexEntrySupplier_asian::IndexEntrySupplier_asian( { implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian"; #ifdef SAL_DLLPREFIX - OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION); + OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION); #else - OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION); + OUString lib=OUString::createFromAscii("index_data" SAL_DLLEXTENSION); #endif hModule = osl_loadModuleRelative( &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT ); diff --git a/main/i18npool/source/localedata/LocaleNode.cxx b/main/i18npool/source/localedata/LocaleNode.cxx index 0e9cd47..d3b5dbd 100644 --- a/main/i18npool/source/localedata/LocaleNode.cxx +++ b/main/i18npool/source/localedata/LocaleNode.cxx @@ -158,27 +158,27 @@ LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttr #define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr()) -void print_OUString( const OUString& s ) +static void print_OUString( const OUString& s ) { printf( "%s", OSTR(s)); } -bool is_empty( const OUString& s ) +static bool is_empty_string( const OUString& s ) { return (s.getLength()==0) || (s.getLength()==1 && s[0]=='\n'); } -void print_indent( int depth ) +static void print_indent( int depth ) { for( int i=0; i"); printf("\n"); - if( !is_empty( p->getValue() ) ) + if( !is_empty_string( p->getValue() ) ) { print_indent( depth+1 ); printf("value: "); diff --git a/main/i18npool/source/textconversion/textconversion.cxx b/main/i18npool/source/textconversion/textconversion.cxx index 67a4469..97a2210 100644 --- a/main/i18npool/source/textconversion/textconversion.cxx +++ b/main/i18npool/source/textconversion/textconversion.cxx @@ -37,9 +37,9 @@ extern "C" { static void SAL_CALL thisModule() {} } TextConversion::TextConversion() { #ifdef SAL_DLLPREFIX - OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION); + OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "textconv_dict" SAL_DLLEXTENSION); #else - OUString lib=OUString::createFromAscii("textconv_dict"SAL_DLLEXTENSION); + OUString lib=OUString::createFromAscii( "textconv_dict" SAL_DLLEXTENSION); #endif hModule = osl_loadModuleRelative( &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT ); diff --git a/main/i18npool/source/transliteration/textToPronounce_zh.cxx b/main/i18npool/source/transliteration/textToPronounce_zh.cxx index 79835b4..a80259c 100644 --- a/main/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/main/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -144,9 +144,9 @@ extern "C" { static void SAL_CALL thisModule() {} } TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name) { #ifdef SAL_DLLPREFIX - OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION); + OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION); #else - OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION); + OUString lib=OUString::createFromAscii( "index_data" SAL_DLLEXTENSION); #endif hModule = osl_loadModuleRelative( &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT ); diff --git a/main/io/source/acceptor/acc_socket.cxx b/main/io/source/acceptor/acc_socket.cxx index 2c07d48..e9d1dd6 100644 --- a/main/io/source/acceptor/acc_socket.cxx +++ b/main/io/source/acceptor/acc_socket.cxx @@ -66,7 +66,7 @@ namespace io_acceptor { typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > - XStreamListener_hash_set; + XStreamListener_unordered_set; class SocketConnection : public ::cppu::WeakImplHelper2< @@ -112,13 +112,13 @@ namespace io_acceptor { sal_Bool _started; sal_Bool _closed; sal_Bool _error; - XStreamListener_hash_set _listeners; + XStreamListener_unordered_set _listeners; }; template void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t) { - XStreamListener_hash_set listeners; + XStreamListener_unordered_set listeners; { ::osl::MutexGuard guard(pCon->_mutex); diff --git a/main/io/source/connector/connector.hxx b/main/io/source/connector/connector.hxx index e29ff12..d62a734 100644 --- a/main/io/source/connector/connector.hxx +++ b/main/io/source/connector/connector.hxx @@ -58,7 +58,7 @@ namespace stoc_connector typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > - XStreamListener_hash_set; + XStreamListener_unordered_set; class PipeConnection : public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection > @@ -133,7 +133,7 @@ namespace stoc_connector sal_Bool _closed; sal_Bool _error; - XStreamListener_hash_set _listeners; + XStreamListener_unordered_set _listeners; }; } diff --git a/main/io/source/connector/ctr_socket.cxx b/main/io/source/connector/ctr_socket.cxx index e6fe05e..c8b9c7a 100644 --- a/main/io/source/connector/ctr_socket.cxx +++ b/main/io/source/connector/ctr_socket.cxx @@ -39,7 +39,7 @@ namespace stoc_connector { template void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t) { - XStreamListener_hash_set listeners; + XStreamListener_unordered_set listeners; { ::osl::MutexGuard guard(pCon->_mutex); diff --git a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 27effc5..00b636f 100644 --- a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -498,7 +498,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( sRuntimeLib, osl_getThreadTextEncoding()); rtl::OString sSymbol = rtl::OUStringToOString( sSymbolCreateJava, osl_getThreadTextEncoding()); - fprintf(stderr,"[Java framework]sunjavaplugin"SAL_DLLEXTENSION + fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION "Java runtime library: %s does not export symbol %s !\n", sLib.getStr(), sSymbol.getStr()); return JFW_PLUGIN_E_VM_CREATION_FAILED; @@ -589,13 +589,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( rtl::OUString message; if( err < 0) { - fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION + fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION "Can not create Java Virtual Machine\n"); errcode = JFW_PLUGIN_E_VM_CREATION_FAILED; } else if( err > 0) { - fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION + fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION "Can not create JavaVirtualMachine, abort handler was called.\n"); errcode = JFW_PLUGIN_E_VM_CREATION_FAILED; } @@ -603,7 +603,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( else { *ppVm = pJavaVM; - JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n"); + JFW_TRACE2( "[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n"); } diff --git a/main/rsc/source/rsc/rsc.cxx b/main/rsc/source/rsc/rsc.cxx index a30cd0f..84e3d8d 100644 --- a/main/rsc/source/rsc/rsc.cxx +++ b/main/rsc/source/rsc/rsc.cxx @@ -1298,7 +1298,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aBaseFileName += ByteString::CreateFromInt32( 0 ); if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) ) - aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) ); + aEntryVector.push_back( ::std::pair< ByteString, sal_Int32 >( aFilePath, nNumber ) ); else aMissingImages.push_back( aBaseFileName ); } diff --git a/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 81fc1ed..ad5be89 100644 --- a/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -189,7 +189,7 @@ void MasterPageObserver::Implementation::RegisterDocument ( SdDrawDocument& rDocument) { // Gather the names of all the master pages in the given document. - MasterPageContainer::data_type aMasterPageSet; + MasterPageContainer::mapped_type aMasterPageSet; sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD); for (sal_uInt16 nIndex=0; nIndex( new GenericAnimation< AnimationBase, - ::std::identity< typename AnimationBase::ValueType > >( + std_identity< typename AnimationBase::ValueType > >( rShapeManager, nFlags, pIsValid, @@ -611,8 +611,8 @@ namespace slideshow pGetValue, pSetValue, // no modification necessary, use identity functor here - ::std::identity< typename AnimationBase::ValueType >(), - ::std::identity< typename AnimationBase::ValueType >() ) ); + std_identity< typename AnimationBase::ValueType >(), + std_identity< typename AnimationBase::ValueType >())); } class Scaler diff --git a/main/solenv/gbuild/platform/linux.mk b/main/solenv/gbuild/platform/linux.mk index ed74e12..5ca2420 100644 --- a/main/solenv/gbuild/platform/linux.mk +++ b/main/solenv/gbuild/platform/linux.mk @@ -83,6 +83,7 @@ gb_CFLAGS := \ -pipe \ gb_CXXFLAGS := \ + -std=c++11 \ -Wall \ -Wendif-labels \ -Wextra \ diff --git a/main/solenv/inc/unxlng.mk b/main/solenv/inc/unxlng.mk index ef745f2..11ee3c1 100644 --- a/main/solenv/inc/unxlng.mk +++ b/main/solenv/inc/unxlng.mk @@ -39,7 +39,8 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) +CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 +CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -83,7 +84,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible -CFLAGSCXX= -pipe $(ARCH_FLAGS) +CFLAGSCXX= -std=c++11 -pipe $(ARCH_FLAGS) .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" CFLAGSCXX += -fvisibility-inlines-hidden .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -221,24 +222,6 @@ X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive -.IF "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlportstlg -LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug -LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) -.ENDIF -.ELSE # "$(USE_STLP_DEBUG)" != "" -.IF "$(STLPORT_VER)" >= "500" -LIBSTLPORT=$(DYNAMIC) -lstlport -LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) -.ELSE -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -.ENDIF -.ENDIF # "$(USE_STLP_DEBUG)" != "" - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) # name of library manager diff --git a/main/stlport/systemstl/functional b/main/stlport/systemstl/functional index 5a2c395..d3337e2 100644 --- a/main/stlport/systemstl/functional +++ b/main/stlport/systemstl/functional @@ -52,5 +52,7 @@ namespace std # error UNSUPPORTED COMPILER #endif +template< typename T> struct std_identity { T operator() (const T& v) const { return v; }; }; + #endif /* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/main/svl/inc/svl/itemset.hxx b/main/svl/inc/svl/itemset.hxx index 86ef276..1a71364 100644 --- a/main/svl/inc/svl/itemset.hxx +++ b/main/svl/inc/svl/itemset.hxx @@ -25,11 +25,7 @@ #include "svl/svldllapi.h" -#if STLPORT_VERSION<321 -#include -#else #include // std::va_list and friends -#endif #include #include #include diff --git a/main/svl/source/items/itemset.cxx b/main/svl/source/items/itemset.cxx index 5171d76..c4d6b58 100644 --- a/main/svl/source/items/itemset.cxx +++ b/main/svl/source/items/itemset.cxx @@ -25,10 +25,7 @@ #include "precompiled_svl.hxx" #include - -#if STLPORT_VERSION>=321 #include -#endif #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS diff --git a/main/sw/source/ui/app/appenv.cxx b/main/sw/source/ui/app/appenv.cxx index 79c2870..afb557f 100644 --- a/main/sw/source/ui/app/appenv.cxx +++ b/main/sw/source/ui/app/appenv.cxx @@ -24,11 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - -#if STLPORT_VERSION>=321 #include -#endif - #include diff --git a/main/sw/source/ui/app/applab.cxx b/main/sw/source/ui/app/applab.cxx index 7a88ccd..a86f14b 100644 --- a/main/sw/source/ui/app/applab.cxx +++ b/main/sw/source/ui/app/applab.cxx @@ -24,11 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - -#if STLPORT_VERSION>=321 #include -#endif - #include diff --git a/main/sw/source/ui/dbui/dbmgr.cxx b/main/sw/source/ui/dbui/dbmgr.cxx index 6c73e79..cb40fb1 100644 --- a/main/sw/source/ui/dbui/dbmgr.cxx +++ b/main/sw/source/ui/dbui/dbmgr.cxx @@ -23,11 +23,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#if STLPORT_VERSION>=321 + #include -#endif +#include -#include #include #include #include diff --git a/main/sw/source/ui/shells/textsh2.cxx b/main/sw/source/ui/shells/textsh2.cxx index cb763dd..86e31f8 100644 --- a/main/sw/source/ui/shells/textsh2.cxx +++ b/main/sw/source/ui/shells/textsh2.cxx @@ -24,11 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - - -#if STLPORT_VERSION>=321 #include -#endif #include #include diff --git a/main/sw/source/ui/uiview/viewprt.cxx b/main/sw/source/ui/uiview/viewprt.cxx index d6dbd8e..db2e3bd 100644 --- a/main/sw/source/ui/uiview/viewprt.cxx +++ b/main/sw/source/ui/uiview/viewprt.cxx @@ -26,9 +26,7 @@ #include -#if STLPORT_VERSION>=321 #include -#endif #ifndef _CMDID_H #include diff --git a/main/sw/source/ui/wrtsh/wrtsh1.cxx b/main/sw/source/ui/wrtsh/wrtsh1.cxx index 3d02787..f9b3e26 100644 --- a/main/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/main/sw/source/ui/wrtsh/wrtsh1.cxx @@ -33,9 +33,7 @@ #include #include -#if STLPORT_VERSION>=321 #include // prevent conflict between exception and std::exception -#endif #include #include #include diff --git a/main/tmp_unordered.sh b/main/tmp_unordered.sh new file mode 100644 index 0000000..00dfa8d --- /dev/null +++ b/main/tmp_unordered.sh @@ -0,0 +1,17 @@ +#bin/sh +#Places where this script doesn't give working results: +# codemaker +# cppu +# +#Places where it shouldn't be used: +# reportbuilder - we don't build this anymore. + +find . -type f | egrep "[ch]xx$|.h$" | xargs sed -i.old \ + -e 's|||g' \ + -e 's|||g' \ + -e 's|\(std::\)*hash_map|boost::unordered_map|g' \ + -e 's|\(std::\)*hash_multimap|boost::unordered_multimap|g' \ + -e 's|\(std::\)*hash_set|boost::unordered_set|g' \ + -e 's|\(std::\)*hash_multiset|boost::unordered_multiset|g' \ + -e 's|std::hash|boost::hash|g' + diff --git a/main/tools/inc/tools/diagnose_ex.h b/main/tools/inc/tools/diagnose_ex.h index e736f8e..c85dca1 100644 --- a/main/tools/inc/tools/diagnose_ex.h +++ b/main/tools/inc/tools/diagnose_ex.h @@ -86,14 +86,14 @@ OSL_ENSURE(c, m); \ throw ::com::sun::star::lang::IllegalArgumentException( \ ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \ - ::rtl::OUString::createFromAscii(",\n"m), \ + ::rtl::OUString::createFromAscii(",\n" m), \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \ 0 ); } #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \ OSL_ENSURE(c, m); \ throw ::com::sun::star::lang::IllegalArgumentException( \ ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \ - ::rtl::OUString::createFromAscii(",\n"m), \ + ::rtl::OUString::createFromAscii(",\n" m), \ ifc, \ arg ); } @@ -104,13 +104,13 @@ OSL_ENSURE(c, m); \ throw ::com::sun::star::uno::RuntimeException( \ ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \ - ::rtl::OUString::createFromAscii(",\n"m), \ + ::rtl::OUString::createFromAscii(",\n" m), \ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); } #define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \ OSL_ENSURE(c, m); \ throw ::com::sun::star::uno::RuntimeException( \ ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \ - ::rtl::OUString::createFromAscii(",\n"m), \ + ::rtl::OUString::createFromAscii(",\n" m), \ ifc ); } /** This macro asserts the given condition (in debug mode), and diff --git a/main/unotools/source/config/bootstrap.cxx b/main/unotools/source/config/bootstrap.cxx index 0d14151..41a3728 100644 --- a/main/unotools/source/config/bootstrap.cxx +++ b/main/unotools/source/config/bootstrap.cxx @@ -149,7 +149,7 @@ namespace utl rtl::OUString uri; rtl::Bootstrap::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); - s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"BOOTSTRAP_DATA_NAME))); + s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME))); } return *s_pData; } @@ -693,7 +693,7 @@ OUString Bootstrap::getAllUsersValue(OUString const& _sDefault) { OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS)); - rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) ); + rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SETUP_DATA_NAME ) ) ); OUString sResult; aData.getFrom( csAllUsersItem, sResult, _sDefault ); return sResult; @@ -910,7 +910,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa rtl::Bootstrap::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri); rtl::Bootstrap aData( uri + - OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"SAL_CONFIGFILE("version"))) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist return sal_False; diff --git a/main/unotools/source/config/cmdoptions.cxx b/main/unotools/source/config/cmdoptions.cxx index 9531952..d0b7a32 100644 --- a/main/unotools/source/config/cmdoptions.cxx +++ b/main/unotools/source/config/cmdoptions.cxx @@ -102,7 +102,7 @@ class SvtCmdOptions void SetContainerSize( sal_Int32 nSize ) { - m_aCommandHashMap.resize( nSize ); + m_aCommandHashMap.rehash( nSize ); } sal_Bool Lookup( const OUString& aCmd ) const diff --git a/main/unotools/source/config/inetoptions.cxx b/main/unotools/source/config/inetoptions.cxx index 5884786..8754492 100644 --- a/main/unotools/source/config/inetoptions.cxx +++ b/main/unotools/source/config/inetoptions.cxx @@ -207,13 +207,10 @@ void SvtInetOptions::Impl::notifyListeners( star::uno::Sequence< rtl::OUString > const & rKeys) { - typedef - std::vector< std::pair< star::uno::Reference< - star::beans::XPropertiesChangeListener >, - star::uno::Sequence< - star::beans::PropertyChangeEvent > > > - List; - List aNotifications; + typedef std::pair< star::uno::Reference< star::beans::XPropertiesChangeListener >, + star::uno::Sequence< star::beans::PropertyChangeEvent > > Listen2EventPair; + typedef std::vector< Listen2EventPair > NotificationList; + NotificationList aNotifications; { osl::MutexGuard aGuard(m_aMutex); aNotifications.reserve(m_aListeners.size()); @@ -240,16 +237,10 @@ SvtInetOptions::Impl::notifyListeners( } } if (nCount > 0) - { - aEvents.realloc(nCount); - aNotifications. - push_back(std::make_pair< List::value_type::first_type, - List::value_type::second_type >( - aIt->first, aEvents)); - } + aNotifications.push_back( Listen2EventPair( aIt->first, aEvents)); } } - for (List::size_type i = 0; i < aNotifications.size(); ++i) + for (NotificationList::size_type i = 0; i < aNotifications.size(); ++i) if (aNotifications[i].first.is()) aNotifications[i].first-> propertiesChange(aNotifications[i].second); diff --git a/main/vcl/source/gdi/configsettings.cxx b/main/vcl/source/gdi/configsettings.cxx index 5a57a1e..372ed38 100644 --- a/main/vcl/source/gdi/configsettings.cxx +++ b/main/vcl/source/gdi/configsettings.cxx @@ -131,7 +131,7 @@ void SettingsConfigItem::getValues() m_aSettings.clear(); Sequence< OUString > aNames( GetNodeNames( OUString() ) ); - m_aSettings.resize( aNames.getLength() ); + m_aSettings.rehash( aNames.getLength() ); for( int j = 0; j < aNames.getLength(); j++ ) { diff --git a/main/vcl/unx/generic/gdi/salgdi3.cxx b/main/vcl/unx/generic/gdi/salgdi3.cxx index 37dde06..8dbceb1 100644 --- a/main/vcl/unx/generic/gdi/salgdi3.cxx +++ b/main/vcl/unx/generic/gdi/salgdi3.cxx @@ -131,7 +131,7 @@ void PspKernInfo::Initialize() const return; // feed psprint's kerning list into a lookup-friendly container - maUnicodeKernPairs.resize( rKernPairs.size() ); + maUnicodeKernPairs.rehash( rKernPairs.size() ); PspKernPairs::const_iterator it = rKernPairs.begin(); for(; it != rKernPairs.end(); ++it ) { diff --git a/main/vcl/unx/headless/svptext.cxx b/main/vcl/unx/headless/svptext.cxx index 90ff6c8..79a60d5 100644 --- a/main/vcl/unx/headless/svptext.cxx +++ b/main/vcl/unx/headless/svptext.cxx @@ -189,7 +189,7 @@ void PspKernInfo::Initialize() const return; // feed psprint's kerning list into a lookup-friendly container - maUnicodeKernPairs.resize( rKernPairs.size() ); + maUnicodeKernPairs.rehash( rKernPairs.size() ); PspKernPairs::const_iterator it = rKernPairs.begin(); for(; it != rKernPairs.end(); ++it ) { diff --git a/main/xmloff/source/transform/EventOASISTContext.cxx b/main/xmloff/source/transform/EventOASISTContext.cxx index 6b156b6..fd82f9f 100644 --- a/main/xmloff/source/transform/EventOASISTContext.cxx +++ b/main/xmloff/source/transform/EventOASISTContext.cxx @@ -63,7 +63,7 @@ XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform if( pInit ) { XMLTransformerOASISEventMap_Impl::key_type aKey; - XMLTransformerOASISEventMap_Impl::data_type aData; + XMLTransformerOASISEventMap_Impl::mapped_type aData; while( pInit->m_pOASISName ) { aKey.m_nPrefix = pInit->m_nOASISPrefix; diff --git a/main/xmloff/source/transform/EventOOoTContext.cxx b/main/xmloff/source/transform/EventOOoTContext.cxx index b6f64bd..537aea2 100644 --- a/main/xmloff/source/transform/EventOOoTContext.cxx +++ b/main/xmloff/source/transform/EventOOoTContext.cxx @@ -62,7 +62,7 @@ public: void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit ) { XMLTransformerOOoEventMap_Impl::key_type aKey; - XMLTransformerOOoEventMap_Impl::data_type aData; + XMLTransformerOOoEventMap_Impl::mapped_type aData; while( pInit->m_pOOoName ) { aKey = OUString::createFromAscii(pInit->m_pOOoName); diff --git a/main/xmloff/source/transform/TransformerActions.cxx b/main/xmloff/source/transform/TransformerActions.cxx index 98a18d0..6b06213 100644 --- a/main/xmloff/source/transform/TransformerActions.cxx +++ b/main/xmloff/source/transform/TransformerActions.cxx @@ -37,7 +37,7 @@ XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit ) if( pInit ) { XMLTransformerActions::key_type aKey; - XMLTransformerActions::data_type aData; + XMLTransformerActions::mapped_type aData; while( pInit->m_nActionType != XML_TACTION_EOT ) { aKey.m_nPrefix = pInit->m_nPrefix; @@ -66,7 +66,7 @@ void XMLTransformerActions::Add( XMLTransformerActionInit *pInit ) if( pInit ) { XMLTransformerActions::key_type aKey; - XMLTransformerActions::data_type aData; + XMLTransformerActions::mapped_type aData; while( pInit->m_nActionType != XML_TACTION_EOT ) { aKey.m_nPrefix = pInit->m_nPrefix; diff --git a/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index f449aba..f8d3533 100644 --- a/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -296,9 +296,9 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa deleteRootsModule(); #if defined SYSTEM_MOZILLA - OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION)); + OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION)); #else - OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION)); + OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION)); #endif ::rtl::Bootstrap::expandMacros(rootModule); @@ -328,18 +328,18 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa RootsModule = 0; if (found) xmlsec_trace("Added new root certificate module " - "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr()); + "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr()); else { xmlsec_trace("FAILED to load the new root certificate module " - "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr()); + "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr()); return_value = false; } } else { xmlsec_trace("FAILED to add new root certifice module: " - "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr()); + "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr()); return_value = false; } @@ -368,17 +368,17 @@ extern "C" void nsscrypto_finalize() if (SECSuccess == SECMOD_UnloadUserModule(RootsModule)) { - xmlsec_trace("Unloaded module \""ROOT_CERTS"\"."); + xmlsec_trace( "Unloaded module \"" ROOT_CERTS "\"."); } else { - xmlsec_trace("Failed unloadeding module \""ROOT_CERTS"\"."); + xmlsec_trace( "Failed unloadeding module \"" ROOT_CERTS "\"."); } SECMOD_DestroyModule(RootsModule); } else { - xmlsec_trace("Unloading module \""ROOT_CERTS + xmlsec_trace( "Unloading module \"" ROOT_CERTS "\" failed because it was not found."); } PK11_LogoutAll();