Attachment #80221 for issue #121585

View | Details | Raw Unified | Return to issue 121585
Collapse All | Expand All




//***************   These are used for IDL currently only!   ********************

const char * const C_sStdStyle =
    "/*See bottom of file for explanations.*/" CRLF
    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
    ;


const char * const C_sCssExplanations =
    "/* 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
    ;

const char * const C_sStdStyle_withDivFrame =
    "/*See bottom of file for explanations.*/" CRLF
    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
    ;







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
    ;


const char * const
    C_sCssExplanations =
    "/* 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
    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
    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
    CRLF
    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
    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
    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
    ;



Lines 55-62 namespace basebmp Link Here

(-)a/main/basebmp/source/intconversion.hxx (-2 / +2 lines)
55	/// Get converter from given data type to sal_uInt32	55	/// Get converter from given data type to sal_uInt32
56	template< typename DataType > struct uInt32Converter	56	template< typename DataType > struct uInt32Converter
57	{	57	{
58	typedef std::identity<DataType> to;	58	typedef std_identity<DataType> to;
59	typedef std::identity<DataType> from;	59	typedef std_identity<DataType> from;
60	};	60	};
61	template< unsigned int RedIndex,	61	template< unsigned int RedIndex,
62	unsigned int GreenIndex,	62	unsigned int GreenIndex,

Lines 115-120 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) Link Here

(-)a/main/boost/makefile.mk (+1 lines)
115	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda $(INCCOM)$/$(PRJNAME)	115	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda $(INCCOM)$/$(PRJNAME)
116	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic $(INCCOM)$/$(PRJNAME)	116	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic $(INCCOM)$/$(PRJNAME)
117	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math $(INCCOM)$/$(PRJNAME)	117	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math $(INCCOM)$/$(PRJNAME)
		118	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/move $(INCCOM)$/$(PRJNAME)
118	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi $(INCCOM)$/$(PRJNAME)	119	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi $(INCCOM)$/$(PRJNAME)
119	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)	120	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
120	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm $(INCCOM)$/$(PRJNAME)	121	@$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm $(INCCOM)$/$(PRJNAME)

Lines 1037-1044 mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail Link Here

(-)a/main/boost/prj/d.lst (-1 / +2 lines)
1037	..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail	1037	..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail
1038	..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools	1038	..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
1039	..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail	1039	..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail
1040	..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives	1040	..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
1041	..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi	1041	..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
		1042	..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
1042	..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail	1043	..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
1043	..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python	1044	..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python
1044	..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config	1045	..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config

Lines 80-86 static void s_setCurrent(uno_Environment * pEnv) Link Here

(-)a/main/cppu/source/uno/EnvStack.cxx (-1 / +2 lines)
80	else	80	else
81	{	81	{
82	ThreadMap::iterator iEnv = s_threadMap.find(threadId);	82	ThreadMap::iterator iEnv = s_threadMap.find(threadId);
83	s_threadMap.erase(iEnv);	83	if( iEnv != s_threadMap.end())
		84	s_threadMap.erase(iEnv);
84	}	85	}
85	}	86	}
86		87

Lines 1665-1671 Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD Link Here

(-)a/main/dbaccess/source/ui/browser/genericcontroller.cxx (-1 / +1 lines)
1665	::std::transform( aInformationList.begin(),	1665	::std::transform( aInformationList.begin(),
1666	aInformationList.end(),	1666	aInformationList.end(),
1667	aInformation.getArray(),	1667	aInformation.getArray(),
1668	::std::identity< DispatchInformation >()	1668	std_identity< DispatchInformation >()
1669	);	1669	);
1670		1670
1671	return aInformation;	1671	return aInformation;

Lines 324-330 void JavaMigration::migrateJavarc() Link Here

(-)a/main/desktop/source/migration/services/jvmfwk.cxx (-1 / +1 lines)
324	return;	324	return;
325		325
326	OUString sValue;	326	OUString sValue;
327	rtl::Bootstrap javaini(m_sUserDir + OUSTR("/user/config/"SAL_CONFIGFILE("java")));	327	rtl::Bootstrap javaini(m_sUserDir + OUSTR( "/user/config/" SAL_CONFIGFILE("java")));
328	sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue);	328	sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue);
329	OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME	329	OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
330	"] XJob::execute: Could not get Home entry from java.ini/javarc.");	330	"] XJob::execute: Could not get Home entry from java.ini/javarc.");




            return 0;
        }
        else if (isOption( info_version, &nPos )) {
            dp_misc::writeConsole( "\n" APP_NAME " Version 3.3\n");
            return 0;
        }
        //consume all bootstrap variables which may occur before the subcommannd

        }
        
        if (option_verbose)
            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;

    }
    catch (ucb::CommandAbortedException &) 
    {
        dp_misc::writeConsoleError( "\n" APP_NAME " aborted!\n");
    }
    catch (deployment::DeploymentException & exc) 
    {

            OUSTR("\n"));
    }
    if (!bNoOtherErrorMsg)
        dp_misc::writeConsoleError( "\n" APP_NAME " failed.\n");
    disposeBridges(xLocalComponentContext);
    return 1;
}




    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




	TempFile aTemp;
	aTemp.EnableKillingFile();
	rtl::OUString fileName = 
			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "pstoedit" EXESUFFIX));
	rtl::OUString arg1 = 
			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));
	rtl::OUString arg2 = 

	Graphic &rGraphic)
{
	rtl::OUString fileName = 
			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,

{
#ifdef WNT
	rtl::OUString fileName = 
			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gswin32c" EXESUFFIX));
#else
	rtl::OUString fileName = 
			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gs" EXESUFFIX));
#endif
	rtl::OUString arg1 = 
			rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));

Lines 41-49 IndexEntrySupplier_asian::IndexEntrySupplier_asian( Link Here

(-)a/main/i18npool/source/indexentry/indexentrysupplier_asian.cxx (-2 / +2 lines)
41	{	41	{
42	implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";	42	implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";
43	#ifdef SAL_DLLPREFIX	43	#ifdef SAL_DLLPREFIX
44	OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);	44	OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION);
45	#else	45	#else
46	OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);	46	OUString lib=OUString::createFromAscii("index_data" SAL_DLLEXTENSION);
47	#endif	47	#endif
48	hModule = osl_loadModuleRelative(	48	hModule = osl_loadModuleRelative(
49	&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );	49	&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );





#define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr())

static void print_OUString( const OUString& s )
{
    printf( "%s", OSTR(s));
}

static bool is_empty_string( const OUString& s )
{
     return (s.getLength()==0) || (s.getLength()==1 && s[0]=='\n');
}

static void print_indent( int depth )
{
     for( int i=0; i<depth; i++ ) printf("    ");
}

static void print_color( int color )
{
     printf("\033[%dm", color);
}

static void print_node( const LocaleNode* p, int depth=0 )
{
     if( !p ) return;


     }
     printf(">");
     printf("\n");
     if( !is_empty_string( p->getValue() ) )
     {
          print_indent( depth+1 );
          printf("value: ");

Lines 37-45 extern "C" { static void SAL_CALL thisModule() {} } Link Here

(-)a/main/i18npool/source/textconversion/textconversion.cxx (-2 / +2 lines)
37	TextConversion::TextConversion()	37	TextConversion::TextConversion()
38	{	38	{
39	#ifdef SAL_DLLPREFIX	39	#ifdef SAL_DLLPREFIX
40	OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION);	40	OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "textconv_dict" SAL_DLLEXTENSION);
41	#else	41	#else
42	OUString lib=OUString::createFromAscii("textconv_dict"SAL_DLLEXTENSION);	42	OUString lib=OUString::createFromAscii( "textconv_dict" SAL_DLLEXTENSION);
43	#endif	43	#endif
44	hModule = osl_loadModuleRelative(	44	hModule = osl_loadModuleRelative(
45	&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );	45	&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

Lines 144-152 extern "C" { static void SAL_CALL thisModule() {} } Link Here

(-)a/main/i18npool/source/transliteration/textToPronounce_zh.cxx (-2 / +2 lines)
144	TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)	144	TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
145	{	145	{
146	#ifdef SAL_DLLPREFIX	146	#ifdef SAL_DLLPREFIX
147	OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);	147	OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION);
148	#else	148	#else
149	OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);	149	OUString lib=OUString::createFromAscii( "index_data" SAL_DLLEXTENSION);
150	#endif	150	#endif
151	hModule = osl_loadModuleRelative(	151	hModule = osl_loadModuleRelative(
152	&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );	152	&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );




	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_unordered_set;


	class SocketConnection : public ::cppu::WeakImplHelper2< 

		sal_Bool     _started;
		sal_Bool     _closed;
		sal_Bool     _error;
		XStreamListener_unordered_set _listeners;
	};

	template<class T>
	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
	{
  		XStreamListener_unordered_set listeners;

		{
			::osl::MutexGuard guard(pCon->_mutex);

Lines 58-64 namespace stoc_connector Link Here

(-)a/main/io/source/connector/connector.hxx (-2 / +2 lines)
58	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,	58	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
59	ReferenceHash< ::com::sun::star::io::XStreamListener>,	59	ReferenceHash< ::com::sun::star::io::XStreamListener>,
60	ReferenceEqual< ::com::sun::star::io::XStreamListener> >	60	ReferenceEqual< ::com::sun::star::io::XStreamListener> >
61	XStreamListener_hash_set;	61	XStreamListener_unordered_set;
62		62
63	class PipeConnection :	63	class PipeConnection :
64	public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >	64	public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >
Lines 133-139 namespace stoc_connector Link Here
133	sal_Bool _closed;	133	sal_Bool _closed;
134	sal_Bool _error;	134	sal_Bool _error;
135		135
136	XStreamListener_hash_set _listeners;	136	XStreamListener_unordered_set _listeners;
137	};	137	};
138	}	138	}
139		139

