[Libreoffice-commits] .: binfilter/bf_sw binfilter/inc
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Thu Oct 28 16:52:36 PDT 2010
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 88 ------------------
binfilter/bf_sw/source/filter/sw6/sw6par.hxx | 4
binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx | 102 +++++++---------------
binfilter/inc/bf_svtools/svarray.hxx | 8 -
binfilter/inc/bf_svtools/svstdarr.hxx | 62 -------------
5 files changed, 39 insertions(+), 225 deletions(-)
New commits:
commit 10c63684800137578f58a4a4bbb4d26970a0f0b9
Author: Joseph Powers <jpowers27 at cox.net>
Date: Thu Oct 28 04:46:49 2010 -0700
Mac OS9 Cleanup #3
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
index 4c8992f..5575660 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
@@ -69,7 +69,7 @@
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
-#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) && !defined(OS2)
+#if !defined(UNX) && !defined(MSC) && !defined(PPC) && !defined(CSET) && !defined(WTC) && !defined(__MINGW32__) && !defined(OS2)
#define FIELDFNTAB_SIZE 37
#if FIELDFNTAB_SIZE != RES_FIELDS_END - RES_FIELDS_BEGIN
@@ -517,8 +517,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ }
/*N*/ }
-/* */
-
/*N*/ SwUserFieldType* lcl_sw3io_InUserFieldType40( Sw3IoImp& rIo )
/*N*/ {
/*N*/ String aName, aContent, aValue;
@@ -666,8 +664,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ rIo.pStrm->WriteByteString( s8 );
/*N*/ }
-/* */
-
/*N*/ SwSetExpFieldType* lcl_sw3io_InSetExpFieldType( Sw3IoImp& rIo )
/*N*/ {
/*N*/ UINT16 nType;
@@ -728,8 +724,6 @@ static OldFormats aOldGetSetExpFmt30[] =
/*N*/ }
/*N*/ }
-/* */
-
SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
{
SwAuthorityFieldType* pFldType = (SwAuthorityFieldType*) rIo.pDoc->
@@ -841,8 +835,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*?*/ }
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDBField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -1004,8 +996,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InFileNameField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1053,8 +1043,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return new SwDBNameField( (SwDBNameFieldType *)pType, aData );
/*N*/ }
-
-
/*N*/ void lcl_sw3io_OutDBNameField( Sw3IoImp& rIo, SwField* pFld )
/*N*/ {
/*N*/ if( !rIo.IsSw31Export() )
@@ -1067,8 +1055,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDateField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ { //SW40.SDW
@@ -1079,8 +1065,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return pFld;
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InTimeField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ {
@@ -1091,8 +1075,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
return pFld;
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InPageNumberField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1157,9 +1139,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, ((SwPageNumberField*)pFld)->GetUserString() );
/*N*/ }
-
-/* */
-
/*N*/ SwField* lcl_sw3io_InUserField40( Sw3IoImp& rIo, SwFieldType *pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -1217,8 +1196,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ ((SwUserField*)pFld)->GetTyp()->GetName(), USHRT_MAX );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InGetRefField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1229,18 +1206,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.InString( *rIo.pStrm, aExpand );
/*N*/ if( rIo.IsVersion( SWG_FMTGETREFFLD, SWG_EXPORT31 ) )
/*N*/ {
-/*N*/ #if 0
-/*N*/ // JP 05.11.96: es gab mal ein Zwischenversion der Felder, wo Seqence-Refs
-/*N*/ // ueber eine 255 unterschieden wurden
-/*N*/ xub_StrLen nPos = aName.Search( (sal_Unicode)0xff );
-/*N*/ if( nPos != STRING_NOTFOUND )
-/*N*/ {
-/*N*/ nSeqNo = (aName.Cut( nPos )).Copy( 1 );
-/*N*/ *rIo.pStrm >> nFmt;
-/*N*/ nSubType = REF_SEQUENCEFLD;
-/*N*/ }
-/*N*/ else
-/*N*/ #endif
/*N*/ *rIo.pStrm >> nFmt16 >> nSubType >> nSeqNo;
/*N*/ rFmt = nFmt16;
/*N*/ }
@@ -1294,8 +1259,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ *rIo.pStrm << (UINT16)((SwGetRefField*)pFld)->GetSeqNo();
/*N*/ }
-/* */
-
/*N*/ void lcl_sw3io_ChkHiddenExp( String& rCond ) //SW40.SDW
/*N*/ {
/*N*/ // die Expression wurde bei 4.0 Export einmal gedreht, beim erneuten
@@ -1440,8 +1403,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() ); // condition
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InPostItField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1461,8 +1422,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
rIo.OutString( *rIo.pStrm, pFld->GetPar2() ); // Text
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDateTimeField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ {
@@ -1490,8 +1449,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ << (INT32)((SwDateTimeField*)pFld)->GetOffset();
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InFixDateField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1510,8 +1467,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ *rIo.pStrm << (INT32) ((SwDateTimeField*)pFld)->GetDate(TRUE).GetDate();
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InFixTimeField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1529,8 +1484,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
*rIo.pStrm << (INT32)((SwDateTimeField*)pFld)->GetTime(TRUE).GetTime();
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InAuthorField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1553,8 +1506,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, ((SwAuthorField *)pFld)->GetContent() );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InChapterField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1579,8 +1530,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ *rIo.pStrm << cLvl;
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDocStatField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
@@ -1602,8 +1551,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
// Im 5.0-Format bleibt nix, was geschrieben werden muesste.
-/* */
-
/*N*/ SwField* lcl_sw3io_InDDEField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1666,8 +1613,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );// PromptText
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InMacroField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1684,8 +1629,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InTblField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& )
/*N*/ {
@@ -1720,8 +1663,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ *rIo.pStrm << (UINT16) ((SwTblField*)pFld)->GetSubType();
/*N*/ }
-/* */
-
/*N*/ SwField *lcl_sw3io_InGetExpField40( Sw3IoImp& rIo, SwFieldType *pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ { //SW40.SDW
@@ -1971,8 +1912,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, ((SwSetExpField *)pFld)->GetExpStr() );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InHiddenParaField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -1991,8 +1930,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar1() );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDocInfoField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT nSubType, UINT32& rFmt )
/*N*/ {
@@ -2064,16 +2001,12 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ *rIo.pStrm << ((SwDocInfoField*)pFld)->GetValue();
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InTemplNameField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& rFmt )
/*N*/ {
/*N*/ return new SwTemplNameField( (SwTemplNameFieldType*)pType, rFmt );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDBNextSetField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2107,8 +2040,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ }
-/* */
-
// der 3.1-Writer hat beim Einlesen Condition und Number vertauscht.
// Deshalb exportieren wir diese beiden Werte vertauscht und lesen sie
// in der exportierten Version auch verkehrt herum wieder ein.
@@ -2164,8 +2095,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InDBSetNumberField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2200,8 +2129,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ }
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InExtUserField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2247,8 +2174,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, ((SwExtUserField *)pFld)->GetContent() );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InRefPageSetField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2264,8 +2189,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
<< (BYTE)((SwRefPageSetField*)pFld)->IsOn();
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InRefPageGetField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2281,8 +2204,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
rIo.OutString( *rIo.pStrm, ((SwRefPageGetField*)pFld)->GetText() );
/*N*/ }
-/* */
-
/*N*/ SwField *lcl_sw3io_InINetField31( Sw3IoImp& rIo, SwFieldType *, USHORT, UINT32& )
/*N*/ {
/*N*/ ASSERT( !(rIo.pFmtINetFmt || rIo.aINetFldText.Len()),
@@ -2322,8 +2243,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ return 0;
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InJumpEditField( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2340,8 +2259,6 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
/*N*/ rIo.OutString( *rIo.pStrm, pFld->GetPar2() );
/*N*/ }
-/* */
-
/*N*/ SwField* lcl_sw3io_InScriptField40( Sw3IoImp& rIo, SwFieldType* pType,
/*N*/ USHORT, UINT32& )
/*N*/ {
@@ -2460,10 +2377,7 @@ SwAuthorityFieldType* lcl_sw3io_InAuthorityFieldType( Sw3IoImp& rIo )
<< (UINT16)((SwAuthorityField *)pFld)->GetHandlePosition();
/*N*/ }
-/* */
-
//////////////////////////////////////////////////////////////////////////////
-
// Die Beta-1-Version hatte noch eine eigene Kapselung fuer das Feld.
// Da dieser Inhalt als Teil eines SWG_ATTRIBUTE-Records vorkommt,ist
// dies reine Platzverschwendung und wurde geknickt.
diff --git a/binfilter/bf_sw/source/filter/sw6/sw6par.hxx b/binfilter/bf_sw/source/filter/sw6/sw6par.hxx
index 2e9064e..2530af1 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw6par.hxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw6par.hxx
@@ -186,11 +186,7 @@ struct DATEIDESC {
// einige Forward-Deklaratioen
class SwPaM;
class SwDoc;
-#ifdef __MWERKS__
-class SwSw6Parser : public Sw6Layout // Fehler im MWerks-Compiler, sorry
-#else
class SwSw6Parser:private Sw6Layout
-#endif
{
private:
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
index 2c6b016..4026ec9 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4watr.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4watr.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
@@ -95,7 +95,7 @@ namespace binfilter {
* gepflegt werden: rtf\rtfatr.cxx, sw6\sw6atr.cxx, w4w\w4watr.cxx
*/
-#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(__MWERKS__) && !defined(WTC) && !defined(__MINGW32__) && !defined(OS2)
+#if !defined(MSC) && !defined(UNX) && !defined(PPC) && !defined(CSET) && !defined(WTC) && !defined(__MINGW32__) && !defined(OS2)
#define ATTRFNTAB_SIZE 130
#if ATTRFNTAB_SIZE != POOLATTR_END - POOLATTR_BEGIN
@@ -188,28 +188,27 @@ void OutW4W_SwFmtPageDesc1( SwW4WWriter& rW4WWrt, const SwPageDesc* pPg )
|| rW4WWrt.bHdFt ) // hier ignorieren ( mag WW2 nicht )
return;
- if ((( rW4WWrt.GetFilter() != 1 ) // Keiner (?) will ^L im Ascii-Text
- || (rW4WWrt.GetIniFlags() & 0x10000))
- && rW4WWrt.bIsTxtInPgDesc )
+ if ( ( ( rW4WWrt.GetFilter() != 1 ) // Keiner (?) will ^L im Ascii-Text
+ || ( rW4WWrt.GetIniFlags() & 0x10000 )
+ )
+ && rW4WWrt.bIsTxtInPgDesc
+ )
rW4WWrt.Strm() << sW4W_RECBEGIN << "HNP" << cW4W_RED;
-// if ( rW4WWrt.pPgDsc2 != pPg )
- {
- rW4WWrt.pPgDsc2 = pPg;
- const SwFrmFmt *pFrm = &(pPg->GetMaster()); //!!! GetLeft()
+ rW4WWrt.pPgDsc2 = pPg;
+ const SwFrmFmt *pFrm = &(pPg->GetMaster()); //!!! GetLeft()
#if OSL_DEBUG_LEVEL > 1
- rW4WWrt.Strm() << sW4W_RECBEGIN << "NOP_Pagedesc_Inhalt" << sW4W_TERMEND;
+ rW4WWrt.Strm() << sW4W_RECBEGIN << "NOP_Pagedesc_Inhalt" << sW4W_TERMEND;
#endif
- BOOL bOldPg = rW4WWrt.bPageDesc;
- rW4WWrt.bPageDesc = TRUE;
+ BOOL bOldPg = rW4WWrt.bPageDesc;
+ rW4WWrt.bPageDesc = TRUE;
- OutW4W_SwFmt( rW4WWrt, *pFrm );
+ OutW4W_SwFmt( rW4WWrt, *pFrm );
- rW4WWrt.bPageDesc = bOldPg;
+ rW4WWrt.bPageDesc = bOldPg;
#if OSL_DEBUG_LEVEL > 1
- rW4WWrt.Strm() << sW4W_RECBEGIN << "NOP_Pagedesc_Inhalt_Ende" << sW4W_TERMEND ;//!!!
+ rW4WWrt.Strm() << sW4W_RECBEGIN << "NOP_Pagedesc_Inhalt_Ende" << sW4W_TERMEND ;//!!!
#endif
- }
rW4WWrt.bIsTxtInPgDesc = FALSE;
return;
}
@@ -234,11 +233,12 @@ static BOOL OutW4W_SwFmtHeader1( SwW4WWriter& rWrt, const SwFmtHeader& rHd,
return FALSE;
// hole einen Node zu dem Request
- SwCntntNode *pNode = 0;
- const SwFmtCntnt& rCntnt = rHd.GetHeaderFmt()->GetCntnt();
- if( rCntnt.GetCntntIdx() )
- pNode = rWrt.pDoc->GetNodes()[ rCntnt.GetCntntIdx()->GetIndex()+ 1 ]->
- GetCntntNode();
+ SwCntntNode *pNode = 0;
+ const SwFmtCntnt& rCntnt = rHd.GetHeaderFmt()->GetCntnt();
+ if( rCntnt.GetCntntIdx() )
+ pNode = rWrt.pDoc->GetNodes()[ rCntnt.GetCntntIdx()->GetIndex()+ 1 ]
+ ->GetCntntNode();
+
do { // middle-check-loop
if( !pNode )
break; // es gibt keine Kopf-/Fusszeile/Fussnote
@@ -552,19 +552,16 @@ Writer& OutW4W_SwFmt( Writer& rWrt, const SwFmt& rFmt )
case RES_CONDTXTFMTCOLL:
case RES_TXTFMTCOLL:
{
-// if( rW4WWrt.bAttrOnOff )
- {
- USHORT nFontHeight, nFontId;
- CalcFontSize( rW4WWrt, rFmt, nFontId, nFontHeight );
-
- // dann gebe mal das "W4W"-FontAttribut aus
- rW4WWrt.Strm() << sW4W_RECBEGIN << "SPF10" << cW4W_TXTERM
- << '0' << cW4W_TXTERM << "10" << cW4W_TXTERM;
- rWrt.OutULong( nFontId ) << cW4W_TXTERM;
- rWrt.OutULong( nFontHeight ) << cW4W_TXTERM;
- OutW4W_String( rWrt, rW4WWrt.GetFont( nFontId ).
- GetFamilyName() ).Strm() << sW4W_TERMEND;
- }
+ USHORT nFontHeight, nFontId;
+ CalcFontSize( rW4WWrt, rFmt, nFontId, nFontHeight );
+
+ // dann gebe mal das "W4W"-FontAttribut aus
+ rW4WWrt.Strm() << sW4W_RECBEGIN << "SPF10" << cW4W_TXTERM
+ << '0' << cW4W_TXTERM << "10" << cW4W_TXTERM;
+ rWrt.OutULong( nFontId ) << cW4W_TXTERM;
+ rWrt.OutULong( nFontHeight ) << cW4W_TXTERM;
+ OutW4W_String( rWrt, rW4WWrt.GetFont( nFontId ).GetFamilyName() ).Strm()
+ << sW4W_TERMEND;
// akt. Collection-Pointer am Writer setzen
rW4WWrt.pNdFmt = &rFmt;
@@ -763,9 +760,6 @@ static Writer& OutW4W_SwTxtNode( Writer& rWrt, SwCntntNode & rNode )
if( !rW4WWrt.bWriteAll && rW4WWrt.bFirstLine )
{
ASSERT( !&rWrt, "Teilausgabe der Dokuments nicht implementiert" );
-// jetzt noch die Attribute aus dem Format setzen
-// rW4WWrt.bAttrOnOff = TRUE;
-// OutW4W_SwFmt( rW4WWrt, *rW4WWrt.ChrFmt() );
}
@@ -848,8 +842,6 @@ static Writer& OutW4W_SwGrfNode( Writer& rWrt, SwCntntNode & rNode )
{
SwW4WWriter& rW4WWrt = (SwW4WWriter&)rWrt;
rW4WWrt.OutW4W_Grf( rNode.GetGrfNode() );
-// rWrt.Strm() << sW4W_RECBEGIN << "HNL" << cW4W_RED; //!!!
-
return rWrt;
}
@@ -949,7 +941,6 @@ static Writer& OutW4W_SwKerning( Writer& rWrt, const SfxPoolItem& rHt )
#ifdef JP_NEWCORE
// JP 23.09.94, wie nun ?????
-
Fraction aTmp( 20, 1 );
aTmp += rKern.frKern;
nDist = (long)aTmp; // in Twips umrechnen
@@ -1024,7 +1015,6 @@ static Writer& OutW4W_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
pSttStr = "BUL";
pEndStr = "EUL";
-// ??? if( rULine.bUnderlineSpaces )
}
else if( UNDERLINE_DOUBLE == rULine.GetUnderline() )
{
@@ -1177,10 +1167,6 @@ static Writer& OutW4W_SwField( Writer& rWrt, const SfxPoolItem& rHt )
-
-
-
-
/* File FRMATR.HXX */
static Writer& OutW4W_SwFrmSize( Writer& rWrt, const SfxPoolItem& /*rHt*/ )
@@ -1211,28 +1197,14 @@ static Writer& OutW4W_SwBreak( Writer& rWrt, const SfxPoolItem& rHt )
if( SVX_BREAK_NONE != rBreak.GetBreak() )
- if ( ( rW4WWrt.GetFilter() != 1 ) // Keiner (?) will ^L im Ascii-Text
- || (rW4WWrt.GetIniFlags() & 0x10000))
+ if ( ( rW4WWrt.GetFilter() != 1 ) // Keiner (?) will ^L im Ascii-Text
+ || ( rW4WWrt.GetIniFlags() & 0x10000)
+ )
OUTRECORD( rWrt.Strm(), "HNP" );
- rWrt.Strm() << sW4W_RECBEGIN << "NOP_PageBreak" << sW4W_TERMEND;//!!!
- //!!! PAGEBREAK_AFTER stimmt nicht
+ rWrt.Strm() << sW4W_RECBEGIN << "NOP_PageBreak" << sW4W_TERMEND;//!!!
+ //!!! PAGEBREAK_AFTER stimmt nicht
-#if 0
- const SwFmtPageBreak & rBreak = (const SwFmtPageBreak&)rHt;
- if ( rBreak.IsAuto() )
- {
- rWrt << "\\page";
- }
- else
- switch( rBreak.GetPageBreak() )
- {
- case PAGEBREAK_NONE: break;
- case PAGEBREAK_BEFORE: rWrt << "\\pagebb"; break;
- case PAGEBREAK_AFTER: // rWrt << "\*pageba"; break;
- case PAGEBREAK_BOTH: break;
- }
-#endif
return rWrt;
}
@@ -1247,7 +1219,6 @@ static Writer& OutW4W_SwFmtLRSpace( Writer& rWrt, const SfxPoolItem& rHt )
SwW4WWriter & rW4WWrt = (SwW4WWriter&)rWrt;
// hole erstmal die Seitenangaben
-// const SwFrmFmt &rFmtPage = rW4WWrt.pDoc->GetPageDesc(0).GetMaster();
const SwFrmFmt* pFmtPage = rW4WWrt.pPgFrm;
const SvxLRSpaceItem& rPageLR = pFmtPage->GetLRSpace();
const SwFmtFrmSize& rSz = pFmtPage->GetFrmSize();
@@ -1510,7 +1481,6 @@ static Writer& OutW4W_SwTabStop( Writer& rWrt, const SfxPoolItem& rHt )
SwW4WWriter& rW4WWrt = (SwW4WWriter&)rWrt;
const SvxTabStopItem & rTStops = (const SvxTabStopItem&)rHt;
-// long nLeftMargin = ( rW4WWrt).GetLeftMargin();
SwTwips nLeftMargin, nWidth;
rW4WWrt.GetMargins( nLeftMargin, nWidth );
diff --git a/binfilter/inc/bf_svtools/svarray.hxx b/binfilter/inc/bf_svtools/svarray.hxx
index bcbeb35..b39782c 100644
--- a/binfilter/inc/bf_svtools/svarray.hxx
+++ b/binfilter/inc/bf_svtools/svarray.hxx
@@ -584,15 +584,9 @@ _SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, 1, )
// SORTARR - Begin
-#ifdef __MWERKS__
-#define __MWERKS__PRIVATE public
-#else
-#define __MWERKS__PRIVATE private
-#endif
-
#define _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\
typedef BOOL (*FnForEach_##nm)( const AE&, void* );\
-class vis nm : __MWERKS__PRIVATE nm##_SAR \
+class vis nm : private nm##_SAR \
{\
public:\
nm(USHORT nSize = IS, BYTE nG = GS)\
diff --git a/binfilter/inc/bf_svtools/svstdarr.hxx b/binfilter/inc/bf_svtools/svstdarr.hxx
index 660ba43..6788a9c 100644
--- a/binfilter/inc/bf_svtools/svstdarr.hxx
+++ b/binfilter/inc/bf_svtools/svstdarr.hxx
@@ -33,39 +33,30 @@
namespace binfilter
{
-//#ifdef _SVSTDARR_BOOLS
#ifndef _SVSTDARR_BOOLS_DECL
SV_DECL_VARARR_VISIBILITY( SvBools, BOOL, 1, 1, )
#define _SVSTDARR_BOOLS_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTES
#ifndef _SVSTDARR_BYTES_DECL
SV_DECL_VARARR_VISIBILITY( SvBytes, BYTE, 1, 1, )
#define _SVSTDARR_BYTES_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_ULONGS
#ifndef _SVSTDARR_ULONGS_DECL
SV_DECL_VARARR_VISIBILITY( SvULongs, ULONG, 1, 1, )
#define _SVSTDARR_ULONGS_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_USHORTS
#ifndef _SVSTDARR_USHORTS_DECL
SV_DECL_VARARR_VISIBILITY( SvUShorts, USHORT, 1, 1, )
#define _SVSTDARR_USHORTS_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_USHORTSSORT
#ifndef _SVSTDARR_USHORTSSORT_DECL
typedef BOOL (*FnForEach_SvUShortsSort)( const USHORT&, void* );
-class SvUShortsSort : __MWERKS__PRIVATE SvUShorts
+class SvUShortsSort : private SvUShorts
{
public:
SvUShortsSort(BYTE nSize = 1, BYTE nG = 1)
@@ -104,136 +95,85 @@ private:
#define _SVSTDARR_USHORTSSORT_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_LONGS
#ifndef _SVSTDARR_LONGS_DECL
SV_DECL_VARARR_VISIBILITY( SvLongs, long, 1, 1, )
#define _SVSTDARR_LONGS_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_SHORTS
#ifndef _SVSTDARR_SHORTS_DECL
SV_DECL_VARARR_VISIBILITY( SvShorts, short, 1, 1, )
#define _SVSTDARR_SHORTS_DECL
#endif
-//#endif
-
-/*
- form here all Arrays for Strings, ByteString and then
- len of a string (xub_StrLen)
-#if (defined(_SVSTDARR_STRINGS) && !defined(_SVSTDARR_STRINGS_DECL)) || \
- (defined(_SVSTDARR_STRINGSDTOR) && !defined(_SVSTDARR_STRINGSDTOR_DECL)) || \
- (defined(_SVSTDARR_STRINGSSORT) && !defined(_SVSTDARR_STRINGSSORT_DECL)) || \
- (defined(_SVSTDARR_STRINGSSORTDTOR) && !defined(_SVSTDARR_STRINGSSORTDTOR_DECL)) || \
- (defined(_SVSTDARR_STRINGSISORT) && !defined(_SVSTDARR_STRINGSISORT_DECL)) || \
- (defined(_SVSTDARR_STRINGSISORTDTOR) && !defined(_SVSTDARR_STRINGSISORTDTOR_DECL)) || \
- (defined(_SVSTDARR_BYTESTRINGS) && !defined(_SVSTDARR_BYTESTRINGS_DECL)) || \
- (defined(_SVSTDARR_BYTESTRINGSDTOR) && !defined(_SVSTDARR_BYTESTRINGSDTOR_DECL)) || \
- (defined(_SVSTDARR_BYTESTRINGSSORT) && !defined(_SVSTDARR_BYTESTRINGSSORT_DECL)) || \
- (defined(_SVSTDARR_BYTESTRINGSSORTDTOR) && !defined(_SVSTDARR_BYTESTRINGSSORTDTOR_DECL)) || \
- (defined(_SVSTDARR_BYTESTRINGSISORT) && !defined(_SVSTDARR_BYTESTRINGSISORT_DECL)) || \
- (defined(_SVSTDARR_BYTESTRINGSISORTDTOR) && !defined(_SVSTDARR_BYTESTRINGSISORTDTOR_DECL)) || \
- (defined(_SVSTDARR_XUB_STRLEN) && !defined(_SVSTDARR_XUB_STRLEN_DECL))
-*/
-
typedef String* StringPtr;
typedef ByteString* ByteStringPtr;
-//#endif
-//#ifdef _SVSTDARR_STRINGS
#ifndef _SVSTDARR_STRINGS_DECL
SV_DECL_PTRARR_VISIBILITY( SvStrings, StringPtr, 1, 1, )
#define _SVSTDARR_STRINGS_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_STRINGSDTOR
#ifndef _SVSTDARR_STRINGSDTOR_DECL
SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1, 1, )
#define _SVSTDARR_STRINGSDTOR_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_STRINGSSORT
#ifndef _SVSTDARR_STRINGSSORT_DECL
SV_DECL_PTRARR_SORT_VISIBILITY( SvStringsSort, StringPtr, 1, 1, )
#define _SVSTDARR_STRINGSSORT_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_STRINGSSORTDTOR
#ifndef _SVSTDARR_STRINGSSORTDTOR_DECL
SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsSortDtor, StringPtr, 1, 1, )
#define _SVSTDARR_STRINGSSORTDTOR_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_STRINGSISORT
#ifndef _SVSTDARR_STRINGSISORT_DECL
SV_DECL_PTRARR_SORT_VISIBILITY( SvStringsISort, StringPtr, 1, 1, )
#define _SVSTDARR_STRINGSISORT_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_STRINGSISORTDTOR
#ifndef _SVSTDARR_STRINGSISORTDTOR_DECL
SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvStringsISortDtor, StringPtr, 1, 1, )
#define _SVSTDARR_STRINGSISORTDTOR_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTESTRINGS
#ifndef _SVSTDARR_BYTESTRINGS_DECL
SV_DECL_PTRARR_VISIBILITY( SvByteStrings, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGS_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTESTRINGSDTOR
#ifndef _SVSTDARR_BYTESTRINGSDTOR_DECL
SV_DECL_PTRARR_DEL_VISIBILITY( SvByteStringsDtor, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGSDTOR_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTESTRINGSSORT
#ifndef _SVSTDARR_BYTESTRINGSSORT_DECL
SV_DECL_PTRARR_SORT_VISIBILITY( SvByteStringsSort, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGSSORT_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTESTRINGSSORTDTOR
#ifndef _SVSTDARR_BYTESTRINGSSORTDTOR_DECL
SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsSortDtor, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGSSORTDTOR_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTESTRINGSISORT
#ifndef _SVSTDARR_BYTESTRINGSISORT_DECL
SV_DECL_PTRARR_SORT_VISIBILITY( SvByteStringsISort, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGSISORT_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_BYTESTRINGSISORTDTOR
#ifndef _SVSTDARR_BYTESTRINGSISORTDTOR_DECL
SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvByteStringsISortDtor, ByteStringPtr, 1, 1, )
#define _SVSTDARR_BYTESTRINGSISORTDTOR_DECL
#endif
-//#endif
-//#ifdef _SVSTDARR_XUB_STRLEN
#ifndef _SVSTDARR_XUB_STRLEN_DECL
SV_DECL_VARARR_VISIBILITY( SvXub_StrLens, xub_StrLen, 1, 1, )
#define _SVSTDARR_XUB_STRLEN_DECL
#endif
-//#endif
}
More information about the Libreoffice-commits
mailing list