diff options
Diffstat (limited to 'sw/source/filter/html')
36 files changed, 1873 insertions, 1857 deletions
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 39761ebbd810..5601124e754e 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 7edd84270886..f221eb4b2bab 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,18 +122,18 @@ #define HTML_HEADSPACE (12*20) -#define CSS1_BACKGROUND_ATTR 1 -#define CSS1_BACKGROUND_PAGE 2 -#define CSS1_BACKGROUND_TABLE 3 -#define CSS1_BACKGROUND_FLY 4 -#define CSS1_BACKGROUND_SECTION 5 +#define CSS1_BACKGROUND_ATTR 1 +#define CSS1_BACKGROUND_PAGE 2 +#define CSS1_BACKGROUND_TABLE 3 +#define CSS1_BACKGROUND_FLY 4 +#define CSS1_BACKGROUND_SECTION 5 -#define CSS1_FRMSIZE_WIDTH 0x01 -#define CSS1_FRMSIZE_VARHEIGHT 0x02 -#define CSS1_FRMSIZE_MINHEIGHT 0x04 -#define CSS1_FRMSIZE_FIXHEIGHT 0x08 -#define CSS1_FRMSIZE_ANYHEIGHT 0x0e -#define CSS1_FRMSIZE_PIXEL 0x10 +#define CSS1_FRMSIZE_WIDTH 0x01 +#define CSS1_FRMSIZE_VARHEIGHT 0x02 +#define CSS1_FRMSIZE_MINHEIGHT 0x04 +#define CSS1_FRMSIZE_FIXHEIGHT 0x08 +#define CSS1_FRMSIZE_ANYHEIGHT 0x0e +#define CSS1_FRMSIZE_PIXEL 0x10 using namespace ::com::sun::star; @@ -341,8 +341,8 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut ) ASSERT( FUNIT_MM == eUnit, "Masseinheit wird nicht unterstuetzt" ); case FUNIT_MM: // 0.01mm = 0.57twip - nMul = 25400; // 25.4 * 1000 - nDiv = 1440; // 72 * 20; + nMul = 25400; // 25.4 * 1000 + nDiv = 1440; // 72 * 20; nFac = 100; pUnit = sCSS1_UNIT_mm; break; @@ -353,13 +353,13 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut ) case FUNIT_CM: #ifdef EXACT_VALUES // 0.001cm = 0.57twip - nMul = 25400; // 2.54 * 10000 - nDiv = 1440; // 72 * 20; + nMul = 25400; // 2.54 * 10000 + nDiv = 1440; // 72 * 20; nFac = 1000; #else // 0.01cm = 5.7twip (ist zwar ungenau, aber die UI ist auch ungenau) - nMul = 2540; // 2.54 * 1000 - nDiv = 1440; // 72 * 20; + nMul = 2540; // 2.54 * 1000 + nDiv = 1440; // 72 * 20; nFac = 100; #endif pUnit = sCSS1_UNIT_cm; @@ -391,7 +391,7 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut ) #else // 0.01pc = 2.40twip (ist zwar ungenau, aber die UI ist auch ungenau) nMul = 1000; - nDiv = 240; // 12 * 20; + nDiv = 240; // 12 * 20; nFac = 100; #endif pUnit = sCSS1_UNIT_pc; @@ -408,12 +408,12 @@ static void AddUnitPropertyValue( long nVal, FieldUnit eUnit, ByteString& rOut ) #ifdef EXACT_VALUES // 0.0001in = 0.144twip nMul = 100000; - nDiv = 1440; // 72 * 20; + nDiv = 1440; // 72 * 20; nFac = 10000; #else // 0.01in = 14.4twip (ist zwar ungenau, aber die UI ist auch ungenau) nMul = 1000; - nDiv = 1440; // 72 * 20; + nDiv = 1440; // 72 * 20; nFac = 100; #endif pUnit = sCSS1_UNIT_inch; @@ -758,13 +758,13 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, // 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) ) + case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) ) { rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE; rToken.Assign( OOO_STRING_SVTOOLS_HTML_blockquote ); } break; - case 'C': if( bChrFmt ) + case 'C': if( bChrFmt ) { if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) ) { @@ -778,7 +778,7 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, } } break; - case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) ) + case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) ) { rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE; rToken.Assign( OOO_STRING_SVTOOLS_HTML_definstance); @@ -809,23 +809,23 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, } } break; - case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) ) + case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) ) { rRefPoolId = RES_POOLCHR_HTML_EMPHASIS; rToken.Assign( OOO_STRING_SVTOOLS_HTML_emphasis ); } break; - case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_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( OOO_STRING_SVTOOLS_HTML_keyboard ) ) + case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) ) { rRefPoolId = RES_POOLCHR_HTML_KEYBOARD; rToken.Assign( OOO_STRING_SVTOOLS_HTML_keyboard ); } break; - case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) ) + case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) ) { // Listing als PRE exportieren bzw. von // PRE abgeleitete Vorlage exportieren @@ -834,13 +834,13 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, nDeep = CSS1_FMT_CMPREF; } break; - case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) ) + case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) ) { rRefPoolId = RES_POOLCOLL_HTML_PRE; rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt ); } break; - case 'S': if( bChrFmt ) + case 'S': if( bChrFmt ) { if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_sample ) ) { @@ -854,19 +854,19 @@ USHORT SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken, } } break; - case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) ) + case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) ) { rRefPoolId = RES_POOLCHR_HTML_TELETYPE; rToken.Assign( OOO_STRING_SVTOOLS_HTML_teletype ); } break; - case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) ) + case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) ) { rRefPoolId = RES_POOLCHR_HTML_VARIABLE; rToken.Assign( OOO_STRING_SVTOOLS_HTML_variable ); } break; - case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) ) + case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) ) { // XMP als PRE exportieren (aber nicht die // Vorlage als Style) @@ -1139,7 +1139,7 @@ const SwFmt *SwHTMLWriter::GetParentFmt( const SwFmt& rFmt, USHORT nDeep ) BOOL lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ) { - return ((const SvxFontItem &)r1).GetFamilyName() == + return ((const SvxFontItem &)r1).GetFamilyName() == ((const SvxFontItem &)r2).GetFamilyName() && ((const SvxFontItem &)r1).GetFamily() == ((const SvxFontItem &)r2).GetFamily(); @@ -1153,7 +1153,7 @@ void SwHTMLWriter::SubtractItemSet( SfxItemSet& rItemSet, { ASSERT( bSetDefaults || bClearSame, "SwHTMLWriter::SubtractItemSet: Bei diesen Flags passiert nix" ); - SfxItemSet aRefItemSet( *rRefItemSet.GetPool(), rRefItemSet.GetRanges() ); + SfxItemSet aRefItemSet( *rRefItemSet.GetPool(), rRefItemSet.GetRanges() ); aRefItemSet.Set( rRefItemSet ); // und mit dem Attr-Set der Vorlage vergleichen @@ -1288,11 +1288,11 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem, const sal_Char *pStr = 0; switch( rFontItem.GetFamily() ) { - case FAMILY_ROMAN: pStr = sCSS1_PV_serif; break; - case FAMILY_SWISS: pStr = sCSS1_PV_sans_serif; break; - case FAMILY_SCRIPT: pStr = sCSS1_PV_cursive; break; - case FAMILY_DECORATIVE: pStr = sCSS1_PV_fantasy; break; - case FAMILY_MODERN: pStr = sCSS1_PV_monospace; break; + case FAMILY_ROMAN: pStr = sCSS1_PV_serif; break; + case FAMILY_SWISS: pStr = sCSS1_PV_sans_serif; break; + case FAMILY_SCRIPT: pStr = sCSS1_PV_cursive; break; + case FAMILY_DECORATIVE: pStr = sCSS1_PV_fantasy; break; + case FAMILY_MODERN: pStr = sCSS1_PV_monospace; break; default: ; } @@ -1311,12 +1311,12 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, { static sal_uInt16 aWhichIds[] = { - RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT, - RES_CHRATR_FONTSIZE, RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE, - RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, - RES_CHRATR_POSTURE, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CTL_POSTURE, - RES_CHRATR_WEIGHT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_CTL_WEIGHT, - 0, 0, 0 + RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT, + RES_CHRATR_FONTSIZE, RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CTL_FONTSIZE, + RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, + RES_CHRATR_POSTURE, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CTL_POSTURE, + RES_CHRATR_WEIGHT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_CTL_WEIGHT, + 0, 0, 0 }; for( sal_uInt16 i=0; aWhichIds[i]; i += 3 ) @@ -1379,13 +1379,13 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, if( pDCCharFmt ) { SfxItemSet aTstItemSet( *pDCCharFmt->GetAttrSet().GetPool(), - RES_CHRATR_FONT, RES_CHRATR_FONT, - RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, - RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, - RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT, - RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT, - RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, - RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, + RES_CHRATR_FONT, RES_CHRATR_FONT, + RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, + RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, + RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT, + RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT, + RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, + RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, 0 ); aTstItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True ); return HasScriptDependentItems( aTstItemSet, sal_False ); @@ -1650,7 +1650,7 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, USHORT nRefPoolId = 0; USHORT nDeep = GetCSS1Selector( &rFmt, aSelector, nRefPoolId ); if( !nDeep ) - return rWrt; // von keiner HTML-Vorlage abgeleitet + return rWrt; // von keiner HTML-Vorlage abgeleitet USHORT nPoolFmtId = rFmt.GetPoolFmtId(); @@ -1727,16 +1727,16 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt, const String& rNm = rFmt.GetName(); switch( rNm.GetChar(0) ) { - case 'D': if( rNm.EqualsAscii("DD 1") || rNm.EqualsAscii("DT 1") ) + case 'D': if( rNm.EqualsAscii("DD 1") || rNm.EqualsAscii("DT 1") ) rHTMLWrt.nDfltBottomMargin = 0; break; - case 'L': if(rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_listing) ) + case 'L': if(rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_listing) ) rHTMLWrt.nDfltBottomMargin = 0; break; - case 'P': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_preformtxt) ) + case 'P': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_preformtxt) ) rHTMLWrt.nDfltBottomMargin = 0; break; - case 'X': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_xmp) ) + case 'X': if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_xmp) ) rHTMLWrt.nDfltBottomMargin = 0; break; } @@ -1834,9 +1834,9 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, const sal_Char *pPseudo = 0; switch( rPageDesc.GetPoolFmtId() ) { - case RES_POOLPAGE_FIRST: pPseudo = sCSS1_first; break; - case RES_POOLPAGE_LEFT: pPseudo = sCSS1_left; break; - case RES_POOLPAGE_RIGHT: pPseudo = sCSS1_right; break; + case RES_POOLPAGE_FIRST: pPseudo = sCSS1_first; break; + case RES_POOLPAGE_LEFT: pPseudo = sCSS1_left; break; + case RES_POOLPAGE_RIGHT: pPseudo = sCSS1_right; break; } if( pPseudo ) { @@ -2596,8 +2596,8 @@ static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char *pStr = 0; switch( ((const SvxCaseMapItem&)rHt).GetCaseMap() ) { - case SVX_CASEMAP_NOT_MAPPED: pStr = sCSS1_PV_normal; break; - case SVX_CASEMAP_KAPITAELCHEN: pStr = sCSS1_PV_small_caps; break; + case SVX_CASEMAP_NOT_MAPPED: pStr = sCSS1_PV_normal; break; + case SVX_CASEMAP_KAPITAELCHEN: pStr = sCSS1_PV_small_caps; break; default: ; } @@ -2656,8 +2656,8 @@ static Writer& OutCSS1_SvxFont( Writer& rWrt, const SfxPoolItem& rHt ) sal_uInt16 nScript = CSS1_OUTMODE_WESTERN; switch( rHt.Which() ) { - case RES_CHRATR_CJK_FONT: nScript = CSS1_OUTMODE_CJK; break; - case RES_CHRATR_CTL_FONT: nScript = CSS1_OUTMODE_CTL; break; + case RES_CHRATR_CJK_FONT: nScript = CSS1_OUTMODE_CJK; break; + case RES_CHRATR_CTL_FONT: nScript = CSS1_OUTMODE_CTL; break; } if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; @@ -2690,8 +2690,8 @@ static Writer& OutCSS1_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) sal_uInt16 nScript = CSS1_OUTMODE_WESTERN; switch( rHt.Which() ) { - case RES_CHRATR_CJK_FONTSIZE: nScript = CSS1_OUTMODE_CJK; break; - case RES_CHRATR_CTL_FONTSIZE: nScript = CSS1_OUTMODE_CTL; break; + case RES_CHRATR_CJK_FONTSIZE: nScript = CSS1_OUTMODE_CJK; break; + case RES_CHRATR_CTL_FONTSIZE: nScript = CSS1_OUTMODE_CTL; break; } if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; @@ -2720,8 +2720,8 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt ) sal_uInt16 nScript = CSS1_OUTMODE_WESTERN; switch( rHt.Which() ) { - case RES_CHRATR_CJK_POSTURE: nScript = CSS1_OUTMODE_CJK; break; - case RES_CHRATR_CTL_POSTURE: nScript = CSS1_OUTMODE_CTL; break; + case RES_CHRATR_CJK_POSTURE: nScript = CSS1_OUTMODE_CJK; break; + case RES_CHRATR_CTL_POSTURE: nScript = CSS1_OUTMODE_CTL; break; } if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; @@ -2729,8 +2729,8 @@ static Writer& OutCSS1_SvxPosture( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char *pStr = 0; switch( ((const SvxPostureItem&)rHt).GetPosture() ) { - case ITALIC_NONE: pStr = sCSS1_PV_normal; break; - case ITALIC_OBLIQUE: pStr = sCSS1_PV_oblique; break; + case ITALIC_NONE: pStr = sCSS1_PV_normal; break; + case ITALIC_OBLIQUE: pStr = sCSS1_PV_oblique; break; case ITALIC_NORMAL: if( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) ) { @@ -2770,7 +2770,7 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt ) } // Breite als n.n pt - nValue = (nValue + 1) / 2; // 1/10pt + nValue = (nValue + 1) / 2; // 1/10pt sOut.Append( ByteString::CreateFromInt32( (sal_Int32)(nValue / 10) ) ); sOut.Append( '.' ); sOut.Append( ByteString::CreateFromInt32( (sal_Int32)(nValue % 10) ) ); @@ -2798,8 +2798,8 @@ static Writer& OutCSS1_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt ) sal_uInt16 nScript = CSS1_OUTMODE_WESTERN; switch( rHt.Which() ) { - case RES_CHRATR_CJK_LANGUAGE: nScript = CSS1_OUTMODE_CJK; break; - case RES_CHRATR_CTL_LANGUAGE: nScript = CSS1_OUTMODE_CTL; break; + case RES_CHRATR_CJK_LANGUAGE: nScript = CSS1_OUTMODE_CJK; break; + case RES_CHRATR_CTL_LANGUAGE: nScript = CSS1_OUTMODE_CTL; break; } if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; @@ -2851,8 +2851,8 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt ) sal_uInt16 nScript = CSS1_OUTMODE_WESTERN; switch( rHt.Which() ) { - case RES_CHRATR_CJK_WEIGHT: nScript = CSS1_OUTMODE_CJK; break; - case RES_CHRATR_CTL_WEIGHT: nScript = CSS1_OUTMODE_CTL; break; + case RES_CHRATR_CJK_WEIGHT: nScript = CSS1_OUTMODE_CJK; break; + case RES_CHRATR_CTL_WEIGHT: nScript = CSS1_OUTMODE_CTL; break; } if( !rHTMLWrt.IsCSS1Script( nScript ) ) return rWrt; @@ -2860,11 +2860,11 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char *pStr = 0; switch( ((const SvxWeightItem&)rHt).GetWeight() ) { - case WEIGHT_ULTRALIGHT: pStr = sCSS1_PV_extra_light; break; - case WEIGHT_LIGHT: pStr = sCSS1_PV_light; break; - case WEIGHT_SEMILIGHT: pStr = sCSS1_PV_demi_light; break; - case WEIGHT_NORMAL: pStr = sCSS1_PV_normal; break; - case WEIGHT_SEMIBOLD: pStr = sCSS1_PV_demi_bold; break; + case WEIGHT_ULTRALIGHT: pStr = sCSS1_PV_extra_light; break; + case WEIGHT_LIGHT: pStr = sCSS1_PV_light; break; + case WEIGHT_SEMILIGHT: pStr = sCSS1_PV_demi_light; break; + case WEIGHT_NORMAL: pStr = sCSS1_PV_normal; break; + case WEIGHT_SEMIBOLD: pStr = sCSS1_PV_demi_bold; break; case WEIGHT_BOLD: if( !rHTMLWrt.IsCSS1Source( CSS1_OUTMODE_PARA ) ) { @@ -2875,7 +2875,7 @@ static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt ) pStr = sCSS1_PV_bold; } break; - case WEIGHT_ULTRABOLD: pStr = sCSS1_PV_extra_bold; break; + case WEIGHT_ULTRABOLD: pStr = sCSS1_PV_extra_bold; break; default: pStr = sCSS1_PV_normal;; } @@ -2909,7 +2909,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.bOutTable && rHTMLWrt.bCfgNetscape4 ) return rWrt; - const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)rHt; + const SvxLineSpacingItem& rLSItem = (const SvxLineSpacingItem&)rHt; USHORT nHeight = 0; USHORT nPrcHeight = 0; @@ -2968,10 +2968,10 @@ static Writer& OutCSS1_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) const sal_Char* pStr = 0; switch( ((const SvxAdjustItem&)rHt).GetAdjust() ) { - case SVX_ADJUST_LEFT: pStr = sCSS1_PV_left; break; - case SVX_ADJUST_RIGHT: pStr = sCSS1_PV_right; break; - case SVX_ADJUST_BLOCK: pStr = sCSS1_PV_justify; break; - case SVX_ADJUST_CENTER: pStr = sCSS1_PV_center; break; + case SVX_ADJUST_LEFT: pStr = sCSS1_PV_left; break; + case SVX_ADJUST_RIGHT: pStr = sCSS1_PV_right; break; + case SVX_ADJUST_BLOCK: pStr = sCSS1_PV_justify; break; + case SVX_ADJUST_CENTER: pStr = sCSS1_PV_center; break; default: ; } @@ -3259,7 +3259,7 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt, static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt, const SvxFmtBreakItem *pBreakItem, const SwFmtPageDesc *pPDescItem, - const SvxFmtKeepItem *pKeepItem ) + const SvxFmtKeepItem *pKeepItem ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -3302,9 +3302,9 @@ static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt, { switch( pPDesc->GetPoolFmtId() ) { - case RES_POOLPAGE_LEFT: pBreakBefore = sCSS1_PV_left; break; - case RES_POOLPAGE_RIGHT: pBreakBefore = sCSS1_PV_right; break; - default: pBreakBefore = sCSS1_PV_always; break; + case RES_POOLPAGE_LEFT: pBreakBefore = sCSS1_PV_left; break; + case RES_POOLPAGE_RIGHT: pBreakBefore = sCSS1_PV_right; break; + default: pBreakBefore = sCSS1_PV_always; break; } } else if( !pBreakBefore ) @@ -3372,7 +3372,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, return rWrt; // Erstmal ein par Werte holen -// const Brush &rBrush = ((const SvxBrushItem &)rHt).GetBrush(); +// const Brush &rBrush = ((const SvxBrushItem &)rHt).GetBrush(); const Color & rColor = ((const SvxBrushItem &)rHt).GetColor(); const String *pLink = pGrfName ? pGrfName : ((const SvxBrushItem &)rHt).GetGraphicLink(); @@ -3415,7 +3415,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, sGrfNm, String::CreateFromAscii("JPG"), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); - if( !nErr ) // fehlerhaft, da ist nichts auszugeben + if( !nErr ) // fehlerhaft, da ist nichts auszugeben { sGrfNm = URIHelper::SmartRel2Abs( INetURLObject(rWrt.GetBaseURL()), sGrfNm, @@ -3590,7 +3590,7 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt, } else { - nWidth *= 5; // 1/100pt + nWidth *= 5; // 1/100pt // Breite als n.nn pt sOut += ByteString::CreateFromInt32( nWidth / 100 ); @@ -3709,37 +3709,37 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt ) SwAttrFnTab aCSS1AttrFnTab = { -/* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap, -/* RES_CHRATR_CHARSETCOLOR */ 0, -/* RES_CHRATR_COLOR */ OutCSS1_SvxColor, -/* RES_CHRATR_CONTOUR */ 0, -/* RES_CHRATR_CROSSEDOUT */ OutCSS1_SvxCrossedOut, -/* RES_CHRATR_ESCAPEMENT */ 0, -/* RES_CHRATR_FONT */ OutCSS1_SvxFont, -/* RES_CHRATR_FONTSIZE */ OutCSS1_SvxFontHeight, -/* RES_CHRATR_KERNING */ OutCSS1_SvxKerning, -/* RES_CHRATR_LANGUAGE */ OutCSS1_SvxLanguage, -/* RES_CHRATR_POSTURE */ OutCSS1_SvxPosture, +/* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap, +/* RES_CHRATR_CHARSETCOLOR */ 0, +/* RES_CHRATR_COLOR */ OutCSS1_SvxColor, +/* RES_CHRATR_CONTOUR */ 0, +/* RES_CHRATR_CROSSEDOUT */ OutCSS1_SvxCrossedOut, +/* RES_CHRATR_ESCAPEMENT */ 0, +/* RES_CHRATR_FONT */ OutCSS1_SvxFont, +/* RES_CHRATR_FONTSIZE */ OutCSS1_SvxFontHeight, +/* RES_CHRATR_KERNING */ OutCSS1_SvxKerning, +/* RES_CHRATR_LANGUAGE */ OutCSS1_SvxLanguage, +/* RES_CHRATR_POSTURE */ OutCSS1_SvxPosture, /* RES_CHRATR_PROPORTIONALFONTSIZE*/0, -/* RES_CHRATR_SHADOWED */ 0, -/* RES_CHRATR_UNDERLINE */ OutCSS1_SvxUnderline, -/* RES_CHRATR_WEIGHT */ OutCSS1_SvxFontWeight, -/* RES_CHRATR_WORDLINEMODE */ 0, -/* RES_CHRATR_AUTOKERN */ 0, -/* RES_CHRATR_BLINK */ OutCSS1_SvxBlink, -/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen +/* RES_CHRATR_SHADOWED */ 0, +/* RES_CHRATR_UNDERLINE */ OutCSS1_SvxUnderline, +/* RES_CHRATR_WEIGHT */ OutCSS1_SvxFontWeight, +/* RES_CHRATR_WORDLINEMODE */ 0, +/* RES_CHRATR_AUTOKERN */ 0, +/* RES_CHRATR_BLINK */ OutCSS1_SvxBlink, +/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen /* RES_CHRATR_NOLINEBREAK */ 0, // Neu: nicht umbrechen -/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // Neu: Zeichenhintergrund -/* RES_CHRATR_CJK_FONT */ OutCSS1_SvxFont, -/* RES_CHRATR_CJK_FONTSIZE */ OutCSS1_SvxFontHeight, -/* RES_CHRATR_CJK_LANGUAGE */ OutCSS1_SvxLanguage, -/* RES_CHRATR_CJK_POSTURE */ OutCSS1_SvxPosture, -/* RES_CHRATR_CJK_WEIGHT */ OutCSS1_SvxFontWeight, -/* RES_CHRATR_CTL_FONT */ OutCSS1_SvxFont, -/* RES_CHRATR_CTL_FONTSIZE */ OutCSS1_SvxFontHeight, -/* RES_CHRATR_CTL_LANGUAGE */ OutCSS1_SvxLanguage, -/* RES_CHRATR_CTL_POSTURE */ OutCSS1_SvxPosture, -/* RES_CHRATR_CTL_WEIGHT */ OutCSS1_SvxFontWeight, +/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // Neu: Zeichenhintergrund +/* RES_CHRATR_CJK_FONT */ OutCSS1_SvxFont, +/* RES_CHRATR_CJK_FONTSIZE */ OutCSS1_SvxFontHeight, +/* RES_CHRATR_CJK_LANGUAGE */ OutCSS1_SvxLanguage, +/* RES_CHRATR_CJK_POSTURE */ OutCSS1_SvxPosture, +/* RES_CHRATR_CJK_WEIGHT */ OutCSS1_SvxFontWeight, +/* RES_CHRATR_CTL_FONT */ OutCSS1_SvxFont, +/* RES_CHRATR_CTL_FONTSIZE */ OutCSS1_SvxFontHeight, +/* RES_CHRATR_CTL_LANGUAGE */ OutCSS1_SvxLanguage, +/* RES_CHRATR_CTL_POSTURE */ OutCSS1_SvxPosture, +/* RES_CHRATR_CTL_WEIGHT */ OutCSS1_SvxFontWeight, /* RES_CHRATR_ROTATE */ 0, /* RES_CHRATR_EMPHASIS_MARK */ 0, /* RES_CHRATR_TWO_LINES */ 0, @@ -3761,26 +3761,26 @@ SwAttrFnTab aCSS1AttrFnTab = { /* RES_TXTATR_UNKNOWN_CONTAINER */ 0, /* RES_TXTATR_DUMMY5 */ 0, -/* RES_TXTATR_FIELD */ 0, -/* RES_TXTATR_FLYCNT */ 0, -/* RES_TXTATR_FTN */ 0, +/* RES_TXTATR_FIELD */ 0, +/* RES_TXTATR_FLYCNT */ 0, +/* RES_TXTATR_FTN */ 0, /* RES_TXTATR_DUMMY4 */ 0, /* RES_TXTATR_DUMMY3 */ 0, -/* RES_TXTATR_DUMMY1 */ 0, // Dummy: -/* RES_TXTATR_DUMMY2 */ 0, // Dummy: - -/* RES_PARATR_LINESPACING */ OutCSS1_SvxLineSpacing, -/* RES_PARATR_ADJUST */ OutCSS1_SvxAdjust, -/* RES_PARATR_SPLIT */ OutCSS1_SvxFmtSplit, -/* RES_PARATR_WIDOWS */ OutCSS1_SvxWidows, -/* RES_PARATR_ORPHANS */ OutCSS1_SvxOrphans, -/* RES_PARATR_TABSTOP */ 0, +/* RES_TXTATR_DUMMY1 */ 0, // Dummy: +/* RES_TXTATR_DUMMY2 */ 0, // Dummy: + +/* RES_PARATR_LINESPACING */ OutCSS1_SvxLineSpacing, +/* RES_PARATR_ADJUST */ OutCSS1_SvxAdjust, +/* RES_PARATR_SPLIT */ OutCSS1_SvxFmtSplit, +/* RES_PARATR_WIDOWS */ OutCSS1_SvxWidows, +/* RES_PARATR_ORPHANS */ OutCSS1_SvxOrphans, +/* RES_PARATR_TABSTOP */ 0, /* RES_PARATR_HYPHENZONE*/ 0, -/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop, -/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit -/* RES_PARATR_NUMRULE */ 0, // Dummy: -/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy: -/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy: +/* RES_PARATR_DROP */ OutCSS1_SwFmtDrop, +/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit +/* RES_PARATR_NUMRULE */ 0, // Dummy: +/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy: +/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy: /* RES_PARATR_FORBIDDEN_RULES */ 0, // new /* RES_PARATR_VERTALIGN */ 0, // new /* RES_PARATR_SNAPTOGRID*/ 0, // new @@ -3793,41 +3793,41 @@ SwAttrFnTab aCSS1AttrFnTab = { /* RES_PARATR_LIST_RESTARTVALUE */ 0, // new /* RES_PARATR_LIST_ISCOUNTED */ 0, // new -/* RES_FILL_ORDER */ 0, -/* RES_FRM_SIZE */ 0, -/* RES_PAPER_BIN */ 0, -/* RES_LR_SPACE */ OutCSS1_SvxLRSpace, -/* RES_UL_SPACE */ OutCSS1_SvxULSpace, -/* RES_PAGEDESC */ 0, -/* RES_BREAK */ 0, -/* RES_CNTNT */ 0, -/* RES_HEADER */ 0, -/* RES_FOOTER */ 0, -/* RES_PRINT */ 0, -/* RES_OPAQUE */ 0, -/* RES_PROTECT */ 0, -/* RES_SURROUND */ 0, -/* RES_VERT_ORIENT */ 0, -/* RES_HORI_ORIENT */ 0, -/* RES_ANCHOR */ 0, -/* RES_BACKGROUND */ OutCSS1_SvxBrush, -/* RES_BOX */ OutCSS1_SvxBox, -/* RES_SHADOW */ 0, -/* RES_FRMMACRO */ 0, -/* RES_COL */ 0, -/* RES_KEEP */ 0, -/* RES_URL */ 0, -/* RES_EDIT_IN_READONLY */ 0, -/* RES_LAYOUT_SPLIT */ 0, -/* RES_CHAIN */ 0, -/* RES_TEXTGRID */ 0, -/* RES_LINENUMBER */ 0, -/* RES_FTN_AT_TXTEND */ 0, -/* RES_END_AT_TXTEND */ 0, -/* RES_COLUMNBALANCE */ 0, -/* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection, +/* RES_FILL_ORDER */ 0, +/* RES_FRM_SIZE */ 0, +/* RES_PAPER_BIN */ 0, +/* RES_LR_SPACE */ OutCSS1_SvxLRSpace, +/* RES_UL_SPACE */ OutCSS1_SvxULSpace, +/* RES_PAGEDESC */ 0, +/* RES_BREAK */ 0, +/* RES_CNTNT */ 0, +/* RES_HEADER */ 0, +/* RES_FOOTER */ 0, +/* RES_PRINT */ 0, +/* RES_OPAQUE */ 0, +/* RES_PROTECT */ 0, +/* RES_SURROUND */ 0, +/* RES_VERT_ORIENT */ 0, +/* RES_HORI_ORIENT */ 0, +/* RES_ANCHOR */ 0, +/* RES_BACKGROUND */ OutCSS1_SvxBrush, +/* RES_BOX */ OutCSS1_SvxBox, +/* RES_SHADOW */ 0, +/* RES_FRMMACRO */ 0, +/* RES_COL */ 0, +/* RES_KEEP */ 0, +/* RES_URL */ 0, +/* RES_EDIT_IN_READONLY */ 0, +/* RES_LAYOUT_SPLIT */ 0, +/* RES_CHAIN */ 0, +/* RES_TEXTGRID */ 0, +/* RES_LINENUMBER */ 0, +/* RES_FTN_AT_TXTEND */ 0, +/* RES_END_AT_TXTEND */ 0, +/* RES_COLUMNBALANCE */ 0, +/* RES_FRAMEDIR */ OutCSS1_SvxFrameDirection, /* RES_HEADER_FOOTER_EAT_SPACING */ 0, -/* RES_FRMATR_DUMMY9 */ 0, // Dummy: +/* RES_FRMATR_DUMMY9 */ 0, // Dummy: /* RES_FOLLOW_TEXT_FLOW */ 0, /* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0, /* RES_FRMATR_DUMMY2 */ 0, // Dummy: @@ -3836,24 +3836,24 @@ SwAttrFnTab aCSS1AttrFnTab = { /* RES_FRMATR_DUMMY5 */ 0, // Dummy: /* RES_GRFATR_MIRRORGRF */ 0, -/* RES_GRFATR_CROPGRF */ 0, -/* RES_GRFATR_ROTATION */ 0, -/* RES_GRFATR_LUMINANCE */ 0, -/* RES_GRFATR_CONTRAST */ 0, -/* RES_GRFATR_CHANNELR */ 0, -/* RES_GRFATR_CHANNELG */ 0, -/* RES_GRFATR_CHANNELB */ 0, -/* RES_GRFATR_GAMMA */ 0, -/* RES_GRFATR_INVERT */ 0, -/* RES_GRFATR_TRANSPARENCY */ 0, -/* RES_GRFATR_DRWAMODE */ 0, -/* RES_GRFATR_DUMMY1 */ 0, -/* RES_GRFATR_DUMMY2 */ 0, -/* RES_GRFATR_DUMMY3 */ 0, -/* RES_GRFATR_DUMMY4 */ 0, -/* RES_GRFATR_DUMMY5 */ 0, - -/* RES_BOXATR_FORMAT */ 0, -/* RES_BOXATR_FORMULA */ 0, -/* RES_BOXATR_VALUE */ 0 +/* RES_GRFATR_CROPGRF */ 0, +/* RES_GRFATR_ROTATION */ 0, +/* RES_GRFATR_LUMINANCE */ 0, +/* RES_GRFATR_CONTRAST */ 0, +/* RES_GRFATR_CHANNELR */ 0, +/* RES_GRFATR_CHANNELG */ 0, +/* RES_GRFATR_CHANNELB */ 0, +/* RES_GRFATR_GAMMA */ 0, +/* RES_GRFATR_INVERT */ 0, +/* RES_GRFATR_TRANSPARENCY */ 0, +/* RES_GRFATR_DRWAMODE */ 0, +/* RES_GRFATR_DUMMY1 */ 0, +/* RES_GRFATR_DUMMY2 */ 0, +/* RES_GRFATR_DUMMY3 */ 0, +/* RES_GRFATR_DUMMY4 */ 0, +/* RES_GRFATR_DUMMY5 */ 0, + +/* RES_BOXATR_FORMAT */ 0, +/* RES_BOXATR_FORMULA */ 0, +/* RES_BOXATR_VALUE */ 0 }; diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index 63d319a8ac12..5bde86df2ed3 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx index 7994ab32c616..4c374bf81888 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 573d5c7ebc5f..d0f73494bb00 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,9 +124,9 @@ using namespace ::com::sun::star; #endif -#define HTML_BULLETCHAR_DISC 34 -#define HTML_BULLETCHAR_CIRCLE 38 -#define HTML_BULLETCHAR_SQUARE 36 +#define HTML_BULLETCHAR_DISC 34 +#define HTML_BULLETCHAR_CIRCLE 38 +#define HTML_BULLETCHAR_SQUARE 36 #define COLFUZZY 20 @@ -134,10 +134,10 @@ using namespace ::com::sun::star; HTMLOutEvent __FAR_DATA aAnchorEventTable[] = { - { 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 } + { 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 } }; static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ); @@ -198,7 +198,7 @@ void SwHTMLWriter::OutAndSetDefList( USHORT nNewLvl ) { // output </pre> for the previous(!) pararagraph, if required. // Preferable, the <pre> is exported by OutHTML_SwFmtOff for the - // previous paragraph already, but that's not possible, because a very + // previous paragraph already, but that's not possible, because a very // deep look at the next paragraph (this one) is required to figure // out that a def list starts here. @@ -277,13 +277,13 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType ) struct SwHTMLTxtCollOutputInfo { - ByteString aToken; // auszugendens End-Token - SfxItemSet *pItemSet; // harte Attributierung + ByteString aToken; // auszugendens End-Token + SfxItemSet *pItemSet; // harte Attributierung - BOOL bInNumBulList; // in einer Aufzaehlungs-Liste; - BOOL bParaPossible; // ein </P> darf zusaetzlich ausgegeben werden - BOOL bOutPara; // ein </P> soll ausgegeben werden - BOOL bOutDiv; // write a </DIV> + BOOL bInNumBulList; // in einer Aufzaehlungs-Liste; + BOOL bParaPossible; // ein </P> darf zusaetzlich ausgegeben werden + BOOL bOutPara; // ein </P> soll ausgegeben werden + BOOL bOutDiv; // write a </DIV> SwHTMLTxtCollOutputInfo() : pItemSet( 0 ), @@ -306,16 +306,16 @@ SwHTMLTxtCollOutputInfo::~SwHTMLTxtCollOutputInfo() struct SwHTMLFmtInfo { - const SwFmt *pFmt; // das Format selbst - const SwFmt *pRefFmt; // das Vergleichs-Format + const SwFmt *pFmt; // das Format selbst + const SwFmt *pRefFmt; // das Vergleichs-Format - ByteString aToken; // das auszugebende Token - String aClass; // die auszugebende Klasse + ByteString aToken; // das auszugebende Token + String aClass; // die auszugebende Klasse - SfxItemSet *pItemSet; // der auszugebende Attribut-Set + SfxItemSet *pItemSet; // der auszugebende Attribut-Set - sal_Int32 nLeftMargin; // ein par default-Werte fuer - sal_Int32 nRightMargin; // Absatz-Vorlagen + sal_Int32 nLeftMargin; // ein par default-Werte fuer + sal_Int32 nRightMargin; // Absatz-Vorlagen short nFirstLineIndent; USHORT nTopMargin; @@ -370,7 +370,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate, BOOL bTxtColl = pFmt->Which() == RES_TXTFMTCOLL || pFmt->Which() == RES_CONDTXTFMTCOLL; - const SwFmt *pReferenceFmt = 0; // Vergleichs-Format + const SwFmt *pReferenceFmt = 0; // Vergleichs-Format sal_Bool bSetDefaults = sal_True, bClearSame = sal_True; if( nDeep != 0 ) { @@ -585,15 +585,15 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, USHORT nNumStart = USHRT_MAX; BOOL bForceDL = FALSE; BOOL bDT = FALSE; - rInfo.bInNumBulList = FALSE; // Wir sind in einer Liste? - BOOL bNumbered = FALSE; // Der aktuelle Absatz ist numeriert - BOOL bPara = FALSE; // das aktuelle Token ist <P> - rInfo.bParaPossible = FALSE; // ein <P> darf zusaetzlich ausgegeben werden - BOOL bNoEndTag = FALSE; // kein End-Tag ausgeben + rInfo.bInNumBulList = FALSE; // Wir sind in einer Liste? + BOOL bNumbered = FALSE; // Der aktuelle Absatz ist numeriert + BOOL bPara = FALSE; // das aktuelle Token ist <P> + rInfo.bParaPossible = FALSE; // ein <P> darf zusaetzlich ausgegeben werden + BOOL bNoEndTag = FALSE; // kein End-Tag ausgeben - rHWrt.bNoAlign = FALSE; // kein ALIGN=... moeglich - BOOL bNoStyle = FALSE; // kein STYLE=... moeglich - BYTE nBulletGrfLvl = 255; // Die auszugebende Bullet-Grafik + rHWrt.bNoAlign = FALSE; // kein ALIGN=... moeglich + BOOL bNoStyle = FALSE; // kein STYLE=... moeglich + BYTE nBulletGrfLvl = 255; // Die auszugebende Bullet-Grafik // Sind wir in einer Aufzaehlungs- oder Numerierungliste? const SwTxtNode* pTxtNd = rWrt.pCurPam->GetNode()->GetTxtNode(); @@ -662,8 +662,8 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, } // Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist - USHORT nToken = 0; // Token fuer Tag-Wechsel - BOOL bOutNewLine = FALSE; // nur ein LF ausgeben? + USHORT nToken = 0; // Token fuer Tag-Wechsel + BOOL bOutNewLine = FALSE; // nur ein LF ausgeben? if( pFmtInfo->aToken.Len() ) { // Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer @@ -673,19 +673,19 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // der erste Buchstabe reicht meistens switch( rInfo.aToken.GetChar( 0 ) ) { - case 'A': ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_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(OOO_STRING_SVTOOLS_HTML_blockquote), + case 'B': ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_blockquote), "Doch kein BLOCKQUOTE?" ); rInfo.bParaPossible = TRUE; rHWrt.bNoAlign = TRUE; break; - case 'P': if( rInfo.aToken.Len() == 1 ) + case 'P': if( rInfo.aToken.Len() == 1 ) { bPara = TRUE; } @@ -706,7 +706,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, } break; - case 'D': ASSERT( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt) || + 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(OOO_STRING_SVTOOLS_HTML_dt); @@ -774,7 +774,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, { // nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang // ausgeben - rInfo.aToken.Erase(); // kein End-Tag ausgeben + rInfo.aToken.Erase(); // kein End-Tag ausgeben rWrt.Strm() << SwHTMLWriter::sNewLine; return; @@ -794,7 +794,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // Unteren Absatz-Abstand beachten ? (nie im letzen Absatz von // Tabellen) - BOOL bUseParSpace = !rHWrt.bOutTable || + BOOL bUseParSpace = !rHWrt.bOutTable || (rWrt.pCurPam->GetPoint()->nNode.GetIndex() != rWrt.pCurPam->GetMark()->nNode.GetIndex()); // Wenn Styles exportiert werden, wird aus eingerueckten Absaetzen @@ -1012,9 +1012,9 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // - ein unterer Abstand oder // - eine Absatz-Ausrichtung existiert, ode // - Styles exportiert werden und, - // - die Textkoerper-Vorlage geaendert wurde, oder - // - ein Benutzer-Format exportiert wird, oder - // - Absatz-Attribute existieren + // - die Textkoerper-Vorlage geaendert wurde, oder + // - ein Benutzer-Format exportiert wird, oder + // - Absatz-Attribute existieren if( !bPara || (!rInfo.bInNumBulList && !rHWrt.nDefListLvl) || (rInfo.bInNumBulList && !bNumbered) || @@ -1232,34 +1232,34 @@ HTMLSttEndPos::~HTMLSttEndPos() typedef HTMLSttEndPos *HTMLSttEndPosPtr; SV_DECL_PTRARR( _HTMLEndLst, HTMLSttEndPosPtr, 5, 5 ) -enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut - HTML_REAL_VALUE, // Attribut mit Wert - HTML_ON_VALUE, // Attribut entspricht On-Tag - HTML_OFF_VALUE, // Attribut entspricht Off-Tag - HTML_CHRFMT_VALUE, // Attribut fuer Zeichenvorlage - HTML_COLOR_VALUE, // Attribut fuer Vordergrundfarbe - HTML_STYLE_VALUE, // Attribut muss als Style exp. - HTML_DROPCAP_VALUE, // DropCap-Attributs - HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles +enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut + HTML_REAL_VALUE, // Attribut mit Wert + HTML_ON_VALUE, // Attribut entspricht On-Tag + HTML_OFF_VALUE, // Attribut entspricht Off-Tag + HTML_CHRFMT_VALUE, // Attribut fuer Zeichenvorlage + HTML_COLOR_VALUE, // Attribut fuer Vordergrundfarbe + HTML_STYLE_VALUE, // Attribut muss als Style exp. + HTML_DROPCAP_VALUE, // DropCap-Attributs + HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles class HTMLEndPosLst { - _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste - _HTMLEndLst aEndLst; // nach End-Psotionen sortierte Liste - SvXub_StrLens aScriptChgLst; // positions where script changes + _HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste + _HTMLEndLst aEndLst; // nach End-Psotionen sortierte Liste + SvXub_StrLens aScriptChgLst; // positions where script changes // 0 is not contained in this list, // but the text length - SvUShorts aScriptLst; // the script that is valif up to the position + SvUShorts aScriptLst; // the script that is valif up to the position // contained in aScriptChgList at the same index - SwDoc *pDoc; // das aktuelle Dokument - SwDoc* pTemplate; // die HTML-Vorlage (oder 0) + SwDoc *pDoc; // das aktuelle Dokument + SwDoc* pTemplate; // die HTML-Vorlage (oder 0) const Color* pDfltColor;// die Default-Vordergrund-Farbe - SvStringsSortDtor& rScriptTxtStyles; // + SvStringsSortDtor& rScriptTxtStyles; // ULONG nHTMLMode; - BOOL bOutStyles : 1; // werden Styles exportiert + BOOL bOutStyles : 1; // werden Styles exportiert // die Position eines Items in der Start-/Ende-Liste suchen @@ -1529,9 +1529,9 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem ) eState = HTML_DROPCAP_VALUE; break; -// default: -// eState = HTML_NOT_SUPPORTED; -// break; +// default: +// eState = HTML_NOT_SUPPORTED; +// break; } return eState; @@ -2097,7 +2097,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( xub_StrLen nPos , } void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, xub_StrLen nPos, - HTMLOutContext *pContext ) + HTMLOutContext *pContext ) { rHWrt.bTagOn = TRUE; @@ -2182,7 +2182,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) xub_StrLen nEnde = rStr.Len(); // Besonderheit: leere Node und HR-Vorlage (horizontaler Strich) - // nur ein <HR> ausgeben + // nur ein <HR> ausgeben USHORT nPoolId = pNd->GetAnyFmtColl().GetPoolFmtId(); if( !nEnde && (RES_POOLCOLL_HTML_HR==nPoolId || @@ -2486,7 +2486,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset ); nAttrPos++; - if( RES_TXTATR_FIELD == pHt->Which() ) // Felder nicht + if( RES_TXTATR_FIELD == pHt->Which() ) // Felder nicht continue; // ausgeben if ( pHt->GetEnd() && !pHt->HasDummyChar() ) @@ -2539,7 +2539,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) // Die an der aktuellen Position verankerten Rahmen ausgeben if( bFlysLeft ) - bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), + bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), nStrPos, HTML_POS_INSIDE, &aContext ); @@ -2559,8 +2559,8 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) { // Wenn erlaubt, wird das Ding als Spacer exportiert - bOutChar = FALSE; // Space nicht ausgeben - bWriteBreak = FALSE; // der Absatz ist aber auch nicht leer + bOutChar = FALSE; // Space nicht ausgeben + bWriteBreak = FALSE; // der Absatz ist aber auch nicht leer HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); OutHTML_HoriSpacer( rWrt, ((const SvxKerningItem&)pHt->GetAttr()).GetValue() ); @@ -2596,7 +2596,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode ) RES_SCRIPTFLD != nFldWhich ) ) bWriteBreak = FALSE; } - bOutChar = FALSE; // keine 255 ausgeben + bOutChar = FALSE; // keine 255 ausgeben } } while( ++nAttrPos < nCntAttr && nStrPos == *( pHt = pNd->GetSwpHints()[ nAttrPos ] )->GetStart() ); @@ -2765,7 +2765,7 @@ sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal ) const { nVal = Application::GetDefaultDevice()->LogicToPixel( Size( nVal, nVal ), MapMode( MAP_TWIP ) ).Width(); - if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein + if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein nVal = 1; } return nVal; @@ -2794,8 +2794,8 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt ) // die Default-Farbe nur Schreiben, wenn sie als Hint vorkommt //if( rHTMLWrt.bTagOn && !rHTMLWrt.bTxtAttr && rHTMLWrt.pDfltColor - // && rColor == *rHTMLWrt.pDfltColor ) - // return rWrt; + // && rColor == *rHTMLWrt.pDfltColor ) + // return rWrt; if( !rHTMLWrt.bTxtAttr && rHTMLWrt.bCfgOutStyles && rHTMLWrt.bCfgPreferStyles ) { @@ -3177,7 +3177,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, BOOL bOn ) if( bEvents ) HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable, rHTMLWrt.bCfgStarBasic, rHTMLWrt.eDestEnc, - &rHTMLWrt.aNonConvertableCharacters ); + &rHTMLWrt.aNonConvertableCharacters ); rWrt.Strm() << ">"; return rWrt; @@ -3345,37 +3345,37 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt ) SwAttrFnTab aHTMLAttrFnTab = { -/* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr, -/* RES_CHRATR_CHARSETCOLOR */ 0, -/* RES_CHRATR_COLOR */ OutHTML_SvxColor, -/* RES_CHRATR_CONTOUR */ 0, -/* RES_CHRATR_CROSSEDOUT */ OutHTML_SwCrossedOut, -/* RES_CHRATR_ESCAPEMENT */ OutHTML_SvxEscapement, -/* RES_CHRATR_FONT */ OutHTML_SvxFont, -/* RES_CHRATR_FONTSIZE */ OutHTML_SvxFontHeight, -/* RES_CHRATR_KERNING */ OutHTML_CSS1Attr, -/* RES_CHRATR_LANGUAGE */ OutHTML_SvxLanguage, -/* RES_CHRATR_POSTURE */ OutHTML_SwPosture, +/* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr, +/* RES_CHRATR_CHARSETCOLOR */ 0, +/* RES_CHRATR_COLOR */ OutHTML_SvxColor, +/* RES_CHRATR_CONTOUR */ 0, +/* RES_CHRATR_CROSSEDOUT */ OutHTML_SwCrossedOut, +/* RES_CHRATR_ESCAPEMENT */ OutHTML_SvxEscapement, +/* RES_CHRATR_FONT */ OutHTML_SvxFont, +/* RES_CHRATR_FONTSIZE */ OutHTML_SvxFontHeight, +/* RES_CHRATR_KERNING */ OutHTML_CSS1Attr, +/* RES_CHRATR_LANGUAGE */ OutHTML_SvxLanguage, +/* RES_CHRATR_POSTURE */ OutHTML_SwPosture, /* RES_CHRATR_PROPORTIONALFONTSIZE*/0, -/* RES_CHRATR_SHADOWED */ 0, -/* RES_CHRATR_UNDERLINE */ OutHTML_SwUnderline, -/* RES_CHRATR_WEIGHT */ OutHTML_SwWeight, -/* RES_CHRATR_WORDLINEMODE */ 0, -/* RES_CHRATR_AUTOKERN */ 0, -/* RES_CHRATR_BLINK */ OutHTML_SwBlink, -/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen +/* RES_CHRATR_SHADOWED */ 0, +/* RES_CHRATR_UNDERLINE */ OutHTML_SwUnderline, +/* RES_CHRATR_WEIGHT */ OutHTML_SwWeight, +/* RES_CHRATR_WORDLINEMODE */ 0, +/* RES_CHRATR_AUTOKERN */ 0, +/* RES_CHRATR_BLINK */ OutHTML_SwBlink, +/* RES_CHRATR_NOHYPHEN */ 0, // Neu: nicht trennen /* RES_CHRATR_NOLINEBREAK */ 0, // Neu: nicht umbrechen -/* RES_CHRATR_BACKGROUND */ OutHTML_CSS1Attr, // Neu: Zeichenhintergrund -/* RES_CHRATR_CJK_FONT */ OutHTML_SvxFont, -/* RES_CHRATR_CJK_FONTSIZE */ OutHTML_SvxFontHeight, -/* RES_CHRATR_CJK_LANGUAGE */ OutHTML_SvxLanguage, -/* RES_CHRATR_CJK_POSTURE */ OutHTML_SwPosture, -/* RES_CHRATR_CJK_WEIGHT */ OutHTML_SwWeight, -/* RES_CHRATR_CTL_FONT */ OutHTML_SvxFont, -/* RES_CHRATR_CTL_FONTSIZE */ OutHTML_SvxFontHeight, -/* RES_CHRATR_CTL_LANGUAGE */ OutHTML_SvxLanguage, -/* RES_CHRATR_CTL_POSTURE */ OutHTML_SwPosture, -/* RES_CHRATR_CTL_WEIGHT */ OutHTML_SwWeight, +/* RES_CHRATR_BACKGROUND */ OutHTML_CSS1Attr, // Neu: Zeichenhintergrund +/* RES_CHRATR_CJK_FONT */ OutHTML_SvxFont, +/* RES_CHRATR_CJK_FONTSIZE */ OutHTML_SvxFontHeight, +/* RES_CHRATR_CJK_LANGUAGE */ OutHTML_SvxLanguage, +/* RES_CHRATR_CJK_POSTURE */ OutHTML_SwPosture, +/* RES_CHRATR_CJK_WEIGHT */ OutHTML_SwWeight, +/* RES_CHRATR_CTL_FONT */ OutHTML_SvxFont, +/* RES_CHRATR_CTL_FONTSIZE */ OutHTML_SvxFontHeight, +/* RES_CHRATR_CTL_LANGUAGE */ OutHTML_SvxLanguage, +/* RES_CHRATR_CTL_POSTURE */ OutHTML_SwPosture, +/* RES_CHRATR_CTL_WEIGHT */ OutHTML_SwWeight, /* RES_CHRATR_ROTATE */ 0, /* RES_CHRATR_EMPHASIS_MARK */ 0, /* RES_CHRATR_TWO_LINES */ 0, @@ -3397,26 +3397,26 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_TXTATR_UNKNOWN_CONTAINER */ 0, /* RES_TXTATR_DUMMY5 */ 0, -/* RES_TXTATR_FIELD */ OutHTML_SwFmtFld, -/* RES_TXTATR_FLYCNT */ OutHTML_SwFlyCnt, -/* RES_TXTATR_FTN */ OutHTML_SwFmtFtn, +/* RES_TXTATR_FIELD */ OutHTML_SwFmtFld, +/* RES_TXTATR_FLYCNT */ OutHTML_SwFlyCnt, +/* RES_TXTATR_FTN */ OutHTML_SwFmtFtn, /* RES_TXTATR_DUMMY4 */ 0, /* RES_TXTATR_DUMMY3 */ 0, -/* RES_TXTATR_DUMMY1 */ 0, // Dummy: -/* RES_TXTATR_DUMMY2 */ 0, // Dummy: - -/* RES_PARATR_LINESPACING */ 0, -/* RES_PARATR_ADJUST */ OutHTML_SvxAdjust, -/* RES_PARATR_SPLIT */ 0, -/* RES_PARATR_WIDOWS */ 0, -/* RES_PARATR_ORPHANS */ 0, -/* RES_PARATR_TABSTOP */ 0, +/* RES_TXTATR_DUMMY1 */ 0, // Dummy: +/* RES_TXTATR_DUMMY2 */ 0, // Dummy: + +/* RES_PARATR_LINESPACING */ 0, +/* RES_PARATR_ADJUST */ OutHTML_SvxAdjust, +/* RES_PARATR_SPLIT */ 0, +/* RES_PARATR_WIDOWS */ 0, +/* RES_PARATR_ORPHANS */ 0, +/* RES_PARATR_TABSTOP */ 0, /* RES_PARATR_HYPHENZONE*/ 0, -/* RES_PARATR_DROP */ OutHTML_CSS1Attr, -/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit -/* RES_PARATR_NUMRULE */ 0, // Dummy: -/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy: -/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy: +/* RES_PARATR_DROP */ OutHTML_CSS1Attr, +/* RES_PARATR_REGISTER */ 0, // neu: Registerhaltigkeit +/* RES_PARATR_NUMRULE */ 0, // Dummy: +/* RES_PARATR_SCRIPTSPACE */ 0, // Dummy: +/* RES_PARATR_HANGINGPUNCTUATION */ 0, // Dummy: /* RES_PARATR_FORBIDDEN_RULES */ 0, // new /* RES_PARATR_VERTALIGN */ 0, // new /* RES_PARATR_SNAPTOGRID*/ 0, // new @@ -3428,41 +3428,41 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_PARATR_LIST_RESTARTVALUE */ 0, // new /* RES_PARATR_LIST_ISCOUNTED */ 0, // new -/* RES_FILL_ORDER */ 0, -/* RES_FRM_SIZE */ 0, -/* RES_PAPER_BIN */ 0, -/* RES_LR_SPACE */ 0, -/* RES_UL_SPACE */ 0, -/* RES_PAGEDESC */ 0, -/* RES_BREAK */ 0, -/* RES_CNTNT */ 0, -/* RES_HEADER */ 0, -/* RES_FOOTER */ 0, -/* RES_PRINT */ 0, -/* RES_OPAQUE */ 0, -/* RES_PROTECT */ 0, -/* RES_SURROUND */ 0, -/* RES_VERT_ORIENT */ 0, -/* RES_HORI_ORIENT */ 0, -/* RES_ANCHOR */ 0, -/* RES_BACKGROUND */ 0, -/* RES_BOX */ 0, -/* RES_SHADOW */ 0, -/* RES_FRMMACRO */ 0, -/* RES_COL */ 0, -/* RES_KEEP */ 0, -/* RES_URL */ 0, -/* RES_EDIT_IN_READONLY */ 0, -/* RES_LAYOUT_SPLIT */ 0, -/* RES_FRMATR_DUMMY1 */ 0, // Dummy: -/* RES_FRMATR_DUMMY2 */ 0, // Dummy: -/* RES_AUTO_STYLE */ 0, // Dummy: -/* RES_FRMATR_DUMMY4 */ 0, // Dummy: -/* RES_FRMATR_DUMMY5 */ 0, // Dummy: -/* RES_FRMATR_DUMMY6 */ 0, // Dummy: -/* RES_FRMATR_DUMMY7 */ 0, // Dummy: -/* RES_FRMATR_DUMMY8 */ 0, // Dummy: -/* RES_FRMATR_DUMMY9 */ 0, // Dummy: +/* RES_FILL_ORDER */ 0, +/* RES_FRM_SIZE */ 0, +/* RES_PAPER_BIN */ 0, +/* RES_LR_SPACE */ 0, +/* RES_UL_SPACE */ 0, +/* RES_PAGEDESC */ 0, +/* RES_BREAK */ 0, +/* RES_CNTNT */ 0, +/* RES_HEADER */ 0, +/* RES_FOOTER */ 0, +/* RES_PRINT */ 0, +/* RES_OPAQUE */ 0, +/* RES_PROTECT */ 0, +/* RES_SURROUND */ 0, +/* RES_VERT_ORIENT */ 0, +/* RES_HORI_ORIENT */ 0, +/* RES_ANCHOR */ 0, +/* RES_BACKGROUND */ 0, +/* RES_BOX */ 0, +/* RES_SHADOW */ 0, +/* RES_FRMMACRO */ 0, +/* RES_COL */ 0, +/* RES_KEEP */ 0, +/* RES_URL */ 0, +/* RES_EDIT_IN_READONLY */ 0, +/* RES_LAYOUT_SPLIT */ 0, +/* RES_FRMATR_DUMMY1 */ 0, // Dummy: +/* RES_FRMATR_DUMMY2 */ 0, // Dummy: +/* RES_AUTO_STYLE */ 0, // Dummy: +/* RES_FRMATR_DUMMY4 */ 0, // Dummy: +/* RES_FRMATR_DUMMY5 */ 0, // Dummy: +/* RES_FRMATR_DUMMY6 */ 0, // Dummy: +/* RES_FRMATR_DUMMY7 */ 0, // Dummy: +/* RES_FRMATR_DUMMY8 */ 0, // Dummy: +/* RES_FRMATR_DUMMY9 */ 0, // Dummy: /* RES_FOLLOW_TEXT_FLOW */ 0, /* RES_WRAP_INFLUENCE_ON_OBJPOS */ 0, /* RES_FRMATR_DUMMY2 */ 0, // Dummy: @@ -3470,25 +3470,25 @@ SwAttrFnTab aHTMLAttrFnTab = { /* RES_FRMATR_DUMMY4 */ 0, // Dummy: /* RES_FRMATR_DUMMY5 */ 0, // Dummy: -/* RES_GRFATR_MIRRORGRF */ 0, -/* RES_GRFATR_CROPGRF */ 0, -/* RES_GRFATR_ROTATION */ 0, -/* RES_GRFATR_LUMINANCE */ 0, -/* RES_GRFATR_CONTRAST */ 0, -/* RES_GRFATR_CHANNELR */ 0, -/* RES_GRFATR_CHANNELG */ 0, -/* RES_GRFATR_CHANNELB */ 0, -/* RES_GRFATR_GAMMA */ 0, -/* RES_GRFATR_INVERT */ 0, -/* RES_GRFATR_TRANSPARENCY */ 0, -/* RES_GRFATR_DRWAMODE */ 0, -/* RES_GRFATR_DUMMY1 */ 0, -/* RES_GRFATR_DUMMY2 */ 0, -/* RES_GRFATR_DUMMY3 */ 0, -/* RES_GRFATR_DUMMY4 */ 0, -/* RES_GRFATR_DUMMY5 */ 0, - -/* RES_BOXATR_FORMAT */ 0, -/* RES_BOXATR_FORMULA */ 0, -/* RES_BOXATR_VALUE */ 0 +/* RES_GRFATR_MIRRORGRF */ 0, +/* RES_GRFATR_CROPGRF */ 0, +/* RES_GRFATR_ROTATION */ 0, +/* RES_GRFATR_LUMINANCE */ 0, +/* RES_GRFATR_CONTRAST */ 0, +/* RES_GRFATR_CHANNELR */ 0, +/* RES_GRFATR_CHANNELG */ 0, +/* RES_GRFATR_CHANNELB */ 0, +/* RES_GRFATR_GAMMA */ 0, +/* RES_GRFATR_INVERT */ 0, +/* RES_GRFATR_TRANSPARENCY */ 0, +/* RES_GRFATR_DRWAMODE */ 0, +/* RES_GRFATR_DUMMY1 */ 0, +/* RES_GRFATR_DUMMY2 */ 0, +/* RES_GRFATR_DUMMY3 */ 0, +/* RES_GRFATR_DUMMY4 */ 0, +/* RES_GRFATR_DUMMY5 */ 0, + +/* RES_BOXATR_FORMAT */ 0, +/* RES_BOXATR_FORMULA */ 0, +/* RES_BOXATR_VALUE */ 0 }; diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 6a6bcc04b34c..48d1e293ed1b 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,11 +64,11 @@ using namespace ::com::sun::star::container; static HTMLOutEvent __FAR_DATA aBodyEventTable[] = { - { 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 } + { 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 } }; @@ -103,8 +103,8 @@ void SwHTMLParser::EndScript() aScriptSource.ConvertLineEnd(); // MIB 23.5.97: SGML-Kommentare brauchen nicht mehr entfernt zu werden, -// weil JS das jetzt selber kann. -// RemoveSGMLComment( aScriptSource, TRUE ); +// weil JS das jetzt selber kann. +// RemoveSGMLComment( aScriptSource, TRUE ); // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den // Modulnamen in einem Feld merken merken @@ -286,7 +286,7 @@ void SwHTMLWriter::OutBasic() BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager(); ASSERT( pBasicMan, "Wo ist der Basic-Manager?" ); //JP 17.07.96: Bug 29538 - nur das DocumentBasic schreiben - if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() ) + if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() ) { SFX_APP()->LeaveBasicCall(); return; @@ -328,7 +328,7 @@ void SwHTMLWriter::OutBasic() } const String& rModName = pModule->GetName(); - Strm() << SwHTMLWriter::sNewLine; // nicht einruecken! + Strm() << SwHTMLWriter::sNewLine; // nicht einruecken! HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(), sLang, eType, aEmptyStr, &rLibName, &rModName, @@ -341,7 +341,7 @@ void SwHTMLWriter::OutBasic() static const char* aEventNames[] = { - "OnLoad", "OnPrepareUnload", "OnFocus", "OnUnfocus" + "OnLoad", "OnPrepareUnload", "OnFocus", "OnUnfocus" }; void SwHTMLWriter::OutBasicBodyEvents() diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 9d05d833c2d2..b1dd98e21a03 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -174,9 +174,9 @@ BOOL SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet, case SVX_CSS1_PBREAK_AUTO: bSetBreak = bSetPageDesc = TRUE; break; -// case SVX_CSS1_PBREAK_AVOID: +// case SVX_CSS1_PBREAK_AVOID: // Hier koennte man SvxKeepItem am Absatz davor einfuegen -// break; +// break; default: ; } @@ -1189,24 +1189,24 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( USHORT nToken2, const String& rClass ) const const sal_Char* sName = 0; switch( nToken2 ) { - case HTML_EMPHASIS_ON: nPoolId = RES_POOLCHR_HTML_EMPHASIS; break; - case HTML_CITIATION_ON: nPoolId = RES_POOLCHR_HTML_CITIATION; break; - case HTML_STRONG_ON: nPoolId = RES_POOLCHR_HTML_STRONG; break; - case HTML_CODE_ON: nPoolId = RES_POOLCHR_HTML_CODE; break; - case HTML_SAMPLE_ON: nPoolId = RES_POOLCHR_HTML_SAMPLE; break; - case HTML_KEYBOARD_ON: nPoolId = RES_POOLCHR_HTML_KEYBOARD; break; - case HTML_VARIABLE_ON: nPoolId = RES_POOLCHR_HTML_VARIABLE; break; - 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 = 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; + case HTML_EMPHASIS_ON: nPoolId = RES_POOLCHR_HTML_EMPHASIS; break; + case HTML_CITIATION_ON: nPoolId = RES_POOLCHR_HTML_CITIATION; break; + case HTML_STRONG_ON: nPoolId = RES_POOLCHR_HTML_STRONG; break; + case HTML_CODE_ON: nPoolId = RES_POOLCHR_HTML_CODE; break; + case HTML_SAMPLE_ON: nPoolId = RES_POOLCHR_HTML_SAMPLE; break; + case HTML_KEYBOARD_ON: nPoolId = RES_POOLCHR_HTML_KEYBOARD; break; + case HTML_VARIABLE_ON: nPoolId = RES_POOLCHR_HTML_VARIABLE; break; + 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 = 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) @@ -1322,7 +1322,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( USHORT nTxtColl, } String sName; - if( USER_FMT & nTxtColl ) // eine vom Reader angelegte + if( USER_FMT & nTxtColl ) // eine vom Reader angelegte { ASSERT( !this, "Wo kommt die Benutzer-Vorlage her?" ); pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD ); @@ -1488,12 +1488,12 @@ BOOL SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo, BOOL bAutoWidth ) { // abs-pos - // left/top none auto twip perc + // left/top none auto twip perc // - // none Z Z - - - // auto Z Z - - - // twip Z Z S/R - - // perc - - - - + // none Z Z - - + // auto Z Z - - + // twip Z Z S/R - + // perc - - - - // // - das Tag wird absolut positioniert und left/top sind beide // gegeben und enthalten auch keine %-Angabe, oder @@ -1502,9 +1502,9 @@ BOOL SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo, return ( ( SVX_CSS1_POS_ABSOLUTE == rPropInfo.ePosition && SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eLeftType && SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eTopType && - (SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType || - SVX_CSS1_LTYPE_TWIP != rPropInfo.eTopType) ) || - ( SVX_ADJUST_END != rPropInfo.eFloat ) ) && + (SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType || + SVX_CSS1_LTYPE_TWIP != rPropInfo.eTopType) ) || + ( SVX_ADJUST_END != rPropInfo.eFloat ) ) && ( bAutoWidth || SVX_CSS1_LTYPE_TWIP == rPropInfo.eWidthType || SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.eWidthType ); @@ -1518,8 +1518,8 @@ void SwCSS1Parser::AddClassName( String& rFmtName, const String& rClass ) ASSERT( rClass.Len(), "Style-Klasse ohne Laenge?" ); // ?????????? -// String aTmp( rClass ); -// GetpApp()->GetAppInternational().ToLower( aTmp ); +// String aTmp( rClass ); +// GetpApp()->GetAppInternational().ToLower( aTmp ); (rFmtName += '.') += rClass; } @@ -1918,13 +1918,13 @@ BOOL SwCSS1Parser::ParseStyleSheet( const String& rIn ) pPageEntry->GetPropertyInfo() ); SetPageDescAttrs( GetRightPageDesc(), pPageEntry->GetItemSet(), pPageEntry->GetPropertyInfo() ); -// if( pNamedPageDescs ) -// { -// for( USHORT i=0; i<pNamedPageDescs->Count(); i++ ) -// SetPageDescAttrs( (*pNamedPageDescs)[i], -// pPageEntry->GetItemSet(), -// pPageEntry->GetPropertyInfo() ); -// } +// if( pNamedPageDescs ) +// { +// for( USHORT i=0; i<pNamedPageDescs->Count(); i++ ) +// SetPageDescAttrs( (*pNamedPageDescs)[i], +// pPageEntry->GetItemSet(), +// pPageEntry->GetPropertyInfo() ); +// } } @@ -1950,27 +1950,27 @@ BOOL SwCSS1Parser::ParseStyleSheet( const String& rIn ) pPageEntry->GetPropertyInfo() ); // und jetzt noch die benannten Vorlagen -// for( USHORT i=0; i < GetPageCount(); i++ ) -// { -// pPageEntry = GetPage( i ); -// const String& rKey = pPageEntry->GetKey(); -// if( !rKey.Len() || rKey.GetChar(0) == ':' ) -// continue; +// for( USHORT i=0; i < GetPageCount(); i++ ) +// { +// pPageEntry = GetPage( i ); +// const String& rKey = pPageEntry->GetKey(); +// if( !rKey.Len() || rKey.GetChar(0) == ':' ) +// continue; // -// String aName( rKey ); -// GetpApp()->GetAppInternational().ToLower( aName ); -// USHORT nPage = pDoc->MakePageDesc( aName ); -// SwPageDesc *pPageDesc = &pDoc->_GetPageDesc( nPage ); +// String aName( rKey ); +// GetpApp()->GetAppInternational().ToLower( aName ); +// USHORT nPage = pDoc->MakePageDesc( aName ); +// SwPageDesc *pPageDesc = &pDoc->_GetPageDesc( nPage ); // -// // Die neue Seitenvorlage entsteht aus dem Master durch kopieren. -// pDoc->CopyPageDesc( *pMasterPageDesc, *pPageDesc ); -// SetPageDescAttrs( pPageDesc, pPageEntry->GetItemSet(), -// pPageEntry->GetPropertyInfo() ); +// // Die neue Seitenvorlage entsteht aus dem Master durch kopieren. +// pDoc->CopyPageDesc( *pMasterPageDesc, *pPageDesc ); +// SetPageDescAttrs( pPageDesc, pPageEntry->GetItemSet(), +// pPageEntry->GetPropertyInfo() ); // -// if( !pNamedPageDescs ) -// pNamedPageDescs = new SwHTMLPageDescs; -// pNamedPageDescs->Insert( pPageDesc, pNamedPageDescs->Count() ); -// } +// if( !pNamedPageDescs ) +// pNamedPageDescs = new SwHTMLPageDescs; +// pNamedPageDescs->Insert( pPageDesc, pNamedPageDescs->Count() ); +// } return TRUE; } diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 485ac5dd2a2b..d8fd133f4357 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,23 +55,23 @@ using namespace ::com::sun::star; class _HTMLAttrContext_SaveDoc { - SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung - SwPosition *pPos; // hierhin beim verlassen den + SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung + SwPosition *pPos; // hierhin beim verlassen den // Kontexts zurueckgesprungen - _HTMLAttrTable *pAttrTab; // In Umgebung gueltige Attribute, + _HTMLAttrTable *pAttrTab; // In Umgebung gueltige Attribute, // wenn Attributierung nicht // beibehalten werden soll. - USHORT nContextStMin; // In Umgebung gueltige Stack- + USHORT nContextStMin; // In Umgebung gueltige Stack- // Untergrenze, wenn der Stack // geschuetzt werden soll. - USHORT nContextStAttrMin; // In Umgebung gueltige Stack- + USHORT nContextStAttrMin; // In Umgebung gueltige Stack- // Untergrenze, wenn die Attribute // nicht beibehalten werden sollen. - BOOL bStripTrailingPara : 1; // letzen Absatz entfernen? - BOOL bKeepNumRules : 1; // Numerierung beibehalten? - BOOL bPopStack : 1; // Stack-Elemente oberhalb des + BOOL bStripTrailingPara : 1; // letzen Absatz entfernen? + BOOL bKeepNumRules : 1; // Numerierung beibehalten? + BOOL bPopStack : 1; // Stack-Elemente oberhalb des // zu schliessenden entfernen? BOOL bFixHeaderDist : 1; BOOL bFixFooterDist : 1; diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index e0f8be92c93e..56f112a8bf41 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,27 +70,27 @@ using namespace ::com::sun::star; -const sal_uInt32 HTML_FRMOPTS_MARQUEE = +const sal_uInt32 HTML_FRMOPTS_MARQUEE = HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE; -const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 = +const sal_uInt32 HTML_FRMOPTS_MARQUEE_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; static HTMLOptionEnum __FAR_DATA aHTMLMarqBehaviorTable[] = { - { 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 } + { 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[] = { - { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT }, - { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT }, - { 0, 0 } + { OOO_STRING_SVTOOLS_HTML_AL_left, SDRTEXTANI_LEFT }, + { OOO_STRING_SVTOOLS_HTML_AL_right, SDRTEXTANI_RIGHT }, + { 0, 0 } }; /* */ @@ -180,7 +180,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, SwFmtAnchor aAnchor( FLY_AS_CHAR ); if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition && SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType && - SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType ) + SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType ) { const SwStartNode *pFlySttNd = pDoc->GetNodes()[pPam->GetPoint()->nNode]->FindFlyStartNode(); @@ -237,23 +237,23 @@ static void PutEEPoolItem( SfxItemSet &rEEItemSet, switch( rSwItem.Which() ) { - case RES_CHRATR_COLOR: nEEWhich = EE_CHAR_COLOR; break; - case RES_CHRATR_CROSSEDOUT: nEEWhich = EE_CHAR_STRIKEOUT; break; - case RES_CHRATR_ESCAPEMENT: nEEWhich = EE_CHAR_ESCAPEMENT; break; - case RES_CHRATR_FONT: nEEWhich = EE_CHAR_FONTINFO; break; - case RES_CHRATR_CJK_FONT: nEEWhich = EE_CHAR_FONTINFO_CJK; break; - case RES_CHRATR_CTL_FONT: nEEWhich = EE_CHAR_FONTINFO_CTL; break; - case RES_CHRATR_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT; break; - case RES_CHRATR_CJK_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CJK; break; - case RES_CHRATR_CTL_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CTL; break; - case RES_CHRATR_KERNING: nEEWhich = EE_CHAR_KERNING; break; - case RES_CHRATR_POSTURE: nEEWhich = EE_CHAR_ITALIC; break; - case RES_CHRATR_CJK_POSTURE: nEEWhich = EE_CHAR_ITALIC_CJK; break; - case RES_CHRATR_CTL_POSTURE: nEEWhich = EE_CHAR_ITALIC_CTL; break; - case RES_CHRATR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE; break; - case RES_CHRATR_WEIGHT: nEEWhich = EE_CHAR_WEIGHT; break; - case RES_CHRATR_CJK_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CJK; break; - case RES_CHRATR_CTL_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CTL; break; + case RES_CHRATR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case RES_CHRATR_CROSSEDOUT: nEEWhich = EE_CHAR_STRIKEOUT; break; + case RES_CHRATR_ESCAPEMENT: nEEWhich = EE_CHAR_ESCAPEMENT; break; + case RES_CHRATR_FONT: nEEWhich = EE_CHAR_FONTINFO; break; + case RES_CHRATR_CJK_FONT: nEEWhich = EE_CHAR_FONTINFO_CJK; break; + case RES_CHRATR_CTL_FONT: nEEWhich = EE_CHAR_FONTINFO_CTL; break; + case RES_CHRATR_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT; break; + case RES_CHRATR_CJK_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CJK; break; + case RES_CHRATR_CTL_FONTSIZE: nEEWhich = EE_CHAR_FONTHEIGHT_CTL; break; + case RES_CHRATR_KERNING: nEEWhich = EE_CHAR_KERNING; break; + case RES_CHRATR_POSTURE: nEEWhich = EE_CHAR_ITALIC; break; + case RES_CHRATR_CJK_POSTURE: nEEWhich = EE_CHAR_ITALIC_CJK; break; + case RES_CHRATR_CTL_POSTURE: nEEWhich = EE_CHAR_ITALIC_CTL; break; + case RES_CHRATR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE; break; + case RES_CHRATR_WEIGHT: nEEWhich = EE_CHAR_WEIGHT; break; + case RES_CHRATR_CJK_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CJK; break; + case RES_CHRATR_CTL_WEIGHT: nEEWhich = EE_CHAR_WEIGHT_CTL; break; case RES_BACKGROUND: case RES_CHRATR_BACKGROUND: { @@ -405,10 +405,10 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) eAniDir = SDRTEXTANI_RIGHT; // die fuer das Scrollen benoetigten Attribute umsetzen - sal_uInt16 aWhichMap[7] = { XATTR_FILL_FIRST, XATTR_FILL_LAST, + sal_uInt16 aWhichMap[7] = { XATTR_FILL_FIRST, XATTR_FILL_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, - EE_CHAR_START, EE_CHAR_END, - 0 }; + EE_CHAR_START, EE_CHAR_END, + 0 }; SfxItemSet aItemSet( pModel->GetItemPool(), aWhichMap ); aItemSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); aItemSet.Put( SdrTextAutoGrowHeightItem( sal_True ) ); @@ -554,7 +554,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) // und das Objekt in das Dok einfuegen InsertDrawObject( pMarquee, aSpace, eVertOri, eHoriOri, aStyleItemSet, - aPropInfo ); + aPropInfo ); // Das Zeichen-Objekt der Tabelle bekanntmachen. Ist ein bisserl // umstaendlich, weil noch ueber den Parser gegangen wird, obwohl die @@ -647,23 +647,23 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet, sal_uInt16 nSwWhich = 0; switch( nEEWhich ) { - case EE_CHAR_COLOR: nSwWhich = RES_CHRATR_COLOR; break; - case EE_CHAR_STRIKEOUT: nSwWhich = RES_CHRATR_CROSSEDOUT; break; - case EE_CHAR_ESCAPEMENT: nSwWhich = RES_CHRATR_ESCAPEMENT; break; - case EE_CHAR_FONTINFO: nSwWhich = RES_CHRATR_FONT; break; - case EE_CHAR_FONTINFO_CJK: nSwWhich = RES_CHRATR_CJK_FONT; break; - case EE_CHAR_FONTINFO_CTL: nSwWhich = RES_CHRATR_CTL_FONT; break; - case EE_CHAR_FONTHEIGHT: nSwWhich = RES_CHRATR_FONTSIZE; break; + case EE_CHAR_COLOR: nSwWhich = RES_CHRATR_COLOR; break; + case EE_CHAR_STRIKEOUT: nSwWhich = RES_CHRATR_CROSSEDOUT; break; + case EE_CHAR_ESCAPEMENT: nSwWhich = RES_CHRATR_ESCAPEMENT; break; + case EE_CHAR_FONTINFO: nSwWhich = RES_CHRATR_FONT; break; + case EE_CHAR_FONTINFO_CJK: nSwWhich = RES_CHRATR_CJK_FONT; break; + case EE_CHAR_FONTINFO_CTL: nSwWhich = RES_CHRATR_CTL_FONT; break; + case EE_CHAR_FONTHEIGHT: nSwWhich = RES_CHRATR_FONTSIZE; break; case EE_CHAR_FONTHEIGHT_CJK:nSwWhich = RES_CHRATR_CJK_FONTSIZE; break; case EE_CHAR_FONTHEIGHT_CTL:nSwWhich = RES_CHRATR_CTL_FONTSIZE; break; - case EE_CHAR_KERNING: nSwWhich = RES_CHRATR_KERNING; break; - case EE_CHAR_ITALIC: nSwWhich = RES_CHRATR_POSTURE; break; - case EE_CHAR_ITALIC_CJK: nSwWhich = RES_CHRATR_CJK_POSTURE; break; - case EE_CHAR_ITALIC_CTL: nSwWhich = RES_CHRATR_CTL_POSTURE; break; - case EE_CHAR_UNDERLINE: nSwWhich = RES_CHRATR_UNDERLINE; break; - case EE_CHAR_WEIGHT: nSwWhich = RES_CHRATR_WEIGHT; break; - case EE_CHAR_WEIGHT_CJK: nSwWhich = RES_CHRATR_CJK_WEIGHT; break; - case EE_CHAR_WEIGHT_CTL: nSwWhich = RES_CHRATR_CTL_WEIGHT; break; + case EE_CHAR_KERNING: nSwWhich = RES_CHRATR_KERNING; break; + case EE_CHAR_ITALIC: nSwWhich = RES_CHRATR_POSTURE; break; + case EE_CHAR_ITALIC_CJK: nSwWhich = RES_CHRATR_CJK_POSTURE; break; + case EE_CHAR_ITALIC_CTL: nSwWhich = RES_CHRATR_CTL_POSTURE; break; + case EE_CHAR_UNDERLINE: nSwWhich = RES_CHRATR_UNDERLINE; break; + case EE_CHAR_WEIGHT: nSwWhich = RES_CHRATR_WEIGHT; break; + case EE_CHAR_WEIGHT_CJK: nSwWhich = RES_CHRATR_CJK_WEIGHT; break; + case EE_CHAR_WEIGHT_CTL: nSwWhich = RES_CHRATR_CTL_WEIGHT; break; } if( nSwWhich ) @@ -717,9 +717,9 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, const sal_Char *pStr = 0; switch( eAniKind ) { - 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; + 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: ; } @@ -732,8 +732,8 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, SdrTextAniDirection eAniDir = pTextObj->GetTextAniDirection(); switch( eAniDir ) { - case SDRTEXTANI_LEFT: pStr = OOO_STRING_SVTOOLS_HTML_AL_left; break; - case SDRTEXTANI_RIGHT: pStr = OOO_STRING_SVTOOLS_HTML_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: ; } diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 28fd4124bf05..c1f7d34bd380 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,71 +57,71 @@ struct HTMLNumFmtTblEntry static HTMLOptionEnum __FAR_DATA aHTMLFldTypeTable[] = { - { 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 } + { 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[] = { - { "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 } + { "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[] = { - { "SYS", NF_TIME_HHMMSS }, - { "SSMM24", NF_TIME_HHMM }, - { "SSMM12", NF_TIME_HHMMAMPM }, - { 0, NF_NUMERIC_START } + { "SYS", NF_TIME_HHMMSS }, + { "SSMM24", NF_TIME_HHMM }, + { "SSMM12", NF_TIME_HHMMAMPM }, + { 0, NF_NUMERIC_START } }; static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldFmtTable[] = { - { 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 } + { 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[] = { - { 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_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 }, @@ -132,75 +132,75 @@ static HTMLOptionEnum __FAR_DATA aHTMLExtUsrFldSubTable[] = { 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 } + { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLAuthorFldFmtTable[] = { - { OOO_STRING_SW_HTML_FF_name, AF_NAME }, - { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT }, - { 0, 0 } + { OOO_STRING_SW_HTML_FF_name, AF_NAME }, + { OOO_STRING_SW_HTML_FF_shortcut, AF_SHORTCUT }, + { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLPageNumFldSubTable[] = { - { 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 } + { 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 } }; // UGLY: these are extensions of nsSwDocInfoSubType (in inc/docufld.hxx) // these are necessary for importing document info fields written by // older versions of OOo (< 3.0) which did not have DI_CUSTOM fields - const SwDocInfoSubType DI_INFO1 = DI_SUBTYPE_END + 1; - const SwDocInfoSubType DI_INFO2 = DI_SUBTYPE_END + 2; - const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3; - const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4; + const SwDocInfoSubType DI_INFO1 = DI_SUBTYPE_END + 1; + const SwDocInfoSubType DI_INFO2 = DI_SUBTYPE_END + 2; + const SwDocInfoSubType DI_INFO3 = DI_SUBTYPE_END + 3; + const SwDocInfoSubType DI_INFO4 = DI_SUBTYPE_END + 4; static HTMLOptionEnum __FAR_DATA aHTMLDocInfoFldSubTable[] = { - { 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_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 } + { "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[] = { - { 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 } + { 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[] = { - { 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 } + { 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[] = { - { 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 } + { 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 } }; /* */ @@ -363,7 +363,7 @@ void SwHTMLParser::NewField() if( aValue.Len() ) nSub |= FIXEDFLD; - SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); + SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); if( pFmtOption ) { const String& rFmt = pFmtOption->GetString(); @@ -395,7 +395,7 @@ void SwHTMLParser::NewField() { USHORT nSub = 0; - SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); + SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); sal_uInt32 nNumFmt; LanguageType eLang; double dValue = GetTableDataOptionsValNum( @@ -404,7 +404,7 @@ void SwHTMLParser::NewField() short nFmtType = pFormatter->GetType( nNumFmt ); switch( nFmtType ) { - case NUMBERFORMAT_DATE: nSub = DATEFLD; break; + case NUMBERFORMAT_DATE: nSub = DATEFLD; break; case NUMBERFORMAT_TIME: nSub = TIMEFLD; break; } diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx index 2ba89a9af6de..b139c8c72b8b 100644 --- a/sw/source/filter/html/htmlfld.hxx +++ b/sw/source/filter/html/htmlfld.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 50b7bdc7ddc8..32234b79294a 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,16 +53,16 @@ const sal_Char *SwHTMLWriter::GetNumFormat( USHORT nFmt ) switch( (SvxExtNumType)nFmt ) { - 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; + 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: ; } @@ -80,14 +80,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, USHORT nField = pFldTyp->Which(); ULONG nFmt = pFld->GetFormat(); - const sal_Char *pTypeStr=0, // TYPE - *pSubStr=0, // SUBTYPE - *pFmtStr=0; // FORMAT (SW) - String aValue; // VALUE (SW) - BOOL bNumFmt=FALSE; // SDNUM (Number-Formatter-Format) - BOOL bNumValue=FALSE; // SDVAL (Number-Formatter-Value) - double dNumValue = 0.0; // SDVAL (Number-Formatter-Value) - BOOL bFixed=FALSE; // SDFIXED + const sal_Char *pTypeStr=0, // TYPE + *pSubStr=0, // SUBTYPE + *pFmtStr=0; // FORMAT (SW) + String aValue; // VALUE (SW) + BOOL bNumFmt=FALSE; // SDNUM (Number-Formatter-Format) + BOOL bNumValue=FALSE; // SDVAL (Number-Formatter-Value) + double dNumValue = 0.0; // SDVAL (Number-Formatter-Value) + BOOL bFixed=FALSE; // SDFIXED String aName; // NAME (CUSTOM) switch( nField ) @@ -96,21 +96,21 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, pTypeStr = OOO_STRING_SW_HTML_FT_sender; switch( (SwExtUserSubType)pFld->GetSubType() ) { - 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; + 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: ; } @@ -122,8 +122,8 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, pTypeStr = OOO_STRING_SW_HTML_FT_author; switch( (SwAuthorFormat)nFmt & 0xff) { - case AF_NAME: pFmtStr = OOO_STRING_SW_HTML_FF_name; break; - case AF_SHORTCUT: pFmtStr = OOO_STRING_SW_HTML_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(); @@ -145,9 +145,9 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, SwPageNumSubType eSubType = (SwPageNumSubType)pFld->GetSubType(); switch( eSubType ) { - 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; + 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) ); @@ -178,14 +178,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, switch( nSubType ) { - 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_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; + 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; } if( DI_CUSTOM == nSubType ) { @@ -236,14 +236,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, USHORT nSubType = pFld->GetSubType(); switch( nSubType ) { - 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; + 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) ); } @@ -253,10 +253,10 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, pTypeStr = OOO_STRING_SW_HTML_FT_filename; switch( (SwFileNameFormat)(nFmt & ~FF_FIXED) ) { - 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; + 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,9 +369,9 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, sal_uInt16 *pWhichIds = 0; switch( nScript ) { - case CSS1_OUTMODE_WESTERN: pWhichIds = aWesternWhichIds; break; - case CSS1_OUTMODE_CJK: pWhichIds = aCJKWhichIds; break; - case CSS1_OUTMODE_CTL: pWhichIds = aCTLWhichIds; break; + case CSS1_OUTMODE_WESTERN: pWhichIds = aWesternWhichIds; break; + case CSS1_OUTMODE_CJK: pWhichIds = aCJKWhichIds; break; + case CSS1_OUTMODE_CTL: pWhichIds = aCTLWhichIds; break; } rHTMLWrt.bTagOn = TRUE; diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 88fe896d6a17..e11a5cdf43e1 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,25 +77,25 @@ using namespace ::com::sun::star; //////////////////////////////////////////////////////////// -const ULONG HTML_FRMOPTS_IMG_ALL = +const ULONG HTML_FRMOPTS_IMG_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE | HTML_FRMOPT_ANYSIZE | HTML_FRMOPT_BORDER | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_IMG_CNTNR = +const ULONG HTML_FRMOPTS_IMG_CNTNR = HTML_FRMOPTS_IMG_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_IMG = +const ULONG HTML_FRMOPTS_IMG = HTML_FRMOPTS_IMG_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BRCLEAR; -const ULONG HTML_FRMOPTS_IMG_CSS1 = +const ULONG HTML_FRMOPTS_IMG_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; -const ULONG HTML_FRMOPTS_DIV = +const ULONG HTML_FRMOPTS_DIV = HTML_FRMOPT_ID | HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SIZE | @@ -107,22 +107,22 @@ const ULONG HTML_FRMOPTS_DIV = HTML_FRMOPT_BRCLEAR | HTML_FRMOPT_DIR; -const ULONG HTML_FRMOPTS_MULTICOL = +const ULONG HTML_FRMOPTS_MULTICOL = HTML_FRMOPT_ID | HTML_FRMOPT_WIDTH | HTML_FRMOPT_ANYSIZE | HTML_FRMOPT_ABSSIZE | HTML_FRMOPT_DIR; -const ULONG HTML_FRMOPTS_MULTICOL_CNTNR = +const ULONG HTML_FRMOPTS_MULTICOL_CNTNR = HTML_FRMOPTS_MULTICOL; -const ULONG HTML_FRMOPTS_MULTICOL_CSS1 = +const ULONG HTML_FRMOPTS_MULTICOL_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SIZE | HTML_FRMOPT_S_SPACE | HTML_FRMOPT_S_BORDER| HTML_FRMOPT_S_BACKGROUND; -const ULONG HTML_FRMOPTS_SPACER = +const ULONG HTML_FRMOPTS_SPACER = HTML_FRMOPT_ALIGN | HTML_FRMOPT_SIZE | HTML_FRMOPT_ANYSIZE | @@ -130,7 +130,7 @@ const ULONG HTML_FRMOPTS_SPACER = HTML_FRMOPT_MARGINSIZE | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_CNTNR = +const ULONG HTML_FRMOPTS_CNTNR = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE | HTML_FRMOPT_S_WIDTH | @@ -146,30 +146,30 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFmt ); static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, const SwFrmFmt& rFrmFmt, BOOL bSpan ); static Writer& OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFmt, - BOOL bInCntnr ); + BOOL bInCntnr ); static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt, - BOOL bInCntnr ); + BOOL bInCntnr ); static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, - const SdrObject& rSdrObj ); + const SdrObject& rSdrObj ); //----------------------------------------------------------------------- extern HTMLOutEvent __FAR_DATA aAnchorEventTable[]; static HTMLOutEvent __FAR_DATA aImageEventTable[] = { - { 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 } + { 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[] = { - { 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 } + { 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 } }; @@ -378,7 +378,7 @@ void SwHTMLWriter::CollectFlyFrms() BOOL SwHTMLWriter::OutFlyFrm( ULONG nNdIdx, xub_StrLen nCntntIdx, BYTE nPos, HTMLOutContext *pContext ) { - BOOL bFlysLeft = FALSE; // Noch Flys an aktueller Node-Position da? + BOOL bFlysLeft = FALSE; // Noch Flys an aktueller Node-Position da? // OutFlyFrm kan rekursiv aufgerufen werden. Deshalb muss man // manchmal wieder von vorne anfangen, nachdem ein Fly ausgegeben @@ -411,7 +411,7 @@ BOOL SwHTMLWriter::OutFlyFrm( ULONG nNdIdx, xub_StrLen nCntntIdx, BYTE nPos, { delete pHTMLPosFlyFrms; pHTMLPosFlyFrms = 0; - bRestart = TRUE; // nicht wirklich, nur raus + bRestart = TRUE; // nicht wirklich, nur raus // aus der Schleife } @@ -486,17 +486,17 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt, switch( nOutMode ) { - case HTML_OUT_TBLNODE: // OK + case HTML_OUT_TBLNODE: // OK ASSERT( !pCntnrStr, "Table: Container ist hier nicht vorgesehen" ); OutHTML_FrmFmtTableNode( *this, rFrmFmt ); break; - case HTML_OUT_GRFNODE: // OK + case HTML_OUT_GRFNODE: // OK OutHTML_FrmFmtGrfNode( *this, rFrmFmt, pCntnrStr != 0 ); break; - case HTML_OUT_OLENODE: // OK + case HTML_OUT_OLENODE: // OK OutHTML_FrmFmtOLENode( *this, rFrmFmt, pCntnrStr != 0 ); break; - case HTML_OUT_OLEGRF: // OK + case HTML_OUT_OLEGRF: // OK OutHTML_FrmFmtOLENodeGrf( *this, rFrmFmt, pCntnrStr != 0 ); break; case HTML_OUT_DIV: @@ -504,14 +504,14 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt, ASSERT( !pCntnrStr, "Div: Container ist hier nicht vorgesehen" ); OutHTML_FrmFmtAsDivOrSpan( *this, rFrmFmt, HTML_OUT_SPAN==nOutMode ); break; - case HTML_OUT_MULTICOL: // OK + case HTML_OUT_MULTICOL: // OK OutHTML_FrmFmtAsMulticol( *this, rFrmFmt, pCntnrStr != 0 ); break; - case HTML_OUT_SPACER: // OK + case HTML_OUT_SPACER: // OK ASSERT( !pCntnrStr, "Spacer: Container ist hier nicht vorgesehen" ); OutHTML_FrmFmtAsSpacer( *this, rFrmFmt ); break; - case HTML_OUT_CONTROL: // OK + case HTML_OUT_CONTROL: // OK OutHTML_DrawFrmFmtAsControl( *this, (const SwDrawFrmFmt &)rFrmFmt, *pSdrObject, pCntnrStr != 0 ); @@ -911,7 +911,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, rBox.CalcLineSpace(BOX_LINE_RIGHT) ); ASSERT( nWidth>0, "Gibt es 0 twip breite Grafiken!?" ); - if( nWidth<=0 ) // sollte nicht passieren + if( nWidth<=0 ) // sollte nicht passieren nWidth = 1; if( rRealSize.Width() != nWidth ) @@ -1220,7 +1220,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, // Grafik als (JPG-)File speichern if( rHTMLWrt.GetOrigFileName() ) rGrfName = *rHTMLWrt.GetOrigFileName(); - USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName, + USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, rGrfName, String::CreateFromAscii("JPG"), (XOUTBMP_USE_GIF_IF_SENSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE)); @@ -1368,7 +1368,7 @@ static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt ) static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFrmFmt, - BOOL bInCntnr ) + BOOL bInCntnr ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -1421,7 +1421,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, rWrt.Strm() << '>'; rHTMLWrt.bLFPossible = TRUE; - rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken; + rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken; const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt(); ULONG nStt = rFlyCntnt.GetCntntIdx()->GetIndex(); @@ -1438,9 +1438,9 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, rHTMLWrt.Out_SwDoc( rWrt.pCurPam ); } -// rHTMLWrt.ChangeParaToken( 0 ); // MIB 8.7.97: Passiert jetzt in Out_SwDoc +// rHTMLWrt.ChangeParaToken( 0 ); // MIB 8.7.97: Passiert jetzt in Out_SwDoc - rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; + rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, FALSE ); @@ -1507,7 +1507,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags ); rWrt.Strm() << '>'; - rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken + rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken rHTMLWrt.bLFPossible = TRUE; const SwFmtCntnt& rFlyCntnt = rFrmFmt.GetCntnt(); @@ -1529,7 +1529,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, rHTMLWrt.Out_SwDoc( rWrt.pCurPam ); } - rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; + rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; if( rHTMLWrt.bLFPossible ) rHTMLWrt.OutNewLine(); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, FALSE ); @@ -1613,7 +1613,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, USHORT nErr = XOutBitmap::WriteGraphic( pGrfNd->GetGrf(), aGrfNm, String::CreateFromAscii("JPG"), nFlags, &aMM100Size ); - if( nErr ) // fehlerhaft, da ist nichts auszugeben + if( nErr ) // fehlerhaft, da ist nichts auszugeben { rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE; return rWrt; @@ -1640,7 +1640,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt, static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt, - const SdrObject& rSdrObj ) + const SdrObject& rSdrObj ) { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; @@ -1683,7 +1683,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, sOut += (bHeader ? "HEADER" : "FOOTER" ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer() ); - rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken; + rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken; // Einen Spacer fuer den Absatnd zusammenbasteln. Da durch das // <DL> bzw. </DL> immer einer Absatz-Abstand entsteht, wird der @@ -1737,7 +1737,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), aSpacer.GetBuffer() ); } - rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; + rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken; rHTMLWrt.OutNewLine(); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE ); diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 72a2dd4ba006..16c04053716e 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,30 +60,30 @@ enum SwHTMLFrmType HTML_FRMTYPE_END }; -#define HTML_OUT_TBLNODE 0x00 -#define HTML_OUT_GRFNODE 0x01 -#define HTML_OUT_OLENODE 0x02 -#define HTML_OUT_DIV 0x03 -#define HTML_OUT_MULTICOL 0x04 -#define HTML_OUT_SPACER 0x05 -#define HTML_OUT_CONTROL 0x06 -#define HTML_OUT_AMARQUEE 0x07 -#define HTML_OUT_MARQUEE 0x08 -#define HTML_OUT_GRFFRM 0x09 -#define HTML_OUT_OLEGRF 0x0a -#define HTML_OUT_SPAN 0x0b -#define HTML_OUT_MASK 0x0f - -#define HTML_POS_PREFIX 0x00 -#define HTML_POS_BEFORE 0x10 -#define HTML_POS_INSIDE 0x20 -#define HTML_POS_ANY 0x30 -#define HTML_POS_MASK 0x30 - -#define HTML_CNTNR_NONE 0x00 -#define HTML_CNTNR_SPAN 0x40 -#define HTML_CNTNR_DIV 0x80 -#define HTML_CNTNR_MASK 0xc0 +#define HTML_OUT_TBLNODE 0x00 +#define HTML_OUT_GRFNODE 0x01 +#define HTML_OUT_OLENODE 0x02 +#define HTML_OUT_DIV 0x03 +#define HTML_OUT_MULTICOL 0x04 +#define HTML_OUT_SPACER 0x05 +#define HTML_OUT_CONTROL 0x06 +#define HTML_OUT_AMARQUEE 0x07 +#define HTML_OUT_MARQUEE 0x08 +#define HTML_OUT_GRFFRM 0x09 +#define HTML_OUT_OLEGRF 0x0a +#define HTML_OUT_SPAN 0x0b +#define HTML_OUT_MASK 0x0f + +#define HTML_POS_PREFIX 0x00 +#define HTML_POS_BEFORE 0x10 +#define HTML_POS_INSIDE 0x20 +#define HTML_POS_ANY 0x30 +#define HTML_POS_MASK 0x30 + +#define HTML_CNTNR_NONE 0x00 +#define HTML_CNTNR_SPAN 0x40 +#define HTML_CNTNR_DIV 0x80 +#define HTML_CNTNR_MASK 0xc0 const USHORT MAX_FRMTYPES = HTML_FRMTYPE_END; @@ -97,12 +97,12 @@ extern BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS]; class SwHTMLPosFlyFrm { - const SwFrmFmt *pFrmFmt; // der Rahmen - const SdrObject *pSdrObject; // ggf. Sdr-Objekt - SwNodeIndex *pNdIdx; // Node-Index - UINT32 nOrdNum; // Aus SwPosFlyFrm - xub_StrLen nCntntIdx; // seine Position im Content - BYTE nOutputMode; // Ausgabe-Infos + const SwFrmFmt *pFrmFmt; // der Rahmen + const SdrObject *pSdrObject; // ggf. Sdr-Objekt + SwNodeIndex *pNdIdx; // Node-Index + UINT32 nOrdNum; // Aus SwPosFlyFrm + xub_StrLen nCntntIdx; // seine Position im Content + BYTE nOutputMode; // Ausgabe-Infos public: @@ -117,7 +117,7 @@ public: const SwNodeIndex& GetNdIndex() const { return *pNdIdx; } - xub_StrLen GetCntntIndex() const { return nCntntIdx; } + xub_StrLen GetCntntIndex() const { return nCntntIdx; } BYTE GetOutMode() const { return nOutputMode; } diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx index f3b80db509e5..dffa3c761e46 100644 --- a/sw/source/filter/html/htmlflyt.cxx +++ b/sw/source/filter/html/htmlflyt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,95 +37,95 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(DIV, PREFIX, NONE), // IE 4 - TE(DIV, PREFIX, NONE), // SW - TE(DIV, PREFIX, NONE) // Netscape 4! + TE(TBLNODE, BEFORE, NONE), // HTML 3.2 + TE(DIV, PREFIX, NONE), // IE 4 + TE(DIV, PREFIX, NONE), // SW + TE(DIV, PREFIX, NONE) // Netscape 4! }, { // Textrahmen mit Tabelle und Ueberschrift - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(DIV, PREFIX, NONE), // IE 4 - TE(DIV, PREFIX, NONE), // SW - TE(DIV, PREFIX, NONE) // Netscape 4 + TE(TBLNODE, BEFORE, NONE), // HTML 3.2 + TE(DIV, PREFIX, NONE), // IE 4 + TE(DIV, PREFIX, NONE), // SW + TE(DIV, PREFIX, NONE) // Netscape 4 }, { // spaltiger Rahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, PREFIX, NONE), // IE 4 - TE(MULTICOL,PREFIX, NONE), // SW - TE(MULTICOL,PREFIX, DIV) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, PREFIX, NONE), // IE 4 + TE(MULTICOL,PREFIX, NONE), // SW + TE(MULTICOL,PREFIX, DIV) // Netscape 4 }, { // leerer Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(DIV, PREFIX, NONE), // IE 4 - TE(DIV, PREFIX, NONE), // SW - TE(DIV, PREFIX, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(DIV, PREFIX, NONE), // IE 4 + TE(DIV, PREFIX, NONE), // SW + TE(DIV, PREFIX, NONE) // Netscape 4 }, { // sonstiger Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(DIV, PREFIX, NONE), // IE 4 - TE(DIV, PREFIX, NONE), // SW - TE(DIV, PREFIX, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(DIV, PREFIX, NONE), // IE 4 + TE(DIV, PREFIX, NONE), // SW + TE(DIV, PREFIX, NONE) // Netscape 4 }, { // Grafik-Node - TE(GRFNODE, INSIDE, NONE), // HTML 3.2 - TE(GRFNODE, PREFIX, NONE), // IE 4 - TE(GRFNODE, PREFIX, NONE), // SW - TE(GRFNODE, PREFIX, SPAN) // Netscape 4 + TE(GRFNODE, INSIDE, NONE), // HTML 3.2 + TE(GRFNODE, PREFIX, NONE), // IE 4 + TE(GRFNODE, PREFIX, NONE), // SW + TE(GRFNODE, PREFIX, SPAN) // Netscape 4 }, { // Plugin - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, PREFIX, NONE), // SW - TE(OLENODE, PREFIX, SPAN) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, PREFIX, NONE), // IE 4 + TE(OLENODE, PREFIX, NONE), // SW + TE(OLENODE, PREFIX, SPAN) // Netscape 4 }, { // Applet - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, PREFIX, NONE), // SW - TE(OLENODE, PREFIX, SPAN) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, PREFIX, NONE), // IE 4 + TE(OLENODE, PREFIX, NONE), // SW + TE(OLENODE, PREFIX, SPAN) // Netscape 4 }, { // Floating-Frame - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, PREFIX, NONE), // SW - TE(OLEGRF, PREFIX, SPAN) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, PREFIX, NONE), // IE 4 + TE(OLENODE, PREFIX, NONE), // SW + TE(OLEGRF, PREFIX, SPAN) // Netscape 4 }, { // sonstige OLE-Objekte - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLEGRF, PREFIX, NONE), // IE 4 - TE(OLEGRF, PREFIX, NONE), // SW - TE(OLEGRF, PREFIX, SPAN) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLEGRF, PREFIX, NONE), // IE 4 + TE(OLEGRF, PREFIX, NONE), // SW + TE(OLEGRF, PREFIX, SPAN) // Netscape 4 }, { // Laufschrift - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(AMARQUEE,PREFIX, NONE), // IE 4 - TE(AMARQUEE,PREFIX, NONE), // SW - TE(GRFFRM, PREFIX, SPAN) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(AMARQUEE,PREFIX, NONE), // IE 4 + TE(AMARQUEE,PREFIX, NONE), // SW + TE(GRFFRM, PREFIX, SPAN) // Netscape 4 }, { // Controls - TE(CONTROL, INSIDE, NONE), // HTML 3.2 - TE(CONTROL, PREFIX, NONE), // IE 4 - TE(CONTROL, PREFIX, NONE), // SW + TE(CONTROL, INSIDE, NONE), // HTML 3.2 + TE(CONTROL, PREFIX, NONE), // IE 4 + TE(CONTROL, PREFIX, NONE), // SW // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus. - TE(CONTROL, INSIDE, NONE) // Netscape 4 + TE(CONTROL, INSIDE, NONE) // Netscape 4 }, { // sonstige Zeichen-Objekte - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, PREFIX, NONE), // IE 4 - TE(GRFFRM, PREFIX, NONE), // SW - TE(GRFFRM, PREFIX, SPAN) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, PREFIX, NONE), // IE 4 + TE(GRFFRM, PREFIX, NONE), // SW + TE(GRFFRM, PREFIX, SPAN) // Netscape 4 } }; @@ -133,96 +133,96 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(TBLNODE, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // SW - TE(TBLNODE, BEFORE, NONE) // Netscape 4 + TE(TBLNODE, BEFORE, NONE), // HTML 3.2 + TE(TBLNODE, BEFORE, NONE), // IE 4 + TE(TBLNODE, BEFORE, NONE), // SW + TE(TBLNODE, BEFORE, NONE) // Netscape 4 }, { // Textrahmen mit Tabelle und Ueberschrift - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(DIV, BEFORE, NONE), // IE 4 - TE(DIV, BEFORE, NONE), // SW - TE(TBLNODE, BEFORE, NONE) // Netscape 4 + TE(TBLNODE, BEFORE, NONE), // HTML 3.2 + TE(DIV, BEFORE, NONE), // IE 4 + TE(DIV, BEFORE, NONE), // SW + TE(TBLNODE, BEFORE, NONE) // Netscape 4 }, { // spaltiger Rahmen - TE(GRFFRM, BEFORE, NONE), // HTML 3.2 - TE(GRFFRM, BEFORE, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // SW - TE(MULTICOL,BEFORE, DIV) // Netscape 4 + TE(GRFFRM, BEFORE, NONE), // HTML 3.2 + TE(GRFFRM, BEFORE, NONE), // IE 4 + TE(MULTICOL,BEFORE, NONE), // SW + TE(MULTICOL,BEFORE, DIV) // Netscape 4 }, { // leerer Textreahmen - TE(GRFFRM, BEFORE, NONE), // HTML 3.2 - TE(DIV, BEFORE, NONE), // IE 4 - TE(SPACER, BEFORE, NONE), // SW - TE(SPACER, BEFORE, NONE) // Netscape 4 + TE(GRFFRM, BEFORE, NONE), // HTML 3.2 + TE(DIV, BEFORE, NONE), // IE 4 + TE(SPACER, BEFORE, NONE), // SW + TE(SPACER, BEFORE, NONE) // Netscape 4 }, { // sonstiger Textreahmen - TE(GRFFRM, BEFORE, NONE), // HTML 3.2 - TE(DIV, BEFORE, NONE), // IE 4 - TE(DIV, BEFORE, NONE), // SW - TE(DIV, BEFORE, NONE) // Netscape 4 + TE(GRFFRM, BEFORE, NONE), // HTML 3.2 + TE(DIV, BEFORE, NONE), // IE 4 + TE(DIV, BEFORE, NONE), // SW + TE(DIV, BEFORE, NONE) // Netscape 4 }, { // Grafik-Node - TE(GRFNODE, BEFORE, NONE), // HTML 3.2 - TE(GRFNODE, BEFORE, NONE), // IE 4 - TE(GRFNODE, BEFORE, NONE), // SW - TE(GRFNODE, BEFORE, NONE) // Netscape 4 + TE(GRFNODE, BEFORE, NONE), // HTML 3.2 + TE(GRFNODE, BEFORE, NONE), // IE 4 + TE(GRFNODE, BEFORE, NONE), // SW + TE(GRFNODE, BEFORE, NONE) // Netscape 4 }, { // Plugin - TE(OLENODE, BEFORE, NONE), // HTML 3.2 - TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // SW - TE(OLENODE, BEFORE, NONE) // Netscape 4 + TE(OLENODE, BEFORE, NONE), // HTML 3.2 + TE(OLENODE, BEFORE, NONE), // IE 4 + TE(OLENODE, BEFORE, NONE), // SW + TE(OLENODE, BEFORE, NONE) // Netscape 4 }, { // Applet - TE(OLENODE, BEFORE, NONE), // HTML 3.2 - TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // SW - TE(OLENODE, BEFORE, NONE) // Netscape 4 + TE(OLENODE, BEFORE, NONE), // HTML 3.2 + TE(OLENODE, BEFORE, NONE), // IE 4 + TE(OLENODE, BEFORE, NONE), // SW + TE(OLENODE, BEFORE, NONE) // Netscape 4 }, { // Floating-Frame - TE(OLEGRF, BEFORE, NONE), // HTML 3.2 - TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // SW - TE(OLEGRF, BEFORE, NONE) // Netscape 4 + TE(OLEGRF, BEFORE, NONE), // HTML 3.2 + TE(OLENODE, BEFORE, NONE), // IE 4 + TE(OLENODE, BEFORE, NONE), // SW + TE(OLEGRF, BEFORE, NONE) // Netscape 4 }, { // sonstige OLE-Objekte - TE(OLEGRF, BEFORE, NONE), // HTML 3.2 - TE(OLEGRF, BEFORE, NONE), // IE 4 - TE(OLEGRF, BEFORE, NONE), // SW - TE(OLEGRF, BEFORE, NONE) // Netscape 4 + TE(OLEGRF, BEFORE, NONE), // HTML 3.2 + TE(OLEGRF, BEFORE, NONE), // IE 4 + TE(OLEGRF, BEFORE, NONE), // SW + TE(OLEGRF, BEFORE, NONE) // Netscape 4 }, { // Laufschrift (fuer Netscape 4 im Container, damit // die LAufschrift an der richtigen Stelle erscheint - TE(GRFFRM, BEFORE, NONE), // HTML 3.2 - TE(AMARQUEE,BEFORE, NONE), // IE 4 - TE(AMARQUEE,BEFORE, NONE), // SW - TE(GRFFRM, BEFORE, NONE) // Netscape 4 + TE(GRFFRM, BEFORE, NONE), // HTML 3.2 + TE(AMARQUEE,BEFORE, NONE), // IE 4 + TE(AMARQUEE,BEFORE, NONE), // SW + TE(GRFFRM, BEFORE, NONE) // Netscape 4 }, { // Controls - TE(CONTROL, INSIDE, NONE), // HTML 3.2 - TE(CONTROL, BEFORE, NONE), // IE 4 - TE(CONTROL, BEFORE, NONE), // SW + TE(CONTROL, INSIDE, NONE), // HTML 3.2 + TE(CONTROL, BEFORE, NONE), // IE 4 + TE(CONTROL, BEFORE, NONE), // SW // hier koennte man einen Container draus machen (Import fehlt) - TE(CONTROL, BEFORE, NONE) // Netscape 4 + TE(CONTROL, BEFORE, NONE) // Netscape 4 }, { // sonstige Zeichen-Objekte - TE(GRFFRM, BEFORE, NONE), // HTML 3.2 - TE(GRFFRM, BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // SW - TE(GRFFRM, BEFORE, NONE) // Netscape 4 + TE(GRFFRM, BEFORE, NONE), // HTML 3.2 + TE(GRFFRM, BEFORE, NONE), // IE 4 + TE(GRFFRM, BEFORE, NONE), // SW + TE(GRFFRM, BEFORE, NONE) // Netscape 4 } }; @@ -230,95 +230,95 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle - TE(TBLNODE, INSIDE, NONE), // HTML 3.2 - TE(TBLNODE, INSIDE, NONE), // IE 4 - TE(TBLNODE, INSIDE, NONE), // SW - TE(TBLNODE, INSIDE, NONE) // Netscape 4 + TE(TBLNODE, INSIDE, NONE), // HTML 3.2 + TE(TBLNODE, INSIDE, NONE), // IE 4 + TE(TBLNODE, INSIDE, NONE), // SW + TE(TBLNODE, INSIDE, NONE) // Netscape 4 }, { // Textrahmen mit Tabelle und Ueberschrift - TE(TBLNODE, INSIDE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPAN, INSIDE, NONE), // SW - TE(SPAN, INSIDE, NONE) // Netscape 4 + TE(TBLNODE, INSIDE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPAN, INSIDE, NONE), // SW + TE(SPAN, INSIDE, NONE) // Netscape 4 }, { // spaltiger Rahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // SW - TE(MULTICOL,INSIDE, SPAN) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(MULTICOL,INSIDE, NONE), // SW + TE(MULTICOL,INSIDE, SPAN) // Netscape 4 }, { // leerer Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPACER, INSIDE, NONE), // SW - TE(SPACER, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPACER, INSIDE, NONE), // SW + TE(SPACER, INSIDE, NONE) // Netscape 4 }, { // sonstiger Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPAN, INSIDE, NONE), // SW - TE(SPAN, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPAN, INSIDE, NONE), // SW + TE(SPAN, INSIDE, NONE) // Netscape 4 }, { // Grafik-Node - TE(GRFNODE, INSIDE, NONE), // HTML 3.2 - TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // SW - TE(GRFNODE, INSIDE, NONE) // Netscape 4 + TE(GRFNODE, INSIDE, NONE), // HTML 3.2 + TE(GRFNODE, INSIDE, NONE), // IE 4 + TE(GRFNODE, INSIDE, NONE), // SW + TE(GRFNODE, INSIDE, NONE) // Netscape 4 }, { // Plugin - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLENODE, INSIDE, NONE) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLENODE, INSIDE, NONE) // Netscape 4 }, { // Applet - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLENODE, INSIDE, NONE) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLENODE, INSIDE, NONE) // Netscape 4 }, { // Floating-Frame - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLEGRF, INSIDE, NONE) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, { // sonstige OLE-Objekte - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // SW - TE(OLEGRF, INSIDE, NONE) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLEGRF, INSIDE, NONE), // IE 4 + TE(OLEGRF, INSIDE, NONE), // SW + TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, { // Laufschrift - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(AMARQUEE,INSIDE, NONE), // IE 4 - TE(AMARQUEE,INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(AMARQUEE,INSIDE, NONE), // IE 4 + TE(AMARQUEE,INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, { // Controls - TE(CONTROL, INSIDE, NONE), // HTML 3.2 - TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // SW + TE(CONTROL, INSIDE, NONE), // HTML 3.2 + TE(CONTROL, INSIDE, NONE), // IE 4 + TE(CONTROL, INSIDE, NONE), // SW // hier koennte man einen Container draus machen (Import fehlt) - TE(CONTROL, INSIDE, NONE) // Netscape 4 + TE(CONTROL, INSIDE, NONE) // Netscape 4 }, { // sonstige Zeichen-Objekte - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(GRFFRM, INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, NONE) // Netscape 4 } }; @@ -326,95 +326,95 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPAN, INSIDE, NONE), // SW - TE(SPAN, INSIDE, NONE) // Netscape 4 + TE(TBLNODE, BEFORE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPAN, INSIDE, NONE), // SW + TE(SPAN, INSIDE, NONE) // Netscape 4 }, { // Textrahmen mit Tabelle und Ueberschrift - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPAN, INSIDE, NONE), // SW - TE(SPAN, INSIDE, NONE) // Netscape 4 + TE(TBLNODE, BEFORE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPAN, INSIDE, NONE), // SW + TE(SPAN, INSIDE, NONE) // Netscape 4 }, { // spaltiger Rahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // SW - TE(MULTICOL,INSIDE, SPAN) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(MULTICOL,INSIDE, NONE), // SW + TE(MULTICOL,INSIDE, SPAN) // Netscape 4 }, { // leerer Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPAN, INSIDE, NONE), // SW - TE(SPAN, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPAN, INSIDE, NONE), // SW + TE(SPAN, INSIDE, NONE) // Netscape 4 }, { // sonstiger Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPAN, INSIDE, NONE), // SW - TE(SPAN, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(SPAN, INSIDE, NONE), // IE 4 + TE(SPAN, INSIDE, NONE), // SW + TE(SPAN, INSIDE, NONE) // Netscape 4 }, { // Grafik-Node - TE(GRFNODE, INSIDE, NONE), // HTML 3.2 - TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // SW - TE(GRFNODE, INSIDE, SPAN) // Netscape 4 + TE(GRFNODE, INSIDE, NONE), // HTML 3.2 + TE(GRFNODE, INSIDE, NONE), // IE 4 + TE(GRFNODE, INSIDE, NONE), // SW + TE(GRFNODE, INSIDE, SPAN) // Netscape 4 }, { // Plugin - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLENODE, INSIDE, SPAN) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLENODE, INSIDE, SPAN) // Netscape 4 }, { // Applet - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLENODE, INSIDE, SPAN) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLENODE, INSIDE, SPAN) // Netscape 4 }, { // Floating-Frame - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLEGRF, INSIDE, SPAN) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLEGRF, INSIDE, SPAN) // Netscape 4 }, { // sonstige OLE-Objekte - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // SW - TE(OLEGRF, INSIDE, SPAN) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLEGRF, INSIDE, NONE), // IE 4 + TE(OLEGRF, INSIDE, NONE), // SW + TE(OLEGRF, INSIDE, SPAN) // Netscape 4 }, { // Laufschrift - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(AMARQUEE,INSIDE, NONE), // IE 4 - TE(AMARQUEE,INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, SPAN) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(AMARQUEE,INSIDE, NONE), // IE 4 + TE(AMARQUEE,INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, SPAN) // Netscape 4 }, { // Controls - TE(CONTROL, INSIDE, NONE), // HTML 3.2 - TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // SW + TE(CONTROL, INSIDE, NONE), // HTML 3.2 + TE(CONTROL, INSIDE, NONE), // IE 4 + TE(CONTROL, INSIDE, NONE), // SW // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus. - TE(CONTROL, INSIDE, NONE) // Netscape 4 + TE(CONTROL, INSIDE, NONE) // Netscape 4 }, { // sonstige Zeichen-Objekte - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, SPAN) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(GRFFRM, INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, SPAN) // Netscape 4 } }; @@ -422,95 +422,95 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(GRFFRM, INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, { // Textrahmen mit Tabelle und Ueberschrift - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(GRFFRM, INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, { // spaltiger Rahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // SW - TE(MULTICOL,INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(MULTICOL,INSIDE, NONE), // SW + TE(MULTICOL,INSIDE, NONE) // Netscape 4 }, { // leerer Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(SPACER, INSIDE, NONE), // SW - TE(SPACER, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(SPACER, INSIDE, NONE), // SW + TE(SPACER, INSIDE, NONE) // Netscape 4 }, { // sonstiger Textreahmen - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(GRFFRM, INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, { // Grafik-Node - TE(GRFNODE, INSIDE, NONE), // HTML 3.2 - TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // SW - TE(GRFNODE, INSIDE, NONE) // Netscape 4 + TE(GRFNODE, INSIDE, NONE), // HTML 3.2 + TE(GRFNODE, INSIDE, NONE), // IE 4 + TE(GRFNODE, INSIDE, NONE), // SW + TE(GRFNODE, INSIDE, NONE) // Netscape 4 }, { // Plugin - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLENODE, INSIDE, NONE) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLENODE, INSIDE, NONE) // Netscape 4 }, { // Applet - TE(OLENODE, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLENODE, INSIDE, NONE) // Netscape 4 + TE(OLENODE, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLENODE, INSIDE, NONE) // Netscape 4 }, { // Floating-Frame - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // SW - TE(OLEGRF, INSIDE, NONE) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLENODE, INSIDE, NONE), // IE 4 + TE(OLENODE, INSIDE, NONE), // SW + TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, { // sonstige OLE-Objekte - TE(OLEGRF, INSIDE, NONE), // HTML 3.2 - TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // SW - TE(OLEGRF, INSIDE, NONE) // Netscape 4 + TE(OLEGRF, INSIDE, NONE), // HTML 3.2 + TE(OLEGRF, INSIDE, NONE), // IE 4 + TE(OLEGRF, INSIDE, NONE), // SW + TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, { // Laufschrift (kann immer als MARQUEE exportiert werden, weil // der Inhalt an der richtigen Stelle erscheint - TE(MARQUEE, INSIDE, NONE), // HTML 3.2 - TE(MARQUEE, INSIDE, NONE), // IE 4 - TE(MARQUEE, INSIDE, NONE), // SW - TE(MARQUEE, INSIDE, NONE) // Netscape 4 + TE(MARQUEE, INSIDE, NONE), // HTML 3.2 + TE(MARQUEE, INSIDE, NONE), // IE 4 + TE(MARQUEE, INSIDE, NONE), // SW + TE(MARQUEE, INSIDE, NONE) // Netscape 4 }, { // Controls - TE(CONTROL, INSIDE, NONE), // HTML 3.2 - TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // SW - TE(CONTROL, INSIDE, NONE) // Netscape 4 + TE(CONTROL, INSIDE, NONE), // HTML 3.2 + TE(CONTROL, INSIDE, NONE), // IE 4 + TE(CONTROL, INSIDE, NONE), // SW + TE(CONTROL, INSIDE, NONE) // Netscape 4 }, { // sonstige Zeichen-Objekte - TE(GRFFRM, INSIDE, NONE), // HTML 3.2 - TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // SW - TE(GRFFRM, INSIDE, NONE) // Netscape 4 + TE(GRFFRM, INSIDE, NONE), // HTML 3.2 + TE(GRFFRM, INSIDE, NONE), // IE 4 + TE(GRFFRM, INSIDE, NONE), // SW + TE(GRFFRM, INSIDE, NONE) // Netscape 4 } }; diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 3067de67ce97..06d9e29ca855 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,29 +97,29 @@ const sal_uInt16 TABINDEX_MAX = 32767; static HTMLOptionEnum __FAR_DATA aHTMLFormMethodTable[] = { - { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET }, - { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST }, - { 0, 0 } + { OOO_STRING_SVTOOLS_HTML_METHOD_get, FormSubmitMethod_GET }, + { OOO_STRING_SVTOOLS_HTML_METHOD_post, FormSubmitMethod_POST }, + { 0, 0 } }; static HTMLOptionEnum __FAR_DATA aHTMLFormEncTypeTable[] = { - { 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 } + { 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 } }; enum HTMLWordWrapMode { HTML_WM_OFF, HTML_WM_HARD, HTML_WM_SOFT }; static HTMLOptionEnum __FAR_DATA aHTMLTextAreaWrapTable[] = { - { 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 } + { 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 } }; HTMLEventType __FAR_DATA aEventTypeTable[] = @@ -187,28 +187,28 @@ const sal_Char * __FAR_DATA aEventOptionTable[] = class SwHTMLForm_Impl { - SwDocShell *pDocSh; + SwDocShell *pDocSh; - SvKeyValueIterator *pHeaderAttrs; + SvKeyValueIterator *pHeaderAttrs; // gecachte Interfaces - uno::Reference< drawing::XDrawPage > xDrawPage; - uno::Reference< container::XIndexContainer > xForms; - uno::Reference< drawing::XShapes > xShapes; - uno::Reference< XMultiServiceFactory > xServiceFactory; + uno::Reference< drawing::XDrawPage > xDrawPage; + uno::Reference< container::XIndexContainer > xForms; + uno::Reference< drawing::XShapes > xShapes; + uno::Reference< XMultiServiceFactory > xServiceFactory; - uno::Reference< script::XEventAttacherManager > xControlEventManager; - uno::Reference< script::XEventAttacherManager > xFormEventManager; + uno::Reference< script::XEventAttacherManager > xControlEventManager; + uno::Reference< script::XEventAttacherManager > xFormEventManager; // Kontext-Informationen - uno::Reference< container::XIndexContainer > xFormComps; - uno::Reference< beans::XPropertySet > xFCompPropSet; - uno::Reference< drawing::XShape > xShape; + uno::Reference< container::XIndexContainer > xFormComps; + uno::Reference< beans::XPropertySet > xFCompPropSet; + uno::Reference< drawing::XShape > xShape; - String sText; - SvStringsDtor aStringList; - SvStringsDtor aValueList; - SvUShorts aSelectedList; + String sText; + SvStringsDtor aStringList; + SvStringsDtor aValueList; + SvUShorts aSelectedList; public: @@ -379,11 +379,11 @@ const uno::Reference< script::XEventAttacherManager >& class SwHTMLImageWatcher : public cppu::WeakImplHelper2< awt::XImageConsumer, XEventListener > { - uno::Reference< drawing::XShape > xShape; // das control - uno::Reference< XImageProducerSupplier > xSrc; - uno::Reference< awt::XImageConsumer > xThis; // man selbst - sal_Bool bSetWidth; - sal_Bool bSetHeight; + uno::Reference< drawing::XShape > xShape; // das control + uno::Reference< XImageProducerSupplier > xSrc; + uno::Reference< awt::XImageConsumer > xThis; // man selbst + sal_Bool bSetWidth; + sal_Bool bSetHeight; void clear(); @@ -556,7 +556,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height ) pLayout->GetBrowseWidthByTable( *pDoc ); if ( nBrowseWidth ) - { + { pLayout->Resize( nBrowseWidth, sal_True, sal_True, bLastGrf ? HTMLTABLE_RESIZE_NOW : 500 ); @@ -659,10 +659,10 @@ static void lcl_html_setFixedFontProperty( class SwHTMLFormPendingStackData_Impl: public SwPendingStackData { - uno::Reference< drawing::XShape > xShape; - Size aTextSz; - sal_Bool bMinWidth; - sal_Bool bMinHeight; + uno::Reference< drawing::XShape > xShape; + Size aTextSz; + sal_Bool bMinWidth; + sal_Bool bMinHeight; public: @@ -728,7 +728,7 @@ void SwHTMLParser::SetControlSize( const uno::Reference< drawing::XShape >& rSha SFX_ITEMSET_ARG( pDocSh->GetMedium()->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); bRemoveHidden = ( pHiddenItem == NULL || !pHiddenItem->GetValue() ); } - + pTempViewFrame = SfxViewFrame::LoadHiddenDocument( *pDocSh, 0 ); CallStartAction(); pDoc->GetEditShell( &pVSh ); @@ -1168,7 +1168,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sal_Int16 nSurround = text::WrapTextMode_NONE; if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition && SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType && - SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType ) + SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType ) { const SwStartNode *pFlySttNd = pDoc->GetNodes()[pPam->GetPoint()->nNode]->FindFlyStartNode(); @@ -1590,7 +1590,7 @@ void SwHTMLParser::InsertInput() bSetEvent = sal_True; break; - case HTML_O_SDONBLUR: // eigtl. nur EDIT + case HTML_O_SDONBLUR: // eigtl. nur EDIT eScriptType2 = STARBASIC; case HTML_O_ONBLUR: nEvent = HTML_ET_ONLOSEFOCUS; @@ -1604,14 +1604,14 @@ void SwHTMLParser::InsertInput() bSetEvent = sal_True; break; - case HTML_O_SDONCHANGE: // eigtl. nur EDIT + case HTML_O_SDONCHANGE: // eigtl. nur EDIT eScriptType2 = STARBASIC; case HTML_O_ONCHANGE: nEvent = HTML_ET_ONCHANGE; bSetEvent = sal_True; break; - case HTML_O_SDONSELECT: // eigtl. nur EDIT + case HTML_O_SDONSELECT: // eigtl. nur EDIT eScriptType2 = STARBASIC; case HTML_O_ONSELECT: nEvent = HTML_ET_ONSELECT; @@ -1747,8 +1747,8 @@ void SwHTMLParser::InsertInput() aTmp <<= OUString(sText); - Size aSz( 0, 0 ); // defaults - Size aTextSz( 0, 0 ); // Text-Size + Size aSz( 0, 0 ); // defaults + Size aTextSz( 0, 0 ); // Text-Size sal_Bool bMinWidth = sal_False, bMinHeight = sal_False; sal_Bool bUseSize = sal_False; switch( eType ) @@ -2438,7 +2438,7 @@ void SwHTMLParser::NewSelect() } else { - if( nSelectEntryCnt <= 1 ) // 4 Zeilen als default + if( nSelectEntryCnt <= 1 ) // 4 Zeilen als default nSelectEntryCnt = 4; if( bMultiple ) diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx index 2deac9db0b5c..a54b2659cc6b 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,10 @@ enum HTMLEventType { - HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM, - HTML_ET_ONGETFOCUS, HTML_ET_ONLOSEFOCUS, - HTML_ET_ONCLICK, HTML_ET_ONCLICK_ITEM, - HTML_ET_ONCHANGE, HTML_ET_ONSELECT, + HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM, + HTML_ET_ONGETFOCUS, HTML_ET_ONLOSEFOCUS, + HTML_ET_ONCLICK, HTML_ET_ONCLICK_ITEM, + HTML_ET_ONCHANGE, HTML_ET_ONSELECT, HTML_ET_END }; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 85c4e9846857..c2b0968e9ea4 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ struct HTMLControl { // die Form, zu der das Control gehoert uno::Reference< container::XIndexContainer > xFormComps; - ULONG nNdIdx; // der Node, in dem es verankert ist + ULONG nNdIdx; // der Node, in dem es verankert ist xub_StrLen nCount; // wie viele Controls sind in dem Node HTMLControl( const uno::Reference< container::XIndexContainer > & rForm, diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 900643bbc680..21fb5d0716e7 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ struct SwHTMLFootEndNote_Impl SvStringsDtor aNames; String sName; - String sContent; // Infos fuer die letzte Fussnote + String sContent; // Infos fuer die letzte Fussnote BOOL bEndNote; BOOL bFixed; }; @@ -384,7 +384,7 @@ void SwHTMLWriter::OutFootEndNotes() Strm() << "\">"; bLFPossible = TRUE; - IncIndentLevel(); // Inhalt von <DIV> einruecken + IncIndentLevel(); // Inhalt von <DIV> einruecken ASSERT( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" ); SwNodeIndex *pSttNdIdx = pTxtFtn->GetStartNode(); @@ -397,7 +397,7 @@ void SwHTMLWriter::OutFootEndNotes() Out_SwDoc( pCurPam ); } - DecIndentLevel(); // Inhalt von <DIV> einruecken + DecIndentLevel(); // Inhalt von <DIV> einruecken if( bLFPossible ) OutNewLine(); HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, FALSE ); @@ -503,7 +503,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, USHORT lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, String *pParts, - BOOL bEndNote ) + BOOL bEndNote ) { USHORT nParts = 0; sal_Int16 eFmt = rInfo.aFmt.GetNumberingType(); @@ -518,17 +518,17 @@ USHORT lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, } if( rInfo.nFtnOffset > 0 ) { - pParts[1] = String::CreateFromInt32( (sal_Int32)rInfo.nFtnOffset ); + pParts[1] = String::CreateFromInt32( (sal_Int32)rInfo.nFtnOffset ); nParts = 2; } if( rInfo.GetPrefix().Len() > 0 ) { - pParts[2] = rInfo.GetPrefix(); + pParts[2] = rInfo.GetPrefix(); nParts = 3; } if( rInfo.GetSuffix().Len() > 0 ) { - pParts[3] = rInfo.GetSuffix(); + pParts[3] = rInfo.GetSuffix(); nParts = 4; } @@ -596,12 +596,12 @@ void SwHTMLWriter::OutFootEndNoteInfo() } if( rInfo.aQuoVadis.Len() > 0 ) { - aParts[6] = rInfo.aQuoVadis; + aParts[6] = rInfo.aQuoVadis; nParts = 7; } if( rInfo.aErgoSum.Len() > 0 ) { - aParts[7] = rInfo.aErgoSum; + aParts[7] = rInfo.aErgoSum; nParts = 8; } if( nParts > 0 ) diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index afcb979abe6c..707b62c2cf89 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgHAlignTable[] = { { OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT }, { OOO_STRING_SVTOOLS_HTML_AL_right, text::HoriOrientation::RIGHT }, - { 0, 0 } + { 0, 0 } }; @@ -101,7 +101,7 @@ HTMLOptionEnum __FAR_DATA aHTMLImgVAlignTable[] = { 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 } + { 0, 0 } }; SV_IMPL_PTRARR( ImageMaps, ImageMapPtr ) @@ -158,7 +158,7 @@ void SwHTMLParser::ConnectImageMaps() // Grafik muss nicht skaliert werden pGrfNd->ScaleImageMap(); } - nMissingImgMaps--; // eine Map weniger suchen + nMissingImgMaps--; // eine Map weniger suchen } } nIdx = rNds[nIdx]->EndOfSectionIndex() + 1; @@ -516,7 +516,7 @@ IMAGE_SETEVENT: USHORT nPoolId = static_cast< USHORT >(pDoc->IsVisitedURL( rURL ) ? RES_POOLCHR_INET_VISIT : RES_POOLCHR_INET_NORMAL); - const SwCharFmt *pCharFmt = pCSS1Parser->GetCharFmtFromPool( nPoolId ); + const SwCharFmt *pCharFmt = pCSS1Parser->GetCharFmtFromPool( nPoolId ); aHBorderLine.SetColor( pCharFmt->GetColor().GetValue() ); aVBorderLine.SetColor( aHBorderLine.GetColor() ); } @@ -559,7 +559,7 @@ IMAGE_SETEVENT: { case SVX_CSS1_LTYPE_TWIP: aTwipSz.Width() = aPropInfo.nWidth; - nWidth = 1; // != 0 + nWidth = 1; // != 0 bPrcWidth = FALSE; break; case SVX_CSS1_LTYPE_PERCENTAGE: @@ -574,7 +574,7 @@ IMAGE_SETEVENT: { case SVX_CSS1_LTYPE_TWIP: aTwipSz.Height() = aPropInfo.nHeight; - nHeight = 1; // != 0 + nHeight = 1; // != 0 bPrcHeight = FALSE; break; case SVX_CSS1_LTYPE_PERCENTAGE: @@ -587,8 +587,8 @@ IMAGE_SETEVENT: } Size aGrfSz( 0, 0 ); - BOOL bSetTwipSize = TRUE; // Twip-Size am Node setzen? - BOOL bChangeFrmSize = FALSE; // Frame-Format nachtraeglich anpassen? + BOOL bSetTwipSize = TRUE; // Twip-Size am Node setzen? + BOOL bChangeFrmSize = FALSE; // Frame-Format nachtraeglich anpassen? BOOL bRequestGrfNow = FALSE; BOOL bSetScaleImageMap = FALSE; BYTE nPrcWidth = 0, nPrcHeight = 0; @@ -678,7 +678,7 @@ IMAGE_SETEVENT: ImageMap aEmptyImgMap( aName ); SwFmtURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert aFrmSet.Put( aURL ); - nMissingImgMaps++; // es fehlen noch Image-Maps + nMissingImgMaps++; // es fehlen noch Image-Maps // die Grafik muss beim SetTwipSize skaliert werden, wenn // wir keine Groesse am Node gesetzt haben oder die Groesse @@ -894,9 +894,9 @@ void SwHTMLParser::InsertBodyOptions() break; case HTML_O_ONERROR: -// if( bAnyStarBasic ) -// InsertBasicDocEvent( SFX_EVENT_ACTIVATEDOC, -// pOption->GetString() ); +// if( bAnyStarBasic ) +// InsertBasicDocEvent( SFX_EVENT_ACTIVATEDOC, +// pOption->GetString() ); break; case HTML_O_STYLE: diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 0cf9d8d6d04c..581cefc2d4aa 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,18 +56,18 @@ using namespace ::com::sun::star; // TODO: Unicode: Are these characters the correct ones? -#define HTML_BULLETCHAR_DISC (0xe008) -#define HTML_BULLETCHAR_CIRCLE (0xe009) -#define HTML_BULLETCHAR_SQUARE (0xe00b) +#define HTML_BULLETCHAR_DISC (0xe008) +#define HTML_BULLETCHAR_CIRCLE (0xe009) +#define HTML_BULLETCHAR_SQUARE (0xe00b) // <UL TYPE=...> static HTMLOptionEnum __FAR_DATA aHTMLULTypeTable[] = { - { 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 } + { 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 } }; /* */ @@ -160,7 +160,7 @@ void SwHTMLParser::NewNumBulList( int nToken ) } // <-- aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); - aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !! + aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !! nChrFmtPoolId = RES_POOLCHR_BUL_LEVEL; } @@ -212,7 +212,7 @@ void SwHTMLParser::NewNumBulList( int nToken ) case 'a': aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break; case 'I': aNumFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); break; case 'i': aNumFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); break; - default: bChangeNumFmt = sal_False; + default: bChangeNumFmt = sal_False; } break; @@ -421,7 +421,7 @@ void SwHTMLParser::EndNumBulList( int nToken ) if( rInfo.GetDepth()>0 && (!nToken || pCntxt) ) { rInfo.DecDepth(); - if( !rInfo.GetDepth() ) // wars der letze Level ? + if( !rInfo.GetDepth() ) // wars der letze Level ? { // Die noch nicht angepassten Formate werden jetzt noch // angepasst, damit es sich besser Editieren laesst. @@ -490,7 +490,7 @@ void SwHTMLParser::EndNumBulList( int nToken ) SetTxtCollAttrs(); if( bSetAttrs ) - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen } @@ -536,7 +536,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken ) // einen neuen Absatz aufmachen if( pPam->GetPoint()->nContent.GetIndex() ) AppendTxtNode( AM_NOSPACE, sal_False ); - bNoParSpace = sal_False; // In <LI> wird kein Abstand eingefuegt! + bNoParSpace = sal_False; // In <LI> wird kein Abstand eingefuegt! // --> OD 2008-04-02 #refactorlists# // if( HTML_LISTHEADER_ON==nToken ) @@ -567,7 +567,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken ) } // <-- aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); - aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !! + aNumFmt.SetBulletChar( cBulletChar ); // das Bulletzeichen !! aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) ); aNumFmt.SetLSpace( (sal_uInt16)(-HTML_NUMBUL_INDENT) ); aNumFmt.SetFirstLineOffset( HTML_NUMBUL_INDENT ); @@ -671,7 +671,7 @@ void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl, if( pCntxt ) { EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -904,10 +904,10 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, sal_Char cType = 0; switch( eType ) { - case SVX_NUM_CHARS_UPPER_LETTER: cType = 'A'; break; - case SVX_NUM_CHARS_LOWER_LETTER: cType = 'a'; break; - case SVX_NUM_ROMAN_UPPER: cType = 'I'; break; - case SVX_NUM_ROMAN_LOWER: cType = 'i'; break; + case SVX_NUM_CHARS_UPPER_LETTER: cType = 'A'; break; + case SVX_NUM_CHARS_LOWER_LETTER: cType = 'a'; break; + case SVX_NUM_ROMAN_UPPER: cType = 'I'; break; + case SVX_NUM_ROMAN_LOWER: cType = 'i'; break; } if( cType ) (((sOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_type) += '=') += cType; diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx index 7f7f02bc1015..2df081dcd191 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,19 +30,19 @@ #include <swtypes.hxx> #include <string.h> -#define HTML_NUMBUL_MARGINLEFT (MM50*2 + MM50/2) -#define HTML_NUMBUL_INDENT (-MM50) +#define HTML_NUMBUL_MARGINLEFT (MM50*2 + MM50/2) +#define HTML_NUMBUL_INDENT (-MM50) class SwTxtNode; class SwNumRule; class SwHTMLNumRuleInfo { - sal_uInt16 aNumStarts[MAXLEVEL]; - SwNumRule * pNumRule; // Aktuelle Numerierung - sal_uInt16 nDeep; // aktuelle Num-Tiefe (1, 2, 3, ...) - sal_Bool bRestart : 1; // Export: Numerierung neu starten - sal_Bool bNumbered : 1; // Export: Absatz ist numeriert + sal_uInt16 aNumStarts[MAXLEVEL]; + SwNumRule * pNumRule; // Aktuelle Numerierung + sal_uInt16 nDeep; // aktuelle Num-Tiefe (1, 2, 3, ...) + sal_Bool bRestart : 1; // Export: Numerierung neu starten + sal_Bool bNumbered : 1; // Export: Absatz ist numeriert public: diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index a154592959dc..f05692f82d70 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,49 +82,49 @@ static char const sHTML_O_Hidden_False[] = "FALSE"; } -const ULONG HTML_FRMOPTS_EMBED_ALL = +const ULONG HTML_FRMOPTS_EMBED_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_EMBED_CNTNR = +const ULONG HTML_FRMOPTS_EMBED_CNTNR = HTML_FRMOPTS_EMBED_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_EMBED = +const ULONG HTML_FRMOPTS_EMBED = HTML_FRMOPTS_EMBED_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BRCLEAR | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_HIDDEN_EMBED = +const ULONG HTML_FRMOPTS_HIDDEN_EMBED = HTML_FRMOPT_ALT | HTML_FRMOPT_NAME; -const ULONG HTML_FRMOPTS_APPLET_ALL = +const ULONG HTML_FRMOPTS_APPLET_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE; -const ULONG HTML_FRMOPTS_APPLET_CNTNR = +const ULONG HTML_FRMOPTS_APPLET_CNTNR = HTML_FRMOPTS_APPLET_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_APPLET = +const ULONG HTML_FRMOPTS_APPLET = HTML_FRMOPTS_APPLET_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BRCLEAR; -const ULONG HTML_FRMOPTS_IFRAME_ALL = +const ULONG HTML_FRMOPTS_IFRAME_ALL = HTML_FRMOPT_ALT | HTML_FRMOPT_SIZE; -const ULONG HTML_FRMOPTS_IFRAME_CNTNR = +const ULONG HTML_FRMOPTS_IFRAME_CNTNR = HTML_FRMOPTS_IFRAME_ALL | HTML_FRMOPT_ABSSIZE; -const ULONG HTML_FRMOPTS_IFRAME = +const ULONG HTML_FRMOPTS_IFRAME = HTML_FRMOPTS_IFRAME_ALL | HTML_FRMOPT_ALIGN | HTML_FRMOPT_SPACE | HTML_FRMOPT_BORDER | HTML_FRMOPT_BRCLEAR; -const ULONG HTML_FRMOPTS_OLE_CSS1 = +const ULONG HTML_FRMOPTS_OLE_CSS1 = HTML_FRMOPT_S_ALIGN | HTML_FRMOPT_S_SPACE; @@ -404,7 +404,7 @@ void SwHTMLParser::InsertEmbed() { // Size (0,0) wird in SetFrmSize auf (MINFLY, MINFLY) umgebogen aSize.Width() = 0; aSize.Height() = 0; - aSpace.Width() = 0; aSpace.Height() = 0; + aSpace.Width() = 0; aSpace.Height() = 0; bPrcWidth = bPrcHeight = FALSE; } @@ -1380,7 +1380,7 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt, String::CreateFromAscii("JPG"), (XOUTBMP_USE_GIF_IF_POSSIBLE | XOUTBMP_USE_NATIVE_IF_POSSIBLE) ); - if( nErr ) // fehlerhaft, da ist nichts auszugeben + if( nErr ) // fehlerhaft, da ist nichts auszugeben { rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE; return rWrt; diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index ac2f348532e8..c9fa4bd875cd 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,7 +152,7 @@ void SwHTMLParser::NewDivision( int nToken ) if( !bPositioned && (bHeader || bFooter) && IsNewDoc() ) { - SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc(); + SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc(); SwFrmFmt& rPageFmt = pPageDesc->GetMaster(); SwFrmFmt *pHdFtFmt; @@ -359,7 +359,7 @@ void SwHTMLParser::NewDivision( int nToken ) // (ersten) Node des Bereich verschieben. if( pOldTxtNd ) MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(), - sal_True ); + sal_True ); if( pPostIts ) { @@ -415,7 +415,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ ) { // Attribute beenden EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -424,7 +424,7 @@ void SwHTMLParser::EndDivision( int /*nToken*/ ) void SwHTMLParser::FixHeaderFooterDistance( sal_Bool bHeader, const SwPosition *pOldPos ) { - SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc(); + SwPageDesc *pPageDesc = pCSS1Parser->GetMasterPageDesc(); SwFrmFmt& rPageFmt = pPageDesc->GetMaster(); SwFrmFmt *pHdFtFmt = @@ -754,7 +754,7 @@ void SwHTMLParser::NewMultiCol() // to the section's first node. if( pOldTxtNd ) MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(), - sal_True ); + sal_True ); if( pPostIts ) { @@ -823,14 +823,14 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd, SwCntntNode* pSrcCntntNd = pSrcNd->GetCntntNode(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet() + if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet() .GetItemState( RES_PAGEDESC, sal_False, &pItem ) && ((SwFmtPageDesc *)pItem)->GetPageDesc() ) { pDestCntntNd->SetAttr( *pItem ); pSrcCntntNd->ResetAttr( RES_PAGEDESC ); } - if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet() + if( SFX_ITEM_SET == pSrcCntntNd->GetSwAttrSet() .GetItemState( RES_BREAK, sal_False, &pItem ) ) { switch( ((SvxFmtBreakItem *)pItem)->GetBreak() ) @@ -851,7 +851,7 @@ void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd, SwFrmFmt *pFrmFmt = pSrcNd->GetTableNode()->GetTable().GetFrmFmt(); const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pFrmFmt->GetAttrSet(). + if( SFX_ITEM_SET == pFrmFmt->GetAttrSet(). GetItemState( RES_PAGEDESC, sal_False, &pItem ) ) { pDestCntntNd->SetAttr( *pItem ); diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index df9f43fafa41..6adf0ba2f6aa 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ static HTMLOptionEnum __FAR_DATA aHTMLTblVAlignTable[] = { 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 } + { 0, 0 } }; @@ -128,22 +128,22 @@ struct HTMLTableOptions class _HTMLTableContext { - SwHTMLNumRuleInfo aNumRuleInfo; // Vor der Tabelle gueltige Numerierung + SwHTMLNumRuleInfo aNumRuleInfo; // Vor der Tabelle gueltige Numerierung - SwTableNode *pTblNd; // der Tabellen-Node + SwTableNode *pTblNd; // der Tabellen-Node SwFrmFmt *pFrmFmt; // der Fly frame::Frame, in dem die Tabelle steht - SwPosition *pPos; // die Position hinter der Tabelle + SwPosition *pPos; // die Position hinter der Tabelle sal_uInt16 nContextStAttrMin; sal_uInt16 nContextStMin; - sal_Bool bRestartPRE : 1; - sal_Bool bRestartXMP : 1; - sal_Bool bRestartListing : 1; + sal_Bool bRestartPRE : 1; + sal_Bool bRestartXMP : 1; + sal_Bool bRestartListing : 1; public: - _HTMLAttrTable aAttrTab; // und die Attribute + _HTMLAttrTable aAttrTab; // und die Attribute _HTMLTableContext( SwPosition *pPs, sal_uInt16 nCntxtStMin, sal_uInt16 nCntxtStAttrMin ) : @@ -186,11 +186,11 @@ public: class HTMLTableCnts { - HTMLTableCnts *pNext; // der naechste Inhalt + HTMLTableCnts *pNext; // der naechste Inhalt // von den beiden naechsten Pointern darf nur einer gesetzt sein! - const SwStartNode *pStartNode; // ein Abastz - HTMLTable *pTable; // eine Tabelle + const SwStartNode *pStartNode; // ein Abastz + HTMLTable *pTable; // eine Tabelle SwHTMLTableLayoutCnts* pLayoutInfo; @@ -203,7 +203,7 @@ public: HTMLTableCnts( const SwStartNode* pStNd ); HTMLTableCnts( HTMLTable* pTab ); - ~HTMLTableCnts(); // nur in ~HTMLTableCell erlaubt + ~HTMLTableCnts(); // nur in ~HTMLTableCell erlaubt // Ermitteln des SwStartNode bzw. der HTMLTable const SwStartNode *GetStartNode() const { return pStartNode; } @@ -232,18 +232,18 @@ class HTMLTableCell { // !!!ACHTUNG!!!!! Fuer jeden neuen Pointer muss die SetProtected- // Methode (und natuerlich der Destruktor) bearbeitet werden. - HTMLTableCnts *pContents; // der Inhalt der Zelle - SvxBrushItem *pBGBrush; // Hintergrund der Zelle + HTMLTableCnts *pContents; // der Inhalt der Zelle + SvxBrushItem *pBGBrush; // Hintergrund der Zelle // !!!ACHTUNG!!!!! sal_uInt32 nNumFmt; - sal_uInt16 nRowSpan; // ROWSPAN der Zelle - sal_uInt16 nColSpan; // COLSPAN der Zelle - sal_uInt16 nWidth; // WIDTH der Zelle + sal_uInt16 nRowSpan; // ROWSPAN der Zelle + sal_uInt16 nColSpan; // COLSPAN der Zelle + sal_uInt16 nWidth; // WIDTH der Zelle double nValue; sal_Int16 eVertOri; // vertikale Ausrichtung der Zelle - sal_Bool bProtected : 1; // Zelle darf nicht belegt werden - sal_Bool bRelWidth : 1; // nWidth ist %-Angabe + sal_Bool bProtected : 1; // Zelle darf nicht belegt werden + sal_Bool bRelWidth : 1; // nWidth ist %-Angabe sal_Bool bHasNumFmt : 1; sal_Bool bHasValue : 1; sal_Bool bNoWrap : 1; @@ -251,9 +251,9 @@ class HTMLTableCell public: - HTMLTableCell(); // neue Zellen sind immer leer + HTMLTableCell(); // neue Zellen sind immer leer - ~HTMLTableCell(); // nur in ~HTMLTableRow erlaubt + ~HTMLTableCell(); // nur in ~HTMLTableRow erlaubt // Belegen einer nicht-leeren Zelle void Set( HTMLTableCnts *pCnts, sal_uInt16 nRSpan, sal_uInt16 nCSpan, @@ -302,23 +302,23 @@ SV_DECL_PTRARR_DEL(HTMLTableCells,HTMLTableCellPtr,5,5) class HTMLTableRow { - HTMLTableCells *pCells; // die Zellen der Zeile + HTMLTableCells *pCells; // die Zellen der Zeile sal_Bool bIsEndOfGroup : 1; sal_Bool bSplitable : 1; - sal_uInt16 nHeight; // Optionen von <TR>/<TD> - sal_uInt16 nEmptyRows; // wieviele Leere Zeilen folgen + sal_uInt16 nHeight; // Optionen von <TR>/<TD> + sal_uInt16 nEmptyRows; // wieviele Leere Zeilen folgen SvxAdjust eAdjust; sal_Int16 eVertOri; - SvxBrushItem *pBGBrush; // Hintergrund der Zelle aus STYLE + SvxBrushItem *pBGBrush; // Hintergrund der Zelle aus STYLE public: - sal_Bool bBottomBorder; // kommt hinter der Zeile eine Linie? + sal_Bool bBottomBorder; // kommt hinter der Zeile eine Linie? - HTMLTableRow( sal_uInt16 nCells=0 ); // die Zellen der Zeile sind leer + HTMLTableRow( sal_uInt16 nCells=0 ); // die Zellen der Zeile sind leer ~HTMLTableRow(); @@ -363,7 +363,7 @@ class HTMLTableColumn { sal_Bool bIsEndOfGroup; - sal_uInt16 nWidth; // Optionen von <COL> + sal_uInt16 nWidth; // Optionen von <COL> sal_Bool bRelWidth; SvxAdjust eAdjust; @@ -376,7 +376,7 @@ class HTMLTableColumn public: - sal_Bool bLeftBorder; // kommt vor der Spalte eine Linie + sal_Bool bLeftBorder; // kommt vor der Spalte eine Linie HTMLTableColumn(); @@ -419,87 +419,87 @@ class HTMLTable String aDir; SdrObjects *pResizeDrawObjs;// SDR-Objekte - SvUShorts *pDrawObjPrcWidths; // Spalte des Zeichen-Objekts und dessen + SvUShorts *pDrawObjPrcWidths; // Spalte des Zeichen-Objekts und dessen // relative Breite - HTMLTableRows *pRows; // die Zeilen der Tabelle + HTMLTableRows *pRows; // die Zeilen der Tabelle HTMLTableColumns *pColumns; // die Spalten der Tabelle - sal_uInt16 nRows; // Anzahl Zeilen - sal_uInt16 nCols; // Anzahl Spalten - sal_uInt16 nFilledCols; // Anzahl tatsaechlich gefuellter Spalten + sal_uInt16 nRows; // Anzahl Zeilen + sal_uInt16 nCols; // Anzahl Spalten + sal_uInt16 nFilledCols; // Anzahl tatsaechlich gefuellter Spalten - sal_uInt16 nCurRow; // aktuelle Zeile - sal_uInt16 nCurCol; // aktuelle Spalte + sal_uInt16 nCurRow; // aktuelle Zeile + sal_uInt16 nCurCol; // aktuelle Spalte - sal_uInt16 nLeftMargin; // Abstand zum linken Rand (aus Absatz) - sal_uInt16 nRightMargin; // Abstand zum rechten Rand (aus Absatz) + sal_uInt16 nLeftMargin; // Abstand zum linken Rand (aus Absatz) + sal_uInt16 nRightMargin; // Abstand zum rechten Rand (aus Absatz) - sal_uInt16 nCellPadding; // Abstand Umrandung zum Text - sal_uInt16 nCellSpacing; // Abstand zwischen zwei Zellen + sal_uInt16 nCellPadding; // Abstand Umrandung zum Text + sal_uInt16 nCellSpacing; // Abstand zwischen zwei Zellen sal_uInt16 nHSpace; sal_uInt16 nVSpace; - sal_uInt16 nBoxes; // Wievele Boxen enthaelt die Tabelle + sal_uInt16 nBoxes; // Wievele Boxen enthaelt die Tabelle - const SwStartNode *pPrevStNd; // der Table-Node oder der Start-Node + const SwStartNode *pPrevStNd; // der Table-Node oder der Start-Node // der vorhergehenden Section - const SwTable *pSwTable; // die SW-Tabelle (nur auf dem Top-Level) - SwTableBox *pBox1; // die TableBox, die beim Erstellen + const SwTable *pSwTable; // die SW-Tabelle (nur auf dem Top-Level) + SwTableBox *pBox1; // die TableBox, die beim Erstellen // der Top-Level-Tabelle angelegt wird SwTableBoxFmt *pBoxFmt; // das frame::Frame-Format einer SwTableBox SwTableLineFmt *pLineFmt; // das frame::Frame-Format einer SwTableLine SwTableLineFmt *pLineFrmFmtNoHeight; - SvxBrushItem *pBGBrush; // Hintergrund der Tabelle - SvxBrushItem *pInhBGBrush; // "geerbter" Hintergrund der Tabelle - const SwStartNode *pCaptionStartNode; // Start-Node der Tabellen-Ueberschrift + SvxBrushItem *pBGBrush; // Hintergrund der Tabelle + SvxBrushItem *pInhBGBrush; // "geerbter" Hintergrund der Tabelle + const SwStartNode *pCaptionStartNode; // Start-Node der Tabellen-Ueberschrift - SvxBorderLine aTopBorderLine; // die Linie fuer die Umrandung + SvxBorderLine aTopBorderLine; // die Linie fuer die Umrandung SvxBorderLine aBottomBorderLine;// die Linie fuer die Umrandung - SvxBorderLine aLeftBorderLine; // die Linie fuer die Umrandung - SvxBorderLine aRightBorderLine; // die Linie fuer die Umrandung - SvxBorderLine aBorderLine; // die Linie fuer die Umrandung - SvxBorderLine aInhLeftBorderLine; // die Linie fuer die Umrandung - SvxBorderLine aInhRightBorderLine; // die Linie fuer die Umrandung - sal_Bool bTopBorder; // besitzt die Tabelle oben eine Linie + SvxBorderLine aLeftBorderLine; // die Linie fuer die Umrandung + SvxBorderLine aRightBorderLine; // die Linie fuer die Umrandung + SvxBorderLine aBorderLine; // die Linie fuer die Umrandung + SvxBorderLine aInhLeftBorderLine; // die Linie fuer die Umrandung + SvxBorderLine aInhRightBorderLine; // die Linie fuer die Umrandung + sal_Bool bTopBorder; // besitzt die Tabelle oben eine Linie sal_Bool bRightBorder; // besitzt die Tabelle rechts eine Linie - sal_Bool bTopAlwd; // duerfen die Raender gesetzt werden? + sal_Bool bTopAlwd; // duerfen die Raender gesetzt werden? sal_Bool bRightAlwd; - sal_Bool bFillerTopBorder; // bekommt eine linke/rechter Filler- - sal_Bool bFillerBottomBorder; // Zelle eine obere/untere Umrandung? + sal_Bool bFillerTopBorder; // bekommt eine linke/rechter Filler- + sal_Bool bFillerBottomBorder; // Zelle eine obere/untere Umrandung? sal_Bool bInhLeftBorder; sal_Bool bInhRightBorder; - sal_Bool bBordersSet; // die Umrandung wurde bereits gesetzt + sal_Bool bBordersSet; // die Umrandung wurde bereits gesetzt sal_Bool bForceFrame; - sal_Bool bTableAdjustOfTag; // stammt nTableAdjust aus <TABLE>? - sal_uInt32 nHeadlineRepeat; // repeating rows + sal_Bool bTableAdjustOfTag; // stammt nTableAdjust aus <TABLE>? + sal_uInt32 nHeadlineRepeat; // repeating rows sal_Bool bIsParentHead; sal_Bool bHasParentSection; sal_Bool bMakeTopSubTable; sal_Bool bHasToFly; sal_Bool bFixedCols; - sal_Bool bColSpec; // Gab es COL(GROUP)-Elemente? - sal_Bool bPrcWidth; // Breite ist eine %-Angabe + sal_Bool bColSpec; // Gab es COL(GROUP)-Elemente? + sal_Bool bPrcWidth; // Breite ist eine %-Angabe - SwHTMLParser *pParser; // der aktuelle Parser - HTMLTable *pTopTable; // die Tabelle auf dem Top-Level + SwHTMLParser *pParser; // der aktuelle Parser + HTMLTable *pTopTable; // die Tabelle auf dem Top-Level HTMLTableCnts *pParentContents; - _HTMLTableContext *pContext; // der Kontext der Tabelle + _HTMLTableContext *pContext; // der Kontext der Tabelle SwHTMLTableLayout *pLayoutInfo; // die folgenden Parameter stammen aus der dem <TABLE>-Tag - sal_uInt16 nWidth; // die Breite der Tabelle - sal_uInt16 nHeight; // absolute Hoehe der Tabelle + sal_uInt16 nWidth; // die Breite der Tabelle + sal_uInt16 nHeight; // absolute Hoehe der Tabelle SvxAdjust eTableAdjust; // drawing::Alignment der Tabelle sal_Int16 eVertOri; // Default vertikale Ausr. der Zellen - sal_uInt16 nBorder; // Breite der auesseren Umrandung - HTMLTableFrame eFrame; // Rahmen um die Tabelle - HTMLTableRules eRules; // Ramhen in der Tabelle - sal_Bool bTopCaption; // Ueberschrift ueber der Tabelle + sal_uInt16 nBorder; // Breite der auesseren Umrandung + HTMLTableFrame eFrame; // Rahmen um die Tabelle + HTMLTableRules eRules; // Ramhen in der Tabelle + sal_Bool bTopCaption; // Ueberschrift ueber der Tabelle void InitCtor( const HTMLTableOptions *pOptions ); @@ -573,7 +573,7 @@ class HTMLTable public: - sal_Bool bFirstCell; // wurde schon eine Zelle angelegt? + sal_Bool bFirstCell; // wurde schon eine Zelle angelegt? HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab, sal_Bool bParHead, sal_Bool bHasParentSec, @@ -715,7 +715,7 @@ HTMLTableCnts::HTMLTableCnts( HTMLTable* pTab ): HTMLTableCnts::~HTMLTableCnts() { - delete pTable; // die Tabellen brauchen wir nicht mehr + delete pTable; // die Tabellen brauchen wir nicht mehr delete pNext; } @@ -1086,7 +1086,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) if( nCellPadding ) { if( nCellPadding==USHRT_MAX ) - nCellPadding = MIN_BORDER_DIST; // default + nCellPadding = MIN_BORDER_DIST; // default else { nCellPadding = pParser->ToTwips( nCellPadding ); @@ -1412,9 +1412,9 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox, { SwFrmFmt *pFrmFmt = 0; // frame::Frame-Format sal_Int16 eVOri = text::VertOrientation::NONE; - const SvxBrushItem *pBGBrushItem = 0; // Hintergrund + const SvxBrushItem *pBGBrushItem = 0; // Hintergrund sal_Bool bTopLine = sal_False, bBottomLine = sal_False, bLastBottomLine = sal_False; - sal_Bool bReUsable = sal_False; // Format nochmals verwendbar? + sal_Bool bReUsable = sal_False; // Format nochmals verwendbar? sal_uInt16 nEmptyRows = 0; sal_Bool bHasNumFmt = sal_False; sal_Bool bHasValue = sal_False; @@ -1468,7 +1468,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox, if( bHasNumFmt ) bHasValue = pCell->GetValue( nValue ); - if( nColSpan==1 && !bTopLine && !bLastBottomLine && !nEmptyRows && + if( nColSpan==1 && !bTopLine && !bLastBottomLine && !nEmptyRows && !pBGBrushItem && !bHasNumFmt ) { pFrmFmt = pColumn->GetFrmFmt( bBottomLine, eVOri ); @@ -2017,7 +2017,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable *pParent, if( nCol+nColSpan==pParent->nCols && pParent->bRightBorder ) { - bInhRightBorder = sal_True; // erstmal nur merken + bInhRightBorder = sal_True; // erstmal nur merken aInhRightBorderLine = pParent->aRightBorderLine; nInhRightBorderWidth = GetBorderWidth( aInhRightBorderLine, sal_True ) + MIN_BORDER_DIST; @@ -2025,7 +2025,7 @@ void HTMLTable::InheritVertBorders( const HTMLTable *pParent, if( ((*pParent->pColumns)[nCol])->bLeftBorder ) { - bInhLeftBorder = sal_True; // erstmal nur merken + bInhLeftBorder = sal_True; // erstmal nur merken aInhLeftBorderLine = 0==nCol ? pParent->aLeftBorderLine : pParent->aBorderLine; nInhLeftBorderWidth = @@ -2165,8 +2165,8 @@ void HTMLTable::InsertCell( HTMLTableCnts *pCnts, if( !nColSpan || (sal_uInt32)nCurCol + nColSpan > USHRT_MAX ) nColSpan = 1; - sal_uInt16 nColsReq = nCurCol + nColSpan; // benoetigte Spalten - sal_uInt16 nRowsReq = nCurRow + nRowSpan; // benoetigte Zeilen + sal_uInt16 nColsReq = nCurCol + nColSpan; // benoetigte Spalten + sal_uInt16 nRowsReq = nCurRow + nRowSpan; // benoetigte Zeilen sal_uInt16 i, j; // falls wir mehr Spalten benoetigen als wir zur Zeit haben, @@ -2278,14 +2278,14 @@ inline void HTMLTable::CloseSection( sal_Bool bHead ) if( nCurRow>0 && nCurRow<=nRows ) ((*pRows)[nCurRow-1])->SetEndOfGroup(); if( bHead /*&& nCurRow==1*/ ) -// bHeadlineRepeat = sal_True; +// bHeadlineRepeat = sal_True; nHeadlineRepeat = nCurRow; } void HTMLTable::OpenRow( SvxAdjust eAdjust, sal_Int16 eVertOrient, SvxBrushItem *pBGBrushItem ) { - sal_uInt16 nRowsReq = nCurRow+1; // Anzahl benoetigter Zeilen; + sal_uInt16 nRowsReq = nCurRow+1; // Anzahl benoetigter Zeilen; // die naechste Zeile anlegen, falls sie nicht schon da ist if( nRows<nRowsReq ) @@ -2372,7 +2372,7 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, sal_Bool bRel if( !nSpan ) nSpan = 1; - sal_uInt16 nColsReq = nCurCol + nSpan; // benoetigte Spalten + sal_uInt16 nColsReq = nCurCol + nSpan; // benoetigte Spalten if( nCols < nColsReq ) { @@ -2474,7 +2474,7 @@ void HTMLTable::_MakeTable( SwTableBox *pBox ) erste Zeile: ohne Absatz-Einzuege zweite Zeile: mit Absatz-Einzuegen -ALIGN= LEFT RIGHT CENTER - +ALIGN= LEFT RIGHT CENTER - ------------------------------------------------------------------------- xxx bei Tabellen mit WIDTH=nn% ist die Prozent-Angabe von Bedeutung: xxx nn = 100 text::HoriOrientation::FULL text::HoriOrientation::FULL text::HoriOrientation::FULL text::HoriOrientation::FULL % @@ -3005,12 +3005,12 @@ xub_StrLen SwHTMLParser::StripTrailingLF() { // MIB 6.6.97: Warum sollte man bei leeren Absaetzen nur ein LF loeschen? // Das stimmt doch irgendwi nicht ... -// if( nLFCount == nLen ) -// { -// // nur Lfs, dann nur ein LF loeschen -// nLFCount = 1; -// } -// else if( nLFCount > 2 ) +// if( nLFCount == nLen ) +// { +// // nur Lfs, dann nur ein LF loeschen +// nLFCount = 1; +// } +// else if( nLFCount > 2 ) if( nLFCount > 2 ) { // Bei Netscape entspricht ein Absatz-Ende zwei LFs @@ -3181,8 +3181,8 @@ class _CellSaveStruct : public _SectionSaveStruct String aBGImage; Color aBGColor; - HTMLTableCnts* pCnts; // Liste aller Inhalte - HTMLTableCnts* pCurrCnts; // der aktuelle Inhalt oder 0 + HTMLTableCnts* pCnts; // Liste aller Inhalte + HTMLTableCnts* pCurrCnts; // der aktuelle Inhalt oder 0 SwNodeIndex *pNoBreakEndParaIdx;// Absatz-Index eines </NOBR> double nValue; @@ -3190,7 +3190,7 @@ class _CellSaveStruct : public _SectionSaveStruct sal_uInt32 nNumFmt; sal_uInt16 nRowSpan, nColSpan, nWidth, nHeight; - xub_StrLen nNoBreakEndCntntPos; // Zeichen-Index eines </NOBR> + xub_StrLen nNoBreakEndCntntPos; // Zeichen-Index eines </NOBR> SvxAdjust eAdjust; sal_Int16 eVertOri; @@ -3200,8 +3200,8 @@ class _CellSaveStruct : public _SectionSaveStruct sal_Bool bHasNumFmt : 1; sal_Bool bHasValue : 1; sal_Bool bBGColor : 1; - sal_Bool bNoWrap : 1; // NOWRAP-Option - sal_Bool bNoBreak : 1; // NOBREAK-Tag + sal_Bool bNoWrap : 1; // NOWRAP-Option + sal_Bool bNoBreak : 1; // NOBREAK-Tag public: @@ -3278,15 +3278,15 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable, aHTMLTblVAlignTable, eVertOri ); break; case HTML_O_WIDTH: - nWidth = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape + nWidth = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape bPrcWidth = (pOption->GetString().Search('%') != STRING_NOTFOUND); if( bPrcWidth && nWidth>100 ) nWidth = 100; break; case HTML_O_HEIGHT: - nHeight = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape + nHeight = (sal_uInt16)pOption->GetNumber(); // nur fuer Netscape if( pOption->GetString().Search('%') != STRING_NOTFOUND) - nHeight = 0; // keine %-Angaben beruecksichtigen + nHeight = 0; // keine %-Angaben beruecksichtigen break; case HTML_O_BGCOLOR: // Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netscape @@ -3586,13 +3586,13 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, static sal_uInt16 aWhichIds[] = { - RES_PARATR_SPLIT, RES_PARATR_SPLIT, - RES_PAGEDESC, RES_PAGEDESC, - RES_BREAK, RES_BREAK, - RES_BACKGROUND, RES_BACKGROUND, - RES_KEEP, RES_KEEP, - RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, - RES_FRAMEDIR, RES_FRAMEDIR, + RES_PARATR_SPLIT, RES_PARATR_SPLIT, + RES_PAGEDESC, RES_PAGEDESC, + RES_BREAK, RES_BREAK, + RES_BACKGROUND, RES_BACKGROUND, + RES_KEEP, RES_KEEP, + RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, + RES_FRAMEDIR, RES_FRAMEDIR, 0 }; @@ -3650,14 +3650,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, // oder es gibt bereits Inhalt an der entsprechenden Stelle. ASSERT( !bForceFrame || pCurTable->HasParentSection(), "Tabelle im Rahmen hat keine Umgebung!" ); -// SCHOEN WAER'S, aber wie bekommen den Inhalt nicht zurueck -// in die umgebende Zelle -// if( bForceFrame && !pCurTable->HasParentSection() ) -// { -// pCurTable->SetParentContents( -// InsertTableContents( sal_False, SVX_ADJUST_END ) ); -// pCurTable->SetHasParentSection( sal_True ); -// } +// SCHOEN WAER'S, aber wie bekommen den Inhalt nicht zurueck +// in die umgebende Zelle +// if( bForceFrame && !pCurTable->HasParentSection() ) +// { +// pCurTable->SetParentContents( +// InsertTableContents( sal_False, SVX_ADJUST_END ) ); +// pCurTable->SetHasParentSection( sal_True ); +// } sal_Bool bAppend = sal_False; if( bForceFrame ) @@ -3836,8 +3836,8 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, // automatisch verankerte Rahmen muessen noch um // eine Position nach vorne verschoben werden. //if( FLY_AUTO_CNTNT==eAnchorId ) - // aMoveFlyFrms.C40_INSERT( SwFrmFmt, pFrmFmt, - // aMoveFlyFrms.Count() ); + // aMoveFlyFrms.C40_INSERT( SwFrmFmt, pFrmFmt, + // aMoveFlyFrms.Count() ); } // eine SwTable mit einer Box anlegen und den PaM in den @@ -3875,14 +3875,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, SwFrmFmt *pFrmFmt = pSwTable->GetFrmFmt(); const SfxPoolItem* pItem2; - if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet() + if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet() .GetItemState( RES_PAGEDESC, sal_False, &pItem2 ) && ((SwFmtPageDesc *)pItem2)->GetPageDesc() ) { pFrmFmt->SetFmtAttr( *pItem2 ); pOldTxtNd->ResetAttr( RES_PAGEDESC ); } - if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet() + if( SFX_ITEM_SET == pOldTxtNd->GetSwAttrSet() .GetItemState( RES_BREAK, sal_True, &pItem2 ) ) { switch( ((SvxFmtBreakItem *)pItem2)->GetBreak() ) @@ -3963,7 +3963,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, } if( !nToken ) - nToken = GetNextToken(); // Token nach <TABLE> + nToken = GetNextToken(); // Token nach <TABLE> sal_Bool bDone = sal_False; while( (IsParserWorking() && !bDone) || bPending ) @@ -4368,7 +4368,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions, } if( !nToken ) - nToken = GetNextToken(); // naechstes Token + nToken = GetNextToken(); // naechstes Token sal_Bool bDone = sal_False; while( (IsParserWorking() && !bDone) || bPending ) @@ -4395,10 +4395,10 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions, SkipToken( -1 ); bDone = sal_True; } -// else -// { -// NextToken( nToken ); -// } +// else +// { +// NextToken( nToken ); +// } break; case HTML_TABLEROW_ON: case HTML_THEAD_ON: @@ -4440,10 +4440,10 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions, // spaltige Rahmen koennen wir hier leider nicht einguegen break; case HTML_FORM_ON: - NewForm( sal_False ); // keinen neuen Absatz aufmachen! + NewForm( sal_False ); // keinen neuen Absatz aufmachen! break; case HTML_FORM_OFF: - EndForm( sal_False ); // keinen neuen Absatz aufmachen! + EndForm( sal_False ); // keinen neuen Absatz aufmachen! break; case HTML_COMMENT: NextToken( nToken ); @@ -4547,7 +4547,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, } if( !nToken ) - nToken = GetNextToken(); // naechstes Token + nToken = GetNextToken(); // naechstes Token sal_Bool bDone = sal_False; while( (IsParserWorking() && !bDone) || bPending ) @@ -4574,10 +4574,10 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, SkipToken( -1 ); bDone = sal_True; } -// else -// { -// NextToken( nToken ); -// } +// else +// { +// NextToken( nToken ); +// } break; case HTML_THEAD_ON: case HTML_TFOOT_ON: @@ -4603,7 +4603,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, bDone = pTable->IsOverflowing(); break; case HTML_TABLEROW_ON: - BuildTableRow( pCurTable, sal_True, pSaveStruct->eAdjust, + BuildTableRow( pCurTable, sal_True, pSaveStruct->eAdjust, pSaveStruct->eVertOri ); bDone = pTable->IsOverflowing(); break; @@ -4611,10 +4611,10 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable, // spaltige Rahmen koennen wir hier leider nicht einguegen break; case HTML_FORM_ON: - NewForm( sal_False ); // keinen neuen Absatz aufmachen! + NewForm( sal_False ); // keinen neuen Absatz aufmachen! break; case HTML_FORM_OFF: - EndForm( sal_False ); // keinen neuen Absatz aufmachen! + EndForm( sal_False ); // keinen neuen Absatz aufmachen! break; case HTML_TEXTTOKEN: // Blank-Strings sind Folge von CR+LF und kein Text @@ -4676,7 +4676,7 @@ inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() : inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable ) { pTable->CloseColGroup( nColGrpSpan, nColGrpWidth, - bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri ); + bRelColGrpWidth, eColGrpAdjust, eColGrpVertOri ); } void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, @@ -4745,7 +4745,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, } if( !nToken ) - nToken = GetNextToken(); // naechstes Token + nToken = GetNextToken(); // naechstes Token sal_Bool bDone = sal_False; while( (IsParserWorking() && !bDone) || bPending ) @@ -4772,10 +4772,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, SkipToken( -1 ); bDone = sal_True; } -// else -// { -// NextToken( nToken ); -// } +// else +// { +// NextToken( nToken ); +// } break; case HTML_COLGROUP_ON: case HTML_THEAD_ON: @@ -4833,7 +4833,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, } break; case HTML_COL_OFF: - break; // Ignorieren + break; // Ignorieren case HTML_MULTICOL_ON: // spaltige Rahmen koennen wir hier leider nicht einguegen break; @@ -4876,7 +4876,7 @@ class _CaptionSaveStruct : public _SectionSaveStruct public: - _HTMLAttrTable aAttrTab; // und die Attribute + _HTMLAttrTable aAttrTab; // und die Attribute _CaptionSaveStruct( SwHTMLParser& rParser, const SwPosition& rPos ) : _SectionSaveStruct( rParser ), aSavePos( rPos ) @@ -4981,7 +4981,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) } if( !nToken ) - nToken = GetNextToken(); // naechstes Token + nToken = GetNextToken(); // naechstes Token // </CAPTION> wird laut DTD benoetigt sal_Bool bDone = sal_False; @@ -5032,7 +5032,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) pPendStack = pTmp; ASSERT( !pTmp, "weiter kann es nicht gehen!" ); - nNxtToken = 0; // neu lesen + nNxtToken = 0; // neu lesen } if( IsParserWorking() ) @@ -5191,7 +5191,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions *pOptions, case HTML_O_HEIGHT: nHeight = (sal_uInt16)pOption->GetNumber(); if( pOption->GetString().Search('%') != STRING_NOTFOUND ) - nHeight = 0; // keine %-Anagben benutzen!!! + nHeight = 0; // keine %-Anagben benutzen!!! break; case HTML_O_CELLPADDING: nCellPadding = (sal_uInt16)pOption->GetNumber(); @@ -5343,7 +5343,7 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, // </TABLE> wird laut DTD benoetigt if( !nToken ) - nToken = GetNextToken(); // naechstes Token + nToken = GetNextToken(); // naechstes Token sal_Bool bDone = sal_False; while( (IsParserWorking() && !bDone) || bPending ) @@ -5372,10 +5372,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, SkipToken( -1 ); bDone = sal_True; } -// else -// { -// NextToken( nToken ); -// } +// else +// { +// NextToken( nToken ); +// } break; case HTML_TABLE_OFF: bDone = sal_True; @@ -5408,10 +5408,10 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust, // spaltige Rahmen koennen wir hier leider nicht einguegen break; case HTML_FORM_ON: - NewForm( sal_False ); // keinen neuen Absatz aufmachen! + NewForm( sal_False ); // keinen neuen Absatz aufmachen! break; case HTML_FORM_OFF: - EndForm( sal_False ); // keinen neuen Absatz aufmachen! + EndForm( sal_False ); // keinen neuen Absatz aufmachen! break; case HTML_TEXTTOKEN: // Blank-Strings sind u. U. eine Folge von CR+LF und kein Text diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 43b83557a149..f7b577ca7d7a 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -285,7 +285,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, SwWriteTableCol *pCol = aCols[nCol]; -// sal_Bool bOutWidth = nColSpan>1 || pCol->GetOutWidth(); +// sal_Bool bOutWidth = nColSpan>1 || pCol->GetOutWidth(); sal_Bool bOutWidth = sal_True; //nColSpan==1 && pCol->GetOutWidth(); const SwStartNode* pSttNd = pBox->GetSttNd(); @@ -323,7 +323,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, } } - rWrt.OutNewLine(); // <TH>/<TD> in neue Zeile + rWrt.OutNewLine(); // <TH>/<TD> in neue Zeile ByteString sOut( '<' ); sOut += (bHead ? OOO_STRING_SVTOOLS_HTML_tableheader : OOO_STRING_SVTOOLS_HTML_tabledata ); @@ -461,7 +461,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, rWrt.Strm() << sOut.GetBuffer(); rWrt.bLFPossible = sal_True; - rWrt.IncIndentLevel(); // den Inhalt von <TD>...</TD> einruecken + rWrt.IncIndentLevel(); // den Inhalt von <TD>...</TD> einruecken if( pSttNd ) { @@ -492,7 +492,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, aTableWrt.Write( rWrt ); } - rWrt.DecIndentLevel(); // den Inhalt von <TD>...</TD> einruecken + rWrt.DecIndentLevel(); // den Inhalt von <TD>...</TD> einruecken if( rWrt.bLFPossible ) rWrt.OutNewLine(); @@ -529,7 +529,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, } } - rWrt.OutNewLine(); // <TR> in neuer Zeile + rWrt.OutNewLine(); // <TR> in neuer Zeile rWrt.Strm() << '<' << OOO_STRING_SVTOOLS_HTML_tablerow; if( pBrushItem ) { @@ -559,7 +559,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, rWrt.DecIndentLevel(); // Inhalt von <TR>...</TR> einruecken - rWrt.OutNewLine(); // </TR> in neuer Zeile + rWrt.OutNewLine(); // </TR> in neuer Zeile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False ); } @@ -567,7 +567,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt, void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, sal_Bool bTHead, const SwFrmFmt *pFrmFmt, - const String *pCaption, sal_Bool bTopCaption, + const String *pCaption, sal_Bool bTopCaption, sal_uInt16 nHSpace, sal_uInt16 nVSpace ) const { sal_uInt16 nRow; @@ -627,7 +627,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, rWrt.ChangeParaToken( 0 ); if( rWrt.bLFPossible ) - rWrt.OutNewLine(); // <TABLE> in neue Zeile + rWrt.OutNewLine(); // <TABLE> in neue Zeile ByteString sOut( '<' ); sOut += OOO_STRING_SVTOOLS_HTML_table; @@ -733,16 +733,16 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, const sal_Char *pFrame = 0; switch( nFrameMask ) { - 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; + 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 = OOO_STRING_SVTOOLS_HTML_TF_box ;break; // geht nicht + //default: pFrame = OOO_STRING_SVTOOLS_HTML_TF_box ;break; // geht nicht }; if( pFrame ) (((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_frame ) += '=') += pFrame; @@ -817,7 +817,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, (((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_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, sal_False ); } @@ -1177,7 +1177,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, if( text::HoriOrientation::NONE!=eDivHoriOri ) { if( rHTMLWrt.bLFPossible ) - rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile + rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile if( text::HoriOrientation::CENTER==eDivHoriOri ) HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True ); else @@ -1187,7 +1187,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.GetBuffer(), sal_True ); } - rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken + rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken rHTMLWrt.bLFPossible = sal_True; } @@ -1226,8 +1226,8 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode, if( text::HoriOrientation::NONE!=eDivHoriOri ) { - rHTMLWrt.DecIndentLevel(); // Inhalt von <CENTER> einruecken - rHTMLWrt.OutNewLine(); // </CENTER> in neue Teile + rHTMLWrt.DecIndentLevel(); // Inhalt von <CENTER> einruecken + rHTMLWrt.OutNewLine(); // </CENTER> in neue Teile HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), text::HoriOrientation::CENTER==eDivHoriOri ? OOO_STRING_SVTOOLS_HTML_center : OOO_STRING_SVTOOLS_HTML_division, sal_False ); diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx index 18e0129fd0a3..82e1c1df1f56 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 8d6aadfc41e2..3f3c46f5db18 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,10 +54,10 @@ #define LOOP_CHECK_RESTART \ nOldInPos = STRING_MAXLEN; #define LOOP_CHECK_CHECK( where ) \ - DBG_ASSERT( nOldInPos!=nInPos || cNextCh==(sal_Unicode)EOF, where ); \ - if( nOldInPos==nInPos && cNextCh!=(sal_Unicode)EOF ) \ - break; \ - else \ + DBG_ASSERT( nOldInPos!=nInPos || cNextCh==(sal_Unicode)EOF, where ); \ + if( nOldInPos==nInPos && cNextCh!=(sal_Unicode)EOF ) \ + break; \ + else \ nOldInPos = nInPos; #else @@ -661,8 +661,8 @@ CSS1Token CSS1Parser::GetNextToken() sTmpBuffer2.append( cNextCh ); switch( cNextCh ) { - case '(': nNestCnt++; break; - case ')': nNestCnt--; break; + case '(': nNestCnt++; break; + case ')': nNestCnt--; break; } cNextCh = GetNextChar(); } while( (nNestCnt>1 || ')'!=cNextCh) && !IsEOF() ); @@ -728,7 +728,7 @@ void CSS1Parser::ParseStyleSheet() // url ueberspringen wir ungeprueft nToken = GetNextToken(); break; - case CSS1_IDENT: // Look-Aheads + case CSS1_IDENT: // Look-Aheads case CSS1_DOT_W_WS: case CSS1_HASH: // /Feature: PrintExt @@ -755,7 +755,7 @@ void CSS1Parser::ParseStyleSheet() switch( nToken ) { - case CSS1_IDENT: // Look-Aheads + case CSS1_IDENT: // Look-Aheads case CSS1_DOT_W_WS: case CSS1_HASH: // /Feature: PrintExt @@ -1026,7 +1026,7 @@ CSS1Selector *CSS1Parser::ParseSelector() // term // : unary_operator? // [ NUMBER | STRING | PERCENTAGE | LENGTH | EMS | EXS | IDENT | -// HEXCOLOR | URL | RGB ] +// HEXCOLOR | URL | RGB ] // // operator // : '/' | ',' | /* empty */ @@ -1099,7 +1099,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( String& rProperty ) case CSS1_RGB: case CSS1_HEXCOLOR: pNew = new CSS1Expression( nToken, aToken, nValue, cOp ); - nValue = 0; // sonst landet das auch im naechsten Ident + nValue = 0; // sonst landet das auch im naechsten Ident cSign = 0; cOp = 0; break; @@ -1358,7 +1358,7 @@ BOOL CSS1Expression::GetColor( Color &rColor ) const rColor.SetGreen( aColors[1] ); rColor.SetBlue( aColors[2] ); - bRet = TRUE; // etwas anderes als eine Farbe kann es nicht sein + bRet = TRUE; // etwas anderes als eine Farbe kann es nicht sein } break; diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 7d85f05e4a7f..822bd6525e38 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ enum CSS1Token CSS1_STRING, CSS1_NUMBER, CSS1_PERCENTAGE, - CSS1_LENGTH, // eine absolute Groesse in 1/100 MM - CSS1_PIXLENGTH, // eine Pixel-Groesse + CSS1_LENGTH, // eine absolute Groesse in 1/100 MM + CSS1_PIXLENGTH, // eine Pixel-Groesse CSS1_EMS, CSS1_EMX, CSS1_HEXCOLOR, @@ -110,9 +110,9 @@ enum CSS1SelectorType // Selektoren verkettet class CSS1Selector { - CSS1SelectorType eType; // Art des Selektors - String aSelector; // der Selektor selbst - CSS1Selector *pNext; // die naechste Komponente + CSS1SelectorType eType; // Art des Selektors + String aSelector; // der Selektor selbst + CSS1Selector *pNext; // die naechste Komponente public: @@ -143,11 +143,11 @@ public: // struct CSS1Expression { - sal_Unicode cOp; // Art der Verkuepfung mit dem Vorgaenger - CSS1Token eType; // der Typ des Wertes - String aValue; // und sein Wert als String - double nValue; // und als Zahl (TWIPs fuer LENGTH) - CSS1Expression *pNext; // die naechste Komponente + sal_Unicode cOp; // Art der Verkuepfung mit dem Vorgaenger + CSS1Token eType; // der Typ des Wertes + String aValue; // und sein Wert als String + double nValue; // und als Zahl (TWIPs fuer LENGTH) + CSS1Expression *pNext; // die naechste Komponente public: @@ -201,31 +201,31 @@ inline sal_Int32 CSS1Expression::GetSLength() const // und DeclarationParsed() an abgeleitete Parser uebergeben. Bsp: // // H1, H2 { font-weight: bold; text-align: right } -// | | | | +// | | | | // | | | DeclP( 'text-align', 'right' ) -// | | DeclP( 'font-weight', 'bold' ) +// | | DeclP( 'font-weight', 'bold' ) // | SelP( 'H2', sal_False ) // SelP( 'H1', sal_True ) // class CSS1Parser { - sal_Bool bWhiteSpace : 1; // White-Space gelesen? - sal_Bool bEOF : 1; // Ende des "Files" ? + sal_Bool bWhiteSpace : 1; // White-Space gelesen? + sal_Bool bEOF : 1; // Ende des "Files" ? - sal_Unicode cNextCh; // naechstes Zeichen + sal_Unicode cNextCh; // naechstes Zeichen - xub_StrLen nInPos; // aktuelle Position im Input-String + xub_StrLen nInPos; // aktuelle Position im Input-String - sal_uInt32 nlLineNr; // akt. Zeilen Nummer - sal_uInt32 nlLinePos; // akt. Spalten Nummer + sal_uInt32 nlLineNr; // akt. Zeilen Nummer + sal_uInt32 nlLinePos; // akt. Spalten Nummer - double nValue; // der Wert des Tokens als Zahl + double nValue; // der Wert des Tokens als Zahl - CSS1ParserState eState; // der akteulle Zustand der Parsers - CSS1Token nToken; // das aktuelle Token + CSS1ParserState eState; // der akteulle Zustand der Parsers + CSS1Token nToken; // das aktuelle Token - String aIn; // der zu parsende String - String aToken; // das Token als String + String aIn; // der zu parsende String + String aToken; // das Token als String // Parsen vorbereiten void InitRead( const String& rIn ); @@ -243,8 +243,8 @@ class CSS1Parser sal_uInt32 IncLineNr() { return ++nlLineNr; } sal_uInt32 IncLinePos() { return ++nlLinePos; } - inline sal_uInt32 SetLineNr( sal_uInt32 nlNum ); // inline unten - inline sal_uInt32 SetLinePos( sal_uInt32 nlPos ); // inline unten + inline sal_uInt32 SetLineNr( sal_uInt32 nlNum ); // inline unten + inline sal_uInt32 SetLinePos( sal_uInt32 nlPos ); // inline unten // Parsen von Teilen der Grammatik void ParseRule(); @@ -283,8 +283,8 @@ public: CSS1Parser(); virtual ~CSS1Parser(); - inline sal_uInt32 GetLineNr() const { return nlLineNr; } - inline sal_uInt32 GetLinePos() const { return nlLinePos; } + inline sal_uInt32 GetLineNr() const { return nlLineNr; } + inline sal_uInt32 GetLinePos() const { return nlLinePos; } }; inline sal_uInt32 CSS1Parser::SetLineNr( sal_uInt32 nlNum ) diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index f1dd5631eca4..f1bda7dad01c 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,161 +79,161 @@ SV_IMPL_PTRARR( CSS1Selectors, CSS1Selector* ) static CSS1PropertyEnum __READONLY_DATA aFontSizeTable[] = { - { sCSS1_PV_xx_small, 0 }, - { sCSS1_PV_x_small, 1 }, - { sCSS1_PV_small, 2 }, - { sCSS1_PV_medium, 3 }, - { sCSS1_PV_large, 4 }, - { sCSS1_PV_x_large, 5 }, - { sCSS1_PV_xx_large, 6 }, - { 0, 0 } + { sCSS1_PV_xx_small, 0 }, + { sCSS1_PV_x_small, 1 }, + { sCSS1_PV_small, 2 }, + { sCSS1_PV_medium, 3 }, + { sCSS1_PV_large, 4 }, + { sCSS1_PV_x_large, 5 }, + { sCSS1_PV_xx_large, 6 }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aFontFamilyTable[] = { - { sCSS1_PV_serif, FAMILY_ROMAN }, - { sCSS1_PV_sans_serif, FAMILY_SWISS }, - { sCSS1_PV_cursive, FAMILY_SCRIPT }, - { sCSS1_PV_fantasy, FAMILY_DECORATIVE }, - { sCSS1_PV_monospace, FAMILY_MODERN }, - { 0, 0 } + { sCSS1_PV_serif, FAMILY_ROMAN }, + { sCSS1_PV_sans_serif, FAMILY_SWISS }, + { sCSS1_PV_cursive, FAMILY_SCRIPT }, + { sCSS1_PV_fantasy, FAMILY_DECORATIVE }, + { sCSS1_PV_monospace, FAMILY_MODERN }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aFontWeightTable[] = { - { sCSS1_PV_extra_light, WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS) - { sCSS1_PV_light, WEIGHT_NORMAL }, // WEIGHT_LIGHT (OBSOLETE) - { sCSS1_PV_demi_light, WEIGHT_NORMAL }, // WEIGHT_SEMILIGHT (OBS) - { sCSS1_PV_medium, WEIGHT_NORMAL }, // WEIGHT_MEDIUM (OBS) - { sCSS1_PV_normal, WEIGHT_NORMAL }, // WEIGHT_MEDIUM - { sCSS1_PV_demi_bold, WEIGHT_NORMAL }, // WEIGHT_SEMIBOLD (OBS) - { sCSS1_PV_bold, WEIGHT_BOLD }, // WEIGHT_BOLD (OBSOLETE) - { sCSS1_PV_extra_bold, WEIGHT_BOLD }, // WEIGHT_ULTRABOLD (OBS) - { sCSS1_PV_bolder, WEIGHT_BOLD }, - { sCSS1_PV_lighter, WEIGHT_NORMAL }, - { 0, 0 } + { sCSS1_PV_extra_light, WEIGHT_NORMAL }, // WEIGHT_ULTRALIGHT (OBS) + { sCSS1_PV_light, WEIGHT_NORMAL }, // WEIGHT_LIGHT (OBSOLETE) + { sCSS1_PV_demi_light, WEIGHT_NORMAL }, // WEIGHT_SEMILIGHT (OBS) + { sCSS1_PV_medium, WEIGHT_NORMAL }, // WEIGHT_MEDIUM (OBS) + { sCSS1_PV_normal, WEIGHT_NORMAL }, // WEIGHT_MEDIUM + { sCSS1_PV_demi_bold, WEIGHT_NORMAL }, // WEIGHT_SEMIBOLD (OBS) + { sCSS1_PV_bold, WEIGHT_BOLD }, // WEIGHT_BOLD (OBSOLETE) + { sCSS1_PV_extra_bold, WEIGHT_BOLD }, // WEIGHT_ULTRABOLD (OBS) + { sCSS1_PV_bolder, WEIGHT_BOLD }, + { sCSS1_PV_lighter, WEIGHT_NORMAL }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aFontStyleTable[] = { - { sCSS1_PV_normal, ITALIC_NONE }, - { sCSS1_PV_italic, ITALIC_NORMAL }, - { sCSS1_PV_oblique, ITALIC_NORMAL }, - { 0, 0 } + { sCSS1_PV_normal, ITALIC_NONE }, + { sCSS1_PV_italic, ITALIC_NORMAL }, + { sCSS1_PV_oblique, ITALIC_NORMAL }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aFontVariantTable[] = { - { sCSS1_PV_normal, SVX_CASEMAP_NOT_MAPPED }, - { sCSS1_PV_small_caps, SVX_CASEMAP_KAPITAELCHEN }, - { 0, 0 } + { sCSS1_PV_normal, SVX_CASEMAP_NOT_MAPPED }, + { sCSS1_PV_small_caps, SVX_CASEMAP_KAPITAELCHEN }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aDirectionTable[] = { - { sCSS1_PV_ltr, FRMDIR_HORI_LEFT_TOP }, - { sCSS1_PV_rtl, FRMDIR_HORI_RIGHT_TOP }, - { sCSS1_PV_inherit, FRMDIR_ENVIRONMENT }, - { 0, 0 } + { sCSS1_PV_ltr, FRMDIR_HORI_LEFT_TOP }, + { sCSS1_PV_rtl, FRMDIR_HORI_RIGHT_TOP }, + { sCSS1_PV_inherit, FRMDIR_ENVIRONMENT }, + { 0, 0 } }; /* */ static CSS1PropertyEnum __READONLY_DATA aBGRepeatTable[] = { - { sCSS1_PV_repeat, GPOS_TILED }, - { sCSS1_PV_repeat_x, GPOS_TILED }, - { sCSS1_PV_repeat_y, GPOS_TILED }, - { sCSS1_PV_no_repeat, GPOS_NONE }, - { 0, 0 } + { sCSS1_PV_repeat, GPOS_TILED }, + { sCSS1_PV_repeat_x, GPOS_TILED }, + { sCSS1_PV_repeat_y, GPOS_TILED }, + { sCSS1_PV_no_repeat, GPOS_NONE }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aBGHoriPosTable[] = { - { sCSS1_PV_left, GPOS_LT }, - { sCSS1_PV_center, GPOS_MT }, - { sCSS1_PV_right, GPOS_RT }, - { 0, 0 } + { sCSS1_PV_left, GPOS_LT }, + { sCSS1_PV_center, GPOS_MT }, + { sCSS1_PV_right, GPOS_RT }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aBGVertPosTable[] = { - { sCSS1_PV_top, GPOS_LT }, - { sCSS1_PV_middle, GPOS_LM }, - { sCSS1_PV_bottom, GPOS_LB }, - { 0, 0 } + { sCSS1_PV_top, GPOS_LT }, + { sCSS1_PV_middle, GPOS_LM }, + { sCSS1_PV_bottom, GPOS_LB }, + { 0, 0 } }; /* */ static CSS1PropertyEnum __READONLY_DATA aTextAlignTable[] = { - { sCSS1_PV_left, SVX_ADJUST_LEFT }, - { sCSS1_PV_center, SVX_ADJUST_CENTER }, - { sCSS1_PV_right, SVX_ADJUST_RIGHT }, - { sCSS1_PV_justify, SVX_ADJUST_BLOCK }, - { 0, 0 } + { sCSS1_PV_left, SVX_ADJUST_LEFT }, + { sCSS1_PV_center, SVX_ADJUST_CENTER }, + { sCSS1_PV_right, SVX_ADJUST_RIGHT }, + { sCSS1_PV_justify, SVX_ADJUST_BLOCK }, + { 0, 0 } }; /* */ static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] = { - { sCSS1_PV_thin, 0 }, // DEF_LINE_WIDTH_0 / DEF_DOUBLE_LINE0 - { sCSS1_PV_medium, 1 }, // DEF_LINE_WIDTH_1 / DEF_DOUBLE_LINE1 - { sCSS1_PV_thick, 2 }, // DEF_LINE_WIDTH_2 / DEF_DOUBLE_LINE2 - { 0, 0 } + { sCSS1_PV_thin, 0 }, // DEF_LINE_WIDTH_0 / DEF_DOUBLE_LINE0 + { sCSS1_PV_medium, 1 }, // DEF_LINE_WIDTH_1 / DEF_DOUBLE_LINE1 + { sCSS1_PV_thick, 2 }, // DEF_LINE_WIDTH_2 / DEF_DOUBLE_LINE2 + { 0, 0 } }; enum CSS1BorderStyle { CSS1_BS_NONE, CSS1_BS_SINGLE, CSS1_BS_DOUBLE }; static CSS1PropertyEnum __READONLY_DATA aBorderStyleTable[] = { - { sCSS1_PV_none, CSS1_BS_NONE }, - { sCSS1_PV_dotted, CSS1_BS_SINGLE }, - { sCSS1_PV_dashed, CSS1_BS_SINGLE }, - { sCSS1_PV_solid, CSS1_BS_SINGLE }, - { sCSS1_PV_double, CSS1_BS_DOUBLE }, - { sCSS1_PV_groove, CSS1_BS_SINGLE }, - { sCSS1_PV_ridge, CSS1_BS_SINGLE }, - { sCSS1_PV_inset, CSS1_BS_SINGLE }, - { sCSS1_PV_outset, CSS1_BS_SINGLE }, - { 0, 0 } + { sCSS1_PV_none, CSS1_BS_NONE }, + { sCSS1_PV_dotted, CSS1_BS_SINGLE }, + { sCSS1_PV_dashed, CSS1_BS_SINGLE }, + { sCSS1_PV_solid, CSS1_BS_SINGLE }, + { sCSS1_PV_double, CSS1_BS_DOUBLE }, + { sCSS1_PV_groove, CSS1_BS_SINGLE }, + { sCSS1_PV_ridge, CSS1_BS_SINGLE }, + { sCSS1_PV_inset, CSS1_BS_SINGLE }, + { sCSS1_PV_outset, CSS1_BS_SINGLE }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aFloatTable[] = { - { sCSS1_PV_left, SVX_ADJUST_LEFT }, - { sCSS1_PV_right, SVX_ADJUST_RIGHT }, - { sCSS1_PV_none, SVX_ADJUST_END }, - { 0, 0 } + { sCSS1_PV_left, SVX_ADJUST_LEFT }, + { sCSS1_PV_right, SVX_ADJUST_RIGHT }, + { sCSS1_PV_none, SVX_ADJUST_END }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aPositionTable[] = { - { sCSS1_PV_absolute, SVX_CSS1_POS_ABSOLUTE }, - { sCSS1_PV_relative, SVX_CSS1_POS_RELATIVE }, - { sCSS1_PV_static, SVX_CSS1_POS_STATIC }, - { 0, 0 } + { sCSS1_PV_absolute, SVX_CSS1_POS_ABSOLUTE }, + { sCSS1_PV_relative, SVX_CSS1_POS_RELATIVE }, + { sCSS1_PV_static, SVX_CSS1_POS_STATIC }, + { 0, 0 } }; // Feature: PrintExt static CSS1PropertyEnum __READONLY_DATA aSizeTable[] = { - { sCSS1_PV_auto, SVX_CSS1_STYPE_AUTO }, - { sCSS1_PV_landscape, SVX_CSS1_STYPE_LANDSCAPE }, - { sCSS1_PV_portrait, SVX_CSS1_STYPE_PORTRAIT }, - { 0, 0 } + { sCSS1_PV_auto, SVX_CSS1_STYPE_AUTO }, + { sCSS1_PV_landscape, SVX_CSS1_STYPE_LANDSCAPE }, + { sCSS1_PV_portrait, SVX_CSS1_STYPE_PORTRAIT }, + { 0, 0 } }; static CSS1PropertyEnum __READONLY_DATA aPageBreakTable[] = { - { sCSS1_PV_auto, SVX_CSS1_PBREAK_AUTO }, - { sCSS1_PV_always, SVX_CSS1_PBREAK_ALWAYS }, - { sCSS1_PV_avoid, SVX_CSS1_PBREAK_AVOID }, - { sCSS1_PV_left, SVX_CSS1_PBREAK_LEFT }, - { sCSS1_PV_right, SVX_CSS1_PBREAK_RIGHT }, - { 0, 0 } + { sCSS1_PV_auto, SVX_CSS1_PBREAK_AUTO }, + { sCSS1_PV_always, SVX_CSS1_PBREAK_ALWAYS }, + { sCSS1_PV_avoid, SVX_CSS1_PBREAK_AVOID }, + { sCSS1_PV_left, SVX_CSS1_PBREAK_LEFT }, + { sCSS1_PV_right, SVX_CSS1_PBREAK_RIGHT }, + { 0, 0 } }; // /Feature: PrintExt @@ -561,10 +561,10 @@ SvxCSS1BorderInfo *SvxCSS1PropertyInfo::GetBorderInfo( USHORT nLine, BOOL bCreat USHORT nPos = 0; switch( nLine ) { - case BOX_LINE_TOP: nPos = 0; break; - case BOX_LINE_BOTTOM: nPos = 1; break; - case BOX_LINE_LEFT: nPos = 2; break; - case BOX_LINE_RIGHT: nPos = 3; break; + case BOX_LINE_TOP: nPos = 0; break; + case BOX_LINE_BOTTOM: nPos = 1; break; + case BOX_LINE_LEFT: nPos = 2; break; + case BOX_LINE_RIGHT: nPos = 3; break; } if( !aBorderInfos[nPos] && bCreate ) @@ -713,7 +713,7 @@ BOOL operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 ) return rE1.aKey==rE2.aKey; } -BOOL operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 ) +BOOL operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 ) { return rE1.aKey<rE2.aKey; } @@ -740,7 +740,7 @@ BOOL SvxCSS1Parser::SelectorParsed( const CSS1Selector *pSelector, // Dieses ist der erste Selektor einer Rule, also muessen // die bisher geparsten Items auf die Styles verteilt werden -// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() ); +// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() ); for( USHORT i=0; i<aSelectors.Count(); i++ ) { StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo ); @@ -769,7 +769,7 @@ BOOL SvxCSS1Parser::DeclarationParsed( const String& rProperty, ParseProperty( rProperty, pExpr ); - return TRUE; // die Deklaration brauchen wir nicht mehr. Loeschen! + return TRUE; // die Deklaration brauchen wir nicht mehr. Loeschen! } /* */ @@ -852,7 +852,7 @@ BOOL SvxCSS1Parser::ParseStyleSheet( const String& rIn ) BOOL bSuccess = CSS1Parser::ParseStyleSheet( rIn ); // die bisher geparsten Items auf die Styles verteilt werden -// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() ); +// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() ); for( USHORT i=0; i<aSelectors.Count(); i++ ) { StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo ); @@ -879,7 +879,7 @@ BOOL SvxCSS1Parser::ParseStyleOption( const String& rIn, BOOL bSuccess = CSS1Parser::ParseStyleOption( rIn ); rItemSet.ClearItem( aItemIds.nDirection ); -// pPropInfo->CreateBoxItem( *pItemSet, GetDfltBorderDist() ); +// pPropInfo->CreateBoxItem( *pItemSet, GetDfltBorderDist() ); pItemSet = 0; pPropInfo = 0; @@ -944,7 +944,7 @@ void SvxCSS1Parser::SetBorderWidth( SvxBorderLine& aBorderLine, USHORT nWidth, USHORT i = (nSize / sizeof(USHORT)) - 4; while( i>0 && - nWidth <= ((aWidths[i] + aWidths[i-4]) / 2) ) + nWidth <= ((aWidths[i] + aWidths[i-4]) / 2) ) { DBG_ASSERT( aWidths[i] > aWidths[i-4], "Linienbreiten sind nicht sortiert!" ); @@ -962,14 +962,14 @@ sal_uInt32 SvxCSS1Parser::GetFontHeight( USHORT nSize ) const switch( nSize ) { - case 0: nHeight = 8*20; break; - case 1: nHeight = 10*20; break; - case 2: nHeight = 11*20; break; - case 3: nHeight = 12*20; break; - case 4: nHeight = 17*20; break; - case 5: nHeight = 20*20; break; + case 0: nHeight = 8*20; break; + case 1: nHeight = 10*20; break; + case 2: nHeight = 11*20; break; + case 3: nHeight = 12*20; break; + case 4: nHeight = 17*20; break; + case 5: nHeight = 20*20; break; case 6: - default: nHeight = 32*20; break; + default: nHeight = 32*20; break; } return nHeight; @@ -1239,7 +1239,7 @@ static void ParseCSS1_font_weight( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_IDENT: - case CSS1_STRING: // MS-IE, was sonst + case CSS1_STRING: // MS-IE, was sonst { USHORT nWeight; if( SvxCSS1Parser::GetEnum( aFontWeightTable, pExpr->GetString(), @@ -1399,7 +1399,7 @@ static void ParseCSS1_color( const CSS1Expression *pExpr, case CSS1_IDENT: case CSS1_RGB: case CSS1_HEXCOLOR: - case CSS1_STRING: // Wegen MS-IE + case CSS1_STRING: // Wegen MS-IE { Color aColor; if( pExpr->GetColor( aColor ) ) @@ -1570,7 +1570,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, case CSS1_IDENT: case CSS1_HEXCOLOR: - case CSS1_STRING: // Wegen MS-IE + case CSS1_STRING: // Wegen MS-IE { USHORT nEnum; const String &rValue = pExpr->GetString(); @@ -1656,7 +1656,7 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr, break; case CSS1_IDENT: case CSS1_HEXCOLOR: - case CSS1_STRING: // Wegen MS-IE + case CSS1_STRING: // Wegen MS-IE if( pExpr->GetString().EqualsIgnoreCaseAscii( sCSS1_PV_transparent ) ) { bTransparent = TRUE; @@ -1727,7 +1727,7 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr, if( nHeight ) { - if( nHeight < rParser.GetMinFixLineSpace() ) + if( nHeight < rParser.GetMinFixLineSpace() ) nHeight = rParser.GetMinFixLineSpace(); SvxLineSpacingItem aLSItem( nHeight, aItemIds.nLineSpacing ); aLSItem.SetLineHeight( nHeight ); @@ -2379,15 +2379,15 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, bSetMargins[2] = bSetMargins[3] = TRUE; break; case 1: - nMargins[1] = nMargins[3] = nMargin; // right + left + nMargins[1] = nMargins[3] = nMargin; // right + left bSetMargins[1] = bSetMargins[3] = TRUE; break; case 2: - nMargins[2] = nMargin; // bottom + nMargins[2] = nMargin; // bottom bSetMargins[2] = TRUE; break; case 3: - nMargins[3] = nMargin; // left + nMargins[3] = nMargin; // left bSetMargins[3] = TRUE; break; } @@ -2517,10 +2517,10 @@ static BOOL ParseCSS1_padding_xxx( const CSS1Expression *pExpr, { switch( nWhichLine ) { - case BOX_LINE_TOP: rPropInfo.nTopBorderDistance = nDist; break; - case BOX_LINE_BOTTOM: rPropInfo.nBottomBorderDistance = nDist;break; - case BOX_LINE_LEFT: rPropInfo.nLeftBorderDistance = nDist; break; - case BOX_LINE_RIGHT: rPropInfo.nRightBorderDistance = nDist; break; + case BOX_LINE_TOP: rPropInfo.nTopBorderDistance = nDist; break; + case BOX_LINE_BOTTOM: rPropInfo.nBottomBorderDistance = nDist;break; + case BOX_LINE_LEFT: rPropInfo.nLeftBorderDistance = nDist; break; + case BOX_LINE_RIGHT: rPropInfo.nRightBorderDistance = nDist; break; } } @@ -2599,8 +2599,8 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr, { DBG_ASSERT( pExpr, "kein Ausdruck" ); - USHORT nWidth = USHRT_MAX; // die Linien-Dicke - USHORT nNWidth = 1; // benannte Linien-Dicke (und default) + USHORT nWidth = USHRT_MAX; // die Linien-Dicke + USHORT nNWidth = 1; // benannte Linien-Dicke (und default) CSS1BorderStyle eStyle = CSS1_BS_NONE; // Linien-Style Color aColor; BOOL bColor = FALSE; @@ -2694,8 +2694,8 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr, { DBG_ASSERT( pExpr, "kein Ausdruck" ); - USHORT nWidth = USHRT_MAX; // die Linien-Dicke - USHORT nNWidth = 1; // benannte Linien-Dicke (und default) + USHORT nWidth = USHRT_MAX; // die Linien-Dicke + USHORT nNWidth = 1; // benannte Linien-Dicke (und default) switch( pExpr->GetType() ) { @@ -2935,7 +2935,7 @@ static void ParseCSS1_length( const CSS1Expression *pExpr, break; case CSS1_PIXLENGTH: - case CSS1_NUMBER: // wegen Netscape und IE + case CSS1_NUMBER: // wegen Netscape und IE { long nWidthL = (long)pExpr->GetNumber(); long nPWidth = bHori ? 0 : nWidthL; @@ -3143,7 +3143,7 @@ static void ParseCSS1_so_language( const CSS1Expression *pExpr, const SvxCSS1Parser& rParser ) { if( CSS1_IDENT == pExpr->GetType() || - CSS1_STRING == pExpr->GetType() ) + CSS1_STRING == pExpr->GetType() ) { LanguageType eLang = MsLangId::convertIsoStringToLanguage( pExpr->GetString() ); if( LANGUAGE_DONTKNOW != eLang ) @@ -3172,14 +3172,14 @@ struct CSS1PropEntry { union { - const sal_Char *sName; - String *pName; + const sal_Char *sName; + String *pName; }; FnParseCSS1Prop pFunc; }; #define CSS1_PROP_ENTRY(p) \ - { { sCSS1_P_##p }, ParseCSS1_##p } + { { sCSS1_P_##p }, ParseCSS1_##p } // die Tabelle mit den Zuordnungen diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx index e5f706334538..ed1e3a6b1c86 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,58 +46,58 @@ class FontList; enum SvxCSS1Position { - SVX_CSS1_POS_NONE, // nichts angegeben - SVX_CSS1_POS_STATIC, // normal - SVX_CSS1_POS_ABSOLUTE, // absolut - SVX_CSS1_POS_RELATIVE, // relativ + SVX_CSS1_POS_NONE, // nichts angegeben + SVX_CSS1_POS_STATIC, // normal + SVX_CSS1_POS_ABSOLUTE, // absolut + SVX_CSS1_POS_RELATIVE, // relativ SVX_CSS1_POS_END }; enum SvxCSS1LengthType { - SVX_CSS1_LTYPE_NONE, // nichts angegeben - SVX_CSS1_LTYPE_AUTO, // automatisch - SVX_CSS1_LTYPE_TWIP, // twip - SVX_CSS1_LTYPE_PERCENTAGE, // %-Angabe + SVX_CSS1_LTYPE_NONE, // nichts angegeben + SVX_CSS1_LTYPE_AUTO, // automatisch + SVX_CSS1_LTYPE_TWIP, // twip + SVX_CSS1_LTYPE_PERCENTAGE, // %-Angabe SVX_CSS1_LTYPE_END }; // Feature: PrintExt enum SvxCSS1SizeType { - SVX_CSS1_STYPE_NONE, // nichts angegeben - SVX_CSS1_STYPE_AUTO, // automatisch - SVX_CSS1_STYPE_TWIP, // twip - SVX_CSS1_STYPE_LANDSCAPE, // Landscape - SVX_CSS1_STYPE_PORTRAIT, // Landscape + SVX_CSS1_STYPE_NONE, // nichts angegeben + SVX_CSS1_STYPE_AUTO, // automatisch + SVX_CSS1_STYPE_TWIP, // twip + SVX_CSS1_STYPE_LANDSCAPE, // Landscape + SVX_CSS1_STYPE_PORTRAIT, // Landscape SVX_CSS1_STYPE_END }; enum SvxCSS1PageBreak { - SVX_CSS1_PBREAK_NONE, // nichts angegeben - SVX_CSS1_PBREAK_AUTO, // automatisch - SVX_CSS1_PBREAK_ALWAYS, // immer - SVX_CSS1_PBREAK_AVOID, // nie - SVX_CSS1_PBREAK_LEFT, // naechste Seite ist eine linke - SVX_CSS1_PBREAK_RIGHT, // naechste Seite ist eine rechte + SVX_CSS1_PBREAK_NONE, // nichts angegeben + SVX_CSS1_PBREAK_AUTO, // automatisch + SVX_CSS1_PBREAK_ALWAYS, // immer + SVX_CSS1_PBREAK_AVOID, // nie + SVX_CSS1_PBREAK_LEFT, // naechste Seite ist eine linke + SVX_CSS1_PBREAK_RIGHT, // naechste Seite ist eine rechte SVX_CSS1_PBREAK_END }; // /Feature: PrintExt #define CSS1_SCRIPT_WESTERN 0x01 -#define CSS1_SCRIPT_CJK 0x02 -#define CSS1_SCRIPT_CTL 0x04 -#define CSS1_SCRIPT_ALL 0x07 +#define CSS1_SCRIPT_CJK 0x02 +#define CSS1_SCRIPT_CTL 0x04 +#define CSS1_SCRIPT_ALL 0x07 /* */ struct CSS1PropertyEnum { - const sal_Char *pName; // Wert einer Property - sal_uInt16 nEnum; // und der dazugehoerige Wert eines Enums + const sal_Char *pName; // Wert einer Property + sal_uInt16 nEnum; // und der dazugehoerige Wert eines Enums }; @@ -120,7 +120,7 @@ class SvxCSS1PropertyInfo public: - String aId; // ID fuer Bookmarks, Rahmen etc. + String aId; // ID fuer Bookmarks, Rahmen etc. sal_Bool bTopMargin : 1; sal_Bool bBottomMargin : 1; @@ -211,7 +211,7 @@ inline sal_Bool operator==( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& r return rE1.aKey==rE2.aKey; } -inline sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 ) +inline sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& rE2 ) { return rE1.aKey<rE2.aKey; } @@ -226,7 +226,7 @@ inline sal_Bool operator<( const SvxCSS1MapEntry& rE1, const SvxCSS1MapEntry& r class SvxCSS1Parser : public CSS1Parser { - CSS1Selectors aSelectors; // Liste der "offenen" Selectoren + CSS1Selectors aSelectors; // Liste der "offenen" Selectoren SvxCSS1Map aIds; SvxCSS1Map aClasses; @@ -235,24 +235,24 @@ class SvxCSS1Parser : public CSS1Parser String sBaseURL; - SfxItemSet *pSheetItemSet; // der Item-Set fuer Style-Sheets - SfxItemSet *pItemSet; // der aktuelle Item-Set + SfxItemSet *pSheetItemSet; // der Item-Set fuer Style-Sheets + SfxItemSet *pItemSet; // der aktuelle Item-Set SvxCSS1MapEntry *pSearchEntry; SvxCSS1PropertyInfo *pSheetPropInfo; SvxCSS1PropertyInfo *pPropInfo; - sal_uInt16 nMinFixLineSpace; // Mindest-Abstand fuer festen Zeilenabstand + sal_uInt16 nMinFixLineSpace; // Mindest-Abstand fuer festen Zeilenabstand - rtl_TextEncoding eDfltEnc; - sal_uInt16 nScriptFlags; + rtl_TextEncoding eDfltEnc; + sal_uInt16 nScriptFlags; sal_Bool bIgnoreFontFamily; void ParseProperty( const String& rProperty, const CSS1Expression *pExpr ); - SvUShorts aWhichMap; // Which-Map des Parser + SvUShorts aWhichMap; // Which-Map des Parser using CSS1Parser::ParseStyleOption; diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx index 09d16753db82..ae57527a132f 100644 --- a/sw/source/filter/html/swcss1.hxx +++ b/sw/source/filter/html/swcss1.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ protected: SvxCSS1PropertyInfo& rPropInfo ); using CSS1Parser::ParseStyleSheet; - + public: SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const String& rBaseURL, BOOL bNewDoc ); virtual ~SwCSS1Parser(); @@ -103,7 +103,7 @@ public: // eine TextFmtColl zu einer Pool-Id ermitteln SwTxtFmtColl *GetTxtFmtColl( USHORT nTxtColl, const String& rClass ); - // This methods do the same as the one of SwDoc, but change the + // This methods do the same as the one of SwDoc, but change the // encoding if required. SwTxtFmtColl *GetTxtCollFromPool( USHORT nPoolId ) const; SwCharFmt *GetCharFmtFromPool( USHORT nPoolId ) const; @@ -132,7 +132,7 @@ public: const SvxCSS1PropertyInfo& rPropInfo ); // Fuellen eines DropCap-Attributs - void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet, + void FillDropCap( SwFmtDrop& rDrop, SfxItemSet& rItemSet, const String *pName=0 ); BOOL SetFmtBreak( SfxItemSet& rItemSet, @@ -146,7 +146,7 @@ public: static BOOL MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo, BOOL bAutoWidth=FALSE ); - static sal_uInt16 GetScriptFromClass( String& rClass, + static sal_uInt16 GetScriptFromClass( String& rClass, sal_Bool bSubClassOnly = sal_True ); BOOL IsBodyBGColorSet() const { return bBodyBGColorSet; } @@ -170,14 +170,14 @@ public: inline void SetTDTagStyles(); inline void SetATagStyles(); inline void SetDelayedStyles(); - + virtual void SetDfltEncoding( rtl_TextEncoding eEnc ); }; inline void SwCSS1Parser::AddFirstLetterExt( String& rFmtName ) { - rFmtName.AppendAscii( ".FL", 3 ); // first letter + rFmtName.AppendAscii( ".FL", 3 ); // first letter } inline const SwPageDesc* SwCSS1Parser::GetFirstPageDesc( BOOL bCreate ) diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index fba6a477757d..caa655c44d4f 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,9 +93,9 @@ #include <expfld.hxx> #include <poolfmt.hxx> #include <pagedesc.hxx> -#include <IMark.hxx> // fuer SwBookmark ... +#include <IMark.hxx> // fuer SwBookmark ... #include <docsh.hxx> -#include <editsh.hxx> // fuer Start/EndAction +#include <editsh.hxx> // fuer Start/EndAction #include <docufld.hxx> #include <swcss1.hxx> #include <htmlvsh.hxx> @@ -114,9 +114,9 @@ #endif #include <swerror.h> -#define FONTSIZE_MASK 7 -#define FONTCOLOR_MASK (1<<15) -#define FONT_MASK (1<<14) +#define FONTSIZE_MASK 7 +#define FONTCOLOR_MASK (1<<15) +#define FONT_MASK (1<<14) #define HTML_ESC_PROP 80 #define HTML_ESC_SUPER DFLT_ESC_SUPER @@ -136,22 +136,22 @@ using namespace ::com::sun::star; // <P ALIGN=xxx>, <Hn ALIGN=xxx>, <TD ALIGN=xxx> usw. HTMLOptionEnum __FAR_DATA aHTMLPAlignTable[] = { - { 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 } + { 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[] = { - { 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 } + { 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 } }; SV_IMPL_PTRARR( _HTMLAttrs, _HTMLAttrPtr ) @@ -388,7 +388,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, SwDocShell* pDocSh = pDoc->GetDocShell(); if( pDocSh ) { - bViewCreated = TRUE; // nicht, synchron laden + bViewCreated = TRUE; // nicht, synchron laden // es ist ein Sprungziel vorgegeben. @@ -417,7 +417,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, else if( sCmp.EqualsAscii( pMarkToOutline ) || sCmp.EqualsAscii( pMarkToText ) || sCmp.EqualsAscii( pMarkToFrame ) ) - eJumpTo = JUMPTO_NONE; // das ist nichts gueltiges! + eJumpTo = JUMPTO_NONE; // das ist nichts gueltiges! else // ansonsten ist das ein normaler (Book)Mark nPos = STRING_LEN; @@ -530,7 +530,7 @@ SvParserState __EXPORT SwHTMLParser::CallParser() { // einen temporaeren Index anlegen, auf Pos 0 so wird er nicht bewegt! pSttNdIdx = new SwNodeIndex( pDoc->GetNodes() ); - if( !IsNewDoc() ) // in ein Dokument einfuegen ? + if( !IsNewDoc() ) // in ein Dokument einfuegen ? { const SwPosition* pPos = pPam->GetPoint(); @@ -824,8 +824,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) // nun noch das SplitNode vom Anfang aufheben else if( !IsNewDoc() ) { - if( pPos->nContent.GetIndex() ) // dann gabs am Ende kein <P>, - pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node + if( pPos->nContent.GetIndex() ) // dann gabs am Ende kein <P>, + pPam->Move( fnMoveForward, fnGoNode ); // als zum naechsten Node SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode(); SwNodeIndex aPrvIdx( pPos->nNode ); if( pTxtNode && pTxtNode->CanJoinPrev( &aPrvIdx ) && @@ -934,7 +934,7 @@ void SwHTMLParser::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) { // dann uns selbst beenden pRegisteredIn->Remove( this ); - ReleaseRef(); // ansonsten sind wir fertig! + ReleaseRef(); // ansonsten sind wir fertig! } break; } @@ -1237,6 +1237,21 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) } else if( aUnknownToken.Len() ) { + // Fix i#59064 : Paste content of unknown tags. + if (aToken.Len() > 0) + { + if( !bDocInitalized ) + DocumentDetected(); + pDoc->InsertString( *pPam, aToken ); + + // wenn es noch vorlaefige Absatz-Attribute gibt, der Absatz aber + // nicht leer ist, dann sind die Absatz-Attribute entgueltig. + if( aParaAttrs.Count() ) + aParaAttrs.Remove( 0, aParaAttrs.Count() ); + + SetAttr(); + } + // Unbekannte Token im Header werden nur durch ein passendes // End-Token, </HEAD> oder <BODY> wieder beendet. Darin wird Text // ignoriert. @@ -1248,12 +1263,13 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_FRAMESET_ON: case HTML_HEAD_OFF: case HTML_BODY_ON: - case HTML_IMAGE: // Warum auch immer Netscape das tut. + case HTML_IMAGE: // Warum auch immer Netscape das tut. aUnknownToken.Erase(); break; case HTML_TEXTTOKEN: return; default: + aUnknownToken.Erase(); break; } } @@ -1692,7 +1708,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) !pPam->GetNode()->FindFootnoteStartNode() ) ) { if ( nParaCnt < 5 ) - Show(); // bis hierhin schon mal anzeigen + Show(); // bis hierhin schon mal anzeigen SvxAdjust eAdjust = aAttrTab.pAdjust ? ((const SvxAdjustItem&)aAttrTab.pAdjust->GetItem()). @@ -1903,7 +1919,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_HTML_OFF: case HTML_HEAD_ON: case HTML_TITLE_OFF: - break; // nicht weiter auswerten, oder??? + break; // nicht weiter auswerten, oder??? case HTML_HTML_ON: { const HTMLOptions *pHTMLOptions = GetOptions(); @@ -2312,11 +2328,11 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) } else switch( nWhich ) { - case RES_CHRATR_FONT: nIdx = 0; break; - case RES_CHRATR_FONTSIZE: nIdx = 1; break; - case RES_CHRATR_LANGUAGE: nIdx = 2; break; - case RES_CHRATR_POSTURE: nIdx = 3; break; - case RES_CHRATR_WEIGHT: nIdx = 4; break; + case RES_CHRATR_FONT: nIdx = 0; break; + case RES_CHRATR_FONTSIZE: nIdx = 1; break; + case RES_CHRATR_LANGUAGE: nIdx = 2; break; + case RES_CHRATR_POSTURE: nIdx = 3; break; + case RES_CHRATR_WEIGHT: nIdx = 4; break; } if( nIdx != -1 ) { @@ -2806,7 +2822,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, pCNd->SetAttr( *pAttr->pItem ); break; } - ASSERT( !this, + ASSERT( !this, "LRSpace ueber mehrere Absaetze gesetzt!" ); // kein break (hier sollen wir trotzdem nie hinkommen; default: @@ -3206,7 +3222,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, { ULONG nOldEnd = nEndIdx.GetIndex(); ULONG nTmpIdx; - if( ( nTmpIdx = pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd || + if( ( nTmpIdx = pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd || ( nTmpIdx = pDoc->GetNodes().GetEndOfAutotext().GetIndex()) >= nOldEnd ) { nTmpIdx = pDoc->GetNodes().GetEndOfInserts().GetIndex(); @@ -3584,8 +3600,8 @@ void SwHTMLParser::NewFontAttr( int nToken ) String aFace, aId, aStyle, aClass, aLang, aDir; Color aColor; - ULONG nFontHeight = 0; // tatsaechlich einzustellende Font-Hoehe - USHORT nSize = 0; // Fontgroesse in Netscape-Notation (1-7) + ULONG nFontHeight = 0; // tatsaechlich einzustellende Font-Hoehe + USHORT nSize = 0; // Fontgroesse in Netscape-Notation (1-7) BOOL bColor = FALSE; const HTMLOptions *pHTMLOptions = GetOptions(); @@ -3678,8 +3694,8 @@ void SwHTMLParser::NewFontAttr( int nToken ) ASSERT( !nSize == !nFontHeight, "HTML-Font-Size != Font-Height" ); String aFontName, aStyleName; - FontFamily eFamily = FAMILY_DONTKNOW; // Family und Pitch, - FontPitch ePitch = PITCH_DONTKNOW; // falls nicht gefunden + FontFamily eFamily = FAMILY_DONTKNOW; // Family und Pitch, + FontPitch ePitch = PITCH_DONTKNOW; // falls nicht gefunden rtl_TextEncoding eEnc = gsl_getSystemTextEncoding(); if( aFace.Len() && !pCSS1Parser->IsIgnoreFontFamily() ) @@ -3913,7 +3929,7 @@ void SwHTMLParser::EndPara( BOOL bReal ) if( pCntxt ) { EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -3968,13 +3984,13 @@ void SwHTMLParser::NewHeading( int nToken ) USHORT nTxtColl; switch( nToken ) { - case HTML_HEAD1_ON: nTxtColl = RES_POOLCOLL_HEADLINE1; break; - case HTML_HEAD2_ON: nTxtColl = RES_POOLCOLL_HEADLINE2; break; - case HTML_HEAD3_ON: nTxtColl = RES_POOLCOLL_HEADLINE3; break; - case HTML_HEAD4_ON: nTxtColl = RES_POOLCOLL_HEADLINE4; break; - case HTML_HEAD5_ON: nTxtColl = RES_POOLCOLL_HEADLINE5; break; - case HTML_HEAD6_ON: nTxtColl = RES_POOLCOLL_HEADLINE6; break; - default: nTxtColl = RES_POOLCOLL_STANDARD; break; + case HTML_HEAD1_ON: nTxtColl = RES_POOLCOLL_HEADLINE1; break; + case HTML_HEAD2_ON: nTxtColl = RES_POOLCOLL_HEADLINE2; break; + case HTML_HEAD3_ON: nTxtColl = RES_POOLCOLL_HEADLINE3; break; + case HTML_HEAD4_ON: nTxtColl = RES_POOLCOLL_HEADLINE4; break; + case HTML_HEAD5_ON: nTxtColl = RES_POOLCOLL_HEADLINE5; break; + case HTML_HEAD6_ON: nTxtColl = RES_POOLCOLL_HEADLINE6; break; + default: nTxtColl = RES_POOLCOLL_STANDARD; break; } // den Kontext anlegen @@ -4041,7 +4057,7 @@ void SwHTMLParser::EndHeading() if( pCntxt ) { EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -4097,7 +4113,7 @@ void SwHTMLParser::NewTxtFmtColl( int nToken, USHORT nColl ) eMode = AM_SPACE; break; case HTML_ADDRESS_ON: - eMode = AM_NOSPACE; // ADDRESS kann auf einen <P> ohne </P> folgen + eMode = AM_NOSPACE; // ADDRESS kann auf einen <P> ohne </P> folgen break; case HTML_DT_ON: case HTML_DD_ON: @@ -4172,7 +4188,7 @@ void SwHTMLParser::EndTxtFmtColl( int nToken ) if( pCntxt ) { EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -4305,7 +4321,7 @@ void SwHTMLParser::EndDefList() if( pCntxt ) { EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -4388,7 +4404,7 @@ void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl, if( pCntxt ) { EndContext( pCntxt ); - SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen + SetAttr(); // Absatz-Atts wegen JavaScript moeglichst schnell setzen delete pCntxt; } @@ -4402,11 +4418,11 @@ void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl, BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly, BOOL bSurroundOnly ) const { - // bNoSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen - // ohne Umlauf - // bSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen - // mit Umlauf aber keinen ohne Umlauf - // sonst: Der Absatz enthaelt irgendeinen Rahmen + // bNoSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen + // ohne Umlauf + // bSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen + // mit Umlauf aber keinen ohne Umlauf + // sonst: Der Absatz enthaelt irgendeinen Rahmen SwNodeIndex& rNodeIdx = pPam->GetPoint()->nNode; const SwSpzFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts(); @@ -4482,16 +4498,16 @@ const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) { - SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage - SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs + SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage + SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs USHORT nTopColl = pContext ? pContext->GetTxtFmtColl() : 0; const String& rTopClass = pContext ? pContext->GetClass() : (const String&) aEmptyStr; USHORT nDfltColl = RES_POOLCOLL_TEXT; - BOOL bInPRE=FALSE; // etwas Kontext Info + BOOL bInPRE=FALSE; // etwas Kontext Info - USHORT nLeftMargin = 0, nRightMargin = 0; // die Einzuege und - short nFirstLineIndent = 0; // Abstaende + USHORT nLeftMargin = 0, nRightMargin = 0; // die Einzuege und + short nFirstLineIndent = 0; // Abstaende USHORT i; for( i = nContextStAttrMin; i < aContexts.Count(); i++ ) @@ -4875,7 +4891,7 @@ void SwHTMLParser::InsertSpacer() // den unteren Absatz-Abstand des vorherigen Nodes aendern, // wenn moeglich - SetAttr(); // noch offene Absatz-Attribute setzen + SetAttr(); // noch offene Absatz-Attribute setzen pTxtNode = pDoc->GetNodes()[pPam->GetPoint()->nNode.GetIndex()-1] ->GetTxtNode(); @@ -4899,7 +4915,7 @@ void SwHTMLParser::InsertSpacer() NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (USHORT)nSize, RES_UL_SPACE ) ); EndAttr( aAttrTab.pULSpace, 0, FALSE ); - AppendTxtNode(); // nicht am Abstand drehen! + AppendTxtNode(); // nicht am Abstand drehen! } } break; @@ -5023,9 +5039,9 @@ void SwHTMLParser::InsertLineBreak() // 6.) Wenn von keinem Rahmen der Umlauf geaendert wird, wird ein // harter Zeilenumbruch eingefuegt - String aId, aStyle, aClass; // die ID der Bookmark + String aId, aStyle, aClass; // die ID der Bookmark BOOL bClearLeft = FALSE, bClearRight = FALSE; - BOOL bCleared = FALSE; // wurde ein CLEAR ausgefuehrt? + BOOL bCleared = FALSE; // wurde ein CLEAR ausgefuehrt? // dann holen wir mal die Optionen const HTMLOptions *pHTMLOptions = GetOptions(); @@ -5141,7 +5157,7 @@ void SwHTMLParser::InsertLineBreak() { // wenn kein CLEAR ausgefuehrt werden sollte oder konnte, wird // ein Zeilenumbruch eingef?gt - String sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-) + String sTmp( (sal_Unicode)0x0a ); // make the Mac happy :-) pDoc->InsertString( *pPam, sTmp ); } else if( pPam->GetPoint()->nContent.GetIndex() ) diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index e7d684842beb..7f5fb3cdbe0d 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,13 +99,13 @@ class _HTMLAttr xub_StrLen nSttCntnt, nEndCntnt; sal_Bool bInsAtStart : 1; sal_Bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen - sal_Bool bValid : 1; // ist das Attribut gueltig? + sal_Bool bValid : 1; // ist das Attribut gueltig? SfxPoolItem* pItem; - sal_uInt16 nCount; // Anzahl noch zu schliessender Attrs mit einem Wert - _HTMLAttr *pNext; // noch zu schliessene Attrs mit unterschiedl. Werten - _HTMLAttr *pPrev; // bereits geschlossene aber noch nicht gesetze Attrs - _HTMLAttr **ppHead; // der Listenkopf + sal_uInt16 nCount; // Anzahl noch zu schliessender Attrs mit einem Wert + _HTMLAttr *pNext; // noch zu schliessene Attrs mit unterschiedl. Werten + _HTMLAttr *pPrev; // bereits geschlossene aber noch nicht gesetze Attrs + _HTMLAttr **ppHead; // der Listenkopf _HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, _HTMLAttr **pHd=0 ); @@ -134,8 +134,8 @@ public: sal_Bool IsLikePara() const { return bLikePara; } void SetLikePara( sal_Bool bPara=sal_True ) { bLikePara = bPara; } - SfxPoolItem& GetItem() { return *pItem; } - const SfxPoolItem& GetItem() const { return *pItem; } + SfxPoolItem& GetItem() { return *pItem; } + const SfxPoolItem& GetItem() const { return *pItem; } _HTMLAttr *GetNext() const { return pNext; } void InsertNext( _HTMLAttr *pNxt ) { pNext = pNxt; } @@ -160,13 +160,13 @@ public: struct _HTMLAttrTable { _HTMLAttr - *pKeep, // ::com::sun::star::frame::Frame-Attribure + *pKeep, // ::com::sun::star::frame::Frame-Attribure *pBox, *pBrush, *pBreak, *pPageDesc, - *pLRSpace, // Absatz-Attribute + *pLRSpace, // Absatz-Attribute *pULSpace, *pLineSpacing, *pAdjust, @@ -176,10 +176,10 @@ struct _HTMLAttrTable *pOrphans, *pDirection, - *pCharFmts, // Text-Attribute + *pCharFmts, // Text-Attribute *pINetFmt, - *pBold, // Zeichen-Attribute + *pBold, // Zeichen-Attribute *pBoldCJK, *pBoldCTL, *pItalic, @@ -197,8 +197,8 @@ struct _HTMLAttrTable *pFontColor, *pEscapement, *pCaseMap, - *pKerning, // (nur fuer SPACER) - *pCharBrush, // Zeichen-Hintergrund + *pKerning, // (nur fuer SPACER) + *pCharBrush, // Zeichen-Hintergrund *pLanguage, *pLanguageCJK, *pLanguageCTL @@ -208,44 +208,44 @@ struct _HTMLAttrTable class _HTMLAttrContext_SaveDoc; enum SwHTMLAppendMode { - AM_NORMAL, // keine Absatz-Abstand-Behandlung - AM_NOSPACE, // Abstand hart auf 0cm setzen - AM_SPACE, // Abstand hart auf 0.5cm setzen - AM_SOFTNOSPACE, // Abstand nicht setzen aber 0cm merken - AM_NONE // gar kein Append + AM_NORMAL, // keine Absatz-Abstand-Behandlung + AM_NOSPACE, // Abstand hart auf 0cm setzen + AM_SPACE, // Abstand hart auf 0.5cm setzen + AM_SOFTNOSPACE, // Abstand nicht setzen aber 0cm merken + AM_NONE // gar kein Append }; class _HTMLAttrContext { - _HTMLAttrs aAttrs; // die in dem Kontext gestarteten Attribute + _HTMLAttrs aAttrs; // die in dem Kontext gestarteten Attribute - String aClass; // die Klasse des Kontexts + String aClass; // die Klasse des Kontexts _HTMLAttrContext_SaveDoc *pSaveDocContext; SfxItemSet *pFrmItemSet; - sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt + sal_uInt16 nToken; // das Token, zu dem der Kontext gehoehrt - sal_uInt16 nTxtFmtColl; // eine in dem Kontext begonnene Vorlage oder 0 + sal_uInt16 nTxtFmtColl; // eine in dem Kontext begonnene Vorlage oder 0 - sal_uInt16 nLeftMargin; // ein veraenderter linker Rand - sal_uInt16 nRightMargin; // ein veraenderter rechter Rand - sal_uInt16 nFirstLineIndent; // ein veraenderter Erstzeilen-Einzug + sal_uInt16 nLeftMargin; // ein veraenderter linker Rand + sal_uInt16 nRightMargin; // ein veraenderter rechter Rand + sal_uInt16 nFirstLineIndent; // ein veraenderter Erstzeilen-Einzug - sal_uInt16 nUpperSpace; - sal_uInt16 nLowerSpace; + sal_uInt16 nUpperSpace; + sal_uInt16 nLowerSpace; SwHTMLAppendMode eAppend; - sal_Bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert? - sal_Bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert? - sal_Bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default - sal_Bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf - sal_Bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf. - sal_Bool bFinishPREListingXMP : 1; - sal_Bool bRestartPRE : 1; - sal_Bool bRestartXMP : 1; - sal_Bool bRestartListing : 1; + sal_Bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert? + sal_Bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert? + sal_Bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default + sal_Bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf + sal_Bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf. + sal_Bool bFinishPREListingXMP : 1; + sal_Bool bRestartPRE : 1; + sal_Bool bRestartXMP : 1; + sal_Bool bRestartListing : 1; public: void ClearSaveDocContext(); @@ -359,21 +359,21 @@ SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1, 1 ) typedef SwFrmFmt *SwFrmFmtPtr; SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2, 2 ) -#define HTML_CNTXT_PROTECT_STACK 0x0001 -#define HTML_CNTXT_STRIP_PARA 0x0002 -#define HTML_CNTXT_KEEP_NUMRULE 0x0004 -#define HTML_CNTXT_HEADER_DIST 0x0008 -#define HTML_CNTXT_FOOTER_DIST 0x0010 -#define HTML_CNTXT_KEEP_ATTRS 0x0020 +#define HTML_CNTXT_PROTECT_STACK 0x0001 +#define HTML_CNTXT_STRIP_PARA 0x0002 +#define HTML_CNTXT_KEEP_NUMRULE 0x0004 +#define HTML_CNTXT_HEADER_DIST 0x0008 +#define HTML_CNTXT_FOOTER_DIST 0x0010 +#define HTML_CNTXT_KEEP_ATTRS 0x0020 -#define CONTEXT_FLAGS_ABSPOS \ +#define CONTEXT_FLAGS_ABSPOS \ (HTML_CNTXT_PROTECT_STACK | \ HTML_CNTXT_STRIP_PARA) -#define HTML_FF_BOX 0x0001 -#define HTML_FF_BACKGROUND 0x0002 -#define HTML_FF_PADDING 0x0004 -#define HTML_FF_DIRECTION 0x0008 +#define HTML_FF_BOX 0x0001 +#define HTML_FF_BACKGROUND 0x0002 +#define HTML_FF_PADDING 0x0004 +#define HTML_FF_DIRECTION 0x0008 class SwHTMLParser : public SfxHTMLParser, public SwClient { @@ -381,115 +381,115 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient friend class _CellSaveStruct; friend class _CaptionSaveStruct; - String aPathToFile; - String sBaseURL; - String sSaveBaseURL; - String aBasicLib; - String aBasicModule; - String aScriptSource; // Inhalt des aktuellen Script-Blocks - String aScriptType; // Type des gelesenen Scripts (StarBasic/VB/JAVA) - String aScriptURL; // URL eines Scripts - String aStyleSource; // Inhalt des aktuellen Style-Sheets - String aContents; // Text des akteullen Marquee, Feldes etc. - String sTitle; - String aUnknownToken; // ein gestartetes unbekanntes Token - String aBulletGrfs[MAXLEVEL]; - String sJmpMark; - - SvUShorts aBaseFontStack; // Stack fuer <BASEFONT> + String aPathToFile; + String sBaseURL; + String sSaveBaseURL; + String aBasicLib; + String aBasicModule; + String aScriptSource; // Inhalt des aktuellen Script-Blocks + String aScriptType; // Type des gelesenen Scripts (StarBasic/VB/JAVA) + String aScriptURL; // URL eines Scripts + String aStyleSource; // Inhalt des aktuellen Style-Sheets + String aContents; // Text des akteullen Marquee, Feldes etc. + String sTitle; + String aUnknownToken; // ein gestartetes unbekanntes Token + String aBulletGrfs[MAXLEVEL]; + String sJmpMark; + + SvUShorts aBaseFontStack; // Stack fuer <BASEFONT> // Bit 0-2: Fontgroesse (1-7) - SvUShorts aFontStack; // Stack fuer <FONT>, <BIG>, <SMALL> + SvUShorts aFontStack; // Stack fuer <FONT>, <BIG>, <SMALL> // Bit 0-2: Fontgroesse (1-7) // Bit 15: Fontfarbe wurde gesetzt - _HTMLAttrs aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr. - _HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute - _HTMLAttrTable aAttrTab; // "offene" Attribute + _HTMLAttrs aSetAttrTab;// "geschlossene", noch nicht gesetzte Attr. + _HTMLAttrs aParaAttrs; // vorlauefige Absatz-Attribute + _HTMLAttrTable aAttrTab; // "offene" Attribute _HTMLAttrContexts aContexts;// der aktuelle Attribut/Token-Kontext - SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, deren Anker verschoben wird - SvXub_StrLens aMoveFlyCnts;// und deren Content-Positionen + SwHTMLFrmFmts aMoveFlyFrms;// Fly-Frames, deren Anker verschoben wird + SvXub_StrLens aMoveFlyCnts;// und deren Content-Positionen - SwApplet_Impl *pAppletImpl; // das aktuelle Applet + SwApplet_Impl *pAppletImpl; // das aktuelle Applet - SwCSS1Parser *pCSS1Parser; // der Style-Sheet-Parser + SwCSS1Parser *pCSS1Parser; // der Style-Sheet-Parser SwHTMLNumRuleInfo *pNumRuleInfo; - SwPendingStack *pPendStack; + SwPendingStack *pPendStack; - SwDoc *pDoc; - SwPaM *pPam; // SwPosition duerfte doch reichen, oder ?? - ViewShell *pActionViewShell; // ViewShell, an der das StartAction + SwDoc *pDoc; + SwPaM *pPam; // SwPosition duerfte doch reichen, oder ?? + ViewShell *pActionViewShell; // ViewShell, an der das StartAction // gerufen wurde. - SwNodeIndex *pSttNdIdx; + SwNodeIndex *pSttNdIdx; - HTMLTable *pTable; // die aktuelle "auesserste" Tabelle + HTMLTable *pTable; // die aktuelle "auesserste" Tabelle SwHTMLForm_Impl *pFormImpl;// die aktuelle Form - SdrObject *pMarquee; // aktuelles Marquee - SwField *pField; // aktuelles Feld - ImageMap *pImageMap; // aktuelle Image-Map - ImageMaps *pImageMaps;// alle gelesenen Image-Maps + SdrObject *pMarquee; // aktuelles Marquee + SwField *pField; // aktuelles Feld + ImageMap *pImageMap; // aktuelle Image-Map + ImageMaps *pImageMaps;// alle gelesenen Image-Maps SwHTMLFootEndNote_Impl *pFootEndNoteImpl; - Size aHTMLPageSize; // die Seitengroesse der HTML-Vorlage + Size aHTMLPageSize; // die Seitengroesse der HTML-Vorlage - sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7 - sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks - ULONG nEventId; + sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7 + sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks + ULONG nEventId; - sal_uInt16 nBaseFontStMin; // - sal_uInt16 nFontStMin; // - sal_uInt16 nDefListDeep; // - sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn> - sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module - sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch? - sal_uInt16 nParaCnt; - sal_uInt16 nContextStMin; // Untergrenze fuer PopContext - sal_uInt16 nContextStAttrMin; // Untergrenze fuer Attributierung - sal_uInt16 nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox - sal_uInt16 nOpenParaToken; // ein geoeffnetes Absatz-Element + sal_uInt16 nBaseFontStMin; // + sal_uInt16 nFontStMin; // + sal_uInt16 nDefListDeep; // + sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn> + sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module + sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch? + sal_uInt16 nParaCnt; + sal_uInt16 nContextStMin; // Untergrenze fuer PopContext + sal_uInt16 nContextStAttrMin; // Untergrenze fuer Attributierung + sal_uInt16 nSelectEntryCnt; // Anzahl der Eintraege der akt. Listbox + sal_uInt16 nOpenParaToken; // ein geoeffnetes Absatz-Element enum JumpToMarks { JUMPTO_NONE, JUMPTO_MARK, JUMPTO_TABLE, JUMPTO_FRAME, JUMPTO_REGION, JUMPTO_GRAPHIC } eJumpTo; #ifdef DBG_UTIL - sal_uInt16 nContinue; // Tiefe der Continue-Aufrufe + sal_uInt16 nContinue; // Tiefe der Continue-Aufrufe #endif - SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz + SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz HTMLScriptLanguage eScriptLang; // die aktuelle Script-Language - sal_Bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument? + sal_Bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument? - sal_Bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert + sal_Bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert // Flag um doppeltes init durch Rekursion // zu verhindern. - sal_Bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron) - sal_Bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen + sal_Bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron) + sal_Bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen sal_Bool bSetModEnabled : 1; - sal_Bool bInFloatingFrame : 1; // Wir sind in einen Floating ::com::sun::star::frame::Frame + sal_Bool bInFloatingFrame : 1; // Wir sind in einen Floating ::com::sun::star::frame::Frame sal_Bool bInField : 1; - sal_Bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh. + sal_Bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh. // 8 - sal_Bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen - sal_Bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren. - sal_Bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt. - sal_Bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren? - sal_Bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen? + sal_Bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen + sal_Bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren. + sal_Bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt. + sal_Bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren? + sal_Bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen? sal_Bool bFixMarqueeHeight : 1; - sal_Bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt + sal_Bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt sal_Bool bNoParSpace : 1; // 16 - sal_Bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul - sal_Bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich + sal_Bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul + sal_Bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich - sal_Bool bInTitle : 1; // Wir sind im Titel + sal_Bool bInTitle : 1; // Wir sind im Titel - sal_Bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark + sal_Bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark sal_Bool bUpdateDocStat : 1; - sal_Bool bFixSelectWidth : 1; // Breite eines Selects neu setzen? - sal_Bool bFixSelectHeight : 1; // Breite eines Selects neu setzen? + sal_Bool bFixSelectWidth : 1; // Breite eines Selects neu setzen? + sal_Bool bFixSelectHeight : 1; // Breite eines Selects neu setzen? sal_Bool bTextArea : 1; // 24 sal_Bool bSelect : 1; @@ -560,7 +560,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void InsertAttr( _HTMLAttr **ppAttr, const SfxPoolItem & rItem, _HTMLAttrContext *pCntxt ); void SplitPREListingXMP( _HTMLAttrContext *pCntxt ); - void FixHeaderFooterDistance( sal_Bool bHeader, const SwPosition *pOldPos ); + void FixHeaderFooterDistance( sal_Bool bHeader, const SwPosition *pOldPos ); void EndContext( _HTMLAttrContext *pContext ); void ClearContext( _HTMLAttrContext *pContext ); @@ -668,9 +668,9 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient void EndTag( int nToken ); // Font-Attribute behandeln - void NewBasefontAttr(); // fuer <BASEFONT> + void NewBasefontAttr(); // fuer <BASEFONT> void EndBasefontAttr(); - void NewFontAttr( int nToken ); // fuer <FONT>, <BIG> und <SMALL> + void NewFontAttr( int nToken ); // fuer <FONT>, <BIG> und <SMALL> void EndFontAttr( int nToken ); // Tags, die durch Zeichenvorlagen realisiert werden @@ -733,18 +733,18 @@ private: // die eigentlichen Einfuege-Methoden fuer <IMG>, <EMBED> und <APPLET> // und <PARAM> - void InsertImage(); // htmlgrin.cxx - void InsertEmbed(); // htmlplug.cxx + void InsertImage(); // htmlgrin.cxx + void InsertEmbed(); // htmlplug.cxx #ifdef SOLAR_JAVA - void NewObject(); // htmlplug.cxx + void NewObject(); // htmlplug.cxx #endif - void EndObject(); // CommandLine mit Applet verkn. (htmlplug.cxx) + void EndObject(); // CommandLine mit Applet verkn. (htmlplug.cxx) #ifdef SOLAR_JAVA - void InsertApplet(); // htmlplug.cxx + void InsertApplet(); // htmlplug.cxx #endif - void EndApplet(); // CommandLine mit Applet verkn. (htmlplug.cxx) - void InsertParam(); // htmlplug.cxx + void EndApplet(); // CommandLine mit Applet verkn. (htmlplug.cxx) + void InsertParam(); // htmlplug.cxx void InsertFloatingFrame(); void EndFloatingFrame() { bInFloatingFrame = sal_False; } @@ -850,7 +850,7 @@ private: // Einfuegen von Tabellen (htmltab.cxx) -public: // wird in Tabellen benoetigt +public: // wird in Tabellen benoetigt // einen Boxen-Inhalt hinter dem angegebenen Node einfuegen const SwStartNode *InsertTableSection( const SwStartNode *pPrevStNd ); @@ -909,7 +909,7 @@ private: sal_Bool HasCurrentParaFlys( sal_Bool bNoSurroundOnly = sal_False, sal_Bool bSurroundOnly = sal_False ) const; -public: // wird in Tabellen benoetigt +public: // wird in Tabellen benoetigt // generieren eines BrushItems (mit new) oder 0 SvxBrushItem* CreateBrushItem( const Color *pColor, diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index ab6dfd92554a..8c84dd977707 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,10 +70,10 @@ #include <pam.hxx> #include <doc.hxx> #include <ndtxt.hxx> -#include <mdiexp.hxx> // ...Percent() +#include <mdiexp.hxx> // ...Percent() #include <fltini.hxx> #include <viewopt.hxx> -#include <IMark.hxx> // fuer SwBookmark ... +#include <IMark.hxx> // fuer SwBookmark ... #include <poolfmt.hxx> #include <pagedesc.hxx> #include <section.hxx> @@ -89,7 +89,7 @@ #include <swmodule.hxx> #ifndef _STATSTR_HRC -#include <statstr.hrc> // ResId fuer Statusleiste +#include <statstr.hrc> // ResId fuer Statusleiste #endif #include <swerror.h> @@ -160,7 +160,7 @@ ULONG SwHTMLWriter::WriteStream() nHTMLMode |= HTMLMODE_ABS_POS_FLY|HTMLMODE_ABS_POS_DRAW; if( HTML_CFG_WRITER==nExportMode ) -// nHTMLMode |= HTMLMODE_FLY_MARGINS | HTMLMODE_FRSTLINE_IN_NUMBUL; +// nHTMLMode |= HTMLMODE_FLY_MARGINS | HTMLMODE_FRSTLINE_IN_NUMBUL; nHTMLMode |= HTMLMODE_FLY_MARGINS; if( HTML_CFG_NS40==nExportMode ) @@ -197,8 +197,8 @@ ULONG SwHTMLWriter::WriteStream() eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); // fuer Netscape optimieren heisst Spacer- und Multicol ausgeben -// bCfgMultiCol = pHtmlOptions->IsNetscape3(); -// bCfgSpacer = pHtmlOptions->IsNetscape3(); +// bCfgMultiCol = pHtmlOptions->IsNetscape3(); +// bCfgSpacer = pHtmlOptions->IsNetscape3(); // wenn Styles exportiert werden, wird ein Style einem HTML-Tag manchmal // vorgezogen, wenn nicht fuer Netscape exportiert wird @@ -321,7 +321,7 @@ ULONG SwHTMLWriter::WriteStream() (((((((sOut += OOO_STRING_SVTOOLS_HTML_division) += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\"") += aName) += '\"') - += '>') += aStartTags; + += '>') += aStartTags; aStartTags = sOut; } @@ -739,7 +739,7 @@ static Writer& OutHTML_Section( Writer& rWrt, const SwSectionNode& rSectNd ) void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) { - sal_Bool bSaveWriteAll = bWriteAll; // sichern + sal_Bool bSaveWriteAll = bWriteAll; // sichern // suche die naechste text::Bookmark-Position aus der text::Bookmark-Tabelle nBkmkTabPos = bWriteAll ? FindPos_Bkmk( *pCurPam->GetPoint() ) : -1; @@ -782,7 +782,7 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) else if( pNd == &pDoc->GetNodes().GetEndOfContent() ) break; - pCurPam->GetPoint()->nNode++; // Bewegen + pCurPam->GetPoint()->nNode++; // Bewegen sal_uInt32 nPos = pCurPam->GetPoint()->nNode.GetIndex(); if( bShowProgress ) @@ -803,9 +803,9 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam ) // beim Aufrufer OutAndSetDefList( 0 ); - } while( CopyNextPam( &pPam ) ); // bis alle PaM's bearbeitet + } while( CopyNextPam( &pPam ) ); // bis alle PaM's bearbeitet - bWriteAll = bSaveWriteAll; // wieder auf alten Wert zurueck + bWriteAll = bSaveWriteAll; // wieder auf alten Wert zurueck } @@ -932,12 +932,12 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) OutNewLine(); HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head ); - IncIndentLevel(); // Inhalt von <HEAD> einruecken + IncIndentLevel(); // Inhalt von <HEAD> einruecken // DokumentInfo ByteString sIndent; GetIndentString( sIndent ); -// OutNewLine(); +// OutNewLine(); using namespace ::com::sun::star; uno::Reference<document::XDocumentProperties> xDocProps; SwDocShell *pDocShell(pDoc->GetDocShell()); @@ -989,7 +989,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) //else //{ // In HTML-Dokumenten nehmen wir immer die HTML-Vorlage - // pPageDesc = pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML ); + // pPageDesc = pDoc->GetPageDescFromPool( RES_POOLPAGE_HTML ); //} // und nun ... das Style-Sheet!!! @@ -999,10 +999,10 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) } // und nun ... das BASIC und JavaScript! - if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich + if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich OutBasic(); - DecIndentLevel(); // Inhalt von <HEAD> einruecken + DecIndentLevel(); // Inhalt von <HEAD> einruecken OutNewLine(); HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head, sal_False ); @@ -1042,7 +1042,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) OutCSS1_BodyTagStyleOpt( *this, rItemSet, aEmbGrfName ); // Events anhaengen - if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich + if( pDoc->GetDocShell() ) // nur mit DocShell ist Basic moeglich OutBasicBodyEvents(); Strm() << '>'; @@ -1088,7 +1088,7 @@ void SwHTMLWriter::OutBookmarks() sal_uInt16 nPos; for( nPos = 0; nPos < aOutlineMarkPoss.Count() && aOutlineMarkPoss[nPos] < nNode; nPos++ ) - ; + ; while( nPos < aOutlineMarkPoss.Count() && aOutlineMarkPoss[nPos] == nNode ) { @@ -1111,7 +1111,7 @@ void SwHTMLWriter::OutImplicitMark( const String& rMark, sal_uInt16 nPos; if( aImplicitMarks.Seek_Entry( &sMark, &nPos ) ) { - sMark.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5 + sMark.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5 OutAnchor( sMark ); aImplicitMarks.DeleteAndDestroy( nPos, 1 ); } @@ -1137,7 +1137,7 @@ void SwHTMLWriter::OutHyperlinkHRefValue( const String& rURL ) sCmp.EqualsAscii( pMarkToOutline ) || sCmp.EqualsAscii( pMarkToText ) ) { - sURL.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5 + sURL.SearchAndReplaceAll( '?', '_' ); // '?' causes problems in IE/Netscape 5 } } } @@ -1180,7 +1180,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, rEmbGrfNm, String::CreateFromAscii( "JPG" ), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); - if( !nErr ) // fehlerhaft, da ist nichts auszugeben + if( !nErr ) // fehlerhaft, da ist nichts auszugeben { rEmbGrfNm = URIHelper::SmartRel2Abs( INetURLObject( GetBaseURL() ), rEmbGrfNm, @@ -1348,7 +1348,7 @@ sal_uInt16 SwHTMLWriter::GetHTMLFontSize( sal_uInt32 nHeight ) const // einen anderen Dokument-Teil auszugeben, wie z.B. Header/Footer HTMLSaveData::HTMLSaveData( SwHTMLWriter& rWriter, ULONG nStt, ULONG nEnd, sal_Bool bSaveNum, - const SwFrmFmt *pFrmFmt ) : + const SwFrmFmt *pFrmFmt ) : rWrt( rWriter ), pOldPam( rWrt.pCurPam ), pOldEnd( rWrt.GetEndPaM() ), @@ -1402,7 +1402,7 @@ HTMLSaveData::HTMLSaveData( SwHTMLWriter& rWriter, ULONG nStt, HTMLSaveData::~HTMLSaveData() { - delete rWrt.pCurPam; // Pam wieder loeschen + delete rWrt.pCurPam; // Pam wieder loeschen rWrt.pCurPam = pOldPam; rWrt.SetEndPaM( pOldEnd ); diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 20511eecf3be..c422babf17d3 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,61 +71,61 @@ extern SwAttrFnTab aHTMLAttrFnTab; // BORDER geht nur bei OutHTML_Image // ANYSIZE gibt an, ob auch VAR_SIZE und MIN_SIZE angaben exportiert werden // ABSSIZE gibt an, ob Abstand und Umrandung ignoriert werden sollen -const sal_uInt32 HTML_FRMOPT_ALIGN = 1<<0; -const sal_uInt32 HTML_FRMOPT_S_ALIGN = 1<<1; - -const sal_uInt32 HTML_FRMOPT_WIDTH = 1<<2; -const sal_uInt32 HTML_FRMOPT_HEIGHT = 1<<3; -const sal_uInt32 HTML_FRMOPT_SIZE = HTML_FRMOPT_WIDTH|HTML_FRMOPT_HEIGHT; -const sal_uInt32 HTML_FRMOPT_S_WIDTH = 1<<4; -const sal_uInt32 HTML_FRMOPT_S_HEIGHT = 1<<5; -const sal_uInt32 HTML_FRMOPT_S_SIZE = HTML_FRMOPT_S_WIDTH|HTML_FRMOPT_S_HEIGHT; -const sal_uInt32 HTML_FRMOPT_ANYSIZE = 1<<6; -const sal_uInt32 HTML_FRMOPT_ABSSIZE = 1<<7; -const sal_uInt32 HTML_FRMOPT_MARGINSIZE = 1<<8; - -const sal_uInt32 HTML_FRMOPT_SPACE = 1<<9; -const sal_uInt32 HTML_FRMOPT_S_SPACE = 1<<10; - -const sal_uInt32 HTML_FRMOPT_BORDER = 1<<11; -const sal_uInt32 HTML_FRMOPT_S_BORDER = 1<<12; -const sal_uInt32 HTML_FRMOPT_S_NOBORDER = 1<<13; +const sal_uInt32 HTML_FRMOPT_ALIGN = 1<<0; +const sal_uInt32 HTML_FRMOPT_S_ALIGN = 1<<1; + +const sal_uInt32 HTML_FRMOPT_WIDTH = 1<<2; +const sal_uInt32 HTML_FRMOPT_HEIGHT = 1<<3; +const sal_uInt32 HTML_FRMOPT_SIZE = HTML_FRMOPT_WIDTH|HTML_FRMOPT_HEIGHT; +const sal_uInt32 HTML_FRMOPT_S_WIDTH = 1<<4; +const sal_uInt32 HTML_FRMOPT_S_HEIGHT = 1<<5; +const sal_uInt32 HTML_FRMOPT_S_SIZE = HTML_FRMOPT_S_WIDTH|HTML_FRMOPT_S_HEIGHT; +const sal_uInt32 HTML_FRMOPT_ANYSIZE = 1<<6; +const sal_uInt32 HTML_FRMOPT_ABSSIZE = 1<<7; +const sal_uInt32 HTML_FRMOPT_MARGINSIZE = 1<<8; + +const sal_uInt32 HTML_FRMOPT_SPACE = 1<<9; +const sal_uInt32 HTML_FRMOPT_S_SPACE = 1<<10; + +const sal_uInt32 HTML_FRMOPT_BORDER = 1<<11; +const sal_uInt32 HTML_FRMOPT_S_BORDER = 1<<12; +const sal_uInt32 HTML_FRMOPT_S_NOBORDER = 1<<13; const sal_uInt32 HTML_FRMOPT_S_BACKGROUND = 1<<14; -const sal_uInt32 HTML_FRMOPT_NAME = 1<<15; -const sal_uInt32 HTML_FRMOPT_ALT = 1<<16; -const sal_uInt32 HTML_FRMOPT_BRCLEAR = 1<<17; -const sal_uInt32 HTML_FRMOPT_S_PIXSIZE = 1<<18; -const sal_uInt32 HTML_FRMOPT_ID = 1<<19; -const sal_uInt32 HTML_FRMOPT_DIR = 1<<20; +const sal_uInt32 HTML_FRMOPT_NAME = 1<<15; +const sal_uInt32 HTML_FRMOPT_ALT = 1<<16; +const sal_uInt32 HTML_FRMOPT_BRCLEAR = 1<<17; +const sal_uInt32 HTML_FRMOPT_S_PIXSIZE = 1<<18; +const sal_uInt32 HTML_FRMOPT_ID = 1<<19; +const sal_uInt32 HTML_FRMOPT_DIR = 1<<20; -const sal_uInt32 HTML_FRMOPTS_GENIMG_ALL = - HTML_FRMOPT_ALT | - HTML_FRMOPT_SIZE | +const sal_uInt32 HTML_FRMOPTS_GENIMG_ALL = + HTML_FRMOPT_ALT | + HTML_FRMOPT_SIZE | HTML_FRMOPT_ABSSIZE | HTML_FRMOPT_NAME; const sal_uInt32 HTML_FRMOPTS_GENIMG_CNTNR = HTML_FRMOPTS_GENIMG_ALL; -const sal_uInt32 HTML_FRMOPTS_GENIMG = +const sal_uInt32 HTML_FRMOPTS_GENIMG = HTML_FRMOPTS_GENIMG_ALL | - HTML_FRMOPT_ALIGN | - HTML_FRMOPT_SPACE | + HTML_FRMOPT_ALIGN | + HTML_FRMOPT_SPACE | HTML_FRMOPT_BRCLEAR; -#define HTMLMODE_BLOCK_SPACER 0x00010000 -#define HTMLMODE_FLOAT_FRAME 0x00020000 -#define HTMLMODE_VERT_SPACER 0x00040000 -#define HTMLMODE_NBSP_IN_TABLES 0x00080000 -#define HTMLMODE_LSPACE_IN_NUMBUL 0x00100000 -#define HTMLMODE_NO_BR_AT_PAREND 0x00200000 -#define HTMLMODE_PRINT_EXT 0x00400000 -#define HTMLMODE_ABS_POS_FLY 0x00800000 -#define HTMLMODE_ABS_POS_DRAW 0x01000000 -#define HTMLMODE_FLY_MARGINS 0x02000000 -#define HTMLMODE_BORDER_NONE 0x04000000 -#define HTMLMODE_FONT_GENERIC 0x08000000 -#define HTMLMODE_FRSTLINE_IN_NUMBUL 0x10000000 +#define HTMLMODE_BLOCK_SPACER 0x00010000 +#define HTMLMODE_FLOAT_FRAME 0x00020000 +#define HTMLMODE_VERT_SPACER 0x00040000 +#define HTMLMODE_NBSP_IN_TABLES 0x00080000 +#define HTMLMODE_LSPACE_IN_NUMBUL 0x00100000 +#define HTMLMODE_NO_BR_AT_PAREND 0x00200000 +#define HTMLMODE_PRINT_EXT 0x00400000 +#define HTMLMODE_ABS_POS_FLY 0x00800000 +#define HTMLMODE_ABS_POS_DRAW 0x01000000 +#define HTMLMODE_FLY_MARGINS 0x02000000 +#define HTMLMODE_BORDER_NONE 0x04000000 +#define HTMLMODE_FONT_GENERIC 0x08000000 +#define HTMLMODE_FRSTLINE_IN_NUMBUL 0x10000000 #define HTMLMODE_NO_CONTROL_CENTERING 0x20000000 #define HTML_DLCOLL_DD 0x4000 @@ -138,55 +138,55 @@ const sal_uInt32 HTML_FRMOPTS_GENIMG = // Die folgenden Flags bestimmen nur, welche Descriptoren, Tags, Optionen etc. // ausgegeben werden ... // bit 0,1,2 -#define CSS1_OUTMODE_SPAN_NO_ON 0x0000U -#define CSS1_OUTMODE_SPAN_TAG_ON 0x0001U -#define CSS1_OUTMODE_STYLE_OPT_ON 0x0002U -#define CSS1_OUTMODE_RULE_ON 0x0003U -#define CSS1_OUTMODE_SPAN_TAG1_ON 0x0004U -#define CSS1_OUTMODE_ANY_ON 0x0007U +#define CSS1_OUTMODE_SPAN_NO_ON 0x0000U +#define CSS1_OUTMODE_SPAN_TAG_ON 0x0001U +#define CSS1_OUTMODE_STYLE_OPT_ON 0x0002U +#define CSS1_OUTMODE_RULE_ON 0x0003U +#define CSS1_OUTMODE_SPAN_TAG1_ON 0x0004U +#define CSS1_OUTMODE_ANY_ON 0x0007U // bit 3,4,5 -#define CSS1_OUTMODE_SPAN_NO_OFF 0x0000U -#define CSS1_OUTMODE_SPAN_TAG_OFF ((sal_uInt16)(0x0001U << 3)) -#define CSS1_OUTMODE_STYLE_OPT_OFF ((sal_uInt16)(0x0002U << 3)) -#define CSS1_OUTMODE_RULE_OFF ((sal_uInt16)(0x0003U << 3)) -#define CSS1_OUTMODE_SPAN_TAG1_OFF ((sal_uInt16)(0x0004U << 3)) -#define CSS1_OUTMODE_ANY_OFF ((sal_uInt16)(0x0007U << 3)) +#define CSS1_OUTMODE_SPAN_NO_OFF 0x0000U +#define CSS1_OUTMODE_SPAN_TAG_OFF ((sal_uInt16)(0x0001U << 3)) +#define CSS1_OUTMODE_STYLE_OPT_OFF ((sal_uInt16)(0x0002U << 3)) +#define CSS1_OUTMODE_RULE_OFF ((sal_uInt16)(0x0003U << 3)) +#define CSS1_OUTMODE_SPAN_TAG1_OFF ((sal_uInt16)(0x0004U << 3)) +#define CSS1_OUTMODE_ANY_OFF ((sal_uInt16)(0x0007U << 3)) #define CSS1_OUTMODE_ONOFF(a) (CSS1_OUTMODE_##a##_ON|CSS1_OUTMODE_##a##_OFF) -#define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG) -#define CSS1_OUTMODE_STYLE_OPT CSS1_OUTMODE_ONOFF(STYLE_OPT) -#define CSS1_OUTMODE_RULE CSS1_OUTMODE_ONOFF(RULE) -#define CSS1_OUTMODE_SPAN_TAG1 CSS1_OUTMODE_ONOFF(TAG1) +#define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG) +#define CSS1_OUTMODE_STYLE_OPT CSS1_OUTMODE_ONOFF(STYLE_OPT) +#define CSS1_OUTMODE_RULE CSS1_OUTMODE_ONOFF(RULE) +#define CSS1_OUTMODE_SPAN_TAG1 CSS1_OUTMODE_ONOFF(TAG1) // Die folgenden Flags legen fest, was ausgegeben wird // bit 6,7,8,9 -#define CSS1_OUTMODE_TEMPLATE 0x0000U -#define CSS1_OUTMODE_BODY ((sal_uInt16)(0x0001U << 6)) -#define CSS1_OUTMODE_PARA ((sal_uInt16)(0x0002U << 6)) -#define CSS1_OUTMODE_HINT ((sal_uInt16)(0x0003U << 6)) -#define CSS1_OUTMODE_FRAME ((sal_uInt16)(0x0004U << 6)) -#define CSS1_OUTMODE_TABLE ((sal_uInt16)(0x0005U << 6)) -#define CSS1_OUTMODE_TABLEBOX ((sal_uInt16)(0x0006U << 6)) -#define CSS1_OUTMODE_DROPCAP ((sal_uInt16)(0x0007U << 6)) -#define CSS1_OUTMODE_SECTION ((sal_uInt16)(0x0008U << 6)) -#define CSS1_OUTMODE_SOURCE ((sal_uInt16)(0x000fU << 6)) +#define CSS1_OUTMODE_TEMPLATE 0x0000U +#define CSS1_OUTMODE_BODY ((sal_uInt16)(0x0001U << 6)) +#define CSS1_OUTMODE_PARA ((sal_uInt16)(0x0002U << 6)) +#define CSS1_OUTMODE_HINT ((sal_uInt16)(0x0003U << 6)) +#define CSS1_OUTMODE_FRAME ((sal_uInt16)(0x0004U << 6)) +#define CSS1_OUTMODE_TABLE ((sal_uInt16)(0x0005U << 6)) +#define CSS1_OUTMODE_TABLEBOX ((sal_uInt16)(0x0006U << 6)) +#define CSS1_OUTMODE_DROPCAP ((sal_uInt16)(0x0007U << 6)) +#define CSS1_OUTMODE_SECTION ((sal_uInt16)(0x0008U << 6)) +#define CSS1_OUTMODE_SOURCE ((sal_uInt16)(0x000fU << 6)) // bit 10 -#define CSS1_OUTMODE_ENCODE ((sal_uInt16)(0x0001U << 10)) +#define CSS1_OUTMODE_ENCODE ((sal_uInt16)(0x0001U << 10)) // bit 11,12,13 // don't care about script -#define CSS1_OUTMODE_ANY_SCRIPT 0x0000U +#define CSS1_OUTMODE_ANY_SCRIPT 0x0000U // no cjk or ctl items -#define CSS1_OUTMODE_WESTERN ((sal_uInt16)(0x0001U << 11)) +#define CSS1_OUTMODE_WESTERN ((sal_uInt16)(0x0001U << 11)) // no western or ctl items -#define CSS1_OUTMODE_CJK ((sal_uInt16)(0x0002U << 11)) +#define CSS1_OUTMODE_CJK ((sal_uInt16)(0x0002U << 11)) // no western or cjk items -#define CSS1_OUTMODE_CTL ((sal_uInt16)(0x0003U << 11)) +#define CSS1_OUTMODE_CTL ((sal_uInt16)(0x0003U << 11)) // no western, cjk or ctl items -#define CSS1_OUTMODE_NO_SCRIPT ((sal_uInt16)(0x0004U << 11)) -#define CSS1_OUTMODE_SCRIPT ((sal_uInt16)(0x0007U << 11)) +#define CSS1_OUTMODE_NO_SCRIPT ((sal_uInt16)(0x0004U << 11)) +#define CSS1_OUTMODE_SCRIPT ((sal_uInt16)(0x0007U << 11)) // der HTML-Writer struct HTMLControl; @@ -203,7 +203,7 @@ class SwHTMLWriter : public Writer SwHTMLPosFlyFrms *pHTMLPosFlyFrms; SwHTMLNumRuleInfo *pNumRuleInfo;// aktuelle Numerierung SwHTMLNumRuleInfo *pNextNumRuleInfo; - sal_uInt32 nHTMLMode; // Beschreibung der Export-Konfiguration + sal_uInt32 nHTMLMode; // Beschreibung der Export-Konfiguration FieldUnit eCSS1Unit; @@ -219,126 +219,126 @@ protected: public: #if defined(UNX) - static const sal_Char sNewLine; // nur \012 oder \015 + static const sal_Char sNewLine; // nur \012 oder \015 #else - static const sal_Char __FAR_DATA sNewLine[]; // \015\012 + static const sal_Char __FAR_DATA sNewLine[]; // \015\012 #endif - SvStringsDtor aImgMapNames; // geschriebene Image Maps + SvStringsDtor aImgMapNames; // geschriebene Image Maps SvStringsSortDtor aImplicitMarks;// implizite Stprungmarken - SvStringsDtor aOutlineMarks; // geschriebene Image Maps + SvStringsDtor aOutlineMarks; // geschriebene Image Maps SvStringsSortDtor aNumRuleNames;// Names of exported num rules SvStringsSortDtor aScriptParaStyles;// script dependent para styles SvStringsSortDtor aScriptTextStyles;// script dependent text styles SvULongs aOutlineMarkPoss; - HTMLControls aHTMLControls; // die zu schreibenden ::com::sun::star::form::Forms + HTMLControls aHTMLControls; // die zu schreibenden ::com::sun::star::form::Forms SwHTMLFmtInfos aChrFmtInfos; SwHTMLFmtInfos aTxtCollInfos; - INetFmts aINetFmts; // die "offenen" INet-Attribute + INetFmts aINetFmts; // die "offenen" INet-Attribute SwHTMLTxtFtns *pFootEndNotes; - String aCSS1Selector; // der Selektor eines Styles + String aCSS1Selector; // der Selektor eines Styles String aNonConvertableCharacters; - String aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen + String aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > *pxFormComps; // die aktuelle Form + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > *pxFormComps; // die aktuelle Form - SwDoc *pTemplate; // die HTML-Vorlage - Color *pDfltColor; // default Farbe - SwNodeIndex *pStartNdIdx; // Index des ersten Absatz + SwDoc *pTemplate; // die HTML-Vorlage + Color *pDfltColor; // default Farbe + SwNodeIndex *pStartNdIdx; // Index des ersten Absatz const SwPageDesc *pCurrPageDesc;// Die aktuelle Seiten-Vorlage const SwFmtFtn *pFmtFtn; - sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7 + sal_uInt32 aFontHeights[7]; // die Font-Hoehen 1-7 - sal_uInt32 nWarn; // Result-Code fuer Warnungen - sal_uInt32 nLastLFPos; // letzte Position eines LF + sal_uInt32 nWarn; // Result-Code fuer Warnungen + sal_uInt32 nLastLFPos; // letzte Position eines LF - sal_uInt16 nLastParaToken; // fuers Absaetze zusammenhalten - sal_Int32 nBkmkTabPos; // akt. Position in der Bookmark-Tabelle - sal_uInt16 nImgMapCnt; // zum eindeutig + sal_uInt16 nLastParaToken; // fuers Absaetze zusammenhalten + sal_Int32 nBkmkTabPos; // akt. Position in der Bookmark-Tabelle + sal_uInt16 nImgMapCnt; // zum eindeutig sal_uInt16 nFormCntrlCnt; sal_uInt16 nEndNote; sal_uInt16 nFootNote; - sal_Int32 nLeftMargin; // linker Einzug (z.B. aus Listen) - sal_Int32 nDfltLeftMargin; // die dafaults, der nicht geschrieben - sal_Int32 nDfltRightMargin; // werden muessen (aus der Vorlage) - short nFirstLineIndent; // Erstzeilen-Einzug (aus Listen) - short nDfltFirstLineIndent; // nicht zu schreibender default - sal_uInt16 nDfltTopMargin; // die defaults, der nicht geschrieben - sal_uInt16 nDfltBottomMargin; // werden muessen (aus der Vorlage) - sal_uInt16 nIndentLvl; // wie weit ist eingerueckt? - xub_StrLen nWhishLineLen; // wie lang darf eine Zeile werden? - sal_uInt16 nDefListLvl; // welcher DL-Level existiert gerade - sal_Int32 nDefListMargin; // Wie weit wird in DL eingerueckt + sal_Int32 nLeftMargin; // linker Einzug (z.B. aus Listen) + sal_Int32 nDfltLeftMargin; // die dafaults, der nicht geschrieben + sal_Int32 nDfltRightMargin; // werden muessen (aus der Vorlage) + short nFirstLineIndent; // Erstzeilen-Einzug (aus Listen) + short nDfltFirstLineIndent; // nicht zu schreibender default + sal_uInt16 nDfltTopMargin; // die defaults, der nicht geschrieben + sal_uInt16 nDfltBottomMargin; // werden muessen (aus der Vorlage) + sal_uInt16 nIndentLvl; // wie weit ist eingerueckt? + xub_StrLen nWhishLineLen; // wie lang darf eine Zeile werden? + sal_uInt16 nDefListLvl; // welcher DL-Level existiert gerade + sal_Int32 nDefListMargin; // Wie weit wird in DL eingerueckt sal_uInt16 nHeaderFooterSpace; sal_uInt16 nTxtAttrsToIgnore; sal_uInt16 nExportMode; sal_uInt16 nCSS1OutMode; - sal_uInt16 nCSS1Script; // contains default script (that's the one + sal_uInt16 nCSS1Script; // contains default script (that's the one // that is not contained in class names) - sal_uInt16 nDirection; // the current direction + sal_uInt16 nDirection; // the current direction - rtl_TextEncoding eDestEnc; - LanguageType eLang; + rtl_TextEncoding eDestEnc; + LanguageType eLang; // Beschreibung der Export-Konfiguration // 0 - sal_Bool bCfgOutStyles : 1; // Styles exportieren - sal_Bool bCfgPreferStyles : 1; // Styles herkoemmlichen Tags vorziehen - sal_Bool bCfgFormFeed : 1; // Form-Feeds exportieren - sal_Bool bCfgStarBasic : 1; // StarBasic exportieren + sal_Bool bCfgOutStyles : 1; // Styles exportieren + sal_Bool bCfgPreferStyles : 1; // Styles herkoemmlichen Tags vorziehen + sal_Bool bCfgFormFeed : 1; // Form-Feeds exportieren + sal_Bool bCfgStarBasic : 1; // StarBasic exportieren sal_Bool bCfgCpyLinkedGrfs : 1; // Beschreibung dessen, was exportiert wird - sal_Bool bFirstLine : 1; // wird die 1. Zeile ausgegeben ? - sal_Bool bTagOn : 1; // Tag an oder aus/Attr-Start oder -Ende + sal_Bool bFirstLine : 1; // wird die 1. Zeile ausgegeben ? + sal_Bool bTagOn : 1; // Tag an oder aus/Attr-Start oder -Ende // Die folgenden beiden Flags geben an, wir Attribute exportiert werden: // bTxtAttr bOutOpts - // 0 0 Style-Sheets - // 1 0 Hints: Jedes Attribut wird als eignes Tag - // geschrieben und es gibt ein End-Tag - // 0 1 (Absatz-)Attribute: Das Attribut wird als Option - // eines bereits geschrieben Tags exportiert. Es - // gibt kein End-Tag. + // 0 0 Style-Sheets + // 1 0 Hints: Jedes Attribut wird als eignes Tag + // geschrieben und es gibt ein End-Tag + // 0 1 (Absatz-)Attribute: Das Attribut wird als Option + // eines bereits geschrieben Tags exportiert. Es + // gibt kein End-Tag. sal_Bool bTxtAttr : 1; // 8 sal_Bool bOutOpts : 1; - sal_Bool bOutTable : 1; // wird der Tabelleninhalt geschrieben? + sal_Bool bOutTable : 1; // wird der Tabelleninhalt geschrieben? sal_Bool bOutHeader : 1; sal_Bool bOutFooter : 1; sal_Bool bOutFlyFrame : 1; // Flags fuer Style-Export - sal_Bool bFirstCSS1Rule : 1; // wurde schon eine Property ausgegeben - sal_Bool bFirstCSS1Property : 1; // wurde schon eine Property ausgegeben - sal_Bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde + sal_Bool bFirstCSS1Rule : 1; // wurde schon eine Property ausgegeben + sal_Bool bFirstCSS1Property : 1; // wurde schon eine Property ausgegeben + sal_Bool bPoolCollTextModified : 1; // die Textkoerper-Vorlage wurde // modifiziert. // 16 sal_Bool bCSS1IgnoreFirstPageDesc : 1; // was muss/kann/darf nicht ausgegeben werden? - sal_Bool bNoAlign : 1; // HTML-Tag erlaubt kein ALIGN=... - sal_Bool bClearLeft : 1; // <BR CLEAR=LEFT> am Absatz-Ende ausg. - sal_Bool bClearRight : 1; // <BR CLEAR=RIGHT> am Absatz-Ende ausg. - sal_Bool bLFPossible : 1; // ein Zeilenumbruch darf eingef. werden + sal_Bool bNoAlign : 1; // HTML-Tag erlaubt kein ALIGN=... + sal_Bool bClearLeft : 1; // <BR CLEAR=LEFT> am Absatz-Ende ausg. + sal_Bool bClearRight : 1; // <BR CLEAR=RIGHT> am Absatz-Ende ausg. + sal_Bool bLFPossible : 1; // ein Zeilenumbruch darf eingef. werden // sonstiges - sal_Bool bPreserveForm : 1; // die aktuelle Form beibehalten + sal_Bool bPreserveForm : 1; // die aktuelle Form beibehalten - sal_Bool bCfgNetscape4 : 1; // Netscape4 Hacks + sal_Bool bCfgNetscape4 : 1; // Netscape4 Hacks // 23 SwHTMLWriter( const String& rBaseURL ); virtual ~SwHTMLWriter(); - void Out_SwDoc( SwPaM* ); // schreibe den makierten Bereich + void Out_SwDoc( SwPaM* ); // schreibe den makierten Bereich // gebe alle an in aktuellen Ansatz stehenden ::com::sun::star::text::Bookmarks aus void OutAnchor( const String& rName ); @@ -461,7 +461,7 @@ public: String& rClass, sal_uInt16& rRefPoolId, String *pPseudo=0 ); - static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate ); + static const SwFmt *GetTemplateFmt( sal_uInt16 nPoolId, IDocumentStylePoolAccess* /*SwDoc*/ pTemplate ); static const SwFmt *GetParentFmt( const SwFmt& rFmt, sal_uInt16 nDeep ); static void SubtractItemSet( SfxItemSet& rItemSet, @@ -533,8 +533,8 @@ struct HTMLSaveData { SwHTMLWriter& rWrt; SwPaM* pOldPam, *pOldEnd; - SwHTMLNumRuleInfo *pOldNumRuleInfo; // Owner = this - SwHTMLNumRuleInfo *pOldNextNumRuleInfo; // Owner = HTML-Writer + SwHTMLNumRuleInfo *pOldNumRuleInfo; // Owner = this + SwHTMLNumRuleInfo *pOldNextNumRuleInfo; // Owner = HTML-Writer sal_uInt16 nOldDefListLvl; sal_uInt16 nOldDirection; sal_Bool bOldWriteAll : 1; @@ -545,7 +545,7 @@ struct HTMLSaveData HTMLSaveData( SwHTMLWriter&, ULONG nStt, ULONG nEnd, sal_Bool bSaveNum=sal_True, - const SwFrmFmt *pFrmFmt=0 ); + const SwFrmFmt *pFrmFmt=0 ); ~HTMLSaveData(); }; @@ -599,5 +599,5 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt, const SwHTMLNumRuleInfo& rNextInfo ); -#endif // _WRTHTML_HXX +#endif // _WRTHTML_HXX |