Attachment #28706 for issue #4925

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

Lines 1389-1394 void ScDocShell::AsciiSave( SvStream& rS Link Here

(-)sc/source/ui/docshell/docsh.cxx (-1 / +2 lines)
1389	sal_Unicode cStrDelim = rAsciiOpt.nTextSepCode;	1389	sal_Unicode cStrDelim = rAsciiOpt.nTextSepCode;
1390	CharSet eCharSet = rAsciiOpt.eCharSet;	1390	CharSet eCharSet = rAsciiOpt.eCharSet;
1391	BOOL bFixedWidth = rAsciiOpt.bFixedWidth;	1391	BOOL bFixedWidth = rAsciiOpt.bFixedWidth;
		1392	BOOL bSaveAsRendered = rAsciiOpt.bSaveAsRendered;
1392		1393
1393	CharSet eOldCharSet = rStream.GetStreamCharSet();	1394	CharSet eOldCharSet = rStream.GetStreamCharSet();
1394	rStream.SetStreamCharSet( eCharSet );	1395	rStream.SetStreamCharSet( eCharSet );
Lines 1575-1581 void ScDocShell::AsciiSave( SvStream& rS Link Here
1575	{	1576	{
1576	ULONG nFormat;	1577	ULONG nFormat;
1577	aDocument.GetNumberFormat( nCol, nRow, nTab, nFormat );	1578	aDocument.GetNumberFormat( nCol, nRow, nTab, nFormat );
1578	if ( bFixedWidth )	1579	if ( bFixedWidth \|\| bSaveAsRendered )
1579	{	1580	{
1580	Color* pDummy;	1581	Color* pDummy;
1581	ScCellFormat::GetString( pCell, nFormat, aString, &pDummy, rFormatter );	1582	ScCellFormat::GetString( pCell, nFormat, aString, &pDummy, rFormatter );

Lines 368-373 ScImportOptions::ScImportOptions( const Link Here

(-)sc/source/ui/dbgui/imoptdlg.cxx (+3 lines)
368	nTextSepCode = (sal_Unicode) rStr.GetToken(1,',').ToInt32();	368	nTextSepCode = (sal_Unicode) rStr.GetToken(1,',').ToInt32();
369	aStrFont = rStr.GetToken(2,',');	369	aStrFont = rStr.GetToken(2,',');
370	eCharSet = ScGlobal::GetCharsetValue(aStrFont);	370	eCharSet = ScGlobal::GetCharsetValue(aStrFont);
		371	bSaveAsRendered = (BOOL) (rStr.GetToken( 3, ',' ).ToInt32());
371	}	372	}
372	}	373	}
373		374
Lines 385-390 String ScImportOptions::BuildString() co Link Here
385	aResult += String::CreateFromInt32(nTextSepCode);	386	aResult += String::CreateFromInt32(nTextSepCode);
386	aResult += ',';	387	aResult += ',';
387	aResult += aStrFont;	388	aResult += aStrFont;
		389	aResult += ',';
		390	aResult += String::CreateFromInt32( (sal_Int32)bSaveAsRendered );
388		391
389	return aResult;	392	return aResult;
390	}	393	}

Lines 74-77 Link Here

(-)sc/source/ui/dbgui/imoptdlg.hrc (+1 lines)
74	#define LB_FONT 10	74	#define LB_FONT 10
75	#define FL_FIELDOPT 11	75	#define FL_FIELDOPT 11
76	#define CB_FIXEDWIDTH 12	76	#define CB_FIXEDWIDTH 12
		77	#define CB_SAVERENDER 13
77		78




{
public:
		ScImportOptions()
            : nFieldSepCode(0),nTextSepCode(0),eCharSet(RTL_TEXTENCODING_DONTKNOW),bFixedWidth(FALSE),bSaveAsRendered(FALSE)
		{}
		ScImportOptions( const String& rStr );

		ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, const String& rStr )
            : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),aStrFont(rStr),bFixedWidth(FALSE),bSaveAsRendered(FALSE)
		{ eCharSet = ScGlobal::GetCharsetValue(aStrFont); }

		ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, rtl_TextEncoding nEnc )
            : nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),bFixedWidth(FALSE),bSaveAsRendered(FALSE)
		{ SetTextEncoding( nEnc ); }

		ScImportOptions( const ScImportOptions& rCpy )
			: nFieldSepCode		(rCpy.nFieldSepCode),
			  nTextSepCode		(rCpy.nTextSepCode),
			  aStrFont			(rCpy.aStrFont),
              eCharSet      	(rCpy.eCharSet),
              bFixedWidth   	(rCpy.bFixedWidth),
			  bSaveAsRendered	(rCpy.bSaveAsRendered)
		{}

	ScImportOptions& operator=( const ScImportOptions& rCpy )
						{
							nFieldSepCode 	= rCpy.nFieldSepCode;
							nTextSepCode  	= rCpy.nTextSepCode;
							aStrFont	  	= rCpy.aStrFont;
							eCharSet	  	= rCpy.eCharSet;
                            bFixedWidth   	= rCpy.bFixedWidth;
							bSaveAsRendered	= rCpy.bSaveAsRendered;
							return *this;
						}

	BOOL			 operator==( const ScImportOptions& rCmp )
						{
							return
								   nFieldSepCode 	== rCmp.nFieldSepCode
								&& nTextSepCode  	== rCmp.nTextSepCode
								&& eCharSet		 	== rCmp.eCharSet
                                && aStrFont      	== rCmp.aStrFont
                                && bFixedWidth   	== rCmp.bFixedWidth
								&& bSaveAsRendered	== rCmp.bSaveAsRendered;
						}
	String	BuildString() const;


    String      aStrFont;
    CharSet     eCharSet;
    BOOL        bFixedWidth;
	BOOL		bSaveAsRendered;
};



