Skip to content

C
core
Kaydet (Commit) 7a59eb88 authored tarafından jp's avatar jp
Dosyalara gözat
Seçenekler

Read_FieldIniFlags removed

üst d90b475d
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 50 deletions
sw/source/filter/ww8/ww8par.cxx
Dosyayı görüntüle @ 7a59eb88
......@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: jp $ $Date: 2000-11-15 14:31:46 $
* last change: $Author: jp $ $Date: 2000-11-20 14:11:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -204,15 +204,18 @@
#ifndef _FMTCLBL_HXX
#include <fmtclbl.hxx>
#endif
#ifndef _FLTINI_HXX
#include <fltini.hxx> // ReadFilterFlags
#endif
#ifndef _SWDOCSH_HXX //autogen
#include <docsh.hxx>
#endif
#ifndef _DOCUFLD_HXX //autogen
#include <docufld.hxx>
#endif
#ifndef _SWFLTOPT_HXX
#include <swfltopt.hxx>
#endif
#ifndef _FLTINI_HXX
#include <fltini.hxx>
#endif
#ifdef DEBUG
#ifndef _DOCARY_HXX //autogen
......@@ -2561,14 +2564,50 @@ ULONG SwWW8ImplReader::LoadDoc( SwPaM& rPaM,WW8Glossary *pGloss)
pAktColl = 0;
pAktItemSet = 0;
nIniFlags = ReadFilterFlags( "WW" );
nIniFlags1= ReadFilterFlags( "WW8" );
// nIniHdSiz = ReadFilterFlags( "WWHD" );
nIniFtSiz = ReadFilterFlags( "WWFT" );
// schiebt Flys um x twips nach rechts o. links
nIniFlyDx = ReadFilterFlags( "WWFLX" );
nIniFlyDy = ReadFilterFlags( "WWFLY" );// nach oben o. unten
Read_FieldIniFlags();
{
static const sal_Char* aNames[ 12 ] = {
"WinWord/WW", "WinWord/WW8", "WinWord/WWFT",
"WinWord/WWFLX", "WinWord/WWFLY",
"WinWord/WWF",
"WinWord/WWFA0", "WinWord/WWFA1", "WinWord/WWFA2",
"WinWord/WWFB0", "WinWord/WWFB1", "WinWord/WWFB2"
};
sal_uInt32 aVal[ 12 ];
SwFilterOptions aOpt( 12, aNames, aVal );
nIniFlags = aVal[ 0 ];
nIniFlags1= aVal[ 1 ];
// nIniHdSiz = ReadFilterFlags( "WWHD" );
nIniFtSiz = aVal[ 2 ];
// schiebt Flys um x twips nach rechts o. links
nIniFlyDx = aVal[ 3 ];
nIniFlyDy = aVal[ 4 ];
nFieldFlags = aVal[ 5 ];
if ( SwFltGetFlag( nFieldFlags, SwFltControlStack::HYPO ) )
{
SwFltSetFlag( nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF );
SwFltSetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID );
SwFltSetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT );
SwFltSetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
for( USHORT i = 0; i < 3; i++ )
nFieldTagAlways[i] = 0; // Hypo-Default: bekannte Felder
// nicht taggen
nFieldTagBad[0] = 0xffffffff; // unbekannte Felder taggen
nFieldTagBad[1] = 0xffffffff; //
nFieldTagBad[2] = 0xffffffef; // "EinfuegenText" nicht taggen
}
else
{
nFieldTagAlways[0] = aVal[ 6 ];
nFieldTagAlways[1] = aVal[ 7 ];
nFieldTagAlways[2] = aVal[ 8 ];
nFieldTagBad[0] = aVal[ 9 ];
nFieldTagBad[1] = aVal[ 10 ];
nFieldTagBad[2] = aVal[ 11 ];
}
}
UINT16 nMagic;
*pStrm >> nMagic;
......@@ -2851,11 +2890,14 @@ void SwMSDffManager::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd,
Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.cxx,v 1.2 2000-11-15 14:31:46 jp Exp $
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.cxx,v 1.3 2000-11-20 14:11:52 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
Revision 1.2 2000/11/15 14:31:46 jp
GetFilterFlags: don't insert SW-Objects
Revision 1.1.1.1 2000/09/18 17:14:58 hr
initial import
......
sw/source/filter/ww8/ww8par.hxx
Dosyayı görüntüle @ 7a59eb88
......@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par.hxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: jp $ $Date: 2000-11-01 12:12:16 $
* last change: $Author: jp $ $Date: 2000-11-20 14:09:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -910,7 +910,6 @@ friend class WW8FormulaControl;
void QuoteChar( String& rStr, const sal_Unicode _c, BOOL bAllowCr );
void QuoteString( String& rStr, const String& rOrg );
void MakeTagString( String& rStr, const String& rOrg );
void Read_FieldIniFlags();
void UpdateFields();
// void ConvertFName( String& rName );
void ConvertFFileName( String& rName, const String& rRaw );
......@@ -1116,11 +1115,14 @@ public: // eigentlich private, geht aber leider nur public
Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.hxx,v 1.4 2000-11-01 12:12:16 jp Exp $
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par.hxx,v 1.5 2000-11-20 14:09:17 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
Revision 1.4 2000/11/01 12:12:16 jp
optimize: use the same code to read MAC-Pict
Revision 1.3 2000/10/16 10:54:58 khz
read extended WW9-Frame-Alignment (stored in Escher record 0xF122)
......
sw/source/filter/ww8/ww8par5.cxx
Dosyayı görüntüle @ 7a59eb88
......@@ -2,9 +2,9 @@
*
* $RCSfile: ww8par5.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: khz $ $Date: 2000-10-25 14:19:04 $
* last change: $Author: jp $ $Date: 2000-11-20 14:11:17 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -389,35 +389,6 @@ BOOL _ReadFieldParams::GetTokenSttFromTo(USHORT* pFrom, USHORT* pTo, USHORT nMax
/* */
//----------------------------------------
// Initialisieren der Feld-FilterFlags
//----------------------------------------
void SwWW8ImplReader::Read_FieldIniFlags()
{
USHORT i;
nFieldFlags = ReadFilterFlags( "WWF" );
if ( SwFltGetFlag( nFieldFlags, SwFltControlStack::HYPO ) ){
SwFltSetFlag( nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF );
SwFltSetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID );
SwFltSetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT );
SwFltSetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
for( i = 0; i < 3; i++ ){
nFieldTagAlways[i] = 0; // Hypo-Default: bekannte Felder
} // nicht taggen
nFieldTagBad[0] = 0xffffffff; // unbekannte Felder taggen
nFieldTagBad[1] = 0xffffffff; //
nFieldTagBad[2] = 0xffffffef; // "EinfuegenText" nicht taggen
}else{
nFieldTagAlways[0] = ReadFilterFlags( "WWFA0" );
nFieldTagAlways[1] = ReadFilterFlags( "WWFA1" );
nFieldTagAlways[2] = ReadFilterFlags( "WWFA2" );
nFieldTagBad[0] = ReadFilterFlags( "WWFB0" );
nFieldTagBad[1] = ReadFilterFlags( "WWFB1" );
nFieldTagBad[2] = ReadFilterFlags( "WWFB2" );
}
}
//----------------------------------------
// Bookmarks
//----------------------------------------
......@@ -2860,12 +2831,15 @@ void SwWW8ImplReader::Read_Invisible( USHORT, BYTE* pData, short nLen )
Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par5.cxx,v 1.3 2000-10-25 14:19:04 khz Exp $
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par5.cxx,v 1.4 2000-11-20 14:11:17 jp Exp $
Source Code Control System - Update
$Log: not supported by cvs2svn $
Revision 1.3 2000/10/25 14:19:04 khz
code cleaned up
Revision 1.2 2000/10/06 13:11:18 jp
should changes: don't use IniManager
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment