You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/02/07 15:47:22 UTC
svn commit: r1443509 - in /openoffice/trunk/main:
autodoc/source/display/html/ desktop/source/migration/services/
desktop/source/pkgchk/unopkg/ filter/source/graphicfilter/ieps/
i18npool/source/indexentry/ i18npool/source/textconversion/ i18npool/sourc...
Author: hdu
Date: Thu Feb 7 14:47:22 2013
New Revision: 1443509
URL: http://svn.apache.org/viewvc?rev=1443509&view=rev
Log:
fix build for compilers supporting user-defined literals
User defined literals (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2378.pdf)
are already available in gcc 4.7 and clang 3.1 and this results in problems in code
where literal strings are concatenated without any whitespace inbetween.
Modified:
openoffice/trunk/main/autodoc/source/display/html/cfrstd.cxx
openoffice/trunk/main/autodoc/source/display/html/outfile.cxx
openoffice/trunk/main/desktop/source/migration/services/jvmfwk.cxx
openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
openoffice/trunk/main/filter/source/graphicfilter/ieps/ieps.cxx
openoffice/trunk/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx
openoffice/trunk/main/i18npool/source/textconversion/textconversion.cxx
openoffice/trunk/main/i18npool/source/transliteration/textToPronounce_zh.cxx
openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
openoffice/trunk/main/tools/inc/tools/diagnose_ex.h
openoffice/trunk/main/unotools/source/config/bootstrap.cxx
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
Modified: openoffice/trunk/main/autodoc/source/display/html/cfrstd.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/autodoc/source/display/html/cfrstd.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/autodoc/source/display/html/cfrstd.cxx (original)
+++ openoffice/trunk/main/autodoc/source/display/html/cfrstd.cxx Thu Feb 7 14:47:22 2013
@@ -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
- 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
- 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
- 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
+ "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
+ 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
+ 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
;
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
- 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
- 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
+ ".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
+ 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
+ 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
- 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
- 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
- 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 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
+ 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
+ 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
;
Modified: openoffice/trunk/main/autodoc/source/display/html/outfile.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/autodoc/source/display/html/outfile.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/autodoc/source/display/html/outfile.cxx (original)
+++ openoffice/trunk/main/autodoc/source/display/html/outfile.cxx Thu Feb 7 14:47:22 2013
@@ -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
- CRLF
- "dt.attention { color:#dd0000; }"CRLF
- 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
- 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
- CRLF
- ".nqclass { color:#008800; }"CRLF
- 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
+ "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
+ 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
+ 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
+ CRLF
+ ".nqclass { color:#008800; }" CRLF
+ 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
;
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
- 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
- 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
- CRLF
- "#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }"CRLF
- CRLF
- "#adc-cppref .nqclass { color:#008800; }"CRLF
- 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
+ "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
+ 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
+ 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
+ CRLF
+ "#adc-cppref .nqclass { color:#008800; }" CRLF
+ 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
;
Modified: openoffice/trunk/main/desktop/source/migration/services/jvmfwk.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/migration/services/jvmfwk.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/migration/services/jvmfwk.cxx (original)
+++ openoffice/trunk/main/desktop/source/migration/services/jvmfwk.cxx Thu Feb 7 14:47:22 2013
@@ -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.");
Modified: openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx (original)
+++ openoffice/trunk/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx Thu Feb 7 14:47:22 2013
@@ -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;
}
Modified: openoffice/trunk/main/filter/source/graphicfilter/ieps/ieps.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/graphicfilter/ieps/ieps.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/filter/source/graphicfilter/ieps/ieps.cxx (original)
+++ openoffice/trunk/main/filter/source/graphicfilter/ieps/ieps.cxx Thu Feb 7 14:47:22 2013
@@ -204,7 +204,7 @@ static bool RenderAsEMF(const sal_uInt8*
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(co
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 s
{
#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"));
Modified: openoffice/trunk/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx (original)
+++ openoffice/trunk/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx Thu Feb 7 14:47:22 2013
@@ -41,9 +41,9 @@ IndexEntrySupplier_asian::IndexEntrySupp
{
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 );
Modified: openoffice/trunk/main/i18npool/source/textconversion/textconversion.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/textconversion/textconversion.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/textconversion/textconversion.cxx (original)
+++ openoffice/trunk/main/i18npool/source/textconversion/textconversion.cxx Thu Feb 7 14:47:22 2013
@@ -37,9 +37,9 @@ extern "C" { static void SAL_CALL thisMo
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 );
Modified: openoffice/trunk/main/i18npool/source/transliteration/textToPronounce_zh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/transliteration/textToPronounce_zh.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/transliteration/textToPronounce_zh.cxx (original)
+++ openoffice/trunk/main/i18npool/source/transliteration/textToPronounce_zh.cxx Thu Feb 7 14:47:22 2013
@@ -144,9 +144,9 @@ extern "C" { static void SAL_CALL thisMo
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 );
Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx (original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx Thu Feb 7 14:47:22 2013
@@ -498,7 +498,7 @@ javaPluginError jfw_plugin_startJavaVirt
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_startJavaVirt
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_startJavaVirt
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");
}
Modified: openoffice/trunk/main/tools/inc/tools/diagnose_ex.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/inc/tools/diagnose_ex.h?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/tools/inc/tools/diagnose_ex.h (original)
+++ openoffice/trunk/main/tools/inc/tools/diagnose_ex.h Thu Feb 7 14:47:22 2013
@@ -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
Modified: openoffice/trunk/main/unotools/source/config/bootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/source/config/bootstrap.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/source/config/bootstrap.cxx (original)
+++ openoffice/trunk/main/unotools/source/config/bootstrap.cxx Thu Feb 7 14:47:22 2013
@@ -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(OUS
{
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::getVersionValu
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;
Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx?rev=1443509&r1=1443508&r2=1443509&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx Thu Feb 7 14:47:22 2013
@@ -296,9 +296,9 @@ bool nsscrypto_initialize( const css::un
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::un
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();