diff options
Diffstat (limited to 'sw/source/filter')
172 files changed, 5475 insertions, 5475 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index 0c1601abcd28..8073ec4552e7 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -2,7 +2,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 @@ -65,9 +65,9 @@ class SwASC_AttrIter public: SwASC_AttrIter( SwASCWriter& rWrt, const SwTxtNode& rNd, xub_StrLen nStt ); - void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); } + void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); } - xub_StrLen WhereNext() const { return nAktSwPos; } + xub_StrLen WhereNext() const { return nAktSwPos; } BOOL OutAttr( xub_StrLen nSwPos ); }; @@ -221,9 +221,9 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) */ SwNodeFnTab aASCNodeFnTab = { -/* RES_TXTNODE */ OutASC_SwTxtNode, -/* RES_GRFNODE */ 0, -/* RES_OLENODE */ 0 +/* RES_TXTNODE */ OutASC_SwTxtNode, +/* RES_GRFNODE */ 0, +/* RES_OLENODE */ 0 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index d304102ccfce..47cbe0a72638 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -2,7 +2,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 @@ -110,9 +110,9 @@ SwASCIIParser::SwASCIIParser(SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, pArr = new sal_Char [ ASC_BUFFLEN + 2 ]; pItemSet = new SfxItemSet( pDoc->GetAttrPool(), - RES_CHRATR_FONT, RES_CHRATR_LANGUAGE, - RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_LANGUAGE, - RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE, + RES_CHRATR_FONT, RES_CHRATR_LANGUAGE, + RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_LANGUAGE, + RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE, 0 ); // set defaults from the options @@ -333,7 +333,7 @@ ULONG SwASCIIParser::ReadChars() if( SVSTREAM_OK != rInput.GetError() || 0 == (lGCount = rInput.Read( pArr + nArrOffset, ASC_BUFFLEN - nArrOffset ))) - break; // aus der WHILE-Schleife heraus + break; // aus der WHILE-Schleife heraus /* #98380# @@ -406,13 +406,13 @@ ULONG SwASCIIParser::ReadChars() switch( *pStt ) { //JP 12.11.2001: task 94636 - don't ignore all behind the zero character, -// change it to the default "control character" -// case 0: -// pEnd = pStt; -// bIns = false ; -// break; +// change it to the default "control character" +// case 0: +// pEnd = pStt; +// bIns = false ; +// break; - case 0x0a: if( LINEEND_LF == pUseMe->GetParaFlags() ) + case 0x0a: if( LINEEND_LF == pUseMe->GetParaFlags() ) { bIns = false; *pStt = 0; @@ -424,7 +424,7 @@ ULONG SwASCIIParser::ReadChars() } break; - case 0x0d: if( LINEEND_LF != pUseMe->GetParaFlags() ) + case 0x0d: if( LINEEND_LF != pUseMe->GetParaFlags() ) { bIns = false; *pStt = 0; @@ -476,7 +476,7 @@ ULONG SwASCIIParser::ReadChars() *pStt = '#'; // Ersatzdarstellung break; - case '\t': break; + case '\t': break; default: if( ' ' > *pStt ) diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index a2403bf4ae19..bb8c2eb570c2 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -2,7 +2,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 @@ -34,13 +34,13 @@ #include <pam.hxx> #include <doc.hxx> #include <ndtxt.hxx> -#include <mdiexp.hxx> // ...Percent() +#include <mdiexp.hxx> // ...Percent() #include <docary.hxx> #include <fmtcntnt.hxx> #include <frmfmt.hxx> #include <wrtasc.hxx> -#include <statstr.hrc> // ResId fuer Statusleiste +#include <statstr.hrc> // ResId fuer Statusleiste //----------------------------------------------------------------- @@ -58,12 +58,12 @@ SwASCWriter::SwASCWriter( const String& rFltNm ) if( 5 < rFltNm.Len() ) switch( rFltNm.Copy( 5 ).ToInt32() ) { - case 437: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_437 ); break; - case 850: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_850 ); break; - case 860: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_860 ); break; - case 861: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_861 ); break; - case 863: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_863 ); break; - case 865: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_865 ); break; + case 437: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_437 ); break; + case 850: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_850 ); break; + case 860: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_860 ); break; + case 861: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_861 ); break; + case 863: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_863 ); break; + case 865: aNewOpts.SetCharSet( RTL_TEXTENCODING_IBM_865 ); break; } break; @@ -102,7 +102,7 @@ ULONG SwASCWriter::WriteStream() { sal_Char cLineEnd[ 3 ]; sal_Char* pCEnd = cLineEnd; - if( bASCII_ParaAsCR ) // falls vorgegeben ist. + if( bASCII_ParaAsCR ) // falls vorgegeben ist. *pCEnd++ = '\015'; else if( bASCII_ParaAsBlanc ) *pCEnd++ = ' '; @@ -110,8 +110,8 @@ ULONG SwASCWriter::WriteStream() switch( GetAsciiOptions().GetParaFlags() ) { case LINEEND_CR: *pCEnd++ = '\015'; break; - case LINEEND_LF: *pCEnd++ = '\012'; break; - case LINEEND_CRLF: *pCEnd++ = '\015', *pCEnd++ = '\012'; break; + case LINEEND_LF: *pCEnd++ = '\012'; break; + case LINEEND_CRLF: *pCEnd++ = '\015', *pCEnd++ = '\012'; break; } *pCEnd = 0; @@ -166,7 +166,7 @@ ULONG SwASCWriter::WriteStream() pCurPam = NewSwPaM( *pDoc, pIdx->GetIndex(), pIdx->GetNode().EndOfSectionIndex() ); pCurPam->Exchange(); - continue; // while-Schleife neu aufsetzen !! + continue; // while-Schleife neu aufsetzen !! } } else @@ -194,7 +194,7 @@ ULONG SwASCWriter::WriteStream() } Out( aASCNodeFnTab, *pNd, *this ); } - bTstFly = FALSE; // eimal Testen reicht + bTstFly = FALSE; // eimal Testen reicht } if( !pCurPam->Move( fnMoveForward, fnGoNode ) ) @@ -205,7 +205,7 @@ ULONG SwASCWriter::WriteStream() pDoc->GetDocShell() ); // Wie weit ? } - } while( CopyNextPam( &pPam ) ); // bis alle Pam bearbeitet + } while( CopyNextPam( &pPam ) ); // bis alle Pam bearbeitet Strm().SetStreamCharSet( eOld ); diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx index e260f9546c81..3942fa7cd6c0 100644 --- a/sw/source/filter/ascii/wrtasc.hxx +++ b/sw/source/filter/ascii/wrtasc.hxx @@ -2,7 +2,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 @@ -50,6 +50,6 @@ public: }; -#endif // _WRTASC_HXX +#endif // _WRTASC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/basflt/docfact.cxx b/sw/source/filter/basflt/docfact.cxx index 3d1543c413ec..7c511fbb92f8 100644 --- a/sw/source/filter/basflt/docfact.cxx +++ b/sw/source/filter/basflt/docfact.cxx @@ -2,7 +2,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,10 +37,10 @@ /****************************************************************************** - * Methode : SwDocFac::SwDocFac( SwDoc *pDoc ) - * Beschreibung: - * Erstellt : OK 01-24-94 11:32am - * Aenderung : OK 01-24-94 11:32am + * Methode : SwDocFac::SwDocFac( SwDoc *pDoc ) + * Beschreibung: + * Erstellt : OK 01-24-94 11:32am + * Aenderung : OK 01-24-94 11:32am ******************************************************************************/ @@ -52,10 +52,10 @@ SwDocFac::SwDocFac( SwDoc *pDc ) } /****************************************************************************** - * Methode : SwDocFac::~SwDocFac() - * Beschreibung: - * Erstellt : OK 01-24-94 11:33am - * Aenderung : OK 01-24-94 11:33am + * Methode : SwDocFac::~SwDocFac() + * Beschreibung: + * Erstellt : OK 01-24-94 11:33am + * Aenderung : OK 01-24-94 11:33am ******************************************************************************/ @@ -66,10 +66,10 @@ SwDocFac::~SwDocFac() } /****************************************************************************** - * Methode : SwDoc *SwDocFac::GetDoc() - * Beschreibung: Diese Methode legt immer einen Drucker an. - * Erstellt : OK 01-24-94 11:34am - * Aenderung : OK 01-24-94 11:34am + * Methode : SwDoc *SwDocFac::GetDoc() + * Beschreibung: Diese Methode legt immer einen Drucker an. + * Erstellt : OK 01-24-94 11:34am + * Aenderung : OK 01-24-94 11:34am ******************************************************************************/ diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 2e1b53fea8bc..9676bd3fc993 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -31,7 +31,7 @@ #define _SVSTDARR_STRINGS #include <string.h> -#include <stdio.h> // sscanf +#include <stdio.h> // sscanf #include <hintids.hxx> #include <i18npool/lang.h> #include <i18npool/mslangid.hxx> @@ -301,7 +301,7 @@ USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium, else nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll ); - pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !! + pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !! } else { @@ -389,7 +389,7 @@ BOOL SwReader::CheckPasswd( const String& /*rPasswd*/, const Reader& /*rOptions* </FilterFlags> */ -#define FILTER_OPTION_ROOT String::CreateFromAscii( \ +#define FILTER_OPTION_ROOT String::CreateFromAscii( \ RTL_CONSTASCII_STRINGPARAM( "Office.Writer/FilterFlags" ) ) SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames, @@ -888,10 +888,10 @@ String NameFromCharSet(rtl_TextEncoding nChrSet) // for the automatic conversion (mail/news/...) // The user data contains the options for the ascii import/export filter. // The format is: -// 1. CharSet - as ascii chars -// 2. LineEnd - as CR/LR/CRLF -// 3. Fontname -// 4. Language +// 1. CharSet - as ascii chars +// 2. LineEnd - as CR/LR/CRLF +// 3. Fontname +// 4. Language // the delimetercharacter is "," // @@ -905,10 +905,10 @@ void SwAsciiOptions::ReadUserData( const String& rStr ) { switch( nCnt ) { - case 0: // CharSet + case 0: // CharSet eCharSet = CharSetFromName(sToken); break; - case 1: // LineEnd + case 1: // LineEnd if( sToken.EqualsIgnoreCaseAscii( "CRLF" )) eCRLF_Flag = LINEEND_CRLF; else if( sToken.EqualsIgnoreCaseAscii( "LF" )) @@ -916,10 +916,10 @@ void SwAsciiOptions::ReadUserData( const String& rStr ) else eCRLF_Flag = LINEEND_CR; break; - case 2: // fontname + case 2: // fontname sFont = sToken; break; - case 3: // Language + case 3: // Language nLanguage = MsLangId::convertIsoStringToLanguage( sToken ); break; } diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index ca128c7c38c1..8dd56acc256e 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -2,7 +2,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/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 09647719165a..5543e56c7e4d 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -2,7 +2,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 @@ -49,8 +49,8 @@ #include <doc.hxx> #include <pam.hxx> #include <editsh.hxx> -#include <undobj.hxx> // fuer Undo Insert-Dokument -#include <swundo.hxx> // fuer Undo Insert-Dokument +#include <undobj.hxx> // fuer Undo Insert-Dokument +#include <swundo.hxx> // fuer Undo Insert-Dokument #include <swtable.hxx> #include <tblsel.hxx> #include <pagedesc.hxx> @@ -196,7 +196,7 @@ ULONG SwReader::Read( const Reader& rOptions ) pDoc->SetRedlineMode_intern( nsRedlineMode_t::REDLINE_IGNORE ); - if( !IsError( nError )) // dann setzen wir das Ende mal richtig + if( !IsError( nError )) // dann setzen wir das Ende mal richtig { aEndPos--; pCNd = aEndPos.GetNode().GetCntntNode(); @@ -341,8 +341,8 @@ ULONG SwReader::Read( const Reader& rOptions ) /* * !!! man muss selbst den Status vom Stream zuruecksetzen. !!! - * Beim seekg wird der akt. Status, eof- und bad-Bit - * gesetzt, warum weiss keiner + * Beim seekg wird der akt. Status, eof- und bad-Bit + * gesetzt, warum weiss keiner */ if( pStrm ) { @@ -375,7 +375,7 @@ ULONG SwReader::Read( const Reader& rOptions ) // Wenn der Pam nur fuers Lesen konstruiert wurde, jetzt zerstoeren. if( !pCrsr ) { - delete pPam; // ein neues aufgemacht. + delete pPam; // ein neues aufgemacht. // --> FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and // SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): @@ -393,7 +393,7 @@ ULONG SwReader::Read( const Reader& rOptions ) pDoc->SetRedlineMode_intern( eOld ); pDoc->SetOle2Link( aOLELink ); - if( pCrsr ) // das Doc ist jetzt modifiziert + if( pCrsr ) // das Doc ist jetzt modifiziert pDoc->SetModified(); // --> OD 2005-02-11 #i38810# - If links have been updated, the document // have to be modified. During update of links the OLE link at the document @@ -546,7 +546,7 @@ SwDoc* Reader::GetTemplateDoc() { pTemplate = pDocSh->GetDoc(); pTemplate->SetOle2Link( Link() ); - pTemplate->DoUndo( FALSE ); // always FALSE + pTemplate->DoUndo( FALSE ); // always FALSE pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); pTemplate->RemoveAllFmtLanguageDependencies(); @@ -612,7 +612,7 @@ void Reader::MakeHTMLDummyTemplateDoc() pTemplate->set(IDocumentSettingAccess::BROWSE_MODE, bTmplBrowseMode ); pTemplate->getPrinter( true ); pTemplate->RemoveAllFmtLanguageDependencies(); - aChkDateTime = Date( 1, 1, 2300 ); // 2300. Jahrtausend sollte reichen + aChkDateTime = Date( 1, 1, 2300 ); // 2300. Jahrtausend sollte reichen aTemplateNm.AssignAscii( "$$Dummy$$" ); } @@ -968,7 +968,7 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName ) } else { - delete pPam; // loesche den hier erzeugten Pam + delete pPam; // loesche den hier erzeugten Pam // Alles erfolgreich geschrieben? Sag' das dem Dokument! if ( !IsError( nError ) && !pDoc ) { diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index 6caa08440fbe..238524a6bb66 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -2,7 +2,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 e5392e0668f8..8c819ccdf8cf 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2,7 +2,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 @@ -123,18 +123,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 ) OSL_ENSURE( 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, { OSL_ENSURE( 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 ); @@ -3725,37 +3725,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, @@ -3777,26 +3777,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 @@ -3809,41 +3809,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: @@ -3852,26 +3852,26 @@ 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 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx index 7031a5ac5985..31b44b8a50ef 100644 --- a/sw/source/filter/html/css1kywd.cxx +++ b/sw/source/filter/html/css1kywd.cxx @@ -2,7 +2,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 19d1d7771ab7..3134422f3779 100644 --- a/sw/source/filter/html/css1kywd.hxx +++ b/sw/source/filter/html/css1kywd.hxx @@ -2,7 +2,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 e9e5c464e54b..0197bb89428b 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2,7 +2,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 @@ -125,9 +125,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 @@ -135,10 +135,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 ); @@ -199,7 +199,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. @@ -278,13 +278,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 ), @@ -307,16 +307,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; @@ -371,7 +371,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 ) { @@ -586,15 +586,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(); @@ -663,8 +663,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 @@ -686,7 +686,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, rHWrt.bNoAlign = TRUE; break; - case 'P': if( rInfo.aToken.Len() == 1 ) + case 'P': if( rInfo.aToken.Len() == 1 ) { bPara = TRUE; } @@ -775,7 +775,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; @@ -795,7 +795,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 @@ -1013,9 +1013,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) || @@ -1233,34 +1233,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 @@ -1530,9 +1530,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; @@ -2098,7 +2098,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( xub_StrLen nPos , } void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, xub_StrLen nPos, - HTMLOutContext *pContext ) + HTMLOutContext *pContext ) { rHWrt.bTagOn = TRUE; @@ -2183,7 +2183,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 || @@ -2487,7 +2487,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() ) @@ -2540,7 +2540,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 ); @@ -2560,8 +2560,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() ); @@ -2597,7 +2597,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() ); @@ -2766,7 +2766,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; @@ -2795,8 +2795,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 ) { @@ -3178,7 +3178,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; @@ -3346,37 +3346,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, @@ -3398,26 +3398,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 @@ -3429,41 +3429,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: @@ -3471,27 +3471,27 @@ 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 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index c64bcb63ea44..b30d9ddf5f78 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -2,7 +2,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 @@ -65,11 +65,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 } }; @@ -104,8 +104,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 @@ -287,7 +287,7 @@ void SwHTMLWriter::OutBasic() BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager(); OSL_ENSURE( 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; @@ -329,7 +329,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, @@ -342,7 +342,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 7794bd8418a6..f4c8f5e1aca6 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2,7 +2,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 @@ -175,9 +175,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: ; } @@ -1190,24 +1190,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) @@ -1323,7 +1323,7 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( USHORT nTxtColl, } String sName; - if( USER_FMT & nTxtColl ) // eine vom Reader angelegte + if( USER_FMT & nTxtColl ) // eine vom Reader angelegte { OSL_ENSURE( !this, "Wo kommt die Benutzer-Vorlage her?" ); pColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD ); @@ -1489,12 +1489,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 @@ -1503,9 +1503,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 ); @@ -1519,8 +1519,8 @@ void SwCSS1Parser::AddClassName( String& rFmtName, const String& rClass ) OSL_ENSURE( rClass.Len(), "Style-Klasse ohne Laenge?" ); // ?????????? -// String aTmp( rClass ); -// GetpApp()->GetAppInternational().ToLower( aTmp ); +// String aTmp( rClass ); +// GetpApp()->GetAppInternational().ToLower( aTmp ); (rFmtName += '.') += rClass; } @@ -1919,13 +1919,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() ); +// } } @@ -1951,27 +1951,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 049ba78cce4d..85ffe829af0e 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -2,7 +2,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,23 +56,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 3e47fe1b4aa6..b10945464f32 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -2,7 +2,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,27 +71,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 } }; /* */ @@ -181,7 +181,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(); @@ -238,23 +238,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: { @@ -406,10 +406,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 ) ); @@ -555,7 +555,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 @@ -648,23 +648,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 ) @@ -718,9 +718,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: ; } @@ -733,8 +733,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 511fcbb27c43..a97ee39c0d9a 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -2,7 +2,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 @@ -58,71 +58,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 }, @@ -133,75 +133,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 } }; /* */ @@ -364,7 +364,7 @@ void SwHTMLParser::NewField() if( aValue.Len() ) nSub |= FIXEDFLD; - SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); + SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); if( pFmtOption ) { const String& rFmt = pFmtOption->GetString(); @@ -396,7 +396,7 @@ void SwHTMLParser::NewField() { USHORT nSub = 0; - SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); + SvNumberFormatter *pFormatter = pDoc->GetNumberFormatter(); sal_uInt32 nNumFmt; LanguageType eLang; double dValue = GetTableDataOptionsValNum( @@ -405,7 +405,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 812e895ca287..6b4f80c280b4 100644 --- a/sw/source/filter/html/htmlfld.hxx +++ b/sw/source/filter/html/htmlfld.hxx @@ -2,7 +2,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 e86060f85d59..50dd594c50f2 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -2,7 +2,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,16 +54,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: ; } @@ -81,14 +81,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 ) @@ -97,21 +97,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: ; } @@ -123,8 +123,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; } OSL_ENSURE( pFmtStr, "ubekanntes Format fuer SwAuthorField" ); bFixed = ((const SwAuthorField*)pFld)->IsFixed(); @@ -146,9 +146,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; } OSL_ENSURE( pSubStr, "ubekannter Subtyp fuer SwPageNumberField" ); pFmtStr = SwHTMLWriter::GetNumFormat( static_cast< sal_uInt16 >(nFmt) ); @@ -179,14 +179,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 ) { @@ -237,14 +237,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) ); } @@ -254,10 +254,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: ; } @@ -370,9 +370,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 ec4812a522cb..25db83fde906 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -2,7 +2,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 @@ -78,25 +78,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 | @@ -108,22 +108,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 | @@ -131,7 +131,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 | @@ -147,30 +147,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 } }; @@ -379,7 +379,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 @@ -412,7 +412,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 } @@ -487,17 +487,17 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt, switch( nOutMode ) { - case HTML_OUT_TBLNODE: // OK + case HTML_OUT_TBLNODE: // OK OSL_ENSURE( !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: @@ -505,14 +505,14 @@ void SwHTMLWriter::OutFrmFmt( BYTE nMode, const SwFrmFmt& rFrmFmt, OSL_ENSURE( !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 OSL_ENSURE( !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 ); @@ -912,7 +912,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, rBox.CalcLineSpace(BOX_LINE_RIGHT) ); OSL_ENSURE( 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 ) @@ -1221,7 +1221,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)); @@ -1369,7 +1369,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; @@ -1422,7 +1422,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(); @@ -1439,9 +1439,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 ); @@ -1508,7 +1508,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(); @@ -1530,7 +1530,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 ); @@ -1614,7 +1614,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; @@ -1641,7 +1641,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; @@ -1684,7 +1684,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 @@ -1738,7 +1738,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 0eb14de5d311..fb2d1ae1320d 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -2,7 +2,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 @@ -59,30 +59,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; @@ -96,12 +96,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: @@ -116,7 +116,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 454faca19a88..7547d44d1e98 100644 --- a/sw/source/filter/html/htmlflyt.cxx +++ b/sw/source/filter/html/htmlflyt.cxx @@ -2,7 +2,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 @@ -38,95 +38,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 } }; @@ -134,96 +134,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 } }; @@ -231,95 +231,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 } }; @@ -327,95 +327,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 } }; @@ -423,95 +423,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 1225495391b5..fd63a1e09de5 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2,7 +2,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 @@ -98,29 +98,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[] = @@ -188,28 +188,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: @@ -380,11 +380,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(); @@ -557,7 +557,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 ); @@ -660,10 +660,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: @@ -729,7 +729,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 ); @@ -1169,7 +1169,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(); @@ -1591,7 +1591,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; @@ -1605,14 +1605,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; @@ -1748,8 +1748,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 ) @@ -2439,7 +2439,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 90088dffa029..d1c510ac7225 100644 --- a/sw/source/filter/html/htmlform.hxx +++ b/sw/source/filter/html/htmlform.hxx @@ -2,7 +2,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 @@ -32,10 +32,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 0fa6692ee52b..bf3c44628baa 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -2,7 +2,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 @@ -100,7 +100,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 342b63d3674c..916c2f06b714 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -2,7 +2,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,7 +56,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; }; @@ -385,7 +385,7 @@ void SwHTMLWriter::OutFootEndNotes() Strm() << "\">"; bLFPossible = TRUE; - IncIndentLevel(); // Inhalt von <DIV> einruecken + IncIndentLevel(); // Inhalt von <DIV> einruecken OSL_ENSURE( pTxtFtn, "SwHTMLWriter::OutFootEndNotes: SwTxtFtn fehlt" ); SwNodeIndex *pSttNdIdx = pTxtFtn->GetStartNode(); @@ -398,7 +398,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 ); @@ -504,7 +504,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(); @@ -519,17 +519,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; } @@ -597,12 +597,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 5883fcbc13b2..dfde354e9bb9 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -2,7 +2,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 @@ 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 } }; @@ -102,7 +102,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 ) @@ -159,7 +159,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; @@ -517,7 +517,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() ); } @@ -560,7 +560,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: @@ -575,7 +575,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: @@ -588,8 +588,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; @@ -679,7 +679,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 @@ -895,9 +895,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 08e0e7e7c6c3..0d167f7bba3a 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -2,7 +2,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,18 +57,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 } }; /* */ @@ -161,7 +161,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; } @@ -213,7 +213,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; @@ -422,7 +422,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. @@ -491,7 +491,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 } @@ -537,7 +537,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 ) @@ -568,7 +568,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 ); @@ -672,7 +672,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; } @@ -905,10 +905,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 d747b79746f7..a3665415ef49 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -2,7 +2,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,19 +31,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 9def84968f67..ef95684e4a56 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -2,7 +2,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,49 +83,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; @@ -405,7 +405,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; } @@ -1381,7 +1381,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 97c55d1a1aab..c688c7949da0 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -2,7 +2,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 @@ -153,7 +153,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; @@ -360,7 +360,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 ) { @@ -416,7 +416,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; } @@ -425,7 +425,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 = @@ -755,7 +755,7 @@ void SwHTMLParser::NewMultiCol() // to the section's first node. if( pOldTxtNd ) MovePageDescAttrs( pOldTxtNd, pPam->GetPoint()->nNode.GetIndex(), - sal_True ); + sal_True ); if( pPostIts ) { @@ -824,14 +824,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() ) @@ -852,7 +852,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 b0e3bfa79e4c..ee4cd64e6678 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2,7 +2,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 @@ 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 } }; @@ -127,22 +127,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 ) : @@ -185,11 +185,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; @@ -202,7 +202,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; } @@ -231,18 +231,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; @@ -250,9 +250,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, @@ -301,23 +301,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(); @@ -362,7 +362,7 @@ class HTMLTableColumn { sal_Bool bIsEndOfGroup; - sal_uInt16 nWidth; // Optionen von <COL> + sal_uInt16 nWidth; // Optionen von <COL> sal_Bool bRelWidth; SvxAdjust eAdjust; @@ -375,7 +375,7 @@ class HTMLTableColumn public: - sal_Bool bLeftBorder; // kommt vor der Spalte eine Linie + sal_Bool bLeftBorder; // kommt vor der Spalte eine Linie HTMLTableColumn(); @@ -418,87 +418,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 ); @@ -572,7 +572,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, @@ -714,7 +714,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; } @@ -1087,7 +1087,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 ); @@ -1413,9 +1413,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; @@ -1469,7 +1469,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 ); @@ -2018,7 +2018,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; @@ -2026,7 +2026,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 = @@ -2166,8 +2166,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, @@ -2279,14 +2279,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 ) @@ -2373,7 +2373,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 ) { @@ -2475,7 +2475,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 % @@ -3006,12 +3006,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 @@ -3182,8 +3182,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; @@ -3191,7 +3191,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; @@ -3201,8 +3201,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: @@ -3279,15 +3279,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 @@ -3587,13 +3587,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 }; @@ -3651,14 +3651,14 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions, // oder es gibt bereits Inhalt an der entsprechenden Stelle. OSL_ENSURE( !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 ) @@ -3837,8 +3837,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 @@ -3876,14 +3876,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() ) @@ -3964,7 +3964,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 ) @@ -4369,7 +4369,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 ) @@ -4396,10 +4396,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: @@ -4441,10 +4441,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 ); @@ -4548,7 +4548,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 ) @@ -4575,10 +4575,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: @@ -4604,7 +4604,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; @@ -4612,10 +4612,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 @@ -4677,7 +4677,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, @@ -4746,7 +4746,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 ) @@ -4773,10 +4773,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: @@ -4834,7 +4834,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; @@ -4877,7 +4877,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 ) @@ -4982,7 +4982,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; @@ -5033,7 +5033,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) pPendStack = pTmp; OSL_ENSURE( !pTmp, "weiter kann es nicht gehen!" ); - nNxtToken = 0; // neu lesen + nNxtToken = 0; // neu lesen } if( IsParserWorking() ) @@ -5192,7 +5192,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(); @@ -5344,7 +5344,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 ) @@ -5373,10 +5373,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; @@ -5409,10 +5409,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 1ed154ffea00..c520e6a5be80 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -2,7 +2,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 @@ -282,7 +282,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(); @@ -320,7 +320,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 ); @@ -463,7 +463,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 ) { @@ -494,7 +494,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(); @@ -531,7 +531,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 ) { @@ -561,7 +561,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 ); } @@ -569,7 +569,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; @@ -629,7 +629,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; @@ -722,16 +722,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; @@ -806,7 +806,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 ); } @@ -1166,7 +1166,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 @@ -1176,7 +1176,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; } @@ -1215,8 +1215,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 99343566048a..2e67a7a12676 100644 --- a/sw/source/filter/html/htmlvsh.hxx +++ b/sw/source/filter/html/htmlvsh.hxx @@ -2,7 +2,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 ab9f16c36cc7..4195cc1493c1 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -2,7 +2,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,10 +55,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 @@ -662,8 +662,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() ); @@ -729,7 +729,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 @@ -756,7 +756,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 @@ -1027,7 +1027,7 @@ CSS1Selector *CSS1Parser::ParseSelector() // term // : unary_operator? // [ NUMBER | STRING | PERCENTAGE | LENGTH | EMS | EXS | IDENT | -// HEXCOLOR | URL | RGB ] +// HEXCOLOR | URL | RGB ] // // operator // : '/' | ',' | /* empty */ @@ -1100,7 +1100,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; @@ -1359,7 +1359,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 570f96b7e969..3a6fa46e698e 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -2,7 +2,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 @@ -45,8 +45,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, @@ -111,9 +111,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: @@ -144,11 +144,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: @@ -202,31 +202,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 ); @@ -244,8 +244,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(); @@ -284,8 +284,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 d588171c8720..cf5e71b813ef 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -2,7 +2,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 @@ -78,161 +78,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, CSS1_BS_DOTTED, CSS1_BS_DASHED }; static CSS1PropertyEnum __READONLY_DATA aBorderStyleTable[] = { - { sCSS1_PV_none, CSS1_BS_NONE }, - { sCSS1_PV_dotted, CSS1_BS_DOTTED }, - { sCSS1_PV_dashed, CSS1_BS_DASHED }, - { 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_DOTTED }, + { sCSS1_PV_dashed, CSS1_BS_DASHED }, + { 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 @@ -566,10 +566,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 ) @@ -718,7 +718,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; } @@ -745,7 +745,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 ); @@ -774,7 +774,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! } /* */ @@ -857,7 +857,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 ); @@ -884,7 +884,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; @@ -949,7 +949,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!" ); @@ -967,14 +967,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; @@ -1242,7 +1242,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(), @@ -1402,7 +1402,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 ) ) @@ -1573,7 +1573,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(); @@ -1659,7 +1659,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; @@ -1730,7 +1730,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 ); @@ -2382,15 +2382,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; } @@ -2520,10 +2520,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; } } @@ -2602,8 +2602,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; @@ -2697,8 +2697,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() ) { @@ -2938,7 +2938,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; @@ -3146,7 +3146,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 ) @@ -3175,14 +3175,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 9ab53c43ed3c..d2ebe3eafd00 100644 --- a/sw/source/filter/html/svxcss1.hxx +++ b/sw/source/filter/html/svxcss1.hxx @@ -2,7 +2,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 @@ -47,58 +47,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 }; @@ -121,7 +121,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; @@ -212,7 +212,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; } @@ -227,7 +227,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; @@ -236,24 +236,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 3551d8357cd8..e12c0ecb1fa9 100644 --- a/sw/source/filter/html/swcss1.hxx +++ b/sw/source/filter/html/swcss1.hxx @@ -2,7 +2,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 @@ -84,7 +84,7 @@ protected: SvxCSS1PropertyInfo& rPropInfo ); using CSS1Parser::ParseStyleSheet; - + public: SwCSS1Parser( SwDoc *pDoc, sal_uInt32 aFHeight[7], const String& rBaseURL, BOOL bNewDoc ); virtual ~SwCSS1Parser(); @@ -104,7 +104,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; @@ -133,7 +133,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, @@ -147,7 +147,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; } @@ -171,14 +171,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 c5c116812a6e..0fd023a202a2 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2,7 +2,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 @@ -94,9 +94,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> @@ -113,9 +113,9 @@ #include <statstr.hrc> // ResId fuer Statusleiste #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 @@ -135,22 +135,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 ) @@ -387,7 +387,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. @@ -416,7 +416,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; @@ -529,7 +529,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(); @@ -823,8 +823,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 ) && @@ -933,7 +933,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; } @@ -1262,7 +1262,7 @@ 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: @@ -1707,7 +1707,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()). @@ -1918,7 +1918,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(); @@ -2327,11 +2327,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 ) { @@ -2821,7 +2821,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, pCNd->SetAttr( *pAttr->pItem ); break; } - OSL_ENSURE( !this, + OSL_ENSURE( !this, "LRSpace ueber mehrere Absaetze gesetzt!" ); // kein break (hier sollen wir trotzdem nie hinkommen; default: @@ -3221,7 +3221,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(); @@ -3599,8 +3599,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(); @@ -3693,8 +3693,8 @@ void SwHTMLParser::NewFontAttr( int nToken ) OSL_ENSURE( !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() ) @@ -3928,7 +3928,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; } @@ -3983,13 +3983,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 @@ -4056,7 +4056,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; } @@ -4112,7 +4112,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: @@ -4187,7 +4187,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; } @@ -4320,7 +4320,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; } @@ -4403,7 +4403,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; } @@ -4417,11 +4417,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(); @@ -4497,16 +4497,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++ ) @@ -4890,7 +4890,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(); @@ -4914,7 +4914,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; @@ -5038,9 +5038,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(); @@ -5156,7 +5156,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 f6f7eac37b64..24595edd27d9 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -2,7 +2,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 @@ -100,13 +100,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 ); @@ -135,8 +135,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; } @@ -161,13 +161,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, @@ -177,10 +177,10 @@ struct _HTMLAttrTable *pOrphans, *pDirection, - *pCharFmts, // Text-Attribute + *pCharFmts, // Text-Attribute *pINetFmt, - *pBold, // Zeichen-Attribute + *pBold, // Zeichen-Attribute *pBoldCJK, *pBoldCTL, *pItalic, @@ -198,8 +198,8 @@ struct _HTMLAttrTable *pFontColor, *pEscapement, *pCaseMap, - *pKerning, // (nur fuer SPACER) - *pCharBrush, // Zeichen-Hintergrund + *pKerning, // (nur fuer SPACER) + *pCharBrush, // Zeichen-Hintergrund *pLanguage, *pLanguageCJK, *pLanguageCTL @@ -209,44 +209,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(); @@ -360,21 +360,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 { @@ -382,115 +382,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; #if OSL_DEBUG_LEVEL > 1 - 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; @@ -561,7 +561,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 ); @@ -669,9 +669,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 @@ -734,18 +734,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; } @@ -851,7 +851,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 ); @@ -910,7 +910,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 8efc9c191701..60e51075f9b7 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -2,7 +2,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,10 +71,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> @@ -87,7 +87,7 @@ #include <htmlfly.hxx> #include <swmodule.hxx> -#include <statstr.hrc> // ResId fuer Statusleiste +#include <statstr.hrc> // ResId fuer Statusleiste #include <swerror.h> #define MAX_INDENT_LEVEL 20 @@ -157,7 +157,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 ) @@ -194,8 +194,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 @@ -318,7 +318,7 @@ ULONG SwHTMLWriter::WriteStream() (((((((sOut += OOO_STRING_SVTOOLS_HTML_division) += ' ') += OOO_STRING_SVTOOLS_HTML_O_id) += "=\"") += aName) += '\"') - += '>') += aStartTags; + += '>') += aStartTags; aStartTags = sOut; } @@ -736,7 +736,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; @@ -779,7 +779,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 ) @@ -800,9 +800,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 } @@ -929,12 +929,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()); @@ -986,7 +986,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!!! @@ -996,10 +996,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 ); @@ -1039,7 +1039,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() << '>'; @@ -1085,7 +1085,7 @@ void SwHTMLWriter::OutBookmarks() sal_uInt16 nPos; for( nPos = 0; nPos < aOutlineMarkPoss.Count() && aOutlineMarkPoss[nPos] < nNode; nPos++ ) - ; + ; while( nPos < aOutlineMarkPoss.Count() && aOutlineMarkPoss[nPos] == nNode ) { @@ -1108,7 +1108,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 ); } @@ -1134,7 +1134,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 } } } @@ -1177,7 +1177,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, @@ -1345,7 +1345,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() ), @@ -1399,7 +1399,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 9efc9015b36f..f561b2e19b78 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -2,7 +2,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 @@ -72,61 +72,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 @@ -139,55 +139,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; @@ -204,7 +204,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; @@ -220,126 +220,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 ); @@ -462,7 +462,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, @@ -534,8 +534,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; @@ -546,7 +546,7 @@ struct HTMLSaveData HTMLSaveData( SwHTMLWriter&, ULONG nStt, ULONG nEnd, sal_Bool bSaveNum=sal_True, - const SwFrmFmt *pFrmFmt=0 ); + const SwFrmFmt *pFrmFmt=0 ); ~HTMLSaveData(); }; @@ -601,6 +601,6 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt, Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt ); -#endif // _WRTHTML_HXX +#endif // _WRTHTML_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/inc/fltbase.hxx b/sw/source/filter/inc/fltbase.hxx index 6665ebd7a449..b7b8957f9f72 100644 --- a/sw/source/filter/inc/fltbase.hxx +++ b/sw/source/filter/inc/fltbase.hxx @@ -2,7 +2,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 @@ -34,15 +34,15 @@ class SwFilterBase { protected: - SvStream *pIn; - sal_Char *pReadBuff; // Groessenangabe - INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records + SvStream *pIn; + sal_Char *pReadBuff; // Groessenangabe + INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records - CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz) -// CharSet eZielChar; // Ziel-Zeichensatz + CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz) +// CharSet eZielChar; // Ziel-Zeichensatz - USHORT nTab; // z.Zt. bearbeitete Tabelle - USHORT nReadBuffSize;// temporaerer Lesepuffer mit + USHORT nTab; // z.Zt. bearbeitete Tabelle + USHORT nReadBuffSize;// temporaerer Lesepuffer mit // ---------------------------------------------------------- inline void ReadChar( char &rC ); @@ -54,7 +54,7 @@ protected: inline void Read( USHORT &rN1, USHORT &rN2 ); inline void Read( USHORT &rN1, USHORT &rN2, USHORT &rN3, USHORT &rN4 ); inline void Read( double &rF ); - void Read( String &rS ); // liest 0-terminierten C-String! + void Read( String &rS ); // liest 0-terminierten C-String! inline void ClearBytesLeft( void ); }; diff --git a/sw/source/filter/inc/fltglbls.hxx b/sw/source/filter/inc/fltglbls.hxx index 97fd88e6f7a9..16a313a169bb 100644 --- a/sw/source/filter/inc/fltglbls.hxx +++ b/sw/source/filter/inc/fltglbls.hxx @@ -2,7 +2,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,43 +54,43 @@ extern LotGlob *pLotGlob; class FilterGlobals { protected: - SvPtrarr aTblFmts; - USHORT nColStart; - USHORT nColEnd; - USHORT nRowStart; - USHORT nRowEnd; - USHORT nAnzCols; - USHORT nAnzRows; + SvPtrarr aTblFmts; + USHORT nColStart; + USHORT nColEnd; + USHORT nRowStart; + USHORT nRowEnd; + USHORT nAnzCols; + USHORT nAnzRows; public: FilterGlobals( SwDoc& rDoc, const SwPaM& rPam ); ~FilterGlobals(); - SwDoc *pD; - SwPaM *pPam; - const SwTable *pTable; + SwDoc *pD; + SwPaM *pPam; + const SwTable *pTable; SvNumberFormatter *pNumFormatter; - LanguageType eDefLanguage; - ULONG nStandard; - ULONG nDefFormat; // = 0xFFFFFFFF + LanguageType eDefLanguage; + ULONG nStandard; + ULONG nDefFormat; // = 0xFFFFFFFF void SetRange( USHORT nCS, USHORT nCE, USHORT nRS, USHORT nRE ); BOOL IsInColRange( USHORT nCol ) - { return ( nCol >= nColStart && nCol <= nColEnd ); } + { return ( nCol >= nColStart && nCol <= nColEnd ); } BOOL IsInRowRange( USHORT nRow ) - { return ( nRow >= nRowStart && nRow <= nRowEnd ); } + { return ( nRow >= nRowStart && nRow <= nRowEnd ); } BOOL IsInRange( USHORT nCol, USHORT nRow ) - { return IsInRowRange(nRow) && IsInColRange(nCol); } + { return IsInRowRange(nRow) && IsInColRange(nCol); } - void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; } - void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; } + void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; } + void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; } void Normalize( USHORT &rCol, USHORT &rRow ) - { NormalizeCol( rCol ); NormalizeRow( rRow ); } + { NormalizeCol( rCol ); NormalizeRow( rRow ); } - USHORT AnzCols() const { return nAnzCols; } - USHORT AnzRows() const { return nAnzRows; } + USHORT AnzCols() const { return nAnzCols; } + USHORT AnzRows() const { return nAnzRows; } BOOL ColRangeLimitter( USHORT &rCS, USHORT &rCE ); @@ -98,8 +98,8 @@ public: void CreateTable(); void InsertAttr( const SfxPoolItem& rItem ); - inline void ColLimitter( USHORT &rCol ); - inline void RowLimitter( USHORT &rRow ); + inline void ColLimitter( USHORT &rCol ); + inline void RowLimitter( USHORT &rRow ); }; diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 8f69b3761b26..e1a0e560ff73 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -2,7 +2,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 @@ -81,7 +81,7 @@ void GetWW8Writer( const String&, const String&, WriterRef& ); // Absatz-Einzug abgezogen werden muss. class SW_DLLPUBLIC SwRelNumRuleSpaces { - SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules + SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules BOOL bNewDoc; void SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule ); @@ -95,7 +95,7 @@ public: const SwNodeIndex& rEnd ); }; -#define SW_SV_BRUSH_25 0 +#define SW_SV_BRUSH_25 0 #define SW_SV_BRUSH_50 1 #define SW_SV_BRUSH_75 2 #define SW_SV_BRUSH_NULL 3 diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index ff6b588bd92d..7851d15f55e8 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -2,7 +2,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 @@ -69,11 +69,11 @@ public: SwNodeIndex nMkNode; SwNodeIndex nPtNode; SfxPoolItem * pAttr;// Format Attribute - long nHandle; // fuer verschachtelte Attrs, z.B. Bookmarks + long nHandle; // fuer verschachtelte Attrs, z.B. Bookmarks xub_StrLen nMkCntnt;// Nachbildung von Mark() xub_StrLen nPtCntnt;// Nachbildung von GetPoint() - BOOL bOld; // to mark Attributes *before* skipping field results + BOOL bOld; // to mark Attributes *before* skipping field results BOOL bLocked; BOOL bCopied; BOOL bConsumedByField; @@ -84,7 +84,7 @@ public: void SetStartPos(const SwPosition & rStartPos); SW_DLLPUBLIC void SetEndPos( const SwPosition & rEndPos); - SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck ); + SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck ); }; class SW_DLLPUBLIC SwFltControlStack @@ -121,7 +121,7 @@ public: SwFltControlStack(SwDoc* pDo, ULONG nFieldFl); virtual ~SwFltControlStack(); - BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);} + BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);} void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr ); @@ -156,7 +156,7 @@ public: virtual int operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; void SetFrmFmt(SwFrmFmt * _pFrmFmt); - const SwFrmFmt* GetFrmFmt() const; + const SwFrmFmt* GetFrmFmt() const; SwFrmFmt* GetFrmFmt(); }; @@ -174,18 +174,18 @@ public: class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem { public: - DateTime aStamp; - DateTime aStampPrev; - RedlineType_t eType; - RedlineType_t eTypePrev; - USHORT nAutorNo; - USHORT nAutorNoPrev; - - SwFltRedline(RedlineType_t eType_, - USHORT nAutorNo_, + DateTime aStamp; + DateTime aStampPrev; + RedlineType_t eType; + RedlineType_t eTypePrev; + USHORT nAutorNo; + USHORT nAutorNoPrev; + + SwFltRedline(RedlineType_t eType_, + USHORT nAutorNo_, const DateTime& rStamp_, - RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT, - USHORT nAutorNoPrev_ = USHRT_MAX, + RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT, + USHORT nAutorNoPrev_ = USHRT_MAX, const DateTime* pStampPrev_ = 0) : SfxPoolItem(RES_FLTR_REDLINE), aStamp(rStamp_), eType(eType_), eTypePrev(eTypePrev_), nAutorNo(nAutorNo_), nAutorNoPrev(nAutorNoPrev_) @@ -196,12 +196,12 @@ public: SwFltRedline(const SwFltRedline& rCpy): SfxPoolItem(RES_FLTR_REDLINE), - aStamp( rCpy.aStamp ), - aStampPrev( rCpy.aStampPrev ), - eType( rCpy.eType ), - eTypePrev( rCpy.eTypePrev ), - nAutorNo( rCpy.nAutorNo ), - nAutorNoPrev( rCpy.nAutorNoPrev ) + aStamp( rCpy.aStamp ), + aStampPrev( rCpy.aStampPrev ), + eType( rCpy.eType ), + eTypePrev( rCpy.eTypePrev ), + nAutorNo( rCpy.nAutorNo ), + nAutorNoPrev( rCpy.nAutorNoPrev ) {} // "pure virtual Methoden" vom SfxPoolItem virtual int operator==(const SfxPoolItem& rItem) const; @@ -210,11 +210,11 @@ public: class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem { - friend class SwFltShell; // darf aName und aVal uebersetzen + friend class SwFltShell; // darf aName und aVal uebersetzen long nHandle; String aName; String aVal; - BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts + BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts BOOL bRef; BOOL bPgRef; public: @@ -224,14 +224,14 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - const String& GetName() const { return aName; } - const String& GetValSys() const { return aVal; } - BOOL IsOnlyRef() const { return bOnlyRef; } - BOOL IsRef() const { return bRef; } - void SetRef(BOOL b = TRUE) { bRef = b; } - BOOL IsPgRef() const { return bPgRef; } - void SetPgRef(BOOL b = TRUE) { bPgRef = b; } - long GetHandle() const { return nHandle; } + const String& GetName() const { return aName; } + const String& GetValSys() const { return aVal; } + BOOL IsOnlyRef() const { return bOnlyRef; } + BOOL IsRef() const { return bRef; } + void SetRef(BOOL b = TRUE) { bRef = b; } + BOOL IsPgRef() const { return bPgRef; } + void SetPgRef(BOOL b = TRUE) { bPgRef = b; } + long GetHandle() const { return nHandle; } }; class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem @@ -246,8 +246,8 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==(const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const; - SwTOXBase* GetBase() { return pTOXBase; } - USHORT GetCols() const { return nCols; } + SwTOXBase* GetBase() { return pTOXBase; } + USHORT GetCols() const { return nCols; } void SetHadBreakItem( BOOL bVal ) { bHadBreakItem = bVal; } void SetHadPageDescItem( BOOL bVal ) { bHadPageDescItem = bVal; } BOOL HadBreakItem() const { return bHadBreakItem; } @@ -300,7 +300,7 @@ protected: RndStdIds eFlyAnchor; BOOL bFlyAbsPos; - SwDoc& GetDoc() { return rDoc; } + SwDoc& GetDoc() { return rDoc; } SfxItemSet* NewFlyDefaults(); SwFltOutBase(SwDoc& rDocu); virtual ~SwFltOutBase(); @@ -345,7 +345,7 @@ class SwFltOutDoc : public SwFltOutBase SwTwips nTableWidth; USHORT usTableX; USHORT usTableY; - BOOL bReadNoTbl; // Keine Tabellen + BOOL bReadNoTbl; // Keine Tabellen SwTableBox* GetBox(USHORT ny, USHORT nx = USHRT_MAX); BOOL SeekCell( short nRow, short nCol, BOOL bPam ); @@ -358,8 +358,8 @@ public: nTableWidth(0), bReadNoTbl(FALSE) {} - void SetReadNoTable() { bReadNoTbl = TRUE; } - BOOL IsTableWidthSet() const { return 0 != nTableWidth; } + void SetReadNoTable() { bReadNoTbl = TRUE; } + BOOL IsTableWidthSet() const { return 0 != nTableWidth; } virtual SwFltOutBase& operator << (const SfxPoolItem& rItem); @@ -392,7 +392,7 @@ public: class SwFltFormatCollection : public SwFltOutBase { SwTxtFmtColl* pColl; - SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles + SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles BOOL bHasFly; public: SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType); @@ -409,10 +409,10 @@ public: void Derived(SwTxtFmtColl* pBase) { pColl->SetDerivedFrom(pBase); } -// SwTxtFmtColl* Search(String, CharSet eSrc); - SwTxtFmtColl* GetColl() { return pColl; } - void SetHasFly() { bHasFly = TRUE; } - SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; } +// SwTxtFmtColl* Search(String, CharSet eSrc); + SwTxtFmtColl* GetColl() { return pColl; } + void SetHasFly() { bHasFly = TRUE; } + SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; } virtual SwFltOutBase& operator << (const SfxPoolItem& rItem); virtual const SfxPoolItem& GetAttr(USHORT nWhich); @@ -444,7 +444,7 @@ class SwFltShell SwFltFormatCollection* pColls[256]; SwFltOutBase* pOut; -// SwFltFormatCollection* pFormat; // set when in style-mode +// SwFltFormatCollection* pFormat; // set when in style-mode SwPageDesc* pCurrentPageDesc; SwPosition* pSavedPos; // set, when in footnote or header/footer -mode #ifdef None @@ -462,7 +462,7 @@ class SwFltShell } eSubMode; // Fly items: - USHORT nAktStyle; // zur Indizierung pStyleFlyTable + USHORT nAktStyle; // zur Indizierung pStyleFlyTable // SwFltControlStack aStack; SwFltEndStack aEndStack; @@ -480,18 +480,18 @@ public: SwFltShell(SwDoc* , SwPaM& , const String& rBaseURL, BOOL bNew, ULONG = 0); ~SwFltShell(); - SwDoc& GetDoc() { return *aStack.pDoc; } + SwDoc& GetDoc() { return *aStack.pDoc; } - CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet; + CharSet SetCharSet(CharSet eNew) { CharSet eOld = eSrcCharSet; eSrcCharSet = eNew; return eOld; } - void SetUseStdPageDesc() { bStdPD = TRUE; } - void SetProtect() { bProtect = TRUE; } + void SetUseStdPageDesc() { bStdPD = TRUE; } + void SetProtect() { bProtect = TRUE; } SwPageDesc* MakePageDesc(SwPageDesc* pFirstPageDesc = NULL); - SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; } - void NextTab() { (*this) << BYTE(0x09); } - void NextLine() { (*this) << BYTE(0x0a); } + SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; } + void NextTab() { (*this) << BYTE(0x09); } + void NextLine() { (*this) << BYTE(0x0a); } void NextParagraph(); void NextPage(); void NextSection() { pCurrentPageDesc = MakePageDesc(); } @@ -504,15 +504,15 @@ public: SwFltShell& operator << ( Graphic& ); SwFltShell& operator << ( SwFltBookmark& aBook ); void SetBookEnd(long nHandle); - SwFltShell& operator << ( const String& ); // Vorsicht: CHARSET_ANSI + SwFltShell& operator << ( const String& ); // Vorsicht: CHARSET_ANSI SwFltShell& operator << ( const sal_Unicode ); SwFltShell& operator << ( const SwField& ); SwFltShell& operator << ( const SfxPoolItem& rItem ) { *pOut << rItem; return *this; } -// SwFltShell& operator >> (SfxPoolItem&); +// SwFltShell& operator >> (SfxPoolItem&); // methode zum beenden einer sub-sektion, zB Fusznote etc - void End() { eSubMode = None; } + void End() { eSubMode = None; } // methoden zur verwaltung von Header/Footer void BeginHeader(SwPageDesc* =NULL); void BeginFooter(SwPageDesc* =NULL); @@ -597,7 +597,7 @@ public: void EndStyle() { -// OSL_ENSURE(eSubMode == Style, "wrong state for style"); +// OSL_ENSURE(eSubMode == Style, "wrong state for style"); nAktStyle = 0; pOut = pOutDoc; eSubMode = None; diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 0872e3434656..cfbe19a05922 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -2,7 +2,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,13 +70,13 @@ namespace sw { /** MSOffice appears to set the charset of unicode fonts to MS 932 - Arial Unicode MS for example is a unicode font, but word sets + Arial Unicode MS for example is a unicode font, but word sets exported uses of it to the MS 932 charset @param eTextEncoding the OOo encoding to convert from - @return + @return a msoffice equivalent charset identifier @author @@ -167,8 +167,8 @@ namespace sw /** Clips a value to MAX/MIN 16bit value to make it safe for use as a position value to give to writer. i.e. +-57.8cm. Sometimes we see ridiculous values for positioning in rtf and word document, - this captures such ones and clips them to values which are - still outside the document, but of a value that doesn't cause + this captures such ones and clips them to values which are + still outside the document, but of a value that doesn't cause problems for writer's layout, e.g. see http://www.openoffice.org/issues/show_bug.cgi?id=i9245 @@ -186,14 +186,14 @@ namespace sw Mapping a word style to a writer style has to consider mapping the word builtin styles like "Normal" as the default root style to our default root style which is called "Default" in english, - and "Normal" in german. - + and "Normal" in german. + Additionally it then has to avoid name collisions such as a) styles "Normal" and "Default" in a single document, where we can use the original distinct names "Normal" and "Default" and.. b) styles "Normal" and "Default" in a single document, where - we can not use the original names, and must come up with an + we can not use the original names, and must come up with an alternative name for one of them.. And it needs to report to the importer if the style being mapped to @@ -208,7 +208,7 @@ namespace sw { private: //I hate these things stupid pImpl things, but its warranted here - ParaMapper *mpImpl; + ParaMapper *mpImpl; public: ParaStyleMapper(SwDoc &rDoc); ~ParaStyleMapper(); @@ -224,21 +224,21 @@ namespace sw @param rName The name of the word style - @param eSti + @param eSti The style id of the word style, we are really only interested in knowing if the style has either a builtin standard id, or is a user defined style. - + @return The equivalent writer style packaged as a StyleResult to use for this word style. - + It will only return a failure in the pathological case of catastropic failure elsewhere of there exist already styles rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely and impossible. */ - StyleResult GetStyle(const String& rName, ww::sti eSti); + StyleResult GetStyle(const String& rName, ww::sti eSti); }; /** Knows which writer style a given word style should be imported as @@ -246,14 +246,14 @@ namespace sw Mapping a word style to a writer style has to consider mapping the word builtin styles like "Normal" as the default root style to our default root style which is called "Default" in english, - and "Normal" in german. - + and "Normal" in german. + Additionally it then has to avoid name collisions such as a) styles "Normal" and "Default" in a single document, where we can use the original distinct names "Normal" and "Default" and.. b) styles "Normal" and "Default" in a single document, where - we can not use the original names, and must come up with an + we can not use the original names, and must come up with an alternative name for one of them.. And it needs to report to the importer if the style being mapped to @@ -268,7 +268,7 @@ namespace sw { private: //I hate these things stupid pImpl things, but its warranted here - CharMapper *mpImpl; + CharMapper *mpImpl; public: CharStyleMapper(SwDoc &rDoc); ~CharStyleMapper(); @@ -284,25 +284,25 @@ namespace sw @param rName The name of the word style - @param eSti + @param eSti The style id of the word style, we are really only interested in knowing if the style has either a builtin standard id, or is a user defined style. - + @return The equivalent writer style packaged as a StyleResult to use for this word style. - + It will only return a failure in the pathological case of catastropic failure elsewhere of there exist already styles rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely and impossible. */ - StyleResult GetStyle(const String& rName, ww::sti eSti); + StyleResult GetStyle(const String& rName, ww::sti eSti); }; /** Find suitable names for exporting this font - + Given a fontname description find the best primary and secondary fallback font to use from MSWord's persp font @@ -319,7 +319,7 @@ namespace sw bool HasDistinctSecondary() const; FontMapExport(const String &rFontDescription); }; - + class InsertedTableClient : public SwClient { public: @@ -328,11 +328,11 @@ namespace sw }; /** Handle requirements for table formatting in insert->file mode. - + When inserting a table into a document which already has been formatted and laid out (e.g using insert->file) then tables must be handled in a special way, (or so previous comments and - code in the filters leads me to believe). + code in the filters leads me to believe). Before the document is finalized the new tables need to have their layout frms deleted and recalculated. This TableManager @@ -340,7 +340,7 @@ namespace sw a document should be registered with this manager with InsertTable, and before finialization DelAndMakeTblFrms should be called. - + @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> @@ -454,8 +454,8 @@ namespace sw /** Given a SwNoTxtNode (ole/graphic) get original size Get the uncropped and unscaled size of the underlying graphic or - ole object associated with a given SwNoTxtNode. - + ole object associated with a given SwNoTxtNode. + This function will swap in the graphic if it is swapped out from the graphic or object cache, but will swap it out if that was the case, i.e. rNd is logically unchanged before and after @@ -464,7 +464,7 @@ namespace sw @param rNd the SwNoTxtNode whose objects original size we want - @return + @return the uncropped unscaled size of the SwNoTxtNode @author @@ -478,9 +478,9 @@ namespace sw sal_uInt16 mnScript; rtl_TextEncoding meCharSet; bool mbRTL; - CharRunEntry(xub_StrLen nEndPos, sal_uInt16 nScript, - rtl_TextEncoding eCharSet, bool bRTL) - : mnEndPos(nEndPos), mnScript(nScript), meCharSet(eCharSet), + CharRunEntry(xub_StrLen nEndPos, sal_uInt16 nScript, + rtl_TextEncoding eCharSet, bool bRTL) + : mnEndPos(nEndPos), mnScript(nScript), meCharSet(eCharSet), mbRTL(bRTL) { } @@ -489,7 +489,7 @@ namespace sw typedef std::vector<CharRunEntry> CharRuns; typedef CharRuns::const_iterator cCharRunIter; - /** Collect the ranges of Text which share + /** Collect the ranges of Text which share Word generally requires characters which share the same direction, the same script, and occasionally (depending on the format) the @@ -512,13 +512,13 @@ namespace sw @return STL container of CharRuns which describe the shared direction, script and optionally script of the contigious sequences of characters - + @author <a href="mailto:cmc@openoffice.org">Caolán McNamara</a> @see #i22537# for example */ - CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd, + CharRuns GetPseudoCharRuns(const SwTxtNode& rTxtNd, xub_StrLen nStart = 0, bool bSplitOnCharSet = false); } } diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index 1e96a5fc4b3a..1764599be1af 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -2,7 +2,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,14 +44,14 @@ class RTFVertOrient public: RTFVertOrient( USHORT nValue ) { Value.nVal = nValue; } - RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) { + RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) { Value.Flags.nOrient = nOrient; Value.Flags.nRelOrient = nRelOrient; } - USHORT GetOrient() const { return Value.Flags.nOrient; } + USHORT GetOrient() const { return Value.Flags.nOrient; } USHORT GetRelation() const { return Value.Flags.nRelOrient; } - USHORT GetValue() const { return Value.nVal; } + USHORT GetValue() const { return Value.nVal; } }; @@ -75,9 +75,9 @@ public: Value.Flags.nRelAnchor = 0; } - USHORT GetOrient() const { return Value.Flags.nOrient; } + USHORT GetOrient() const { return Value.Flags.nOrient; } USHORT GetRelation() const { return Value.Flags.nRelOrient; } - USHORT GetValue() const { return Value.nVal; } + USHORT GetValue() const { return Value.nVal; } }; class RTFProtect @@ -99,10 +99,10 @@ public: Value.Flags.bPos = bPos; } - BOOL GetCntnt() const { return Value.Flags.bCntnt; } - BOOL GetSize() const { return Value.Flags.bSize; } - BOOL GetPos() const { return Value.Flags.bPos; } - USHORT GetValue() const { return Value.nVal; } + BOOL GetCntnt() const { return Value.Flags.bCntnt; } + BOOL GetSize() const { return Value.Flags.bSize; } + BOOL GetPos() const { return Value.Flags.bPos; } + USHORT GetValue() const { return Value.nVal; } }; @@ -125,7 +125,7 @@ public: BYTE GetOrder() const { return (BYTE)Value.Flags.nOrder; } BOOL GetGoldCut() const { return (BOOL)Value.Flags.nGoldCut; } - USHORT GetValue() const { return Value.nVal; } + USHORT GetValue() const { return Value.nVal; } }; #endif // _RTF_HXX diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx index c4790db74c12..855d4bb25444 100644 --- a/sw/source/filter/inc/wrt_fn.hxx +++ b/sw/source/filter/inc/wrt_fn.hxx @@ -2,7 +2,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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _WRT_FN_HXX #define _WRT_FN_HXX -#include "hintids.hxx" // fuer die Konstanten +#include "hintids.hxx" // fuer die Konstanten // einige Forward-Deklarationen class SwNode; @@ -64,6 +64,6 @@ SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt ); -#endif // _WRT_FN_HXX +#endif // _WRT_FN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 8bf5424e3408..c78a6c486b9c 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -2,7 +2,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,7 +44,7 @@ class SvxBrushItem; class SvxBorderLine; //--------------------------------------------------------------------------- -// Code aus dem HTML-Filter fuers schreiben von Tabellen +// Code aus dem HTML-Filter fuers schreiben von Tabellen //--------------------------------------------------------------------------- #define COLFUZZY 20 @@ -57,18 +57,18 @@ class SvxBorderLine; class SwWriteTableCell { - const SwTableBox *pBox; // SwTableBox der Zelle - const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile + const SwTableBox *pBox; // SwTableBox der Zelle + const SvxBrushItem *pBackground; // geerbter Hintergrund einer Zeile - long nHeight; // fixe/Mindest-Hoehe der Zeile + long nHeight; // fixe/Mindest-Hoehe der Zeile - USHORT nWidthOpt; // Breite aus Option; + USHORT nWidthOpt; // Breite aus Option; - USHORT nRow; // Start-Zeile - USHORT nCol; // Start-Spalte + USHORT nRow; // Start-Zeile + USHORT nCol; // Start-Spalte - USHORT nRowSpan; // ueberspannte Zeilen - USHORT nColSpan; // ueberspannte Spalten + USHORT nRowSpan; // ueberspannte Zeilen + USHORT nColSpan; // ueberspannte Spalten BOOL bPrcWidthOpt; @@ -112,10 +112,10 @@ SV_DECL_PTRARR_DEL( SwWriteTableCells, SwWriteTableCellPtr, 5, 5 ) class SwWriteTableRow { - SwWriteTableCells aCells; // Alle Zellen der Rows + SwWriteTableCells aCells; // Alle Zellen der Rows const SvxBrushItem *pBackground;// Hintergrund - long nPos; // End-Position (twips) der Zeile + long nPos; // End-Position (twips) der Zeile BOOL mbUseLayoutHeights; // Forbidden and not implemented. @@ -129,10 +129,10 @@ protected: public: - USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen + USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen USHORT nBottomBorder; - BOOL bTopBorder : 1; // Welche Umrandungen sind da? + BOOL bTopBorder : 1; // Welche Umrandungen sind da? BOOL bBottomBorder : 1; SwWriteTableRow( long nPos, BOOL bUseLayoutHeights ); @@ -149,11 +149,11 @@ public: } const SvxBrushItem *GetBackground() const { return pBackground; } - BOOL HasTopBorder() const { return bTopBorder; } - BOOL HasBottomBorder() const { return bBottomBorder; } + BOOL HasTopBorder() const { return bTopBorder; } + BOOL HasBottomBorder() const { return bBottomBorder; } - long GetPos() const { return nPos; } - const SwWriteTableCells& GetCells() const { return aCells; } + long GetPos() const { return nPos; } + const SwWriteTableCells& GetCells() const { return aCells; } inline int operator==( const SwWriteTableRow& rRow ) const; inline int operator<( const SwWriteTableRow& rRow2 ) const; @@ -181,29 +181,29 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableRows, SwWriteTableRowPtr, 5, 5 ) class SwWriteTableCol { - USHORT nPos; // End Position der Spalte + USHORT nPos; // End Position der Spalte USHORT nWidthOpt; BOOL bRelWidthOpt : 1; - BOOL bOutWidth : 1; // Spaltenbreite ausgeben? + BOOL bOutWidth : 1; // Spaltenbreite ausgeben? public: - BOOL bLeftBorder : 1; // Welche Umrandungen sind da? + BOOL bLeftBorder : 1; // Welche Umrandungen sind da? BOOL bRightBorder : 1; SwWriteTableCol( USHORT nPosition ); - USHORT GetPos() const { return nPos; } + USHORT GetPos() const { return nPos; } - void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; } - BOOL HasLeftBorder() const { return bLeftBorder; } + void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; } + BOOL HasLeftBorder() const { return bLeftBorder; } - void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; } - BOOL HasRightBorder() const { return bRightBorder; } + void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; } + BOOL HasRightBorder() const { return bRightBorder; } - void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; } - BOOL GetOutWidth() const { return bOutWidth; } + void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; } + BOOL GetOutWidth() const { return bOutWidth; } inline int operator==( const SwWriteTableCol& rCol ) const; inline int operator<( const SwWriteTableCol& rCol ) const; @@ -212,8 +212,8 @@ public: { nWidthOpt = nWidth; bRelWidthOpt = bRel; } - USHORT GetWidthOpt() const { return nWidthOpt; } - BOOL HasRelWidthOpt() const { return bRelWidthOpt; } + USHORT GetWidthOpt() const { return nWidthOpt; } + BOOL HasRelWidthOpt() const { return bRelWidthOpt; } }; inline int SwWriteTableCol::operator==( const SwWriteTableCol& rCol ) const @@ -239,27 +239,27 @@ SV_DECL_PTRARR_SORT_DEL( SwWriteTableCols, SwWriteTableColPtr, 5, 5 ) class SW_DLLPUBLIC SwWriteTable { protected: - SwWriteTableCols aCols; // alle Spalten - SwWriteTableRows aRows; // alle Zellen + SwWriteTableCols aCols; // alle Spalten + SwWriteTableRows aRows; // alle Zellen - UINT32 nBorderColor; // Umrandungsfarbe + UINT32 nBorderColor; // Umrandungsfarbe - USHORT nCellSpacing; // Dicke der inneren Umrandung - USHORT nCellPadding; // Absatnd Umrandung-Inhalt + USHORT nCellSpacing; // Dicke der inneren Umrandung + USHORT nCellPadding; // Absatnd Umrandung-Inhalt - USHORT nBorder; // Dicke der ausseren Umrandung - USHORT nInnerBorder; // Dicke der inneren Umrandung - USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize + USHORT nBorder; // Dicke der ausseren Umrandung + USHORT nInnerBorder; // Dicke der inneren Umrandung + USHORT nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize - USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes + USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes USHORT nLeftSub; USHORT nRightSub; - long nTabWidth; // Absolute/Relative Breite der Tabelle + long nTabWidth; // Absolute/Relative Breite der Tabelle - BOOL bRelWidths : 1; // Breiten relativ ausgeben? - BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen? + BOOL bRelWidths : 1; // Breiten relativ ausgeben? + BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen? #if OSL_DEBUG_LEVEL > 1 BOOL bGetLineHeightCalled : 1; #endif @@ -299,7 +299,7 @@ protected: public: static long GetBoxWidth( const SwTableBox *pBox ); - + USHORT GetRawWidth( USHORT nCol, USHORT nColSpan ) const; USHORT GetAbsWidth( USHORT nCol, USHORT nColSpan ) const; USHORT GetRelWidth( USHORT nCol, USHORT nColSpan ) const; diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx index e2053fd5eaa7..78ee77167409 100644 --- a/sw/source/filter/inc/wwstyles.hxx +++ b/sw/source/filter/inc/wwstyles.hxx @@ -2,7 +2,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 @@ -143,9 +143,9 @@ namespace ww stiUser = 0x0ffe, // user styles are distinguished by name stiNil = 0x0fff // max for 12 bits }; - + /** Find the WinWord sti index of an english style name. - + When importing a RTF document we would like to treat styles as similiar to how word does as possible, to this end word will treat some styles with special names as inbuilt styles, and some as user defined styles. @@ -170,10 +170,10 @@ namespace ww sti GetCanonicalStiFromEnglishName(const String &rString) throw(); /** Find the WinWord sti index of an old <= Word2 stc (style code) - - When importing a Word 2 document we would like to treat styles as - similiar to how word 8 does as possible, to this end word will treat - some styles with special codes as inbuilt styles, and some as user + + When importing a Word 2 document we would like to treat styles as + similiar to how word 8 does as possible, to this end word will treat + some styles with special codes as inbuilt styles, and some as user defined styles. @param @@ -189,7 +189,7 @@ namespace ww sti GetCanonicalStiFromStc(sal_uInt8 stc) throw(); /** Find the WinWord english name from a sti index - + Map the word style index to it's english name @param @@ -204,7 +204,7 @@ namespace ww const sal_Char* GetEnglishNameFromSti(sti eSti) throw(); /** Determine if the WinWord sti is standard Character Style - + @param sti the Style index diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index d6c4e41a74dc..bee4b8bbc889 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -2,7 +2,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 @@ -65,10 +65,10 @@ // bestimme, ob es sich um ein IMPORT/TOC - Feld handelt. -// return: 0 - weder noch, -// 1 - TOC -// 2 - IMPORT -// 3 - INDEX +// return: 0 - weder noch, +// 1 - TOC +// 2 - IMPORT +// 3 - INDEX enum RTF_FLD_TYPES { RTFFLD_UNKNOWN = 0, RTFFLD_TOC, @@ -92,21 +92,21 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) { // Strings sind PascalStrings; Laenge steht an 1. Stellen, dadurch wird // sich der Aufruf von strlen erspart!!! - sal_Char __READONLY_DATA sTOC[]= "\x03""toc"; - sal_Char __READONLY_DATA sIMPORT[]= "\x06""import"; - sal_Char __READONLY_DATA sINDEX[]= "\x05""index"; - sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol"; - sal_Char __READONLY_DATA sPAGE[]= "\x04""page"; + sal_Char __READONLY_DATA sTOC[]= "\x03""toc"; + sal_Char __READONLY_DATA sIMPORT[]= "\x06""import"; + sal_Char __READONLY_DATA sINDEX[]= "\x05""index"; + sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol"; + sal_Char __READONLY_DATA sPAGE[]= "\x04""page"; sal_Char __READONLY_DATA sNUMPAGES[]= "\x08""numpages"; - sal_Char __READONLY_DATA sDATE[]= "\x04""date"; - sal_Char __READONLY_DATA sTIME[]= "\x04""time"; - sal_Char __READONLY_DATA sDATA[]= "\x04""data"; - sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield"; - sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture"; - sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink"; - sal_Char __READONLY_DATA sREF[]= "\x03""ref"; - sal_Char __READONLY_DATA sPAGEREF[]= "\x07""pageref"; - sal_Char __READONLY_DATA sEQ[]= "\x02""eq"; + sal_Char __READONLY_DATA sDATE[]= "\x04""date"; + sal_Char __READONLY_DATA sTIME[]= "\x04""time"; + sal_Char __READONLY_DATA sDATA[]= "\x04""data"; + sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield"; + sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture"; + sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink"; + sal_Char __READONLY_DATA sREF[]= "\x03""ref"; + sal_Char __READONLY_DATA sPAGEREF[]= "\x07""pageref"; + sal_Char __READONLY_DATA sEQ[]= "\x02""eq"; sal_Char __READONLY_DATA sINCLUDETEXT[]="\x0B""includetext"; struct _Dummy_RTF_FLD_TYPES @@ -126,10 +126,10 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) {RTFFLD_DATA, sDATA}, {RTFFLD_MERGEFLD, sMERGEFLD}, {RTFFLD_IMPORT, sIMPORT2}, - {RTFFLD_HYPERLINK, sHYPERLINK}, - {RTFFLD_REF, sREF}, - {RTFFLD_PAGEREF, sPAGEREF}, - {RTFFLD_EQ, sEQ}, + {RTFFLD_HYPERLINK, sHYPERLINK}, + {RTFFLD_REF, sREF}, + {RTFFLD_PAGEREF, sPAGEREF}, + {RTFFLD_EQ, sEQ}, {RTFFLD_INCLUDETEXT, sINCLUDETEXT} }; @@ -155,7 +155,7 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) ( !nFndPos || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos-1) )) ) && ( nFndPos+nLen == sNm.Len() || !isalpha(sNm.GetChar( static_cast< xub_StrLen >(nFndPos+nLen) ) ) ) ) { -// rName = sNm.Copy( nFndPos, nLen ); +// rName = sNm.Copy( nFndPos, nLen ); rName = rName.Copy( nFndPos, static_cast< xub_StrLen >(nLen) ); nFndPos += nTokenStt + static_cast< xub_StrLen >(nLen); while( rNext.GetChar( nFndPos ) == ' ' ) ++nFndPos; @@ -164,7 +164,7 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) return aFldNmArr[n].eFldType; } } - return RTFFLD_UNKNOWN; // nichts gefunden. + return RTFFLD_UNKNOWN; // nichts gefunden. } static USHORT CheckNumberFmtStr( const String& rNStr ) @@ -191,7 +191,7 @@ static USHORT CheckNumberFmtStr( const String& rNStr ) if( rNStr.EqualsAscii( pCmp, 0, static_cast< xub_StrLen >(nLen) )) return static_cast< USHORT >(2 <= n ? n : (n + SVX_NUM_CHARS_UPPER_LETTER_N)); } - return SVX_NUM_PAGEDESC; // default-Wert + return SVX_NUM_PAGEDESC; // default-Wert } class RtfFieldSwitch @@ -202,11 +202,11 @@ public: RtfFieldSwitch( const String& rParam ); sal_Unicode GetSwitch( String& rParam ); - BOOL IsAtEnd() const { return nCurPos >= sParam.Len(); } - xub_StrLen GetCurPos() const { return nCurPos; } - void Erase( xub_StrLen nEndPos ) { sParam.Erase( 0, nEndPos ); } - void Insert( const String& rIns ) { sParam.Insert( rIns, 0 ); } - const String& GetStr() const { return sParam; } + BOOL IsAtEnd() const { return nCurPos >= sParam.Len(); } + xub_StrLen GetCurPos() const { return nCurPos; } + void Erase( xub_StrLen nEndPos ) { sParam.Erase( 0, nEndPos ); } + void Insert( const String& rIns ) { sParam.Insert( rIns, 0 ); } + const String& GetStr() const { return sParam; } }; RtfFieldSwitch::RtfFieldSwitch( const String& rParam ) @@ -297,9 +297,9 @@ void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData, case 0: switch( nSttKey ) { - case 'u': rData.sUp += sParam; break; - case 'd': rData.sDown += sParam; break; - default: rData.sText += sParam; break; + case 'u': rData.sUp += sParam; break; + case 'd': rData.sDown += sParam; break; + default: rData.sText += sParam; break; } break; @@ -408,8 +408,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) case RTFFLD_IMPORT: { //JP 11.03.96: vertraegt sich nicht so ganz mit Internet! -// if( STRING_NOTFOUND != ( nPos = aSaveStr.Search( '.' ))) -// aSaveStr.Erase( nPos+4 ); +// if( STRING_NOTFOUND != ( nPos = aSaveStr.Search( '.' ))) +// aSaveStr.Erase( nPos+4 ); aSaveStr.EraseLeadingAndTrailingChars(); if( aSaveStr.Len() ) @@ -425,7 +425,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) INetURLObject(GetBaseURL()), aSaveStr, URIHelper::GetMaybeFileHdl() ); } -// SkipGroup(); // ueberlese den Rest +// SkipGroup(); // ueberlese den Rest } break; @@ -462,7 +462,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) aPF.ChangeFormat( CheckNumberFmtStr( aSaveStr )); } pDoc->InsertPoolItem( *pPam, SwFmtFld( aPF ), 0 ); - SkipGroup(); // ueberlese den Rest + SkipGroup(); // ueberlese den Rest } break; case RTFFLD_DATE: @@ -520,7 +520,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) delete pFld; } } - SkipGroup(); // ueberlese den Rest + SkipGroup(); // ueberlese den Rest } break; @@ -533,8 +533,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) // im SWG geben die DATA Felder den Namen der Datenbank // an. Dieser kann als Field oder als DBInfo interpretiert // werden: - // \\data -> Datenbank-Name als Field - // DATA -> Datenbank-Info + // \\data -> Datenbank-Name als Field + // DATA -> Datenbank-Info BOOL bField = rFieldStr.GetChar( 0 ) != 'D'; // nur der Name interressiert @@ -549,20 +549,20 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) static_cast<SwDBNameFieldType*>(pFldType), SwDBData())), 0); } else - pDoc->ChgDBData( aData ); // MS: Keine DBInfo verwenden - SkipGroup(); // ueberlese den Rest + pDoc->ChgDBData( aData ); // MS: Keine DBInfo verwenden + SkipGroup(); // ueberlese den Rest } break; case RTFFLD_MERGEFLD: { // ein Datenbank - Feld: nur der Name interressiert // bis zum Ende vom String ist das der Feldname - SwDBFieldType aTmp( pDoc, aSaveStr, SwDBData() ); // + SwDBFieldType aTmp( pDoc, aSaveStr, SwDBData() ); // SwDBField aDBFld( (SwDBFieldType*)pDoc->InsertFldType( aTmp )); aDBFld.ChangeFormat( UF_STRING ); pDoc->InsertPoolItem(*pPam, SwFmtFld( aDBFld ), 0); - SkipGroup(); // ueberlese den Rest + SkipGroup(); // ueberlese den Rest } break; @@ -632,7 +632,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) if( !IsNewGroup() ) AttrGroupEnd(); SetNewGroup( FALSE ); - SkipGroup(); // ueberlese den Rest + SkipGroup(); // ueberlese den Rest } break; @@ -657,8 +657,8 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) URIHelper::GetMaybeFileHdl() ); break; - case 'l': case 'L': sMark = sParam; break; - case 't': case 'T': sFrame = sParam; break; + case 'l': case 'L': sMark = sParam; break; + case 't': case 'T': sFrame = sParam; break; } } @@ -683,12 +683,12 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) //Translate and apply switch( aData.nJustificationCode ) { - case 0: aData.nJustificationCode = 1; break; - case 1: aData.nJustificationCode = 3; break; - case 2: aData.nJustificationCode = 4; break; - case 4: aData.nJustificationCode = 2; break; -// case 3: - default: aData.nJustificationCode = 0; break; + case 0: aData.nJustificationCode = 1; break; + case 1: aData.nJustificationCode = 3; break; + case 2: aData.nJustificationCode = 4; break; + case 4: aData.nJustificationCode = 2; break; +// case 3: + default: aData.nJustificationCode = 0; break; } SwFmtRuby aRuby( aData.sUp ); @@ -774,7 +774,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr ) pDoc->InsertPoolItem( *pPam, SwFmtFld( aFld ), 0); } - SkipGroup(); // ueberlese den Rest + SkipGroup(); // ueberlese den Rest } break; @@ -953,16 +953,16 @@ void SwRTFParser::ReadXEField() } break; - case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; - case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; - case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; - case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; - case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; - case RTF_BULLET: cCh = 149; goto INSINGLECHAR; - case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; - case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; - case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; - case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; + case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; + case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; + case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; + case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; + case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; + case RTF_BULLET: cCh = 149; goto INSINGLECHAR; + case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; + case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; + case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; + case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; INSINGLECHAR: sFieldStr += ByteString::ConvertToUnicode( cCh, RTL_TEXTENCODING_MS_1252 ); @@ -990,7 +990,7 @@ INSINGLECHAR: } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } @@ -998,7 +998,7 @@ void SwRTFParser::ReadField() { bReadSwFly = false; //#it may be that any uses of this need to be removed and replaced int nRet = 0; - int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! int bFldInst = FALSE, bFldRslt = FALSE; String sFieldStr, sFieldNm; BYTE cCh; @@ -1149,16 +1149,16 @@ void SwRTFParser::ReadField() } break; - case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; - case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; - case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; - case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; - case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; - case RTF_BULLET: cCh = 149; goto INSINGLECHAR; - case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; - case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; - case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; - case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; + case RTF_LINE: cCh = '\n'; goto INSINGLECHAR; + case RTF_TAB: cCh = '\t'; goto INSINGLECHAR; + case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR; + case RTF_EMDASH: cCh = 151; goto INSINGLECHAR; + case RTF_ENDASH: cCh = 150; goto INSINGLECHAR; + case RTF_BULLET: cCh = 149; goto INSINGLECHAR; + case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR; + case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR; + case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR; + case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR; INSINGLECHAR: sFieldStr += ByteString::ConvertToUnicode( cCh, RTL_TEXTENCODING_MS_1252 ); @@ -1169,7 +1169,7 @@ INSINGLECHAR: sFieldStr += aToken; break; - case RTF_PICT: // Pic-Daten einlesen! + case RTF_PICT: // Pic-Daten einlesen! if( RTFFLD_IMPORT == nRet ) { Graphic aGrf; @@ -1220,7 +1220,7 @@ INSINGLECHAR: if (RTFFLD_IMPORT == nRet && sFieldNm.Len()) InsPicture( sFieldNm ); - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index 3b30757ffb37..26a2c05176ac 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -2,7 +2,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,7 +77,7 @@ using namespace ::com::sun::star; -#define ANCHOR(p) ((SwFmtAnchor*)p) +#define ANCHOR(p) ((SwFmtAnchor*)p) // steht in shellio.hxx extern SwCntntNode* GoNextNds( SwNodeIndex * pIdx, BOOL bChk ); @@ -245,9 +245,9 @@ void SwRTFParser::SetFlysInDoc() //JP 21.09.98: wenn ein DropCap ist, dann Text im Node belassen, am - // Absatz das Absatz Attribut setzen. Ggfs noch die - // FontSize zuruecksetzen, damit das DropCap nicht zu - // gro? wird. + // Absatz das Absatz Attribut setzen. Ggfs noch die + // FontSize zuruecksetzen, damit das DropCap nicht zu + // gro? wird. if( pFlySave->nDropAnchor ) { SwTxtNode* pSttNd = pFlySave->nSttNd.GetNode().GetTxtNode(); @@ -311,7 +311,7 @@ void SwRTFParser::SetFlysInDoc() if( pNd->IsNoTxtNode() ) { // die Size muss noch korrigiert werden! - nAktPageDesc = 0; // Standart PageDesc + nAktPageDesc = 0; // Standart PageDesc if( SFX_ITEM_SET != pFlySave->aFlySet.GetItemState( RES_FRM_SIZE, FALSE ) ) _SetPictureSize( *(SwNoTxtNode*)pNd, aRg.aStart, @@ -459,9 +459,9 @@ void SwRTFParser::SetFlysInDoc() //JP 02.08.99: that is wrong. The anchor is ever the NEXT! //JP 05.08.99: there are an Bug in the ExportFilter which will - // be fixed in the Version 517 - by SWG-Export - // the fly will be after the paragraph - but in RTF - // the flys will be before the paragraph. + // be fixed in the Version 517 - by SWG-Export + // the fly will be after the paragraph - but in RTF + // the flys will be before the paragraph. if( !bSwPageDesc || 5430 < GetVersionNo() ) pFlySave->nSttNd++; @@ -610,7 +610,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) aSz.SetHeightSizeType( ((SwFmtFrmSize*)pItem)->GetHeightSizeType() ); aSz.SetHeight( ((SwFmtFrmSize*)pItem)->GetHeight() ); } - if( MINFLY > nTokenValue ) nTokenValue = MINFLY; + if( MINFLY > nTokenValue ) nTokenValue = MINFLY; aSet.Put( aSz ); } break; @@ -629,7 +629,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) nTokenValue = -nTokenValue; aSz.SetHeightSizeType( ATT_FIX_SIZE ); } - if( MINFLY > nTokenValue ) nTokenValue = MINFLY; + if( MINFLY > nTokenValue ) nTokenValue = MINFLY; aSz.SetHeight( nTokenValue ); aSet.Put( aSz ); } @@ -644,8 +644,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) { SvxULSpaceItem aUL( RES_UL_SPACE ); SvxLRSpaceItem aLR( RES_LR_SPACE ); - aUL.SetUpper( nVal ); aUL.SetLower( nVal ); - aLR.SetLeft( nVal ); aLR.SetRight( nVal ); + aUL.SetUpper( nVal ); aUL.SetLower( nVal ); + aLR.SetLeft( nVal ); aLR.SetRight( nVal ); pSet->Put( aUL ); pSet->Put( aLR ); } @@ -654,14 +654,14 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) case RTF_DFRMTXTX: { SvxLRSpaceItem aLR( RES_LR_SPACE ); - aLR.SetLeft( nVal ); aLR.SetRight( nVal ); + aLR.SetLeft( nVal ); aLR.SetRight( nVal ); pSet->Put( aLR ); } break; case RTF_DFRMTXTY: { SvxULSpaceItem aUL( RES_UL_SPACE ); - aUL.SetUpper( nVal ); aUL.SetLower( nVal ); + aUL.SetUpper( nVal ); aUL.SetLower( nVal ); pSet->Put( aUL ); } break; @@ -718,7 +718,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) aFrmDir.SetValue( FRMDIR_VERT_TOP_RIGHT ); break; - case RTF_DROPCAPLI: // Dropcaps !! + case RTF_DROPCAPLI: // Dropcaps !! if( bChkDropCap ) { nDropCapLines = USHORT( nTokenValue ); @@ -738,8 +738,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) // fuer die "alten" Writer - haben die Spaltigkeit falsch heraus- // geschrieben - case RTF_COLS: nCols = USHORT( nTokenValue ); break; - case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break; + case RTF_COLS: nCols = USHORT( nTokenValue ); break; + case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break; case RTF_COLNO: nAktCol = USHORT( nTokenValue ); if( RTF_COLW == GetNextToken() ) @@ -748,7 +748,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) if( RTF_COLSR == GetNextToken() ) nSpace = USHORT( nTokenValue ); else - SkipToken( -1 ); // wieder zurueck + SkipToken( -1 ); // wieder zurueck if( --nAktCol == ( aColumns.Count() / 2 ) ) { @@ -766,7 +766,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) if( RTF_SHADINGDEF == (nToken & ~0xff) ) { ReadBackgroundAttr( nToken, aSet ); - GetNextToken(); // Klammer ueberlesen + GetNextToken(); // Klammer ueberlesen } else nSkip = -1; @@ -777,7 +777,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) bReadSwFly = true; // alles kommt in den akt. Fly SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE ); - nCols = USHRT_MAX; // neu aufsetzen + nCols = USHRT_MAX; // neu aufsetzen nColSpace = USHRT_MAX; do { nVal = USHORT(nTokenValue); @@ -829,10 +829,10 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) aHori.SetRelationOrient( aHO.GetRelation() ); } break; - case RTF_FLYOUTLEFT: aLR.SetLeft( nVal ); break; - case RTF_FLYOUTRIGHT: aLR.SetRight( nVal ); break; - case RTF_FLYOUTUPPER: aUL.SetUpper( nVal ); break; - case RTF_FLYOUTLOWER: aUL.SetLower( nVal ); break; + case RTF_FLYOUTLEFT: aLR.SetLeft( nVal ); break; + case RTF_FLYOUTRIGHT: aLR.SetRight( nVal ); break; + case RTF_FLYOUTUPPER: aUL.SetUpper( nVal ); break; + case RTF_FLYOUTLOWER: aUL.SetLower( nVal ); break; case RTF_FLYANCHOR: switch( GetNextToken() ) { @@ -853,11 +853,11 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) break; // JP 26.09.94: die Bindung an die Spalte gibt es nicht mehr !! -// case RTF_FLY_COLUMN: +// case RTF_FLY_COLUMN: } break; - case RTF_COLS: nCols = USHORT( nTokenValue ); break; - case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break; + case RTF_COLS: nCols = USHORT( nTokenValue ); break; + case RTF_COLSX: nColSpace = USHORT( nTokenValue ); break; case RTF_COLNO: nAktCol = USHORT( nTokenValue ); if( RTF_COLW == GetNextToken() ) @@ -866,7 +866,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) if( RTF_COLSR == GetNextToken() ) nSpace = USHORT( nTokenValue ); else - SkipToken( -1 ); // wieder zurueck + SkipToken( -1 ); // wieder zurueck if( --nAktCol == ( aColumns.Count() / 2 ) ) { @@ -909,7 +909,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) } else SkipGroup(); - GetNextToken(); // Klammer ueberlesen + GetNextToken(); // Klammer ueberlesen break; } } while( IsParserWorking() && @@ -996,7 +996,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) pSet->Put( aCol ); } - if( pSet != &aSet ) // wurde der Set uebergeben, dann wars das + if( pSet != &aSet ) // wurde der Set uebergeben, dann wars das return ; // ein neues FlyFormat anlegen oder das alte benutzen ? @@ -1062,8 +1062,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) nToken = GetNextToken(); // BUG 22036: kommt zwischen Fly-Attributen ein unbekanntes, - // dann erzeuge nie 2 FlyFrames, sondern fasse - // beide zusammen !!! + // dann erzeuge nie 2 FlyFrames, sondern fasse + // beide zusammen !!! while( RTF_APOCTL == ( nToken & ~(0xff | RTF_SWGDEFS) )) { if( RTF_FLY_INPARA == nToken ) @@ -1113,8 +1113,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) pPam->GetPoint()->nNode == pFlySave->nSttNd && !pPam->GetPoint()->nContent.GetIndex() ) { -// // dann erzeuge mindestens einen leeren TextNode -// pDoc->AppendTxtNode(*pPam); +// // dann erzeuge mindestens einen leeren TextNode +// pDoc->AppendTxtNode(*pPam); // dann zerstoere den FlySave wieder. aFlyArr.DeleteAndDestroy( --nFlyArrCnt ); @@ -1295,10 +1295,10 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf, } SwFlyFrmFmt* pFlyFmt = pDoc->Insert( *pPam, - rGrfNm, aEmptyStr, // Name der Graphic !! + rGrfNm, aEmptyStr, // Name der Graphic !! pGrf, - &aFlySet, // Attribute fuer den FlyFrm - pGrfAttrSet, NULL ); // Attribute fuer die Grafik + &aFlySet, // Attribute fuer den FlyFrm + pGrfAttrSet, NULL ); // Attribute fuer die Grafik pGrfNd = pDoc->GetNodes()[ pFlyFmt->GetCntnt().GetCntntIdx()-> GetIndex()+1 ]->GetGrfNode(); @@ -1321,11 +1321,11 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf, { SwXFrame::GetOrCreateSdrObject( pFlyFmt ); pDoc->SetFlyFrmTitle( *(pFlyFmt), aIt->second ); - } + } ++aIt; } - } - + } + } if( pGrfAttrSet ) @@ -1391,7 +1391,7 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd, } //JP 8.11.2001: bug 94450 - if no size exist, then the size is set by - // the swapin of the graphic. + // the swapin of the graphic. SwGrfNode* pGrfNd; if( !aSize.Width() && !aSize.Height() && 0 != (pGrfNd = (SwGrfNode*)rNd.GetGrfNode() ) && pGrfNd->IsGrfLink() ) @@ -1504,7 +1504,7 @@ void SwRTFParser::ReadOLEData() SvxRTFPictureType aPicType, aOleType; int nToken, bValidOle = TRUE, bWeiter = TRUE; - int nOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int nOpenBrakets = 1; // die erste wurde schon vorher erkannt !! String* pStr = 0; String sObjClass, sObjName, sObjData; @@ -1515,7 +1515,7 @@ void SwRTFParser::ReadOLEData() USHORT nVal = USHORT( nTokenValue ); switch( nToken ) { - case '}': --nOpenBrakets; pStr = 0; break; + case '}': --nOpenBrakets; pStr = 0; break; case '{': { if( RTF_IGNOREFLAG != GetNextToken() ) @@ -1536,19 +1536,19 @@ void SwRTFParser::ReadOLEData() break; case RTF_OBJECT: - case RTF_OBJEMB: // default ist embedded - case RTF_LINKSELF: // ?? - case RTF_OBJLOCK: // ?? - case RTF_OBJUPDATE: // ?? - case RTF_OBJTIME: // ?? + case RTF_OBJEMB: // default ist embedded + case RTF_LINKSELF: // ?? + case RTF_OBJLOCK: // ?? + case RTF_OBJUPDATE: // ?? + case RTF_OBJTIME: // ?? case RTF_OBJSETSIZE: case RTF_OBJALIGN: case RTF_OBJTRANSY: case RTF_OBJATTPH: break; - case RTF_OBJLINK: // ?? welche Daten sind das ?? - case RTF_OBJAUTLINK: // ?? -""- ?? + case RTF_OBJLINK: // ?? welche Daten sind das ?? + case RTF_OBJAUTLINK: // ?? -""- ?? case RTF_OBJSUB: case RTF_OBJPUB: case RTF_OBJICEMB: @@ -1556,7 +1556,7 @@ void SwRTFParser::ReadOLEData() case RTF_OBJHTML: case RTF_OBJALIAS: case RTF_OBJSECT: - bValidOle = FALSE; // diese Typen koennen wir nicht + bValidOle = FALSE; // diese Typen koennen wir nicht break; case RTF_OBJCLASS: @@ -1579,21 +1579,21 @@ void SwRTFParser::ReadOLEData() bWeiter = FALSE; } break; - case RTF_RSLTBMP: // diese sollten wir ignorieren + case RTF_RSLTBMP: // diese sollten wir ignorieren case RTF_RSLTMERGE: case RTF_RSLTPICT: case RTF_RSLTRTF: case RTF_RSLTTXT: break; - case RTF_OBJW: aOleType.nWidth = nVal; break; - case RTF_OBJH: aOleType.nHeight = nVal; break; - case RTF_OBJCROPT: aOleType.nCropT = (short)nTokenValue; break; - case RTF_OBJCROPB: aOleType.nCropB = (short)nTokenValue; break; - case RTF_OBJCROPL: aOleType.nCropL = (short)nTokenValue; break; - case RTF_OBJCROPR: aOleType.nCropR = (short)nTokenValue; break; - case RTF_OBJSCALEX: aOleType.nScalX = nVal; break; - case RTF_OBJSCALEY: aOleType.nScalY = nVal; break; + case RTF_OBJW: aOleType.nWidth = nVal; break; + case RTF_OBJH: aOleType.nHeight = nVal; break; + case RTF_OBJCROPT: aOleType.nCropT = (short)nTokenValue; break; + case RTF_OBJCROPB: aOleType.nCropB = (short)nTokenValue; break; + case RTF_OBJCROPL: aOleType.nCropL = (short)nTokenValue; break; + case RTF_OBJCROPR: aOleType.nCropR = (short)nTokenValue; break; + case RTF_OBJSCALEX: aOleType.nScalX = nVal; break; + case RTF_OBJSCALEY: aOleType.nScalY = nVal; break; case RTF_TEXTTOKEN: if( 1 < nOpenBrakets && pStr ) @@ -1618,24 +1618,24 @@ void SwRTFParser::ReadOLEData() if( bValidOle ) { - bValidOle = FALSE; // erstmal + bValidOle = FALSE; // erstmal } - if( !bWeiter ) // dann stehen wir noch im Result + if( !bWeiter ) // dann stehen wir noch im Result { // ist das Ole-Object Ok? // -> dann solange SkipGroup rufen, bis zur letzten - // schliessenden Klammer + // schliessenden Klammer // ansonsten alle Token verarbeiten, bis zur letzten - // schliessenden Klammer + // schliessenden Klammer bWeiter = TRUE; while( nOpenBrakets && IsParserWorking() && bWeiter ) { switch( nToken = GetNextToken() ) { - case '}': --nOpenBrakets; break; - case '{': ++nOpenBrakets; break; + case '}': --nOpenBrakets; break; + case '{': ++nOpenBrakets; break; } if( nOpenBrakets && !bValidOle ) NextToken( nToken ); @@ -1645,7 +1645,7 @@ void SwRTFParser::ReadOLEData() if( !bValidOle && '}' != nToken ) SkipGroup(); - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } #endif diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index 2504997518f4..e00c1df65eb3 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -68,7 +68,7 @@ SfxItemSet& GetNumChrFmt( SwDoc& rDoc, SwNumRule& rRule, BYTE nNumLvl ) void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl ) { int nToken; - int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! int nLvlTxtLevel = 0, nLvlNumberLevel = 0; String sLvlText, sLvlNumber; SwNumFmt* pCurNumFmt; @@ -114,9 +114,9 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl ) // Unknown und alle bekannten nicht ausgewerteten Gruppen // sofort ueberspringen else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() )) -// RTF_PANOSE != nToken && RTF_FALT != nToken && -// RTF_FALT != nToken && RTF_FNAME != nToken && -// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken ) +// RTF_PANOSE != nToken && RTF_FALT != nToken && +// RTF_FALT != nToken && RTF_FNAME != nToken && +// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken ) nToken = SkipToken( -2 ); else { @@ -136,12 +136,12 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl ) sal_Int16 eType = SVX_NUM_ARABIC; switch( nTokenValue ) { - case 1: eType = SVX_NUM_ROMAN_UPPER; break; - case 2: eType = SVX_NUM_ROMAN_LOWER; break; - case 3: eType = SVX_NUM_CHARS_UPPER_LETTER_N; break; - case 4: eType = SVX_NUM_CHARS_LOWER_LETTER_N; break; + case 1: eType = SVX_NUM_ROMAN_UPPER; break; + case 2: eType = SVX_NUM_ROMAN_LOWER; break; + case 3: eType = SVX_NUM_CHARS_UPPER_LETTER_N; break; + case 4: eType = SVX_NUM_CHARS_LOWER_LETTER_N; break; case 255: - case 23: eType = SVX_NUM_CHAR_SPECIAL; break; + case 23: eType = SVX_NUM_CHAR_SPECIAL; break; } if( pCurNumFmt ) pCurNumFmt->SetNumberingType(eType); @@ -153,8 +153,8 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl ) SvxAdjust eAdj = SVX_ADJUST_LEFT; switch( nTokenValue ) { - case 1: eAdj = SVX_ADJUST_CENTER; break; - case 2: eAdj = SVX_ADJUST_RIGHT; break; + case 1: eAdj = SVX_ADJUST_CENTER; break; + case 2: eAdj = SVX_ADJUST_RIGHT; break; } if( pCurNumFmt ) pCurNumFmt->SetNumAdjust( eAdj ); @@ -294,7 +294,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl ) void SwRTFParser::ReadListTable() { int nToken; - int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! bNewNumList = TRUE; BYTE nNumLvl = 0; @@ -305,7 +305,7 @@ void SwRTFParser::ReadListTable() { switch( ( nToken = GetNextToken() )) { - case '}': if( --nNumOpenBrakets && IsParserWorking() ) + case '}': if( --nNumOpenBrakets && IsParserWorking() ) { // Style konnte vollstaendig gelesen werden, // also ist das noch ein stabiler Status @@ -326,9 +326,9 @@ void SwRTFParser::ReadListTable() // Unknown und alle bekannten nicht ausgewerteten Gruppen // sofort ueberspringen else if( RTF_UNKNOWNCONTROL != ( nToken = GetNextToken() )) -// RTF_PANOSE != nToken && RTF_FALT != nToken && -// RTF_FALT != nToken && RTF_FNAME != nToken && -// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken ) +// RTF_PANOSE != nToken && RTF_FALT != nToken && +// RTF_FALT != nToken && RTF_FNAME != nToken && +// RTF_FONTEMB != nToken && RTF_FONTFILE != nToken ) nToken = SkipToken( -2 ); else { @@ -361,8 +361,8 @@ void SwRTFParser::ReadListTable() } break; - case RTF_LISTID: aEntry.nListId = nTokenValue; break; - case RTF_LISTTEMPLATEID: aEntry.nListTemplateId = nTokenValue; break; + case RTF_LISTID: aEntry.nListId = nTokenValue; break; + case RTF_LISTTEMPLATEID: aEntry.nListTemplateId = nTokenValue; break; case RTF_LISTRESTARTHDN: break; @@ -398,7 +398,7 @@ void SwRTFParser::ReadListTable() if( pCurRule && pCurRule->IsContinusNum() ) lcl_ExpandNumFmts( *pCurRule ); - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule ) @@ -413,7 +413,7 @@ BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule ) for( BYTE n = 0; bRet && n < MAXLEVEL; ++n ) { const SwNumFmt* pOFmt = pOrigRule->GetNumFmt( n ), - * pFmt = pRule->GetNumFmt( n ); + * pFmt = pRule->GetNumFmt( n ); if( pFmt && pOFmt ) { SwCharFmt* pOCFmt = pOFmt->GetCharFmt(), @@ -443,7 +443,7 @@ BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule ) void SwRTFParser::ReadListOverrideTable() { int nToken; - int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! SwListEntry aEntry; SwNumRule* pRule = 0, *pOrigRule = 0; BYTE nNumLvl = 0; @@ -533,9 +533,9 @@ void SwRTFParser::ReadListOverrideTable() } break; - case RTF_LISTOVERRIDE: aEntry.Clear(); break; - case RTF_LISTID: aEntry.nListId = nTokenValue; break; - case RTF_LS: aEntry.nListNo = nTokenValue; break; + case RTF_LISTOVERRIDE: aEntry.Clear(); break; + case RTF_LISTID: aEntry.nListId = nTokenValue; break; + case RTF_LS: aEntry.nListNo = nTokenValue; break; case RTF_LISTOVERRIDECOUNT: if( nTokenValue ) { @@ -662,7 +662,7 @@ void SwRTFParser::ReadListOverrideTable() } while( 0 != (pStyle = GetStyleTbl().Next()) ); } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } SwNumRule* SwRTFParser::GetNumRuleOfListNo( long nListNo, BOOL bRemoveFromList ) @@ -783,7 +783,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken ) { switch( nToken = GetNextToken() ) { - case RTF_PNLVL: nListNo = 3; + case RTF_PNLVL: nListNo = 3; bContinus = FALSE; nLevel = MAXLEVEL <= (unsigned long) nTokenValue ? MAXLEVEL - 1 @@ -847,7 +847,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken ) } FontUnderline eUnderline; - int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! + int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !! while( nNumOpenBrakets && IsParserWorking() ) { switch( ( nToken = GetNextToken() )) @@ -885,11 +885,11 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken ) case RTF_PNCARD: case RTF_PNORD: case RTF_PNORDT: - case RTF_PNDEC: pCurNumFmt->SetNumberingType(SVX_NUM_ARABIC); break; - case RTF_PNUCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); break; - case RTF_PNUCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_UPPER); break; - case RTF_PNLCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); break; - case RTF_PNLCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_LOWER); break; + case RTF_PNDEC: pCurNumFmt->SetNumberingType(SVX_NUM_ARABIC); break; + case RTF_PNUCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); break; + case RTF_PNUCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_UPPER); break; + case RTF_PNLCLTR: pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); break; + case RTF_PNLCRM: pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_LOWER); break; case RTF_PNF: { @@ -998,9 +998,9 @@ NUMATTR_SETUNDERLINE: } break; - case RTF_PNQC: pCurNumFmt->SetNumAdjust( SVX_ADJUST_CENTER ); break; - case RTF_PNQL: pCurNumFmt->SetNumAdjust( SVX_ADJUST_LEFT ); break; - case RTF_PNQR: pCurNumFmt->SetNumAdjust( SVX_ADJUST_RIGHT ); break; + case RTF_PNQC: pCurNumFmt->SetNumAdjust( SVX_ADJUST_CENTER ); break; + case RTF_PNQL: pCurNumFmt->SetNumAdjust( SVX_ADJUST_LEFT ); break; + case RTF_PNQR: pCurNumFmt->SetNumAdjust( SVX_ADJUST_RIGHT ); break; case RTF_PNSTART: pCurNumFmt->SetStart( USHORT( nTokenValue )); @@ -1009,7 +1009,7 @@ NUMATTR_SETUNDERLINE: case RTF_PNNUMONCE: case RTF_PNACROSS: case RTF_PNHANG: - case RTF_PNRESTART: break; + case RTF_PNRESTART: break; case RTF_PNTXTA: { @@ -1070,7 +1070,7 @@ NUMATTR_SETUNDERLINE: } } - SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet return pCurRule; } diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index d2fa7f37368e..e3b1e644edbb 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -2,7 +2,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 @@ -145,7 +145,7 @@ void SwRTFParser::ReadTable( int nToken ) if (CantUseTables()) { // alle Tabellen-Tokens ueberlesen - nToken = GetNextToken(); // RTF_TROWD ueberlesen + nToken = GetNextToken(); // RTF_TROWD ueberlesen do { if( RTF_TABLEDEF != (nToken & ~(0xff | RTF_SWGDEFS)) && RTF_UNKNOWNCONTROL != nToken ) @@ -175,7 +175,7 @@ void SwRTFParser::ReadTable( int nToken ) if( RTF_TROWD == nToken || !pTableNode ) { if( RTF_TROWD == nToken ) - nToken = GetNextToken(); // RTF_TROWD ueberlesen + nToken = GetNextToken(); // RTF_TROWD ueberlesen // Flags fuer die gemergten Boxen loeschen aMergeBoxes.Remove( 0, aMergeBoxes.Count() ); @@ -458,7 +458,7 @@ void SwRTFParser::ReadTable( int nToken ) case RTF_CLTXLRTB: case RTF_CLTXTBRL: - case RTF_INTBL: // das wissen wir ! + case RTF_INTBL: // das wissen wir ! case RTF_CLMGF: case RTF_CLVMGF: case RTF_CLVMRG: @@ -529,7 +529,7 @@ void SwRTFParser::ReadTable( int nToken ) int nC = aMergeBackup.Count(); for (USHORT i = 0; i < nC; ++i) aMergeBoxes.Insert(aMergeBackup[i], i); - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck return; } @@ -635,9 +635,9 @@ void SwRTFParser::ReadTable( int nToken ) } aBoxFmts.Remove( 0, n ); - if( aBoxFmts.Count() ) // es muessen noch neue zugefuegt werden + if( aBoxFmts.Count() ) // es muessen noch neue zugefuegt werden nAktBox = n; - else // es mussen noch Boxen geloescht werden + else // es mussen noch Boxen geloescht werden { // remove ContentIndex of other Bound pPam->SetMark(); pPam->DeleteMark(); @@ -727,7 +727,7 @@ void SwRTFParser::ReadTable( int nToken ) } else { - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck return; } @@ -832,7 +832,7 @@ void SwRTFParser::ReadTable( int nToken ) OSL_ENSURE(!bFailure, "RTF Table failure"); if (bFailure) { - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck return; } @@ -867,7 +867,7 @@ void SwRTFParser::ReadTable( int nToken ) pStk->MoveFullNode(aOldPos, aNewPos); } } - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck } // in die naechste Box dieser Line (opt.: falls es nicht die letzte ist) @@ -945,7 +945,7 @@ void SwRTFParser::NewTblLine() if( !bMakeCopy && 64000 < pTableNode->GetTable().GetTabSortBoxes().Count() ) { - bMakeCopy = TRUE; // spaetestens jetzt eine neue anfangen! + bMakeCopy = TRUE; // spaetestens jetzt eine neue anfangen! } if( bMakeCopy ) @@ -964,7 +964,7 @@ void SwRTFParser::NewTblLine() pLns = &pTableNode->GetTable().GetTabLines(); } else -// pDoc->InsertRow( aBoxes ); +// pDoc->InsertRow( aBoxes ); pTableNode->GetTable().AppendRow( pDoc ); pBox = (*pLns)[ pLns->Count()-1 ]->GetTabBoxes()[0]; @@ -1018,8 +1018,8 @@ void SwRTFParser::CheckInsNewTblLine() { if( nInsTblRow > GetOpenBrakets() || IsPardTokenRead() ) nInsTblRow = USHRT_MAX; - else if( !pTableNode ) // Tabelle nicht mehr vorhanden ? - NewTblLine(); // evt. Line copieren + else if( !pTableNode ) // Tabelle nicht mehr vorhanden ? + NewTblLine(); // evt. Line copieren } } diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index e0aeb4e45594..63e7e1be2011 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -2,7 +2,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 @@ -1881,7 +1881,7 @@ void SwRTFParser::NextToken( int nToken ) case RTF_REVDTTM: if (pRedlineInsert != NULL) pRedlineInsert->aStamp = sw::ms::DTTM2DateTime(nTokenValue); - + break; case RTF_REVDTTMDEL: @@ -2737,7 +2737,7 @@ void SwRTFParser::MakeStyleTab() const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls(); for( USHORT n = rColls.Count(); n; ) //if( MAXLEVEL > (nLvl = rColls[ --n ]->GetOutlineLevel() ))//#outline level,zhaojianwei - // nValidOutlineLevels |= 1 << nLvl; + // nValidOutlineLevels |= 1 << nLvl; if( rColls[ --n ]->IsAssignedToListLevelOfOutlineStyle()) nValidOutlineLevels |= 1 << rColls[ n ]->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei } @@ -3918,11 +3918,11 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos, if( !nPos ) { pColl = pDoc->GetTxtCollFromPool( RES_POOLCOLL_STANDARD, false ); - //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei - if(nOutlineLevel < MAXLEVEL ) //->add by zhaojianwei + //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei + if(nOutlineLevel < MAXLEVEL ) //->add by zhaojianwei pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel ); else - pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei + pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei return pColl; } @@ -3946,11 +3946,11 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos, if (!rbCollExist) { - //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei - if(nOutlineLevel < MAXLEVEL) //->add by zhaojianwei + //pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei + if(nOutlineLevel < MAXLEVEL) //->add by zhaojianwei pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel ); else - pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei + pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei } return pColl; diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx index c6bd7bdbc44c..b995d4dedbbd 100644 --- a/sw/source/filter/rtf/swparrtf.hxx +++ b/sw/source/filter/rtf/swparrtf.hxx @@ -2,7 +2,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 @@ -90,7 +90,7 @@ class SwNodeIdx : public SvxNodeIdx SwNodeIndex aIdx; public: SwNodeIdx( const SwNodeIndex& rIdx ) : aIdx( rIdx ) {} - virtual ULONG GetIdx() const; + virtual ULONG GetIdx() const; virtual SvxNodeIdx* Clone() const; }; @@ -113,9 +113,9 @@ class SwxPosition : public SvxPosition { SwPaM* pPam; public: - SwxPosition( SwPaM* pCrsr ) : pPam( pCrsr ) {} + SwxPosition( SwPaM* pCrsr ) : pPam( pCrsr ) {} - virtual ULONG GetNodeIdx() const; + virtual ULONG GetNodeIdx() const; virtual xub_StrLen GetCntIdx() const; // erzeuge von sich selbst eine Kopie @@ -128,11 +128,11 @@ public: // zum zwischenspeichern der Flys: struct SwFlySave { - SfxItemSet aFlySet; - SwNodeIndex nSttNd, nEndNd; - xub_StrLen nEndCnt; - SwTwips nPageWidth; - USHORT nDropLines, nDropAnchor; + SfxItemSet aFlySet; + SwNodeIndex nSttNd, nEndNd; + xub_StrLen nEndCnt; + SwTwips nPageWidth; + USHORT nDropLines, nDropAnchor; SwFlySave( const SwPaM& rPam, SfxItemSet& rSet ); int IsEqualFly( const SwPaM& rPos, SfxItemSet& rSet ); @@ -301,8 +301,8 @@ class SwRTFParser : public SvxRTFParser sw::util::InsertedTablesManager maInsertedTables; SwRTFStyleTbl aTxtCollTbl; SwRTFCharStyleTbl aCharFmtTbl; - SwFlySaveArr aFlyArr; // Flys als Letzes im Doc setzen - SvBools aMergeBoxes; // Flags fuer gemergte Zellen + SwFlySaveArr aFlyArr; // Flys als Letzes im Doc setzen + SvBools aMergeBoxes; // Flags fuer gemergte Zellen SwListArr aListArr; SvPtrarr aTblFmts; SvPtrarr aRubyCharFmts; @@ -314,9 +314,9 @@ class SwRTFParser : public SvxRTFParser SwTableNode* pTableNode, *pOldTblNd; // fuers Lesen von Tabellen: akt. Tab SwNodeIndex* pSttNdIdx; SwNodeIndex* pRegionEndIdx; - SwDoc* pDoc; - SwPaM* pPam; // SwPosition duerfte doch reichen, oder ?? - SwRelNumRuleSpaces* pRelNumRule; // Liste aller benannten NumRules + SwDoc* pDoc; + SwPaM* pPam; // SwPosition duerfte doch reichen, oder ?? + SwRelNumRuleSpaces* pRelNumRule; // Liste aller benannten NumRules String sNestedFieldStr; SwFltRedline *pRedlineInsert; @@ -325,29 +325,29 @@ class SwRTFParser : public SvxRTFParser String sBaseURL; USHORT nAktPageDesc, nAktFirstPageDesc; - USHORT nAktBox; // akt. Box - USHORT nInsTblRow; // beim nach \row kein \pard -> neue Line anlegen - USHORT nNewNumSectDef; // jeder SectionWechsel kann neue Rules definieren + USHORT nAktBox; // akt. Box + USHORT nInsTblRow; // beim nach \row kein \pard -> neue Line anlegen + USHORT nNewNumSectDef; // jeder SectionWechsel kann neue Rules definieren USHORT nRowsToRepeat; bool bSwPageDesc; - bool bReadSwFly; // lese Swg-Fly (wichtig fuer Bitmaps!) + bool bReadSwFly; // lese Swg-Fly (wichtig fuer Bitmaps!) // --> OD 2008-12-22 #i83368# bool mbReadCellWhileReadSwFly; // <-- - bool mbReadNoTbl; // verhinder Tabelle in Tabelle/FootNote + bool mbReadNoTbl; // verhinder Tabelle in Tabelle/FootNote bool mbIsFootnote; - bool bFootnoteAutoNum; // automatische Numerierung ? - bool bStyleTabValid; // Styles schon erzeugt ? - bool bInPgDscTbl; // beim PageDescTbl lesen - bool bNewNumList; // Word 7.0 NumList gelesen, 6.0 ueberspringen - bool bFirstContinue; // 1.Call ins Continue + bool bFootnoteAutoNum; // automatische Numerierung ? + bool bStyleTabValid; // Styles schon erzeugt ? + bool bInPgDscTbl; // beim PageDescTbl lesen + bool bNewNumList; // Word 7.0 NumList gelesen, 6.0 ueberspringen + bool bFirstContinue; // 1.Call ins Continue bool bContainsPara; // If there is no paragraph in the section bool bContainsTablePara; // If there is an table in this section bool bForceNewTable; // Forces a beginning of a new table bool bNestedField; bool bTrowdRead; // True, iff an \trowd definition was read after the last \row - + int nReadFlyDepth; int nZOrder; @@ -412,13 +412,13 @@ class SwRTFParser : public SvxRTFParser SfxItemSet& rSet, const SvxRTFPictureType* = 0 ); void SetFlysInDoc(); - void GetPageSize( Size& rSize ); // Groesse der PagePrintArea + void GetPageSize( Size& rSize ); // Groesse der PagePrintArea // fuers Einlesen von Tabellen void GotoNextBox(); void NewTblLine(); - void DelLastNode(); // loesche den letzten Node (Tabelle/Fly/Ftn/..) + void DelLastNode(); // loesche den letzten Node (Tabelle/Fly/Ftn/..) void AddNumRule( SwNumRule* pRule ); void SetNumRelSpaces(); @@ -432,12 +432,12 @@ protected: // wird fuer jedes Token gerufen, das in CallParser erkannt wird virtual void NextToken( int nToken ); -// virtual void ReadUnknownData(); +// virtual void ReadUnknownData(); virtual void ReadBitmapData(); #ifdef READ_OLE_OBJECT virtual void ReadOLEData(); #endif - virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ); + virtual void SetAttrInDoc( SvxRTFItemStackType &rSet ); virtual bool UncompressableStackEntry(const SvxRTFItemStackType &rSet) const; // fuer Tokens, die im ReadAttr nicht ausgewertet werden virtual void UnknownAttrToken( int nToken, SfxItemSet* pSet ); @@ -468,12 +468,12 @@ public: const String& rBaseURL, int bReadNewDoc = TRUE ); - virtual SvParserState CallParser(); // Aufruf des Parsers + virtual SvParserState CallParser(); // Aufruf des Parsers virtual int IsEndPara( SvxNodeIdx* pNd, xub_StrLen nCnt ) const; // fuers asynchrone lesen aus dem SvStream -// virtual void SaveState( int nToken ); -// virtual void RestoreState(); +// virtual void SaveState( int nToken ); +// virtual void RestoreState(); virtual void Continue( int nToken ); }; diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index aa68e4f25d7f..a2cce0c8e7da 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -2,7 +2,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 @@ -194,8 +194,8 @@ BOOL Writer::CopyNextPam( SwPaM ** ppPam ) { if( (*ppPam)->GetNext() == pOrigPam ) { - *ppPam = pOrigPam; // wieder auf den Anfangs-Pam setzen - return FALSE; // Ende vom Ring + *ppPam = pOrigPam; // wieder auf den Anfangs-Pam setzen + return FALSE; // Ende vom Ring } // ansonsten kopiere den die Werte aus dem naechsten Pam @@ -262,7 +262,7 @@ void Writer::SetStream(SvStream *const pStream) SvStream& Writer::OutHex( SvStream& rStrm, ULONG nHex, BYTE nLen ) -{ // in einen Stream aus +{ // in einen Stream aus // Pointer an das Bufferende setzen sal_Char* pStr = aNToABuf + (NTOABUFLEN-1); for( BYTE n = 0; n < nLen; ++n ) @@ -357,15 +357,15 @@ ULONG Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, const St BOOL Writer::CopyLocalFileToINet( String& rFileNm ) { - if( !pOrigFileName ) // can be happen, by example if we + if( !pOrigFileName ) // can be happen, by example if we return FALSE; // write into the clipboard BOOL bRet = FALSE; INetURLObject aFileUrl( rFileNm ), aTargetUrl( *pOrigFileName ); // JP 01.11.00: what is the correct question for the portal?? -// if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() ) -// return bRet; +// if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() ) +// return bRet; // this is our old without the Mail-Export if( ! ( INET_PROT_FILE == aFileUrl.GetProtocol() && INET_PROT_FILE != aTargetUrl.GetProtocol() && diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx index 171d5d39bc11..dc2f9c20f553 100644 --- a/sw/source/filter/writer/wrt_fn.cxx +++ b/sw/source/filter/writer/wrt_fn.cxx @@ -2,7 +2,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/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index b154452bd39c..58e3cbde1b3c 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -2,7 +2,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,7 +56,7 @@ sal_Int16 SwWriteTableCell::GetVertOri() const { const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, FALSE, &pItem ) ) { sal_Int16 eBoxVertOri = ((const SwFmtVertOrient *)pItem)->GetVertOrient(); @@ -611,7 +611,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow, SwWriteTableRow *pRow = aRows[nOldRow]; SwWriteTableRow *pEndRow = aRows[nRow]; -// if( nLine==0 && nParentLineHeight==0 ) +// if( nLine==0 && nParentLineHeight==0 ) if( nLine+1==nNumOfHeaderRows && nParentLineHeight==0 ) nHeadEndRow = nRow; @@ -744,16 +744,16 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, USHORT nStartRow, pEndRow->nBottomBorder = nBottomBorder; } } -// MIB: 13.12.2000: Why should a cell that contains a subtable -// not have borders? Moreover, switching them, off switches off -// the fill border lines between the columns and rows. (#74222#) -// else -// { -// aCols[nOldCol]->bLeftBorder = FALSE; -// aCols[nCol]->bRightBorder = FALSE; -// pRow->bTopBorder = FALSE; -// pEndRow->bBottomBorder = FALSE; -// } +// MIB: 13.12.2000: Why should a cell that contains a subtable +// not have borders? Moreover, switching them, off switches off +// the fill border lines between the columns and rows. (#74222#) +// else +// { +// aCols[nOldCol]->bLeftBorder = FALSE; +// aCols[nCol]->bRightBorder = FALSE; +// pRow->bTopBorder = FALSE; +// pEndRow->bBottomBorder = FALSE; +// } } else { diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index cd032117b56c..c233e7a852cb 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -60,15 +60,15 @@ #include <doc.hxx> #include <ndtxt.hxx> #include <frmatr.hxx> -#include <fldbas.hxx> // RES_SETEXPFLD -#include <charatr.hxx> // class SwFmtRefMark -#include <swtable.hxx> // class SwTableLines, ... +#include <fldbas.hxx> // RES_SETEXPFLD +#include <charatr.hxx> // class SwFmtRefMark +#include <swtable.hxx> // class SwTableLines, ... #include <tox.hxx> -#include <expfld.hxx> // SwExpField -#include <section.hxx> // class SwSection -#include <tblsel.hxx> // class SwSelBoxes +#include <expfld.hxx> // SwExpField +#include <section.hxx> // class SwSection +#include <tblsel.hxx> // class SwSelBoxes #include <pagedesc.hxx> -#include <docsh.hxx> // class SwDocSh +#include <docsh.hxx> // class SwDocSh #include <fltshell.hxx> #include <viewsh.hxx> #include <shellres.hxx> @@ -98,10 +98,10 @@ SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt ) { // Anfang vom Bereich merken nMkCntnt = rStartPos.nContent.GetIndex(); - pAttr = pHt; // speicher eine Kopie vom Attribut - bOld = FALSE; // used for marking Attributes *before* skipping field results - bLocked = TRUE; // locke das Attribut --> darf erst - bCopied = FALSE; // gesetzt werden, wenn es wieder geunlocked ist + pAttr = pHt; // speicher eine Kopie vom Attribut + bOld = FALSE; // used for marking Attributes *before* skipping field results + bLocked = TRUE; // locke das Attribut --> darf erst + bCopied = FALSE; // gesetzt werden, wenn es wieder geunlocked ist bConsumedByField = FALSE; } @@ -109,10 +109,10 @@ SwFltStackEntry::SwFltStackEntry(const SwFltStackEntry& rEntry) : nMkNode(rEntry.nMkNode), nPtNode(rEntry.nPtNode) { - pAttr = rEntry.pAttr->Clone(); + pAttr = rEntry.pAttr->Clone(); nMkCntnt= rEntry.nMkCntnt; - bOld = rEntry.bOld; - bLocked = bCopied = TRUE; // when rEntry were NOT bLocked we would never have been called + bOld = rEntry.bOld; + bLocked = bCopied = TRUE; // when rEntry were NOT bLocked we would never have been called bConsumedByField = rEntry.bConsumedByField; } @@ -131,7 +131,7 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos) // Cursor-Position auch der Bereich vom Attribut weiter // verschoben wird. // Das ist aber nicht das gewollte! - bLocked = FALSE; // freigeben und das ENDE merken + bLocked = FALSE; // freigeben und das ENDE merken nPtNode = rEndPos.nNode.GetIndex()-1; nPtCntnt = rEndPos.nContent.GetIndex(); } @@ -262,7 +262,7 @@ void SwFltControlStack::StealAttr(const SwPosition* pPos, USHORT nAttrId /* = 0 pEntry = (*this)[ nCnt ]; if (pEntry->nPtNode.GetIndex()+1 == pPos->nNode.GetIndex() && (!nAttrId || nAttrId == pEntry->pAttr->Which())) - DeleteAndDestroy(nCnt); // loesche aus dem Stack + DeleteAndDestroy(nCnt); // loesche aus dem Stack } } @@ -320,7 +320,7 @@ void SwFltControlStack::SetAttr(const SwPosition& rPos, USHORT nAttrId, if (!nAttrId ){ bF = true; }else if( nAttrId == pEntry->pAttr->Which()){ - if( nAttrId != RES_FLTR_BOOKMARK ){ // Handle abfragen + if( nAttrId != RES_FLTR_BOOKMARK ){ // Handle abfragen bF = true; }else if( nHand == ((SwFltBookmark*)(pEntry->pAttr))->GetHandle() ) { @@ -345,8 +345,8 @@ void SwFltControlStack::SetAttr(const SwPosition& rPos, USHORT nAttrId, continue; } SetAttrInDoc(rPos, pEntry); - DeleteAndDestroy(i); // loesche aus dem Stack - i--; nCnt--; // Danach rutschen alle folgenden nach unten + DeleteAndDestroy(i); // loesche aus dem Stack + i--; nCnt--; // Danach rutschen alle folgenden nach unten } } @@ -370,13 +370,13 @@ static void MakeBookRegionOrPoint(SwFltStackEntry* pEntry, SwDoc* pDoc, { if (pEntry->MakeRegion(pDoc, rRegion, bCheck )){ const SwNodes& rNds = pDoc->GetNodes(); -// BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0; -// const SwStartNode* p1 = rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode(); -// const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode(); +// BOOL b1 = rNds[rRegion.GetPoint()->nNode]->FindTableNode() != 0; +// const SwStartNode* p1 = rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode(); +// const SwStartNode* p2 = rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode(); if( rNds[rRegion.GetPoint()->nNode]->FindTableBoxStartNode() != rNds[rRegion.GetMark()->nNode]->FindTableBoxStartNode() ){ - rRegion.Exchange(); // Ungueltiger Bereich - rRegion.DeleteMark(); // -> beide auf Mark + rRegion.Exchange(); // Ungueltiger Bereich + rRegion.DeleteMark(); // -> beide auf Mark } }else{ MakePoint(pEntry, pDoc, rRegion); @@ -394,24 +394,24 @@ extern BOOL CheckNodesRange( const SwNodeIndex& rStt, // rNds sind die Doc-Nodes // rEnd ist Bereichs-Ende, // rTmpStart ist ReinRaus-Parameter: Anfang des zu untersuchenden Bereiches rein, -// Anfang des gueltigen Bereichs raus +// Anfang des gueltigen Bereichs raus // rTmpEnd ist raus-Parameter // Return-Bool ist TRUE fuer gueltigen Bereich static BOOL IterateNumrulePiece( const SwNodeIndex& rEnd, SwNodeIndex& rTmpStart, SwNodeIndex& rTmpEnd ) { while( ( rTmpStart <= rEnd ) - && !( rTmpStart.GetNode().IsTxtNode() ) ) // suche gueltigen Anfang + && !( rTmpStart.GetNode().IsTxtNode() ) ) // suche gueltigen Anfang rTmpStart++; rTmpEnd = rTmpStart; while( ( rTmpEnd <= rEnd ) - && ( rTmpEnd.GetNode().IsTxtNode() ) ) // suche gueltiges Ende + 1 + && ( rTmpEnd.GetNode().IsTxtNode() ) ) // suche gueltiges Ende + 1 rTmpEnd++; - rTmpEnd--; // gueltiges Ende + rTmpEnd--; // gueltiges Ende - return rTmpStart <= rTmpEnd; // gueltig ? + return rTmpStart <= rTmpEnd; // gueltig ? } void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* pEntry) @@ -445,7 +445,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* break; case RES_TXTATR_TOXMARK: break; - case RES_FLTR_NUMRULE: // Numrule 'reinsetzen + case RES_FLTR_NUMRULE: // Numrule 'reinsetzen { const String& rNumNm = ((SfxStringItem*)pEntry->pAttr)->GetValue(); SwNumRule* pRul = pDoc->FindNumRulePtr( rNumNm ); @@ -476,7 +476,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* break; case RES_FLTR_NUMRULE_NUM: break; - case RES_FLTR_BOOKMARK: // eigentlich nur fuer den Ende-Stack + case RES_FLTR_BOOKMARK: // eigentlich nur fuer den Ende-Stack { SwFltBookmark* pB = (SwFltBookmark*)pEntry->pAttr; const String& rName = ((SwFltBookmark*)pEntry->pAttr)->GetName(); @@ -493,7 +493,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* { SwFieldType* pFT = pDoc->GetFldType(RES_SETEXPFLD, rName, false); if (!pFT) - { // FieldType anlegen + { // FieldType anlegen SwSetExpFieldType aS(pDoc, rName, nsSwGetSetExpType::GSE_STRING); pFT = pDoc->InsertFldType(aS); } @@ -558,7 +558,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* } break; case RES_FLTR_SECTION: - MakePoint(pEntry, pDoc, aRegion); // bislang immer Point==Mark + MakePoint(pEntry, pDoc, aRegion); // bislang immer Point==Mark pDoc->InsertSwSection(aRegion, *(static_cast<SwFltSection*>(pEntry->pAttr))->GetSectionData(), 0, 0, false); @@ -619,7 +619,7 @@ SfxPoolItem* SwFltControlStack::GetFmtStackAttr(USHORT nWhich, USHORT * pPos) { if (pPos) *pPos = nSize; - return (SfxPoolItem*)pEntry->pAttr; // Ok, dann Ende + return (SfxPoolItem*)pEntry->pAttr; // Ok, dann Ende } } return 0; @@ -632,10 +632,10 @@ const SfxPoolItem* SwFltControlStack::GetFmtAttr(const SwPosition& rPos, USHORT return (const SfxPoolItem*)pHt; // im Stack ist das Attribut nicht vorhanden, also befrage das Dokument -// SwCntntNode * pNd = rPaM.GetCntntNode(); +// SwCntntNode * pNd = rPaM.GetCntntNode(); SwCntntNode * pNd = pDoc->GetNodes()[ rPos.nNode ]->GetCntntNode(); - if (!pNd) // kein ContentNode, dann das dflt. Attribut + if (!pNd) // kein ContentNode, dann das dflt. Attribut return &pDoc->GetAttrPool().GetDefaultItem(nWhich); return &pNd->GetAttr(nWhich); } @@ -916,7 +916,7 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, BOOL bN pOutDoc = new SwFltOutDoc( *pDoc, pPaM, aStack, aEndStack ); pOut = pOutDoc; - if( !bNewDoc ){ // in ein Dokument einfuegen ? + if( !bNewDoc ){ // in ein Dokument einfuegen ? // Da immer ganze Zeile eingelesen werden, muessen // evtl. Zeilen eingefuegt / aufgebrochen werden const SwPosition* pPos = pPaM->GetPoint(); @@ -924,10 +924,10 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, BOOL bN USHORT nCntPos = pPos->nContent.GetIndex(); if( nCntPos && pSttNd->GetTxt().Len() ) // EinfuegePos nicht in leerer Zeile - pDoc->SplitNode( *pPos, false ); // neue Zeile erzeugen - if( pSttNd->GetTxt().Len() ){ // EinfuegePos nicht am Ende der Zeile - pDoc->SplitNode( *pPos, false ); // neue Zeile - pPaM->Move( fnMoveBackward ); // gehe in leere Zeile + pDoc->SplitNode( *pPos, false ); // neue Zeile erzeugen + if( pSttNd->GetTxt().Len() ){ // EinfuegePos nicht am Ende der Zeile + pDoc->SplitNode( *pPos, false ); // neue Zeile + pPaM->Move( fnMoveBackward ); // gehe in leere Zeile } // verhinder das Einlesen von Tabellen in Fussnoten / Tabellen @@ -939,7 +939,7 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, BOOL bN pOutDoc->SetReadNoTable(); } pCurrentPageDesc = &((SwPageDesc&)const_cast<const SwDoc *>(pDoc) - ->GetPageDesc( 0 )); // Standard + ->GetPageDesc( 0 )); // Standard } @@ -949,7 +949,7 @@ SwFltShell::~SwFltShell() if (eSubMode == Style) EndStyle(); - if( pOutDoc->IsInTable() ) // falls nicht ordentlich abgeschlossen + if( pOutDoc->IsInTable() ) // falls nicht ordentlich abgeschlossen EndTable(); if( pOutDoc->IsInFly() ) EndFly(); @@ -972,7 +972,7 @@ SwFltShell::~SwFltShell() const SwNode* pEndNd = &rDoc.GetNodes().GetEndOfContent(); SwNodeIndex aEndIdx( *pEndNd, -1L ); const SwStartNode* pSttNd = pEndNd->StartOfSectionNode(); - SwNodeIndex aSttIdx( *pSttNd, 1L ); // +1 -> hinter StartNode + SwNodeIndex aSttIdx( *pSttNd, 1L ); // +1 -> hinter StartNode // Section einfuegen // Section einfuegen rDoc.GetNodes().InsertTextSection( @@ -989,7 +989,7 @@ SwFltShell::~SwFltShell() GetDoc().ChgPageDesc( 0, const_cast<const SwDoc &>(GetDoc()). - GetPageDesc( 0 )); // PageDesc "Standard" + GetPageDesc( 0 )); // PageDesc "Standard" for (i=nPageDescOffset;i<GetDoc().GetPageDescCnt();i++) { const SwPageDesc& rPD = const_cast<const SwDoc &>(GetDoc()). @@ -1027,7 +1027,7 @@ String SwFltShell::QuoteStr( const String& rIn ) switch( sOut.GetChar( n ) ) { case 0x0a: - sOut.Erase( n, 1 ); // 0xd 0xa wird zu \n + sOut.Erase( n, 1 ); // 0xd 0xa wird zu \n break; case 0x0b: @@ -1208,9 +1208,9 @@ const SfxPoolItem& SwFltOutDoc::GetNodeOrStyAttr(USHORT nWhich) { SwCntntNode * pNd = GetDoc().GetNodes()[ pPaM->GetPoint()->nNode ] ->GetCntntNode(); - if (pNd) // ContentNode: Attribut mit Parent + if (pNd) // ContentNode: Attribut mit Parent return pNd->GetAttr(nWhich); - else // kein ContentNode, dann das dflt. Attribut + else // kein ContentNode, dann das dflt. Attribut return GetDoc().GetAttrPool().GetDefaultItem(nWhich); } @@ -1375,7 +1375,7 @@ BOOL SwFltOutDoc::BeginTable() SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 1 ), *pTabSavedPos, 1, 1, text::HoriOrientation::LEFT, 0, 0, FALSE, FALSE ); // TODO MULTIHEADER nTableWidth = 0; - ((SwTable*)pTable)->LockModify(); // Nichts automatisch anpassen! + ((SwTable*)pTable)->LockModify(); // Nichts automatisch anpassen! // set pam in 1. table cell usTableX = usTableY = 0; @@ -1389,7 +1389,7 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */) OSL_ENSURE(pTable, "GetBox ohne Tabelle"); return 0; } - if( nx == USHRT_MAX ) // aktuelle Zelle + if( nx == USHRT_MAX ) // aktuelle Zelle nx = usTableX; // get structs to table cells @@ -1398,7 +1398,7 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */) OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableLines"); return 0; } - if( ny >= pTableLines->Count() ){ // Notbremse + if( ny >= pTableLines->Count() ){ // Notbremse OSL_ENSURE( FALSE, "SwFltOutDoc:GetBox:ny >= Count()"); ny = pTableLines->Count() - 1; } @@ -1412,7 +1412,7 @@ SwTableBox* SwFltOutDoc::GetBox(USHORT ny, USHORT nx /*= USHRT_MAX */) OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:pTableBoxes"); return 0; } - if( nx >= pTableBoxes->Count() ){ // Notbremse + if( nx >= pTableBoxes->Count() ){ // Notbremse OSL_ENSURE(FALSE, "SwFltOutDoc:GetBox:nx >= Count()"); nx = pTableBoxes->Count() - 1; } @@ -1476,7 +1476,7 @@ void SwFltOutDoc::SetTableWidth(SwTwips nSwWidth) } OSL_ENSURE( nSwWidth > MINLAY, "Tabellenbreite <= MINLAY" ); if( nSwWidth != nTableWidth ){ - if( nTableWidth ) // Nicht beim ersten Setzen + if( nTableWidth ) // Nicht beim ersten Setzen SplitTable(); pTable->GetFrmFmt()->SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE, nSwWidth)); nTableWidth = nSwWidth; @@ -1614,10 +1614,10 @@ void SwFltOutDoc::EndTable() pTableNode->MakeFrms(&pPaM->GetPoint()->nNode); } - *pPaM->GetPoint() = *pTabSavedPos; // restore Cursor + *pPaM->GetPoint() = *pTabSavedPos; // restore Cursor delete pTabSavedPos; pTabSavedPos = 0; - ((SwTable*)pTable)->UnlockModify(); // Test, nuetzt nichts gegen Assert + ((SwTable*)pTable)->UnlockModify(); // Test, nuetzt nichts gegen Assert pTable = 0; nTableWidth = 0; } @@ -1674,7 +1674,7 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults() RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); SwFmtFrmSize aSz( ATT_VAR_SIZE, MINFLY, MINFLY ); // Default: Breite 100% ( = PMW:Auto ) - aSz.SetWidthPercent( 100 ); // Hoehe: Auto + aSz.SetWidthPercent( 100 ); // Hoehe: Auto p->Put( aSz ); p->Put( SwFmtHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::FRAME )); return p; @@ -1692,7 +1692,7 @@ BOOL SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/, OSL_ENSURE(!pMoreAttrs, "SwFltOutBase:BeginFly mit pMoreAttrs" ); #endif eFlyAnchor = eAnchor; - bFlyAbsPos = bAbsolutePos; // Bloedsinn eigentlich + bFlyAbsPos = bAbsolutePos; // Bloedsinn eigentlich return TRUE; } @@ -1748,7 +1748,7 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/, rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); // create Fly: - OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // rekursiv geht noch nicht + OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // rekursiv geht noch nicht pFlySavedPos = new SwPosition(*pPaM->GetPoint()); @@ -1759,9 +1759,9 @@ BOOL SwFltOutDoc::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/, pSet->Put(*pMoreAttrs); // dieses NICHT bei Seitengebundenem Fly mit Seiten-NUMMER ! - aAnchor.SetAnchor(pPaM->GetPoint()); // braucht erstaunlicherweise + aAnchor.SetAnchor(pPaM->GetPoint()); // braucht erstaunlicherweise // den Stack nicht -// aStack.NewAttr( *pPaM->GetPoint(), SwFltAnchor( pFly ) ); +// aStack.NewAttr( *pPaM->GetPoint(), SwFltAnchor( pFly ) ); pSet->Put( aAnchor ); SwFrmFmt* pF = MakeFly( eAnchor, pSet ); @@ -1808,7 +1808,7 @@ void SwFltOutDoc::EndFly() rStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); rEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); - *pPaM->GetPoint() = *pFlySavedPos; // restore Cursor + *pPaM->GetPoint() = *pFlySavedPos; // restore Cursor delete pFlySavedPos; pFlySavedPos = 0; SwFltOutBase::EndFly(); @@ -1826,7 +1826,7 @@ void SwFltOutDoc::EndFly() /*virtual*/ void SwFltFormatCollection::SetFlyFrmAttr(const SfxPoolItem& rAttr) { if (!pFlyAttrs) - pFlyAttrs = new SfxItemSet( GetDoc().GetAttrPool(), + pFlyAttrs = new SfxItemSet( GetDoc().GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); pFlyAttrs->Put( rAttr ); } @@ -1850,7 +1850,7 @@ BOOL SwFltFormatCollection::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/, return TRUE; } -void SwFltFormatCollection::EndFly() // Wird nie aufgerufen +void SwFltFormatCollection::EndFly() // Wird nie aufgerufen { } @@ -1904,7 +1904,7 @@ void SwFltShell::EndFly() OSL_ENSURE(FALSE, "EndFly ohne Fly"); return; } - if (pOutDoc->IsInTable()){ // Table verschraenkt mit Fly macht keinen Sinn + if (pOutDoc->IsInTable()){ // Table verschraenkt mit Fly macht keinen Sinn OSL_ENSURE(FALSE, "EndFly in Table ( verschraenkt )"); EndTable(); // -> Table beenden } @@ -1918,7 +1918,7 @@ void SwFltShell::EndFly() void SwFltShell::BeginFootnote() { - if( pOut->IsInFly() ){ // Passiert z.B. bei Fussnote in Fly + if( pOut->IsInFly() ){ // Passiert z.B. bei Fussnote in Fly OSL_ENSURE(FALSE, "Fussnote in Fly nicht erlaubt"); return; } @@ -1930,8 +1930,8 @@ void SwFltShell::BeginFootnote() // Alle Attribute schliessen, da sonst Attribute entstehen koennen, // die in Fussnoten reinragen aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); -// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); -// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber +// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); +// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber // Fussnoten im PMW uebernommen werden SwFmtFtn aFtn; @@ -1942,7 +1942,7 @@ void SwFltShell::BeginFootnote() SwTxtNode* pTxt = pPaM->GetNode()->GetTxtNode(); SwTxtAttr *const pFN = pTxt->GetTxtAttrForCharAt( pPaM->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN); - if( !pFN ){ // Passiert z.B. bei Fussnote in Fly + if( !pFN ){ // Passiert z.B. bei Fussnote in Fly OSL_ENSURE(pFN, "Probleme beim Anlegen des Fussnoten-Textes"); return; } @@ -1960,11 +1960,11 @@ void SwFltShell::EndFootnote() // Alle Attribute schliessen, da sonst Attribute // entstehen koennen, die aus Fussnoten rausragen aStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); -// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); -// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber +// aEndStack.SetAttr( *pPaM->GetPoint(), 0, FALSE ); +// EndStack erstmal nicht zwangs-Schliessen, damit Bookmarks ueber // Fussnoten im PMW uebernommen werden - *pPaM->GetPoint() = *pSavedPos; // restore Cursor + *pPaM->GetPoint() = *pSavedPos; // restore Cursor delete pSavedPos; pSavedPos = 0; } @@ -2005,21 +2005,21 @@ void SwFltShell::BeginFooter(SwPageDesc* /*pPD*/) void SwFltShell::EndHeaderFooter() { - *pPaM->GetPoint() = *pSavedPos; // restore Cursor + *pPaM->GetPoint() = *pSavedPos; // restore Cursor delete pSavedPos; pSavedPos = 0; } SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc) { - if(bStdPD) // keine Neuen PageDescs + if(bStdPD) // keine Neuen PageDescs return pCurrentPageDesc; BOOL bFollow = (pFirstPageDesc != 0); SwPageDesc* pNewPD; USHORT nPos; if (bFollow && pFirstPageDesc->GetFollow() != pFirstPageDesc) - return pFirstPageDesc; // Fehler: hat schon Follow + return pFirstPageDesc; // Fehler: hat schon Follow // Erkennung doppelter Namen fehlt noch (Wahrscheinlichkeit // fuer dopp. Namen ist gering) @@ -2030,7 +2030,7 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc) pNewPD = &((SwPageDesc&)const_cast<const SwDoc &>(GetDoc()). GetPageDesc(nPos)); if (bFollow) - { // Dieser ist der folgende von pPageDesc + { // Dieser ist der folgende von pPageDesc pFirstPageDesc->SetFollow(pNewPD); pNewPD->SetFollow(pNewPD); } @@ -2051,7 +2051,7 @@ SwFltFormatCollection::SwFltFormatCollection( pFlyAttrs( 0 ), bHasFly( FALSE ) { - Reset(); // Default-Attrs loeschen und Auto-Flag + Reset(); // Default-Attrs loeschen und Auto-Flag } SwFltFormatCollection::SwFltFormatCollection( @@ -2061,7 +2061,7 @@ SwFltFormatCollection::SwFltFormatCollection( bHasFly( FALSE ) { pColl = _rDoc.MakeTxtFmtColl(rName, (SwTxtFmtColl*)_rDoc.GetDfltTxtFmtColl()); - Reset(); // Default-Attrs loeschen und Auto-Flag + Reset(); // Default-Attrs loeschen und Auto-Flag } void SwFltShell::NextStyle(USHORT nWhich, USHORT nNext) diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 8c3f415486ab..efd0c788f38a 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -2,7 +2,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 @@ -347,7 +347,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, ULONG nFieldFlgs) //~ Ww1: new-NULL if (rFib.GetStream().Read(pA, rFib.GetFIB().cbSttbfffnGet() - sizeof(nCountBytes)) == (ULONG)rFib.GetFIB().cbSttbfffnGet() - - sizeof(nCountBytes)) // lese alle Fonts + - sizeof(nCountBytes)) // lese alle Fonts {} //nothing long nLeft = rFib.GetFIB().cbSttbfffnGet() @@ -361,15 +361,15 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, ULONG nFieldFlgs) break; nMax++; nLeft -= nNextSiz; - if(nLeft < 1) // naechste Laenge muss gelesen werden koennen + if(nLeft < 1) // naechste Laenge muss gelesen werden koennen break; p = (W1_FFN *)(((char*)p) + nNextSiz); } if (nMax) { - pFontA = new W1_FFN*[nMax]; // alloziere Index-Array + pFontA = new W1_FFN*[nMax]; // alloziere Index-Array //~ Ww1: new-NULL - pFontA[0] = pA; // fuelle Index-Array + pFontA[0] = pA; // fuelle Index-Array USHORT i; for(i=1, p=pA; i<nMax; i++) { @@ -378,7 +378,7 @@ Ww1Fonts::Ww1Fonts(Ww1Fib& rInFib, ULONG nFieldFlgs) } } else - pFontA = 0; // Keine Eintraege -> kein Array + pFontA = 0; // Keine Eintraege -> kein Array } } bOK = TRUE; @@ -500,8 +500,8 @@ USHORT Ww1SingleSprmByteSized::Size(BYTE* pSprm) { USHORT nRet; nRet = SVBT8ToByte(pSprm); - nRet += sizeof(SVBT8); // var. l. byte-size -// pSprm += sizeof(SVBT8); // var. l. byte-size + nRet += sizeof(SVBT8); // var. l. byte-size +// pSprm += sizeof(SVBT8); // var. l. byte-size nRet = nRet + nCountBytes; return nRet; } @@ -511,7 +511,7 @@ USHORT Ww1SingleSprmWordSized::Size(BYTE* pSprm) USHORT nRet; nRet = SVBT16ToShort(pSprm); nRet += sizeof(SVBT16); // var. l. word-size -// pSprm += sizeof(SVBT16); // var. l. word-size +// pSprm += sizeof(SVBT16); // var. l. word-size nRet = nRet + nCountBytes; return nRet; } @@ -602,7 +602,7 @@ void Ww1Sprm::InitTab() pSingleSprm = new Ww1SingleSprm( 0, DUMPNAME(pUnknown)); aTab[ 2] = new Ww1SingleSprmByte(DUMPNAME("sprmPStc")); // 2 pap.istd (style code) - aTab[ 3] = new Ww1SingleSprmByteSized(0, DUMPNAME("sprmPIstdPermute")); // 3 pap.istd permutation + aTab[ 3] = new Ww1SingleSprmByteSized(0, DUMPNAME("sprmPIstdPermute")); // 3 pap.istd permutation aTab[ 4] = new Ww1SingleSprmByte(DUMPNAME("sprmPIncLevel")); // 4 pap.istddifference aTab[ 5] = new Ww1SingleSprmPJc(DUMPNAME("sprmPJc")); // 5 pap.jc (justification) aTab[ 6] = new Ww1SingleSprmBool(DUMPNAME("sprmPFSideBySide")); // 6 pap.fSideBySide @@ -619,7 +619,7 @@ void Ww1Sprm::InitTab() aTab[ 17] = new Ww1SingleSprmPDxaLeft(DUMPNAME("sprmPDxaLeft")); // 17 pap.dxaLeft aTab[ 18] = new Ww1SingleSprmWord(DUMPNAME("sprmPNest")); // 18 pap.dxaNest aTab[ 19] = new Ww1SingleSprmPDxaLeft1(DUMPNAME("sprmPDxaLeft1")); // 19 pap.dxaLeft1 - aTab[ 20] = new Ww1SingleSprmPDyaLine(DUMPNAME("sprmPDyaLine")); // 20 pap.lspd an LSPD + aTab[ 20] = new Ww1SingleSprmPDyaLine(DUMPNAME("sprmPDyaLine")); // 20 pap.lspd an LSPD aTab[ 21] = new Ww1SingleSprmPDyaBefore(DUMPNAME("sprmPDyaBefore")); // 21 pap.dyaBefore aTab[ 22] = new Ww1SingleSprmPDyaAfter(DUMPNAME("sprmPDyaAfter")); // 22 pap.dyaAfter aTab[ 23] = new Ww1SingleSprmTab(0, DUMPNAME(pUnknown)); // 23 pap.itbdMac, pap.rgdxaTab @@ -819,7 +819,7 @@ BYTE* Ww1Plc::GetData(USHORT nIndex) Ww1StringList::Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb ) : pIdxA(0), nMax(0) { - if( nCb > 2 ) // ueberhaupt Eintraege ? + if( nCb > 2 ) // ueberhaupt Eintraege ? { SVBT16 nCountBytes; DBG_ASSERT(nCb > sizeof(nCountBytes), "Ww1StringList"); @@ -834,7 +834,7 @@ Ww1StringList::Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb ) // Alloziere PString-Array //~ Ww1: new-NULL if (rSt.Read(pA, nCb - sizeof(nCountBytes)) - == (ULONG)nCb - sizeof(nCountBytes)) // lese alle + == (ULONG)nCb - sizeof(nCountBytes)) // lese alle {}// do nothing // Zaehle, wieviele Fonts enthalten long nLeft = nCb - sizeof(nCountBytes); @@ -847,32 +847,32 @@ Ww1StringList::Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb ) break; nMax++; nLeft -= nNextSiz; - if(nLeft < 1) // naechste Laenge muss gelesen werden koennen + if(nLeft < 1) // naechste Laenge muss gelesen werden koennen break; p = p + nNextSiz; } if (nMax) { - pIdxA = new sal_Char*[nMax+1]; // alloziere Index-Array - pIdxA[0] = pA; // Index 0 : alles + pIdxA = new sal_Char*[nMax+1]; // alloziere Index-Array + pIdxA[0] = pA; // Index 0 : alles // ab Index 1 C-Strings - pIdxA[1] = pA + 1; // fuelle Index-Array + pIdxA[1] = pA + 1; // fuelle Index-Array USHORT i = 2; p = pA; BYTE nL = *p; while(1) { - p += nL + 1; // Neues Laengen-Byte - nL = *p; // merke Laenge - *p = '\0'; // mach C-String draus + p += nL + 1; // Neues Laengen-Byte + nL = *p; // merke Laenge + *p = '\0'; // mach C-String draus if( i > nMax ) break; - pIdxA[i] = p + 1; // Ptr auf C-String + pIdxA[i] = p + 1; // Ptr auf C-String i++; } } else - pIdxA = 0; // Keine Eintraege -> kein Array + pIdxA = 0; // Keine Eintraege -> kein Array } } } @@ -993,10 +993,10 @@ BOOL Ww1FkpPap::Fill(USHORT nIndex, BYTE*& p, USHORT& rnCountBytes) if (nOffset) { DBG_ASSERT(nOffset>(USHORT)(Count()*sizeof(SVBT32)), "calc error"); -// rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2 + 1; // SH: +1 ????? +// rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2 + 1; // SH: +1 ????? rnCountBytes = SVBT8ToByte(aFkp+nOffset) * 2; nOffset += sizeof(SVBT8); - if( nOffset + rnCountBytes < 511 ) // SH: Assert schlug 1 zu frueh zu + if( nOffset + rnCountBytes < 511 ) // SH: Assert schlug 1 zu frueh zu rnCountBytes++; // SH: Ich weiss nicht genau, // ob das letzte Byte des PAPX // genutzt wird, aber so vergessen @@ -1017,7 +1017,7 @@ BOOL Ww1FkpPap::Fill(USHORT nIndex, BYTE*& p, USHORT& rnCountBytes) BOOL Ww1FkpChp::Fill(USHORT nIndex, W1_CHP& aChp) { DBG_ASSERT( nIndex < Count(), "Ww1FkpChp::Fill() Index out of Range" ); - memset(&aChp, 0, sizeof(aChp)); // Default, da verkuerzt gespeichert + memset(&aChp, 0, sizeof(aChp)); // Default, da verkuerzt gespeichert USHORT nOffset = GetData(nIndex)[0] * 2; if (nOffset) { @@ -1095,7 +1095,7 @@ ULONG Ww1Pap::Where( BOOL bSetIndex ) nFkpIndex = 0; } if (pPap != NULL) -// if (nFkpIndex < pPap->Count()) +// if (nFkpIndex < pPap->Count()) if (nFkpIndex <= pPap->Count()) ulRet = pPap->Where(nFkpIndex) - rFib.GetFIB().fcMinGet(); return ulRet; @@ -1104,7 +1104,7 @@ ULONG Ww1Pap::Where( BOOL bSetIndex ) void Ww1Pap::operator++(int) { if (pPap != NULL) -// if (++nFkpIndex >= pPap->Count()) +// if (++nFkpIndex >= pPap->Count()) if (++nFkpIndex > pPap->Count()) { delete pPap; @@ -1196,7 +1196,7 @@ ULONG Ww1Chp::Where( BOOL bSetIndex ) nFkpIndex = 0; } if (pChp != NULL) -// if (nFkpIndex < pChp->Count()) +// if (nFkpIndex < pChp->Count()) if (nFkpIndex <= pChp->Count()) ulRet = pChp->Where(nFkpIndex) - rFib.GetFIB().fcMinGet() - ulOffset; @@ -1206,7 +1206,7 @@ ULONG Ww1Chp::Where( BOOL bSetIndex ) void Ww1Chp::operator++(int) { if (pChp != NULL) -// if (++nFkpIndex >= pChp->Count()) +// if (++nFkpIndex >= pChp->Count()) if (++nFkpIndex > pChp->Count()) { delete pChp; diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx index 49547f65b892..7182ab139efb 100644 --- a/sw/source/filter/ww1/w1class.hxx +++ b/sw/source/filter/ww1/w1class.hxx @@ -2,7 +2,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 @@ -113,9 +113,9 @@ class Ww1Fib public: Ww1Fib(SvStream&); friend ostream& operator <<(ostream&, Ww1Fib&); - W1_FIB& GetFIB() { return aFib; } - BOOL GetError() { return !bOK; } - SvStream& GetStream() { return rStream; } + W1_FIB& GetFIB() { return aFib; } + BOOL GetError() { return !bOK; } + SvStream& GetStream() { return rStream; } }; /////////////////////////////////////////////////////////////////// Dop @@ -153,7 +153,7 @@ protected: public: Ww1PlainText(Ww1Fib& rWwFib, ULONG nFilePos, ULONG nCountBytes); // innerhalb des textes - ULONG Where() const { return ulSeek; } + ULONG Where() const { return ulSeek; } void Seek( ULONG ulNew ) { DBG_ASSERT(ulNew < ulCountBytes, "Ww1PlainText"); @@ -161,7 +161,7 @@ public: ulSeek = ulNew; } - ULONG Count() const { return ulCountBytes; } + ULONG Count() const { return ulCountBytes; } void SetCount(ULONG ulNew) { ulNew += ulSeek; @@ -173,7 +173,7 @@ public: DBG_ASSERT(ulSeek+1<ulCountBytes, "Ww1PlainText"); ulSeek++; } - BOOL GetError() { return !bOK; } + BOOL GetError() { return !bOK; } sal_Unicode Out( Ww1Shell&, ULONG& ); sal_Unicode Out( String&, ULONG=0xffffffff); sal_Unicode Out( sal_Unicode& ); @@ -183,7 +183,7 @@ public: String GetText( ULONG ulOffset, ULONG nLen ) const; enum Consts { MinChar = 32 }; - static BOOL IsChar( sal_Unicode c ) { return c >= MinChar; } + static BOOL IsChar( sal_Unicode c ) { return c >= MinChar; } }; /////////////////////////////////////////////////////////////// DocText @@ -262,15 +262,15 @@ class Ww1Style public: Ww1Style(); ~Ww1Style(); - BOOL IsUsed() const { return bUsed; } + BOOL IsUsed() const { return bUsed; } void SetDefaults(BYTE); - void SetParent(Ww1StyleSheet* newParent) { pParent = newParent; } - void SetName(const String& rName) { bUsed = TRUE; aName = rName; } - const String& GetName() const { return aName; } -// Ww1Style& GetNext(); + void SetParent(Ww1StyleSheet* newParent) { pParent = newParent; } + void SetName(const String& rName) { bUsed = TRUE; aName = rName; } + const String& GetName() const { return aName; } +// Ww1Style& GetNext(); Ww1Style& GetBase(); - USHORT GetnBase() const { return stcBase; } - USHORT GetnNext() const { return stcNext; } + USHORT GetnBase() const { return stcBase; } + USHORT GetnNext() const { return stcNext; } USHORT ReadName(BYTE*&, USHORT&, USHORT stc); USHORT ReadChpx(BYTE*&, USHORT&); USHORT ReadPapx(BYTE*&, USHORT&); @@ -390,7 +390,7 @@ public: class Ww1SingleSprmByteSized : public Ww1SingleSprm { public: -// ostream& Dump(ostream&, BYTE*, USHORT); +// ostream& Dump(ostream&, BYTE*, USHORT); USHORT Size(BYTE*); Ww1SingleSprmByteSized(USHORT nBytes, sal_Char* sName = 0) : Ww1SingleSprm(nBytes, sName) { @@ -399,7 +399,7 @@ public: class Ww1SingleSprmWordSized : public Ww1SingleSprm { public: -// ostream& Dump(ostream&, BYTE*, USHORT); +// ostream& Dump(ostream&, BYTE*, USHORT); USHORT Size(BYTE*); Ww1SingleSprmWordSized(USHORT nBytes, sal_Char* sName = 0) : Ww1SingleSprm(nBytes, sName) { @@ -409,7 +409,7 @@ public: class Ww1SingleSprmByte : public Ww1SingleSprm { public: ostream& Dump(ostream&, BYTE*, USHORT); -// USHORT Size(BYTE*); +// USHORT Size(BYTE*); Ww1SingleSprmByte(sal_Char* sName = 0) : Ww1SingleSprm(1, sName) { } @@ -418,7 +418,7 @@ public: class Ww1SingleSprmBool : public Ww1SingleSprmByte { public: ostream& Dump(ostream&, BYTE*, USHORT); -// USHORT Size(BYTE*); +// USHORT Size(BYTE*); Ww1SingleSprmBool(sal_Char* sName = 0) : Ww1SingleSprmByte(sName) { } @@ -427,7 +427,7 @@ public: class Ww1SingleSprm4State : public Ww1SingleSprmByte { public: ostream& Dump(ostream&, BYTE*, USHORT); -// USHORT Size(BYTE*); +// USHORT Size(BYTE*); Ww1SingleSprm4State(sal_Char* sName = 0) : Ww1SingleSprmByte(sName) { } @@ -436,7 +436,7 @@ public: class Ww1SingleSprmWord : public Ww1SingleSprm { public: ostream& Dump(ostream&, BYTE*, USHORT); -// USHORT Size(BYTE*); +// USHORT Size(BYTE*); Ww1SingleSprmWord(sal_Char* sName = 0) : Ww1SingleSprm(2, sName) {} }; @@ -444,7 +444,7 @@ public: class Ww1SingleSprmLong : public Ww1SingleSprm { public: ostream& Dump(ostream&, BYTE*, USHORT); -// USHORT Size(BYTE*); +// USHORT Size(BYTE*); Ww1SingleSprmLong(sal_Char* sName = 0) : Ww1SingleSprm(4, sName) { } @@ -529,14 +529,14 @@ public: class Ww1SingleSprmPBrc : public Ww1SingleSprmWord { protected: -// SvxBorderLine* SetBorder(SvxBorderLine*, W1_BRC*); +// SvxBorderLine* SetBorder(SvxBorderLine*, W1_BRC*); // spezielle start-routine, je nach sprm verschieden versorgt // mit einem BoxItem. void Start(Ww1Shell&, BYTE, W1_BRC10*, USHORT, Ww1Manager&, SvxBoxItem&); void Start(Ww1Shell&, BYTE, W1_BRC*, USHORT, Ww1Manager&, SvxBoxItem&); using Ww1SingleSprm::Start; - + public: Ww1SingleSprmPBrc(sal_Char* sName) : Ww1SingleSprmWord(sName) { @@ -558,14 +558,14 @@ public: // SH: Ab sofort alle 4 Umrandungen ueber nur 1 Klasse. class Ww1SingleSprmPBrc10 : public Ww1SingleSprmPBrc { - USHORT nLine; // BRC_TOP, BRC_LEFT, ... - + USHORT nLine; // BRC_TOP, BRC_LEFT, ... + using Ww1SingleSprmPBrc::Start; - + public: Ww1SingleSprmPBrc10(USHORT nL, sal_Char* sName) : Ww1SingleSprmPBrc(sName), nLine(nL) {} - + void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&); }; @@ -652,10 +652,10 @@ public: //class Ww1SingleSprmTDxaLeft : public Ww1SingleSprmWord { //public: -// Ww1SingleSprmTDxaLeft(sal_Char* sName) : -// Ww1SingleSprmWord(sName) { -// } -// void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&); +// Ww1SingleSprmTDxaLeft(sal_Char* sName) : +// Ww1SingleSprmWord(sName) { +// } +// void Start(Ww1Shell&, BYTE, BYTE*, USHORT, Ww1Manager&); //}; class Ww1SingleSprmTDxaGapHalf : public Ww1SingleSprmWord { @@ -757,7 +757,7 @@ protected: BYTE nId = *pSprm++; return GetSize(nId, pSprm) + 1; } // gibt fuer nTh element id, size & zeiger auf daten: -// BOOL Fill(USHORT, BYTE&, USHORT&, BYTE*&); +// BOOL Fill(USHORT, BYTE&, USHORT&, BYTE*&); public: // SH: brauche ich public // gibt fuer nTh element id, size & zeiger auf daten: @@ -955,10 +955,10 @@ class Ww1StringList public: Ww1StringList( SvStream& rSt, ULONG nFc, USHORT nCb ); ~Ww1StringList() - { if( pIdxA ) { delete pIdxA[0]; delete pIdxA; } } + { if( pIdxA ) { delete pIdxA[0]; delete pIdxA; } } const String GetStr( USHORT nNum ) const; - USHORT Count() const { return nMax; } - BOOL GetError() const { return (nMax != 0) && !pIdxA; } + USHORT Count() const { return nMax; } + BOOL GetError() const { return (nMax != 0) && !pIdxA; } }; class Ww1PlcBookmarkTxt: public Ww1StringList @@ -972,15 +972,15 @@ public: class Ww1PlcBookmarkPos : public Ww1Plc { -// USHORT Fill(USHORT, BYTE&, String&, String&, String&); +// USHORT Fill(USHORT, BYTE&, String&, String&, String&); public: Ww1PlcBookmarkPos(Ww1Fib& _rFib, ULONG start, USHORT nBytes, BOOL bEnd) : Ww1Plc(_rFib, start, nBytes, (bEnd) ? 0 : 2) {} - BYTE* GetData(USHORT nIndex) { return Ww1Plc::GetData(nIndex); } + BYTE* GetData(USHORT nIndex) { return Ww1Plc::GetData(nIndex); } // Position als CP - ULONG WhereCP(USHORT nIndex) { return Ww1Plc::Where(nIndex); } + ULONG WhereCP(USHORT nIndex) { return Ww1Plc::Where(nIndex); } // absolut im file ULONG Where(USHORT nIndex) { @@ -988,7 +988,7 @@ public: ? Ww1Plc::Where(nIndex) + rFib.GetFIB().fcMinGet() : 0xffffffff; } -// friend ostream& operator <<(ostream&, Ww1PlcBookmarks&); +// friend ostream& operator <<(ostream&, Ww1PlcBookmarks&); }; //////////////////////////////////////////////////////////////// PlcHdd @@ -1016,7 +1016,7 @@ protected: public: Ww1Fkp(SvStream&, ULONG, USHORT); friend ostream& operator <<(ostream&, Ww1Fkp&); - USHORT Count() const { return SVBT8ToByte(aFkp+511); } + USHORT Count() const { return SVBT8ToByte(aFkp+511); } ULONG Where(USHORT); // wie im entsprechenden fkp }; @@ -1036,7 +1036,7 @@ class Ww1FkpChp : public Ww1Fkp { #ifdef DUMP SvStream& rStream; - SvStream& GetStream() { return rStream; } + SvStream& GetStream() { return rStream; } #endif public: Ww1FkpChp(SvStream& rStream, ULONG ulFilePos) @@ -1089,8 +1089,8 @@ class Ww1Assoc public: Ww1Assoc(Ww1Fib&); - ~Ww1Assoc() { delete pBuffer; } - BOOL GetError() const { return !bOK; } + ~Ww1Assoc() { delete pBuffer; } + BOOL GetError() const { return !bOK; } friend ostream& operator <<(ostream&, Ww1Assoc&); void Out(Ww1Shell&); }; @@ -1147,7 +1147,7 @@ public: if (grpfIhdt & 0x0002) nFtnFollowSep = nextIhdd++; if (grpfIhdt & 0x0004) nFtnNote = nextIhdd++; } -// ~Ww1HeaderFooter() {} +// ~Ww1HeaderFooter() {} void SetGrpfIhdt(USHORT grpfIhdt) { if (grpfIhdt & 0x0001) nEvenHeadL = nextIhdd++; @@ -1249,15 +1249,15 @@ public: Ww1Fields(Ww1Fib& rFibL, ULONG ulFilePos, USHORT nBytes) : Ww1PlcFields(rFibL, ulFilePos, nBytes), nPlcIndex(0), pField(0) {} -// ~Ww1Fields() {} +// ~Ww1Fields() {} // innerhalb des textes - ULONG Where() { return Where(nPlcIndex); } + ULONG Where() { return Where(nPlcIndex); } void operator++(int) { DBG_ASSERT(nPlcIndex+1 <= Count(), "Ww1Fields"); nPlcIndex++; } - void Seek(ULONG ulNew) { Ww1PlcFields::Seek(ulNew, nPlcIndex); } + void Seek(ULONG ulNew) { Ww1PlcFields::Seek(ulNew, nPlcIndex); } W1_FLD* GetData() { DBG_ASSERT(nPlcIndex < Count(), "Ww1Fields"); @@ -1316,8 +1316,8 @@ class Ww1Bookmarks USHORT nPlcIdx[2]; USHORT nIsEnd; BOOL bOK; -// ULONG Where(USHORT nIndex) { // innerhalb des textes -// return Ww1PlcFields::Where(nIndex) - rFib.GetFIB().fcMinGet(); } +// ULONG Where(USHORT nIndex) { // innerhalb des textes +// return Ww1PlcFields::Where(nIndex) - rFib.GetFIB().fcMinGet(); } public: Ww1Bookmarks(Ww1Fib& rFib); ~Ww1Bookmarks() @@ -1325,11 +1325,11 @@ public: delete pPos[1]; delete pPos[0]; } - ULONG Where() const { return pPos[nIsEnd]->WhereCP(nPlcIdx[nIsEnd]); } + ULONG Where() const { return pPos[nIsEnd]->WhereCP(nPlcIdx[nIsEnd]); } void operator++(int); - BOOL GetError() const { return !bOK; } + BOOL GetError() const { return !bOK; } long GetHandle() const; - BOOL GetIsEnd() const { return ( nIsEnd ) ? TRUE : FALSE; } + BOOL GetIsEnd() const { return ( nIsEnd ) ? TRUE : FALSE; } const String GetName() const; long Len() const; friend ostream& operator <<(ostream&, Ww1Bookmarks&); @@ -1348,7 +1348,7 @@ public: Ww1Footnotes(Ww1Fib& rFibL) : Ww1PlcFootnoteRef(rFibL), nPlcIndex(0), aText(rFibL), bStarted(FALSE) {} -// ~Ww1Footnotes() {} +// ~Ww1Footnotes() {} // innerhalb des textes ULONG Where() { @@ -1375,15 +1375,15 @@ public: Ww1Sep(Ww1Fib& rFibL, USHORT grpfIhdt) : Ww1PlcSep(rFibL), aHdd(rFibL, grpfIhdt), nPlcIndex(0) {} - Ww1HeaderFooter& GetHdd() { return aHdd; } - void operator++(int) { nPlcIndex++; } - BYTE* GetData() { return Ww1PlcSep::GetData(nPlcIndex); } + Ww1HeaderFooter& GetHdd() { return aHdd; } + void operator++(int) { nPlcIndex++; } + BYTE* GetData() { return Ww1PlcSep::GetData(nPlcIndex); } // innerhalb des textes - ULONG Where() { return Ww1PlcSep::Where(nPlcIndex); } + ULONG Where() { return Ww1PlcSep::Where(nPlcIndex); } void SetGrpfIhdt(BYTE grpfIhdt) { GetHdd().SetGrpfIhdt(grpfIhdt); -// GetHdd().Start(rOut, rMan); +// GetHdd().Start(rOut, rMan); } void Start(Ww1Shell&, Ww1Manager&); void Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode& c) @@ -1416,7 +1416,7 @@ class Ww1Pap : public Ww1PlcPap public: Ww1Pap(Ww1Fib& rFib); - ~Ww1Pap() { delete pPap; } + ~Ww1Pap() { delete pPap; } ULONG Where( BOOL bSetIndex = TRUE ); // innerhalb des textes void operator++(int); BOOL FillStart(BYTE*& pB, USHORT& nSize) @@ -1483,7 +1483,7 @@ class Ww1Chp : public Ww1PlcChp public: Ww1Chp( Ww1Fib& rFib ); - ~Ww1Chp() { delete pChp; } + ~Ww1Chp() { delete pChp; } ULONG Where( BOOL bSetIndex = TRUE ); // innerhalb des textes void operator++(int); BOOL FillStart(W1_CHP& rChp) @@ -1506,7 +1506,7 @@ public: delete pChp; pChp = NULL; } - BOOL Pushed() { return nPushedPlcIndex != 0xffff; } + BOOL Pushed() { return nPushedPlcIndex != 0xffff; } void Pop() { DBG_ASSERT(Pushed(), "Ww1Chp"); @@ -1557,15 +1557,15 @@ class Ww1Manager public: Ww1Manager(SvStream& rStrm, ULONG nFieldFlgs); - BOOL GetError() const { return !bOK; } + BOOL GetError() const { return !bOK; } // Fuer Tabellen - void SetInTtp(BOOL bSet = TRUE) { bInTtp = bSet; } - BOOL IsInTtp() const { return bInTtp; } - void SetInStyle(BOOL bSet = TRUE) { bInStyle = bSet; } - BOOL IsInStyle() const { return bInStyle; } - void SetStopAll(BOOL bSet = TRUE) { bStopAll = bSet; } - BOOL IsStopAll() const { return bStopAll; } + void SetInTtp(BOOL bSet = TRUE) { bInTtp = bSet; } + BOOL IsInTtp() const { return bInTtp; } + void SetInStyle(BOOL bSet = TRUE) { bInStyle = bSet; } + BOOL IsInStyle() const { return bInStyle; } + void SetStopAll(BOOL bSet = TRUE) { bStopAll = bSet; } + BOOL IsStopAll() const { return bStopAll; } BOOL HasInTable(); BOOL HasTtp(); BOOL LastHasTtp(); @@ -1574,13 +1574,13 @@ public: BOOL HasPPc(); BOOL HasPDxaAbs(); - Ww1Fib& GetFib() { return aFib; } - Ww1PlainText& GetText() { return *pDoc; } - Ww1Dop& GetDop() { return aDop; } - Ww1Sep& GetSep() { return aSep; } + Ww1Fib& GetFib() { return aFib; } + Ww1PlainText& GetText() { return *pDoc; } + Ww1Dop& GetDop() { return aDop; } + Ww1Sep& GetSep() { return aSep; } // innerhalb des textes - ULONG Where() { return pDoc->Where(); } - void Fill( sal_Unicode& rChr ) { pDoc->Out( rChr ); } + ULONG Where() { return pDoc->Where(); } + void Fill( sal_Unicode& rChr ) { pDoc->Out( rChr ); } BYTE Fill( String& rStr, ULONG ulLen) { ulLen += pDoc->Where(); @@ -1589,7 +1589,7 @@ public: SvxFontItem GetFont(USHORT nFCode); friend Ww1Shell& operator <<(Ww1Shell&, Ww1Manager&); friend ostream& operator <<(ostream&, Ww1Manager&); - BOOL Pushed() { return pDoc != &aDoc; } + BOOL Pushed() { return pDoc != &aDoc; } void Pop(); void Push0(Ww1PlainText* pDoc, ULONG, Ww1Fields* = 0); void Push1(Ww1PlainText* pDoc, ULONG ulSeek, ULONG ulSeek2 = 0, diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 07b570f44906..c33b233c0228 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -2,7 +2,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 @@ -61,7 +61,7 @@ #include <expfld.hxx> #include <docufld.hxx> #include <ftninfo.hxx> -#include <section.hxx> // class SwSection +#include <section.hxx> // class SwSection #include <fltini.hxx> #include <w1par.hxx> @@ -140,8 +140,8 @@ Ww1Shell& operator <<(Ww1Shell& rOut, Ww1Manager& This) cUnknown = This.pDoc->Out(rOut, *This.pSeek); } This.SetStopAll(TRUE); - This.OutStop(rOut, cUnknown); // Damit die Attribute am Ende geschlossen - This.SetStopAll(FALSE); // werden + This.OutStop(rOut, cUnknown); // Damit die Attribute am Ende geschlossen + This.SetStopAll(FALSE); // werden return rOut; } @@ -232,7 +232,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown) bLHasTtp = HasTtp(); } - OutStop( rOut, cUnknown ); // Attrs ggfs. beenden + OutStop( rOut, cUnknown ); // Attrs ggfs. beenden // meta-zeichen interpretieren: if (!Ww1PlainText::IsChar(cUnknown)) @@ -253,7 +253,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown) break; case 0x0b: // linebreak if (rOut.IsInTable()) -// rOut.NextBand(); // war Stuss +// rOut.NextBand(); // war Stuss ; else rOut.NextLine(); @@ -271,7 +271,7 @@ void Ww1Manager::Out(Ww1Shell& rOut, sal_Unicode cUnknown) break; } - OutStart( rOut ); // Attrs ggfs. starten und Naechste Pos berechnen + OutStart( rOut ); // Attrs ggfs. starten und Naechste Pos berechnen } SvxFontItem Ww1Manager::GetFont(USHORT nFCode) @@ -331,7 +331,7 @@ void Ww1Bookmarks::Out(Ww1Shell& rOut, Ww1Manager& rMan, USHORT) } const String & rName = GetName(); - if( rName.EqualsAscii( "_Toc", 0, 4 ) ) // "_Toc*" ist ueberfluessig + if( rName.EqualsAscii( "_Toc", 0, 4 ) ) // "_Toc*" ist ueberfluessig return; if( rOut.IsFlagSet( SwFltControlStack::HYPO ) @@ -402,7 +402,7 @@ void Ww1Footnotes::Stop(Ww1Shell& /*rOut*/, Ww1Manager& rMan, sal_Unicode& c) if (bStarted && rMan.Where() > Where()) { DBG_ASSERT(nPlcIndex < Count(), "Ww1Footnotes"); -// DBG_ASSERT(c==0x02, "Ww1Footnotes"); // scheint Stuss zu sein +// DBG_ASSERT(c==0x02, "Ww1Footnotes"); // scheint Stuss zu sein c = ' '; (*this)++; } @@ -454,17 +454,17 @@ static WWDateTime GetTimeDatePara( const String& rForm, SwDateFormat* pDate = 0 ) { WWDateTime eDT = WW_BOTH; - if( STRING_NOTFOUND == rForm.Search( 'H' )) // H -> 24h + if( STRING_NOTFOUND == rForm.Search( 'H' )) // H -> 24h { if( pTime ) *pTime = TF_SSMM_24; } - else if( STRING_NOTFOUND == rForm.Search( 'H' )) // h -> 24h + else if( STRING_NOTFOUND == rForm.Search( 'H' )) // h -> 24h { if( pTime ) *pTime = TF_SSMM_12; } - else // keine Zeit + else // keine Zeit { eDT = (WWDateTime)( eDT & ~(USHORT)WW_TIME ); } @@ -472,7 +472,7 @@ static WWDateTime GetTimeDatePara( const String& rForm, xub_StrLen nDPos = 0; while( STRING_NOTFOUND != nDPos ) { - nDPos = rForm.Search( 'M', nDPos ); // M -> Datum + nDPos = rForm.Search( 'M', nDPos ); // M -> Datum if( !nDPos ) break; sal_Unicode cPrev = rForm.GetChar( nDPos - 1 ); @@ -483,7 +483,7 @@ static WWDateTime GetTimeDatePara( const String& rForm, ++nDPos; } - if( STRING_NOTFOUND != nDPos ) // Monat -> Datum ? + if( STRING_NOTFOUND != nDPos ) // Monat -> Datum ? { static SwDateFormat __READONLY_DATA aDateA[32] = { @@ -512,13 +512,13 @@ static WWDateTime GetTimeDatePara( const String& rForm, STRING_NOTFOUND != rForm.SearchAscii( "ddd" ) || STRING_NOTFOUND != rForm.SearchAscii( "DDD" ); - // M, MM -> numeric month - // MMM, MMMM -> text. month + // M, MM -> numeric month + // MMM, MMMM -> text. month BOOL bLitMonth = STRING_NOTFOUND != rForm.SearchAscii( "MMM" ); - // MMMM -> full month + // MMMM -> full month BOOL bFullMonth = STRING_NOTFOUND != rForm.SearchAscii( "MMMM" ); - // jj, JJ -> 2-col-year - // jjjj, JJJJ -> 4-col-year + // jj, JJ -> 2-col-year + // jjjj, JJJJ -> 4-col-year BOOL bFullYear = STRING_NOTFOUND != rForm.SearchAscii( "jjj" ) || STRING_NOTFOUND != rForm.SearchAscii( "JJJ" ) || STRING_NOTFOUND != rForm.SearchAscii( "yyy" ) || @@ -554,7 +554,7 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, USHORT nDepth) String sType; // der typ als string String sFormel; // die formel String sFormat; - String sDTFormat; // Datum / Zeit-Format + String sDTFormat; // Datum / Zeit-Format W1_FLD* pData = GetData(); // die an den plc gebunden daten DBG_ASSERT(pData->chGet()==19, "Ww1Fields"); // sollte beginn sein @@ -636,10 +636,10 @@ oncemore: REF_BOOKMARK, 0, REF_CONTENT ); -// pField = new SwGetExpField((SwGetExpFieldType*) -// rOut.GetSysFldType(RES_GETEXPFLD), sFormel, nsSwGetSetExpType::GSE_STRING); -// , -// nsSwGetSetExpType::GSE_STRING, VVF_SYS); +// pField = new SwGetExpField((SwGetExpFieldType*) +// rOut.GetSysFldType(RES_GETEXPFLD), sFormel, nsSwGetSetExpType::GSE_STRING); +// , +// nsSwGetSetExpType::GSE_STRING, VVF_SYS); break; case 6: // set command { @@ -729,15 +729,15 @@ oncemore: case 23: // print date case 25:{// edit time USHORT nSub; - USHORT nReg = 0; // RegInfoFormat, DefaultFormat fuer DocInfoFelder + USHORT nReg = 0; // RegInfoFormat, DefaultFormat fuer DocInfoFelder switch( rbType ) { default: - case 21: nSub = DI_CREATE; nReg = DI_SUB_DATE; break; - case 23: nSub = DI_PRINT; nReg = DI_SUB_DATE; break; - case 22: nSub = DI_CHANGE; nReg = DI_SUB_DATE; break; - case 25: nSub = DI_CHANGE; nReg = DI_SUB_TIME; break; + case 21: nSub = DI_CREATE; nReg = DI_SUB_DATE; break; + case 23: nSub = DI_PRINT; nReg = DI_SUB_DATE; break; + case 22: nSub = DI_CHANGE; nReg = DI_SUB_DATE; break; + case 25: nSub = DI_CHANGE; nReg = DI_SUB_TIME; break; } switch( GetTimeDatePara( sDTFormat ) ) { @@ -782,7 +782,7 @@ oncemore: SwTimeFormat aTime = TF_SYSTEM; WWDateTime eDT = GetTimeDatePara(sDTFormat, &aTime, &aDate); - if( eDT == WW_DONTKNOW ) // kein D/T-Formatstring + if( eDT == WW_DONTKNOW ) // kein D/T-Formatstring eDT = ( rbType == 32 ) ? WW_TIME : WW_DATE; // benutze ID if( eDT & WW_DATE ) @@ -832,7 +832,7 @@ oncemore: String aName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Ww" ))); aName += String::CreateFromInt32( nPlcIndex ); - SwFieldType* pFT = rOut.GetDoc().GetFldType( RES_SETEXPFLD, aName, false); + SwFieldType* pFT = rOut.GetDoc().GetFldType( RES_SETEXPFLD, aName, false); if (pFT == 0) { SwSetExpFieldType aS(&rOut.GetDoc(), aName, nsSwGetSetExpType::GSE_FORMULA); @@ -854,10 +854,10 @@ oncemore: break; aFName.SearchAndReplaceAscii( "\\\\", String( '\\' )); -// char* pBook = FindNextPara( pNext, 0 ); //!! Bookmark/Feld-Name -// //!! erstmal nicht +// char* pBook = FindNextPara( pNext, 0 ); //!! Bookmark/Feld-Name +// //!! erstmal nicht -// ConvertFFileName( aPara, pFName ); //!! WW1 ???? +// ConvertFFileName( aPara, pFName ); //!! WW1 ???? aFName = URIHelper::SmartRel2Abs( INetURLObject(rOut.GetBaseURL()), aFName ); @@ -890,15 +890,15 @@ oncemore: pField = new SwSetExpField((SwSetExpFieldType*)pFT, aStr ); ((SwSetExpField*)pField)->SetInputFlag( TRUE ); ((SwSetExpField*)pField)->SetSubType(nsSwExtendedSubType::SUB_INVISIBLE); -// pField.SetPromptText( aQ ); //!! fehlt noch -// aFld.SetPar2( aDef ); //!! dito +// pField.SetPromptText( aQ ); //!! fehlt noch +// aFld.SetPar2( aDef ); //!! dito // das Ignorieren des Bookmarks ist nicht implementiert } case 39: // fillin command pField = new SwInputField( (SwInputFieldType*)rOut.GetSysFldType( RES_INPUTFLD ), aEmptyStr, sFormel, - INP_TXT, 0 ); // sichtbar ( geht z.Zt. nicht anders ) + INP_TXT, 0 ); // sichtbar ( geht z.Zt. nicht anders ) break; case 51: // macro button { @@ -963,9 +963,9 @@ oncemore: case 4: // index entry // wwpar5: 1351/1454 case 5: // footnote ref -// pField = new SwGetRefField( -// (SwGetRefFieldType*)rDoc.GetSysFldType(RES_GETREFFLD), -// sFormel, REF_FOOTNOTE, 0, REF_BEGIN); +// pField = new SwGetRefField( +// (SwGetRefFieldType*)rDoc.GetSysFldType(RES_GETREFFLD), +// sFormel, REF_FOOTNOTE, 0, REF_BEGIN); case 7: // if command case 8: // create index // wwpar5: 1351/1454 @@ -1076,7 +1076,7 @@ void Ww1Pap::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&) aSprm.Stop(rOut, rMan); }else{ DBG_ASSERT( !nPlcIndex || rMan.IsStopAll(), "Pap-Attribut-Stop verloren" ); -// rMan.IsStopAll() ist nicht schoen. +// rMan.IsStopAll() ist nicht schoen. } } } @@ -1231,7 +1231,7 @@ void Ww1Style::Out(Ww1Shell& rOut, Ww1Manager& rMan) { // Zuerst Basis, damit Attribute des Basis-Styles erkannt werden // first: Base................................................ - if(pParent->GetStyle(stcBase).IsUsed() ) // Basis gueltig ? + if(pParent->GetStyle(stcBase).IsUsed() ) // Basis gueltig ? rOut.BaseStyle(stcBase); // next of all: CHP............................................... @@ -1307,12 +1307,12 @@ sal_Unicode Ww1PlainText::Out( sal_Unicode& rRead ) void Ww1SprmPapx::Start(Ww1Shell& rOut, Ww1Manager& rMan) { - if( !rMan.IsInStyle() ){ // Innerhalb Style gehts ueber die + if( !rMan.IsInStyle() ){ // Innerhalb Style gehts ueber die // normalen Attribute if (!rOut.IsInFly() - && !rOut.IsInTable() // Nicht innerhalb Tabelle! + && !rOut.IsInTable() // Nicht innerhalb Tabelle! && ( rMan.HasPPc() || rMan.HasPDxaAbs())){ // Fly-Start - rOut.BeginFly(); // eAnchor ); + rOut.BeginFly(); // eAnchor ); } if (!rOut.IsInTable() && rMan.HasInTable()) { @@ -1327,15 +1327,15 @@ void Ww1SprmPapx::Stop(Ww1Shell& rOut, Ww1Manager& rMan) { Ww1Sprm::Stop(rOut, rMan); - if( !rMan.IsInStyle() ) // Innerhalb Style gehts ueber die - { // normalen Attribute + if( !rMan.IsInStyle() ) // Innerhalb Style gehts ueber die + { // normalen Attribute if (rOut.IsInTable() &&( rMan.IsStopAll() || !rMan.HasInTable())) rOut.EndTable(); if( rOut.IsInFly() && ( rMan.IsStopAll() - || ( !rMan.HasPPc() && !rMan.HasPDxaAbs() // Fly-Ende - && !rOut.IsInTable()))) // Nicht innerhalb Tabelle! + || ( !rMan.HasPPc() && !rMan.HasPDxaAbs() // Fly-Ende + && !rOut.IsInTable()))) // Nicht innerhalb Tabelle! rOut.EndFly(); } } @@ -1479,7 +1479,7 @@ void Ww1Dop::Out(Ww1Shell& rOut) rFmt.SetFmtAttr(aUL); SwFtnInfo aInfo; - aInfo = rOut.GetDoc().GetFtnInfo(); // Copy-Ctor privat + aInfo = rOut.GetDoc().GetFtnInfo(); // Copy-Ctor privat // wo positioniert ? ( 0 == Section, 1 == Page, // 2 == beim Text -> Page, 3 == Doc ) switch( rDOP.fpcGet() ){ @@ -1487,7 +1487,7 @@ void Ww1Dop::Out(Ww1Shell& rOut) case 2: aInfo.ePos = FTNPOS_PAGE; break; default: aInfo.ePos = FTNPOS_CHAPTER; break; } -// aInfo.eNum = ( rDOP.fFtnRestartGet() ) ? FTNNUM_CHAPTER : FTNNUM_DOC; +// aInfo.eNum = ( rDOP.fFtnRestartGet() ) ? FTNNUM_CHAPTER : FTNNUM_DOC; // Da Sw unter Chapter anscheinend was anderes versteht als PMW // hier also immer Doc ! aInfo.eNum = FTNNUM_DOC; @@ -1640,16 +1640,16 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc) { const RES_POOL_COLLFMT_TYPE RES_NONE = RES_POOLCOLL_DOC_END; RES_POOL_COLLFMT_TYPE aType = RES_NONE; -// aType = RES_POOLCOLL_JAKETADRESS; break; -// aType = RES_POOLCOLL_LISTS_BEGIN; break; -// aType = RES_POOLCOLL_SENDADRESS; break; -// aType = RES_POOLCOLL_SIGNATURE; break; -// aType = RES_POOLCOLL_TEXT_NEGIDENT; break; -// aType = RES_POOLCOLL_TOX_IDXH; break; +// aType = RES_POOLCOLL_JAKETADRESS; break; +// aType = RES_POOLCOLL_LISTS_BEGIN; break; +// aType = RES_POOLCOLL_SENDADRESS; break; +// aType = RES_POOLCOLL_SIGNATURE; break; +// aType = RES_POOLCOLL_TEXT_NEGIDENT; break; +// aType = RES_POOLCOLL_TOX_IDXH; break; switch (stc) { case 222: // Null - aType = RES_POOLCOLL_TEXT; break; //??? + aType = RES_POOLCOLL_TEXT; break; //??? case 223: // annotation reference break; case 224: // annotation text @@ -1718,7 +1718,7 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc) aType = RES_POOLCOLL_TEXT_IDENT; break; case 0: // Normal aType = RES_POOLCOLL_STANDARD; break; -// aType = RES_POOLCOLL_TEXT; break; // Das ist "textkoerper" +// aType = RES_POOLCOLL_TEXT; break; // Das ist "textkoerper" } if (aType == RES_NONE) rOut.BeginStyle(stc, GetStyle(stc).GetName() ); @@ -1727,7 +1727,7 @@ void Ww1StyleSheet::OutOne(Ww1Shell& rOut, Ww1Manager& rMan, USHORT stc) OutDefaults(rOut, rMan, stc); GetStyle(stc).Out(rOut, rMan); rOut.EndStyle(); -// rMan.SetInApo(FALSE); +// rMan.SetInApo(FALSE); } // OutOneWithBase() liest einen Style mit OutOne() einen Style ein // Jedoch liest er, wenn noch nicht geschehen, den Basisstyle rekursiv ein @@ -1960,7 +1960,7 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1Manager& /*rMan*/) } break; case 97: // embedded bitmap -// case 99: // SH: bei meinem BspDoc 41738.doc auch embedded Bitmap, +// case 99: // SH: bei meinem BspDoc 41738.doc auch embedded Bitmap, // aber leider anderes Format { ULONG nSiz = GuessPicSize(pPic); @@ -2046,7 +2046,7 @@ void Ww1HeaderFooter::Start(Ww1Shell& rOut, Ww1Manager& rMan) void Ww1HeaderFooter::Stop(Ww1Shell& rOut, Ww1Manager& rMan, sal_Unicode&) { if (!rMan.Pushed() && eHeaderFooterMode != None -// && rMan.GetText().Where() >= rMan.GetText().Count() +// && rMan.GetText().Where() >= rMan.GetText().Count() ) { Start(rOut, rMan); diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx index c90e39b173a7..a7605be0b8c2 100644 --- a/sw/source/filter/ww1/w1par.cxx +++ b/sw/source/filter/ww1/w1par.cxx @@ -2,7 +2,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 @@ -32,12 +32,12 @@ #include <pam.hxx> // fuer SwPam #include <doc.hxx> -#include <ndtxt.hxx> // class SwTxtNode -#include <fltini.hxx> // Ww1Reader +#include <ndtxt.hxx> // class SwTxtNode +#include <fltini.hxx> // Ww1Reader #include <w1par.hxx> #include <swfltopt.hxx> -#include <mdiexp.hxx> // StatLine...() -#include <swerror.h> // ERR_WW1_... +#include <mdiexp.hxx> // StatLine...() +#include <swerror.h> // ERR_WW1_... #include <statstr.hrc> // ResId fuer Statusleiste //---------------------------------------- @@ -46,7 +46,7 @@ static ULONG WW1_Read_FieldIniFlags() { -// USHORT i; +// USHORT i; static const sal_Char* aNames[ 1 ] = { "WinWord/WW1F" }; sal_uInt32 aVal[ 1 ]; SwFilterOptions aOpt( 1, aNames, aVal ); @@ -76,7 +76,7 @@ ULONG WW1Reader::Read(SwDoc& rDoc, const String& rBaseURL, SwPaM& rPam, const St OSL_ENSURE(pStrm!=NULL, "W1-Read ohne Stream"); if (pStrm != NULL) { - BOOL bNew = !bInsertMode; // Neues Doc ( kein Einfuegen ) + BOOL bNew = !bInsertMode; // Neues Doc ( kein Einfuegen ) // erstmal eine shell konstruieren: die ist schnittstelle // zum writer-dokument @@ -109,7 +109,7 @@ ULONG WW1Reader::Read(SwDoc& rDoc, const String& rBaseURL, SwPaM& rPam, const St // das nicht unterstuetzt. Stattdessen temporaer // nur eine Warnung, bis die entsprechende // Meldung und Behandlung weiter oben eingebaut ist. -// nRet = WARN_WW6_FASTSAVE_ERR; +// nRet = WARN_WW6_FASTSAVE_ERR; // Zum Einchecken mit neuem String: nRet = ERR_WW6_FASTSAVE_ERR; } diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx index 01f5d66a7d97..0df49450a7a6 100644 --- a/sw/source/filter/ww1/w1par.hxx +++ b/sw/source/filter/ww1/w1par.hxx @@ -2,7 +2,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/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx index 6d5fdacc1ec7..e36f9735ac1f 100644 --- a/sw/source/filter/ww1/w1sprm.cxx +++ b/sw/source/filter/ww1/w1sprm.cxx @@ -2,7 +2,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 @@ -66,8 +66,8 @@ using namespace ::com::sun::star; void Ww1Sprm::Stop( Ww1Shell& rOut, Ww1Manager& rMan) { if(IsUsed()) -// for(USHORT i=0;i<Count();i++) - for(short i=Count()-1;i>=0;i--){ // rueckwaerts +// for(USHORT i=0;i<Count();i++) + for(short i=Count()-1;i>=0;i--){ // rueckwaerts BYTE nId; USHORT nSize; BYTE* pSprm; @@ -215,7 +215,7 @@ SvxBorderLine* Ww1SingleSprmPBrc::SetBorder(SvxBorderLine* pLine, W1_BRC10* pBrc switch(pBrc->dxpLine1WidthGet()) { default: OSL_ENSURE(FALSE, "unknown linewidth"); - case 0: return 0; // keine Linie + case 0: return 0; // keine Linie case 1: nCode = DEF_LINE_WIDTH_0; break; case 2: nCode = DEF_LINE_WIDTH_1; break; case 3: nCode = DEF_LINE_WIDTH_2; break; @@ -310,7 +310,7 @@ void Ww1SingleSprmPBrc10::Start( rOut.GetFlyFrmAttr(RES_BOX) :rOut.GetAttr(RES_BOX)); const SvxBoxItem &rBoxItem = (const SvxBoxItem&)rItem; SvxBoxItem aBox( rBoxItem ); -// rOut >> aBox; +// rOut >> aBox; SvxBorderLine aLine; aBox.SetLine(SetBorder(&aLine, pBrc), nBrcTrans[nLine] ); Ww1SingleSprmPBrc::Start(rOut, nId, pBrc, nSize, rMan, aBox); @@ -351,7 +351,7 @@ void Ww1SingleSprmPDyaLine::Start( SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING ); if(TRUE) {// MultilineSpace(proportional) - long n = nSpace * 100 / 240; // W1: 240 = 100%, SW: 100 = 100% + long n = nSpace * 100 / 240; // W1: 240 = 100%, SW: 100 = 100% if(n>200) n = 200; // SW_UI-Maximum aLSpc.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; @@ -369,17 +369,17 @@ void Ww1SingleSprmPChgTabsPapx::Start( Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT /*nSize*/, Ww1Manager& /*rMan*/) { #if OSL_DEBUG_LEVEL > 1 -// rOut << 'T'; +// rOut << 'T'; #endif - short nLeftPMgn = 0; // Koordinaten etwa gleich ?? -// ( pAktColl ) ? pCollA[nAktColl].nLeftParaMgn -// : nLeftParaMgn; // Absatz L-Space + short nLeftPMgn = 0; // Koordinaten etwa gleich ?? +// ( pAktColl ) ? pCollA[nAktColl].nLeftParaMgn +// : nLeftParaMgn; // Absatz L-Space short i; BYTE nDel = pSprm[1]; - BYTE* pDel = pSprm + 2; // Del - Array + BYTE* pDel = pSprm + 2; // Del - Array BYTE nIns = pSprm[nDel*2+2]; - BYTE* pIns = pSprm + 2*nDel + 3; // Ins - Array + BYTE* pIns = pSprm + 2*nDel + 3; // Ins - Array W1_TBD* pTyp = (W1_TBD*)(pSprm + 2*nDel + 2*nIns + 3);// Typ - Array SvxTabStopItem aAttr( (SvxTabStopItem&)rOut.GetNodeOrStyAttr( RES_PARATR_TABSTOP )); @@ -399,10 +399,10 @@ void Ww1SingleSprmPChgTabsPapx::Start( aTabStop.GetTabPos() = nPos; switch( pTyp[i].jcGet() ){ case 0: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_LEFT; break; - case 1: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_CENTER; break; + case 1: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_CENTER; break; case 2: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_RIGHT; break; - case 3: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_DECIMAL; break; - case 4: continue; // ignoriere Bar + case 3: aTabStop.GetAdjustment() = SVX_TAB_ADJUST_DECIMAL; break; + case 4: continue; // ignoriere Bar } switch( pTyp[i].tlcGet() ){ @@ -415,7 +415,7 @@ void Ww1SingleSprmPChgTabsPapx::Start( USHORT nPos2 = aAttr.GetPos( nPos ); if( nPos2 != SVX_TAB_NOTFOUND ) - aAttr.Remove( nPos2, 1 ); // sonst weigert sich das Insert() + aAttr.Remove( nPos2, 1 ); // sonst weigert sich das Insert() aAttr.Insert( aTabStop ); } @@ -447,7 +447,7 @@ void Ww1SingleSprmSColumns::Start( void Ww1SingleSprmPTtp::Start( Ww1Shell& /*rOut*/, BYTE, BYTE*, USHORT, Ww1Manager& rMan) { - rMan.SetInTtp( TRUE ); // Besonderheit: wird bei InTable::Stop und + rMan.SetInTtp( TRUE ); // Besonderheit: wird bei InTable::Stop und // nicht bei InTtp::Stop zurueckgesetzt, // da Auswertung in InTable } @@ -491,7 +491,7 @@ void Ww1SingleSprmTDefTable10::Start( Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT nSize, Ww1Manager& /*rMan*/) { USHORT i; - BYTE *p = pSprm + 2; // LaengenWord ueberlesen + BYTE *p = pSprm + 2; // LaengenWord ueberlesen BYTE nCount = *p; p++; nSize -= 3; @@ -503,26 +503,26 @@ void Ww1SingleSprmTDefTable10::Start( return; // Erstmal die Zellenpositionen einlesen - short nPos = SVBT16ToShort( p ); // signed, kann auch neg. sein !!! + short nPos = SVBT16ToShort( p ); // signed, kann auch neg. sein !!! -// if( !rOut.IsTableWidthSet() ){ // Muss Tabellenbreite und -Ausrichtung +// if( !rOut.IsTableWidthSet() ){ // Muss Tabellenbreite und -Ausrichtung // noch gesetzt werden ? { short nWholeWidth = SVBT16ToShort( p + 2 * nCount ) - nPos; - rOut.SetTableWidth( (USHORT)nWholeWidth ); // Tabellenbreite setzen + rOut.SetTableWidth( (USHORT)nWholeWidth ); // Tabellenbreite setzen // Pos der Tabelle setzen - long nMidTab = nPos + nWholeWidth / 2; // TabellenMitte + long nMidTab = nPos + nWholeWidth / 2; // TabellenMitte const SwFrmFmt &rFmt = rOut.GetPageDesc().GetMaster(); const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); long nRight = rFmt.GetFrmSize().GetWidth() - rLR.GetLeft() - rLR.GetRight(); sal_Int16 eOri = text::HoriOrientation::LEFT; - if( nPos > MINLAY ){ // per Zuppeln positioniert - if ( nMidTab <= nRight / 3 ) // 1/3 der Seite + if( nPos > MINLAY ){ // per Zuppeln positioniert + if ( nMidTab <= nRight / 3 ) // 1/3 der Seite eOri = text::HoriOrientation::LEFT; - else if ( nMidTab <= 2 * nRight / 3 ) // 2/3 der Seite + else if ( nMidTab <= 2 * nRight / 3 ) // 2/3 der Seite eOri = text::HoriOrientation::CENTER; else eOri = text::HoriOrientation::RIGHT; @@ -532,7 +532,7 @@ void Ww1SingleSprmTDefTable10::Start( BYTE* pEndPos = p+2; BYTE* pTc0 = ( nSize >= nCount * 10 ) ? pEndPos + 2 * nCount : 0; - USHORT nCellsDeleted = 0; // fuer gemergte Zellen + USHORT nCellsDeleted = 0; // fuer gemergte Zellen for( i = 0; i < nCount; i++ ){ // Info sammeln @@ -549,10 +549,10 @@ void Ww1SingleSprmTDefTable10::Start( pEndPos+=2; nPos = nPos1; - if( pTc0 ){ // gibts TCs ueberhaupt ? + if( pTc0 ){ // gibts TCs ueberhaupt ? W1_TC* pTc2 = (W1_TC*)pTc0; BOOL bMerged2 = pTc2->fMergedGet(); -// OSL_ENSURE( !bMerged2, "Gemergte Tabellenzellen noch nicht vollstaendig implementiert" ); +// OSL_ENSURE( !bMerged2, "Gemergte Tabellenzellen noch nicht vollstaendig implementiert" ); if( !bMerged2 ){ // und nun die Umrandungen SvxBoxItem aBox( (SvxBoxItem&)rOut.GetCellAttr( RES_BOX )); @@ -569,7 +569,7 @@ void Ww1SingleSprmTDefTable10::Start( rOut.DeleteCell( i - nCellsDeleted ); nCellsDeleted++; } - pTc0+=sizeof(W1_TC); // 10 + pTc0+=sizeof(W1_TC); // 10 } } } @@ -589,41 +589,41 @@ void Ww1SingleSprmPpc::Start( { BYTE nPpc = SVBT8ToByte(pSprm); - if (rOut.IsInTable()) // Flys in Tabellen kann PMW - return; // nicht + if (rOut.IsInTable()) // Flys in Tabellen kann PMW + return; // nicht - RndStdIds eAnchor; // Bindung + RndStdIds eAnchor; // Bindung sal_Int16 eHRel; // Seite oder Seitenrand sal_Int16 eVRel; // Seite oder Seitenrand - switch ( ( nPpc & 0x30 ) >> 4 ){ // Y - Bindung bestimmt Sw-Bindung + switch ( ( nPpc & 0x30 ) >> 4 ){ // Y - Bindung bestimmt Sw-Bindung case 0: eAnchor = FLY_AT_PARA; // Vert Margin eVRel = text::RelOrientation::PRINT_AREA; -// if( nYPos < 0 ) -// nYPos = 0; // koennen wir nicht +// if( nYPos < 0 ) +// nYPos = 0; // koennen wir nicht break; -/* case 1:*/ // Vert. Seite +/* case 1:*/ // Vert. Seite default:eAnchor = FLY_AT_PAGE; // Vert Page oder unknown eVRel = text::RelOrientation::FRAME; - break; // 2=Vert. Paragraph, 3=Use Default + break; // 2=Vert. Paragraph, 3=Use Default } switch ( ( nPpc & 0xc0 ) >> 6 ){ // X - Bindung -> Koordinatentransformation - case 0: // Hor. Spalte - case 1: // Hor. Absatz + case 0: // Hor. Spalte + case 1: // Hor. Absatz eHRel = text::RelOrientation::PRINT_AREA; -// nXPos += nPgLeft; // in Seiten-Koordinaten umrechnen +// nXPos += nPgLeft; // in Seiten-Koordinaten umrechnen break; -/* case 2:*/ // Hor. Seite +/* case 2:*/ // Hor. Seite default: eHRel = text::RelOrientation::FRAME; break; } if( !rOut.IsInFly() && rMan.IsInStyle() ){ - rOut.BeginFly( eAnchor ); // Starte StyleFly + rOut.BeginFly( eAnchor ); // Starte StyleFly }else{ - rOut.SetFlyAnchor( eAnchor ); // Setze Anker + rOut.SetFlyAnchor( eAnchor ); // Setze Anker } } @@ -633,21 +633,21 @@ void Ww1SingleSprmPDxaAbs::Start( short nXPos = SVBT16ToShort(pSprm); if( rMan.IsInStyle() && !rOut.IsInFly() ){ - rOut.BeginFly(); // Fly ohne PPc-Attribut + rOut.BeginFly(); // Fly ohne PPc-Attribut } sal_Int16 eHRel = text::RelOrientation::FRAME; sal_Int16 eHAlign = text::HoriOrientation::NONE; - switch( nXPos ){ // besondere X-Positionen ? + switch( nXPos ){ // besondere X-Positionen ? case 0: case -12: eHAlign = text::HoriOrientation::NONE; nXPos = 0; break; // Mogel: innen -> links // eigentich text::HoriOrientation::LEFT, aber dann verrueckt // ein Abstand nach aussen den Fly case -4: eHAlign = text::HoriOrientation::CENTER; nXPos = 0; break; // zentriert - case -8: // rechts + case -8: // rechts case -16: eHAlign = text::HoriOrientation::RIGHT; nXPos = 0; break; // Mogel: aussen -> rechts -// default: nXPos += (short)nIniFlyDx; break; // Korrekturen per Ini-Datei +// default: nXPos += (short)nIniFlyDx; break; // Korrekturen per Ini-Datei } rOut.SetFlyXPos( nXPos, eHRel, eHAlign ); } @@ -659,11 +659,11 @@ void Ww1SingleSprmPDyaAbs::Start( sal_Int16 eVRel = text::RelOrientation::FRAME; sal_Int16 eVAlign = text::VertOrientation::NONE; - switch( nYPos ){ // besondere Y-Positionen ? + switch( nYPos ){ // besondere Y-Positionen ? case -4: eVAlign = text::VertOrientation::TOP; nYPos = 0; break; // oben case -8: eVAlign = text::VertOrientation::CENTER; nYPos = 0; break; // zentriert case -12: eVAlign = text::VertOrientation::BOTTOM; nYPos = 0; break; // unten -// default: nYPos += (short)nIniFlyDy; break; // Korrekturen per Ini-Datei +// default: nYPos += (short)nIniFlyDy; break; // Korrekturen per Ini-Datei } rOut.SetFlyYPos( nYPos, eVRel, eVAlign ); } @@ -678,7 +678,7 @@ void Ww1SingleSprmPDxaWidth::Start( void Ww1SingleSprmPFromText::Start( Ww1Shell& rOut, BYTE /*nId*/, BYTE* pSprm, USHORT /*nSize*/, Ww1Manager& /*rMan*/) { - if( rOut.IsInFly() ){ // Kommt auch ausserhalb eines Flys vor, hat + if( rOut.IsInFly() ){ // Kommt auch ausserhalb eines Flys vor, hat // dann aber offensichtlich nichts zu bedeuten. // Einen impliziten Fly-Anfang bedeutet es // definitiv nicht diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx index 0cc2d7cf8c62..2009b93cda52 100644 --- a/sw/source/filter/ww1/w1struct.hxx +++ b/sw/source/filter/ww1/w1struct.hxx @@ -2,7 +2,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,22 +56,22 @@ struct W1_FIB ///////////////////////////////////////////////////////// SVBT16 fFlags; USHORT fFlagsGet() { return SVBT16ToShort(fFlags); } - // SVBT16 fDot :1;// 0xa 0001 + // SVBT16 fDot :1;// 0xa 0001 BOOL fDotGet() { return 0 != ((fFlagsGet() >> 0) & 1); } - // SVBT16 fGlsy :1;// 0002 + // SVBT16 fGlsy :1;// 0002 BOOL fGlsyGet() { return 0 != ((fFlagsGet() >> 1) & 1); } - // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format. + // SVBT16 fComplex :1;// 0004 when 1, file is in complex, fast-saved format. BOOL fComplexGet() { return 0 != ((fFlagsGet() >> 2) & 1); } - // SVBT16 fHasPic :1;// 0008 file contains 1 or more pictures + // SVBT16 fHasPic :1;// 0008 file contains 1 or more pictures BOOL fHasPicGet() { return 0 != ((fFlagsGet() >> 3) & 1); } - // SVBT16 cQuickSaves :4;// 00F0 count of times file was quicksaved + // SVBT16 cQuickSaves :4;// 00F0 count of times file was quicksaved USHORT cQuickSavesGet() { return (USHORT)((fFlagsGet() >> 4) & 0xf); } - // SVBT16 u1 :8;// FF00 unused + // SVBT16 u1 :8;// FF00 unused USHORT u1Get() { return (USHORT)((fFlagsGet() >> 8) & 0xff); } SVBT16 nFibBack;// 0xc @@ -213,46 +213,46 @@ struct W1_FIB ///////////////////////////////////////////////////////// SVBT32 fcPlcfsea;// 0xac file offset of PLC reserved for private use. The SEA is 6 bytes long. ULONG fcPlcfseaGet() { return SVBT32ToUInt32(fcPlcfsea); } - SVBT16 cbPlcfsea;// 0xb0 count of bytes of private use PLC. + SVBT16 cbPlcfsea;// 0xb0 count of bytes of private use PLC. USHORT cbPlcfseaGet() { return SVBT16ToShort(cbPlcfsea); } - SVBT32 fcSttbfffn;// 0xb2 file offset of font information STTBF. See the FFN file structure definition. + SVBT32 fcSttbfffn;// 0xb2 file offset of font information STTBF. See the FFN file structure definition. ULONG fcSttbfffnGet() { return SVBT32ToUInt32(fcSttbfffn); } - SVBT16 cbSttbfffn;// 0xb6 count of bytes in sttbfffn. + SVBT16 cbSttbfffn;// 0xb6 count of bytes in sttbfffn. USHORT cbSttbfffnGet() { return SVBT16ToShort(cbSttbfffn); } - SVBT32 fcPlcffldMom;// 0xb8 offset in doc stream to the PLC of field positions in the main document. + SVBT32 fcPlcffldMom;// 0xb8 offset in doc stream to the PLC of field positions in the main document. ULONG fcPlcffldMomGet() { return SVBT32ToUInt32(fcPlcffldMom); } SVBT16 cbPlcffldMom;// 0xbc USHORT cbPlcffldMomGet() { return SVBT16ToShort(cbPlcffldMom); } - SVBT32 fcPlcffldHdr;// 0xbe offset in doc stream to the PLC of field positions in the header subdocument. + SVBT32 fcPlcffldHdr;// 0xbe offset in doc stream to the PLC of field positions in the header subdocument. ULONG fcPlcffldHdrGet() { return SVBT32ToUInt32(fcPlcffldHdr); } SVBT16 cbPlcffldHdr;// 0xc2 USHORT cbPlcffldHdrGet() { return SVBT16ToShort(cbPlcffldHdr); } - SVBT32 fcPlcffldFtn;// 0xc4 offset in doc stream to the PLC of field positions in the footnote subdocument. + SVBT32 fcPlcffldFtn;// 0xc4 offset in doc stream to the PLC of field positions in the footnote subdocument. ULONG fcPlcffldFtnGet() { return SVBT32ToUInt32(fcPlcffldFtn); } SVBT16 cbPlcffldFtn;// 0xc8 USHORT cbPlcffldFtnGet() { return SVBT16ToShort(cbPlcffldFtn); } - SVBT32 fcPlcffldAtn;// 0xca offset in doc stream to the PLC of field positions in the annotation subdocument. + SVBT32 fcPlcffldAtn;// 0xca offset in doc stream to the PLC of field positions in the annotation subdocument. ULONG fcPlcffldAtnGet() { return SVBT32ToUInt32(fcPlcffldAtn); } SVBT16 cbPlcffldAtn;// 0xce USHORT cbPlcffldAtnGet() { return SVBT16ToShort(cbPlcffldAtn); } - SVBT32 fcPlcffldMcr;// 0xd0 offset in doc stream to the PLC of field positions in the macro subdocument. + SVBT32 fcPlcffldMcr;// 0xd0 offset in doc stream to the PLC of field positions in the macro subdocument. ULONG fcPlcffldMcrGet() { return SVBT32ToUInt32(fcPlcffldMcr); } SVBT16 cbPlcffldMcr;// 0xd4 @@ -419,13 +419,13 @@ struct W1_DOP ///////////////////////////////////// Document Properties // SVBT16 irmProps : 7; USHORT irmPropsGet() { return (USHORT)((fRvsFlagsGet() >> 8) & 0x7f); } - // SVBT16 fRevMarking : 1;// when 1, Word will mark revisions as the document is edited + // SVBT16 fRevMarking : 1;// when 1, Word will mark revisions as the document is edited BOOL fRevMarkingGet() { return 0 != ((fRvsFlagsGet() >> 15) & 1); } SVBT16 fSveFlags; USHORT fSveFlagsGet() { return SVBT16ToShort(fSveFlags); } - // SVBT16 fBackup : 1;// always make backup when document saved when 1. + // SVBT16 fBackup : 1;// always make backup when document saved when 1. BOOL fBackupGet() { return 0 != ((fSveFlagsGet() >> 0) & 1); } // SVBT16 fExactCWords : 1; @@ -437,10 +437,10 @@ struct W1_DOP ///////////////////////////////////// Document Properties // SVBT16 fPagResults : 1; BOOL fPagResultsGet() { return 0 != ((fSveFlagsGet() >> 3) & 1); } - // SVBT16 fLockAtn : 1;// when 1, annotations are locked for editing + // SVBT16 fLockAtn : 1;// when 1, annotations are locked for editing BOOL fLockAtnGet() { return 0 != ((fSveFlagsGet() >> 4) & 1); } - // SVBT16 fMirrorMargins : 1;// swap margins on left/right pages when 1. + // SVBT16 fMirrorMargins : 1;// swap margins on left/right pages when 1. BOOL fMirrorMarginsGet() { return 0 != ((fSveFlagsGet() >> 5) & 1); } // SVBT16 : 10;// unused @@ -468,80 +468,80 @@ struct W1_DOP ///////////////////////////////////// Document Properties SVBT16 dxaGutter; USHORT dxaGutterGet() { return SVBT16ToShort(dxaGutter); } - SVBT16 dxaTab;// 720 twips default tab width + SVBT16 dxaTab;// 720 twips default tab width USHORT dxaTabGet() { return SVBT16ToShort(dxaTab); } - SVBT16 wSpare;// + SVBT16 wSpare;// USHORT wSpareGet() { return SVBT16ToShort(wSpare); } - SVBT16 dxaHotZ;// width of hyphenation hot zone measured in twips + SVBT16 dxaHotZ;// width of hyphenation hot zone measured in twips USHORT dxaHotZGet() { return SVBT16ToShort(dxaHotZ); } - SVBT16 rgwSpare[2];// reserved - SVBT32 dttmCreated;// DTTM date and time document was created + SVBT16 rgwSpare[2];// reserved + SVBT32 dttmCreated;// DTTM date and time document was created ULONG dttmCreatedGet() { return SVBT32ToUInt32(dttmCreated); } - SVBT32 dttmRevised;// DTTM date and time document was last revised + SVBT32 dttmRevised;// DTTM date and time document was last revised ULONG dttmRevisedGet() { return SVBT32ToUInt32(dttmRevised); } - SVBT32 dttmLastPrint;// DTTM date and time document was last printed + SVBT32 dttmLastPrint;// DTTM date and time document was last printed ULONG dttmLastPrintGet() { return SVBT32ToUInt32(dttmLastPrint); } - SVBT16 nRevision;// number of times document has been revised since its creation + SVBT16 nRevision;// number of times document has been revised since its creation USHORT nRevisionGet() { return SVBT16ToShort(nRevision); } - SVBT32 tmEdited;// time document was last edited + SVBT32 tmEdited;// time document was last edited ULONG tmEditedGet() { return SVBT32ToUInt32(tmEdited); } - SVBT32 cWords;// count of words tallied by last Word Count execution + SVBT32 cWords;// count of words tallied by last Word Count execution ULONG cWordsGet() { return SVBT32ToUInt32(cWords); } - SVBT32 cCh;// count of characters tallied by last Word Count execution + SVBT32 cCh;// count of characters tallied by last Word Count execution ULONG cChGet() { return SVBT32ToUInt32(cCh); } - SVBT16 cPg;// count of pages tallied by last Word Count execution + SVBT16 cPg;// count of pages tallied by last Word Count execution USHORT cPgGet() { return SVBT16ToShort(cPg); } - SVBT16 rgwSpareDocSum[2]; + SVBT16 rgwSpareDocSum[2]; }; // cbDOP is 66. struct W1_CHP ///////////////////////////////////////////////////////// { - SVBT16 fChar; - SVBT16 ftc;// Font Code - SVBT8 hps;// Font size in half points - SVBT8 hpsPos;// Sub/Superscript ( signed number, 0 = normal ) - SVBT16 fText; - SVBT32 fcPic;// not stored in File - SVBT8 fnPic;// internal - SVBT16 hpsLargeChp;// ??? + SVBT16 fChar; + SVBT16 ftc;// Font Code + SVBT8 hps;// Font size in half points + SVBT8 hpsPos;// Sub/Superscript ( signed number, 0 = normal ) + SVBT16 fText; + SVBT32 fcPic;// not stored in File + SVBT8 fnPic;// internal + SVBT16 hpsLargeChp;// ??? W1_CHP() { memset( this, 0, sizeof( *this)); } - USHORT fCharGet() { return SVBT16ToShort(fChar); } + USHORT fCharGet() { return SVBT16ToShort(fChar); } void fCharSet(USHORT n) { ShortToSVBT16(n, fChar); } - BOOL fBoldGet() { return 0 != ((fCharGet() >> 0) & 1); } - void fBoldSet(BOOL b) { fCharSet( ( fCharGet() & 0xfffe ) | ( b << 0 ) ); } - BOOL fItalicGet() { return 0 != ((fCharGet() >> 1) & 1); } + BOOL fBoldGet() { return 0 != ((fCharGet() >> 0) & 1); } + void fBoldSet(BOOL b) { fCharSet( ( fCharGet() & 0xfffe ) | ( b << 0 ) ); } + BOOL fItalicGet() { return 0 != ((fCharGet() >> 1) & 1); } void fItalicSet(BOOL b) { fCharSet( ( fCharGet() & 0xfffd ) | ( b << 1 ) ); } - BOOL fStrikeGet() { return 0 != ((fCharGet() >> 2) & 1); } - BOOL fOutlineGet() { return 0 != ((fCharGet() >> 3) & 1); } - BOOL fFldVanishGet() { return 0 != ((fCharGet() >> 4) & 1); } - BOOL fSmallCapsGet() { return 0 != ((fCharGet() >> 5) & 1); } - BOOL fCapsGet() { return 0 != ((fCharGet() >> 6) & 1); } - BOOL fVanishGet() { return 0 != ((fCharGet() >> 7) & 1); } - BOOL fRMarkGet() { return 0 != ((fCharGet() >> 8) & 1); } - BOOL fSpecGet() { return 0 != ((fCharGet() >> 9) & 1); } - BOOL fsIcoGet() { return 0 != ((fCharGet() >> 10) & 1); } - BOOL fsFtcGet() { return 0 != ((fCharGet() >> 11) & 1); } - void fsFtcSet(BOOL b) { fCharSet( ( fCharGet() & 0xf7ff ) | ( b << 11 ) ); } - BOOL fsHpsGet() { return 0 != ((fCharGet() >> 12) & 1); } - void fsHpsSet(BOOL b) { fCharSet( ( fCharGet() & 0xefff ) | ( b << 12 ) ); } - BOOL fsKulGet() { return 0 != ((fCharGet() >> 13) & 1); } - void fsKulSet(BOOL b) { fCharSet( ( fCharGet() & 0xdfff ) | ( b << 13 ) ); } - BOOL fsPosGet() { return 0 != ((fCharGet() >> 14) & 1); } - BOOL fsSpaceGet() { return 0 != ((fCharGet() >> 15) & 1); } + BOOL fStrikeGet() { return 0 != ((fCharGet() >> 2) & 1); } + BOOL fOutlineGet() { return 0 != ((fCharGet() >> 3) & 1); } + BOOL fFldVanishGet() { return 0 != ((fCharGet() >> 4) & 1); } + BOOL fSmallCapsGet() { return 0 != ((fCharGet() >> 5) & 1); } + BOOL fCapsGet() { return 0 != ((fCharGet() >> 6) & 1); } + BOOL fVanishGet() { return 0 != ((fCharGet() >> 7) & 1); } + BOOL fRMarkGet() { return 0 != ((fCharGet() >> 8) & 1); } + BOOL fSpecGet() { return 0 != ((fCharGet() >> 9) & 1); } + BOOL fsIcoGet() { return 0 != ((fCharGet() >> 10) & 1); } + BOOL fsFtcGet() { return 0 != ((fCharGet() >> 11) & 1); } + void fsFtcSet(BOOL b) { fCharSet( ( fCharGet() & 0xf7ff ) | ( b << 11 ) ); } + BOOL fsHpsGet() { return 0 != ((fCharGet() >> 12) & 1); } + void fsHpsSet(BOOL b) { fCharSet( ( fCharGet() & 0xefff ) | ( b << 12 ) ); } + BOOL fsKulGet() { return 0 != ((fCharGet() >> 13) & 1); } + void fsKulSet(BOOL b) { fCharSet( ( fCharGet() & 0xdfff ) | ( b << 13 ) ); } + BOOL fsPosGet() { return 0 != ((fCharGet() >> 14) & 1); } + BOOL fsSpaceGet() { return 0 != ((fCharGet() >> 15) & 1); } // SVBT16 fBold :1;// 1 == opposite boldness of style // SVBT16 fItalic :1;// 1 == opposite of style // SVBT16 fStrike :1;// 1 == opposite of style @@ -559,28 +559,28 @@ struct W1_CHP ///////////////////////////////////////////////////////// // SVBT16 fsPos :1;// 1 == Char position (hpsPos) different to style // SVBT16 fsSpace :1;// 1 == Char Spacing (qpsSpace) different to style - USHORT ftcGet() { return SVBT16ToShort(ftc); } - void ftcSet(USHORT n) { ShortToSVBT16(n, ftc); } - void hpsSet(BYTE n) { ByteToSVBT8(n, hps); } - BYTE hpsGet() { return SVBT8ToByte(hps); } + USHORT ftcGet() { return SVBT16ToShort(ftc); } + void ftcSet(USHORT n) { ShortToSVBT16(n, ftc); } + void hpsSet(BYTE n) { ByteToSVBT8(n, hps); } + BYTE hpsGet() { return SVBT8ToByte(hps); } - BYTE hpsPosGet() { return SVBT8ToByte(hpsPos); } - USHORT fTextGet() { return SVBT16ToShort(fText); } + BYTE hpsPosGet() { return SVBT8ToByte(hpsPos); } + USHORT fTextGet() { return SVBT16ToShort(fText); } void fTextSet(USHORT n) { ShortToSVBT16(n, fText); } - USHORT qpsSpaceGet() { return (USHORT)((fTextGet() >> 0) & 0x3f); } - USHORT wSpare2Get() { return (USHORT)((fTextGet() >> 6) & 3); } - USHORT icoGet() { return (USHORT)((fTextGet() >> 8) & 0xf); } - USHORT kulGet() { return (USHORT)((fTextGet() >> 12) & 7); } - void kulSet(USHORT n) { fTextSet( ( fTextGet() & 0x8fff ) | ( ( n & 7 ) << 12 ) ); } - BOOL fSysVanishGet() { return 0 != ((fTextGet() >> 15) & 1); } + USHORT qpsSpaceGet() { return (USHORT)((fTextGet() >> 0) & 0x3f); } + USHORT wSpare2Get() { return (USHORT)((fTextGet() >> 6) & 3); } + USHORT icoGet() { return (USHORT)((fTextGet() >> 8) & 0xf); } + USHORT kulGet() { return (USHORT)((fTextGet() >> 12) & 7); } + void kulSet(USHORT n) { fTextSet( ( fTextGet() & 0x8fff ) | ( ( n & 7 ) << 12 ) ); } + BOOL fSysVanishGet() { return 0 != ((fTextGet() >> 15) & 1); } // SVBT16 qpsSpace :6;// Char Spacing, -7 .. 56; 57 = -7, 63 = -1 // SVBT16 wSpare2 : 2;// reserved // SVBT16 ico :4;// color of Text: 0=black, 1=blue, 2=cyan, 3=green, 4=magenta, 5=red, 6=yellow, 7=white // SVBT16 kul: 3;// Underline code: 0=none, 1=single, 2=by word, 3=double, 4=dotted // SVBT16 fSysVanish: 1;// used internally - ULONG fcPicGet() { return SVBT32ToUInt32(fcPic); } - USHORT fnPicGet() { return SVBT8ToByte(fnPic); } + ULONG fcPicGet() { return SVBT32ToUInt32(fcPic); } + USHORT fnPicGet() { return SVBT8ToByte(fnPic); } USHORT hpsLargeChpGet() { return SVBT16ToShort(hpsLargeChp); } void Out(Ww1Shell&, Ww1Manager&); @@ -588,24 +588,24 @@ struct W1_CHP ///////////////////////////////////////////////////////// struct W1_FFN ///////////////////////////////////////// Font Descriptor { - SVBT8 cbFfnM1;// 0x0 total length of FFN - 1. + SVBT8 cbFfnM1;// 0x0 total length of FFN - 1. USHORT cbFfnM1Get() { return SVBT8ToByte(cbFfnM1); } SVBT8 fFlags; USHORT fFlagsGet() { return SVBT8ToByte(fFlags); } - // SVBT8 prg : 2;// 0x1:03 pitch request + // SVBT8 prg : 2;// 0x1:03 pitch request USHORT prgGet() { return (USHORT)((fFlagsGet() >> 0) & 3); } - // SVBT8 fTrueType : 1;// 0x1:04 when 1, font is a TrueType font + // SVBT8 fTrueType : 1;// 0x1:04 when 1, font is a TrueType font BOOL fTrueTypeGet() { return 0 != ((fFlagsGet() >> 2) & 1); } - // SVBT8 : 1;// 0x1:08 reserved - // SVBT8 ff : 3;// 0x1:70 font family id + // SVBT8 : 1;// 0x1:08 reserved + // SVBT8 ff : 3;// 0x1:70 font family id USHORT ffGet() { return (USHORT)((fFlagsGet() >> 4) & 7); } - // SVBT8 : 1;// 0x1:80 reserved - BYTE szFfn[65];// 0x6 zero terminated string that records name of font. + // SVBT8 : 1;// 0x1:80 reserved + BYTE szFfn[65];// 0x6 zero terminated string that records name of font. // Vorsicht: Dieses Array kann auch kleiner sein!!! // Possibly followed by a second sz which records the name of an // alternate font to use if the first named font does not exist @@ -664,14 +664,14 @@ struct W1_BRC //////////////////////////////////////////// Border Code // 3 == double BYTE brcTypeGet() { return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 3) & 0x0003); } - // SVBT16 fShadow : 1;// 0020 when 1, border is drawn with shadow. Must be 0 + // SVBT16 fShadow : 1;// 0020 when 1, border is drawn with shadow. Must be 0 // when BRC is a substructure of the TC BYTE fShadowGet() { return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 5) & 0x0001); } // SVBT16 ico : 5;// 07C0 color code (see chp.ico) BYTE icoGet() { return sal::static_int_cast< sal_uInt8, sal_uInt16 >((aBitsGet() >> 6) & 0x001f); } - // SVBT16 dxpSpace : 5;// F800 width of space to maintain between border and + // SVBT16 dxpSpace : 5;// F800 width of space to maintain between border and // text within border. Must be 0 when BRC is a // substructure of the TC. Stored in points for Windows. BYTE dxpSpaceGet() { @@ -729,83 +729,83 @@ struct W1_PIC /////////////////////////////////////// PictureStructure USHORT cbHeaderGet() { return SVBT16ToShort(cbHeader); } struct MFP { - SVBT16 mm;// 0x6 int + SVBT16 mm;// 0x6 int USHORT mmGet() { return SVBT16ToShort(mm); } - SVBT16 xExt;// 0x8 int + SVBT16 xExt;// 0x8 int USHORT xExtGet() { return SVBT16ToShort(xExt); } - SVBT16 yExt;// 0xa int + SVBT16 yExt;// 0xa int USHORT yExtGet() { return SVBT16ToShort(yExt); } - SVBT16 hMF;// 0xc int + SVBT16 hMF;// 0xc int USHORT hMFGet() { return SVBT16ToShort(hMF); } } mfp; union W1_MFP_BMP { - SVBT8 bm[14];// 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. - SVBT8 rcWinMF[14];// 0xe rc (rectangle - 8 bytes) rect for window origin and extents when metafile is stored -- ignored if 0 + SVBT8 bm[14];// 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. + SVBT8 rcWinMF[14];// 0xe rc (rectangle - 8 bytes) rect for window origin and extents when metafile is stored -- ignored if 0 } MFP_BMP; - SVBT16 dxaGoal;// 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. + SVBT16 dxaGoal;// 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. USHORT dxaGoalGet() { return SVBT16ToShort(dxaGoal); } - SVBT16 dyaGoal;// 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. + SVBT16 dyaGoal;// 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. USHORT dyaGoalGet() { return SVBT16ToShort(dyaGoal); } - SVBT16 mx;// 0x20 horizontal scaling factor supplied by user in .1% units. + SVBT16 mx;// 0x20 horizontal scaling factor supplied by user in .1% units. USHORT mxGet() { return SVBT16ToShort(mx); } - SVBT16 my;// 0x22 vertical scaling factor supplied by user in .1% units. + SVBT16 my;// 0x22 vertical scaling factor supplied by user in .1% units. USHORT myGet() { return SVBT16ToShort(my); } - SVBT16 dxaCropLeft;// 0x24 the amount the picture has been cropped on the left in twips. + SVBT16 dxaCropLeft;// 0x24 the amount the picture has been cropped on the left in twips. USHORT dxaCropLeftGet() { return SVBT16ToShort(dxaCropLeft); } - SVBT16 dyaCropTop;// 0x26 the amount the picture has been cropped on the top in twips. + SVBT16 dyaCropTop;// 0x26 the amount the picture has been cropped on the top in twips. USHORT dyaCropTopGet() { return SVBT16ToShort(dyaCropTop); } SVBT16 dxaCropRight;// 0x28 the amount the picture has been cropped on the right in twips. USHORT dxaCropRightGet() { return SVBT16ToShort(dxaCropRight); } - SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. + SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. USHORT dyaCropBottomGet() { return SVBT16ToShort(dyaCropBottom); } SVBT16 flags; USHORT flagsGet() { return SVBT16ToShort(flags); } -// brcl : 4;// 000F Obsolete, superseded by brcTop, etc. In +// brcl : 4;// 000F Obsolete, superseded by brcTop, etc. In BYTE brclGet() { return sal::static_int_cast< BYTE, sal_uInt16 >(flagsGet() & 0xf); } -// fFrameEmpty : 1;// 0010 picture consists of a single frame +// fFrameEmpty : 1;// 0010 picture consists of a single frame BOOL fFrameEmptyGet() { return sal::static_int_cast< BYTE, sal_uInt16 >((flagsGet() >> 4) & 1); } // win6 stuff: -// fBitmap : 1;// 0020 ==1, when picture is just a bitmap -// BOOL fBitmapGet() { -// return (flagsGet() >> 5) & 1; } -// fDrawHatch : 1;// 0040 ==1, when picture is an active OLE object -// BOOL fDrawHatchGet() { -// return (flagsGet() >> 6) & 1; } -// fError : 1;// 0080 ==1, when picture is just an error message -// BOOL fErrorGet() { -// return (flagsGet() >> 7) & 1; } -// bpp : 8;// FF00 bits per pixel, 0 = unknown -// BYTE bppGet() { -// return (flagsGet() >> 8) & 0xff; } -// SVBT16 rgbrc[4]; -// USHORT rgbrcGet(USHORT nIndex) { -// return SVBT16ToShort(rgbrc[nIndex]); } -// W1_BRC brcTop;// 0x2e specification for border above picture -// W1_BRC brcLeft;// 0x30 specification for border to the left -// W1_BRC brcBottom;// 0x32 specification for border below picture -// W1_BRC brcRight;// 0x34 specification for border to the right -// SVBT16 dxaOrigin;// 0x36 horizontal offset of hand annotation origin -// USHORT dxaOriginGet() { -// return SVBT16ToShort(dxaOrigin); } -// SVBT16 dyaOrigin;// 0x38 vertical offset of hand annotation origin -// USHORT dyaOriginGet() { -// return SVBT16ToShort(dyaOrigin); } - SVBT8 rgb;// 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. +// fBitmap : 1;// 0020 ==1, when picture is just a bitmap +// BOOL fBitmapGet() { +// return (flagsGet() >> 5) & 1; } +// fDrawHatch : 1;// 0040 ==1, when picture is an active OLE object +// BOOL fDrawHatchGet() { +// return (flagsGet() >> 6) & 1; } +// fError : 1;// 0080 ==1, when picture is just an error message +// BOOL fErrorGet() { +// return (flagsGet() >> 7) & 1; } +// bpp : 8;// FF00 bits per pixel, 0 = unknown +// BYTE bppGet() { +// return (flagsGet() >> 8) & 0xff; } +// SVBT16 rgbrc[4]; +// USHORT rgbrcGet(USHORT nIndex) { +// return SVBT16ToShort(rgbrc[nIndex]); } +// W1_BRC brcTop;// 0x2e specification for border above picture +// W1_BRC brcLeft;// 0x30 specification for border to the left +// W1_BRC brcBottom;// 0x32 specification for border below picture +// W1_BRC brcRight;// 0x34 specification for border to the right +// SVBT16 dxaOrigin;// 0x36 horizontal offset of hand annotation origin +// USHORT dxaOriginGet() { +// return SVBT16ToShort(dxaOrigin); } +// SVBT16 dyaOrigin;// 0x38 vertical offset of hand annotation origin +// USHORT dyaOriginGet() { +// return SVBT16ToShort(dyaOrigin); } + SVBT8 rgb;// 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. BYTE* rgbGet() { return rgb; } }; @@ -818,11 +818,11 @@ struct W1_TBD ///////////////////////////////////////////////////////// // SVBT8 jc : 3;// 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar BYTE jcGet() { return aBits1Get() & 0x07; } -// SVBT8 tlc : 3;// 0x38 tab leader code: 0=no leader, 1=dotted leader, +// SVBT8 tlc : 3;// 0x38 tab leader code: 0=no leader, 1=dotted leader, // 2=hyphenated leader, 3=single line leader, 4=heavy line leader BYTE tlcGet() { return (aBits1Get() >> 3 ) & 0x07; } -// * int :2 C0 reserved +// * int :2 C0 reserved }; struct W1_TC ////////////////////////////////////////////////////////// @@ -835,9 +835,9 @@ struct W1_TC ////////////////////////////////////////////////////////// BYTE fMergedGet() { return (aBits1Get() >> 1 ) & 0x01; } SVBT8 aBits2; -// SVBT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. -// SVBT16 fMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell. -// SVBT16 fUnused : 14;// FFFC reserved +// SVBT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. +// SVBT16 fMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell. +// SVBT16 fUnused : 14;// FFFC reserved W1_BRC10 rgbrc[4];// notational convenience for referring to brcTop, brcLeft, etc fields. W1_BRC10* rgbrcGet() { return rgbrc; } diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx index 6d2f1e8d793b..545a33843ab8 100644 --- a/sw/source/filter/ww8/WW8FFData.cxx +++ b/sw/source/filter/ww8/WW8FFData.cxx @@ -2,7 +2,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 @@ -35,13 +35,13 @@ #include "writerwordglue.hxx" #include "wrtww8.hxx" -namespace sw +namespace sw { using sw::types::msword_cast; WW8FFData::WW8FFData() - : + : mnType(0), mnResult(0), mbOwnHelp(false), @@ -66,7 +66,7 @@ void WW8FFData::setHelp(const ::rtl::OUString & rHelp) msHelp = rHelp; mbOwnHelp = true; } - + void WW8FFData::setStatus(const ::rtl::OUString & rStatus) { msStatus = rStatus; @@ -84,13 +84,13 @@ void WW8FFData::WriteOUString(SvStream * pDataStrm, const ::rtl::OUString & rStr { sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength()); *pDataStrm << nStrLen; - SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero); + SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero); } void WW8FFData::Write(SvStream * pDataStrm) { ULONG nDataStt = pDataStrm->Tell(); - + static const sal_uInt8 aHeader[] = { 0,0,0,0, // len of struct @@ -107,72 +107,72 @@ void WW8FFData::Write(SvStream * pDataStrm) 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - + aData[4] = mnType | (mnResult << 2); - + if (mbOwnHelp) aData[4] |= (1 << 7); - + aData[5] = (mnTextType << 3); if (mbOwnStat) aData[5] |= 1; - + if (mbProtected) aData[5] |= (1 << 1); - + if (mbSize) aData[5] |= (1 << 2); - + if (mbRecalc) aData[5] |= (1 << 6); - + if (mbListBox) aData[5] |= (1 << 7); - + aData[6] = ::sal::static_int_cast<sal_uInt8>(mnMaxLen & 0xffff); aData[7] = ::sal::static_int_cast<sal_uInt8>(mnMaxLen >> 8); aData[8] = ::sal::static_int_cast<sal_uInt8>(mnCheckboxHeight & 0xffff); aData[9] = ::sal::static_int_cast<sal_uInt8>(mnCheckboxHeight >> 8); - + pDataStrm->Write(aData, sizeof(aData)); - + WriteOUString(pDataStrm, msName, true); - + if (mnType == 0) WriteOUString(pDataStrm, msDefault, true); else *pDataStrm << mnDefault; - + WriteOUString(pDataStrm, msFormat, true); WriteOUString(pDataStrm, msHelp, true); WriteOUString(pDataStrm, msStatus, true); WriteOUString(pDataStrm, msMacroEnter, true); WriteOUString(pDataStrm, msMacroExit, true); - + if (mnType == 2) { sal_uInt8 aData1[2] = { 0xff, 0xff }; pDataStrm->Write(aData1, sizeof(aData1)); - + sal_uInt32 nListboxEntries = msListEntries.size(); *pDataStrm << nListboxEntries; - + ::std::vector< ::rtl::OUString >::const_iterator aIt = msListEntries.begin(); - + while (aIt != msListEntries.end()) { const ::rtl::OUString & rEntry = *aIt; WriteOUString(pDataStrm, rEntry, false); - + aIt++; } } - + SwWW8Writer::WriteLong( *pDataStrm, nDataStt, pDataStrm->Tell() - nDataStt ); } - + } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index fcb46d5ff987..8ad7967b55f3 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -2,7 +2,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 @@ -41,7 +41,7 @@ private: sal_uInt8 mnType; // :2 0x3 sal_uInt8 mnResult; // :5 0x7c bool mbOwnHelp; // :1 0x80 - + // offset 5 bool mbOwnStat; // :1 0x01 bool mbProtected; // :1 0x02 @@ -49,13 +49,13 @@ private: sal_uInt8 mnTextType; // :3 0x38 bool mbRecalc; // :1 0x4 bool mbListBox; // :1 0x80 - + // offset 6 sal_uInt16 mnMaxLen; // :15 0x7fff maximum length of text field, 0 <=> no limit - + // offset 8 sal_uInt16 mnCheckboxHeight; - + // offset 10 and beyond ::rtl::OUString msName; ::rtl::OUString msDefault; // only for type == 0 @@ -65,16 +65,16 @@ private: ::rtl::OUString msStatus; ::rtl::OUString msMacroEnter; ::rtl::OUString msMacroExit; - + ::std::vector< ::rtl::OUString > msListEntries; - + protected: void WriteOUString(SvStream * pStream, const ::rtl::OUString & rStr, bool bAddZero); - + public: WW8FFData(); ~WW8FFData(); - + void setType(sal_uInt8 nType) { mnType = nType; } sal_uInt8 getType() const { return mnType; } void setResult(sal_uInt8 nResult) { mnResult = nResult; } @@ -109,9 +109,9 @@ public: const ::rtl::OUString & getMacroEnter() const { return msMacroEnter; } void setMacroExit(const ::rtl::OUString & rMacroExit) { msMacroExit = rMacroExit; } const ::rtl::OUString & getMacroExit() const { return msMacroExit; } - + void addListboxEntry(const ::rtl::OUString & rEntry); - + void Write(SvStream * pDataStrm); }; } diff --git a/sw/source/filter/ww8/WW8FibData.cxx b/sw/source/filter/ww8/WW8FibData.cxx index 5226f4b0d669..6a9cddd71052 100644 --- a/sw/source/filter/ww8/WW8FibData.cxx +++ b/sw/source/filter/ww8/WW8FibData.cxx @@ -2,7 +2,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/ww8/WW8FibData.hxx b/sw/source/filter/ww8/WW8FibData.hxx index b6a886be9886..0fd655dd861f 100644 --- a/sw/source/filter/ww8/WW8FibData.hxx +++ b/sw/source/filter/ww8/WW8FibData.hxx @@ -2,7 +2,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 @@ -43,7 +43,7 @@ public: void setReadOnlyRecommended(bool bReadOnlyRecommended); void setWriteReservation(bool bWriteReservation); - + bool getReadOnlyRecommended() const; bool getWriteReservation() const; }; diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index 07271945430a..28f3135baf74 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -2,7 +2,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 @@ -41,66 +41,66 @@ namespace ww8 : mn_offset(0), mn_size(nSize) { rSt.Seek(nPos); - + mp_data.reset(new BYTE[nSize]); - rSt.Read(mp_data.get(), nSize); + rSt.Read(mp_data.get(), nSize); } - + WW8Struct::WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize) - : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos), + : mp_data(pStruct->mp_data), mn_offset(pStruct->mn_offset + nPos), mn_size(nSize) { } - + WW8Struct::~WW8Struct() { } - + sal_uInt8 WW8Struct::getU8(sal_uInt32 nOffset) { sal_uInt8 nResult = 0; - + if (nOffset < mn_size) { nResult = mp_data[mn_offset + nOffset]; } - + return nResult; } - - ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset, + + ::rtl::OUString WW8Struct::getUString(sal_uInt32 nOffset, sal_uInt32 nCount) { ::rtl::OUString aResult; - + if (nCount > 0) { rtl_uString * pNew = 0; rtl_uString_newFromStr_WithLength (&pNew, reinterpret_cast<const sal_Unicode *>(&mp_data[mn_offset + nOffset]), nCount); - + aResult = rtl::OUString(pNew); } #ifdef DEBUG char sBuffer[256]; - snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", + snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", nOffset, nCount); - ::std::clog << "<WW8Struct-getUString" << sBuffer << ">" - << dbg_out(aResult) << "</WW8Struct-getUString>" + ::std::clog << "<WW8Struct-getUString" << sBuffer << ">" + << dbg_out(aResult) << "</WW8Struct-getUString>" << ::std::endl; #endif return aResult; - + } - ::rtl::OUString WW8Struct::getString(sal_uInt32 nOffset, + ::rtl::OUString WW8Struct::getString(sal_uInt32 nOffset, sal_uInt32 nCount) { ::rtl::OUString aResult; - + if (nCount > 0) { ::rtl::OString aOStr(reinterpret_cast<const sal_Char *>(&mp_data[mn_offset + nOffset]), @@ -108,17 +108,17 @@ namespace ww8 ::rtl::OUString aOUStr(rtl::OStringToOUString(aOStr, RTL_TEXTENCODING_ASCII_US)); aResult = rtl::OUString(aOUStr); } - + #ifdef DEBUG char sBuffer[256]; - snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", + snprintf(sBuffer, sizeof(sBuffer), "offset=\"%" SAL_PRIuUINT32 "\" count=\"%" SAL_PRIuUINT32 "\"", nOffset, nCount); - ::std::clog << "<WW8Struct-getString " << sBuffer << ">" - << dbg_out(aResult) << "</WW8Struct-getUString>" + ::std::clog << "<WW8Struct-getString " << sBuffer << ">" + << dbg_out(aResult) << "</WW8Struct-getUString>" << ::std::endl; #endif - return aResult; + return aResult; } } diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx index 0741a221a248..e1ce52815788 100644 --- a/sw/source/filter/ww8/WW8Sttbf.hxx +++ b/sw/source/filter/ww8/WW8Sttbf.hxx @@ -2,7 +2,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,31 +37,31 @@ namespace ww8 { typedef boost::shared_array<BYTE> DataArray_t; - + class WW8Struct : public ::sw::ExternalData { DataArray_t mp_data; sal_uInt32 mn_offset; sal_uInt32 mn_size; - + public: WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize); WW8Struct(WW8Struct * pStruct, sal_uInt32 nPos, sal_uInt32 nSize); virtual ~WW8Struct(); - + sal_uInt8 getU8(sal_uInt32 nOffset); - sal_uInt16 getU16(sal_uInt32 nOffset) + sal_uInt16 getU16(sal_uInt32 nOffset) { return getU8(nOffset) + (getU8(nOffset + 1) << 8); } sal_uInt32 getU32(sal_uInt32 nOffset) { return getU16(nOffset) + (getU16(nOffset + 1) << 16); } - + ::rtl::OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount); - + ::rtl::OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount); }; - + typedef ::std::vector<rtl::OUString> StringVector_t; template <class T> class WW8Sttb : public WW8Struct @@ -71,11 +71,11 @@ typedef ::std::vector<rtl::OUString> StringVector_t; bool bDoubleByteCharacters; StringVector_t m_Strings; ExtrasVector_t m_Extras; - + public: WW8Sttb(SvStream& rSt, INT32 nPos, sal_uInt32 nSize); virtual ~WW8Sttb(); - + sal_uInt32 getCount() const; ::rtl::OUString getEntry(sal_uInt32 nEntry) const { @@ -86,48 +86,48 @@ typedef ::std::vector<rtl::OUString> StringVector_t; { return m_Strings; } - + const T * getExtra(sal_uInt32 nEntry) const { return dynamic_cast<const T *> (m_Extras[nEntry].get()); } }; - + template <class T> WW8Sttb<T>::WW8Sttb(SvStream& rSt, INT32 nPos, sal_uInt32 nSize) : WW8Struct(rSt, nPos, nSize), bDoubleByteCharacters(false) { sal_uInt32 nOffset = 0; - + if (getU16(nOffset) == 0xffff) { bDoubleByteCharacters = true; nOffset += 2; } - + sal_uInt16 nCount = getU16(nOffset); sal_uInt16 ncbExtra = getU16(nOffset + 2); - + nOffset += 4; for (sal_uInt16 i = 0; i < nCount; i++) { if (bDoubleByteCharacters) { sal_uInt16 nStrLen = getU16(nOffset); - + m_Strings.push_back(getUString(nOffset +2, nStrLen)); - + nOffset += 2 + 2 * nStrLen; } else { sal_uInt8 nStrLen = getU8(nOffset); - + m_Strings.push_back(getUString(nOffset, nStrLen)); - + nOffset += 1 + nStrLen; } - + if (ncbExtra > 0) { ExtraPointer_t pExtra(new T(this, nOffset, ncbExtra)); @@ -137,7 +137,7 @@ typedef ::std::vector<rtl::OUString> StringVector_t; } } } - + template <class T> WW8Sttb<T>::~WW8Sttb() { diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index 0400babd7380..ca8205dce3be 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -2,7 +2,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 @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <iostream> +#include <iostream> #include <set> -#include <stdio.h> +#include <stdio.h> #include "WW8TableInfo.hxx" #include "fmtfsize.hxx" #include "attributeoutputbase.hxx" @@ -41,7 +41,7 @@ #include "ndtxt.hxx" #include "dbgoutsw.hxx" -namespace ww8 +namespace ww8 { // WW8TableNodeInfoInner @@ -92,7 +92,7 @@ void WW8TableNodeInfoInner::setShadowsAfter(sal_uInt32 nShadowsAfter) void WW8TableNodeInfoInner::setEndOfLine(bool bEndOfLine) { - mbEndOfLine = bEndOfLine; + mbEndOfLine = bEndOfLine; } void WW8TableNodeInfoInner::setEndOfCell(bool bEndOfCell) @@ -169,10 +169,10 @@ bool WW8TableNodeInfoInner::isFirstInTable() const const SwNode * WW8TableNodeInfoInner::getNode() const { const SwNode * pResult = NULL; - + if (mpParent != NULL) pResult = mpParent->getNode(); - + return pResult; } @@ -180,14 +180,14 @@ TableBoxVectorPtr WW8TableNodeInfoInner::getTableBoxesOfRow() { TableBoxVectorPtr pResult(new TableBoxVector); - WW8TableCellGrid::Pointer_t pCellGrid = + WW8TableCellGrid::Pointer_t pCellGrid = mpParent->getParent()->getCellGridForTable(getTable(), false); if (pCellGrid.get() == NULL) { const SwTableLine * pTabLine = getTableBox()->GetUpper(); const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes(); - + sal_uInt8 nBoxes = rTblBoxes.Count(); for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { @@ -209,27 +209,27 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase) OSL_ENSURE(pFmt,"Impossible"); if (!pFmt) return pResult; - + const SwFmtFrmSize &rSize = pFmt->GetFrmSize(); unsigned long nTblSz = static_cast<unsigned long>(rSize.GetWidth()); - + sal_uInt32 nPageSize = 0; bool bRelBoxSize = false; - + rBase.GetTablePageSize ( this, nPageSize, bRelBoxSize ); - + SwTwips nSz = 0; - Widths::const_iterator aWidthsEnd = pWidths->end(); - for ( Widths::const_iterator aIt = pWidths->begin(); - aIt != aWidthsEnd; + Widths::const_iterator aWidthsEnd = pWidths->end(); + for ( Widths::const_iterator aIt = pWidths->begin(); + aIt != aWidthsEnd; aIt++) { nSz += *aIt; SwTwips nCalc = nSz; if ( bRelBoxSize ) nCalc = ( nCalc * nPageSize ) / nTblSz; - + pResult->push_back( nCalc ); } @@ -240,11 +240,11 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow() { WidthsPtr pWidths; - WW8TableCellGrid::Pointer_t pCellGrid = + WW8TableCellGrid::Pointer_t pCellGrid = mpParent->getParent()->getCellGridForTable(getTable(), false); if (pCellGrid.get() == NULL) - { + { const SwTableBox * pTabBox = getTableBox(); const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes(); @@ -254,7 +254,7 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow() sal_uInt32 nBoxes = rTabBoxes.Count(); if ( nBoxes > 32 ) nBoxes = 32; - + for (sal_uInt32 n = 0; n < nBoxes; n++) { const SwFrmFmt* pBoxFmt = rTabBoxes[ n ]->GetFrmFmt(); @@ -273,9 +273,9 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() { RowSpansPtr pResult(new RowSpans); - WW8TableCellGrid::Pointer_t pCellGrid = + WW8TableCellGrid::Pointer_t pCellGrid = mpParent->getParent()->getCellGridForTable(getTable(), false); - + if (pCellGrid.get() == NULL) { const SwTableBox * pTabBox = getTableBox(); @@ -285,7 +285,7 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() sal_uInt32 nBoxes = rTabBoxes.Count(); if (nBoxes > 32) nBoxes = 32; - + for (sal_uInt32 n = 0; n < nBoxes; ++n) { pResult->push_back(rTabBoxes[n]->getRowSpan()); @@ -315,7 +315,7 @@ const SwRect & WW8TableNodeInfoInner::getRect() const string WW8TableNodeInfoInner::toString() const { static char buffer[256]; - snprintf(buffer, sizeof(buffer), + snprintf(buffer, sizeof(buffer), "<tableinner depth=\"%" SAL_PRIuUINT32 "\"" " cell=\"%" SAL_PRIuUINT32 "\"" " row=\"%" SAL_PRIuUINT32 "\"" @@ -330,15 +330,15 @@ string WW8TableNodeInfoInner::toString() const mnShadowsBefore, mnShadowsAfter, mbVertMerge ? "yes" : "no"); - + return string(buffer); } // WW8TableTextNodeInfo -WW8TableNodeInfo::WW8TableNodeInfo(WW8TableInfo * pParent, +WW8TableNodeInfo::WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pNode) : mpParent(pParent), - mnDepth(0), + mnDepth(0), mpNode(pNode), mpNext(NULL), mpNextNode(NULL) @@ -352,38 +352,38 @@ WW8TableNodeInfo::~WW8TableNodeInfo() ::std::string WW8TableNodeInfo::toString() const { static char buffer[1024]; - snprintf(buffer, sizeof(buffer), + snprintf(buffer, sizeof(buffer), "<tableNodeInfo p=\"%p\" depth=\"%" SAL_PRIuUINT32 "\">" ,this, getDepth()); ::std::string sResult(buffer); - + Inners_t::const_iterator aIt(mInners.begin()); Inners_t::const_iterator aEnd(mInners.end()); - + while (aIt != aEnd) { WW8TableNodeInfoInner::Pointer_t pInner = aIt->second; sResult += pInner->toString(); - + aIt++; } -#ifdef DEBUG +#ifdef DEBUG sResult += dbg_out(*mpNode); #endif sResult += "</tableNodeInfo>"; - + return sResult; } void WW8TableNodeInfo::setDepth(sal_uInt32 nDepth) { mnDepth = nDepth; - + Inners_t::iterator aIt = mInners.find(mnDepth); if (aIt == mInners.end()) mInners[mnDepth] = WW8TableNodeInfoInner::Pointer_t(new WW8TableNodeInfoInner(this)); - + mInners[mnDepth]->setDepth(mnDepth); } @@ -393,7 +393,7 @@ void WW8TableNodeInfo::setEndOfLine(bool bEndOfLine) pInner->setEndOfLine(bEndOfLine); #ifdef DEBUG - ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">" + ::std::clog << "<endOfLine depth=\"" << mnDepth << "\">" << toString() << "</endOfLine>" << ::std::endl; #endif } @@ -402,9 +402,9 @@ void WW8TableNodeInfo::setEndOfCell(bool bEndOfCell) { WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth); pInner->setEndOfCell(bEndOfCell); - + #ifdef DEBUG - ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">" + ::std::clog << "<endOfCell depth=\"" << mnDepth << "\">" << toString() << "</endOfCell>" << ::std::endl; #endif } @@ -416,9 +416,9 @@ void WW8TableNodeInfo::setFirstInTable(bool bFirstInTable) pInner->setFirstInTable(bFirstInTable); #ifdef DEBUG - ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">" + ::std::clog << "<firstInTable depth=\"" << mnDepth << "\">" << toString() << "</firstInTable>" << ::std::endl; -#endif +#endif } void WW8TableNodeInfo::setVertMerge(bool bVertMerge) @@ -426,10 +426,10 @@ void WW8TableNodeInfo::setVertMerge(bool bVertMerge) WW8TableNodeInfoInner::Pointer_t pInner = getInnerForDepth(mnDepth); pInner->setVertMerge(bVertMerge); - + #ifdef DEBUG - ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">" + ::std::clog << "<vertMerge depth=\"" << mnDepth << "\">" << toString() << "</vertMerge>" << ::std::endl; #endif } @@ -449,8 +449,8 @@ void WW8TableNodeInfo::setNext(WW8TableNodeInfo * pNext) mpNext = pNext; #ifdef DEBUG - ::std::clog << "<setnext><from>" << toString() << "</from><to>" - << pNext->toString() << "</to></setnext>" + ::std::clog << "<setnext><from>" << toString() << "</from><to>" + << pNext->toString() << "</to></setnext>" << ::std::endl; #endif } @@ -494,7 +494,7 @@ sal_uInt32 WW8TableNodeInfo::getDepth() const { if (mInners.size() > 0) return mInners.begin()->second->getDepth(); - + return mnDepth; } @@ -542,7 +542,7 @@ sal_uInt32 WW8TableNodeInfo::getCell() const { return getInnerForDepth(mnDepth)->getCell(); } - + sal_uInt32 WW8TableNodeInfo::getRow() const { return getInnerForDepth(mnDepth)->getRow(); @@ -556,26 +556,26 @@ const ww8::WW8TableNodeInfo::Inners_t & WW8TableNodeInfo::getInners() const const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getFirstInner() const { WW8TableNodeInfoInner::Pointer_t pResult; - + if (mInners.size() > 0) pResult = mInners.begin()->second; - + return pResult; } const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getInnerForDepth(sal_uInt32 nDepth) const { WW8TableNodeInfoInner::Pointer_t pResult; - + Inners_t::const_iterator aIt = mInners.find(nDepth); if (aIt != mInners.end()) { pResult = aIt->second; } - + return pResult; } - + // WW8TableInfo WW8TableInfo::WW8TableInfo() @@ -597,37 +597,37 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) SwRect aRect = aTableCellInfo.getRect(); #ifdef DEBUG - static char sBuffer[1024]; + static char sBuffer[1024]; ::std::clog << "<CellFrm>" << ::std::endl; - snprintf(sBuffer, sizeof(sBuffer), + snprintf(sBuffer, sizeof(sBuffer), "<rect top=\"%ld\" bottom=\"%ld\" left=\"%ld\" right=\"%ld\"/>", aRect.Top(), aRect.Bottom(), aRect.Left(), aRect.Right()); ::std::clog << sBuffer << ::std::endl; #endif const SwTableBox * pTableBox = aTableCellInfo.getTableBox(); const SwStartNode * pSttNd = pTableBox->GetSttNd(); - + if (pSttNd != NULL) { SwPaM aPam(*pSttNd, 0); - + bool bDone = false; do { SwNode & rNode = aPam.GetPoint()->nNode.GetNode(); insertTableNodeInfo(&rNode, pTable, pTableBox, 0, 0, 1, & aRect); - + if (rNode.IsEndNode()) { SwEndNode * pEndNode = rNode.GetEndNode(); SwStartNode * pTmpSttNd = pEndNode->StartOfSectionNode(); - + if (pTmpSttNd == pSttNd) - bDone = true; + bDone = true; } - + aPam.GetPoint()->nNode++; } while (!bDone); @@ -645,12 +645,12 @@ WW8TableInfo::processSwTableByLayout(const SwTable * pTable) void WW8TableInfo::processSwTable(const SwTable * pTable) { -#ifdef DEBUG +#ifdef DEBUG ::std::clog << "<processSwTable>" << ::std::endl; #endif WW8TableNodeInfo * pPrev = NULL; - + SwFrmFmt * pFrmFmt = pTable->GetFrmFmt(); if (pFrmFmt != NULL && pTable->IsTblComplex()) { @@ -664,21 +664,21 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) else { const SwTableLines & rLines = pTable->GetTabLines(); - + for (USHORT n = 0; n < rLines.Count(); n++) { const SwTableLine * pLine = rLines[n]; - + pPrev = processTableLine(pTable, pLine, n, 1, pPrev); } - + } if (pPrev != NULL) { SwTableNode * pTableNode = pTable->GetTableNode(); SwEndNode * pEndNode = pTableNode->EndOfSectionNode(); - + pPrev->setNextNode(pEndNode); } #ifdef DEBUG @@ -686,28 +686,28 @@ void WW8TableInfo::processSwTable(const SwTable * pTable) #endif } -WW8TableNodeInfo * -WW8TableInfo::processTableLine(const SwTable * pTable, - const SwTableLine * pTableLine, +WW8TableNodeInfo * +WW8TableInfo::processTableLine(const SwTable * pTable, + const SwTableLine * pTableLine, sal_uInt32 nRow, sal_uInt32 nDepth, WW8TableNodeInfo * pPrev) { #ifdef DEBUG - ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\"" + ::std::clog << "<processTableLine row=\"" << nRow << "\" depth=\"" << nDepth << "\">" << ::std::endl; #endif const SwTableBoxes & rBoxes = pTableLine->GetTabBoxes(); - + WW8TableNodeInfo::Pointer_t pTextNodeInfo; - + for (USHORT n = 0; n < rBoxes.Count(); n++) { const SwTableBox * pBox = rBoxes[n]; - + pPrev = processTableBox(pTable, pBox, nRow, n, nDepth, n == rBoxes.Count() - 1, pPrev); - } - + } + #ifdef DEBUG ::std::clog << "</processTableLine>" << ::std::endl; #endif @@ -724,22 +724,22 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, sal_uInt32 nDepth) { #ifdef DEBUG - ::std::clog << "<processTableBoxLines depth=\"" << nDepth + ::std::clog << "<processTableBoxLines depth=\"" << nDepth << "\" row=\"" << nRow << "\" cell=\"" << nCell << "\">" << ::std::endl; #endif const SwTableLines & rLines = pBox->GetTabLines(); WW8TableNodeInfo::Pointer_t pNodeInfo; - + if (rLines.Count() > 0) { for (sal_uInt32 n = 0; n < rLines.Count(); n++) { const SwTableLine * pLine = rLines[n]; const SwTableBoxes & rBoxes = pLine->GetTabBoxes(); - + for (USHORT nBox = 0; nBox < rBoxes.Count(); nBox++) - pNodeInfo = processTableBoxLines(rBoxes[nBox], pTable, pBoxToSet, nRow, nCell, nDepth); + pNodeInfo = processTableBoxLines(rBoxes[nBox], pTable, pBoxToSet, nRow, nCell, nDepth); } } else @@ -748,21 +748,21 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, const SwEndNode * pEndNd = pSttNd->EndOfSectionNode(); SwPaM aPaM(*pSttNd, 0); SwPaM aEndPaM(*pEndNd, 0); - + bool bDone = false; - while (!bDone) + while (!bDone) { SwNode & rNode = aPaM.GetPoint()->nNode.GetNode(); - - pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBoxToSet, nRow, nCell, nDepth); - + + pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBoxToSet, nRow, nCell, nDepth); + if (aPaM.GetPoint()->nNode == aEndPaM.GetPoint()->nNode) bDone = true; else aPaM.GetPoint()->nNode++; } } - + #ifdef DEBUG ::std::clog << "</processTableBoxLines>" << ::std::endl; #endif @@ -771,8 +771,8 @@ WW8TableInfo::processTableBoxLines(const SwTableBox * pBox, } WW8TableNodeInfo * -WW8TableInfo::processTableBox(const SwTable * pTable, - const SwTableBox * pBox, +WW8TableInfo::processTableBox(const SwTable * pTable, + const SwTableBox * pBox, sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth, @@ -790,30 +790,30 @@ WW8TableInfo::processTableBox(const SwTable * pTable, WW8TableNodeInfo::Pointer_t pEndOfCellInfo; if (rLines.Count() > 0) - { + { pNodeInfo = processTableBoxLines(pBox, pTable, pBox, nRow, nCell, nDepth); pNodeInfo->setEndOfCell(true); if (bEndOfLine) pNodeInfo->setEndOfLine(true); - + for (sal_uInt32 n = 0; n < rLines.Count(); n++) { const SwTableLine * pLine = rLines[n]; - + pPrev = processTableLine(pTable, pLine, n, 1, pPrev); } } else - { + { SwPaM aPaM(*pSttNd, 0); - + bool bDone = false; sal_uInt32 nDepthInsideCell = 0; - + do { SwNode & rNode = aPaM.GetPoint()->nNode.GetNode(); - + if (rNode.IsStartNode()) { if (nDepthInsideCell > 0) @@ -821,24 +821,24 @@ WW8TableInfo::processTableBox(const SwTable * pTable, nDepthInsideCell++; } - + pNodeInfo = insertTableNodeInfo(&rNode, pTable, pBox, nRow, nCell, nDepth); - + if (pPrev != NULL) pPrev->setNext(pNodeInfo.get()); - + pPrev = pNodeInfo.get(); - + if (nDepthInsideCell == 1 && rNode.IsTxtNode()) pEndOfCellInfo = pNodeInfo; - + if (rNode.IsEndNode()) { nDepthInsideCell--; if (nDepthInsideCell == 0 && pEndOfCellInfo.get() == NULL) pEndOfCellInfo = pNodeInfo; - + SwEndNode * pEndNode = rNode.GetEndNode( ); SwStartNode * pTmpSttNd = pEndNode->StartOfSectionNode(); if (pTmpSttNd == pSttNd) @@ -851,12 +851,12 @@ WW8TableInfo::processTableBox(const SwTable * pTable, if (pEndOfCellInfo.get() != NULL) { - pEndOfCellInfo->setEndOfCell(true); - + pEndOfCellInfo->setEndOfCell(true); + if (bEndOfLine) pEndOfCellInfo->setEndOfLine(true); } - } + } #ifdef DEBUG ::std::clog << "</processTableBox>" << ::std::endl; @@ -866,8 +866,8 @@ WW8TableInfo::processTableBox(const SwTable * pTable, } WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo -(const SwNode * pNode, - const SwTable * pTable, +(const SwNode * pNode, + const SwTable * pTable, const SwTableBox * pTableBox, sal_uInt32 nRow, sal_uInt32 nCell, @@ -875,10 +875,10 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo SwRect * pRect) { WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode); - + if (pNodeInfo.get() == NULL) { - pNodeInfo = + pNodeInfo = WW8TableNodeInfo::Pointer_t(new WW8TableNodeInfo(this, pNode)); mMap.insert(Map_t::value_type(pNode, pNodeInfo)); } @@ -904,7 +904,7 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::insertTableNodeInfo if (pRect) { WW8TableCellGrid::Pointer_t pCellGrid = getCellGridForTable(pTable); - + pCellGrid->insert(*pRect, pNodeInfo.get()); pNodeInfo->setRect(*pRect); } @@ -941,26 +941,26 @@ WW8TableNodeInfo::Pointer_t WW8TableInfo::getTableNodeInfo { WW8TableNodeInfo::Pointer_t pResult; Map_t::iterator aIt = mMap.find(pNode); - + if (aIt != mMap.end()) pResult = (*aIt).second; - + return pResult; } const SwNode * WW8TableInfo::getNextNode(const SwNode * pNode) { const SwNode * pResult = NULL; - + WW8TableNodeInfo::Pointer_t pNodeInfo = getTableNodeInfo(pNode); - + if (pNodeInfo.get() != NULL) { WW8TableNodeInfo * pNextInfo = pNodeInfo->getNext(); - + if (pNextInfo != NULL) pResult = pNextInfo->getNode(); - else + else { const SwNode * pNextNode = pNodeInfo->getNextNode(); @@ -968,7 +968,7 @@ const SwNode * WW8TableInfo::getNextNode(const SwNode * pNode) pResult = pNextNode; } } - + return pResult; } @@ -1032,8 +1032,8 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const ::std::string CellInfo::toString() const { static char sBuffer[256]; - - snprintf(sBuffer, sizeof(sBuffer), + + snprintf(sBuffer, sizeof(sBuffer), "<cellinfo left=\"%ld\"" " right=\"%ld\"" " top=\"%ld\"" @@ -1044,7 +1044,7 @@ bool CellInfo::operator < (const CellInfo & aCellInfo) const top(), bottom(), m_pNodeInfo); - + return sBuffer; } @@ -1087,7 +1087,7 @@ WW8TableCellGridRow::Pointer_t WW8TableCellGrid::getRow(long nTop, bool bCreate) } } else - pResult = m_aRows[nTop]; + pResult = m_aRows[nTop]; return pResult; } @@ -1112,7 +1112,7 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(long nTop) return getRow(nTop)->end(); } -void WW8TableCellGrid::insert(const SwRect & rRect, +void WW8TableCellGrid::insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, unsigned long * pFmtFrmWidth) { @@ -1149,15 +1149,15 @@ void WW8TableCellGrid::addShadowCells() SwRect aRect = aCellIt->getRect(); long nRowSpan = 1; while (aCellIt != aCellEndIt) - { + { WW8TableNodeInfo * pNodeInfo = aCellIt->getTableNodeInfo(); if (bBeginningOfCell) { RowTops_t::const_iterator aRowSpanIt(aTopsIt); - aRowSpanIt++; - - if (aRowSpanIt != getRowTopsEnd() && + aRowSpanIt++; + + if (aRowSpanIt != getRowTopsEnd() && *aRowSpanIt < aCellIt->bottom()) { aRect.Top(*aRowSpanIt); @@ -1170,30 +1170,30 @@ void WW8TableCellGrid::addShadowCells() bVertMerge = false; nRowSpan = 1; - while (aRowSpanIt != getRowTopsEnd() && + while (aRowSpanIt != getRowTopsEnd() && *aRowSpanIt < aCellIt->bottom()) { aRowSpanIt++; nRowSpan++; } - + if (pNodeInfo != NULL) pRowSpans->push_back(nRowSpan); else pRowSpans->push_back(-nRowSpan); } - + if (pNodeInfo != NULL) { pNodeInfo->setVertMerge(bVertMerge); } aCellIt++; - + bBeginningOfCell = (aRect.Left() != aCellIt->left()); aRect = aCellIt->getRect(); } - + WW8TableCellGridRow::Pointer_t pRow = getRow(*aTopsIt); if (pRow.get() != NULL) pRow->setRowSpans(pRowSpans); @@ -1217,7 +1217,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() CellInfoMultiSet::const_iterator aCellEndIt = getCellsEnd(*aTopsIt); GridColsPtr pWidths(new Widths); TableBoxVectorPtr pTableBoxes(new TableBoxVector); - + sal_uInt32 nShadows = 0; sal_uInt32 nCell = 0; bool bBeginningOfCell = true; @@ -1267,7 +1267,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() if (bBeginningOfCell) { pWidths->push_back(aCellIt->getFmtFrmWidth()); - + if (pNodeInfo != NULL) pTableBoxes->push_back(pNodeInfo->getTableBox()); else @@ -1292,7 +1292,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() } pLastNodeInfo->setShadowsAfter(nShadows); - + if (pEndOfCellInfo == NULL) { pEndOfCellInfo = pLastNodeInfo; @@ -1300,7 +1300,7 @@ WW8TableNodeInfo * WW8TableCellGrid::connectCells() pEndOfCellInfo->setEndOfCell(true); pLastNodeInfo->setEndOfLine(true); - + WW8TableCellGridRow::Pointer_t pRow(getRow(*aTopsIt)); pRow->setTableBoxVector(pTableBoxes); pRow->setWidths(pWidths); @@ -1390,7 +1390,7 @@ string WW8TableCellGrid::toString() } sResult += "</WW8TableCellGrid>\n"; - + return sResult; } @@ -1398,7 +1398,7 @@ TableBoxVectorPtr WW8TableCellGrid::getTableBoxesOfRow (WW8TableNodeInfoInner * pNodeInfoInner) { TableBoxVectorPtr pResult; - WW8TableCellGridRow::Pointer_t pRow = + WW8TableCellGridRow::Pointer_t pRow = getRow(pNodeInfoInner->getRect().Top(), false); if (pRow.get() != NULL) @@ -1414,7 +1414,7 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow { GridColsPtr pResult; - WW8TableCellGridRow::Pointer_t pRow = + WW8TableCellGridRow::Pointer_t pRow = getRow(pNodeInfoInner->getRect().Top(), false); if (pRow.get() != NULL) @@ -1423,27 +1423,27 @@ WidthsPtr WW8TableCellGrid::getWidthsOfRow } return pResult; -} +} RowSpansPtr WW8TableCellGrid::getRowSpansOfRow (WW8TableNodeInfoInner * pNodeInfoInner) { RowSpansPtr pResult; - - WW8TableCellGridRow::Pointer_t pRow = + + WW8TableCellGridRow::Pointer_t pRow = getRow(pNodeInfoInner->getRect().Top(), false); if (pRow.get() != NULL) { pResult = pRow->getRowSpans(); } - + return pResult; } WW8TableCellGridRow::WW8TableCellGridRow() : m_pCellInfos(new CellInfoMultiSet) -{ +{ } WW8TableCellGridRow::~WW8TableCellGridRow() @@ -1455,8 +1455,8 @@ void WW8TableCellGridRow::insert(const CellInfo & rCellInfo) m_pCellInfos->insert(rCellInfo); #ifdef DEBUG - ::std::clog << "<gridRowInsert>" - << rCellInfo.toString() + ::std::clog << "<gridRowInsert>" + << rCellInfo.toString() << "</gridRowInsert>" << ::std::endl; #endif @@ -1479,9 +1479,9 @@ void WW8TableCellGridRow::setTableBoxVector(TableBoxVectorPtr pTableBoxVector) void WW8TableCellGridRow::setWidths(WidthsPtr pWidths) { - m_pWidths = pWidths; + m_pWidths = pWidths; } - + void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) { m_pRowSpans = pRowSpans; diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index bd913e93fe65..9dc10486f251 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -2,7 +2,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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef WW8_TABLE_INFO_HXX #define WW8_TABLE_INFO_HXX #include <hash_map> @@ -49,7 +49,7 @@ namespace ww8 using namespace ::std; class WW8TableNodeInfo; -typedef boost::shared_ptr<SwRect> SwRectPtr; +typedef boost::shared_ptr<SwRect> SwRectPtr; typedef ::std::vector<const SwTableBox *> TableBoxVector; typedef boost::shared_ptr<TableBoxVector> TableBoxVectorPtr; typedef ::std::vector<sal_uInt32> GridCols; @@ -74,13 +74,13 @@ class WW8TableNodeInfoInner const SwTableBox * mpTableBox; const SwTable * mpTable; SwRect maRect; - + public: typedef boost::shared_ptr<WW8TableNodeInfoInner> Pointer_t; WW8TableNodeInfoInner(WW8TableNodeInfo * pParent); ~WW8TableNodeInfoInner(); - + void setDepth(sal_uInt32 nDepth); void setCell(sal_uInt32 nCell); void setRow(sal_uInt32 nRow); @@ -93,7 +93,7 @@ public: void setTableBox(const SwTableBox * pTableBox); void setTable(const SwTable * pTable); void setRect(const SwRect & rRect); - + sal_uInt32 getDepth() const; sal_uInt32 getCell() const; sal_uInt32 getRow() const; @@ -106,7 +106,7 @@ public: const SwTableBox * getTableBox() const; const SwTable * getTable() const; const SwRect & getRect() const; - + const SwNode * getNode() const; TableBoxVectorPtr getTableBoxesOfRow(); @@ -125,9 +125,9 @@ class WW8TableInfo; class WW8TableNodeInfo { public: - typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, + typedef map<sal_uInt32, WW8TableNodeInfoInner::Pointer_t, greater<sal_uInt32> > Inners_t; - + private: WW8TableInfo * mpParent; sal_uInt32 mnDepth; @@ -141,7 +141,7 @@ public: WW8TableNodeInfo(WW8TableInfo * pParent, const SwNode * pTxtNode); virtual ~WW8TableNodeInfo(); - + void setDepth(sal_uInt32 nDepth); void setEndOfLine(bool bEndOfLine); void setEndOfCell(bool bEndOfCell); @@ -156,7 +156,7 @@ public: void setNext(WW8TableNodeInfo * pNext); void setNextNode(const SwNode * pNode); void setRect(const SwRect & rRect); - + WW8TableInfo * getParent() const; sal_uInt32 getDepth() const; bool isEndOfLine() const; @@ -172,7 +172,7 @@ public: const Inners_t & getInners() const; const WW8TableNodeInfoInner::Pointer_t getFirstInner() const; const WW8TableNodeInfoInner::Pointer_t getInnerForDepth(sal_uInt32 nDepth) const; - + sal_uInt32 getCell() const; sal_uInt32 getRow() const; @@ -180,16 +180,16 @@ public: bool operator < (const WW8TableNodeInfo & rInfo) const; }; - + struct hashNode { - size_t operator()(const SwNode * pNode) const + size_t operator()(const SwNode * pNode) const { return reinterpret_cast<size_t>(pNode); } }; - + struct hashTable { - size_t operator()(const SwTable * pTable) const + size_t operator()(const SwTable * pTable) const { return reinterpret_cast<size_t>(pTable); } }; @@ -210,7 +210,7 @@ public: CellInfoMultiSet::const_iterator end() const; void setTableBoxVector(TableBoxVectorPtr pTableBoxVector); - void setWidths(WidthsPtr pGridCols); + void setWidths(WidthsPtr pGridCols); void setRowSpans(RowSpansPtr pRowSpans); TableBoxVectorPtr getTableBoxVector() const; @@ -225,7 +225,7 @@ class WW8TableCellGrid RowTops_t m_aRowTops; Rows_t m_aRows; - + WW8TableCellGridRow::Pointer_t getRow(long nTop, bool bCreate = true); RowTops_t::const_iterator getRowTopsBegin() const; RowTops_t::const_iterator getRowTopsEnd() const; @@ -238,7 +238,7 @@ public: WW8TableCellGrid(); ~WW8TableCellGrid(); - void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, + void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo, unsigned long * pFmtFrmWidth = NULL); void addShadowCells(); WW8TableNodeInfo * connectCells(); @@ -248,7 +248,7 @@ public: TableBoxVectorPtr getTableBoxesOfRow(WW8TableNodeInfoInner * pNodeInfo); WidthsPtr getWidthsOfRow(WW8TableNodeInfoInner * pNodeInfo); RowSpansPtr getRowSpansOfRow(WW8TableNodeInfoInner * pNodeInfo); -}; +}; class WW8TableInfo { @@ -260,21 +260,21 @@ class WW8TableInfo CellGridMap_t mCellGridMap; typedef hash_map<const SwTable *, const SwNode *, hashTable > FirstInTableMap_t; - FirstInTableMap_t mFirstInTableMap; + FirstInTableMap_t mFirstInTableMap; WW8TableNodeInfo * - processTableLine(const SwTable * pTable, + processTableLine(const SwTable * pTable, const SwTableLine * pTableLine, - sal_uInt32 nRow, + sal_uInt32 nRow, sal_uInt32 nDepth, WW8TableNodeInfo * pPrev); WW8TableNodeInfo * processTableBox(const SwTable * pTable, const SwTableBox * pTableBox, sal_uInt32 nRow, - sal_uInt32 nCell, + sal_uInt32 nCell, sal_uInt32 nDepth, bool bEndOfLine, WW8TableNodeInfo * pPrev); - + WW8TableNodeInfo::Pointer_t processTableBoxLines(const SwTableBox * pBox, const SwTable * pTable, @@ -282,25 +282,25 @@ class WW8TableInfo sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth); - + WW8TableNodeInfo::Pointer_t - insertTableNodeInfo(const SwNode * pNode, - const SwTable * pTable, + insertTableNodeInfo(const SwNode * pNode, + const SwTable * pTable, const SwTableBox * pTableBox, sal_uInt32 nRow, sal_uInt32 nCell, sal_uInt32 nDepth, SwRect * pRect = NULL); - WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable, + WW8TableCellGrid::Pointer_t getCellGridForTable(const SwTable * pTable, bool bCreate = true); - -public: + +public: typedef boost::shared_ptr<WW8TableInfo> Pointer_t; WW8TableInfo(); virtual ~WW8TableInfo(); - + void processSwTable(const SwTable * pTable); WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable); WW8TableNodeInfo::Pointer_t getTableNodeInfo(const SwNode * pNode); @@ -309,7 +309,7 @@ public: WW8TableNodeInfo * reorderByLayout(const SwTable * pTable); }; - + class CellInfo { SwRect m_aRect; @@ -320,7 +320,7 @@ public: CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo); CellInfo(const CellInfo & aRectAndTableInfo) - : m_aRect(aRectAndTableInfo.m_aRect), + : m_aRect(aRectAndTableInfo.m_aRect), m_pNodeInfo(aRectAndTableInfo.m_pNodeInfo), m_nFmtFrmWidth(aRectAndTableInfo.m_nFmtFrmWidth) { @@ -337,7 +337,7 @@ public: long width() const { return m_aRect.Width(); } long height() const { return m_aRect.Height(); } SwRect getRect() const { return m_aRect; } - WW8TableNodeInfo * getTableNodeInfo() const + WW8TableNodeInfo * getTableNodeInfo() const { return m_pNodeInfo; } unsigned long getFmtFrmWidth() const { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 37ceb71897c8..a6326f14c887 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -2,7 +2,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 @@ public: /// Output text (inside a run). virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ); - + /// Output text (without markup). virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); @@ -252,7 +252,7 @@ public: /// Start of the abstract numbering definition instance. virtual void StartAbstractNumbering( USHORT nId ); - + /// End of the abstract numbering definition instance. virtual void EndAbstractNumbering(); @@ -304,13 +304,13 @@ private: /// Output graphic fly frames. void FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize ); void WriteOLE2Obj( const SdrObject* pSdrObj, const Size& rSize ); - + void InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); - + void StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); void TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); @@ -517,7 +517,7 @@ protected: virtual void RefField( const SwField& rFld, const String& rRef ); virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); + virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); virtual void PostitField( const SwField* pFld ); virtual bool DropdownField( const SwField* pFld ); @@ -584,7 +584,7 @@ private: bool m_bParagraphOpened; - // Remember that a column break has to be opened at the + // Remember that a column break has to be opened at the // beginning of the next paragraph DocxColBreakStatus m_nColBreakStatus; @@ -603,13 +603,13 @@ public: /// Occasionnaly need to use this serializer from the outside ::sax_fastparser::FSHelperPtr GetSerializer( ) { return m_pSerializer; } - + /// Do we have any footnotes? bool HasFootnotes(); /// Do we have any endnotes? bool HasEndnotes(); - + /// Output the content of the footnotes.xml resp. endnotes.xml void FootnotesEndnotes( bool bFootnotes ); }; diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 2df417d6b877..ad916cdc3d50 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -2,7 +2,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 @@ -132,11 +132,11 @@ void DocxExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xu it < end; ++it ) { IMark* pMark = (*it); - + xub_StrLen nStart = pMark->GetMarkStart().nContent.GetIndex(); xub_StrLen nEnd = pMark->GetMarkEnd().nContent.GetIndex(); - if ( nStart == nAktPos ) + if ( nStart == nAktPos ) aStarts.push_back( pMark->GetName() ); if ( nEnd == nAktPos ) @@ -243,41 +243,41 @@ void DocxExport::DoComboBox(const rtl::OUString& rName, { m_pDocumentFS->startElementNS( XML_w, XML_ffData, FSEND ); - m_pDocumentFS->singleElementNS( XML_w, XML_name, + m_pDocumentFS->singleElementNS( XML_w, XML_name, FSNS( XML_w, XML_val ), OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); m_pDocumentFS->singleElementNS( XML_w, XML_enabled, FSEND ); if ( rHelp.getLength( ) > 0 ) - m_pDocumentFS->singleElementNS( XML_w, XML_helpText, + m_pDocumentFS->singleElementNS( XML_w, XML_helpText, FSNS( XML_w, XML_val ), OUStringToOString( rHelp, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); - + if ( rToolTip.getLength( ) > 0 ) - m_pDocumentFS->singleElementNS( XML_w, XML_statusText, + m_pDocumentFS->singleElementNS( XML_w, XML_statusText, FSNS( XML_w, XML_val ), OUStringToOString( rToolTip, RTL_TEXTENCODING_UTF8 ).getStr(), FSEND ); m_pDocumentFS->startElementNS( XML_w, XML_ddList, FSEND ); - + // Output the 0-based index of the selected value sal_uInt32 nListItems = rListItems.getLength(); sal_Int32 nId = 0; sal_uInt32 nI = 0; while ( ( nI < nListItems ) && ( nId == 0 ) ) { - if ( rListItems[nI] == rSelected ) + if ( rListItems[nI] == rSelected ) nId = nI; nI++; } - m_pDocumentFS->singleElementNS( XML_w, XML_result, + m_pDocumentFS->singleElementNS( XML_w, XML_result, FSNS( XML_w, XML_val ), rtl::OString::valueOf( nId ).getStr( ), FSEND ); // Loop over the entries - + for (sal_uInt32 i = 0; i < nListItems; i++) { m_pDocumentFS->singleElementNS( XML_w, XML_listEntry, @@ -332,7 +332,7 @@ void DocxExport::ExportDocument_Impl() WriteMainText(); WriteFootnotesEndnotes(); - + WriteNumbering(); WriteFonts(); @@ -384,7 +384,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode ) nRstLnNum = 0; AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo( ) ); - m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum ); + m_pSections->AppendSection( pAktPageDesc, pParentFmt, nRstLnNum ); } } } @@ -411,7 +411,7 @@ void DocxExport::OutputLinkedOLE( const OUString& ) ULONG DocxExport::ReplaceCr( BYTE ) { - // Completely unused for Docx export... only here for code sharing + // Completely unused for Docx export... only here for code sharing // purpose with binary export return 0; } @@ -549,7 +549,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/header" ), aName ); - + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" ) ); @@ -562,7 +562,7 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char* aRelId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), S( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer" ), aName ); - + pFS = m_pFilter->openFragmentStreamWithSerializer( OUStringBuffer().appendAscii( "word/" ).append( aName ).makeStringAndClear(), S( "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml" ) ); @@ -625,14 +625,14 @@ void DocxExport::WriteFonts() } -void DocxExport::WriteProperties( ) +void DocxExport::WriteProperties( ) { // Write the core properties SwDocShell* pDocShell( pDoc->GetDocShell( ) ); uno::Reference<document::XDocumentProperties> xDocProps; if ( pDocShell ) { - uno::Reference<document::XDocumentPropertiesSupplier> xDPS( + uno::Reference<document::XDocumentPropertiesSupplier> xDPS( pDocShell->GetModel( ), uno::UNO_QUERY ); xDocProps = xDPS->getDocumentProperties(); } @@ -652,7 +652,7 @@ void DocxExport::WriteMainText() // body m_pDocumentFS->startElementNS( XML_w, XML_body, FSEND ); - + pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex(); // the text diff --git a/sw/source/filter/ww8/docxexportfilter.hxx b/sw/source/filter/ww8/docxexportfilter.hxx index 0d6432a79805..a3ec5c1bbe7f 100644 --- a/sw/source/filter/ww8/docxexportfilter.hxx +++ b/sw/source/filter/ww8/docxexportfilter.hxx @@ -2,7 +2,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/ww8/docxfootnotes.hxx b/sw/source/filter/ww8/docxfootnotes.hxx index 1d715e7ff260..ed9f160c94b6 100644 --- a/sw/source/filter/ww8/docxfootnotes.hxx +++ b/sw/source/filter/ww8/docxfootnotes.hxx @@ -2,7 +2,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/ww8/dump/dump8.cxx b/sw/source/filter/ww8/dump/dump8.cxx index ecd8e4fb1944..67e9aa5ccea6 100644 --- a/sw/source/filter/ww8/dump/dump8.cxx +++ b/sw/source/filter/ww8/dump/dump8.cxx @@ -2,7 +2,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 @@ -127,7 +127,7 @@ void MyApp::Main() Execute(); } DeInit(); -// SvFactory::DeInit(); +// SvFactory::DeInit(); } // ----------------------------------------------------------------------- diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx index f9c6fe779409..b35a64bce7bf 100644 --- a/sw/source/filter/ww8/dump/dump8a.cxx +++ b/sw/source/filter/ww8/dump/dump8a.cxx @@ -2,7 +2,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 @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <string.h> // memset(), ... -#include <io.h> // access() +#include <string.h> // memset(), ... +#include <io.h> // access() #include <tools/solar.h> #include <sot/storage.hxx> @@ -47,12 +47,12 @@ WW8ScannerBase* pSBase = 0; //WW8PLCFMan* pPLCFMan = 0; -WW8Fib* pWwFib = 0; -SvStorageRef* pxStor; +WW8Fib* pWwFib = 0; +SvStorageRef* pxStor; SvStorageStreamRef xStrm; -SvStorageStreamRef xTableStream; // ist bei Ver6-7 mit xStrm identisch, +SvStorageStreamRef xTableStream; // ist bei Ver6-7 mit xStrm identisch, // ansonsten entweder 0TABLE oder 1TABLE -SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, +SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, // ansonsten DATA typedef void (*FNDumpData)( void* ); @@ -235,7 +235,7 @@ static void DumpNumList() for( USHORT nLevel = 0; nLevel < nWW8MaxListLevel; nLevel++ ) *xTableStream >> aStyleIdArr[ nLevel ]; *xTableStream >> nByte; - xTableStream->SeekRel( 1 ); // Dummy ueberlesen + xTableStream->SeekRel( 1 ); // Dummy ueberlesen *pOut << "ListId: " << nLstId << " TemplateId " << nTplId << endl1 @@ -334,7 +334,7 @@ static void DumpBookLow() *pOut << endl1; WW8PLCFspecial aStarts( &xStrm, pWwFib->fcPlcfbkf, pWwFib->lcbPlcfbkf, 4 ); - WW8PLCFspecial aEnds( &xStrm, pWwFib->fcPlcfbkl, pWwFib->lcbPlcfbkl, 0, -1, TRUE ); + WW8PLCFspecial aEnds( &xStrm, pWwFib->fcPlcfbkl, pWwFib->lcbPlcfbkl, 0, -1, TRUE ); USHORT i = 0; while( 1 ){ @@ -381,7 +381,7 @@ static void DumpBookHigh() *pOut << indent2 << i << ". Cp:" << hex6 << nPos << dec; *pOut << ( ( aBook.GetIsEnd() ) ? " Ende " : " Anfang" ); *pOut << " Handle: " << aBook.GetHandle(); -// *pOut << " Len: " << hex4 << aBook.GetLen() << dec; +// *pOut << " Len: " << hex4 << aBook.GetLen() << dec; ByteString sName( *aBook.GetName(), RTL_TEXTENCODING_MS_1252 ); if( sName.Len() ) *pOut << " Name: " << sName.GetBuffer() << endl1; @@ -422,51 +422,51 @@ static BOOL DumpField2( WW8PLCFspecial& rPlc ) { WW8_CP nSCode, nECode, nSRes, nERes; void* pData; - if( !rPlc.Get( nSCode, pData ) ) // Ende des Plc1 ? + if( !rPlc.Get( nSCode, pData ) ) // Ende des Plc1 ? return FALSE; rPlc++; if( ((BYTE*)pData)[0] != 19 ){ *pOut << "Field Error, " << (USHORT)((BYTE*)pData)[0] << endl1; - return TRUE; // nicht abbrechen + return TRUE; // nicht abbrechen } *pOut << " " << indent1 << begin1 << "Field" << " Cp: " << hex << nSCode << " Typ: " << dec << (USHORT)((BYTE*)pData)[1] << endl1; - if( !rPlc.Get( nECode, pData ) ) // Ende des Plc1 ? + if( !rPlc.Get( nECode, pData ) ) // Ende des Plc1 ? return FALSE; DumpShortPlainText( nSCode, nECode - nSCode, "Code" ); // Code, bei nested abgeschnitten - nSRes = nECode; // Default + nSRes = nECode; // Default - while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? - DumpField2( rPlc ); // nested Field im Beschreibungsteil - if( !rPlc.Get( nSRes, pData ) ) // Ende des Plc1 ? + while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? + DumpField2( rPlc ); // nested Field im Beschreibungsteil + if( !rPlc.Get( nSRes, pData ) ) // Ende des Plc1 ? return FALSE; } - if( ((BYTE*)pData)[0] == 20 ){ // Field Separator ? + if( ((BYTE*)pData)[0] == 20 ){ // Field Separator ? rPlc++; *pOut << " " << indent1 << "Field Seperator" << " Cp: " << hex << nSRes << ", Flags = 0x" << hex << (USHORT)((BYTE*)pData)[1] << dec << endl1; - if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? + if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? return FALSE; - while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? - DumpField2( rPlc ); // nested Field im Resultatteil - if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? + while( ((BYTE*)pData)[0] == 19 ){ // immer noch neue (nested) Anfaenge ? + DumpField2( rPlc ); // nested Field im Resultatteil + if( !rPlc.Get( nERes, pData ) ) // Ende des Plc1 ? return FALSE; } DumpShortPlainText( nSRes, nERes - nSRes, "Result" ); // Result, bei nested incl. nested Field }else{ - nERes = nSRes; // Kein Result vorhanden + nERes = nSRes; // Kein Result vorhanden } rPlc++; - if( ((BYTE*)pData)[0] == 21 ){ // Field Ende ? + if( ((BYTE*)pData)[0] == 21 ){ // Field Ende ? *pOut << " " << end1 << " Field " << " Cp: " << hex << nERes << ", Flags = 0x" << hex << (USHORT)((BYTE*)pData)[1] << dec << endl1; }else{ @@ -496,7 +496,7 @@ static void DumpField1( WW8_FC nPos, long nLen, char* pName ) << endl1; -// while( DumpField2( aPlc ) ){} +// while( DumpField2( aPlc ) ){} while( (long)aPlc.GetIdx() < aPlc.GetIMax() ) { DumpField3( aPlc ); @@ -525,7 +525,7 @@ static void DumpFonts() sOut = ByteString( p->sFontname, RTL_TEXTENCODING_MS_1252 ); *pOut << "Id:" << i << " Name:\"" << sOut.GetBuffer() << '"'; // Name - if( p->ibszAlt ) // gibt es einen alternativen Font ? + if( p->ibszAlt ) // gibt es einen alternativen Font ? { sOut = ByteString( p->sFontname.Copy( p->ibszAlt ), RTL_TEXTENCODING_MS_1252 ); @@ -542,7 +542,7 @@ static void DumpFonts() //----------------------------------------- -// class DFib +// class DFib //----------------------------------------- class DFib: public WW8Fib @@ -755,7 +755,7 @@ void DFib::Dump() } //----------------------------------------- -// class DStyle +// class DStyle //----------------------------------------- class DStyle: public WW8Style @@ -769,7 +769,7 @@ public: }; //----------------------------------------- -// universelle Hilfsroutinen +// universelle Hilfsroutinen //----------------------------------------- static void DumpIt( SvStream& rSt, short nLen ) @@ -819,7 +819,7 @@ static short DumpSprm( BYTE nVersion, SvStream& rSt, short nSprmsLen ) indent( *pOut, rSt ); BYTE x[512]; - rSt.Read( x, 512 ); // Token und folgende lesen + rSt.Read( x, 512 ); // Token und folgende lesen USHORT nId = WW8GetSprmId( nVersion, x, &nDelta ); @@ -846,9 +846,9 @@ static short DumpSprm( BYTE nVersion, SvStream& rSt, short nSprmsLen ) rSt.Seek( nSprmPos + 1 + nDelta + WW8SprmDataOfs( nId ) );// gehe zum eigentlichen // Inhalt if( rSprm.pOutFnc ) - rSprm.pOutFnc( rSt, nSprmNL ); // Rufe Ausgabefunktion + rSprm.pOutFnc( rSt, nSprmNL ); // Rufe Ausgabefunktion else - DumpItSmall( rSt, nSprmNL ); // oder Dumper + DumpItSmall( rSt, nSprmNL ); // oder Dumper *pOut << endl1; return nSprmsLen; @@ -873,7 +873,7 @@ static void DumpMemSprm( BYTE nVersion, INT16* pSprm ) BYTE* p = (BYTE*)pSprm; USHORT nId = WW8GetSprmId( nVersion, p, 0 ); - *pOut << (USHORT)p[0]; // Ausgabe: Token in Dez + *pOut << (USHORT)p[0]; // Ausgabe: Token in Dez *pOut << '/' << WW8GetSprmSizeBrutto( nVersion, p, &nId ); // Laenge incl. alles in Dez *pOut << '/' << WW8GetSprmSizeNetto( nVersion, p, &nId ); // Laenge excl Token in Dez @@ -884,7 +884,7 @@ static void DumpMemSprm( BYTE nVersion, INT16* pSprm ) //----------------------------------------- -// Hilfsroutinen: SEPX +// Hilfsroutinen: SEPX //----------------------------------------- void DumpSepx( BYTE nVersion, long nPos ) { @@ -901,7 +901,7 @@ void DumpSepx( BYTE nVersion, long nPos ) //----------------------------------------- -// Hilfsroutinen: FKP.CHPX, FKP.PAPX +// Hilfsroutinen: FKP.CHPX, FKP.PAPX //----------------------------------------- static void DumpPhe( WW8_PHE_Base& rPhe ) { @@ -957,7 +957,7 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) int i; WW8_FC aF[2]; BYTE c; - long nStartOfs = nPos + ( nElem + 1 ) * 4; // bei dieser Pos faengt Offset-Array an + long nStartOfs = nPos + ( nElem + 1 ) * 4; // bei dieser Pos faengt Offset-Array an short nOfs; WW8_PHE_Base aPhe; @@ -965,14 +965,14 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) { xStrm->Seek( nPos + i * 4 ); indent( *pOut, *xStrm ); - xStrm->Read( aF, sizeof( aF ) ); // lese 2 FCs + xStrm->Read( aF, sizeof( aF ) ); // lese 2 FCs xStrm->Seek( nStartOfs + i * nItemSize ); - xStrm->Read( &c, 1 ); // lese Word Offset ( evtl. Teil von BX ) + xStrm->Read( &c, 1 ); // lese Word Offset ( evtl. Teil von BX ) if( ePlc == PAP ) xStrm->Read( &aPhe, sizeof( aPhe ) ); - nOfs= c * 2; // -> Byte Offset + nOfs= c * 2; // -> Byte Offset xStrm->Seek( nPos + nOfs ); xStrm->Read( &c, 1 ); @@ -993,7 +993,7 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) break; case PAP: - short nLen = c * 2; // So weit bis zum naechsten ! + short nLen = c * 2; // So weit bis zum naechsten ! short nIStd; @@ -1015,18 +1015,18 @@ void DumpFkp( BYTE nVersion, long nPos, short nItemSize, ePLCFT ePlc ) } //----------------------------------------- -// WW8_DOP ( Document Properties ) +// WW8_DOP ( Document Properties ) //----------------------------------------- //!!! WW8LoadDop gibt's jetzt auch in WW8scan.cxx void DumpDop( WW8Fib& rFib ) { // nicht loeschen! - xTableStream->Seek( rFib.fcDop ); // diese Aktion dient lediglich dazu, die + xTableStream->Seek( rFib.fcDop ); // diese Aktion dient lediglich dazu, die // Positions-Ausgabe der folgenden Anweisung // mit dem alten Dumper uebereinstimmen zu lassen. -// *pOut << begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1; +// *pOut << begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1; begin( *pOut, *xTableStream ) << "Dop, Size " << rFib.lcbDop << ", DefaultSize 84" << endl1; WW8Dop* pD = new WW8Dop( *xTableStream, rFib.nFib, rFib.fcDop, rFib.lcbDop ); @@ -1153,7 +1153,7 @@ void DumpDop( WW8Fib& rFib ) } //----------------------------------------- -// PLCF.PCD ( Piece Table ) +// PLCF.PCD ( Piece Table ) //----------------------------------------- #ifdef __WW8_NEEDS_PACK @@ -1164,13 +1164,13 @@ struct WW8_PCD1 { BYTE aBits1; BYTE aBits2; -// INT16 fNoParaLast : 1; // when 1, means that piece contains no end of parag -// BYTE fPaphNil : 1; // used internally by Word -// BYTE fCopied : 1; // used internally by Word - // * int :5 -// BYTE aBits2; // fn int:8, used internally by Word - INT32 fc; // file offset of beginning of piece. The size of th - INT16 prm; // PRM contains either a single sprm or else an inde +// INT16 fNoParaLast : 1; // when 1, means that piece contains no end of parag +// BYTE fPaphNil : 1; // used internally by Word +// BYTE fCopied : 1; // used internally by Word + // * int :5 +// BYTE aBits2; // fn int:8, used internally by Word + INT32 fc; // file offset of beginning of piece. The size of th + INT16 prm; // PRM contains either a single sprm or else an inde }; #ifdef __WW8_NEEDS_PACK @@ -1248,12 +1248,12 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen ) indent( *pOut, *xTableStream ) << "grpprl No. " << i << ", Len: " << cb << endl1; long nPos = xTableStream->Tell(); - DumpSprms( nVersion, *xTableStream, cb ); // Dumpe Sprms - xTableStream->Seek( nPos + cb ); // gehe hinter grpprl + DumpSprms( nVersion, *xTableStream, cb ); // Dumpe Sprms + xTableStream->Seek( nPos + cb ); // gehe hinter grpprl nLen1 -= cb; i++; -// *pOut << " " << indent1 << "grpprl: " << cb << "Bytes ueberlesen"; -// *pOut << endl1; +// *pOut << " " << indent1 << "grpprl: " << cb << "Bytes ueberlesen"; +// *pOut << endl1; } INT32 nLen2; xTableStream->Read( &nLen2, 4 ); @@ -1268,7 +1268,7 @@ static void DumpPcd( BYTE nVersion, long nPos, long nLen ) } //----------------------------------------- -// PLCF.CHPX, PLCF.PAPX, PLCF.SEPX +// PLCF.CHPX, PLCF.PAPX, PLCF.SEPX //----------------------------------------- static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc ) @@ -1304,7 +1304,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc ) return; } -// SvStream* pSt = (SEP == ePlc) ? &xTableStream : &xStrm; +// SvStream* pSt = (SEP == ePlc) ? &xTableStream : &xStrm; SvStream* pSt = &xTableStream; WW8PLCF aPlc( pSt, nPos, nLen, pPlcSizeTab[ ePlc ] ); @@ -1411,7 +1411,7 @@ static void DumpPLCF( long nPos, long nLen, ePLCFT ePlc ) } //----------------------------------------- -// Text ohne Attribute +// Text ohne Attribute //----------------------------------------- static void DumpPlainText1( WW8_CP nStartCp, long nTextLen ) @@ -1430,7 +1430,7 @@ static void DumpPlainText1( WW8_CP nStartCp, long nTextLen ) *pOut << endl1; indent( *pOut, *xStrm ); } -// DumpChar( c ); +// DumpChar( c ); } } @@ -1456,7 +1456,7 @@ void DumpPlainText( WW8_CP nStartCp, long nTextLen, char* pName ) } //----------------------------------------- -// Text mit Attributen +// Text mit Attributen //----------------------------------------- BOOL DumpChar( BYTE c ) @@ -1466,7 +1466,7 @@ BOOL DumpChar( BYTE c ) return FALSE; }else{ switch (c){ - case 0xe4: // dt. Umlaute + case 0xe4: // dt. Umlaute case 0xf6: case 0xfc: case 0xdf: @@ -1486,7 +1486,7 @@ BOOL DumpChar( BYTE c ) } //----------------------------------------- -// Header / Footer +// Header / Footer //----------------------------------------- static void DumpPlcText( WW8_FC nPos, long nLen, long nOfs, @@ -1595,7 +1595,7 @@ void DumpTxtStoryEntry( void* pData ) short* ps = (short*)p; *pOut << " fReusable: 0x" << *ps++ << endl1; p = (long*)ps; - ++p; // reserved + ++p; // reserved *pOut << " " << indent1 << "lid: 0x" << *p++; *pOut << " txidUndo: 0x" << *p++ << dec << endl1; @@ -1760,27 +1760,27 @@ BOOL ReadEsherRec( SvStream& rStrm, UINT8& rVer, UINT16& rInst, const char* _GetShapeTypeNm( UINT16 nId ) { const char* aNmArr[ 202 + 2 + 1 ] = { -/* 0*/ "NotPrimitive","Rectangle","RoundRectangle","Ellipse","Diamond","IsocelesTriangle","RightTriangle","Parallelogram","Trapezoid","Hexagon", -/* 10*/ "Octagon","Plus","Star","Arrow","ThickArrow","HomePlate","Cube","Balloon","Seal","Arc", -/* 20*/ "Line","Plaque","Can","Donut","TextSimple","TextOctagon","TextHexagon","TextCurve","TextWave","TextRing", -/* 30*/ "TextOnCurve","TextOnRing","StraightConnector1","BentConnector2","BentConnector3","BentConnector4","BentConnector5","CurvedConnector2","CurvedConnector3","CurvedConnector4", -/* 40*/ "CurvedConnector5","Callout1","Callout2","Callout3","AccentCallout1","AccentCallout2","AccentCallout3","BorderCallout1","BorderCallout2","BorderCallout3", -/* 50*/ "AccentBorderCallout1","AccentBorderCallout2","AccentBorderCallout3","Ribbon","Ribbon2","Chevron","Pentagon","NoSmoking","Seal8","Seal16", -/* 60*/ "Seal32","WedgeRectCallout","WedgeRRectCallout","WedgeEllipseCallout","Wave","FoldedCorner","LeftArrow","DownArrow","UpArrow","LeftRightArrow", -/* 70*/ "UpDownArrow","IrregularSeal1","IrregularSeal2","LightningBolt","Heart","PictureFrame","QuadArrow","LeftArrowCallout","RightArrowCallout","UpArrowCallout", -/* 80*/ "DownArrowCallout","LeftRightArrowCallout","UpDownArrowCallout","QuadArrowCallout","Bevel","LeftBracket","RightBracket","LeftBrace","RightBrace","LeftUpArrow", -/* 90*/ "BentUpArrow","BentArrow","Seal24","StripedRightArrow","NotchedRightArrow","BlockArc","SmileyFace","VerticalScroll","HorizontalScroll","CircularArrow", -/* 100*/ "NotchedCircularArrow","UturnArrow","CurvedRightArrow","CurvedLeftArrow","CurvedUpArrow","CurvedDownArrow","CloudCallout","EllipseRibbon","EllipseRibbon2","FlowChartProcess", -/* 110*/ "FlowChartDecision","FlowChartInputOutput","FlowChartPredefinedProcess","FlowChartInternalStorage","FlowChartDocument","FlowChartMultidocument","FlowChartTerminator","FlowChartPreparation","FlowChartManualInput","FlowChartManualOperation", -/* 120*/ "FlowChartConnector","FlowChartPunchedCard","FlowChartPunchedTape","FlowChartSummingJunction","FlowChartOr","FlowChartCollate","FlowChartSort","FlowChartExtract","FlowChartMerge","FlowChartOfflineStorage", -/* 130*/ "FlowChartOnlineStorage","FlowChartMagneticTape","FlowChartMagneticDisk","FlowChartMagneticDrum","FlowChartDisplay","FlowChartDelay","TextPlainText","TextStop","TextTriangle","TextTriangleInverted", -/* 140*/ "TextChevron","TextChevronInverted","TextRingInside","TextRingOutside","TextArchUpCurve","TextArchDownCurve","TextCircleCurve","TextButtonCurve","TextArchUpPour","TextArchDownPour", -/* 150*/ "TextCirclePour","TextButtonPour","TextCurveUp","TextCurveDown","TextCascadeUp","TextCascadeDown","TextWave1","TextWave2","TextWave3","TextWave4", -/* 160*/ "TextInflate","TextDeflate","TextInflateBottom","TextDeflateBottom","TextInflateTop","TextDeflateTop","TextDeflateInflate","TextDeflateInflateDeflate","TextFadeRight","TextFadeLeft", -/* 170*/ "TextFadeUp","TextFadeDown","TextSlantUp","TextSlantDown","TextCanUp","TextCanDown","FlowChartAlternateProcess","FlowChartOffpageConnector","Callout90","AccentCallout90", -/* 180*/ "BorderCallout90","AccentBorderCallout90","LeftRightUpArrow","Sun","Moon","BracketPair","BracePair","Seal4","DoubleWave","ActionButtonBlank", -/* 190*/ "ActionButtonHome","ActionButtonHelp","ActionButtonInformation","ActionButtonForwardNext","ActionButtonBackPrevious","ActionButtonEnd","ActionButtonBeginning","ActionButtonReturn","ActionButtonDocument","ActionButtonSound", -/* 200*/ "ActionButtonMovie","HostControl","TextBox","Nil", "???" +/* 0*/ "NotPrimitive","Rectangle","RoundRectangle","Ellipse","Diamond","IsocelesTriangle","RightTriangle","Parallelogram","Trapezoid","Hexagon", +/* 10*/ "Octagon","Plus","Star","Arrow","ThickArrow","HomePlate","Cube","Balloon","Seal","Arc", +/* 20*/ "Line","Plaque","Can","Donut","TextSimple","TextOctagon","TextHexagon","TextCurve","TextWave","TextRing", +/* 30*/ "TextOnCurve","TextOnRing","StraightConnector1","BentConnector2","BentConnector3","BentConnector4","BentConnector5","CurvedConnector2","CurvedConnector3","CurvedConnector4", +/* 40*/ "CurvedConnector5","Callout1","Callout2","Callout3","AccentCallout1","AccentCallout2","AccentCallout3","BorderCallout1","BorderCallout2","BorderCallout3", +/* 50*/ "AccentBorderCallout1","AccentBorderCallout2","AccentBorderCallout3","Ribbon","Ribbon2","Chevron","Pentagon","NoSmoking","Seal8","Seal16", +/* 60*/ "Seal32","WedgeRectCallout","WedgeRRectCallout","WedgeEllipseCallout","Wave","FoldedCorner","LeftArrow","DownArrow","UpArrow","LeftRightArrow", +/* 70*/ "UpDownArrow","IrregularSeal1","IrregularSeal2","LightningBolt","Heart","PictureFrame","QuadArrow","LeftArrowCallout","RightArrowCallout","UpArrowCallout", +/* 80*/ "DownArrowCallout","LeftRightArrowCallout","UpDownArrowCallout","QuadArrowCallout","Bevel","LeftBracket","RightBracket","LeftBrace","RightBrace","LeftUpArrow", +/* 90*/ "BentUpArrow","BentArrow","Seal24","StripedRightArrow","NotchedRightArrow","BlockArc","SmileyFace","VerticalScroll","HorizontalScroll","CircularArrow", +/* 100*/ "NotchedCircularArrow","UturnArrow","CurvedRightArrow","CurvedLeftArrow","CurvedUpArrow","CurvedDownArrow","CloudCallout","EllipseRibbon","EllipseRibbon2","FlowChartProcess", +/* 110*/ "FlowChartDecision","FlowChartInputOutput","FlowChartPredefinedProcess","FlowChartInternalStorage","FlowChartDocument","FlowChartMultidocument","FlowChartTerminator","FlowChartPreparation","FlowChartManualInput","FlowChartManualOperation", +/* 120*/ "FlowChartConnector","FlowChartPunchedCard","FlowChartPunchedTape","FlowChartSummingJunction","FlowChartOr","FlowChartCollate","FlowChartSort","FlowChartExtract","FlowChartMerge","FlowChartOfflineStorage", +/* 130*/ "FlowChartOnlineStorage","FlowChartMagneticTape","FlowChartMagneticDisk","FlowChartMagneticDrum","FlowChartDisplay","FlowChartDelay","TextPlainText","TextStop","TextTriangle","TextTriangleInverted", +/* 140*/ "TextChevron","TextChevronInverted","TextRingInside","TextRingOutside","TextArchUpCurve","TextArchDownCurve","TextCircleCurve","TextButtonCurve","TextArchUpPour","TextArchDownPour", +/* 150*/ "TextCirclePour","TextButtonPour","TextCurveUp","TextCurveDown","TextCascadeUp","TextCascadeDown","TextWave1","TextWave2","TextWave3","TextWave4", +/* 160*/ "TextInflate","TextDeflate","TextInflateBottom","TextDeflateBottom","TextInflateTop","TextDeflateTop","TextDeflateInflate","TextDeflateInflateDeflate","TextFadeRight","TextFadeLeft", +/* 170*/ "TextFadeUp","TextFadeDown","TextSlantUp","TextSlantDown","TextCanUp","TextCanDown","FlowChartAlternateProcess","FlowChartOffpageConnector","Callout90","AccentCallout90", +/* 180*/ "BorderCallout90","AccentBorderCallout90","LeftRightUpArrow","Sun","Moon","BracketPair","BracePair","Seal4","DoubleWave","ActionButtonBlank", +/* 190*/ "ActionButtonHome","ActionButtonHelp","ActionButtonInformation","ActionButtonForwardNext","ActionButtonBackPrevious","ActionButtonEnd","ActionButtonBeginning","ActionButtonReturn","ActionButtonDocument","ActionButtonSound", +/* 200*/ "ActionButtonMovie","HostControl","TextBox","Nil", "???" }; if( 203 < nId ) nId = 204; @@ -1793,296 +1793,296 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp, const char* pRecNm = 0; switch( nId ) { - case 4: pRecNm = "DFF_Prop_Rotation"; break; + case 4: pRecNm = "DFF_Prop_Rotation"; break; // Protection - case 119: pRecNm = "DFF_Prop_LockRotation"; break; - case 120: pRecNm = "DFF_Prop_LockAspectRatio"; break; - case 121: pRecNm = "DFF_Prop_LockPosition"; break; - case 122: pRecNm = "DFF_Prop_LockAgainstSelect"; break; - case 123: pRecNm = "DFF_Prop_LockCropping"; break; - case 124: pRecNm = "DFF_Prop_LockVertices"; break; - case 125: pRecNm = "DFF_Prop_LockText"; break; - case 126: pRecNm = "DFF_Prop_LockAdjustHandles"; break; - case 127: pRecNm = "DFF_Prop_LockAgainstGrouping"; break; + case 119: pRecNm = "DFF_Prop_LockRotation"; break; + case 120: pRecNm = "DFF_Prop_LockAspectRatio"; break; + case 121: pRecNm = "DFF_Prop_LockPosition"; break; + case 122: pRecNm = "DFF_Prop_LockAgainstSelect"; break; + case 123: pRecNm = "DFF_Prop_LockCropping"; break; + case 124: pRecNm = "DFF_Prop_LockVertices"; break; + case 125: pRecNm = "DFF_Prop_LockText"; break; + case 126: pRecNm = "DFF_Prop_LockAdjustHandles"; break; + case 127: pRecNm = "DFF_Prop_LockAgainstGrouping"; break; // Text - case 128: pRecNm = "DFF_Prop_lTxid"; break; - case 129: pRecNm = "DFF_Prop_dxTextLeft"; break; - case 130: pRecNm = "DFF_Prop_dyTextTop"; break; - case 131: pRecNm = "DFF_Prop_dxTextRight"; break; - case 132: pRecNm = "DFF_Prop_dyTextBottom"; break; - case 133: pRecNm = "DFF_Prop_WrapText"; break; - case 134: pRecNm = "DFF_Prop_scaleText"; break; - case 135: pRecNm = "DFF_Prop_anchorText"; break; - case 136: pRecNm = "DFF_Prop_txflTextFlow"; break; - case 137: pRecNm = "DFF_Prop_cdirFont"; break; - case 138: pRecNm = "DFF_Prop_hspNext"; break; - case 139: pRecNm = "DFF_Prop_txdir"; break; - case 187: pRecNm = "DFF_Prop_SelectText"; break; - case 188: pRecNm = "DFF_Prop_AutoTextMargin"; break; - case 189: pRecNm = "DFF_Prop_RotateText"; break; - case 190: pRecNm = "DFF_Prop_FitShapeToText"; break; - case 191: pRecNm = "DFF_Prop_FitTextToShape"; break; + case 128: pRecNm = "DFF_Prop_lTxid"; break; + case 129: pRecNm = "DFF_Prop_dxTextLeft"; break; + case 130: pRecNm = "DFF_Prop_dyTextTop"; break; + case 131: pRecNm = "DFF_Prop_dxTextRight"; break; + case 132: pRecNm = "DFF_Prop_dyTextBottom"; break; + case 133: pRecNm = "DFF_Prop_WrapText"; break; + case 134: pRecNm = "DFF_Prop_scaleText"; break; + case 135: pRecNm = "DFF_Prop_anchorText"; break; + case 136: pRecNm = "DFF_Prop_txflTextFlow"; break; + case 137: pRecNm = "DFF_Prop_cdirFont"; break; + case 138: pRecNm = "DFF_Prop_hspNext"; break; + case 139: pRecNm = "DFF_Prop_txdir"; break; + case 187: pRecNm = "DFF_Prop_SelectText"; break; + case 188: pRecNm = "DFF_Prop_AutoTextMargin"; break; + case 189: pRecNm = "DFF_Prop_RotateText"; break; + case 190: pRecNm = "DFF_Prop_FitShapeToText"; break; + case 191: pRecNm = "DFF_Prop_FitTextToShape"; break; // GeoText - case 192: pRecNm = "DFF_Prop_gtextUNICODE"; break; - case 193: pRecNm = "DFF_Prop_gtextRTF"; break; - case 194: pRecNm = "DFF_Prop_gtextAlign"; break; - case 195: pRecNm = "DFF_Prop_gtextSize"; break; - case 196: pRecNm = "DFF_Prop_gtextSpacing"; break; - case 197: pRecNm = "DFF_Prop_gtextFont"; break; - case 240: pRecNm = "DFF_Prop_gtextFReverseRows"; break; - case 241: pRecNm = "DFF_Prop_fGtext"; break; - case 242: pRecNm = "DFF_Prop_gtextFVertical"; break; - case 243: pRecNm = "DFF_Prop_gtextFKern"; break; - case 244: pRecNm = "DFF_Prop_gtextFTight"; break; - case 245: pRecNm = "DFF_Prop_gtextFStretch"; break; - case 246: pRecNm = "DFF_Prop_gtextFShrinkFit"; break; - case 247: pRecNm = "DFF_Prop_gtextFBestFit"; break; - case 248: pRecNm = "DFF_Prop_gtextFNormalize"; break; - case 249: pRecNm = "DFF_Prop_gtextFDxMeasure"; break; - case 250: pRecNm = "DFF_Prop_gtextFBold"; break; - case 251: pRecNm = "DFF_Prop_gtextFItalic"; break; - case 252: pRecNm = "DFF_Prop_gtextFUnderline"; break; - case 253: pRecNm = "DFF_Prop_gtextFShadow"; break; - case 254: pRecNm = "DFF_Prop_gtextFSmallcaps"; break; - case 255: pRecNm = "DFF_Prop_gtextFStrikethrough"; break; + case 192: pRecNm = "DFF_Prop_gtextUNICODE"; break; + case 193: pRecNm = "DFF_Prop_gtextRTF"; break; + case 194: pRecNm = "DFF_Prop_gtextAlign"; break; + case 195: pRecNm = "DFF_Prop_gtextSize"; break; + case 196: pRecNm = "DFF_Prop_gtextSpacing"; break; + case 197: pRecNm = "DFF_Prop_gtextFont"; break; + case 240: pRecNm = "DFF_Prop_gtextFReverseRows"; break; + case 241: pRecNm = "DFF_Prop_fGtext"; break; + case 242: pRecNm = "DFF_Prop_gtextFVertical"; break; + case 243: pRecNm = "DFF_Prop_gtextFKern"; break; + case 244: pRecNm = "DFF_Prop_gtextFTight"; break; + case 245: pRecNm = "DFF_Prop_gtextFStretch"; break; + case 246: pRecNm = "DFF_Prop_gtextFShrinkFit"; break; + case 247: pRecNm = "DFF_Prop_gtextFBestFit"; break; + case 248: pRecNm = "DFF_Prop_gtextFNormalize"; break; + case 249: pRecNm = "DFF_Prop_gtextFDxMeasure"; break; + case 250: pRecNm = "DFF_Prop_gtextFBold"; break; + case 251: pRecNm = "DFF_Prop_gtextFItalic"; break; + case 252: pRecNm = "DFF_Prop_gtextFUnderline"; break; + case 253: pRecNm = "DFF_Prop_gtextFShadow"; break; + case 254: pRecNm = "DFF_Prop_gtextFSmallcaps"; break; + case 255: pRecNm = "DFF_Prop_gtextFStrikethrough"; break; // Blip - case 256: pRecNm = "DFF_Prop_cropFromTop"; break; - case 257: pRecNm = "DFF_Prop_cropFromBottom"; break; - case 258: pRecNm = "DFF_Prop_cropFromLeft"; break; - case 259: pRecNm = "DFF_Prop_cropFromRight"; break; - case 260: pRecNm = "DFF_Prop_pib"; break; - case 261: pRecNm = "DFF_Prop_pibName"; break; - case 262: pRecNm = "DFF_Prop_pibFlags"; break; - case 263: pRecNm = "DFF_Prop_pictureTransparent"; break; - case 264: pRecNm = "DFF_Prop_pictureContrast"; break; - case 265: pRecNm = "DFF_Prop_pictureBrightness"; break; - case 266: pRecNm = "DFF_Prop_pictureGamma"; break; - case 267: pRecNm = "DFF_Prop_pictureId"; break; - case 268: pRecNm = "DFF_Prop_pictureDblCrMod"; break; - case 269: pRecNm = "DFF_Prop_pictureFillCrMod"; break; - case 270: pRecNm = "DFF_Prop_pictureLineCrMod"; break; - case 271: pRecNm = "DFF_Prop_pibPrint"; break; - case 272: pRecNm = "DFF_Prop_pibPrintName"; break; - case 273: pRecNm = "DFF_Prop_pibPrintFlags"; break; - case 316: pRecNm = "DFF_Prop_fNoHitTestPicture"; break; - case 317: pRecNm = "DFF_Prop_pictureGray"; break; - case 318: pRecNm = "DFF_Prop_pictureBiLevel"; break; - case 319: pRecNm = "DFF_Prop_pictureActive"; break; + case 256: pRecNm = "DFF_Prop_cropFromTop"; break; + case 257: pRecNm = "DFF_Prop_cropFromBottom"; break; + case 258: pRecNm = "DFF_Prop_cropFromLeft"; break; + case 259: pRecNm = "DFF_Prop_cropFromRight"; break; + case 260: pRecNm = "DFF_Prop_pib"; break; + case 261: pRecNm = "DFF_Prop_pibName"; break; + case 262: pRecNm = "DFF_Prop_pibFlags"; break; + case 263: pRecNm = "DFF_Prop_pictureTransparent"; break; + case 264: pRecNm = "DFF_Prop_pictureContrast"; break; + case 265: pRecNm = "DFF_Prop_pictureBrightness"; break; + case 266: pRecNm = "DFF_Prop_pictureGamma"; break; + case 267: pRecNm = "DFF_Prop_pictureId"; break; + case 268: pRecNm = "DFF_Prop_pictureDblCrMod"; break; + case 269: pRecNm = "DFF_Prop_pictureFillCrMod"; break; + case 270: pRecNm = "DFF_Prop_pictureLineCrMod"; break; + case 271: pRecNm = "DFF_Prop_pibPrint"; break; + case 272: pRecNm = "DFF_Prop_pibPrintName"; break; + case 273: pRecNm = "DFF_Prop_pibPrintFlags"; break; + case 316: pRecNm = "DFF_Prop_fNoHitTestPicture"; break; + case 317: pRecNm = "DFF_Prop_pictureGray"; break; + case 318: pRecNm = "DFF_Prop_pictureBiLevel"; break; + case 319: pRecNm = "DFF_Prop_pictureActive"; break; // Geometry - case 320: pRecNm = "DFF_Prop_geoLeft"; break; - case 321: pRecNm = "DFF_Prop_geoTop"; break; - case 322: pRecNm = "DFF_Prop_geoRight"; break; - case 323: pRecNm = "DFF_Prop_geoBottom"; break; - case 324: pRecNm = "DFF_Prop_shapePath"; break; - case 325: pRecNm = "DFF_Prop_pVertices"; break; - case 326: pRecNm = "DFF_Prop_pSegmentInfo"; break; - case 327: pRecNm = "DFF_Prop_adjustValue"; break; - case 328: pRecNm = "DFF_Prop_adjust2Value"; break; - case 329: pRecNm = "DFF_Prop_adjust3Value"; break; - case 330: pRecNm = "DFF_Prop_adjust4Value"; break; - case 331: pRecNm = "DFF_Prop_adjust5Value"; break; - case 332: pRecNm = "DFF_Prop_adjust6Value"; break; - case 333: pRecNm = "DFF_Prop_adjust7Value"; break; - case 334: pRecNm = "DFF_Prop_adjust8Value"; break; - case 335: pRecNm = "DFF_Prop_adjust9Value"; break; - case 336: pRecNm = "DFF_Prop_adjust10Value"; break; - case 378: pRecNm = "DFF_Prop_fShadowOK"; break; - case 379: pRecNm = "DFF_Prop_f3DOK"; break; - case 380: pRecNm = "DFF_Prop_fLineOK"; break; - case 381: pRecNm = "DFF_Prop_fGtextOK"; break; - case 382: pRecNm = "DFF_Prop_fFillShadeShapeOK"; break; - case 383: pRecNm = "DFF_Prop_fFillOK"; break; + case 320: pRecNm = "DFF_Prop_geoLeft"; break; + case 321: pRecNm = "DFF_Prop_geoTop"; break; + case 322: pRecNm = "DFF_Prop_geoRight"; break; + case 323: pRecNm = "DFF_Prop_geoBottom"; break; + case 324: pRecNm = "DFF_Prop_shapePath"; break; + case 325: pRecNm = "DFF_Prop_pVertices"; break; + case 326: pRecNm = "DFF_Prop_pSegmentInfo"; break; + case 327: pRecNm = "DFF_Prop_adjustValue"; break; + case 328: pRecNm = "DFF_Prop_adjust2Value"; break; + case 329: pRecNm = "DFF_Prop_adjust3Value"; break; + case 330: pRecNm = "DFF_Prop_adjust4Value"; break; + case 331: pRecNm = "DFF_Prop_adjust5Value"; break; + case 332: pRecNm = "DFF_Prop_adjust6Value"; break; + case 333: pRecNm = "DFF_Prop_adjust7Value"; break; + case 334: pRecNm = "DFF_Prop_adjust8Value"; break; + case 335: pRecNm = "DFF_Prop_adjust9Value"; break; + case 336: pRecNm = "DFF_Prop_adjust10Value"; break; + case 378: pRecNm = "DFF_Prop_fShadowOK"; break; + case 379: pRecNm = "DFF_Prop_f3DOK"; break; + case 380: pRecNm = "DFF_Prop_fLineOK"; break; + case 381: pRecNm = "DFF_Prop_fGtextOK"; break; + case 382: pRecNm = "DFF_Prop_fFillShadeShapeOK"; break; + case 383: pRecNm = "DFF_Prop_fFillOK"; break; // FillStyle - case 384: pRecNm = "DFF_Prop_fillType"; break; - case 385: pRecNm = "DFF_Prop_fillColor"; break; - case 386: pRecNm = "DFF_Prop_fillOpacity"; break; - case 387: pRecNm = "DFF_Prop_fillBackColor"; break; - case 388: pRecNm = "DFF_Prop_fillBackOpacity"; break; - case 389: pRecNm = "DFF_Prop_fillCrMod"; break; - case 390: pRecNm = "DFF_Prop_fillBlip"; break; - case 391: pRecNm = "DFF_Prop_fillBlipName"; break; - case 392: pRecNm = "DFF_Prop_fillBlipFlags"; break; - case 393: pRecNm = "DFF_Prop_fillWidth"; break; - case 394: pRecNm = "DFF_Prop_fillHeight"; break; - case 395: pRecNm = "DFF_Prop_fillAngle"; break; - case 396: pRecNm = "DFF_Prop_fillFocus"; break; - case 397: pRecNm = "DFF_Prop_fillToLeft"; break; - case 398: pRecNm = "DFF_Prop_fillToTop"; break; - case 399: pRecNm = "DFF_Prop_fillToRight"; break; - case 400: pRecNm = "DFF_Prop_fillToBottom"; break; - case 401: pRecNm = "DFF_Prop_fillRectLeft"; break; - case 402: pRecNm = "DFF_Prop_fillRectTop"; break; - case 403: pRecNm = "DFF_Prop_fillRectRight"; break; - case 404: pRecNm = "DFF_Prop_fillRectBottom"; break; - case 405: pRecNm = "DFF_Prop_fillDztype"; break; - case 406: pRecNm = "DFF_Prop_fillShadePreset"; break; - case 407: pRecNm = "DFF_Prop_fillShadeColors"; break; - case 408: pRecNm = "DFF_Prop_fillOriginX"; break; - case 409: pRecNm = "DFF_Prop_fillOriginY"; break; - case 410: pRecNm = "DFF_Prop_fillShapeOriginX"; break; - case 411: pRecNm = "DFF_Prop_fillShapeOriginY"; break; - case 412: pRecNm = "DFF_Prop_fillShadeType"; break; - case 443: pRecNm = "DFF_Prop_fFilled"; break; - case 444: pRecNm = "DFF_Prop_fHitTestFill"; break; - case 445: pRecNm = "DFF_Prop_fillShape"; break; - case 446: pRecNm = "DFF_Prop_fillUseRect"; break; - case 447: pRecNm = "DFF_Prop_fNoFillHitTest"; break; + case 384: pRecNm = "DFF_Prop_fillType"; break; + case 385: pRecNm = "DFF_Prop_fillColor"; break; + case 386: pRecNm = "DFF_Prop_fillOpacity"; break; + case 387: pRecNm = "DFF_Prop_fillBackColor"; break; + case 388: pRecNm = "DFF_Prop_fillBackOpacity"; break; + case 389: pRecNm = "DFF_Prop_fillCrMod"; break; + case 390: pRecNm = "DFF_Prop_fillBlip"; break; + case 391: pRecNm = "DFF_Prop_fillBlipName"; break; + case 392: pRecNm = "DFF_Prop_fillBlipFlags"; break; + case 393: pRecNm = "DFF_Prop_fillWidth"; break; + case 394: pRecNm = "DFF_Prop_fillHeight"; break; + case 395: pRecNm = "DFF_Prop_fillAngle"; break; + case 396: pRecNm = "DFF_Prop_fillFocus"; break; + case 397: pRecNm = "DFF_Prop_fillToLeft"; break; + case 398: pRecNm = "DFF_Prop_fillToTop"; break; + case 399: pRecNm = "DFF_Prop_fillToRight"; break; + case 400: pRecNm = "DFF_Prop_fillToBottom"; break; + case 401: pRecNm = "DFF_Prop_fillRectLeft"; break; + case 402: pRecNm = "DFF_Prop_fillRectTop"; break; + case 403: pRecNm = "DFF_Prop_fillRectRight"; break; + case 404: pRecNm = "DFF_Prop_fillRectBottom"; break; + case 405: pRecNm = "DFF_Prop_fillDztype"; break; + case 406: pRecNm = "DFF_Prop_fillShadePreset"; break; + case 407: pRecNm = "DFF_Prop_fillShadeColors"; break; + case 408: pRecNm = "DFF_Prop_fillOriginX"; break; + case 409: pRecNm = "DFF_Prop_fillOriginY"; break; + case 410: pRecNm = "DFF_Prop_fillShapeOriginX"; break; + case 411: pRecNm = "DFF_Prop_fillShapeOriginY"; break; + case 412: pRecNm = "DFF_Prop_fillShadeType"; break; + case 443: pRecNm = "DFF_Prop_fFilled"; break; + case 444: pRecNm = "DFF_Prop_fHitTestFill"; break; + case 445: pRecNm = "DFF_Prop_fillShape"; break; + case 446: pRecNm = "DFF_Prop_fillUseRect"; break; + case 447: pRecNm = "DFF_Prop_fNoFillHitTest"; break; // LineStyle - case 448: pRecNm = "DFF_Prop_lineColor"; break; - case 449: pRecNm = "DFF_Prop_lineOpacity"; break; - case 450: pRecNm = "DFF_Prop_lineBackColor"; break; - case 451: pRecNm = "DFF_Prop_lineCrMod"; break; - case 452: pRecNm = "DFF_Prop_lineType"; break; - case 453: pRecNm = "DFF_Prop_lineFillBlip"; break; - case 454: pRecNm = "DFF_Prop_lineFillBlipName"; break; - case 455: pRecNm = "DFF_Prop_lineFillBlipFlags"; break; - case 456: pRecNm = "DFF_Prop_lineFillWidth"; break; - case 457: pRecNm = "DFF_Prop_lineFillHeight"; break; - case 458: pRecNm = "DFF_Prop_lineFillDztype"; break; - case 459: pRecNm = "DFF_Prop_lineWidth"; break; - case 460: pRecNm = "DFF_Prop_lineMiterLimit"; break; - case 461: pRecNm = "DFF_Prop_lineStyle"; break; - case 462: pRecNm = "DFF_Prop_lineDashing"; break; - case 463: pRecNm = "DFF_Prop_lineDashStyle"; break; - case 464: pRecNm = "DFF_Prop_lineStartArrowhead"; break; - case 465: pRecNm = "DFF_Prop_lineEndArrowhead"; break; - case 466: pRecNm = "DFF_Prop_lineStartArrowWidth"; break; - case 467: pRecNm = "DFF_Prop_lineStartArrowLength"; break; - case 468: pRecNm = "DFF_Prop_lineEndArrowWidth"; break; - case 469: pRecNm = "DFF_Prop_lineEndArrowLength"; break; - case 470: pRecNm = "DFF_Prop_lineJoinStyle"; break; - case 471: pRecNm = "DFF_Prop_lineEndCapStyle"; break; - case 507: pRecNm = "DFF_Prop_fArrowheadsOK"; break; - case 508: pRecNm = "DFF_Prop_fLine"; break; - case 509: pRecNm = "DFF_Prop_fHitTestLine"; break; - case 510: pRecNm = "DFF_Prop_lineFillShape"; break; - case 511: pRecNm = "DFF_Prop_fNoLineDrawDash"; break; + case 448: pRecNm = "DFF_Prop_lineColor"; break; + case 449: pRecNm = "DFF_Prop_lineOpacity"; break; + case 450: pRecNm = "DFF_Prop_lineBackColor"; break; + case 451: pRecNm = "DFF_Prop_lineCrMod"; break; + case 452: pRecNm = "DFF_Prop_lineType"; break; + case 453: pRecNm = "DFF_Prop_lineFillBlip"; break; + case 454: pRecNm = "DFF_Prop_lineFillBlipName"; break; + case 455: pRecNm = "DFF_Prop_lineFillBlipFlags"; break; + case 456: pRecNm = "DFF_Prop_lineFillWidth"; break; + case 457: pRecNm = "DFF_Prop_lineFillHeight"; break; + case 458: pRecNm = "DFF_Prop_lineFillDztype"; break; + case 459: pRecNm = "DFF_Prop_lineWidth"; break; + case 460: pRecNm = "DFF_Prop_lineMiterLimit"; break; + case 461: pRecNm = "DFF_Prop_lineStyle"; break; + case 462: pRecNm = "DFF_Prop_lineDashing"; break; + case 463: pRecNm = "DFF_Prop_lineDashStyle"; break; + case 464: pRecNm = "DFF_Prop_lineStartArrowhead"; break; + case 465: pRecNm = "DFF_Prop_lineEndArrowhead"; break; + case 466: pRecNm = "DFF_Prop_lineStartArrowWidth"; break; + case 467: pRecNm = "DFF_Prop_lineStartArrowLength"; break; + case 468: pRecNm = "DFF_Prop_lineEndArrowWidth"; break; + case 469: pRecNm = "DFF_Prop_lineEndArrowLength"; break; + case 470: pRecNm = "DFF_Prop_lineJoinStyle"; break; + case 471: pRecNm = "DFF_Prop_lineEndCapStyle"; break; + case 507: pRecNm = "DFF_Prop_fArrowheadsOK"; break; + case 508: pRecNm = "DFF_Prop_fLine"; break; + case 509: pRecNm = "DFF_Prop_fHitTestLine"; break; + case 510: pRecNm = "DFF_Prop_lineFillShape"; break; + case 511: pRecNm = "DFF_Prop_fNoLineDrawDash"; break; // ShadowStyle - case 512: pRecNm = "DFF_Prop_shadowType"; break; - case 513: pRecNm = "DFF_Prop_shadowColor"; break; - case 514: pRecNm = "DFF_Prop_shadowHighlight"; break; - case 515: pRecNm = "DFF_Prop_shadowCrMod"; break; - case 516: pRecNm = "DFF_Prop_shadowOpacity"; break; - case 517: pRecNm = "DFF_Prop_shadowOffsetX"; break; - case 518: pRecNm = "DFF_Prop_shadowOffsetY"; break; - case 519: pRecNm = "DFF_Prop_shadowSecondOffsetX"; break; - case 520: pRecNm = "DFF_Prop_shadowSecondOffsetY"; break; - case 521: pRecNm = "DFF_Prop_shadowScaleXToX"; break; - case 522: pRecNm = "DFF_Prop_shadowScaleYToX"; break; - case 523: pRecNm = "DFF_Prop_shadowScaleXToY"; break; - case 524: pRecNm = "DFF_Prop_shadowScaleYToY"; break; - case 525: pRecNm = "DFF_Prop_shadowPerspectiveX"; break; - case 526: pRecNm = "DFF_Prop_shadowPerspectiveY"; break; - case 527: pRecNm = "DFF_Prop_shadowWeight"; break; - case 528: pRecNm = "DFF_Prop_shadowOriginX"; break; - case 529: pRecNm = "DFF_Prop_shadowOriginY"; break; - case 574: pRecNm = "DFF_Prop_fShadow"; break; - case 575: pRecNm = "DFF_Prop_fshadowObscured"; break; + case 512: pRecNm = "DFF_Prop_shadowType"; break; + case 513: pRecNm = "DFF_Prop_shadowColor"; break; + case 514: pRecNm = "DFF_Prop_shadowHighlight"; break; + case 515: pRecNm = "DFF_Prop_shadowCrMod"; break; + case 516: pRecNm = "DFF_Prop_shadowOpacity"; break; + case 517: pRecNm = "DFF_Prop_shadowOffsetX"; break; + case 518: pRecNm = "DFF_Prop_shadowOffsetY"; break; + case 519: pRecNm = "DFF_Prop_shadowSecondOffsetX"; break; + case 520: pRecNm = "DFF_Prop_shadowSecondOffsetY"; break; + case 521: pRecNm = "DFF_Prop_shadowScaleXToX"; break; + case 522: pRecNm = "DFF_Prop_shadowScaleYToX"; break; + case 523: pRecNm = "DFF_Prop_shadowScaleXToY"; break; + case 524: pRecNm = "DFF_Prop_shadowScaleYToY"; break; + case 525: pRecNm = "DFF_Prop_shadowPerspectiveX"; break; + case 526: pRecNm = "DFF_Prop_shadowPerspectiveY"; break; + case 527: pRecNm = "DFF_Prop_shadowWeight"; break; + case 528: pRecNm = "DFF_Prop_shadowOriginX"; break; + case 529: pRecNm = "DFF_Prop_shadowOriginY"; break; + case 574: pRecNm = "DFF_Prop_fShadow"; break; + case 575: pRecNm = "DFF_Prop_fshadowObscured"; break; // PerspectiveStyle - case 576: pRecNm = "DFF_Prop_perspectiveType"; break; - case 577: pRecNm = "DFF_Prop_perspectiveOffsetX"; break; - case 578: pRecNm = "DFF_Prop_perspectiveOffsetY"; break; - case 579: pRecNm = "DFF_Prop_perspectiveScaleXToX"; break; - case 580: pRecNm = "DFF_Prop_perspectiveScaleYToX"; break; - case 581: pRecNm = "DFF_Prop_perspectiveScaleXToY"; break; - case 582: pRecNm = "DFF_Prop_perspectiveScaleYToY"; break; - case 583: pRecNm = "DFF_Prop_perspectivePerspectiveX"; break; - case 584: pRecNm = "DFF_Prop_perspectivePerspectiveY"; break; - case 585: pRecNm = "DFF_Prop_perspectiveWeight"; break; - case 586: pRecNm = "DFF_Prop_perspectiveOriginX"; break; - case 587: pRecNm = "DFF_Prop_perspectiveOriginY"; break; - case 639: pRecNm = "DFF_Prop_fPerspective"; break; + case 576: pRecNm = "DFF_Prop_perspectiveType"; break; + case 577: pRecNm = "DFF_Prop_perspectiveOffsetX"; break; + case 578: pRecNm = "DFF_Prop_perspectiveOffsetY"; break; + case 579: pRecNm = "DFF_Prop_perspectiveScaleXToX"; break; + case 580: pRecNm = "DFF_Prop_perspectiveScaleYToX"; break; + case 581: pRecNm = "DFF_Prop_perspectiveScaleXToY"; break; + case 582: pRecNm = "DFF_Prop_perspectiveScaleYToY"; break; + case 583: pRecNm = "DFF_Prop_perspectivePerspectiveX"; break; + case 584: pRecNm = "DFF_Prop_perspectivePerspectiveY"; break; + case 585: pRecNm = "DFF_Prop_perspectiveWeight"; break; + case 586: pRecNm = "DFF_Prop_perspectiveOriginX"; break; + case 587: pRecNm = "DFF_Prop_perspectiveOriginY"; break; + case 639: pRecNm = "DFF_Prop_fPerspective"; break; // 3D Object - case 640: pRecNm = "DFF_Prop_c3DSpecularAmt"; break; - case 641: pRecNm = "DFF_Prop_c3DDiffuseAmt"; break; - case 642: pRecNm = "DFF_Prop_c3DShininess"; break; - case 643: pRecNm = "DFF_Prop_c3DEdgeThickness"; break; - case 644: pRecNm = "DFF_Prop_c3DExtrudeForward"; break; - case 645: pRecNm = "DFF_Prop_c3DExtrudeBackward"; break; - case 646: pRecNm = "DFF_Prop_c3DExtrudePlane"; break; - case 647: pRecNm = "DFF_Prop_c3DExtrusionColor"; break; - case 648: pRecNm = "DFF_Prop_c3DCrMod"; break; - case 700: pRecNm = "DFF_Prop_f3D"; break; - case 701: pRecNm = "DFF_Prop_fc3DMetallic"; break; - case 702: pRecNm = "DFF_Prop_fc3DUseExtrusionColor"; break; - case 703: pRecNm = "DFF_Prop_fc3DLightFace"; break; + case 640: pRecNm = "DFF_Prop_c3DSpecularAmt"; break; + case 641: pRecNm = "DFF_Prop_c3DDiffuseAmt"; break; + case 642: pRecNm = "DFF_Prop_c3DShininess"; break; + case 643: pRecNm = "DFF_Prop_c3DEdgeThickness"; break; + case 644: pRecNm = "DFF_Prop_c3DExtrudeForward"; break; + case 645: pRecNm = "DFF_Prop_c3DExtrudeBackward"; break; + case 646: pRecNm = "DFF_Prop_c3DExtrudePlane"; break; + case 647: pRecNm = "DFF_Prop_c3DExtrusionColor"; break; + case 648: pRecNm = "DFF_Prop_c3DCrMod"; break; + case 700: pRecNm = "DFF_Prop_f3D"; break; + case 701: pRecNm = "DFF_Prop_fc3DMetallic"; break; + case 702: pRecNm = "DFF_Prop_fc3DUseExtrusionColor"; break; + case 703: pRecNm = "DFF_Prop_fc3DLightFace"; break; // 3D Style - case 704: pRecNm = "DFF_Prop_c3DYRotationAngle"; break; - case 705: pRecNm = "DFF_Prop_c3DXRotationAngle"; break; - case 706: pRecNm = "DFF_Prop_c3DRotationAxisX"; break; - case 707: pRecNm = "DFF_Prop_c3DRotationAxisY"; break; - case 708: pRecNm = "DFF_Prop_c3DRotationAxisZ"; break; - case 709: pRecNm = "DFF_Prop_c3DRotationAngle"; break; - case 710: pRecNm = "DFF_Prop_c3DRotationCenterX"; break; - case 711: pRecNm = "DFF_Prop_c3DRotationCenterY"; break; - case 712: pRecNm = "DFF_Prop_c3DRotationCenterZ"; break; - case 713: pRecNm = "DFF_Prop_c3DRenderMode"; break; - case 714: pRecNm = "DFF_Prop_c3DTolerance"; break; - case 715: pRecNm = "DFF_Prop_c3DXViewpoint"; break; - case 716: pRecNm = "DFF_Prop_c3DYViewpoint"; break; - case 717: pRecNm = "DFF_Prop_c3DZViewpoint"; break; - case 718: pRecNm = "DFF_Prop_c3DOriginX"; break; - case 719: pRecNm = "DFF_Prop_c3DOriginY"; break; - case 720: pRecNm = "DFF_Prop_c3DSkewAngle"; break; - case 721: pRecNm = "DFF_Prop_c3DSkewAmount"; break; - case 722: pRecNm = "DFF_Prop_c3DAmbientIntensity"; break; - case 723: pRecNm = "DFF_Prop_c3DKeyX"; break; - case 724: pRecNm = "DFF_Prop_c3DKeyY"; break; - case 725: pRecNm = "DFF_Prop_c3DKeyZ"; break; - case 726: pRecNm = "DFF_Prop_c3DKeyIntensity"; break; - case 727: pRecNm = "DFF_Prop_c3DFillX"; break; - case 728: pRecNm = "DFF_Prop_c3DFillY"; break; - case 729: pRecNm = "DFF_Prop_c3DFillZ"; break; - case 730: pRecNm = "DFF_Prop_c3DFillIntensity"; break; - case 763: pRecNm = "DFF_Prop_fc3DConstrainRotation"; break; - case 764: pRecNm = "DFF_Prop_fc3DRotationCenterAuto"; break; - case 765: pRecNm = "DFF_Prop_fc3DParallel"; break; - case 766: pRecNm = "DFF_Prop_fc3DKeyHarsh"; break; - case 767: pRecNm = "DFF_Prop_fc3DFillHarsh"; break; + case 704: pRecNm = "DFF_Prop_c3DYRotationAngle"; break; + case 705: pRecNm = "DFF_Prop_c3DXRotationAngle"; break; + case 706: pRecNm = "DFF_Prop_c3DRotationAxisX"; break; + case 707: pRecNm = "DFF_Prop_c3DRotationAxisY"; break; + case 708: pRecNm = "DFF_Prop_c3DRotationAxisZ"; break; + case 709: pRecNm = "DFF_Prop_c3DRotationAngle"; break; + case 710: pRecNm = "DFF_Prop_c3DRotationCenterX"; break; + case 711: pRecNm = "DFF_Prop_c3DRotationCenterY"; break; + case 712: pRecNm = "DFF_Prop_c3DRotationCenterZ"; break; + case 713: pRecNm = "DFF_Prop_c3DRenderMode"; break; + case 714: pRecNm = "DFF_Prop_c3DTolerance"; break; + case 715: pRecNm = "DFF_Prop_c3DXViewpoint"; break; + case 716: pRecNm = "DFF_Prop_c3DYViewpoint"; break; + case 717: pRecNm = "DFF_Prop_c3DZViewpoint"; break; + case 718: pRecNm = "DFF_Prop_c3DOriginX"; break; + case 719: pRecNm = "DFF_Prop_c3DOriginY"; break; + case 720: pRecNm = "DFF_Prop_c3DSkewAngle"; break; + case 721: pRecNm = "DFF_Prop_c3DSkewAmount"; break; + case 722: pRecNm = "DFF_Prop_c3DAmbientIntensity"; break; + case 723: pRecNm = "DFF_Prop_c3DKeyX"; break; + case 724: pRecNm = "DFF_Prop_c3DKeyY"; break; + case 725: pRecNm = "DFF_Prop_c3DKeyZ"; break; + case 726: pRecNm = "DFF_Prop_c3DKeyIntensity"; break; + case 727: pRecNm = "DFF_Prop_c3DFillX"; break; + case 728: pRecNm = "DFF_Prop_c3DFillY"; break; + case 729: pRecNm = "DFF_Prop_c3DFillZ"; break; + case 730: pRecNm = "DFF_Prop_c3DFillIntensity"; break; + case 763: pRecNm = "DFF_Prop_fc3DConstrainRotation"; break; + case 764: pRecNm = "DFF_Prop_fc3DRotationCenterAuto"; break; + case 765: pRecNm = "DFF_Prop_fc3DParallel"; break; + case 766: pRecNm = "DFF_Prop_fc3DKeyHarsh"; break; + case 767: pRecNm = "DFF_Prop_fc3DFillHarsh"; break; // Shape - case 769: pRecNm = "DFF_Prop_hspMaster"; break; - case 771: pRecNm = "DFF_Prop_cxstyle"; break; - case 772: pRecNm = "DFF_Prop_bWMode"; break; - case 773: pRecNm = "DFF_Prop_bWModePureBW"; break; - case 774: pRecNm = "DFF_Prop_bWModeBW"; break; - case 826: pRecNm = "DFF_Prop_fOleIcon"; break; - case 827: pRecNm = "DFF_Prop_fPreferRelativeResize"; break; - case 828: pRecNm = "DFF_Prop_fLockShapeType"; break; - case 830: pRecNm = "DFF_Prop_fDeleteAttachedObject"; break; - case 831: pRecNm = "DFF_Prop_fBackground"; break; + case 769: pRecNm = "DFF_Prop_hspMaster"; break; + case 771: pRecNm = "DFF_Prop_cxstyle"; break; + case 772: pRecNm = "DFF_Prop_bWMode"; break; + case 773: pRecNm = "DFF_Prop_bWModePureBW"; break; + case 774: pRecNm = "DFF_Prop_bWModeBW"; break; + case 826: pRecNm = "DFF_Prop_fOleIcon"; break; + case 827: pRecNm = "DFF_Prop_fPreferRelativeResize"; break; + case 828: pRecNm = "DFF_Prop_fLockShapeType"; break; + case 830: pRecNm = "DFF_Prop_fDeleteAttachedObject"; break; + case 831: pRecNm = "DFF_Prop_fBackground"; break; // Callout - case 832: pRecNm = "DFF_Prop_spcot"; break; - case 833: pRecNm = "DFF_Prop_dxyCalloutGap"; break; - case 834: pRecNm = "DFF_Prop_spcoa"; break; - case 835: pRecNm = "DFF_Prop_spcod"; break; - case 836: pRecNm = "DFF_Prop_dxyCalloutDropSpecified"; break; - case 837: pRecNm = "DFF_Prop_dxyCalloutLengthSpecified"; break; - case 889: pRecNm = "DFF_Prop_fCallout"; break; - case 890: pRecNm = "DFF_Prop_fCalloutAccentBar"; break; - case 891: pRecNm = "DFF_Prop_fCalloutTextBorder"; break; - case 892: pRecNm = "DFF_Prop_fCalloutMinusX"; break; - case 893: pRecNm = "DFF_Prop_fCalloutMinusY"; break; - case 894: pRecNm = "DFF_Prop_fCalloutDropAuto"; break; - case 895: pRecNm = "DFF_Prop_fCalloutLengthSpecified"; break; + case 832: pRecNm = "DFF_Prop_spcot"; break; + case 833: pRecNm = "DFF_Prop_dxyCalloutGap"; break; + case 834: pRecNm = "DFF_Prop_spcoa"; break; + case 835: pRecNm = "DFF_Prop_spcod"; break; + case 836: pRecNm = "DFF_Prop_dxyCalloutDropSpecified"; break; + case 837: pRecNm = "DFF_Prop_dxyCalloutLengthSpecified"; break; + case 889: pRecNm = "DFF_Prop_fCallout"; break; + case 890: pRecNm = "DFF_Prop_fCalloutAccentBar"; break; + case 891: pRecNm = "DFF_Prop_fCalloutTextBorder"; break; + case 892: pRecNm = "DFF_Prop_fCalloutMinusX"; break; + case 893: pRecNm = "DFF_Prop_fCalloutMinusY"; break; + case 894: pRecNm = "DFF_Prop_fCalloutDropAuto"; break; + case 895: pRecNm = "DFF_Prop_fCalloutLengthSpecified"; break; // GroupShape - case 896: pRecNm = "DFF_Prop_wzName"; break; - case 897: pRecNm = "DFF_Prop_wzDescription"; break; - case 898: pRecNm = "DFF_Prop_pihlShape"; break; - case 899: pRecNm = "DFF_Prop_pWrapPolygonVertices"; break; - case 900: pRecNm = "DFF_Prop_dxWrapDistLeft"; break; - case 901: pRecNm = "DFF_Prop_dyWrapDistTop"; break; - case 902: pRecNm = "DFF_Prop_dxWrapDistRight"; break; - case 903: pRecNm = "DFF_Prop_dyWrapDistBottom"; break; - case 904: pRecNm = "DFF_Prop_lidRegroup"; break; - case 953: pRecNm = "DFF_Prop_fEditedWrap"; break; - case 954: pRecNm = "DFF_Prop_fBehindDocument"; break; - case 955: pRecNm = "DFF_Prop_fOnDblClickNotify"; break; - case 956: pRecNm = "DFF_Prop_fIsButton"; break; - case 957: pRecNm = "DFF_Prop_fOneD"; break; - case 958: pRecNm = "DFF_Prop_fHidden"; break; - case 959: pRecNm = "DFF_Prop_fPrint"; break; + case 896: pRecNm = "DFF_Prop_wzName"; break; + case 897: pRecNm = "DFF_Prop_wzDescription"; break; + case 898: pRecNm = "DFF_Prop_pihlShape"; break; + case 899: pRecNm = "DFF_Prop_pWrapPolygonVertices"; break; + case 900: pRecNm = "DFF_Prop_dxWrapDistLeft"; break; + case 901: pRecNm = "DFF_Prop_dyWrapDistTop"; break; + case 902: pRecNm = "DFF_Prop_dxWrapDistRight"; break; + case 903: pRecNm = "DFF_Prop_dyWrapDistBottom"; break; + case 904: pRecNm = "DFF_Prop_lidRegroup"; break; + case 953: pRecNm = "DFF_Prop_fEditedWrap"; break; + case 954: pRecNm = "DFF_Prop_fBehindDocument"; break; + case 955: pRecNm = "DFF_Prop_fOnDblClickNotify"; break; + case 956: pRecNm = "DFF_Prop_fIsButton"; break; + case 957: pRecNm = "DFF_Prop_fOneD"; break; + case 958: pRecNm = "DFF_Prop_fHidden"; break; + case 959: pRecNm = "DFF_Prop_fPrint"; break; } *pOut << " " << indent1 << ' '; @@ -2091,7 +2091,7 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp, else *pOut << "Prop" ; - *pOut << " Id: " << dec << nId << " (=0x" << hex << nId << ')'; + *pOut << " Id: " << dec << nId << " (=0x" << hex << nId << ')'; if( bBid ) *pOut << " Bid: 0x" << (UINT16)bBid; @@ -2101,7 +2101,7 @@ void DumpEscherProp( UINT16 nId, BOOL bBid, BOOL bComplex, UINT32 nOp, // .... rStreamOffset += nOp; } -// else +// else *pOut << " op: 0x" << nOp; *pOut << dec << endl1; @@ -2113,39 +2113,39 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, const char* pRecNm = 0; switch( nFbt ) { - case 0xF000: pRecNm = "DFF_msofbtDggContainer"; break; - case 0xF006: pRecNm = "DFF_msofbtDgg"; break; - case 0xF016: pRecNm = "DFF_msofbtCLSID"; break; - case 0xF00B: pRecNm = "DFF_msofbtOPT"; break; - case 0xF11A: pRecNm = "DFF_msofbtColorMRU"; break; - case 0xF11E: pRecNm = "DFF_msofbtSplitMenuColors"; break; - case 0xF001: pRecNm = "DFF_msofbtBstoreContainer"; break; - case 0xF007: pRecNm = "DFF_msofbtBSE"; break; - case 0xF018: pRecNm = "DFF_msofbtBlipFirst"; break; - case 0xF117: pRecNm = "DFF_msofbtBlipLast"; break; - case 0xF002: pRecNm = "DFF_msofbtDgContainer"; break; - case 0xF008: pRecNm = "DFF_msofbtDg"; break; - case 0xF118: pRecNm = "DFF_msofbtRegroupItems"; break; - case 0xF120: pRecNm = "DFF_msofbtColorScheme"; break; - case 0xF003: pRecNm = "DFF_msofbtSpgrContainer"; break; - case 0xF004: pRecNm = "DFF_msofbtSpContainer"; break; - case 0xF009: pRecNm = "DFF_msofbtSpgr"; break; - case 0xF00A: pRecNm = "DFF_msofbtSp"; break; - case 0xF00C: pRecNm = "DFF_msofbtTextbox"; break; - case 0xF00D: pRecNm = "DFF_msofbtClientTextbox"; break; - case 0xF00E: pRecNm = "DFF_msofbtAnchor"; break; - case 0xF00F: pRecNm = "DFF_msofbtChildAnchor"; break; - case 0xF010: pRecNm = "DFF_msofbtClientAnchor"; break; - case 0xF011: pRecNm = "DFF_msofbtClientData"; break; - case 0xF11F: pRecNm = "DFF_msofbtOleObject"; break; - case 0xF11D: pRecNm = "DFF_msofbtDeletedPspl"; break; - case 0xF005: pRecNm = "DFF_msofbtSolverContainer"; break; - case 0xF012: pRecNm = "DFF_msofbtConnectorRule"; break; - case 0xF013: pRecNm = "DFF_msofbtAlignRule"; break; - case 0xF014: pRecNm = "DFF_msofbtArcRule"; break; - case 0xF015: pRecNm = "DFF_msofbtClientRule"; break; - case 0xF017: pRecNm = "DFF_msofbtCalloutRule"; break; - case 0xF122: pRecNm = "DFF_msofbtUDefProp"; break; + case 0xF000: pRecNm = "DFF_msofbtDggContainer"; break; + case 0xF006: pRecNm = "DFF_msofbtDgg"; break; + case 0xF016: pRecNm = "DFF_msofbtCLSID"; break; + case 0xF00B: pRecNm = "DFF_msofbtOPT"; break; + case 0xF11A: pRecNm = "DFF_msofbtColorMRU"; break; + case 0xF11E: pRecNm = "DFF_msofbtSplitMenuColors"; break; + case 0xF001: pRecNm = "DFF_msofbtBstoreContainer"; break; + case 0xF007: pRecNm = "DFF_msofbtBSE"; break; + case 0xF018: pRecNm = "DFF_msofbtBlipFirst"; break; + case 0xF117: pRecNm = "DFF_msofbtBlipLast"; break; + case 0xF002: pRecNm = "DFF_msofbtDgContainer"; break; + case 0xF008: pRecNm = "DFF_msofbtDg"; break; + case 0xF118: pRecNm = "DFF_msofbtRegroupItems"; break; + case 0xF120: pRecNm = "DFF_msofbtColorScheme"; break; + case 0xF003: pRecNm = "DFF_msofbtSpgrContainer"; break; + case 0xF004: pRecNm = "DFF_msofbtSpContainer"; break; + case 0xF009: pRecNm = "DFF_msofbtSpgr"; break; + case 0xF00A: pRecNm = "DFF_msofbtSp"; break; + case 0xF00C: pRecNm = "DFF_msofbtTextbox"; break; + case 0xF00D: pRecNm = "DFF_msofbtClientTextbox"; break; + case 0xF00E: pRecNm = "DFF_msofbtAnchor"; break; + case 0xF00F: pRecNm = "DFF_msofbtChildAnchor"; break; + case 0xF010: pRecNm = "DFF_msofbtClientAnchor"; break; + case 0xF011: pRecNm = "DFF_msofbtClientData"; break; + case 0xF11F: pRecNm = "DFF_msofbtOleObject"; break; + case 0xF11D: pRecNm = "DFF_msofbtDeletedPspl"; break; + case 0xF005: pRecNm = "DFF_msofbtSolverContainer"; break; + case 0xF012: pRecNm = "DFF_msofbtConnectorRule"; break; + case 0xF013: pRecNm = "DFF_msofbtAlignRule"; break; + case 0xF014: pRecNm = "DFF_msofbtArcRule"; break; + case 0xF015: pRecNm = "DFF_msofbtClientRule"; break; + case 0xF017: pRecNm = "DFF_msofbtCalloutRule"; break; + case 0xF122: pRecNm = "DFF_msofbtUDefProp"; break; } *pOut << hex6 << nPos << indent1; @@ -2159,7 +2159,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, switch( nFbt ) { - case 0xf00b: // DFF_msofbtOPT + case 0xf00b: // DFF_msofbtOPT { UINT16 nId; UINT32 nOp, nStreamOffset = nInst * 6; BOOL bBid, bComplex; @@ -2177,9 +2177,9 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xF00d: // DFF_msofbtClientTextbox - case 0xF010: // DFF_msofbtClientAnchor - case 0xF011: // DFF_msofbtClientData + case 0xF00d: // DFF_msofbtClientTextbox + case 0xF010: // DFF_msofbtClientAnchor + case 0xF011: // DFF_msofbtClientData { UINT32 nData; if( 4 == nLength && WW8ReadUINT32( *xTableStream, nData )) @@ -2188,7 +2188,7 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xf00a: // DFF_msofbtSp + case 0xf00a: // DFF_msofbtSp { UINT32 nId, nData; if( WW8ReadUINT32( *xTableStream, nId ) && @@ -2202,8 +2202,8 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xf009: // DFF_msofbtSpgr - case 0xf00f: // DFF_msofbtChildAnchor + case 0xf009: // DFF_msofbtSpgr + case 0xf00f: // DFF_msofbtChildAnchor { UINT32 nL, nT, nR, nB; if( WW8ReadUINT32( *xTableStream, nL ) && @@ -2219,12 +2219,12 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, case 0xf006: //ESCHER_Dgg { - UINT32 spidMax, // The current maximum shape ID - cidcl, // The number of ID clusters (FIDCLs) - cspSaved, // The total number of shapes saved + UINT32 spidMax, // The current maximum shape ID + cidcl, // The number of ID clusters (FIDCLs) + cspSaved, // The total number of shapes saved // (including deleted shapes, if undo // information was saved) - cdgSaved; // The total number of drawings saved + cdgSaved; // The total number of drawings saved if( WW8ReadUINT32( *xTableStream, spidMax ) && WW8ReadUINT32( *xTableStream, cidcl ) && @@ -2276,26 +2276,26 @@ void DumpEscherRec( ULONG nPos, UINT8 nVer, UINT16 nInst, } break; - case 0xF016: //ESCHER_CLSID - case 0xF11A: //ESCHER_ColorMRU - case 0xF11E: //ESCHER_SplitMenuColors -// case 0xF001: //ESCHER_BstoreContainer - case 0xF007: //ESCHER_BSE - case 0xF018: //ESCHER_BlipFirst - case 0xF117: //ESCHER_BlipLast - case 0xF118: //ESCHER_RegroupItems - case 0xF120: //ESCHER_ColorScheme - case 0xF00C: //ESCHER_Textbox - case 0xF00E: //ESCHER_Anchor - case 0xF11F: //ESCHER_OleObject - case 0xF11D: //ESCHER_DeletedPspl - case 0xF005: //ESCHER_SolverContainer - case 0xF012: //ESCHER_ConnectorRule - case 0xF013: //ESCHER_AlignRule - case 0xF014: //ESCHER_ArcRule - case 0xF015: //ESCHER_ClientRule - case 0xF017: //ESCHER_CalloutRule - case 0xF119: //ESCHER_Selection + case 0xF016: //ESCHER_CLSID + case 0xF11A: //ESCHER_ColorMRU + case 0xF11E: //ESCHER_SplitMenuColors +// case 0xF001: //ESCHER_BstoreContainer + case 0xF007: //ESCHER_BSE + case 0xF018: //ESCHER_BlipFirst + case 0xF117: //ESCHER_BlipLast + case 0xF118: //ESCHER_RegroupItems + case 0xF120: //ESCHER_ColorScheme + case 0xF00C: //ESCHER_Textbox + case 0xF00E: //ESCHER_Anchor + case 0xF11F: //ESCHER_OleObject + case 0xF11D: //ESCHER_DeletedPspl + case 0xF005: //ESCHER_SolverContainer + case 0xF012: //ESCHER_ConnectorRule + case 0xF013: //ESCHER_AlignRule + case 0xF014: //ESCHER_ArcRule + case 0xF015: //ESCHER_ClientRule + case 0xF017: //ESCHER_CalloutRule + case 0xF119: //ESCHER_Selection case 0xf008: //ESCHER_Dg { int nCnt = 128; @@ -2363,7 +2363,7 @@ void DumpEscherRecs( ULONG nPos, UINT32 nLength ) switch( nFbt ) { case 0xF000: - case 0xF001: //ESCHER_BstoreContainer + case 0xF001: //ESCHER_BstoreContainer case 0xF002: case 0xF003: case 0xF004: @@ -2399,7 +2399,7 @@ void DumpDrawing() //----------------------------------------- -// Hilfroutinen fuer Styles +// Hilfroutinen fuer Styles //----------------------------------------- static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP ) @@ -2419,7 +2419,7 @@ static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP ) indent( *pOut, *xTableStream ); xTableStream->Read( &cbUPX, 2 ); - nLen-= 2; + nLen-= 2; if ( cbUPX > nLen ) { @@ -2443,13 +2443,13 @@ static short DumpStyleUPX( BYTE nVersion, short nLen, BOOL bPAP ) xTableStream->Read( &id, 2 ); cbUPX-= 2; - nLen-= 2; + nLen-= 2; *pOut << "ID:" << id; } *pOut << endl1; - ULONG nPos = xTableStream->Tell(); // falls etwas falsch interpretiert + ULONG nPos = xTableStream->Tell(); // falls etwas falsch interpretiert // wird, gehts danach wieder richtig DumpSprms( nVersion, *xTableStream, cbUPX ); @@ -2475,8 +2475,8 @@ static void DumpStyleGrupx( BYTE nVersion, short nLen, BOOL bPara ) begin( *pOut, *xTableStream ) << "Grupx, Len:" << nLen << endl1; - if( bPara ) nLen = DumpStyleUPX( nVersion, nLen, TRUE ); // Grupx.Papx - DumpStyleUPX( nVersion, nLen, FALSE ); // Grupx.Chpx + if( bPara ) nLen = DumpStyleUPX( nVersion, nLen, TRUE ); // Grupx.Papx + DumpStyleUPX( nVersion, nLen, FALSE ); // Grupx.Chpx end( *pOut, *xTableStream ) << "Grupx" << endl1; } @@ -2486,12 +2486,12 @@ static void PrintStyleId( USHORT nId ) switch ( nId ){ case 0xffe: *pOut << "User "; break; case 0xfff: *pOut << "Nil "; break; - default: *pOut << nId << ' '; break; + default: *pOut << nId << ' '; break; } } //----------------------------------------- -// Styles +// Styles //----------------------------------------- void DStyle::Dump1Style( USHORT nNr ) @@ -2503,7 +2503,7 @@ void DStyle::Dump1Style( USHORT nNr ) WW8_STD* pStd = Read1Style( nSkip, &aStr, &cbStd ); // lese Style - if ( aStr.Len() ) // echter Style + if ( aStr.Len() ) // echter Style { *pOut << begin1; switch ( pStd->sgc ){ @@ -2521,17 +2521,17 @@ void DStyle::Dump1Style( USHORT nNr ) *pOut << "No of Upx & Upe:" << pStd->cupx << ' '; *pOut << "bchUpe:" << pStd->bchUpe << ' '; *pOut << "nSkip:" << nSkip << endl1; - }else{ // leerer Slot + }else{ // leerer Slot *pOut << "empty Slot Nr:" << nNr << endl1; } - long nPos = xTableStream->Tell(); // falls etwas falsch interpretiert + long nPos = xTableStream->Tell(); // falls etwas falsch interpretiert // wird, gehts danach wieder richtig if( pStd && ( pStd->sgc == 1 || pStd->sgc == 2 ) ) DumpStyleGrupx( nVersion, nSkip, pStd->sgc == 1 ); - if ( aStr.Len() ) // echter Style + if ( aStr.Len() ) // echter Style end( *pOut, *xTableStream ) << c << "-Style" << endl1; xTableStream->Seek( nPos+nSkip ); @@ -2543,7 +2543,7 @@ void DStyle::Dump() { *pOut << hex6 << nStyleStart << ' ' << dec2 << indent1; - *pOut << begin1 << cstd << " Styles, "; + *pOut << begin1 << cstd << " Styles, "; *pOut << "Base:" << cbSTDBaseInFile; *pOut << ", Written:" << (fStdStylenamesWritten) ? 'T' : 'F'; *pOut << ", MaxSti:" << stiMaxWhenSaved; @@ -2559,7 +2559,7 @@ void DStyle::Dump() } //----------------------------------------- -// Main +// Main //----------------------------------------- //char cName [266]; @@ -2629,7 +2629,7 @@ int DoConvert( const String& rName, BYTE nVersion ) // welcher Table-Stream gueltig ist. // Diesen oeffnen wir nun. - switch( pWwFib->nVersion ) // 6 steht fuer "6 ODER 7", 7 steht fuer "NUR 7" + switch( pWwFib->nVersion ) // 6 steht fuer "6 ODER 7", 7 steht fuer "NUR 7" { case 6: case 7: @@ -2664,10 +2664,10 @@ int DoConvert( const String& rName, BYTE nVersion ) // erstmal die Lowlevel-Funktionen - ((DFib*)pWwFib)->Dump(); // FIB - DumpDop( *pWwFib ); // WW8_DOP + ((DFib*)pWwFib)->Dump(); // FIB + DumpDop( *pWwFib ); // WW8_DOP - if( ( 8 > pWwFib->nVersion && pWwFib->fComplex ) || + if( ( 8 > pWwFib->nVersion && pWwFib->fComplex ) || pWwFib->lcbClx ) DumpPcd( pWwFib->nVersion, pWwFib->fcClx, pWwFib->lcbClx ); @@ -2676,18 +2676,18 @@ int DoConvert( const String& rName, BYTE nVersion ) DumpBookHigh(); - DumpPLCF( pWwFib->fcPlcfsed, pWwFib->lcbPlcfsed, SEP ); // SEPX + DumpPLCF( pWwFib->fcPlcfsed, pWwFib->lcbPlcfsed, SEP ); // SEPX DumpPLCF( pWwFib->fcPlcfbteChpx, pWwFib->lcbPlcfbteChpx, CHP ); // CHPX DumpPLCF( pWwFib->fcPlcfbtePapx, pWwFib->lcbPlcfbtePapx, PAP ); // PAPX { - DStyle aStyle( *xTableStream, *pWwFib ); // Styles + DStyle aStyle( *xTableStream, *pWwFib ); // Styles aStyle.Dump(); } - DumpFonts(); // WW8_FFN + DumpFonts(); // WW8_FFN // ... und jetzt die High-Level-Funktionen @@ -2698,7 +2698,7 @@ int DoConvert( const String& rName, BYTE nVersion ) DumpField1( pWwFib->fcPlcffldMom, pWwFib->lcbPlcffldMom, "MainText Fields" ); - DumpHeader( pSBase ); // Header / Footer + DumpHeader( pSBase ); // Header / Footer DumpField1( pWwFib->fcPlcffldHdr, pWwFib->lcbPlcffldHdr, "Header/Footer Fields" ); @@ -2734,7 +2734,7 @@ int DoConvert( const String& rName, BYTE nVersion ) void DeInit() { -// DELETEZ( aWwStor ); +// DELETEZ( aWwStor ); xStrm.Clear(); DELETEZ( pxStor ); DELETEZ( pOut ); diff --git a/sw/source/filter/ww8/dump/msvbasic.cxx b/sw/source/filter/ww8/dump/msvbasic.cxx index 0acbb3dab7fc..7f9659b77b1a 100644 --- a/sw/source/filter/ww8/dump/msvbasic.cxx +++ b/sw/source/filter/ww8/dump/msvbasic.cxx @@ -2,7 +2,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,9 +30,9 @@ #include "precompiled_sw.hxx" -#include <string.h> // memset(), ... +#include <string.h> // memset(), ... #ifndef UNX -#include <io.h> // access() +#include <io.h> // access() #endif #include <msvbasic.hxx> @@ -286,7 +286,7 @@ int VBA_Impl::ReadVBAProject(const SvStorageRef &rxVBAStorage) xVBAProject->Read(&junksize,2); // usually 18 02, sometimes 1e 02 //but sometimes its a run of numbers until 0xffff, gagh!!! //*pOut << "position is " << xVBAProject->Tell() << "len is " - // << junksize << endl; + // << junksize << endl; } UINT16 ftest; @@ -395,7 +395,7 @@ const String &VBA_Impl::Decompress( UINT16 nIndex, int *pOverflow) xVBAStream->GetError() ) { DBG_WARNING("Not able to open vb module "); -// DBG_WARNING((pOffsets[nIndex].sName).GetStr()); +// DBG_WARNING((pOffsets[nIndex].sName).GetStr()); } else { @@ -403,7 +403,7 @@ const String &VBA_Impl::Decompress( UINT16 nIndex, int *pOverflow) DecompressVBA(nIndex,xVBAStream); /* * if len was too big for a single string set that variable ? - * if ((len > XX) && (pOverflow)) + * if ((len > XX) && (pOverflow)) *pOverflow=1; */ if (bCommented) diff --git a/sw/source/filter/ww8/dump/msvbasic.hxx b/sw/source/filter/ww8/dump/msvbasic.hxx index bb12e9509511..86326c0015aa 100644 --- a/sw/source/filter/ww8/dump/msvbasic.hxx +++ b/sw/source/filter/ww8/dump/msvbasic.hxx @@ -2,7 +2,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,7 +64,7 @@ public: //0 for failure, 1 for success BOOL Open( const String &rToplevel, const String &rSublevel); const String & Decompress( UINT16 nIndex, int *pOverflow=0); - UINT16 GetNoStreams() const { return nOffsets; } + UINT16 GetNoStreams() const { return nOffsets; } const String &GetStreamName( UINT16 nIndex ) const { DBG_ASSERT( nIndex < nOffsets, "Index out of range" ); diff --git a/sw/source/filter/ww8/dump/ww8darr.cxx b/sw/source/filter/ww8/dump/ww8darr.cxx index ae33501a5bee..da2deb130277 100644 --- a/sw/source/filter/ww8/dump/ww8darr.cxx +++ b/sw/source/filter/ww8/dump/ww8darr.cxx @@ -2,7 +2,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,7 +31,7 @@ #include <stdlib.h> -#include "ww8dout.hxx" // OutShort() +#include "ww8dout.hxx" // OutShort() #include "ww8darr.hxx" @@ -44,17 +44,17 @@ SprmDumpInfo aSprmDumpTab[] = { 0, (FnOut)0, "NOP(0)", 2, OutShort, "sprmPIstd", // pap.istd (style code) - 3, (FnOut)0, "sprmPIstdPermute", // pap.istd permutation + 3, (FnOut)0, "sprmPIstdPermute", // pap.istd permutation 4, OutByte, "sprmPIncLv1", // pap.istddifference 5, OutByte, "sprmPJc", // pap.jc (justification) 6, OutBool, "sprmPFSideBySide", // pap.fSideBySide 7, OutBool, "sprmPFKeep", // pap.fKeep - 8, OutBool, "sprmPFKeepFollow ", // pap.fKeepFollow + 8, OutBool, "sprmPFKeepFollow ", // pap.fKeepFollow 9, OutBool, "sprmPPageBreakBefore", // pap.fPageBreakBefore - 10, (FnOut)0, "sprmPBrcl", // pap.brcl + 10, (FnOut)0, "sprmPBrcl", // pap.brcl 11, (FnOut)0, "sprmPBrcp ", // pap.brcp - 12, (FnOut)0, "sprmPAnld", // pap.anld (ANLD structure) + 12, (FnOut)0, "sprmPAnld", // pap.anld (ANLD structure) 13, OutByte, "sprmPNLvlAnm", // pap.nLvlAnm nn 14, OutBool, "sprmPFNoLineNumb", //ap.fNoLnn @@ -67,9 +67,9 @@ SprmDumpInfo aSprmDumpTab[] = { 18, OutWord, "sprmPNest", // pap.dxaLeft 19, OutShort, "sprmPDxaLeft1", // pap.dxaLeft1 - 20, OutShorts, "sprmPDyaLine", // pap.lspd an LSPD + 20, OutShorts, "sprmPDyaLine", // pap.lspd an LSPD 21, OutWord, "sprmPDyaBefore", // pap.dyaBefore - 22, OutWord, "sprmPDyaAfter", // pap.dyaAfter + 22, OutWord, "sprmPDyaAfter", // pap.dyaAfter //?? @@ -124,7 +124,7 @@ SprmDumpInfo aSprmDumpTab[] = { 72, OutShort, "sprmCRMReason", // chp.idslRMReason an index to a table 73, (FnOut)0, "sprmCChse", // chp.fChsDiff and chp.chse see below 3 bytes 74, (FnOut)0, "sprmCSymbol", // chp.fSpec, chp.chSym and chp.ftcSym - 75, OutBool, "sprmCFOle2", // chp.fOle2 1 or 0 bit + 75, OutBool, "sprmCFOle2", // chp.fOle2 1 or 0 bit 80, OutShort, "sprmCIstd", // chp.istd istd, see stylesheet definition short 81, (FnOut)0, "sprmCIstdPermute", // chp.istd permutation vector (see below) @@ -169,7 +169,7 @@ SprmDumpInfo aSprmDumpTab[] = { 118, OutBool, "sprmCFObj", // chp.fObj 1 or 0 bit 119, (FnOut)0, "sprmPicBrcl", // pic.brcl brcl (see PIC structure definition) byte - 120, (FnOut)0, "sprmPicScale", // pic.mx, pic.my, pic.dxaCropleft, + 120, (FnOut)0, "sprmPicScale", // pic.mx, pic.my, pic.dxaCropleft, 121, (FnOut)0, "sprmPicBrcTop", // pic.brcTop BRC word 122, (FnOut)0, "sprmPicBrcLeft", // pic.brcLeft BRC word 123, (FnOut)0, "sprmPicBrcBottom", // pic.brcBottom BRC word diff --git a/sw/source/filter/ww8/dump/ww8darr.hxx b/sw/source/filter/ww8/dump/ww8darr.hxx index 158fa11ab1f5..64a8e9c6e636 100644 --- a/sw/source/filter/ww8/dump/ww8darr.hxx +++ b/sw/source/filter/ww8/dump/ww8darr.hxx @@ -2,7 +2,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/ww8/dump/ww8dout.cxx b/sw/source/filter/ww8/dump/ww8dout.cxx index 771233b1f029..a0a77dd393f7 100644 --- a/sw/source/filter/ww8/dump/ww8dout.cxx +++ b/sw/source/filter/ww8/dump/ww8dout.cxx @@ -2,7 +2,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 @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <stdio.h> // getchar +#include <stdio.h> // getchar -#include <tools/solar.h> // BYTE +#include <tools/solar.h> // BYTE #include "ww8dout.hxx" #include <tools/stream.hxx> @@ -39,7 +39,7 @@ extern SvStorageStreamRef xStrm; extern SvStorageStreamRef xTableStream; -extern SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, +extern SvStorageStreamRef xDataStream; // ist bei Ver6-7 mit xStrm identisch, void DumpSprms( BYTE nVersion, SvStream& rSt, short nLen ); ostream* pOut = 0; @@ -47,7 +47,7 @@ ostream* pOut = 0; #define DumpVer8 //----------------------------------------- -// Streams +// Streams //----------------------------------------- @@ -152,7 +152,7 @@ ostream& __cdecl end1( ostream& s ) { level--; return s << indent1 << "END "; } ostream& __cdecl end2( ostream& s ) { level--; return s << indent2 << "END "; } //----------------------------------------- -// Ausgabe-Funktionen +// Ausgabe-Funktionen //----------------------------------------- void OutBool( SvStream& rSt, short ) @@ -285,7 +285,7 @@ void OutTab( SvStream& rSt, short ) rSt.Read( &nDel, sizeof( nDel ) ); *pOut << "Del " << (USHORT)nDel; - if ( nDel ) *pOut << ": "; + if ( nDel ) *pOut << ": "; else *pOut << ", "; for( i=1; i<=nDel; i++){ @@ -296,7 +296,7 @@ void OutTab( SvStream& rSt, short ) } rSt.Read( &nIns, sizeof( nIns ) ); *pOut << "Ins " << (USHORT)nIns; - if ( nIns ) *pOut << ": "; + if ( nIns ) *pOut << ": "; for( i=1; i<=nIns; i++){ rSt.Read( &nPos, sizeof( nPos ) ); @@ -304,7 +304,7 @@ void OutTab( SvStream& rSt, short ) if( i<nIns ) *pOut << ','; else *pOut << ' '; } - if ( nIns ) *pOut << "Typ: "; + if ( nIns ) *pOut << "Typ: "; for( i=1; i<=nIns; i++){ rSt.Read( &nType, sizeof( nType ) ); @@ -313,9 +313,9 @@ void OutTab( SvStream& rSt, short ) else *pOut << ' '; } -// nSiz = 1 + 2 * nDel + 1 + nIns * 3; // genaue Laenge, +// nSiz = 1 + 2 * nDel + 1 + nIns * 3; // genaue Laenge, // stimmt auch bei Laenge > 256 -// bei diesem Tab-Befehl anscheinend nicht noetig +// bei diesem Tab-Befehl anscheinend nicht noetig } void OutTab190( SvStream& rSt, short nLen ) @@ -364,7 +364,7 @@ void OutHugeHex( SvStream& rSt, short nLen ) xDataStream->Read( &nLen, sizeof( nLen ) ); -// *pOut << ", Len max: " << nLen << ", ID:" << nIStd << endl1; +// *pOut << ", Len max: " << nLen << ", ID:" << nIStd << endl1; *pOut << endl1; DumpSprms( 8, *xDataStream, nLen ); @@ -375,7 +375,7 @@ void OutTabD608( SvStream& rSt, short nLen ) { BYTE nHi, nCols; rSt.Read( &nHi, sizeof( nHi ) ); -// nLen += ((short)nHi) << 8; +// nLen += ((short)nHi) << 8; rSt.Read( &nCols, sizeof( nCols ) ); *pOut << " Cols: " << (short)nCols << ' ' << endl1 << indent2; diff --git a/sw/source/filter/ww8/dump/ww8dout.hxx b/sw/source/filter/ww8/dump/ww8dout.hxx index 5bcb34db96c2..56d786e34acf 100644 --- a/sw/source/filter/ww8/dump/ww8dout.hxx +++ b/sw/source/filter/ww8/dump/ww8dout.hxx @@ -2,7 +2,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,10 +30,10 @@ #define _WW8DOUT_HXX #ifndef INC_FSTREAM - #include <fstream.h> // ostream + #include <fstream.h> // ostream #endif #ifndef SOLAR_H - #include <tools/solar.h> // BYTE + #include <tools/solar.h> // BYTE #endif class SvStream; diff --git a/sw/source/filter/ww8/dump/ww8scan.cxx b/sw/source/filter/ww8/dump/ww8scan.cxx index 7ecb639a1b75..cf58b2814c69 100644 --- a/sw/source/filter/ww8/dump/ww8scan.cxx +++ b/sw/source/filter/ww8/dump/ww8scan.cxx @@ -2,7 +2,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 @@ -32,7 +32,7 @@ #include <algorithm> #include <functional> -#include <string.h> // memset() +#include <string.h> // memset() #include <osl/endian.h> #include <rtl/tencinfo.h> @@ -41,12 +41,12 @@ #define ERR_SWG_READ_ERROR 1234 #define OSL_ENSURE( a, b ) -#else // dump -#include <swerror.h> // ERR_WW6_... -#include <errhdl.hxx> // OSL_ENSURE() -#include <swtypes.hxx> // DELETEZ +#else // dump +#include <swerror.h> // ERR_WW6_... +#include <errhdl.hxx> // OSL_ENSURE() +#include <swtypes.hxx> // DELETEZ -#endif // dump +#endif // dump #include <tools/debug.hxx> #include "ww8scan.hxx" @@ -239,7 +239,7 @@ const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher() { 72, 2, L_FIX}, // "sprmCRMReason" chp.idslRMReason an index to a table { 73, 3, L_FIX}, // "sprmCChse" chp.fChsDiff and chp.chse { 74, 0, L_VAR}, // "sprmCSymbol" chp.fSpec, chp.chSym and chp.ftcSym - { 75, 1, L_FIX}, // "sprmCFOle2" chp.fOle2 1 or 0 bit + { 75, 1, L_FIX}, // "sprmCFOle2" chp.fOle2 1 or 0 bit { 79, 0, L_VAR}, // unknown { 80, 2, L_FIX}, // "sprmCIstd" chp.istd istd, see stylesheet definition { 81, 0, L_VAR}, // "sprmCIstdPermute" chp.istd permutation vector @@ -602,7 +602,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {0x9031, 2, L_FIX}, // "sprmSDyaLinePitch" // sep.dyaLinePitch;dya; WRONG:long; RIGHT:short; ! {0x5032, 2, L_FIX}, // "sprmSClm" ;;; - {0x5033, 2, L_FIX}, // "sprmSTextFlow" sep.wTextFlow;complex + {0x5033, 2, L_FIX}, // "sprmSTextFlow" sep.wTextFlow;complex {0x5400, 2, L_FIX}, // "sprmTJc" tap.jc;jc;word (low order byte is // significant); {0x9601, 2, L_FIX}, // "sprmTDxaLeft" tap.rgdxaCenter @@ -837,7 +837,7 @@ const BYTE* WW8SprmIter::FindSprm(USHORT nId) } //----------------------------------------- -// temporaerer Test +// temporaerer Test //----------------------------------------- // WW8PLCFx_PCDAttrs halten sich an WW8PLCF_Pcd fest und besitzen deshalb keine // eigenen Iteratoren. Alle sich auf Iteratoren beziehenden Methoden @@ -905,9 +905,9 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) } const BYTE* pSprms = pGrpprls[ nSprmIdx ]; - p->nSprmsLen = SVBT16ToShort( pSprms ); // Length + p->nSprmsLen = SVBT16ToShort( pSprms ); // Length pSprms += 2; - p->pMemPos = pSprms; // Position + p->pMemPos = pSprms; // Position } else { @@ -920,7 +920,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) { aShortSprm[0] = (BYTE)( ( nPrm & 0xfe) >> 1 ); aShortSprm[1] = (BYTE)( nPrm >> 8 ); - p->nSprmsLen = ( nPrm ) ? 2 : 0; // Laenge + p->nSprmsLen = ( nPrm ) ? 2 : 0; // Laenge // store Postion of internal mini storage in Data Pointer p->pMemPos = aShortSprm; @@ -1160,20 +1160,20 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos ) } //----------------------------------------- -// Hilfsroutinen fuer alle +// Hilfsroutinen fuer alle //----------------------------------------- DateTime WW8ScannerBase::WW8DTTM2DateTime(long lDTTM) { /* - mint short :6 0000003F minutes (0-59) - hr short :5 000007C0 hours (0-23) - dom short :5 0000F800 days of month (1-31) - mon short :4 000F0000 months (1-12) - yr short :9 1FF00000 years (1900-2411)-1900 - wdy short :3 E0000000 weekday(Sunday=0 + mint short :6 0000003F minutes (0-59) + hr short :5 000007C0 hours (0-23) + dom short :5 0000F800 days of month (1-31) + mon short :4 000F0000 months (1-12) + yr short :9 1FF00000 years (1900-2411)-1900 + wdy short :3 E0000000 weekday(Sunday=0 Monday=1 - ( wdy can be ignored ) Tuesday=2 + ( wdy can be ignored ) Tuesday=2 Wednesday=3 Thursday=4 Friday=5 @@ -1182,13 +1182,13 @@ DateTime WW8ScannerBase::WW8DTTM2DateTime(long lDTTM) DateTime aDateTime(Date( 0 ), Time( 0 )); if( lDTTM ) { - USHORT lMin = (USHORT)(lDTTM & 0x0000003F); + USHORT lMin = (USHORT)(lDTTM & 0x0000003F); lDTTM >>= 6; USHORT lHour= (USHORT)(lDTTM & 0x0000001F); lDTTM >>= 5; - USHORT lDay = (USHORT)(lDTTM & 0x0000001F); + USHORT lDay = (USHORT)(lDTTM & 0x0000001F); lDTTM >>= 5; - USHORT lMon = (USHORT)(lDTTM & 0x0000000F); + USHORT lMon = (USHORT)(lDTTM & 0x0000000F); lDTTM >>= 4; USHORT lYear= (USHORT)(lDTTM & 0x000001FF) + 1900; aDateTime = DateTime(Date(lDay, lMon, lYear), Time(lHour, lMin)); @@ -1211,7 +1211,7 @@ short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace, if( bVer67 ) { UINT16 aBrc1 = SVBT16ToShort(aBits1); - nCol = ((aBrc1 >> 6) & 0x1f); // aBor.ico + nCol = ((aBrc1 >> 6) & 0x1f); // aBor.ico nSpace = (aBrc1 & 0xF800) >> 11; nMSTotalWidth = aBrc1 & 0x07; @@ -1228,7 +1228,7 @@ short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace, else { nIdx = aBits1[1]; - nCol = aBits2[0]; // aBor.ico + nCol = aBits2[0]; // aBor.ico nSpace = aBits2[1] & 0x1F; //space between line and object //Specification in 8ths of a point, 1 Point = 20 Twips, so by 2.5 @@ -1429,7 +1429,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const long nCpStart, nCpEnd; void* pData; if( !pPieceIter->Get( nCpStart, nCpEnd, pData ) ) - { // ausserhalb PLCFfpcd ? + { // ausserhalb PLCFfpcd ? OSL_ENSURE( !this, "PLCFpcd-WW8Fc2Cp() ging schief" ); break; } @@ -1462,7 +1462,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const } } // not found - pPieceIter->SetIdx( nOldPos ); // not found + pPieceIter->SetIdx( nOldPos ); // not found /* If it was not found, then this is because it has fallen between two stools, i.e. either it is the last cp/fc of the last piece, or it is @@ -1489,7 +1489,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode, pIsUnicode = &bIsUnicode; if( pPieceIter ) - { // Complex File + { // Complex File if( pNextPieceCp ) *pNextPieceCp = LONG_MAX; @@ -1535,7 +1535,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode, } //----------------------------------------- -// class WW8ScannerBase +// class WW8ScannerBase //----------------------------------------- WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) @@ -1554,43 +1554,43 @@ WW8PLCFpcd* WW8ScannerBase::OpenPieceTable( SvStream* pStr, const WW8Fib* pWwF ) { *pStr >> clxt; nLeft--; - if( 2 == clxt ) // PLCFfpcd ? - break; // PLCFfpcd gefunden - if( 1 == clxt ) // clxtGrpprl ? + if( 2 == clxt ) // PLCFfpcd ? + break; // PLCFfpcd gefunden + if( 1 == clxt ) // clxtGrpprl ? nGrpprl++; UINT16 nLen; *pStr >> nLen; nLeft -= 2 + nLen; if( nLeft < 0 ) - return 0; // schiefgegangen - pStr->SeekRel( nLen ); // ueberlies grpprl + return 0; // schiefgegangen + pStr->SeekRel( nLen ); // ueberlies grpprl } pStr->Seek( nClxPos ); nLeft = nClxLen; pPieceGrpprls = new BYTE*[nGrpprl + 1]; memset( pPieceGrpprls, 0, ( nGrpprl + 1 ) * 4 ); nPieceGrpprls = nGrpprl; - INT16 nAktGrpprl = 0; // lies Grpprls ein + INT16 nAktGrpprl = 0; // lies Grpprls ein while( 1 ) { *pStr >> clxt; nLeft--; - if( 2 == clxt) // PLCFfpcd ? - break; // PLCFfpcd gefunden + if( 2 == clxt) // PLCFfpcd ? + break; // PLCFfpcd gefunden UINT16 nLen; *pStr >> nLen; nLeft -= 2 + nLen; if( nLeft < 0 ) - return 0; // schiefgegangen - if( 1 == clxt ) // clxtGrpprl ? + return 0; // schiefgegangen + if( 1 == clxt ) // clxtGrpprl ? { - BYTE* p = new BYTE[nLen+2]; // alloziere - ShortToSVBT16(nLen, p); // trage Laenge ein - pStr->Read( p+2, nLen ); // lies grpprl - pPieceGrpprls[nAktGrpprl++] = p; // trage in Array ein + BYTE* p = new BYTE[nLen+2]; // alloziere + ShortToSVBT16(nLen, p); // trage Laenge ein + pStr->Read( p+2, nLen ); // lies grpprl + pPieceGrpprls[nAktGrpprl++] = p; // trage in Array ein } else - pStr->SeekRel( nLen ); // ueberlies nicht-Grpprl + pStr->SeekRel( nLen ); // ueberlies nicht-Grpprl } // lies Piece Table PLCF ein INT32 nPLCFfLen; @@ -1616,7 +1616,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, pMainTxbxBkd(0), pHdFtTxbx(0), pHdFtTxbxBkd(0), pMagicTables(0), pPieceGrpprls(0) { - pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex + pPiecePLCF = OpenPieceTable( pTblSt, pWw8Fib ); // Complex if( pPiecePLCF ) { pPieceIter = new WW8PLCFpcd_Iter( *pPiecePLCF ); @@ -1633,10 +1633,10 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream* pTblSt, } // pChpPLCF and pPapPLCF may NOT be created before pPLCFx_PCD !! - pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX - pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX + pChpPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, CHP ); // CHPX + pPapPLCF = new WW8PLCFx_Cp_FKP( pSt, pTblSt, pDataSt, *this, PAP ); // PAPX - pSepPLCF = new WW8PLCFx_SEPX( pSt, pTblSt, *pWwFib, 0 ); // SEPX + pSepPLCF = new WW8PLCFx_SEPX( pSt, pTblSt, *pWwFib, 0 ); // SEPX // Footnotes pFtnPLCF = new WW8PLCFx_SubDoc( pTblSt, pWwFib->nVersion, 0, @@ -1767,20 +1767,20 @@ WW8ScannerBase::~WW8ScannerBase() } //----------------------------------------- -// Fields +// Fields //----------------------------------------- static bool WW8SkipField(WW8PLCFspecial& rPLCF) { void* pData; long nP; - if (!rPLCF.Get(nP, pData)) // Ende des PLCFspecial ? + if (!rPLCF.Get(nP, pData)) // Ende des PLCFspecial ? return false; rPLCF++; - if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? - return true; // Bei Fehler nicht abbrechen + if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? + return true; // Bei Fehler nicht abbrechen if( !rPLCF.Get( nP, pData ) ) return false; @@ -1789,7 +1789,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF) while((((BYTE*)pData)[0] & 0x1f ) == 0x13 ) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil + WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil if( !rPLCF.Get( nP, pData ) ) return false; } @@ -1806,7 +1806,7 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF) while ((((BYTE*)pData)[0] & 0x1f ) == 0x13) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Resultatteil + WW8SkipField( rPLCF ); // nested Field im Resultatteil if( !rPLCF.Get( nP, pData ) ) return false; } @@ -1823,12 +1823,12 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) rF.nLen = rF.nId = rF.nOpt = rF.bCodeNest = rF.bResNest = 0; - if( !rPLCF.Get( rF.nSCode, pData ) ) // Ende des PLCFspecial ? + if( !rPLCF.Get( rF.nSCode, pData ) ) // Ende des PLCFspecial ? goto Err; rPLCF++; - if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? + if((((BYTE*)pData)[0] & 0x1f ) != 0x13 ) // Kein Anfang ? goto Err; rF.nId = ((BYTE*)pData)[1]; @@ -1836,20 +1836,20 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) if( !rPLCF.Get( rF.nLCode, pData ) ) goto Err; - rF.nSRes = rF.nLCode; // Default - rF.nSCode++; // ohne Marken - rF.nLCode -= rF.nSCode; // Pos zu Laenge + rF.nSRes = rF.nLCode; // Default + rF.nSCode++; // ohne Marken + rF.nLCode -= rF.nSCode; // Pos zu Laenge while((((BYTE*)pData)[0] & 0x1f ) == 0x13 ) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil + WW8SkipField( rPLCF ); // nested Field im Beschreibungsteil rF.bCodeNest = true; if( !rPLCF.Get( rF.nSRes, pData ) ) goto Err; } - if((((BYTE*)pData)[0] & 0x1f ) == 0x14 ){ // Field Separator ? + if((((BYTE*)pData)[0] & 0x1f ) == 0x14 ){ // Field Separator ? rPLCF++; if( !rPLCF.Get( rF.nLRes, pData ) ) @@ -1858,19 +1858,19 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) while((((BYTE*)pData)[0] & 0x1f ) == 0x13 ) { // immer noch neue (nested) Anfaenge ? - WW8SkipField( rPLCF ); // nested Field im Resultatteil + WW8SkipField( rPLCF ); // nested Field im Resultatteil rF.bResNest = true; if( !rPLCF.Get( rF.nLRes, pData ) ) goto Err; } - rF.nLen = rF.nLRes - rF.nSCode + 2; // nLRes ist noch die Endposition - rF.nLRes -= rF.nSRes; // nun: nLRes = Laenge - rF.nSRes++; // Endpos encl. Marken + rF.nLen = rF.nLRes - rF.nSCode + 2; // nLRes ist noch die Endposition + rF.nLRes -= rF.nSRes; // nun: nLRes = Laenge + rF.nSRes++; // Endpos encl. Marken rF.nLRes--; }else{ - rF.nLRes = 0; // Kein Result vorhanden - rF.nLen = rF.nSRes - rF.nSCode + 2; // Gesamtlaenge + rF.nLRes = 0; // Kein Result vorhanden + rF.nLen = rF.nSRes - rF.nSCode + 2; // Gesamtlaenge } rPLCF++; @@ -1878,9 +1878,9 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) { // Field Ende ? // INDEX-Fld hat Bit7 gesetzt!?! - rF.nOpt = ((BYTE*)pData)[1]; // Ja -> Flags uebernehmen + rF.nOpt = ((BYTE*)pData)[1]; // Ja -> Flags uebernehmen }else{ - rF.nId = 0; // Nein -> Feld ungueltig + rF.nId = 0; // Nein -> Feld ungueltig } rPLCF.SetIdx( nOldIdx ); @@ -1915,7 +1915,7 @@ String WW8ReadPString(SvStream& rStrm, rtl_TextEncoding eEnc, } if( bAtEndSeekRel1 ) - rStrm.SeekRel( 1 ); // ueberspringe das Null-Byte am Ende. + rStrm.SeekRel( 1 ); // ueberspringe das Null-Byte am Ende. return String( aByteStr, eEnc ); @@ -1953,7 +1953,7 @@ String WW8Read_xstz(SvStream& rStrm, USHORT nChars, bool bAtEndSeekRel1) } if( bAtEndSeekRel1 ) - rStrm.SeekRel( 2 ); // ueberspringe das Null-Character am Ende. + rStrm.SeekRel( 2 ); // ueberspringe das Null-Character am Ende. return aStr; } @@ -1978,7 +1978,7 @@ USHORT WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, long nTotalRead = 0; WW8_CP nBehindTextCp = nAktStartCp + nTotalLen; - WW8_CP nNextPieceCp = nBehindTextCp; // Initialisierung wichtig fuer Ver6 + WW8_CP nNextPieceCp = nBehindTextCp; // Initialisierung wichtig fuer Ver6 do { bool bIsUnicode, bPosOk; @@ -2019,7 +2019,7 @@ USHORT WW8ScannerBase::WW8ReadString( SvStream& rStrm, String& rStr, } //----------------------------------------- -// WW8PLCFspecial +// WW8PLCFspecial //----------------------------------------- // Bei nStartPos < 0 wird das erste Element des PLCFs genommen @@ -2045,7 +2045,7 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, long nFilePos, long nPLCF, if( nStruct ) // Pointer auf Inhalts-Array pPLCF_Contents = (BYTE*)&pPLCF_PosArray[nIMax + 1]; else - pPLCF_Contents = 0; // kein Inhalt + pPLCF_Contents = 0; // kein Inhalt if( nStartPos >= 0 ) SeekPos( nStartPos ); @@ -2061,7 +2061,7 @@ bool WW8PLCFspecial::SeekPos(long nP) if( nP < pPLCF_PosArray[0] ) { nIdx = 0; - return false; // Not found: nP unterhalb kleinstem Eintrag + return false; // Not found: nP unterhalb kleinstem Eintrag } // Search from beginning? @@ -2074,17 +2074,17 @@ bool WW8PLCFspecial::SeekPos(long nP) for(int n = (1==nIdx ? 1 : 2); n; --n ) { for( ; nI <=nEnd; ++nI) - { // Suchen mit um 1 erhoehtem Index + { // Suchen mit um 1 erhoehtem Index if( nP < pPLCF_PosArray[nI] ) - { // Position gefunden - nIdx = nI - 1; // nI - 1 ist der richtige Index - return true; // ... und fertig + { // Position gefunden + nIdx = nI - 1; // nI - 1 ist der richtige Index + return true; // ... und fertig } } nI = 1; nEnd = nIdx-1; } - nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2097,7 +2097,7 @@ bool WW8PLCFspecial::SeekPosExact(long nP) if( nP < pPLCF_PosArray[0] ) { nIdx = 0; - return false; // Not found: nP unterhalb kleinstem Eintrag + return false; // Not found: nP unterhalb kleinstem Eintrag } // Search from beginning? if( nP <=pPLCF_PosArray[nIdx] ) @@ -2111,15 +2111,15 @@ bool WW8PLCFspecial::SeekPosExact(long nP) for( ; nI < nEnd; ++nI) { if( nP <=pPLCF_PosArray[nI] ) - { // Position gefunden - nIdx = nI; // nI ist der richtige Index - return true; // ... und fertig + { // Position gefunden + nIdx = nI; // nI ist der richtige Index + return true; // ... und fertig } } nI = 0; nEnd = nIdx; } - nIdx = nIMax; // Not found, groesser als alle Eintraege + nIdx = nIMax; // Not found, groesser als alle Eintraege return false; } @@ -2141,7 +2141,7 @@ bool WW8PLCFspecial::GetData(long nInIdx, long& rPos, void*& rpValue) const } //----------------------------------------- -// WW8PLCF z.B. fuer SEPX +// WW8PLCF z.B. fuer SEPX //----------------------------------------- // Ctor fuer *andere* als Fkps @@ -2203,30 +2203,30 @@ void WW8PLCF::GeneratePLCF( SvStream* pSt, long nPN, long ncpN ) OSL_ENSURE( nIMax < (long)ncpN, "Pcl.Fkp: Warum ist PLCF zu gross ?" ); nIMax = ncpN; long nSiz = 6 * nIMax + 4; - pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array + pPLCF_PosArray = new INT32[ ( nSiz + 3 ) / 4 ]; // Pointer auf Pos-Array memset( pPLCF_PosArray, 0, (size_t)nSiz ); INT32 nFc; USHORT i; - for( i = 0; i < ncpN; i++ ){ // Baue FC-Eintraege - pSt->Seek( ( nPN + i ) << 9 ); // erster FC-Eintrag jedes Fkp + for( i = 0; i < ncpN; i++ ){ // Baue FC-Eintraege + pSt->Seek( ( nPN + i ) << 9 ); // erster FC-Eintrag jedes Fkp *pSt >> nFc; pPLCF_PosArray[i] = nFc; } ULONG nLastFkpPos = ( ( nPN + nIMax - 1 ) << 9 ); - pSt->Seek( nLastFkpPos + 511 ); // Anz. Fkp-Eintraege des letzten Fkp + pSt->Seek( nLastFkpPos + 511 ); // Anz. Fkp-Eintraege des letzten Fkp BYTE nb; *pSt >> nb; - pSt->Seek( nLastFkpPos + nb * 4 ); // letzer FC-Eintrag des letzten Fkp + pSt->Seek( nLastFkpPos + nb * 4 ); // letzer FC-Eintrag des letzten Fkp *pSt >> nFc; - pPLCF_PosArray[nIMax] = nFc; // Ende des letzten Fkp + pPLCF_PosArray[nIMax] = nFc; // Ende des letzten Fkp // Pointer auf Inhalts-Array pPLCF_Contents = (BYTE*)&pPLCF_PosArray[nIMax + 1]; BYTE* p = pPLCF_Contents; - for( i = 0; i < ncpN; i++ ) // Baue PNs + for( i = 0; i < ncpN; i++ ) // Baue PNs { ShortToSVBT16(nPN + i, p); p+=2; @@ -2253,19 +2253,19 @@ bool WW8PLCF::SeekPos(long nPos) for(int n = (1==nIdx ? 1 : 2); n; --n ) { - for( ; nI <=nEnd; ++nI) // Suchen mit um 1 erhoehtem Index + for( ; nI <=nEnd; ++nI) // Suchen mit um 1 erhoehtem Index { - if( nP < pPLCF_PosArray[nI] ) // Position gefunden + if( nP < pPLCF_PosArray[nI] ) // Position gefunden { - nIdx = nI - 1; // nI - 1 ist der richtige Index - return true; // ... und fertig + nIdx = nI - 1; // nI - 1 ist der richtige Index + return true; // ... und fertig } } nI = 1; nEnd = nIdx-1; } - nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2291,14 +2291,14 @@ long WW8PLCF::Where() const } //----------------------------------------- -// WW8PLCFpcd +// WW8PLCFpcd //----------------------------------------- WW8PLCFpcd::WW8PLCFpcd( SvStream* pSt, long nFilePos, long nPLCF, long nStruct ) :nStru( nStruct ) { nIMax = ( nPLCF - 4 ) / ( 4 + nStruct ); - pPLCF_PosArray = new INT32[ ( nPLCF + 3 ) / 4 ]; // Pointer auf Pos-Array + pPLCF_PosArray = new INT32[ ( nPLCF + 3 ) / 4 ]; // Pointer auf Pos-Array long nOldPos = pSt->Tell(); @@ -2330,7 +2330,7 @@ bool WW8PLCFpcd_Iter::SeekPos(long nPos) if( nP < rPLCF.pPLCF_PosArray[0] ) { nIdx = 0; - return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag + return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag } // Search from beginning? if( (1 > nIdx) || (nP < rPLCF.pPLCF_PosArray[ nIdx-1 ]) ) @@ -2352,7 +2352,7 @@ bool WW8PLCFpcd_Iter::SeekPos(long nPos) nI = 1; nEnd = nIdx-1; } - nIdx = rPLCF.nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = rPLCF.nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2520,7 +2520,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::SeekPos(WW8_FC nFc) if (nFc < maEntries[0].mnFC) { nIdx = 0; - return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag + return false; // Nicht gefunden: nPos unterhalb kleinstem Eintrag } // Search from beginning? if( (1 > nIdx) || (nFc < maEntries[nIdx-1].mnFC) ) @@ -2542,7 +2542,7 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::SeekPos(WW8_FC nFc) nI = 1; nEnd = nIdx-1; } - nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege + nIdx = nIMax; // Nicht gefunden, groesser als alle Eintraege return false; } @@ -2681,11 +2681,11 @@ bool WW8PLCFx_Fc_FKP::NewFkp() if (!pPLCF->Get( nPLCFStart, nPLCFEnd, pPage )) { pFkp = 0; - return false; // PLCF fertig abgearbeitet + return false; // PLCF fertig abgearbeitet } (*pPLCF)++; long nPo = SVBT16ToShort( (BYTE *)pPage ); - nPo <<= 9; // shift als LONG + nPo <<= 9; // shift als LONG long nAktFkpFilePos = pFkp ? pFkp->GetFilePos() : -1; if (nAktFkpFilePos == nPo) @@ -2712,7 +2712,7 @@ bool WW8PLCFx_Fc_FKP::NewFkp() } } - SetStartFc( -1 ); // Nur das erste Mal + SetStartFc( -1 ); // Nur das erste Mal return true; } @@ -2760,11 +2760,11 @@ void WW8PLCFx_Fc_FKP::SetIdx( ULONG nIdx ) pFkp = 0; } else - { //Es gab einen Fkp + { //Es gab einen Fkp //Lese PLCF um 1 Pos zurueck, um die Adresse des Fkp wiederzubekommen pPLCF->SetIdx( ( nIdx >> 8 ) - 1 ); - if ( NewFkp() ) // und lese Fkp wieder ein - pFkp->SetIdx( nIdx & 0xff ); // Dann stelle Fkp-Pos wieder ein + if ( NewFkp() ) // und lese Fkp wieder ein + pFkp->SetIdx( nIdx & 0xff ); // Dann stelle Fkp-Pos wieder ein } } @@ -2782,7 +2782,7 @@ bool WW8PLCFx_Fc_FKP::SeekPos(WW8_FC nFcPos) if( pFkp && pPLCF->Get( nPLCFStart, nPLCFEnd, pPage ) ) { long nPo = SVBT16ToShort( (BYTE *)pPage ); - nPo <<= 9; // shift als LONG + nPo <<= 9; // shift als LONG if (nPo != pFkp->GetFilePos()) pFkp = 0; else @@ -2802,13 +2802,13 @@ WW8_FC WW8PLCFx_Fc_FKP::Where() if( nP != LONG_MAX ) return nP; - pFkp = 0; // FKP beendet -> hole neuen - return Where(); // am einfachsten rekursiv + pFkp = 0; // FKP beendet -> hole neuen + return Where(); // am einfachsten rekursiv } BYTE* WW8PLCFx_Fc_FKP::GetSprmsAndPos(WW8_FC& rStart, WW8_FC& rEnd, long& rLen) { - rLen = 0; // Default + rLen = 0; // Default rStart = rEnd = LONG_MAX; if( !pFkp ) // Fkp not there ? @@ -2981,9 +2981,9 @@ void WW8PLCFx_Cp_FKP::SetPCDIdx( ULONG nIdx ) bool WW8PLCFx_Cp_FKP::SeekPos(WW8_CP nCpPos) { - if( pPcd ) // Complex + if( pPcd ) // Complex { - if( !pPcd->SeekPos( nCpPos ) ) // Piece setzen + if( !pPcd->SeekPos( nCpPos ) ) // Piece setzen return false; if (pPCDAttrs && !pPCDAttrs->GetIter()->SeekPos(nCpPos)) return false; @@ -2997,8 +2997,8 @@ WW8_CP WW8PLCFx_Cp_FKP::Where() { WW8_FC nFc = WW8PLCFx_Fc_FKP::Where(); if( pPcd ) - return pPcd->AktPieceStartFc2Cp( nFc ); // Piece ermitteln - return rSBase.WW8Fc2Cp( nFc ); // KEINE Piece-Table !!! + return pPcd->AktPieceStartFc2Cp( nFc ); // Piece ermitteln + return rSBase.WW8Fc2Cp( nFc ); // KEINE Piece-Table !!! } void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) @@ -3031,7 +3031,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) return; } - if( pPcd ) // Piece-Table vorhanden !!! + if( pPcd ) // Piece-Table vorhanden !!! { // Init ( noch kein ++ gerufen ) if( (nAttrStart > nAttrEnd) || (nAttrStart == -1) ) @@ -3103,7 +3103,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) If the FKP FC that was found was greater than the FC of the end of the piece, scan piece by piece toward the end of the document until a piece is found that - contains a paragraph end mark. + contains a paragraph end mark. */ /* @@ -3168,7 +3168,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) p->bRealLineEnd = bLineEnd; } } - else // KEINE Piece-Table !!! + else // KEINE Piece-Table !!! { p->nStartPos = rSBase.WW8Fc2Cp( p->nStartPos ); p->nEndPos = rSBase.WW8Fc2Cp( p->nEndPos ); @@ -3183,13 +3183,13 @@ WW8PLCFx& WW8PLCFx_Cp_FKP::operator ++( int ) if ( !bComplex || !pPcd ) return *this; - if( GetPCDIdx() >= GetPCDIMax() ) // End of PLCF + if( GetPCDIdx() >= GetPCDIMax() ) // End of PLCF { nAttrStart = nAttrEnd = LONG_MAX; return *this; } - long nFkpLen; // Fkp-Eintrag + long nFkpLen; // Fkp-Eintrag // Fkp-Eintrag holen WW8PLCFx_Fc_FKP::GetSprmsAndPos(nAttrStart, nAttrEnd, nFkpLen); @@ -3210,7 +3210,7 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt, ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, 12, nStartCp) : 0; - pSprms = new BYTE[nArrMax]; // maximum length + pSprms = new BYTE[nArrMax]; // maximum length } WW8PLCFx_SEPX::~WW8PLCFx_SEPX() @@ -3248,7 +3248,7 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p) p->bRealLineEnd = false; if (!pPLCF->Get( p->nStartPos, p->nEndPos, pData )) { - p->nStartPos = p->nEndPos = LONG_MAX; // PLCF fertig abgearbeitet + p->nStartPos = p->nEndPos = LONG_MAX; // PLCF fertig abgearbeitet p->pMemPos = 0; p->nSprmsLen = 0; } @@ -3257,25 +3257,25 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p) long nPo = SVBT32ToUInt32( (BYTE*)pData+2 ); if (nPo == -1L) { - p->nStartPos = p->nEndPos = LONG_MAX; // Sepx empty + p->nStartPos = p->nEndPos = LONG_MAX; // Sepx empty p->pMemPos = 0; p->nSprmsLen = 0; } else { pStrm->Seek( nPo ); - *pStrm >> nSprmSiz; // read len + *pStrm >> nSprmSiz; // read len if( nSprmSiz > nArrMax ) - { // passt nicht + { // passt nicht delete[] pSprms; - nArrMax = nSprmSiz; // Hole mehr Speicher + nArrMax = nSprmSiz; // Hole mehr Speicher pSprms = new BYTE[nArrMax]; } - pStrm->Read( pSprms, nSprmSiz ); // read Sprms + pStrm->Read( pSprms, nSprmSiz ); // read Sprms p->nSprmsLen = nSprmSiz; - p->pMemPos = pSprms; // return Position + p->pMemPos = pSprms; // return Position } } } @@ -3366,7 +3366,7 @@ const BYTE* WW8PLCFx_SEPX::HasSprm( USHORT nId, BYTE n2nd ) const pSp += x; } - return 0; // Sprm nicht gefunden + return 0; // Sprm nicht gefunden } //----------------------------------------- @@ -3424,7 +3424,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen ) if ( !pRef ) { - rStart = LONG_MAX; // Es gibt keine Noten + rStart = LONG_MAX; // Es gibt keine Noten rLen = 0; return -1; } @@ -3433,7 +3433,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen ) if (!pRef->Get( rStart, nE, pData )) { - rStart = LONG_MAX; // PLCF fertig abgearbeitet + rStart = LONG_MAX; // PLCF fertig abgearbeitet rLen = 0; return -1; } @@ -3441,7 +3441,7 @@ long WW8PLCFx_SubDoc::GetNoSprms( WW8_CP& rStart, long& rEnd, long& rLen ) if(!pTxt->Get( nSt, rLen, pData )) { - rStart = LONG_MAX; // PLCF fertig abgearbeitet + rStart = LONG_MAX; // PLCF fertig abgearbeitet rLen = 0; return -1; } @@ -3461,7 +3461,7 @@ WW8PLCFx& WW8PLCFx_SubDoc::operator ++( int ) } //----------------------------------------- -// Felder +// Felder //----------------------------------------- WW8PLCFx_FLD::WW8PLCFx_FLD( SvStream* pSt, const WW8Fib& rMyFib, short nType) @@ -3573,7 +3573,7 @@ void WW8PLCFx_FLD::GetSprms(WW8PLCFxDesc* p) if (!pPLCF) { - p->nStartPos = LONG_MAX; // Es gibt keine Felder + p->nStartPos = LONG_MAX; // Es gibt keine Felder return; } @@ -3581,18 +3581,18 @@ void WW8PLCFx_FLD::GetSprms(WW8PLCFxDesc* p) long nP; void *pData; - if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? + if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? { - p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet + p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet return; } p->nStartPos = nP; (*pPLCF)++; - if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? + if (!pPLCF->Get(nP, pData)) // Ende des PLCFspecial ? { - p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet + p->nStartPos = LONG_MAX; // PLCF fertig abgearbeitet return; } @@ -3625,7 +3625,7 @@ bool WW8PLCFx_FLD::GetPara(long nIdx, WW8FieldDesc& rF) } //----------------------------------------- -// class WW8PLCF_Book +// class WW8PLCF_Book //----------------------------------------- /* to be optimized like this: */ @@ -3637,7 +3637,7 @@ void WW8ReadSTTBF(bool bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen, rStrm.Seek( nStart ); UINT16 nLen2; - rStrm >> nLen2; // bVer67: total length of structure + rStrm >> nLen2; // bVer67: total length of structure // bVer8 : count of strings if( bVer8 ) @@ -3745,7 +3745,7 @@ WW8PLCFx_Book::WW8PLCFx_Book(SvStream* pTblSt, const WW8Fib& rFib) nIMax = aBookNames.size(); - if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks + if( pBook[0]->GetIMax() < nIMax ) // Count of Bookmarks nIMax = pBook[0]->GetIMax(); if( pBook[1]->GetIMax() < nIMax ) nIMax = pBook[1]->GetIMax(); @@ -3782,7 +3782,7 @@ void WW8PLCFx_Book::SetIdx2( ULONG nI ) if( nIMax ) { pBook[1]->SetIdx( nI & 0x7fffffff ); - nIsEnd = (USHORT)( ( nI >> 31 ) & 1 ); // 0 oder 1 + nIsEnd = (USHORT)( ( nI >> 31 ) & 1 ); // 0 oder 1 } } @@ -3815,7 +3815,7 @@ long WW8PLCFx_Book::GetNoSprms( long& rStart, long& rEnd, long& rLen ) return -1; } - pBook[nIsEnd]->Get( rStart, pData ); // Pos. abfragen + pBook[nIsEnd]->Get( rStart, pData ); // Pos. abfragen return pBook[nIsEnd]->GetIdx(); } @@ -3975,7 +3975,7 @@ const String* WW8PLCFx_Book::GetName() const } //----------------------------------------- -// WW8PLCFMan +// WW8PLCFMan //----------------------------------------- #ifndef DUMP @@ -4002,7 +4002,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc ) if ( (&rDesc == pPap) && rDesc.bRealLineEnd ) { - if ( pPap->nEndPos != LONG_MAX ) // Para adjust + if ( pPap->nEndPos != LONG_MAX ) // Para adjust { nLineEnd = pPap->nEndPos;// nLineEnd zeigt *hinter* das <CR> pPap->nEndPos--; // Absatzende um 1 Zeichen verkuerzen @@ -4021,8 +4021,8 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc ) else if ( (&rDesc == pChp) || (&rDesc == pSep) ) { // Char Adjust oder Sep Adjust Wenn Ende Char-Attr == Absatzende ... - if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) ) - rDesc.nEndPos--; // ... dann um 1 Zeichen verkuerzen + if( (rDesc.nEndPos == nLineEnd) && (rDesc.nEndPos > rDesc.nStartPos) ) + rDesc.nEndPos--; // ... dann um 1 Zeichen verkuerzen } } @@ -4085,7 +4085,7 @@ USHORT WW8PLCFMan::GetId(const WW8PLCFxDesc* p) const else if (p->nSprmsLen > 0) nId = maSprmParser.GetSprmId(p->pMemPos); else - nId = 0; // Id = 0 for empty attributes + nId = 0; // Id = 0 for empty attributes return nId; } @@ -4143,7 +4143,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, pPap = &aD[5]; pSep = &aD[6]; // Dummy - pAnd = pFtn = pEdn = 0; // unbenutzt bei SpezText + pAnd = pFtn = pEdn = 0; // unbenutzt bei SpezText } pChp->pPLCFx = pBase->pChpPLCF; @@ -4157,7 +4157,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, pMagicTables = pBase->pMagicTables; - switch( nType ) // Feld-Initialisierung + switch( nType ) // Feld-Initialisierung { case MAN_HDFT: pFld->pPLCFx = pBase->pFldHdFtPLCF; @@ -4209,7 +4209,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, } if( nStartCp || nCpO ) - SeekPos( nStartCp ); // PLCFe auf Text-StartPos einstellen + SeekPos( nStartCp ); // PLCFe auf Text-StartPos einstellen // initialisieren der Member-Vars Low-Level GetChpPLCF()->ResetAttrStartEnd(); @@ -4264,7 +4264,7 @@ WW8PLCFMan::WW8PLCFMan(WW8ScannerBase* pBase, short nType, long nStartCp, GetNewSprms( *p ); } else - GetNewSprms( *p ); // bei allen PLCFen initialisiert sein + GetNewSprms( *p ); // bei allen PLCFen initialisiert sein } else if( p->pPLCFx ) GetNewNoSprms( *p ); @@ -4283,9 +4283,9 @@ WW8PLCFMan::~WW8PLCFMan() USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const { OSL_ENSURE(nPLCF,"What the hell"); - long nNext = LONG_MAX; // SuchReihenfolge: + long nNext = LONG_MAX; // SuchReihenfolge: USHORT nNextIdx = nPLCF;// first ending found ( CHP, PAP, ( SEP ) ), - bool bStart = true; // dann Anfaenge finden ( ( SEP ), PAP, CHP ) + bool bStart = true; // dann Anfaenge finden ( ( SEP ), PAP, CHP ) USHORT i; const WW8PLCFxDesc* pD; for (i=0; i < nPLCF; i++) @@ -4293,7 +4293,7 @@ USHORT WW8PLCFMan::WhereIdx(bool* pbStart, long* pPos) const pD = &aD[i]; if (pD != pPcdA) { - if( (pD->nEndPos < nNext) && (pD->nStartPos == LONG_MAX) ) + if( (pD->nEndPos < nNext) && (pD->nStartPos == LONG_MAX) ) { // sonst ist Anfang = Ende nNext = pD->nEndPos; @@ -4402,7 +4402,7 @@ void WW8PLCFMan::GetSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const const WW8PLCFxDesc* p = &aD[nIdx]; if (!(p->pIdStk->empty())) - pRes->nSprmId = p->pIdStk->top(); // get end position + pRes->nSprmId = p->pIdStk->top(); // get end position else { OSL_ENSURE( !this, "No Id on the Stack" ); @@ -4435,12 +4435,12 @@ void WW8PLCFMan::GetNoSprmStart( short nIdx, WW8PLCFManResult* pRes ) const GetSprmStart( nIdx+1, pRes ); } else - pRes->nSprmId = 0; // default: not found + pRes->nSprmId = 0; // default: not found } void WW8PLCFMan::GetNoSprmEnd( short nIdx, WW8PLCFManResult* pRes ) const { - pRes->nMemLen = -1; // Ende-Kennzeichen + pRes->nMemLen = -1; // Ende-Kennzeichen if( &aD[nIdx] == pBkm ) pRes->nSprmId = eBKN; @@ -4472,7 +4472,7 @@ bool WW8PLCFMan::TransferOpenSprms(std::stack<USHORT> &rStack) void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) { - WW8PLCFxDesc* p = &aD[nIdx]; // Sprm-Klasse(!) ermitteln + WW8PLCFxDesc* p = &aD[nIdx]; // Sprm-Klasse(!) ermitteln p->bFirstSprm = false; if( bStart ) @@ -4481,7 +4481,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) p->pIdStk->push(nLastId); // merke Id fuer Attribut-Ende if( p->nSprmsLen ) - { /* + { /* Pruefe, ob noch Sprm(s) abzuarbeiten sind */ if( p->pMemPos ) @@ -4506,7 +4506,7 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) p->nSprmsLen = 0; } if (p->nSprmsLen < maSprmParser.MinSprmLen()) - p->nStartPos = LONG_MAX; // es folgen Enden + p->nStartPos = LONG_MAX; // es folgen Enden } else { @@ -4571,8 +4571,8 @@ void WW8PLCFMan::AdvSprm(short nIdx, bool bStart) } else { - (*p->pPLCFx)++; // next Group of Sprms - p->pMemPos = 0; // !!! + (*p->pPLCFx)++; // next Group of Sprms + p->pMemPos = 0; // !!! p->nSprmsLen = 0; GetNewSprms( *p ); } @@ -4631,7 +4631,7 @@ void WW8PLCFMan::AdvNoSprm(short nIdx, bool bStart) else { // NoSprm ohne Ende (*p->pPLCFx)++; - p->pMemPos = 0; // MemPos ungueltig + p->pMemPos = 0; // MemPos ungueltig p->nSprmsLen = 0; GetNewNoSprms( *p ); } @@ -4645,18 +4645,18 @@ WW8PLCFMan& WW8PLCFMan::operator ++(int) { WW8PLCFxDesc* p = &aD[nIdx]; - p->bFirstSprm = true; // Default + p->bFirstSprm = true; // Default if( p->pPLCFx->IsSprm() ) AdvSprm( nIdx, bStart ); - else // NoSprm + else // NoSprm AdvNoSprm( nIdx, bStart ); } return *this; } // Rueckgabe true fuer Anfang eines Attributes oder Fehler, -// false fuer Ende d. Attr +// false fuer Ende d. Attr // Restliche Rueckgabewerte werden in der vom Aufrufer zu stellenden Struktur // WW8PclxManResults geliefert. bool WW8PLCFMan::Get(WW8PLCFManResult* pRes) const @@ -4831,7 +4831,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) { BYTE aBits1; BYTE aBits2; - BYTE aVer8Bits1; // nur ab WinWord 8 benutzt + BYTE aVer8Bits1; // nur ab WinWord 8 benutzt rSt.Seek( nOffset ); /* Wunsch-Nr vermerken, File-Versionsnummer ermitteln @@ -4849,22 +4849,22 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) switch( nVersion ) { case 6: - nFibMin = 0x0065; // von 101 WinWord 6.0 + nFibMin = 0x0065; // von 101 WinWord 6.0 // 102 " // und 103 WinWord 6.0 fuer Macintosh // 104 " - nFibMax = 0x0069; // bis 105 WinWord 95 + nFibMax = 0x0069; // bis 105 WinWord 95 break; case 7: - nFibMin = 0x0069; // von 105 WinWord 95 - nFibMax = 0x0069; // bis 105 WinWord 95 + nFibMin = 0x0069; // von 105 WinWord 95 + nFibMax = 0x0069; // bis 105 WinWord 95 break; case 8: - nFibMin = 0x006A; // von 106 WinWord 97 - nFibMax = 0x00c1; // bis 193 WinWord 97 (?) + nFibMin = 0x006A; // von 106 WinWord 97 + nFibMax = 0x00c1; // bis 193 WinWord 97 (?) break; default: - nFibMin = 0; // Programm-Fehler! + nFibMin = 0; // Programm-Fehler! nFibMax = 0; nFib = 1; OSL_ENSURE( !this, "Es wurde vergessen, nVersion zu kodieren!" ); @@ -4872,7 +4872,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) } if ( (nFib < nFibMin) || (nFib > nFibMax) ) { - nFibError = ERR_SWG_READ_ERROR; // Error melden + nFibError = ERR_SWG_READ_ERROR; // Error melden return; // und hopp raus! } } @@ -4896,7 +4896,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) rSt >> lKey1; rSt >> lKey2; rSt >> envr; - rSt >> aVer8Bits1; // unter Ver67 nur leeres Reservefeld + rSt >> aVer8Bits1; // unter Ver67 nur leeres Reservefeld // Inhalt von aVer8Bits1 // // BYTE fMac :1; @@ -4924,15 +4924,15 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) /* // dies sind die 9 unused Felder: - && (bVer67 || WW8ReadINT16( rSt, pnFbpChpFirst_W6 )) // 1 - && (bVer67 || WW8ReadINT16( rSt, pnChpFirst_W6 )) // 2 - && (bVer67 || WW8ReadINT16( rSt, cpnBteChp_W6 )) // 3 - && (bVer67 || WW8ReadINT16( rSt, pnFbpPapFirst_W6 )) // 4 - && (bVer67 || WW8ReadINT16( rSt, pnPapFirst_W6 )) // 5 - && (bVer67 || WW8ReadINT16( rSt, cpnBtePap_W6 )) // 6 - && (bVer67 || WW8ReadINT16( rSt, pnFbpLvcFirst_W6 )) // 7 - && (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) // 8 - && (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) // 9 + && (bVer67 || WW8ReadINT16( rSt, pnFbpChpFirst_W6 )) // 1 + && (bVer67 || WW8ReadINT16( rSt, pnChpFirst_W6 )) // 2 + && (bVer67 || WW8ReadINT16( rSt, cpnBteChp_W6 )) // 3 + && (bVer67 || WW8ReadINT16( rSt, pnFbpPapFirst_W6 )) // 4 + && (bVer67 || WW8ReadINT16( rSt, pnPapFirst_W6 )) // 5 + && (bVer67 || WW8ReadINT16( rSt, cpnBtePap_W6 )) // 6 + && (bVer67 || WW8ReadINT16( rSt, pnFbpLvcFirst_W6 )) // 7 + && (bVer67 || WW8ReadINT16( rSt, pnLvcFirst_W6 )) // 8 + && (bVer67 || WW8ReadINT16( rSt, cpnBteLvc_W6 )) // 9 */ rSt >> lidFE; rSt >> clw; @@ -5144,7 +5144,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) } else if( bVer8 ) { - fMac = aVer8Bits1 & 0x01 ; + fMac = aVer8Bits1 & 0x01 ; fEmptySpecial = ( aVer8Bits1 & 0x02 ) >> 1; fLoadOverridePage = ( aVer8Bits1 & 0x04 ) >> 2; fFuturesavedUndo = ( aVer8Bits1 & 0x08 ) >> 3; @@ -5171,10 +5171,10 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) nFibError = ERR_SWG_READ_ERROR; } - rSt.Seek( 0x372 ); // fcSttbListNames + rSt.Seek( 0x372 ); // fcSttbListNames rSt >> fcSttbListNames; rSt >> lcbSttbListNames; - rSt.Seek( 0x382 ); // MagicTables + rSt.Seek( 0x382 ); // MagicTables rSt >> fcMagicTable; rSt >> lcbMagicTable; if( 0 != rSt.GetError() ) @@ -5185,7 +5185,7 @@ WW8Fib::WW8Fib( SvStream& rSt, BYTE nWantedVersion,UINT32 nOffset ) } else { - nFibError = ERR_SWG_READ_ERROR; // Error melden + nFibError = ERR_SWG_READ_ERROR; // Error melden } } @@ -5202,16 +5202,16 @@ WW8Fib::WW8Fib(BYTE nVer) nFibBack = 0xbf; nProduct = 0x204D; - csw = 0x0e; // muss das sein ??? - cfclcb = 0x6c; // -""- - clw = 0x16; // -""- + csw = 0x0e; // muss das sein ??? + cfclcb = 0x6c; // -""- + clw = 0x16; // -""- pnFbpChpFirst = pnFbpPapFirst = pnFbpLvcFirst = 0x000fffff; fExtChar = true; fWord97Saved = fWord2000Saved = true; // diese Flags muessen nicht gesetzt werden; koennen aber. - // wMagicCreated = wMagicRevised = 0x6a62; - // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2; + // wMagicCreated = wMagicRevised = 0x6a62; + // wMagicCreatedPrivate = wMagicRevisedPrivate = 0xb3b2; // wMagicCreated = 0x6143; @@ -5249,14 +5249,14 @@ bool WW8Fib::Write(SvStream& rStrm) Set_UInt16( pData, pnNext ); UINT16 nBits16 = 0; - if( fDot ) nBits16 |= 0x0001; - if( fGlsy) nBits16 |= 0x0002; - if( fComplex ) nBits16 |= 0x0004; - if( fHasPic ) nBits16 |= 0x0008; + if( fDot ) nBits16 |= 0x0001; + if( fGlsy) nBits16 |= 0x0002; + if( fComplex ) nBits16 |= 0x0004; + if( fHasPic ) nBits16 |= 0x0008; nBits16 |= (0xf0 & ( cQuickSaves << 4 )); - if( fEncrypted ) nBits16 |= 0x0100; - if( fWhichTblStm ) nBits16 |= 0x0200; - if( fExtChar ) nBits16 |= 0x1000; + if( fEncrypted ) nBits16 |= 0x0100; + if( fWhichTblStm ) nBits16 |= 0x0200; + if( fExtChar ) nBits16 |= 0x1000; Set_UInt16( pData, nBits16 ); Set_UInt16( pData, nFibBack ); @@ -5267,11 +5267,11 @@ bool WW8Fib::Write(SvStream& rStrm) BYTE nBits8 = 0; if( bVer8 ) { - if( fMac ) nBits8 |= 0x0001; - if( fEmptySpecial ) nBits8 |= 0x0002; - if( fLoadOverridePage ) nBits8 |= 0x0004; - if( fFuturesavedUndo ) nBits8 |= 0x0008; - if( fWord97Saved ) nBits8 |= 0x0010; + if( fMac ) nBits8 |= 0x0001; + if( fEmptySpecial ) nBits8 |= 0x0002; + if( fLoadOverridePage ) nBits8 |= 0x0004; + if( fFuturesavedUndo ) nBits8 |= 0x0008; + if( fWord97Saved ) nBits8 |= 0x0010; if( fWord2000Saved ) nBits8 |= 0x0020; } // unter Ver67 these are only reserved @@ -5477,7 +5477,7 @@ bool WW8Fib::Write(SvStream& rStrm) if( bVer8 ) { - pData += 0x2e2 - 0x27a; // Pos + Offset (fcPlcfLst - fcStwUser) + pData += 0x2e2 - 0x27a; // Pos + Offset (fcPlcfLst - fcStwUser) Set_UInt32( pData, fcPlcfLst ); Set_UInt32( pData, lcbPlcfLst ); Set_UInt32( pData, fcPlfLfo ); @@ -5487,7 +5487,7 @@ bool WW8Fib::Write(SvStream& rStrm) Set_UInt32( pData, fcPlcfHdrtxbxBkd ); Set_UInt32( pData, lcbPlcfHdrtxbxBkd ); - pData += 0x372 - 0x302; // Pos + Offset (fcSttbListNames - fcDocUndo) + pData += 0x372 - 0x302; // Pos + Offset (fcSttbListNames - fcDocUndo) Set_UInt32( pData, fcSttbListNames ); Set_UInt32( pData, lcbSttbListNames ); @@ -5525,12 +5525,12 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) rSt.Seek(nStyleStart); - USHORT cbStshi = 0; // 2 bytes size of the following STSHI structure + USHORT cbStshi = 0; // 2 bytes size of the following STSHI structure // alte Version ? if (rFib.nFib < 67) - cbStshi = 4; // -> Laengenfeld fehlt - else // neue Version: + cbStshi = 4; // -> Laengenfeld fehlt + else // neue Version: // lies die Laenge der in der Datei gespeicherten Struktur rSt >> cbStshi; @@ -5571,7 +5571,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara) if( 18 < nRead ) rSt.SeekRel( nRead-18 ); } - while( !this ); // Trick: obiger Block wird genau einmal durchlaufen + while( !this ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. if( 0 != rSt.GetError() ) @@ -5589,7 +5589,7 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd ) WW8_STD* pStd = 0; UINT16 cbStd; - rSt >> cbStd; // lies Laenge + rSt >> cbStd; // lies Laenge UINT16 nRead = cbSTDBaseInFile; if( cbStd >= cbSTDBaseInFile ) @@ -5636,18 +5636,18 @@ WW8_STD* WW8Style::Read1STDFixed( short& rSkip, short* pcbStd ) if( 10 < nRead ) rSt.SeekRel( nRead-10 ); } - while( !this ); // Trick: obiger Block wird genau einmal durchlaufen + while( !this ); // Trick: obiger Block wird genau einmal durchlaufen // und kann vorzeitig per "break" verlassen werden. if( (0 != rSt.GetError()) || !nRead ) - DELETEZ( pStd ); // per NULL den Error melden + DELETEZ( pStd ); // per NULL den Error melden rSkip = cbStd - cbSTDBaseInFile; } else - { // Fixed part zu kurz + { // Fixed part zu kurz if( cbStd ) - rSt.SeekRel( cbStd ); // ueberlies Reste + rSt.SeekRel( cbStd ); // ueberlies Reste rSkip = 0; } if( pcbStd ) @@ -5660,11 +5660,11 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd ) // Attention: MacWord-Documents have their Stylenames // always in ANSI, even if eStructCharSet == CHARSET_MAC !! - WW8_STD* pStd = Read1STDFixed( rSkip, pcbStd ); // lese STD + WW8_STD* pStd = Read1STDFixed( rSkip, pcbStd ); // lese STD // String gewuenscht ? if( pString ) - { // echter Style ? + { // echter Style ? if ( pStd ) { switch( rFib.nVersion ) @@ -5707,7 +5707,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd ) } } else - *pString = aEmptyStr; // Kann keinen Namen liefern + *pString = aEmptyStr; // Kann keinen Namen liefern } return pStd; } @@ -5719,7 +5719,7 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, String* pString, short* pcbStd ) struct WW8_FFN_Ver6 : public WW8_FFN_BASE { // ab Ver6 - sal_Char szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that + sal_Char szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that // records name of font. // Maximal size of szFfn is 65 characters. // Vorsicht: Dieses Array kann auch kleiner sein!!! @@ -5731,8 +5731,8 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE { // ab Ver8 sind folgende beiden Felder eingeschoben, // werden von uns ignoriert. - sal_Char panose[ 10 ]; // 0x6 PANOSE - sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE + sal_Char panose[ 10 ]; // 0x6 PANOSE + sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE // ab Ver8 als Unicode UINT16 szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that @@ -5792,7 +5792,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) break; nMax++; nLeft -= nNextSiz; - if( nLeft < 1 ) // can we read the given ammount of bytes ? + if( nLeft < 1 ) // can we read the given ammount of bytes ? break; // increase p by nNextSiz Bytes p = (WW8_FFN *)( ( (BYTE*)p ) + nNextSiz ); @@ -5831,12 +5831,12 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) if ((eEnc == RTL_TEXTENCODING_SYMBOL) || (eEnc == RTL_TEXTENCODING_DONTKNOW)) eEnc = RTL_TEXTENCODING_MS_1252; p->sFontname = String(pVer6->szFfn, eEnc); -// p->sFontname = String(pVer6->szFfn, RTL_TEXTENCODING_MS_1252); +// p->sFontname = String(pVer6->szFfn, RTL_TEXTENCODING_MS_1252); if (p->ibszAlt) { p->sFontname.Append(';'); p->sFontname += String(pVer6->szFfn+p->ibszAlt, eEnc); -// RTL_TEXTENCODING_MS_1252 ); +// RTL_TEXTENCODING_MS_1252 ); } pVer6 = (WW8_FFN_Ver6*)( ((BYTE*)pVer6) + pVer6->cbFfnM1 + 1 ); } @@ -5848,7 +5848,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib ) for(USHORT i=0; i<nMax; ++i, ++p) { p->cbFfnM1 = pVer8->cbFfnM1; - c2 = *(((BYTE*)pVer8) + 1); + c2 = *(((BYTE*)pVer8) + 1); p->prg = c2 & 0x02; p->fTrueType = (c2 & 0x04) >> 2; @@ -5904,11 +5904,11 @@ const WW8_FFN* WW8Fonts::GetFont( USHORT nNum ) const // 1) Am Anfang des Einlesens muss WWPLCF_HdFt mit Fib und Dop konstruiert werden // 2) Der Haupttext muss sequentiell ueber alle Sections gelesen werden // 3) Fuer jedes vorkommende Header / Footer - Attribut des Haupttextes -// ( Darf pro Section maximal eins sein ) muss UpdateIndex() genau einmal +// ( Darf pro Section maximal eins sein ) muss UpdateIndex() genau einmal // mit dem Parameter des Attributes gerufen werden. Dieser Aufruf muss *nach* // dem letzten Aufruf von GetTextPos() passieren. // 4) GetTextPos() darf mit genau einem der obenstehen WW_... aufgerufen werden -// ( nicht verodern ! ) +// ( nicht verodern ! ) // -> dann liefert GetTextPos() vielleicht auch ein richtiges Ergebnis WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) @@ -5929,7 +5929,7 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ) footers in this PLCF, UpdateIndex does that task. */ for( BYTE nI = 0x1; nI <= 0x20; nI <<= 1 ) - if( nI & rDop.grpfIhdt ) // Bit gesetzt ? + if( nI & rDop.grpfIhdt ) // Bit gesetzt ? nIdxOffset++; nTextOfs = rFib.ccpText + rFib.ccpFtn; // Groesse des Haupttextes @@ -5944,18 +5944,18 @@ bool WW8PLCF_HdFt::GetTextPos(BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart, while (true) { if( nI & nWhich ) - break; // found + break; // found if( grpfIhdt & nI ) - nIdx++; // uninteresting Header / Footer - nI <<= 1; // text next bit + nIdx++; // uninteresting Header / Footer + nI <<= 1; // text next bit if( nI > 0x20 ) - return false; // not found + return false; // not found } // nIdx ist HdFt-Index WW8_CP nEnd; void* pData; - aPLCF.SetIdx( nIdx ); // Lookup suitable CP + aPLCF.SetIdx( nIdx ); // Lookup suitable CP aPLCF.Get( rStart, nEnd, pData ); rLen = nEnd - rStart; aPLCF++; @@ -5968,7 +5968,7 @@ bool WW8PLCF_HdFt::GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen) WW8_CP nEnd; void* pData; - aPLCF.SetIdx( nIdx ); // Lookup suitable CP + aPLCF.SetIdx( nIdx ); // Lookup suitable CP aPLCF.Get( rStart, nEnd, pData ); rLen = nEnd - rStart; return true; @@ -5983,7 +5983,7 @@ void WW8PLCF_HdFt::UpdateIndex( BYTE grpfIhdt ) } //----------------------------------------- -// WW8Dop +// WW8Dop //----------------------------------------- WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) @@ -5995,8 +5995,8 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) rSt.Seek( nPos ); if( 2 > nSize || nRead != rSt.Read( pData, nRead )) { - memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); - nDopError = ERR_SWG_READ_ERROR; // Error melden + memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); + nDopError = ERR_SWG_READ_ERROR; // Error melden } else { @@ -6118,23 +6118,23 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) if( nFib >= 103 ) { a32Bit = Get_ULong( pData ); - fNoTabForInd = ( a32Bit & 0x00000001 ) ; - fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ; - fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ; - fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ; - fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ; - fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ; - fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ; - fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ; - fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ; - fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ; - fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ; - fSwapBordersFacingPgs = ( a32Bit & 0x00000800 ) >> 11 ; - fSuppressTopSpacingMac5 = ( a32Bit & 0x00010000 ) >> 16 ; - fTruncDxaExpand = ( a32Bit & 0x00020000 ) >> 17 ; - fPrintBodyBeforeHdr = ( a32Bit & 0x00040000 ) >> 18 ; - fNoLeading = ( a32Bit & 0x00080000 ) >> 19 ; - fMWSmallCaps = ( a32Bit & 0x00200000 ) >> 21 ; + fNoTabForInd = ( a32Bit & 0x00000001 ) ; + fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ; + fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ; + fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ; + fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ; + fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ; + fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ; + fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ; + fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ; + fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ; + fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ; + fSwapBordersFacingPgs = ( a32Bit & 0x00000800 ) >> 11 ; + fSuppressTopSpacingMac5 = ( a32Bit & 0x00010000 ) >> 16 ; + fTruncDxaExpand = ( a32Bit & 0x00020000 ) >> 17 ; + fPrintBodyBeforeHdr = ( a32Bit & 0x00040000 ) >> 18 ; + fNoLeading = ( a32Bit & 0x00080000 ) >> 19 ; + fMWSmallCaps = ( a32Bit & 0x00200000 ) >> 21 ; fUsePrinterMetrics = ( a32Bit & 0x80000000 ) >> 31 ; } @@ -6153,16 +6153,16 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) a16Bit = Get_UShort( pData ); // die untersten 9 Bit sind uninteressant - fHtmlDoc = ( a16Bit & 0x0200 ) >> 9 ; - fSnapBorder = ( a16Bit & 0x0800 ) >> 11 ; - fIncludeHeader = ( a16Bit & 0x1000 ) >> 12 ; - fIncludeFooter = ( a16Bit & 0x2000 ) >> 13 ; - fForcePageSizePag = ( a16Bit & 0x4000 ) >> 14 ; - fMinFontSizePag = ( a16Bit & 0x8000 ) >> 15 ; + fHtmlDoc = ( a16Bit & 0x0200 ) >> 9 ; + fSnapBorder = ( a16Bit & 0x0800 ) >> 11 ; + fIncludeHeader = ( a16Bit & 0x1000 ) >> 12 ; + fIncludeFooter = ( a16Bit & 0x2000 ) >> 13 ; + fForcePageSizePag = ( a16Bit & 0x4000 ) >> 14 ; + fMinFontSizePag = ( a16Bit & 0x8000 ) >> 15 ; a16Bit = Get_UShort( pData ); - fHaveVersions = 0 != ( a16Bit & 0x0001 ); - fAutoVersion = 0 != ( a16Bit & 0x0002 ); + fHaveVersions = 0 != ( a16Bit & 0x0001 ); + fAutoVersion = 0 != ( a16Bit & 0x0002 ); pData += 12; @@ -6189,7 +6189,7 @@ WW8Dop::WW8Dop( SvStream& rSt, INT16 nFib, INT32 nPos, INT32 nSize ) WW8Dop::WW8Dop() { // first set everything to a default of 0 - memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); + memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); fWidowControl = 1; fpc = 1; @@ -6240,23 +6240,23 @@ WW8Dop::WW8Dop() UINT32 WW8Dop::GetCompatabilityOptions() const { UINT32 a32Bit = 0; - if (fNoTabForInd) a32Bit |= 0x00000001; - if (fNoSpaceRaiseLower) a32Bit |= 0x00000002; - if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004; - if (fWrapTrailSpaces) a32Bit |= 0x00000008; - if (fMapPrintTextColor) a32Bit |= 0x00000010; - if (fNoColumnBalance) a32Bit |= 0x00000020; - if (fConvMailMergeEsc) a32Bit |= 0x00000040; - if (fSupressTopSpacing) a32Bit |= 0x00000080; - if (fOrigWordTableRules) a32Bit |= 0x00000100; - if (fTransparentMetafiles) a32Bit |= 0x00000200; - if (fShowBreaksInFrames) a32Bit |= 0x00000400; - if (fSwapBordersFacingPgs) a32Bit |= 0x00000800; - if (fSuppressTopSpacingMac5) a32Bit |= 0x00010000; - if (fTruncDxaExpand) a32Bit |= 0x00020000; - if (fPrintBodyBeforeHdr) a32Bit |= 0x00040000; - if (fNoLeading) a32Bit |= 0x00080000; - if (fMWSmallCaps) a32Bit |= 0x00200000; + if (fNoTabForInd) a32Bit |= 0x00000001; + if (fNoSpaceRaiseLower) a32Bit |= 0x00000002; + if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004; + if (fWrapTrailSpaces) a32Bit |= 0x00000008; + if (fMapPrintTextColor) a32Bit |= 0x00000010; + if (fNoColumnBalance) a32Bit |= 0x00000020; + if (fConvMailMergeEsc) a32Bit |= 0x00000040; + if (fSupressTopSpacing) a32Bit |= 0x00000080; + if (fOrigWordTableRules) a32Bit |= 0x00000100; + if (fTransparentMetafiles) a32Bit |= 0x00000200; + if (fShowBreaksInFrames) a32Bit |= 0x00000400; + if (fSwapBordersFacingPgs) a32Bit |= 0x00000800; + if (fSuppressTopSpacingMac5) a32Bit |= 0x00010000; + if (fTruncDxaExpand) a32Bit |= 0x00020000; + if (fPrintBodyBeforeHdr) a32Bit |= 0x00040000; + if (fNoLeading) a32Bit |= 0x00080000; + if (fMWSmallCaps) a32Bit |= 0x00200000; if (fUsePrinterMetrics) a32Bit |= 0x80000000; return a32Bit; } @@ -6297,55 +6297,55 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( fOnlyMacPics ) a8Bit |= 0x01; - if( fOnlyWinPics ) a8Bit |= 0x02; - if( fLabelDoc ) a8Bit |= 0x04; - if( fHyphCapitals ) a8Bit |= 0x08; - if( fAutoHyphen ) a8Bit |= 0x10; - if( fFormNoFields ) a8Bit |= 0x20; - if( fLinkStyles ) a8Bit |= 0x40; - if( fRevMarking ) a8Bit |= 0x80; + if( fOnlyMacPics ) a8Bit |= 0x01; + if( fOnlyWinPics ) a8Bit |= 0x02; + if( fLabelDoc ) a8Bit |= 0x04; + if( fHyphCapitals ) a8Bit |= 0x08; + if( fAutoHyphen ) a8Bit |= 0x10; + if( fFormNoFields ) a8Bit |= 0x20; + if( fLinkStyles ) a8Bit |= 0x40; + if( fRevMarking ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( fBackup ) a8Bit |= 0x01; - if( fExactCWords ) a8Bit |= 0x02; - if( fPagHidden ) a8Bit |= 0x04; - if( fPagResults ) a8Bit |= 0x08; - if( fLockAtn ) a8Bit |= 0x10; - if( fMirrorMargins ) a8Bit |= 0x20; - if( fReadOnlyRecommended ) a8Bit |= 0x40; - if( fDfltTrueType ) a8Bit |= 0x80; + if( fBackup ) a8Bit |= 0x01; + if( fExactCWords ) a8Bit |= 0x02; + if( fPagHidden ) a8Bit |= 0x04; + if( fPagResults ) a8Bit |= 0x08; + if( fLockAtn ) a8Bit |= 0x10; + if( fMirrorMargins ) a8Bit |= 0x20; + if( fReadOnlyRecommended ) a8Bit |= 0x40; + if( fDfltTrueType ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( fPagSuppressTopSpacing ) a8Bit |= 0x01; - if( fProtEnabled ) a8Bit |= 0x02; - if( fDispFormFldSel ) a8Bit |= 0x04; - if( fRMView ) a8Bit |= 0x08; - if( fRMPrint ) a8Bit |= 0x10; - if( fWriteReservation ) a8Bit |= 0x20; - if( fLockRev ) a8Bit |= 0x40; - if( fEmbedFonts ) a8Bit |= 0x80; + if( fPagSuppressTopSpacing ) a8Bit |= 0x01; + if( fProtEnabled ) a8Bit |= 0x02; + if( fDispFormFldSel ) a8Bit |= 0x04; + if( fRMView ) a8Bit |= 0x08; + if( fRMPrint ) a8Bit |= 0x10; + if( fWriteReservation ) a8Bit |= 0x20; + if( fLockRev ) a8Bit |= 0x40; + if( fEmbedFonts ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( copts_fNoTabForInd ) a8Bit |= 0x01; - if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02; - if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04; - if( copts_fWrapTrailSpaces ) a8Bit |= 0x08; - if( copts_fMapPrintTextColor ) a8Bit |= 0x10; - if( copts_fNoColumnBalance ) a8Bit |= 0x20; - if( copts_fConvMailMergeEsc ) a8Bit |= 0x40; - if( copts_fSupressTopSpacing ) a8Bit |= 0x80; + if( copts_fNoTabForInd ) a8Bit |= 0x01; + if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02; + if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04; + if( copts_fWrapTrailSpaces ) a8Bit |= 0x08; + if( copts_fMapPrintTextColor ) a8Bit |= 0x10; + if( copts_fNoColumnBalance ) a8Bit |= 0x20; + if( copts_fConvMailMergeEsc ) a8Bit |= 0x40; + if( copts_fSupressTopSpacing ) a8Bit |= 0x80; Set_UInt8( pData, a8Bit ); a8Bit = 0; - if( copts_fOrigWordTableRules ) a8Bit |= 0x01; - if( copts_fTransparentMetafiles ) a8Bit |= 0x02; - if( copts_fShowBreaksInFrames ) a8Bit |= 0x04; - if( copts_fSwapBordersFacingPgs ) a8Bit |= 0x08; + if( copts_fOrigWordTableRules ) a8Bit |= 0x01; + if( copts_fTransparentMetafiles ) a8Bit |= 0x02; + if( copts_fShowBreaksInFrames ) a8Bit |= 0x04; + if( copts_fSwapBordersFacingPgs ) a8Bit |= 0x08; Set_UInt8( pData, a8Bit ); Set_UInt16( pData, dxaTab ); @@ -6372,10 +6372,10 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const a16Bit |= (0x0003 & epc ); a16Bit |= (0x003c & (nfcFtnRef << 2)); a16Bit |= (0x03c0 & (nfcEdnRef << 6)); - if( fPrintFormData ) a16Bit |= 0x0400; - if( fSaveFormData ) a16Bit |= 0x0800; - if( fShadeFormData ) a16Bit |= 0x1000; - if( fWCFtnEdn ) a16Bit |= 0x8000; + if( fPrintFormData ) a16Bit |= 0x0400; + if( fSaveFormData ) a16Bit |= 0x0800; + if( fShadeFormData ) a16Bit |= 0x1000; + if( fWCFtnEdn ) a16Bit |= 0x8000; Set_UInt16( pData, a16Bit ); Set_UInt32( pData, cLines ); @@ -6387,7 +6387,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const Set_UInt32( pData, lKeyProtDoc ); a16Bit = 0; - if (wvkSaved) + if (wvkSaved) a16Bit |= 0x0007; a16Bit |= (0x0ff8 & (wScaleSaved << 3)); a16Bit |= (0x3000 & (zkSaved << 12)); @@ -6404,18 +6404,18 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const memcpy( pData, &dogrid, sizeof( WW8_DOGRID )); pData += sizeof( WW8_DOGRID ); - a16Bit = 0x12; // lvl auf 9 setzen - if( fHtmlDoc ) a16Bit |= 0x0200; - if( fSnapBorder ) a16Bit |= 0x0800; - if( fIncludeHeader ) a16Bit |= 0x1000; - if( fIncludeFooter ) a16Bit |= 0x2000; - if( fForcePageSizePag ) a16Bit |= 0x4000; - if( fMinFontSizePag ) a16Bit |= 0x8000; + a16Bit = 0x12; // lvl auf 9 setzen + if( fHtmlDoc ) a16Bit |= 0x0200; + if( fSnapBorder ) a16Bit |= 0x0800; + if( fIncludeHeader ) a16Bit |= 0x1000; + if( fIncludeFooter ) a16Bit |= 0x2000; + if( fForcePageSizePag ) a16Bit |= 0x4000; + if( fMinFontSizePag ) a16Bit |= 0x8000; Set_UInt16( pData, a16Bit ); a16Bit = 0; - if( fHaveVersions ) a16Bit |= 0x0001; - if( fAutoVersion ) a16Bit |= 0x0002; + if( fHaveVersions ) a16Bit |= 0x0001; + if( fAutoVersion ) a16Bit |= 0x0002; Set_UInt16( pData, a16Bit ); pData += 12; @@ -6435,7 +6435,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const Set_UInt16( pData, nfcEdnRef ); Set_UInt16( pData, hpsZoonFontPag ); Set_UInt16( pData, dywDispPag ); - + //500 -> 508, Appear to be repeated here in 2000+ pData += 8; Set_UInt32(pData, GetCompatabilityOptions()); @@ -6503,16 +6503,16 @@ USHORT WW8DopTypography::GetConvertedLang() const */ switch(reserved1 & 0xE) { - case 2: //Japan + case 2: //Japan nLang = LANGUAGE_JAPANESE; break; - case 4: //Chinese (Peoples Republic) + case 4: //Chinese (Peoples Republic) nLang = LANGUAGE_CHINESE_SIMPLIFIED; break; - case 6: //Korean + case 6: //Korean nLang = LANGUAGE_KOREAN; break; - case 8: //Chinese (Taiwan) + case 8: //Chinese (Taiwan) nLang = LANGUAGE_CHINESE_TRADITIONAL; break; default: @@ -6530,9 +6530,9 @@ USHORT WW8DopTypography::GetConvertedLang() const } //----------------------------------------- -// Sprms +// Sprms //----------------------------------------- -USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) +USHORT wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm) const { SprmInfo aSprm = GetSprmInfo(nId); @@ -6610,16 +6610,16 @@ USHORT wwSprmParser::GetSprmId(const sal_uInt8* pSp) const ASSERT_RET_ON_FAIL(pSp, "Why GetSprmId with pSp of 0", 0); USHORT nId = 0; - switch (mnVersion) // 6 stands for "6 OR 7", 7 stands for "ONLY 7" + switch (mnVersion) // 6 stands for "6 OR 7", 7 stands for "ONLY 7" { case 6: - case 7: + case 7: nId = *pSp; - if (0x0100 < nId) + if (0x0100 < nId) nId = 0; break; default: - case 8: + case 8: nId = SVBT16ToShort(pSp); if (0x0800 > nId) nId = 0; @@ -6655,8 +6655,8 @@ SEPr::SEPr() : xaPage(12242), yaPage(15842), xaPageNUp(12242), yaPageNUp(15842), dxaLeft(1800), dxaRight(1800), dyaTop(1440), dyaBottom(1440), dzaGutter(0), dyaHdrTop(720), dyaHdrBottom(720), ccolM1(0), fEvenlySpaced(1), - reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0), - dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0), + reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0), + dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0), reserved4(0) { memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing)); diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx index f27ae65cdf89..403dcf412783 100644 --- a/sw/source/filter/ww8/dump/ww8scan.hxx +++ b/sw/source/filter/ww8/dump/ww8scan.hxx @@ -2,7 +2,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 @@ -34,7 +34,7 @@ #include <limits.h> #endif #include <sal/types.h> -#include <tools/solar.h> // UINTXX +#include <tools/solar.h> // UINTXX #include <tools/table.hxx> #include <tools/datetime.hxx> #include <tools/stream.hxx> @@ -44,7 +44,7 @@ #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#include <ww8struc.hxx> // FIB, STSHI, STD +#include <ww8struc.hxx> // FIB, STSHI, STD #include <ww8scan.hxx> @@ -85,7 +85,7 @@ String WW8Read_xstz(SvStream& rStrm, // attention: the *extra data* of each string are SKIPPED and ignored /* to be optimized like this: */ -void WW8ReadSTTBF( BOOL bVer8, SvStream& rStrm, +void WW8ReadSTTBF( BOOL bVer8, SvStream& rStrm, UINT32 nStart, INT32 nLen, USHORT nSkip, rtl_TextEncoding eCS, SvStrings &rArray, SvStrings* pExtraArray = 0 ); @@ -99,15 +99,15 @@ BYTE WW8SprmDataOfs( USHORT nId ); struct WW8FieldDesc { - long nLen; // Gesamtlaenge ( zum Text ueberlesen ) + long nLen; // Gesamtlaenge ( zum Text ueberlesen ) WW8_CP nSCode; // Anfang Befehlscode - long nLCode; // Laenge - WW8_CP nSRes; // Anfang Ergebnis - long nLRes; // Laenge ( == 0, falls kein Ergebnis ) - USHORT nId; // WW-Id fuer Felder - BYTE nOpt; // WW-Flags ( z.B.: vom User geaendert ) - BOOL bCodeNest:1; // Befehl rekursiv verwendet - BOOL bResNest:1; // Befehl in Resultat eingefuegt + long nLCode; // Laenge + WW8_CP nSRes; // Anfang Ergebnis + long nLRes; // Laenge ( == 0, falls kein Ergebnis ) + USHORT nId; // WW-Id fuer Felder + BYTE nOpt; // WW-Flags ( z.B.: vom User geaendert ) + BOOL bCodeNest:1; // Befehl rekursiv verwendet + BOOL bResNest:1; // Befehl in Resultat eingefuegt }; BOOL WW8GetFieldPara( BYTE nVersion, WW8PLCFspecial& rPLCF, WW8FieldDesc& rF ); @@ -116,7 +116,7 @@ BOOL WW8GetFieldPara( BYTE nVersion, WW8PLCFspecial& rPLCF, WW8FieldDesc& rF ); struct WW8PLCFxSave1 { ULONG nPLCFxPos; - ULONG nPLCFxPos2; // fuer PLCF_Cp_Fkp: PieceIter-Pos + ULONG nPLCFxPos2; // fuer PLCF_Cp_Fkp: PieceIter-Pos long nPLCFxMemOfs; WW8_CP nAttrStart; WW8_CP nAttrEnd; @@ -128,12 +128,12 @@ struct WW8PLCFxSave1 u.a. fuer Felder, also genausoviele Attr wie Positionen, falls Ctor-Param bNoEnd = false */ -class WW8PLCFspecial // Iterator fuer PLCFs +class WW8PLCFspecial // Iterator fuer PLCFs { - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array - long nIMax; // Anzahl der Elemente - long nIdx; // Merker, wo wir gerade sind + INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + long nIMax; // Anzahl der Elemente + long nIdx; // Merker, wo wir gerade sind long nStru; public: @@ -141,9 +141,9 @@ public: long nStruct, long nStartPos = -1, BOOL bNoEnd = FALSE ); ~WW8PLCFspecial(){ delete( pPLCF_PosArray ); pPLCF_PosArray = 0; } ULONG GetIdx() const { return (ULONG)nIdx; } - void SetIdx( ULONG nI ) { nIdx = (long)nI; } // geht ueber Nummer + void SetIdx( ULONG nI ) { nIdx = (long)nI; } // geht ueber Nummer long GetIMax(){ return nIMax; } - BOOL SeekPos( long nPos ); // geht ueber FC- bzw. CP-Wert + BOOL SeekPos( long nPos ); // geht ueber FC- bzw. CP-Wert // bzw. naechste groesseren Wert BOOL SeekPosExact( long nPos ); long Where() { return ( nIdx >= nIMax ) ? LONG_MAX : pPLCF_PosArray[nIdx]; } @@ -168,15 +168,15 @@ public: class WW8SprmIter { // these members will be updated - BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM) - BYTE* pAktParams; // start of akt. SPRM's parameters + BYTE* pSprms; // remaining part of the SPRMs ( == start of akt. SPRM) + BYTE* pAktParams; // start of akt. SPRM's parameters USHORT nAktId; short nAktSizeBrutto; // these members will *not* be updated by UpdateMyMembers() BYTE nVersion; BYTE nDelta; - short nRemLen; // length of remaining SPRMs (including akt. SPRM) + short nRemLen; // length of remaining SPRMs (including akt. SPRM) void UpdateMyMembers(); public: @@ -195,11 +195,11 @@ public: /* u.a. fuer FKPs auf normale Attr., also ein Attr weniger als Positionen */ -class WW8PLCF // Iterator fuer PLCFs +class WW8PLCF // Iterator fuer PLCFs { - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array - long nIMax; // Anzahl der Elemente + INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + long nIMax; // Anzahl der Elemente long nIdx; long nStru; @@ -245,8 +245,8 @@ class WW8PLCFpcd { friend class WW8PLCFpcd_Iter; WW8Pcd_FC_sortArr aFC_sort; // sorted PCD entries by FC - INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur - BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array + INT32* pPLCF_PosArray; // Pointer auf Pos-Array und auf ganze Struktur + BYTE* pPLCF_Contents; // Pointer auf Inhalts-Array-Teil des Pos-Array long nIMax; long nStru; @@ -266,12 +266,12 @@ class WW8PLCFpcd_Iter public: WW8PLCFpcd_Iter( WW8PLCFpcd& rPLCFpcd, long nStartPos = -1 ); -// ~WW8PLCFpcd_Iter() {} +// ~WW8PLCFpcd_Iter() {} ULONG GetIdx() const { return (ULONG)nIdx; } void SetIdx( ULONG nI ) { nIdx = (long)nI; } long GetIMax(){ return rPLCF.nIMax; } BOOL SeekPos( long nPos ); -// BOOL SeekMaxMainFC( WW8Fib& rWwF, long& rMaxPosData ); +// BOOL SeekMaxMainFC( WW8Fib& rWwF, long& rMaxPosData ); long Where(); BOOL Get( long& rStart, long& rEnd, void*& rpValue ); ULONG FindIdx( WW8_FC nFC ) const { return rPLCF.FindIdx( nFC ); } @@ -284,10 +284,10 @@ enum ePLCFT{ CHP=0, PAP, SEP, /*HED, FNR, ENR,*/ PLCF_END }; /* pure virtual: */ -class WW8PLCFx // virtueller Iterator fuer Piece Table Exceptions +class WW8PLCFx // virtueller Iterator fuer Piece Table Exceptions { - BYTE nVersion; // Versionsnummer des FIB - BOOL bIsSprm; // PLCF von Sprms oder von anderem ( Footnote, ... ) + BYTE nVersion; // Versionsnummer des FIB + BOOL bIsSprm; // PLCF von Sprms oder von anderem ( Footnote, ... ) public: WW8PLCFx( BYTE nFibVersion, BOOL bSprm ) @@ -300,7 +300,7 @@ public: virtual void SetIdx2( ULONG nIdx ); virtual BOOL SeekPos( WW8_CP nCpPos ) = 0; virtual long Where() = 0; -// virtual BYTE* GetSprms( long& rStart, long& rEnd, long& rLen ); +// virtual BYTE* GetSprms( long& rStart, long& rEnd, long& rLen ); virtual void GetSprms( WW8PLCFxDesc* p ); virtual long GetNoSprms( long& rStart, long&, long& rLen ); virtual WW8PLCFx& operator ++( int ) = 0; @@ -316,10 +316,10 @@ class WW8PLCFx_PCDAttrs : public WW8PLCFx { WW8PLCFpcd_Iter* pPcdI; WW8PLCFx_PCD* pPcd; - BYTE** pGrpprls; // Attribute an Piece-Table - SVBT32 aShortSprm; // mini storage: can contain ONE sprm with + BYTE** pGrpprls; // Attribute an Piece-Table + SVBT32 aShortSprm; // mini storage: can contain ONE sprm with // 1 byte param - UINT16 nGrpprls; // Attribut Anzahl davon + UINT16 nGrpprls; // Attribut Anzahl davon public: WW8PLCFx_PCDAttrs( BYTE nVersion, WW8PLCFx_PCD* pPLCFx_PCD, WW8ScannerBase* pBase ); @@ -334,7 +334,7 @@ public: WW8PLCFpcd_Iter* GetIter() const { return pPcdI; } }; -class WW8PLCFx_PCD : public WW8PLCFx // Iterator fuer Piece Table +class WW8PLCFx_PCD : public WW8PLCFx // Iterator fuer Piece Table { WW8PLCFpcd_Iter* pPcdI; BOOL bVer67; @@ -347,7 +347,7 @@ public: virtual void SetIdx( ULONG nI ); virtual BOOL SeekPos( WW8_CP nCpPos ); virtual long Where(); -// virtual void GetSprms( WW8PLCFxDesc* p ); +// virtual void GetSprms( WW8PLCFxDesc* p ); virtual long GetNoSprms( long& rStart, long&, long& rLen ); virtual WW8PLCFx& operator ++( int ); WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos ); @@ -366,13 +366,13 @@ public: }; -class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Fkps +class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Fkps // arbeitet nur auf FCs, nicht auf CPs ! // ( Low-Level ) { - class WW8Fkp // Iterator fuer Formatted Disk Page + class WW8Fkp // Iterator fuer Formatted Disk Page { struct WW8Grpprl { @@ -382,15 +382,15 @@ class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Excepti BOOL bMustDelete; }; - WW8Grpprl* pGrpprl; // Pointer of Meta Array (pointing + WW8Grpprl* pGrpprl; // Pointer of Meta Array (pointing - BYTE* pFkp; // gesamter Fkp + BYTE* pFkp; // gesamter Fkp - long nItemSize; // entweder 1 Byte oder ein komplettes BX - long nFilePos; // Offset in Stream where last read of 52 bytes took place - short nIdx; // Pos-Merker + long nItemSize; // entweder 1 Byte oder ein komplettes BX + long nFilePos; // Offset in Stream where last read of 52 bytes took place + short nIdx; // Pos-Merker ePLCFT ePLCF; - BYTE nIMax; // Anzahl der Eintraege + BYTE nIMax; // Anzahl der Eintraege BYTE nVersion; public: @@ -421,15 +421,15 @@ class WW8PLCFx_Fc_FKP : public WW8PLCFx // Iterator fuer Piece Table Excepti */ BYTE* HasSprm( USHORT nId ); - ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps + ULONG GetParaHeight() const; // fuer Header/Footer bei Papx-Fkps BYTE GetVersion() const { return nVersion; } }; WW8PLCFx_PCDAttrs* pPCDAttrs; - SvStream* pFKPStrm; // Input-File - SvStream* pDataStrm; // Input-File + SvStream* pFKPStrm; // Input-File + SvStream* pDataStrm; // Input-File WW8PLCF* pPLCF; WW8Fkp* pFkp; WW8_FC nStartFc; @@ -488,7 +488,7 @@ public: -class WW8PLCFx_SEPX : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Sepx +class WW8PLCFx_SEPX : public WW8PLCFx // Iterator fuer Piece Table Exceptions of Sepx { SvStream* pStrm; WW8PLCF* pPLCF; @@ -548,7 +548,7 @@ public: long Count() { return ( pRef ) ? pRef->GetIMax() : 0; } }; -class WW8PLCFx_FLD : public WW8PLCFx // Iterator fuer Fuss- und Endnoten +class WW8PLCFx_FLD : public WW8PLCFx // Iterator fuer Fuss- und Endnoten { WW8PLCFspecial* pPLCF; WW8Fib& rFib; @@ -567,12 +567,12 @@ public: enum eBookStatus { BOOK_NORMAL = 0, BOOK_IGNORE = 0x1, BOOK_ONLY_REF = 0x2 }; -class WW8PLCFx_Book : public WW8PLCFx // Iterator fuer Booknotes +class WW8PLCFx_Book : public WW8PLCFx // Iterator fuer Booknotes { - WW8PLCFspecial* pBook[2]; // Start- und EndPosition - SvStrings aBookNames; // Name + WW8PLCFspecial* pBook[2]; // Start- und EndPosition + SvStrings aBookNames; // Name eBookStatus* pStatus; - long nIMax; // Anzahl der Booknotes + long nIMax; // Anzahl der Booknotes USHORT nIsEnd; public: WW8PLCFx_Book( SvStream* pSt, SvStream* pTblSt, WW8Fib& rFib, WW8_CP nStartCp ); @@ -606,24 +606,24 @@ public: */ struct WW8PLCFManResult { - WW8_CP nCpPos; // Attribut-Anfangsposition - long nMemLen; // Laenge dazu - long nCp2OrIdx; // footnote-textpos oder Index in PLCF - WW8_CP nAktCp; // wird nur vom Aufrufer benutzt - BYTE* pMemPos; // Mem-Pos fuer Sprms - USHORT nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! ) + WW8_CP nCpPos; // Attribut-Anfangsposition + long nMemLen; // Laenge dazu + long nCp2OrIdx; // footnote-textpos oder Index in PLCF + WW8_CP nAktCp; // wird nur vom Aufrufer benutzt + BYTE* pMemPos; // Mem-Pos fuer Sprms + USHORT nSprmId; // Sprm-Id ( 0 = ungueltige Id -> ueberspringen! ) // (2..255) oder Pseudo-Sprm-Id (256..260) // bzw. ab Winword-Ver8 die Sprm-Id (800..) - BYTE nFlags; // Absatz- oder Section-Anfang + BYTE nFlags; // Absatz- oder Section-Anfang }; #define MAN_ANZ_PLCF 12 -#define MAN_MASK_NEW_PAP 1 // neue Zeile -#define MAN_MASK_NEW_SEP 2 // neue Section +#define MAN_MASK_NEW_PAP 1 // neue Zeile +#define MAN_MASK_NEW_SEP 2 // neue Section -#define MAN_MAINTEXT 0 // Defines fuer PLCFMan-ctor +#define MAN_MAINTEXT 0 // Defines fuer PLCFMan-ctor #define MAN_FTN 1 #define MAN_EDN 2 #define MAN_HDFT 3 @@ -643,14 +643,14 @@ struct WW8PLCFxDesc { WW8PLCFx* pPLCFx; UShortStk* pIdStk;// Speicher fuer Attr-Id fuer Attr-Ende(n) - BYTE* pMemPos; // wo liegen die Sprm(s) + BYTE* pMemPos; // wo liegen die Sprm(s) long nStartPos; long nEndPos; - long nCp2OrIdx; // wo liegen die NoSprm(s) - long nSprmsLen; // wie viele Bytes fuer weitere Sprms / Laenge Fussnote - long nCpOfs; // fuer Offset Header .. Footnote - BOOL bFirstSprm; // fuer Erkennung erster Sprm einer Gruppe - BOOL bRealLineEnd; // FALSE bei Pap-Piece-Ende + long nCp2OrIdx; // wo liegen die NoSprm(s) + long nSprmsLen; // wie viele Bytes fuer weitere Sprms / Laenge Fussnote + long nCpOfs; // fuer Offset Header .. Footnote + BOOL bFirstSprm; // fuer Erkennung erster Sprm einer Gruppe + BOOL bRealLineEnd; // FALSE bei Pap-Piece-Ende void Save( WW8PLCFxSave1& rSave ) const; void Restore( const WW8PLCFxSave1& rSave ); }; @@ -660,11 +660,11 @@ struct WW8PLCFxDesc class WW8PLCFMan { - long nCpO; // Origin Cp -- the basis for nNewCp + long nCpO; // Origin Cp -- the basis for nNewCp - long nLineEnd; // zeigt *hinter* das <CR> - long nLastWhereIdxCp; // last result of WhereIdx() - USHORT nPLCF; // so viele PLCFe werden verwaltet + long nLineEnd; // zeigt *hinter* das <CR> + long nLastWhereIdxCp; // last result of WhereIdx() + USHORT nPLCF; // so viele PLCFe werden verwaltet short nManType; WW8PLCFxDesc aD[MAN_ANZ_PLCF]; @@ -700,13 +700,13 @@ public: BOOL Get( WW8PLCFManResult* pResult ); WW8PLCFMan& operator ++( int ); - USHORT GetColl() const; // liefert aktuellen Style + USHORT GetColl() const; // liefert aktuellen Style WW8PLCFx_FLD* GetFld() const; WW8PLCFx_SubDoc* GetEdn() const { return (WW8PLCFx_SubDoc*)pEdn->pPLCFx; } WW8PLCFx_SubDoc* GetFtn() const { return (WW8PLCFx_SubDoc*)pFtn->pPLCFx; } WW8PLCFx_SubDoc* GetAtn() const { return (WW8PLCFx_SubDoc*)pAnd->pPLCFx; } WW8PLCFx_Book* GetBook() const { return (WW8PLCFx_Book*)pBkm->pPLCFx; } - long GetCpOfs() const { return pChp->nCpOfs; } // fuer Header/Footer... + long GetCpOfs() const { return pChp->nCpOfs; } // fuer Header/Footer... /* fragt, ob *aktueller Absatz* einen Sprm diesen Typs hat @@ -725,9 +725,9 @@ public: void SeekPos( long nNewCp ); void SaveAllPLCFx( WW8PLCFxSaveAll& rSave ) const; void RestoreAllPLCFx( const WW8PLCFxSaveAll& rSave ); - WW8PLCFspecial* GetFdoa() { return pFdoa; } - WW8PLCFspecial* GetTxbx() { return pTxbx; } - WW8PLCFspecial* GetTxbxBkd(){ return pTxbxBkd; } + WW8PLCFspecial* GetFdoa() { return pFdoa; } + WW8PLCFspecial* GetTxbx() { return pTxbx; } + WW8PLCFspecial* GetTxbxBkd(){ return pTxbxBkd; } short GetManType() { return nManType; } }; @@ -749,34 +749,34 @@ friend class SwWw8ImplReader; #endif WW8Fib* pWw8Fib; - WW8PLCFx_Cp_FKP* pChpPLCF; // Character-Attrs - WW8PLCFx_Cp_FKP* pPapPLCF; // Para-Attrs - WW8PLCFx_SEPX* pSepPLCF; // Section-Attrs - WW8PLCFx_SubDoc* pFtnPLCF; // Footnotes - WW8PLCFx_SubDoc* pEdnPLCF; // EndNotes - WW8PLCFx_SubDoc* pAndPLCF; // Anmerkungen - WW8PLCFx_FLD* pFldPLCF; // Fields in Main Text - WW8PLCFx_FLD* pFldHdFtPLCF; // Fields in Header / Footer - WW8PLCFx_FLD* pFldTxbxPLCF; // Fields in Textboxes in Main Text - WW8PLCFx_FLD* pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer - WW8PLCFx_FLD* pFldFtnPLCF; // Fields in Footnotes - WW8PLCFx_FLD* pFldEdnPLCF; // Fields in Endnotes - WW8PLCFx_FLD* pFldAndPLCF; // Fields in Anmerkungen - WW8PLCFspecial* pMainFdoa; // Graphic Primitives in Main Text - WW8PLCFspecial* pHdFtFdoa; // Graphic Primitives in Header / Footer - WW8PLCFspecial* pMainTxbx; // Textboxen in Main Text - WW8PLCFspecial* pMainTxbxBkd; // Break-Deskriptoren fuer diese - WW8PLCFspecial* pHdFtTxbx; // TextBoxen in Header / Footer - WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese - WW8PLCFx_Book* pBook; // Bookmarks - - WW8PLCFpcd* pPiecePLCF; // fuer FastSave ( Basis-PLCF ohne Iterator ) - WW8PLCFpcd_Iter* pPieceIter; // fuer FastSave ( Iterator dazu ) - WW8PLCFx_PCD* pPLCFx_PCD; // dito - WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs; - BYTE** pPieceGrpprls; // Attribute an Piece-Table - UINT16 nPieceGrpprls; // Anzahl davon - USHORT nNoAttrScan; // Attribute komplett(!) ignorieren, die ueber n CPs + WW8PLCFx_Cp_FKP* pChpPLCF; // Character-Attrs + WW8PLCFx_Cp_FKP* pPapPLCF; // Para-Attrs + WW8PLCFx_SEPX* pSepPLCF; // Section-Attrs + WW8PLCFx_SubDoc* pFtnPLCF; // Footnotes + WW8PLCFx_SubDoc* pEdnPLCF; // EndNotes + WW8PLCFx_SubDoc* pAndPLCF; // Anmerkungen + WW8PLCFx_FLD* pFldPLCF; // Fields in Main Text + WW8PLCFx_FLD* pFldHdFtPLCF; // Fields in Header / Footer + WW8PLCFx_FLD* pFldTxbxPLCF; // Fields in Textboxes in Main Text + WW8PLCFx_FLD* pFldTxbxHdFtPLCF; // Fields in Textboxes in Header / Footer + WW8PLCFx_FLD* pFldFtnPLCF; // Fields in Footnotes + WW8PLCFx_FLD* pFldEdnPLCF; // Fields in Endnotes + WW8PLCFx_FLD* pFldAndPLCF; // Fields in Anmerkungen + WW8PLCFspecial* pMainFdoa; // Graphic Primitives in Main Text + WW8PLCFspecial* pHdFtFdoa; // Graphic Primitives in Header / Footer + WW8PLCFspecial* pMainTxbx; // Textboxen in Main Text + WW8PLCFspecial* pMainTxbxBkd; // Break-Deskriptoren fuer diese + WW8PLCFspecial* pHdFtTxbx; // TextBoxen in Header / Footer + WW8PLCFspecial* pHdFtTxbxBkd; // Break-Deskriptoren fuer diese + WW8PLCFx_Book* pBook; // Bookmarks + + WW8PLCFpcd* pPiecePLCF; // fuer FastSave ( Basis-PLCF ohne Iterator ) + WW8PLCFpcd_Iter* pPieceIter; // fuer FastSave ( Iterator dazu ) + WW8PLCFx_PCD* pPLCFx_PCD; // dito + WW8PLCFx_PCDAttrs* pPLCFx_PCDAttrs; + BYTE** pPieceGrpprls; // Attribute an Piece-Table + UINT16 nPieceGrpprls; // Anzahl davon + USHORT nNoAttrScan; // Attribute komplett(!) ignorieren, die ueber n CPs // aufgespannt sind; z.B. bei Char #7 (Zellen-/Zeilenende) WW8PLCFpcd* OpenPieceTable( SvStream* pStr, WW8Fib* pWwF ); @@ -811,7 +811,7 @@ public: von uns verlangte Programm-Version: in Ctor wird geprueft, ob sie zu nFib passt */ - BYTE nVersion; // 6 steht fuer "WinWord 6 oder WinWord 95", + BYTE nVersion; // 6 steht fuer "WinWord 6 oder WinWord 95", // 7 steht fuer "nur WinWord 95" // 8 steht fuer "nur WinWord 97" /* @@ -823,16 +823,16 @@ public: (entspricht nur ungefaehr der tatsaechlichen Struktur des Winword-FIB) */ - UINT16 wIdent; // 0x0 int magic number - UINT16 nFib; // 0x2 FIB version written - UINT16 nProduct; // 0x4 product version written by - INT16 lid; // 0x6 language stamp---localized version; - WW8_PN pnNext; // 0x8 + UINT16 wIdent; // 0x0 int magic number + UINT16 nFib; // 0x2 FIB version written + UINT16 nProduct; // 0x4 product version written by + INT16 lid; // 0x6 language stamp---localized version; + WW8_PN pnNext; // 0x8 - UINT16 fDot :1; // 0xa 0001 + UINT16 fDot :1; // 0xa 0001 UINT16 fGlsy :1; UINT16 fComplex :1; // 0004 when 1, file is in complex, fast-saved format. - UINT16 fHasPic :1; // 0008 file contains 1 or more pictures + UINT16 fHasPic :1; // 0008 file contains 1 or more pictures UINT16 cQuickSaves :4; // 00F0 count of times file was quicksaved UINT16 fEncrypted :1; //0100 1 if file is encrypted, 0 if not UINT16 fWhichTblStm :1; //0200 When 0, this fib refers to the table stream @@ -846,67 +846,67 @@ public: UINT16 fExtChar :1; // 1000 =1, when using extended character set in file // UINT16 u2 :3; - UINT16 nFibBack; // 0xc - INT16 lKey1; // 0xe file encrypted key, only valid if fEncrypted. - INT16 lKey2; // 0x10 key in 2 Portionen wg. Misalignment - UINT8 envr; // 0x12 environment in which file was created + UINT16 nFibBack; // 0xc + INT16 lKey1; // 0xe file encrypted key, only valid if fEncrypted. + INT16 lKey2; // 0x10 key in 2 Portionen wg. Misalignment + UINT8 envr; // 0x12 environment in which file was created // 0 created by Win Word / 1 created by Mac Word - BYTE fMac :1; // 0x13 when 1, this file was last saved in the Mac environment + BYTE fMac :1; // 0x13 when 1, this file was last saved in the Mac environment BYTE fEmptySpecial :1; BYTE fLoadOverridePage :1; BYTE fFuturesavedUndo :1; BYTE fWord97Saved :1; BYTE :3; - UINT16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse) + UINT16 chse; // 0x14 default extended character set id for text in document stream. (overidden by chp.chse) // 0 = ANSI / 256 Macintosh character set. - UINT16 chseTables; // 0x16 default extended character set id for text in + UINT16 chseTables; // 0x16 default extended character set id for text in // internal data structures: 0 = ANSI, 256 = Macintosh - WW8_FC fcMin; // 0x18 file offset of first character of text - WW8_FC fcMac; // 0x1c file offset of last character of text + 1 + WW8_FC fcMin; // 0x18 file offset of first character of text + WW8_FC fcMac; // 0x1c file offset of last character of text + 1 // Einschub fuer WW8 ***************************************************** - UINT16 csw; // Count of fields in the array of "shorts" + UINT16 csw; // Count of fields in the array of "shorts" // Marke: "rgsw" Beginning of the array of shorts - UINT16 wMagicCreated; // unique number Identifying the File's creator + UINT16 wMagicCreated; // unique number Identifying the File's creator // 0x6A62 is the creator ID for Word and is reserved. // Other creators should choose a different value. - UINT16 wMagicRevised; // identifies the File's last modifier - UINT16 wMagicCreatedPrivate; // private data - UINT16 wMagicRevisedPrivate; // private data + UINT16 wMagicRevised; // identifies the File's last modifier + UINT16 wMagicCreatedPrivate; // private data + UINT16 wMagicRevisedPrivate; // private data /* - INT16 pnFbpChpFirst_W6; // not used - INT16 pnChpFirst_W6; // not used - INT16 cpnBteChp_W6; // not used - INT16 pnFbpPapFirst_W6; // not used - INT16 pnPapFirst_W6; // not used - INT16 cpnBtePap_W6; // not used - INT16 pnFbpLvcFirst_W6; // not used - INT16 pnLvcFirst_W6; // not used - INT16 cpnBteLvc_W6; // not used + INT16 pnFbpChpFirst_W6; // not used + INT16 pnChpFirst_W6; // not used + INT16 cpnBteChp_W6; // not used + INT16 pnFbpPapFirst_W6; // not used + INT16 pnPapFirst_W6; // not used + INT16 cpnBtePap_W6; // not used + INT16 pnFbpLvcFirst_W6; // not used + INT16 pnLvcFirst_W6; // not used + INT16 cpnBteLvc_W6; // not used */ - INT16 lidFE; // Language id if document was written by Far East version + INT16 lidFE; // Language id if document was written by Far East version // of Word (i.e. FIB.fFarEast is on) - UINT16 clw; // Number of fields in the array of longs + UINT16 clw; // Number of fields in the array of longs // Ende des Einschubs fuer WW8 ******************************************* // Marke: "rglw" Beginning of the array of longs - WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1. - - // WW8_FC u4[4]; // 0x24 - WW8_CP ccpText; // 0x34 length of main document text stream - WW8_CP ccpFtn; // 0x38 length of footnote subdocument text stream - WW8_CP ccpHdr; // 0x3c length of header subdocument text stream - WW8_CP ccpMcr; // 0x40 length of macro subdocument text stream - WW8_CP ccpAtn; // 0x44 length of annotation subdocument text stream - WW8_CP ccpEdn; // 0x48 length of endnote subdocument text stream - WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream - WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream + WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1. + + // WW8_FC u4[4]; // 0x24 + WW8_CP ccpText; // 0x34 length of main document text stream + WW8_CP ccpFtn; // 0x38 length of footnote subdocument text stream + WW8_CP ccpHdr; // 0x3c length of header subdocument text stream + WW8_CP ccpMcr; // 0x40 length of macro subdocument text stream + WW8_CP ccpAtn; // 0x44 length of annotation subdocument text stream + WW8_CP ccpEdn; // 0x48 length of endnote subdocument text stream + WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream + WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream // Einschub fuer WW8 ***************************************************** - INT32 pnFbpChpFirst; // when there was insufficient memory for Word to expand + INT32 pnFbpChpFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written // to the file in a linked list of 512-byte pieces // starting with this pn. @@ -914,13 +914,13 @@ public: // folgende Felder existieren zwar so in der Datei, // wir benutzen jedoch unten deklarierte General-Variablen // fuer Ver67 und Ver8 gemeinsam. - INT32 pnChpFirst; // the page number of the lowest numbered page in the + INT32 pnChpFirst; // the page number of the lowest numbered page in the // document that records CHPX FKP information - INT32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex + INT32 cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbteChpx // is less than this, the PLCFbteChpx is incomplete. */ - INT32 pnFbpPapFirst; // when there was insufficient memory for Word to expand + INT32 pnFbpPapFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written to // the file in a linked list of 512-byte pieces // starting with this pn @@ -928,251 +928,251 @@ public: // folgende Felder existieren zwar so in der Datei, // wir benutzen jedoch unten deklarierte General-Variablen // fuer Ver67 und Ver8 gemeinsam. - INT32 pnPapFirst; // the page number of the lowest numbered page in the + INT32 pnPapFirst; // the page number of the lowest numbered page in the // document that records PAPX FKP information - INT32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex + INT32 cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbtePapx is // less than this, the PLCFbtePapx is incomplete. */ - INT32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand + INT32 pnFbpLvcFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written to // the file in a linked list of 512-byte pieces // starting with this pn - INT32 pnLvcFirst; // the page number of the lowest numbered page in the + INT32 pnLvcFirst; // the page number of the lowest numbered page in the // document that records LVC FKP information - INT32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex + INT32 cpnBteLvc; // count of LVC FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbtePapx is // less than this, the PLCFbtePapx is incomplete. - INT32 fcIslandFirst; // ? - INT32 fcIslandLim; // ? - UINT16 cfclcb; // Number of fields in the array of FC/LCB pairs. + INT32 fcIslandFirst; // ? + INT32 fcIslandLim; // ? + UINT16 cfclcb; // Number of fields in the array of FC/LCB pairs. // Ende des Einschubs fuer WW8 ******************************************* // Marke: "rgfclcb" Beginning of array of FC/LCB pairs. - WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table + WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table // stream. During fast save Word will attempt to reuse // this allocation if STSH is small enough to fit. - INT32 lcbStshfOrig; // 0x5c count of bytes of original STSH allocation - WW8_FC fcStshf; // 0x60 file offset of STSH in file. - INT32 lcbStshf; // 0x64 count of bytes of current STSH allocation - WW8_FC fcPlcffndRef; // 0x68 file offset of footnote reference PLCF. - INT32 lcbPlcffndRef; // 0x6c count of bytes of footnote reference PLCF + INT32 lcbStshfOrig; // 0x5c count of bytes of original STSH allocation + WW8_FC fcStshf; // 0x60 file offset of STSH in file. + INT32 lcbStshf; // 0x64 count of bytes of current STSH allocation + WW8_FC fcPlcffndRef; // 0x68 file offset of footnote reference PLCF. + INT32 lcbPlcffndRef; // 0x6c count of bytes of footnote reference PLCF // == 0 if no footnotes defined in document. - WW8_FC fcPlcffndTxt; // 0x70 file offset of footnote text PLCF. - INT32 lcbPlcffndTxt; // 0x74 count of bytes of footnote text PLCF. + WW8_FC fcPlcffndTxt; // 0x70 file offset of footnote text PLCF. + INT32 lcbPlcffndTxt; // 0x74 count of bytes of footnote text PLCF. // == 0 if no footnotes defined in document - WW8_FC fcPlcfandRef; // 0x78 file offset of annotation reference PLCF. - INT32 lcbPlcfandRef; // 0x7c count of bytes of annotation reference PLCF. + WW8_FC fcPlcfandRef; // 0x78 file offset of annotation reference PLCF. + INT32 lcbPlcfandRef; // 0x7c count of bytes of annotation reference PLCF. - WW8_FC fcPlcfandTxt; // 0x80 file offset of annotation text PLCF. - INT32 lcbPlcfandTxt; // 0x84 count of bytes of the annotation text PLCF + WW8_FC fcPlcfandTxt; // 0x80 file offset of annotation text PLCF. + INT32 lcbPlcfandTxt; // 0x84 count of bytes of the annotation text PLCF - WW8_FC fcPlcfsed; // 8x88 file offset of section descriptor PLCF. - INT32 lcbPlcfsed; // 0x8c count of bytes of section descriptor PLCF. + WW8_FC fcPlcfsed; // 8x88 file offset of section descriptor PLCF. + INT32 lcbPlcfsed; // 0x8c count of bytes of section descriptor PLCF. - WW8_FC fcPlcfpad; // 0x90 file offset of paragraph descriptor PLCF - INT32 lcbPlcfpad; // 0x94 count of bytes of paragraph descriptor PLCF. + WW8_FC fcPlcfpad; // 0x90 file offset of paragraph descriptor PLCF + INT32 lcbPlcfpad; // 0x94 count of bytes of paragraph descriptor PLCF. // ==0 if file was never viewed in Outline view. // Should not be written by third party creators - WW8_FC fcPlcfphe; // 0x98 file offset of PLCF of paragraph heights. - INT32 lcbPlcfphe; // 0x9c count of bytes of paragraph height PLCF. + WW8_FC fcPlcfphe; // 0x98 file offset of PLCF of paragraph heights. + INT32 lcbPlcfphe; // 0x9c count of bytes of paragraph height PLCF. // ==0 when file is non-complex. - WW8_FC fcSttbfglsy; // 0xa0 file offset of glossary string table. - INT32 lcbSttbfglsy; // 0xa4 count of bytes of glossary string table. - // == 0 for non-glossary documents. - // !=0 for glossary documents. + WW8_FC fcSttbfglsy; // 0xa0 file offset of glossary string table. + INT32 lcbSttbfglsy; // 0xa4 count of bytes of glossary string table. + // == 0 for non-glossary documents. + // !=0 for glossary documents. - WW8_FC fcPlcfglsy; // 0xa8 file offset of glossary PLCF. - INT32 lcbPlcfglsy; // 0xac count of bytes of glossary PLCF. - // == 0 for non-glossary documents. - // !=0 for glossary documents. + WW8_FC fcPlcfglsy; // 0xa8 file offset of glossary PLCF. + INT32 lcbPlcfglsy; // 0xac count of bytes of glossary PLCF. + // == 0 for non-glossary documents. + // !=0 for glossary documents. - WW8_FC fcPlcfhdd; // 0xb0 byte offset of header PLCF. - INT32 lcbPlcfhdd; // 0xb4 count of bytes of header PLCF. - // == 0 if document contains no headers + WW8_FC fcPlcfhdd; // 0xb0 byte offset of header PLCF. + INT32 lcbPlcfhdd; // 0xb4 count of bytes of header PLCF. + // == 0 if document contains no headers - WW8_FC fcPlcfbteChpx; // 0xb8 file offset of character property bin table.PLCF. + WW8_FC fcPlcfbteChpx; // 0xb8 file offset of character property bin table.PLCF. INT32 lcbPlcfbteChpx;// 0xbc count of bytes of character property bin table PLCF. - WW8_FC fcPlcfbtePapx; // 0xc0 file offset of paragraph property bin table.PLCF. + WW8_FC fcPlcfbtePapx; // 0xc0 file offset of paragraph property bin table.PLCF. INT32 lcbPlcfbtePapx;// 0xc4 count of bytes of paragraph property bin table PLCF. - WW8_FC fcPlcfsea; // 0xc8 file offset of PLCF reserved for private use. The SEA is 6 bytes long. - INT32 lcbPlcfsea; // 0xcc count of bytes of private use PLCF. + WW8_FC fcPlcfsea; // 0xc8 file offset of PLCF reserved for private use. The SEA is 6 bytes long. + INT32 lcbPlcfsea; // 0xcc count of bytes of private use PLCF. - WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition. - INT32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn. + WW8_FC fcSttbfffn; // 0xd0 file offset of font information STTBF. See the FFN file structure definition. + INT32 lcbSttbfffn; // 0xd4 count of bytes in sttbfffn. - WW8_FC fcPlcffldMom; // 0xd8 offset in doc stream to the PLCF of field positions in the main document. - INT32 lcbPlcffldMom; // 0xdc + WW8_FC fcPlcffldMom; // 0xd8 offset in doc stream to the PLCF of field positions in the main document. + INT32 lcbPlcffldMom; // 0xdc - WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument. - INT32 lcbPlcffldHdr; // 0xe4 + WW8_FC fcPlcffldHdr; // 0xe0 offset in doc stream to the PLCF of field positions in the header subdocument. + INT32 lcbPlcffldHdr; // 0xe4 - WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument. - INT32 lcbPlcffldFtn; // 0xec + WW8_FC fcPlcffldFtn; // 0xe8 offset in doc stream to the PLCF of field positions in the footnote subdocument. + INT32 lcbPlcffldFtn; // 0xec - WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument. - INT32 lcbPlcffldAtn; // 0xf4 + WW8_FC fcPlcffldAtn; // 0xf0 offset in doc stream to the PLCF of field positions in the annotation subdocument. + INT32 lcbPlcffldAtn; // 0xf4 - WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument. - INT32 lcbPlcffldMcr; // 9xfc + WW8_FC fcPlcffldMcr; // 0xf8 offset in doc stream to the PLCF of field positions in the macro subdocument. + INT32 lcbPlcffldMcr; // 9xfc - WW8_FC fcSttbfbkmk; // 0x100 offset in document stream of the STTBF that records bookmark names in the main document - INT32 lcbSttbfbkmk; // 0x104 + WW8_FC fcSttbfbkmk; // 0x100 offset in document stream of the STTBF that records bookmark names in the main document + INT32 lcbSttbfbkmk; // 0x104 - WW8_FC fcPlcfbkf; // 0x108 offset in document stream of the PLCF that records the beginning CP offsets of bookmarks in the main document. See BKF - INT32 lcbPlcfbkf; // 0x10c + WW8_FC fcPlcfbkf; // 0x108 offset in document stream of the PLCF that records the beginning CP offsets of bookmarks in the main document. See BKF + INT32 lcbPlcfbkf; // 0x10c - WW8_FC fcPlcfbkl; // 0x110 offset in document stream of the PLCF that records the ending CP offsets of bookmarks recorded in the main document. See the BKL structure definition. - INT32 lcbPlcfbkl; // 0x114 INT32 + WW8_FC fcPlcfbkl; // 0x110 offset in document stream of the PLCF that records the ending CP offsets of bookmarks recorded in the main document. See the BKL structure definition. + INT32 lcbPlcfbkl; // 0x114 INT32 - WW8_FC fcCmds; // 0x118 FC - INT32 lcbCmds; // 0x11c + WW8_FC fcCmds; // 0x118 FC + INT32 lcbCmds; // 0x11c - WW8_FC fcPlcfmcr; // 0x120 FC - INT32 lcbPlcfmcr; // 0x124 + WW8_FC fcPlcfmcr; // 0x120 FC + INT32 lcbPlcfmcr; // 0x124 - WW8_FC fcSttbfmcr; // 0x128 FC - INT32 lcbSttbfmcr; // 0x12c + WW8_FC fcSttbfmcr; // 0x128 FC + INT32 lcbSttbfmcr; // 0x12c - WW8_FC fcPrDrvr; // 0x130 file offset of the printer driver information (names of drivers, port etc...) - INT32 lcbPrDrvr; // 0x134 count of bytes of the printer driver information (names of drivers, port etc...) + WW8_FC fcPrDrvr; // 0x130 file offset of the printer driver information (names of drivers, port etc...) + INT32 lcbPrDrvr; // 0x134 count of bytes of the printer driver information (names of drivers, port etc...) - WW8_FC fcPrEnvPort; // 0x138 file offset of the print environment in portrait mode. - INT32 lcbPrEnvPort; // 0x13c count of bytes of the print environment in portrait mode. + WW8_FC fcPrEnvPort; // 0x138 file offset of the print environment in portrait mode. + INT32 lcbPrEnvPort; // 0x13c count of bytes of the print environment in portrait mode. - WW8_FC fcPrEnvLand; // 0x140 file offset of the print environment in landscape mode. - INT32 lcbPrEnvLand; // 0x144 count of bytes of the print environment in landscape mode. + WW8_FC fcPrEnvLand; // 0x140 file offset of the print environment in landscape mode. + INT32 lcbPrEnvLand; // 0x144 count of bytes of the print environment in landscape mode. - WW8_FC fcWss; // 0x148 file offset of Window Save State data structure. See WSS. - INT32 lcbWss; // 0x14c count of bytes of WSS. ==0 if unable to store the window state. + WW8_FC fcWss; // 0x148 file offset of Window Save State data structure. See WSS. + INT32 lcbWss; // 0x14c count of bytes of WSS. ==0 if unable to store the window state. - WW8_FC fcDop; // 0x150 file offset of document property data structure. - INT32 lcbDop; // 0x154 count of bytes of document properties. + WW8_FC fcDop; // 0x150 file offset of document property data structure. + INT32 lcbDop; // 0x154 count of bytes of document properties. // cbDOP is 84 when nFib < 103 - WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC. - INT32 cbSttbfAssoc; // 0x15C + WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC. + INT32 cbSttbfAssoc; // 0x15C - WW8_FC fcClx; // 0x160 file offset of beginning of information for complex files. - INT32 lcbClx; // 0x164 count of bytes of complex file information. 0 if file is non-complex. + WW8_FC fcClx; // 0x160 file offset of beginning of information for complex files. + INT32 lcbClx; // 0x164 count of bytes of complex file information. 0 if file is non-complex. - WW8_FC fcPlcfpgdFtn; // 0x168 file offset of page descriptor PLCF for footnote subdocument. - INT32 lcbPlcfpgdFtn; // 0x16C count of bytes of page descriptor PLCF for footnote subdocument. - // ==0 if document has not been paginated. The length of the PGD is 8 bytes. + WW8_FC fcPlcfpgdFtn; // 0x168 file offset of page descriptor PLCF for footnote subdocument. + INT32 lcbPlcfpgdFtn; // 0x16C count of bytes of page descriptor PLCF for footnote subdocument. + // ==0 if document has not been paginated. The length of the PGD is 8 bytes. - WW8_FC fcAutosaveSource; // 0x170 file offset of the name of the original file. - INT32 lcbAutosaveSource; // 0x174 count of bytes of the name of the original file. + WW8_FC fcAutosaveSource; // 0x170 file offset of the name of the original file. + INT32 lcbAutosaveSource; // 0x174 count of bytes of the name of the original file. - WW8_FC fcGrpStAtnOwners; // 0x178 group of strings recording the names of the owners of annotations - INT32 lcbGrpStAtnOwners; // 0x17C count of bytes of the group of strings + WW8_FC fcGrpStAtnOwners; // 0x178 group of strings recording the names of the owners of annotations + INT32 lcbGrpStAtnOwners; // 0x17C count of bytes of the group of strings - WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument - INT32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument + WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument + INT32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument // Einschubs fuer WW67 *************************************************** - // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden + // INT16 wSpare4Fib; // Reserve, muss hier nicht deklariert werden /* // folgende Felder existieren zwar so in der Datei, // wir benutzen jedoch unten deklarierte General-Variablen // fuer Ver67 und Ver8 gemeinsam. - WW8_PN pnChpFirst; // the page number of the lowest numbered page in + WW8_PN pnChpFirst; // the page number of the lowest numbered page in // the document that records CHPX FKP information - WW8_PN pnPapFirst; // the page number of the lowest numbered page in + WW8_PN pnPapFirst; // the page number of the lowest numbered page in // the document that records PAPX FKP information - WW8_PN cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex + WW8_PN cpnBteChp; // count of CHPX FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbteChpx is // less than this, the PLCFbteChpx is incomplete. - WW8_PN cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex + WW8_PN cpnBtePap; // count of PAPX FKPs recorded in file. In non-complex // files if the number of entries in the PLCFbtePapx is // less than this, the PLCFbtePapx is incomplete. */ // Ende des Einschubs fuer WW67 ****************************************** - WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document. - // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. + WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document. + // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. // ab Ver8 unused - INT32 lcbPlcfdoaMom; // 0x196 length in bytes of the FDOA PLCF of the main document + INT32 lcbPlcfdoaMom; // 0x196 length in bytes of the FDOA PLCF of the main document // ab Ver8 unused - WW8_FC fcPlcfdoaHdr; // 0x19A file offset of the FDOA (drawn object) PLCF for the header document. - // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. + WW8_FC fcPlcfdoaHdr; // 0x19A file offset of the FDOA (drawn object) PLCF for the header document. + // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. // ab Ver8 unused - INT32 lcbPlcfdoaHdr; // 0x19E length in bytes of the FDOA PLCF of the header document + INT32 lcbPlcfdoaHdr; // 0x19E length in bytes of the FDOA PLCF of the header document // ab Ver8 unused - WW8_FC fcPlcfspaMom; // offset in table stream of the FSPA PLCF for main document. + WW8_FC fcPlcfspaMom; // offset in table stream of the FSPA PLCF for main document. // == 0 if document has no office art objects // war in Ver67 nur leere Reserve - INT32 lcbPlcfspaMom; // length in bytes of the FSPA PLCF of the main document + INT32 lcbPlcfspaMom; // length in bytes of the FSPA PLCF of the main document // war in Ver67 nur leere Reserve - WW8_FC fcPlcfspaHdr; // offset in table stream of the FSPA PLCF for header document. + WW8_FC fcPlcfspaHdr; // offset in table stream of the FSPA PLCF for header document. // == 0 if document has no office art objects // war in Ver67 nur leere Reserve - INT32 lcbPlcfspaHdr; // length in bytes of the FSPA PLCF of the header document + INT32 lcbPlcfspaHdr; // length in bytes of the FSPA PLCF of the header document // war in Ver67 nur leere Reserve - WW8_FC fcPlcfAtnbkf; // 0x1B2 file offset of BKF (bookmark first) PLCF of the annotation subdocument - INT32 lcbPlcfAtnbkf; // 0x1B6 length in bytes of BKF (bookmark first) PLCF of the annotation subdocument + WW8_FC fcPlcfAtnbkf; // 0x1B2 file offset of BKF (bookmark first) PLCF of the annotation subdocument + INT32 lcbPlcfAtnbkf; // 0x1B6 length in bytes of BKF (bookmark first) PLCF of the annotation subdocument - WW8_FC fcPlcfAtnbkl; // 0x1BA file offset of BKL (bookmark last) PLCF of the annotation subdocument - INT32 lcbPlcfAtnbkl; // 0x1BE length in bytes of BKL (bookmark first) PLCF of the annotation subdocument + WW8_FC fcPlcfAtnbkl; // 0x1BA file offset of BKL (bookmark last) PLCF of the annotation subdocument + INT32 lcbPlcfAtnbkl; // 0x1BE length in bytes of BKL (bookmark first) PLCF of the annotation subdocument - WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block - INT32 lcbPMS; // 0x1C6 length in bytes of PMS + WW8_FC fcPms; // 0x1C2 file offset of PMS (Print Merge State) information block + INT32 lcbPMS; // 0x1C6 length in bytes of PMS - WW8_FC fcFormFldSttbf; // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls - INT32 lcbFormFldSttbf; // 0x1CE length in bytes of form field Sttbf + WW8_FC fcFormFldSttbf; // 0x1CA file offset of form field Sttbf which contains strings used in form field dropdown controls + INT32 lcbFormFldSttbf; // 0x1CE length in bytes of form field Sttbf - WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream - INT32 lcbPlcfendRef; // 0x1D6 + WW8_FC fcPlcfendRef; // 0x1D2 file offset of PLCFendRef which points to endnote references in the main document stream + INT32 lcbPlcfendRef; // 0x1D6 - WW8_FC fcPlcfendTxt; // 0x1DA file offset of PLCFendRef which points to endnote text in the endnote document - // stream which corresponds with the PLCFendRef - INT32 lcbPlcfendTxt; // 0x1DE + WW8_FC fcPlcfendTxt; // 0x1DA file offset of PLCFendRef which points to endnote text in the endnote document + // stream which corresponds with the PLCFendRef + INT32 lcbPlcfendTxt; // 0x1DE - WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc - INT32 lcbPlcffldEdn; // 0x1E6 + WW8_FC fcPlcffldEdn; // 0x1E2 offset to PLCF of field positions in the endnote subdoc + INT32 lcbPlcffldEdn; // 0x1E6 - WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc. - INT32 lcbPlcfpgdEdn; // 0x1EE + WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc. + INT32 lcbPlcfpgdEdn; // 0x1EE - WW8_FC fcDggInfo; // offset in table stream of the office art object table data. + WW8_FC fcDggInfo; // offset in table stream of the office art object table data. // The format of office art object table data is found in a separate document. // war in Ver67 nur leere Reserve - INT32 lcbDggInfo; // length in bytes of the office art object table data + INT32 lcbDggInfo; // length in bytes of the office art object table data // war in Ver67 nur leere Reserve - WW8_FC fcSttbfRMark; // 0x1fa offset to STTBF that records the author abbreviations... - INT32 lcbSttbfRMark; // 0x1fe - WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles... - INT32 lcbSttbfCaption; // 0x206 - WW8_FC fcSttbAutoCaption; // offset in table stream to the STTBF that records the object names and + WW8_FC fcSttbfRMark; // 0x1fa offset to STTBF that records the author abbreviations... + INT32 lcbSttbfRMark; // 0x1fe + WW8_FC fcSttbfCaption; // 0x202 offset to STTBF that records caption titles... + INT32 lcbSttbfCaption; // 0x206 + WW8_FC fcSttbAutoCaption; // offset in table stream to the STTBF that records the object names and // indices into the caption STTBF for objects which get auto captions. - INT32 lcbSttbAutoCaption; // 0x20e + INT32 lcbSttbAutoCaption; // 0x20e - WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents... - INT32 lcbPlcfwkb; // 0x216 + WW8_FC fcPlcfwkb; // 0x212 offset to PLCF that describes the boundaries of contributing documents... + INT32 lcbPlcfwkb; // 0x216 - WW8_FC fcPlcfspl; // offset in table stream of PLCF (of SPLS structures) that records spell check state + WW8_FC fcPlcfspl; // offset in table stream of PLCF (of SPLS structures) that records spell check state // war in Ver67 nur leere Reserve - INT32 lcbPlcfspl; // war in Ver67 nur leere Reserve + INT32 lcbPlcfspl; // war in Ver67 nur leere Reserve - WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc - INT32 lcbPlcftxbxTxt; // 0x226 - WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc. - INT32 lcbPlcffldTxbx; // 0x22e + WW8_FC fcPlcftxbxTxt; // 0x222 ...PLCF of beginning CP in the text box subdoc + INT32 lcbPlcftxbxTxt; // 0x226 + WW8_FC fcPlcffldTxbx; // 0x22a ...PLCF of field boundaries recorded in the textbox subdoc. + INT32 lcbPlcffldTxbx; // 0x22e WW8_FC fcPlcfHdrtxbxTxt;// 0x232 ...PLCF of beginning CP in the header text box subdoc INT32 lcbPlcfHdrtxbxTxt;// 0x236 WW8_FC fcPlcffldHdrTxbx;// 0x23a ...PLCF of field boundaries recorded in the header textbox subdoc. @@ -1181,15 +1181,15 @@ public: /* spezielle Listenverwaltung fuer WW8 */ - WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information. - INT32 lcbPlcfLst; // 0x02e6 length - WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information. - INT32 lcbPlfLfo; // 0x02ee length + WW8_FC fcPlcfLst; // 0x02e2 offset in the table stream of list format information. + INT32 lcbPlcfLst; // 0x02e6 length + WW8_FC fcPlfLfo; // 0x02ea offset in the table stream of list format override information. + INT32 lcbPlfLfo; // 0x02ee length /* spezielle Break-Verwaltung fuer Text-Box-Stories in WW8 */ - WW8_FC fcPlcftxbxBkd; // 0x02f2 PLCF fuer TextBox-Break-Deskriptoren im Maintext - INT32 lcbPlcftxbxBkd; // 0x02f6 + WW8_FC fcPlcftxbxBkd; // 0x02f2 PLCF fuer TextBox-Break-Deskriptoren im Maintext + INT32 lcbPlcftxbxBkd; // 0x02f6 WW8_FC fcPlcfHdrtxbxBkd;// 0x02fa PLCF fuer TextBox-Break-Deskriptoren im Header-/Footer-Bereich INT32 lcbPlcfHdrtxbxBkd;// 0x02fe @@ -1225,20 +1225,20 @@ protected: SvStream& rSt; long nStyleStart; long nStyleLen; -// WW8_STSHI* pStishi; +// WW8_STSHI* pStishi; - UINT16 cstd; // Count of styles in stylesheet - UINT16 cbSTDBaseInFile; // Length of STD Base as stored in a file - UINT16 fStdStylenamesWritten : 1; // Are built-in stylenames stored? - UINT16 : 15; // Spare flags - UINT16 stiMaxWhenSaved; // Max sti known when this file was written - UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? - UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames - UINT16 ftcStandardChpStsh; // ftc used by StandardChpStsh for this document + UINT16 cstd; // Count of styles in stylesheet + UINT16 cbSTDBaseInFile; // Length of STD Base as stored in a file + UINT16 fStdStylenamesWritten : 1; // Are built-in stylenames stored? + UINT16 : 15; // Spare flags + UINT16 stiMaxWhenSaved; // Max sti known when this file was written + UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there? + UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames + UINT16 ftcStandardChpStsh; // ftc used by StandardChpStsh for this document public: WW8Style( SvStream& rSt, WW8Fib& rFibPara ); -// ~WW8Style(){ delete( pStishi ); pStishi = 0; } +// ~WW8Style(){ delete( pStishi ); pStishi = 0; } WW8_STD* Read1STDFixed( short& rSkip, short* pcbStd ); WW8_STD* Read1Style( short& rSkip, String* pString, short* pcbStd ); const UINT16 GetCount() const { return cstd; } @@ -1248,9 +1248,9 @@ public: class WW8Fonts { protected: - WW8_FFN* pFontA; // Array of Pointers to Font Description + WW8_FFN* pFontA; // Array of Pointers to Font Description // Hilfs-Vari - USHORT nMax; // Array-Groesse + USHORT nMax; // Array-Groesse public: WW8Fonts( SvStream& rSt, WW8Fib& rFib ); ~WW8Fonts(){ if( pFontA ) delete [] pFontA; } @@ -1276,146 +1276,146 @@ public: // Initialisier-Dummy: BYTE nDataStart; //------------------------- - UINT16 fFacingPages : 1; // 1 when facing pages should be printed - UINT16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled. - UINT16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0 - UINT16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0 - UINT16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text - UINT16 : 1; // 0 unused + UINT16 fFacingPages : 1; // 1 when facing pages should be printed + UINT16 fWidowControl : 1; // 1 when widow control is in effect. 0 when widow control disabled. + UINT16 fPMHMainDoc : 1; // 1 when doc is a main doc for Print Merge Helper, 0 when not; default=0 + UINT16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0 + UINT16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text + UINT16 : 1; // 0 unused //------------------------- - UINT16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic. + UINT16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic. //------------------------- - UINT16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page - UINT16 nFtn : 14; // 1 initial footnote number for document - UINT16 fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied - UINT16 : 7; // reserved - UINT16 fOnlyMacPics : 1; // when 1, Word believes all pictures recorded in the document were created on a Macintosh - UINT16 fOnlyWinPics : 1; // when 1, Word believes all pictures recorded in the document were created in Windows - UINT16 fLabelDoc : 1; // when 1, document was created as a print merge labels document - UINT16 fHyphCapitals : 1; // when 1, Word is allowed to hyphenate words that are capitalized. When 0, capitalized may not be hyphenated - UINT16 fAutoHyphen : 1; // when 1, Word will hyphenate newly typed text as a background task - UINT16 fFormNoFields : 1; - UINT16 fLinkStyles : 1; // when 1, Word will merge styles from its template - UINT16 fRevMarking : 1; // when 1, Word will mark revisions as the document is edited - UINT16 fBackup : 1; // always make backup when document saved when 1. - UINT16 fExactCWords : 1; - UINT16 fPagHidden : 1; // - UINT16 fPagResults : 1; - UINT16 fLockAtn : 1; // when 1, annotations are locked for editing - UINT16 fMirrorMargins : 1; // swap margins on left/right pages when 1. - UINT16 fReadOnlyRecommended : 1;// user has recommended that this doc be opened read-only when 1 - UINT16 fDfltTrueType : 1; // when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x) - UINT16 fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x). - UINT16 fProtEnabled : 1; // when 1, document is protected from edit operations - UINT16 fDispFormFldSel : 1;// when 1, restrict selections to occur only within form fields - UINT16 fRMView : 1; // when 1, show revision markings on screen - UINT16 fRMPrint : 1; // when 1, print revision marks when document is printed - UINT16 fWriteReservation : 1; - UINT16 fLockRev : 1; // when 1, the current revision marking state is locked - UINT16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts - // compatability options - UINT16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent - UINT16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters - UINT16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break - UINT16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line - UINT16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers - UINT16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts + UINT16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page + UINT16 nFtn : 14; // 1 initial footnote number for document + UINT16 fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied + UINT16 : 7; // reserved + UINT16 fOnlyMacPics : 1; // when 1, Word believes all pictures recorded in the document were created on a Macintosh + UINT16 fOnlyWinPics : 1; // when 1, Word believes all pictures recorded in the document were created in Windows + UINT16 fLabelDoc : 1; // when 1, document was created as a print merge labels document + UINT16 fHyphCapitals : 1; // when 1, Word is allowed to hyphenate words that are capitalized. When 0, capitalized may not be hyphenated + UINT16 fAutoHyphen : 1; // when 1, Word will hyphenate newly typed text as a background task + UINT16 fFormNoFields : 1; + UINT16 fLinkStyles : 1; // when 1, Word will merge styles from its template + UINT16 fRevMarking : 1; // when 1, Word will mark revisions as the document is edited + UINT16 fBackup : 1; // always make backup when document saved when 1. + UINT16 fExactCWords : 1; + UINT16 fPagHidden : 1; // + UINT16 fPagResults : 1; + UINT16 fLockAtn : 1; // when 1, annotations are locked for editing + UINT16 fMirrorMargins : 1; // swap margins on left/right pages when 1. + UINT16 fReadOnlyRecommended : 1;// user has recommended that this doc be opened read-only when 1 + UINT16 fDfltTrueType : 1; // when 1, use TrueType fonts by default (flag obeyed only when doc was created by WinWord 2.x) + UINT16 fPagSuppressTopSpacing : 1;//when 1, file created with SUPPRESSTOPSPACING=YES in win.ini. (flag obeyed only when doc was created by WinWord 2.x). + UINT16 fProtEnabled : 1; // when 1, document is protected from edit operations + UINT16 fDispFormFldSel : 1;// when 1, restrict selections to occur only within form fields + UINT16 fRMView : 1; // when 1, show revision markings on screen + UINT16 fRMPrint : 1; // when 1, print revision marks when document is printed + UINT16 fWriteReservation : 1; + UINT16 fLockRev : 1; // when 1, the current revision marking state is locked + UINT16 fEmbedFonts : 1; // when 1, document contains embedded True Type fonts + // compatability options + UINT16 copts_fNoTabForInd : 1; // when 1, don�t add automatic tab stops for hanging indent + UINT16 copts_fNoSpaceRaiseLower : 1; // when 1, don�t add extra space for raised or lowered characters + UINT16 copts_fSupressSpbfAfterPgBrk : 1; // when 1, supress the paragraph Space Before and Space After options after a page break + UINT16 copts_fWrapTrailSpaces : 1; // when 1, wrap trailing spaces at the end of a line to the next line + UINT16 copts_fMapPrintTextColor : 1; // when 1, print colors as black on non-color printers + UINT16 copts_fNoColumnBalance : 1; // when 1, don�t balance columns for Continuous Section starts UINT16 copts_fConvMailMergeEsc : 1; - UINT16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page - UINT16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh - UINT16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures - UINT16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames - UINT16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages - - INT16 dxaTab; // 720 twips default tab width - UINT16 wSpare; // - UINT16 dxaHotZ; // width of hyphenation hot zone measured in twips - UINT16 cConsecHypLim; // number of lines allowed to have consecutive hyphens - UINT16 wSpare2; // reserved - INT32 dttmCreated; // DTTM date and time document was created - INT32 dttmRevised; // DTTM date and time document was last revised - INT32 dttmLastPrint; // DTTM date and time document was last printed - INT16 nRevision; // number of times document has been revised since its creation - INT32 tmEdited; // time document was last edited - INT32 cWords; // count of words tallied by last Word Count execution - INT32 cCh; // count of characters tallied by last Word Count execution - INT16 cPg; // count of pages tallied by last Word Count execution - INT32 cParas; // count of paragraphs tallied by last Word Count execution - UINT16 rncEdn : 2; // restart endnote number code: 0 don�t restart endnote numbering, 1 section, 2 page - UINT16 nEdn : 14; // beginning endnote number - UINT16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document - // UINT16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman - // 3 Upper case Letter, 4 Lower case Letter + UINT16 copts_fSupressTopSpacing : 1; // when 1, supress extra line spacing at top of page + UINT16 copts_fOrigWordTableRules : 1; // when 1, combine table borders like Word 5.x for the Macintosh + UINT16 copts_fTransparentMetafiles : 1; // when 1, don�t blank area between metafile pictures + UINT16 copts_fShowBreaksInFrames : 1; // when 1, show hard page or column breaks in frames + UINT16 copts_fSwapBordersFacingPgs : 1; // when 1, swap left and right pages on odd facing pages + + INT16 dxaTab; // 720 twips default tab width + UINT16 wSpare; // + UINT16 dxaHotZ; // width of hyphenation hot zone measured in twips + UINT16 cConsecHypLim; // number of lines allowed to have consecutive hyphens + UINT16 wSpare2; // reserved + INT32 dttmCreated; // DTTM date and time document was created + INT32 dttmRevised; // DTTM date and time document was last revised + INT32 dttmLastPrint; // DTTM date and time document was last printed + INT16 nRevision; // number of times document has been revised since its creation + INT32 tmEdited; // time document was last edited + INT32 cWords; // count of words tallied by last Word Count execution + INT32 cCh; // count of characters tallied by last Word Count execution + INT16 cPg; // count of pages tallied by last Word Count execution + INT32 cParas; // count of paragraphs tallied by last Word Count execution + UINT16 rncEdn : 2; // restart endnote number code: 0 don�t restart endnote numbering, 1 section, 2 page + UINT16 nEdn : 14; // beginning endnote number + UINT16 epc : 2; // endnote position code: 0 at end of section, 3 at end of document + // UINT16 nfcFtnRef : 4; // number format code for auto footnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman + // 3 Upper case Letter, 4 Lower case Letter // ersetzt durch gleichlautendes Feld unten - // UINT16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman - // 3 Upper case Letter, 4 Lower case Letter + // UINT16 nfcEdnRef : 4; // number format code for auto endnotes: 0 Arabic, 1 Upper case Roman, 2 Lower case Roman + // 3 Upper case Letter, 4 Lower case Letter // ersetzt durch gleichlautendes Feld unten - UINT16 fPrintFormData : 1; // only print data inside of form fields - UINT16 fSaveFormData : 1; // only save document data that is inside of a form field. - UINT16 fShadeFormData : 1; // shade form fields - UINT16 : 2; // reserved - UINT16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count - INT32 cLines; // count of lines tallied by last Word Count operation - INT32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation - INT32 cChFtnEdn; // count of characters in footnotes and endnotes tallied by last Word Count operation - INT16 cPgFtnEdn; // count of pages in footnotes and endnotes tallied by last Word Count operation - INT32 cParasFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation - INT32 cLinesFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation - INT32 lKeyProtDoc; // document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1. - UINT16 wvkSaved : 3; // document view kind: 0 Normal view, 1 Outline view, 2 Page View - UINT16 wScaleSaved : 9; // - UINT16 zkSaved : 2; - - // hier sollte bei nFib < 103 Schluss sein, sonst ist Datei fehlerhaft! + UINT16 fPrintFormData : 1; // only print data inside of form fields + UINT16 fSaveFormData : 1; // only save document data that is inside of a form field. + UINT16 fShadeFormData : 1; // shade form fields + UINT16 : 2; // reserved + UINT16 fWCFtnEdn : 1; // when 1, include footnotes and endnotes in word count + INT32 cLines; // count of lines tallied by last Word Count operation + INT32 cWordsFtnEnd; // count of words in footnotes and endnotes tallied by last Word Count operation + INT32 cChFtnEdn; // count of characters in footnotes and endnotes tallied by last Word Count operation + INT16 cPgFtnEdn; // count of pages in footnotes and endnotes tallied by last Word Count operation + INT32 cParasFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation + INT32 cLinesFtnEdn; // count of paragraphs in footnotes and endnotes tallied by last Word Count operation + INT32 lKeyProtDoc; // document protection password key, only valid if dop.fProtEnabled, dop.fLockAtn or dop.fLockRev are 1. + UINT16 wvkSaved : 3; // document view kind: 0 Normal view, 1 Outline view, 2 Page View + UINT16 wScaleSaved : 9; // + UINT16 zkSaved : 2; + + // hier sollte bei nFib < 103 Schluss sein, sonst ist Datei fehlerhaft! /* bei nFib >= 103 gehts weiter: */ - UINT32 fNoTabForInd :1; // see above in compatability options - UINT32 fNoSpaceRaiseLower :1; // see above - UINT32 fSupressSpbfAfterPageBreak :1; // see above - UINT32 fWrapTrailSpaces :1; // see above - UINT32 fMapPrintTextColor :1; // see above - UINT32 fNoColumnBalance :1; // see above - UINT32 fConvMailMergeEsc :1; // see above - UINT32 fSupressTopSpacing :1; // see above - UINT32 fOrigWordTableRules :1; // see above - UINT32 fTransparentMetafiles :1; // see above - UINT32 fShowBreaksInFrames :1; // see above - UINT32 fSwapBordersFacingPgs :1; // see above - UINT32 :4; // reserved - UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top + UINT32 fNoTabForInd :1; // see above in compatability options + UINT32 fNoSpaceRaiseLower :1; // see above + UINT32 fSupressSpbfAfterPageBreak :1; // see above + UINT32 fWrapTrailSpaces :1; // see above + UINT32 fMapPrintTextColor :1; // see above + UINT32 fNoColumnBalance :1; // see above + UINT32 fConvMailMergeEsc :1; // see above + UINT32 fSupressTopSpacing :1; // see above + UINT32 fOrigWordTableRules :1; // see above + UINT32 fTransparentMetafiles :1; // see above + UINT32 fShowBreaksInFrames :1; // see above + UINT32 fSwapBordersFacingPgs :1; // see above + UINT32 :4; // reserved + UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top // of page like MacWord 5.x - UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points - UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer - UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text - UINT32 :1; // reserved - UINT32 fMWSmallCaps :1; // Use larger small caps like MacWord 5.x - UINT32 :10;// reserved + UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points + UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer + UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text + UINT32 :1; // reserved + UINT32 fMWSmallCaps :1; // Use larger small caps like MacWord 5.x + UINT32 :10;// reserved - // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! + // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! /* bei nFib > 105 gehts weiter: */ - INT16 adt; // Autoformat Document Type: + INT16 adt; // Autoformat Document Type: // 0 for normal. 1 for letter, and 2 for email. - WW8_DOPTYPOGRAPHY doptypography; // siehe WW8STRUC.HXX - WW8_DOGRID dogrid; // siehe WW8STRUC.HXX - UINT16 :1; // reserved - UINT16 lvl :4; // Which outline levels are showing in outline view - UINT16 :4; // reserved - UINT16 fHtmlDoc :1; // This file is based upon an HTML file - UINT16 :1; // reserved - UINT16 fSnapBorder :1; // Snap table and page borders to page border - UINT16 fIncludeHeader :1; // Place header inside page border - UINT16 fIncludeFooter :1; // Place footer inside page border - UINT16 fForcePageSizePag :1; // Are we in online view - UINT16 fMinFontSizePag :1; // Are we auto-promoting + WW8_DOPTYPOGRAPHY doptypography; // siehe WW8STRUC.HXX + WW8_DOGRID dogrid; // siehe WW8STRUC.HXX + UINT16 :1; // reserved + UINT16 lvl :4; // Which outline levels are showing in outline view + UINT16 :4; // reserved + UINT16 fHtmlDoc :1; // This file is based upon an HTML file + UINT16 :1; // reserved + UINT16 fSnapBorder :1; // Snap table and page borders to page border + UINT16 fIncludeHeader :1; // Place header inside page border + UINT16 fIncludeFooter :1; // Place footer inside page border + UINT16 fForcePageSizePag :1; // Are we in online view + UINT16 fMinFontSizePag :1; // Are we auto-promoting // fonts to >= hpsZoonFontPag? - UINT16 fHaveVersions :1; // versioning is turned on - UINT16 fAutoVersion :1; // autoversioning is enabled - UINT16 :14; // reserved + UINT16 fHaveVersions :1; // versioning is turned on + UINT16 fAutoVersion :1; // autoversioning is enabled + UINT16 :14; // reserved // hier 12 Byte ueberspringen: ASUMI INT32 cChWS; INT32 cChWSFtnEdn; @@ -1472,7 +1472,7 @@ class WW8PLCF_HdFt public: WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop ); -// ~WW8PLCF_HdFt() {} +// ~WW8PLCF_HdFt() {} BOOL GetTextPos( BYTE grpfIhdt, BYTE nWhich, WW8_CP& rStart, long& rLen ); BOOL GetTextPosExact( short nIdx, WW8_CP& rStart, long& rLen ); void UpdateIndex( BYTE grpfIhdt ); diff --git a/sw/source/filter/ww8/dump/ww8struc.hxx b/sw/source/filter/ww8/dump/ww8struc.hxx index 92797f9c6c64..c8ab5bd8d1eb 100644 --- a/sw/source/filter/ww8/dump/ww8struc.hxx +++ b/sw/source/filter/ww8/dump/ww8struc.hxx @@ -2,7 +2,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 @@ -38,17 +38,17 @@ inline BYTE Get_Byte( BYTE *& p ) - { BYTE n = SVBT8ToByte( *(SVBT8*)p ); p += 1; return n; } + { BYTE n = SVBT8ToByte( *(SVBT8*)p ); p += 1; return n; } inline short Get_Short( BYTE *& p ) - { short n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } + { short n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } inline USHORT Get_UShort( BYTE *& p ) - { USHORT n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } + { USHORT n = SVBT16ToShort( *(SVBT16*)p ); p += 2; return n; } inline long Get_Long( BYTE *& p ) - { long n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } + { long n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } inline ULONG Get_ULong( BYTE *& p ) - { ULONG n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } + { ULONG n = SVBT32ToUInt32( *(SVBT32*)p ); p += 4; return n; } inline void Set_UInt8( BYTE *& p, UINT8 n ) { ByteToSVBT8( n, *(SVBT8*)p ); p+= 1; } @@ -85,50 +85,50 @@ typedef INT32 WW8_CP; struct WW8_STD { // Base part of STD: - UINT16 sti : 12; // invariant style identifier - UINT16 fScratch : 1; // spare field for any temporary use, + UINT16 sti : 12; // invariant style identifier + UINT16 fScratch : 1; // spare field for any temporary use, // always reset back to zero! - UINT16 fInvalHeight : 1; // PHEs of all text with this style are wrong - UINT16 fHasUpe : 1; // UPEs have been generated - UINT16 fMassCopy : 1; // std has been mass-copied; if unused at + UINT16 fInvalHeight : 1; // PHEs of all text with this style are wrong + UINT16 fHasUpe : 1; // UPEs have been generated + UINT16 fMassCopy : 1; // std has been mass-copied; if unused at // save time, style should be deleted - UINT16 sgc : 4; // style type code - UINT16 istdBase : 12; // base style - UINT16 cupx : 4; // # of UPXs (and UPEs) - UINT16 istdNext : 12; // next style - UINT16 bchUpe; // offset to end of upx's, start of upe's + UINT16 sgc : 4; // style type code + UINT16 istdBase : 12; // base style + UINT16 cupx : 4; // # of UPXs (and UPEs) + UINT16 istdNext : 12; // next style + UINT16 bchUpe; // offset to end of upx's, start of upe's //-------- jetzt neu: // ab Ver8 gibts zwei Felder mehr: - UINT16 fAutoRedef : 1; /* auto redefine style when appropriate */ - UINT16 fHidden : 1; /* hidden from UI? */ - UINT16 : 14; /* unused bits */ + UINT16 fAutoRedef : 1; /* auto redefine style when appropriate */ + UINT16 fHidden : 1; /* hidden from UI? */ + UINT16 : 14; /* unused bits */ // Variable length part of STD: - // UINT8 stzName[2]; /* sub-names are separated by chDelimStyle - // char grupx[]; + // UINT8 stzName[2]; /* sub-names are separated by chDelimStyle + // char grupx[]; // the UPEs are not stored on the file; they are a cache of the based-on // chain - // char grupe[]; + // char grupe[]; }; /* Basis zum Einlesen UND zum Arbeiten (wird jeweils unter schiedlich beerbt) */ -struct WW8_FFN_BASE // Font Descriptor +struct WW8_FFN_BASE // Font Descriptor { // ab Ver6 - BYTE cbFfnM1; // 0x0 total length of FFN - 1. + BYTE cbFfnM1; // 0x0 total length of FFN - 1. - BYTE prg: 2; // 0x1:03 pitch request - BYTE fTrueType : 1; // 0x1:04 when 1, font is a TrueType font - // 0x1:08 reserved - BYTE ff : 3; // 0x1:70 font family id - // 0x1:80 reserved + BYTE prg: 2; // 0x1:03 pitch request + BYTE fTrueType : 1; // 0x1:04 when 1, font is a TrueType font + // 0x1:08 reserved + BYTE ff : 3; // 0x1:70 font family id + // 0x1:80 reserved - short wWeight; // 0x2 base weight of font - BYTE chs; // 0x4 character set identifier - BYTE ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font + short wWeight; // 0x2 base weight of font + BYTE chs; // 0x4 character set identifier + BYTE ibszAlt; // 0x5 index into ffn.szFfn to the name of the alternate font }; /* @@ -148,35 +148,35 @@ struct WW8_FFN : public WW8_FFN_BASE -struct WW8_BRCVer6 // alter Border Code +struct WW8_BRCVer6 // alter Border Code { SVBT16 aBits1; -// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of +// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of // a single line of border in units of 0.75 points // Must be nonzero when brcType is nonzero. // 6 == dotted, 7 == dashed. -// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double -// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC -// UINT16 ico : 5; // 07C0 color code (see chp.ico) -// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. +// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double +// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC +// UINT16 ico : 5; // 07C0 color code (see chp.ico) +// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. // Must be 0 when BRC is a substructure of the TC. Stored in points for Windows. }; struct WW8_BRC : public WW8_BRCVer6 // Border Code { SVBT16 aBits2; -// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of +// UINT16 dxpLineWidth : 3;// 0007 When dxpLineWidth is 0, 1, 2, 3, 4, or 5, this field is the width of // a single line of border in units of 0.75 points // Must be nonzero when brcType is nonzero. // 6 == dotted, 7 == dashed. -// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double -// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC -// UINT16 ico : 5; // 07C0 color code (see chp.ico) -// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. +// UINT16 brcType : 2; // 0018 border type code: 0 == none, 1 == single, 2 == thick, 3 == double +// UINT16 fShadow : 1; // 0020 when 1, border is drawn with shadow. Must be 0 when BRC is a substructure of the TC +// UINT16 ico : 5; // 07C0 color code (see chp.ico) +// UINT16 dxpSpace : 5; // F800 width of space to maintain between border and text within border. // Must be 0 when BRC is a substructure of the TC. Stored in points for Windows. }; -typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code +typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code #define WW8_TOP 0 #define WW8_LEFT 1 @@ -188,7 +188,7 @@ typedef WW8_BRC WW8_BRC5[5]; // 5 * Border Code -struct WW8_BordersSO // fuer StarOffice-Border Code +struct WW8_BordersSO // fuer StarOffice-Border Code { USHORT Out; USHORT In; @@ -248,45 +248,45 @@ struct WW8_BordersSO // fuer StarOffice-Border Code #define DEF_DOUBLE_LINE9_IN DEF_LINE_WIDTH_0 #define DEF_DOUBLE_LINE9_DIST DEF_LINE_WIDTH_2 -#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3 -#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0 -#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2 +#define DEF_DOUBLE_LINE10_OUT DEF_LINE_WIDTH_3 +#define DEF_DOUBLE_LINE10_IN DEF_LINE_WIDTH_0 +#define DEF_DOUBLE_LINE10_DIST DEF_LINE_WIDTH_2 */ // Deklarationen gemaess BOXITEM.HXX -#define WW8_DECL_LINETAB_ARRAY \ - static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \ - { \ -/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \ -/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \ -/* 2*/ { DEF_LINE_WIDTH_2, 0, 0 }, \ -/* 3*/ { DEF_LINE_WIDTH_3, 0, 0 }, \ -/* 4*/ { DEF_LINE_WIDTH_4, 0, 0 }, \ -/* 5*/ { DEF_DOUBLE_LINE0_OUT, DEF_DOUBLE_LINE0_IN, DEF_DOUBLE_LINE0_DIST },\ -/* 6*/ { DEF_DOUBLE_LINE1_OUT, DEF_DOUBLE_LINE1_IN, DEF_DOUBLE_LINE1_DIST },\ -/* 7*/ { DEF_DOUBLE_LINE2_OUT, DEF_DOUBLE_LINE2_IN, DEF_DOUBLE_LINE2_DIST },\ -/* 8*/ { DEF_DOUBLE_LINE3_OUT, DEF_DOUBLE_LINE3_IN, DEF_DOUBLE_LINE3_DIST },\ -/* 9*/ { DEF_DOUBLE_LINE4_OUT, DEF_DOUBLE_LINE4_IN, DEF_DOUBLE_LINE4_DIST },\ -/*10*/ { DEF_DOUBLE_LINE5_OUT, DEF_DOUBLE_LINE5_IN, DEF_DOUBLE_LINE5_DIST },\ -/*11*/ { DEF_DOUBLE_LINE6_OUT, DEF_DOUBLE_LINE6_IN, DEF_DOUBLE_LINE6_DIST },\ -/*12*/ { DEF_DOUBLE_LINE7_OUT, DEF_DOUBLE_LINE7_IN, DEF_DOUBLE_LINE7_DIST },\ -/*13*/ { DEF_DOUBLE_LINE8_OUT, DEF_DOUBLE_LINE8_IN, DEF_DOUBLE_LINE8_DIST },\ -/*14*/ { DEF_DOUBLE_LINE9_OUT, DEF_DOUBLE_LINE9_IN, DEF_DOUBLE_LINE9_DIST },\ -/*15*/ { DEF_DOUBLE_LINE10_OUT,DEF_DOUBLE_LINE10_IN,DEF_DOUBLE_LINE10_DIST} \ +#define WW8_DECL_LINETAB_ARRAY \ + static WW8_BordersSO __READONLY_DATA nLineTabVer8[] = \ + { \ +/* 0*/ { DEF_LINE_WIDTH_0, 0, 0 }, \ +/* 1*/ { DEF_LINE_WIDTH_1, 0, 0 }, \ +/* 2*/ { DEF_LINE_WIDTH_2, 0, 0 }, \ +/* 3*/ { DEF_LINE_WIDTH_3, 0, 0 }, \ +/* 4*/ { DEF_LINE_WIDTH_4, 0, 0 }, \ +/* 5*/ { DEF_DOUBLE_LINE0_OUT, DEF_DOUBLE_LINE0_IN, DEF_DOUBLE_LINE0_DIST },\ +/* 6*/ { DEF_DOUBLE_LINE1_OUT, DEF_DOUBLE_LINE1_IN, DEF_DOUBLE_LINE1_DIST },\ +/* 7*/ { DEF_DOUBLE_LINE2_OUT, DEF_DOUBLE_LINE2_IN, DEF_DOUBLE_LINE2_DIST },\ +/* 8*/ { DEF_DOUBLE_LINE3_OUT, DEF_DOUBLE_LINE3_IN, DEF_DOUBLE_LINE3_DIST },\ +/* 9*/ { DEF_DOUBLE_LINE4_OUT, DEF_DOUBLE_LINE4_IN, DEF_DOUBLE_LINE4_DIST },\ +/*10*/ { DEF_DOUBLE_LINE5_OUT, DEF_DOUBLE_LINE5_IN, DEF_DOUBLE_LINE5_DIST },\ +/*11*/ { DEF_DOUBLE_LINE6_OUT, DEF_DOUBLE_LINE6_IN, DEF_DOUBLE_LINE6_DIST },\ +/*12*/ { DEF_DOUBLE_LINE7_OUT, DEF_DOUBLE_LINE7_IN, DEF_DOUBLE_LINE7_DIST },\ +/*13*/ { DEF_DOUBLE_LINE8_OUT, DEF_DOUBLE_LINE8_IN, DEF_DOUBLE_LINE8_DIST },\ +/*14*/ { DEF_DOUBLE_LINE9_OUT, DEF_DOUBLE_LINE9_IN, DEF_DOUBLE_LINE9_DIST },\ +/*15*/ { DEF_DOUBLE_LINE10_OUT,DEF_DOUBLE_LINE10_IN,DEF_DOUBLE_LINE10_DIST} \ }; -#define WW8_DECL_LINETAB_OFS_DOUBLE 5 // Beginn des DOUBLE_LINE Abschnitts in meiner Liste +#define WW8_DECL_LINETAB_OFS_DOUBLE 5 // Beginn des DOUBLE_LINE Abschnitts in meiner Liste -struct WW8_XCHAR // Hilfs-Konstrukt fuer WW8_DOPTYPOGRAPHY +struct WW8_XCHAR // Hilfs-Konstrukt fuer WW8_DOPTYPOGRAPHY { sal_Char A; sal_Char B; }; struct WW8_DOPTYPOGRAPHY -{ /* +{ /* Document Typography Info (DOPTYPOGRAPHY) These options are Far East only, and are accessible through the Typography tab of the Tools/Options dialog. @@ -302,21 +302,21 @@ struct WW8_DOPTYPOGRAPHY - short fKerningPunct : 1; // true if we're kerning punctuation - short iJustification : 2; // Kinsoku method of justification: - // 0 = always expand - // 1 = compress punctuation - // 2 = compress punctuation and kana. - short iLevelOfKinsoku: 2; // Level of Kinsoku: - // 0 = Level 1 - // 1 = Level 2 - // 2 = Custom - short f2on1 : 1; // 2-page-on-1 feature is turned on. - short :10; // reserved - short cchFollowingPunct; // length of rgxchFPunct - short cchLeadingPunct; // length of rgxchLPunct + short fKerningPunct : 1; // true if we're kerning punctuation + short iJustification : 2; // Kinsoku method of justification: + // 0 = always expand + // 1 = compress punctuation + // 2 = compress punctuation and kana. + short iLevelOfKinsoku: 2; // Level of Kinsoku: + // 0 = Level 1 + // 1 = Level 2 + // 2 = Custom + short f2on1 : 1; // 2-page-on-1 feature is turned on. + short :10; // reserved + short cchFollowingPunct; // length of rgxchFPunct + short cchLeadingPunct; // length of rgxchLPunct - WW8_XCHAR rgxchFPunct[101]; // array of characters that should + WW8_XCHAR rgxchFPunct[101]; // array of characters that should // never appear at the start of a line WW8_XCHAR rgxchLPunct[51]; // array of characters that should // never appear at the end of a line @@ -324,10 +324,10 @@ struct WW8_DOPTYPOGRAPHY struct WW8_DOGRID { - short xaGrid; // x-coord of the upper left-hand corner of the grid - short yaGrid; // y-coord of the upper left-hand corner of the grid - short dxaGrid; // width of each grid square - short dyaGrid; // height of each grid square + short xaGrid; // x-coord of the upper left-hand corner of the grid + short yaGrid; // y-coord of the upper left-hand corner of the grid + short dxaGrid; // width of each grid square + short dyaGrid; // height of each grid square @@ -339,164 +339,164 @@ struct WW8_DOGRID - short dyGridDisplay:7; // the number of grid squares (in the y direction) + short dyGridDisplay:7; // the number of grid squares (in the y direction) // between each gridline drawn on the screen. 0 means // don't display any gridlines in the y direction. - short fTurnItOff :1; // suppress display of gridlines - short dxGridDisplay:7; // the number of grid squares (in the x direction) + short fTurnItOff :1; // suppress display of gridlines + short dxGridDisplay:7; // the number of grid squares (in the x direction) // between each gridline drawn on the screen. 0 means // don't display any gridlines in the y direction. - short fFollowMargins:1; // if true, the grid will start at the left and top + short fFollowMargins:1; // if true, the grid will start at the left and top // margins and ignore xaGrid and yaGrid. }; struct WW8_PIC { - INT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. - UINT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). + INT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. + UINT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). struct { - INT16 mm; // 0x6 int - INT16 xExt; // 0x8 int - INT16 yExt; // 0xa int - INT16 hMF; // 0xc int + INT16 mm; // 0x6 int + INT16 xExt; // 0x8 int + INT16 yExt; // 0xa int + INT16 hMF; // 0xc int }MFP; -// BYTE bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. - BYTE rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin - // and extents when metafile is stored -- ignored if 0 - INT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. - INT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. - UINT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. - UINT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. - INT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. - INT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. - INT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. - INT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. - INT16 brcl : 4; // 000F Obsolete, superseded by brcTop, etc. In - INT16 fFrameEmpty : 1; // 0010 picture consists of a single frame - INT16 fBitmap : 1; // 0020 ==1, when picture is just a bitmap - INT16 fDrawHatch : 1; // 0040 ==1, when picture is an active OLE object - INT16 fError : 1; // 0080 ==1, when picture is just an error message - INT16 bpp : 8; // FF00 bits per pixel, 0 = unknown +// BYTE bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. + BYTE rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin + // and extents when metafile is stored -- ignored if 0 + INT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. + INT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. + UINT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. + UINT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. + INT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. + INT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. + INT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. + INT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. + INT16 brcl : 4; // 000F Obsolete, superseded by brcTop, etc. In + INT16 fFrameEmpty : 1; // 0010 picture consists of a single frame + INT16 fBitmap : 1; // 0020 ==1, when picture is just a bitmap + INT16 fDrawHatch : 1; // 0040 ==1, when picture is an active OLE object + INT16 fError : 1; // 0080 ==1, when picture is just an error message + INT16 bpp : 8; // FF00 bits per pixel, 0 = unknown WW8_BRC rgbrc[4]; -// BRC brcTop; // 0x2e specification for border above picture -// BRC brcLeft; // 0x30 specification for border to the left -// BRC brcBottom; // 0x32 specification for border below picture -// BRC brcRight; // 0x34 specification for border to the right - INT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin - INT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin -// BYTE rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. +// BRC brcTop; // 0x2e specification for border above picture +// BRC brcLeft; // 0x30 specification for border to the left +// BRC brcBottom; // 0x32 specification for border below picture +// BRC brcRight; // 0x34 specification for border to the right + INT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin + INT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin +// BYTE rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. }; struct WW8_PIC_SHADOW { - SVBT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. - SVBT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). + SVBT32 lcb; // 0x0 number of bytes in the PIC structure plus size of following picture data which may be a Window's metafile, a bitmap, or the filename of a TIFF file. + SVBT16 cbHeader; // 0x4 number of bytes in the PIC (to allow for future expansion). struct { - SVBT16 mm; // 0x6 int - SVBT16 xExt; // 0x8 int - SVBT16 yExt; // 0xa int - SVBT16 hMF; // 0xc int + SVBT16 mm; // 0x6 int + SVBT16 xExt; // 0x8 int + SVBT16 yExt; // 0xa int + SVBT16 hMF; // 0xc int }MFP; -// SVBT8 bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. - SVBT8 rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin - // and extents when metafile is stored -- ignored if 0 - SVBT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. - SVBT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. - SVBT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. - SVBT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. - SVBT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. - SVBT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. - SVBT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. - SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. +// SVBT8 bm[14]; // 0xe BITMAP(14 bytes) Window's bitmap structure when PIC describes a BITMAP. + SVBT8 rcWinMF[14]; // 0xe rc (rectangle - 8 bytes) rect for window origin + // and extents when metafile is stored -- ignored if 0 + SVBT16 dxaGoal; // 0x1c horizontal measurement in twips of the rectangle the picture should be imaged within. + SVBT16 dyaGoal; // 0x1e vertical measurement in twips of the rectangle the picture should be imaged within. + SVBT16 mx; // 0x20 horizontal scaling factor supplied by user in .1% units. + SVBT16 my; // 0x22 vertical scaling factor supplied by user in .1% units. + SVBT16 dxaCropLeft; // 0x24 the amount the picture has been cropped on the left in twips. + SVBT16 dyaCropTop; // 0x26 the amount the picture has been cropped on the top in twips. + SVBT16 dxaCropRight; // 0x28 the amount the picture has been cropped on the right in twips. + SVBT16 dyaCropBottom;// 0x2a the amount the picture has been cropped on the bottom in twips. SVBT8 aBits1; //0x2c SVBT8 aBits2; WW8_BRC rgbrc[4]; -// BRC brcTop; // 0x2e specification for border above picture -// BRC brcLeft; // 0x30 specification for border to the left -// BRC brcBottom; // 0x32 specification for border below picture -// BRC brcRight; // 0x34 specification for border to the right - SVBT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin - SVBT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin -// SVBT8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. +// BRC brcTop; // 0x2e specification for border above picture +// BRC brcLeft; // 0x30 specification for border to the left +// BRC brcBottom; // 0x32 specification for border below picture +// BRC brcRight; // 0x34 specification for border to the right + SVBT16 dxaOrigin; // 0x36 horizontal offset of hand annotation origin + SVBT16 dyaOrigin; // 0x38 vertical offset of hand annotation origin +// SVBT8 rgb[]; // 0x3a variable array of bytes containing Window's metafile, bitmap or TIFF file filename. }; struct WW8_TBD { SVBT8 aBits1; -// BYTE jc : 3; // 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar -// BYTE tlc : 3; // 0x38 tab leader code: 0=no leader, 1=dotted leader, +// BYTE jc : 3; // 0x07 justification code: 0=left tab, 1=centered tab, 2=right tab, 3=decimal tab, 4=bar +// BYTE tlc : 3; // 0x38 tab leader code: 0=no leader, 1=dotted leader, // 2=hyphenated leader, 3=single line leader, 4=heavy line leader -// * int :2 C0 reserved +// * int :2 C0 reserved }; -struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend dem Ver8-Format) +struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend dem Ver8-Format) { - BOOL bFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. - BOOL bMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell. - BOOL bVertical : 1;// set to 1 when cell has vertical text flow - BOOL bBackward : 1;// for a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0. - BOOL bRotateFont : 1;// set to 1 when cell has rotated characters (i.e. uses @font) - BOOL bVertMerge : 1;// set to 1 when cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3). - BOOL bVertRestart : 1;// set to 1 when the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty. - BYTE nVertAlign : 2;// specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary): - // 0 top - // 1 center - // 2 bottom - UINT16 fUnused : 7;// reserved - nicht loeschen: macht das UINT16 voll !! + BOOL bFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. + BOOL bMerged : 1;// 0002 set to 1 when cell has been merged with preceding cell. + BOOL bVertical : 1;// set to 1 when cell has vertical text flow + BOOL bBackward : 1;// for a vertical table cell, text flow is bottom to top when 1 and is bottom to top when 0. + BOOL bRotateFont : 1;// set to 1 when cell has rotated characters (i.e. uses @font) + BOOL bVertMerge : 1;// set to 1 when cell is vertically merged with the cell(s) above and/or below. When cells are vertically merged, the display area of the merged cells are consolidated. The consolidated area is used to display the contents of the first vertically merged cell (the cell with fVertRestart set to 1), and all other vertically merged cells (those with fVertRestart set to 0) must be empty. Cells can only be merged vertically if their left and right boundaries are (nearly) identical (i.e. if corresponding entries in rgdxaCenter of the table rows differ by at most 3). + BOOL bVertRestart : 1;// set to 1 when the cell is the first of a set of vertically merged cells. The contents of a cell with fVertStart set to 1 are displayed in the consolidated area belonging to the entire set of vertically merged cells. Vertically merged cells with fVertRestart set to 0 must be empty. + BYTE nVertAlign : 2;// specifies the alignment of the cell contents relative to text flow (e.g. in a cell with bottom to top text flow and bottom vertical alignment, the text is shifted horizontally to match the cell's right boundary): + // 0 top + // 1 center + // 2 bottom + UINT16 fUnused : 7;// reserved - nicht loeschen: macht das UINT16 voll !! - WW8_BRC rgbrc[4]; // border codes + WW8_BRC rgbrc[4]; // border codes //notational convenience for referring to brcTop, brcLeft, etc fields. -// BRC brcTop; // specification of the top border of a table cell -// BRC brcLeft; // specification of left border of table row -// BRC brcBottom; // specification of bottom border of table row -// BRC brcRight; // specification of right border of table row. +// BRC brcTop; // specification of the top border of a table cell +// BRC brcLeft; // specification of left border of table row +// BRC brcBottom; // specification of bottom border of table row +// BRC brcRight; // specification of right border of table row. }; // cbTC (count of bytes of a TC) is 18(decimal), 12(hex). -struct WW8_TCellVer6 // wird aus der Datei gelesen +struct WW8_TCellVer6 // wird aus der Datei gelesen { SVBT8 aBits1Ver6; SVBT8 aBits2Ver6; -// UINT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. -// UINT16 fMerged : 1; // 0002 set to 1 when cell has been merged with preceding cell. -// UINT16 fUnused : 14; // FFFC reserved +// UINT16 fFirstMerged : 1;// 0001 set to 1 when cell is first cell of a range of cells that have been merged. +// UINT16 fMerged : 1; // 0002 set to 1 when cell has been merged with preceding cell. +// UINT16 fUnused : 14; // FFFC reserved WW8_BRCVer6 rgbrcVer6[4]; // notational convenience for referring to brcTop, brcLeft, etc fields: -// BRC brcTop; // specification of the top border of a table cell -// BRC brcLeft; // specification of left border of table row -// BRC brcBottom; // specification of bottom border of table row -// BRC brcRight; // specification of right border of table row. +// BRC brcTop; // specification of the top border of a table cell +// BRC brcLeft; // specification of left border of table row +// BRC brcBottom; // specification of bottom border of table row +// BRC brcRight; // specification of right border of table row. }; // cbTC (count of bytes of a TC) is 10(decimal), A(hex). -struct WW8_TCellVer8 // wird aus der Datei gelesen +struct WW8_TCellVer8 // wird aus der Datei gelesen { - SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell - SVBT16 aUnused; // reserve - WW8_BRC rgbrcVer8[4]; // Dokumentation siehe oben unter WW8_TCell + SVBT16 aBits1Ver8; // Dokumentation siehe oben unter WW8_TCell + SVBT16 aUnused; // reserve + WW8_BRC rgbrcVer8[4]; // Dokumentation siehe oben unter WW8_TCell }; // cbTC (count of bytes of a TC) is 20(decimal), 14(hex). -struct WW8_SHD // struct SHD fehlt in der Beschreibung +struct WW8_SHD // struct SHD fehlt in der Beschreibung { private: UINT16 aBits; -// UINT16 nFore : 5; // 0x001f ForegroundColor -// UINT16 nBack : 5; // 0x03e0 BackgroundColor -// UINT16 nStyle : 5; // 0x7c00 Percentage and Style -// UINT16 nDontKnow : 1; // 0x8000 ??? ab Ver8: ebenfalls fuer Style +// UINT16 nFore : 5; // 0x001f ForegroundColor +// UINT16 nBack : 5; // 0x03e0 BackgroundColor +// UINT16 nStyle : 5; // 0x7c00 Percentage and Style +// UINT16 nDontKnow : 1; // 0x8000 ??? ab Ver8: ebenfalls fuer Style public: WW8_SHD(){ aBits = 0; } - BYTE GetFore() const { return (BYTE)( aBits & 0x1f); } - BYTE GetBack() const { return (BYTE)((aBits >> 5 ) & 0x1f); } - BYTE GetStyle(BOOL bVer67) const { return (BYTE)((aBits >> 10) & ( bVer67?0x1f:0x3f ) ); } + BYTE GetFore() const { return (BYTE)( aBits & 0x1f); } + BYTE GetBack() const { return (BYTE)((aBits >> 5 ) & 0x1f); } + BYTE GetStyle(BOOL bVer67) const { return (BYTE)((aBits >> 10) & ( bVer67?0x1f:0x3f ) ); } - UINT16 GetValue() const { return aBits; } + UINT16 GetValue() const { return aBits; } void SetValue( UINT16 nVal ){ aBits = nVal; } void SetWWValue( SVBT16 nVal ){ aBits = (UINT16)SVBT16ToShort( nVal ); } @@ -511,135 +511,135 @@ public: struct WW8_ANLV { - SVBT8 nfc; // 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman - // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal - SVBT8 cbTextBefore; // 1 offset into anld.rgch limit of prefix text - SVBT8 cbTextAfter; // 2 + SVBT8 nfc; // 0 number format code, 0=Arabic, 1=Upper case Roman, 2=Lower case Roman + // 3=Upper case Letter, 4=Lower case letter, 5=Ordinal + SVBT8 cbTextBefore; // 1 offset into anld.rgch limit of prefix text + SVBT8 cbTextAfter; // 2 SVBT8 aBits1; -// BYTE jc : 2; // 3 : 0x03 justification code, 0=left, 1=center, 2=right, 3=left and right justify -// BYTE fPrev : 1; // 0x04 when ==1, include previous levels -// BYTE fHang : 1; // 0x08 when ==1, number will be displayed using a hanging indent -// BYTE fSetBold : 1; // 0x10 when ==1, boldness of number will be determined by anld.fBold. -// BYTE fSetItalic : 1;// 0x20 when ==1, italicness of number will be determined by anld.fItalic -// BYTE fSetSmallCaps : 1;// 0x40 when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not. -// BYTE fSetCaps : 1; // 0x80 when ==1, anld.fCaps will determine whether number will be displayed capitalized or not +// BYTE jc : 2; // 3 : 0x03 justification code, 0=left, 1=center, 2=right, 3=left and right justify +// BYTE fPrev : 1; // 0x04 when ==1, include previous levels +// BYTE fHang : 1; // 0x08 when ==1, number will be displayed using a hanging indent +// BYTE fSetBold : 1; // 0x10 when ==1, boldness of number will be determined by anld.fBold. +// BYTE fSetItalic : 1;// 0x20 when ==1, italicness of number will be determined by anld.fItalic +// BYTE fSetSmallCaps : 1;// 0x40 when ==1, anld.fSmallCaps will determine whether number will be displayed in small caps or not. +// BYTE fSetCaps : 1; // 0x80 when ==1, anld.fCaps will determine whether number will be displayed capitalized or not SVBT8 aBits2; -// BYTE fSetStrike : 1;// 4 : 0x01 when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not. -// BYTE fSetKul : 1; // 0x02 when ==1, anld.kul will determine the underlining state of the autonumber. -// BYTE fPrevSpace : 1;// 0x04 when ==1, autonumber will be displayed with a single prefixing space character -// BYTE fBold : 1; // 0x08 determines boldness of autonumber when anld.fSetBold == 1. -// BYTE fItalic : 1; // 0x10 determines italicness of autonumber when anld.fSetItalic == 1. -// BYTE fSmallCaps : 1;// 0x20 determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1. -// BYTE fCaps : 1; // 0x40 determines whether autonumber will be displayed using caps when anld.fSetCaps == 1. -// BYTE fStrike : 1; // 0x80 determines whether autonumber will be displayed using caps when anld.fSetStrike == 1. +// BYTE fSetStrike : 1;// 4 : 0x01 when ==1, anld.fStrike will determine whether the number will be displayed using strikethrough or not. +// BYTE fSetKul : 1; // 0x02 when ==1, anld.kul will determine the underlining state of the autonumber. +// BYTE fPrevSpace : 1;// 0x04 when ==1, autonumber will be displayed with a single prefixing space character +// BYTE fBold : 1; // 0x08 determines boldness of autonumber when anld.fSetBold == 1. +// BYTE fItalic : 1; // 0x10 determines italicness of autonumber when anld.fSetItalic == 1. +// BYTE fSmallCaps : 1;// 0x20 determines whether autonumber will be displayed using small caps when anld.fSetSmallCaps == 1. +// BYTE fCaps : 1; // 0x40 determines whether autonumber will be displayed using caps when anld.fSetCaps == 1. +// BYTE fStrike : 1; // 0x80 determines whether autonumber will be displayed using caps when anld.fSetStrike == 1. SVBT8 aBits3; -// BYTE kul : 3; // 5 : 0x07 determines whether autonumber will be displayed with underlining when anld.fSetKul == 1. -// BYTE ico : 5; // 0xF1 color of autonumber - SVBT16 ftc; // 6 font code of autonumber - SVBT16 hps; // 8 font half point size (or 0=auto) - SVBT16 iStartAt; // 0x0a starting value (0 to 65535) - SVBT16 dxaIndent; // 0x0c *short?* *USHORT?* width of prefix text (same as indent) - SVBT16 dxaSpace; // 0x0e minimum space between number and paragraph +// BYTE kul : 3; // 5 : 0x07 determines whether autonumber will be displayed with underlining when anld.fSetKul == 1. +// BYTE ico : 5; // 0xF1 color of autonumber + SVBT16 ftc; // 6 font code of autonumber + SVBT16 hps; // 8 font half point size (or 0=auto) + SVBT16 iStartAt; // 0x0a starting value (0 to 65535) + SVBT16 dxaIndent; // 0x0c *short?* *USHORT?* width of prefix text (same as indent) + SVBT16 dxaSpace; // 0x0e minimum space between number and paragraph }; // *cbANLV (count of bytes of ANLV) is 16 (decimal), 10(hex). struct WW8_ANLD { - WW8_ANLV eAnlv; // 0 - SVBT8 fNumber1; // 0x10 number only 1 item per table cell - SVBT8 fNumberAcross; // 0x11 number across cells in table rows(instead of down) - SVBT8 fRestartHdn; // 0x12 restart heading number on section boundary - SVBT8 fSpareX; // 0x13 unused( should be 0) - BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber + WW8_ANLV eAnlv; // 0 + SVBT8 fNumber1; // 0x10 number only 1 item per table cell + SVBT8 fNumberAcross; // 0x11 number across cells in table rows(instead of down) + SVBT8 fRestartHdn; // 0x12 restart heading number on section boundary + SVBT8 fSpareX; // 0x13 unused( should be 0) + BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber }; struct WW8_OLST { - WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) - SVBT8 fRestartHdr; // 0x90 when ==1, restart heading on section break - SVBT8 fSpareOlst2; // 0x91 reserved - SVBT8 fSpareOlst3; // 0x92 reserved - SVBT8 fSpareOlst4; // 0x93 reserved - BYTE rgch[64]; // 0x94 array of 64 chars text before/after number + WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) + SVBT8 fRestartHdr; // 0x90 when ==1, restart heading on section break + SVBT8 fSpareOlst2; // 0x91 reserved + SVBT8 fSpareOlst3; // 0x92 reserved + SVBT8 fSpareOlst4; // 0x93 reserved + BYTE rgch[64]; // 0x94 array of 64 chars text before/after number }; // cbOLST is 212(decimal), D4(hex). struct WW8_FDOA { - SVBT32 fc; // 0 FC pointing to drawing object data - SVBT16 ctxbx; // 4 count of textboxes in the drawing object + SVBT32 fc; // 0 FC pointing to drawing object data + SVBT16 ctxbx; // 4 count of textboxes in the drawing object }; struct WW8_DO { - SVBT16 dok; // 0 Drawn Object Kind, currently this is always 0 - SVBT16 cb; // 2 size (count of bytes) of the entire DO - SVBT8 bx; // 4 x position relative to anchor CP - SVBT8 by; // 5 y position relative to anchor CP - SVBT16 dhgt; // 6 height of DO + SVBT16 dok; // 0 Drawn Object Kind, currently this is always 0 + SVBT16 cb; // 2 size (count of bytes) of the entire DO + SVBT8 bx; // 4 x position relative to anchor CP + SVBT8 by; // 5 y position relative to anchor CP + SVBT16 dhgt; // 6 height of DO SVBT16 aBits1; -// UINT16 fAnchorLock : 1; // 8 1 if the DO anchor is locked -// BYTE[] rgdp; // 0xa variable length array of drawing primitives +// UINT16 fAnchorLock : 1; // 8 1 if the DO anchor is locked +// BYTE[] rgdp; // 0xa variable length array of drawing primitives }; struct WW8_DPHEAD { - SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu - // 0=start of grouping, 1=line, 2=textbox, 3=rectangle, - // 4=arc, 5=elipse, 6=polyline, 7=callout textbox, - // 8=end of grouping, 9=sample primitve holding default values - SVBT16 cb; // 2 size (count of bytes) of this DP - SVBT16 xa; // 4 These 2 points describe the rectangle - SVBT16 ya; // 6 enclosing this DP relative to the origin of - SVBT16 dxa; // 8 the DO - SVBT16 dya; // 0xa + SVBT16 dpk; // 0 Drawn Primitive Kind REVIEW davebu + // 0=start of grouping, 1=line, 2=textbox, 3=rectangle, + // 4=arc, 5=elipse, 6=polyline, 7=callout textbox, + // 8=end of grouping, 9=sample primitve holding default values + SVBT16 cb; // 2 size (count of bytes) of this DP + SVBT16 xa; // 4 These 2 points describe the rectangle + SVBT16 ya; // 6 enclosing this DP relative to the origin of + SVBT16 dxa; // 8 the DO + SVBT16 dya; // 0xa }; struct WW8_DP_LINETYPE { - SVBT32 lnpc; // LiNe Property Color -- RGB color value - SVBT16 lnpw; // line property weight in twips - SVBT16 lnps; // line property style : 0=Solid, 1=Dashed + SVBT32 lnpc; // LiNe Property Color -- RGB color value + SVBT16 lnpw; // line property weight in twips + SVBT16 lnps; // line property style : 0=Solid, 1=Dashed // 2=Dotted, 3=Dash Dot, 4=Dash Dot Dot, 5=Hollow }; -struct WW8_DP_SHADOW // Schattierung! +struct WW8_DP_SHADOW // Schattierung! { - SVBT16 shdwpi; // Shadow Property Intensity - SVBT16 xaOffset; // x offset of shadow - SVBT16 yaOffset; // y offset of shadow + SVBT16 shdwpi; // Shadow Property Intensity + SVBT16 xaOffset; // x offset of shadow + SVBT16 yaOffset; // y offset of shadow }; struct WW8_DP_FILL { - SVBT32 dlpcFg; // FiLl Property Color ForeGround -- RGB color value - SVBT32 dlpcBg; // Property Color BackGround -- RGB color value - SVBT16 flpp; // FiLl Property Pattern REVIEW davebu + SVBT32 dlpcFg; // FiLl Property Color ForeGround -- RGB color value + SVBT32 dlpcBg; // Property Color BackGround -- RGB color value + SVBT16 flpp; // FiLl Property Pattern REVIEW davebu }; struct WW8_DP_LINEEND { SVBT16 aStartBits; -// UINT16 eppsStart : 2; // Start EndPoint Property Style +// UINT16 eppsStart : 2; // Start EndPoint Property Style // 0=None, 1=Hollow, 2=Filled -// UINT16 eppwStart : 2; // Start EndPoint Property Weight -// UINT16 epplStart : 2; // Start EndPoint Property length -// UINT16 dummyStart : 10; // Alignment +// UINT16 eppwStart : 2; // Start EndPoint Property Weight +// UINT16 epplStart : 2; // Start EndPoint Property length +// UINT16 dummyStart : 10; // Alignment SVBT16 aEndBits; -// UINT16 eppsEnd : 2; // End EndPoint Property Style -// UINT16 eppwEnd : 2; // End EndPoint Property Weight -// UINT16 epplEnd : 2; // End EndPoint Property length -// UINT16 dummyEnd : 10; // Alignment +// UINT16 eppsEnd : 2; // End EndPoint Property Style +// UINT16 eppwEnd : 2; // End EndPoint Property Weight +// UINT16 epplEnd : 2; // End EndPoint Property length +// UINT16 dummyEnd : 10; // Alignment }; struct WW8_DP_LINE { -// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive - SVBT16 xaStart; // starting point for line - SVBT16 yaStart; // - SVBT16 xaEnd; // ending point for line +// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive + SVBT16 xaStart; // starting point for line + SVBT16 yaStart; // + SVBT16 xaEnd; // ending point for line SVBT16 yaEnd; WW8_DP_LINETYPE aLnt; WW8_DP_LINEEND aEpp; @@ -652,9 +652,9 @@ struct WW8_DP_TXTBOX WW8_DP_FILL aFill; WW8_DP_SHADOW aShd; SVBT16 aBits1; -// UINT16 fRoundCorners : 1; //0x24 0001 1 if the textbox has rounded corners -// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu - SVBT16 dzaInternalMargin; // 0x26 REVIEW davebu +// UINT16 fRoundCorners : 1; //0x24 0001 1 if the textbox has rounded corners +// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu + SVBT16 dzaInternalMargin; // 0x26 REVIEW davebu }; struct WW8_DP_RECT @@ -663,8 +663,8 @@ struct WW8_DP_RECT WW8_DP_FILL aFill; WW8_DP_SHADOW aShd; SVBT16 aBits1; -// UINT16 fRoundCorners : 1; // 0x24 0001 1 if the textbox has rounded corners -// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu +// UINT16 fRoundCorners : 1; // 0x24 0001 1 if the textbox has rounded corners +// UINT16 zaShape : 15; // 0x24 000e REVIEW davebu }; struct WW8_DP_ARC @@ -672,10 +672,10 @@ struct WW8_DP_ARC WW8_DP_LINETYPE aLnt; WW8_DP_FILL aFill; WW8_DP_SHADOW aShd; - SVBT8 fLeft; // 0x24 00ff REVIEW davebu - SVBT8 fUp; // 0x24 ff00 REVIEW davebu -// UINT16 fLeft : 8; // 0x24 00ff REVIEW davebu -// UINT16 fUp : 8; // 0x24 ff00 REVIEW davebu + SVBT8 fLeft; // 0x24 00ff REVIEW davebu + SVBT8 fUp; // 0x24 ff00 REVIEW davebu +// UINT16 fLeft : 8; // 0x24 00ff REVIEW davebu +// UINT16 fUp : 8; // 0x24 ff00 REVIEW davebu }; struct WW8_DP_ELIPSE @@ -692,25 +692,25 @@ struct WW8_DP_POLYLINE WW8_DP_LINEEND aEpp; WW8_DP_SHADOW aShd; SVBT16 aBits1; -// UINT16 fPolygon : 1; // 0x28 0001 1 if this is a polygon -// UINT16 cpt : 15; // 0x28 00fe count of points -// short xaFirst; // 0x2a These are the endpoints of the first line. -// short yaFirst; // 0x2c -// short xaEnd; // 0x2e -// short yaEnd; // 0x30 -// short rgpta[]; // 0x32 An array of xa,ya pairs for the remaining points +// UINT16 fPolygon : 1; // 0x28 0001 1 if this is a polygon +// UINT16 cpt : 15; // 0x28 00fe count of points +// short xaFirst; // 0x2a These are the endpoints of the first line. +// short yaFirst; // 0x2c +// short xaEnd; // 0x2e +// short yaEnd; // 0x30 +// short rgpta[]; // 0x32 An array of xa,ya pairs for the remaining points }; struct WW8_DP_CALLOUT_TXTBOX { - SVBT16 flags; // 0x0c REVIEW davebu flags - SVBT16 dzaOffset; // 0x0e REVIEW davebu - SVBT16 dzaDescent; // 0x10 REVIEW davebu - SVBT16 dzaLength; // 0x12 REVIEW davebu - WW8_DPHEAD dpheadTxbx; // 0x14 DPHEAD for a textbox - WW8_DP_TXTBOX dptxbx; // 0x20 DP for a textbox - WW8_DPHEAD dpheadPolyLine; // 0x4c DPHEAD for a Polyline - WW8_DP_POLYLINE dpPolyLine; // 0x48 DP for a polyline + SVBT16 flags; // 0x0c REVIEW davebu flags + SVBT16 dzaOffset; // 0x0e REVIEW davebu + SVBT16 dzaDescent; // 0x10 REVIEW davebu + SVBT16 dzaLength; // 0x12 REVIEW davebu + WW8_DPHEAD dpheadTxbx; // 0x14 DPHEAD for a textbox + WW8_DP_TXTBOX dptxbx; // 0x20 DP for a textbox + WW8_DPHEAD dpheadPolyLine; // 0x4c DPHEAD for a Polyline + WW8_DP_POLYLINE dpPolyLine; // 0x48 DP for a polyline }; struct WW8_DP_DEFAULTS @@ -719,29 +719,29 @@ struct WW8_DP_DEFAULTS WW8_DP_FILL aFill; WW8_DP_LINEEND aEpp; WW8_DP_SHADOW aShd; - SVBT16 dzaOffset; // 0x2a REVIEW davebu - SVBT16 dzaDescent; // 0x2c REVIEW davebu - SVBT16 dzaLength; // 0x2e REVIEW davebu + SVBT16 dzaOffset; // 0x2a REVIEW davebu + SVBT16 dzaDescent; // 0x2c REVIEW davebu + SVBT16 dzaLength; // 0x2e REVIEW davebu SVBT16 aBits3; -// UINT16 fRoundCorners : 1; // 0x30 0001 1 if the textbox has rounded corners -// UINT16 zaShape : 15; // 0x30 000fe REVIEW davebu - SVBT16 dzaInternalMargin; // 0x32 REVIEW davebu +// UINT16 fRoundCorners : 1; // 0x30 0001 1 if the textbox has rounded corners +// UINT16 zaShape : 15; // 0x30 000fe REVIEW davebu + SVBT16 dzaInternalMargin; // 0x32 REVIEW davebu }; struct WW8_PCD { SVBT8 aBits1; -// BYTE fNoParaLast : 1; // when 1, means that piece contains no end of paragraph marks. -// BYTE fPaphNil : 1; // used internally by Word -// BYTE fCopied : 1; // used internally by Word -// * int :5 - SVBT8 aBits2; // fn int:8, used internally by Word - SVBT32 fc; // file offset of beginning of piece. The size of the +// BYTE fNoParaLast : 1; // when 1, means that piece contains no end of paragraph marks. +// BYTE fPaphNil : 1; // used internally by Word +// BYTE fCopied : 1; // used internally by Word +// * int :5 + SVBT8 aBits2; // fn int:8, used internally by Word + SVBT32 fc; // file offset of beginning of piece. The size of the // ithpiece can be determined by subtracting rgcp[i] of // the containing plcfpcd from its rgcp[i+1]. - SVBT16 prm; // PRM contains either a single sprm or else an index number + SVBT16 prm; // PRM contains either a single sprm or else an index number // of the grpprl which contains the sprms that modify the // properties of the piece. }; @@ -749,21 +749,21 @@ struct WW8_PCD struct WW8_PHE_Base { BYTE aBits1; // -// 0 0 fSpare int :1 0001 reserved -// fUnk int :1 0002 phe entry is invalid -// when == 1 -// fDiffLines int :1 0004 when 1, total -// height of paragraph is known but lines in -// paragraph have different heights. -// * int :5 00F8 reserved - BYTE nlMac; // when fDiffLines is 0 is number of lines in -// // paragraph - SVBT16 dxaCol; // width of lines in paragraph +// 0 0 fSpare int :1 0001 reserved +// fUnk int :1 0002 phe entry is invalid +// when == 1 +// fDiffLines int :1 0004 when 1, total +// height of paragraph is known but lines in +// paragraph have different heights. +// * int :5 00F8 reserved + BYTE nlMac; // when fDiffLines is 0 is number of lines in +// // paragraph + SVBT16 dxaCol; // width of lines in paragraph SVBT16 dyl; -// 4 4 dylLine int when fDiffLines is 0, -// is height of every line in paragraph.in pixels -// 4 4 dylHeight uns when fDiffLines is 1, -// is the total height in pixels of the paragraph +// 4 4 dylLine int when fDiffLines is 0, +// is height of every line in paragraph.in pixels +// 4 4 dylHeight uns when fDiffLines is 1, +// is the total height in pixels of the paragraph }; /* @@ -771,38 +771,38 @@ eigentlich muessten wir das jetzt in etwa *so* praezisieren: struct WW8_PHE_Ver6 : public WW8_PHE_Base { - // 6 Bytes gross + // 6 Bytes gross }; struct WW8_PHE_Ver6 : public WW8_PHE_Base { SVBT16 a; SVBT16 b; - SVBT16 c; // 12 Byte gross + SVBT16 c; // 12 Byte gross }; */ // AnnoTation Refernce Descriptor (ATRD) -struct WW8_ATRD // fuer die 8-Version +struct WW8_ATRD // fuer die 8-Version { - SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials + SVBT16 xstUsrInitl[ 10 ]; // pascal-style String holding initials // of annotation author - SVBT16 ibst; // index into GrpXstAtnOwners - SVBT16 ak; // not used - SVBT16 grfbmc; // not used - SVBT32 ITagBkmk; // when not -1, this tag identifies the + SVBT16 ibst; // index into GrpXstAtnOwners + SVBT16 ak; // not used + SVBT16 grfbmc; // not used + SVBT32 ITagBkmk; // when not -1, this tag identifies the // annotation bookmark that locates the // range of CPs in the main document which // this annotation references. }; -struct WW67_ATRD // fuer die 6/7-Version +struct WW67_ATRD // fuer die 6/7-Version { - sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials + sal_Char xstUsrInitl[ 10 ]; // pascal-style String holding initials // of annotation author - SVBT16 ibst; // index into GrpXstAtnOwners - SVBT16 ak; // not used - SVBT16 grfbmc; // not used - SVBT32 ITagBkmk; // when not -1, this tag identifies the + SVBT16 ibst; // index into GrpXstAtnOwners + SVBT16 ak; // not used + SVBT16 grfbmc; // not used + SVBT32 ITagBkmk; // when not -1, this tag identifies the // annotation bookmark that locates the // range of CPs in the main document which // this annotation references. diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx index 8df80add18f3..fa99b3a2811a 100644 --- a/sw/source/filter/ww8/fields.cxx +++ b/sw/source/filter/ww8/fields.cxx @@ -2,7 +2,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/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx index a491109c0b7d..b70f816a0949 100644 --- a/sw/source/filter/ww8/fields.hxx +++ b/sw/source/filter/ww8/fields.hxx @@ -2,7 +2,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 @@ -32,11 +32,11 @@ namespace ww { - enum eField + enum eField { eNONE = 0, eUNKNOWN = 1, - ePOSSIBLEBOOKMARK = 2, + ePOSSIBLEBOOKMARK = 2, eREF = 3, eXE = 4, eFOOTREF = 5, @@ -131,9 +131,9 @@ namespace ww eGREETINGLINE = 94, eSHAPE = 95 }; - + /** Find the English Field Name from a winword index - + See OpenOffice.org issue 12831 (http://www.openoffice.org/issues/show_bug.cgi?id=12831) and MS Knowledge Base article 268717 diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx index e089a15e1436..ff71be2369e5 100644 --- a/sw/source/filter/ww8/hash_wrap.hxx +++ b/sw/source/filter/ww8/hash_wrap.hxx @@ -2,7 +2,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/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index 10fd8bedae45..8506fff9d07a 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.hxx @@ -2,7 +2,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,7 +53,7 @@ namespace ww template<typename Ret, typename Param> Ret needed_cast(Param in) { /* - Massage a single argument and a ret value into two arguments to allow + Massage a single argument and a ret value into two arguments to allow a determination if the dest type is the same as the sourct type */ return checking_cast(in, Ret()); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0776a5db231d..ba53111c3e83 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2672,7 +2672,7 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace ) { if( m_rExport.bOutPageDescs ) { - + OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" ); if ( !m_rExport.GetCurItemSet() ) return; @@ -3201,15 +3201,15 @@ static OString WriteHex(OString sString) } void lcl_AppendSP( OStringBuffer& rBuffer, - const char cName[], - const ::rtl::OUString& rValue, + const char cName[], + const ::rtl::OUString& rValue, const RtfExport& rExport ) { rBuffer.append( "{" OOO_STRING_SVTOOLS_RTF_SP "{" ); // "{\sp{" rBuffer.append( OOO_STRING_SVTOOLS_RTF_SN " " );//" \sn " - rBuffer.append( cName ); //"PropName" + rBuffer.append( cName ); //"PropName" rBuffer.append( "}{" OOO_STRING_SVTOOLS_RTF_SV " " ); -// "}{ \sv " +// "}{ \sv " rBuffer.append( rExport.OutString( rValue, rExport.eCurrentEncoding ) ); rBuffer.append( "}}" ); } diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index ca837d9d97e4..d9696139fa6e 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -363,7 +363,7 @@ void RtfExport::DoFormText(const SwInputField* pFld ) if( sStatus.getLength() ) m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFOWNSTAT ); m_pAttrOutput->RunText().append( OOO_STRING_SVTOOLS_RTF_FFTYPETXT "0" ); - + if( sName.getLength() ) m_pAttrOutput->RunText().append( "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_FFNAME " ").append( OutString( sName, eDefaultEncoding )).append( "}" ); if( sHelp.getLength() ) @@ -548,7 +548,7 @@ void RtfExport::ExportDocument_Impl() if( pDoc->GetPageDescCnt() ) { //JP 06.04.99: Bug 64361 - Seeking the first SwFmtPageDesc. If - // no set, the default is valid + // no set, the default is valid const SwFmtPageDesc* pSttPgDsc = 0; { const SwNode& rSttNd = *pDoc->GetNodes()[ @@ -622,7 +622,7 @@ void RtfExport::ExportDocument_Impl() // All sections are unlocked by default Strm() << OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED; OutLong(1); - OutPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers + OutPageDescription( rPageDesc, FALSE, TRUE ); // Changed bCheckForFirstPage to TRUE so headers // following title page are correctly added - i13107 if( pSttPgDsc ) { @@ -647,24 +647,24 @@ void RtfExport::ExportDocument_Impl() switch( rFtnInfo.eNum ) { - case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break; - case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break; + case FTNNUM_PAGE: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTPG; break; + case FTNNUM_DOC: pOut = OOO_STRING_SVTOOLS_RTF_FTNRSTCONT; break; // case FTNNUM_CHAPTER: - default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_FTNRESTART; break; } Strm() << pOut; switch( rFtnInfo.aFmt.GetNumberingType() ) { case SVX_NUM_CHARS_LOWER_LETTER: - case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNALC; break; case SVX_NUM_CHARS_UPPER_LETTER: - case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break; - case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break; - case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break; - case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAUC; break; + case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRLC; break; + case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_FTNNRUC; break; + case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_FTNNCHI; break; // case SVX_NUM_ARABIC: - default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_FTNNAR; break; } Strm() << pOut; @@ -678,14 +678,14 @@ void RtfExport::ExportDocument_Impl() switch( rEndNoteInfo.aFmt.GetNumberingType() ) { case SVX_NUM_CHARS_LOWER_LETTER: - case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break; + case SVX_NUM_CHARS_LOWER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNALC; break; case SVX_NUM_CHARS_UPPER_LETTER: - case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break; - case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break; - case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break; - case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break; + case SVX_NUM_CHARS_UPPER_LETTER_N: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAUC; break; + case SVX_NUM_ROMAN_LOWER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRLC; break; + case SVX_NUM_ROMAN_UPPER: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNRUC; break; + case SVX_NUM_CHAR_SPECIAL: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNCHI; break; // case SVX_NUM_ARABIC: - default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break; + default: pOut = OOO_STRING_SVTOOLS_RTF_AFTNNAR; break; } Strm() << pOut; } diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index cdb75421951d..f2a97c8b5e12 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -475,7 +475,7 @@ sal_Int32 RtfSdrExport::StartShape() for(std::map<OString,OString>::reverse_iterator i = m_aShapeProps.rbegin(); i != m_aShapeProps.rend(); i++) lcl_AppendSP(m_rAttrOutput.RunText(), (*i).first, (*i).second ); - + lcl_AppendSP(m_rAttrOutput.RunText(), "wzDescription", RtfExport::OutString( m_pSdrObject->GetDescription(), m_rExport.eCurrentEncoding)); lcl_AppendSP(m_rAttrOutput.RunText(), "wzName", RtfExport::OutString( m_pSdrObject->GetTitle(), m_rExport.eCurrentEncoding)); diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx index 6147964e4d2f..93e62b9c3dff 100644 --- a/sw/source/filter/ww8/sortedarray.hxx +++ b/sw/source/filter/ww8/sortedarray.hxx @@ -2,7 +2,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/ww8/staticassert.hxx b/sw/source/filter/ww8/staticassert.hxx index 3d1a3c2bceea..d2a998cf7e14 100644 --- a/sw/source/filter/ww8/staticassert.hxx +++ b/sw/source/filter/ww8/staticassert.hxx @@ -2,7 +2,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/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index 517c412117a8..928c1408e144 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -2,7 +2,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 @@ -52,7 +52,7 @@ namespace const sal_Char **GetStiNames() throw() { - static const sal_Char *stiName[] = + static const sal_Char *stiName[] = { "Normal", "Heading 1", @@ -201,9 +201,9 @@ namespace ww return stiUser; else { - static sti aMapping[] = + static sti aMapping[] = { - stiNil, stiAtnRef, stiAtnText, stiToc8, stiToc7, stiToc6, + stiNil, stiAtnRef, stiAtnText, stiToc8, stiToc7, stiToc6, stiToc5, stiToc4, stiToc3, stiToc2, stiToc1, stiIndex7, stiIndex6, stiIndex5, stiIndex4, stiIndex3, stiIndex2, stiIndex1, stiLnn, stiIndexHeading, stiFooter, stiHeader, diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx index 78b27197676f..fe3141900e75 100644 --- a/sw/source/filter/ww8/tracer.cxx +++ b/sw/source/filter/ww8/tracer.cxx @@ -2,7 +2,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/ww8/tracer.hxx b/sw/source/filter/ww8/tracer.hxx index df6d7c497108..1d885866a923 100644 --- a/sw/source/filter/ww8/tracer.hxx +++ b/sw/source/filter/ww8/tracer.hxx @@ -2,7 +2,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 @@ -78,7 +78,7 @@ namespace sw Tracer(const SfxMedium &rMedium); MSFilterTracer *GetTrace() const { return mpTrace; } void EnterEnvironment(Environment eContext); - void EnterEnvironment(Environment eContext, + void EnterEnvironment(Environment eContext, const rtl::OUString &rDetails); void Log(Problem eProblem); void LeaveEnvironment(Environment eContext); diff --git a/sw/source/filter/ww8/types.hxx b/sw/source/filter/ww8/types.hxx index 652baec7bfc1..af9df2069201 100644 --- a/sw/source/filter/ww8/types.hxx +++ b/sw/source/filter/ww8/types.hxx @@ -2,7 +2,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 @@ -45,14 +45,14 @@ namespace ww inline bool IsSevenMinus(WordVersion eVer) { return eVer <= eWW7; } inline bool IsEightPlus(WordVersion eVer) { return eVer >= eWW8; } - /** For custom wrapping + /** For custom wrapping When you edit the wrap points of a contour in word, word uses a relative scale of 0 to 21600 where 21600 is apparently 100% of the graphic width */ const int nWrap100Percent = 21600; } - + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/typessw.hxx b/sw/source/filter/ww8/typessw.hxx index 7d12833d49fe..0c35a3b00377 100644 --- a/sw/source/filter/ww8/typessw.hxx +++ b/sw/source/filter/ww8/typessw.hxx @@ -2,7 +2,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/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 8b7dbb8bc669..31c1d6be25ed 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -2,7 +2,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 @@ -32,7 +32,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <doc.hxx> -# include "writerhelper.hxx" +# include "writerhelper.hxx" # include <msfilter.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/embed/EmbedStates.hpp> diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 0e5edf1bb182..3cdd0c4d69e1 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -2,7 +2,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/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index d37b2f07ac77..89f7d4b51504 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -2,7 +2,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,7 +57,7 @@ # include <fmtfsize.hxx> //SwFmtFrmSize # include <swrect.hxx> //SwRect # include <fmthdft.hxx> //SwFmtHeader/SwFmtFooter -# include <frmatr.hxx> //GetLRSpace... +# include <frmatr.hxx> //GetLRSpace... # include <ndtxt.hxx> //SwTxtNode # include <breakit.hxx> //pBreakIt @@ -997,7 +997,7 @@ namespace sw } ++nI; } - + if (bForceNatNum) bForceJapanese = true; diff --git a/sw/source/filter/ww8/writerwordglue.hxx b/sw/source/filter/ww8/writerwordglue.hxx index e52d29940d83..b267ba302b48 100644 --- a/sw/source/filter/ww8/writerwordglue.hxx +++ b/sw/source/filter/ww8/writerwordglue.hxx @@ -2,7 +2,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 @@ -141,7 +141,7 @@ namespace sw bool HasHeader() const { return mbHasHeader; } bool HasFooter() const { return mbHasFooter; } - /** Is the top of the page the same in both objects + /** Is the top of the page the same in both objects Ignoring the difference in header and footers, will the main document text have the same top/bottom bounds in word between diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 2f7220460104..2bc80af8dcd0 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -173,8 +173,8 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet) // --> OD 2010-05-14 #160026# // property "Help" does not exist and due to the no-existence an exception is thrown. // uno::Any aTmp = xPropSet->getPropertyValue(C2U("Help")); - try - { + try + { uno::Any aTmp = xPropSet->getPropertyValue(C2U("HelpText")); // <-- const rtl::OUString *pStr = (const rtl::OUString *)aTmp.getValue(); diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 8abe5c4200e9..b430366e0477 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -2,7 +2,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 @@ -234,7 +234,7 @@ void WW8AttributeOutput::NumberingLevel( BYTE /*nLevel*/, default: nAlign = 0; break; } *m_rWW8Export.pTableStrm << nAlign; - + // Write the rgbxchNums[9], positions of placeholders for paragraph // numbers in the text m_rWW8Export.pTableStrm->Write( pNumLvlPos, WW8ListManager::nMaxLevel ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 244d4acc328a..f8b34bb3174f 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2,7 +2,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 @@ -268,19 +268,19 @@ static void WriteDop( WW8Export& rWrt ) xDocProps = xDPS->getDocumentProperties(); DBG_ASSERT(xDocProps.is(), "DocumentProperties is null"); - rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash(); + rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash(); } if ((rWrt.pSepx && rWrt.pSepx->DocumentIsProtected()) || rDop.lKeyProtDoc != 0) - { + { rDop.fProtEnabled = 1; } - else + else { rDop.fProtEnabled = 0; } - + if (!xDocProps.is()) { rDop.dttmCreated = rDop.dttmRevised = rDop.dttmLastPrint = 0x45FBAC69; } else { @@ -1624,7 +1624,7 @@ void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAd ww::bytes aBytes; SwWW8Writer::InsUInt16(aBytes, rStr.Len()); SwWW8Writer::InsAsString16(aBytes, rStr); - if (bAddZero) + if (bAddZero) SwWW8Writer::InsUInt16(aBytes, 0); rStrm.Write(&aBytes[0], aBytes.size()); } @@ -1712,7 +1712,7 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt, if( nStt || nLen != rStr.Len() ) { String sOut( rStr.Copy( nStt, nLen ) ); - + #ifdef DEBUG ::std::clog << ::rtl::OUStringToOString(sOut, RTL_TEXTENCODING_ASCII_US).getStr() << ::std::endl; #endif @@ -1722,7 +1722,7 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt, else SwWW8Writer::WriteString8(Strm(), sOut, false, eChrSet); } - else + else { #ifdef DEBUG ::std::clog << ::rtl::OUStringToOString(rStr, RTL_TEXTENCODING_ASCII_US).getStr() << ::std::endl; @@ -1734,9 +1734,9 @@ void WW8Export::OutSwString(const String& rStr, xub_StrLen nStt, SwWW8Writer::WriteString8(Strm(), rStr, false, eChrSet); } } - + #ifdef DEBUG - ::std::clog << "</OutSwString>" << ::std::endl; + ::std::clog << "</OutSwString>" << ::std::endl; #endif } @@ -1746,7 +1746,7 @@ void WW8Export::WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo WriteChar('\007'); else WriteChar( '\015' ); - + pPiece->SetParaBreak(); } @@ -1878,12 +1878,12 @@ void WW8AttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pT if ( nDepth > 0 ) { - /* Cell */ + /* Cell */ m_rWW8Export.InsUInt16( NS_sprm::LN_PFInTable ); m_rWW8Export.pO->Insert( (BYTE)0x1, m_rWW8Export.pO->Count() ); m_rWW8Export.InsUInt16( NS_sprm::LN_PTableDepth ); m_rWW8Export.InsUInt32( nDepth ); - + if ( nDepth > 1 && pTableTextNodeInfoInner->isEndOfCell() ) { m_rWW8Export.InsUInt16( NS_sprm::LN_PCell ); @@ -1965,15 +1965,15 @@ static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, long nRowSpan) void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes(); - + sal_uInt8 nBoxes = rTblBoxes.Count(); for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { const SwTableBox * pTabBox1 = rTblBoxes[n]; const SwFrmFmt * pFrmFmt = pTabBox1->GetFrmFmt(); - + if ( FRMDIR_VERT_TOP_RIGHT == m_rWW8Export.TrueFrameDirection( *pFrmFmt ) ) { m_rWW8Export.InsUInt16( NS_sprm::LN_TTextFlow ); @@ -1987,7 +1987,7 @@ void WW8AttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt(); /* @@ -1995,7 +1995,7 @@ void WW8AttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT feature equivalent to this, Word stores 1 for fCantSplit if the row cannot be split, we set true if we can split it. An example is #i4569# */ - + const SwFmtRowSplit& rSplittable = pLineFmt->GetRowSplit(); BYTE nCantSplit = (!rSplittable.GetValue()) ? 1 : 0; if ( m_rWW8Export.bWrtWW8 ) @@ -2015,7 +2015,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt(); - + if ( m_rWW8Export.bWrtWW8 ) { if ( m_rWW8Export.TrueFrameDirection(*pFrmFmt) == FRMDIR_HORI_RIGHT_TOP ) @@ -2029,7 +2029,7 @@ void WW8AttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); - const SwTableLine * pTabLine = pTabBox->GetUpper(); + const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwFrmFmt * pLineFmt = pTabLine->GetFrmFmt(); // Zeilenhoehe ausgeben sprmTDyaRowHeight @@ -2051,21 +2051,21 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab m_rWW8Export.pO->Insert( 189, m_rWW8Export.pO->Count() ); m_rWW8Export.InsUInt16( (USHORT)nHeight ); } - + } void WW8AttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); - + const SwFrmFmt *pFmt = pTable->GetFrmFmt(); OSL_ENSURE(pFmt,"Impossible"); if (!pFmt) return; - + const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient(); const SwFmtVertOrient &rVert = pFmt->GetVertOrient(); - + if ( (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() || text::RelOrientation::FRAME == rHori.GetRelationOrient()) @@ -2095,11 +2095,11 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); const SwTableFmt * pTableFmt = dynamic_cast<const SwTableFmt *>(pTable->GetRegisteredIn()); - + if (pTableFmt != NULL) { const SvxULSpaceItem & rUL = pTableFmt->GetULSpace(); - + if (rUL.GetUpper() > 0) { sal_uInt8 nPadding = 2; @@ -2123,13 +2123,13 @@ void WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab m_rWW8Export.InsUInt16(NS_sprm::LN_TDyaFromTextBottom); m_rWW8Export.InsUInt16(rUL.GetLower()); } - } + } } void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTable * pTable = pTableTextNodeInfoInner->getTable(); - + if ( pTable->GetRowsToRepeat() > pTableTextNodeInfoInner->getRow() ) { if( m_rWW8Export.bWrtWW8 ) @@ -2139,11 +2139,11 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t m_rWW8Export.pO->Insert( 1, m_rWW8Export.pO->Count() ); } - ww8::TableBoxVectorPtr pTableBoxes = + ww8::TableBoxVectorPtr pTableBoxes = pTableTextNodeInfoInner->getTableBoxesOfRow(); // number of cell written sal_uInt32 nBoxes = pTableBoxes->size(); - + // sprm header m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTable ); sal_uInt16 nSprmSize = 2 + (nBoxes + 1) * 2 + nBoxes * 20; @@ -2152,7 +2152,7 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // number of boxes m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes), m_rWW8Export.pO->Count() ); - /* cellxs */ + /* cellxs */ /* ALWAYS relative when text::HoriOrientation::NONE (nPageSize + ( nPageSize / 10 )) < nTblSz, in that case the cell width's and table width's are not real. The table @@ -2167,9 +2167,9 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t const SwFmtHoriOrient &rHori = pFmt->GetHoriOrient(); const SwFmtVertOrient &rVert = pFmt->GetVertOrient(); - + sal_uInt16 nTblOffset = 0; - + if ( (text::RelOrientation::PRINT_AREA == rHori.GetRelationOrient() || text::RelOrientation::FRAME == rHori.GetRelationOrient()) @@ -2192,61 +2192,61 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t break; } } - + m_rWW8Export.InsUInt16( nTblOffset ); - + ww8::GridColsPtr pGridCols = GetGridCols( pTableTextNodeInfoInner ); - for ( ww8::GridCols::const_iterator it = pGridCols->begin(), + for ( ww8::GridCols::const_iterator it = pGridCols->begin(), end = pGridCols->end(); it != end; ++it ) { m_rWW8Export.InsUInt16( static_cast<USHORT>( *it ) + nTblOffset ); } - + /* TCs */ ww8::RowSpansPtr pRowSpans = pTableTextNodeInfoInner->getRowSpansOfRow(); ww8::RowSpans::const_iterator aItRowSpans = pRowSpans->begin(); ww8::TableBoxVector::const_iterator aIt; ww8::TableBoxVector::const_iterator aItEnd = pTableBoxes->end(); - + #ifdef DEBUG size_t nRowSpans = pRowSpans->size(); size_t nTableBoxes = pTableBoxes->size(); (void) nRowSpans; (void) nTableBoxes; #endif - + for( aIt = pTableBoxes->begin(); aIt != aItEnd; ++aIt, ++aItRowSpans) { #ifdef DEBUG sal_uInt16 npOCount = m_rWW8Export.pO->Count(); #endif - + const SwTableBox * pTabBox1 = *aIt; const SwFrmFmt * pBoxFmt = NULL; if (pTabBox1 != NULL) pBoxFmt = pTabBox1->GetFrmFmt(); - + if ( m_rWW8Export.bWrtWW8 ) { - sal_uInt16 nFlags = + sal_uInt16 nFlags = lcl_TCFlags(pTabBox1, *aItRowSpans); m_rWW8Export.InsUInt16( nFlags ); } - + static BYTE aNullBytes[] = { 0x0, 0x0 }; - + m_rWW8Export.pO->Insert( aNullBytes, 2, m_rWW8Export.pO->Count() ); // dummy if (pBoxFmt != NULL) { const SvxBoxItem & rBoxItem = pBoxFmt->GetBox(); - + m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, &rBoxItem ); // 8/16 Byte } else m_rWW8Export.Out_SwFmtTableBox( *m_rWW8Export.pO, NULL); // 8/16 Byte - + #ifdef DEBUG - ::std::clog << "<tclength>" << m_rWW8Export.pO->Count() - npOCount << "</tclength>" + ::std::clog << "<tclength>" << m_rWW8Export.pO->Count() - npOCount << "</tclength>" << ::std::endl; #endif } @@ -2256,7 +2256,7 @@ ww8::GridColsPtr AttributeOutputBase::GetGridCols( ww8::WW8TableNodeInfoInner::P { return pTableTextNodeInfoInner->getGridColsOfRow(*this); } - + void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableTextNodeInfoInner, sal_uInt32& rPageSize, bool& rRelBoxSize ) { sal_uInt32 nPageSize = 0; @@ -2310,9 +2310,9 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner * pTableT const SvxLRSpaceItem &rLR = pFmt->GetLRSpace(); nPageSize -= (rLR.GetLeft() + rLR.GetRight()); } - + } - + OSL_ENSURE(nWidthPercent, "Impossible"); if (nWidthPercent) { @@ -2337,7 +2337,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT }; - + for ( int i = 0; i < 4; ++i ) { SwWW8Writer::InsUInt16( *m_rWW8Export.pO, 0xD634 ); @@ -2346,7 +2346,7 @@ void WW8AttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe m_rWW8Export.pO->Insert( BYTE(1), m_rWW8Export.pO->Count() ); m_rWW8Export.pO->Insert( BYTE(1 << i), m_rWW8Export.pO->Count() ); m_rWW8Export.pO->Insert( BYTE(3), m_rWW8Export.pO->Count() ); - + SwWW8Writer::InsUInt16( *m_rWW8Export.pO, pFrmFmt->GetBox().GetDistance( aBorders[i] ) ); } @@ -2364,17 +2364,17 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t else m_rWW8Export.pO->Insert( (BYTE)191, m_rWW8Export.pO->Count() ); m_rWW8Export.pO->Insert( (BYTE)(nBoxes * 2), m_rWW8Export.pO->Count() ); // Len - + for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { const SwTableBox * pBox1 = rTabBoxes[n]; const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt(); const SfxPoolItem * pI = NULL; Color aColor; - + if ( SFX_ITEM_ON == pFrmFmt->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) ) { - aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); + aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); } else aColor = COL_AUTO; @@ -2390,32 +2390,32 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t sal_uInt8 nBoxes0 = rTabBoxes.Count(); if (nBoxes0 > 21) nBoxes0 = 21; - + for (sal_uInt32 m = 0; m < 2; m++) { m_rWW8Export.InsUInt16( aSprmIds[m] ); - m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes0 * 10), + m_rWW8Export.pO->Insert( static_cast<BYTE>(nBoxes0 * 10), m_rWW8Export.pO->Count() ); - + for ( sal_uInt8 n = 0; n < nBoxes0; n++ ) { const SwTableBox * pBox1 = rTabBoxes[n]; const SwFrmFmt * pFrmFmt = pBox1->GetFrmFmt(); const SfxPoolItem * pI = NULL; Color aColor; - - if ( SFX_ITEM_ON == + + if ( SFX_ITEM_ON == pFrmFmt->GetAttrSet(). GetItemState( RES_BACKGROUND, false, &pI ) ) { - aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); + aColor = dynamic_cast<const SvxBrushItem *>(pI)->GetColor(); } else aColor = COL_AUTO; - + WW8SHDLong aSHD; aSHD.setCvFore( 0xFF000000 ); - + sal_uInt32 nBgColor = aColor.GetColor(); if ( nBgColor == COL_AUTO ) aSHD.setCvBack( 0xFF000000 ); @@ -2423,8 +2423,8 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t aSHD.setCvBack( wwUtility::RGBToBGR( nBgColor ) ); aSHD.Write( m_rWW8Export ); - } - } + } + } } } @@ -2522,16 +2522,16 @@ void MSWordExportBase::WriteText() SwNode * pCurrentNode = &pCurPam->GetPoint()->nNode.GetNode(); const SwNode * pNextNode = mpTableInfo->getNextNode(pCurrentNode); - + if (pNextNode != NULL) pCurPam->GetPoint()->nNode = SwNodeIndex(*pNextNode); else pCurPam->GetPoint()->nNode++; - + ULONG nPos = pCurPam->GetPoint()->nNode.GetIndex(); ::SetProgressState( nPos, pCurPam->GetDoc()->GetDocShell() ); } - + #ifdef DEBUG ::std::clog << "</WriteText>" << ::std::endl; #endif @@ -2720,13 +2720,13 @@ void WW8Export::WriteFkpPlcUsw() // Reclaim stored FIB data from document. ::ww8::WW8FibData * pFibData = dynamic_cast<ww8::WW8FibData *> (pDoc->getExternalData(::sw::FIB).get()); - + if ( pFibData ) // <-- { - pFib->fReadOnlyRecommended = + pFib->fReadOnlyRecommended = pFibData->getReadOnlyRecommended() ? 1 : 0; - pFib->fWriteReservation = + pFib->fWriteReservation = pFibData->getWriteReservation() ? 1 : 0; } @@ -2868,7 +2868,7 @@ namespace rCtx.Encode(in, nBS, in, nBS); rOut.Write(in, nBS); } - } + } } void MSWordExportBase::ExportDocument( bool bWriteAll ) @@ -3073,12 +3073,12 @@ void WW8Export::ExportDocument_Impl() StoreDoc1(); if ( bEncrypt ) - { + { // Generate random number with a seed of time as salt. TimeValue aTime; osl_getSystemTime( &aTime ); rtlRandomPool aRandomPool = rtl_random_createPool (); - rtl_random_addBytes ( aRandomPool, &aTime, 8 ); + rtl_random_addBytes ( aRandomPool, &aTime, 8 ); sal_uInt8 aDocId[ 16 ] = {0}; rtl_random_getBytes( aRandomPool, aDocId, 16 ); @@ -3098,11 +3098,11 @@ void WW8Export::ExportDocument_Impl() pDataStrmTemp = &xDataStrm; if ( pDataStrmTemp && pDataStrmTemp != pStrmTemp) - EncryptRC4(aCtx, *pDataStrm, *pDataStrmTemp); + EncryptRC4(aCtx, *pDataStrm, *pDataStrmTemp); EncryptRC4(aCtx, *pTableStrm, *pTableStrmTemp); - // Write Unencrypted Header 52 bytes to the start of the table stream + // Write Unencrypted Header 52 bytes to the start of the table stream // EncryptionVersionInfo (4 bytes): A Version structure where Version.vMajor MUST be 0x0001, and Version.vMinor MUST be 0x0001. pTableStrmTemp->Seek( 0 ); sal_uInt32 nEncType = 0x10001; @@ -3114,19 +3114,19 @@ void WW8Export::ExportDocument_Impl() pTableStrmTemp->Write( aDocId, 16 ); pTableStrmTemp->Write( pSaltData, 16 ); - pTableStrmTemp->Write( pSaltDigest, 16 ); + pTableStrmTemp->Write( pSaltDigest, 16 ); EncryptRC4(aCtx, GetWriter().Strm(), *pStrmTemp); - // Write Unencrypted Fib 68 bytes to the start of the workdocument stream + // Write Unencrypted Fib 68 bytes to the start of the workdocument stream pFib->fEncrypted = 1; // fEncrypted indicates the document is encrypted. pFib->fObfuscated = 0; // Must be 0 for RC4. pFib->nHash = 0x34; // encrypt header bytes count of table stream. pFib->nKey = 0; // lkey2 must be 0 for RC4. - pStrmTemp->Seek( 0 ); - pFib->WriteHeader( *pStrmTemp ); - } + pStrmTemp->Seek( 0 ); + pFib->WriteHeader( *pStrmTemp ); + } if (pUsedNumTbl) // all used NumRules { @@ -3320,7 +3320,7 @@ ULONG SwWW8Writer::Write( SwPaM& rPaM, SfxMedium& rMed, MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam ) : aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0), - pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0), + pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0), mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0), mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0), pStyles( NULL ), @@ -3604,14 +3604,14 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) const sal_uInt8 aFldData[] = { - 0x44,0, // the start of "next" data + 0x44,0, // the start of "next" data 0,0,0,0,0,0,0,0,0,0, // PIC-Structure! /10 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | /16 0,0,0,0, // / /4 }; - sal_uInt32 slen = sizeof(sal_uInt32) + sal_uInt32 slen = sizeof(sal_uInt32) + sizeof(aFldData) + sizeof( aFldHeader.version ) + sizeof( aFldHeader.bits ) + sizeof( aFldHeader.cch ) + sizeof( aFldHeader.hps ) + 2*ffname.getLength() + 4 @@ -3679,7 +3679,7 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer #endif m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren - + sal_uInt32 nShadowsBefore = pNodeInfoInner->getShadowsBefore(); if (nShadowsBefore > 0) { @@ -3692,14 +3692,14 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer for (sal_uInt32 n = 0; n < nShadowsBefore; ++n) { m_rWW8Export.WriteCR(pTmpNodeInfoInner); - - m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, + + m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoCell(pTmpNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry ( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } } @@ -3710,33 +3710,33 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer ::std::clog << "<endOfCell/>" << ::std::endl; #endif m_rWW8Export.WriteCR(pNodeInfoInner); - + m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoCell(pNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } - + sal_uInt32 nShadowsAfter = pNodeInfoInner->getShadowsAfter(); if (nShadowsAfter > 0) { ww8::WW8TableNodeInfoInner::Pointer_t pTmpNodeInfoInner(new ww8::WW8TableNodeInfoInner(NULL)); - + pTmpNodeInfoInner->setDepth(pNodeInfoInner->getDepth()); pTmpNodeInfoInner->setEndOfCell(true); for (sal_uInt32 n = 0; n < nShadowsAfter; ++n) { m_rWW8Export.WriteCR(pTmpNodeInfoInner); - + m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoCell(pTmpNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } } @@ -3747,13 +3747,13 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer ::std::clog << "<endOfLine/>" << ::std::endl; #endif TableRowEnd(pNodeInfoInner->getDepth()); - + ShortToSVBT16(0, nStyle); m_rWW8Export.pO->Insert( (BYTE*)&nStyle, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoRow(pNodeInfoInner); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); - + m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // leeren } #ifdef DEBUG @@ -3764,7 +3764,7 @@ void WW8AttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer void MSWordExportBase::OutputStartNode( const SwStartNode & rNode) { - ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = + ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = mpTableInfo->getTableNodeInfo( &rNode ); if (pNodeInfo.get() != NULL) @@ -3772,14 +3772,14 @@ void MSWordExportBase::OutputStartNode( const SwStartNode & rNode) #ifdef DEBUG ::std::clog << pNodeInfo->toString() << ::std::endl; #endif - + const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners(); ww8::WW8TableNodeInfo::Inners_t::const_reverse_iterator aIt(aInners.rbegin()); ww8::WW8TableNodeInfo::Inners_t::const_reverse_iterator aEnd(aInners.rend()); while (aIt != aEnd) { ww8::WW8TableNodeInfoInner::Pointer_t pInner = aIt->second; - + AttrOutput().TableNodeInfoInner(pInner); aIt++; } @@ -3798,13 +3798,13 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode ) #endif ww8::WW8TableNodeInfo::Pointer_t pNodeInfo = mpTableInfo->getTableNodeInfo( &rNode ); - + if (pNodeInfo.get() != NULL) { #ifdef DEBUG ::std::clog << pNodeInfo->toString() << ::std::endl; #endif - + const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners(); ww8::WW8TableNodeInfo::Inners_t::const_iterator aIt(aInners.begin()); ww8::WW8TableNodeInfo::Inners_t::const_iterator aEnd(aInners.end()); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 007694792f4a..4af4bb137a9d 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -544,7 +544,7 @@ public: BYTE bHasHdr : 1; BYTE bHasFtr : 1; BYTE bSubstituteBullets : 1; // true: SubstituteBullet() gets called - + bool mbExportModeRTF; SwDoc *pDoc; diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index bee910ffb4d7..bd18e5f4a0c4 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -2,7 +2,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/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 3553d320a1c0..5300b852468e 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -2,7 +2,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,7 +70,7 @@ public: /// Output text. virtual void RunText( const String& rText, rtl_TextEncoding eCharSet ); - + /// Output text (without markup). virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ); @@ -397,13 +397,13 @@ protected: /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection( const SvxFrameDirectionItem& ); - + /// Write the expanded field virtual void WriteExpand( const SwField* pFld ); - + virtual void RefField ( const SwField& rFld, const String& rRef ); virtual void HiddenField( const SwField& rFld ); - virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); + virtual void SetField( const SwField& rFld, ww::eField eType, const String& rCmd ); virtual void PostitField( const SwField* pFld ); virtual bool DropdownField( const SwField* pFld ); @@ -445,7 +445,7 @@ public: protected: /// Output the bold etc. attributes void OutputWW8Attribute( BYTE nId, bool bVal ); - + /// Output the bold etc. attributes, the Complex Text Layout version void OutputWW8AttributeCTL( BYTE nId, bool bVal ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 3dc151feb782..6755ac255a0a 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -2,7 +2,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 @@ -257,16 +257,16 @@ bool WW8GlossaryFib::IsGlossaryFib() } UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */, - SvStream & /* rStrm */, + SvStream & /* rStrm */, const WW8Fib &rFib) { UINT32 nGlossaryFibOffset = 0; - if ( rFib.fDot ) // its a template + if ( rFib.fDot ) // its a template { if ( rFib.pnNext ) nGlossaryFibOffset = ( rFib.pnNext * 512 ); } - return nGlossaryFibOffset; + return nGlossaryFibOffset; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index c2d0a6ca64c5..af8b9ade088c 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -2,7 +2,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/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 9597ec2b7dc5..2a1e7a11f4e4 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2,7 +2,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/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index c3b970e4613c..21523f4dc792 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -2,7 +2,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/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index dc5c440ff57b..44bb9c246341 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -2,7 +2,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/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index eb02f119e298..033df99452e7 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -395,7 +395,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, && maShapeRecords.Current()->nRecLen ) { UINT32 nBytesLeft = maShapeRecords.Current()->nRecLen; - UINT32 nUDData; + UINT32 nUDData; UINT16 nPID; while( 5 < nBytesLeft ) { @@ -604,10 +604,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, aSet.Put( SdrTextRightDistItem( nTextRight ) ); aSet.Put( SdrTextUpperDistItem( nTextTop ) ); aSet.Put( SdrTextLowerDistItem( nTextBottom ) ); - pImpRec->nDxTextLeft = nTextLeft; - pImpRec->nDyTextTop = nTextTop; - pImpRec->nDxTextRight = nTextRight; - pImpRec->nDyTextBottom = nTextBottom; + pImpRec->nDxTextLeft = nTextLeft; + pImpRec->nDyTextTop = nTextTop; + pImpRec->nDxTextRight = nTextRight; + pImpRec->nDyTextBottom = nTextBottom; // --> SJ 2009-03-06 : taking the correct default (which is mso_anchorTop) MSO_Anchor eTextAnchor = @@ -701,19 +701,19 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, double fExtraTextRotation = 0.0; if ( mnFix16Angle && !( GetPropertyValue( DFF_Prop_FitTextToShape ) & 4 ) ) - { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false + { // text is already rotated, we have to take back the object rotation if DFF_Prop_RotateText is false fExtraTextRotation = -mnFix16Angle; } - if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text - { // remains unchanged, so we have to take back the flipping here - fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped. + if ( rObjData.nSpFlags & SP_FFLIPV ) // sj: in ppt the text is flipped, whereas in word the text + { // remains unchanged, so we have to take back the flipping here + fExtraTextRotation += 18000.0; // because our core will flip text if the shape is flipped. } fExtraTextRotation += nTextRotationAngle; if ( !::basegfx::fTools::equalZero( fExtraTextRotation ) ) { fExtraTextRotation /= 100.0; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); - const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); + const rtl::OUString sTextRotateAngle( RTL_CONSTASCII_USTRINGPARAM ( "TextRotateAngle" ) ); com::sun::star::beans::PropertyValue aPropVal; aPropVal.Name = sTextRotateAngle; aPropVal.Value <<= fExtraTextRotation; @@ -756,7 +756,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, pImpRec->bDrawHell = FALSE; if (GetPropertyValue(DFF_Prop_fPrint) & 0x02) pImpRec->bHidden = TRUE; - pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 ); + pImpRec->nNextShapeId = GetPropertyValue( DFF_Prop_hspNext, 0 ); if ( nTextId ) { @@ -3001,7 +3001,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTxtPos, bool& rbStartLine) aRes.nAktCp = rTxtPos; // Akt. Cp-Pos bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !bIgnoreText; - if ( bNewSection ) // neue Section + if ( bNewSection ) // neue Section { OSL_ENSURE(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); // PageDesc erzeugen und fuellen @@ -4873,8 +4873,8 @@ public: outlineeq(BYTE nNum) : mnNum(nNum) {} bool operator()(const SwTxtFmtColl *pTest) const { - //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei - return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei + //return pTest->GetOutlineLevel() == mnNum; //#outline level,zhaojianwei + return pTest->IsAssignedToListLevelOfOutlineStyle() && pTest->GetAssignedOutlineStyleLevel() == mnNum; //<-end,zhaojianwei } }; @@ -4912,7 +4912,7 @@ void SwWW8ImplReader::SetOutLineStyles() for ( sw::ParaStyles::reverse_iterator aIter = aOutLined.rbegin(); aIter < aEnd; ++aIter) // <-- { - //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei, + //if ((*aIter)->GetOutlineLevel() < MAXLEVEL) //#outline level,zhaojianwei, //nFlagsStyleOutlLevel |= 1 << (*aIter)->GetOutlineLevel(); if ((*aIter)->IsAssignedToListLevelOfOutlineStyle()) nFlagsStyleOutlLevel |= 1 << (*aIter)->GetAssignedOutlineStyleLevel();//<-end,zhaojianwei @@ -4986,7 +4986,7 @@ void SwWW8ImplReader::SetOutLineStyles() //if ((*aIter)->GetOutlineLevel() < MAXLEVEL)//#outline level,zhaojianwei // (*aIter)->SetOutlineLevel(NO_NUMBERING); if((*aIter)->IsAssignedToListLevelOfOutlineStyle()) - (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end + (*aIter)->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end else break; @@ -5058,7 +5058,7 @@ void SwWW8ImplReader::SetOutLineStyles() aOutlineRule.Set(nToLevel, rRule); // Set my outline level //((SwTxtFmtColl*)rSI.pFmt)->SetOutlineLevel(nToLevel);//#outline level,zhaojianwei - ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei + ((SwTxtFmtColl*)rSI.pFmt)->AssignToListLevelOfOutlineStyle(nToLevel); //<-end,zhaojianwei // If there are more styles on this level ignore them nFlagsStyleOutlLevel |= nAktFlags; } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 588bc97a0b9f..a4b663254176 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -1613,7 +1613,7 @@ void UseListIndent(SwWW8StyInf &rStyle, const SwNumFmt &rFmt); void SetStyleIndent(SwWW8StyInf &rStyleInfo, const SwNumFmt &rFmt); // --> OD 2010-05-06 #i103711# // --> OD 2010-05-11 #i105414# -void SyncIndentWithList( SvxLRSpaceItem &rLR, +void SyncIndentWithList( SvxLRSpaceItem &rLR, const SwNumFmt &rFmt, const bool bFirstLineOfStSet, const bool bLeftIndentSet ); diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index e1f77aa709cd..d5a73b9ac209 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2,7 +2,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 @@ -833,7 +833,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen ) { nSwNumLevel = *pData - 1; if (!bNoAttrImport) - //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei + //((SwTxtFmtColl*)pAktColl)->SetOutlineLevel( nSwNumLevel ); //#outline level,zhaojianwei ((SwTxtFmtColl*)pAktColl)->AssignToListLevelOfOutlineStyle( nSwNumLevel ); //<-end,zhaojianwei // Bei WW-NoNumbering koennte auch NO_NUMBERING gesetzt // werden. ( Bei normaler Nummerierung muss NO_NUM gesetzt @@ -860,7 +860,7 @@ void SwWW8ImplReader::Read_ANLevelNo( USHORT, const BYTE* pData, short nLen ) void SwWW8ImplReader::Read_ANLevelDesc( USHORT, const BYTE* pData, short nLen ) // Sprm 12 { { - SwWW8StyInf * pStyInf = GetStyle(nAktColl); + SwWW8StyInf * pStyInf = GetStyle(nAktColl); if( !pAktColl || nLen <= 0 // nur bei Styledef || (pStyInf && !pStyInf->bColl) // CharFmt -> ignorieren || ( nIniFlags & WW8FL_NO_OUTLINE ) ){ @@ -2399,7 +2399,7 @@ void WW8TabDesc::CalcDefaults() } } */ - if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || + if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || (nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used eOri = text::HoriOrientation::LEFT_AND_WIDTH; // absolutely positioned @@ -2572,7 +2572,7 @@ void WW8TabDesc::CreateSwTable() nLeft = GetMinLeft(); else { - if (nPreferredWidth) + if (nPreferredWidth) { nLeft = pIo->maSectionManager.GetTextAreaWidth(); nLeft = nLeft - nPreferredWidth - nOrgDxaLeft; @@ -3602,25 +3602,25 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp) bool lcl_PamContainsFly(SwPaM & rPam) { - bool bResult = false; + bool bResult = false; SwNodeRange aRg( rPam.Start()->nNode, rPam.End()->nNode ); SwDoc * pDoc = rPam.GetDoc(); - - sal_uInt16 n = 0; + + sal_uInt16 n = 0; SwSpzFrmFmts * pSpzFmts = pDoc->GetSpzFrmFmts(); - sal_uInt16 nCount = pSpzFmts->Count(); + sal_uInt16 nCount = pSpzFmts->Count(); while (!bResult && n < nCount) { SwFrmFmt* pFly = (*pSpzFmts)[n]; const SwFmtAnchor* pAnchor = &pFly->GetAnchor(); - + switch (pAnchor->GetAnchorId()) { case FLY_AT_PARA: case FLY_AT_CHAR: { const SwPosition* pAPos = pAnchor->GetCntntAnchor(); - + if (pAPos != NULL && aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd) @@ -3632,10 +3632,10 @@ bool lcl_PamContainsFly(SwPaM & rPam) default: break; } - + ++n; } - + return bResult; } diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 01753f3d9371..0886fe2d1bcd 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -2,7 +2,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/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 863da472662d..ce066fc5bb96 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2,7 +2,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/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 72db69dd31c8..72a4980e7b1b 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -2,7 +2,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/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index d8295b17bbfa..bb1a210a35d9 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2,7 +2,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 @@ -343,7 +343,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) if( !pName || pName->EqualsIgnoreCaseAscii( "_Toc", 0, 4 ) || pName->EqualsIgnoreCaseAscii( "_Hlt", 0, 4 ) ) return 0; -#endif +#endif //JP 16.11.98: ToUpper darf auf keinen Fall gemacht werden, weil der //Bookmark- name ein Hyperlink-Ziel sein kann! @@ -875,7 +875,7 @@ FieldEntry &FieldEntry::operator=(const FieldEntry &rOther) throw() return msMarkCode; } -void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) +void FieldEntry::SetBookmarkName(::rtl::OUString bookmarkName) { msBookmarkName=bookmarkName; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index f0d568a074e0..5f4ffd46312e 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2,7 +2,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 @@ -2730,15 +2730,15 @@ void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr, pAktColl->SetFmtAttr(rAttr); } else if (pAktItemSet) - { + { pAktItemSet->Put(rAttr); } else if (rAttr.Which() == RES_FLTR_REDLINE) - { + { mpRedlineStack->open(*pPaM->GetPoint(), rAttr); } else - { + { pCtrlStck->NewAttr(*pPaM->GetPoint(), rAttr); // --> OD 2010-05-06 #i103711# if ( bFirstLineOfStSet ) @@ -3569,7 +3569,7 @@ bool SwWW8ImplReader::GetFontParams( USHORT nFCode, FontFamily& reFamily, USHORT SwWW8ImplReader::CorrectResIdForCharset(CharSet nCharSet, USHORT nWhich) { USHORT nResult = 0; - + switch (nCharSet) { case RTL_TEXTENCODING_MS_932: nResult = RES_CHRATR_CJK_FONT; @@ -3579,7 +3579,7 @@ USHORT SwWW8ImplReader::CorrectResIdForCharset(CharSet nCharSet, USHORT nWhich) nResult = nWhich; break; } - + return nResult; } @@ -3608,7 +3608,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums, { eSrcCharSet = RTL_TEXTENCODING_DONTKNOW; } - + maFontSrcCJKCharSets.push(eSrcCharSet); } else @@ -3621,7 +3621,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums, { eSrcCharSet = RTL_TEXTENCODING_DONTKNOW; } - + maFontSrcCharSets.push(eSrcCharSet); } } @@ -3631,7 +3631,7 @@ bool SwWW8ImplReader::SetNewFontAttr(USHORT nFCode, bool bSetEnums, CharSet eDstCharSet = eSrcCharSet; SvxFontItem aFont( eFamily, aName, aEmptyStr, ePitch, eDstCharSet, nWhich); - + nWhich = CorrectResIdForCharset(eSrcCharSet, nWhich); if( bSetEnums ) @@ -3713,7 +3713,7 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen ) pCtrlStck->SetAttr( *pPaM->GetPoint(), nId ); if (nId == RES_CHRATR_CJK_FONT) ResetCJKCharSetVars(); - else + else ResetCharSetVars(); } else @@ -4047,7 +4047,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen ) case 0x845E: aLR.SetTxtLeft( nPara ); if (pAktColl) - { + { pCollA[nAktColl].bListReleventIndentSet = true; } // --> OD 2010-05-11 #i105414# @@ -4084,7 +4084,7 @@ void SwWW8ImplReader::Read_LR( USHORT nId, const BYTE* pData, short nLen ) aLR.SetTxtFirstLineOfst(nPara); if (pAktColl) - { + { pCollA[nAktColl].bListReleventIndentSet = true; } // --> OD 2010-05-06 #i103711# diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index ca05857df38e..f781e017ea71 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2,7 +2,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 @@ -3446,7 +3446,7 @@ WW8PLCFx_SEPX::WW8PLCFx_SEPX(SvStream* pSt, SvStream* pTblSt, pStrm(pSt), nArrMax(256), nSprmSiz(0) { pPLCF = rFib.lcbPlcfsed - ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, + ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, GetFIBVersion() <= ww::eWW2 ? 6 : 12, nStartCp) : 0; @@ -3506,13 +3506,13 @@ void WW8PLCFx_SEPX::GetSprms(WW8PLCFxDesc* p) pStrm->Seek( nPo ); // read len - if (GetFIBVersion() <= ww::eWW2) // eWW6 ?, docs say yes, but... + if (GetFIBVersion() <= ww::eWW2) // eWW6 ?, docs say yes, but... { BYTE nSiz(0); *pStrm >> nSiz; nSprmSiz = nSiz; } - else + else *pStrm >> nSprmSiz; if( nSprmSiz > nArrMax ) @@ -5182,7 +5182,7 @@ WW8_CP WW8Fib::GetBaseCp(ManTypes nType) const nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn; break; case MAN_TXBX_HDFT: - nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn + + nOffset = ccpText + ccpFtn + ccpHdr + ccpMcr + ccpAtn + ccpEdn + ccpTxbx; break; } @@ -5572,14 +5572,14 @@ WW8Fib::WW8Fib(SvStream& rSt, BYTE nWantedVersion, UINT32 nOffset) rSt.Seek( 0x372 ); // fcSttbListNames rSt >> fcSttbListNames; rSt >> lcbSttbListNames; - + if (cfclcb > 93) { rSt.Seek( 0x382 ); // MagicTables rSt >> fcPlcfTch; rSt >> lcbPlcfTch; } - + if (cfclcb > 113) { rSt.Seek( 0x41A ); // new ATRD @@ -5640,7 +5640,7 @@ WW8Fib::WW8Fib(BYTE nVer) nProduct = 0xc02d; } - // --> #i90932# + // --> #i90932# lid = 0x409; // LANGUAGE_ENGLISH_US LanguageType nLang = Application::GetSettings().GetLanguage(); @@ -5663,7 +5663,7 @@ WW8Fib::WW8Fib(BYTE nVer) fFarEast = false; break; }; - // <-- #i90932# + // <-- #i90932# Locale aTempLocale; SvxLanguageToLocale( aTempLocale, lid ); @@ -5677,7 +5677,7 @@ sal_Unicode WW8Fib::getNumDecimalSep() const } bool WW8Fib::WriteHeader(SvStream& rStrm) -{ +{ bool bVer8 = 8 == nVersion; size_t nUnencryptedHdr = bVer8 ? 0x44 : 0x24; @@ -5696,22 +5696,22 @@ bool WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, pnNext ); UINT16 nBits16 = 0; - if( fDot ) nBits16 |= 0x0001; - if( fGlsy) nBits16 |= 0x0002; - if( fComplex ) nBits16 |= 0x0004; - if( fHasPic ) nBits16 |= 0x0008; + if( fDot ) nBits16 |= 0x0001; + if( fGlsy) nBits16 |= 0x0002; + if( fComplex ) nBits16 |= 0x0004; + if( fHasPic ) nBits16 |= 0x0008; nBits16 |= (0xf0 & ( cQuickSaves << 4 )); - if( fEncrypted ) nBits16 |= 0x0100; - if( fWhichTblStm ) nBits16 |= 0x0200; + if( fEncrypted ) nBits16 |= 0x0100; + if( fWhichTblStm ) nBits16 |= 0x0200; - if (fReadOnlyRecommended) + if (fReadOnlyRecommended) nBits16 |= 0x0400; - if (fWriteReservation) + if (fWriteReservation) nBits16 |= 0x0800; - if( fExtChar ) nBits16 |= 0x1000; + if( fExtChar ) nBits16 |= 0x1000; if( fFarEast ) nBits16 |= 0x4000; // #i90932# - if( fObfuscated ) nBits16 |= 0x8000; + if( fObfuscated ) nBits16 |= 0x8000; Set_UInt16( pData, nBits16 ); Set_UInt16( pData, nFibBack ); @@ -5722,11 +5722,11 @@ bool WW8Fib::WriteHeader(SvStream& rStrm) BYTE nBits8 = 0; if( bVer8 ) { - if( fMac ) nBits8 |= 0x0001; - if( fEmptySpecial ) nBits8 |= 0x0002; - if( fLoadOverridePage ) nBits8 |= 0x0004; - if( fFuturesavedUndo ) nBits8 |= 0x0008; - if( fWord97Saved ) nBits8 |= 0x0010; + if( fMac ) nBits8 |= 0x0001; + if( fEmptySpecial ) nBits8 |= 0x0002; + if( fLoadOverridePage ) nBits8 |= 0x0004; + if( fFuturesavedUndo ) nBits8 |= 0x0008; + if( fWord97Saved ) nBits8 |= 0x0010; if( fWord2000Saved ) nBits8 |= 0x0020; } // unter Ver67 these are only reserved @@ -5776,7 +5776,7 @@ bool WW8Fib::Write(SvStream& rStrm) ULONG nPos = rStrm.Tell(); cbMac = rStrm.Seek( STREAM_SEEK_TO_END ); - rStrm.Seek( nPos ); + rStrm.Seek( nPos ); // 2 Longs uebergehen, da unwichtiger Quatsch pData += 2 * sizeof( INT32); @@ -6912,44 +6912,44 @@ UINT32 WW8Dop::GetCompatabilityOptions() const // i#78591# void WW8Dop::SetCompatabilityOptions2(UINT32 a32Bit) { - fCompatabilityOptions_Unknown2_1 = ( a32Bit & 0x00000001 ); - fCompatabilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ; - fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ; - fCompatabilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ; - fCompatabilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ; - fCompatabilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ; - fCompatabilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ; - fCompatabilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ; - fCompatabilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ; - fCompatabilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ; - fCompatabilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ; - fCompatabilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ; - fCompatabilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ; - fCompatabilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ; - fCompatabilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ; - fCompatabilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ; - fCompatabilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ; - fCompatabilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ; - fCompatabilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ; - fCompatabilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ; - fCompatabilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ; - fCompatabilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ; - fCompatabilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ; - fCompatabilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ; - fCompatabilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ; - fCompatabilityOptions_Unknown2_26 = ( a32Bit & 0x02000800 ) >> 25 ; - fCompatabilityOptions_Unknown2_27 = ( a32Bit & 0x04000800 ) >> 26 ; - fCompatabilityOptions_Unknown2_28 = ( a32Bit & 0x08000800 ) >> 27 ; - fCompatabilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ; - fCompatabilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ; - fCompatabilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ; - fCompatabilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ; + fCompatabilityOptions_Unknown2_1 = ( a32Bit & 0x00000001 ); + fCompatabilityOptions_Unknown2_2 = ( a32Bit & 0x00000002 ) >> 1 ; + fDontUseHTMLAutoSpacing = ( a32Bit & 0x00000004 ) >> 2 ; + fCompatabilityOptions_Unknown2_4 = ( a32Bit & 0x00000008 ) >> 3 ; + fCompatabilityOptions_Unknown2_5 = ( a32Bit & 0x00000010 ) >> 4 ; + fCompatabilityOptions_Unknown2_6 = ( a32Bit & 0x00000020 ) >> 5 ; + fCompatabilityOptions_Unknown2_7 = ( a32Bit & 0x00000040 ) >> 6 ; + fCompatabilityOptions_Unknown2_8 = ( a32Bit & 0x00000080 ) >> 7 ; + fCompatabilityOptions_Unknown2_9 = ( a32Bit & 0x00000100 ) >> 8 ; + fCompatabilityOptions_Unknown2_10 = ( a32Bit & 0x00000200 ) >> 9 ; + fCompatabilityOptions_Unknown2_11 = ( a32Bit & 0x00000400 ) >> 10 ; + fCompatabilityOptions_Unknown2_12 = ( a32Bit & 0x00000800 ) >> 11 ; + fCompatabilityOptions_Unknown2_13 = ( a32Bit & 0x00001000 ) >> 12 ; + fCompatabilityOptions_Unknown2_14 = ( a32Bit & 0x00002000 ) >> 13 ; + fCompatabilityOptions_Unknown2_15 = ( a32Bit & 0x00004000 ) >> 14 ; + fCompatabilityOptions_Unknown2_16 = ( a32Bit & 0x00008000 ) >> 15 ; + fCompatabilityOptions_Unknown2_17 = ( a32Bit & 0x00010000 ) >> 16 ; + fCompatabilityOptions_Unknown2_18 = ( a32Bit & 0x00020000 ) >> 17 ; + fCompatabilityOptions_Unknown2_19 = ( a32Bit & 0x00040000 ) >> 18 ; + fCompatabilityOptions_Unknown2_20 = ( a32Bit & 0x00080000 ) >> 19 ; + fCompatabilityOptions_Unknown2_21 = ( a32Bit & 0x00100000 ) >> 20 ; + fCompatabilityOptions_Unknown2_22 = ( a32Bit & 0x00200000 ) >> 21 ; + fCompatabilityOptions_Unknown2_23 = ( a32Bit & 0x00400000 ) >> 22 ; + fCompatabilityOptions_Unknown2_24 = ( a32Bit & 0x00800800 ) >> 23 ; + fCompatabilityOptions_Unknown2_25 = ( a32Bit & 0x01000800 ) >> 24 ; + fCompatabilityOptions_Unknown2_26 = ( a32Bit & 0x02000800 ) >> 25 ; + fCompatabilityOptions_Unknown2_27 = ( a32Bit & 0x04000800 ) >> 26 ; + fCompatabilityOptions_Unknown2_28 = ( a32Bit & 0x08000800 ) >> 27 ; + fCompatabilityOptions_Unknown2_29 = ( a32Bit & 0x10000800 ) >> 28 ; + fCompatabilityOptions_Unknown2_30 = ( a32Bit & 0x20000800 ) >> 29 ; + fCompatabilityOptions_Unknown2_31 = ( a32Bit & 0x40000800 ) >> 30 ; + fCompatabilityOptions_Unknown2_32 = ( a32Bit & 0x80000000 ) >> 31 ; } UINT32 WW8Dop::GetCompatabilityOptions2() const { UINT32 a32Bit = 0; - if (fCompatabilityOptions_Unknown2_1) a32Bit |= 0x00000001; + if (fCompatabilityOptions_Unknown2_1) a32Bit |= 0x00000001; if (fCompatabilityOptions_Unknown2_2) a32Bit |= 0x00000002; if (fDontUseHTMLAutoSpacing) a32Bit |= 0x00000004; if (fCompatabilityOptions_Unknown2_4) a32Bit |= 0x00000008; @@ -6963,13 +6963,13 @@ UINT32 WW8Dop::GetCompatabilityOptions2() const if (fCompatabilityOptions_Unknown2_12) a32Bit |= 0x00000800; if (fCompatabilityOptions_Unknown2_13) a32Bit |= 0x00001000; //#i42909# set thai "line breaking rules" compatibility option - // pflin, wonder whether bUseThaiLineBreakingRules is correct + // pflin, wonder whether bUseThaiLineBreakingRules is correct // when importing word document. if (bUseThaiLineBreakingRules) a32Bit |= 0x00002000; - else if (fCompatabilityOptions_Unknown2_14) a32Bit |= 0x00002000; + else if (fCompatabilityOptions_Unknown2_14) a32Bit |= 0x00002000; if (fCompatabilityOptions_Unknown2_15) a32Bit |= 0x00004000; if (fCompatabilityOptions_Unknown2_16) a32Bit |= 0x00008000; - if (fCompatabilityOptions_Unknown2_17) a32Bit |= 0x00010000; + if (fCompatabilityOptions_Unknown2_17) a32Bit |= 0x00010000; if (fCompatabilityOptions_Unknown2_18) a32Bit |= 0x00020000; if (fCompatabilityOptions_Unknown2_19) a32Bit |= 0x00040000; if (fCompatabilityOptions_Unknown2_20) a32Bit |= 0x00080000; @@ -7181,7 +7181,7 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const a16Bit |= 0x2000; } Set_UInt16(pData, a16Bit); - + pData += 48; a16Bit = 0x0080; Set_UInt16(pData, a16Bit); @@ -7211,7 +7211,7 @@ void WW8DopTypography::ReadFromMem(BYTE *&pData) if (cchFollowingPunct >= 0 && cchFollowingPunct < nMaxFollowing) rgxchFPunct[cchFollowingPunct]=0; - else + else rgxchFPunct[nMaxFollowing - 1]=0; if (cchLeadingPunct >= 0 && cchLeadingPunct < nMaxLeading) diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 722a1929326f..7e29e0aefa18 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -2,7 +2,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 @@ -129,7 +129,7 @@ private: enum SprmType {L_FIX=0, L_VAR=1, L_VAR2=2}; public: //7- ids are very different to 8+ ones - wwSprmParser(ww::WordVersion eVersion); + wwSprmParser(ww::WordVersion eVersion); /// Return the SPRM id at the beginning of this byte sequence sal_uInt16 GetSprmId(const sal_uInt8* pSp) const; @@ -157,7 +157,7 @@ class WW8PLCFspecial; struct WW8PLCFxDesc; class WW8PLCFx_PCD; -String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc, +String WW8ReadPString( SvStream& rStrm, rtl_TextEncoding eEnc, bool bAtEndSeekRel1 = true); /** @@ -220,20 +220,20 @@ public: long nStruct, long nStartPos = -1 ); ~WW8PLCFspecial() { delete[] pPLCF_PosArray; } long GetIdx() const { return nIdx; } - void SetIdx( long nI ) { nIdx = nI; } + void SetIdx( long nI ) { nIdx = nI; } long GetIMax() const { return nIMax; } bool SeekPos(long nPos); // geht ueber FC- bzw. CP-Wert // bzw. naechste groesseren Wert bool SeekPosExact(long nPos); - INT32 Where() const + INT32 Where() const { return ( nIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nIdx]; } bool Get(WW8_CP& rStart, void*& rpValue) const; bool GetData(long nIdx, WW8_CP& rPos, void*& rpValue) const; - const void* GetData( long nInIdx ) const + const void* GetData( long nInIdx ) const { - return ( nInIdx >= nIMax ) ? 0 - : (const void*)&pPLCF_Contents[nInIdx * nStru]; + return ( nInIdx >= nIMax ) ? 0 + : (const void*)&pPLCF_Contents[nInIdx * nStru]; } INT32 GetPos( long nInIdx ) const { return ( nInIdx >= nIMax ) ? SAL_MAX_INT32 : pPLCF_PosArray[nInIdx]; } @@ -262,7 +262,7 @@ public: void SetSprms( const BYTE* pSprms_, long nLen_ ); const BYTE* FindSprm(USHORT nId); const BYTE* operator ++( int ); - const BYTE* GetSprms() const + const BYTE* GetSprms() const { return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; } const BYTE* GetAktParams() const { return pAktParams; } USHORT GetAktId() const { return nAktId; } @@ -292,13 +292,13 @@ private: void MakeFailedPLCF(); public: - WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, + WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, WW8_CP nStartPos = -1 ); /* folgender Ctor generiert ggfs. einen PLC aus nPN und ncpN */ - WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, + WW8PLCF( SvStream* pSt, WW8_FC nFilePos, INT32 nPLCF, int nStruct, WW8_CP nStartPos, INT32 nPN, INT32 ncpN ); ~WW8PLCF(){ delete[] pPLCF_PosArray; } @@ -310,10 +310,10 @@ public: bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const; WW8PLCF& operator ++( int ) { if( nIdx < nIMax ) nIdx++; return *this; } - const void* GetData( INT32 nInIdx ) const + const void* GetData( INT32 nInIdx ) const { - return ( nInIdx >= nIMax ) ? 0 : - (const void*)&pPLCF_Contents[nInIdx * nStru]; + return ( nInIdx >= nIMax ) ? 0 : + (const void*)&pPLCF_Contents[nInIdx * nStru]; } }; @@ -348,11 +348,11 @@ public: bool SeekPos(long nPos); INT32 Where() const; bool Get(WW8_CP& rStart, WW8_CP& rEnd, void*& rpValue) const; - WW8PLCFpcd_Iter& operator ++( int ) - { - if( nIdx < rPLCF.nIMax ) - nIdx++; - return *this; + WW8PLCFpcd_Iter& operator ++( int ) + { + if( nIdx < rPLCF.nIMax ) + nIdx++; + return *this; } }; @@ -377,7 +377,7 @@ private: WW8PLCFx(const WW8PLCFx&); WW8PLCFx& operator=(const WW8PLCFx&); public: - WW8PLCFx(ww::WordVersion eVersion, bool bSprm) + WW8PLCFx(ww::WordVersion eVersion, bool bSprm) : meVer(eVersion), bIsSprm(bSprm), bDirty(false) {} virtual ~WW8PLCFx() {} bool IsSprm() const { return bIsSprm; } @@ -437,7 +437,7 @@ private: WW8PLCFx_PCD(const WW8PLCFx_PCD&); WW8PLCFx_PCD& operator=(const WW8PLCFx_PCD&); public: - WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, + WW8PLCFx_PCD(ww::WordVersion eVersion, WW8PLCFpcd* pPLCFpcd, WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); virtual ULONG GetIMax() const; @@ -449,7 +449,7 @@ public: virtual WW8PLCFx& operator ++( int ); WW8_CP AktPieceStartFc2Cp( WW8_FC nStartPos ); WW8_FC AktPieceStartCp2Fc( WW8_CP nCp ); - void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos, + void AktPieceFc2Cp(WW8_CP& rStartPos, WW8_CP& rEndPos, const WW8ScannerBase *pSBase); WW8PLCFpcd_Iter* GetPLCFIter() { return pPcdI; } void SetClipStart(WW8_CP nIn) { nClipStart = nIn; } @@ -477,49 +477,49 @@ public: public: WW8_FC mnFC; - sal_uInt8* mpData; + sal_uInt8* mpData; sal_uInt16 mnLen; sal_uInt16 mnIStd; // only for Fkp.Papx (actualy Style-Nr) bool mbMustDelete; - explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0), + explicit Entry(WW8_FC nFC) : mnFC(nFC), mpData(0), mnLen(0), mnIStd(0), mbMustDelete(false) {} Entry(const Entry &rEntry); ~Entry(); bool operator<(const Entry& rEntry) const; Entry& operator=(const Entry& rEntry); }; - + sal_uInt8 maRawData[512]; std::vector<Entry> maEntries; long nItemSize; // entweder 1 Byte oder ein komplettes BX // Offset in Stream where last read of 52 bytes took place - long nFilePos; + long nFilePos; sal_uInt8 mnIdx; // Pos-Merker ePLCFT ePLCF; sal_uInt8 mnIMax; // Anzahl der Eintraege - + wwSprmParser maSprmParser; public: - WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm, - SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl, + WW8Fkp (ww::WordVersion eVersion, SvStream* pFKPStrm, + SvStream* pDataStrm, long _nFilePos, long nItemSiz, ePLCFT ePl, WW8_FC nStartFc = -1); void Reset(WW8_FC nPos); long GetFilePos() const { return nFilePos; } sal_uInt8 GetIdx() const { return mnIdx; } bool SetIdx(sal_uInt8 nI); bool SeekPos(WW8_FC nFc); - WW8_FC Where() const - { - return (mnIdx < mnIMax) ? maEntries[mnIdx].mnFC : WW8_FC_MAX; + WW8_FC Where() const + { + return (mnIdx < mnIMax) ? maEntries[mnIdx].mnFC : WW8_FC_MAX; } - WW8Fkp& operator ++( int ) - { + WW8Fkp& operator ++( int ) + { if (mnIdx < mnIMax) mnIdx++; - return *this; + return *this; } BYTE* Get( WW8_FC& rStart, WW8_FC& rEnd, sal_Int32& rLen ) const; sal_uInt16 GetIstd() const { return maEntries[mnIdx].mnIStd; } @@ -601,7 +601,7 @@ private: WW8PLCFx_Cp_FKP(const WW8PLCFx_Cp_FKP&); WW8PLCFx_Cp_FKP& operator=(const WW8PLCFx_Cp_FKP&); public: - WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, + WW8PLCFx_Cp_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8ScannerBase& rBase, ePLCFT ePl ); virtual ~WW8PLCFx_Cp_FKP(); void ResetAttrStartEnd(); @@ -633,7 +633,7 @@ private: WW8PLCFx_SEPX(const WW8PLCFx_SEPX&); WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&); public: - WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, + WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, WW8_CP nStartCp ); virtual ~WW8PLCFx_SEPX(); virtual ULONG GetIdx() const; @@ -662,7 +662,7 @@ private: WW8PLCFx_SubDoc(const WW8PLCFx_SubDoc&); WW8PLCFx_SubDoc& operator=(const WW8PLCFx_SubDoc&); public: - WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, + WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0); virtual ~WW8PLCFx_SubDoc(); virtual ULONG GetIdx() const; @@ -718,7 +718,7 @@ private: long nIMax; // Number of Booknotes USHORT nIsEnd; int nBookmarkId; // counter incremented by GetUniqueBookmarkName. - + //No copying WW8PLCFx_Book(const WW8PLCFx_Book&); WW8PLCFx_Book& operator=(const WW8PLCFx_Book&); @@ -835,7 +835,7 @@ private: //drawboxes we want the true offsets WW8PLCFxDesc aD[MAN_ANZ_PLCF]; - WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd, + WW8PLCFxDesc *pChp, *pPap, *pSep, *pFld, *pFtn, *pEdn, *pBkm, *pPcd, *pPcdA, *pAnd; WW8PLCFspecial *pFdoa, *pTxbx, *pTxbxBkd,*pMagicTables, *pSubdocs; BYTE* pExtendedAtrds; @@ -854,7 +854,7 @@ private: void AdvNoSprm(short nIdx, bool bStart); USHORT GetId(const WW8PLCFxDesc* p ) const; public: - WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, + WW8PLCFMan(WW8ScannerBase* pBase, ManTypes nType, long nStartCp, bool bDoingDrawTextBox = false); ~WW8PLCFMan(); @@ -881,11 +881,11 @@ public: const BYTE* HasCharSprm( USHORT nId ) const; bool HasCharSprm(USHORT nId, std::vector<const BYTE *> &rResult) const; - WW8PLCFx_Cp_FKP* GetChpPLCF() const + WW8PLCFx_Cp_FKP* GetChpPLCF() const { return (WW8PLCFx_Cp_FKP*)pChp->pPLCFx; } - WW8PLCFx_Cp_FKP* GetPapPLCF() const + WW8PLCFx_Cp_FKP* GetPapPLCF() const { return (WW8PLCFx_Cp_FKP*)pPap->pPLCFx; } - WW8PLCFx_SEPX* GetSepPLCF() const + WW8PLCFx_SEPX* GetSepPLCF() const { return (WW8PLCFx_SEPX*)pSep->pPLCFx; } WW8PLCFxDesc* GetPap() const { return pPap; } bool TransferOpenSprms(std::stack<USHORT> &rStack); @@ -911,7 +911,7 @@ struct WW8PLCFxSaveAll class WW8ScannerBase { -friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, +friend WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); friend WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP( SvStream*, SvStream*, SvStream*, const WW8ScannerBase&, ePLCFT ); @@ -969,10 +969,10 @@ public: //given that we never write fastsaved files you can use it, otherwise //I will beat you with a stick WW8_CP WW8Fc2Cp(WW8_FC nFcPos) const ; - WW8_FC WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode = 0, + WW8_FC WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode = 0, WW8_CP* pNextPieceCp = 0, bool* pTestFlag = 0) const; - xub_StrLen WW8ReadString(SvStream& rStrm, String& rStr, WW8_CP nAktStartCp, + xub_StrLen WW8ReadString(SvStream& rStrm, String& rStr, WW8_CP nAktStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const; }; @@ -1418,7 +1418,7 @@ public: // 0x422 - 0x4D4 == ignore WW8_FC fcHplxsdr; //bizarrely, word xp seems to require this set to shows dates from AtrdExtra - UINT32 lcbHplxsdr; + UINT32 lcbHplxsdr; /* General-Varaiblen, die fuer Ver67 und Ver8 verwendet werden, @@ -1429,7 +1429,7 @@ public: INT32 cpnBteChp; INT32 cpnBtePap; /* - The actual nFib, moved here because some readers assumed + The actual nFib, moved here because some readers assumed they couldn't read any format with nFib > some constant */ UINT16 nFib_actual; // 0x05bc #i56856# @@ -1497,12 +1497,12 @@ public: typedef BYTE HdFtFlags; namespace nsHdFtFlags { - const HdFtFlags WW8_HEADER_EVEN = 0x01; - const HdFtFlags WW8_HEADER_ODD = 0x02; - const HdFtFlags WW8_FOOTER_EVEN = 0x04; - const HdFtFlags WW8_FOOTER_ODD = 0x08; - const HdFtFlags WW8_HEADER_FIRST = 0x10; - const HdFtFlags WW8_FOOTER_FIRST = 0x20; + const HdFtFlags WW8_HEADER_EVEN = 0x01; + const HdFtFlags WW8_HEADER_ODD = 0x02; + const HdFtFlags WW8_FOOTER_EVEN = 0x04; + const HdFtFlags WW8_FOOTER_ODD = 0x08; + const HdFtFlags WW8_HEADER_FIRST = 0x10; + const HdFtFlags WW8_FOOTER_FIRST = 0x20; } /// Document Properties @@ -1628,26 +1628,26 @@ public: UINT32 fTransparentMetafiles :1; // see above UINT32 fShowBreaksInFrames :1; // see above UINT32 fSwapBordersFacingPgs :1; // see above - UINT32 fCompatabilityOptions_Unknown1_13 :1; // #i78591# - UINT32 fExpShRtn :1; // #i78591# and #i56856# - UINT32 fCompatabilityOptions_Unknown1_15 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_16 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_13 :1; // #i78591# + UINT32 fExpShRtn :1; // #i78591# and #i56856# + UINT32 fCompatabilityOptions_Unknown1_15 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_16 :1; // #i78591# UINT32 fSuppressTopSpacingMac5 :1; // Suppress extra line spacing at top // of page like MacWord 5.x UINT32 fTruncDxaExpand :1; // Expand/Condense by whole number of points UINT32 fPrintBodyBeforeHdr :1; // Print body text before header/footer UINT32 fNoLeading :1; // Don't add extra spacebetween rows of text - UINT32 fCompatabilityOptions_Unknown1_21 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_21 :1; // #i78591# UINT32 fMWSmallCaps : 1; // Use larger small caps like MacWord 5.x - UINT32 fCompatabilityOptions_Unknown1_23 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_24 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_25 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_26 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_27 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_28 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_29 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_30 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown1_31 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_23 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_24 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_25 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_26 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_27 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_28 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_29 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_30 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown1_31 :1; // #i78591# UINT32 fUsePrinterMetrics : 1; //The magic option // hier sollte bei nFib <= 105 Schluss sein, sonst ist Datei fehlerhaft! @@ -1687,38 +1687,38 @@ public: INT16 hpsZoonFontPag; INT16 dywDispPag; - UINT32 fCompatabilityOptions_Unknown2_1 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_2 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_1 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_2 :1; // #i78591# UINT32 fDontUseHTMLAutoSpacing:1; - UINT32 fCompatabilityOptions_Unknown2_4 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_5 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_6 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_7 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_8 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_9 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_10 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_11 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_12 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_13 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_14 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_15 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_16 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_17 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_18 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_19 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_20 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_21 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_22 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_23 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_24 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_25 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_26 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_27 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_28 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_29 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_30 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_31 :1; // #i78591# - UINT32 fCompatabilityOptions_Unknown2_32 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_4 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_5 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_6 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_7 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_8 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_9 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_10 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_11 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_12 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_13 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_14 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_15 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_16 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_17 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_18 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_19 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_20 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_21 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_22 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_23 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_24 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_25 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_26 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_27 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_28 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_29 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_30 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_31 :1; // #i78591# + UINT32 fCompatabilityOptions_Unknown2_32 :1; // #i78591# UINT16 fUnknown3:15; UINT16 fUseBackGroundInAllmodes:1; diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 5d943b80a759..a17853521072 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -2,7 +2,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/xml/ForbiddenCharactersEnum.hxx b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx index 374d70593d87..15cb576faebf 100644 --- a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx +++ b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx @@ -2,7 +2,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 @@ -39,6 +39,6 @@ enum ForbiddenCharactersEnum SW_FORBIDDEN_CHARACTER_MAX }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 8862af145f90..01e2ff6e401e 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -2,7 +2,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 @@ -102,7 +102,7 @@ SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange ) class XTextRangeOrNodeIndexPosition { Reference<XTextRange> xRange; - SwNodeIndex* pIndex; /// pIndex will point to the *previous* node + SwNodeIndex* pIndex; /// pIndex will point to the *previous* node public: XTextRangeOrNodeIndexPosition(); @@ -131,7 +131,7 @@ XTextRangeOrNodeIndexPosition::~XTextRangeOrNodeIndexPosition() void XTextRangeOrNodeIndexPosition::Set( Reference<XTextRange> & rRange ) { - xRange = rRange->getStart(); // set bookmark + xRange = rRange->getStart(); // set bookmark if (NULL != pIndex) { delete pIndex; @@ -145,7 +145,7 @@ void XTextRangeOrNodeIndexPosition::Set( SwNodeIndex& rIndex ) delete pIndex; pIndex = new SwNodeIndex(rIndex); - (*pIndex)-- ; // previous node!!! + (*pIndex)-- ; // previous node!!! xRange = NULL; } @@ -186,7 +186,7 @@ void XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos) else { rPos.nNode = *pIndex; - rPos.nNode++; // pIndex points to previous index !!! + rPos.nNode++; // pIndex points to previous index !!! rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), 0 ); } } @@ -218,9 +218,9 @@ public: RedlineType_t eType; // info fields: - OUString sAuthor; /// change author string - OUString sComment; /// change comment string - util::DateTime aDateTime; /// change DateTime + OUString sAuthor; /// change author string + OUString sComment; /// change comment string + util::DateTime aDateTime; /// change DateTime sal_Bool bMergeLastParagraph; /// the SwRedline::IsDelLastPara flag // each position can may be either empty, an XTextRange, or an SwNodeIndex @@ -558,7 +558,7 @@ void XMLRedlineImportHelper::SetCursor( } void XMLRedlineImportHelper::AdjustStartNodeCursor( - const OUString& rId, /// ID used in RedlineAdd() call + const OUString& rId, /// ID used in RedlineAdd() call sal_Bool /*bStart*/, Reference<XTextRange> & /*rRange*/) { @@ -709,13 +709,13 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline( // 2) util::DateTime -> DateTime DateTime aDT; - aDT.SetYear( pRedlineInfo->aDateTime.Year ); - aDT.SetMonth( pRedlineInfo->aDateTime.Month ); - aDT.SetDay( pRedlineInfo->aDateTime.Day ); - aDT.SetHour( pRedlineInfo->aDateTime.Hours ); - aDT.SetMin( pRedlineInfo->aDateTime.Minutes ); - aDT.SetSec( pRedlineInfo->aDateTime.Seconds ); - aDT.Set100Sec( pRedlineInfo->aDateTime.HundredthSeconds ); + aDT.SetYear( pRedlineInfo->aDateTime.Year ); + aDT.SetMonth( pRedlineInfo->aDateTime.Month ); + aDT.SetDay( pRedlineInfo->aDateTime.Day ); + aDT.SetHour( pRedlineInfo->aDateTime.Hours ); + aDT.SetMin( pRedlineInfo->aDateTime.Minutes ); + aDT.SetSec( pRedlineInfo->aDateTime.Seconds ); + aDT.Set100Sec( pRedlineInfo->aDateTime.HundredthSeconds ); // 3) recursively convert next redline // ( check presence and sanity of hierarchical redline info ) @@ -731,8 +731,8 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline( SwRedlineData* pData = new SwRedlineData(pRedlineInfo->eType, nAuthorId, aDT, pRedlineInfo->sComment, - pNext, // next data (if available) - NULL); // no extra data + pNext, // next data (if available) + NULL); // no extra data return pData; } diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index f6da99528225..e8e0f1267d8e 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -2,7 +2,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 @@ -76,56 +76,56 @@ class XMLRedlineImportHelper public: XMLRedlineImportHelper( - sal_Bool bIgnoreRedlines, /// ignore redlines mode + sal_Bool bIgnoreRedlines, /// ignore redlines mode - // property sets of model + import info for saving + restoring the + // property sets of model + import info for saving + restoring the // redline mode const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rModel, const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rImportInfoSet ); + ::com::sun::star::beans::XPropertySet> & rImportInfoSet ); virtual ~XMLRedlineImportHelper(); /// create a redline object /// (The redline will be inserted into the document after both start /// and end cursor has been set.) - void Add( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment + void Add( + const ::rtl::OUString& rType, /// redline type (insert, del,... ) + const ::rtl::OUString& rId, /// use to identify this redline + const ::rtl::OUString& rAuthor, /// name of the author + const ::rtl::OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastParagraph); /// merge last paragraph? /// create a text section for the redline, and return an /// XText/XTextCursor that may be used to write into it. - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> CreateRedlineTextSection( - ::com::sun::star::uno::Reference< /// needed to get the document + ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> xOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const ::rtl::OUString& rId); /// ID used to RedlineAdd() call /// Set start or end position for a redline in the text body. /// Accepts XTextRange objects. void SetCursor( - const ::rtl::OUString& rId, /// ID used in RedlineAdd() call - sal_Bool bStart, /// start or end Range - ::com::sun::star::uno::Reference< /// the actual XTextRange + const ::rtl::OUString& rId, /// ID used in RedlineAdd() call + sal_Bool bStart, /// start or end Range + ::com::sun::star::uno::Reference< /// the actual XTextRange ::com::sun::star::text::XTextRange> & rRange, /// text range is (from an XML view) outside of a paragraph /// (i.e. before a table) - sal_Bool bIsOusideOfParagraph); + sal_Bool bIsOusideOfParagraph); /** * Adjust the start (end) position for a redline that begins in a - * start node. It takes the cursor positions _inside_ the redlined + * start node. It takes the cursor positions _inside_ the redlined * element (e.g. section or table). * * We will do sanity checking of the given text range: It will * only be considered valid if it points to the next text node * after the position given in a previous SetCursor */ void AdjustStartNodeCursor( - const ::rtl::OUString& rId, /// ID used in RedlineAdd() call + const ::rtl::OUString& rId, /// ID used in RedlineAdd() call sal_Bool bStart, /// XTextRange _inside_ a table/section ::com::sun::star::uno::Reference< @@ -138,7 +138,7 @@ public: void SetRecordChanges( sal_Bool bRecordChanges ); /// set redline protection key - void SetProtectionKey( + void SetProtectionKey( const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); private: @@ -148,8 +148,8 @@ private: void InsertIntoDocument(RedlineInfo* pRedline); SwRedlineData* ConvertRedline( - RedlineInfo* pRedline, /// RedlineInfo to be converted - SwDoc* pDoc); /// document needed for Author-ID conversion + RedlineInfo* pRedline, /// RedlineInfo to be converted + SwDoc* pDoc); /// document needed for Author-ID conversion /** save the redline mode (if rPropertySet is non-null) */ void SaveRedlineMode( diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 180973470216..ff073100ef27 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -2,7 +2,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 @@ -274,7 +274,7 @@ sal_Int32 ReadThroughComponent( aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); DBG_ERROR( aError.GetBuffer() ); #endif - + return ERR_SWG_READ_ERROR; } catch( packages::zip::ZipIOException& r) @@ -445,10 +445,10 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc ) for ( USHORT n = 1; n < rColls.Count(); ++n ) { SwTxtFmtColl* pColl = rColls[ n ]; - //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei + //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei if ( pColl->IsAssignedToListLevelOfOutlineStyle() ) { - // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true; + // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true; aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei } @@ -851,7 +851,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S } } - rDoc.acquire(); // prevent deletion + rDoc.acquire(); // prevent deletion sal_uInt32 nRet = 0; // save redline mode into import info property set diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 4a6db2d80be0..9a264742b498 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -2,7 +2,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 @@ -204,34 +204,34 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, pStatusBarItem->GetValue() >>= xStatusIndicator; } -// try -// { -// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel()); -// if (xModel.is()) -// { -// uno::Sequence< beans::PropertyValue > xMediaDescr -// uno::Reference<frame::XController> xController( -// xModel->getCurrentController()); -// if( xController.is()) -// { -// uno::Reference<frame::XFrame> xFrame( xController->getFrame()); -// if( xFrame.is()) -// { -// uno::Reference<task::XStatusIndicatorFactory> xFactory( -// xFrame, uno::UNO_QUERY ); -// if( xFactory.is()) -// { -// xStatusIndicator = -// xFactory->createStatusIndicator(); -// } -// } -// } -// } -// } -// catch( const RuntimeException& ) -// { -// xStatusIndicator = 0; -// } +// try +// { +// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel()); +// if (xModel.is()) +// { +// uno::Sequence< beans::PropertyValue > xMediaDescr +// uno::Reference<frame::XController> xController( +// xModel->getCurrentController()); +// if( xController.is()) +// { +// uno::Reference<frame::XFrame> xFrame( xController->getFrame()); +// if( xFrame.is()) +// { +// uno::Reference<task::XStatusIndicatorFactory> xFactory( +// xFrame, uno::UNO_QUERY ); +// if( xFactory.is()) +// { +// xStatusIndicator = +// xFactory->createStatusIndicator(); +// } +// } +// } +// } +// } +// catch( const RuntimeException& ) +// { +// xStatusIndicator = 0; +// } // set progress range and start status indicator sal_Int32 nProgressRange(1000000); @@ -472,8 +472,8 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 && !(bOrganizerMode || bBlock || bErr) ) { -// DBG_ASSERT( !pDoc->GetDocStat().bModified, -// "doc stat is modified!" ); +// DBG_ASSERT( !pDoc->GetDocStat().bModified, +// "doc stat is modified!" ); OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") ); try { diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index a622d59a362d..f2e1020b3199 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -2,7 +2,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 @@ -72,18 +72,18 @@ private: /// the component we export const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> & xComponent, - const sal_Char* pStreamName, /// the stream name + const sal_Char* pStreamName, /// the stream name /// service factory for pServiceName const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rFactory, - const sal_Char* pServiceName, /// service name of the component + const sal_Char* pServiceName, /// service name of the component /// the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, /// output descriptor const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc, - sal_Bool bPlainStream ); /// neither compress nor encrypt + sal_Bool bPlainStream ); /// neither compress nor encrypt /// write a single output stream /// (to be called either directly or by WriteThroughComponent(...)) @@ -102,6 +102,6 @@ private: }; -#endif // _WRTXML_HXX +#endif // _WRTXML_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 807159040be4..06dcfe133b94 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -2,7 +2,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,13 +71,13 @@ enum SvXMLTokenMapAttrs static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = { - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, - { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, - { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE }, - { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW }, - { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION }, - { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT }, - { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER }, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, + { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, + { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE }, + { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW }, + { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION }, + { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT }, + { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER }, XML_TOKEN_MAP_END }; @@ -228,7 +228,7 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem ) { GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sValue ); GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) ); + // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) ); GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); } diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx index b0795a9d0869..e6506e2a4453 100644 --- a/sw/source/filter/xml/xmlbrshe.hxx +++ b/sw/source/filter/xml/xmlbrshe.hxx @@ -2,7 +2,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 @@ -38,21 +38,21 @@ class SwXMLExport; class SwXMLBrushItemExport { - SwXMLExport& rExport; + SwXMLExport& rExport; protected: - + SwXMLExport& GetExport() { return rExport; } public: SwXMLBrushItemExport( SwXMLExport& rExport ); ~SwXMLBrushItemExport(); - + // core API void exportXML( const SvxBrushItem& rItem ); }; -#endif // _XMLBRSHE_HXX +#endif // _XMLBRSHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index fb0f54f21bf3..af1ec4b2ddc4 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -2,7 +2,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 @@ -42,8 +42,8 @@ class SwXMLBrushItemImportContext : public SvXMLImportContext { private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; - SvxBrushItem *pItem; - + SvxBrushItem *pItem; + void ProcessAttrs( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, @@ -59,7 +59,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, - const SvxBrushItem& rItem ); + const SvxBrushItem& rItem ); SwXMLBrushItemImportContext( SvXMLImport& rImport, @@ -68,7 +68,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, - sal_uInt16 nWhich ); + sal_uInt16 nWhich ); virtual ~SwXMLBrushItemImportContext(); @@ -83,6 +83,6 @@ public: }; -#endif // _XMLBRSHI_HXX +#endif // _XMLBRSHI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 31555e592204..c81731fea397 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -2,7 +2,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 @@ -129,7 +129,7 @@ void SwXMLExport::SetCurPaM( SwPaM& rPaM, sal_Bool bWhole, sal_Bool bTabOnly ) SwXMLExport::SwXMLExport( const uno::Reference< lang::XMultiServiceFactory > xServiceFactory, sal_uInt16 nExportFlags) -: SvXMLExport( xServiceFactory, MAP_INCH, XML_TEXT, nExportFlags ), +: SvXMLExport( xServiceFactory, MAP_INCH, XML_TEXT, nExportFlags ), #ifdef XML_CORE_API pCurPaM( 0 ), pOrigPaM( &rPaM ), @@ -160,7 +160,7 @@ SwXMLExport::SwXMLExport( const Reference< XGraphicObjectResolver > & rEmbeddedGrfObjs, sal_Bool bExpWholeDoc, sal_Bool bExpFirstTableOnly, sal_Bool bShowProg ) -: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, rEmbeddedGrfObjs, +: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, rEmbeddedGrfObjs, SW_MOD()->GetMetric( rPaM.GetDoc()->get(IDocumentSettingAccess::HTML_MODE) ) ), pCurPaM( 0 ), pOrigPaM( &rPaM ), @@ -292,7 +292,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) SfxObjectShell* pObjSh = pDoc->GetDocShell(); if( pObjSh ) - pObjSh->UpdateDocInfoForSave(); // update information + pObjSh->UpdateDocInfoForSave(); // update information } if( bShowProgress ) { @@ -321,7 +321,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) nRef += pDoc->GetCharFmts()->Count() - 1; nRef += pDoc->GetFrmFmts()->Count() - 1; nRef += pDoc->GetTxtFmtColls()->Count() - 1; -// nRef += pDoc->GetPageDescCnt(); +// nRef += pDoc->GetPageDescCnt(); nRef *= 2; // for the above styles, xmloff will increment by 2! // #i93174#: count all paragraphs for the progress bar nRef += aDocStat.nAllPara; // 1: only content, no autostyle @@ -444,7 +444,7 @@ __EXPORT SwXMLExport::~SwXMLExport() void SwXMLExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created SvXMLExport::_ExportFontDecls(); } @@ -814,8 +814,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLExport( - // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | - // EXPORT_FONTDECLS ); + // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | + // EXPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLExport( rSMgr, EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS|EXPORT_OASIS ); @@ -841,8 +841,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLExport( - // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS | - // EXPORT_FONTDECLS ); + // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS | + // EXPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLExport( rSMgr, EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS | @@ -978,7 +978,7 @@ void SwXMLExport::ExportCurPaM( sal_Bool bExportWholePaM ) else if( pNd == &pDoc->GetNodes().GetEndOfContent() ) break; - pCurPaM->GetPoint()->nNode++; // next node + pCurPaM->GetPoint()->nNode++; // next node sal_uInt32 nPos = pCurPaM->GetPoint()->nNode.GetIndex(); diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 7b081378236a..e613d6db5aa3 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -2,7 +2,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,24 +57,24 @@ class SwXMLExport : public SvXMLExport friend class SwXMLExpContext; #ifdef XML_CORE_API - SwPaM *pCurPaM; // the current PaM - SwPaM *pOrigPaM; // the original PaM + SwPaM *pCurPaM; // the current PaM + SwPaM *pOrigPaM; // the original PaM #endif - SvXMLUnitConverter *pTwipUnitConv; + SvXMLUnitConverter *pTwipUnitConv; - SvXMLExportItemMapper *pTableItemMapper; - SwXMLTableLinesCache_Impl *pTableLines; + SvXMLExportItemMapper *pTableItemMapper; + SwXMLTableLinesCache_Impl *pTableLines; - SvXMLItemMapEntriesRef xTableItemMap; - SvXMLItemMapEntriesRef xTableRowItemMap; - SvXMLItemMapEntriesRef xTableCellItemMap; + SvXMLItemMapEntriesRef xTableItemMap; + SvXMLItemMapEntriesRef xTableRowItemMap; + SvXMLItemMapEntriesRef xTableCellItemMap; UniReference < XMLPropertySetMapper > xParaPropMapper; - sal_Bool bExportWholeDoc : 1;// export whole document? - sal_Bool bBlock : 1; // export text block? - sal_Bool bExportFirstTableOnly : 1; - sal_Bool bShowProgress : 1; + sal_Bool bExportWholeDoc : 1;// export whole document? + sal_Bool bBlock : 1; // export text block? + sal_Bool bExportFirstTableOnly : 1; + sal_Bool bShowProgress : 1; sal_Bool bSavedShowChanges : 1; void _InitItemExport(); @@ -187,6 +187,6 @@ inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const } -#endif // _XMLEXP_HXX +#endif // _XMLEXP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 048c6996847e..4f295026ae6f 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -2,7 +2,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 @@ -508,23 +508,23 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( /** xml -> MemberId - border-padding ALL_BORDER_PADDING - border-padding-before LEFT_BORDER_PADDING - border-padding-after RIGHT_BORDER_PADDING - border-padding-start TOP_BORDER_PADDING - border-padding-end BOTTOM_BORDER_PADDING - - border ALL_BORDER - border-before LEFT_BORDER - border-after RIGHT_BORDER - border-start TOP_BORDER - border-end BOTTOM_BORDER - - border-line-width ALL_BORDER_LINE_WIDTH - border-line-width-before LEFT_BORDER_LINE_WIDTH - border-line-width-after RIGHT_BORDER_LINE_WIDTH - border-line-width-start TOP_BORDER_LINE_WIDTH - border-line-width-end BOTTOM_BORDER_LINE_WIDTH + border-padding ALL_BORDER_PADDING + border-padding-before LEFT_BORDER_PADDING + border-padding-after RIGHT_BORDER_PADDING + border-padding-start TOP_BORDER_PADDING + border-padding-end BOTTOM_BORDER_PADDING + + border ALL_BORDER + border-before LEFT_BORDER + border-after RIGHT_BORDER + border-start TOP_BORDER + border-end BOTTOM_BORDER + + border-line-width ALL_BORDER_LINE_WIDTH + border-line-width-before LEFT_BORDER_LINE_WIDTH + border-line-width-after RIGHT_BORDER_LINE_WIDTH + border-line-width-start TOP_BORDER_LINE_WIDTH + border-line-width-end BOTTOM_BORDER_LINE_WIDTH */ const SvxBorderLine* pLeft = pBox->GetLeft(); diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 108d8a50f0bf..e622a6c1763b 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -2,7 +2,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 @@ -33,12 +33,12 @@ #include <tools/ref.hxx> #include "xmlitmap.hxx" -#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items -#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from +#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items +#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from // parent item sets -#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element +#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element // even if its empty -#define XML_EXPORT_FLAG_IGN_WS 0x0008 +#define XML_EXPORT_FLAG_IGN_WS 0x0008 namespace rtl { class OUString; } class SvXMLUnitConverter; @@ -123,7 +123,7 @@ public: inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); - static sal_Bool QueryXMLValue( const SfxPoolItem& rItem, + static sal_Bool QueryXMLValue( const SfxPoolItem& rItem, ::rtl::OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ); }; @@ -134,6 +134,6 @@ SvXMLExportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) mrMapEntries = rMapEntries; } -#endif // _XMLITMPR_HXX +#endif // _XMLITMPR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 3e89060e642b..ff83864c8569 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -2,7 +2,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 @@ -109,7 +109,7 @@ inline sal_Bool SwXMLConditionParser_Impl::SkipWS() inline sal_Bool SwXMLConditionParser_Impl::MatchChar( sal_Unicode c ) { sal_Bool bRet = sal_False; - if( nPos < nLength && c == sInput[nPos] ) + if( nPos < nLength && c == sInput[nPos] ) { nPos++; bRet = sal_True; @@ -286,7 +286,7 @@ SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5, 2 ) class SwXMLTextStyleContext_Impl : public XMLTextStyleContext { - SwXMLConditions_Impl *pConditions; + SwXMLConditions_Impl *pConditions; protected: @@ -450,16 +450,16 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext { - OUString sMasterPageName; - SfxItemSet *pItemSet; + OUString sMasterPageName; + SfxItemSet *pItemSet; SwXMLTextStyleContext_Impl *pTextStyle; SvXMLStylesContext &rStyles; - OUString sDataStyleName; + OUString sDataStyleName; - sal_Bool bHasMasterPageName : 1; - sal_Bool bPageDescConnected : 1; - sal_Bool bDataStyleIsResolved; + sal_Bool bHasMasterPageName : 1; + sal_Bool bPageDescConnected : 1; + sal_Bool bDataStyleIsResolved; SvXMLImportContext *CreateItemSetContext( sal_uInt16 nPrefix, @@ -524,7 +524,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey, if (rValue.getLength() > 0) { sDataStyleName = rValue; - bDataStyleIsResolved = sal_False; // needs to be resolved + bDataStyleIsResolved = sal_False; // needs to be resolved } } else diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index e815ca96e784..a18c43e320bd 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -2,7 +2,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/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index ea9ec6b3d404..c86306cfa82e 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -2,7 +2,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/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 3f34c6ae6d03..a42cfa8092aa 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -2,7 +2,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 @@ -116,14 +116,14 @@ enum SwXMLDocTokens static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] = { - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, + { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, + { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, { XML_NAMESPACE_XFORMS, XML_MODEL, XML_TOK_DOC_XFORMS }, XML_TOKEN_MAP_END }; @@ -240,10 +240,10 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext( pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList, sal_True ); break; -// case XML_TOK_DOC_USESTYLES: -// pContext = GetSwImport().CreateUseStylesContext( rLocalName, -// xAttrList ); -// break; +// case XML_TOK_DOC_USESTYLES: +// pContext = GetSwImport().CreateUseStylesContext( rLocalName, +// xAttrList ); +// break; case XML_TOK_DOC_MASTERSTYLES: pContext = GetSwImport().CreateMasterStylesContext( rLocalName, xAttrList ); @@ -449,7 +449,7 @@ SvXMLImportContext *SwXMLImport::CreateContext( SwXMLImport::SwXMLImport( const uno::Reference< lang::XMultiServiceFactory > xServiceFactory, sal_uInt16 nImportFlags) -: SvXMLImport( xServiceFactory, nImportFlags ), +: SvXMLImport( xServiceFactory, nImportFlags ), pSttNdIdx( 0 ), pTableItemMapper( 0 ), pDocElemTokenMap( 0 ), @@ -482,7 +482,7 @@ SwXMLImport::SwXMLImport( const uno::Reference< frame::XModel > & rModel, const uno::Reference< document::XGraphicObjectResolver > & rEGO, SvStorage *pPkg ) -: SvXMLImport( xServiceFactory, rModel, rEGO ), +: SvXMLImport( xServiceFactory, rModel, rEGO ), bLoadDoc( bLDoc ), bInsert( bInsertMode ), nStyleFamilyMask( nStyleFamMask ), @@ -568,7 +568,7 @@ OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rT if( !xCrsrTunnel.is() ) return 0; OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" ); return pTxtCrsr; } @@ -921,10 +921,10 @@ void SwXMLImport::endDocument( void ) if( pNextNd->CanJoinPrev(/* &pPos->nNode*/ ) && *pSttNdIdx != pPos->nNode ) { -// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode(); -// pPos->nContent.Assign( pPrevNd, 0 ); -// pPaM->SetMark(); pPaM->DeleteMark(); -// pPrevNd->JoinNext(); +// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode(); +// pPos->nContent.Assign( pPrevNd, 0 ); +// pPaM->SetMark(); pPaM->DeleteMark(); +// pPrevNd->JoinNext(); pNextNd->JoinPrev(); } } @@ -1604,8 +1604,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLImport( - // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | - // IMPORT_FONTDECLS ); + // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | + // IMPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | @@ -1632,11 +1632,11 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLImport( - // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | - // IMPORT_FONTDECLS ); + // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + // IMPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLImport( rSMgr, - IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | IMPORT_FONTDECLS ); } diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 013df52e6b07..65ac50e127fb 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -2,7 +2,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,48 +55,48 @@ namespace SwImport { class SwXMLImport: public SvXMLImport { - SwNodeIndex *pSttNdIdx; - - SvXMLUnitConverter *pTwipUnitConv; - SvXMLImportItemMapper *pTableItemMapper;// paragraph item import - SvXMLTokenMap *pDocElemTokenMap; - SvXMLTokenMap *pTableElemTokenMap; - SvXMLTokenMap *pTableCellAttrTokenMap; - SvXMLGraphicHelper *pGraphicResolver; - SvXMLEmbeddedObjectHelper *pEmbeddedResolver; - - SvXMLItemMapEntriesRef xTableItemMap; - SvXMLItemMapEntriesRef xTableColItemMap; - SvXMLItemMapEntriesRef xTableRowItemMap; - SvXMLItemMapEntriesRef xTableCellItemMap; - SvStorageRef xPackage; + SwNodeIndex *pSttNdIdx; + + SvXMLUnitConverter *pTwipUnitConv; + SvXMLImportItemMapper *pTableItemMapper;// paragraph item import + SvXMLTokenMap *pDocElemTokenMap; + SvXMLTokenMap *pTableElemTokenMap; + SvXMLTokenMap *pTableCellAttrTokenMap; + SvXMLGraphicHelper *pGraphicResolver; + SvXMLEmbeddedObjectHelper *pEmbeddedResolver; + + SvXMLItemMapEntriesRef xTableItemMap; + SvXMLItemMapEntriesRef xTableColItemMap; + SvXMLItemMapEntriesRef xTableRowItemMap; + SvXMLItemMapEntriesRef xTableCellItemMap; + SvStorageRef xPackage; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xLateInitSettings; - sal_uInt16 nStyleFamilyMask;// Mask of styles to load - sal_Bool bLoadDoc : 1; // Load doc or styles only - sal_Bool bInsert : 1; // Insert mode. If styles are + sal_uInt16 nStyleFamilyMask;// Mask of styles to load + sal_Bool bLoadDoc : 1; // Load doc or styles only + sal_Bool bInsert : 1; // Insert mode. If styles are // loaded only sal_False means that // existing styles will be // overwritten. - sal_Bool bBlock : 1; // Load text block - sal_Bool bAutoStylesValid : 1; - sal_Bool bShowProgress : 1; - sal_Bool bOrganizerMode : 1; + sal_Bool bBlock : 1; // Load text block + sal_Bool bAutoStylesValid : 1; + sal_Bool bShowProgress : 1; + sal_Bool bOrganizerMode : 1; sal_Bool bInititedXForms : 1; - sal_Bool bPreserveRedlineMode; + sal_Bool bPreserveRedlineMode; - void _InitItemImport(); - void _FinitItemImport(); - void UpdateTxtCollConditions( SwDoc *pDoc ); + void _InitItemImport(); + void _FinitItemImport(); + void UpdateTxtCollConditions( SwDoc *pDoc ); - void setTextInsertMode( + void setTextInsertMode( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rInsertPos ); - void setStyleInsertMode( sal_uInt16 nFamilies, + void setStyleInsertMode( sal_uInt16 nFamilies, sal_Bool bOverwrite ); - void setBlockMode(); - void setOrganizerMode(); + void setBlockMode(); + void setOrganizerMode(); protected: @@ -121,12 +121,12 @@ public: #ifdef XML_CORE_API // #110680# - SwXMLImport( + SwXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - SwDoc& rDoc, - const SwPaM& rPaM, + SwDoc& rDoc, + const SwPaM& rPaM, sal_Bool bLoadDoc, - sal_Bool bInsertMode, + sal_Bool bInsertMode, sal_uInt16 nStyleFamMask, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > &, @@ -152,8 +152,8 @@ public: ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - void InsertStyles( sal_Bool bAuto ); - void FinishStyles(); + void InsertStyles( sal_Bool bAuto ); + void FinishStyles(); // namespace office @@ -225,10 +225,10 @@ inline const SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper() const inline void SwXMLImport::SetProgressValue( sal_Int32 nValue ) { - if ( bShowProgress ) - GetProgressBarHelper()->SetValue(nValue); + if ( bShowProgress ) + GetProgressBarHelper()->SetValue(nValue); } -#endif // _XMLIMP_HXX +#endif // _XMLIMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index f3eac88edfdf..05ee1e1cdfc6 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -2,7 +2,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 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet, if( 0 == (pEntry->nMemberId&MID_SW_FLAG_SPECIAL_ITEM_IMPORT) ) { -// bPut = pNewItem->importXML( rValue, -// pEntry->nMemberId & MID_SW_FLAG_MASK, -// rUnitConverter ); +// bPut = pNewItem->importXML( rValue, +// pEntry->nMemberId & MID_SW_FLAG_MASK, +// rUnitConverter ); bPut = PutXMLValue( *pNewItem, rValue, static_cast<sal_uInt16>( pEntry->nMemberId & MID_SW_FLAG_MASK ), rUnitConverter ); @@ -528,7 +528,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_4 ) ) return sal_False; - + // #i61946: accept line style even it's not part of our "normal" set of line styles sal_uInt16 nWidth = 0; @@ -641,7 +641,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_BACK_COLOR: - if( IsXMLToken( rValue, XML_TRANSPARENT ) ) + if( IsXMLToken( rValue, XML_TRANSPARENT ) ) { pBrush->GetColor().SetTransparency(0xff); bOk = sal_True; @@ -663,7 +663,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( if( GPOS_NONE == eOldGraphicPos && GPOS_NONE != pBrush->GetGraphicPos() ) pBrush->SetGraphicPos( GPOS_TILED ); - bOk = sal_True ; + bOk = sal_True ; } break; @@ -794,7 +794,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( { SfxBoolItem* pSplit = PTR_CAST(SfxBoolItem, &rItem); DBG_ASSERT( pSplit != NULL, "Wrong Which-ID" ); - + if( IsXMLToken( rValue, XML_AUTO ) || IsXMLToken( rValue, XML_TRUE ) ) { diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index 0734dbbf67bc..1c4a8e45f680 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -2,7 +2,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 @@ -108,6 +108,6 @@ SvXMLImportItemMapper::getMapEntries() const } -#endif // _XMLIMPIT_HXX +#endif // _XMLIMPIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx index ff5dc27764d1..2d1c8ee5675d 100644 --- a/sw/source/filter/xml/xmlitem.cxx +++ b/sw/source/filter/xml/xmlitem.cxx @@ -2,7 +2,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/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 1922f2238b39..a384253ddeb3 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -2,7 +2,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,9 +44,9 @@ struct SvXMLItemMapEntry; class SvXMLItemSetContext : public SvXMLImportContext { protected: - SfxItemSet &rItemSet; - const SvXMLImportItemMapper &rIMapper; - const SvXMLUnitConverter &rUnitConv; + SfxItemSet &rItemSet; + const SvXMLImportItemMapper &rIMapper; + const SvXMLUnitConverter &rUnitConv; public: @@ -77,6 +77,6 @@ public: }; -#endif // _XMLITEM_HXX +#endif // _XMLITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 48efcc45b3d3..c69da83f7ba1 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -2,7 +2,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/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index ace9205e322c..dab53a3bfc33 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -2,7 +2,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/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx index 5bc92baa071c..d50c96aa9e6e 100644 --- a/sw/source/filter/xml/xmlitemm.cxx +++ b/sw/source/filter/xml/xmlitemm.cxx @@ -2,7 +2,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,13 +55,13 @@ SvXMLItemMapEntry aXMLTableItemMap[] = // RES_FILL_ORDER // not required // RES_FRM_SIZE - M_E_SE( STYLE, WIDTH, RES_FRM_SIZE, MID_FRMSIZE_WIDTH ), - M_E_SE( STYLE, REL_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH ), + M_E_SE( STYLE, WIDTH, RES_FRM_SIZE, MID_FRMSIZE_WIDTH ), + M_E_SE( STYLE, REL_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH ), // RES_PAPER_BIN // not required // TODO: RES_LR_SPACE - M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ), - M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ), + M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ), + M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ), // RES_UL_SPACE MAP_ENTRY( FO, MARGIN_TOP, RES_UL_SPACE, MID_UP_MARGIN ), MAP_ENTRY( FO, MARGIN_BOTTOM, RES_UL_SPACE, MID_LO_MARGIN ), @@ -131,7 +131,7 @@ SvXMLItemMapEntry aXMLTableItemMap[] = SvXMLItemMapEntry aXMLTableColItemMap[] = { - M_E_SI( STYLE, COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_COL_WIDTH ), + M_E_SI( STYLE, COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_COL_WIDTH ), MAP_ENTRY( STYLE, REL_COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_COL_WIDTH ), M_END }; diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 11c925cec7bf..cdea43cfb211 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -2,7 +2,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 @@ -319,23 +319,23 @@ void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, const struct SvXMLEnumMapEntry psXML_BrushRepeat[] = { - { XML_BACKGROUND_REPEAT, GPOS_TILED }, - { XML_BACKGROUND_NO_REPEAT, GPOS_MM }, - { XML_BACKGROUND_STRETCH, GPOS_AREA }, + { XML_BACKGROUND_REPEAT, GPOS_TILED }, + { XML_BACKGROUND_NO_REPEAT, GPOS_MM }, + { XML_BACKGROUND_STRETCH, GPOS_AREA }, { XML_TOKEN_INVALID, 0 } }; const struct SvXMLEnumMapEntry psXML_BrushHoriPos[] = { - { XML_LEFT, GPOS_LM }, - { XML_RIGHT, GPOS_RM }, + { XML_LEFT, GPOS_LM }, + { XML_RIGHT, GPOS_RM }, { XML_TOKEN_INVALID, 0 } }; const struct SvXMLEnumMapEntry psXML_BrushVertPos[] = { - { XML_TOP, GPOS_MT }, - { XML_BOTTOM, GPOS_MB }, + { XML_TOP, GPOS_MT }, + { XML_BOTTOM, GPOS_MB }, { XML_TOKEN_INVALID, 0 } }; diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 76683e0046d4..f897f9915d8b 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -2,7 +2,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/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 978805643080..c423355aeafa 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -2,7 +2,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 @@ -33,34 +33,34 @@ #include <tools/ref.hxx> #include <xmloff/xmltoken.hxx> -namespace rtl { class OUString; } +namespace rtl { class OUString; } -#define MID_SW_FLAG_MASK 0x0000ffff +#define MID_SW_FLAG_MASK 0x0000ffff // this flags are used in the item mapper for import and export -#define MID_SW_FLAG_SPECIAL_ITEM_IMPORT 0x80000000 -#define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000 -#define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000 -#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000 -#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export -#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export -#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000 -#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000 -#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export +#define MID_SW_FLAG_SPECIAL_ITEM_IMPORT 0x80000000 +#define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000 +#define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000 +#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000 +#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export +#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export +#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000 +#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000 +#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export // --- struct SvXMLItemMapEntry { - sal_uInt16 nNameSpace; // declares the Namespace in wich this item + sal_uInt16 nNameSpace; // declares the Namespace in wich this item // exists enum ::xmloff::token::XMLTokenEnum eLocalName; - // the local name for the item inside + // the local name for the item inside // the Namespace (as an XMLTokenEnum) - sal_uInt16 nWhichId; // the WichId to identify the item + sal_uInt16 nWhichId; // the WichId to identify the item // in the pool - sal_uInt32 nMemberId; // the memberid specifies wich part + sal_uInt32 nMemberId; // the memberid specifies wich part // of the item should be imported or // exported with this Namespace // and localName @@ -94,6 +94,6 @@ SV_DECL_REF( SvXMLItemMapEntries ) SV_IMPL_REF( SvXMLItemMapEntries ) -#endif // _XMLITMAP_HXX +#endif // _XMLITMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx index c0edce67c1bf..5cedf38dc8f1 100644 --- a/sw/source/filter/xml/xmlitmpr.cxx +++ b/sw/source/filter/xml/xmlitmpr.cxx @@ -2,7 +2,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 @@ -62,12 +62,12 @@ SvXMLItemMapEntries::~SvXMLItemMapEntries() delete mpImpl; } -SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace, +SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace, const OUString& rString, SvXMLItemMapEntry* pStartAt /* = NULL */ ) const { - SvXMLItemMapEntry* pMap = - (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ? + SvXMLItemMapEntry* pMap = + (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ? &(pStartAt[1]) : mpImpl->mpEntries; while( pMap && (pMap->eLocalName != XML_TOKEN_INVALID) ) { @@ -87,7 +87,7 @@ SvXMLItemMapEntry* SvXMLItemMapEntries::getByIndex( UINT16 nIndex ) const UINT16 SvXMLItemMapEntries::getCount() const { - return mpImpl->mnCount; + return mpImpl->mnCount; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 62b5e3bff91e..a0f23c4d46f5 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -2,7 +2,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 @@ -100,13 +100,13 @@ enum SvXMLTokenMapAttrs /* static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] = { - { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE }, - { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE }, - { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE }, - { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA }, - { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE }, - { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD }, - { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR }, + { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE }, + { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE }, + { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE }, + { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA }, + { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE }, + { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD }, + { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR }, XML_TOKEN_MAP_END }; */ diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index cc9d683a2818..8fe25c7cf726 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -2,7 +2,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/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 04b458eabfc5..bd3b8662f20b 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -2,7 +2,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,8 +77,8 @@ using table::XCell; class SwXMLTableColumn_Impl : public SwWriteTableCol { - OUString sStyleName; - sal_uInt32 nRelWidth; + OUString sStyleName; + sal_uInt32 nRelWidth; public: @@ -117,9 +117,9 @@ IMPL_CONTAINER_SORT( SwXMLTableColumnsSortByWidth_Impl, SwXMLTableColumn_Impl, class SwXMLTableLines_Impl { - SwXMLTableColumns_Impl aCols; - const SwTableLines *pLines; - sal_uInt32 nWidth; + SwXMLTableColumns_Impl aCols; + const SwTableLines *pLines; + sal_uInt32 nWidth; public: @@ -385,10 +385,10 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, // order is: -/-/-/num, // -/-/box/-, --/-/box/num, - // -/brush/-/-, -/brush/-/num, -/brush/box/-, -/brush/box/num, - // vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num, - // vert/brush/-/-, vert/brush/-/num, vert/brush/box/-, - // vert/brush/box/num + // -/brush/-/-, -/brush/-/num, -/brush/box/-, -/brush/box/num, + // vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num, + // vert/brush/-/-, vert/brush/-/num, vert/brush/box/-, + // vert/brush/box/num sal_uInt32 nCount2 = Count(); sal_Bool bInsert = sal_True; sal_uInt32 i; @@ -605,7 +605,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, const SwXMLTableColumns_Impl& rCols = pLines->GetColumns(); sal_uInt16 nCPos = 0U; sal_uInt16 nColumns = rCols.Count(); - for( sal_uInt16 nColumn=0U; nColumn<nColumns; nColumn++ ) + for( sal_uInt16 nColumn=0U; nColumn<nColumns; nColumn++ ) { SwXMLTableColumn_Impl *pColumn = rCols[nColumn]; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index ec2db6ae38d5..86bbe4ab701e 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2,7 +2,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 @@ -114,12 +114,12 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, { XML_NAMESPACE_OFFICE, XML_DDE_SOURCE, XML_TOK_OFFICE_DDE_SOURCE }, @@ -128,7 +128,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = // supported in Writer (they are Calc-only features), so we // support column groups by simply using the <table:table-columns> // token for column groups, too. - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS }, XML_TOKEN_MAP_END }; @@ -175,17 +175,17 @@ class SwXMLTableCell_Impl OUString mXmlId; - OUString sFormula; // cell formula; valid if length > 0 - double dValue; // formula value + OUString sFormula; // cell formula; valid if length > 0 + double dValue; // formula value - SvXMLImportContextRef xSubTable; + SvXMLImportContextRef xSubTable; const SwStartNode *pStartNode; sal_uInt32 nRowSpan; sal_uInt32 nColSpan; sal_Bool bProtected : 1; - sal_Bool bHasValue; // determines whether dValue attribute is valid + sal_Bool bHasValue; // determines whether dValue attribute is valid sal_Bool mbCovered; sal_Bool mbTextValue; @@ -403,19 +403,19 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext OUString sSaveParaDefault; OUString mXmlId; - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; double fValue; sal_Bool bHasValue; sal_Bool bHasTextValue; sal_Bool bProtect; - sal_uInt32 nRowSpan; - sal_uInt32 nColSpan; - sal_uInt32 nColRepeat; + sal_uInt32 nRowSpan; + sal_uInt32 nColSpan; + sal_uInt32 nColRepeat; - sal_Bool bHasTextContent : 1; - sal_Bool bHasTableContent : 1; + sal_Bool bHasTextContent : 1; + sal_Bool bHasTableContent : 1; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -724,7 +724,7 @@ void SwXMLTableCellContext_Impl::EndElement() class SwXMLTableColContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -811,7 +811,7 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl() class SwXMLTableColsContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; sal_Bool bHeader; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -872,9 +872,9 @@ SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext( class SwXMLTableRowContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; - sal_uInt32 nRowRepeat; + sal_uInt32 nRowRepeat; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -994,7 +994,7 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext( class SwXMLTableRowsContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; sal_Bool bHeader; @@ -1076,11 +1076,11 @@ public: virtual void StartElement( const Reference<xml::sax::XAttributeList> & xAttrList); - OUString& GetConnectionName() { return sConnectionName; } - OUString& GetDDEApplication() { return sDDEApplication; } - OUString& GetDDEItem() { return sDDEItem; } - OUString& GetDDETopic() { return sDDETopic; } - sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; } + OUString& GetConnectionName() { return sConnectionName; } + OUString& GetDDEApplication() { return sDDEApplication; } + OUString& GetDDEItem() { return sDDEItem; } + OUString& GetDDETopic() { return sDDETopic; } + sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; } }; TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext ); @@ -1155,10 +1155,10 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) { sPrefixStr = String('_'); } -// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii()) -// { -// sPrefixStr.Insert('_', 0); -// } +// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii()) +// { +// sPrefixStr.Insert('_', 0); +// } // else: name is OK. // increase count until we find a name that is not yet taken @@ -2542,8 +2542,8 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) sal_Int32 nExtraAbs = nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L; - sal_Bool bMin = sal_False; // Do all columns get the mininum width? - sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus + sal_Bool bMin = sal_False; // Do all columns get the mininum width? + sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus // some extra space? if( nAbsForRelWidth <= nMinAbs ) diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 7d7296b2ef19..4f991d9bb629 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -2,7 +2,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 @@ -63,14 +63,14 @@ namespace com { namespace sun { namespace star { class SwXMLTableContext : public XMLTextTableContext { - ::rtl::OUString aStyleName; - ::rtl::OUString aDfltCellStyleName; + ::rtl::OUString aStyleName; + ::rtl::OUString aDfltCellStyleName; /// NB: this contains the xml:id only if this table is a subtable! ::rtl::OUString mXmlId; - SvUShorts aColumnWidths; - SvBools aColumnRelWidths; - SvStringsDtor *pColumnDefaultCellStyleNames; + SvUShorts aColumnWidths; + SvBools aColumnRelWidths; + SvStringsDtor *pColumnDefaultCellStyleNames; ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > xOldCursor; @@ -79,12 +79,12 @@ class SwXMLTableContext : public XMLTextTableContext SwXMLTableRows_Impl *pRows; - SwTableNode *pTableNode; - SwTableBox *pBox1; - const SwStartNode *pSttNd1; + SwTableNode *pTableNode; + SwTableBox *pBox1; + const SwStartNode *pSttNd1; - SwTableBoxFmt *pBoxFmt; - SwTableLineFmt *pLineFmt; + SwTableBoxFmt *pBoxFmt; + SwTableLineFmt *pLineFmt; // hash map of shared format, indexed by the (XML) style name, // the column width, and protection flag @@ -92,18 +92,18 @@ class SwXMLTableContext : public XMLTextTableContext TableBoxIndexHasher> map_BoxFmt; map_BoxFmt* pSharedBoxFormats; - SvXMLImportContextRef xParentTable; // if table is a sub table + SvXMLImportContextRef xParentTable; // if table is a sub table - SwXMLDDETableContext_Impl *pDDESource; + SwXMLDDETableContext_Impl *pDDESource; - sal_Bool bFirstSection : 1; - sal_Bool bRelWidth : 1; + sal_Bool bFirstSection : 1; + sal_Bool bRelWidth : 1; sal_Bool bHasSubTables : 1; USHORT nHeaderRows; - sal_uInt32 nCurRow; - sal_uInt32 nCurCol; - sal_Int32 nWidth; + sal_uInt32 nCurRow; + sal_uInt32 nCurCol; + sal_Int32 nWidth; SwTableBox *NewTableBox( const SwStartNode *pStNd, SwTableLine *pUpper ); diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index d95471801959..aa9524b15821 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -2,7 +2,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/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index b6d2b0698757..9765dfc6255a 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -2,7 +2,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 @@ SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode( SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt(); const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt(); const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx(); - return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode(); + return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode(); } void SwXMLTextParagraphExport::exportStyleContent( diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 37045870d389..9b9ecfd2aa9a 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -2,7 +2,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 @@ -39,7 +39,7 @@ class SwNoTxtNode; namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } } -class SwXMLTextParagraphExport : public XMLTextParagraphExport +class SwXMLTextParagraphExport : public XMLTextParagraphExport { const ::rtl::OUString sTextTable; const ::rtl::OUString sEmbeddedObjectProtocol; @@ -50,7 +50,7 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport const SvGlobalName aIFrameClassId; const SvGlobalName aOutplaceClassId; - SwNoTxtNode *GetNoTxtNode( + SwNoTxtNode *GetNoTxtNode( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet ) const; @@ -86,6 +86,6 @@ public: }; -#endif // _XMLTEXTE_HXX +#endif // _XMLTEXTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 8d3a0341100a..161e659b813b 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -2,7 +2,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,16 +88,16 @@ using namespace xml::sax; struct XMLServiceMapEntry_Impl { const sal_Char *sFilterService; - sal_Int32 nFilterServiceLen; + sal_Int32 nFilterServiceLen; - sal_uInt32 n1; - sal_uInt16 n2, n3; - sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; + sal_uInt32 n1; + sal_uInt16 n2, n3; + sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; }; #define SERVICE_MAP_ENTRY( app, s ) \ { XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1, \ - SO3_##s##_CLASSID } + SO3_##s##_CLASSID } const XMLServiceMapEntry_Impl aServiceMap[] = { diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 2107746cffed..b3752c4efc87 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -2,7 +2,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 @@ -104,20 +104,20 @@ public: // redlining helper methods // (here is the real implementation) virtual void RedlineAdd( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment - const ::com::sun::star::util::DateTime& rDateTime, /// date+time + const ::rtl::OUString& rType, /// redline type (insert, del,... ) + const ::rtl::OUString& rId, /// use to identify this redline + const ::rtl::OUString& rAuthor, /// name of the author + const ::rtl::OUString& rComment, /// redline comment + const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastPara); /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( - ::com::sun::star::uno::Reference< /// needed to get the document + ::com::sun::star::uno::Reference< /// needed to get the document ::com::sun::star::text::XTextCursor> & rOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const ::rtl::OUString& rId); /// ID used to RedlineAdd() call virtual void RedlineSetCursor( - const ::rtl::OUString& rId, /// ID used to RedlineAdd() call - sal_Bool bStart, /// start or end Cursor + const ::rtl::OUString& rId, /// ID used to RedlineAdd() call + sal_Bool bStart, /// start or end Cursor sal_Bool bIsOutsideOfParagraph); virtual void RedlineAdjustStartNodeCursor( sal_Bool bStart); @@ -127,6 +127,6 @@ public: const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); }; -#endif // _XMLTEXTI_HXX +#endif // _XMLTEXTI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |