Skip to content

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

ReadFilterFlags removed, use new class SwFilterOptions

üst 7a59eb88
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 50 deletions
sw/source/filter/basflt/fltini.cxx
Dosyayı görüntüle @ 7e30aa52
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: fltini.cxx,v $ * $RCSfile: fltini.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: jp $ $Date: 2000-11-13 10:46:09 $ * last change: $Author: jp $ $Date: 2000-11-20 14:17:21 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -107,6 +107,12 @@ ...@@ -107,6 +107,12 @@
#ifndef _SVX_TSPTITEM_HXX //autogen #ifndef _SVX_TSPTITEM_HXX //autogen
#include <svx/tstpitem.hxx> #include <svx/tstpitem.hxx>
#endif #endif
#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
#include <com/sun/star/uno/Any.hxx>
#endif
#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
#include <com/sun/star/uno/Sequence.hxx>
#endif
#ifndef _DOC_HXX #ifndef _DOC_HXX
#include <doc.hxx> #include <doc.hxx>
...@@ -169,18 +175,23 @@ ...@@ -169,18 +175,23 @@
#ifndef _FRMFMT_HXX #ifndef _FRMFMT_HXX
#include <frmfmt.hxx> #include <frmfmt.hxx>
#endif #endif
#ifndef _NUMRULE_HXX #ifndef _NUMRULE_HXX
#include <numrule.hxx> #include <numrule.hxx>
#endif #endif
#ifndef _NDTXT_HXX #ifndef _NDTXT_HXX
#include <ndtxt.hxx> #include <ndtxt.hxx>
#endif #endif
#ifndef _SWFLTOPT_HXX
#include <swfltopt.hxx>
#endif
#ifndef _SWSWERROR_H #ifndef _SWSWERROR_H
#include <swerror.h> #include <swerror.h>
#endif #endif
using namespace utl;
using namespace rtl;
using namespace com::sun::star::uno;
SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0, SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
ReadHTML = 0, ReadXML = 0; ReadHTML = 0, ReadXML = 0;
...@@ -498,49 +509,67 @@ BOOL SwReader::CheckPasswd( const String& rPasswd, const Reader& rOptions ) ...@@ -498,49 +509,67 @@ BOOL SwReader::CheckPasswd( const String& rPasswd, const Reader& rOptions )
/* */ /* */
//----------------------------------------- //-----------------------------------------------------------------------
// IniFlags lesen // Filter Flags lesen, wird von WW8 / W4W / EXCEL / LOTUS benutzt.
//----------------------------------------- //-----------------------------------------------------------------------
// ReadFilterFlags wird von WW / W4W / EXCEL / LOTUS benutzt.
/*
ULONG ReadFilterFlags( const sal_Char* pName, const sal_Char* pAltName ) <FilterFlags>
<Excel_Lotus>
<MinRow cfg:type="long">0</MinRow>
<MaxRow cfg:type="long">0</MaxRow>
<MinCol cfg:type="long">0</MinCol>
<MaxCol cfg:type="long">0</MaxCol>
</Excel_Lotus>
<W4W>
<W4WHD cfg:type="long">0</W4WHD>
<W4WFT cfg:type="long">0</W4WFT>
<W4W000 cfg:type="long">0</W4W000>
</W4W>
<WinWord>
<WW1F cfg:type="long">0</WW1F>
<WW cfg:type="long">0</WW>
<WW8 cfg:type="long">0</WW8>
<WWF cfg:type="long">0</WWF>
<WWFA0 cfg:type="long">0</WWFA0>
<WWFA1 cfg:type="long">0</WWFA1>
<WWFA2 cfg:type="long">0</WWFA2>
<WWFB0 cfg:type="long">0</WWFB0>
<WWFB1 cfg:type="long">0</WWFB1>
<WWFB2 cfg:type="long">0</WWFB2>
<WWFLX cfg:type="long">0</WWFLX>
<WWFLY cfg:type="long">0</WWFLY>
<WWFT cfg:type="long">0</WWFT>
<WWWR cfg:type="long">0</WWWR>
</WinWord>
<Writer>
<SW3Imp cfg:type="long">0</SW3Imp>
</Writer>
</FilterFlags>
*/
SwFilterOptions::SwFilterOptions( sal_uInt16 nCnt, const sal_Char** ppNames,
sal_uInt32* pValues )
: ConfigItem( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
"Office.Writer/FilterFlags" ) ))
{ {
return 0; Sequence<OUString> aNames( nCnt );
OUString* pNames = aNames.getArray();
#if 0 for( USHORT n = 0; n < nCnt; ++n )
// must be changed to the new configiguration pNames[ n ] = OUString::createFromAscii( ppNames[ n ] );
String sName( String::CreateFromAscii( pName )); Sequence<Any> aValues = GetProperties( aNames );
String aStr( SFX_APP()->GetIniManager()->Get( SFX_GROUP_USER, sName )); // aName suchen
if( !aStr.Len() && pAltName && *pAltName ) if( nCnt == aValues.getLength() )
aStr = SFX_APP()->GetIniManager()->Get( SFX_GROUP_USER,
sName.AssignAscii( pAltName ));
ULONG nVal = 0;
if( aStr.Len() )
{
xub_StrLen nPos = aStr.SearchAscii( "0x" );
if( STRING_NOTFOUND != nPos )
{ {
sal_Unicode nNibble; const Any* pAnyValues = aValues.getConstArray();
for( nPos += 2; nPos < aStr.Len(); ++nPos ) for( n = 0; n < nCnt; ++n )
{ pValues[ n ] = pAnyValues[ n ].hasValue()
if( ((nNibble = aStr.GetChar(nPos)) >= '0') && ( nNibble <= '9') ) ? *(sal_uInt32*)pAnyValues[ n ].getValue()
nNibble -= '0'; : 0;
else if( (nNibble >= 'A') && (nNibble <= 'F') )
nNibble -= 'A' - 10;
else if( (nVal >= 'a') && (nNibble <= 'f') )
nNibble -= 'a' - 10;
else
break;
( nVal <<= 4 ) += nNibble;
}
} }
else else
nVal = aStr.ToInt32(); for( n = 0; n < nCnt; ++n )
} pValues[ n ] = 0;
return nVal;
#endif
} }
/* */ /* */
...@@ -1516,6 +1545,9 @@ Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle) ...@@ -1516,6 +1545,9 @@ Color ConvertBrushStyle(const Color& rCol, const Color& rFillCol, BYTE nStyle)
/************************************************************************* /*************************************************************************
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2000/11/13 10:46:09 jp
remove IniManager
Revision 1.2 2000/10/06 13:08:02 jp Revision 1.2 2000/10/06 13:08:02 jp
should changes: don't use IniManager should changes: don't use IniManager
......
sw/source/filter/ww1/w1par.cxx
Dosyayı görüntüle @ 7e30aa52
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: w1par.cxx,v $ * $RCSfile: w1par.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: hr $ $Date: 2000-09-18 17:14:58 $ * last change: $Author: jp $ $Date: 2000-11-20 14:13:10 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -80,6 +80,9 @@ ...@@ -80,6 +80,9 @@
#ifndef _W1PAR_HXX #ifndef _W1PAR_HXX
#include <w1par.hxx> #include <w1par.hxx>
#endif #endif
#ifndef _SWFLTOPT_HXX
#include <swfltopt.hxx>
#endif
#ifndef _MDIEXP_HXX #ifndef _MDIEXP_HXX
#include <mdiexp.hxx> // StatLine...() #include <mdiexp.hxx> // StatLine...()
...@@ -98,7 +101,11 @@ ...@@ -98,7 +101,11 @@
static ULONG WW1_Read_FieldIniFlags() static ULONG WW1_Read_FieldIniFlags()
{ {
// USHORT i; // USHORT i;
ULONG nFieldFlags = ReadFilterFlags( "WW1F" ); static const sal_Char* aNames[ 1 ] = { "WinWord/WW1F" };
sal_uInt32 aVal[ 1 ];
SwFilterOptions aOpt( 1, aNames, aVal );
ULONG nFieldFlags = aVal[ 0 ];
if ( SwFltGetFlag( nFieldFlags, SwFltControlStack::HYPO ) ) if ( SwFltGetFlag( nFieldFlags, SwFltControlStack::HYPO ) )
{ {
SwFltSetFlag( nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF ); SwFltSetFlag( nFieldFlags, SwFltControlStack::BOOK_TO_VAR_REF );
...@@ -188,11 +195,14 @@ Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, BOOL bNew, ULONG nFieldFlags) ...@@ -188,11 +195,14 @@ Ww1Shell::Ww1Shell( SwDoc& rD, SwPaM& rPam, BOOL bNew, ULONG nFieldFlags)
Source Code Control System - Header Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww1/w1par.cxx,v 1.1.1.1 2000-09-18 17:14:58 hr Exp $ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww1/w1par.cxx,v 1.2 2000-11-20 14:13:10 jp Exp $
Source Code Control System - Update Source Code Control System - Update
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.1.1.1 2000/09/18 17:14:58 hr
initial import
Revision 1.20 2000/09/18 16:04:57 willem.vandorp Revision 1.20 2000/09/18 16:04:57 willem.vandorp
OpenOffice header added. OpenOffice header added.
......
sw/source/filter/ww8/wrtww8.cxx
Dosyayı görüntüle @ 7e30aa52
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: wrtww8.cxx,v $ * $RCSfile: wrtww8.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: jp $ $Date: 2000-11-13 17:30:15 $ * last change: $Author: jp $ $Date: 2000-11-20 14:12:26 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -183,7 +183,12 @@ ...@@ -183,7 +183,12 @@
#ifndef _SECTION_HXX #ifndef _SECTION_HXX
#include <section.hxx> #include <section.hxx>
#endif #endif
#include "poolfmt.hxx" // RES_POOLCOLL_STANDARD #ifndef _POOLFMT_HXX
#include <poolfmt.hxx> // RES_POOLCOLL_STANDARD
#endif
#ifndef _SWFLTOPT_HXX
#include <swfltopt.hxx>
#endif
#ifndef _MDIEXP_HXX #ifndef _MDIEXP_HXX
#include <mdiexp.hxx> // Progress #include <mdiexp.hxx> // Progress
...@@ -1705,7 +1710,12 @@ void SwWW8Writer::StoreDoc1() ...@@ -1705,7 +1710,12 @@ void SwWW8Writer::StoreDoc1()
ULONG SwWW8Writer::StoreDoc() ULONG SwWW8Writer::StoreDoc()
{ {
nIniFlags = ReadFilterFlags( "WWWR" ); {
static const sal_Char* aNames[ 1 ] = { "WinWord/WWWR" };
sal_uInt32 aVal[ 1 ];
SwFilterOptions aOpt( 1, aNames, aVal );
nIniFlags = aVal[ 0 ];
}
nCharFmtStart = ANZ_DEFAULT_STYLES; nCharFmtStart = ANZ_DEFAULT_STYLES;
nFmtCollStart = nCharFmtStart + pDoc->GetCharFmts()->Count() - 1; nFmtCollStart = nCharFmtStart + pDoc->GetCharFmts()->Count() - 1;
...@@ -2056,11 +2066,14 @@ void GetWW8Writer( const String& rFltName, WriterRef& xRet ) ...@@ -2056,11 +2066,14 @@ void GetWW8Writer( const String& rFltName, WriterRef& xRet )
Source Code Control System - Header Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtww8.cxx,v 1.3 2000-11-13 17:30:15 jp Exp $ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtww8.cxx,v 1.4 2000-11-20 14:12:26 jp Exp $
Source Code Control System - Update Source Code Control System - Update
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2000/11/13 17:30:15 jp
new method PutCJKandCTLFontsInAttrPool
Revision 1.2 2000/10/10 16:54:06 cmc Revision 1.2 2000/10/10 16:54:06 cmc
MSOffice 97/2000 Controls {Im|Ex}port MSOffice 97/2000 Controls {Im|Ex}port
......
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