Lines 173-179 ScImportOptionsDlg::ScImportOptionsDlg( Link Here

(-)sc/source/ui/dbgui/scuiimoptdlg.cxx (-1 / +7 lines)
173	aFtFont ( this, ScResId( FT_FONT ) ),	173	aFtFont ( this, ScResId( FT_FONT ) ),
174	aLbFont ( this, ScResId( bAscii ? DDLB_FONT : LB_FONT ) ),	174	aLbFont ( this, ScResId( bAscii ? DDLB_FONT : LB_FONT ) ),
175	aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),	175	aFlFieldOpt ( this, ScResId( FL_FIELDOPT ) ),
176	aCbFixed ( this, ScResId( CB_FIXEDWIDTH ) )	176	aCbFixed ( this, ScResId( CB_FIXEDWIDTH ) ),
		177	aCbRender ( this, ScResId( CB_SAVERENDER ) )
177	{	178	{
178	// im Ctor-Initializer nicht moeglich (MSC kann das nicht):	179	// im Ctor-Initializer nicht moeglich (MSC kann das nicht):
179	pFieldSepTab = new ScDelimiterTable( String(ScResId(SCSTR_FIELDSEP)) );	180	pFieldSepTab = new ScDelimiterTable( String(ScResId(SCSTR_FIELDSEP)) );
Lines 250-255 ScImportOptionsDlg::ScImportOptionsDlg( Link Here
250	aCbFixed.Show();	251	aCbFixed.Show();
251	aCbFixed.SetClickHdl( LINK( this, ScImportOptionsDlg, FixedWidthHdl ) );	252	aCbFixed.SetClickHdl( LINK( this, ScImportOptionsDlg, FixedWidthHdl ) );
252	aCbFixed.Check( FALSE );	253	aCbFixed.Check( FALSE );
		254	aCbRender.Show();
		255	aCbRender.Check( FALSE );
253	}	256	}
254	else	257	else
255	{	258	{
Lines 260-265 ScImportOptionsDlg::ScImportOptionsDlg( Link Here
260	aEdFieldSep.Hide();	263	aEdFieldSep.Hide();
261	aEdTextSep.Hide();	264	aEdTextSep.Hide();
262	aCbFixed.Hide();	265	aCbFixed.Hide();
		266	aCbRender.Hide();
263	aLbFont.GrabFocus();	267	aLbFont.GrabFocus();
264	aLbFont.SetDoubleClickHdl( LINK( this, ScImportOptionsDlg, DoubleClickHdl ) );	268	aLbFont.SetDoubleClickHdl( LINK( this, ScImportOptionsDlg, DoubleClickHdl ) );
265	}	269	}
Lines 293-298 void ScImportOptionsDlg::GetImportOption Link Here
293	rOptions.nFieldSepCode = GetCodeFromCombo( aEdFieldSep );	297	rOptions.nFieldSepCode = GetCodeFromCombo( aEdFieldSep );
294	rOptions.nTextSepCode = GetCodeFromCombo( aEdTextSep );	298	rOptions.nTextSepCode = GetCodeFromCombo( aEdTextSep );
295	rOptions.bFixedWidth = aCbFixed.IsChecked();	299	rOptions.bFixedWidth = aCbFixed.IsChecked();
		300	rOptions.bSaveAsRendered = aCbRender.IsChecked();
296	}	301	}
297	}	302	}
298		303
Lines 335-340 IMPL_LINK( ScImportOptionsDlg, FixedWidt Link Here
335	aEdFieldSep.Enable( bEnable );	340	aEdFieldSep.Enable( bEnable );
336	aFtTextSep.Enable( bEnable );	341	aFtTextSep.Enable( bEnable );
337	aEdTextSep.Enable( bEnable );	342	aEdTextSep.Enable( bEnable );
		343	aCbRender.Enable( bEnable );
338	}	344	}
339	return 0;	345	return 0;
340	}	346	}