Lines 39-45 namespace stoc_connector { Link Here

(-)a/main/io/source/connector/ctr_socket.cxx (-1 / +1 lines)
39	template<class T>	39	template<class T>
40	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)	40	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
41	{	41	{
42	XStreamListener_hash_set listeners;	42	XStreamListener_unordered_set listeners;
43		43
44	{	44	{
45	::osl::MutexGuard guard(pCon->_mutex);	45	::osl::MutexGuard guard(pCon->_mutex);




            sRuntimeLib, osl_getThreadTextEncoding());
        rtl::OString sSymbol = rtl::OUStringToOString(
            sSymbolCreateJava, osl_getThreadTextEncoding());
        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;

        rtl::OUString message;
        if( err < 0)
        {
            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
                    "Can not create JavaVirtualMachine, abort handler was called.\n");
            errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
        }

    else
    {
        *ppVm = pJavaVM;
        JFW_TRACE2( "[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n");
    }
        
        

Lines 1298-1304 void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, Link Here

(-)a/main/rsc/source/rsc/rsc.cxx (-1 / +1 lines)
1298	aBaseFileName += ByteString::CreateFromInt32( 0 );	1298	aBaseFileName += ByteString::CreateFromInt32( 0 );
1299		1299
1300	if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )	1300	if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )
1301	aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );	1301	aEntryVector.push_back( ::std::pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
1302	else	1302	else
1303	aMissingImages.push_back( aBaseFileName );	1303	aMissingImages.push_back( aBaseFileName );
1304	}	1304	}

Lines 189-195 void MasterPageObserver::Implementation::RegisterDocument ( Link Here

(-)a/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx (-1 / +1 lines)
189	SdDrawDocument& rDocument)	189	SdDrawDocument& rDocument)
190	{	190	{
191	// Gather the names of all the master pages in the given document.	191	// Gather the names of all the master pages in the given document.
192	MasterPageContainer::data_type aMasterPageSet;	192	MasterPageContainer::mapped_type aMasterPageSet;
193	sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);	193	sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
194	for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)	194	for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
195	{	195	{

Lines 603-609 namespace slideshow Link Here

(-)a/main/slideshow/source/engine/animationfactory.cxx (-3 / +3 lines)
603	{	603	{
604	return ::boost::shared_ptr< AnimationBase >(	604	return ::boost::shared_ptr< AnimationBase >(
605	new GenericAnimation< AnimationBase,	605	new GenericAnimation< AnimationBase,
606	::std::identity< typename AnimationBase::ValueType > >(	606	std_identity< typename AnimationBase::ValueType > >(
607	rShapeManager,	607	rShapeManager,
608	nFlags,	608	nFlags,
609	pIsValid,	609	pIsValid,
Lines 611-618 namespace slideshow Link Here
611	pGetValue,	611	pGetValue,
612	pSetValue,	612	pSetValue,
613	// no modification necessary, use identity functor here	613	// no modification necessary, use identity functor here
614	::std::identity< typename AnimationBase::ValueType >(),	614	std_identity< typename AnimationBase::ValueType >(),
615	::std::identity< typename AnimationBase::ValueType >() ) );	615	std_identity< typename AnimationBase::ValueType >()));
616	}	616	}
617		617
618	class Scaler	618	class Scaler

Lines 83-88 gb_CFLAGS := \ Link Here

(-)a/main/solenv/gbuild/platform/linux.mk (+1 lines)
83	-pipe \	83	-pipe \
84		84
85	gb_CXXFLAGS := \	85	gb_CXXFLAGS := \
		86	-std=c++11 \
86	-Wall \	87	-Wall \
87	-Wendif-labels \	88	-Wendif-labels \
88	-Wextra \	89	-Wextra \




#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
CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD

# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"

CFLAGS_NO_EXCEPTIONS=-fno-exceptions

# -fpermissive should be removed as soon as possible
CFLAGSCXX= -std=c++11 -pipe $(ARCH_FLAGS)
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
CFLAGSCXX += -fvisibility-inlines-hidden
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"


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

Lines 52-56 namespace std Link Here

(-)a/main/stlport/systemstl/functional (+2 lines)
52	# error UNSUPPORTED COMPILER	52	# error UNSUPPORTED COMPILER
53	#endif	53	#endif
54		54
		55	template< typename T> struct std_identity { T operator() (const T& v) const { return v; }; };
		56
55	#endif	57	#endif
56	/* vi:set tabstop=4 shiftwidth=4 expandtab: */	58	/* vi:set tabstop=4 shiftwidth=4 expandtab: */

Lines 25-35 Link Here

(-)a/main/svl/inc/svl/itemset.hxx (-4 lines)
25		25
26	#include "svl/svldllapi.h"	26	#include "svl/svldllapi.h"
27		27
28	#if STLPORT_VERSION<321
29	#include <stdarg.h>
30	#else
31	#include <cstdarg> // std::va_list and friends	28	#include <cstdarg> // std::va_list and friends
32	#endif
33	#include <svl/poolitem.hxx>	29	#include <svl/poolitem.hxx>
34	#include <tools/rtti.hxx>	30	#include <tools/rtti.hxx>
35	#include <tools/solar.h>	31	#include <tools/solar.h>

Lines 25-34 Link Here

(-)a/main/svl/source/items/itemset.cxx (-3 lines)
25	#include "precompiled_svl.hxx"	25	#include "precompiled_svl.hxx"
26		26
27	#include <string.h>	27	#include <string.h>
28
29	#if STLPORT_VERSION>=321
30	#include <cstdarg>	28	#include <cstdarg>
31	#endif
32		29
33	#define _SVSTDARR_USHORTS	30	#define _SVSTDARR_USHORTS
34	#define _SVSTDARR_ULONGS	31	#define _SVSTDARR_ULONGS

Lines 24-34 Link Here

(-)a/main/sw/source/ui/app/appenv.cxx (-4 lines)
24	// MARKER(update_precomp.py): autogen include statement, do not remove	24	// MARKER(update_precomp.py): autogen include statement, do not remove
25	#include "precompiled_sw.hxx"	25	#include "precompiled_sw.hxx"
26		26
27
28	#if STLPORT_VERSION>=321
29	#include <cstdarg>	27	#include <cstdarg>
30	#endif
31
32		28
33	#include <hintids.hxx>	29	#include <hintids.hxx>
34		30

Lines 24-34 Link Here

(-)a/main/sw/source/ui/app/applab.cxx (-4 lines)
24	// MARKER(update_precomp.py): autogen include statement, do not remove	24	// MARKER(update_precomp.py): autogen include statement, do not remove
25	#include "precompiled_sw.hxx"	25	#include "precompiled_sw.hxx"
26		26
27
28	#if STLPORT_VERSION>=321
29	#include <cstdarg>	27	#include <cstdarg>
30	#endif
31
32		28
33	#include <hintids.hxx>	29	#include <hintids.hxx>
34		30

Lines 23-33 Link Here

(-)a/main/sw/source/ui/dbui/dbmgr.cxx (-3 / +2 lines)
23		23
24	// MARKER(update_precomp.py): autogen include statement, do not remove	24	// MARKER(update_precomp.py): autogen include statement, do not remove
25	#include "precompiled_sw.hxx"	25	#include "precompiled_sw.hxx"
26	#if STLPORT_VERSION>=321	26
27	#include <cstdarg>	27	#include <cstdarg>
28	#endif	28	#include <cstdio>
29		29
30	#include <stdio.h>
31	#include <unotxdoc.hxx>	30	#include <unotxdoc.hxx>
32	#include <com/sun/star/text/NotePrintMode.hpp>	31	#include <com/sun/star/text/NotePrintMode.hpp>
33	#include <sfx2/app.hxx>	32	#include <sfx2/app.hxx>

Lines 24-34 Link Here

(-)a/main/sw/source/ui/shells/textsh2.cxx (-4 lines)
24	// MARKER(update_precomp.py): autogen include statement, do not remove	24	// MARKER(update_precomp.py): autogen include statement, do not remove
25	#include "precompiled_sw.hxx"	25	#include "precompiled_sw.hxx"
26		26
27
28
29	#if STLPORT_VERSION>=321
30	#include <cstdarg>	27	#include <cstdarg>
31	#endif
32		28
33	#include <svtools/svmedit.hxx>	29	#include <svtools/svmedit.hxx>
34	#include <svl/eitem.hxx>	30	#include <svl/eitem.hxx>

Lines 26-34 Link Here

(-)a/main/sw/source/ui/uiview/viewprt.cxx (-2 lines)
26		26
27	#include <com/sun/star/text/NotePrintMode.hpp>	27	#include <com/sun/star/text/NotePrintMode.hpp>
28		28
29	#if STLPORT_VERSION>=321
30	#include <cstdarg>	29	#include <cstdarg>
31	#endif
32		30
33	#ifndef _CMDID_H	31	#ifndef _CMDID_H
34	#include <cmdid.h>	32	#include <cmdid.h>

Lines 33-41 Link Here

(-)a/main/sw/source/ui/wrtsh/wrtsh1.cxx (-2 lines)
33	#include <com/sun/star/chart2/XChartDocument.hpp>	33	#include <com/sun/star/chart2/XChartDocument.hpp>
34	#include <com/sun/star/util/XModifiable.hpp>	34	#include <com/sun/star/util/XModifiable.hpp>
35		35
36	#if STLPORT_VERSION>=321
37	#include <math.h> // prevent conflict between exception and std::exception	36	#include <math.h> // prevent conflict between exception and std::exception
38	#endif
39	#include <hintids.hxx>	37	#include <hintids.hxx>
40	#include <svx/svdview.hxx>	38	#include <svx/svdview.hxx>
41	#include <sot/factory.hxx>	39	#include <sot/factory.hxx>




#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|<hash_set>|<boost/unordered_set.hpp>|g' \
	-e 's|<hash_map>|<boost/unordered_map.hpp>|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'





                                     OSL_ENSURE(c, m); \
                                     throw ::com::sun::star::lang::IllegalArgumentException( \
                                     ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
                                     ::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), \
                                               ifc, \
                                               arg ); }


                                     OSL_ENSURE(c, m); \
                                     throw ::com::sun::star::uno::RuntimeException( \
                                     ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
                                     ::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), \
                                          ifc ); }

