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 | f83ef386d33bf2c00371cfba6953c61a103f0c4b (patch) | |
| tree | 2a4321c479724c795feaa2876f0c2765504a95e9 | |
| parent | 0a606b888ece7885a851feee96afe44ff8a25b38 (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>
26 files changed, 1273 insertions, 1396 deletions
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index 29607aa34b99..fcf9d727f05e 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -40,7 +40,6 @@ #include <tools/string.hxx> -#include <svtools/htmlkywd.hxx> #include <sfx2/frmhtml.hxx> #include <sfx2/frmhtmlw.hxx> #ifndef _WRKWIN_HXX //autogen @@ -53,12 +52,7 @@ class SfxItemSet; -extern SVT_DLLPUBLIC sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archive, "ARCHIVE" ); - -extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_Hidden, "HIDDEN" ); -extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_Hidden_False, "FALSE" ); -extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_Archives, "ARCHIVES" ); -extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_Object, "OBJECT" ); +#define OOO_STRING_SW_HTML_O_Hidden "HIDDEN" class SwApplet_Impl { diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 2d58313dfc4b..2e8d395d72ca 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -31,6 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <SwAppletImpl.hxx> +#include <svtools/htmlkywd.hxx> #include <svtools/urihelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/EmbedStates.hpp> @@ -42,14 +43,13 @@ using namespace com::sun::star; -/* Some MIB magic...*/ +namespace { -//sal_Char SVT_DLLPUBLIC const SVTOOLS_CONSTASCII_DEF( sHTML_O_archive, "ARCHIVE" ); +static char const sHTML_O_archive[] = "ARCHIVE"; +static char const sHTML_O_Archives[] = "ARCHIVES"; +static char const sHTML_O_Object[] = "OBJECT"; -sal_Char const SVTOOLS_CONSTASCII_DEF( sHTML_O_Hidden, "HIDDEN" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sHTML_O_Hidden_False, "FALSE" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sHTML_O_Archives, "ARCHIVES" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sHTML_O_Object, "OBJECT" ); +} USHORT SwApplet_Impl::GetOptionType( const String& rName, BOOL bApplet ) { @@ -59,8 +59,8 @@ USHORT SwApplet_Impl::GetOptionType( const String& rName, BOOL bApplet ) { case 'A': case 'a': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_align ) || - rName.EqualsIgnoreCaseAscii( sHTML_O_alt ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_align ) || + rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_alt ) ) nType = SWHTML_OPTTYPE_IGNORE; else if( bApplet && (rName.EqualsIgnoreCaseAscii( sHTML_O_archive ) || @@ -69,32 +69,32 @@ USHORT SwApplet_Impl::GetOptionType( const String& rName, BOOL bApplet ) break; case 'C': case 'c': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_class ) || - (bApplet && (rName.EqualsIgnoreCaseAscii( sHTML_O_code ) || - rName.EqualsIgnoreCaseAscii( sHTML_O_codebase ))) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_class ) || + (bApplet && (rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_code ) || + rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_codebase ))) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'H': case 'h': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_height ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_height ) ) nType = SWHTML_OPTTYPE_SIZE; - else if( rName.EqualsIgnoreCaseAscii( sHTML_O_hspace ) || - (!bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_Hidden )) ) + else if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_hspace ) || + (!bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SW_HTML_O_Hidden )) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'I': case 'i': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_id ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_id ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'M': case 'm': - if( bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_mayscript ) ) + if( bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'N': case 'n': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_name ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_name ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'O': @@ -104,23 +104,23 @@ USHORT SwApplet_Impl::GetOptionType( const String& rName, BOOL bApplet ) break; case 'S': case 's': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_style ) || - (!bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_src )) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_style ) || + (!bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_src )) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'T': case 't': - if( !bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_type ) ) + if( !bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_type ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'V': case 'v': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_vspace ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_vspace ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'W': case 'w': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_width ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_width ) ) nType = SWHTML_OPTTYPE_SIZE; break; } @@ -171,13 +171,13 @@ sal_Bool SwApplet_Impl::CreateApplet( const String& rBaseURL ) { const SvCommand& rArg = aCommandList[i]; const String& rName = rArg.GetCommand(); - if( rName.EqualsIgnoreCaseAscii( sHTML_O_code ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_code ) ) aCode = rArg.GetArgument(); - else if( rName.EqualsIgnoreCaseAscii( sHTML_O_codebase ) ) + else if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_codebase ) ) aCodeBase = INetURLObject::GetAbsURL( rBaseURL, rArg.GetArgument() ); - else if( rName.EqualsIgnoreCaseAscii( sHTML_O_name ) ) + else if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_name ) ) aName = rArg.GetArgument(); - else if( rName.EqualsIgnoreCaseAscii( sHTML_O_mayscript ) ) + else if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) bMayScript = sal_True; } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index e63f7c4b67b7..2020efd3288e 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -252,11 +252,11 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, { bFirstCSS1Rule = FALSE; OutNewLine(); - ((((sOut += '<') += sHTML_style) += ' ') += sHTML_O_type) += "=\"text/css\">"; + ((((sOut += '<') += OOO_STRING_SVTOOLS_HTML_style) += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += "=\"text/css\">"; Strm() << sOut.GetBuffer(); sOut.Erase(); OutNewLine(); - Strm() << '<' << sHTML_comment; + Strm() << '<' << OOO_STRING_SVTOOLS_HTML_comment; IncIndentLevel(); } @@ -269,11 +269,11 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, case CSS1_OUTMODE_SPAN_TAG1_ON: if( bTagOn ) { - ((((sOut += '<') += sHTML_span) += ' ') += sHTML_O_style) += "=\""; + ((((sOut += '<') += OOO_STRING_SVTOOLS_HTML_span) += ' ') += OOO_STRING_SVTOOLS_HTML_O_style) += "=\""; } else { - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_span, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, FALSE ); return; } break; @@ -287,7 +287,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, break; case CSS1_OUTMODE_STYLE_OPT_ON: - ((sOut = ' ') += sHTML_O_style) += "=\""; + ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_style) += "=\""; break; } bFirstCSS1Property = FALSE; @@ -715,7 +715,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, BOOL bUsed ) Strm() << "-->"; OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_style, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_style, FALSE ); } else { @@ -756,37 +756,37 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, switch( rNm.GetChar(0) ) { // nicht mehr unterstuetzt: - // sHTML_author - // sHTML_acronym - // sHTML_abbreviation - // sHTML_deletedtext - // sHTML_insertedtext - // sHTML_language - // sHTML_person - case 'B': if( !bChrFmt && rNm.EqualsAscii(sHTML_blockquote) ) + // OOO_STRING_SVTOOLS_HTML_author + // OOO_STRING_SVTOOLS_HTML_acronym + // OOO_STRING_SVTOOLS_HTML_abbreviation + // OOO_STRING_SVTOOLS_HTML_deletedtext + // OOO_STRING_SVTOOLS_HTML_insertedtext + // OOO_STRING_SVTOOLS_HTML_language + // OOO_STRING_SVTOOLS_HTML_person + case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) ) { rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE; - rToken.Assign( sHTML_blockquote ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_blockquote ); } break; case 'C': if( bChrFmt ) { - if( rNm.EqualsAscii(sHTML_citiation) ) + if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) ) { rRefPoolId = RES_POOLCHR_HTML_CITIATION; - rToken.Assign( sHTML_citiation ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_citiation ); } - else if( rNm.EqualsAscii(sHTML_code) ) + else if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_code) ) { rRefPoolId = RES_POOLCHR_HTML_CODE; - rToken.Assign( sHTML_code ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_code ); } } break; - case 'D': if( bChrFmt && rNm.EqualsAscii(sHTML_definstance) ) + case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) ) { rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE; - rToken.Assign( sHTML_definstance); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_definstance); } else if( !bChrFmt ) { @@ -804,78 +804,78 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, else if( nDefListLvl & HTML_DLCOLL_DD ) { rRefPoolId = RES_POOLCOLL_HTML_DD; - rToken.Assign( sHTML_dd ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_dd ); } else { rRefPoolId = RES_POOLCOLL_HTML_DT; - rToken.Assign( sHTML_dt ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_dt ); } } } break; - case 'E': if( bChrFmt && rNm.EqualsAscii( sHTML_emphasis ) ) + case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) ) { rRefPoolId = RES_POOLCHR_HTML_EMPHASIS; - rToken.Assign( sHTML_emphasis ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_emphasis ); } break; - case 'H': if( !bChrFmt && rNm.EqualsAscii( sHTML_horzrule ) ) + case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule ) ) // HR nicht ausgeben! bStop = (nDeep==0); break; - case 'K': if( bChrFmt && rNm.EqualsAscii( sHTML_keyboard ) ) + case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) ) { rRefPoolId = RES_POOLCHR_HTML_KEYBOARD; - rToken.Assign( sHTML_keyboard ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_keyboard ); } break; - case 'L': if( !bChrFmt && rNm.EqualsAscii( sHTML_listing ) ) + case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) ) { // Listing als PRE exportieren bzw. von // PRE abgeleitete Vorlage exportieren - rToken.Assign( sHTML_preformtxt ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt ); rRefPoolId = RES_POOLCOLL_HTML_PRE; nDeep = CSS1_FMT_CMPREF; } break; - case 'P': if( !bChrFmt && rNm.EqualsAscii( sHTML_preformtxt ) ) + case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) ) { rRefPoolId = RES_POOLCOLL_HTML_PRE; - rToken.Assign( sHTML_preformtxt ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt ); } break; case 'S': if( bChrFmt ) { - if( rNm.EqualsAscii( sHTML_sample ) ) + if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_sample ) ) { rRefPoolId = RES_POOLCHR_HTML_SAMPLE; - rToken.Assign( sHTML_sample ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_sample ); } - else if( rNm.EqualsAscii( sHTML_strong ) ) + else if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_strong ) ) { rRefPoolId = RES_POOLCHR_HTML_STRONG; - rToken.Assign( sHTML_strong ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_strong ); } } break; - case 'T': if( bChrFmt && rNm.EqualsAscii( sHTML_teletype ) ) + case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) ) { rRefPoolId = RES_POOLCHR_HTML_TELETYPE; - rToken.Assign( sHTML_teletype ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_teletype ); } break; - case 'V': if( bChrFmt && rNm.EqualsAscii( sHTML_variable ) ) + case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) ) { rRefPoolId = RES_POOLCHR_HTML_VARIABLE; - rToken.Assign( sHTML_variable ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_variable ); } break; - case 'X': if( !bChrFmt && rNm.EqualsAscii( sHTML_xmp ) ) + case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) ) { // XMP als PRE exportieren (aber nicht die // Vorlage als Style) - rToken.Assign( sHTML_preformtxt ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt ); rRefPoolId = RES_POOLCOLL_HTML_PRE; nDeep = CSS1_FMT_CMPREF; } @@ -899,62 +899,62 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, bStop = (nDeep==0); break; case RES_POOLCOLL_TEXT: - rToken.Assign( sHTML_parabreak ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); break; case RES_POOLCOLL_HEADLINE1: - rToken.Assign( sHTML_head1 ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_head1 ); break; case RES_POOLCOLL_HEADLINE2: - rToken.Assign( sHTML_head2 ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_head2 ); break; case RES_POOLCOLL_HEADLINE3: - rToken.Assign( sHTML_head3 ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_head3 ); break; case RES_POOLCOLL_HEADLINE4: - rToken.Assign( sHTML_head4 ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_head4 ); break; case RES_POOLCOLL_HEADLINE5: - rToken.Assign( sHTML_head5 ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_head5 ); break; case RES_POOLCOLL_HEADLINE6: - rToken.Assign( sHTML_head6 ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_head6 ); break; case RES_POOLCOLL_SENDADRESS: - rToken.Assign( sHTML_address ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_address ); break; case RES_POOLCOLL_HTML_BLOCKQUOTE: - rToken.Assign( sHTML_blockquote ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_blockquote ); break; case RES_POOLCOLL_HTML_PRE: - rToken.Assign( sHTML_preformtxt ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt ); break; case RES_POOLCOLL_HTML_DD: - rToken.Assign( sHTML_dd ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_dd ); break; case RES_POOLCOLL_HTML_DT: - rToken.Assign( sHTML_dt ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_dt ); break; case RES_POOLCOLL_TABLE: if( pPseudo ) { - rToken.Assign( sHTML_tabledata ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_tabledata ); rToken.Append( ' ' ); - rToken.Append( sHTML_parabreak ); + rToken.Append( OOO_STRING_SVTOOLS_HTML_parabreak ); } else - rToken.Assign( sHTML_parabreak ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); break; case RES_POOLCOLL_TABLE_HDLN: if( pPseudo ) { - rToken.Assign( sHTML_tableheader ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_tableheader ); rToken.Append( ' ' ); - rToken.Append( sHTML_parabreak ); + rToken.Append( OOO_STRING_SVTOOLS_HTML_parabreak ); } else - rToken.Assign( sHTML_parabreak ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); break; case RES_POOLCOLL_HTML_HR: // HR nicht ausgeben! @@ -963,8 +963,8 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, case RES_POOLCOLL_FOOTNOTE: if( !nDeep ) { - rToken.Assign( sHTML_parabreak ); - rClass.AssignAscii( sHTML_sdfootnote ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); + rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); rRefPoolId = RES_POOLCOLL_TEXT; nDeep = CSS1_FMT_CMPREF; } @@ -972,8 +972,8 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, case RES_POOLCOLL_ENDNOTE: if( !nDeep ) { - rToken.Assign( sHTML_parabreak ); - rClass.AssignAscii( sHTML_sdendnote ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak ); + rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); rRefPoolId = RES_POOLCOLL_TEXT; nDeep = CSS1_FMT_CMPREF; } @@ -981,44 +981,44 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, // Zeichen-Vorlagen case RES_POOLCHR_HTML_EMPHASIS: - rToken.Assign( sHTML_emphasis ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_emphasis ); break; case RES_POOLCHR_HTML_CITIATION: - rToken.Assign( sHTML_citiation ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_citiation ); break; case RES_POOLCHR_HTML_STRONG: - rToken.Assign( sHTML_strong ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_strong ); break; case RES_POOLCHR_HTML_CODE: - rToken.Assign( sHTML_code ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_code ); break; case RES_POOLCHR_HTML_SAMPLE: - rToken.Assign( sHTML_sample ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_sample ); break; case RES_POOLCHR_HTML_KEYBOARD: - rToken.Assign( sHTML_keyboard ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_keyboard ); break; case RES_POOLCHR_HTML_VARIABLE: - rToken.Assign( sHTML_variable ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_variable ); break; case RES_POOLCHR_HTML_DEFINSTANCE: - rToken.Assign( sHTML_definstance ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_definstance ); break; case RES_POOLCHR_HTML_TELETYPE: - rToken.Assign( sHTML_teletype ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_teletype ); break; case RES_POOLCHR_INET_NORMAL: if( pPseudo ) { - rToken.Assign( sHTML_anchor ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_anchor ); pPseudo->AssignAscii( sCSS1_link ); } break; case RES_POOLCHR_INET_VISIT: if( pPseudo ) { - rToken.Assign( sHTML_anchor ); + rToken.Assign( OOO_STRING_SVTOOLS_HTML_anchor ); pPseudo->AssignAscii( sCSS1_visited ); } break; @@ -1735,13 +1735,13 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, case 'D': if( rNm.EqualsAscii("DD 1") || rNm.EqualsAscii("DT 1") ) rHTMLWrt.nDfltBottomMargin = 0; break; - case 'L': if(rNm.EqualsAscii(sHTML_listing) ) + case 'L': if(rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_listing) ) rHTMLWrt.nDfltBottomMargin = 0; break; - case 'P': if( rNm.EqualsAscii(sHTML_preformtxt) ) + case 'P': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_preformtxt) ) rHTMLWrt.nDfltBottomMargin = 0; break; - case 'X': if( rNm.EqualsAscii(sHTML_xmp) ) + case 'X': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_xmp) ) rHTMLWrt.nDfltBottomMargin = 0; break; } @@ -1937,10 +1937,10 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo, if( nNotes > 0 ) { - aSelector.AssignAscii( sHTML_anchor ); + aSelector.AssignAscii( OOO_STRING_SVTOOLS_HTML_anchor ); aSelector.Append( '.'); - aSelector.AppendAscii( bEndNote ? sHTML_sdendnote_anc - : sHTML_sdfootnote_anc ); + aSelector.AppendAscii( bEndNote ? OOO_STRING_SVTOOLS_HTML_sdendnote_anc + : OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ); SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_RULE|CSS1_OUTMODE_TEMPLATE, TRUE, &aSelector ); rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_font_size, @@ -1969,10 +1969,10 @@ static Writer& OutCSS1_SwFtnInfo( Writer& rWrt, const SwEndNoteInfo& rInfo, } if( aItemSet.Count() ) { - aSelector.AssignAscii( sHTML_anchor ); + aSelector.AssignAscii( OOO_STRING_SVTOOLS_HTML_anchor ); aSelector.Append( '.'); - aSelector.AppendAscii( bEndNote ? sHTML_sdendnote_sym - : sHTML_sdfootnote_sym ); + aSelector.AppendAscii( bEndNote ? OOO_STRING_SVTOOLS_HTML_sdendnote_sym + : OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ); if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, sal_True, sal_False )) rHTMLWrt.aScriptTextStyles.Insert( new String( pSymCharFmt->GetName() ) ); } @@ -3079,7 +3079,7 @@ static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt ) } else { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_span, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, FALSE ); } return rWrt; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 030409c1e955..c4608a4907f2 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -140,9 +140,9 @@ using namespace ::com::sun::star; HTMLOutEvent __FAR_DATA aAnchorEventTable[] = { - { sHTML_O_SDonclick, sHTML_O_onclick, SFX_EVENT_MOUSECLICK_OBJECT }, - { sHTML_O_SDonmouseover, sHTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, - { sHTML_O_SDonmouseout, sHTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT }, + { OOO_STRING_SVTOOLS_HTML_O_SDonclick, OOO_STRING_SVTOOLS_HTML_O_onclick, SFX_EVENT_MOUSECLICK_OBJECT }, + { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, + { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT }, { 0, 0, 0 } }; @@ -161,9 +161,9 @@ static Writer& OutHTML_HoriSpacer( Writer& rWrt, INT16 nSize ) } ByteString sOut( '<' ); - (((((((((sOut += sHTML_spacer) - += ' ') += sHTML_O_type) += '=') += sHTML_SPTYPE_horizontal) - += ' ') += sHTML_O_size) += '=') + (((((((((sOut += OOO_STRING_SVTOOLS_HTML_spacer) + += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal) + += ' ') += OOO_STRING_SVTOOLS_HTML_O_size) += '=') +=ByteString::CreateFromInt32(nSize)) += '>'; rWrt.Strm() << sOut.GetBuffer(); @@ -182,13 +182,13 @@ USHORT SwHTMLWriter::GetDefListLvl( const String& rNm, USHORT nPoolId ) return 1 | HTML_DLCOLL_DT; } - String sDTDD( String::CreateFromAscii(sHTML_dt) ); + String sDTDD( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_dt) ); sDTDD += ' '; if( COMPARE_EQUAL == sDTDD.CompareTo( rNm, sDTDD.Len() ) ) // DefinitionList - term return (USHORT)rNm.Copy( sDTDD.Len() ).ToInt32() | HTML_DLCOLL_DT; - sDTDD.AssignAscii( sHTML_dd ); + sDTDD.AssignAscii( OOO_STRING_SVTOOLS_HTML_dd ); sDTDD += ' '; if( COMPARE_EQUAL == sDTDD.CompareTo( rNm, sDTDD.Len() ) ) // DefinitionList - definition @@ -215,7 +215,7 @@ void SwHTMLWriter::OutAndSetDefList( USHORT nNewLvl ) { if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_deflist, TRUE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, TRUE ); IncIndentLevel(); bLFPossible = TRUE; } @@ -227,7 +227,7 @@ void SwHTMLWriter::OutAndSetDefList( USHORT nNewLvl ) DecIndentLevel(); if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_deflist, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, FALSE ); bLFPossible = TRUE; } } @@ -240,7 +240,7 @@ void SwHTMLWriter::ChangeParaToken( USHORT nNew ) { if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken ) { - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_preformtxt, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_preformtxt, FALSE ); bLFPossible = TRUE; } nLastParaToken = nNew; @@ -679,13 +679,13 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // der erste Buchstabe reicht meistens switch( rInfo.aToken.GetChar( 0 ) ) { - case 'A': ASSERT( rInfo.aToken.Equals(sHTML_address), + case 'A': ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_address), "Doch kein ADDRESS?" ); rInfo.bParaPossible = TRUE; rHWrt.bNoAlign = TRUE; break; - case 'B': ASSERT( rInfo.aToken.Equals(sHTML_blockquote), + case 'B': ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_blockquote), "Doch kein BLOCKQUOTE?" ); rInfo.bParaPossible = TRUE; rHWrt.bNoAlign = TRUE; @@ -697,7 +697,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, } else { - ASSERT( rInfo.aToken.Equals(sHTML_preformtxt), + ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_preformtxt), "Doch kein PRE?" ); if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken ) { @@ -712,10 +712,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, } break; - case 'D': ASSERT( rInfo.aToken.Equals(sHTML_dt) || - rInfo.aToken.Equals(sHTML_dd), + case 'D': ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt) || + rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dd), "Doch kein DD/DT?" ); - bDT = rInfo.aToken.Equals(sHTML_dt); + bDT = rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt); rInfo.bParaPossible = !bDT; rHWrt.bNoAlign = TRUE; bForceDL = TRUE; @@ -727,7 +727,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // alle Vorlagen, die nicht einem HTML-Tag entsprechen oder von // diesem abgeleitet sind, werden als <P> exportiert - rInfo.aToken = sHTML_parabreak; + rInfo.aToken = OOO_STRING_SVTOOLS_HTML_parabreak; bPara = TRUE; } @@ -935,9 +935,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, if( rInfo.bInNumBulList && bNumbered ) { ByteString sOut( '<' ); - sOut += sHTML_li; + sOut += OOO_STRING_SVTOOLS_HTML_li; if( USHRT_MAX != nNumStart ) - (((sOut += ' ') += sHTML_O_value) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_value) += '=') += ByteString::CreateFromInt32(nNumStart); sOut += '>'; rWrt.Strm() << sOut.GetBuffer(); @@ -945,7 +945,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, if( rHWrt.nDefListLvl > 0 && !bForceDL ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bDT ? sHTML_dt : sHTML_dd ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bDT ? OOO_STRING_SVTOOLS_HTML_dt : OOO_STRING_SVTOOLS_HTML_dd ); } if( pAdjItem && @@ -956,7 +956,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // if there are controls in a paragraph, because the control and // all text behind the control does not recognize this attribute. ByteString sOut( '<' ); - sOut += sHTML_division; + sOut += OOO_STRING_SVTOOLS_HTML_division; rWrt.Strm() << sOut.GetBuffer(); rHWrt.bTxtAttr = FALSE; @@ -980,7 +980,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, (bHasParSpace || pAdjItem) ) { HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.GetBuffer() ); - aToken = sHTML_parabreak; + aToken = OOO_STRING_SVTOOLS_HTML_parabreak; bPara = TRUE; rHWrt.bNoAlign = FALSE; bNoStyle = FALSE; @@ -1057,7 +1057,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, if( rHWrt.bCfgOutStyles && (pFmtInfo->aClass.Len() || pFmtInfo->bScriptDependent) ) { - ((sOut += ' ') += sHTML_O_class) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\""; rWrt.Strm() << sOut.GetBuffer(); String aClass( pFmtInfo->aClass ); if( pFmtInfo->bScriptDependent ) @@ -1124,7 +1124,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, ASSERT( nBulletGrfLvl < MAXLEVEL, "So viele Ebenen gibt's nicht" ); const SwNumFmt& rNumFmt = aNumInfo.GetNumRule()->Get(nBulletGrfLvl); - OutHTML_BulletImage( rWrt, sHTML_image, 0, + OutHTML_BulletImage( rWrt, OOO_STRING_SVTOOLS_HTML_image, 0, rHWrt.aBulletGrfs[nBulletGrfLvl], rNumFmt.GetGraphicSize(), rNumFmt.GetGraphicOrientation() ); } @@ -1177,20 +1177,20 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo ) // - keine Styles geschrieben werden, und // - ein untere Abstand existiert if( rInfo.bParaPossible && rInfo.bOutPara ) - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_parabreak, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_parabreak, FALSE ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.GetBuffer(), FALSE ); - rHWrt.bLFPossible = !rInfo.aToken.Equals( sHTML_dt ) && - !rInfo.aToken.Equals( sHTML_dd ) && - !rInfo.aToken.Equals( sHTML_li ); + rHWrt.bLFPossible = !rInfo.aToken.Equals( OOO_STRING_SVTOOLS_HTML_dt ) && + !rInfo.aToken.Equals( OOO_STRING_SVTOOLS_HTML_dd ) && + !rInfo.aToken.Equals( OOO_STRING_SVTOOLS_HTML_li ); } if( rInfo.bOutDiv ) { rHWrt.DecIndentLevel(); if( rHWrt.bLFPossible ) rHWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_division, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE ); rHWrt.bLFPossible = TRUE; } @@ -2192,7 +2192,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) USHORT nPoolId = pNd->GetAnyFmtColl().GetPoolFmtId(); if( !nEnde && (RES_POOLCOLL_HTML_HR==nPoolId || - pNd->GetAnyFmtColl().GetName().EqualsAscii( sHTML_horzrule) ) ) + pNd->GetAnyFmtColl().GetName().EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule) ) ) { // dann die absatz-gebundenen Grafiken/OLE-Objekte im Absatz // MIB 8.7.97: Ein <PRE> spannen wir um die Linie auf. Dann stimmen @@ -2209,7 +2209,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) rHTMLWrt.bLFPossible = TRUE; ByteString sOut( '<' ); - sOut += sHTML_horzrule; + sOut += OOO_STRING_SVTOOLS_HTML_horzrule; const SfxItemSet* pItemSet = pNd->GetpSwAttrSet(); if( !pItemSet ) @@ -2245,17 +2245,17 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) nPageWidth = pBox->GetFrmFmt()->GetFrmSize().GetWidth(); } - ((sOut += ' ') += sHTML_O_width) += '='; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '='; rWrt.Strm() << sOut.GetBuffer(); rWrt.OutULong( rHTMLWrt.ToPixel(nPageWidth-nLeft-nRight) ); - ((sOut = ' ') += sHTML_O_align) += '='; + ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '='; if( !nLeft ) - sOut += sHTML_AL_left; + sOut += OOO_STRING_SVTOOLS_HTML_AL_left; else if( !nRight ) - sOut += sHTML_AL_right; + sOut += OOO_STRING_SVTOOLS_HTML_AL_right; else - sOut += sHTML_AL_center; + sOut += OOO_STRING_SVTOOLS_HTML_AL_center; } } rWrt.Strm() << sOut.GetBuffer(); @@ -2268,14 +2268,14 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) USHORT nWidth = pBorderLine->GetOutWidth() + pBorderLine->GetInWidth() + pBorderLine->GetDistance(); - ((sOut = ' ') += sHTML_O_size) += '='; + ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_size) += '='; rWrt.Strm() << sOut.GetBuffer(); rWrt.OutULong( rHTMLWrt.ToPixel(nWidth) ); const Color& rBorderColor = pBorderLine->GetColor(); if( !rBorderColor.IsRGBEqual( Color(COL_GRAY) ) ) { - ((sOut = ' ') += sHTML_O_color) += '='; + ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_color) += '='; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_Color( rWrt.Strm(), rBorderColor, rHTMLWrt.eDestEnc ); @@ -2283,7 +2283,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( !pBorderLine->GetInWidth() ) { - (sOut = ' ') += sHTML_O_noshade; + (sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_noshade; rWrt.Strm() << sOut.GetBuffer(); } } @@ -2670,7 +2670,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( 0x0a == c ) { HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_linebreak ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_linebreak ); } else HTMLOutFuncs::Out_Char( rWrt.Strm(), c, aContext, &rHTMLWrt.aNonConvertableCharacters ); @@ -2709,16 +2709,16 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) // Wenn der letzte Absatz einer Tabellezelle leer ist und // wir fuer den MS-IE exportieren, schreiben wir statt eines // <BR> ein - rWrt.Strm() << '&' << sHTML_S_nbsp << ';'; + rWrt.Strm() << '&' << OOO_STRING_SVTOOLS_HTML_S_nbsp << ';'; } else { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_linebreak ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_linebreak ); const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem &)pNd->GetSwAttrSet().Get(RES_UL_SPACE); if( rULSpace.GetLower() > 0 && !bEndOfCell && !rHTMLWrt.IsHTMLMode(HTMLMODE_NO_BR_AT_PAREND) ) - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_linebreak ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_linebreak ); rHTMLWrt.bLFPossible = TRUE; } } @@ -2729,15 +2729,15 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) if( rHTMLWrt.bClearLeft ) { if( rHTMLWrt.bClearRight ) - pStr = sHTML_AL_all; + pStr = OOO_STRING_SVTOOLS_HTML_AL_all; else - pStr = sHTML_AL_left; + pStr = OOO_STRING_SVTOOLS_HTML_AL_left; } else - pStr = sHTML_AL_right; + pStr = OOO_STRING_SVTOOLS_HTML_AL_right; - ByteString sOut( sHTML_linebreak ); - (((sOut += ' ') += sHTML_O_clear) += '=') += pStr; + ByteString sOut( OOO_STRING_SVTOOLS_HTML_linebreak ); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += pStr; HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), sOut.GetBuffer() ); rHTMLWrt.bClearLeft = FALSE; @@ -2817,12 +2817,12 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) aColor.SetColor( COL_BLACK ); ByteString sOut( '<' ); - (((sOut += sHTML_font) += ' ') += sHTML_O_color) += '='; + (((sOut += OOO_STRING_SVTOOLS_HTML_font) += ' ') += OOO_STRING_SVTOOLS_HTML_O_color) += '='; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.eDestEnc ) << '>'; } else - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_font, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, FALSE ); return rWrt; } @@ -2837,7 +2837,7 @@ static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt ) const FontItalic nPosture = ((const SvxPostureItem&)rHt).GetPosture(); if( ITALIC_NORMAL == nPosture ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_italic, rHTMLWrt.bTagOn ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_italic, rHTMLWrt.bTagOn ); } else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr ) { @@ -2860,13 +2860,13 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt ) SwHTMLWriter::PrepareFontList( ((const SvxFontItem&)rHt), aNames, 0, rHTMLWrt.IsHTMLMode(HTMLMODE_FONT_GENERIC) ); ByteString sOut( '<' ); - (((sOut += sHTML_font) += ' ') += sHTML_O_face) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_font) += ' ') += OOO_STRING_SVTOOLS_HTML_O_face) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << "\">"; } else - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_font , FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font , FALSE ); return rWrt; } @@ -2880,11 +2880,11 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.bTagOn ) { ByteString sOut( '<' ); - sOut += sHTML_font; + sOut += OOO_STRING_SVTOOLS_HTML_font; UINT32 nHeight = ((const SvxFontHeightItem&)rHt).GetHeight(); USHORT nSize = rHTMLWrt.GetHTMLFontSize( nHeight ); - (((sOut += ' ') += sHTML_O_size) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_size) += '=') += ByteString::CreateFromInt32( nSize ); rWrt.Strm() << sOut.GetBuffer(); @@ -2899,7 +2899,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) } else { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_font, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, FALSE ); } return rWrt; @@ -2918,14 +2918,14 @@ static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.bTagOn ) { ByteString sOut( '<' ); - sOut += sHTML_span; + sOut += OOO_STRING_SVTOOLS_HTML_span; rWrt.Strm() << sOut.GetBuffer(); rHTMLWrt.OutLanguage( ((const SvxLanguageItem &)rHt).GetLanguage() ); rWrt.Strm() << '>'; } else { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_span, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, FALSE ); } return rWrt; @@ -2939,7 +2939,7 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt ) const FontWeight nBold = ((const SvxWeightItem&)rHt).GetWeight(); if( WEIGHT_BOLD == nBold ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_bold, rHTMLWrt.bTagOn ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_bold, rHTMLWrt.bTagOn ); } else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr ) { @@ -2961,7 +2961,7 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) const FontStrikeout nStrike = ((const SvxCrossedOutItem&)rHt).GetStrikeout(); if( STRIKEOUT_NONE != nStrike ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_strike, rHTMLWrt.bTagOn ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_strike, rHTMLWrt.bTagOn ); } else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr ) { @@ -2984,8 +2984,8 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char *pStr = 0; switch( eEscape ) { - case SVX_ESCAPEMENT_SUPERSCRIPT: pStr = sHTML_superscript; break; - case SVX_ESCAPEMENT_SUBSCRIPT: pStr = sHTML_subscript; break; + case SVX_ESCAPEMENT_SUPERSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_superscript; break; + case SVX_ESCAPEMENT_SUBSCRIPT: pStr = OOO_STRING_SVTOOLS_HTML_subscript; break; default: ; } @@ -3014,7 +3014,7 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) const FontUnderline eUnder = ((const SvxUnderlineItem&)rHt).GetLineStyle(); if( UNDERLINE_NONE != eUnder ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_underline, rHTMLWrt.bTagOn ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_underline, rHTMLWrt.bTagOn ); } else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr ) { @@ -3061,7 +3061,7 @@ static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt ) if( ((const SvxBlinkItem&)rHt).GetValue() ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_blink, rHTMLWrt.bTagOn ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_blink, rHTMLWrt.bTagOn ); } else if( rHTMLWrt.bCfgOutStyles && rHTMLWrt.bTxtAttr ) { @@ -3087,12 +3087,12 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn ) // Tag aus? Dann nur ein </A> ausgeben. if( !bOn ) { - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_anchor, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, FALSE ); return rWrt; } ByteString sOut( '<' ); - sOut += sHTML_anchor; + sOut += OOO_STRING_SVTOOLS_HTML_anchor; sal_Bool bScriptDependent = sal_False; { @@ -3119,7 +3119,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn ) if( bScriptDependent ) { - ((sOut += ' ') += sHTML_O_class) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\""; switch( rHTMLWrt.nCSS1Script ) { case CSS1_OUTMODE_WESTERN: @@ -3156,7 +3156,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn ) #endif aURL.EraseLeadingChars().EraseTrailingChars(); - ((sOut = ' ') += sHTML_O_href) += "=\""; + ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_href) += "=\""; rWrt.Strm() << sOut.GetBuffer(); rHTMLWrt.OutHyperlinkHRefValue( aURL ); sOut = '\"'; @@ -3166,7 +3166,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn ) if( rINetFmt.GetName().Len() ) { - ((sOut += ' ') += sHTML_O_name) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFmt.GetName(), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); @@ -3176,7 +3176,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn ) const String& rTarget = rINetFmt.GetTargetFrame(); if( rTarget.Len() ) { - ((sOut += ' ') += sHTML_O_target) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_target) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -3282,11 +3282,11 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt ) if( pFmtInfo->aToken.Len() > 0 ) sOut += pFmtInfo->aToken; else - sOut += sHTML_span; + sOut += OOO_STRING_SVTOOLS_HTML_span; if( rHTMLWrt.bCfgOutStyles && (pFmtInfo->aClass.Len() || pFmtInfo->bScriptDependent) ) { - ((sOut += ' ') += sHTML_O_class) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\""; rWrt.Strm() << sOut.GetBuffer(); String aClass( pFmtInfo->aClass ); if( pFmtInfo->bScriptDependent ) @@ -3317,7 +3317,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt ) { HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pFmtInfo->aToken.Len() ? pFmtInfo->aToken.GetBuffer() - : sHTML_span, + : OOO_STRING_SVTOOLS_HTML_span, FALSE ); } @@ -3334,17 +3334,17 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char* pStr = 0; switch( rAdjust.GetAdjust() ) { - case SVX_ADJUST_CENTER: pStr = sHTML_AL_center; break; - case SVX_ADJUST_LEFT: pStr = sHTML_AL_left; break; - case SVX_ADJUST_RIGHT: pStr = sHTML_AL_right; break; - case SVX_ADJUST_BLOCK: pStr = sHTML_AL_justify; break; + case SVX_ADJUST_CENTER: pStr = OOO_STRING_SVTOOLS_HTML_AL_center; break; + case SVX_ADJUST_LEFT: pStr = OOO_STRING_SVTOOLS_HTML_AL_left; break; + case SVX_ADJUST_RIGHT: pStr = OOO_STRING_SVTOOLS_HTML_AL_right; break; + case SVX_ADJUST_BLOCK: pStr = OOO_STRING_SVTOOLS_HTML_AL_justify; break; default: ; } if( pStr ) { ByteString sOut( ' ' ); - ((sOut += sHTML_O_align) += '=') += pStr; + ((sOut += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += pStr; rWrt.Strm() << sOut.GetBuffer(); } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index bd877376883a..bb003d292ed8 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -65,10 +65,10 @@ using namespace ::com::sun::star::container; static HTMLOutEvent __FAR_DATA aBodyEventTable[] = { - { sHTML_O_SDonload, sHTML_O_onload, SFX_EVENT_OPENDOC }, - { sHTML_O_SDonunload, sHTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC }, - { sHTML_O_SDonfocus, sHTML_O_onfocus, SFX_EVENT_ACTIVATEDOC }, - { sHTML_O_SDonblur, sHTML_O_onblur, SFX_EVENT_DEACTIVATEDOC }, + { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC }, + { OOO_STRING_SVTOOLS_HTML_O_SDonunload, OOO_STRING_SVTOOLS_HTML_O_onunload, SFX_EVENT_PREPARECLOSEDOC }, + { OOO_STRING_SVTOOLS_HTML_O_SDonfocus, OOO_STRING_SVTOOLS_HTML_O_onfocus, SFX_EVENT_ACTIVATEDOC }, + { OOO_STRING_SVTOOLS_HTML_O_SDonblur, OOO_STRING_SVTOOLS_HTML_O_onblur, SFX_EVENT_DEACTIVATEDOC }, { 0, 0, 0 } }; @@ -208,22 +208,22 @@ void SwHTMLParser::AddScriptSource() xub_StrLen nPos = STRING_NOTFOUND; if( !aBasicLib.Len() ) { - nPos = aToken.SearchAscii( sHTML_SB_library ); + nPos = aToken.SearchAscii( OOO_STRING_SVTOOLS_HTML_SB_library ); if( nPos != STRING_NOTFOUND ) { aBasicLib = - aToken.Copy( nPos + sizeof(sHTML_SB_library) - 1 ); + aToken.Copy( nPos + sizeof(OOO_STRING_SVTOOLS_HTML_SB_library) - 1 ); aBasicLib.EraseLeadingChars().EraseTrailingChars(); } } if( !aBasicModule.Len() && nPos==STRING_NOTFOUND ) { - nPos = aToken.SearchAscii( sHTML_SB_module ); + nPos = aToken.SearchAscii( OOO_STRING_SVTOOLS_HTML_SB_module ); if( nPos != STRING_NOTFOUND ) { aBasicModule = - aToken.Copy( nPos + sizeof(sHTML_SB_module) - 1 ); + aToken.Copy( nPos + sizeof(OOO_STRING_SVTOOLS_HTML_SB_module) - 1 ); aBasicModule.EraseLeadingChars().EraseTrailingChars(); } } @@ -312,13 +312,13 @@ void SwHTMLWriter::OutBasic() { OutNewLine(); ByteString sOut( '<' ); - sOut.Append( sHTML_meta ); + sOut.Append( OOO_STRING_SVTOOLS_HTML_meta ); sOut.Append( ' ' ); - sOut.Append( sHTML_O_httpequiv ); + sOut.Append( OOO_STRING_SVTOOLS_HTML_O_httpequiv ); sOut.Append( "=\"" ); - sOut.Append( sHTML_META_content_script_type ); + sOut.Append( OOO_STRING_SVTOOLS_HTML_META_content_script_type ); sOut.Append( "\" " ); - sOut.Append( sHTML_O_content ); + sOut.Append( OOO_STRING_SVTOOLS_HTML_O_content ); sOut.Append( "=\"text/x-" ); Strm() << sOut.GetBuffer(); // Entities aren't welcome here diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index a71c69a8d8f0..7fb4fd8502af 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -252,7 +252,7 @@ void SwCSS1Parser::SetLinkCharFmts() ASSERT( !bLinkCharFmtsSet, "Aufruf von SetLinkCharFmts unnoetig" ); SvxCSS1MapEntry *pStyleEntry = - GetTag( String::CreateFromAscii(sHTML_anchor) ); + GetTag( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) ); SwCharFmt *pUnvisited = 0, *pVisited = 0; if( pStyleEntry ) { @@ -268,7 +268,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyVLinkSet |= bColorSet; } - String sTmp( String::CreateFromAscii(sHTML_anchor) ); + String sTmp( String::CreateFromAscii(OOO_STRING_SVTOOLS_HTML_anchor) ); sTmp.Append( ':' ); sTmp.AppendAscii( sCSS1_link ); pStyleEntry = GetTag( sTmp ); @@ -283,7 +283,7 @@ void SwCSS1Parser::SetLinkCharFmts() bBodyLinkSet |= bColorSet; } - sTmp.AssignAscii( sHTML_anchor ); + sTmp.AssignAscii( OOO_STRING_SVTOOLS_HTML_anchor ); sTmp.Assign( ':' ); sTmp.AppendAscii( sCSS1_visited ); pStyleEntry = GetTag( sTmp ); @@ -377,12 +377,12 @@ void SwCSS1Parser::SetTableTxtColl( BOOL bHeader ) if( bHeader ) { nPoolId = RES_POOLCOLL_TABLE_HDLN; - sTag.AssignAscii( sHTML_tableheader ); + sTag.AssignAscii( OOO_STRING_SVTOOLS_HTML_tableheader ); } else { nPoolId = RES_POOLCOLL_TABLE; - sTag.AssignAscii( sHTML_tabledata ); + sTag.AssignAscii( OOO_STRING_SVTOOLS_HTML_tabledata ); } SwTxtFmtColl *pColl = 0; @@ -398,7 +398,7 @@ void SwCSS1Parser::SetTableTxtColl( BOOL bHeader ) String sTmp( sTag ); sTmp.Append( ' ' ); - sTmp.AppendAscii( sHTML_parabreak ); + sTmp.AppendAscii( OOO_STRING_SVTOOLS_HTML_parabreak ); pStyleEntry = GetTag( sTmp ); if( pStyleEntry ) { @@ -893,9 +893,9 @@ BOOL SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, ('s' == aClass.GetChar(0) || 'S' == aClass.GetChar(0)) ) { USHORT nPoolFmtId = 0; - if( aClass.EqualsIgnoreCaseAscii(sHTML_sdendnote_sym) ) + if( aClass.EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_sdendnote_sym) ) nPoolFmtId = RES_POOLCHR_ENDNOTE; - else if( aClass.EqualsIgnoreCaseAscii(sHTML_sdfootnote_sym) ) + else if( aClass.EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym) ) nPoolFmtId = RES_POOLCHR_FOOTNOTE; if( nPoolFmtId ) { @@ -941,9 +941,9 @@ BOOL SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, if( aClass.Len() >= 9 && ('s' == aClass.GetChar(0) || 'S' == aClass.GetChar(0)) ) { - if( aClass.EqualsIgnoreCaseAscii(sHTML_sdendnote) ) + if( aClass.EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_sdendnote) ) nPoolCollId = RES_POOLCOLL_ENDNOTE; - else if( aClass.EqualsIgnoreCaseAscii(sHTML_sdfootnote) ) + else if( aClass.EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_sdfootnote) ) nPoolCollId = RES_POOLCOLL_FOOTNOTE; if( nPoolCollId ) @@ -1001,7 +1001,7 @@ BOOL SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, { String sTmp( aToken2 ); sTmp += ' '; - sTmp.AppendAscii( sHTML_parabreak ); + sTmp.AppendAscii( OOO_STRING_SVTOOLS_HTML_parabreak ); if( CSS1_SCRIPT_ALL == nScript ) { @@ -1207,14 +1207,14 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( USHORT nToken2, const String& rClass ) const case HTML_DEFINSTANCE_ON: nPoolId = RES_POOLCHR_HTML_DEFINSTANCE; break; case HTML_TELETYPE_ON: nPoolId = RES_POOLCHR_HTML_TELETYPE; break; - case HTML_SHORTQUOTE_ON: sName = sHTML_shortquote; break; - case HTML_LANGUAGE_ON: sName = sHTML_language; break; - case HTML_AUTHOR_ON: sName = sHTML_author; break; - case HTML_PERSON_ON: sName = sHTML_person; break; - case HTML_ACRONYM_ON: sName = sHTML_acronym; break; - case HTML_ABBREVIATION_ON: sName = sHTML_abbreviation; break; - case HTML_INSERTEDTEXT_ON: sName = sHTML_insertedtext; break; - case HTML_DELETEDTEXT_ON: sName = sHTML_deletedtext; break; + case HTML_SHORTQUOTE_ON: sName = OOO_STRING_SVTOOLS_HTML_shortquote; break; + case HTML_LANGUAGE_ON: sName = OOO_STRING_SVTOOLS_HTML_language; break; + case HTML_AUTHOR_ON: sName = OOO_STRING_SVTOOLS_HTML_author; break; + case HTML_PERSON_ON: sName = OOO_STRING_SVTOOLS_HTML_person; break; + case HTML_ACRONYM_ON: sName = OOO_STRING_SVTOOLS_HTML_acronym; break; + case HTML_ABBREVIATION_ON: sName = OOO_STRING_SVTOOLS_HTML_abbreviation; break; + case HTML_INSERTEDTEXT_ON: sName = OOO_STRING_SVTOOLS_HTML_insertedtext; break; + case HTML_DELETEDTEXT_ON: sName = OOO_STRING_SVTOOLS_HTML_deletedtext; break; } // die Vorlage suchen oder anlegen (geht nur mit Namen) @@ -1317,12 +1317,12 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( USHORT nTxtColl, if( RES_POOLCOLL_TEXT == nTxtColl && aClass.Len() >= 9 && ('s' == aClass.GetChar(0) || 'S' == aClass.GetChar(0) ) ) { - if( aClass.EqualsIgnoreCaseAscii(sHTML_sdendnote) ) + if( aClass.EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_sdendnote) ) { nTxtColl = RES_POOLCOLL_ENDNOTE; aClass = aEmptyStr; } - else if( aClass.EqualsIgnoreCaseAscii(sHTML_sdfootnote) ) + else if( aClass.EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_sdfootnote) ) { nTxtColl = RES_POOLCOLL_FOOTNOTE; aClass = aEmptyStr; diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 88965c8b1179..328eb21be526 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -85,16 +85,16 @@ const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 = static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] = { - { sHTML_BEHAV_scroll, SDRTEXTANI_SCROLL }, - { sHTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE }, - { sHTML_BEHAV_slide, SDRTEXTANI_SLIDE }, + { OOO_STRING_SVTOOLS_HTML_BEHAV_scroll, SDRTEXTANI_SCROLL }, + { OOO_STRING_SVTOOLS_HTML_BEHAV_alternate, SDRTEXTANI_ALTERNATE }, + { OOO_STRING_SVTOOLS_HTML_BEHAV_slide, SDRTEXTANI_SLIDE }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLMarqDirectionTable[] = { - { sHTML_AL_left, SDRTEXTANI_LEFT }, - { sHTML_AL_right, SDRTEXTANI_RIGHT }, + { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT }, + { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT }, { 0, 0 } }; @@ -331,7 +331,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) case HTML_O_LOOP: if( pOption->GetString(). - EqualsIgnoreCaseAscii(sHTML_LOOP_infinite) ) + EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_LOOP_infinite) ) { nCount = 0; } @@ -703,7 +703,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, return rWrt; ByteString sOut( '<' ); - sOut += sHTML_marquee; + sOut += OOO_STRING_SVTOOLS_HTML_marquee; // Die Attribute des Objektd holen const SfxItemSet& rItemSet = pTextObj->GetMergedItemSet(); @@ -718,29 +718,29 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, const sal_Char *pStr = 0; switch( eAniKind ) { - case SDRTEXTANI_SCROLL: pStr = sHTML_BEHAV_scroll; break; - case SDRTEXTANI_SLIDE: pStr = sHTML_BEHAV_slide; break; - case SDRTEXTANI_ALTERNATE: pStr = sHTML_BEHAV_alternate; break; + case SDRTEXTANI_SCROLL: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_scroll; break; + case SDRTEXTANI_SLIDE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_slide; break; + case SDRTEXTANI_ALTERNATE: pStr = OOO_STRING_SVTOOLS_HTML_BEHAV_alternate; break; default: ; } if( pStr ) - (((sOut += ' ') += sHTML_O_behavior) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_behavior) += '=') += pStr; // DIRECTION pStr = 0; SdrTextAniDirection eAniDir = pTextObj->GetTextAniDirection(); switch( eAniDir ) { - case SDRTEXTANI_LEFT: pStr = sHTML_AL_left; break; - case SDRTEXTANI_RIGHT: pStr = sHTML_AL_right; break; + case SDRTEXTANI_LEFT: pStr = OOO_STRING_SVTOOLS_HTML_AL_left; break; + case SDRTEXTANI_RIGHT: pStr = OOO_STRING_SVTOOLS_HTML_AL_right; break; default: ; } if( pStr ) - (((sOut += ' ') += sHTML_O_direction) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_direction) += '=') += pStr; // LOOP sal_Int32 nCount = @@ -748,14 +748,14 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, .GetValue(); if( 0==nCount ) nCount = SDRTEXTANI_SLIDE==eAniKind ? 1 : -1; - (((sOut += ' ') += sHTML_O_loop) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_loop) += '=') += ByteString::CreateFromInt32( nCount ); // SCROLLDELAY sal_uInt16 nDelay = ((const SdrTextAniDelayItem&)rItemSet.Get( SDRATTR_TEXT_ANIDELAY )) .GetValue(); - (((sOut += ' ') += sHTML_O_scrolldelay) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_scrolldelay) += '=') += ByteString::CreateFromInt32( nDelay ); // SCROLLAMOUNT @@ -773,7 +773,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, MapMode(MAP_TWIP) ).Width()); } if( nAmount ) - (((sOut += ' ') += sHTML_O_scrollamount) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_scrollamount) += '=') += ByteString::CreateFromInt32( nAmount ); Size aTwipSz( pTextObj->GetLogicRect().GetSize() ); @@ -803,11 +803,11 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, aPixelSz.Height() = 1; if( aPixelSz.Width() ) - (((sOut += ' ') += sHTML_O_width) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '=') += ByteString::CreateFromInt32( aPixelSz.Width() ); if( aPixelSz.Height() ) - (((sOut += ' ') += sHTML_O_height) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') += ByteString::CreateFromInt32( aPixelSz.Height() ); } @@ -819,7 +819,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, const Color& rFillColor = ((const XFillColorItem&)rItemSet.Get(XATTR_FILLCOLOR)).GetColorValue(); - ((sOut += ' ') += sHTML_O_bgcolor) += '='; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_bgcolor) += '='; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.eDestEnc ); sOut.Erase(); @@ -849,7 +849,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, HTMLOutFuncs::Out_String( rWrt.Strm(), aText, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_marquee, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False ); if( aEndTags.Len() ) rWrt.Strm() << aEndTags.GetBuffer(); diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 0d0b94bc1ed1..0049097a5178 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -62,96 +62,96 @@ struct HTMLNumFmtTblEntry static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] = { - { sHTML_FT_author, RES_AUTHORFLD }, - { sHTML_FT_sender, RES_EXTUSERFLD }, - { sHTML_FT_date, RES_DATEFLD }, - { sHTML_FT_time, RES_TIMEFLD }, - { sHTML_FT_datetime,RES_DATETIMEFLD }, - { sHTML_FT_page, RES_PAGENUMBERFLD }, - { sHTML_FT_docinfo, RES_DOCINFOFLD }, - { sHTML_FT_docstat, RES_DOCSTATFLD }, - { sHTML_FT_filename,RES_FILENAMEFLD }, + { OOO_STRING_SW_HTML_FT_author, RES_AUTHORFLD }, + { OOO_STRING_SW_HTML_FT_sender, RES_EXTUSERFLD }, + { "DATE", RES_DATEFLD }, + { "TIME", RES_TIMEFLD }, + { OOO_STRING_SW_HTML_FT_datetime,RES_DATETIMEFLD }, + { OOO_STRING_SW_HTML_FT_page, RES_PAGENUMBERFLD }, + { OOO_STRING_SW_HTML_FT_docinfo, RES_DOCINFOFLD }, + { OOO_STRING_SW_HTML_FT_docstat, RES_DOCSTATFLD }, + { OOO_STRING_SW_HTML_FT_filename,RES_FILENAMEFLD }, { 0, 0 } }; static HTMLNumFmtTblEntry __FAR_DATA aHTMLDateFldFmtTable[] = { - { sHTML_FF_ssys, NF_DATE_SYSTEM_SHORT }, - { sHTML_FF_lsys, NF_DATE_SYSTEM_LONG }, - { sHTML_FF_dmy, NF_DATE_SYS_DDMMYY, }, - { sHTML_FF_dmyy, NF_DATE_SYS_DDMMYYYY, }, - { sHTML_FF_dmmy, NF_DATE_SYS_DMMMYY, }, - { sHTML_FF_dmmyy, NF_DATE_SYS_DMMMYYYY, }, - { sHTML_FF_dmmmy, NF_DATE_DIN_DMMMMYYYY }, - { sHTML_FF_dmmmyy, NF_DATE_DIN_DMMMMYYYY }, - { sHTML_FF_ddmmy, NF_DATE_SYS_NNDMMMYY }, - { sHTML_FF_ddmmmy, NF_DATE_SYS_NNDMMMMYYYY }, - { sHTML_FF_ddmmmyy, NF_DATE_SYS_NNDMMMMYYYY }, - { sHTML_FF_dddmmmy, NF_DATE_SYS_NNNNDMMMMYYYY }, - { sHTML_FF_dddmmmyy, NF_DATE_SYS_NNNNDMMMMYYYY }, - { sHTML_FF_my, NF_DATE_SYS_MMYY }, - { sHTML_FF_md, NF_DATE_DIN_MMDD }, - { sHTML_FF_ymd, NF_DATE_DIN_YYMMDD }, - { sHTML_FF_yymd, NF_DATE_DIN_YYYYMMDD }, + { "SSYS", NF_DATE_SYSTEM_SHORT }, + { "LSYS", NF_DATE_SYSTEM_LONG }, + { "DMY", NF_DATE_SYS_DDMMYY, }, + { "DMYY", NF_DATE_SYS_DDMMYYYY, }, + { "DMMY", NF_DATE_SYS_DMMMYY, }, + { "DMMYY", NF_DATE_SYS_DMMMYYYY, }, + { "DMMMY", NF_DATE_DIN_DMMMMYYYY }, + { "DMMMYY", NF_DATE_DIN_DMMMMYYYY }, + { "DDMMY", NF_DATE_SYS_NNDMMMYY }, + { "DDMMMY", NF_DATE_SYS_NNDMMMMYYYY }, + { "DDMMMYY", NF_DATE_SYS_NNDMMMMYYYY }, + { "DDDMMMY", NF_DATE_SYS_NNNNDMMMMYYYY }, + { "DDDMMMYY", NF_DATE_SYS_NNNNDMMMMYYYY }, + { "MY", NF_DATE_SYS_MMYY }, + { "MD", NF_DATE_DIN_MMDD }, + { "YMD", NF_DATE_DIN_YYMMDD }, + { "YYMD", NF_DATE_DIN_YYYYMMDD }, { 0, NF_NUMERIC_START } }; static HTMLNumFmtTblEntry __FAR_DATA aHTMLTimeFldFmtTable[] = { - { sHTML_FF_sys, NF_TIME_HHMMSS }, - { sHTML_FF_ssmm24, NF_TIME_HHMM }, - { sHTML_FF_ssmm12, NF_TIME_HHMMAMPM }, + { "SYS", NF_TIME_HHMMSS }, + { "SSMM24", NF_TIME_HHMM }, + { "SSMM12", NF_TIME_HHMMAMPM }, { 0, NF_NUMERIC_START } }; static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] = { - { sHTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER }, - { sHTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER }, - { sHTML_FF_uroman, SVX_NUM_ROMAN_UPPER }, - { sHTML_FF_lroman, SVX_NUM_ROMAN_LOWER }, - { sHTML_FF_arabic, SVX_NUM_ARABIC }, - { sHTML_FF_none, SVX_NUM_NUMBER_NONE }, - { sHTML_FF_char, SVX_NUM_CHAR_SPECIAL }, - { sHTML_FF_page, SVX_NUM_PAGEDESC }, - { sHTML_FF_ulettern, SVX_NUM_CHARS_UPPER_LETTER_N }, - { sHTML_FF_llettern, SVX_NUM_CHARS_LOWER_LETTER_N }, + { OOO_STRING_SW_HTML_FF_uletter, SVX_NUM_CHARS_UPPER_LETTER }, + { OOO_STRING_SW_HTML_FF_lletter, SVX_NUM_CHARS_LOWER_LETTER }, + { OOO_STRING_SW_HTML_FF_uroman, SVX_NUM_ROMAN_UPPER }, + { OOO_STRING_SW_HTML_FF_lroman, SVX_NUM_ROMAN_LOWER }, + { OOO_STRING_SW_HTML_FF_arabic, SVX_NUM_ARABIC }, + { OOO_STRING_SW_HTML_FF_none, SVX_NUM_NUMBER_NONE }, + { OOO_STRING_SW_HTML_FF_char, SVX_NUM_CHAR_SPECIAL }, + { OOO_STRING_SW_HTML_FF_page, SVX_NUM_PAGEDESC }, + { OOO_STRING_SW_HTML_FF_ulettern, SVX_NUM_CHARS_UPPER_LETTER_N }, + { OOO_STRING_SW_HTML_FF_llettern, SVX_NUM_CHARS_LOWER_LETTER_N }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] = { - { sHTML_FS_company, EU_COMPANY }, - { sHTML_FS_firstname, EU_FIRSTNAME }, - { sHTML_FS_name, EU_NAME }, - { sHTML_FS_shortcut, EU_SHORTCUT }, - { sHTML_FS_street, EU_STREET }, - { sHTML_FS_country, EU_COUNTRY }, - { sHTML_FS_zip, EU_ZIP }, - { sHTML_FS_city, EU_CITY }, - { sHTML_FS_title, EU_TITLE }, - { sHTML_FS_position, EU_POSITION }, - { sHTML_FS_pphone, EU_PHONE_PRIVATE }, - { sHTML_FS_cphone, EU_PHONE_COMPANY }, - { sHTML_FS_fax, EU_FAX }, - { sHTML_FS_email, EU_EMAIL }, - { sHTML_FS_state, EU_STATE }, + { OOO_STRING_SW_HTML_FS_company, EU_COMPANY }, + { OOO_STRING_SW_HTML_FS_firstname, EU_FIRSTNAME }, + { OOO_STRING_SW_HTML_FS_name, EU_NAME }, + { OOO_STRING_SW_HTML_FS_shortcut, EU_SHORTCUT }, + { OOO_STRING_SW_HTML_FS_street, EU_STREET }, + { OOO_STRING_SW_HTML_FS_country, EU_COUNTRY }, + { OOO_STRING_SW_HTML_FS_zip, EU_ZIP }, + { OOO_STRING_SW_HTML_FS_city, EU_CITY }, + { OOO_STRING_SW_HTML_FS_title, EU_TITLE }, + { OOO_STRING_SW_HTML_FS_position, EU_POSITION }, + { OOO_STRING_SW_HTML_FS_pphone, EU_PHONE_PRIVATE }, + { OOO_STRING_SW_HTML_FS_cphone, EU_PHONE_COMPANY }, + { OOO_STRING_SW_HTML_FS_fax, EU_FAX }, + { OOO_STRING_SW_HTML_FS_email, EU_EMAIL }, + { OOO_STRING_SW_HTML_FS_state, EU_STATE }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLAuthorFldFmtTable[] = { - { sHTML_FF_name, AF_NAME }, - { sHTML_FF_shortcut, AF_SHORTCUT }, + { OOO_STRING_SW_HTML_FF_name, AF_NAME }, + { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = { - { sHTML_FS_random, PG_RANDOM }, - { sHTML_FS_next, PG_NEXT }, - { sHTML_FS_prev, PG_PREV }, + { OOO_STRING_SW_HTML_FS_random, PG_RANDOM }, + { OOO_STRING_SW_HTML_FS_next, PG_NEXT }, + { OOO_STRING_SW_HTML_FS_prev, PG_PREV }, { 0, 0 } }; @@ -165,46 +165,46 @@ static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] = { - { sHTML_FS_title, DI_TITEL }, - { sHTML_FS_theme, DI_THEMA }, - { sHTML_FS_keys, DI_KEYS }, - { sHTML_FS_comment, DI_COMMENT }, - { sHTML_FS_info1, DI_INFO1 }, - { sHTML_FS_info2, DI_INFO2 }, - { sHTML_FS_info3, DI_INFO3 }, - { sHTML_FS_info4, DI_INFO4 }, - { sHTML_FS_custom, DI_CUSTOM }, - { sHTML_FS_create, DI_CREATE }, - { sHTML_FS_change, DI_CHANGE }, + { OOO_STRING_SW_HTML_FS_title, DI_TITEL }, + { OOO_STRING_SW_HTML_FS_theme, DI_THEMA }, + { OOO_STRING_SW_HTML_FS_keys, DI_KEYS }, + { OOO_STRING_SW_HTML_FS_comment, DI_COMMENT }, + { "INFO1", DI_INFO1 }, + { "INFO2", DI_INFO2 }, + { "INFO3", DI_INFO3 }, + { "INFO4", DI_INFO4 }, + { OOO_STRING_SW_HTML_FS_custom, DI_CUSTOM }, + { OOO_STRING_SW_HTML_FS_create, DI_CREATE }, + { OOO_STRING_SW_HTML_FS_change, DI_CHANGE }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldFmtTable[] = { - { sHTML_FF_author, DI_SUB_AUTHOR }, - { sHTML_FF_time, DI_SUB_TIME }, - { sHTML_FF_date, DI_SUB_DATE }, + { OOO_STRING_SW_HTML_FF_author, DI_SUB_AUTHOR }, + { OOO_STRING_SW_HTML_FF_time, DI_SUB_TIME }, + { OOO_STRING_SW_HTML_FF_date, DI_SUB_DATE }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLDocStatFldSubTable[] = { - { sHTML_FS_page, DS_PAGE }, - { sHTML_FS_para, DS_PARA }, - { sHTML_FS_word, DS_WORD }, - { sHTML_FS_char, DS_CHAR }, - { sHTML_FS_tbl, DS_TBL }, - { sHTML_FS_grf, DS_GRF }, - { sHTML_FS_ole, DS_OLE }, + { OOO_STRING_SW_HTML_FS_page, DS_PAGE }, + { OOO_STRING_SW_HTML_FS_para, DS_PARA }, + { OOO_STRING_SW_HTML_FS_word, DS_WORD }, + { OOO_STRING_SW_HTML_FS_char, DS_CHAR }, + { OOO_STRING_SW_HTML_FS_tbl, DS_TBL }, + { OOO_STRING_SW_HTML_FS_grf, DS_GRF }, + { OOO_STRING_SW_HTML_FS_ole, DS_OLE }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLFileNameFldFmtTable[] = { - { sHTML_FF_name, FF_NAME }, - { sHTML_FF_pathname, FF_PATHNAME }, - { sHTML_FF_path, FF_PATH }, - { sHTML_FF_name_noext, FF_NAME_NOEXT }, + { OOO_STRING_SW_HTML_FF_name, FF_NAME }, + { OOO_STRING_SW_HTML_FF_pathname, FF_PATHNAME }, + { OOO_STRING_SW_HTML_FF_path, FF_PATH }, + { OOO_STRING_SW_HTML_FF_name_noext, FF_NAME_NOEXT }, { 0, 0 } }; diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx index f9127f5cde80..9432a1a19904 100644 --- a/sw/source/filter/html/htmlfld.hxx +++ b/sw/source/filter/html/htmlfld.hxx @@ -31,103 +31,64 @@ #ifndef _HTMLFLD_HXX #define _HTMLFLD_HXX -#include <svtools/htmlkywd.hxx> - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_author, "AUTHOR" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_sender, "SENDER" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_date, "DATE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_time, "TIME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_datetime, "DATETIME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_page, "PAGE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_docinfo, "DOCINFO" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_docstat, "DOCSTAT" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FT_filename, "FILENAME" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_company, "COMPANY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_firstname, "FIRSTNAME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_name, "NAME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_shortcut, "SHORTCUT" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_street, "STREET" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_country, "COUNTRY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_zip, "ZIP" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_city, "CITY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_title, "TITLE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_position, "POSITION" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_pphone, "PPHONE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_cphone, "CPHONE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_fax, "FAX" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_email, "EMAIL" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_state, "STATE" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_random, "RANDOM" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_next, "NEXT" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_prev, "PREV" ); - -//sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_title, "TITLE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_theme, "THEME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_keys, "KEYS" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_comment, "COMMENT" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info1, "INFO1" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info2, "INFO2" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info3, "INFO3" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_info4, "INFO4" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_custom, "CUSTOM" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_create, "CREATE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_change, "CHANGE" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_page, "PAGE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_para, "PARAGRAPH" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_word, "WORD" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_char, "CHAR" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_tbl, "TABLE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_grf, "GRAPHIC" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FS_ole, "OLE" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_name, "NAME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_shortcut, "SHORTCUT" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ssys, "SSYS" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_lsys, "LSYS" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dmy, "DMY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dmyy, "DMYY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dmmy, "DMMY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dmmyy, "DMMYY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dmmmy, "DMMMY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dmmmyy, "DMMMYY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ddmmy, "DDMMY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ddmmmy, "DDMMMY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ddmmmyy, "DDMMMYY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dddmmmy, "DDDMMMY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_dddmmmyy, "DDDMMMYY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_my, "MY" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_md, "MD" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ymd, "YMD" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_yymd, "YYMD" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_sys, "SYS" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ssmm24, "SSMM24" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ssmm12, "SSMM12" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_uletter, "ULETTER" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_lletter, "LLETTER" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_uroman, "UROMAN" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_lroman, "LROMAN" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_arabic, "ARABIC" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_none, "NONE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_char, "CHAR" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_page, "PAGE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_ulettern, "ULETTERN" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_llettern, "LLETTERN" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_author, "AUTHOR" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_time, "TIME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_date, "DATE" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_all, "ALL" ); - -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_pathname, "PATHNAME" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_path, "PATH" ); -extern sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DECL( sHTML_FF_name_noext, "NAME-NOEXT" ); - +#include "sal/config.h" + +#define OOO_STRING_SW_HTML_FT_author "AUTHOR" +#define OOO_STRING_SW_HTML_FT_sender "SENDER" +#define OOO_STRING_SW_HTML_FT_datetime "DATETIME" +#define OOO_STRING_SW_HTML_FT_page "PAGE" +#define OOO_STRING_SW_HTML_FT_docinfo "DOCINFO" +#define OOO_STRING_SW_HTML_FT_docstat "DOCSTAT" +#define OOO_STRING_SW_HTML_FT_filename "FILENAME" +#define OOO_STRING_SW_HTML_FS_company "COMPANY" +#define OOO_STRING_SW_HTML_FS_firstname "FIRSTNAME" +#define OOO_STRING_SW_HTML_FS_name "NAME" +#define OOO_STRING_SW_HTML_FS_shortcut "SHORTCUT" +#define OOO_STRING_SW_HTML_FS_street "STREET" +#define OOO_STRING_SW_HTML_FS_country "COUNTRY" +#define OOO_STRING_SW_HTML_FS_zip "ZIP" +#define OOO_STRING_SW_HTML_FS_city "CITY" +#define OOO_STRING_SW_HTML_FS_title "TITLE" +#define OOO_STRING_SW_HTML_FS_position "POSITION" +#define OOO_STRING_SW_HTML_FS_pphone "PPHONE" +#define OOO_STRING_SW_HTML_FS_cphone "CPHONE" +#define OOO_STRING_SW_HTML_FS_fax "FAX" +#define OOO_STRING_SW_HTML_FS_email "EMAIL" +#define OOO_STRING_SW_HTML_FS_state "STATE" +#define OOO_STRING_SW_HTML_FS_random "RANDOM" +#define OOO_STRING_SW_HTML_FS_next "NEXT" +#define OOO_STRING_SW_HTML_FS_prev "PREV" +#define OOO_STRING_SW_HTML_FS_theme "THEME" +#define OOO_STRING_SW_HTML_FS_keys "KEYS" +#define OOO_STRING_SW_HTML_FS_comment "COMMENT" +#define OOO_STRING_SW_HTML_FS_custom "CUSTOM" +#define OOO_STRING_SW_HTML_FS_create "CREATE" +#define OOO_STRING_SW_HTML_FS_change "CHANGE" +#define OOO_STRING_SW_HTML_FS_page "PAGE" +#define OOO_STRING_SW_HTML_FS_para "PARAGRAPH" +#define OOO_STRING_SW_HTML_FS_word "WORD" +#define OOO_STRING_SW_HTML_FS_char "CHAR" +#define OOO_STRING_SW_HTML_FS_tbl "TABLE" +#define OOO_STRING_SW_HTML_FS_grf "GRAPHIC" +#define OOO_STRING_SW_HTML_FS_ole "OLE" +#define OOO_STRING_SW_HTML_FF_name "NAME" +#define OOO_STRING_SW_HTML_FF_shortcut "SHORTCUT" +#define OOO_STRING_SW_HTML_FF_uletter "ULETTER" +#define OOO_STRING_SW_HTML_FF_lletter "LLETTER" +#define OOO_STRING_SW_HTML_FF_uroman "UROMAN" +#define OOO_STRING_SW_HTML_FF_lroman "LROMAN" +#define OOO_STRING_SW_HTML_FF_arabic "ARABIC" +#define OOO_STRING_SW_HTML_FF_none "NONE" +#define OOO_STRING_SW_HTML_FF_char "CHAR" +#define OOO_STRING_SW_HTML_FF_page "PAGE" +#define OOO_STRING_SW_HTML_FF_ulettern "ULETTERN" +#define OOO_STRING_SW_HTML_FF_llettern "LLETTERN" +#define OOO_STRING_SW_HTML_FF_author "AUTHOR" +#define OOO_STRING_SW_HTML_FF_time "TIME" +#define OOO_STRING_SW_HTML_FF_date "DATE" +#define OOO_STRING_SW_HTML_FF_pathname "PATHNAME" +#define OOO_STRING_SW_HTML_FF_path "PATH" +#define OOO_STRING_SW_HTML_FF_name_noext "NAME-NOEXT" #endif diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 9d0f7da4c4b2..b3ef7f67d75e 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <tools/string.hxx> +#include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> #include <fmtfld.hxx> @@ -49,120 +50,22 @@ using namespace nsSwDocInfoSubType; -//----------------------------------------------------------------------- - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_author, "AUTHOR" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_sender, "SENDER" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_date, "DATE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_time, "TIME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_datetime, "DATETIME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_page, "PAGE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_docinfo, "DOCINFO" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_docstat, "DOCSTAT" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FT_filename, "FILENAME" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_company, "COMPANY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_firstname, "FIRSTNAME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_name, "NAME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_shortcut, "SHORTCUT" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_street, "STREET" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_country, "COUNTRY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_zip, "ZIP" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_city, "CITY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_title, "TITLE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_position, "POSITION" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_pphone, "PPHONE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_cphone, "CPHONE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_fax, "FAX" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_email, "EMAIL" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_state, "STATE" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_random, "RANDOM" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_next, "NEXT" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_prev, "PREV" ); - -//sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_title, "TITLE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_theme, "THEME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_keys, "KEYS" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_comment, "COMMENT" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info1, "INFO1" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info2, "INFO2" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info3, "INFO3" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_info4, "INFO4" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_custom, "CUSTOM" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_create, "CREATE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_change, "CHANGE" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_page, "PAGE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_para, "PARAGRAPH" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_word, "WORD" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_char, "CHAR" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_tbl, "TABLE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_grf, "GRAPHIC" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FS_ole, "OLE" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_name, "NAME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_shortcut, "SHORTCUT" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ssys, "SSYS" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_lsys, "LSYS" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dmy, "DMY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dmyy, "DMYY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dmmy, "DMMY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dmmyy, "DMMYY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dmmmy, "DMMMY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dmmmyy, "DMMMYY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ddmmy, "DDMMY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ddmmmy, "DDMMMY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ddmmmyy, "DDMMMYY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dddmmmy, "DDDMMMY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_dddmmmyy, "DDDMMMYY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_my, "MY" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_md, "MD" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ymd, "YMD" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_yymd, "YYMD" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_sys, "SYS" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ssmm24, "SSMM24" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ssmm12, "SSMM12" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_uletter, "ULETTER" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_lletter, "LLETTER" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_uroman, "UROMAN" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_lroman, "LROMAN" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_arabic, "ARABIC" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_none, "NONE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_char, "CHAR" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_page, "PAGE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_ulettern, "ULETTERN" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_llettern, "LLETTERN" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_author, "AUTHOR" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_time, "TIME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_date, "DATE" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_all, "ALL" ); - -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_pathname, "PATHNAME" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_path, "PATH" ); -sal_Char __FAR_DATA SVTOOLS_CONSTASCII_DEF( sHTML_FF_name_noext, "NAME-NOEXT" ); - - const sal_Char *SwHTMLWriter::GetNumFormat( USHORT nFmt ) { const sal_Char *pFmtStr = 0; switch( (SvxExtNumType)nFmt ) { - case SVX_NUM_CHARS_UPPER_LETTER: pFmtStr = sHTML_FF_uletter; break; - case SVX_NUM_CHARS_LOWER_LETTER: pFmtStr = sHTML_FF_lletter; break; - case SVX_NUM_ROMAN_UPPER: pFmtStr = sHTML_FF_uroman; break; - case SVX_NUM_ROMAN_LOWER: pFmtStr = sHTML_FF_lroman; break; - case SVX_NUM_ARABIC: pFmtStr = sHTML_FF_arabic; break; - case SVX_NUM_NUMBER_NONE: pFmtStr = sHTML_FF_none; break; - case SVX_NUM_CHAR_SPECIAL: pFmtStr = sHTML_FF_char; break; - case SVX_NUM_PAGEDESC: pFmtStr = sHTML_FF_page; break; - case SVX_NUM_CHARS_UPPER_LETTER_N: pFmtStr = sHTML_FF_ulettern; break; - case SVX_NUM_CHARS_LOWER_LETTER_N: pFmtStr = sHTML_FF_llettern; break; + case SVX_NUM_CHARS_UPPER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_uletter; break; + case SVX_NUM_CHARS_LOWER_LETTER: pFmtStr = OOO_STRING_SW_HTML_FF_lletter; break; + case SVX_NUM_ROMAN_UPPER: pFmtStr = OOO_STRING_SW_HTML_FF_uroman; break; + case SVX_NUM_ROMAN_LOWER: pFmtStr = OOO_STRING_SW_HTML_FF_lroman; break; + case SVX_NUM_ARABIC: pFmtStr = OOO_STRING_SW_HTML_FF_arabic; break; + case SVX_NUM_NUMBER_NONE: pFmtStr = OOO_STRING_SW_HTML_FF_none; break; + case SVX_NUM_CHAR_SPECIAL: pFmtStr = OOO_STRING_SW_HTML_FF_char; break; + case SVX_NUM_PAGEDESC: pFmtStr = OOO_STRING_SW_HTML_FF_page; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_ulettern; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pFmtStr = OOO_STRING_SW_HTML_FF_llettern; break; default: ; } @@ -193,24 +96,24 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, switch( nField ) { case RES_EXTUSERFLD: - pTypeStr = sHTML_FT_sender; + pTypeStr = OOO_STRING_SW_HTML_FT_sender; switch( (SwExtUserSubType)pFld->GetSubType() ) { - case EU_COMPANY: pSubStr = sHTML_FS_company; break; - case EU_FIRSTNAME: pSubStr = sHTML_FS_firstname; break; - case EU_NAME: pSubStr = sHTML_FS_name; break; - case EU_SHORTCUT: pSubStr = sHTML_FS_shortcut; break; - case EU_STREET: pSubStr = sHTML_FS_street; break; - case EU_COUNTRY: pSubStr = sHTML_FS_country; break; - case EU_ZIP: pSubStr = sHTML_FS_zip; break; - case EU_CITY: pSubStr = sHTML_FS_city; break; - case EU_TITLE: pSubStr = sHTML_FS_title; break; - case EU_POSITION: pSubStr = sHTML_FS_position; break; - case EU_PHONE_PRIVATE: pSubStr = sHTML_FS_pphone; break; - case EU_PHONE_COMPANY: pSubStr = sHTML_FS_cphone; break; - case EU_FAX: pSubStr = sHTML_FS_fax; break; - case EU_EMAIL: pSubStr = sHTML_FS_email; break; - case EU_STATE: pSubStr = sHTML_FS_state; break; + case EU_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_company; break; + case EU_FIRSTNAME: pSubStr = OOO_STRING_SW_HTML_FS_firstname; break; + case EU_NAME: pSubStr = OOO_STRING_SW_HTML_FS_name; break; + case EU_SHORTCUT: pSubStr = OOO_STRING_SW_HTML_FS_shortcut; break; + case EU_STREET: pSubStr = OOO_STRING_SW_HTML_FS_street; break; + case EU_COUNTRY: pSubStr = OOO_STRING_SW_HTML_FS_country; break; + case EU_ZIP: pSubStr = OOO_STRING_SW_HTML_FS_zip; break; + case EU_CITY: pSubStr = OOO_STRING_SW_HTML_FS_city; break; + case EU_TITLE: pSubStr = OOO_STRING_SW_HTML_FS_title; break; + case EU_POSITION: pSubStr = OOO_STRING_SW_HTML_FS_position; break; + case EU_PHONE_PRIVATE: pSubStr = OOO_STRING_SW_HTML_FS_pphone; break; + case EU_PHONE_COMPANY: pSubStr = OOO_STRING_SW_HTML_FS_cphone; break; + case EU_FAX: pSubStr = OOO_STRING_SW_HTML_FS_fax; break; + case EU_EMAIL: pSubStr = OOO_STRING_SW_HTML_FS_email; break; + case EU_STATE: pSubStr = OOO_STRING_SW_HTML_FS_state; break; default: ; } @@ -219,18 +122,18 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, break; case RES_AUTHORFLD: - pTypeStr = sHTML_FT_author; + pTypeStr = OOO_STRING_SW_HTML_FT_author; switch( (SwAuthorFormat)nFmt & 0xff) { - case AF_NAME: pFmtStr = sHTML_FF_name; break; - case AF_SHORTCUT: pFmtStr = sHTML_FF_shortcut; break; + case AF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break; + case AF_SHORTCUT: pFmtStr = OOO_STRING_SW_HTML_FF_shortcut; break; } ASSERT( pFmtStr, "ubekanntes Format fuer SwAuthorField" ); bFixed = ((const SwAuthorField*)pFld)->IsFixed(); break; case RES_DATETIMEFLD: - pTypeStr = sHTML_FT_datetime; + pTypeStr = OOO_STRING_SW_HTML_FT_datetime; bNumFmt = TRUE; if( ((SwDateTimeField*)pFld)->IsFixed() ) { @@ -241,13 +144,13 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, case RES_PAGENUMBERFLD: { - pTypeStr = sHTML_FT_page; + pTypeStr = OOO_STRING_SW_HTML_FT_page; SwPageNumSubType eSubType = (SwPageNumSubType)pFld->GetSubType(); switch( eSubType ) { - case PG_RANDOM: pSubStr = sHTML_FS_random; break; - case PG_NEXT: pSubStr = sHTML_FS_next; break; - case PG_PREV: pSubStr = sHTML_FS_prev; break; + case PG_RANDOM: pSubStr = OOO_STRING_SW_HTML_FS_random; break; + case PG_NEXT: pSubStr = OOO_STRING_SW_HTML_FS_next; break; + case PG_PREV: pSubStr = OOO_STRING_SW_HTML_FS_prev; break; } ASSERT( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" ); pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) ); @@ -272,19 +175,19 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, case RES_DOCINFOFLD: { USHORT nSubType = pFld->GetSubType(); - pTypeStr = sHTML_FT_docinfo; + pTypeStr = OOO_STRING_SW_HTML_FT_docinfo; USHORT nExtSubType = nSubType & 0x0f00; nSubType &= 0x00ff; switch( nSubType ) { - case DI_TITEL: pSubStr = sHTML_FS_title; break; - case DI_THEMA: pSubStr = sHTML_FS_theme; break; - case DI_KEYS: pSubStr = sHTML_FS_keys; break; - case DI_COMMENT: pSubStr = sHTML_FS_comment; break; - case DI_CREATE: pSubStr = sHTML_FS_create; break; - case DI_CHANGE: pSubStr = sHTML_FS_change; break; - case DI_CUSTOM: pSubStr = sHTML_FS_custom; break; + case DI_TITEL: pSubStr = OOO_STRING_SW_HTML_FS_title; break; + case DI_THEMA: pSubStr = OOO_STRING_SW_HTML_FS_theme; break; + case DI_KEYS: pSubStr = OOO_STRING_SW_HTML_FS_keys; break; + case DI_COMMENT: pSubStr = OOO_STRING_SW_HTML_FS_comment; break; + case DI_CREATE: pSubStr = OOO_STRING_SW_HTML_FS_create; break; + case DI_CHANGE: pSubStr = OOO_STRING_SW_HTML_FS_change; break; + case DI_CUSTOM: pSubStr = OOO_STRING_SW_HTML_FS_custom; break; default: pTypeStr = 0; break; } @@ -297,14 +200,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, switch( nExtSubType ) { case DI_SUB_AUTHOR: - pFmtStr = sHTML_FF_author; + pFmtStr = OOO_STRING_SW_HTML_FF_author; break; case DI_SUB_TIME: - pFmtStr = sHTML_FF_time; + pFmtStr = OOO_STRING_SW_HTML_FF_time; bNumFmt = TRUE; break; case DI_SUB_DATE: - pFmtStr = sHTML_FF_date; + pFmtStr = OOO_STRING_SW_HTML_FF_date; bNumFmt = TRUE; break; } @@ -332,17 +235,17 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, case RES_DOCSTATFLD: { - pTypeStr = sHTML_FT_docstat; + pTypeStr = OOO_STRING_SW_HTML_FT_docstat; USHORT nSubType = pFld->GetSubType(); switch( nSubType ) { - case DS_PAGE: pSubStr = sHTML_FS_page; break; - case DS_PARA: pSubStr = sHTML_FS_para; break; - case DS_WORD: pSubStr = sHTML_FS_word; break; - case DS_CHAR: pSubStr = sHTML_FS_char; break; - case DS_TBL: pSubStr = sHTML_FS_tbl; break; - case DS_GRF: pSubStr = sHTML_FS_grf; break; - case DS_OLE: pSubStr = sHTML_FS_ole; break; + case DS_PAGE: pSubStr = OOO_STRING_SW_HTML_FS_page; break; + case DS_PARA: pSubStr = OOO_STRING_SW_HTML_FS_para; break; + case DS_WORD: pSubStr = OOO_STRING_SW_HTML_FS_word; break; + case DS_CHAR: pSubStr = OOO_STRING_SW_HTML_FS_char; break; + case DS_TBL: pSubStr = OOO_STRING_SW_HTML_FS_tbl; break; + case DS_GRF: pSubStr = OOO_STRING_SW_HTML_FS_grf; break; + case DS_OLE: pSubStr = OOO_STRING_SW_HTML_FS_ole; break; default: pTypeStr = 0; break; } pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) ); @@ -350,13 +253,13 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, break; case RES_FILENAMEFLD: - pTypeStr = sHTML_FT_filename; + pTypeStr = OOO_STRING_SW_HTML_FT_filename; switch( (SwFileNameFormat)(nFmt & ~FF_FIXED) ) { - case FF_NAME: pFmtStr = sHTML_FF_name; break; - case FF_PATHNAME: pFmtStr = sHTML_FF_pathname; break; - case FF_PATH: pFmtStr = sHTML_FF_path; break; - case FF_NAME_NOEXT: pFmtStr = sHTML_FF_name_noext; break; + case FF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break; + case FF_PATHNAME: pFmtStr = OOO_STRING_SW_HTML_FF_pathname; break; + case FF_PATH: pFmtStr = OOO_STRING_SW_HTML_FF_path; break; + case FF_NAME_NOEXT: pFmtStr = OOO_STRING_SW_HTML_FF_name_noext; break; default: ; } @@ -369,22 +272,22 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, if( pTypeStr ) { ByteString sOut( '<' ); - ((((sOut += sHTML_sdfield) += ' ') += sHTML_O_type) += '=') + ((((sOut += OOO_STRING_SVTOOLS_HTML_sdfield) += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += pTypeStr; if( pSubStr ) - (((sOut += ' ') += sHTML_O_subtype) += '=') += pSubStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_subtype) += '=') += pSubStr; if( pFmtStr ) - (((sOut += ' ') += sHTML_O_format) += '=') += pFmtStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_format) += '=') += pFmtStr; if( aName.Len() ) { - (((sOut += ' ') += sHTML_O_name) += "=\""); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""); rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; } if( aValue.Len() ) { - ((sOut += ' ') += sHTML_O_value) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_value) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -399,7 +302,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } if( bFixed ) - (sOut += ' ') += sHTML_O_sdfixed; + (sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_sdfixed; sOut += '>'; rWrt.Strm() << sOut.GetBuffer(); } @@ -517,7 +420,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, // Off-Tag ausgeben if( pTypeStr ) - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_sdfield, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_sdfield, FALSE ); return rWrt; } @@ -557,7 +460,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) if( (rComment.Len() >= 6 && '<' == rComment.GetChar(0) && '>' == rComment.GetChar(rComment.Len()-1) && - rComment.Copy( 1, 4 ).EqualsIgnoreCaseAscii(sHTML_meta)) || + rComment.Copy( 1, 4 ).EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_meta)) || (rComment.Len() >= 7 && rComment.Copy( 0, 4 ).EqualsAscii( "<!--" ) && rComment.Copy( rComment.Len()-3, 3 ).EqualsAscii( "-->" )) ) @@ -597,7 +500,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) String sComment( rComment ); sComment.ConvertLineEnd( GetSystemLineEnd() ); // TODO: ??? - (((sOut += sHTML_comment) += ' ') + (((sOut += OOO_STRING_SVTOOLS_HTML_comment) += ' ') += ByteString( sComment, ((SwHTMLWriter&)rWrt).eDestEnc )) += " -->"; rWrt.Strm() << sOut.GetBuffer(); diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 80d37e28a613..e79016c96364 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -167,16 +167,16 @@ extern HTMLOutEvent __FAR_DATA aAnchorEventTable[]; static HTMLOutEvent __FAR_DATA aImageEventTable[] = { - { sHTML_O_SDonload, sHTML_O_onload, SVX_EVENT_IMAGE_LOAD }, - { sHTML_O_SDonabort, sHTML_O_onabort, SVX_EVENT_IMAGE_ABORT }, - { sHTML_O_SDonerror, sHTML_O_onerror, SVX_EVENT_IMAGE_ERROR }, + { OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SVX_EVENT_IMAGE_LOAD }, + { OOO_STRING_SVTOOLS_HTML_O_SDonabort, OOO_STRING_SVTOOLS_HTML_O_onabort, SVX_EVENT_IMAGE_ABORT }, + { OOO_STRING_SVTOOLS_HTML_O_SDonerror, OOO_STRING_SVTOOLS_HTML_O_onerror, SVX_EVENT_IMAGE_ERROR }, { 0, 0, 0 } }; static HTMLOutEvent __FAR_DATA aIMapEventTable[] = { - { sHTML_O_SDonmouseover, sHTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, - { sHTML_O_SDonmouseout, sHTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT }, + { OOO_STRING_SVTOOLS_HTML_O_SDonmouseover, OOO_STRING_SVTOOLS_HTML_O_onmouseover, SFX_EVENT_MOUSEOVER_OBJECT }, + { OOO_STRING_SVTOOLS_HTML_O_SDonmouseout, OOO_STRING_SVTOOLS_HTML_O_onmouseout, SFX_EVENT_MOUSEOUT_OBJECT }, { 0, 0, 0 } }; @@ -466,10 +466,10 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt, ByteString sOut( '<' ); pCntnrStr = (HTML_CNTNR_DIV == nCntnrMode) - ? sHTML_division - : sHTML_span; + ? OOO_STRING_SVTOOLS_HTML_division + : OOO_STRING_SVTOOLS_HTML_span; sOut += pCntnrStr; - ((((sOut += ' ') += sHTML_O_class) += "=\"") + ((((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\"") += sCSS1_class_abs_pos) += '\"'; Strm() << sOut.GetBuffer(); @@ -542,11 +542,11 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt, DecIndentLevel(); if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_division, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE ); bLFPossible = TRUE; } else if( HTML_CNTNR_SPAN == nCntnrMode ) - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_span, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, FALSE ); } @@ -564,7 +564,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, rFrmFmt.GetName().Len() ) { const sal_Char *pStr = - (nFrmOpts & HTML_FRMOPT_ID) ? sHTML_O_id : sHTML_O_name; + (nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; ((sOut += ' ') += pStr) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), rFrmFmt.GetName(), eDestEnc, &aNonConvertableCharacters ); @@ -584,7 +584,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, // ALT if( (nFrmOpts & HTML_FRMOPT_ALT) && rAlternateTxt.Len() ) { - ((sOut += ' ') += sHTML_O_alt) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_alt) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), rAlternateTxt, eDestEnc, &aNonConvertableCharacters ); sOut = '\"'; @@ -605,8 +605,8 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() ) { pStr = text::HoriOrientation::RIGHT == rHoriOri.GetHoriOrient() - ? sHTML_AL_right - : sHTML_AL_left; + ? OOO_STRING_SVTOOLS_HTML_AL_right + : OOO_STRING_SVTOOLS_HTML_AL_left; } } if( (nFrmOpts & HTML_FRMOPT_ALIGN) && !pStr && @@ -616,20 +616,20 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, { switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() ) { - case text::VertOrientation::LINE_TOP: pStr = sHTML_VA_top; break; + case text::VertOrientation::LINE_TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_top; break; case text::VertOrientation::CHAR_TOP: - case text::VertOrientation::BOTTOM: pStr = sHTML_VA_texttop; break; // geht nicht + case text::VertOrientation::BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_texttop; break; // geht nicht case text::VertOrientation::LINE_CENTER: - case text::VertOrientation::CHAR_CENTER: pStr = sHTML_VA_absmiddle; break; // geht nicht - case text::VertOrientation::CENTER: pStr = sHTML_VA_middle; break; + case text::VertOrientation::CHAR_CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_absmiddle; break; // geht nicht + case text::VertOrientation::CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_middle; break; case text::VertOrientation::LINE_BOTTOM: - case text::VertOrientation::CHAR_BOTTOM: pStr = sHTML_VA_absbottom; break; // geht nicht - case text::VertOrientation::TOP: pStr = sHTML_VA_bottom; break; + case text::VertOrientation::CHAR_BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_absbottom; break; // geht nicht + case text::VertOrientation::TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_bottom; break; case text::VertOrientation::NONE: break; } } if( pStr ) - (((sOut += ' ') += sHTML_O_align) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += pStr; // HSPACE und VSPACE @@ -665,13 +665,13 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( aPixelSpc.Width() ) { - (((sOut += ' ') += sHTML_O_hspace) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_hspace) += '=') += ByteString::CreateFromInt32( aPixelSpc.Width() ); } if( aPixelSpc.Height() ) { - (((sOut += ' ') += sHTML_O_vspace) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_vspace) += '=') += ByteString::CreateFromInt32( aPixelSpc.Height() ); } } @@ -740,7 +740,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( (nFrmOpts & HTML_FRMOPT_WIDTH) && ((nPrcWidth && nPrcWidth!=255) || aPixelSz.Width()) ) { - ((sOut += ' ') += sHTML_O_width) += '='; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '='; if( nPrcWidth ) (sOut += ByteString::CreateFromInt32( nPrcWidth )) += '%'; else @@ -750,7 +750,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( (nFrmOpts & HTML_FRMOPT_HEIGHT) && ((nPrcHeight && nPrcHeight!=255) || aPixelSz.Height()) ) { - ((sOut += ' ') += sHTML_O_height) += '='; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '='; if( nPrcHeight ) (sOut += ByteString::CreateFromInt32( nPrcHeight )) += '%'; else @@ -781,7 +781,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, { case SURROUND_NONE: case SURROUND_RIGHT: - pStr = sHTML_AL_right; + pStr = OOO_STRING_SVTOOLS_HTML_AL_right; break; case SURROUND_LEFT: case SURROUND_PARALLEL: @@ -802,7 +802,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, { case SURROUND_NONE: case SURROUND_LEFT: - pStr = sHTML_AL_left; + pStr = OOO_STRING_SVTOOLS_HTML_AL_left; break; case SURROUND_RIGHT: case SURROUND_PARALLEL: @@ -819,8 +819,8 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( pStr ) { - (((((((sOut = '<') += sHTML_linebreak) += ' ') - += sHTML_O_clear) += '=') += pStr) += '>') += rEndTags; + (((((((sOut = '<') += OOO_STRING_SVTOOLS_HTML_linebreak) += ' ') + += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += pStr) += '>') += rEndTags; rEndTags = sOut; } } @@ -876,7 +876,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( aIMapName.Len() ) aNameBase = aIMapName; else - aNameBase.AssignAscii( sHTML_map ); + aNameBase.AssignAscii( OOO_STRING_SVTOOLS_HTML_map ); if( !aIMapName.Len() ) (aIMapName = aNameBase) += String::CreateFromInt32( rHTMLWrt.nImgMapCnt ); @@ -1023,12 +1023,12 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( aMapURL.Len() || aName.Len() || aTarget.Len() || bEvents ) { - (sOut = '<') += sHTML_anchor; + (sOut = '<') += OOO_STRING_SVTOOLS_HTML_anchor; // Ein HREF nur Ausgaben, wenn es einen Link oder Makros gibt if( aMapURL.Len() || bEvents ) { - ((sOut += ' ') += sHTML_O_href) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_href) += "=\""; rWrt.Strm() << sOut.GetBuffer(); rHTMLWrt.OutHyperlinkHRefValue( aMapURL ); sOut = '\"'; @@ -1036,7 +1036,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( aName.Len() ) { - ((sOut += ' ') += sHTML_O_name) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); @@ -1045,7 +1045,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( aTarget.Len() ) { - ((sOut += ' ') += sHTML_O_target) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_target) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aTarget, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); @@ -1069,7 +1069,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, } rWrt.Strm() << ">"; - (((sOut = "</") += sHTML_anchor) += ">") += aEndTags; + (((sOut = "</") += OOO_STRING_SVTOOLS_HTML_anchor) += ">") += aEndTags; aEndTags = sOut; } } @@ -1135,18 +1135,18 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( pColBorderLine ) { sOut = '<'; - (((sOut += sHTML_font) += ' ') += sHTML_O_color) += '='; + (((sOut += OOO_STRING_SVTOOLS_HTML_font) += ' ') += OOO_STRING_SVTOOLS_HTML_O_color) += '='; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_Color( rWrt.Strm(), pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ) << '>'; - (((sOut = "</" ) += sHTML_font) += '>') += aEndTags; + (((sOut = "</" ) += OOO_STRING_SVTOOLS_HTML_font) += '>') += aEndTags; aEndTags = sOut; } } sOut = '<'; - (((sOut += sHTML_image) += ' ') += sHTML_O_src) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_image) += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aGrfNm, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"'; @@ -1170,19 +1170,19 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, if( nFrmOpts & HTML_FRMOPT_BORDER ) { - (((sOut = ' ') += sHTML_O_border) += '=') + (((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_border) += '=') += ByteString::CreateFromInt32( nBorderWidth ); rWrt.Strm() << sOut.GetBuffer(); } if( pURLItem && pURLItem->IsServerMap() ) { - (sOut = ' ') += sHTML_O_ismap; + (sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_ismap; rWrt.Strm() << sOut.GetBuffer(); } if( aIMapName.Len() ) { - ((sOut = ' ') += sHTML_O_usemap) += "=\"#"; + ((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_usemap) += "=\"#"; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aIMapName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"'; } @@ -1270,7 +1270,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, String s( *pLink ); if( !HTMLOutFuncs::PrivateURLToInternalImg(s) ) s = URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), s); - (sOut += sHTML_O_src) += "=\""; + (sOut += OOO_STRING_SVTOOLS_HTML_O_src) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), s, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1289,11 +1289,11 @@ Writer& OutHTML_BulletImage( Writer& rWrt, } if( aPixelSz.Width() ) - (((sOut += ' ') += sHTML_O_width) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '=') += ByteString::CreateFromInt32( aPixelSz.Width() ); if( aPixelSz.Height() ) - (((sOut += ' ') += sHTML_O_height) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') += ByteString::CreateFromInt32( aPixelSz.Height() ); if( pVertOrient ) @@ -1301,19 +1301,19 @@ Writer& OutHTML_BulletImage( Writer& rWrt, const sal_Char *pStr = 0; switch( pVertOrient->GetVertOrient() ) { - case text::VertOrientation::LINE_TOP: pStr = sHTML_VA_top; break; + case text::VertOrientation::LINE_TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_top; break; case text::VertOrientation::CHAR_TOP: - case text::VertOrientation::BOTTOM: pStr = sHTML_VA_texttop; break; // geht nicht + case text::VertOrientation::BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_texttop; break; // geht nicht case text::VertOrientation::LINE_CENTER: - case text::VertOrientation::CHAR_CENTER: pStr = sHTML_VA_absmiddle; break; // geht nicht - case text::VertOrientation::CENTER: pStr = sHTML_VA_middle; break; + case text::VertOrientation::CHAR_CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_absmiddle; break; // geht nicht + case text::VertOrientation::CENTER: pStr = OOO_STRING_SVTOOLS_HTML_VA_middle; break; case text::VertOrientation::LINE_BOTTOM: - case text::VertOrientation::CHAR_BOTTOM: pStr = sHTML_VA_absbottom; break; // geht nicht - case text::VertOrientation::TOP: pStr = sHTML_VA_bottom; break; + case text::VertOrientation::CHAR_BOTTOM: pStr = OOO_STRING_SVTOOLS_HTML_VA_absbottom; break; // geht nicht + case text::VertOrientation::TOP: pStr = OOO_STRING_SVTOOLS_HTML_VA_bottom; break; case text::VertOrientation::NONE: break; } if( pStr ) - (((sOut += ' ') += sHTML_O_align) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += pStr; } } @@ -1390,14 +1390,14 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, rHTMLWrt.OutNewLine(); ByteString sOut( '<' ); - sOut += sHTML_multicol; + sOut += OOO_STRING_SVTOOLS_HTML_multicol; const SwFmtCol& rFmtCol = rFrmFmt.GetCol(); // die Anzahl der Spalten als COLS ausgeben USHORT nCols = rFmtCol.GetNumCols(); if( nCols ) - (((sOut += ' ') += sHTML_O_cols) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( nCols ); // die Gutter-Breite (Minimalwert) als GUTTER @@ -1410,7 +1410,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, ->LogicToPixel( Size(nGutter,0), MapMode(MAP_TWIP) ).Width(); } - (((sOut += ' ') += sHTML_O_gutter) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_gutter) += '=') += ByteString::CreateFromInt32( nGutter ); } @@ -1451,7 +1451,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_multicol, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, FALSE ); rHTMLWrt.bLFPossible = TRUE; return rWrt; @@ -1466,8 +1466,8 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt ) rHTMLWrt.OutNewLine( TRUE ); ByteString sOut('<'); - ((((sOut += sHTML_spacer) += ' ') += sHTML_O_type) += '=') - += sHTML_SPTYPE_block; + ((((sOut += OOO_STRING_SVTOOLS_HTML_spacer) += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') + += OOO_STRING_SVTOOLS_HTML_SPTYPE_block; rWrt.Strm() << sOut.GetBuffer(); // ALIGN, WIDTH, HEIGHT @@ -1494,10 +1494,10 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, // Die aktulle <DL> beenden! rHTMLWrt.OutAndSetDefList( 0 ); - pStr = sHTML_division; + pStr = OOO_STRING_SVTOOLS_HTML_division; } else - pStr = sHTML_span; + pStr = OOO_STRING_SVTOOLS_HTML_span; // als DIV ausgeben if( rHTMLWrt.bLFPossible ) @@ -1686,8 +1686,8 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, // als Multicol ausgeben rHTMLWrt.OutNewLine(); - ByteString sOut( sHTML_division ); - ((sOut += ' ') += sHTML_O_type) += '='; + ByteString sOut( OOO_STRING_SVTOOLS_HTML_division ); + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '='; sOut += (bHeader ? "HEADER" : "FOOTER" ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer() ); @@ -1708,9 +1708,9 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, nSize = (INT16)Application::GetDefaultDevice() ->LogicToPixel( Size(nSize,0), MapMode(MAP_TWIP) ).Width(); - ((((((((aSpacer = sHTML_spacer) += ' ') - += sHTML_O_type) += '=') += sHTML_SPTYPE_vertical) += ' ') - += sHTML_O_size) += '=') += ByteString::CreateFromInt32(nSize); + ((((((((aSpacer = OOO_STRING_SVTOOLS_HTML_spacer) += ' ') + += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical) += ' ') + += OOO_STRING_SVTOOLS_HTML_O_size) += '=') += ByteString::CreateFromInt32(nSize); } const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt(); @@ -1747,7 +1747,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; rHTMLWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_division, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE ); rHTMLWrt.nHeaderFooterSpace = 0; diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 06eb9675f038..21589c4283c7 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -101,16 +101,16 @@ const sal_uInt16 TABINDEX_MAX = 32767; static HTMLOptionEnum __FAR_DATA aHTMLFormMethodTable[] = { - { sHTML_METHOD_get, FormSubmitMethod_GET }, - { sHTML_METHOD_post, FormSubmitMethod_POST }, + { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET }, + { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST }, { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] = { - { sHTML_ET_url, FormSubmitEncoding_URL }, - { sHTML_ET_multipart, FormSubmitEncoding_MULTIPART }, - { sHTML_ET_text, FormSubmitEncoding_TEXT }, + { OOO_STRING_SVTOOLS_HTML_ET_url, FormSubmitEncoding_URL }, + { OOO_STRING_SVTOOLS_HTML_ET_multipart, FormSubmitEncoding_MULTIPART }, + { OOO_STRING_SVTOOLS_HTML_ET_text, FormSubmitEncoding_TEXT }, { 0, 0 } }; @@ -118,11 +118,11 @@ enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT }; static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] = { - { sHTML_WW_off, HTML_WM_OFF }, - { sHTML_WW_hard, HTML_WM_HARD }, - { sHTML_WW_soft, HTML_WM_SOFT }, - { sHTML_WW_physical,HTML_WM_HARD }, - { sHTML_WW_virtual, HTML_WM_SOFT }, + { OOO_STRING_SVTOOLS_HTML_WW_off, HTML_WM_OFF }, + { OOO_STRING_SVTOOLS_HTML_WW_hard, HTML_WM_HARD }, + { OOO_STRING_SVTOOLS_HTML_WW_soft, HTML_WM_SOFT }, + { OOO_STRING_SVTOOLS_HTML_WW_physical,HTML_WM_HARD }, + { OOO_STRING_SVTOOLS_HTML_WW_virtual, HTML_WM_SOFT }, { 0, 0 } }; @@ -165,25 +165,25 @@ const sal_Char * __FAR_DATA aEventMethodTable[] = const sal_Char * __FAR_DATA aEventSDOptionTable[] = { - sHTML_O_SDonsubmit, - sHTML_O_SDonreset, - sHTML_O_SDonfocus, - sHTML_O_SDonblur, - sHTML_O_SDonclick, - sHTML_O_SDonclick, - sHTML_O_SDonchange, + OOO_STRING_SVTOOLS_HTML_O_SDonsubmit, + OOO_STRING_SVTOOLS_HTML_O_SDonreset, + OOO_STRING_SVTOOLS_HTML_O_SDonfocus, + OOO_STRING_SVTOOLS_HTML_O_SDonblur, + OOO_STRING_SVTOOLS_HTML_O_SDonclick, + OOO_STRING_SVTOOLS_HTML_O_SDonclick, + OOO_STRING_SVTOOLS_HTML_O_SDonchange, 0 }; const sal_Char * __FAR_DATA aEventOptionTable[] = { - sHTML_O_onsubmit, - sHTML_O_onreset, - sHTML_O_onfocus, - sHTML_O_onblur, - sHTML_O_onclick, - sHTML_O_onclick, - sHTML_O_onchange, + OOO_STRING_SVTOOLS_HTML_O_onsubmit, + OOO_STRING_SVTOOLS_HTML_O_onreset, + OOO_STRING_SVTOOLS_HTML_O_onfocus, + OOO_STRING_SVTOOLS_HTML_O_onblur, + OOO_STRING_SVTOOLS_HTML_O_onclick, + OOO_STRING_SVTOOLS_HTML_O_onclick, + OOO_STRING_SVTOOLS_HTML_O_onchange, 0 }; @@ -916,19 +916,19 @@ static void lcl_html_getEvents( const String& rOption, const String& rValue, SvStringsDtor& rUnoMacroTbl, SvStringsDtor& rUnoMacroParamTbl ) { - if( rOption.CompareIgnoreCaseToAscii( sHTML_O_sdevent, - sizeof(sHTML_O_sdevent)-1 ) == COMPARE_EQUAL ) + if( rOption.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_O_sdevent, + sizeof(OOO_STRING_SVTOOLS_HTML_O_sdevent)-1 ) == COMPARE_EQUAL ) { - String *pEvent = new String( rOption.Copy(sizeof(sHTML_O_sdevent)-1) ); + String *pEvent = new String( rOption.Copy(sizeof(OOO_STRING_SVTOOLS_HTML_O_sdevent)-1) ); *pEvent += '-'; *pEvent += rValue; rUnoMacroTbl.Insert( pEvent, rUnoMacroTbl.Count() ); } - else if( rOption.CompareIgnoreCaseToAscii( sHTML_O_sdaddparam, - sizeof(sHTML_O_sdaddparam)-1 ) == COMPARE_EQUAL ) + else if( rOption.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_O_sdaddparam, + sizeof(OOO_STRING_SVTOOLS_HTML_O_sdaddparam)-1 ) == COMPARE_EQUAL ) { String *pParam = - new String( rOption.Copy( sizeof(sHTML_O_sdaddparam)-1 ) ); + new String( rOption.Copy( sizeof(OOO_STRING_SVTOOLS_HTML_O_sdaddparam)-1 ) ); *pParam += '-'; *pParam += rValue; rUnoMacroParamTbl.Insert( pParam, rUnoMacroParamTbl.Count() ); @@ -1753,7 +1753,7 @@ void SwHTMLParser::InsertInput() case HTML_IT_RADIO: { if( !bValue ) - aTmp <<= OUString::createFromAscii( sHTML_on ); + aTmp <<= OUString::createFromAscii( OOO_STRING_SVTOOLS_HTML_on ); xPropSet->setPropertyValue( OUString::createFromAscii( "RefValue" ), aTmp ); aTmp <<= OUString(); @@ -1817,12 +1817,12 @@ void SwHTMLParser::InsertInput() case HTML_IT_SUBMIT: eButtonType = FormButtonType_SUBMIT; if( !sText.Len() ) - sText.AssignAscii( sHTML_IT_submit ); + sText.AssignAscii( OOO_STRING_SVTOOLS_HTML_IT_submit ); break; case HTML_IT_RESET: eButtonType = FormButtonType_RESET; if( !sText.Len() ) - sText.AssignAscii( sHTML_IT_reset ); + sText.AssignAscii( OOO_STRING_SVTOOLS_HTML_IT_reset ); break; default: ; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index a8055a0709ab..147e736a4353 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -217,7 +217,7 @@ void lcl_html_outEvents( SvStream& rStrm, !pDescs[i].AddListenerParam.getLength()) ) sOut += pOpt; else - (((sOut += sHTML_O_sdevent) + (((sOut += OOO_STRING_SVTOOLS_HTML_O_sdevent) += ByteString( sListener, RTL_TEXTENCODING_ASCII_US)) += '-') += ByteString( sMethod, RTL_TEXTENCODING_ASCII_US); sOut += "=\""; @@ -227,7 +227,7 @@ void lcl_html_outEvents( SvStream& rStrm, if( EXTENDED_STYPE == eScriptType && pDescs[i].AddListenerParam.getLength() ) { - (((((sOut = ' ') += sHTML_O_sdaddparam) + (((((sOut = ' ') += OOO_STRING_SVTOOLS_HTML_O_sdaddparam) += ByteString( sListener, RTL_TEXTENCODING_ASCII_US)) += '-') += ByteString( sMethod, RTL_TEXTENCODING_ASCII_US)) += "=\""; @@ -499,7 +499,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, DecIndentLevel(); // Inhalt der Form einruecken if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_form, sal_False ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_form, sal_False ); bLFPossible = sal_True; return; @@ -509,7 +509,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, if( bLFPossible ) OutNewLine(); ByteString sOut( '<' ); - sOut += sHTML_form; + sOut += OOO_STRING_SVTOOLS_HTML_form; uno::Reference< beans::XPropertySet > xFormPropSet( rFormComps, uno::UNO_QUERY ); @@ -518,7 +518,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { - ((sOut += ' ') += sHTML_O_name) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(), eDestEnc, &aNonConvertableCharacters ); @@ -530,7 +530,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { - ((sOut += ' ') += sHTML_O_action) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_action) += "=\""; Strm() << sOut.GetBuffer(); String aURL( *(OUString*)aTmp.getValue() ); aURL = URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), aURL); @@ -547,8 +547,8 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, if( form::FormSubmitMethod_POST==eMethod ) { ((((sOut += ' ') - += sHTML_O_method) += "=\"") - += sHTML_METHOD_post) += '\"'; + += OOO_STRING_SVTOOLS_HTML_O_method) += "=\"") + += OOO_STRING_SVTOOLS_HTML_METHOD_post) += '\"'; } } aTmp = xFormPropSet->getPropertyValue( @@ -561,10 +561,10 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, switch( eEncType ) { case form::FormSubmitEncoding_MULTIPART: - pStr = sHTML_ET_multipart; + pStr = OOO_STRING_SVTOOLS_HTML_ET_multipart; break; case form::FormSubmitEncoding_TEXT: - pStr = sHTML_ET_text; + pStr = OOO_STRING_SVTOOLS_HTML_ET_text; break; default: ; @@ -573,7 +573,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, if( pStr ) { ((((sOut += ' ') - += sHTML_O_enctype) += "=\"") + += OOO_STRING_SVTOOLS_HTML_O_enctype) += "=\"") += pStr) += '\"'; } } @@ -583,7 +583,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn, if( aTmp.getValueType() == ::getCppuType((const OUString*)0)&& ((OUString*)aTmp.getValue())->getLength() ) { - ((sOut += ' ') += sHTML_O_target) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_target) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(), eDestEnc, &aNonConvertableCharacters ); @@ -649,15 +649,15 @@ void SwHTMLWriter::OutHiddenControls( if( bLFPossible ) OutNewLine( sal_True ); ByteString sOut( '<' ); - ((((sOut += sHTML_input) += ' ') += - sHTML_O_type) += '=') += sHTML_IT_hidden; + ((((sOut += OOO_STRING_SVTOOLS_HTML_input) += ' ') += + OOO_STRING_SVTOOLS_HTML_O_type) += '=') += OOO_STRING_SVTOOLS_HTML_IT_hidden; aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "Name" ) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { - (( sOut += ' ' ) += sHTML_O_name ) += "=\""; + (( sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_name ) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(), eDestEnc, &aNonConvertableCharacters ); @@ -668,7 +668,7 @@ void SwHTMLWriter::OutHiddenControls( if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { - ((sOut += ' ') += sHTML_O_value) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_value) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), *(OUString*)aTmp.getValue(), eDestEnc, &aNonConvertableCharacters ); @@ -773,7 +773,21 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, //!!! rHTMLWrt.nWarn = 1; // Control wird falscher Form zugeordnet rHTMLWrt.nFormCntrlCnt++; - const sal_Char *pTag = sHTML_input, *pType = 0; + enum Tag { TAG_INPUT, TAG_SELECT, TAG_TEXTAREA, TAG_NONE }; + static char const * const TagNames[] = { + OOO_STRING_SVTOOLS_HTML_input, OOO_STRING_SVTOOLS_HTML_select, + OOO_STRING_SVTOOLS_HTML_textarea }; + Tag eTag = TAG_INPUT; + enum Type { + TYPE_TEXT, TYPE_PASSWORD, TYPE_CHECKBOX, TYPE_RADIO, TYPE_FILE, + TYPE_SUBMIT, TYPE_IMAGE, TYPE_RESET, TYPE_BUTTON, TYPE_NONE }; + static char const * const TypeNames[] = { + OOO_STRING_SVTOOLS_HTML_IT_text, OOO_STRING_SVTOOLS_HTML_IT_password, + OOO_STRING_SVTOOLS_HTML_IT_checkbox, OOO_STRING_SVTOOLS_HTML_IT_radio, + OOO_STRING_SVTOOLS_HTML_IT_file, OOO_STRING_SVTOOLS_HTML_IT_submit, + OOO_STRING_SVTOOLS_HTML_IT_image, OOO_STRING_SVTOOLS_HTML_IT_reset, + OOO_STRING_SVTOOLS_HTML_IT_button }; + Type eType = TYPE_NONE; OUString sValue; ByteString sOptions; sal_Bool bEmptyValue = sal_False; @@ -785,15 +799,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { case form::FormComponentType::CHECKBOX: case form::FormComponentType::RADIOBUTTON: - pType = (form::FormComponentType::CHECKBOX == nClassId - ? sHTML_IT_checkbox - : sHTML_IT_radio); + eType = (form::FormComponentType::CHECKBOX == nClassId + ? TYPE_CHECKBOX : TYPE_RADIO); aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultState" ) ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && STATE_NOCHECK != *(sal_Int16*) aTmp.getValue() ) { - (sOptions += ' ') += sHTML_O_checked; + (sOptions += ' ') += OOO_STRING_SVTOOLS_HTML_O_checked; } aTmp = xPropSet->getPropertyValue( @@ -804,7 +817,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const OUString& rVal = *(OUString*)aTmp.getValue(); if( !rVal.getLength() ) bEmptyValue = sal_True; - else if( rVal.compareToAscii( sHTML_on ) != 0 ) + else if( rVal.compareToAscii( OOO_STRING_SVTOOLS_HTML_on ) != 0 ) sValue = rVal; } break; @@ -821,14 +834,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, switch( eButtonType ) { case form::FormButtonType_RESET: - pType = sHTML_IT_reset; + eType = TYPE_RESET; break; case form::FormButtonType_SUBMIT: - pType = sHTML_IT_submit; + eType = TYPE_SUBMIT; break; case form::FormButtonType_PUSH: default: - pType = sHTML_IT_button; + eType = TYPE_BUTTON; } aTmp = xPropSet->getPropertyValue( @@ -844,7 +857,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, case form::FormComponentType::LISTBOX: if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine( sal_True ); - pTag = sHTML_select; + eTag = TAG_SELECT; aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "Dropdown" ) ); if( aTmp.getValueType() == ::getBooleanCppuType() && @@ -855,7 +868,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, // wieviele sind sichtbar ?? if( aSz.Height() ) - (((sOptions += ' ' ) += sHTML_O_size ) += '=' ) + (((sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_size ) += '=' ) += ByteString::CreateFromInt32( aSz.Height() ); aTmp = xPropSet->getPropertyValue( @@ -863,7 +876,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( aTmp.getValueType() == ::getBooleanCppuType() && *(sal_Bool*)aTmp.getValue() ) { - (sOptions += ' ' ) += sHTML_O_multiple; + (sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_multiple; } } break; @@ -886,13 +899,13 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine( sal_True ); - pTag = sHTML_textarea; + eTag = TAG_TEXTAREA; if( aSz.Height() ) - (((sOptions += ' ' ) += sHTML_O_rows ) += '=' ) + (((sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_rows ) += '=' ) += ByteString::CreateFromInt32( aSz.Height() ); if( aSz.Width() ) - (((sOptions += ' ' ) += sHTML_O_cols ) += '=' ) + (((sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_cols ) += '=' ) += ByteString::CreateFromInt32( aSz.Width() ); aTmp = xPropSet->getPropertyValue( @@ -906,25 +919,25 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, OUString::createFromAscii( "HardLineBreaks" ) ); pWrapStr = (aTmp.getValueType() == ::getBooleanCppuType() && - *(sal_Bool*)aTmp.getValue()) ? sHTML_WW_hard - : sHTML_WW_soft; - (((sOptions += ' ') += sHTML_O_wrap) += '=') += pWrapStr; + *(sal_Bool*)aTmp.getValue()) ? OOO_STRING_SVTOOLS_HTML_WW_hard + : OOO_STRING_SVTOOLS_HTML_WW_soft; + (((sOptions += ' ') += OOO_STRING_SVTOOLS_HTML_O_wrap) += '=') += pWrapStr; } } else { - pType = sHTML_IT_text; + eType = TYPE_TEXT; OUString sEchoChar( OUString::createFromAscii( "EchoChar" ) ); if( xPropSetInfo->hasPropertyByName( sEchoChar ) ) { aTmp = xPropSet->getPropertyValue( sEchoChar ); if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && *(sal_Int16*)aTmp.getValue() != 0 ) - pType = sHTML_IT_password; + eType = TYPE_PASSWORD; } if( aSz.Width() ) - (((sOptions += ' ' ) += sHTML_O_size ) += '=' ) + (((sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_size ) += '=' ) += ByteString::CreateFromInt32( aSz.Width() ); aTmp = xPropSet->getPropertyValue( @@ -932,7 +945,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( aTmp.getValueType() == ::getCppuType((const sal_Int16*)0) && *(sal_Int16*) aTmp.getValue() != 0 ) { - (((sOptions += ' ' ) += sHTML_O_maxlength ) += '=' ) + (((sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_maxlength ) += '=' ) += ByteString::CreateFromInt32( *(sal_Int16*) aTmp.getValue() ); } @@ -955,10 +968,10 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { Size aSz( 0, 0 ); GetControlSize( rSdrObject, aSz, rWrt.pDoc ); - pType = sHTML_IT_file; + eType = TYPE_FILE; if( aSz.Width() ) - (((sOptions += ' ' ) += sHTML_O_size ) += '=' ) + (((sOptions += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_size ) += '=' ) += ByteString::CreateFromInt32( aSz.Width() ); // VALUE vim form aus Sicherheitsgruenden nicht exportieren @@ -967,28 +980,29 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, case form::FormComponentType::IMAGEBUTTON: - pType = sHTML_IT_image; + eType = TYPE_IMAGE; nFrmOpts = HTML_FRMOPTS_IMG_CONTROL; break; default: // kennt HTML nicht - pTag = 0; // also ueberspringen + eTag = TAG_NONE; // also ueberspringen break; } - if( !pTag ) + if( eTag == TAG_NONE ) return rWrt; ByteString sOut( '<' ); - sOut += pTag; - if( pType ) - (((sOut += ' ') += sHTML_O_type) += '=') += pType; + sOut += TagNames[eTag]; + if( eType != TYPE_NONE ) + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += + TypeNames[eType]; aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "Name" ) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { - (( sOut += ' ' ) += sHTML_O_name ) += "=\""; + (( sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_name ) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), *(OUString*)aTmp.getValue(), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); @@ -999,12 +1013,12 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( aTmp.getValueType() == ::getBooleanCppuType() && !*(sal_Bool*)aTmp.getValue() ) { - (( sOut += ' ' ) += sHTML_O_disabled ); + (( sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_disabled ); } if( sValue.getLength() || bEmptyValue ) { - ((sOut += ' ') += sHTML_O_value) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_value) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1012,14 +1026,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sOut += sOptions; - if( (const sal_Char *)sHTML_IT_image == (const sal_Char *)pType ) + if( TYPE_IMAGE == eType ) { aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "ImageURL" ) ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && ((OUString*)aTmp.getValue())->getLength() ) { - ((sOut += ' ') += sHTML_O_src) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), @@ -1043,11 +1057,11 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } if( aPixelSz.Width() ) - (((sOut += ' ') += sHTML_O_width) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '=') += ByteString::CreateFromInt32( aPixelSz.Width() ); if( aPixelSz.Height() ) - (((sOut += ' ') += sHTML_O_height) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') += ByteString::CreateFromInt32( aPixelSz.Height() ); } @@ -1061,7 +1075,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( nTabIndex >= 32767 ) nTabIndex = 32767; - (((sOut += ' ') += sHTML_O_tabindex) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_tabindex) += '=') += ByteString::CreateFromInt32( nTabIndex ); } } @@ -1077,7 +1091,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, { // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen, // das entsprechende Flag loeschen. - nFrmOpts |= ((const sal_Char *)sHTML_IT_image == (const sal_Char *)pType + nFrmOpts |= (TYPE_IMAGE == eType ? HTML_FRMOPTS_IMG_CONTROL_CSS1 : HTML_FRMOPTS_CONTROL_CSS1); } @@ -1087,8 +1101,8 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( rHTMLWrt.bCfgOutStyles ) { - sal_Bool bEdit = sHTML_textarea == pTag || (const sal_Char *)sHTML_IT_file == (const sal_Char *)pType || - (const sal_Char *)sHTML_IT_text == (const sal_Char *)pType; + sal_Bool bEdit = TAG_TEXTAREA == eTag || TYPE_FILE == eType || + TYPE_TEXT == eType; SfxItemSet aItemSet( rHTMLWrt.pDoc->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END ); @@ -1210,7 +1224,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, rWrt.Strm() << '>'; - if( sHTML_select == pTag ) + if( TAG_SELECT == eTag ) { aTmp = xPropSet->getPropertyValue( OUString::createFromAscii( "StringItemList" ) ); @@ -1265,17 +1279,17 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, nSel++; rHTMLWrt.OutNewLine(); // jede Option bekommt eine eigene Zeile - (sOut = '<') += sHTML_option; + (sOut = '<') += OOO_STRING_SVTOOLS_HTML_option; if( sVal.getLength() || bEmptyVal ) { - ((sOut += ' ') += sHTML_O_value) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_value) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), sVal, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; } if( bSelected ) - (sOut += ' ') += sHTML_O_selected; + (sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_selected; sOut += '>'; rWrt.Strm() << sOut.GetBuffer(); @@ -1283,14 +1297,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i], rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); } - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_option, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_option, sal_False ); rHTMLWrt.DecIndentLevel(); rHTMLWrt.OutNewLine();// das </SELECT> bekommt eine eigene Zeile } - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_select, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_select, sal_False ); } - else if( sHTML_textarea == pTag ) + else if( TAG_TEXTAREA == eTag ) { // In TextAreas duerfen keine zusaetzlichen Spaces oder LF exportiert // werden! @@ -1315,9 +1329,9 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); } } - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_textarea, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_textarea, sal_False ); } - else if( (const sal_Char *)sHTML_IT_checkbox == (const sal_Char *)pType || (const sal_Char *)sHTML_IT_radio == (const sal_Char *)pType ) + else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType ) { aTmp = xPropSet->getPropertyValue( OUString::createFromAscii("Label") ); if( aTmp.getValueType() == ::getCppuType((const OUString*)0) && diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 290a05d38c62..9e35f8e78768 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -307,15 +307,15 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt ) nPos = rHTMLWrt.pFootEndNotes ? rHTMLWrt.pFootEndNotes->Count() : 0; ASSERT( nPos == rHTMLWrt.nFootNote + rHTMLWrt.nEndNote, "OutHTML_SwFmtFtn: Position falsch" ); - sClass.AssignAscii( sHTML_sdendnote_anc ); - sFtnName.AssignAscii( sHTML_sdendnote ); + sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_anc ); + sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); sFtnName += String::CreateFromInt32( (sal_Int32)(++rHTMLWrt.nEndNote) ); } else { nPos = rHTMLWrt.nFootNote; - sClass.AssignAscii( sHTML_sdfootnote_anc ); - sFtnName.AssignAscii( sHTML_sdfootnote); + sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ); + sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote); sFtnName += String::CreateFromInt32( (sal_Int32)(++rHTMLWrt.nFootNote)); } @@ -324,26 +324,26 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt ) rHTMLWrt.pFootEndNotes->Insert( pTxtFtn, nPos ); ByteString sOut( '<' ); - (((sOut += sHTML_anchor) += ' ') += sHTML_O_class) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_anchor) += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - ((sOut = "\" ") += sHTML_O_name) += "=\""; + ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - (((sOut = sHTML_FTN_anchor) += "\" ") += sHTML_O_href) += "=\"#"; + (((sOut = OOO_STRING_SVTOOLS_HTML_FTN_anchor) += "\" ") += OOO_STRING_SVTOOLS_HTML_O_href) += "=\"#"; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - (sOut = sHTML_FTN_symbol)+= '\"'; + (sOut = OOO_STRING_SVTOOLS_HTML_FTN_symbol)+= '\"'; if( rFmtFtn.GetNumStr().Len() ) - (sOut += ' ') += sHTML_O_sdfixed; + (sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_sdfixed; sOut += '>'; rWrt.Strm() << sOut.GetBuffer(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_superscript, TRUE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, TRUE ); HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_superscript, FALSE ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_anchor, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, FALSE ); return rWrt; } @@ -368,21 +368,21 @@ void SwHTMLWriter::OutFootEndNotes() String sFtnName, sClass; if( pFmtFtn->IsEndNote() ) { - sClass.AssignAscii( sHTML_sdendnote ); - sFtnName.AssignAscii( sHTML_sdendnote ); + sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); + sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); sFtnName.Append( String::CreateFromInt32((sal_Int32)(++nEndNote)) ); } else { - sClass.AssignAscii( sHTML_sdfootnote ); - sFtnName.AssignAscii( sHTML_sdfootnote ); + sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); + sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); sFtnName.Append( String::CreateFromInt32((sal_Int32)(++nFootNote))); } if( bLFPossible ) OutNewLine(); ByteString sOut( '<' ); - (((sOut += sHTML_division) += ' ') += sHTML_O_id) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_division) += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters ); Strm() << "\">"; @@ -404,7 +404,7 @@ void SwHTMLWriter::OutFootEndNotes() DecIndentLevel(); // Inhalt von <DIV> einruecken if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_division, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE ); bLFPossible = TRUE; ASSERT( !pFmtFtn, @@ -458,15 +458,15 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, String sFtnName, sClass, sPrefix, sSuffix; if( rFmtFtn.IsEndNote() ) { - sClass.AssignAscii( sHTML_sdendnote_sym ); - sFtnName.AssignAscii( sHTML_sdendnote ); + sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_sym ); + sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); sFtnName.Append( String::CreateFromInt32((sal_Int32)nEndNote) ); pInfo = &pDoc->GetEndNoteInfo(); } else { - sClass.AssignAscii( sHTML_sdfootnote_sym ); - sFtnName.AssignAscii( sHTML_sdfootnote ); + sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ); + sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); sFtnName.Append( String::CreateFromInt32((sal_Int32)nFootNote)); pInfo = &pDoc->GetFtnInfo(); } @@ -489,20 +489,20 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, } ByteString sOut( '<' ); - (((sOut += sHTML_anchor) += ' ') += sHTML_O_class) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_anchor) += ' ') += OOO_STRING_SVTOOLS_HTML_O_class) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters ); - ((sOut = "\" ") += sHTML_O_name) += "=\""; + ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters ); - (((sOut = sHTML_FTN_symbol) +="\" ") += sHTML_O_href) += "=\"#"; + (((sOut = OOO_STRING_SVTOOLS_HTML_FTN_symbol) +="\" ") += OOO_STRING_SVTOOLS_HTML_O_href) += "=\"#"; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters ); - (sOut = sHTML_FTN_anchor) += "\">"; + (sOut = OOO_STRING_SVTOOLS_HTML_FTN_anchor) += "\">"; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), rNum, eDestEnc, &aNonConvertableCharacters ); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_anchor, FALSE ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, FALSE ); } USHORT lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, @@ -565,9 +565,9 @@ void lcl_html_outFootEndNoteInfo( Writer& rWrt, String *pParts, rHTMLWrt.OutNewLine(); ByteString sOut( '<' ); - (((((((sOut += sHTML_meta) += ' ') - += sHTML_O_name) += "=\"") += pName) += "\" ") - += sHTML_O_content) += "=\""; + (((((((sOut += OOO_STRING_SVTOOLS_HTML_meta) += ' ') + += OOO_STRING_SVTOOLS_HTML_O_name) += "=\"") += pName) += "\" ") + += OOO_STRING_SVTOOLS_HTML_O_content) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aContent, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); rWrt.Strm() << "\">"; @@ -610,7 +610,7 @@ void SwHTMLWriter::OutFootEndNoteInfo() } if( nParts > 0 ) lcl_html_outFootEndNoteInfo( *this, aParts, nParts, - sHTML_META_sdfootnote ); + OOO_STRING_SVTOOLS_HTML_META_sdfootnote ); } { @@ -619,7 +619,7 @@ void SwHTMLWriter::OutFootEndNoteInfo() USHORT nParts = lcl_html_fillEndNoteInfo( rInfo, aParts, TRUE ); if( nParts > 0 ) lcl_html_outFootEndNoteInfo( *this, aParts, nParts, - sHTML_META_sdendnote ); + OOO_STRING_SVTOOLS_HTML_META_sdendnote ); } } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 3bb7686dd5fe..48faa240cf7f 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -88,22 +88,22 @@ using namespace ::com::sun::star; HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] = { - { sHTML_AL_left, text::HoriOrientation::LEFT }, - { sHTML_AL_right, text::HoriOrientation::RIGHT }, + { OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT }, + { OOO_STRING_SVTOOLS_HTML_AL_right, text::HoriOrientation::RIGHT }, { 0, 0 } }; HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[] = { - { sHTML_VA_top, text::VertOrientation::LINE_TOP }, - { sHTML_VA_texttop, text::VertOrientation::CHAR_TOP }, - { sHTML_VA_middle, text::VertOrientation::CENTER }, - { sHTML_AL_center, text::VertOrientation::CENTER }, - { sHTML_VA_absmiddle, text::VertOrientation::LINE_CENTER }, - { sHTML_VA_bottom, text::VertOrientation::TOP }, - { sHTML_VA_baseline, text::VertOrientation::TOP }, - { sHTML_VA_absbottom, text::VertOrientation::LINE_BOTTOM }, + { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::LINE_TOP }, + { OOO_STRING_SVTOOLS_HTML_VA_texttop, text::VertOrientation::CHAR_TOP }, + { OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER }, + { OOO_STRING_SVTOOLS_HTML_AL_center, text::VertOrientation::CENTER }, + { OOO_STRING_SVTOOLS_HTML_VA_absmiddle, text::VertOrientation::LINE_CENTER }, + { OOO_STRING_SVTOOLS_HTML_VA_bottom, text::VertOrientation::TOP }, + { OOO_STRING_SVTOOLS_HTML_VA_baseline, text::VertOrientation::TOP }, + { OOO_STRING_SVTOOLS_HTML_VA_absbottom, text::VertOrientation::LINE_BOTTOM }, { 0, 0 } }; @@ -1187,12 +1187,12 @@ ANCHOR_SETEVENT: ('s' == aStrippedClass.GetChar(0) || 'S' == aStrippedClass.GetChar(0)) && ('d' == aStrippedClass.GetChar(1) || 'D' == aStrippedClass.GetChar(1)) ) { - if( aStrippedClass.EqualsIgnoreCaseAscii( sHTML_sdendnote_anc ) ) + if( aStrippedClass.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_anc ) ) bEnAnchor = TRUE; - else if( aStrippedClass.EqualsIgnoreCaseAscii( sHTML_sdfootnote_anc ) ) + else if( aStrippedClass.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ) ) bFtnAnchor = TRUE; - else if( aStrippedClass.EqualsIgnoreCaseAscii( sHTML_sdendnote_sym ) || - aStrippedClass.EqualsIgnoreCaseAscii( sHTML_sdfootnote_sym ) ) + else if( aStrippedClass.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_sym ) || + aStrippedClass.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ) ) bFtnEnSymbol = TRUE; if( bEnAnchor || bFtnAnchor || bFtnEnSymbol ) { diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index c917444c2ded..24045bdef1e2 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -67,9 +67,9 @@ using namespace ::com::sun::star; // <UL TYPE=...> static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] = { - { sHTML_ULTYPE_disc, HTML_BULLETCHAR_DISC }, - { sHTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE }, - { sHTML_ULTYPE_square, HTML_BULLETCHAR_SQUARE }, + { OOO_STRING_SVTOOLS_HTML_ULTYPE_disc, HTML_BULLETCHAR_DISC }, + { OOO_STRING_SVTOOLS_HTML_ULTYPE_circle, HTML_BULLETCHAR_CIRCLE }, + { OOO_STRING_SVTOOLS_HTML_ULTYPE_square, HTML_BULLETCHAR_SQUARE }, { 0, 0 } }; @@ -864,30 +864,30 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, if( SVX_NUM_CHAR_SPECIAL == eType ) { // Aufzaehlungs-Liste: <OL> - sOut += sHTML_unorderlist; + sOut += OOO_STRING_SVTOOLS_HTML_unorderlist; // den Typ ueber das Bullet-Zeichen bestimmen const sal_Char *pStr = 0; switch( rNumFmt.GetBulletChar() ) { case HTML_BULLETCHAR_DISC: - pStr = sHTML_ULTYPE_disc; + pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_disc; break; case HTML_BULLETCHAR_CIRCLE: - pStr = sHTML_ULTYPE_circle; + pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_circle; break; case HTML_BULLETCHAR_SQUARE: - pStr = sHTML_ULTYPE_square; + pStr = OOO_STRING_SVTOOLS_HTML_ULTYPE_square; break; } if( pStr ) - (((sOut += ' ') += sHTML_O_type) += '=') += pStr; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += pStr; } else if( SVX_NUM_BITMAP == eType ) { // Aufzaehlungs-Liste: <OL> - sOut += sHTML_unorderlist; + sOut += OOO_STRING_SVTOOLS_HTML_unorderlist; rWrt.Strm() << sOut.GetBuffer(); sOut.Erase(); @@ -901,7 +901,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, else { // Numerierungs-Liste: <UL> - sOut += sHTML_orderlist; + sOut += OOO_STRING_SVTOOLS_HTML_orderlist; // den Typ ueber das Format bestimmen sal_Char cType = 0; @@ -913,7 +913,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, case SVX_NUM_ROMAN_LOWER: cType = 'i'; break; } if( cType ) - (((sOut += ' ') += sHTML_O_type) += '=') += cType; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += cType; sal_uInt16 nStartVal = rNumFmt.GetStart(); if( bStartValue && 1 == nStartVal && i == rInfo.GetDepth()-1 ) @@ -932,7 +932,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, } if( nStartVal != 1 ) { - (((sOut += ' ') += sHTML_O_start) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_start) += '=') += ByteString::CreateFromInt32( nStartVal ); } } @@ -979,9 +979,9 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt, sal_Int16 eType = rInfo.GetNumRule()->Get( i-1 ).GetNumberingType(); const sal_Char *pStr; if( SVX_NUM_CHAR_SPECIAL == eType || SVX_NUM_BITMAP == eType) - pStr = sHTML_unorderlist; + pStr = OOO_STRING_SVTOOLS_HTML_unorderlist; else - pStr = sHTML_orderlist; + pStr = OOO_STRING_SVTOOLS_HTML_orderlist; HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False ); rWrt.bLFPossible = sal_True; } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index ffadfb58e8fe..9dbcc420ebfd 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -49,6 +49,7 @@ #include <svx/xoutbmp.hxx> #include <svx/ulspitem.hxx> #include <svx/lrspitem.hxx> +#include <svtools/htmlkywd.hxx> #include <svtools/htmltokn.h> #include <SwAppletImpl.hxx> #include <fmtornt.hxx> @@ -82,6 +83,12 @@ using namespace com::sun::star; #define HTML_DFLT_APPLET_WIDTH ((MM50*5)/2) #define HTML_DFLT_APPLET_HEIGHT ((MM50*5)/2) +namespace { + +static char const sHTML_O_Hidden_False[] = "FALSE"; + +} + const ULONG HTML_FRMOPTS_EMBED_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE | @@ -377,7 +384,7 @@ void SwHTMLParser::InsertEmbed() aSpace.Height() = (long)pOption->GetNumber(); break; case HTML_O_UNKNOWN: - if( pOption->GetTokenString().EqualsIgnoreCaseAscii( sHTML_O_Hidden ) ) + if( pOption->GetTokenString().EqualsIgnoreCaseAscii( OOO_STRING_SW_HTML_O_Hidden ) ) bHidden = !pOption->GetString().EqualsIgnoreCaseAscii( sHTML_O_Hidden_False ); break; @@ -992,8 +999,8 @@ static USHORT GetOptionType( const String& rName, BOOL bApplet ) { case 'A': case 'a': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_align ) || - rName.EqualsIgnoreCaseAscii( sHTML_O_alt ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_align ) || + rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_alt ) ) nType = SWHTML_OPTTYPE_IGNORE; else if( bApplet && (rName.EqualsIgnoreCaseAscii( sHTML_O_archive ) || @@ -1002,31 +1009,31 @@ static USHORT GetOptionType( const String& rName, BOOL bApplet ) break; case 'C': case 'c': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_class ) || - (bApplet && (rName.EqualsIgnoreCaseAscii( sHTML_O_code ) || - rName.EqualsIgnoreCaseAscii( sHTML_O_codebase ))) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_class ) || + (bApplet && (rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_code ) || + rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_codebase ))) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'H': case 'h': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_height ) || - rName.EqualsIgnoreCaseAscii( sHTML_O_hspace ) || - (!bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_Hidden )) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_height ) || + rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_hspace ) || + (!bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SW_HTML_O_Hidden )) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'I': case 'i': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_id ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_id ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'M': case 'm': - if( bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_mayscript ) ) + if( bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_mayscript ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'N': case 'n': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_name ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_name ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'O': @@ -1036,23 +1043,23 @@ static USHORT GetOptionType( const String& rName, BOOL bApplet ) break; case 'S': case 's': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_style ) || - (!bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_src )) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_style ) || + (!bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_src )) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'T': case 't': - if( !bApplet && rName.EqualsIgnoreCaseAscii( sHTML_O_type ) ) + if( !bApplet && rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_type ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'V': case 'v': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_vspace ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_vspace ) ) nType = SWHTML_OPTTYPE_IGNORE; break; case 'W': case 'w': - if( rName.EqualsIgnoreCaseAscii( sHTML_O_width ) ) + if( rName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_O_width ) ) nType = SWHTML_OPTTYPE_IGNORE; break; } @@ -1131,7 +1138,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) ) { // erstmal das Plug-spezifische - sOut += sHTML_embed; + sOut += OOO_STRING_SVTOOLS_HTML_embed; ::rtl::OUString aStr; String aURL; @@ -1144,7 +1151,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, if( aURL.Len() ) { - ((sOut += ' ') += sHTML_O_src) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_src) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1154,7 +1161,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("PluginMimeType" ) ); if( (aAny >>= aType) && aType.getLength() ) { - ((sOut += ' ') += sHTML_O_type) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1164,7 +1171,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, SURROUND_THROUGHT == rFrmFmt.GetSurround().GetSurround() ) { // Das Plugin ist HIDDEN - (sOut += ' ') += sHTML_O_Hidden; + (sOut += ' ') += OOO_STRING_SW_HTML_O_Hidden; nFrmOpts = HTML_FRMOPTS_HIDDEN_EMBED; bHiddenEmbed = TRUE; } @@ -1178,7 +1185,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, { // oder das Applet-Spezifische - sOut += sHTML_applet; + sOut += OOO_STRING_SVTOOLS_HTML_applet; // CODEBASE ::rtl::OUString aCd; @@ -1188,7 +1195,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, String sCodeBase( URIHelper::simpleNormalizedMakeRelative(rWrt.GetBaseURL(), aCd) ); if( sCodeBase.Len() ) { - ((sOut += ' ') += sHTML_O_codebase) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_codebase) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1199,7 +1206,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, ::rtl::OUString aClass; aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletCode" ) ); aAny >>= aClass; - ((sOut += ' ') += sHTML_O_code) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_code) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1210,7 +1217,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, aAny >>= aAppletName; if( aAppletName.getLength() ) { - ((sOut += ' ') += sHTML_O_name) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -1220,7 +1227,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("AppletIsScript" ) ); aAny >>= bScript; if( bScript ) - (sOut += ' ') += sHTML_O_mayscript; + (sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_mayscript; nFrmOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR : HTML_FRMOPTS_APPLET; @@ -1229,7 +1236,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, { // oder das Flating-Frame spezifische - sOut += sHTML_iframe; + sOut += OOO_STRING_SVTOOLS_HTML_iframe; rWrt.Strm() << sOut.GetBuffer(); SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(), @@ -1295,11 +1302,11 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, const String& rName = rCommand.GetCommand(); const String& rValue = rCommand.GetArgument(); rHTMLWrt.OutNewLine(); - ((((sOut = '<') += sHTML_param) += ' ') += sHTML_O_name) + ((((sOut = '<') += OOO_STRING_SVTOOLS_HTML_param) += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - ((sOut = "\" ") += sHTML_O_value) += "=\""; + ((sOut = "\" ") += OOO_STRING_SVTOOLS_HTML_O_value) += "=\""; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << "\">"; } @@ -1307,7 +1314,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken if( aCommands.Count() ) rHTMLWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_applet, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_applet, FALSE ); } else if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) ) @@ -1342,7 +1349,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // ausgeben rHTMLWrt.Strm() << '>'; - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_iframe, FALSE ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, FALSE ); } if( aEndTags.Len() ) diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 7e78ca96d78f..f1eb32d730a6 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -240,9 +240,9 @@ void SwHTMLParser::NewDivision( int nToken ) ('d' == aId.GetChar(1) || 'D' == aId.GetChar(1) ) ) { sal_Bool bEndNote = sal_False, bFootNote = sal_False; - if( aId.CompareIgnoreCaseToAscii( sHTML_sdendnote, 9 ) == COMPARE_EQUAL ) + if( aId.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_sdendnote, 9 ) == COMPARE_EQUAL ) bEndNote = sal_True; - else if( aId.CompareIgnoreCaseToAscii( sHTML_sdfootnote, 10 ) == COMPARE_EQUAL ) + else if( aId.CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote, 10 ) == COMPARE_EQUAL ) bFootNote = sal_True; if( bFootNote || bEndNote ) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 7ff16864141a..cc83cbcd8605 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -88,9 +88,9 @@ using namespace ::com::sun::star; static HTMLOptionEnum __FAR_DATA aHTMLTblVAlignTable[] = { - { sHTML_VA_top, text::VertOrientation::NONE }, - { sHTML_VA_middle, text::VertOrientation::CENTER }, - { sHTML_VA_bottom, text::VertOrientation::BOTTOM }, + { OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE }, + { OOO_STRING_SVTOOLS_HTML_VA_middle, text::VertOrientation::CENTER }, + { OOO_STRING_SVTOOLS_HTML_VA_bottom, text::VertOrientation::BOTTOM }, { 0, 0 } }; @@ -4949,7 +4949,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) const HTMLOption *pOption = (*pHTMLOptions)[--i]; if( HTML_O_ALIGN == pOption->GetToken() ) { - if( pOption->GetString().EqualsIgnoreCaseAscii(sHTML_VA_bottom)) + if( pOption->GetString().EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_VA_bottom)) bTop = sal_False; } } @@ -5218,7 +5218,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions *pOptions, case HTML_O_BORDER: // BORDER und BORDER=BORDER wie BORDER=1 behandeln if( pOption->GetString().Len() && - !pOption->GetString().EqualsIgnoreCaseAscii(sHTML_O_border) ) + !pOption->GetString().EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_O_border) ) nBorder = (sal_uInt16)pOption->GetNumber(); else nBorder = 1; diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 375954942032..1150b044db5b 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -328,14 +328,14 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, rWrt.OutNewLine(); // <TH>/<TD> in neue Zeile ByteString sOut( '<' ); - sOut += (bHead ? sHTML_tableheader : sHTML_tabledata ); + sOut += (bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata ); // ROW- und COLSPAN ausgeben if( nRowSpan>1 ) - (((sOut += ' ' ) += sHTML_O_rowspan ) += '=') + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_rowspan ) += '=') += ByteString::CreateFromInt32( nRowSpan ); if( nColSpan > 1 ) - (((sOut += ' ' ) += sHTML_O_colspan ) += '=') + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_colspan ) += '=') += ByteString::CreateFromInt32( nColSpan ); #ifndef PURE_HTML @@ -385,7 +385,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, // WIDTH ausgeben: Aus Layout oder berechnet if( bOutWidth ) { - ((sOut += ' ' ) += sHTML_O_width ) += '='; + ((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_width ) += '='; if( nPrcWidth != USHRT_MAX ) (sOut += ByteString::CreateFromInt32(nPrcWidth)) += '%'; else @@ -396,7 +396,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, if( nHeight ) { - (((sOut += ' ') += sHTML_O_height) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') += ByteString::CreateFromInt32(aPixelSz.Height()); } #endif @@ -412,8 +412,8 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, sal_Int16 eVertOri = pCell->GetVertOri(); if( text::VertOrientation::TOP==eVertOri || text::VertOrientation::BOTTOM==eVertOri ) { - (((sOut += ' ') += sHTML_O_valign) += '=') - += (text::VertOrientation::TOP==eVertOri ? sHTML_VA_top : sHTML_VA_bottom); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_valign) += '=') + += (text::VertOrientation::TOP==eVertOri ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); } } @@ -499,8 +499,8 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, if( rWrt.bLFPossible ) rWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bHead ? sHTML_tableheader - : sHTML_tabledata, + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bHead ? OOO_STRING_SVTOOLS_HTML_tableheader + : OOO_STRING_SVTOOLS_HTML_tabledata, sal_False ); rWrt.bLFPossible = sal_True; } @@ -533,7 +533,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, } rWrt.OutNewLine(); // <TR> in neuer Zeile - rWrt.Strm() << '<' << sHTML_tablerow; + rWrt.Strm() << '<' << OOO_STRING_SVTOOLS_HTML_tablerow; if( pBrushItem ) { String aDummy; @@ -548,8 +548,8 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, if( text::VertOrientation::TOP==eRowVertOri || text::VertOrientation::BOTTOM==eRowVertOri ) { ByteString sOut( ' ' ); - ((sOut += sHTML_O_valign) += '=') - += (text::VertOrientation::TOP==eRowVertOri ? sHTML_VA_top : sHTML_VA_bottom); + ((sOut += OOO_STRING_SVTOOLS_HTML_O_valign) += '=') + += (text::VertOrientation::TOP==eRowVertOri ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); rWrt.Strm() << sOut.GetBuffer(); } @@ -563,7 +563,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, rWrt.DecIndentLevel(); // Inhalt von <TR>...</TR> einruecken rWrt.OutNewLine(); // </TR> in neuer Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_tablerow, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False ); } @@ -632,7 +632,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( rWrt.bLFPossible ) rWrt.OutNewLine(); // <TABLE> in neue Zeile ByteString sOut( '<' ); - sOut += sHTML_table; + sOut += OOO_STRING_SVTOOLS_HTML_table; sal_uInt16 nOldDirection = rWrt.nDirection; if( pFrmFmt ) @@ -647,21 +647,21 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, // COLS ausgeben: Nur bei Export ueber Layout, wenn es beim Import // vorhanden war. if( bColsOption ) - (((sOut += ' ') += sHTML_O_cols) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( aCols.Count() ); // ALIGN= ausgeben if( text::HoriOrientation::RIGHT == eAlign ) - (((sOut += ' ') += sHTML_O_align ) += '=') += sHTML_AL_right; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align ) += '=') += OOO_STRING_SVTOOLS_HTML_AL_right; else if( text::HoriOrientation::CENTER == eAlign ) - (((sOut += ' ') += sHTML_O_align ) += '=') += sHTML_AL_center; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align ) += '=') += OOO_STRING_SVTOOLS_HTML_AL_center; else if( text::HoriOrientation::LEFT == eAlign ) - (((sOut += ' ') += sHTML_O_align ) += '=') += sHTML_AL_left; + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align ) += '=') += OOO_STRING_SVTOOLS_HTML_AL_left; // WIDTH ausgeben: Stammt aus Layout oder ist berechnet if( nTabWidth ) { - ((sOut += ' ') += sHTML_O_width ) += '='; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_width ) += '='; if( HasRelWidths() ) (sOut += ByteString::CreateFromInt32( nTabWidth )) += '%'; else if( Application::GetDefaultDevice() ) @@ -692,13 +692,13 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( aPixelSpc.Width() ) { - (((sOut += ' ') += sHTML_O_hspace) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_hspace) += '=') += ByteString::CreateFromInt32( aPixelSpc.Width() ); } if( aPixelSpc.Height() ) { - (((sOut += ' ') += sHTML_O_vspace) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_vspace) += '=') += ByteString::CreateFromInt32( aPixelSpc.Height() ); } } @@ -709,25 +709,25 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, // die genutzt wird, wenn gar kein sheet::Border angegeben ist. sal_Bool bHasAnyBorders = nFrameMask || bColsHaveBorder || bRowsHaveBorder; if( bCollectBorderWidth || nBorder==0 || bHasAnyBorders ) - (((sOut += ' ' ) += sHTML_O_border ) += '=') + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_border ) += '=') += ByteString::CreateFromInt32( rWrt.ToPixel( nBorder ) ); // BORDERCOLOR ausgeben if( (sal_uInt32)-1 != nBorderColor && rWrt.bCfgOutStyles && bHasAnyBorders ) { - ((sOut += ' ' ) += sHTML_O_bordercolor ) += '='; + ((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_bordercolor ) += '='; rWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_Color( rWrt.Strm(), nBorderColor, rWrt.eDestEnc ); sOut.Erase(); } // CELLPADDING ausgeben: Stammt aus Layout oder ist berechnet - (((sOut += ' ' ) += sHTML_O_cellpadding ) += '=') + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_cellpadding ) += '=') += ByteString::CreateFromInt32( rWrt.ToPixel( nCellPadding ) ); // CELLSPACING ausgeben: Stammt aus Layout oder ist berechnet - (((sOut += ' ' ) += sHTML_O_cellspacing ) += '=') + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_cellspacing ) += '=') += ByteString::CreateFromInt32( rWrt.ToPixel( nCellSpacing ) ); // FRAME/RULES ausgeben (nur sinnvoll, wenn border!=0) @@ -736,19 +736,19 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, const sal_Char *pFrame = 0; switch( nFrameMask ) { - case 0: pFrame = sHTML_TF_void ;break; - case 1: pFrame = sHTML_TF_above ;break; - case 2: pFrame = sHTML_TF_below ;break; - case 3: pFrame = sHTML_TF_hsides ;break; - case 4: pFrame = sHTML_TF_lhs ;break; - case 8: pFrame = sHTML_TF_rhs ;break; - case 12: pFrame = sHTML_TF_vsides ;break; + case 0: pFrame = OOO_STRING_SVTOOLS_HTML_TF_void ;break; + case 1: pFrame = OOO_STRING_SVTOOLS_HTML_TF_above ;break; + case 2: pFrame = OOO_STRING_SVTOOLS_HTML_TF_below ;break; + case 3: pFrame = OOO_STRING_SVTOOLS_HTML_TF_hsides ;break; + case 4: pFrame = OOO_STRING_SVTOOLS_HTML_TF_lhs ;break; + case 8: pFrame = OOO_STRING_SVTOOLS_HTML_TF_rhs ;break; + case 12: pFrame = OOO_STRING_SVTOOLS_HTML_TF_vsides ;break; //FRAME=BOX ist der default wenn BORDER>0 //case 15: - //default: pFrame = sHTML_TF_box ;break; // geht nicht + //default: pFrame = OOO_STRING_SVTOOLS_HTML_TF_box ;break; // geht nicht }; if( pFrame ) - (((sOut += ' ' ) += sHTML_O_frame ) += '=') += pFrame; + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_frame ) += '=') += pFrame; const sal_Char *pRules = 0; if( aCols.Count() > 1 && aRows.Count() > 1 ) @@ -756,44 +756,44 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( !bColsHaveBorder ) { if( !bRowsHaveBorder ) - pRules = sHTML_TR_none; + pRules = OOO_STRING_SVTOOLS_HTML_TR_none; else if( bRowsHaveBorderOnly ) - pRules = sHTML_TR_rows; + pRules = OOO_STRING_SVTOOLS_HTML_TR_rows; else - pRules = sHTML_TR_groups; + pRules = OOO_STRING_SVTOOLS_HTML_TR_groups; } else if( bColsHaveBorderOnly ) { if( !bRowsHaveBorder || !bRowsHaveBorderOnly ) - pRules = sHTML_TR_cols; + pRules = OOO_STRING_SVTOOLS_HTML_TR_cols; } else { if( !bRowsHaveBorder ) - pRules = sHTML_TR_groups; + pRules = OOO_STRING_SVTOOLS_HTML_TR_groups; else if( bRowsHaveBorderOnly ) - pRules = sHTML_TR_rows; + pRules = OOO_STRING_SVTOOLS_HTML_TR_rows; else - pRules = sHTML_TR_groups; + pRules = OOO_STRING_SVTOOLS_HTML_TR_groups; } } else if( aRows.Count() > 1 ) { if( !bRowsHaveBorder ) - pRules = sHTML_TR_none; + pRules = OOO_STRING_SVTOOLS_HTML_TR_none; else if( !bRowsHaveBorderOnly ) - pRules = sHTML_TR_groups; + pRules = OOO_STRING_SVTOOLS_HTML_TR_groups; } else if( aCols.Count() > 1 ) { if( !bColsHaveBorder ) - pRules = sHTML_TR_none; + pRules = OOO_STRING_SVTOOLS_HTML_TR_none; else if( !bColsHaveBorderOnly ) - pRules = sHTML_TR_groups; + pRules = OOO_STRING_SVTOOLS_HTML_TR_groups; } if( pRules ) - (((sOut += ' ' ) += sHTML_O_rules ) += '=') += pRules; + (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_rules ) += '=') += pRules; } rWrt.Strm() << sOut.GetBuffer(); @@ -816,12 +816,12 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( pCaption && pCaption->Len() ) { rWrt.OutNewLine(); // <CAPTION> in neue Zeile - ByteString sOutStr( sHTML_caption ); - (((sOutStr += ' ') += sHTML_O_align) += '=') - += (bTopCaption ? sHTML_VA_top : sHTML_VA_bottom); + ByteString sOutStr( OOO_STRING_SVTOOLS_HTML_caption ); + (((sOutStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') + += (bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.GetBuffer(), sal_True ); HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_caption, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, sal_False ); } sal_uInt16 nCols = aCols.Count(); @@ -834,7 +834,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, if( bColGroups ) { rWrt.OutNewLine(); // <COLGRP> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_colgroup, sal_True ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, sal_True ); rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken } @@ -846,7 +846,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, const SwWriteTableCol *pColumn = aCols[nCol]; ByteString sOutStr( '<' ); - sOutStr += sHTML_col; + sOutStr += OOO_STRING_SVTOOLS_HTML_col; sal_uInt16 nWidth; sal_Bool bRel; @@ -861,7 +861,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, nWidth = bRel ? GetRelWidth(nCol,1) : GetAbsWidth(nCol,1); } - ((sOutStr += ' ' ) += sHTML_O_width ) += '='; + ((sOutStr += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_width ) += '='; if( bRel ) { (sOutStr += ByteString::CreateFromInt32( nWidth ) ) += '*'; @@ -877,10 +877,10 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, { rWrt.DecIndentLevel(); // Inhalt von <COLGRP> einruecken rWrt.OutNewLine(); // </COLGRP> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_colgroup, + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, sal_False ); rWrt.OutNewLine(); // <COLGRP> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_colgroup, + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, sal_True ); rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken } @@ -890,7 +890,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, rWrt.DecIndentLevel(); // Inhalt von <COLGRP> einruecken rWrt.OutNewLine(); // </COLGRP> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_colgroup, + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, sal_False ); } } @@ -915,7 +915,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, { rWrt.OutNewLine(); // <THEAD>/<TDATA> in neue Zeile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - bTHead ? sHTML_thead : sHTML_tbody, sal_True ); + bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_True ); rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr. } @@ -932,9 +932,9 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, for( ; nCnt; nCnt-- ) { rWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_tablerow, + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_True ); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_tablerow, + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False ); } } @@ -945,14 +945,14 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, rWrt.DecIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr. rWrt.OutNewLine(); // </THEAD>/</TDATA> in neue Zeile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - bTHead ? sHTML_thead : sHTML_tbody, sal_False ); + bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_False ); rWrt.OutNewLine(); // <THEAD>/<TDATA> in neue Zeile if( bTHead && nRow==nHeadEndRow ) bTHead = sal_False; HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - bTHead ? sHTML_thead : sHTML_tbody, sal_True ); + bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_True ); rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr. } } @@ -963,13 +963,13 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, rWrt.OutNewLine(); // </THEAD>/</TDATA> in neue Zeile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - bTHead ? sHTML_thead : sHTML_tbody, sal_False ); + bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_False ); } rWrt.DecIndentLevel(); // Inhalt von <TABLE> einr. rWrt.OutNewLine(); // </TABLE> in neue Zeile - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_table, sal_False ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_table, sal_False ); rWrt.nDirection = nOldDirection; } @@ -1124,7 +1124,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, { if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_dd ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_dd ); } // eFlyHoriOri und eTabHoriOri besitzen nun nur noch die Werte @@ -1182,11 +1182,11 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile if( text::HoriOrientation::CENTER==eDivHoriOri ) - HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sHTML_center, sal_True ); + HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True ); else { - ByteString sOut( sHTML_division ); - (((sOut += ' ') += sHTML_O_align) += '=') += sHTML_AL_right; + ByteString sOut( OOO_STRING_SVTOOLS_HTML_division ); + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += OOO_STRING_SVTOOLS_HTML_AL_right; HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer(), sal_True ); } @@ -1232,8 +1232,8 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, rHTMLWrt.DecIndentLevel(); // Inhalt von <CENTER> einruecken rHTMLWrt.OutNewLine(); // </CENTER> in neue Teile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), - text::HoriOrientation::CENTER==eDivHoriOri ? sHTML_center - : sHTML_division, sal_False ); + text::HoriOrientation::CENTER==eDivHoriOri ? OOO_STRING_SVTOOLS_HTML_center + : OOO_STRING_SVTOOLS_HTML_division, sal_False ); rHTMLWrt.bLFPossible = sal_True; } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 17c6961911ff..70dbcb2d8949 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -143,21 +143,21 @@ using namespace ::com::sun::star; // <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw. HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] = { - { sHTML_AL_left, SVX_ADJUST_LEFT }, - { sHTML_AL_center, SVX_ADJUST_CENTER }, - { sHTML_AL_middle, SVX_ADJUST_CENTER }, // Netscape - { sHTML_AL_right, SVX_ADJUST_RIGHT }, - { sHTML_AL_justify, SVX_ADJUST_BLOCK }, - { sHTML_AL_char, SVX_ADJUST_LEFT }, + { OOO_STRING_SVTOOLS_HTML_AL_left, SVX_ADJUST_LEFT }, + { OOO_STRING_SVTOOLS_HTML_AL_center, SVX_ADJUST_CENTER }, + { OOO_STRING_SVTOOLS_HTML_AL_middle, SVX_ADJUST_CENTER }, // Netscape + { OOO_STRING_SVTOOLS_HTML_AL_right, SVX_ADJUST_RIGHT }, + { OOO_STRING_SVTOOLS_HTML_AL_justify, SVX_ADJUST_BLOCK }, + { OOO_STRING_SVTOOLS_HTML_AL_char, SVX_ADJUST_LEFT }, { 0, 0 } }; // <SPACER TYPE=...> static HTMLOptionEnum __FAR_DATA aHTMLSpacerTypeTable[] = { - { sHTML_SPTYPE_block, HTML_SPTYPE_BLOCK }, - { sHTML_SPTYPE_horizontal, HTML_SPTYPE_HORI }, - { sHTML_SPTYPE_vertical, HTML_SPTYPE_VERT }, + { OOO_STRING_SVTOOLS_HTML_SPTYPE_block, HTML_SPTYPE_BLOCK }, + { OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal, HTML_SPTYPE_HORI }, + { OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical, HTML_SPTYPE_VERT }, { 0, 0 } }; @@ -1090,14 +1090,14 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) { case HTML_NOEMBED_OFF: aContents.ConvertLineEnd(); - InsertComment( aContents, sHTML_noembed ); + InsertComment( aContents, OOO_STRING_SVTOOLS_HTML_noembed ); aContents.Erase(); bCallNextToken = FALSE; bInNoEmbed = FALSE; break; case HTML_RAWDATA: - InsertCommentText( sHTML_noembed ); + InsertCommentText( OOO_STRING_SVTOOLS_HTML_noembed ); break; default: @@ -1518,7 +1518,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_NOEMBED_ON: bInNoEmbed = TRUE; bCallNextToken = pTable!=0; - ReadRawData( sHTML_noembed ); + ReadRawData( OOO_STRING_SVTOOLS_HTML_noembed ); break; case HTML_DEFLIST_ON: @@ -5046,14 +5046,14 @@ void SwHTMLParser::InsertLineBreak() case HTML_O_CLEAR: { const String &aClear = pOption->GetString(); - if( aClear.EqualsIgnoreCaseAscii( sHTML_AL_all ) ) + if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_all ) ) { bClearLeft = TRUE; bClearRight = TRUE; } - else if( aClear.EqualsIgnoreCaseAscii( sHTML_AL_left ) ) + else if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) ) bClearLeft = TRUE; - else if( aClear.EqualsIgnoreCaseAscii( sHTML_AL_right ) ) + else if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) ) bClearRight = TRUE; } break; @@ -5374,22 +5374,22 @@ void SwHTMLParser::ParseMoreMetaOptions() // nicht geaendert wurde. Deshalb genuegt es, auf Generator und // auf refresh abzufragen, um noch nicht verarbeitete Token zu finden, // denn das sind die einzigen, die die Dok-Info nicht modifizieren. - if( aName.EqualsIgnoreCaseAscii( sHTML_META_generator ) || - aName.EqualsIgnoreCaseAscii( sHTML_META_refresh ) || - aName.EqualsIgnoreCaseAscii( sHTML_META_content_type ) || - aName.EqualsIgnoreCaseAscii( sHTML_META_content_script_type ) ) + if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_generator ) || + aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_refresh ) || + aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ) || + aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_script_type ) ) return; aContent.EraseAllChars( _CR ); aContent.EraseAllChars( _LF ); - if( aName.EqualsIgnoreCaseAscii( sHTML_META_sdendnote ) ) + if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_sdendnote ) ) { FillEndNoteInfo( aContent ); return; } - if( aName.EqualsIgnoreCaseAscii( sHTML_META_sdfootnote ) ) + if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_sdfootnote ) ) { FillFootNoteInfo( aContent ); return; @@ -5397,16 +5397,16 @@ void SwHTMLParser::ParseMoreMetaOptions() String sText( String::CreateFromAscii(TOOLS_CONSTASCII_STRINGPARAM("HTML: <")) ); - sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(sHTML_meta) ); + sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_meta) ); sText.Append( ' ' ); if( bHTTPEquiv ) - sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(sHTML_O_httpequiv) ); + sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_O_httpequiv) ); else - sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(sHTML_O_name) ); + sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_O_name) ); sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("=\"") ); sText.Append( aName ); sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("\" ") ); - sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(sHTML_O_content) ); + sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_O_content) ); sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("=\"") ); sText.Append( aContent ); sText.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("\">") ); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 2baaa46d45e2..29a5860e0b2f 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -320,8 +320,8 @@ ULONG SwHTMLWriter::WriteStream() aName, eDestEnc, &aNonConvertableCharacters ); ByteString sOut( '<' ); - (((((((sOut += sHTML_division) - += ' ') += sHTML_O_id) += "=\"") + (((((((sOut += OOO_STRING_SVTOOLS_HTML_division) + += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\"") += aName) += '\"') += '>') += aStartTags; @@ -387,9 +387,9 @@ ULONG SwHTMLWriter::WriteStream() if( bLFPossible ) OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_body, sal_False ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_body, sal_False ); OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_html, sal_False ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_html, sal_False ); // loesche die Tabelle mit den freifliegenden Rahmen sal_uInt16 i; @@ -539,7 +539,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); - const sal_Char *pTag = pCol ? sHTML_multicol : sHTML_division; + const sal_Char *pTag = pCol ? OOO_STRING_SVTOOLS_HTML_multicol : OOO_STRING_SVTOOLS_HTML_division; ByteString sOut( '<' ); sOut += pTag; @@ -547,7 +547,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, const String& rName = rSection.GetName(); if( rName.Len() && !bContinued ) { - ((sOut += ' ') += sHTML_O_id) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\""; rHTMLWrt.Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut = '\"'; @@ -560,7 +560,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, if( FILE_LINK_SECTION == rSection.GetType() ) { - ((sOut += ' ') += sHTML_O_href) += "=\""; + ((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_href) += "=\""; rHTMLWrt.Strm() << sOut.GetBuffer(); const String& aFName = rSection.GetLinkFileName(); @@ -607,7 +607,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, } else if( pCol ) { - (((sOut += ' ') += sHTML_O_cols) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += '=') += ByteString::CreateFromInt32( pCol->GetNumCols() ); // minumum gutter width @@ -620,7 +620,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, ->LogicToPixel( Size(nGutter,0), MapMode(MAP_TWIP) ).Width(); } - (((sOut += ' ') += sHTML_O_gutter) += '=') + (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_gutter) += '=') += ByteString::CreateFromInt32( nGutter ); } } @@ -641,7 +641,7 @@ void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt, const SwFmtCol *pCol ) { - const sal_Char *pTag = pCol ? sHTML_multicol : sHTML_division; + const sal_Char *pTag = pCol ? OOO_STRING_SVTOOLS_HTML_multicol : OOO_STRING_SVTOOLS_HTML_division; rHTMLWrt.DecIndentLevel(); if( rHTMLWrt.bLFPossible ) @@ -921,18 +921,18 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs() const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) { - ByteString sOut( sHTML_doctype ); + ByteString sOut( OOO_STRING_SVTOOLS_HTML_doctype ); (sOut += ' ') += - (HTML_CFG_HTML32==nExportMode ? sHTML_doctype32 - : sHTML_doctype40); + (HTML_CFG_HTML32==nExportMode ? OOO_STRING_SVTOOLS_HTML_doctype32 + : OOO_STRING_SVTOOLS_HTML_doctype40); HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.GetBuffer() ); // baue den Vorspann OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_html ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_html ); OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head ); IncIndentLevel(); // Inhalt von <HEAD> einruecken @@ -1006,12 +1006,12 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) DecIndentLevel(); // Inhalt von <HEAD> einruecken OutNewLine(); - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_head, sal_False ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head, sal_False ); // der Body wird nicht eingerueckt, weil sonst alles eingerueckt waere! OutNewLine(); sOut = '<'; - sOut += sHTML_body; + sOut += OOO_STRING_SVTOOLS_HTML_body; Strm() << sOut.GetBuffer(); sOut.Erase(); @@ -1020,15 +1020,15 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) // Textfarbe ausgeben, wenn sie an der Standard-Vorlage gesetzt ist // und sich geaendert hat. - OutBodyColor( sHTML_O_text, + OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_text, pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false ), *this ); // Farben fuer (un)besuchte Links - OutBodyColor( sHTML_O_link, + OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_link, pDoc->GetCharFmtFromPool( RES_POOLCHR_INET_NORMAL ), *this ); - OutBodyColor( sHTML_O_vlink, + OutBodyColor( OOO_STRING_SVTOOLS_HTML_O_vlink, pDoc->GetCharFmtFromPool( RES_POOLCHR_INET_VISIT ), *this ); @@ -1055,10 +1055,10 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) void SwHTMLWriter::OutAnchor( const String& rName ) { ByteString sOut( '<' ); - (((sOut += sHTML_anchor) += ' ') += sHTML_O_name) += "=\""; + (((sOut += OOO_STRING_SVTOOLS_HTML_anchor) += ' ') += OOO_STRING_SVTOOLS_HTML_O_name) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), rName, eDestEnc, &aNonConvertableCharacters ) << "\">"; - HTMLOutFuncs::Out_AsciiTag( Strm(), sHTML_anchor, sal_False ); + HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False ); } void SwHTMLWriter::OutBookmarks() @@ -1159,7 +1159,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, if( rBackColor.GetColor() != COL_TRANSPARENT ) { ByteString sOut( ' ' ); - (sOut += sHTML_O_bgcolor) += '='; + (sOut += OOO_STRING_SVTOOLS_HTML_O_bgcolor) += '='; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_Color( Strm(), rBackColor, eDestEnc); } @@ -1209,7 +1209,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, { ByteString sOut( ' ' ); String s( URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), *pLink)); - (sOut += sHTML_O_background) += "=\""; + (sOut += OOO_STRING_SVTOOLS_HTML_O_background) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), s, eDestEnc, &aNonConvertableCharacters ) << '\"'; } @@ -1249,7 +1249,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang ) if( LANGUAGE_DONTKNOW != nLang ) { ByteString sOut( ' ' ); - (sOut += sHTML_O_lang) += "=\""; + (sOut += OOO_STRING_SVTOOLS_HTML_O_lang) += "=\""; Strm() << sOut.GetBuffer(); HTMLOutFuncs::Out_String( Strm(), MsLangId::convertLanguageToIsoString(nLang), eDestEnc, &aNonConvertableCharacters ) << '"'; @@ -1297,7 +1297,7 @@ void SwHTMLWriter::OutDirection( sal_uInt16 nDir ) if( pValue != 0 ) { ByteString sOut( ' ' ); - (((sOut += sHTML_O_dir) += "=\"") += pValue) += '\"'; + (((sOut += OOO_STRING_SVTOOLS_HTML_O_dir) += "=\"") += pValue) += '\"'; Strm() << sOut.GetBuffer(); } } diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx index 3c099fcd62a5..88dc0da19562 100644 --- a/sw/source/filter/rtf/rtfatr.cxx +++ b/sw/source/filter/rtf/rtfatr.cxx @@ -190,7 +190,7 @@ static Writer& OutRTF_SwFmtCol( Writer& rWrt, const SfxPoolItem& rHt ); SvStream& OutComment( Writer& rWrt, const sal_Char* pStr ) { - return (rWrt.Strm() << '{' << sRTF_IGNORE << pStr); + return (rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << pStr); } SvStream& OutComment( Writer& rWrt, const char* pStr, BOOL bSetFlag ) @@ -198,7 +198,7 @@ SvStream& OutComment( Writer& rWrt, const char* pStr, BOOL bSetFlag ) // setze Flag, damit bei der Ausgabe von Attributen zu erkennen, // ob ueberhaupt etwas ausgegeben wurde. ((SwRTFWriter&)rWrt).bOutFmtAttr = bSetFlag; - return (rWrt.Strm() << '{' << sRTF_IGNORE << pStr); + return (rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << pStr); } Writer& OutRTF_AsByteString( Writer& rWrt, const String& rStr, rtl_TextEncoding eEncoding) @@ -369,15 +369,15 @@ void OutRTF_SfxItemSet( SwRTFWriter& rWrt, const SfxItemSet& rSet, { if (bOutLTOR) { - rWrt.Strm() << sRTF_LTRCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LTRCH; bOutLTOR = false; } if (bLowLTOR) - rWrt.Strm() << sRTF_LOCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LOCH; else { - rWrt.Strm() << sRTF_HICH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_HICH; bLowLTOR = true; } } @@ -385,13 +385,13 @@ void OutRTF_SfxItemSet( SwRTFWriter& rWrt, const SfxItemSet& rSet, { if( bOutLTOR ) { - rWrt.Strm() << sRTF_LTRCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LTRCH; bOutLTOR = false; } - rWrt.Strm() << sRTF_DBCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_DBCH; } else - rWrt.Strm() << sRTF_RTLCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_RTLCH; for (USHORT n = 0; n < pCurArr->Count(); ++n) { @@ -424,7 +424,7 @@ bool SwFmtToSet(SwRTFWriter& rWrt, const SwFmt& rFmt, SfxItemSet &rSet) if (0 == nId ) return false; // Default-TextStyle nicht ausgeben !! - rWrt.Strm() << sRTF_S; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_S; rWrt.OutULong( nId ); rWrt.bOutFmtAttr = TRUE; // BYTE nLvl = ((const SwTxtFmtColl&)rFmt).GetOutlineLevel(); //#outline level,zhaojianwei @@ -438,13 +438,13 @@ bool SwFmtToSet(SwRTFWriter& rWrt, const SwFmt& rFmt, SfxItemSet &rSet) if( USHRT_MAX != nNumId ) { BYTE nWWLvl = 8 >= nLvl ? static_cast<BYTE>(nLvl) : 8; - rWrt.Strm() << sRTF_LS; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LS; rWrt.OutULong( nNumId ); - rWrt.Strm() << sRTF_ILVL; rWrt.OutULong( nWWLvl ); - rWrt.Strm() << sRTF_OUTLINELEVEL; rWrt.OutULong( nWWLvl ); + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_ILVL; rWrt.OutULong( nWWLvl ); + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL; rWrt.OutULong( nWWLvl ); if( nWWLvl != nLvl ) // RTF-kennt nur 9 Ebenen { - OutComment( rWrt, sRTF_SOUTLVL ); + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_SOUTLVL ); rWrt.OutULong( nLvl ) << '}'; } } @@ -473,7 +473,7 @@ bool SwFmtToSet(SwRTFWriter& rWrt, const SwFmt& rFmt, SfxItemSet &rSet) if (0 == nId) return false; // Default-CharStyle nicht ausgeben !! - rWrt.Strm() << sRTF_IGNORE << sRTF_CS; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_CS; rWrt.OutULong( nId ); rWrt.bOutFmtAttr = TRUE; } @@ -532,7 +532,7 @@ void OutRTF_SwFlyFrmFmt( SwRTFWriter& rRTFWrt ) if( aTmpStrm.GetSize() ) // gibt es SWG spezifische Attribute ?? { aTmpStrm.Seek( 0L ); - rRTFWrt.Strm() << '{' << sRTF_IGNORE << aTmpStrm << '}'; + rRTFWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << aTmpStrm << '}'; } } // rRTFWrt.pFlyFmt = 0; // wieder zuruecksetzen !! @@ -782,7 +782,7 @@ void RTFEndPosLst::OutFontAttrs(USHORT nScript, bool bRTL) /* You would have thought that - rWrt.Strm() << (bRTL ? sRTF_RTLCH : sRTF_LTRCH); would be sufficent here , + rWrt.Strm() << (bRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficent here , but looks like word needs to see the other directional token to be satisified that all is kosher, otherwise it seems in ver 2003 to go and semi-randomlyly stick strike through about the place. Perhaps @@ -791,15 +791,15 @@ void RTFEndPosLst::OutFontAttrs(USHORT nScript, bool bRTL) */ if (bRTL) { - rWrt.Strm() << sRTF_LTRCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LTRCH; rWrt.Strm() << ' '; - rWrt.Strm() << sRTF_RTLCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_RTLCH; } else { - rWrt.Strm() << sRTF_RTLCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_RTLCH; rWrt.Strm() << ' '; - rWrt.Strm() << sRTF_LTRCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LTRCH; } // size/weight/posture optional @@ -810,11 +810,11 @@ void RTFEndPosLst::OutFontAttrs(USHORT nScript, bool bRTL) default: //fall through ASSERT(pIdArr, "unknown script, strange"); case i18n::ScriptType::LATIN: - rWrt.Strm() << sRTF_LOCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LOCH; pIdArr = aLatinIds; break; case i18n::ScriptType::ASIAN: - rWrt.Strm() << sRTF_DBCH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_DBCH; pIdArr = aAsianIds; break; case i18n::ScriptType::COMPLEX: @@ -848,7 +848,7 @@ void RTFEndPosLst::EndAttrs( xub_StrLen nStrPos ) switch( rAttrs[ --nAttr ]->Which() ) { case RES_TXTATR_CJK_RUBY: - rWrt.Strm() << ")}{" << sRTF_FLDRSLT << " }}"; + rWrt.Strm() << ")}{" << OOO_STRING_SVTOOLS_RTF_FLDRSLT << " }}"; break; } } @@ -995,7 +995,7 @@ static void OutSvxFrmDir(SwRTFWriter& rRTFWrt, const SfxPoolItem& rHt ) break; case FRMDIR_VERT_TOP_RIGHT: nVal = 1; - pStr = sRTF_FRMTXTBRLV; + pStr = OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV; break; case FRMDIR_HORI_RIGHT_TOP: bRTL = true; @@ -1003,11 +1003,11 @@ static void OutSvxFrmDir(SwRTFWriter& rRTFWrt, const SfxPoolItem& rHt ) // A val of three isn't working as expected in word :-( so leave it // as normal ltr 0 textflow with rtl sect property, neither does // the frame textflow -// pStr = sRTF_FRMTXTBRL; +// pStr = OOO_STRING_SVTOOLS_RTF_FRMTXTBRL; break; case FRMDIR_VERT_TOP_LEFT: nVal = 4; - pStr = sRTF_FRMTXLRTBV; + pStr = OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV; break; } @@ -1020,16 +1020,16 @@ static void OutSvxFrmDir(SwRTFWriter& rRTFWrt, const SfxPoolItem& rHt ) { if (nVal) { - rRTFWrt.Strm() << sRTF_STEXTFLOW; + rRTFWrt.Strm() << OOO_STRING_SVTOOLS_RTF_STEXTFLOW; rRTFWrt.OutULong( nVal ); } if (bRTL) - rRTFWrt.Strm() << sRTF_RTLSECT; + rRTFWrt.Strm() << OOO_STRING_SVTOOLS_RTF_RTLSECT; rRTFWrt.bOutFmtAttr = TRUE; } else if (!rRTFWrt.pFlyFmt && !rRTFWrt.bOutPageDesc) { - rRTFWrt.Strm() << (bRTL ? sRTF_RTLPAR : sRTF_LTRPAR); + rRTFWrt.Strm() << (bRTL ? OOO_STRING_SVTOOLS_RTF_RTLPAR : OOO_STRING_SVTOOLS_RTF_LTRPAR); rRTFWrt.bOutFmtAttr = TRUE; } } @@ -1059,8 +1059,8 @@ static Writer& OutRTF_SwTxtINetFmt( Writer& rWrt, const SfxPoolItem& rHt ) SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; if( rURL.GetValue().Len() ) { - rWrt.Strm() << '{' << sRTF_FIELD << '{' << sRTF_IGNORE - << sRTF_FLDINST << " HYPERLINK "; + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_FIELD << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE + << OOO_STRING_SVTOOLS_RTF_FLDINST << " HYPERLINK "; String sURL( rURL.GetValue() ); if( INET_MARK_TOKEN != sURL.GetChar(0) ) @@ -1097,7 +1097,7 @@ static Writer& OutRTF_SwTxtINetFmt( Writer& rWrt, const SfxPoolItem& rHt ) rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt ) << "\" "; } - rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' '; + rWrt.Strm() << "}{" << OOO_STRING_SVTOOLS_RTF_FLDRSLT << ' '; rRTFWrt.bOutFmtAttr = false; // und dann noch die Attributierung ausgeben @@ -1197,9 +1197,9 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) if( rRTFWrt.bWriteAll ) { - rRTFWrt.Strm() << sRTF_PARD << sRTF_PLAIN << ' '; // alle Attribute zuruecksetzen + rRTFWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << ' '; // alle Attribute zuruecksetzen if( rRTFWrt.bOutTable ) - rRTFWrt.Strm() << sRTF_INTBL; + rRTFWrt.Strm() << OOO_STRING_SVTOOLS_RTF_INTBL; // ist der aktuelle Absatz in einem freifliegenden Rahmen ? Dann // muessen noch die Attribute dafuer ausgegeben werden. @@ -1395,7 +1395,7 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) } } - rRTFWrt.Strm() << SwRTFWriter::sNewLine << sRTF_PAR << ' '; + rRTFWrt.Strm() << SwRTFWriter::sNewLine << OOO_STRING_SVTOOLS_RTF_PAR << ' '; return rRTFWrt; } @@ -1437,10 +1437,10 @@ void ExportPICT(const Size &rOrig, const Size &rRendered, const Size &rMapped, const SwCropGrf &rCr, const char *pBLIPType, const sal_uInt8 *pGraphicAry, unsigned long nSize, SwRTFWriter &rWrt) { - bool bIsWMF = (const char *)pBLIPType == (const char *)sRTF_WMETAFILE ? true : false; + bool bIsWMF = (const char *)pBLIPType == (const char *)OOO_STRING_SVTOOLS_RTF_WMETAFILE ? true : false; if (pBLIPType && nSize && pGraphicAry) { - rWrt.Strm() << '{' << sRTF_PICT; + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_PICT; long nXCroppedSize = rOrig.Width()-(rCr.GetLeft() + rCr.GetRight()); long nYCroppedSize = rOrig.Height()-(rCr.GetTop() + rCr.GetBottom()); @@ -1454,28 +1454,28 @@ void ExportPICT(const Size &rOrig, const Size &rRendered, const Size &rMapped, //Given the original size and taking cropping into account //first, how much has the original been scaled to get the //final rendered size - rWrt.Strm() << sRTF_PICSCALEX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICSCALEX; rWrt.OutLong((100 * rRendered.Width()) / nXCroppedSize); - rWrt.Strm() << sRTF_PICSCALEY; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICSCALEY; rWrt.OutLong((100 * rRendered.Height()) / nYCroppedSize); - rWrt.Strm() << sRTF_PICCROPL; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICCROPL; rWrt.OutLong(rCr.GetLeft()); - rWrt.Strm() << sRTF_PICCROPR; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICCROPR; rWrt.OutLong(rCr.GetRight()); - rWrt.Strm() << sRTF_PICCROPT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICCROPT; rWrt.OutLong(rCr.GetTop()); - rWrt.Strm() << sRTF_PICCROPB; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICCROPB; rWrt.OutLong(rCr.GetBottom()); - rWrt.Strm() << sRTF_PICW; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICW; rWrt.OutLong(rMapped.Width()); - rWrt.Strm() << sRTF_PICH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICH; rWrt.OutLong(rMapped.Height()); - rWrt.Strm() << sRTF_PICWGOAL; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICWGOAL; rWrt.OutLong(rOrig.Width()); - rWrt.Strm() << sRTF_PICHGOAL; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PICHGOAL; rWrt.OutLong(rOrig.Height()); rWrt.Strm() << pBLIPType; @@ -1535,13 +1535,13 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode) switch (aGraphicLink.GetType()) { case GFX_LINK_TYPE_NATIVE_JPG: - pBLIPType = sRTF_JPEGBLIP; + pBLIPType = OOO_STRING_SVTOOLS_RTF_JPEGBLIP; break; case GFX_LINK_TYPE_NATIVE_PNG: - pBLIPType = sRTF_PNGBLIP; + pBLIPType = OOO_STRING_SVTOOLS_RTF_PNGBLIP; case GFX_LINK_TYPE_NATIVE_WMF: pBLIPType = - IsEMF(pGraphicAry, nSize) ? sRTF_EMFBLIP : sRTF_WMETAFILE; + IsEMF(pGraphicAry, nSize) ? OOO_STRING_SVTOOLS_RTF_EMFBLIP : OOO_STRING_SVTOOLS_RTF_WMETAFILE; break; default: break; @@ -1555,7 +1555,7 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode) (eGraphicType == GRAPHIC_BITMAP) ? CVT_PNG : CVT_WMF)) { pBLIPType = (eGraphicType == GRAPHIC_BITMAP) ? - sRTF_PNGBLIP : sRTF_WMETAFILE; + OOO_STRING_SVTOOLS_RTF_PNGBLIP : OOO_STRING_SVTOOLS_RTF_WMETAFILE; aStream.Seek(STREAM_SEEK_TO_END); nSize = aStream.Tell(); pGraphicAry = (sal_uInt8*)aStream.GetData(); @@ -1582,9 +1582,9 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode) the wmf format wrapped in nonshppict, so as to keep wordpad happy. If its a wmf already then we don't need any such wrapping */ - bool bIsWMF = (const sal_Char*)pBLIPType == (const sal_Char*)sRTF_WMETAFILE ? true : false; + bool bIsWMF = (const sal_Char*)pBLIPType == (const sal_Char*)OOO_STRING_SVTOOLS_RTF_WMETAFILE ? true : false; if (!bIsWMF) - OutComment(rRTFWrt, sRTF_SHPPICT); + OutComment(rRTFWrt, OOO_STRING_SVTOOLS_RTF_SHPPICT); if (pBLIPType) ExportPICT(aSize, aRendered, aMapped, rCr, pBLIPType, pGraphicAry, nSize, rRTFWrt); @@ -1592,7 +1592,7 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode) { aStream.Seek(0); GraphicConverter::Export(aStream, aGraphic, CVT_WMF); - pBLIPType = sRTF_WMETAFILE; + pBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE; aStream.Seek(STREAM_SEEK_TO_END); nSize = aStream.Tell(); pGraphicAry = (sal_uInt8*)aStream.GetData(); @@ -1603,11 +1603,11 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode) if (!bIsWMF) { - rRTFWrt.Strm() << '}' << '{' << sRTF_NONSHPPICT; + rRTFWrt.Strm() << '}' << '{' << OOO_STRING_SVTOOLS_RTF_NONSHPPICT; aStream.Seek(0); GraphicConverter::Export(aStream, aGraphic, CVT_WMF); - pBLIPType = sRTF_WMETAFILE; + pBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE; aStream.Seek(STREAM_SEEK_TO_END); nSize = aStream.Tell(); pGraphicAry = (sal_uInt8*)aStream.GetData(); @@ -1685,11 +1685,11 @@ static Writer& OutRTF_SwGrfNode(Writer& rWrt, SwCntntNode & rNode) aGrfNm = aUrl.PathToFileName(); // Bitmap als File-Referenz speichern - rRTFWrt.Strm() << sRTF_FIELD << sRTF_FLDPRIV; - OutComment( rRTFWrt, sRTF_FLDINST ) << "{\\\\import "; + rRTFWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FIELD << OOO_STRING_SVTOOLS_RTF_FLDPRIV; + OutComment( rRTFWrt, OOO_STRING_SVTOOLS_RTF_FLDINST ) << "{\\\\import "; RTFOutFuncs::Out_String( rWrt.Strm(), aGrfNm, rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt ); - rRTFWrt.Strm() << "}}{" << sRTF_FLDRSLT << " }}"; + rRTFWrt.Strm() << "}}{" << OOO_STRING_SVTOOLS_RTF_FLDRSLT << " }}"; rRTFWrt.Strm() << '}' << SwRTFWriter::sNewLine; #endif return rRTFWrt; @@ -1704,7 +1704,7 @@ static Writer& OutRTF_SwOLENode( Writer& rWrt, SwCntntNode & /*rNode*/ ) if( rRTFWrt.pFlyFmt ) OutRTF_SwFlyFrmFmt( rRTFWrt ); - rWrt.Strm() << SwRTFWriter::sNewLine << sRTF_PAR; + rWrt.Strm() << SwRTFWriter::sNewLine << OOO_STRING_SVTOOLS_RTF_PAR; return rWrt; } @@ -1715,18 +1715,18 @@ static void OutTBLBorderLine(SwRTFWriter& rWrt, const SvxBorderLine* pLine, if( pLine->GetInWidth() ) { // doppelte Linie - sLineStr = sRTF_BRDRDB; + sLineStr = OOO_STRING_SVTOOLS_RTF_BRDRDB; switch( pLine->GetInWidth() ) { case DEF_LINE_WIDTH_0: - ( sLineStr += sRTF_BRDRW ) += "15"; + ( sLineStr += OOO_STRING_SVTOOLS_RTF_BRDRW ) += "15"; break; case DEF_LINE_WIDTH_1: - ( sLineStr += sRTF_BRDRW ) += "30"; + ( sLineStr += OOO_STRING_SVTOOLS_RTF_BRDRW ) += "30"; break; case DEF_LINE_WIDTH_2: case DEF_LINE_WIDTH_3: - ( sLineStr += sRTF_BRDRW ) += "45"; + ( sLineStr += OOO_STRING_SVTOOLS_RTF_BRDRW ) += "45"; break; } } @@ -1734,14 +1734,14 @@ static void OutTBLBorderLine(SwRTFWriter& rWrt, const SvxBorderLine* pLine, { // einfache Linie if( DEF_LINE_WIDTH_1 >= pLine->GetOutWidth() ) - (( sLineStr = sRTF_BRDRS ) += sRTF_BRDRW ) += + (( sLineStr = OOO_STRING_SVTOOLS_RTF_BRDRS ) += OOO_STRING_SVTOOLS_RTF_BRDRW ) += ByteString::CreateFromInt32( pLine->GetOutWidth() ); else - (( sLineStr = sRTF_BRDRTH ) += sRTF_BRDRW ) += + (( sLineStr = OOO_STRING_SVTOOLS_RTF_BRDRTH ) += OOO_STRING_SVTOOLS_RTF_BRDRW ) += ByteString::CreateFromInt32( pLine->GetOutWidth() / 2 ); } - rWrt.Strm() << pStr << sLineStr.GetBuffer() << sRTF_BRDRCF; + rWrt.Strm() << pStr << sLineStr.GetBuffer() << OOO_STRING_SVTOOLS_RTF_BRDRCF; rWrt.OutULong( rWrt.GetId( pLine->GetColor() ) ); } @@ -1749,7 +1749,7 @@ static void OutBorderLine(SwRTFWriter& rWrt, const SvxBorderLine* pLine, const sal_Char* pStr, USHORT nDist) { OutTBLBorderLine(rWrt, pLine, pStr); - rWrt.Strm() << sRTF_BRSP; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_BRSP; rWrt.OutULong( nDist ); } @@ -1762,17 +1762,17 @@ static void OutSwTblBorder(SwRTFWriter& rWrt, const SvxBoxItem& rBox, }; static const char* aBorderNames[] = { - sRTF_CLBRDRT, sRTF_CLBRDRL, sRTF_CLBRDRB, sRTF_CLBRDRR + OOO_STRING_SVTOOLS_RTF_CLBRDRT, OOO_STRING_SVTOOLS_RTF_CLBRDRL, OOO_STRING_SVTOOLS_RTF_CLBRDRB, OOO_STRING_SVTOOLS_RTF_CLBRDRR }; //Yes left and top are swapped with eachother for cell padding! Because //that's what the thunderingly annoying rtf export/import word xp does. static const char* aCellPadNames[] = { - sRTF_CLPADL, sRTF_CLPADT, sRTF_CLPADB, sRTF_CLPADR + OOO_STRING_SVTOOLS_RTF_CLPADL, OOO_STRING_SVTOOLS_RTF_CLPADT, OOO_STRING_SVTOOLS_RTF_CLPADB, OOO_STRING_SVTOOLS_RTF_CLPADR }; static const char* aCellPadUnits[] = { - sRTF_CLPADFL, sRTF_CLPADFT, sRTF_CLPADFB, sRTF_CLPADFR + OOO_STRING_SVTOOLS_RTF_CLPADFL, OOO_STRING_SVTOOLS_RTF_CLPADFT, OOO_STRING_SVTOOLS_RTF_CLPADFB, OOO_STRING_SVTOOLS_RTF_CLPADFR }; for (int i = 0; i < 4; ++i) { @@ -1793,7 +1793,7 @@ static void OutSwTblBackground( SwRTFWriter& rWrt, const SvxBrushItem& rBack ) { if( !rBack.GetColor().GetTransparency() ) { - rWrt.Strm() << sRTF_CLCBPAT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CLCBPAT; rWrt.OutULong( rWrt.GetId( rBack.GetColor() ) ); } } @@ -1841,14 +1841,14 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) SwTwips nTblSz = pFmt->GetFrmSize().GetWidth(); - ByteString aTblAdjust( sRTF_TRQL ); + ByteString aTblAdjust( OOO_STRING_SVTOOLS_RTF_TRQL ); switch (pFmt->GetHoriOrient().GetHoriOrient()) { case text::HoriOrientation::CENTER: - aTblAdjust = sRTF_TRQC; + aTblAdjust = OOO_STRING_SVTOOLS_RTF_TRQC; break; case text::HoriOrientation::RIGHT: - aTblAdjust = sRTF_TRQR; + aTblAdjust = OOO_STRING_SVTOOLS_RTF_TRQR; break; case text::HoriOrientation::NONE: case text::HoriOrientation::LEFT_AND_WIDTH: @@ -1856,7 +1856,7 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) const SvxLRSpaceItem& rLRSp = pFmt->GetLRSpace(); nTblOffset = rLRSp.GetLeft(); nPageSize -= (nTblOffset + rLRSp.GetRight()); - aTblAdjust += sRTF_TRLEFT; + aTblAdjust += OOO_STRING_SVTOOLS_RTF_TRLEFT; aTblAdjust += ByteString::CreateFromInt32( nTblOffset ); } break; @@ -1865,7 +1865,7 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) } if (rRTFWrt.TrueFrameDirection(*pFmt) == FRMDIR_HORI_RIGHT_TOP) - aTblAdjust += sRTF_RTLROW; + aTblAdjust += OOO_STRING_SVTOOLS_RTF_RTLROW; // ist die Tabelle wesentlich (PageSize + 10%) groesser als die Seite, // dann sind die Box-Breiten relative Angaben. @@ -1928,10 +1928,10 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) nColCnt = rCols.Count(); // A wrong cellspan-value could cause a nColCnt > rCols.Count() // Start Tabellendefinition - rWrt.Strm() << sRTF_TROWD << aTblAdjust.GetBuffer(); + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TROWD << aTblAdjust.GetBuffer(); if( rTbl.GetRowsToRepeat() > nLine ) - rWrt.Strm() << sRTF_TRHDR; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TRHDR; const SwTableLine* pLine = pBoxArr[ 0 ]->GetBox()->GetUpper(); // Zeilenhoehe ausgeben @@ -1955,11 +1955,11 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) //splittable export TRKEEP const SwFrmFmt *pLineFmt = pLine ? pLine->GetFrmFmt() : 0; if (!pLineFmt || pLineFmt->GetRowSplit().GetValue() == 0) - rWrt.Strm() << sRTF_TRKEEP; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TRKEEP; if( nHeight ) { - rWrt.Strm() << sRTF_TRRH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TRRH; rWrt.OutLong( nHeight ); } @@ -1974,11 +1974,11 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) }; static const char* aRowPadNames[] = { - sRTF_TRPADDT, sRTF_TRPADDL, sRTF_TRPADDB, sRTF_TRPADDR + OOO_STRING_SVTOOLS_RTF_TRPADDT, OOO_STRING_SVTOOLS_RTF_TRPADDL, OOO_STRING_SVTOOLS_RTF_TRPADDB, OOO_STRING_SVTOOLS_RTF_TRPADDR }; static const char* aRowPadUnits[] = { - sRTF_TRPADDFT, sRTF_TRPADDFL, sRTF_TRPADDFB, sRTF_TRPADDFR + OOO_STRING_SVTOOLS_RTF_TRPADDFT, OOO_STRING_SVTOOLS_RTF_TRPADDFL, OOO_STRING_SVTOOLS_RTF_TRPADDFB, OOO_STRING_SVTOOLS_RTF_TRPADDFR }; for (int i = 0; i < 4; ++i) { @@ -2000,8 +2000,8 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) const SwFrmFmt& rFmt = *pCell->GetBox()->GetFrmFmt(); if( 1 < pCell->GetRowSpan() || 0 == pCell->GetRowSpan() ) rWrt.Strm() << ( pCell->GetRowSpan() == pRowSpans[ nBox ] - ? sRTF_CLVMGF - : sRTF_CLVMRG ); + ? OOO_STRING_SVTOOLS_RTF_CLVMGF + : OOO_STRING_SVTOOLS_RTF_CLVMRG ); const SfxPoolItem* pItem; if (SFX_ITEM_SET == rFmt.GetAttrSet().GetItemState(RES_BOX, TRUE, @@ -2025,14 +2025,14 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) RES_VERT_ORIENT, TRUE, &pItem ) ) switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() ) { - case text::VertOrientation::CENTER: rWrt.Strm() << sRTF_CLVERTALC; break; - case text::VertOrientation::BOTTOM: rWrt.Strm() << sRTF_CLVERTALB; break; - default: rWrt.Strm() << sRTF_CLVERTALT; break; + case text::VertOrientation::CENTER: rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CLVERTALC; break; + case text::VertOrientation::BOTTOM: rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; + default: rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CLVERTALT; break; } const SwFmtFrmSize& rLSz = rFmt.GetFrmSize(); nSz += rLSz.GetWidth(); - rWrt.Strm() << sRTF_CELLX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CELLX; nCalc = nSz; if( bRelBoxSize ) @@ -2044,7 +2044,7 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) } // Inhalt der Boxen ausgeben - rWrt.Strm() << SwRTFWriter::sNewLine << sRTF_PARD << sRTF_INTBL; + rWrt.Strm() << SwRTFWriter::sNewLine << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; for( nBox = 0; nBox < nColCnt; ++nBox ) { if( nBox && pBoxArr[ nBox-1 ] == pBoxArr[ nBox ] ) @@ -2059,11 +2059,11 @@ Writer& OutRTF_SwTblNode(Writer& rWrt, const SwTableNode & rNode) rRTFWrt.bOutTable = TRUE; rRTFWrt.Out_SwDoc( rRTFWrt.pCurPam ); } - rWrt.Strm() << sRTF_CELL; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CELL; } // das wars mit der Line - rWrt.Strm() << sRTF_ROW << sRTF_PARD << ' '; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_ROW << OOO_STRING_SVTOOLS_RTF_PARD << ' '; for( nBox = 0; nBox < nColCnt; ++nBox ) --pRowSpans[ nBox ]; @@ -2118,11 +2118,11 @@ Writer& OutRTF_SwSectionNode( Writer& rWrt, SwSectionNode& rNode ) { // als fortlaufenden Abschnittwechsel heraus schreiben if( !bPgDscWrite ) - rWrt.Strm() << sRTF_SECT << sRTF_SBKNONE; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_SECT << OOO_STRING_SVTOOLS_RTF_SBKNONE; //JP 19.03.99 - es muss fuer den Import auf jedenfall das Cols // Token geschrieben werden. Sonst kann nicht erkannt // werden, wann ein PageDesc & eine Section gueltig ist - rWrt.Strm() << sRTF_COLS << '1'; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLS << '1'; rRTFWrt.bOutFmtAttr = TRUE; const SfxPoolItem* pItem; const SwFrmFmt *pFmt = rSect.GetFmt(); @@ -2132,18 +2132,18 @@ Writer& OutRTF_SwSectionNode( Writer& rWrt, SwSectionNode& rNode ) OutRTF_SwFmtCol( rWrt, *pItem ); else { - rWrt.Strm() << sRTF_COLS << '1' << sRTF_COLSX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLS << '1' << OOO_STRING_SVTOOLS_RTF_COLSX; rWrt.OutULong(709); } if( SFX_ITEM_SET == rSet.GetItemState( RES_COLUMNBALANCE, false, &pItem ) && ((SwFmtNoBalancedColumns*)pItem)->GetValue() ) - OutComment( rWrt, sRTF_BALANCEDCOLUMN ) << '}'; + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN ) << '}'; if (FRMDIR_HORI_RIGHT_TOP == rRTFWrt.TrueFrameDirection(*pFmt)) - rWrt.Strm() << sRTF_RTLSECT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_RTLSECT; else - rWrt.Strm() << sRTF_LTRSECT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LTRSECT; rWrt.Strm() << SwRTFWriter::sNewLine; } @@ -2178,10 +2178,10 @@ static Writer& OutRTF_SwFont( Writer& rWrt, const SfxPoolItem& rHt ) */ if (rRTFWrt.bTxtAttr && (rFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL)) { - const sal_Char* pCmd = !bAssoc ? sRTF_AF : sRTF_F; + const sal_Char* pCmd = !bAssoc ? OOO_STRING_SVTOOLS_RTF_AF : OOO_STRING_SVTOOLS_RTF_F; rWrt.Strm() << pCmd; } - const sal_Char* pCmd = bAssoc ? sRTF_AF : sRTF_F; + const sal_Char* pCmd = bAssoc ? OOO_STRING_SVTOOLS_RTF_AF : OOO_STRING_SVTOOLS_RTF_F; rWrt.Strm() << pCmd; rWrt.OutULong(rRTFWrt.GetId(rFont)); rRTFWrt.eCurrentEncoding = rtl_getTextEncodingFromWindowsCharset(sw::ms::rtl_TextEncodingToWinCharset(rFont.GetCharSet())); @@ -2213,7 +2213,7 @@ static Writer& OutRTF_SwPosture( Writer& rWrt, const SfxPoolItem& rHt ) if( ITALIC_NORMAL == nPosture || bTxtOut ) { rRTFWrt.bOutFmtAttr = TRUE; - const sal_Char* pCmd = rRTFWrt.IsAssociatedFlag() ? sRTF_AI : sRTF_I; + const sal_Char* pCmd = rRTFWrt.IsAssociatedFlag() ? OOO_STRING_SVTOOLS_RTF_AI : OOO_STRING_SVTOOLS_RTF_I; rWrt.Strm() << pCmd; } if( bTxtOut ) @@ -2246,7 +2246,7 @@ static Writer& OutRTF_SwWeight( Writer& rWrt, const SfxPoolItem& rHt ) if( WEIGHT_BOLD == nBold || bTxtOut ) { rRTFWrt.bOutFmtAttr = TRUE; - const sal_Char* pCmd = rRTFWrt.IsAssociatedFlag() ? sRTF_AB : sRTF_B; + const sal_Char* pCmd = rRTFWrt.IsAssociatedFlag() ? OOO_STRING_SVTOOLS_RTF_AB : OOO_STRING_SVTOOLS_RTF_B; rWrt.Strm() << pCmd; } if( bTxtOut ) @@ -2261,9 +2261,9 @@ static Writer& OutRTF_SwEmphasisMark( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char* pStr; switch( ((const SvxEmphasisMarkItem&)rHt).GetEmphasisMark()) { - case EMPHASISMARK_NONE: pStr = sRTF_ACCNONE; break; - case EMPHASISMARK_SIDE_DOTS: pStr = sRTF_ACCCOMMA; break; - default: pStr = sRTF_ACCDOT; break; + case EMPHASISMARK_NONE: pStr = OOO_STRING_SVTOOLS_RTF_ACCNONE; break; + case EMPHASISMARK_SIDE_DOTS: pStr = OOO_STRING_SVTOOLS_RTF_ACCCOMMA; break; + default: pStr = OOO_STRING_SVTOOLS_RTF_ACCDOT; break; } rRTFWrt.bOutFmtAttr = TRUE; @@ -2292,7 +2292,7 @@ static Writer& OutRTF_SwTwoInOne( Writer& rWrt, const SfxPoolItem& rHt ) else // all other kind of brackets nType = 1; - rWrt.Strm() << sRTF_TWOINONE; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TWOINONE; rWrt.OutULong( nType ); rRTFWrt.bOutFmtAttr = TRUE; } @@ -2303,7 +2303,7 @@ static Writer& OutRTF_SwCharRotate( Writer& rWrt, const SfxPoolItem& rHt ) { SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_HORZVERT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_HORZVERT; rWrt.OutLong( ((SvxCharRotateItem&)rHt).IsFitToLine() ? 1 : 0 ); return rWrt; } @@ -2311,7 +2311,7 @@ static Writer& OutRTF_SwCharScaleW( Writer& rWrt, const SfxPoolItem& rHt ) { SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_CHARSCALEX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CHARSCALEX; rWrt.OutLong( ((SvxCharScaleWidthItem&)rHt).GetValue() ); return rWrt; } @@ -2324,10 +2324,10 @@ static Writer& OutRTF_SwCharRelief(Writer& rWrt, const SfxPoolItem& rHt) switch (rAttr.GetValue()) { case RELIEF_EMBOSSED: - pStr = sRTF_EMBO; + pStr = OOO_STRING_SVTOOLS_RTF_EMBO; break; case RELIEF_ENGRAVED: - pStr = sRTF_IMPR; + pStr = OOO_STRING_SVTOOLS_RTF_IMPR; break; default: pStr = 0; @@ -2349,7 +2349,7 @@ static Writer& OutRTF_SwChrBckgrnd( Writer& rWrt, const SfxPoolItem& rHt ) const SvxBrushItem& rBack = (const SvxBrushItem&)rHt; if( !rBack.GetColor().GetTransparency() ) { - ByteString sOut( sRTF_CHCBPAT ); + ByteString sOut( OOO_STRING_SVTOOLS_RTF_CHCBPAT ); sOut += ByteString::CreateFromInt32( rRTFWrt.GetId( rBack.GetColor() )); @@ -2367,7 +2367,7 @@ static Writer& OutRTF_SwShadowed( Writer& rWrt, const SfxPoolItem& rHt ) if( bShadow || bTxtOut ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_SHAD; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_SHAD; } if( bTxtOut ) rWrt.Strm() << '0'; @@ -2384,7 +2384,7 @@ static Writer& OutRTF_SwContour( Writer& rWrt, const SfxPoolItem& rHt ) if( bContour || bTxtOut ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_OUTL; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_OUTL; } if( bTxtOut ) rWrt.Strm() << '0'; @@ -2402,12 +2402,12 @@ static Writer& OutRTF_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) rRTFWrt.bOutFmtAttr = TRUE; if( STRIKEOUT_DOUBLE == nStrike ) { - rWrt.Strm() << sRTF_STRIKED; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_STRIKED; if( !bTxtOut ) rWrt.Strm() << '1'; } else - rWrt.Strm() << sRTF_STRIKE; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_STRIKE; } if( bTxtOut ) rWrt.Strm() << '0'; @@ -2422,15 +2422,15 @@ static Writer& OutRTF_SwCaseMap( Writer& rWrt, const SfxPoolItem& rHt ) switch( ((const SvxCaseMapItem&)rHt).GetValue() ) { case SVX_CASEMAP_KAPITAELCHEN: - rWrt.Strm() << sRTF_SCAPS; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_SCAPS; break; case SVX_CASEMAP_VERSALIEN: - rWrt.Strm() << sRTF_CAPS; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CAPS; break; case SVX_CASEMAP_NOT_MAPPED: - rWrt.Strm() << sRTF_CAPS << '0' << sRTF_SCAPS << '0'; // beide aus !! + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CAPS << '0' << OOO_STRING_SVTOOLS_RTF_SCAPS << '0'; // beide aus !! break; default: @@ -2448,55 +2448,55 @@ static Writer& OutRTF_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) switch( ((const SvxUnderlineItem&)rHt).GetLineStyle() ) { case UNDERLINE_SINGLE: - pStr = sRTF_UL; + pStr = OOO_STRING_SVTOOLS_RTF_UL; break; case UNDERLINE_DOUBLE: - pStr = sRTF_ULDB; + pStr = OOO_STRING_SVTOOLS_RTF_ULDB; break; case UNDERLINE_NONE: - pStr = sRTF_ULNONE; + pStr = OOO_STRING_SVTOOLS_RTF_ULNONE; break; case UNDERLINE_DOTTED: - pStr = sRTF_ULD; + pStr = OOO_STRING_SVTOOLS_RTF_ULD; break; case UNDERLINE_DASH: - pStr = sRTF_ULDASH; + pStr = OOO_STRING_SVTOOLS_RTF_ULDASH; break; case UNDERLINE_DASHDOT: - pStr = sRTF_ULDASHD; + pStr = OOO_STRING_SVTOOLS_RTF_ULDASHD; break; case UNDERLINE_DASHDOTDOT: - pStr = sRTF_ULDASHDD; + pStr = OOO_STRING_SVTOOLS_RTF_ULDASHDD; break; case UNDERLINE_BOLD: - pStr = sRTF_ULTH; + pStr = OOO_STRING_SVTOOLS_RTF_ULTH; break; case UNDERLINE_WAVE: - pStr = sRTF_ULWAVE; + pStr = OOO_STRING_SVTOOLS_RTF_ULWAVE; break; case UNDERLINE_BOLDDOTTED: - pStr = sRTF_ULTHD; + pStr = OOO_STRING_SVTOOLS_RTF_ULTHD; break; case UNDERLINE_BOLDDASH: - pStr = sRTF_ULTHDASH; + pStr = OOO_STRING_SVTOOLS_RTF_ULTHDASH; break; case UNDERLINE_LONGDASH: - pStr = sRTF_ULLDASH; + pStr = OOO_STRING_SVTOOLS_RTF_ULLDASH; break; case UNDERLINE_BOLDLONGDASH: - pStr = sRTF_ULTHLDASH; + pStr = OOO_STRING_SVTOOLS_RTF_ULTHLDASH; break; case UNDERLINE_BOLDDASHDOT: - pStr = sRTF_ULTHDASHD; + pStr = OOO_STRING_SVTOOLS_RTF_ULTHDASHD; break; case UNDERLINE_BOLDDASHDOTDOT: - pStr = sRTF_ULTHDASHDD; + pStr = OOO_STRING_SVTOOLS_RTF_ULTHDASHDD; break; case UNDERLINE_BOLDWAVE: - pStr = sRTF_ULHWAVE; + pStr = OOO_STRING_SVTOOLS_RTF_ULHWAVE; break; case UNDERLINE_DOUBLEWAVE: - pStr = sRTF_ULULDBWAVE; + pStr = OOO_STRING_SVTOOLS_RTF_ULULDBWAVE; break; default: break; @@ -2509,12 +2509,12 @@ static Writer& OutRTF_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt ) if( UNDERLINE_SINGLE == ((const SvxUnderlineItem&)rHt).GetLineStyle() && ((SvxWordLineModeItem&)rRTFWrt.GetItem( RES_CHRATR_WORDLINEMODE )).GetValue() ) - pStr = sRTF_ULW; + pStr = OOO_STRING_SVTOOLS_RTF_ULW; rRTFWrt.Strm() << pStr; rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_ULC; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_ULC; rWrt.OutULong( rRTFWrt.GetId(((const SvxUnderlineItem&)rHt).GetColor()) ); } @@ -2530,55 +2530,55 @@ static Writer& OutRTF_SwOverline( Writer& rWrt, const SfxPoolItem& rHt ) switch( ((const SvxOverlineItem&)rHt).GetLineStyle() ) { case UNDERLINE_SINGLE: - pStr = sRTF_OL; + pStr = OOO_STRING_SVTOOLS_RTF_OL; break; case UNDERLINE_DOUBLE: - pStr = sRTF_OLDB; + pStr = OOO_STRING_SVTOOLS_RTF_OLDB; break; case UNDERLINE_NONE: - pStr = sRTF_OLNONE; + pStr = OOO_STRING_SVTOOLS_RTF_OLNONE; break; case UNDERLINE_DOTTED: - pStr = sRTF_OLD; + pStr = OOO_STRING_SVTOOLS_RTF_OLD; break; case UNDERLINE_DASH: - pStr = sRTF_OLDASH; + pStr = OOO_STRING_SVTOOLS_RTF_OLDASH; break; case UNDERLINE_DASHDOT: - pStr = sRTF_OLDASHD; + pStr = OOO_STRING_SVTOOLS_RTF_OLDASHD; break; case UNDERLINE_DASHDOTDOT: - pStr = sRTF_OLDASHDD; + pStr = OOO_STRING_SVTOOLS_RTF_OLDASHDD; break; case UNDERLINE_BOLD: - pStr = sRTF_OLTH; + pStr = OOO_STRING_SVTOOLS_RTF_OLTH; break; case UNDERLINE_WAVE: - pStr = sRTF_OLWAVE; + pStr = OOO_STRING_SVTOOLS_RTF_OLWAVE; break; case UNDERLINE_BOLDDOTTED: - pStr = sRTF_OLTHD; + pStr = OOO_STRING_SVTOOLS_RTF_OLTHD; break; case UNDERLINE_BOLDDASH: - pStr = sRTF_OLTHDASH; + pStr = OOO_STRING_SVTOOLS_RTF_OLTHDASH; break; case UNDERLINE_LONGDASH: - pStr = sRTF_OLLDASH; + pStr = OOO_STRING_SVTOOLS_RTF_OLLDASH; break; case UNDERLINE_BOLDLONGDASH: - pStr = sRTF_OLTHLDASH; + pStr = OOO_STRING_SVTOOLS_RTF_OLTHLDASH; break; case UNDERLINE_BOLDDASHDOT: - pStr = sRTF_OLTHDASHD; + pStr = OOO_STRING_SVTOOLS_RTF_OLTHDASHD; break; case UNDERLINE_BOLDDASHDOTDOT: - pStr = sRTF_OLTHDASHDD; + pStr = OOO_STRING_SVTOOLS_RTF_OLTHDASHDD; break; case UNDERLINE_BOLDWAVE: - pStr = sRTF_OLHWAVE; + pStr = OOO_STRING_SVTOOLS_RTF_OLHWAVE; break; case UNDERLINE_DOUBLEWAVE: - pStr = sRTF_OLOLDBWAVE; + pStr = OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE; break; default: break; @@ -2592,12 +2592,12 @@ static Writer& OutRTF_SwOverline( Writer& rWrt, const SfxPoolItem& rHt ) if( UNDERLINE_SINGLE == ((const SvxOverlineItem&)rHt).GetLineStyle() && ((SvxWordLineModeItem&)rRTFWrt.GetItem( RES_CHRATR_WORDLINEMODE )).GetValue() ) - pStr = sRTF_OLW; + pStr = OOO_STRING_SVTOOLS_RTF_OLW; rRTFWrt.Strm() << pStr; rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_OLC; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_OLC; rWrt.OutULong( rRTFWrt.GetId(((const SvxOverlineItem&)rHt).GetColor()) ); } @@ -2618,7 +2618,7 @@ static Writer& OutRTF_SwLanguage( Writer& rWrt, const SfxPoolItem& rHt ) rRTFWrt.bOutFmtAttr = TRUE; const sal_Char* p = RES_CHRATR_CJK_LANGUAGE == rHt.Which() - ? sRTF_LANGFE : sRTF_LANG; + ? OOO_STRING_SVTOOLS_RTF_LANGFE : OOO_STRING_SVTOOLS_RTF_LANG; rWrt.Strm() << p; rWrt.OutULong( ((const SvxLanguageItem&)rHt).GetLanguage() ); } @@ -2637,10 +2637,10 @@ static Writer& OutRTF_SwEscapement( Writer& rWrt, const SfxPoolItem& rHt ) RES_CHRATR_FONTSIZE )).GetHeight(); if( 0 < rEsc.GetEsc() ) - pUpDn = sRTF_UP; + pUpDn = OOO_STRING_SVTOOLS_RTF_UP; else if( 0 > rEsc.GetEsc() ) { - pUpDn = sRTF_DN; + pUpDn = OOO_STRING_SVTOOLS_RTF_DN; nH = -nH; // den negativen Wert herrausrechnen } else @@ -2660,7 +2660,7 @@ static Writer& OutRTF_SwEscapement( Writer& rWrt, const SfxPoolItem& rHt ) ++nProp; } - OutComment( rWrt, sRTF_UPDNPROP, TRUE ); + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_UPDNPROP, TRUE ); rWrt.OutULong( nProp ) << '}' << pUpDn; /* @@ -2702,7 +2702,7 @@ static Writer& OutRTF_SwSize( Writer& rWrt, const SfxPoolItem& rHt ) rRTFWrt.bOutFmtAttr = TRUE; - const sal_Char* pCmd = rRTFWrt.IsAssociatedFlag() ? sRTF_AFS : sRTF_FS; + const sal_Char* pCmd = rRTFWrt.IsAssociatedFlag() ? OOO_STRING_SVTOOLS_RTF_AFS : OOO_STRING_SVTOOLS_RTF_FS; rWrt.Strm() << pCmd; rWrt.OutULong( ((const SvxFontHeightItem&)rHt).GetHeight() / 10 ); } @@ -2719,7 +2719,7 @@ static Writer& OutRTF_SwColor( Writer& rWrt, const SfxPoolItem& rHt ) * Tabelle im RTF-Dokument referenziert. */ rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_CF; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CF; rWrt.OutULong( rRTFWrt.GetId( ((const SvxColorItem&)rHt).GetValue() )); return rWrt; } @@ -2728,7 +2728,7 @@ static Writer& OutRTF_SvxCharHiddenItem(Writer& rWrt, const SfxPoolItem& rHt) { SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; rRTFWrt.bOutFmtAttr = true; - rWrt.Strm() << sRTF_V; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_V; if (!((const SvxCharHiddenItem&)rHt).GetValue()) rWrt.OutULong(0); return rWrt; @@ -2745,7 +2745,7 @@ static Writer& OutRTF_SwField( Writer& rWrt, const SfxPoolItem& rHt ) const SwField* pFld = rFld.GetFld(); ByteString aFldStt( '{' ); - ((((aFldStt += sRTF_FIELD) += '{' ) += sRTF_IGNORE) += sRTF_FLDINST) += ' '; + ((((aFldStt += OOO_STRING_SVTOOLS_RTF_FIELD) += '{' ) += OOO_STRING_SVTOOLS_RTF_IGNORE) += OOO_STRING_SVTOOLS_RTF_FLDINST) += ' '; switch( pFld->GetTyp()->Which() ) { case RES_COMBINED_CHARS: @@ -2895,7 +2895,7 @@ static Writer& OutRTF_SwField( Writer& rWrt, const SfxPoolItem& rHt ) rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt ); else { - rWrt.Strm() << '{' << sRTF_V << ' '; + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_V << ' '; OutRTF_AsByteString( rWrt, pFld->GetPar2(), rRTFWrt.eDefaultEncoding ).Strm() << '}' << SwRTFWriter::sNewLine; } @@ -2955,7 +2955,7 @@ static Writer& OutRTF_SwField( Writer& rWrt, const SfxPoolItem& rHt ) if( aFldStt.Len() ) { - rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' '; + rWrt.Strm() << "}{" << OOO_STRING_SVTOOLS_RTF_FLDRSLT << ' '; RTFOutFuncs::Out_String( rWrt.Strm(), pFld->Expand(), rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt ); rWrt.Strm() << "}}"; @@ -2993,21 +2993,21 @@ static Writer& OutRTF_SwFtn( Writer& rWrt, const SfxPoolItem& rHt ) if( nStart >= nEnd ) break; - rWrt.Strm() << '{' << sRTF_SUPER << ' '; + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_SUPER << ' '; if( !rFtn.GetNumStr().Len() ) { - rWrt.Strm() << sRTF_CHFTN; - OutComment( rWrt, sRTF_FOOTNOTE ); + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_CHFTN; + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_FOOTNOTE ); if( rFtn.IsEndNote() ) - rWrt.Strm() << sRTF_FTNALT; - rWrt.Strm() << ' ' << sRTF_CHFTN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FTNALT; + rWrt.Strm() << ' ' << OOO_STRING_SVTOOLS_RTF_CHFTN; } else { OutRTF_AsByteString( rWrt, rFtn.GetNumStr(), rRTFWrt.eDefaultEncoding ); - OutComment( rWrt, sRTF_FOOTNOTE ); + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_FOOTNOTE ); if( rFtn.IsEndNote() ) - rWrt.Strm() << sRTF_FTNALT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FTNALT; rWrt.Strm() << ' '; OutRTF_AsByteString( rWrt, rFtn.GetNumStr(), rRTFWrt.eDefaultEncoding ); } @@ -3116,7 +3116,7 @@ static Writer& OutRTF_SwTxtRuby( Writer& rWrt, const SfxPoolItem& rHt ) ( nHeight += 5 ) /= 10; // don't change " EQ " to any other without changing the code in RTFFLD.CXX - rWrt.Strm() << '{' << sRTF_FIELD << '{' << sRTF_IGNORE << sRTF_FLDINST + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_FIELD << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_FLDINST << " EQ \\\\* jc" << cJC << " \\\\* \"Font:"; RTFOutFuncs::Out_String( rWrt.Strm(), pFont->GetFamilyName(), @@ -3172,7 +3172,7 @@ static Writer& OutRTF_SwFrmSize( Writer& rWrt, const SfxPoolItem& rHt ) if( rSz.GetWidth() ) { - rWrt.Strm() << sRTF_ABSW; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_ABSW; rWrt.OutLong( rSz.GetWidth() ); rRTFWrt.bOutFmtAttr = TRUE; } @@ -3182,16 +3182,16 @@ static Writer& OutRTF_SwFrmSize( Writer& rWrt, const SfxPoolItem& rHt ) long nH = rSz.GetHeight(); if( ATT_FIX_SIZE == rSz.GetHeightSizeType() ) nH = -nH; - rWrt.Strm() << sRTF_ABSH; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_ABSH; rWrt.OutLong( nH ); rRTFWrt.bOutFmtAttr = TRUE; } } else if( rRTFWrt.bOutPageDesc ) { - rWrt.Strm() << sRTF_PGWSXN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PGWSXN; rWrt.OutLong( rSz.GetWidth() ); - rWrt.Strm() << sRTF_PGHSXN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_PGHSXN; rWrt.OutLong( rSz.GetHeight() ); rRTFWrt.bOutFmtAttr = TRUE; } @@ -3208,13 +3208,13 @@ static Writer& OutRTF_SwFmtLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) { if( rLR.GetLeft() ) { - rWrt.Strm() << sRTF_MARGLSXN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_MARGLSXN; rWrt.OutLong( rLR.GetLeft() ); rRTFWrt.bOutFmtAttr = TRUE; } if( rLR.GetRight() ) { - rWrt.Strm() << sRTF_MARGRSXN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_MARGRSXN; rWrt.OutLong( rLR.GetRight() ); rRTFWrt.bOutFmtAttr = TRUE; } @@ -3222,20 +3222,20 @@ static Writer& OutRTF_SwFmtLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) else { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_LI; - rWrt.OutLong( rLR.GetTxtLeft() ) << sRTF_RI; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LI; + rWrt.OutLong( rLR.GetTxtLeft() ) << OOO_STRING_SVTOOLS_RTF_RI; rWrt.OutLong( rLR.GetRight() ); - rWrt.Strm() << sRTF_LIN; - rWrt.OutLong( rLR.GetTxtLeft() ) << sRTF_RIN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LIN; + rWrt.OutLong( rLR.GetTxtLeft() ) << OOO_STRING_SVTOOLS_RTF_RIN; rWrt.OutLong( rLR.GetRight() ); - rWrt.Strm() << sRTF_FI; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FI; rWrt.OutLong( rLR.GetTxtFirstLineOfst() ); } } else if( rLR.GetLeft() == rLR.GetRight() && rRTFWrt.bRTFFlySyntax ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_DFRMTXTX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_DFRMTXTX; rWrt.OutLong( rLR.GetLeft() ); } return rWrt; @@ -3250,7 +3250,7 @@ static Writer& OutRTF_SwFmtULSpace( Writer& rWrt, const SfxPoolItem& rHt ) if( rUL.GetUpper() == rUL.GetLower() && rRTFWrt.bRTFFlySyntax ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_DFRMTXTY; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_DFRMTXTY; rWrt.OutLong( rUL.GetLower() ); } } @@ -3260,7 +3260,7 @@ static Writer& OutRTF_SwFmtULSpace( Writer& rWrt, const SfxPoolItem& rHt ) USHORT nValue = rUL.GetUpper(); if( rRTFWrt.bOutPageDesc ) { - p = sRTF_MARGTSXN; + p = OOO_STRING_SVTOOLS_RTF_MARGTSXN; if( !rRTFWrt.bOutPageDescTbl ) { SwRect aRect; @@ -3285,7 +3285,7 @@ static Writer& OutRTF_SwFmtULSpace( Writer& rWrt, const SfxPoolItem& rHt ) } } else - p = sRTF_SB; + p = OOO_STRING_SVTOOLS_RTF_SB; if( rRTFWrt.bOutPageDesc || nValue ) { @@ -3298,7 +3298,7 @@ static Writer& OutRTF_SwFmtULSpace( Writer& rWrt, const SfxPoolItem& rHt ) nValue = rUL.GetLower(); if( rRTFWrt.bOutPageDesc ) { - p = sRTF_MARGBSXN; + p = OOO_STRING_SVTOOLS_RTF_MARGBSXN; if( !rRTFWrt.bOutPageDescTbl ) { SwRect aRect; @@ -3323,7 +3323,7 @@ static Writer& OutRTF_SwFmtULSpace( Writer& rWrt, const SfxPoolItem& rHt ) } } else - p = sRTF_SA; + p = OOO_STRING_SVTOOLS_RTF_SA; if( rRTFWrt.bOutPageDesc || nValue ) { @@ -3365,7 +3365,7 @@ Writer& OutRTF_SwFmtHeader( Writer& rWrt, const SfxPoolItem& rHt ) break; ASSERT( rRTFWrt.pAktPageDesc, "Header-Attribut ohne PageDesc" ); - const sal_Char * pHdNm = sRTF_HEADER; + const sal_Char * pHdNm = OOO_STRING_SVTOOLS_RTF_HEADER; rWrt.Strm() << pHdNm << 'y'; if( rRTFWrt.bOutPageDescTbl ) { @@ -3393,12 +3393,12 @@ Writer& OutRTF_SwFmtHeader( Writer& rWrt, const SfxPoolItem& rHt ) if( rRTFWrt.pAktPageDesc->GetFollow() && rRTFWrt.pAktPageDesc->GetFollow() != rRTFWrt.pAktPageDesc ) { - rWrt.Strm() << sRTF_TITLEPG; //i13107 + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TITLEPG; //i13107 cTyp = 'f'; // dann FirstPage-Header } else if( !rRTFWrt.pAktPageDesc->IsHeaderShared() ) { - rWrt.Strm() << sRTF_FACINGP; //i13107 + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FACINGP; //i13107 cTyp = rRTFWrt.bOutLeftHeadFoot ? 'l' : 'r'; } @@ -3445,7 +3445,7 @@ Writer& OutRTF_SwFmtFooter( Writer& rWrt, const SfxPoolItem& rHt ) break; ASSERT( rRTFWrt.pAktPageDesc, "Footer-Attribut ohne PageDesc" ); - const sal_Char * pFtNm = sRTF_FOOTER; + const sal_Char * pFtNm = OOO_STRING_SVTOOLS_RTF_FOOTER; rWrt.Strm() << pFtNm << 'y'; if( rRTFWrt.bOutPageDescTbl ) { @@ -3473,12 +3473,12 @@ Writer& OutRTF_SwFmtFooter( Writer& rWrt, const SfxPoolItem& rHt ) if( !rRTFWrt.bOutPageDesc && rRTFWrt.pAktPageDesc->GetFollow() && rRTFWrt.pAktPageDesc->GetFollow() != rRTFWrt.pAktPageDesc ) { - rWrt.Strm() << sRTF_TITLEPG; //i13107 + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TITLEPG; //i13107 cTyp = 'f'; // dann FirstPage-Header } else if( !rRTFWrt.pAktPageDesc->IsFooterShared() ) { - rWrt.Strm() << sRTF_FACINGP; //i13107 + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FACINGP; //i13107 cTyp = rRTFWrt.bOutLeftHeadFoot ? 'l' : 'r'; } @@ -3503,7 +3503,7 @@ static Writer& OutRTF_SwFmtPrint( Writer& rWrt, const SfxPoolItem& rHt ) if( !rRTFWrt.bRTFFlySyntax && !((const SvxPrintItem&)rHt).GetValue() ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_FLYPRINT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYPRINT; } return rWrt; } @@ -3515,7 +3515,7 @@ static Writer& OutRTF_SwFmtOpaque( Writer& rWrt, const SfxPoolItem& rHt ) if( !rRTFWrt.bRTFFlySyntax && !((const SvxOpaqueItem&)rHt).GetValue() ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_FLYOPAQUE; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYOPAQUE; } return rWrt; } @@ -3531,7 +3531,7 @@ static Writer& OutRTF_SwFmtProtect( Writer& rWrt, const SfxPoolItem& rHt ) rFlyProtect.IsSizeProtected(), rFlyProtect.IsPosProtected() ); rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_FLYPRTCTD; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYPRTCTD; rWrt.OutULong( aP.GetValue() ); } return rWrt; @@ -3547,7 +3547,7 @@ static Writer& OutRTF_SwFmtSurround( Writer& rWrt, const SfxPoolItem& rHt ) if( SURROUND_NONE == rFlySurround.GetSurround() ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_NOWRAP; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_NOWRAP; } } else @@ -3557,7 +3557,7 @@ static Writer& OutRTF_SwFmtSurround( Writer& rWrt, const SfxPoolItem& rHt ) if( bGold ) eSurround = SURROUND_PARALLEL; RTFSurround aMC( bGold, static_cast< BYTE >(eSurround) ); - rWrt.Strm() << sRTF_FLYMAINCNT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYMAINCNT; rWrt.OutULong( aMC.GetValue() ); rRTFWrt.bOutFmtAttr = TRUE; } @@ -3579,30 +3579,30 @@ static Writer& OutRTF_SwFmtVertOrient ( Writer& rWrt, const SfxPoolItem& rHt ) if( FLY_PAGE == eAnchor ) { if( text::RelOrientation::PAGE_FRAME == eOrient || text::RelOrientation::FRAME == eOrient ) - pOrient = sRTF_PVPG; + pOrient = OOO_STRING_SVTOOLS_RTF_PVPG; else - pOrient = sRTF_PVMRG; + pOrient = OOO_STRING_SVTOOLS_RTF_PVMRG; } else - pOrient = sRTF_PVPARA; + pOrient = OOO_STRING_SVTOOLS_RTF_PVPARA; rWrt.Strm() << pOrient; switch (rFlyVert.GetVertOrient()) { case text::VertOrientation::TOP: case text::VertOrientation::LINE_TOP: - rWrt.Strm() << sRTF_POSYT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_POSYT; break; case text::VertOrientation::BOTTOM: case text::VertOrientation::LINE_BOTTOM: - rWrt.Strm() << sRTF_POSYB; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_POSYB; break; case text::VertOrientation::CENTER: case text::VertOrientation::LINE_CENTER: - rWrt.Strm() << sRTF_POSYC; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_POSYC; break; case text::VertOrientation::NONE: - rWrt.Strm() << sRTF_POSY; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_POSY; rWrt.OutULong(rFlyVert.GetPos()); break; default: @@ -3612,7 +3612,7 @@ static Writer& OutRTF_SwFmtVertOrient ( Writer& rWrt, const SfxPoolItem& rHt ) else if( !rRTFWrt.bRTFFlySyntax ) { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_FLYVERT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYVERT; rWrt.OutULong( aVO.GetValue() ); } @@ -3635,28 +3635,28 @@ static Writer& OutRTF_SwFmtHoriOrient( Writer& rWrt, const SfxPoolItem& rHt ) if( FLY_PAGE == eAnchor ) { if( text::RelOrientation::PAGE_FRAME == eOrient || text::RelOrientation::FRAME == eOrient ) - pS = sRTF_PHPG; + pS = OOO_STRING_SVTOOLS_RTF_PHPG; else - pS = sRTF_PHMRG; + pS = OOO_STRING_SVTOOLS_RTF_PHMRG; } else - pS = sRTF_PHCOL; + pS = OOO_STRING_SVTOOLS_RTF_PHCOL; rWrt.Strm() << pS; pS = 0; switch(rFlyHori.GetHoriOrient()) { case text::HoriOrientation::RIGHT: - pS = rFlyHori.IsPosToggle() ? sRTF_POSXO : sRTF_POSXR; + pS = rFlyHori.IsPosToggle() ? OOO_STRING_SVTOOLS_RTF_POSXO : OOO_STRING_SVTOOLS_RTF_POSXR; break; case text::HoriOrientation::LEFT: - pS = rFlyHori.IsPosToggle() ? sRTF_POSXI : sRTF_POSXL; + pS = rFlyHori.IsPosToggle() ? OOO_STRING_SVTOOLS_RTF_POSXI : OOO_STRING_SVTOOLS_RTF_POSXL; break; case text::HoriOrientation::CENTER: - pS = sRTF_POSXC; + pS = OOO_STRING_SVTOOLS_RTF_POSXC; break; case text::HoriOrientation::NONE: - rWrt.Strm() << sRTF_POSX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_POSX; rWrt.OutULong( rFlyHori.GetPos() ); break; default: @@ -3668,7 +3668,7 @@ static Writer& OutRTF_SwFmtHoriOrient( Writer& rWrt, const SfxPoolItem& rHt ) else { rRTFWrt.bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_FLYHORZ; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYHORZ; rWrt.OutULong( aHO.GetValue() ); } return rWrt; @@ -3681,18 +3681,18 @@ static Writer& OutRTF_SwFmtAnchor( Writer& rWrt, const SfxPoolItem& rHt ) { const SwFmtAnchor& rAnchor = (const SwFmtAnchor&) rHt; USHORT nId = static_cast< USHORT >(rAnchor.GetAnchorId()); - rWrt.Strm() << sRTF_FLYANCHOR; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYANCHOR; rWrt.OutULong( nId ); rRTFWrt.bOutFmtAttr = TRUE; switch( nId ) { case FLY_PAGE: - rWrt.Strm() << sRTF_FLYPAGE; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYPAGE; rWrt.OutULong( rAnchor.GetPageNum() ); break; case FLY_AT_CNTNT: case FLY_IN_CNTNT: - rWrt.Strm() << sRTF_FLYCNTNT; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FLYCNTNT; break; } } @@ -3711,7 +3711,7 @@ static Writer& OutRTF_SwFmtBackground( Writer& rWrt, const SfxPoolItem& rHt ) const SvxBrushItem& rBack = (const SvxBrushItem&)rHt; if( !rBack.GetColor().GetTransparency() ) { - ByteString sOut( sRTF_CBPAT ); + ByteString sOut( OOO_STRING_SVTOOLS_RTF_CBPAT ); sOut += ByteString::CreateFromInt32( rRTFWrt.GetId( rBack.GetColor() )); @@ -3740,12 +3740,12 @@ static Writer& OutRTF_SwFmtShadow( Writer& rWrt, const SfxPoolItem& rHt ) const SvxShadowItem& rShadow = (const SvxShadowItem&)rHt; // FALSE wegen schliessender Klammer !! - OutComment( rWrt, sRTF_SHADOW, FALSE ); - rWrt.OutULong( rShadow.GetLocation() ) << sRTF_SHDWDIST; - rWrt.OutULong( rShadow.GetWidth() ) << sRTF_SHDWSTYLE; + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_SHADOW, FALSE ); + rWrt.OutULong( rShadow.GetLocation() ) << OOO_STRING_SVTOOLS_RTF_SHDWDIST; + rWrt.OutULong( rShadow.GetWidth() ) << OOO_STRING_SVTOOLS_RTF_SHDWSTYLE; const Color& rColor = rShadow.GetColor(); rWrt.OutULong( rColor.GetTransparency() ? SW_SV_BRUSH_NULL : SW_SV_BRUSH_SOLID ); - rWrt.OutULong( rRTFWrt.GetId( rColor ) ) << sRTF_SHDWFCOL; + rWrt.OutULong( rRTFWrt.GetId( rColor ) ) << OOO_STRING_SVTOOLS_RTF_SHDWFCOL; rWrt.OutULong( 0 ) << '}'; return rWrt; } @@ -3754,10 +3754,10 @@ static Writer& OutRTF_SwFmtShadow( Writer& rWrt, const SfxPoolItem& rHt ) static void OutBorderLine( SwRTFWriter& rWrt, const SvxBorderLine* pLine, const char* pStr ) { - rWrt.Strm() << pStr << sRTF_BRDLNCOL; - rWrt.OutULong( rWrt.GetId( pLine->GetColor() ) ) << sRTF_BRDLNIN; - rWrt.OutULong( pLine->GetInWidth() ) << sRTF_BRDLNOUT; - rWrt.OutULong( pLine->GetOutWidth() ) << sRTF_BRDLNDIST; + rWrt.Strm() << pStr << OOO_STRING_SVTOOLS_RTF_BRDLNCOL; + rWrt.OutULong( rWrt.GetId( pLine->GetColor() ) ) << OOO_STRING_SVTOOLS_RTF_BRDLNIN; + rWrt.OutULong( pLine->GetInWidth() ) << OOO_STRING_SVTOOLS_RTF_BRDLNOUT; + rWrt.OutULong( pLine->GetOutWidth() ) << OOO_STRING_SVTOOLS_RTF_BRDLNDIST; rWrt.OutULong( pLine->GetDistance() ); } @@ -3775,7 +3775,7 @@ static Writer& OutRTF_SwFmtBox( Writer& rWrt, const SfxPoolItem& rHt ) #else static const sal_Char* __READONLY_DATA aBorderNames[] = { #endif - sRTF_BRDRT, sRTF_BRDRL, sRTF_BRDRB, sRTF_BRDRR }; + OOO_STRING_SVTOOLS_RTF_BRDRT, OOO_STRING_SVTOOLS_RTF_BRDRL, OOO_STRING_SVTOOLS_RTF_BRDRB, OOO_STRING_SVTOOLS_RTF_BRDRR }; USHORT nDist = rBox.GetDistance(); @@ -3791,13 +3791,13 @@ RTF kennt keine Rahmen Umrandung! *rBox.GetTop() == *rBox.GetBottom() && *rBox.GetTop() == *rBox.GetLeft() && *rBox.GetTop() == *rBox.GetRight() ) - OutBorderLine( rRTFWrt, rBox.GetTop(), sRTF_BOX, nDist ); + OutBorderLine( rRTFWrt, rBox.GetTop(), OOO_STRING_SVTOOLS_RTF_BOX, nDist ); else { - OUT_BRDLINE( rBox.GetTop(), sRTF_BRDRT, nDist ); - OUT_BRDLINE( rBox.GetBottom(), sRTF_BRDRB, nDist ); - OUT_BRDLINE( rBox.GetLeft(), sRTF_BRDRL, nDist ); - OUT_BRDLINE( rBox.GetRight(), sRTF_BRDRR, nDist ); + OUT_BRDLINE( rBox.GetTop(), OOO_STRING_SVTOOLS_RTF_BRDRT, nDist ); + OUT_BRDLINE( rBox.GetBottom(), OOO_STRING_SVTOOLS_RTF_BRDRB, nDist ); + OUT_BRDLINE( rBox.GetLeft(), OOO_STRING_SVTOOLS_RTF_BRDRL, nDist ); + OUT_BRDLINE( rBox.GetRight(), OOO_STRING_SVTOOLS_RTF_BRDRR, nDist ); } */ return rWrt; @@ -3814,7 +3814,7 @@ RTF kennt keine Rahmen Umrandung! nDist == rBox.GetDistance( BOX_LINE_LEFT ) && nDist == rBox.GetDistance( BOX_LINE_BOTTOM ) && nDist == rBox.GetDistance( BOX_LINE_RIGHT )) - OutBorderLine( rRTFWrt, rBox.GetTop(), sRTF_BOX, nDist ); + OutBorderLine( rRTFWrt, rBox.GetTop(), OOO_STRING_SVTOOLS_RTF_BOX, nDist ); else { const USHORT* pBrd = aBorders; @@ -3837,9 +3837,9 @@ RTF kennt keine Rahmen Umrandung! const SvxBorderLine* pLn = rBox.GetLine( *pBrd ); if( pLn ) { - rWrt.Strm() << '{' << sRTF_IGNORE; + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE; OutBorderLine( rRTFWrt, pLn, *pBrdNms ); - rWrt.Strm() << '}' << sRTF_BRSP; + rWrt.Strm() << '}' << OOO_STRING_SVTOOLS_RTF_BRSP; rWrt.OutULong( rBox.GetDistance( *pBrd )); } } @@ -3876,25 +3876,25 @@ static Writer& OutRTF_SwFmtCol( Writer& rWrt, const SfxPoolItem& rHt ) USHORT nPageSize = static_cast< USHORT >( pFmt->GetFrmSize().GetWidth() - rLR.GetLeft() - rLR.GetRight() ); - rWrt.Strm() << sRTF_COLS; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLS; rWrt.OutLong( nCols ); if( rCol.IsOrtho() ) { - rWrt.Strm() << sRTF_COLSX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLSX; rWrt.OutLong( rCol.GetGutterWidth( TRUE ) ); } else for( USHORT n = 0; n < nCols; ) { - rWrt.Strm() << sRTF_COLNO; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLNO; rWrt.OutLong( n+1 ); - rWrt.Strm() << sRTF_COLW; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLW; rWrt.OutLong( rCol.CalcPrtColWidth( n, nPageSize ) ); if( ++n != nCols ) { - rWrt.Strm() << sRTF_COLSR; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_COLSR; rWrt.OutLong( rColumns[ n-1 ]->GetRight() + rColumns[ n ]->GetLeft() ); } @@ -3909,7 +3909,7 @@ static Writer& OutRTF_SvxFmtKeep( Writer& rWrt, const SfxPoolItem& rHt ) const SvxFmtKeepItem& rItem = (const SvxFmtKeepItem&)rHt; if( rItem.GetValue() ) { - rWrt.Strm() << sRTF_KEEPN; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_KEEPN; ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; } return rWrt; @@ -3932,7 +3932,7 @@ static Writer& OutRTF_SwMirrorGrf( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_IGNORE << sRTF_GRFMIRROR; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_GRFMIRROR; rWrt.OutULong( rMirror.GetValue() ); return rWrt; } @@ -3942,16 +3942,16 @@ static Writer& OutRTF_SwCropGrf( Writer& rWrt, const SfxPoolItem& rHt ) const SwCropGrf & rCrop = (const SwCropGrf&)rHt; ByteString aStr; if( rCrop.GetLeft() ) - ( aStr += sRTF_PICCROPL ) += + ( aStr += OOO_STRING_SVTOOLS_RTF_PICCROPL ) += ByteString::CreateFromInt32( (short)rCrop.GetLeft() ); if( rCrop.GetRight() ) - ( aStr += sRTF_PICCROPR ) += + ( aStr += OOO_STRING_SVTOOLS_RTF_PICCROPR ) += ByteString::CreateFromInt32( (short)rCrop.GetRight() ); if( rCrop.GetTop() ) - ( aStr += sRTF_PICCROPT ) += + ( aStr += OOO_STRING_SVTOOLS_RTF_PICCROPT ) += ByteString::CreateFromInt32( (short)rCrop.GetTop() ); if( rCrop.GetBottom() ) - ( aStr += sRTF_PICCROPB ) += + ( aStr += OOO_STRING_SVTOOLS_RTF_PICCROPB ) += ByteString::CreateFromInt32( (short)rCrop.GetBottom() ); if( aStr.Len() ) { @@ -3978,7 +3978,7 @@ static Writer& OutRTF_SwLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) case SVX_LINE_SPACE_MIN: { ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; - rWrt.Strm() << sRTF_SL; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_SL; sal_Char cMult = '0'; switch (rLs.GetInterLineSpaceRule()) { @@ -3997,7 +3997,7 @@ static Writer& OutRTF_SwLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) rWrt.OutLong( rLs.GetLineHeight() ); break; } - rWrt.Strm() << sRTF_SLMULT << cMult; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_SLMULT << cMult; } break; } @@ -4029,7 +4029,7 @@ static Writer& OutRTF_SvxFmtSplit( Writer& rWrt, const SfxPoolItem& rHt ) const SvxFmtSplitItem& rItem = (const SvxFmtSplitItem&)rHt; if( !rItem.GetValue() ) { - rWrt.Strm() << sRTF_KEEP; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_KEEP; ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; } return rWrt; @@ -4052,14 +4052,14 @@ static Writer& OutRTF_SwTabStop( Writer& rWrt, const SfxPoolItem& rHt ) case cDfltFillChar: break; - case '.': pFill = sRTF_TLDOT; break; - case '_': pFill = sRTF_TLUL; break; - case '-': pFill = sRTF_TLTH; break; - case '=': pFill = sRTF_TLEQ; break; + case '.': pFill = OOO_STRING_SVTOOLS_RTF_TLDOT; break; + case '_': pFill = OOO_STRING_SVTOOLS_RTF_TLUL; break; + case '-': pFill = OOO_STRING_SVTOOLS_RTF_TLTH; break; + case '=': pFill = OOO_STRING_SVTOOLS_RTF_TLEQ; break; default: if( !rRTFWrt.bWriteHelpFmt ) { - OutComment( rWrt, sRTF_TLSWG, FALSE ); + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_TLSWG, FALSE ); rWrt.OutULong( (((USHORT)rTS.GetFill()) << 8 ) + rTS.GetDecimal() ) << '}'; @@ -4073,7 +4073,7 @@ static Writer& OutRTF_SwTabStop( Writer& rWrt, const SfxPoolItem& rHt ) rTS.GetDecimal() != ((SvxTabStopItem&)*GetDfltAttr( RES_PARATR_TABSTOP ))[ 0 ].GetDecimal() ) { - OutComment( rWrt, sRTF_TLSWG, FALSE ); + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_TLSWG, FALSE ); rWrt.OutULong( (((USHORT)rTS.GetFill()) << 8 ) + rTS.GetDecimal() ) << '}'; } @@ -4082,20 +4082,20 @@ static Writer& OutRTF_SwTabStop( Writer& rWrt, const SfxPoolItem& rHt ) switch (rTS.GetAdjustment()) { case SVX_TAB_ADJUST_RIGHT: - pAdjStr = sRTF_TQR; + pAdjStr = OOO_STRING_SVTOOLS_RTF_TQR; break; case SVX_TAB_ADJUST_DECIMAL: - pAdjStr = sRTF_TQDEC; + pAdjStr = OOO_STRING_SVTOOLS_RTF_TQDEC; break; case SVX_TAB_ADJUST_CENTER: - pAdjStr = sRTF_TQC; + pAdjStr = OOO_STRING_SVTOOLS_RTF_TQC; break; default: break; } if (pAdjStr) rWrt.Strm() << pAdjStr; - rWrt.Strm() << sRTF_TX; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_TX; rWrt.OutLong(rTS.GetTabPos() + nOffset); } } @@ -4111,10 +4111,10 @@ static Writer& OutRTF_SwHypenZone( Writer& rWrt, const SfxPoolItem& rHt ) USHORT nFlags = rAttr.IsHyphen() ? 1 : 0; if( rAttr.IsPageEnd() ) nFlags += 2; - OutComment( rWrt, sRTF_HYPHEN, FALSE ); - rWrt.OutULong( nFlags ) << sRTF_HYPHLEAD; - rWrt.OutULong( rAttr.GetMinLead() ) << sRTF_HYPHTRAIL; - rWrt.OutULong( rAttr.GetMinTrail() ) << sRTF_HYPHMAX; + OutComment( rWrt, OOO_STRING_SVTOOLS_RTF_HYPHEN, FALSE ); + rWrt.OutULong( nFlags ) << OOO_STRING_SVTOOLS_RTF_HYPHLEAD; + rWrt.OutULong( rAttr.GetMinLead() ) << OOO_STRING_SVTOOLS_RTF_HYPHTRAIL; + rWrt.OutULong( rAttr.GetMinTrail() ) << OOO_STRING_SVTOOLS_RTF_HYPHMAX; rWrt.OutULong( rAttr.GetMaxHyphens() ) << '}'; } return rWrt; @@ -4130,7 +4130,7 @@ static Writer& OutRTF_SwNumRule( Writer& rWrt, const SfxPoolItem& rHt ) if( rAttr.GetValue().Len() && USHRT_MAX != (nId = rRTFWrt.GetId( rAttr ) )) { - rWrt.Strm() << sRTF_LS; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_LS; rWrt.OutULong( nId ); rRTFWrt.bOutFmtAttr = TRUE; } @@ -4142,7 +4142,7 @@ static Writer& OutRTF_SwScriptSpace( Writer& rWrt, const SfxPoolItem& rHt ) { if( ((const SvxScriptSpaceItem&)rHt).GetValue() ) { - rWrt.Strm() << sRTF_ASPALPHA; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_ASPALPHA; ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; } return rWrt; @@ -4151,7 +4151,7 @@ static Writer& OutRTF_SwHangPunctuation( Writer& rWrt, const SfxPoolItem& rHt ) { if( !((const SvxHangingPunctuationItem&)rHt).GetValue() ) { - rWrt.Strm() << sRTF_NOOVERFLOW; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_NOOVERFLOW; ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; } return rWrt; @@ -4160,7 +4160,7 @@ static Writer& OutRTF_SwForbiddenRule( Writer& rWrt, const SfxPoolItem& rHt ) { if( !((const SvxForbiddenRuleItem&)rHt).GetValue() ) { - rWrt.Strm() << sRTF_NOCWRAP; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_NOCWRAP; ((SwRTFWriter&)rWrt).bOutFmtAttr = TRUE; } return rWrt; @@ -4173,13 +4173,13 @@ static Writer& OutRTF_SwFontAlign( Writer& rWrt, const SfxPoolItem& rHt ) const char* pStr; switch ( rAttr.GetValue() ) { - case SvxParaVertAlignItem::TOP: pStr = sRTF_FAHANG; break; - case SvxParaVertAlignItem::BOTTOM: pStr = sRTF_FAVAR; break; - case SvxParaVertAlignItem::CENTER: pStr = sRTF_FACENTER; break; - case SvxParaVertAlignItem::BASELINE: pStr = sRTF_FAROMAN; break; + case SvxParaVertAlignItem::TOP: pStr = OOO_STRING_SVTOOLS_RTF_FAHANG; break; + case SvxParaVertAlignItem::BOTTOM: pStr = OOO_STRING_SVTOOLS_RTF_FAVAR; break; + case SvxParaVertAlignItem::CENTER: pStr = OOO_STRING_SVTOOLS_RTF_FACENTER; break; + case SvxParaVertAlignItem::BASELINE: pStr = OOO_STRING_SVTOOLS_RTF_FAROMAN; break; // case SvxParaVertAlignItem::AUTOMATIC: - default: pStr = sRTF_FAAUTO; break; + default: pStr = OOO_STRING_SVTOOLS_RTF_FAAUTO; break; } rWrt.Strm() << pStr; rRTFWrt.bOutFmtAttr = TRUE; diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index 7259c4048584..2cab705fa8e0 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -1153,14 +1153,14 @@ void SwRTFWriter::OutRTFListTab() // mit der ersten Rule wird auch die ListTable geschrieben if( !sOverrideList.Len() ) - OutComment( *this, sRTF_LISTTABLE ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_LISTTABLE ); - Strm() << '{' << sRTF_LIST << sRTF_LISTTEMPLATEID; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LIST << OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID; OutULong( nTmplId ); ByteString sTmp; if( pRule->IsContinusNum() ) - Strm() << sRTF_LISTSIMPLE; + Strm() << OOO_STRING_SVTOOLS_RTF_LISTSIMPLE; BYTE nLvl, nEnd; lcl_IsExportNumRule( *pRule, &nEnd ); @@ -1170,9 +1170,9 @@ void SwRTFWriter::OutRTFListTab() const SwNumFmt& rFmt = pRule->Get( nLvl ); Strm() << sNewLine; if( nLvl > 8 ) // RTF-kennt nur 9 Ebenen - OutComment( *this, sRTF_SOUTLVL ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_SOUTLVL ); - Strm() << '{' << sRTF_LISTLEVEL << sRTF_LEVELNFC; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTLEVEL << OOO_STRING_SVTOOLS_RTF_LEVELNFC; USHORT nVal = 0; switch( rFmt.GetNumberingType() ) @@ -1187,7 +1187,7 @@ void SwRTFWriter::OutRTFListTab() case SVX_NUM_BITMAP: case SVX_NUM_CHAR_SPECIAL: nVal = 23; break; } - OutLong( nVal ) << sRTF_LEVELJC; + OutLong( nVal ) << OOO_STRING_SVTOOLS_RTF_LEVELJC; switch( rFmt.GetNumAdjust() ) { @@ -1195,9 +1195,9 @@ void SwRTFWriter::OutRTFListTab() case SVX_ADJUST_RIGHT: nVal = 2; break; default: nVal = 0; break; } - OutLong( nVal ) << sRTF_LEVELSTARTAT; + OutLong( nVal ) << OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT; OutLong( rFmt.GetStart() ) - << sRTF_LEVELFOLLOW << "0{" << sRTF_LEVELTEXT << ' '; + << OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW << "0{" << OOO_STRING_SVTOOLS_RTF_LEVELTEXT << ' '; BOOL bWriteBulletFont = FALSE; memset( aNumLvlPos, 0, MAXLEVEL ); @@ -1268,7 +1268,7 @@ void SwRTFWriter::OutRTFListTab() } // write the levelnumbers - Strm() << ";}{" << sRTF_LEVELNUMBERS; + Strm() << ";}{" << OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS; for( BYTE i = 0; i <= nLvl && aNumLvlPos[ i ]; ++i ) { Strm() << "\\'"; OutHex( aNumLvlPos[ i ] ); @@ -1281,7 +1281,7 @@ void SwRTFWriter::OutRTFListTab() if( bWriteBulletFont ) { - Strm() << sRTF_F; + Strm() << OOO_STRING_SVTOOLS_RTF_F; const Font* pFont = rFmt.GetBulletFont(); if( !pFont ) // --> OD 2006-06-27 #b6440955# @@ -1290,8 +1290,8 @@ void SwRTFWriter::OutRTFListTab() OutULong( GetId( *pFont )); } - Strm() << sRTF_FI; - OutLong( rFmt.GetFirstLineOffset() ) << sRTF_LI; + Strm() << OOO_STRING_SVTOOLS_RTF_FI; + OutLong( rFmt.GetFirstLineOffset() ) << OOO_STRING_SVTOOLS_RTF_LI; OutLong( rFmt.GetAbsLSpace() ); Strm() << '}'; @@ -1302,25 +1302,25 @@ void SwRTFWriter::OutRTFListTab() if( !pRule->IsAutoRule() ) { - Strm() << '{' << sRTF_LISTNAME << ' '; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTNAME << ' '; RTFOutFuncs::Out_String( Strm(), pRule->GetName(), eDefaultEncoding, bWriteHelpFmt ) << ";}" ; } - Strm() << sRTF_LISTID; + Strm() << OOO_STRING_SVTOOLS_RTF_LISTID; OutULong( nId ) << '}' << sNewLine; sTmp = '{'; - ((((((( sTmp += sRTF_LISTOVERRIDE ) += - sRTF_LISTID ) += ByteString::CreateFromInt32( nId )) += - sRTF_LISTOVERRIDECOUNT ) += '0' ) += - sRTF_LS ) += ByteString::CreateFromInt32( n )) += '}'; + ((((((( sTmp += OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE ) += + OOO_STRING_SVTOOLS_RTF_LISTID ) += ByteString::CreateFromInt32( nId )) += + OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT ) += '0' ) += + OOO_STRING_SVTOOLS_RTF_LS ) += ByteString::CreateFromInt32( n )) += '}'; sOverrideList += sTmp; ++nId, ++nTmplId; } if( sOverrideList.Len() ) - Strm() << "}{" << sRTF_LISTOVERRIDETABLE + Strm() << "}{" << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE << sOverrideList.GetBuffer() << '}' << sNewLine; } @@ -1408,7 +1408,7 @@ BOOL SwRTFWriter::OutListNum( const SwTxtNode& rNd ) aLR.SetTxtFirstLineOfst( pFmt->GetFirstLineOffset() ); if ( bExportNumRule ) - Strm() << '{' << sRTF_LISTTEXT << sRTF_PARD << sRTF_PLAIN << ' '; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTTEXT << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << ' '; aSet.Put( aLR ); Out_SfxItemSet( aRTFAttrFnTab, *this, aSet, TRUE ); @@ -1440,11 +1440,11 @@ BOOL SwRTFWriter::OutListNum( const SwTxtNode& rNd ) { if( OUTLINE_RULE != pRule->GetRuleType() ) { - Strm() << sRTF_TAB << '}' << sRTF_ILVL; + Strm() << OOO_STRING_SVTOOLS_RTF_TAB << '}' << OOO_STRING_SVTOOLS_RTF_ILVL; if( nLvl > 8 ) // RTF-kennt nur 9 Ebenen { OutULong( 8 ); - OutComment( *this, sRTF_SOUTLVL ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_SOUTLVL ); OutULong( nLvl ) << '}'; } else @@ -1452,10 +1452,10 @@ BOOL SwRTFWriter::OutListNum( const SwTxtNode& rNd ) Strm() << ' '; } else - Strm() << sRTF_TAB << '}'; + Strm() << OOO_STRING_SVTOOLS_RTF_TAB << '}'; } else if( sTxt.Len() ) - Strm() << sRTF_TAB; + Strm() << OOO_STRING_SVTOOLS_RTF_TAB; } bOutListNumTxt = FALSE; } diff --git a/sw/source/filter/rtf/wrtrtf.cxx b/sw/source/filter/rtf/wrtrtf.cxx index 08c9f874e140..c10528f112ee 100644 --- a/sw/source/filter/rtf/wrtrtf.cxx +++ b/sw/source/filter/rtf/wrtrtf.cxx @@ -351,11 +351,11 @@ void SwRTFWriter::Out_SwDoc( SwPaM* pPam ) void SwRTFWriter::MakeHeader() { // baue den Vorspann wie Header, ColorTbl, FontTbl - Strm() << '{' << sRTF_RTF << '1' - << sRTF_ANSI; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_RTF << '1' + << OOO_STRING_SVTOOLS_RTF_ANSI; if( bWriteAll ) { - Strm() << sRTF_DEFF; + Strm() << OOO_STRING_SVTOOLS_RTF_DEFF; OutULong( GetId( (SvxFontItem&)pDoc->GetAttrPool().GetDefaultItem( RES_CHRATR_FONT ) )); } @@ -382,10 +382,10 @@ void SwRTFWriter::MakeHeader() { // Default-TabSize const SvxTabStopItem& rTabs = (const SvxTabStopItem&) pDoc->GetAttrPool().GetDefaultItem( RES_PARATR_TABSTOP ); - Strm() << sRTF_DEFTAB; + Strm() << OOO_STRING_SVTOOLS_RTF_DEFTAB; OutLong( rTabs[0].GetTabPos() ); if ( !pDoc->get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) ) - Strm() << sRTF_LYTPRTMET; + Strm() << OOO_STRING_SVTOOLS_RTF_LYTPRTMET; } // PageDescriptor ausgeben (??nur wenn das gesamte Dokument??) @@ -421,7 +421,7 @@ void SwRTFWriter::MakeHeader() GetPageDesc()->GetName(), &nPosInDoc )) { // FALSE wegen schliessender Klammer !! - OutComment( *this, sRTF_PGDSCNO, FALSE ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_PGDSCNO, FALSE ); OutULong( nPosInDoc ) << '}'; } } @@ -432,40 +432,40 @@ void SwRTFWriter::MakeHeader() { if( rPageDesc.GetLandscape() ) - Strm() << sRTF_LANDSCAPE; + Strm() << OOO_STRING_SVTOOLS_RTF_LANDSCAPE; const SwFmtFrmSize& rSz = rFmtPage.GetFrmSize(); // Clipboard-Dokument wird immer ohne Drucker angelegt, so ist // der Std.PageDesc immer aug LONG_MAX !! Mappe dann auf DIN A4 if( LONG_MAX == rSz.GetHeight() || LONG_MAX == rSz.GetWidth() ) { - Strm() << sRTF_PAPERH; - OutULong( lA4Height ) << sRTF_PAPERW; + Strm() << OOO_STRING_SVTOOLS_RTF_PAPERH; + OutULong( lA4Height ) << OOO_STRING_SVTOOLS_RTF_PAPERW; OutULong( lA4Width ); } else { - Strm() << sRTF_PAPERH; - OutULong( rSz.GetHeight() ) << sRTF_PAPERW; + Strm() << OOO_STRING_SVTOOLS_RTF_PAPERH; + OutULong( rSz.GetHeight() ) << OOO_STRING_SVTOOLS_RTF_PAPERW; OutULong( rSz.GetWidth() ); } } { const SvxLRSpaceItem& rLR = rFmtPage.GetLRSpace(); - Strm() << sRTF_MARGL; - OutLong( rLR.GetLeft() ) << sRTF_MARGR; + Strm() << OOO_STRING_SVTOOLS_RTF_MARGL; + OutLong( rLR.GetLeft() ) << OOO_STRING_SVTOOLS_RTF_MARGR; OutLong( rLR.GetRight() ); } { const SvxULSpaceItem& rUL = rFmtPage.GetULSpace(); - Strm() << sRTF_MARGT; - OutLong( rUL.GetUpper() ) << sRTF_MARGB; + Strm() << OOO_STRING_SVTOOLS_RTF_MARGT; + OutLong( rUL.GetUpper() ) << OOO_STRING_SVTOOLS_RTF_MARGB; OutLong( rUL.GetLower() ); } - Strm() << sRTF_SECTD << sRTF_SBKNONE; + Strm() << OOO_STRING_SVTOOLS_RTF_SECTD << OOO_STRING_SVTOOLS_RTF_SBKNONE; OutRTFPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers // following title page are correctly added - i13107 if( pSttPgDsc ) @@ -481,52 +481,52 @@ void SwRTFWriter::MakeHeader() const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo(); const char* pOut = FTNPOS_CHAPTER == rFtnInfo.ePos - ? sRTF_ENDDOC - : sRTF_FTNBJ; - Strm() << pOut << sRTF_FTNSTART; + ? OOO_STRING_SVTOOLS_RTF_ENDDOC + : OOO_STRING_SVTOOLS_RTF_FTNBJ; + Strm() << pOut << OOO_STRING_SVTOOLS_RTF_FTNSTART; OutLong( rFtnInfo.nFtnOffset + 1 ); switch( rFtnInfo.eNum ) { - case FTNNUM_PAGE: pOut = sRTF_FTNRSTPG; break; - case FTNNUM_DOC: pOut = sRTF_FTNRSTCONT; break; + case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break; + case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break; // case FTNNUM_CHAPTER: - default: pOut = sRTF_FTNRESTART; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break; } Strm() << pOut; switch( rFtnInfo.aFmt.GetNumberingType() ) { case SVX_NUM_CHARS_LOWER_LETTER: - case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = sRTF_FTNNALC; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break; case SVX_NUM_CHARS_UPPER_LETTER: - case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = sRTF_FTNNAUC; break; - case SVX_NUM_ROMAN_LOWER: pOut = sRTF_FTNNRLC; break; - case SVX_NUM_ROMAN_UPPER: pOut = sRTF_FTNNRUC; break; - case SVX_NUM_CHAR_SPECIAL: pOut = sRTF_FTNNCHI; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break; + case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break; + case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break; + case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break; // case SVX_NUM_ARABIC: - default: pOut = sRTF_FTNNAR; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break; } Strm() << pOut; const SwEndNoteInfo& rEndNoteInfo = pDoc->GetEndNoteInfo(); - Strm() << sRTF_AENDDOC << sRTF_AFTNRSTCONT - << sRTF_AFTNSTART; + Strm() << OOO_STRING_SVTOOLS_RTF_AENDDOC << OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT + << OOO_STRING_SVTOOLS_RTF_AFTNSTART; OutLong( rEndNoteInfo.nFtnOffset + 1 ); switch( rEndNoteInfo.aFmt.GetNumberingType() ) { case SVX_NUM_CHARS_LOWER_LETTER: - case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = sRTF_AFTNNALC; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break; case SVX_NUM_CHARS_UPPER_LETTER: - case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = sRTF_AFTNNAUC; break; - case SVX_NUM_ROMAN_LOWER: pOut = sRTF_AFTNNRLC; break; - case SVX_NUM_ROMAN_UPPER: pOut = sRTF_AFTNNRUC; break; - case SVX_NUM_CHAR_SPECIAL: pOut = sRTF_AFTNNCHI; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break; + case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break; + case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break; + case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break; // case SVX_NUM_ARABIC: - default: pOut = sRTF_AFTNNAR; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break; } Strm() << pOut; } @@ -539,15 +539,15 @@ void SwRTFWriter::MakeHeader() if( RES_DBFLD == (*pTypes)[ --nCnt ]->Which() && (*pTypes)[ nCnt ]->GetDepends() ) { - Strm() << '{' << sRTF_FIELD; - OutComment( *this, sRTF_FLDINST ) << " DATA "; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_FIELD; + OutComment( *this, OOO_STRING_SVTOOLS_RTF_FLDINST ) << " DATA "; SwDBData aData = pDoc->GetDBData(); String sOut(aData.sDataSource); sOut += DB_DELIM; sOut += (String)aData.sCommand; RTFOutFuncs::Out_String( Strm(), sOut, eDefaultEncoding, bWriteHelpFmt ); - Strm() << "}{" << sRTF_FLDRSLT << " }}"; + Strm() << "}{" << OOO_STRING_SVTOOLS_RTF_FLDRSLT << " }}"; break; } } @@ -560,11 +560,11 @@ void SwRTFWriter::MakeHeader() void SwRTFWriter::OutInfoDateTime( const sal_Char* i_pStr, const util::DateTime& i_rDT ) { - Strm() << '{' << i_pStr << sRTF_YR; - OutLong( Strm(), i_rDT.Year ) << sRTF_MO; - OutLong( Strm(), i_rDT.Month ) << sRTF_DY; - OutLong( Strm(), i_rDT.Day ) << sRTF_HR; - OutLong( Strm(), i_rDT.Hours ) << sRTF_MIN; + Strm() << '{' << i_pStr << OOO_STRING_SVTOOLS_RTF_YR; + OutLong( Strm(), i_rDT.Year ) << OOO_STRING_SVTOOLS_RTF_MO; + OutLong( Strm(), i_rDT.Month ) << OOO_STRING_SVTOOLS_RTF_DY; + OutLong( Strm(), i_rDT.Day ) << OOO_STRING_SVTOOLS_RTF_HR; + OutLong( Strm(), i_rDT.Hours ) << OOO_STRING_SVTOOLS_RTF_MIN; OutLong( Strm(), i_rDT.Minutes ) << '}'; } @@ -586,7 +586,7 @@ void SwRTFWriter::OutUnicodeSafeRecord(const sal_Char *pToken, bool bNeedUnicodeWrapper = !CharsetSufficient(rContent, eDefaultEncoding); if (bNeedUnicodeWrapper) - Strm() << '{' << sRTF_UPR; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_UPR; Strm() << '{' << pToken << ' '; OutRTF_AsByteString(*this, rContent, eDefaultEncoding); @@ -594,7 +594,7 @@ void SwRTFWriter::OutUnicodeSafeRecord(const sal_Char *pToken, if (bNeedUnicodeWrapper) { - OutComment(*this, sRTF_UD); + OutComment(*this, OOO_STRING_SVTOOLS_RTF_UD); Strm() << '{' << pToken << ' '; RTFOutFuncs::Out_String(Strm(), rContent, eDefaultEncoding, bWriteHelpFmt); @@ -606,7 +606,7 @@ void SwRTFWriter::OutUnicodeSafeRecord(const sal_Char *pToken, void SwRTFWriter::OutDocInfoStat() { - Strm() << '{' << sRTF_INFO; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_INFO; SwDocShell *pDocShell(pDoc->GetDocShell()); uno::Reference<document::XDocumentProperties> xDocProps; @@ -619,25 +619,25 @@ void SwRTFWriter::OutDocInfoStat() // may be null (in case of copying) if (xDocProps.is()) { - OutUnicodeSafeRecord(sRTF_TITLE, xDocProps->getTitle()); - OutUnicodeSafeRecord(sRTF_SUBJECT, xDocProps->getSubject()); + OutUnicodeSafeRecord(OOO_STRING_SVTOOLS_RTF_TITLE, xDocProps->getTitle()); + OutUnicodeSafeRecord(OOO_STRING_SVTOOLS_RTF_SUBJECT, xDocProps->getSubject()); - OutUnicodeSafeRecord(sRTF_KEYWORDS, + OutUnicodeSafeRecord(OOO_STRING_SVTOOLS_RTF_KEYWORDS, ::comphelper::string::convertCommaSeparated(xDocProps->getKeywords())); - OutUnicodeSafeRecord(sRTF_DOCCOMM, xDocProps->getDescription()); + OutUnicodeSafeRecord(OOO_STRING_SVTOOLS_RTF_DOCCOMM, xDocProps->getDescription()); - OutUnicodeSafeRecord(sRTF_AUTHOR, xDocProps->getAuthor() ); - OutInfoDateTime(sRTF_CREATIM, xDocProps->getCreationDate()); + OutUnicodeSafeRecord(OOO_STRING_SVTOOLS_RTF_AUTHOR, xDocProps->getAuthor() ); + OutInfoDateTime(OOO_STRING_SVTOOLS_RTF_CREATIM, xDocProps->getCreationDate()); - OutUnicodeSafeRecord(sRTF_AUTHOR, xDocProps->getModifiedBy() ); - OutInfoDateTime(sRTF_REVTIM, xDocProps->getModificationDate()); + OutUnicodeSafeRecord(OOO_STRING_SVTOOLS_RTF_AUTHOR, xDocProps->getModifiedBy() ); + OutInfoDateTime(OOO_STRING_SVTOOLS_RTF_REVTIM, xDocProps->getModificationDate()); - OutInfoDateTime(sRTF_PRINTIM, xDocProps->getPrintDate()); + OutInfoDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM, xDocProps->getPrintDate()); } // fuer interne Zwecke - Versionsnummer rausschreiben - Strm() << '{' << sRTF_COMMENT << " StarWriter}{" << sRTF_VERN; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_COMMENT << " StarWriter}{" << OOO_STRING_SVTOOLS_RTF_VERN; OutLong( Strm(), SUPD*10 ) << '}'; Strm() << '}'; @@ -770,16 +770,16 @@ void SwRTFWriter::OutRTFColorTab() } // und raus damit - Strm() << SwRTFWriter::sNewLine << '{' << sRTF_COLORTBL; + Strm() << SwRTFWriter::sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL; for( n = 0; n < pColTbl->Count(); n++ ) { const Color& rCol = (*pColTbl)[ n ]; if( n || COL_AUTO != rCol.GetColor() ) { - Strm() << sRTF_RED; - OutULong( rCol.GetRed() ) << sRTF_GREEN; - OutULong( rCol.GetGreen() ) << sRTF_BLUE; + Strm() << OOO_STRING_SVTOOLS_RTF_RED; + OutULong( rCol.GetRed() ) << OOO_STRING_SVTOOLS_RTF_GREEN; + OutULong( rCol.GetGreen() ) << OOO_STRING_SVTOOLS_RTF_BLUE; OutULong( rCol.GetBlue() ); } Strm() << ';'; @@ -798,30 +798,30 @@ bool FontCharsetSufficient(const String &rFntNm, const String &rAltNm, static void _OutFont( SwRTFWriter& rWrt, const SvxFontItem& rFont, USHORT nNo ) { - rWrt.Strm() << '{' << sRTF_F; + rWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_F; - const char* pStr = sRTF_FNIL; + const char* pStr = OOO_STRING_SVTOOLS_RTF_FNIL; switch (rFont.GetFamily()) { case FAMILY_ROMAN: - pStr = sRTF_FROMAN; + pStr = OOO_STRING_SVTOOLS_RTF_FROMAN; break; case FAMILY_SWISS: - pStr = sRTF_FSWISS; + pStr = OOO_STRING_SVTOOLS_RTF_FSWISS; break; case FAMILY_MODERN: - pStr = sRTF_FMODERN; + pStr = OOO_STRING_SVTOOLS_RTF_FMODERN; break; case FAMILY_SCRIPT: - pStr = sRTF_FSCRIPT; + pStr = OOO_STRING_SVTOOLS_RTF_FSCRIPT; break; case FAMILY_DECORATIVE: - pStr = sRTF_FDECOR; + pStr = OOO_STRING_SVTOOLS_RTF_FDECOR; break; default: break; } - rWrt.OutULong(nNo) << pStr << sRTF_FPRQ; + rWrt.OutULong(nNo) << pStr << OOO_STRING_SVTOOLS_RTF_FPRQ; USHORT nVal = 0; switch (rFont.GetPitch()) @@ -856,14 +856,14 @@ static void _OutFont( SwRTFWriter& rWrt, const SvxFontItem& rFont, USHORT nNo ) eChrSet = rtl_getTextEncodingFromWindowsCharset(nChSet); } - rWrt.Strm() << sRTF_FCHARSET; + rWrt.Strm() << OOO_STRING_SVTOOLS_RTF_FCHARSET; rWrt.OutULong( nChSet ); rWrt.Strm() << ' '; if (aRes.HasDistinctSecondary()) { RTFOutFuncs::Out_Fontname(rWrt.Strm(), aRes.msPrimary, eChrSet, rWrt.bWriteHelpFmt); - OutComment(rWrt, sRTF_FALT) << ' '; + OutComment(rWrt, OOO_STRING_SVTOOLS_RTF_FALT) << ' '; RTFOutFuncs::Out_Fontname(rWrt.Strm(), aRes.msSecondary, eChrSet, rWrt.bWriteHelpFmt) << '}'; } @@ -881,7 +881,7 @@ void SwRTFWriter::OutRTFFontTab() const SfxItemPool& rPool = pDoc->GetAttrPool(); const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT); - Strm() << SwRTFWriter::sNewLine << '{' << sRTF_FONTTBL; + Strm() << SwRTFWriter::sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL; _OutFont( *this, *pFont, n++ ); pFont = (const SvxFontItem*)rPool.GetPoolDefaultItem(RES_CHRATR_FONT); @@ -906,7 +906,7 @@ void RTF_WrtRedlineAuthor::Write(Writer &rWrt) { SwRTFWriter & rRTFWrt = (SwRTFWriter&)rWrt; - rRTFWrt.Strm() << '{' << sRTF_IGNORE << sRTF_REVTBL << ' '; + rRTFWrt.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_REVTBL << ' '; typedef std::vector<String>::iterator myiter; for(std::vector<String>::iterator aIter = maAuthors.begin(); aIter != maAuthors.end(); ++aIter) @@ -1039,7 +1039,7 @@ void SwRTFWriter::OutRTFStyleTab() return; bOutStyleTab = TRUE; - Strm() << SwRTFWriter::sNewLine << '{' << sRTF_STYLESHEET; + Strm() << SwRTFWriter::sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET; // das Default-TextStyle wird nicht mit ausgegeben !! for( n = 1; n < nArrLen; ++n ) @@ -1058,14 +1058,14 @@ void SwRTFWriter::OutRTFStyleTab() pColl->DerivedFrom() ) { // die Ableitung vom Format - Strm() << sRTF_SBASEDON; + Strm() << OOO_STRING_SVTOOLS_RTF_SBASEDON; OutULong( nBasedOn ); break; } if( pColl == &pColl->GetNextTxtFmtColl() ) { - Strm() << sRTF_SNEXT; + Strm() << OOO_STRING_SVTOOLS_RTF_SNEXT; OutULong( n ); } else @@ -1075,7 +1075,7 @@ void SwRTFWriter::OutRTFStyleTab() &pColl->GetNextTxtFmtColl() ) { // die Ableitung vom Format - Strm() << sRTF_SNEXT; + Strm() << OOO_STRING_SVTOOLS_RTF_SNEXT; OutULong( nNext ); break; } @@ -1083,7 +1083,7 @@ void SwRTFWriter::OutRTFStyleTab() //if( NO_NUMBERING != pColl->GetOutlineLevel() )//#outline level,zhaojianwei if(pColl->IsAssignedToListLevelOfOutlineStyle())//<-end,zhaojianwei { - Strm() << '{' << sRTF_IGNORE << sRTF_SOUTLVL; + Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_SOUTLVL; //OutULong( pColl->GetOutlineLevel() ) << '}';//#outline level,zhaojianwei OutULong( pColl->GetAssignedOutlineStyleLevel() ) << '}';//<-end,zhaojianwei } @@ -1110,7 +1110,7 @@ void SwRTFWriter::OutRTFStyleTab() pFmt->DerivedFrom() ) { // die Ableitung vom Format - Strm() << sRTF_SBASEDON; + Strm() << OOO_STRING_SVTOOLS_RTF_SBASEDON; OutULong( nArrLen + nBasedOn ); break; } @@ -1145,7 +1145,7 @@ void SwRTFWriter::OutRTFFlyFrms(const SwFlyFrmFmt& rFlyFrmFmt) return; if (!ExportAsInline(rFlyFrmFmt)) - Strm() << SwRTFWriter::sNewLine << sRTF_PARD << sRTF_PLAIN; + Strm() << SwRTFWriter::sNewLine << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN; //If we are only exporting an inline graphic/object then we //only need the its pFlyFmt for the duration of exporting it //for floating objects its a little more complex at the moment @@ -1158,7 +1158,7 @@ void SwRTFWriter::OutRTFFlyFrms(const SwFlyFrmFmt& rFlyFrmFmt) } if (!ExportAsInline(rFlyFrmFmt)) - Strm() << sRTF_PARD << SwRTFWriter::sNewLine; + Strm() << OOO_STRING_SVTOOLS_RTF_PARD << SwRTFWriter::sNewLine; //#i46098#: else pFlyFmt = pOldFlyFmt; } @@ -1198,21 +1198,21 @@ void SwRTFWriter::OutRedline( xub_StrLen nCntntPos ) Strm() << '{'; if(pCurRedline->GetType() == nsRedlineType_t::REDLINE_INSERT) { - Strm() << sRTF_REVISED; - Strm() << sRTF_REVAUTH; + Strm() << OOO_STRING_SVTOOLS_RTF_REVISED; + Strm() << OOO_STRING_SVTOOLS_RTF_REVAUTH; String sName = SW_MOD()->GetRedlineAuthor(pCurRedline->GetAuthor()); OutLong( pRedlAuthors->AddName(sName) ); - Strm() << sRTF_REVDTTM; + Strm() << OOO_STRING_SVTOOLS_RTF_REVDTTM; OutLong( sw::ms::DateTime2DTTM(pCurRedline->GetTimeStamp()) ); Strm() << ' '; } else if(pCurRedline->GetType() == nsRedlineType_t::REDLINE_DELETE) { - Strm() << sRTF_DELETED; - Strm() << sRTF_REVAUTHDEL; + Strm() << OOO_STRING_SVTOOLS_RTF_DELETED; + Strm() << OOO_STRING_SVTOOLS_RTF_REVAUTHDEL; String sDelName = SW_MOD()->GetRedlineAuthor(pCurRedline->GetAuthor()); OutLong( pRedlAuthors->AddName(sDelName) ); - Strm() << sRTF_REVDTTMDEL; + Strm() << OOO_STRING_SVTOOLS_RTF_REVDTTMDEL; OutLong( sw::ms::DateTime2DTTM(pCurRedline->GetTimeStamp()) ); Strm() << ' '; } @@ -1264,7 +1264,7 @@ void SwRTFWriter::OutBookmarks( xub_StrLen nCntntPos) const ::sw::mark::IBookmark* const pAsBookmark = dynamic_cast< const ::sw::mark::IBookmark* >(pBookmark); if(pAsBookmark && (pAsBookmark->GetShortName().getLength() || pAsBookmark->GetKeyCode().GetCode())) { - OutComment( *this, sRTF_BKMKKEY ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_BKMKKEY ); OutULong( ( pAsBookmark->GetKeyCode().GetCode() | pAsBookmark->GetKeyCode().GetModifier() )); if( !pAsBookmark->GetShortName().getLength() ) @@ -1276,7 +1276,7 @@ void SwRTFWriter::OutBookmarks( xub_StrLen nCntntPos) } Strm() << '}'; } - OutComment( *this, sRTF_BKMKSTART ) << ' '; + OutComment( *this, OOO_STRING_SVTOOLS_RTF_BKMKSTART ) << ' '; RTFOutFuncs::Out_String( Strm(), pBookmark->GetName(), eDefaultEncoding, bWriteHelpFmt ) << '}'; } @@ -1291,7 +1291,7 @@ void SwRTFWriter::OutBookmarks( xub_StrLen nCntntPos) const ::sw::mark::IBookmark* const pAsBookmark = dynamic_cast< const ::sw::mark::IBookmark* >(pBookmark); if(pAsBookmark && (pAsBookmark->GetShortName().getLength() || pAsBookmark->GetKeyCode().GetCode())) { - OutComment( *this, sRTF_BKMKKEY ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_BKMKKEY ); OutULong( ( pAsBookmark->GetKeyCode().GetCode() | pAsBookmark->GetKeyCode().GetModifier() )); if( !pAsBookmark->GetShortName().getLength() ) @@ -1303,7 +1303,7 @@ void SwRTFWriter::OutBookmarks( xub_StrLen nCntntPos) } Strm() << '}'; } - OutComment( *this, sRTF_BKMKEND ) << ' '; + OutComment( *this, OOO_STRING_SVTOOLS_RTF_BKMKEND ) << ' '; RTFOutFuncs::Out_String( Strm(), pAsBookmark->GetName(), eDefaultEncoding, bWriteHelpFmt ) << '}'; @@ -1421,14 +1421,14 @@ void SwRTFWriter::OutPageDesc() Strm() << SwRTFWriter::sNewLine; // ein Trenner bOutPageDesc = bOutPageDescTbl = TRUE; - OutComment( *this, sRTF_PGDSCTBL ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_PGDSCTBL ); for( USHORT n = 0; n < nSize; ++n ) { const SwPageDesc& rPageDesc = const_cast<const SwDoc*>(pDoc)->GetPageDesc( n ); - Strm() << SwRTFWriter::sNewLine << '{' << sRTF_PGDSC; - OutULong( n ) << sRTF_PGDSCUSE; + Strm() << SwRTFWriter::sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_PGDSC; + OutULong( n ) << OOO_STRING_SVTOOLS_RTF_PGDSCUSE; OutULong( rPageDesc.ReadUseOn() ); OutRTFPageDescription( rPageDesc, FALSE, FALSE ); @@ -1439,7 +1439,7 @@ void SwRTFWriter::OutPageDesc() if( rPageDesc.GetFollow() == &const_cast<const SwDoc *>(pDoc)->GetPageDesc( --i ) ) break; - Strm() << sRTF_PGDSCNXT; + Strm() << OOO_STRING_SVTOOLS_RTF_PGDSCNXT; OutULong( i ) << ' '; RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(), nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC ), eDefaultEncoding, bWriteHelpFmt ) << ";}"; @@ -1459,20 +1459,20 @@ void SwRTFWriter::OutRTFBorder(const SvxBorderLine* aLine, const USHORT nSpace ) int nWidth = aLine->GetOutWidth(); if(nDistance == 0) // Single Line - Strm() << sRTF_BRDRS; + Strm() << OOO_STRING_SVTOOLS_RTF_BRDRS; else // Double Line { if(nOutWidth == nInWidth) - Strm() << sRTF_BRDRDB; + Strm() << OOO_STRING_SVTOOLS_RTF_BRDRDB; else if (nOutWidth > nInWidth) - Strm() << sRTF_BRDRTNTHSG; + Strm() << OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG; else if (nOutWidth < nInWidth) - Strm() << sRTF_BRDRTHTNSG; + Strm() << OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG; } - Strm() << sRTF_BRDRW; + Strm() << OOO_STRING_SVTOOLS_RTF_BRDRW; OutULong(nWidth); - Strm() << sRTF_BRSP; + Strm() << OOO_STRING_SVTOOLS_RTF_BRSP; OutULong(nSpace); } @@ -1481,28 +1481,28 @@ void SwRTFWriter::OutRTFBorders(SvxBoxItem aBox) const SvxBorderLine *pLine = aBox.GetTop(); if(pLine) { - Strm() << sRTF_PGBRDRT; + Strm() << OOO_STRING_SVTOOLS_RTF_PGBRDRT; OutRTFBorder(pLine, aBox.GetDistance(BOX_LINE_TOP)); } pLine = aBox.GetBottom(); if(pLine) { - Strm() << sRTF_PGBRDRB; + Strm() << OOO_STRING_SVTOOLS_RTF_PGBRDRB; OutRTFBorder(pLine, aBox.GetDistance(BOX_LINE_BOTTOM)); } pLine = aBox.GetRight(); if(pLine) { - Strm() << sRTF_PGBRDRR; + Strm() << OOO_STRING_SVTOOLS_RTF_PGBRDRR; OutRTFBorder(pLine, aBox.GetDistance(BOX_LINE_LEFT)); } pLine = aBox.GetLeft(); if(pLine) { - Strm() << sRTF_PGBRDRL; + Strm() << OOO_STRING_SVTOOLS_RTF_PGBRDRL; OutRTFBorder(pLine, aBox.GetDistance(BOX_LINE_RIGHT)); } } @@ -1529,13 +1529,13 @@ void SwRTFWriter::OutRTFPageDescription( const SwPageDesc& rPgDsc, { if( bFirstLine && bWriteAll && pCurPam->GetPoint()->nNode == pOrigPam->Start()->nNode ) - Strm() << sRTF_SECTD << sRTF_SBKNONE; + Strm() << OOO_STRING_SVTOOLS_RTF_SECTD << OOO_STRING_SVTOOLS_RTF_SBKNONE; else - Strm() << sRTF_SECT << sRTF_SECTD; + Strm() << OOO_STRING_SVTOOLS_RTF_SECT << OOO_STRING_SVTOOLS_RTF_SECTD; } if( pAktPageDesc->GetLandscape() ) - Strm() << sRTF_LNDSCPSXN; + Strm() << OOO_STRING_SVTOOLS_RTF_LNDSCPSXN; const SwFmt *pFmt = &pAktPageDesc->GetMaster(); //GetLeft(); OutRTF_SwFmt( *this, *pFmt ); @@ -1566,7 +1566,7 @@ void SwRTFWriter::OutRTFPageDescription( const SwPageDesc& rPgDsc, if( pAktPageDesc != &rPgDsc ) { pAktPageDesc = &rPgDsc; - Strm() << sRTF_TITLEPG; + Strm() << OOO_STRING_SVTOOLS_RTF_TITLEPG; // die Header/Footer der 1. Seite ausgeben const SfxPoolItem* pHt; @@ -1602,7 +1602,7 @@ BOOL SwRTFWriter::OutBreaks( const SfxItemSet& rSet ) { pAktPageDesc = ((SwFmtPageDesc*)pItem)->GetPageDesc(); // FALSE wegen schliessender Klammer !! - OutComment( *this, sRTF_PGDSCNO, FALSE ); + OutComment( *this, OOO_STRING_SVTOOLS_RTF_PGDSCNO, FALSE ); OutULong( nPos ) << '}'; // nicht weiter, in Styles gibts keine SectionControls !! @@ -1623,7 +1623,7 @@ BOOL SwRTFWriter::OutBreaks( const SfxItemSet& rSet ) SVX_BREAK_PAGE_BOTH == rBreak.GetBreak() ) { bOutFmtAttr = true; - Strm() << sRTF_PAGE; + Strm() << OOO_STRING_SVTOOLS_RTF_PAGE; } } else @@ -1636,13 +1636,13 @@ BOOL SwRTFWriter::OutBreaks( const SfxItemSet& rSet ) break; case SVX_BREAK_PAGE_BEFORE: bOutFmtAttr = true; - Strm() << sRTF_PAGE; + Strm() << OOO_STRING_SVTOOLS_RTF_PAGE; break; case SVX_BREAK_PAGE_AFTER: - OutComment(*this, sRTF_PGBRK, false) << "0}"; + OutComment(*this, OOO_STRING_SVTOOLS_RTF_PGBRK, false) << "0}"; break; case SVX_BREAK_PAGE_BOTH: - OutComment(*this, sRTF_PGBRK, false) << "1}"; + OutComment(*this, OOO_STRING_SVTOOLS_RTF_PGBRK, false) << "1}"; break; default: break; @@ -1683,7 +1683,7 @@ void SwRTFWriter::CheckEndNodeForSection( const SwNode& rNd ) { if (! bOutPageDesc) { - Strm() << sRTF_SECT << sRTF_SECTD << sRTF_SBKNONE; + Strm() << OOO_STRING_SVTOOLS_RTF_SECT << OOO_STRING_SVTOOLS_RTF_SECTD << OOO_STRING_SVTOOLS_RTF_SBKNONE; OutRTFPageDescription( ( pAktPageDesc ? *pAktPageDesc : const_cast<const SwDoc *>(pDoc) diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 902068836660..405604c9ee45 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -152,7 +152,6 @@ SHL2STDLIBS= \ $(SOTLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ @@ -182,7 +181,6 @@ SHL3STDLIBS= \ $(ISWLIB) \ $(SVXLIB) \ $(SFX2LIB) \ - $(BASICLIB) \ $(SVTOOLLIB) \ $(TKLIB) \ $(VCLLIB) \ |