Attachment #13216 for issue #25583

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

Lines 222-228 Link Here

(-)ooo_1.1.0_src.orig/svtools/inc/calendar.hxx (-1 / +1 lines)
222	Rectangle maPrevRect;	222	Rectangle maPrevRect;
223	Rectangle maNextRect;	223	Rectangle maNextRect;
224	String maDayOfWeekText;	224	String maDayOfWeekText;
225	long mnDayOfWeekAry[7];	225	sal_Int32 mnDayOfWeekAry[7];
226	Date maOldFormatFirstDate;	226	Date maOldFormatFirstDate;
227	Date maOldFormatLastDate;	227	Date maOldFormatLastDate;
228	Date maFirstDate;	228	Date maFirstDate;




	Type* operator[]( ULONG nPos ) const 									\
		{ return GetObject(nPos); }											\
																			\
	BOOL Seek_Entry( const Type *pObj, sal_uInt32* pPos ) const;					\
																			\
	ULONG GetPos( const Type* pObj ) const;									\


#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc )					\
BOOL ClassName::Insert( Type *pObj )                                        \
{                                                                           \
	sal_uInt32 nPos;                                                             \
	BOOL bExist;                                                            \
	if( ! ( bExist = Seek_Entry( pObj, &nPos ) ) )                          \
		Container::Insert( pObj, nPos );                                    \

																			\
Type *ClassName::Remove( Type* pObj )                                       \
{                                                                           \
	sal_uInt32 nPos;                                                             \
	if( Seek_Entry( pObj, &nPos ) )                                         \
		return Remove( nPos );                                              \
	else                                                                    \

																			\
ULONG ClassName::GetPos( const Type* pObj ) const                           \
{                                                                           \
	sal_uInt32 nPos;                                                             \
	if( Seek_Entry( pObj, &nPos ) )                                         \
		return nPos;                                                        \
	else                                                                    \
		return CONTAINER_ENTRY_NOTFOUND;                                    \
}                                                                           \
																			\
BOOL ClassName::Seek_Entry( const Type* pObj, sal_uInt32* pPos ) const           \
{                                                                           \
	register ULONG nO  = Count(),                                           \
			nM,                                                             \





	SvFillLockBytes( SvLockBytes* pLockBytes );
	virtual ErrCode ReadAt(
		sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const;
	virtual ErrCode WriteAt(
		sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten );
	virtual ErrCode Flush() const;
	virtual ErrCode SetSize( ULONG nSize );
	virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );
	virtual ErrCode UnlockRegion( ULONG nPos, ULONG nCount, LockType );
	virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
	ErrCode FillAppend( const void* pBuffer, sal_uInt32 nCount, sal_uInt32 *pWritten );
	ULONG   Tell() const { return nFilledSize; }
	void    Seek( ULONG nPos ) { nFilledSize = nPos; }


	virtual BOOL IsSynchronMode() const
	{ return m_xAsyncLockBytes->IsSynchronMode(); }

	virtual ErrCode ReadAt(sal_uInt32 nPos, void * pBuffer, sal_uInt32 nCount,
						   sal_uInt32 * pRead) const;

	virtual ErrCode WriteAt(sal_uInt32 nPos, const void * pBuffer, sal_uInt32 nCount,
							sal_uInt32 * pWritten);

	virtual ErrCode Flush() const { return m_xAsyncLockBytes->Flush(); }


		const
	{ return m_xAsyncLockBytes->Stat(pStat, eFlag); }

	virtual ErrCode FillAppend(const void * pBuffer, sal_uInt32 nCount,
							   sal_uInt32 * pWritten)
	{ return m_xAsyncLockBytes->FillAppend(pBuffer, nCount, pWritten); }

	virtual ULONG Tell() const { return m_xAsyncLockBytes->Tell(); }

	SvLockBytes*    GetLastLockBytes() const;

	virtual ErrCode ReadAt(
		sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const;
	virtual ErrCode WriteAt(
		sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten );
	virtual ErrCode Flush() const;
	virtual ErrCode SetSize( ULONG nSize );
	virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );

Lines 120-125 Link Here

(-)ooo_1.1.0_src.orig/svtools/inc/sbxvar.hxx (+1 lines)
120	CHS();	120	CHS();
121	}	121	}
122	}	122	}
		123	void Set(INT64 n) { nHigh = ((UINT64)n) >> 32; nLow = n & 0xFFFFFFFF; }
123	void Set(INT32 n) { nHigh = n < 0 ? -1 : 0; nLow = n; }	124	void Set(INT32 n) { nHigh = n < 0 ? -1 : 0; nLow = n; }
124		125
125	void SetMax() { nHigh = 0x7FFFFFFF; nLow = 0xFFFFFFFF; }	126	void SetMax() { nHigh = 0x7FFFFFFF; nLow = 0xFFFFFFFF; }




			    rTheOutputStream):
		m_xOutputStream(rTheOutputStream), m_nPosition(0) {}

	virtual ErrCode ReadAt(sal_uInt32, void *, sal_uInt32, sal_uInt32 *) const;

	virtual ErrCode WriteAt(sal_uInt32 nPos, const void * pBuffer, sal_uInt32 nCount,
							sal_uInt32 * pWritten);

	virtual ErrCode Flush() const;



	virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const;

	virtual ErrCode FillAppend(const void * pBuffer, sal_uInt32 nCount,
							   sal_uInt32 * pWritten);

	virtual ULONG Tell() const;





	/** Get table of formats of a specific type of a language/country.
		FIndex returns the default format of that type. */
	SvNumberFormatTable& GetEntryTable(short eType,
									   sal_uInt32& FIndex,
									   LanguageType eLnge);

	/** Get table of formats of a specific type of a language/country.
		FIndex returns the default format of that type.
		If the language/country was never touched before new entries are generated */
	SvNumberFormatTable& ChangeCL(short eType,
								  sal_uInt32& FIndex,
								  LanguageType eLnge);

	/** Get table of formats of the same type as FIndex; eType and rLnge are
		set accordingly. An unknown format is set to Standard/General */
	SvNumberFormatTable& GetFirstEntryTable(short& eType,
											sal_uInt32& FIndex,
											LanguageType& rLnge);

	/// Delete an entry including the format it is refering to
	void DeleteEntry(sal_uInt32 nKey);

	/** Create new entry of a format code string for language/country.
		@return

			nType contains the type of the format.
			nKey contains the index key of the format.
	 */
	BOOL PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey,
				  LanguageType eLnge = LANGUAGE_DONTKNOW );

	/** Same as <method>PutEntry</method> but the format code string is
	 	considered to be of language/country eLnge and is converted to
		language/country eNewLnge */
	BOOL PutandConvertEntry( String& rString, xub_StrLen& nCheckPos,
							 short& nType, sal_uInt32& nKey,
							 LanguageType eLnge, LanguageType eNewLnge );

	/** Same as <method>PutandConvertEntry</method> but the format code string

		converted to another System language/country eNewLnge. In this case
	 	the automatic currency is converted too. */
	BOOL PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos,
							 short& nType, sal_uInt32& nKey,
							 LanguageType eLnge, LanguageType eNewLnge );

	/** Create a format code string using format nIndex as a template and

				returned in fOutNumber
			<FALSE/> if input is not a number
	 */
	BOOL IsNumberFormat( const String& sString, sal_uInt32& F_Index, double& fOutNumber );

	/// Format a number according to a format index, return string and color
	void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex,
						  String& sOutString, Color** ppColor );

	/** Format a string according to a format index, return string and color.
		Formats only if the format code is of type text or the 4th subcode
		of a format code is specified, otherwise sOutString will be == "" */
	void GetOutputString( String& sString, sal_uInt32 nFIndex,
						  String& sOutString, Color** ppColor );

	/** Format a number according to the standard default format matching
		the given format index */
	void GetInputLineString( const double& fOutNumber,
							sal_uInt32 nFIndex, String& sOutString );

	/** Format a number according to a format code string to be scanned.
		@return

						LanguageType eLnge = LANGUAGE_DONTKNOW );

	/// Whether format index nFIndex is of type text or not
	BOOL IsTextFormat(sal_uInt32 nFIndex) const;
	/// Whether the 4th string subcode of format index nFIndex is present
	BOOL HasTextFormat(sal_uInt32 nFIndex) const;

	/// Load all formats from a stream
	BOOL Load( SvStream& rStream );

	void PrepareSave();

	/// Flag format index as used
	void SetFormatUsed(sal_uInt32 nFIndex);

	/// Get additional info of a format index, e.g. for dialog box
	void GetFormatSpecialInfo(ULONG nFormat, BOOL& bThousand, BOOL& IsRed,

	ULONG GetEntryKey( const String& sStr, LanguageType eLnge = LANGUAGE_DONTKNOW );

	/// Return the format for a format index
	const SvNumberformat* GetEntry(sal_uInt32 nKey) const
		{ return (SvNumberformat*) aFTable.Get(nKey); }

	/// Return the format index of the standard default number format for language/country

	/** Return the format index of the default format of a type for language/country.
		Maybe not the default format but a special builtin format, e.g. for
		NF_TIME_HH_MMSS00, if that format is passed in nFIndex. */
	ULONG GetStandardFormat( sal_uInt32 nFIndex, short eType, LanguageType eLnge );

	/** Return the format index of the default format of a type for language/country.
		Maybe not the default format but a special builtin format, e.g. for
		NF_TIME_HH_MMSS00, or NF_TIME_HH_MMSS if fNumber >= 1.0  */
	ULONG GetStandardFormat( double fNumber, sal_uInt32 nFIndex, short eType,
							LanguageType eLnge );

	/// Whether nFIndex is a special builtin format
	BOOL IsSpecialStandardFormat( sal_uInt32 nFIndex, LanguageType eLnge );

	/// Return the reference date
	Date* GetNullDate();

	BOOL GetNoZero() { return bNoZero; }
	/** Get the type of a format (or NUMBERFORMAT_UNDEFINED if no entry),
	 	but with NUMBERFORMAT_DEFINED masked out */
	short GetType(sal_uInt32 nFIndex);

	/// As the name says
	void ClearMergeTable();

	ImpSvNumberformatScan* pFormatScanner;	// Format code string scanner
    Link aColorLink;                        // User defined color table CallBack
	ULONG MaxCLOffset;						// Max language/country offset used
	sal_uInt32 nDefaultSystemCurrencyFormat;		// NewCurrency matching SYSTEM locale
    LanguageType IniLnge;                   // Initialized setting language/country
	LanguageType ActLnge;                   // Current setting language/country
	NfEvalDateFormat eEvalDateFormat;		// DateFormat evaluation




		LanguageType aOldLang;
		GetFormat(sOldFormat, aOldLang);

		sal_uInt32 nDestKey = pFormatter->TestNewString(sOldFormat);
		if (nDestKey == NUMBERFORMAT_ENTRY_NOT_FOUND)
		{
			// die Sprache des neuen Formatters

BOOL FormattedField::SetFormat(const XubString& rFormatString, LanguageType eLang)
{
	DBG_CHKTHIS(FormattedField, NULL);
	sal_uInt32 nNewKey = ImplGetFormatter()->TestNewString(rFormatString, eLang);
	if (nNewKey == NUMBERFORMAT_ENTRY_NOT_FOUND)
	{
		USHORT nCheckPos;

	ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, _bUseSeparator, IsRed, nPrecision, nAnzLeading);
	// ... and introduce it to the formatter
	USHORT nCheckPos;
	sal_uInt32  nNewKey;
	short nType;
	ImplGetFormatter()->PutEntry(sFmtDescription, nCheckPos, nType, nNewKey, eLang);


	ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, bThousand, IsRed, _nPrecision, nAnzLeading);
	// ... and introduce it to the formatter
	USHORT nCheckPos;
	sal_uInt32 nNewKey;
	short nType;
	ImplGetFormatter()->PutEntry(sFmtDescription, nCheckPos, nType, nNewKey, eLang);



	DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");

	sal_uInt32 nFormatKey = m_nFormatKey;	// IsNumberFormat veraendert den FormatKey ...

	if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)
		// damit wir in einem als Text formatierten Feld trotzdem eine Eingabe wie '1,1' erkennen ...

		// the default number format for this language
		ULONG nStandardNumericFormat = m_pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER, eLanguage);

		sal_uInt32 nTempFormat = nStandardNumericFormat;
		double dTemp;
		if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) &&
			NUMBERFORMAT_NUMBER == m_pFormatter->GetType(nTempFormat))

