diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-27 11:24:10 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-27 11:24:10 +0000 |
commit | 01d72b6647f7d40223c44884563a5e489d7f20e7 (patch) | |
tree | 9b6c4e999cea7d8ac58b03066d86a96ed292523d /sfx2 | |
parent | a694f788b723e08c9977fdeb80113095939c6a89 (diff) |
CWS-TOOLING: integrate CWS sb107
2009-04-14 13:09:13 +0200 sb r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/bastyp/frmhtmlw.cxx | 44 | ||||
-rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 44 | ||||
-rw-r--r-- | sfx2/util/makefile.mk | 1 |
3 files changed, 44 insertions, 45 deletions
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 91b787e062..d93f99bda7 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -99,13 +99,13 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rStrm << pIndent; ByteString sOut( '<' ); - (((sOut += sHTML_meta) += ' ') - += (bHTTPEquiv ? sHTML_O_httpequiv : sHTML_O_name)) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_meta) += ' ') + += (bHTTPEquiv ? OOO_STRING_SVTOOLS_HTML_O_httpequiv : OOO_STRING_SVTOOLS_HTML_O_name)) += "=\""; rStrm << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rStrm, rName, eDestEnc, pNonConvertableChars ); - ((sOut = "\" ") += sHTML_O_content) += "=\""; + ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_content) += "=\""; rStrm << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rStrm, rContent, eDestEnc, pNonConvertableChars ) << "\">"; @@ -124,7 +124,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, { String aContentType = String::CreateFromAscii( sHTML_MIME_text_html ); aContentType.AppendAscii( pCharSet ); - OutMeta( rStrm, pIndent, sHTML_META_content_type, aContentType, TRUE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, TRUE, eDestEnc, pNonConvertableChars ); } @@ -132,14 +132,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, rStrm << sNewLine; if( pIndent ) rStrm << pIndent; - HTMLOutFuncs::Out_AsciiTag( rStrm, sHTML_title ); + HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title ); if( i_xDocProps.is() ) { const String& rTitle = i_xDocProps->getTitle(); if( rTitle.Len() ) HTMLOutFuncs::Out_String( rStrm, rTitle, eDestEnc, pNonConvertableChars ); } - HTMLOutFuncs::Out_AsciiTag( rStrm, sHTML_title, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, FALSE ); // Target-Frame if( i_xDocProps.is() ) @@ -152,7 +152,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, rStrm << pIndent; ByteString sOut( '<' ); - (((sOut += sHTML_base) += ' ') += sHTML_O_target) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_base) += ' ') += OOO_STRING_SVTOOLS_HTML_O_target) += "=\""; rStrm << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rStrm, rTarget, eDestEnc, pNonConvertableChars ) << "\">"; @@ -162,7 +162,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, // Who we are String sGenerator( SfxResId( STR_HTML_GENERATOR ) ); sGenerator.SearchAndReplaceAscii( "%1", String( DEFINE_CONST_UNICODE( TOOLS_INETDEF_OS ) ) ); - OutMeta( rStrm, pIndent, sHTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars ); + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars ); if( i_xDocProps.is() ) { @@ -182,14 +182,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, rBaseURL, rReloadURL)); } - OutMeta( rStrm, pIndent, sHTML_META_refresh, sContent, TRUE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, TRUE, eDestEnc, pNonConvertableChars ); } // Author const String& rAuthor = i_xDocProps->getAuthor(); if( rAuthor.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_author, rAuthor, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, FALSE, eDestEnc, pNonConvertableChars ); // created @@ -199,13 +199,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, String sOut = String::CreateFromInt32(aD.GetDate()); sOut += ';'; sOut += String::CreateFromInt32(aT.GetTime()); - OutMeta( rStrm, pIndent, sHTML_META_created, sOut, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, FALSE, eDestEnc, pNonConvertableChars ); // changedby const String& rChangedBy = i_xDocProps->getModifiedBy(); if( rChangedBy.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_changedby, rChangedBy, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, FALSE, eDestEnc, pNonConvertableChars ); // changed @@ -215,26 +215,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, sOut = String::CreateFromInt32(aD2.GetDate()); sOut += ';'; sOut += String::CreateFromInt32(aT2.GetTime()); - OutMeta( rStrm, pIndent, sHTML_META_changed, sOut, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, FALSE, eDestEnc, pNonConvertableChars ); // Subject const String& rTheme = i_xDocProps->getSubject(); if( rTheme.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_classification, rTheme, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, FALSE, eDestEnc, pNonConvertableChars ); // Description const String& rComment = i_xDocProps->getDescription(); if( rComment.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_description, rComment, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, FALSE, eDestEnc, pNonConvertableChars); // Keywords String Keywords = ::comphelper::string::convertCommaSeparated( i_xDocProps->getKeywords()); if( Keywords.Len() ) - OutMeta( rStrm, pIndent, sHTML_META_keywords, Keywords, FALSE, + OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, FALSE, eDestEnc, pNonConvertableChars); uno::Reference < script::XTypeConverter > xConverter( @@ -301,7 +301,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( { aURL = URIHelper::simpleNormalizedMakeRelative( rBaseURL, aURL ); - ((sOut += ' ') += sHTML_O_src) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\""; rOut << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rOut, aURL, eDestEnc, pNonConvertableChars ); sOut = '\"'; @@ -311,7 +311,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameName") ); if ( (aAny >>= aStr) && aStr.getLength() ) { - ((sOut += ' ') += sHTML_O_name) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rOut << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rOut, aStr, eDestEnc, pNonConvertableChars ); sOut = '\"'; @@ -320,10 +320,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( sal_Int32 nVal = SIZE_NOT_SET; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginWidth") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) - (((sOut += ' ') += sHTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal ); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginwidth) += '=') += ByteString::CreateFromInt32( nVal ); aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameMarginHeight") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) - (((sOut += ' ') += sHTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal ); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_marginheight) += '=') += ByteString::CreateFromInt32( nVal ); sal_Bool bVal = sal_True; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") ); @@ -333,7 +333,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( if ( aAny >>= bVal ) { const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; - (((sOut += ' ') += sHTML_O_scrolling) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_scrolling) += '=') += pStr; } } @@ -345,7 +345,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( if ( aAny >>= bVal ) { const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; - (((sOut += ' ') += sHTML_O_frameborder) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_frameborder) += '=') += pStr; } } diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 1b338c38cb..e70537db6a 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -88,12 +88,12 @@ static HTMLOptionEnum aAreaShapeOptEnums[] = static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] = #endif { - { sHTML_SH_rect, IMAP_OBJ_RECTANGLE }, - { sHTML_SH_rectangle, IMAP_OBJ_RECTANGLE }, - { sHTML_SH_circ, IMAP_OBJ_CIRCLE }, - { sHTML_SH_circle, IMAP_OBJ_CIRCLE }, - { sHTML_SH_poly, IMAP_OBJ_POLYGON }, - { sHTML_SH_polygon, IMAP_OBJ_POLYGON }, + { OOO_STRING_SVTOOLS_HTML_SH_rect, IMAP_OBJ_RECTANGLE }, + { OOO_STRING_SVTOOLS_HTML_SH_rectangle, IMAP_OBJ_RECTANGLE }, + { OOO_STRING_SVTOOLS_HTML_SH_circ, IMAP_OBJ_CIRCLE }, + { OOO_STRING_SVTOOLS_HTML_SH_circle, IMAP_OBJ_CIRCLE }, + { OOO_STRING_SVTOOLS_HTML_SH_poly, IMAP_OBJ_POLYGON }, + { OOO_STRING_SVTOOLS_HTML_SH_polygon, IMAP_OBJ_POLYGON }, { 0, 0 } }; @@ -104,18 +104,18 @@ static HTMLOptionEnum aHTMLMetaNameTable[] = static HTMLOptionEnum __READONLY_DATA aHTMLMetaNameTable[] = #endif { - { sHTML_META_author, HTML_META_AUTHOR }, - { sHTML_META_changed, HTML_META_CHANGED }, - { sHTML_META_changedby, HTML_META_CHANGEDBY }, - { sHTML_META_classification,HTML_META_CLASSIFICATION}, - { sHTML_META_content_type, HTML_META_CONTENT_TYPE }, - { sHTML_META_created, HTML_META_CREATED }, - { sHTML_META_description, HTML_META_DESCRIPTION }, - { sHTML_META_keywords, HTML_META_KEYWORDS }, - { sHTML_META_generator, HTML_META_GENERATOR }, - { sHTML_META_refresh, HTML_META_REFRESH }, - { sHTML_META_sdendnote, HTML_META_SDENDNOTE }, - { sHTML_META_sdfootnote, HTML_META_SDFOOTNOTE }, + { OOO_STRING_SVTOOLS_HTML_META_author, HTML_META_AUTHOR }, + { OOO_STRING_SVTOOLS_HTML_META_changed, HTML_META_CHANGED }, + { OOO_STRING_SVTOOLS_HTML_META_changedby, HTML_META_CHANGEDBY }, + { OOO_STRING_SVTOOLS_HTML_META_classification,HTML_META_CLASSIFICATION}, + { OOO_STRING_SVTOOLS_HTML_META_content_type, HTML_META_CONTENT_TYPE }, + { OOO_STRING_SVTOOLS_HTML_META_created, HTML_META_CREATED }, + { OOO_STRING_SVTOOLS_HTML_META_description, HTML_META_DESCRIPTION }, + { OOO_STRING_SVTOOLS_HTML_META_keywords, HTML_META_KEYWORDS }, + { OOO_STRING_SVTOOLS_HTML_META_generator, HTML_META_GENERATOR }, + { OOO_STRING_SVTOOLS_HTML_META_refresh, HTML_META_REFRESH }, + { OOO_STRING_SVTOOLS_HTML_META_sdendnote, HTML_META_SDENDNOTE }, + { OOO_STRING_SVTOOLS_HTML_META_sdfootnote, HTML_META_SDFOOTNOTE }, { 0, 0 } }; @@ -586,7 +586,7 @@ rtl_TextEncoding SfxHTMLParser::GetEncodingByHttpHeader( SvKeyValueIterator *pHT for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont; bCont = pHTTPHeader->GetNext( aKV ) ) { - if( aKV.GetKey().EqualsIgnoreCaseAscii( sHTML_META_content_type ) ) + if( aKV.GetKey().EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ) ) { if( aKV.GetValue().Len() ) { @@ -622,7 +622,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader ) bCont = pHTTPHeader->GetNext( aKV ) ) { if( aKV.GetKey().EqualsIgnoreCaseAscii( - sHTML_META_content_script_type ) ) + OOO_STRING_SVTOOLS_HTML_META_content_script_type ) ) { if( aKV.GetValue().Len() ) { @@ -641,12 +641,12 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader ) aTmp.Erase( 0, 2 ); } - if( aTmp.EqualsIgnoreCaseAscii( sHTML_LG_starbasic ) ) + if( aTmp.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_LG_starbasic ) ) { eScriptType = STARBASIC; aScriptType = DEFINE_CONST_UNICODE(SVX_MACRO_LANGUAGE_STARBASIC); } - if( !aTmp.EqualsIgnoreCaseAscii( sHTML_LG_javascript ) ) + if( !aTmp.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_LG_javascript ) ) { eScriptType = EXTENDED_STYPE; aScriptType = aTmp; diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk index d8fdc0fea5..8b1b18c470 100644 --- a/sfx2/util/makefile.mk +++ b/sfx2/util/makefile.mk @@ -81,7 +81,6 @@ SHL1USE_EXPORTS=name SHL1STDLIBS+=\ $(FWELIB) \ $(BASICLIB) \ - $(XMLSCRIPTLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ $(VCLLIB) \ |