View | Details | Raw Unified | Return to issue 11215
Collapse All | Expand All

(-) (+13 lines)
Added Link Here
1
	<node oor:name="Lwp" oor:op="replace" oor:finalized="true" oor:mandatory="true">
2
		<prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS PREFERRED</value></prop>
3
		<prop oor:name="UIComponent"/>
4
		<prop oor:name="FilterService"/>
5
		<prop oor:name="UserData"><value>LWP</value></prop>
6
		<prop oor:name="UIName">
7
			<value xml:lang="x-default">Lotus Word Pro</value>
8
		</prop>
9
		<prop oor:name="FileFormatVersion"><value>0</value></prop>
10
		<prop oor:name="Type"><value>writer_Lwp</value></prop>
11
		<prop oor:name="TemplateName"/>
12
		<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
13
	</node>
(-) (+12 lines)
Added Link Here
1
	<node oor:name="writer_Lwp" oor:op="replace" oor:finalized="true" oor:mandatory="true">
2
		<prop oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
3
		<prop oor:name="URLPattern"/>
4
		<prop oor:name="Extensions"><value>lwp</value></prop>
5
		<prop oor:name="MediaType"><value></value></prop>
6
		<prop oor:name="Preferred"><value>false</value></prop>
7
		<prop oor:name="PreferredFilter"><value>Lwp</value></prop>
8
		<prop oor:name="UIName">
9
			<value>Lotus Word Pro</value>
10
		</prop>
11
		<prop oor:name="ClipboardFormat"/>
12
	</node>
(-)sw/inc/shellio.hxx (+5 lines)
Lines 351-356 Link Here
351
    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
351
    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
352
};
352
};
353
353
354
class LwpReader: public Reader
355
{
356
    virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &, const String & );