Lines 96-101 private: Link Here

(-)sc/source/ui/inc/scuiimoptdlg.hxx (+1 lines)
96	OKButton aBtnOk;	96	OKButton aBtnOk;
97	CancelButton aBtnCancel;	97	CancelButton aBtnCancel;
98	HelpButton aBtnHelp;	98	HelpButton aBtnHelp;
		99	CheckBox aCbRender;
99		100
100	ScDelimiterTable* pFieldSepTab;	101	ScDelimiterTable* pFieldSepTab;
101	ScDelimiterTable* pTextSepTab;	102	ScDelimiterTable* pTextSepTab;




    CheckBox CB_FIXEDWIDTH
    {
        Pos = MAP_APPFONT( 12, 66 );
        Size = MAP_APPFONT( 100, 10 );
        Hide = TRUE;
        Text [ de ] = "Feste Spalten~breite";
        Text [ en-US ] = "Fixed column ~width";
	};
	CheckBox CB_SAVERENDER
	{
		Pos = MAP_APPFONT( 120, 66 );
		Size = MAP_APPFONT( 100, 10 ); 
		TabStop = TRUE;
		Hide = TRUE;
		Text [ de ] = " ";
		Text [ en-US ] = "Save as ~Rendered";
		Text [ x-comment ] = " ";
	};
	OKButton BTN_OK
	{
		Pos = MAP_APPFONT ( 202 , 6 ) ;

Return to issue 4925

Lines 135-145 ModalDialog RID_SCDLG_IMPORTOPT Link Here

(-)sc/source/ui/dbgui/imoptdlg.src (-1 / +11 lines)
135	CheckBox CB_FIXEDWIDTH	135	CheckBox CB_FIXEDWIDTH
136	{	136	{
137	Pos = MAP_APPFONT( 12, 66 );	137	Pos = MAP_APPFONT( 12, 66 );
138	Size = MAP_APPFONT( 172, 10 );	138	Size = MAP_APPFONT( 100, 10 );
139	Hide = TRUE;	139	Hide = TRUE;
140	Text [ de ] = "Feste Spalten~breite";	140	Text [ de ] = "Feste Spalten~breite";
141	Text [ en-US ] = "Fixed column ~width";	141	Text [ en-US ] = "Fixed column ~width";
142	};	142	};
		143	CheckBox CB_SAVERENDER
		144	{
		145	Pos = MAP_APPFONT( 120, 66 );
		146	Size = MAP_APPFONT( 100, 10 );
		147	TabStop = TRUE;
		148	Hide = TRUE;
		149	Text [ de ] = " ";
		150	Text [ en-US ] = "Save as ~Rendered";
		151	Text [ x-comment ] = " ";
		152	};
143	OKButton BTN_OK	153	OKButton BTN_OK
144	{	154	{
145	Pos = MAP_APPFONT ( 202 , 6 ) ;	155	Pos = MAP_APPFONT ( 202 , 6 ) ;

Lines 143-186 class SC_DLLPUBLIC ScImportOptions Link Here

(-)sc/source/ui/inc/imoptdlg.hxx (-18 / +22 lines)
143	{	143	{
144	public:	144	public:
145	ScImportOptions()	145	ScImportOptions()
146	: nFieldSepCode(0),nTextSepCode(0),eCharSet(RTL_TEXTENCODING_DONTKNOW),bFixedWidth(FALSE)	146	: nFieldSepCode(0),nTextSepCode(0),eCharSet(RTL_TEXTENCODING_DONTKNOW),bFixedWidth(FALSE),bSaveAsRendered(FALSE)
147	{}	147	{}
148	ScImportOptions( const String& rStr );	148	ScImportOptions( const String& rStr );
149		149
150	ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, const String& rStr )	150	ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, const String& rStr )
151	: nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),aStrFont(rStr),bFixedWidth(FALSE)	151	: nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),aStrFont(rStr),bFixedWidth(FALSE),bSaveAsRendered(FALSE)
152	{ eCharSet = ScGlobal::GetCharsetValue(aStrFont); }	152	{ eCharSet = ScGlobal::GetCharsetValue(aStrFont); }
153		153
154	ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, rtl_TextEncoding nEnc )	154	ScImportOptions( sal_Unicode nFieldSep, sal_Unicode nTextSep, rtl_TextEncoding nEnc )
155	: nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),bFixedWidth(FALSE)	155	: nFieldSepCode(nFieldSep),nTextSepCode(nTextSep),bFixedWidth(FALSE),bSaveAsRendered(FALSE)
156	{ SetTextEncoding( nEnc ); }	156	{ SetTextEncoding( nEnc ); }
157		157
158	ScImportOptions( const ScImportOptions& rCpy )	158	ScImportOptions( const ScImportOptions& rCpy )
159	: nFieldSepCode (rCpy.nFieldSepCode),	159	: nFieldSepCode (rCpy.nFieldSepCode),
160	nTextSepCode (rCpy.nTextSepCode),	160	nTextSepCode (rCpy.nTextSepCode),
161	aStrFont (rCpy.aStrFont),	161	aStrFont (rCpy.aStrFont),
162	eCharSet (rCpy.eCharSet),	162	eCharSet (rCpy.eCharSet),
163	bFixedWidth (rCpy.bFixedWidth)	163	bFixedWidth (rCpy.bFixedWidth),
		164	bSaveAsRendered (rCpy.bSaveAsRendered)