/** This macro asserts the given condition (in debug mode), and




            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)));
        }
        return *s_pData;
    }

{
    OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS));

    rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SETUP_DATA_NAME ) ) );
    OUString sResult;
    aData.getFrom( csAllUsersItem, sResult, _sDefault );
    return sResult;

    rtl::Bootstrap::get(
        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
    rtl::Bootstrap aData( uri +
                          OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) );
    if ( aData.getHandle() == NULL )
        // version.ini (versionrc) doesn't exist
        return sal_False;

Lines 102-108 class SvtCmdOptions Link Here

(-)a/main/unotools/source/config/cmdoptions.cxx (-1 / +1 lines)
102		102
103	void SetContainerSize( sal_Int32 nSize )	103	void SetContainerSize( sal_Int32 nSize )
104	{	104	{
105	m_aCommandHashMap.resize( nSize );	105	m_aCommandHashMap.rehash( nSize );
106	}	106	}
107		107
108	sal_Bool Lookup( const OUString& aCmd ) const	108	sal_Bool Lookup( const OUString& aCmd ) const




SvtInetOptions::Impl::notifyListeners(
    star::uno::Sequence< rtl::OUString > const & rKeys)
{
		typedef std::pair< star::uno::Reference< star::beans::XPropertiesChangeListener >,
		                   star::uno::Sequence< star::beans::PropertyChangeEvent > > Listen2EventPair;
		typedef std::vector< Listen2EventPair > NotificationList;
	NotificationList aNotifications;
                                    star::beans::PropertyChangeEvent > > >
    List;
	List aNotifications;
	{
		osl::MutexGuard aGuard(m_aMutex);
		aNotifications.reserve(m_aListeners.size());

				}
			}
			if (nCount > 0)
				aNotifications.push_back( Listen2EventPair( aIt->first, aEvents));
				aEvents.realloc(nCount);
				aNotifications.
					push_back(std::make_pair< List::value_type::first_type,
							                  List::value_type::second_type >(
								  aIt->first, aEvents));
			}
		}
	}
	for (NotificationList::size_type i = 0; i < aNotifications.size(); ++i)
		if (aNotifications[i].first.is())
			aNotifications[i].first->
				propertiesChange(aNotifications[i].second);

Lines 131-137 void SettingsConfigItem::getValues() Link Here

(-)a/main/vcl/source/gdi/configsettings.cxx (-1 / +1 lines)
131	m_aSettings.clear();	131	m_aSettings.clear();
132		132
133	Sequence< OUString > aNames( GetNodeNames( OUString() ) );	133	Sequence< OUString > aNames( GetNodeNames( OUString() ) );
134	m_aSettings.resize( aNames.getLength() );	134	m_aSettings.rehash( aNames.getLength() );
135		135
136	for( int j = 0; j < aNames.getLength(); j++ )	136	for( int j = 0; j < aNames.getLength(); j++ )
137	{	137	{

Lines 131-137 void PspKernInfo::Initialize() const Link Here

(-)a/main/vcl/unx/generic/gdi/salgdi3.cxx (-1 / +1 lines)
131	return;	131	return;
132		132
133	// feed psprint's kerning list into a lookup-friendly container	133	// feed psprint's kerning list into a lookup-friendly container
134	maUnicodeKernPairs.resize( rKernPairs.size() );	134	maUnicodeKernPairs.rehash( rKernPairs.size() );
135	PspKernPairs::const_iterator it = rKernPairs.begin();	135	PspKernPairs::const_iterator it = rKernPairs.begin();
136	for(; it != rKernPairs.end(); ++it )	136	for(; it != rKernPairs.end(); ++it )
137	{	137	{

Lines 189-195 void PspKernInfo::Initialize() const Link Here

(-)a/main/vcl/unx/headless/svptext.cxx (-1 / +1 lines)
189	return;	189	return;
190		190
191	// feed psprint's kerning list into a lookup-friendly container	191	// feed psprint's kerning list into a lookup-friendly container
192	maUnicodeKernPairs.resize( rKernPairs.size() );	192	maUnicodeKernPairs.rehash( rKernPairs.size() );
193	PspKernPairs::const_iterator it = rKernPairs.begin();	193	PspKernPairs::const_iterator it = rKernPairs.begin();
194	for(; it != rKernPairs.end(); ++it )	194	for(; it != rKernPairs.end(); ++it )
195	{	195	{

Lines 63-69 XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform Link Here

(-)a/main/xmloff/source/transform/EventOASISTContext.cxx (-1 / +1 lines)
63	if( pInit )	63	if( pInit )
64	{	64	{
65	XMLTransformerOASISEventMap_Impl::key_type aKey;	65	XMLTransformerOASISEventMap_Impl::key_type aKey;
66	XMLTransformerOASISEventMap_Impl::data_type aData;	66	XMLTransformerOASISEventMap_Impl::mapped_type aData;
67	while( pInit->m_pOASISName )	67	while( pInit->m_pOASISName )
68	{	68	{
69	aKey.m_nPrefix = pInit->m_nOASISPrefix;	69	aKey.m_nPrefix = pInit->m_nOASISPrefix;

Lines 62-68 public: Link Here

(-)a/main/xmloff/source/transform/EventOOoTContext.cxx (-1 / +1 lines)
62	void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )	62	void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
63	{	63	{
64	XMLTransformerOOoEventMap_Impl::key_type aKey;	64	XMLTransformerOOoEventMap_Impl::key_type aKey;
65	XMLTransformerOOoEventMap_Impl::data_type aData;	65	XMLTransformerOOoEventMap_Impl::mapped_type aData;
66	while( pInit->m_pOOoName )	66	while( pInit->m_pOOoName )
67	{	67	{
68	aKey = OUString::createFromAscii(pInit->m_pOOoName);	68	aKey = OUString::createFromAscii(pInit->m_pOOoName);

Lines 37-43 XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit ) Link Here

(-)a/main/xmloff/source/transform/TransformerActions.cxx (-2 / +2 lines)
37	if( pInit )	37	if( pInit )
38	{	38	{
39	XMLTransformerActions::key_type aKey;	39	XMLTransformerActions::key_type aKey;
40	XMLTransformerActions::data_type aData;	40	XMLTransformerActions::mapped_type aData;
41	while( pInit->m_nActionType != XML_TACTION_EOT )	41	while( pInit->m_nActionType != XML_TACTION_EOT )
42	{	42	{
43	aKey.m_nPrefix = pInit->m_nPrefix;	43	aKey.m_nPrefix = pInit->m_nPrefix;
Lines 66-72 void XMLTransformerActions::Add( XMLTransformerActionInit *pInit ) Link Here
66	if( pInit )	66	if( pInit )
67	{	67	{
68	XMLTransformerActions::key_type aKey;	68	XMLTransformerActions::key_type aKey;
69	XMLTransformerActions::data_type aData;	69	XMLTransformerActions::mapped_type aData;
70	while( pInit->m_nActionType != XML_TACTION_EOT )	70	while( pInit->m_nActionType != XML_TACTION_EOT )
71	{	71	{
72	aKey.m_nPrefix = pInit->m_nPrefix;	72	aKey.m_nPrefix = pInit->m_nPrefix;




        deleteRootsModule();
        
#if defined SYSTEM_MOZILLA
        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
#else
        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
#endif
        ::rtl::Bootstrap::expandMacros(rootModule);
        

                RootsModule = 0;
                if (found)
                    xmlsec_trace("Added new root certificate module "
                              "\"" 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());
                    return_value = false;
                }
            }
            else
            {
                xmlsec_trace("FAILED to add new root certifice module: "
                          "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
                return_value = false;

            }

        
        if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))
        {
            xmlsec_trace( "Unloaded module \"" ROOT_CERTS "\".");
        }
        else
        {
            xmlsec_trace( "Failed unloadeding module \"" ROOT_CERTS "\".");
        }
        SECMOD_DestroyModule(RootsModule);
    }
    else
    {
        xmlsec_trace( "Unloading module \"" ROOT_CERTS
                  "\" failed because it was not found.");
    }
    PK11_LogoutAll();

Return to issue 121585

Lines 269-275 extern "C" int unopkg_main() Link Here

(-)a/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx (-4 / +4 lines)
269	return 0;	269	return 0;
270	}	270	}
271	else if (isOption( info_version, &nPos )) {	271	else if (isOption( info_version, &nPos )) {
272	dp_misc::writeConsole("\n"APP_NAME" Version 3.3\n");	272	dp_misc::writeConsole( "\n" APP_NAME " Version 3.3\n");
273	return 0;	273	return 0;
274	}	274	}
275	//consume all bootstrap variables which may occur before the subcommannd	275	//consume all bootstrap variables which may occur before the subcommannd
Lines 649-655 extern "C" int unopkg_main() Link Here
649	}	649	}
650		650
651	if (option_verbose)	651	if (option_verbose)
652	dp_misc::writeConsole(OUSTR("\n"APP_NAME" done.\n"));	652	dp_misc::writeConsole( OUSTR( "\n" APP_NAME " done.\n"));
653	//Force to release all bridges which connect us to the child processes	653	//Force to release all bridges which connect us to the child processes
654	disposeBridges(xLocalComponentContext);	654	disposeBridges(xLocalComponentContext);
655	return 0;	655	return 0;
Lines 661-667 extern "C" int unopkg_main() Link Here
661	}	661	}
662	catch (ucb::CommandAbortedException &)	662	catch (ucb::CommandAbortedException &)
663	{	663	{
664	dp_misc::writeConsoleError("\n"APP_NAME" aborted!\n");	664	dp_misc::writeConsoleError( "\n" APP_NAME " aborted!\n");
665	}	665	}
666	catch (deployment::DeploymentException & exc)	666	catch (deployment::DeploymentException & exc)
667	{	667	{
Lines 699-705 extern "C" int unopkg_main() Link Here
699	OUSTR("\n"));	699	OUSTR("\n"));
700	}	700	}
701	if (!bNoOtherErrorMsg)	701	if (!bNoOtherErrorMsg)
702	dp_misc::writeConsoleError("\n"APP_NAME" failed.\n");	702	dp_misc::writeConsoleError( "\n" APP_NAME " failed.\n");
703	disposeBridges(xLocalComponentContext);	703	disposeBridges(xLocalComponentContext);
704	return 1;	704	return 1;
705	}	705	}

Lines 168-191 if ( true ) Link Here

(-)a/main/external_deps.lst (-18 lines)
168	URL1 = http://archive.apache.org/dist/apr/$(name)	168	URL1 = http://archive.apache.org/dist/apr/$(name)
169	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	169	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
170		170
171	if ( true )
172	MD5 = c441926f3a552ed3e5b274b62e86af16
173	name = STLport-4.0.tar.gz
174	# This seems to be the original host, but the MD5 sum does not match.
175	# URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download
176	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
177
178	if ( true )
179	MD5 = 18f577b374d60b3c760a3a3350407632
180	name = STLport-4.5.tar.gz
181	URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download
182	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
183
184	if ( true )
185	MD5 = 7376930b0d3f3d77a685d94c4a3acda8
186	name = STLport-4.5-0119.tar.gz
187	URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
188
189	if (SYSTEM_LIBXML != YES)	171	if (SYSTEM_LIBXML != YES)
190	MD5 = 8127a65e8c3b08856093099b52599c86	172	MD5 = 8127a65e8c3b08856093099b52599c86
191	name = libxml2-2.7.8.tar.gz	173	name = libxml2-2.7.8.tar.gz

Lines 158-184 LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttr Link Here

(-)a/main/i18npool/source/localedata/LocaleNode.cxx (-6 / +6 lines)
158		158
159	#define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr())	159	#define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr())
160		160
161	void print_OUString( const OUString& s )	161	static void print_OUString( const OUString& s )
162	{	162	{
163	printf( "%s", OSTR(s));	163	printf( "%s", OSTR(s));
164	}	164	}
165		165
166	bool is_empty( const OUString& s )	166	static bool is_empty_string( const OUString& s )
167	{	167	{
168	return (s.getLength()==0) \|\| (s.getLength()==1 && s[0]=='\n');	168	return (s.getLength()==0) \|\| (s.getLength()==1 && s[0]=='\n');
169	}	169	}
170		170
171	void print_indent( int depth )	171	static void print_indent( int depth )
172	{	172	{
173	for( int i=0; i<depth; i++ ) printf(" ");	173	for( int i=0; i<depth; i++ ) printf(" ");
174	}	174	}
175		175
176	void print_color( int color )	176	static void print_color( int color )
177	{	177	{
178	printf("\033[%dm", color);	178	printf("\033[%dm", color);
179	}	179	}
180		180
181	void print_node( const LocaleNode* p, int depth=0 )	181	static void print_node( const LocaleNode* p, int depth=0 )
182	{	182	{
183	if( !p ) return;	183	if( !p ) return;
184		184
Lines 206-212 void print_node( const LocaleNode* p, int depth=0 ) Link Here
206	}	206	}
207	printf(">");	207	printf(">");
208	printf("\n");	208	printf("\n");
209	if( !is_empty( p->getValue() ) )	209	if( !is_empty_string( p->getValue() ) )
210	{	210	{
211	print_indent( depth+1 );	211	print_indent( depth+1 );
212	printf("value: ");	212	printf("value: ");

Lines 207-219 void Link Here

(-)a/main/unotools/source/config/inetoptions.cxx (-15 / +6 lines)
207	SvtInetOptions::Impl::notifyListeners(	207	SvtInetOptions::Impl::notifyListeners(
208	star::uno::Sequence< rtl::OUString > const & rKeys)	208	star::uno::Sequence< rtl::OUString > const & rKeys)
209	{	209	{
210	typedef	210	typedef std::pair< star::uno::Reference< star::beans::XPropertiesChangeListener >,
211	std::vector< std::pair< star::uno::Reference<	211	star::uno::Sequence< star::beans::PropertyChangeEvent > > Listen2EventPair;
212	star::beans::XPropertiesChangeListener >,	212	typedef std::vector< Listen2EventPair > NotificationList;
213	star::uno::Sequence<	213	NotificationList aNotifications;
214	star::beans::PropertyChangeEvent > > >
215	List;
216	List aNotifications;
217	{	214	{
218	osl::MutexGuard aGuard(m_aMutex);	215	osl::MutexGuard aGuard(m_aMutex);
219	aNotifications.reserve(m_aListeners.size());	216	aNotifications.reserve(m_aListeners.size());
Lines 240-255 SvtInetOptions::Impl::notifyListeners( Link Here
240	}	237	}
241	}	238	}
242	if (nCount > 0)	239	if (nCount > 0)
243	{	240	aNotifications.push_back( Listen2EventPair( aIt->first, aEvents));
244	aEvents.realloc(nCount);
245	aNotifications.
246	push_back(std::make_pair< List::value_type::first_type,
247	List::value_type::second_type >(
248	aIt->first, aEvents));
249	}
250	}	241	}
251	}	242	}
252	for (List::size_type i = 0; i < aNotifications.size(); ++i)	243	for (NotificationList::size_type i = 0; i < aNotifications.size(); ++i)
253	if (aNotifications[i].first.is())	244	if (aNotifications[i].first.is())
254	aNotifications[i].first->	245	aNotifications[i].first->
255	propertiesChange(aNotifications[i].second);	246	propertiesChange(aNotifications[i].second);

Lines 98-233 bool bUse_OOoFrameDiv = true; Link Here

(-)a/main/autodoc/source/display/html/cfrstd.cxx (-104 / +104 lines)
98	//************* These are used for IDL currently only! ******************	98	//************* These are used for IDL currently only! ******************
99		99
100	const char * const C_sStdStyle =	100	const char * const C_sStdStyle =
101	"/See bottom of file for explanations./"CRLF	101	"/See bottom of file for explanations./" CRLF
102	CRLF	102	CRLF
103	"body { background-color:#ffffff; }"CRLF	103	"body { background-color:#ffffff; }" CRLF
104	CRLF	104	CRLF
105	"h3 { font-size:13pt; font-weight:bold;"CRLF	105	"h3 { font-size:13pt; font-weight:bold;" CRLF
106	" margin-top:3pt; margin-bottom:1pt; }"CRLF	106	" margin-top:3pt; margin-bottom:1pt; }" CRLF
107	"p, dt, dd, pre { font-size:11pt;"CRLF	107	"p, dt, dd, pre { font-size:11pt;" CRLF
108	" margin-top:3pt; margin-bottom:1pt; }"CRLF	108	" margin-top:3pt; margin-bottom:1pt; }" CRLF
109	"pre { font-family:monospace; }"CRLF	109	"pre { font-family:monospace; }" CRLF
110	CRLF	110	CRLF
111	"table.navimain { background-color:#eeeeff; }"CRLF	111	"table.navimain { background-color:#eeeeff; }" CRLF
112	"table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF	112	"table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF
113	CRLF	113	CRLF
114	"td { font-size:11pt; }"CRLF	114	"td { font-size:11pt; }" CRLF
115	"td.title { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF	115	"td.title { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF
116	" line-height:30pt; background-color:#ccccff; text-align:center; }"CRLF	116	" line-height:30pt; background-color:#ccccff; text-align:center; }" CRLF
117	"td.subtitle { font-family: Arial; font-size:13pt;"CRLF	117	"td.subtitle { font-family: Arial; font-size:13pt;" CRLF
118	" line-height:20pt; background-color:#ccccff; }"CRLF	118	" line-height:20pt; background-color:#ccccff; }" CRLF
119	"td.crosstitle { font-size:12pt; font-weight:bold;"CRLF	119	"td.crosstitle { font-size:12pt; font-weight:bold;" CRLF
120	" line-height:15pt; background-color:#eeeeff; }"CRLF	120	" line-height:15pt; background-color:#eeeeff; }" CRLF
121	"td.imdetail { width:100%; background-color:#eeeeff; }"CRLF	121	"td.imdetail { width:100%; background-color:#eeeeff; }" CRLF
122	CRLF	122	CRLF
123	"td.imsum_left { width:30%; }"CRLF	123	"td.imsum_left { width:30%; }" CRLF
124	"td.imsum_right { width:70%; }"CRLF	124	"td.imsum_right { width:70%; }" CRLF
125	CRLF	125	CRLF
126	"td.navimain, a.navimain"CRLF	126	"td.navimain, a.navimain" CRLF
127	" { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF	127	" { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF
128	"td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF	128	"td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF
129	" color:#ffffff; background-color:#2222ad; }"CRLF	129	" color:#ffffff; background-color:#2222ad; }" CRLF
130	"td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }"CRLF	130	"td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }" CRLF
131	"td.navisub, a.navisub"CRLF	131	"td.navisub, a.navisub" CRLF
132	" { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF	132	" { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF
133	"td.navimain, td.navisub"CRLF	133	"td.navimain, td.navisub" CRLF
134	" { padding-left:7pt; padding-right:7pt; }"CRLF	134	" { padding-left:7pt; padding-right:7pt; }" CRLF
135	CRLF	135	CRLF
136	"a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF	136	"a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF
137	"a.navimain, a.navisub { color:#000000; }"CRLF	137	"a.navimain, a.navisub { color:#000000; }" CRLF
138	".dt { font-weight:bold; }"CRLF	138	".dt { font-weight:bold; }" CRLF
139	".namechain { font-size:13pt; font-weight:bold;"CRLF	139	".namechain { font-size:13pt; font-weight:bold;" CRLF
140	" margin-top:3pt; margin-bottom:6pt; }"CRLF	140	" margin-top:3pt; margin-bottom:6pt; }" CRLF
141	".title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF	141	".title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF
142	;	142	;
143		143
144		144
145	const char * const C_sCssExplanations =	145	const char * const C_sCssExplanations =
146	"/* Explanation of CSS classes:"CRLF	146	"/* Explanation of CSS classes:" CRLF
147	CRLF	147	CRLF
148	".navimain Text in main navigation bar."CRLF	148	".navimain Text in main navigation bar." CRLF
149	".navisub Text in lower navigation bar."CRLF	149	".navisub Text in lower navigation bar." CRLF
150	"td.navimainself Cell in main navigation bar with \"selected\" shadow: You are here."CRLF	150	"td.navimainself Cell in main navigation bar with \"selected\" shadow: You are here." CRLF
151	"td.navimainnone Cell in main navigation bar with no link."CRLF	151	"td.navimainnone Cell in main navigation bar with no link." CRLF
152	CRLF	152	CRLF
153	".namechain Line with current module path."CRLF	153	".namechain Line with current module path." CRLF
154	CRLF	154	CRLF
155	"td.crosstitle Comment box for bases (base interfaces etc.)"CRLF	155	"td.crosstitle Comment box for bases (base interfaces etc.)" CRLF
156	"td.imsum_left Left part of such boxes."CRLF	156	"td.imsum_left Left part of such boxes." CRLF
157	"td.imsum_right Right part of such boxes."CRLF	157	"td.imsum_right Right part of such boxes." CRLF
158	CRLF	158	CRLF
159	"td.title Main title of the page like \"interface XYz\""CRLF	159	"td.title Main title of the page like \"interface XYz\"" CRLF
160	".subtitle Tables, and head cells of those, which list members"CRLF	160	".subtitle Tables, and head cells of those, which list members" CRLF
161	" like \"method summary\" and \"method details\"."CRLF	161	" like \"method summary\" and \"method details\"." CRLF
162	CRLF	162	CRLF
163	"td.imdetail Background table of method's detail description."CRLF	163	"td.imdetail Background table of method's detail description." CRLF
164	"a.membertitle Method name (as jump label) in method's detail"CRLF	164	"a.membertitle Method name (as jump label) in method's detail" CRLF
165	" description."CRLF	165	" description." CRLF
166	".title2 smaller font prefixes to page titles"CRLF	166	".title2 smaller font prefixes to page titles" CRLF
167	"*/"CRLF	167	"*/" CRLF
168	;	168	;
169		169
170	const char * const C_sStdStyle_withDivFrame =	170	const char * const C_sStdStyle_withDivFrame =
171	"/See bottom of file for explanations./"CRLF	171	"/See bottom of file for explanations./" CRLF
172	CRLF	172	CRLF
173	"body { background-color:#ffffff; }"CRLF	173	"body { background-color:#ffffff; }" CRLF
174	CRLF	174	CRLF
175	"#adc-idlref h3 { font-size:13pt; font-weight:bold;"CRLF	175	"#adc-idlref h3 { font-size:13pt; font-weight:bold;" CRLF
176	" margin-top:3pt; margin-bottom:1pt; }"CRLF	176	" margin-top:3pt; margin-bottom:1pt; }" CRLF
177	"#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre"CRLF	177	"#adc-idlref p, #adc-idlref dt, #adc-idlref dd, #adc-idlref pre" CRLF
178	" { font-size:11pt;"CRLF	178	" { font-size:11pt;" CRLF
179	" margin-top:3pt; margin-bottom:1pt; }"CRLF	179	" margin-top:3pt; margin-bottom:1pt; }" CRLF
180	"#adc-idlref pre { font-family:monospace; }"CRLF	180	"#adc-idlref pre { font-family:monospace; }" CRLF
181	CRLF	181	CRLF
182	"#adc-idlref table.navimain { background-color:#eeeeff; }"CRLF	182	"#adc-idlref table.navimain { background-color:#eeeeff; }" CRLF
183	"#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }"CRLF	183	"#adc-idlref table.subtitle { margin-top:6pt; margin-bottom:6pt; }" CRLF
184	CRLF	184	CRLF
185	"#adc-idlref td { font-size:11pt; }"CRLF	185	"#adc-idlref td { font-size:11pt; }" CRLF
186	"#adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold;"CRLF	186	"#adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold;" CRLF
187	" line-height:30pt; background-color:#ccccff; text-align:center; }"CRLF	187	" line-height:30pt; background-color:#ccccff; text-align:center; }" CRLF
188	"#adc-idlref td.subtitle { font-family: Arial; font-size:13pt;"CRLF	188	"#adc-idlref td.subtitle { font-family: Arial; font-size:13pt;" CRLF
189	" line-height:20pt; background-color:#ccccff; }"CRLF	189	" line-height:20pt; background-color:#ccccff; }" CRLF
190	"#adc-idlref td.crosstitle { font-size:12pt; font-weight:bold;"CRLF	190	"#adc-idlref td.crosstitle { font-size:12pt; font-weight:bold;" CRLF
191	" line-height:15pt; background-color:#eeeeff; }"CRLF	191	" line-height:15pt; background-color:#eeeeff; }" CRLF
192	"#adc-idlref td.imdetail { width:100%; background-color:#eeeeff; }"CRLF	192	"#adc-idlref td.imdetail { width:100%; background-color:#eeeeff; }" CRLF
193	CRLF	193	CRLF
194	"#adc-idlref td.imsum_left { width:30%; }"CRLF	194	"#adc-idlref td.imsum_left { width:30%; }" CRLF
195	"#adc-idlref td.imsum_right { width:70%; }"CRLF	195	"#adc-idlref td.imsum_right { width:70%; }" CRLF
196	CRLF	196	CRLF
197	"#adc-idlref td.navimain, #adc-idlref a.navimain"CRLF	197	"#adc-idlref td.navimain, #adc-idlref a.navimain" CRLF
198	" { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }"CRLF	198	" { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; }" CRLF
199	"#adc-idlref td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;"CRLF	199	"#adc-idlref td.navimainself { text-align:center; font-family: Arial; font-size:12pt; font-weight:bold;" CRLF
200	" color:#ffffff; background-color:#2222ad; }"CRLF	200	" color:#ffffff; background-color:#2222ad; }" CRLF
201	"#adc-idlref td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }"CRLF	201	"#adc-idlref td.navimainnone { text-align:center; font-family: Arial; font-size:12pt; }" CRLF
202	"#adc-idlref td.navisub, #adc-idlref a.navisub"CRLF	202	"#adc-idlref td.navisub, #adc-idlref a.navisub" CRLF
203	" { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }"CRLF	203	" { text-align:center; font-family: Arial; font-size:9pt; font-variant:small-caps; }" CRLF
204	"#adc-idlref td.navimain, #adc-idlref td.navisub"CRLF	204	"#adc-idlref td.navimain, #adc-idlref td.navisub" CRLF
205	" { padding-left:7pt; padding-right:7pt; }"CRLF	205	" { padding-left:7pt; padding-right:7pt; }" CRLF
206	CRLF	206	CRLF
207	"#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }"CRLF	207	"#adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; }" CRLF
208	"#adc-idlref a.navimain, #adc-idlref a.navisub { color:#000000; }"CRLF	208	"#adc-idlref a.navimain, #adc-idlref a.navisub { color:#000000; }" CRLF
209	"#adc-idlref .dt { font-weight:bold; }"CRLF	209	"#adc-idlref .dt { font-weight:bold; }" CRLF
210	"#adc-idlref .namechain { font-size:13pt; font-weight:bold;"CRLF	210	"#adc-idlref .namechain { font-size:13pt; font-weight:bold;" CRLF
211	" margin-top:3pt; margin-bottom:6pt; }"CRLF	211	" margin-top:3pt; margin-bottom:6pt; }" CRLF
212	"#adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }"CRLF	212	"#adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; }" CRLF
213	""CRLF	213	"" CRLF
214	"#adc-idlref table { empty-cells:show; }"CRLF	214	"#adc-idlref table { empty-cells:show; }" CRLF
215	""CRLF	215	"" CRLF
216	"#adc-idlref .childlist td, "CRLF	216	"#adc-idlref .childlist td, " CRLF
217	"#adc-idlref .commentedlinks td, "CRLF	217	"#adc-idlref .commentedlinks td, " CRLF
218	"#adc-idlref .memberlist td, "CRLF	218	"#adc-idlref .memberlist td, " CRLF
219	"#adc-idlref .subtitle td, "CRLF	219	"#adc-idlref .subtitle td, " CRLF
220	"#adc-idlref .crosstitle td { border: .1pt solid #000000; }"CRLF	220	"#adc-idlref .crosstitle td { border: .1pt solid #000000; }" CRLF
221	""CRLF	221	"" CRLF
222	"#adc-idlref .flag-table td { border: .1pt solid #cccccc; } "CRLF	222	"#adc-idlref .flag-table td { border: .1pt solid #cccccc; } " CRLF
223	""CRLF	223	"" CRLF
224	"#adc-idlref .title-table td, "CRLF	224	"#adc-idlref .title-table td, " CRLF
225	"#adc-idlref .table-in-method td, "CRLF	225	"#adc-idlref .table-in-method td, " CRLF
226	"#adc-idlref .table-in-data td, "CRLF	226	"#adc-idlref .table-in-data td, " CRLF
227	"#adc-idlref .navimain td, "CRLF	227	"#adc-idlref .navimain td, " CRLF
228	"#adc-idlref .navisub td, "CRLF	228	"#adc-idlref .navisub td, " CRLF
229	"#adc-idlref .expl-table td, "CRLF	229	"#adc-idlref .expl-table td, " CRLF
230	"#adc-idlref .param-table td { border: none; }"CRLF	230	"#adc-idlref .param-table td { border: none; }" CRLF
231	;	231	;
232		232
233		233