Lines 307-316 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/control/taskmisc.cxx (-4 / +4 lines)
307	long nRectHeight = nHeight;	307	long nRectHeight = nHeight;
308	long nOff;	308	long nOff;
309	long nCascadeWins;	309	long nCascadeWins;
310	long nLeftBorder;	310	sal_Int32 nLeftBorder;
311	long nTopBorder;	311	sal_Int32 nTopBorder;
312	long nRightBorder;	312	sal_Int32 nRightBorder;
313	long nBottomBorder;	313	sal_Int32 nBottomBorder;
314	long nStartOverWidth;	314	long nStartOverWidth;
315	long nStartOverHeight;	315	long nStartOverHeight;
316	long nOverWidth;	316	long nOverWidth;




{
	Size aSz = pImpSvMEdit->CalcMinimumSize();

	sal_Int32 nLeft, nTop, nRight, nBottom;
	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
	aSz.Width() += nLeft+nRight;
	aSz.Height() += nTop+nBottom;

Size MultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const
{
	Size aSz = rPrefSize;
	sal_Int32 nLeft, nTop, nRight, nBottom;
	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );

	// In der Hoehe auf ganze Zeilen justieren

{
	Size aSz = pImpSvMEdit->CalcSize( nColumns, nLines );

	sal_Int32 nLeft, nTop, nRight, nBottom;
	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
	aSz.Width() += nLeft+nRight;
	aSz.Height() += nTop+nBottom;

Lines 2760-2766 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filepicker/iodlg.cxx (-1 / +1 lines)
2760	// Dieses Resize wurde nur zum Ein - oder Ausblenden des Indicators aufgerufen	2760	// Dieses Resize wurde nur zum Ein - oder Ausblenden des Indicators aufgerufen
2761	return;	2761	return;
2762		2762
2763	long nMaxYPos = 0;	2763	sal_Int32 nMaxYPos = 0;
2764		2764
2765	// -------------	2765	// -------------
2766	// move controls	2766	// move controls

Lines 203-209 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filter.vcl/filter/dlgexpor.cxx (-1 / +1 lines)
203	{	203	{
204	// Config-Parameter schreiben	204	// Config-Parameter schreiben
205		205
206	sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), 600L), 75L );	206	sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), 600), 75 );
207	::com::sun::star::awt::Size aSize(	207	::com::sun::star::awt::Size aSize(
208	(long)MetricField::ConvertDoubleValue( aMtfSizeX.GetValue(), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM ),	208	(long)MetricField::ConvertDoubleValue( aMtfSizeX.GetValue(), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM ),
209	(long)MetricField::ConvertDoubleValue( aMtfSizeY.GetValue(), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM ) );	209	(long)MetricField::ConvertDoubleValue( aMtfSizeY.GetValue(), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM ) );

Lines 890-896 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filter.vcl/filter/filter.cxx (-1 / +1 lines)
890	MapMode aMap( MAP_100TH_INCH );	890	MapMode aMap( MAP_100TH_INCH );
891		891
892	sal_Int32 nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, pResMgr ) ), 75 );	892	sal_Int32 nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, pResMgr ) ), 75 );
893	Fraction aFrac( 1, Min( Max( nDPI, 75L ), 600L ) );	893	Fraction aFrac( 1, Min( Max( nDPI, 75 ), 600 ) );
894		894
895	aMap.SetScaleX( aFrac );	895	aMap.SetScaleX( aFrac );
896	aMap.SetScaleY( aFrac );	896	aMap.SetScaleY( aFrac );





// -----------------------------------------------------------------------------

void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, UINT32 nWidth )
{
	UINT32 nLen = rText.Len(), i;

	if( nLen )
	{
		sal_Int32	nNormWidth;
		sal_Int32*	pOwnArray;
		sal_Int32*	pDX;

		// get text sizes
		if( pDXArray )
		{
			pOwnArray = NULL;
			nNormWidth = maVDev.GetTextWidth( rText );
			pDX = (sal_Int32*) pDXArray;
		}
		else
		{	
			pOwnArray = new sal_Int32[ nLen ];
			nNormWidth = maVDev.GetTextArray( rText, pOwnArray );
			pDX = pOwnArray;
		}

Lines 115-121 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filter.vcl/wmf/emfwr.hxx (-1 / +1 lines)
115	void ImplWritePolygonRecord( const Polygon& rPoly, BOOL bClose );	115	void ImplWritePolygonRecord( const Polygon& rPoly, BOOL bClose );
116	void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly );	116	void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly );
117	void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP );	117	void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP );
118	void ImplWriteTextRecord( const Point& rPos, const String rText, const long* pDXArray, UINT32 nWidth );	118	void ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, UINT32 nWidth );
119		119
120	void ImplWrite( const GDIMetaFile& rMtf );	120	void ImplWrite( const GDIMetaFile& rMtf );
121		121




}

void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint, 
    const String & rString, const sal_Int32 * pDXAry )
{
    sal_uInt16 nOriginalTextLen = rString.Len();


}

void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, 
    const ByteString & rByteString, const sal_Int32 * pDXAry )
{
	WriteRecordHeader( 0, W_META_EXTTEXTOUT );
	WritePointYX( rPoint );


					pVirDev->SetFont( aSrcFont );
					nLen = aTemp.Len();
					sal_Int32* pDXAry = nLen ? new sal_Int32[ nLen ] : NULL;
					nNormSize = pVirDev->GetTextArray( aTemp, pDXAry );
					for ( i = 0; i < ( nLen - 1 ); i++ )
						pDXAry[ i ] = pDXAry[ i ] * (sal_Int32)pA->GetWidth() / nNormSize;

Lines 188-198 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filter.vcl/wmf/wmfwr.hxx (-3 / +3 lines)
188	void WMFRecord_DeleteObject(USHORT nObjectHandle);	188	void WMFRecord_DeleteObject(USHORT nObjectHandle);
189	void WMFRecord_Ellipse(const Rectangle & rRect);	189	void WMFRecord_Ellipse(const Rectangle & rRect);
190	void WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_Int8* pData );	190	void WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_Int8* pData );
191	sal_Bool WMFRecord_Escape_Unicode( const Point& rPoint, const String& rStr, const long * pDXAry );	191	sal_Bool WMFRecord_Escape_Unicode( const Point& rPoint, const String& rStr, const sal_Int32 * pDXAry );
192	void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const long * pDXAry);	192	void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const sal_Int32 * pDXAry);
193		193
194	void TrueExtTextOut(const Point & rPoint, const String & rString,	194	void TrueExtTextOut(const Point & rPoint, const String & rString,
195	const ByteString & rByteString, const long * pDXAry);	195	const ByteString & rByteString, const sal_Int32 * pDXAry);
196	void TrueTextOut(const Point & rPoint, const ByteString& rString);	196	void TrueTextOut(const Point & rPoint, const ByteString& rString);
197	void WMFRecord_LineTo(const Point & rPoint);	197	void WMFRecord_LineTo(const Point & rPoint);
198	void WMFRecord_MoveTo(const Point & rPoint);	198	void WMFRecord_MoveTo(const Point & rPoint);

Lines 215-221 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/items/lckbitem.cxx (-1 / +1 lines)
215	else	215	else
216	return FALSE;	216	return FALSE;
217		217
218	ULONG nRead = 0;	218	sal_uInt32 nRead = 0;
219	com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen );	219	com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen );
220		220
221	_xVal->ReadAt( 0, aSeq.getArray(), nLen, &nRead );	221	_xVal->ReadAt( 0, aSeq.getArray(), nLen, &nRead );




}

//============================================================================
ErrCode SvFillLockBytes::ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount,
							 sal_uInt32 *pRead ) const
{
	if( bTerminated )
		return xLockBytes->ReadAt( nPos, pBuffer, nCount, pRead );

		}
		else
		{
			sal_uInt32 nRead = MyMin( nCount, long( nFilledSize ) - nPos );
			ULONG nErr = xLockBytes->ReadAt( nPos, pBuffer, nRead, pRead );
			return ( !nCount || nRead == nCount || nErr ) ?
				nErr : ERRCODE_IO_PENDING;

}

//============================================================================
ErrCode SvFillLockBytes::WriteAt( sal_uInt32 nPos, const void* pBuffer,
								  sal_uInt32 nCount, sal_uInt32 *pWritten )
{
	if( bTerminated )
		return xLockBytes->WriteAt( nPos, pBuffer, nCount, pWritten );

		}
		else
		{
			sal_uInt32 nRead = MyMin( nCount, long( nFilledSize ) - nPos );
			ULONG nErr = xLockBytes->WriteAt( nPos, pBuffer, nRead, pWritten );
			return ( !nCount || nRead == nCount || nErr ) ?
				nErr : ERRCODE_IO_PENDING;

}