164	{}	165	{}
165		166
166	ScImportOptions& operator=( const ScImportOptions& rCpy )	167	ScImportOptions& operator=( const ScImportOptions& rCpy )
167	{	168	{
168	nFieldSepCode = rCpy.nFieldSepCode;	169	nFieldSepCode = rCpy.nFieldSepCode;
169	nTextSepCode = rCpy.nTextSepCode;	170	nTextSepCode = rCpy.nTextSepCode;
170	aStrFont = rCpy.aStrFont;	171	aStrFont = rCpy.aStrFont;
171	eCharSet = rCpy.eCharSet;	172	eCharSet = rCpy.eCharSet;
172	bFixedWidth = rCpy.bFixedWidth;	173	bFixedWidth = rCpy.bFixedWidth;
		174	bSaveAsRendered = rCpy.bSaveAsRendered;
173	return *this;	175	return *this;
174	}	176	}
175		177
176	BOOL operator==( const ScImportOptions& rCmp )	178	BOOL operator==( const ScImportOptions& rCmp )
177	{	179	{
178	return	180	return
179	nFieldSepCode == rCmp.nFieldSepCode	181	nFieldSepCode == rCmp.nFieldSepCode
180	&& nTextSepCode == rCmp.nTextSepCode	182	&& nTextSepCode == rCmp.nTextSepCode
181	&& eCharSet == rCmp.eCharSet	183	&& eCharSet == rCmp.eCharSet
182	&& aStrFont == rCmp.aStrFont	184	&& aStrFont == rCmp.aStrFont
183	&& bFixedWidth == rCmp.bFixedWidth;	185	&& bFixedWidth == rCmp.bFixedWidth
		186	&& bSaveAsRendered == rCmp.bSaveAsRendered;
184	}	187	}
185	String BuildString() const;	188	String BuildString() const;
186		189
Lines 191-196 public: Link Here
191	String aStrFont;	194	String aStrFont;
192	CharSet eCharSet;	195	CharSet eCharSet;
193	BOOL bFixedWidth;	196	BOOL bFixedWidth;
		197	BOOL bSaveAsRendered;
194	};	198	};
195		199
196		200