Lines 45-220 using csi::xml::AnAttribute; Link Here

(-)a/main/autodoc/source/display/html/outfile.cxx (-132 / +132 lines)
45		45
46	const char * const	46	const char * const
47	C_sStdStyle =	47	C_sStdStyle =
48	"body { background-color:#ffffff; }"CRLF	48	"body { background-color:#ffffff; }" CRLF
49	"h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF	49	"h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF
50	"h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF	50	"h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF
51	"h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF	51	"h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF
52	"h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF	52	"h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
53	"dl { margin-top:1pt; margin-bottom:1pt; }"CRLF	53	"dl { margin-top:1pt; margin-bottom:1pt; }" CRLF
54	"dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF	54	"dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF
55	"dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF	55	"dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
56	"dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF	56	"dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
57	"dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF	57	"dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF
58	"dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF	58	"dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
59	"dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF	59	"dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF
60	"p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF	60	"p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF
61	"pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF	61	"pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
62	"tr { font-size:10pt; }"CRLF	62	"tr { font-size:10pt; }" CRLF
63	"td { font-size:10pt; }"CRLF	63	"td { font-size:10pt; }" CRLF
64	CRLF	64	CRLF
65	"dt.attention { color:#dd0000; }"CRLF	65	"dt.attention { color:#dd0000; }" CRLF
66	CRLF	66	CRLF
67	"div.title { text-align:center; line-height:26pt; background-color:#ccccff; }"CRLF	67	"div.title { text-align:center; line-height:26pt; background-color:#ccccff; }" CRLF
68	".subtitle { background-color:#ccccff; }"CRLF	68	".subtitle { background-color:#ccccff; }" CRLF
69	CRLF	69	CRLF
70	"td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF	70	"td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
71	"td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF	71	"td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
72	"td.flagno { font-family:Arial; font-size:8pt; }"CRLF	72	"td.flagno { font-family:Arial; font-size:8pt; }" CRLF
73	"td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF	73	"td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
74	CRLF	74	CRLF
75	"td.navimain, td.navimain a"CRLF	75	"td.navimain, td.navimain a" CRLF
76	" { background-color:#eeeeff; color:#000000;"CRLF	76	" { background-color:#eeeeff; color:#000000;" CRLF
77	" font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF	77	" font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
78	"td.navimainself"CRLF	78	"td.navimainself" CRLF
79	" { background-color:#2222ad; color:#ffffff;"CRLF	79	" { background-color:#2222ad; color:#ffffff;" CRLF
80	" font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF	80	" font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
81	"td.navimainnone"CRLF	81	"td.navimainnone" CRLF
82	" { background-color:#eeeeff; color:#000000;"CRLF	82	" { background-color:#eeeeff; color:#000000;" CRLF
83	" font-family:Arial; font-size:12pt; }"CRLF	83	" font-family:Arial; font-size:12pt; }" CRLF
84	CRLF	84	CRLF
85	"div.define { font-family:Arial; background-color:#ccccff; }"CRLF	85	"div.define { font-family:Arial; background-color:#ccccff; }" CRLF
86	CRLF	86	CRLF
87	".nqclass { color:#008800; }"CRLF	87	".nqclass { color:#008800; }" CRLF
88	CRLF	88	CRLF
89	"h3.help { background-color:#eeeeff; margin-top:12pt; }"CRLF	89	"h3.help { background-color:#eeeeff; margin-top:12pt; }" CRLF
90	CRLF	90	CRLF
91	".btpubl { color:#33ff33; }"CRLF	91	".btpubl { color:#33ff33; }" CRLF
92	".btprot { color:#cc9933; }"CRLF	92	".btprot { color:#cc9933; }" CRLF
93	".btpriv { color:#ff6666; }"CRLF	93	".btpriv { color:#ff6666; }" CRLF
94	".btvpubl { color:#33ff33; font-style:italic; }"CRLF	94	".btvpubl { color:#33ff33; font-style:italic; }" CRLF
95	".btvprot { color:#cc9933; font-style:italic; }"CRLF	95	".btvprot { color:#cc9933; font-style:italic; }" CRLF
96	".btvpriv { color:#ff6666; font-style:italic; }"CRLF	96	".btvpriv { color:#ff6666; font-style:italic; }" CRLF
97	".btself { font-weight:bold; }"CRLF	97	".btself { font-weight:bold; }" CRLF
98	;	98	;
99		99
100		100
101	const char * const	101	const char * const
102	C_sCssExplanations =	102	C_sCssExplanations =
103	"/* Explanation of CSS classes:"CRLF	103	"/* Explanation of CSS classes:" CRLF
104	CRLF	104	CRLF
105	"dl.member provides coloured frame for function descriptions."CRLF	105	"dl.member provides coloured frame for function descriptions." CRLF
106	"dd.member makes the content of this frame white"CRLF	106	"dd.member makes the content of this frame white" CRLF
107	CRLF	107	CRLF
108	"dt.attention special colour for @attention remarks"CRLF	108	"dt.attention special colour for @attention remarks" CRLF
109	CRLF	109	CRLF
110	"div.title HTML page headline"CRLF	110	"div.title HTML page headline" CRLF
111	".subtitle headline of lists of members and similar"CRLF	111	".subtitle headline of lists of members and similar" CRLF
112	CRLF	112	CRLF
113	" These are for the flagtables in classes:"CRLF	113	" These are for the flagtables in classes:" CRLF
114	"td.flagname Flag name."CRLF	114	"td.flagname Flag name." CRLF
115	"td.flagyes flag value \"yes\""CRLF	115	"td.flagyes flag value \"yes\"" CRLF
116	"td.flagno flag value \"no\""CRLF	116	"td.flagno flag value \"no\"" CRLF
117	"td.flagtext other flag value"CRLF	117	"td.flagtext other flag value" CRLF
118	CRLF	118	CRLF
119	CRLF	119	CRLF
120	" These are for the main navigationbar:"CRLF	120	" These are for the main navigationbar:" CRLF
121	"td.navimain, td.navimain a"CRLF	121	"td.navimain, td.navimain a" CRLF
122	" Links in navibar."CRLF	122	" Links in navibar." CRLF
123	"td.navimainself Text in navibar which refers to current page."CRLF	123	"td.navimainself Text in navibar which refers to current page." CRLF
124	"td.navimainnone Text which links to nothing."CRLF	124	"td.navimainnone Text which links to nothing." CRLF
125	CRLF	125	CRLF
126	CRLF	126	CRLF
127	"div.define Subtitles on the #define/macro descriptions page"CRLF	127	"div.define Subtitles on the #define/macro descriptions page" CRLF
128	CRLF	128	CRLF
129	".nqclass special color for classes in the qualification"CRLF	129	".nqclass special color for classes in the qualification" CRLF
130	" on top of type pages like in:"CRLF	130	" on top of type pages like in:" CRLF
131	" ::nsp1::nsp2::_ClassXY_::"CRLF	131	" ::nsp1::nsp2::_ClassXY_::" CRLF
132	CRLF	132	CRLF
133	"h3.help Subtitles on the help page"CRLF	133	"h3.help Subtitles on the help page" CRLF
134	CRLF	134	CRLF
135	" These are for the base class tree on class pages:"CRLF	135	" These are for the base class tree on class pages:" CRLF
136	".btpubl public base class"CRLF	136	".btpubl public base class" CRLF
137	".btprot protected"CRLF	137	".btprot protected" CRLF
138	".btpriv private"CRLF	138	".btpriv private" CRLF
139	".btvpubl virtual public"CRLF	139	".btvpubl virtual public" CRLF
140	".btvprot virtual protected"CRLF	140	".btvprot virtual protected" CRLF
141	".btvpriv virtual private"CRLF	141	".btvpriv virtual private" CRLF
142	".btself placeholder for currently displayed class"CRLF	142	".btself placeholder for currently displayed class" CRLF
143	CRLF	143	CRLF
144	"*/"CRLF	144	"*/" CRLF
145	;	145	;
146		146
147		147
148	const char * const	148	const char * const
149	C_sStdStyle_withDivFrame =	149	C_sStdStyle_withDivFrame =
150	"body { background-color:#ffffff; }"CRLF	150	"body { background-color:#ffffff; }" CRLF
151	"#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }"CRLF	151	"#adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; }" CRLF
152	"#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }"CRLF	152	"#adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; }" CRLF
153	"#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }"CRLF	153	"#adc-cppref h3 { font-size:13pt; margin-top:2pt; margin-bottom:3pt; }" CRLF
154	"#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF	154	"#adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
155	"#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; }"CRLF	155	"#adc-cppref dl { margin-top:1pt; margin-bottom:1pt; }" CRLF
156	"#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }"CRLF	156	"#adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; background-color:#eeeeff; }" CRLF
157	"#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF	157	"#adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
158	"#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }"CRLF	158	"#adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; }" CRLF
159	"#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }"CRLF	159	"#adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; }" CRLF
160	"#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF	160	"#adc-cppref dd { font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
161	"#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }"CRLF	161	"#adc-cppref dd.member { font-size:10pt; margin-top:1pt; margin-bottom:1pt; background-color:#ffffff; }" CRLF
162	"#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }"CRLF	162	"#adc-cppref p { font-size:10pt; margin-top:3pt; margin-bottom:1pt; }" CRLF
163	"#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }"CRLF	163	"#adc-cppref pre { font-family:monospace; font-size:10pt; margin-top:1pt; margin-bottom:1pt; }" CRLF
164	"#adc-cppref tr { font-size:10pt; }"CRLF	164	"#adc-cppref tr { font-size:10pt; }" CRLF
165	"#adc-cppref td { font-size:10pt; }"CRLF	165	"#adc-cppref td { font-size:10pt; }" CRLF
166	CRLF	166	CRLF
167	"#adc-cppref dt.attention { color:#dd0000; }"CRLF	167	"#adc-cppref dt.attention { color:#dd0000; }" CRLF
168	CRLF	168	CRLF
169	"#adc-cppref div.title { text-align:center; line-height:26pt; background-color:#ccccff; }"CRLF	169	"#adc-cppref div.title { text-align:center; line-height:26pt; background-color:#ccccff; }" CRLF
170	"#adc-cppref .subtitle { background-color:#ccccff; }"CRLF	170	"#adc-cppref .subtitle { background-color:#ccccff; }" CRLF
171	CRLF	171	CRLF
172	"#adc-cppref td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF	172	"#adc-cppref td.flagname { background-color:#eeeeff; font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
173	"#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF	173	"#adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
174	"#adc-cppref td.flagno { font-family:Arial; font-size:8pt; }"CRLF	174	"#adc-cppref td.flagno { font-family:Arial; font-size:8pt; }" CRLF
175	"#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }"CRLF	175	"#adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; }" CRLF
176	CRLF	176	CRLF
177	"#adc-cppref td.navimain, #adc-cppref td.navimain a"CRLF	177	"#adc-cppref td.navimain, #adc-cppref td.navimain a" CRLF
178	" { background-color:#eeeeff; color:#000000;"CRLF	178	" { background-color:#eeeeff; color:#000000;" CRLF
179	" font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF	179	" font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
180	"#adc-cppref td.navimainself"CRLF	180	"#adc-cppref td.navimainself" CRLF
181	" { background-color:#2222ad; color:#ffffff;"CRLF	181	" { background-color:#2222ad; color:#ffffff;" CRLF
182	" font-family:Arial; font-size:12pt; font-weight:bold; }"CRLF	182	" font-family:Arial; font-size:12pt; font-weight:bold; }" CRLF
183	"#adc-cppref td.navimainnone"CRLF	183	"#adc-cppref td.navimainnone" CRLF
184	" { background-color:#eeeeff; color:#000000;"CRLF	184	" { background-color:#eeeeff; color:#000000;" CRLF
185	" font-family:Arial; font-size:12pt; }"CRLF	185	" font-family:Arial; font-size:12pt; }" CRLF
186	CRLF	186	CRLF
187	"#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }"CRLF	187	"#adc-cppref div.define { font-family:Arial; background-color:#ccccff; }" CRLF
188	CRLF	188	CRLF
189	"#adc-cppref .nqclass { color:#008800; }"CRLF	189	"#adc-cppref .nqclass { color:#008800; }" CRLF
190	CRLF	190	CRLF
191	"#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; }"CRLF	191	"#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; }" CRLF
192	CRLF	192	CRLF
193	"#adc-cppref .btpubl { color:#33ff33; }"CRLF	193	"#adc-cppref .btpubl { color:#33ff33; }" CRLF
194	"#adc-cppref .btprot { color:#cc9933; }"CRLF	194	"#adc-cppref .btprot { color:#cc9933; }" CRLF
195	"#adc-cppref .btpriv { color:#ff6666; }"CRLF	195	"#adc-cppref .btpriv { color:#ff6666; }" CRLF
196	"#adc-cppref .btvpubl { color:#33ff33; font-style:italic; }"CRLF	196	"#adc-cppref .btvpubl { color:#33ff33; font-style:italic; }" CRLF
197	"#adc-cppref .btvprot { color:#cc9933; font-style:italic; }"CRLF	197	"#adc-cppref .btvprot { color:#cc9933; font-style:italic; }" CRLF
198	"#adc-cppref .btvpriv { color:#ff6666; font-style:italic; }"CRLF	198	"#adc-cppref .btvpriv { color:#ff6666; font-style:italic; }" CRLF
199	"#adc-cppref .btself { font-weight:bold; }"CRLF	199	"#adc-cppref .btself { font-weight:bold; }" CRLF
200	""CRLF	200	"" CRLF
201	"#adc-cppref table { empty-cells:show; }"CRLF	201	"#adc-cppref table { empty-cells:show; }" CRLF
202	""CRLF	202	"" CRLF
203	"#adc-cppref .childlist td, "CRLF	203	"#adc-cppref .childlist td, " CRLF
204	"#adc-cppref .commentedlinks td, "CRLF	204	"#adc-cppref .commentedlinks td, " CRLF
205	"#adc-cppref .memberlist td, "CRLF	205	"#adc-cppref .memberlist td, " CRLF
206	"#adc-cppref .subtitle td, "CRLF	206	"#adc-cppref .subtitle td, " CRLF
207	"#adc-cppref .crosstitle td { border: .1pt solid #000000; }"CRLF	207	"#adc-cppref .crosstitle td { border: .1pt solid #000000; }" CRLF
208	""CRLF	208	"" CRLF
209	"#adc-cppref .flag-table td { border: .1pt solid #cccccc; } "CRLF	209	"#adc-cppref .flag-table td { border: .1pt solid #cccccc; } " CRLF
210	""CRLF	210	"" CRLF
211	"#adc-cppref .title-table td, "CRLF	211	"#adc-cppref .title-table td, " CRLF
212	"#adc-cppref .table-in-method td, "CRLF	212	"#adc-cppref .table-in-method td, " CRLF
213	"#adc-cppref .table-in-data td, "CRLF	213	"#adc-cppref .table-in-data td, " CRLF
214	"#adc-cppref .navimain td, "CRLF	214	"#adc-cppref .navimain td, " CRLF
215	"#adc-cppref .navisub td, "CRLF	215	"#adc-cppref .navisub td, " CRLF
216	"#adc-cppref .expl-table td, "CRLF	216	"#adc-cppref .expl-table td, " CRLF
217	"#adc-cppref .param-table td { border: none; }"CRLF	217	"#adc-cppref .param-table td { border: none; }" CRLF
218	;	218	;
219		219
220		220