357
};
354
358
355
class AsciiReader: public Reader
359
class AsciiReader: public Reader
356
{
360
{
Lines 753-758 Link Here
753
757
754
extern const sal_Char __FAR_DATA FILTER_SWG[];  // SWG-Filter
758
extern const sal_Char __FAR_DATA FILTER_SWG[];  // SWG-Filter
755
extern const sal_Char __FAR_DATA FILTER_RTF[];	// RTF-Filter
759
extern const sal_Char __FAR_DATA FILTER_RTF[];	// RTF-Filter
760
extern const sal_Char __FAR_DATA FILTER_LWP[];  // LWP-Filter
756
extern const sal_Char __FAR_DATA FILTER_TEXT[];	// Text-Filter mit Default-CodeSet
761
extern const sal_Char __FAR_DATA FILTER_TEXT[];	// Text-Filter mit Default-CodeSet
757
extern const sal_Char __FAR_DATA FILTER_BAS[];	// StarBasic (identisch mit ANSI)
762
extern const sal_Char __FAR_DATA FILTER_BAS[];	// StarBasic (identisch mit ANSI)
758
extern const sal_Char __FAR_DATA FILTER_W4W[];	// W4W-Filter
763
extern const sal_Char __FAR_DATA FILTER_W4W[];	// W4W-Filter
(-)fltini.cxx.bak (-1 / +2 lines)
Lines 182-188 Link Here
182
using namespace rtl;
182
using namespace rtl;
183
using namespace com::sun::star::uno;
183
using namespace com::sun::star::uno;
184
184
185
SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
185
SwRead ReadRtf = 0, ReadLwp = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0,
186
		ReadHTML = 0, ReadXML = 0;
186
		ReadHTML = 0, ReadXML = 0;
187
187
188
SwRead SwGetReaderSw3() // SW_DLLPUBLIC
188
SwRead SwGetReaderSw3() // SW_DLLPUBLIC
Lines 220-225 Link Here
220
    _SetFltPtr( nCnt, (ReadSwg = new SwgReader), FILTER_SWG );
220
    _SetFltPtr( nCnt, (ReadSwg = new SwgReader), FILTER_SWG );
221
    _SetFltPtr( nCnt, ReadSwg, FILTER_SWGV );
221
    _SetFltPtr( nCnt, ReadSwg, FILTER_SWGV );
222
	_SetFltPtr( nCnt, (ReadRtf = new RtfReader), FILTER_RTF );
222
	_SetFltPtr( nCnt, (ReadRtf = new RtfReader), FILTER_RTF );
223
	_SetFltPtr( nCnt, (ReadLwp = new LwpReader), FILTER_LWP );
223
	_SetFltPtr( nCnt, new Sw6Reader, sSwDos );
224
	_SetFltPtr( nCnt, new Sw6Reader, sSwDos );
224
	_SetFltPtr( nCnt, (ReadAscii = new AsciiReader), FILTER_BAS );
225
	_SetFltPtr( nCnt, (ReadAscii = new AsciiReader), FILTER_BAS );
225
	_SetFltPtr( nCnt, pWW8Rd, sWW6 );
226
	_SetFltPtr( nCnt, pWW8Rd, sWW6 );
(-)iodetect.cxx.bak (-7 / +6 lines)
Lines 154-165 Link Here
154
154
155
#endif
155
#endif
156
156
157
const USHORT MAXFILTER =
158
#ifdef DEBUG_SH
159
		1 +
160
#endif
161
        18;
162
163
#define FORAMTNAME_SW4 		"StarWriter 4.0"
157
#define FORAMTNAME_SW4 		"StarWriter 4.0"
164
#define FORAMTNAME_SW3   	"StarWriter 3.0"
158
#define FORAMTNAME_SW3   	"StarWriter 3.0"
165
#define FORAMTNAME_SWGLOB   "StarWriter/Global 4.0"
159
#define FORAMTNAME_SWGLOB   "StarWriter/Global 4.0"
Lines 171-176 Link Here
171
const sal_Char __FAR_DATA FILTER_SW5[]	= "CSW5";
165
const sal_Char __FAR_DATA FILTER_SW5[]	= "CSW5";
172
const sal_Char __FAR_DATA FILTER_BAS[]	= "BAS";
166
const sal_Char __FAR_DATA FILTER_BAS[]	= "BAS";
173
const sal_Char __FAR_DATA FILTER_RTF[]	= "RTF";
167
const sal_Char __FAR_DATA FILTER_RTF[]	= "RTF";
168
const sal_Char __FAR_DATA FILTER_LWP[]  = "LWP";
174
const sal_Char __FAR_DATA FILTER_W4W[]	= "W4W";
169
const sal_Char __FAR_DATA FILTER_W4W[]	= "W4W";
175
const sal_Char __FAR_DATA FILTER_SWGV[]	= "SWGV";
170
const sal_Char __FAR_DATA FILTER_SWGV[]	= "SWGV";
176
const sal_Char __FAR_DATA FILTER_SW3V[]	= "CSW3V";
171
const sal_Char __FAR_DATA FILTER_SW3V[]	= "CSW3V";
Lines 214-220 Link Here
214
}
209
}
215
210
216
#endif
211
#endif
217
SwIoDetect aReaderWriter[ MAXFILTER ] =
212
SwIoDetect aReaderWriter[ ] =
218
{
213
{
219
///*  0*/ SwIoEntry(FILTER_SW5,       4,          &::GetSw3Writer,    TRUE),
214
///*  0*/ SwIoEntry(FILTER_SW5,       4,          &::GetSw3Writer,    TRUE),
220
///*  1*/ SwIoEntry(FILTER_SW4,       4,          &::GetSw3Writer,    FALSE),
215
///*  1*/ SwIoEntry(FILTER_SW4,       4,          &::GetSw3Writer,    FALSE),
Lines 222-227 Link Here
222
/*  3*/ SwIoEntry(FILTER_SWG,       STRING_LEN, 0,                  TRUE),
217
/*  3*/ SwIoEntry(FILTER_SWG,       STRING_LEN, 0,                  TRUE),
223
/*  4*/ SwIoEntry(FILTER_SWGV,      4,          0,                  FALSE),
218
/*  4*/ SwIoEntry(FILTER_SWGV,      4,          0,                  FALSE),
224
/*	5*/ SwIoEntry(FILTER_RTF, 		STRING_LEN,	&::GetRTFWriter, 	TRUE),
219
/*	5*/ SwIoEntry(FILTER_RTF, 		STRING_LEN,	&::GetRTFWriter, 	TRUE),
220
	    SwIoEntry(FILTER_LWP,   STRING_LEN, 0,                  TRUE),
225
/*  6*/ SwIoEntry(sSwDos,           STRING_LEN,	0,  				TRUE),
221
/*  6*/ SwIoEntry(sSwDos,           STRING_LEN,	0,  				TRUE),
226
/*	7*/ SwIoEntry(FILTER_BAS, 		STRING_LEN,	&::GetASCWriter, 	FALSE),
222
/*	7*/ SwIoEntry(FILTER_BAS, 		STRING_LEN,	&::GetASCWriter, 	FALSE),
227
/*	8*/ SwIoEntry(sWW6,				STRING_LEN,	&::GetWW8Writer, 	TRUE),
223
/*	8*/ SwIoEntry(sWW6,				STRING_LEN,	&::GetWW8Writer, 	TRUE),
Lines 242-247 Link Here
242
238
243
const char* pSw = "swriter";
239
const char* pSw = "swriter";
244
const char* pSwWeb = "swriter/web";
240
const char* pSwWeb = "swriter/web";
241
const USHORT MAXFILTER = sizeof( aReaderWriter ) / sizeof( aReaderWriter[ 0 ] );
245
242
246
// Filter erkennung
243
// Filter erkennung
247
struct W1_FIB
244
struct W1_FIB
Lines 287-292 Link Here
287
                '1' == *(pHeader + 3);
284
                '1' == *(pHeader + 3);
288
	else if( FILTER_RTF == pName )
285
	else if( FILTER_RTF == pName )
289
		bRet = 0 == strncmp( "{\\rtf", pHeader, 5 );
286
		bRet = 0 == strncmp( "{\\rtf", pHeader, 5 );
287
	else if( FILTER_LWP == pName )
288
		bRet = 0 == strncmp( "WordPro", pHeader, 7 );
290
	else if( sLotusD == pName )
289
	else if( sLotusD == pName )
291
		bRet = 0 == *pHeader++ && 0 == *pHeader++ &&
290
		bRet = 0 == *pHeader++ && 0 == *pHeader++ &&
292
				2 == *pHeader++ && 0 == *pHeader++ &&
291
				2 == *pHeader++ && 0 == *pHeader++ &&

Return to issue 11215