//============================================================================
ErrCode SvFillLockBytes::FillAppend( const void* pBuffer, sal_uInt32 nCount, sal_uInt32 *pWritten )
{
	ErrCode nRet = xLockBytes->WriteAt(
		nFilledSize, pBuffer, nCount, pWritten );


//============================================================================
// virtual
ErrCode SvSyncLockBytes::ReadAt(sal_uInt32 nPos, void * pBuffer, sal_uInt32 nCount,
								sal_uInt32 * pRead) const
{
	for (ULONG nReadTotal = 0;;)
	{
		sal_uInt32 nReadCount = 0;
		ErrCode nError = m_xAsyncLockBytes->ReadAt(nPos, pBuffer, nCount,
												   &nReadCount);
		nReadTotal += nReadCount;


//============================================================================
// virtual
ErrCode SvSyncLockBytes::WriteAt(sal_uInt32 nPos, const void * pBuffer,
								 sal_uInt32 nCount, sal_uInt32 * pWritten)
{
	for (ULONG nWrittenTotal = 0;;)
	{
		sal_uInt32 nWrittenCount = 0;
		ErrCode nError = m_xAsyncLockBytes->WriteAt(nPos, pBuffer, nCount,
													&nWrittenCount);
		nWrittenTotal += nWrittenCount;

	BOOL                  bPending;
	ULONG RelativeOffset( ULONG nPos ) const;
	ErrCode ReadWrite_Impl(
		sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pProcessed,
		BOOL bRead );
	SvCompositeLockBytes_Impl() : bPending( FALSE ){}
};


//============================================================================
ErrCode SvCompositeLockBytes_Impl::ReadWrite_Impl(
	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pProcessed,
	BOOL bRead )
{
	ErrCode nErr = ERRCODE_NONE;

		return ERRCODE_IO_CANTREAD;
	}

	sal_uInt32 nDone;
	while( nMinPos < nListCount )
	{
		sal_uInt32 nToProcess;
		sal_uInt32 nSectionStop;
		if( nMinPos + 1 < nListCount )
		{
			nSectionStop = rPositions[ nMinPos + 1 ];

			nToProcess = nBytes;
			nSectionStop = 0;
		}
		sal_uInt32 nAbsPos = nPos - nSectionStart + rOffsets[ nMinPos ];
		SvLockBytes* pLB = rLockBytes.GetObject( nMinPos );
		if( bRead )
			nErr = pLB->ReadAt( nAbsPos, pBuffer, nToProcess, &nDone );


//============================================================================
ErrCode SvCompositeLockBytes::ReadAt(
	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const
{
	return pImpl->ReadWrite_Impl( nPos, pBuffer, nCount, pRead, TRUE );
}

//============================================================================
ErrCode SvCompositeLockBytes::WriteAt(
	sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten )
{
	return pImpl->ReadWrite_Impl(
		nPos, const_cast< void * >(pBuffer), nCount, pWritten, FALSE );





//============================================================================
// virtual
ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uInt32, void *, sal_uInt32, sal_uInt32 *)
	const
{
	return ERRCODE_IO_CANTREAD;


//============================================================================
// virtual
ErrCode SvOutputStreamOpenLockBytes::WriteAt(sal_uInt32 nPos, void const * pBuffer,
											 sal_uInt32 nCount, sal_uInt32 * pWritten)
{
	if (nPos != m_nPosition)
		return ERRCODE_IO_CANTWRITE;

//============================================================================
// virtual
ErrCode SvOutputStreamOpenLockBytes::FillAppend(void const * pBuffer,
												sal_uInt32 nCount,
												sal_uInt32 * pWritten)
{
	if (!m_xOutputStream.is())
		return ERRCODE_IO_CANTWRITE;

	sal_Int32 nSize = 0;
	while (nSize < nBytesToRead)
	{
		sal_uInt32 nCount;
		ErrCode nError = m_xLockBytes->ReadAt(sal_uInt32(m_nPosition),
											  rData.getArray() + nSize,
											  nBytesToRead - nSize, &nCount);
		if (nError != ERRCODE_NONE && nError != ERRCODE_IO_PENDING)

		&& nMaxBytesToRead > 0)
		throw io::IOException();
	rData.realloc(nMaxBytesToRead);
	sal_uInt32 nCount = 0;
	if (nMaxBytesToRead > 0)
	{
		ErrCode nError;
		do
		{
			nError = m_xLockBytes->ReadAt(sal_uInt32(m_nPosition),
										  rData.getArray(),
										  nMaxBytesToRead < 0 ?
										      0 : nMaxBytesToRead,




	if (pFormatter)
	{
		String aTemp = aString;
		sal_uInt32 nUKey = nKey;
		double fValue = 0.0;
		if ( pFormatter->IsNumberFormat(aTemp, nUKey, fValue) )
			nRet = nUKey;

	if (pFormatter)
	{
		String aTemp = aString;
		sal_uInt32 nUKey = nKey;
		double fValue = 0.0;
		if ( pFormatter->IsNumberFormat(aTemp, nUKey, fValue) )
			fRet = fValue;

	SvNumberFormatter* pFormatter = pSupplier ? pSupplier->GetNumberFormatter() : NULL;
	if ( pFormatter )
	{
		sal_uInt32 nIndex = 0;
		LanguageType eLang = lcl_GetLanguage( nLocale );
		SvNumberFormatTable& rTable = bCreate ?
										pFormatter->ChangeCL( nType, nIndex, eLang ) :

	{
		String aFormStr = aFormat;
		LanguageType eLang = lcl_GetLanguage( nLocale );
		sal_uInt32 nKey = 0;
		xub_StrLen nCheckPos = 0;
		short nType = 0;
		BOOL bOk = pFormatter->PutEntry( aFormStr, nCheckPos, nType, nKey, eLang );

		String aFormStr = aFormat;
		LanguageType eLang = lcl_GetLanguage( nLocale );
		LanguageType eNewLang = lcl_GetLanguage( nNewLocale );
		sal_uInt32 nKey = 0;
		xub_StrLen nCheckPos = 0;
		short nType = 0;
		BOOL bOk = pFormatter->PutandConvertEntry( aFormStr, nCheckPos, nType, nKey, eLang, eNewLang );

Lines 116-122 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/numbers/numuno.cxx (-1 / +1 lines)
116	pImpl->pFormatter = pNew;	116	pImpl->pFormatter = pNew;
117	}	117	}
118		118
119	void SvNumberFormatsSupplierObj::NumberFormatDeleted(ULONG nKey)	119	void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32 nKey)
120	{	120	{
121	// Basis-Implementierung tut nix...	121	// Basis-Implementierung tut nix...
122	}	122	}




}


BOOL SvNumberFormatter::IsTextFormat(sal_uInt32 F_Index) const
{
	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
	if (!pFormat)

		return pFormat->IsTextFormat();
}

BOOL SvNumberFormatter::HasTextFormat(sal_uInt32 F_Index) const
{
	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
	if (!pFormat)

BOOL SvNumberFormatter::PutEntry(String& rString,
								 xub_StrLen& nCheckPos,
								 short& nType,
								 sal_uInt32& nKey,			// Formatnummer
								 LanguageType eLnge)
{
	nKey = 0;

BOOL SvNumberFormatter::PutandConvertEntry(String& rString,
										   xub_StrLen& nCheckPos,
										   short& nType,
										   sal_uInt32& nKey,
										   LanguageType eLnge,
										   LanguageType eNewLnge)
{

BOOL SvNumberFormatter::PutandConvertEntrySystem(String& rString,
										   xub_StrLen& nCheckPos,
										   short& nType,
										   sal_uInt32& nKey,
										   LanguageType eLnge,
										   LanguageType eNewLnge)
{

}


void SvNumberFormatter::DeleteEntry(sal_uInt32 nKey)
{
	SvNumberformat* pEntry = aFTable.Remove(nKey);
	delete pEntry;

	 }
}

void SvNumberFormatter::SetFormatUsed(sal_uInt32 nFIndex)
{
	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);
	if (pFormat)


SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable(
													  short& eType,
													  sal_uInt32& FIndex,
													  LanguageType& rLnge)
{
	short eTypetmp = eType;

}

SvNumberFormatTable& SvNumberFormatter::ChangeCL(short eType,
												 sal_uInt32& FIndex,
												 LanguageType eLnge)
{
	ImpGenerateCL(eLnge);


SvNumberFormatTable& SvNumberFormatter::GetEntryTable(
													short eType,
													sal_uInt32& FIndex,
													LanguageType eLnge)
{
	if ( pFormatTable )

}

BOOL SvNumberFormatter::IsNumberFormat(const String& sString,
									   sal_uInt32& F_Index,
									   double& fOutNumber)
{
	short FType;

	}
}

BOOL SvNumberFormatter::IsSpecialStandardFormat( sal_uInt32 nFIndex,
		LanguageType eLnge )
{
	return

		;
}

ULONG SvNumberFormatter::GetStandardFormat( sal_uInt32 nFIndex, short eType,
		LanguageType eLnge )
{
	if ( IsSpecialStandardFormat( nFIndex, eLnge ) )

		return GetStandardFormat( eType, eLnge );
}

ULONG SvNumberFormatter::GetStandardFormat( double fNumber, sal_uInt32 nFIndex,
		short eType, LanguageType eLnge )
{
	if ( IsSpecialStandardFormat( nFIndex, eLnge ) )

}

void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
										   sal_uInt32 nFIndex,
										   String& sOutString)
{
	SvNumberformat* pFormat;

}

void SvNumberFormatter::GetOutputString(const double& fOutNumber,
										sal_uInt32 nFIndex,
										String& sOutString,
										Color** ppColor)
{

}

void SvNumberFormatter::GetOutputString(String& sString,
										sal_uInt32 nFIndex,
										String& sOutString,
										Color** ppColor)
{

	return GetStandardFormat(NUMBERFORMAT_NUMBER, eLnge);
}

short SvNumberFormatter::GetType(sal_uInt32 nFIndex)
{
	short eType;
	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);

ULONG SvNumberFormatter::ImpGetDefaultCurrencyFormat()
{
	ULONG CLOffset = ImpGetCLOffset( ActLnge );
	sal_uInt32 nDefaultCurrencyFormat =
		(ULONG) aDefaultFormatKeys.Get( CLOffset + ZF_STANDARD_CURRENCY );
	if ( !nDefaultCurrencyFormat )
		nDefaultCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;

Lines 1558-1564 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/numbers/zformat.cxx (-1 / +1 lines)
1558	LanguageType eConvertFrom, LanguageType eConvertTo, BOOL bSystem )	1558	LanguageType eConvertFrom, LanguageType eConvertTo, BOOL bSystem )
1559	{	1559	{
1560	xub_StrLen nCheckPos;	1560	xub_StrLen nCheckPos;
1561	ULONG nKey;	1561	sal_uInt32 nKey;
1562	short nType = eType;	1562	short nType = eType;
1563	String aFormatString( sFormatstring );	1563	String aFormatString( sFormatstring );
1564	if ( bSystem )	1564	if ( bSystem )

Lines 139-145 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/sbx/sbxdate.cxx (-2 / +2 lines)
139	xFactory = comphelper::getProcessServiceFactory();	139	xFactory = comphelper::getProcessServiceFactory();
140	pFormatter = new SvNumberFormatter( xFactory, eLangType );	140	pFormatter = new SvNumberFormatter( xFactory, eLangType );
141		141
142	ULONG nIndex;	142	sal_uInt32 nIndex;
143	xub_StrLen nCheckPos = 0;	143	xub_StrLen nCheckPos = 0;
144	short nType = 127;	144	short nType = 127;
145		145
Lines 291-297 Link Here
291	xFactory = comphelper::getProcessServiceFactory();	291	xFactory = comphelper::getProcessServiceFactory();
292	pFormatter = new SvNumberFormatter( xFactory, eLangType );	292	pFormatter = new SvNumberFormatter( xFactory, eLangType );
293		293
294	ULONG nIndex;	294	sal_uInt32 nIndex;
295	xub_StrLen nCheckPos = 0;	295	xub_StrLen nCheckPos = 0;
296	short nType;	296	short nType;
297		297

Lines 189-195 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/svhtml/parhtml.cxx (-1 / +1 lines)
189	"HTMLOption: unbekanntes Token" );	189	"HTMLOption: unbekanntes Token" );
190	}	190	}
191		191
192	ULONG HTMLOption::GetNumber() const	192	sal_uInt32 HTMLOption::GetNumber() const
193	{	193	{
194	DBG_ASSERT( (nToken>=HTML_OPTION_NUMBER_START &&	194	DBG_ASSERT( (nToken>=HTML_OPTION_NUMBER_START &&
195	nToken<HTML_OPTION_NUMBER_END) \|\|	195	nToken<HTML_OPTION_NUMBER_END) \|\|

Return to issue 25583

Lines 125-131 Link Here

(-)ooo_1.1.0_src.orig/svtools/inc/cntnrsrt.hxx (-5 / +5 lines)
125	Type* operator[]( ULONG nPos ) const \	125	Type* operator[]( ULONG nPos ) const \
126	{ return GetObject(nPos); } \	126	{ return GetObject(nPos); } \
127	\	127	\
128	BOOL Seek_Entry( const Type pObj, ULONG pPos ) const; \	128	BOOL Seek_Entry( const Type pObj, sal_uInt32 pPos ) const; \
129	\	129	\
130	ULONG GetPos( const Type* pObj ) const; \	130	ULONG GetPos( const Type* pObj ) const; \
131		131
Lines 149-155 Link Here
149	#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \	149	#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \
150	BOOL ClassName::Insert( Type *pObj ) \	150	BOOL ClassName::Insert( Type *pObj ) \
151	{ \	151	{ \
152	ULONG nPos; \	152	sal_uInt32 nPos; \
153	BOOL bExist; \	153	BOOL bExist; \
154	if( ! ( bExist = Seek_Entry( pObj, &nPos ) ) ) \	154	if( ! ( bExist = Seek_Entry( pObj, &nPos ) ) ) \
155	Container::Insert( pObj, nPos ); \	155	Container::Insert( pObj, nPos ); \
Lines 158-164 Link Here
158	\	158	\
159	Type ClassName::Remove( Type pObj ) \	159	Type ClassName::Remove( Type pObj ) \
160	{ \	160	{ \
161	ULONG nPos; \	161	sal_uInt32 nPos; \
162	if( Seek_Entry( pObj, &nPos ) ) \	162	if( Seek_Entry( pObj, &nPos ) ) \
163	return Remove( nPos ); \	163	return Remove( nPos ); \
164	else \	164	else \
Lines 167-180 Link Here
167	\	167	\
168	ULONG ClassName::GetPos( const Type* pObj ) const \	168	ULONG ClassName::GetPos( const Type* pObj ) const \
169	{ \	169	{ \
170	ULONG nPos; \	170	sal_uInt32 nPos; \
171	if( Seek_Entry( pObj, &nPos ) ) \	171	if( Seek_Entry( pObj, &nPos ) ) \
172	return nPos; \	172	return nPos; \
173	else \	173	else \
174	return CONTAINER_ENTRY_NOTFOUND; \	174	return CONTAINER_ENTRY_NOTFOUND; \
175	} \	175	} \
176	\	176	\
177	BOOL ClassName::Seek_Entry( const Type* pObj, ULONG* pPos ) const \	177	BOOL ClassName::Seek_Entry( const Type* pObj, sal_uInt32* pPos ) const \
178	{ \	178	{ \
179	register ULONG nO = Count(), \	179	register ULONG nO = Count(), \
180	nM, \	180	nM, \

Lines 94-103 Link Here

(-)ooo_1.1.0_src.orig/svtools/inc/strmadpt.hxx (-5 / +5 lines)
94	rTheOutputStream):	94	rTheOutputStream):
95	m_xOutputStream(rTheOutputStream), m_nPosition(0) {}	95	m_xOutputStream(rTheOutputStream), m_nPosition(0) {}
96		96
97	virtual ErrCode ReadAt(ULONG, void , ULONG, ULONG ) const;	97	virtual ErrCode ReadAt(sal_uInt32, void , sal_uInt32, sal_uInt32 ) const;
98		98
99	virtual ErrCode WriteAt(ULONG nPos, const void * pBuffer, ULONG nCount,	99	virtual ErrCode WriteAt(sal_uInt32 nPos, const void * pBuffer, sal_uInt32 nCount,
100	ULONG * pWritten);	100	sal_uInt32 * pWritten);
101		101
102	virtual ErrCode Flush() const;	102	virtual ErrCode Flush() const;
103		103
Lines 105-112 Link Here
105		105
106	virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const;	106	virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const;
107		107
108	virtual ErrCode FillAppend(const void * pBuffer, ULONG nCount,	108	virtual ErrCode FillAppend(const void * pBuffer, sal_uInt32 nCount,
109	ULONG * pWritten);	109	sal_uInt32 * pWritten);
110		110
111	virtual ULONG Tell() const;	111	virtual ULONG Tell() const;
112		112

Lines 699-705 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/control/fmtfield.cxx (-6 / +6 lines)
699	LanguageType aOldLang;	699	LanguageType aOldLang;
700	GetFormat(sOldFormat, aOldLang);	700	GetFormat(sOldFormat, aOldLang);
701		701
702	ULONG nDestKey = pFormatter->TestNewString(sOldFormat);	702	sal_uInt32 nDestKey = pFormatter->TestNewString(sOldFormat);
703	if (nDestKey == NUMBERFORMAT_ENTRY_NOT_FOUND)	703	if (nDestKey == NUMBERFORMAT_ENTRY_NOT_FOUND)
704	{	704	{
705	// die Sprache des neuen Formatters	705	// die Sprache des neuen Formatters
Lines 732-738 Link Here
732	BOOL FormattedField::SetFormat(const XubString& rFormatString, LanguageType eLang)	732	BOOL FormattedField::SetFormat(const XubString& rFormatString, LanguageType eLang)
733	{	733	{
734	DBG_CHKTHIS(FormattedField, NULL);	734	DBG_CHKTHIS(FormattedField, NULL);
735	ULONG nNewKey = ImplGetFormatter()->TestNewString(rFormatString, eLang);	735	sal_uInt32 nNewKey = ImplGetFormatter()->TestNewString(rFormatString, eLang);
736	if (nNewKey == NUMBERFORMAT_ENTRY_NOT_FOUND)	736	if (nNewKey == NUMBERFORMAT_ENTRY_NOT_FOUND)
737	{	737	{
738	USHORT nCheckPos;	738	USHORT nCheckPos;
Lines 783-789 Link Here
783	ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, _bUseSeparator, IsRed, nPrecision, nAnzLeading);	783	ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, _bUseSeparator, IsRed, nPrecision, nAnzLeading);
784	// ... and introduce it to the formatter	784	// ... and introduce it to the formatter
785	USHORT nCheckPos;	785	USHORT nCheckPos;
786	ULONG nNewKey;	786	sal_uInt32 nNewKey;
787	short nType;	787	short nType;
788	ImplGetFormatter()->PutEntry(sFmtDescription, nCheckPos, nType, nNewKey, eLang);	788	ImplGetFormatter()->PutEntry(sFmtDescription, nCheckPos, nType, nNewKey, eLang);
789		789
Lines 827-833 Link Here
827	ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, bThousand, IsRed, _nPrecision, nAnzLeading);	827	ImplGetFormatter()->GenerateFormat(sFmtDescription, m_nFormatKey, eLang, bThousand, IsRed, _nPrecision, nAnzLeading);
828	// ... and introduce it to the formatter	828	// ... and introduce it to the formatter
829	USHORT nCheckPos;	829	USHORT nCheckPos;
830	ULONG nNewKey;	830	sal_uInt32 nNewKey;
831	short nType;	831	short nType;
832	ImplGetFormatter()->PutEntry(sFmtDescription, nCheckPos, nType, nNewKey, eLang);	832	ImplGetFormatter()->PutEntry(sFmtDescription, nCheckPos, nType, nNewKey, eLang);
833		833
Lines 1045-1051 Link Here
1045		1045
1046	DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");	1046	DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !");
1047		1047
1048	ULONG nFormatKey = m_nFormatKey; // IsNumberFormat veraendert den FormatKey ...	1048	sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat veraendert den FormatKey ...
1049		1049
1050	if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)	1050	if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber)
1051	// damit wir in einem als Text formatierten Feld trotzdem eine Eingabe wie '1,1' erkennen ...	1051	// damit wir in einem als Text formatierten Feld trotzdem eine Eingabe wie '1,1' erkennen ...
Lines 1059-1065 Link Here
1059	// the default number format for this language	1059	// the default number format for this language
1060	ULONG nStandardNumericFormat = m_pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER, eLanguage);	1060	ULONG nStandardNumericFormat = m_pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER, eLanguage);
1061		1061
1062	ULONG nTempFormat = nStandardNumericFormat;	1062	sal_uInt32 nTempFormat = nStandardNumericFormat;
1063	double dTemp;	1063	double dTemp;
1064	if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) &&	1064	if (m_pFormatter->IsNumberFormat(sText, nTempFormat, dTemp) &&
1065	NUMBERFORMAT_NUMBER == m_pFormatter->GetType(nTempFormat))	1065	NUMBERFORMAT_NUMBER == m_pFormatter->GetType(nTempFormat))

Lines 1197-1203 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/edit/svmedit.cxx (-3 / +3 lines)
1197	{	1197	{
1198	Size aSz = pImpSvMEdit->CalcMinimumSize();	1198	Size aSz = pImpSvMEdit->CalcMinimumSize();
1199		1199
1200	long nLeft, nTop, nRight, nBottom;	1200	sal_Int32 nLeft, nTop, nRight, nBottom;
1201	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );	1201	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
1202	aSz.Width() += nLeft+nRight;	1202	aSz.Width() += nLeft+nRight;
1203	aSz.Height() += nTop+nBottom;	1203	aSz.Height() += nTop+nBottom;
Lines 1208-1214 Link Here
1208	Size MultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const	1208	Size MultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const
1209	{	1209	{
1210	Size aSz = rPrefSize;	1210	Size aSz = rPrefSize;
1211	long nLeft, nTop, nRight, nBottom;	1211	sal_Int32 nLeft, nTop, nRight, nBottom;
1212	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );	1212	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
1213		1213
1214	// In der Hoehe auf ganze Zeilen justieren	1214	// In der Hoehe auf ganze Zeilen justieren
Lines 1229-1235 Link Here
1229	{	1229	{
1230	Size aSz = pImpSvMEdit->CalcSize( nColumns, nLines );	1230	Size aSz = pImpSvMEdit->CalcSize( nColumns, nLines );
1231		1231
1232	long nLeft, nTop, nRight, nBottom;	1232	sal_Int32 nLeft, nTop, nRight, nBottom;
1233	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );	1233	((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
1234	aSz.Width() += nLeft+nRight;	1234	aSz.Width() += nLeft+nRight;
1235	aSz.Height() += nTop+nBottom;	1235	aSz.Height() += nTop+nBottom;

Lines 81-95 Link Here

(-)ooo_1.1.0_src.orig/svtools/inc/flbytes.hxx (-11 / +11 lines)
81		81
82	SvFillLockBytes( SvLockBytes* pLockBytes );	82	SvFillLockBytes( SvLockBytes* pLockBytes );
83	virtual ErrCode ReadAt(	83	virtual ErrCode ReadAt(
84	ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pRead ) const;	84	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const;
85	virtual ErrCode WriteAt(	85	virtual ErrCode WriteAt(
86	ULONG nPos, const void* pBuffer, ULONG nCount, ULONG* pWritten );	86	sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten );
87	virtual ErrCode Flush() const;	87	virtual ErrCode Flush() const;
88	virtual ErrCode SetSize( ULONG nSize );	88	virtual ErrCode SetSize( ULONG nSize );
89	virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );	89	virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );
90	virtual ErrCode UnlockRegion( ULONG nPos, ULONG nCount, LockType );	90	virtual ErrCode UnlockRegion( ULONG nPos, ULONG nCount, LockType );
91	virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;	91	virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
92	ErrCode FillAppend( const void* pBuffer, ULONG nCount, ULONG *pWritten );	92	ErrCode FillAppend( const void* pBuffer, sal_uInt32 nCount, sal_uInt32 *pWritten );
93	ULONG Tell() const { return nFilledSize; }	93	ULONG Tell() const { return nFilledSize; }
94	void Seek( ULONG nPos ) { nFilledSize = nPos; }	94	void Seek( ULONG nPos ) { nFilledSize = nPos; }
95		95
Lines 133-143 Link Here
133	virtual BOOL IsSynchronMode() const	133	virtual BOOL IsSynchronMode() const
134	{ return m_xAsyncLockBytes->IsSynchronMode(); }	134	{ return m_xAsyncLockBytes->IsSynchronMode(); }
135		135
136	virtual ErrCode ReadAt(ULONG nPos, void * pBuffer, ULONG nCount,	136	virtual ErrCode ReadAt(sal_uInt32 nPos, void * pBuffer, sal_uInt32 nCount,
137	ULONG * pRead) const;	137	sal_uInt32 * pRead) const;
138		138
139	virtual ErrCode WriteAt(ULONG nPos, const void * pBuffer, ULONG nCount,	139	virtual ErrCode WriteAt(sal_uInt32 nPos, const void * pBuffer, sal_uInt32 nCount,
140	ULONG * pWritten);	140	sal_uInt32 * pWritten);
141		141
142	virtual ErrCode Flush() const { return m_xAsyncLockBytes->Flush(); }	142	virtual ErrCode Flush() const { return m_xAsyncLockBytes->Flush(); }
143		143
Lines 154-161 Link Here
154	const	154	const
155	{ return m_xAsyncLockBytes->Stat(pStat, eFlag); }	155	{ return m_xAsyncLockBytes->Stat(pStat, eFlag); }
156		156
157	virtual ErrCode FillAppend(const void * pBuffer, ULONG nCount,	157	virtual ErrCode FillAppend(const void * pBuffer, sal_uInt32 nCount,
158	ULONG * pWritten)	158	sal_uInt32 * pWritten)
159	{ return m_xAsyncLockBytes->FillAppend(pBuffer, nCount, pWritten); }	159	{ return m_xAsyncLockBytes->FillAppend(pBuffer, nCount, pWritten); }
160		160
161	virtual ULONG Tell() const { return m_xAsyncLockBytes->Tell(); }	161	virtual ULONG Tell() const { return m_xAsyncLockBytes->Tell(); }
Lines 193-201 Link Here
193	SvLockBytes* GetLastLockBytes() const;	193	SvLockBytes* GetLastLockBytes() const;
194		194
195	virtual ErrCode ReadAt(	195	virtual ErrCode ReadAt(
196	ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pRead ) const;	196	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const;
197	virtual ErrCode WriteAt(	197	virtual ErrCode WriteAt(
198	ULONG nPos, const void* pBuffer, ULONG nCount, ULONG* pWritten );	198	sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten );
199	virtual ErrCode Flush() const;	199	virtual ErrCode Flush() const;
200	virtual ErrCode SetSize( ULONG nSize );	200	virtual ErrCode SetSize( ULONG nSize );
201	virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );	201	virtual ErrCode LockRegion( ULONG nPos, ULONG nCount, LockType );

Lines 421-444 Link Here

(-)ooo_1.1.0_src.orig/svtools/inc/zforlist.hxx (-20 / +20 lines)
421	/** Get table of formats of a specific type of a language/country.	421	/** Get table of formats of a specific type of a language/country.
422	FIndex returns the default format of that type. */	422	FIndex returns the default format of that type. */
423	SvNumberFormatTable& GetEntryTable(short eType,	423	SvNumberFormatTable& GetEntryTable(short eType,
424	ULONG& FIndex,	424	sal_uInt32& FIndex,
425	LanguageType eLnge);	425	LanguageType eLnge);
426		426
427	/** Get table of formats of a specific type of a language/country.	427	/** Get table of formats of a specific type of a language/country.
428	FIndex returns the default format of that type.	428	FIndex returns the default format of that type.
429	If the language/country was never touched before new entries are generated */	429	If the language/country was never touched before new entries are generated */
430	SvNumberFormatTable& ChangeCL(short eType,	430	SvNumberFormatTable& ChangeCL(short eType,
431	ULONG& FIndex,	431	sal_uInt32& FIndex,
432	LanguageType eLnge);	432	LanguageType eLnge);
433		433
434	/** Get table of formats of the same type as FIndex; eType and rLnge are	434	/** Get table of formats of the same type as FIndex; eType and rLnge are
435	set accordingly. An unknown format is set to Standard/General */	435	set accordingly. An unknown format is set to Standard/General */
436	SvNumberFormatTable& GetFirstEntryTable(short& eType,	436	SvNumberFormatTable& GetFirstEntryTable(short& eType,
437	ULONG& FIndex,	437	sal_uInt32& FIndex,
438	LanguageType& rLnge);	438	LanguageType& rLnge);
439		439
440	/// Delete an entry including the format it is refering to	440	/// Delete an entry including the format it is refering to
441	void DeleteEntry(ULONG nKey);	441	void DeleteEntry(sal_uInt32 nKey);
442		442
443	/** Create new entry of a format code string for language/country.	443	/** Create new entry of a format code string for language/country.
444	@return	444	@return
Lines 453-466 Link Here
453	nType contains the type of the format.	453	nType contains the type of the format.
454	nKey contains the index key of the format.	454	nKey contains the index key of the format.
455	*/	455	*/
456	BOOL PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, ULONG& nKey,	456	BOOL PutEntry( String& rString, xub_StrLen& nCheckPos, short& nType, sal_uInt32& nKey,
457	LanguageType eLnge = LANGUAGE_DONTKNOW );	457	LanguageType eLnge = LANGUAGE_DONTKNOW );
458		458
459	/** Same as <method>PutEntry</method> but the format code string is	459	/** Same as <method>PutEntry</method> but the format code string is
460	considered to be of language/country eLnge and is converted to	460	considered to be of language/country eLnge and is converted to
461	language/country eNewLnge */	461	language/country eNewLnge */
462	BOOL PutandConvertEntry( String& rString, xub_StrLen& nCheckPos,	462	BOOL PutandConvertEntry( String& rString, xub_StrLen& nCheckPos,
463	short& nType, ULONG& nKey,	463	short& nType, sal_uInt32& nKey,
464	LanguageType eLnge, LanguageType eNewLnge );	464	LanguageType eLnge, LanguageType eNewLnge );
465		465
466	/** Same as <method>PutandConvertEntry</method> but the format code string	466	/** Same as <method>PutandConvertEntry</method> but the format code string
Lines 468-474 Link Here
468	converted to another System language/country eNewLnge. In this case	468	converted to another System language/country eNewLnge. In this case
469	the automatic currency is converted too. */	469	the automatic currency is converted too. */
470	BOOL PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos,	470	BOOL PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos,
471	short& nType, ULONG& nKey,	471	short& nType, sal_uInt32& nKey,
472	LanguageType eLnge, LanguageType eNewLnge );	472	LanguageType eLnge, LanguageType eNewLnge );
473		473
474	/** Create a format code string using format nIndex as a template and	474	/** Create a format code string using format nIndex as a template and
Lines 485-506 Link Here
485	returned in fOutNumber	485	returned in fOutNumber
486	<FALSE/> if input is not a number	486	<FALSE/> if input is not a number
487	*/	487	*/
488	BOOL IsNumberFormat( const String& sString, ULONG& F_Index, double& fOutNumber );	488	BOOL IsNumberFormat( const String& sString, sal_uInt32& F_Index, double& fOutNumber );
489		489
490	/// Format a number according to a format index, return string and color	490	/// Format a number according to a format index, return string and color
491	void GetOutputString( const double& fOutNumber, ULONG nFIndex,	491	void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex,
492	String& sOutString, Color** ppColor );	492	String& sOutString, Color** ppColor );
493		493
494	/** Format a string according to a format index, return string and color.	494	/** Format a string according to a format index, return string and color.
495	Formats only if the format code is of type text or the 4th subcode	495	Formats only if the format code is of type text or the 4th subcode
496	of a format code is specified, otherwise sOutString will be == "" */	496	of a format code is specified, otherwise sOutString will be == "" */
497	void GetOutputString( String& sString, ULONG nFIndex,	497	void GetOutputString( String& sString, sal_uInt32 nFIndex,
498	String& sOutString, Color** ppColor );	498	String& sOutString, Color** ppColor );
499		499
500	/** Format a number according to the standard default format matching	500	/** Format a number according to the standard default format matching
501	the given format index */	501	the given format index */
502	void GetInputLineString( const double& fOutNumber,	502	void GetInputLineString( const double& fOutNumber,
503	ULONG nFIndex, String& sOutString );	503	sal_uInt32 nFIndex, String& sOutString );
504		504
505	/** Format a number according to a format code string to be scanned.	505	/** Format a number according to a format code string to be scanned.
506	@return	506	@return
Lines 525-533 Link Here
525	LanguageType eLnge = LANGUAGE_DONTKNOW );	525	LanguageType eLnge = LANGUAGE_DONTKNOW );
526		526
527	/// Whether format index nFIndex is of type text or not	527	/// Whether format index nFIndex is of type text or not
528	BOOL IsTextFormat(ULONG nFIndex) const;	528	BOOL IsTextFormat(sal_uInt32 nFIndex) const;
529	/// Whether the 4th string subcode of format index nFIndex is present	529	/// Whether the 4th string subcode of format index nFIndex is present
530	BOOL HasTextFormat(ULONG nFIndex) const;	530	BOOL HasTextFormat(sal_uInt32 nFIndex) const;
531		531
532	/// Load all formats from a stream	532	/// Load all formats from a stream
533	BOOL Load( SvStream& rStream );	533	BOOL Load( SvStream& rStream );
Lines 537-543 Link Here
537	void PrepareSave();	537	void PrepareSave();
538		538
539	/// Flag format index as used	539	/// Flag format index as used
540	void SetFormatUsed(ULONG nFIndex);	540	void SetFormatUsed(sal_uInt32 nFIndex);
541		541
542	/// Get additional info of a format index, e.g. for dialog box	542	/// Get additional info of a format index, e.g. for dialog box
543	void GetFormatSpecialInfo(ULONG nFormat, BOOL& bThousand, BOOL& IsRed,	543	void GetFormatSpecialInfo(ULONG nFormat, BOOL& bThousand, BOOL& IsRed,
Lines 565-571 Link Here
565	ULONG GetEntryKey( const String& sStr, LanguageType eLnge = LANGUAGE_DONTKNOW );	565	ULONG GetEntryKey( const String& sStr, LanguageType eLnge = LANGUAGE_DONTKNOW );
566		566
567	/// Return the format for a format index	567	/// Return the format for a format index
568	const SvNumberformat* GetEntry(ULONG nKey) const	568	const SvNumberformat* GetEntry(sal_uInt32 nKey) const
569	{ return (SvNumberformat*) aFTable.Get(nKey); }	569	{ return (SvNumberformat*) aFTable.Get(nKey); }
570		570
571	/// Return the format index of the standard default number format for language/country	571	/// Return the format index of the standard default number format for language/country
Lines 577-592 Link Here
577	/** Return the format index of the default format of a type for language/country.	577	/** Return the format index of the default format of a type for language/country.
578	Maybe not the default format but a special builtin format, e.g. for	578	Maybe not the default format but a special builtin format, e.g. for
579	NF_TIME_HH_MMSS00, if that format is passed in nFIndex. */	579	NF_TIME_HH_MMSS00, if that format is passed in nFIndex. */
580	ULONG GetStandardFormat( ULONG nFIndex, short eType, LanguageType eLnge );	580	ULONG GetStandardFormat( sal_uInt32 nFIndex, short eType, LanguageType eLnge );
581		581
582	/** Return the format index of the default format of a type for language/country.	582	/** Return the format index of the default format of a type for language/country.
583	Maybe not the default format but a special builtin format, e.g. for	583	Maybe not the default format but a special builtin format, e.g. for
584	NF_TIME_HH_MMSS00, or NF_TIME_HH_MMSS if fNumber >= 1.0 */	584	NF_TIME_HH_MMSS00, or NF_TIME_HH_MMSS if fNumber >= 1.0 */
585	ULONG GetStandardFormat( double fNumber, ULONG nFIndex, short eType,	585	ULONG GetStandardFormat( double fNumber, sal_uInt32 nFIndex, short eType,
586	LanguageType eLnge );	586	LanguageType eLnge );
587		587
588	/// Whether nFIndex is a special builtin format	588	/// Whether nFIndex is a special builtin format
589	BOOL IsSpecialStandardFormat( ULONG nFIndex, LanguageType eLnge );	589	BOOL IsSpecialStandardFormat( sal_uInt32 nFIndex, LanguageType eLnge );
590		590
591	/// Return the reference date	591	/// Return the reference date
592	Date* GetNullDate();	592	Date* GetNullDate();
Lines 596-602 Link Here
596	BOOL GetNoZero() { return bNoZero; }	596	BOOL GetNoZero() { return bNoZero; }
597	/** Get the type of a format (or NUMBERFORMAT_UNDEFINED if no entry),	597	/** Get the type of a format (or NUMBERFORMAT_UNDEFINED if no entry),
598	but with NUMBERFORMAT_DEFINED masked out */	598	but with NUMBERFORMAT_DEFINED masked out */
599	short GetType(ULONG nFIndex);	599	short GetType(sal_uInt32 nFIndex);
600		600
601	/// As the name says	601	/// As the name says
602	void ClearMergeTable();	602	void ClearMergeTable();
Lines 796-802 Link Here
796	ImpSvNumberformatScan* pFormatScanner; // Format code string scanner	796	ImpSvNumberformatScan* pFormatScanner; // Format code string scanner
797	Link aColorLink; // User defined color table CallBack	797	Link aColorLink; // User defined color table CallBack
798	ULONG MaxCLOffset; // Max language/country offset used	798	ULONG MaxCLOffset; // Max language/country offset used
799	ULONG nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale	799	sal_uInt32 nDefaultSystemCurrencyFormat; // NewCurrency matching SYSTEM locale
800	LanguageType IniLnge; // Initialized setting language/country	800	LanguageType IniLnge; // Initialized setting language/country
801	LanguageType ActLnge; // Current setting language/country	801	LanguageType ActLnge; // Current setting language/country
802	NfEvalDateFormat eEvalDateFormat; // DateFormat evaluation	802	NfEvalDateFormat eEvalDateFormat; // DateFormat evaluation

Lines 770-795 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filter.vcl/wmf/emfwr.cxx (-5 / +5 lines)
770		770
771	// -----------------------------------------------------------------------------	771	// -----------------------------------------------------------------------------
772		772
773	void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, const long* pDXArray, UINT32 nWidth )	773	void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, UINT32 nWidth )
774	{	774	{
775	UINT32 nLen = rText.Len(), i;	775	UINT32 nLen = rText.Len(), i;
776		776
777	if( nLen )	777	if( nLen )
778	{	778	{
779	sal_Int32 nNormWidth;	779	sal_Int32 nNormWidth;
780	long* pOwnArray;	780	sal_Int32* pOwnArray;
781	long* pDX;	781	sal_Int32* pDX;
782		782
783	// get text sizes	783	// get text sizes
784	if( pDXArray )	784	if( pDXArray )
785	{	785	{
786	pOwnArray = NULL;	786	pOwnArray = NULL;
787	nNormWidth = maVDev.GetTextWidth( rText );	787	nNormWidth = maVDev.GetTextWidth( rText );
788	pDX = (long*) pDXArray;	788	pDX = (sal_Int32*) pDXArray;
789	}	789	}
790	else	790	else
791	{	791	{
792	pOwnArray = new long[ nLen ];	792	pOwnArray = new sal_Int32[ nLen ];
793	nNormWidth = maVDev.GetTextArray( rText, pOwnArray );	793	nNormWidth = maVDev.GetTextArray( rText, pOwnArray );
794	pDX = pOwnArray;	794	pDX = pOwnArray;
795	}	795	}

Lines 642-648 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/filter.vcl/wmf/wmfwr.cxx (-3 / +3 lines)
642	}	642	}
643		643
644	void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint,	644	void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint,
645	const String & rString, const long * pDXAry )	645	const String & rString, const sal_Int32 * pDXAry )
646	{	646	{
647	sal_uInt16 nOriginalTextLen = rString.Len();	647	sal_uInt16 nOriginalTextLen = rString.Len();
648		648
Lines 657-663 Link Here
657	}	657	}
658		658
659	void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,	659	void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,
660	const ByteString & rByteString, const long * pDXAry )	660	const ByteString & rByteString, const sal_Int32 * pDXAry )
661	{	661	{
662	WriteRecordHeader( 0, W_META_EXTTEXTOUT );	662	WriteRecordHeader( 0, W_META_EXTTEXTOUT );
663	WritePointYX( rPoint );	663	WritePointYX( rPoint );
Lines 1278-1284 Link Here
1278		1278
1279	pVirDev->SetFont( aSrcFont );	1279	pVirDev->SetFont( aSrcFont );
1280	nLen = aTemp.Len();	1280	nLen = aTemp.Len();
1281	sal_Int32* pDXAry = nLen ? new long[ nLen ] : NULL;	1281	sal_Int32* pDXAry = nLen ? new sal_Int32[ nLen ] : NULL;
1282	nNormSize = pVirDev->GetTextArray( aTemp, pDXAry );	1282	nNormSize = pVirDev->GetTextArray( aTemp, pDXAry );
1283	for ( i = 0; i < ( nLen - 1 ); i++ )	1283	for ( i = 0; i < ( nLen - 1 ); i++ )
1284	pDXAry[ i ] = pDXAry[ i ] * (sal_Int32)pA->GetWidth() / nNormSize;	1284	pDXAry[ i ] = pDXAry[ i ] * (sal_Int32)pA->GetWidth() / nNormSize;

Lines 103-110 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/misc/flbytes.cxx (-21 / +21 lines)
103	}	103	}
104		104
105	//============================================================================	105	//============================================================================
106	ErrCode SvFillLockBytes::ReadAt( ULONG nPos, void* pBuffer, ULONG nCount,	106	ErrCode SvFillLockBytes::ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount,
107	ULONG *pRead ) const	107	sal_uInt32 *pRead ) const
108	{	108	{
109	if( bTerminated )	109	if( bTerminated )
110	return xLockBytes->ReadAt( nPos, pBuffer, nCount, pRead );	110	return xLockBytes->ReadAt( nPos, pBuffer, nCount, pRead );
Lines 119-125 Link Here
119	}	119	}
120	else	120	else
121	{	121	{
122	ULONG nRead = MyMin( nCount, long( nFilledSize ) - nPos );	122	sal_uInt32 nRead = MyMin( nCount, long( nFilledSize ) - nPos );
123	ULONG nErr = xLockBytes->ReadAt( nPos, pBuffer, nRead, pRead );	123	ULONG nErr = xLockBytes->ReadAt( nPos, pBuffer, nRead, pRead );
124	return ( !nCount \|\| nRead == nCount \|\| nErr ) ?	124	return ( !nCount \|\| nRead == nCount \|\| nErr ) ?
125	nErr : ERRCODE_IO_PENDING;	125	nErr : ERRCODE_IO_PENDING;
Lines 128-135 Link Here
128	}	128	}
129		129
130	//============================================================================	130	//============================================================================
131	ErrCode SvFillLockBytes::WriteAt( ULONG nPos, const void* pBuffer,	131	ErrCode SvFillLockBytes::WriteAt( sal_uInt32 nPos, const void* pBuffer,
132	ULONG nCount, ULONG *pWritten )	132	sal_uInt32 nCount, sal_uInt32 *pWritten )
133	{	133	{
134	if( bTerminated )	134	if( bTerminated )
135	return xLockBytes->WriteAt( nPos, pBuffer, nCount, pWritten );	135	return xLockBytes->WriteAt( nPos, pBuffer, nCount, pWritten );
Lines 144-150 Link Here
144	}	144	}
145	else	145	else
146	{	146	{
147	ULONG nRead = MyMin( nCount, long( nFilledSize ) - nPos );	147	sal_uInt32 nRead = MyMin( nCount, long( nFilledSize ) - nPos );
148	ULONG nErr = xLockBytes->WriteAt( nPos, pBuffer, nRead, pWritten );	148	ULONG nErr = xLockBytes->WriteAt( nPos, pBuffer, nRead, pWritten );
149	return ( !nCount \|\| nRead == nCount \|\| nErr ) ?	149	return ( !nCount \|\| nRead == nCount \|\| nErr ) ?
150	nErr : ERRCODE_IO_PENDING;	150	nErr : ERRCODE_IO_PENDING;
Lines 185-191 Link Here
185	}	185	}
186		186
187	//============================================================================	187	//============================================================================
188	ErrCode SvFillLockBytes::FillAppend( const void* pBuffer, ULONG nCount, ULONG *pWritten )	188	ErrCode SvFillLockBytes::FillAppend( const void* pBuffer, sal_uInt32 nCount, sal_uInt32 *pWritten )
189	{	189	{
190	ErrCode nRet = xLockBytes->WriteAt(	190	ErrCode nRet = xLockBytes->WriteAt(
191	nFilledSize, pBuffer, nCount, pWritten );	191	nFilledSize, pBuffer, nCount, pWritten );
Lines 212-223 Link Here
212		212
213	//============================================================================	213	//============================================================================
214	// virtual	214	// virtual
215	ErrCode SvSyncLockBytes::ReadAt(ULONG nPos, void * pBuffer, ULONG nCount,	215	ErrCode SvSyncLockBytes::ReadAt(sal_uInt32 nPos, void * pBuffer, sal_uInt32 nCount,
216	ULONG * pRead) const	216	sal_uInt32 * pRead) const
217	{	217	{
218	for (ULONG nReadTotal = 0;;)	218	for (ULONG nReadTotal = 0;;)
219	{	219	{
220	ULONG nReadCount = 0;	220	sal_uInt32 nReadCount = 0;
221	ErrCode nError = m_xAsyncLockBytes->ReadAt(nPos, pBuffer, nCount,	221	ErrCode nError = m_xAsyncLockBytes->ReadAt(nPos, pBuffer, nCount,
222	&nReadCount);	222	&nReadCount);
223	nReadTotal += nReadCount;	223	nReadTotal += nReadCount;
Lines 236-247 Link Here
236		236
237	//============================================================================	237	//============================================================================
238	// virtual	238	// virtual
239	ErrCode SvSyncLockBytes::WriteAt(ULONG nPos, const void * pBuffer,	239	ErrCode SvSyncLockBytes::WriteAt(sal_uInt32 nPos, const void * pBuffer,
240	ULONG nCount, ULONG * pWritten)	240	sal_uInt32 nCount, sal_uInt32 * pWritten)
241	{	241	{
242	for (ULONG nWrittenTotal = 0;;)	242	for (ULONG nWrittenTotal = 0;;)
243	{	243	{
244	ULONG nWrittenCount = 0;	244	sal_uInt32 nWrittenCount = 0;
245	ErrCode nError = m_xAsyncLockBytes->WriteAt(nPos, pBuffer, nCount,	245	ErrCode nError = m_xAsyncLockBytes->WriteAt(nPos, pBuffer, nCount,
246	&nWrittenCount);	246	&nWrittenCount);
247	nWrittenTotal += nWrittenCount;	247	nWrittenTotal += nWrittenCount;
Lines 272-278 Link Here
272	BOOL bPending;	272	BOOL bPending;
273	ULONG RelativeOffset( ULONG nPos ) const;	273	ULONG RelativeOffset( ULONG nPos ) const;
274	ErrCode ReadWrite_Impl(	274	ErrCode ReadWrite_Impl(
275	ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pProcessed,	275	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pProcessed,
276	BOOL bRead );	276	BOOL bRead );
277	SvCompositeLockBytes_Impl() : bPending( FALSE ){}	277	SvCompositeLockBytes_Impl() : bPending( FALSE ){}
278	};	278	};
Lines 297-303 Link Here
297		297
298	//============================================================================	298	//============================================================================
299	ErrCode SvCompositeLockBytes_Impl::ReadWrite_Impl(	299	ErrCode SvCompositeLockBytes_Impl::ReadWrite_Impl(
300	ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pProcessed,	300	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pProcessed,
301	BOOL bRead )	301	BOOL bRead )
302	{	302	{
303	ErrCode nErr = ERRCODE_NONE;	303	ErrCode nErr = ERRCODE_NONE;
Lines 321-331 Link Here
321	return ERRCODE_IO_CANTREAD;	321	return ERRCODE_IO_CANTREAD;
322	}	322	}
323		323
324	ULONG nDone;	324	sal_uInt32 nDone;
325	while( nMinPos < nListCount )	325	while( nMinPos < nListCount )
326	{	326	{
327	ULONG nToProcess;	327	sal_uInt32 nToProcess;
328	ULONG nSectionStop;	328	sal_uInt32 nSectionStop;
329	if( nMinPos + 1 < nListCount )	329	if( nMinPos + 1 < nListCount )
330	{	330	{
331	nSectionStop = rPositions[ nMinPos + 1 ];	331	nSectionStop = rPositions[ nMinPos + 1 ];
Lines 336-342 Link Here
336	nToProcess = nBytes;	336	nToProcess = nBytes;
337	nSectionStop = 0;	337	nSectionStop = 0;
338	}	338	}
339	ULONG nAbsPos = nPos - nSectionStart + rOffsets[ nMinPos ];	339	sal_uInt32 nAbsPos = nPos - nSectionStart + rOffsets[ nMinPos ];
340	SvLockBytes* pLB = rLockBytes.GetObject( nMinPos );	340	SvLockBytes* pLB = rLockBytes.GetObject( nMinPos );
341	if( bRead )	341	if( bRead )
342	nErr = pLB->ReadAt( nAbsPos, pBuffer, nToProcess, &nDone );	342	nErr = pLB->ReadAt( nAbsPos, pBuffer, nToProcess, &nDone );
Lines 389-402 Link Here
389		389
390	//============================================================================	390	//============================================================================
391	ErrCode SvCompositeLockBytes::ReadAt(	391	ErrCode SvCompositeLockBytes::ReadAt(
392	ULONG nPos, void* pBuffer, ULONG nCount, ULONG* pRead ) const	392	sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const
393	{	393	{
394	return pImpl->ReadWrite_Impl( nPos, pBuffer, nCount, pRead, TRUE );	394	return pImpl->ReadWrite_Impl( nPos, pBuffer, nCount, pRead, TRUE );
395	}	395	}
396		396
397	//============================================================================	397	//============================================================================
398	ErrCode SvCompositeLockBytes::WriteAt(	398	ErrCode SvCompositeLockBytes::WriteAt(
399	ULONG nPos, const void* pBuffer, ULONG nCount, ULONG* pWritten )	399	sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten )
400	{	400	{
401	return pImpl->ReadWrite_Impl(	401	return pImpl->ReadWrite_Impl(
402	nPos, const_cast< void * >(pBuffer), nCount, pWritten, FALSE );	402	nPos, const_cast< void * >(pBuffer), nCount, pWritten, FALSE );

Lines 230-236 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/numbers/numfmuno.cxx (-5 / +5 lines)
230	if (pFormatter)	230	if (pFormatter)
231	{	231	{
232	String aTemp = aString;	232	String aTemp = aString;
233	ULONG nUKey = nKey;	233	sal_uInt32 nUKey = nKey;
234	double fValue = 0.0;	234	double fValue = 0.0;
235	if ( pFormatter->IsNumberFormat(aTemp, nUKey, fValue) )	235	if ( pFormatter->IsNumberFormat(aTemp, nUKey, fValue) )
236	nRet = nUKey;	236	nRet = nUKey;
Lines 254-260 Link Here
254	if (pFormatter)	254	if (pFormatter)
255	{	255	{
256	String aTemp = aString;	256	String aTemp = aString;
257	ULONG nUKey = nKey;	257	sal_uInt32 nUKey = nKey;
258	double fValue = 0.0;	258	double fValue = 0.0;
259	if ( pFormatter->IsNumberFormat(aTemp, nUKey, fValue) )	259	if ( pFormatter->IsNumberFormat(aTemp, nUKey, fValue) )
260	fRet = fValue;	260	fRet = fValue;
Lines 507-513 Link Here
507	SvNumberFormatter* pFormatter = pSupplier ? pSupplier->GetNumberFormatter() : NULL;	507	SvNumberFormatter* pFormatter = pSupplier ? pSupplier->GetNumberFormatter() : NULL;
508	if ( pFormatter )	508	if ( pFormatter )
509	{	509	{
510	ULONG nIndex = 0;	510	sal_uInt32 nIndex = 0;
511	LanguageType eLang = lcl_GetLanguage( nLocale );	511	LanguageType eLang = lcl_GetLanguage( nLocale );
512	SvNumberFormatTable& rTable = bCreate ?	512	SvNumberFormatTable& rTable = bCreate ?
513	pFormatter->ChangeCL( nType, nIndex, eLang ) :	513	pFormatter->ChangeCL( nType, nIndex, eLang ) :
Lines 562-568 Link Here
562	{	562	{
563	String aFormStr = aFormat;	563	String aFormStr = aFormat;
564	LanguageType eLang = lcl_GetLanguage( nLocale );	564	LanguageType eLang = lcl_GetLanguage( nLocale );
565	ULONG nKey = 0;	565	sal_uInt32 nKey = 0;
566	xub_StrLen nCheckPos = 0;	566	xub_StrLen nCheckPos = 0;
567	short nType = 0;	567	short nType = 0;
568	BOOL bOk = pFormatter->PutEntry( aFormStr, nCheckPos, nType, nKey, eLang );	568	BOOL bOk = pFormatter->PutEntry( aFormStr, nCheckPos, nType, nKey, eLang );
Lines 594-600 Link Here
594	String aFormStr = aFormat;	594	String aFormStr = aFormat;
595	LanguageType eLang = lcl_GetLanguage( nLocale );	595	LanguageType eLang = lcl_GetLanguage( nLocale );
596	LanguageType eNewLang = lcl_GetLanguage( nNewLocale );	596	LanguageType eNewLang = lcl_GetLanguage( nNewLocale );
597	ULONG nKey = 0;	597	sal_uInt32 nKey = 0;
598	xub_StrLen nCheckPos = 0;	598	xub_StrLen nCheckPos = 0;
599	short nType = 0;	599	short nType = 0;
600	BOOL bOk = pFormatter->PutandConvertEntry( aFormStr, nCheckPos, nType, nKey, eLang, eNewLang );	600	BOOL bOk = pFormatter->PutandConvertEntry( aFormStr, nCheckPos, nType, nKey, eLang, eNewLang );

Lines 548-554 Link Here

(-)ooo_1.1.0_src.orig/svtools/source/numbers/zforlist.cxx (-19 / +19 lines)
548	}	548	}
549		549
550		550
551	BOOL SvNumberFormatter::IsTextFormat(ULONG F_Index) const	551	BOOL SvNumberFormatter::IsTextFormat(sal_uInt32 F_Index) const
552	{	552	{
553	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);	553	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
554	if (!pFormat)	554	if (!pFormat)
Lines 557-563 Link Here
557	return pFormat->IsTextFormat();	557	return pFormat->IsTextFormat();
558	}	558	}
559		559
560	BOOL SvNumberFormatter::HasTextFormat(ULONG F_Index) const	560	BOOL SvNumberFormatter::HasTextFormat(sal_uInt32 F_Index) const
561	{	561	{
562	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);	562	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(F_Index);
563	if (!pFormat)	563	if (!pFormat)
Lines 569-575 Link Here
569	BOOL SvNumberFormatter::PutEntry(String& rString,	569	BOOL SvNumberFormatter::PutEntry(String& rString,
570	xub_StrLen& nCheckPos,	570	xub_StrLen& nCheckPos,
571	short& nType,	571	short& nType,
572	ULONG& nKey, // Formatnummer	572	sal_uInt32& nKey, // Formatnummer
573	LanguageType eLnge)	573	LanguageType eLnge)
574	{	574	{
575	nKey = 0;	575	nKey = 0;
Lines 636-642 Link Here
636	BOOL SvNumberFormatter::PutandConvertEntry(String& rString,	636	BOOL SvNumberFormatter::PutandConvertEntry(String& rString,
637	xub_StrLen& nCheckPos,	637	xub_StrLen& nCheckPos,
638	short& nType,	638	short& nType,
639	ULONG& nKey,	639	sal_uInt32& nKey,
640	LanguageType eLnge,	640	LanguageType eLnge,
641	LanguageType eNewLnge)	641	LanguageType eNewLnge)
642	{	642	{
Lines 654-660 Link Here
654	BOOL SvNumberFormatter::PutandConvertEntrySystem(String& rString,	654	BOOL SvNumberFormatter::PutandConvertEntrySystem(String& rString,
655	xub_StrLen& nCheckPos,	655	xub_StrLen& nCheckPos,
656	short& nType,	656	short& nType,
657	ULONG& nKey,	657	sal_uInt32& nKey,
658	LanguageType eLnge,	658	LanguageType eLnge,
659	LanguageType eNewLnge)	659	LanguageType eNewLnge)
660	{	660	{
Lines 669-675 Link Here
669	}	669	}
670		670
671		671
672	void SvNumberFormatter::DeleteEntry(ULONG nKey)	672	void SvNumberFormatter::DeleteEntry(sal_uInt32 nKey)
673	{	673	{
674	SvNumberformat* pEntry = aFTable.Remove(nKey);	674	SvNumberformat* pEntry = aFTable.Remove(nKey);
675	delete pEntry;	675	delete pEntry;
Lines 685-691 Link Here
685	}	685	}
686	}	686	}
687		687
688	void SvNumberFormatter::SetFormatUsed(ULONG nFIndex)	688	void SvNumberFormatter::SetFormatUsed(sal_uInt32 nFIndex)
689	{	689	{
690	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);	690	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);
691	if (pFormat)	691	if (pFormat)
Lines 1046-1052 Link Here
1046		1046
1047	SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable(	1047	SvNumberFormatTable& SvNumberFormatter::GetFirstEntryTable(
1048	short& eType,	1048	short& eType,
1049	ULONG& FIndex,	1049	sal_uInt32& FIndex,
1050	LanguageType& rLnge)	1050	LanguageType& rLnge)
1051	{	1051	{
1052	short eTypetmp = eType;	1052	short eTypetmp = eType;
Lines 1143-1149 Link Here
1143	}	1143	}
1144		1144
1145	SvNumberFormatTable& SvNumberFormatter::ChangeCL(short eType,	1145	SvNumberFormatTable& SvNumberFormatter::ChangeCL(short eType,
1146	ULONG& FIndex,	1146	sal_uInt32& FIndex,
1147	LanguageType eLnge)	1147	LanguageType eLnge)
1148	{	1148	{
1149	ImpGenerateCL(eLnge);	1149	ImpGenerateCL(eLnge);
Lines 1152-1158 Link Here
1152		1152
1153	SvNumberFormatTable& SvNumberFormatter::GetEntryTable(	1153	SvNumberFormatTable& SvNumberFormatter::GetEntryTable(
1154	short eType,	1154	short eType,
1155	ULONG& FIndex,	1155	sal_uInt32& FIndex,
1156	LanguageType eLnge)	1156	LanguageType eLnge)
1157	{	1157	{
1158	if ( pFormatTable )	1158	if ( pFormatTable )
Lines 1197-1203 Link Here
1197	}	1197	}
1198		1198
1199	BOOL SvNumberFormatter::IsNumberFormat(const String& sString,	1199	BOOL SvNumberFormatter::IsNumberFormat(const String& sString,
1200	ULONG& F_Index,	1200	sal_uInt32& F_Index,
1201	double& fOutNumber)	1201	double& fOutNumber)
1202	{	1202	{
1203	short FType;	1203	short FType;
Lines 1422-1428 Link Here
1422	}	1422	}
1423	}	1423	}
1424		1424
1425	BOOL SvNumberFormatter::IsSpecialStandardFormat( ULONG nFIndex,	1425	BOOL SvNumberFormatter::IsSpecialStandardFormat( sal_uInt32 nFIndex,
1426	LanguageType eLnge )	1426	LanguageType eLnge )
1427	{	1427	{
1428	return	1428	return
Lines 1432-1438 Link Here
1432	;	1432	;
1433	}	1433	}
1434		1434
1435	ULONG SvNumberFormatter::GetStandardFormat( ULONG nFIndex, short eType,	1435	ULONG SvNumberFormatter::GetStandardFormat( sal_uInt32 nFIndex, short eType,
1436	LanguageType eLnge )	1436	LanguageType eLnge )
1437	{	1437	{
1438	if ( IsSpecialStandardFormat( nFIndex, eLnge ) )	1438	if ( IsSpecialStandardFormat( nFIndex, eLnge ) )
Lines 1441-1447 Link Here
1441	return GetStandardFormat( eType, eLnge );	1441	return GetStandardFormat( eType, eLnge );
1442	}	1442	}
1443		1443
1444	ULONG SvNumberFormatter::GetStandardFormat( double fNumber, ULONG nFIndex,	1444	ULONG SvNumberFormatter::GetStandardFormat( double fNumber, sal_uInt32 nFIndex,
1445	short eType, LanguageType eLnge )	1445	short eType, LanguageType eLnge )
1446	{	1446	{
1447	if ( IsSpecialStandardFormat( nFIndex, eLnge ) )	1447	if ( IsSpecialStandardFormat( nFIndex, eLnge ) )
Lines 1482-1488 Link Here
1482	}	1482	}
1483		1483
1484	void SvNumberFormatter::GetInputLineString(const double& fOutNumber,	1484	void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
1485	ULONG nFIndex,	1485	sal_uInt32 nFIndex,
1486	String& sOutString)	1486	String& sOutString)
1487	{	1487	{
1488	SvNumberformat* pFormat;	1488	SvNumberformat* pFormat;
Lines 1535-1541 Link Here
1535	}	1535	}
1536		1536
1537	void SvNumberFormatter::GetOutputString(const double& fOutNumber,	1537	void SvNumberFormatter::GetOutputString(const double& fOutNumber,
1538	ULONG nFIndex,	1538	sal_uInt32 nFIndex,
1539	String& sOutString,	1539	String& sOutString,
1540	Color** ppColor)	1540	Color** ppColor)
1541	{	1541	{
Lines 1552-1558 Link Here
1552	}	1552	}
1553		1553
1554	void SvNumberFormatter::GetOutputString(String& sString,	1554	void SvNumberFormatter::GetOutputString(String& sString,
1555	ULONG nFIndex,	1555	sal_uInt32 nFIndex,
1556	String& sOutString,	1556	String& sOutString,
1557	Color** ppColor)	1557	Color** ppColor)
1558	{	1558	{
Lines 2792-2798 Link Here
2792	return GetStandardFormat(NUMBERFORMAT_NUMBER, eLnge);	2792	return GetStandardFormat(NUMBERFORMAT_NUMBER, eLnge);
2793	}	2793	}
2794		2794
2795	short SvNumberFormatter::GetType(ULONG nFIndex)	2795	short SvNumberFormatter::GetType(sal_uInt32 nFIndex)
2796	{	2796	{
2797	short eType;	2797	short eType;
2798	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);	2798	SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nFIndex);
Lines 3104-3110 Link Here
3104	ULONG SvNumberFormatter::ImpGetDefaultCurrencyFormat()	3104	ULONG SvNumberFormatter::ImpGetDefaultCurrencyFormat()
3105	{	3105	{
3106	ULONG CLOffset = ImpGetCLOffset( ActLnge );	3106	ULONG CLOffset = ImpGetCLOffset( ActLnge );
3107	ULONG nDefaultCurrencyFormat =	3107	sal_uInt32 nDefaultCurrencyFormat =
3108	(ULONG) aDefaultFormatKeys.Get( CLOffset + ZF_STANDARD_CURRENCY );	3108	(ULONG) aDefaultFormatKeys.Get( CLOffset + ZF_STANDARD_CURRENCY );
3109	if ( !nDefaultCurrencyFormat )	3109	if ( !nDefaultCurrencyFormat )
3110	nDefaultCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;	3110	nDefaultCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;