Lines 204-210 static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r Link Here

(-)a/main/filter/source/graphicfilter/ieps/ieps.cxx (-4 / +4 lines)
204	TempFile aTemp;	204	TempFile aTemp;
205	aTemp.EnableKillingFile();	205	aTemp.EnableKillingFile();
206	rtl::OUString fileName =	206	rtl::OUString fileName =
207	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"EXESUFFIX));	207	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "pstoedit" EXESUFFIX));
208	rtl::OUString arg1 =	208	rtl::OUString arg1 =
209	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));	209	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));
210	rtl::OUString arg2 =	210	rtl::OUString arg2 =
Lines 305-311 static bool RenderAsPNGThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe Link Here
305	Graphic &rGraphic)	305	Graphic &rGraphic)
306	{	306	{
307	rtl::OUString fileName =	307	rtl::OUString fileName =
308	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"EXESUFFIX));	308	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "convert" EXESUFFIX));
309	// density in pixel/inch	309	// density in pixel/inch
310	rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density"));	310	rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density"));
311	// since the preview is also used for PDF-Export & printing on non-PS-printers,	311	// since the preview is also used for PDF-Export & printing on non-PS-printers,
Lines 328-337 static bool RenderAsPNGThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Link Here
328	{	328	{
329	#ifdef WNT	329	#ifdef WNT
330	rtl::OUString fileName =	330	rtl::OUString fileName =
331	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"EXESUFFIX));	331	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gswin32c" EXESUFFIX));
332	#else	332	#else
333	rtl::OUString fileName =	333	rtl::OUString fileName =
334	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"EXESUFFIX));	334	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gs" EXESUFFIX));
335	#endif	335	#endif
336	rtl::OUString arg1 =	336	rtl::OUString arg1 =
337	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));	337	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));

Lines 66-72 namespace io_acceptor { Link Here

(-)a/main/io/source/acceptor/acc_socket.cxx (-3 / +3 lines)
66	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,	66	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>,
67	ReferenceHash< ::com::sun::star::io::XStreamListener>,	67	ReferenceHash< ::com::sun::star::io::XStreamListener>,
68	ReferenceEqual< ::com::sun::star::io::XStreamListener> >	68	ReferenceEqual< ::com::sun::star::io::XStreamListener> >
69	XStreamListener_hash_set;	69	XStreamListener_unordered_set;
70		70
71		71
72	class SocketConnection : public ::cppu::WeakImplHelper2<	72	class SocketConnection : public ::cppu::WeakImplHelper2<
Lines 112-124 namespace io_acceptor { Link Here
112	sal_Bool _started;	112	sal_Bool _started;
113	sal_Bool _closed;	113	sal_Bool _closed;
114	sal_Bool _error;	114	sal_Bool _error;
115	XStreamListener_hash_set _listeners;	115	XStreamListener_unordered_set _listeners;
116	};	116	};
117		117
118	template<class T>	118	template<class T>
119	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)	119	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
120	{	120	{
121	XStreamListener_hash_set listeners;	121	XStreamListener_unordered_set listeners;
122		122
123	{	123	{
124	::osl::MutexGuard guard(pCon->_mutex);	124	::osl::MutexGuard guard(pCon->_mutex);

Lines 498-504 javaPluginError jfw_plugin_startJavaVirtualMachine( Link Here

(-)a/main/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx (-4 / +4 lines)
498	sRuntimeLib, osl_getThreadTextEncoding());	498	sRuntimeLib, osl_getThreadTextEncoding());
499	rtl::OString sSymbol = rtl::OUStringToOString(	499	rtl::OString sSymbol = rtl::OUStringToOString(
500	sSymbolCreateJava, osl_getThreadTextEncoding());	500	sSymbolCreateJava, osl_getThreadTextEncoding());
501	fprintf(stderr,"[Java framework]sunjavaplugin"SAL_DLLEXTENSION	501	fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
502	"Java runtime library: %s does not export symbol %s !\n",	502	"Java runtime library: %s does not export symbol %s !\n",
503	sLib.getStr(), sSymbol.getStr());	503	sLib.getStr(), sSymbol.getStr());
504	return JFW_PLUGIN_E_VM_CREATION_FAILED;	504	return JFW_PLUGIN_E_VM_CREATION_FAILED;
Lines 589-601 javaPluginError jfw_plugin_startJavaVirtualMachine( Link Here
589	rtl::OUString message;	589	rtl::OUString message;
590	if( err < 0)	590	if( err < 0)
591	{	591	{
592	fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION	592	fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
593	"Can not create Java Virtual Machine\n");	593	"Can not create Java Virtual Machine\n");
594	errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;	594	errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
595	}	595	}
596	else if( err > 0)	596	else if( err > 0)
597	{	597	{
598	fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION	598	fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
599	"Can not create JavaVirtualMachine, abort handler was called.\n");	599	"Can not create JavaVirtualMachine, abort handler was called.\n");
600	errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;	600	errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
601	}	601	}
Lines 603-609 javaPluginError jfw_plugin_startJavaVirtualMachine( Link Here
603	else	603	else
604	{	604	{
605	*ppVm = pJavaVM;	605	*ppVm = pJavaVM;
606	JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n");	606	JFW_TRACE2( "[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n");
607	}	607	}
608		608
609		609

Lines 39-45 JAVAFLAGSDEBUG=-g Link Here

(-)a/main/solenv/inc/unxlng.mk (-20 / +3 lines)
39	#LINKOUTPUT_FILTER=" \|& $(SOLARENV)/bin/msg_filter"	39	#LINKOUTPUT_FILTER=" \|& $(SOLARENV)/bin/msg_filter"
40		40
41	# _PTHREADS is needed for the stl	41	# _PTHREADS is needed for the stl
42	CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)	42	CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
		43	CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD
43		44
44	# enable visibility define in "sal/types.h"	45	# enable visibility define in "sal/types.h"
45	.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"	46	.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
Lines 83-89 CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs Link Here
83	CFLAGS_NO_EXCEPTIONS=-fno-exceptions	84	CFLAGS_NO_EXCEPTIONS=-fno-exceptions
84		85
85	# -fpermissive should be removed as soon as possible	86	# -fpermissive should be removed as soon as possible
86	CFLAGSCXX= -pipe $(ARCH_FLAGS)	87	CFLAGSCXX= -std=c++11 -pipe $(ARCH_FLAGS)
87	.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"	88	.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
88	CFLAGSCXX += -fvisibility-inlines-hidden	89	CFLAGSCXX += -fvisibility-inlines-hidden
89	.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"	90	.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
Lines 221-244 X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed Link Here
221		222
222	LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive	223	LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
223		224
224	.IF "$(USE_STLP_DEBUG)" != ""
225	.IF "$(STLPORT_VER)" >= "500"
226	LIBSTLPORT=$(DYNAMIC) -lstlportstlg
227	LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
228	.ELSE
229	LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
230	LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
231	.ENDIF
232	.ELSE # "$(USE_STLP_DEBUG)" != ""
233	.IF "$(STLPORT_VER)" >= "500"
234	LIBSTLPORT=$(DYNAMIC) -lstlport
235	LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
236	.ELSE
237	LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
238	LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
239	.ENDIF
240	.ENDIF # "$(USE_STLP_DEBUG)" != ""
241
242	#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)	225	#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
243		226
244	# name of library manager	227	# name of library manager

Line 0 Link Here

(-)a/main/tmp_unordered.sh (+17 lines)
	1	#bin/sh
	2	#Places where this script doesn't give working results:
	3	# codemaker
	4	# cppu
	5	#
	6	#Places where it shouldn't be used:
	7	# reportbuilder - we don't build this anymore.
	8
	9	find . -type f \| egrep "[ch]xx$\|.h$" \| xargs sed -i.old \
	10	-e 's\|<hash_set>\|<boost/unordered_set.hpp>\|g' \
	11	-e 's\|<hash_map>\|<boost/unordered_map.hpp>\|g' \
	12	-e 's\|\(std::\)*hash_map\|boost::unordered_map\|g' \
	13	-e 's\|\(std::\)*hash_multimap\|boost::unordered_multimap\|g' \
	14	-e 's\|\(std::\)*hash_set\|boost::unordered_set\|g' \
	15	-e 's\|\(std::\)*hash_multiset\|boost::unordered_multiset\|g' \
	16	-e 's\|std::hash\|boost::hash\|g'
	17

Lines 86-99 Link Here

(-)a/main/tools/inc/tools/diagnose_ex.h (-4 / +4 lines)
86	OSL_ENSURE(c, m); \	86	OSL_ENSURE(c, m); \
87	throw ::com::sun::star::lang::IllegalArgumentException( \	87	throw ::com::sun::star::lang::IllegalArgumentException( \
88	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \	88	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
89	::rtl::OUString::createFromAscii(",\n"m), \	89	::rtl::OUString::createFromAscii(",\n" m), \
90	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \	90	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
91	0 ); }	91	0 ); }
92	#define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \	92	#define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
93	OSL_ENSURE(c, m); \	93	OSL_ENSURE(c, m); \
94	throw ::com::sun::star::lang::IllegalArgumentException( \	94	throw ::com::sun::star::lang::IllegalArgumentException( \
95	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \	95	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
96	::rtl::OUString::createFromAscii(",\n"m), \	96	::rtl::OUString::createFromAscii(",\n" m), \
97	ifc, \	97	ifc, \
98	arg ); }	98	arg ); }
99		99
Lines 104-116 Link Here
104	OSL_ENSURE(c, m); \	104	OSL_ENSURE(c, m); \
105	throw ::com::sun::star::uno::RuntimeException( \	105	throw ::com::sun::star::uno::RuntimeException( \
106	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \	106	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
107	::rtl::OUString::createFromAscii(",\n"m), \	107	::rtl::OUString::createFromAscii(",\n" m), \
108	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }	108	::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
109	#define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \	109	#define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \
110	OSL_ENSURE(c, m); \	110	OSL_ENSURE(c, m); \
111	throw ::com::sun::star::uno::RuntimeException( \	111	throw ::com::sun::star::uno::RuntimeException( \
112	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \	112	::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
113	::rtl::OUString::createFromAscii(",\n"m), \	113	::rtl::OUString::createFromAscii(",\n" m), \
114	ifc ); }	114	ifc ); }
115		115
116	/** This macro asserts the given condition (in debug mode), and	116	/** This macro asserts the given condition (in debug mode), and

Lines 149-155 namespace utl Link Here

(-)a/main/unotools/source/config/bootstrap.cxx (-3 / +3 lines)
149	rtl::OUString uri;	149	rtl::OUString uri;
150	rtl::Bootstrap::get(	150	rtl::Bootstrap::get(
151	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);	151	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
152	s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"BOOTSTRAP_DATA_NAME)));	152	s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME)));
153	}	153	}
154	return *s_pData;	154	return *s_pData;
155	}	155	}
Lines 693-699 OUString Bootstrap::getAllUsersValue(OUString const& _sDefault) Link Here
693	{	693	{
694	OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS));	694	OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS));
695		695
696	rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) );	696	rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SETUP_DATA_NAME ) ) );
697	OUString sResult;	697	OUString sResult;
698	aData.getFrom( csAllUsersItem, sResult, _sDefault );	698	aData.getFrom( csAllUsersItem, sResult, _sDefault );
699	return sResult;	699	return sResult;
Lines 910-916 sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa Link Here
910	rtl::Bootstrap::get(	910	rtl::Bootstrap::get(
911	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);	911	rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
912	rtl::Bootstrap aData( uri +	912	rtl::Bootstrap aData( uri +
913	OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"SAL_CONFIGFILE("version"))) );	913	OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) );
914	if ( aData.getHandle() == NULL )	914	if ( aData.getHandle() == NULL )
915	// version.ini (versionrc) doesn't exist	915	// version.ini (versionrc) doesn't exist
916	return sal_False;	916	return sal_False;

Lines 296-304 bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa Link Here

(-)a/main/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx (-8 / +8 lines)
296	deleteRootsModule();	296	deleteRootsModule();
297		297
298	#if defined SYSTEM_MOZILLA	298	#if defined SYSTEM_MOZILLA
299	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));	299	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
300	#else	300	#else
301	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));	301	OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
302	#endif	302	#endif
303	::rtl::Bootstrap::expandMacros(rootModule);	303	::rtl::Bootstrap::expandMacros(rootModule);
304		304
Lines 328-345 bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa Link Here
328	RootsModule = 0;	328	RootsModule = 0;
329	if (found)	329	if (found)
330	xmlsec_trace("Added new root certificate module "	330	xmlsec_trace("Added new root certificate module "
331	"\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());	331	"\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
332	else	332	else
333	{	333	{
334	xmlsec_trace("FAILED to load the new root certificate module "	334	xmlsec_trace("FAILED to load the new root certificate module "
335	"\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());	335	"\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
336	return_value = false;	336	return_value = false;
337	}	337	}
338	}	338	}
339	else	339	else
340	{	340	{
341	xmlsec_trace("FAILED to add new root certifice module: "	341	xmlsec_trace("FAILED to add new root certifice module: "
342	"\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());	342	"\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
343	return_value = false;	343	return_value = false;
344		344
345	}	345	}
Lines 368-384 extern "C" void nsscrypto_finalize() Link Here
368		368
369	if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))	369	if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))
370	{	370	{
371	xmlsec_trace("Unloaded module \""ROOT_CERTS"\".");	371	xmlsec_trace( "Unloaded module \"" ROOT_CERTS "\".");
372	}	372	}
373	else	373	else
374	{	374	{
375	xmlsec_trace("Failed unloadeding module \""ROOT_CERTS"\".");	375	xmlsec_trace( "Failed unloadeding module \"" ROOT_CERTS "\".");
376	}	376	}
377	SECMOD_DestroyModule(RootsModule);	377	SECMOD_DestroyModule(RootsModule);
378	}	378	}
379	else	379	else
380	{	380	{
381	xmlsec_trace("Unloading module \""ROOT_CERTS	381	xmlsec_trace( "Unloading module \"" ROOT_CERTS
382	"\" failed because it was not found.");	382	"\" failed because it was not found.");
383	}	383	}
384	PK11_LogoutAll();	384	PK11_LogoutAll();