Attachment #13217 for issue #25584

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





	String			GetText( LineEnd eEnd = LINEEND_LF ) const;
	String			GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const;
	sal_uInt32		GetTextLen() const;
	sal_uInt32		GetTextHeight() const;
	sal_uInt32		CalcTextWidth();

	String 			GetText( USHORT nParagraph ) const;
	xub_StrLen			GetTextLen( USHORT nParagraph ) const;
	sal_uInt32		GetTextHeight( USHORT nParagraph ) const;

	USHORT 			GetParagraphCount() const;

	USHORT			GetLineCount( USHORT nParagraph ) const;
	xub_StrLen		GetLineLen( USHORT nParagraph, USHORT nLine ) const;
	sal_uInt32		GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
	USHORT			GetFirstLineOffset( USHORT nParagraph );
	ParagraphInfos 	GetParagraphInfos( USHORT nPara );
	USHORT			FindParagraph( long nDocPosY );

	void			Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );

//  ULONG: Fehlercode des Streams.
	sal_uInt32			Read( SvStream& rInput, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
	sal_uInt32			Write( SvStream& rOutput, EETextFormat );

	void			SetStatusEventHdl( const Link& rLink );
	Link			GetStatusEventHdl() const;

	BOOL			IsFlatMode() const;
	void			SetFlatMode( BOOL bFlat );

	void			SetControlWord( sal_uInt32 nWord );
	sal_uInt32		GetControlWord() const;

	void			QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
	void 			QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );


	static void		SetGetAutoCorrectHdl( const Link& rHdl );
	static SfxItemPool*	CreatePool( BOOL bLoadRefCounts = TRUE );
	static sal_uInt32	RegisterClipboardFormatName();
	static BOOL		DoesKeyChangeText( const KeyEvent& rKeyEvent );
	static BOOL		DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
	static BOOL		IsSimpleCharInput( const KeyEvent& rKeyEvent );




	EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return.
*/

inline void SetFlags( sal_uInt32& rBits, const ULONG nMask, FASTBOOL bOn )
{
	if ( bOn )
		rBits |= nMask;

{
protected:
	ULONG	nStatusBits;
	sal_uInt32	nControlBits;
	USHORT	nPrevPara;					// fuer EE_STAT_CRSRLEFTPARA

public:

	ULONG	GetStatusWord() const		{ return nStatusBits; }
	ULONG&	GetStatusWord() 			{ return nStatusBits; }

	sal_uInt32	GetControlWord() const		{ return nControlBits; }
	sal_uInt32&	GetControlWord() 			{ return nControlBits; }

	USHORT	GetPrevParagraph() const	{ return nPrevPara; }
	USHORT&	GetPrevParagraph() 			{ return nPrevPara; }




	void				RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 );
	void 				RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );

	sal_uInt32			Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
	sal_uInt32			Write( SvStream& rOutput, EETextFormat eFormat );

	void 			SetBackgroundColor( const Color& rColor );
	Color			GetBackgroundColor() const;

	void			SetControlWord( sal_uInt32 nWord );
	sal_uInt32		GetControlWord() const;

	EditTextObject*	CreateTextObject();
	void			InsertText( const EditTextObject& rTextObject );

Lines 728-734 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/inc/msdffimp.hxx (-2 / +2 lines)
728	BYTE& rVer,	728	BYTE& rVer,
729	USHORT& rInst,	729	USHORT& rInst,
730	USHORT& rFbt,	730	USHORT& rFbt,
731	ULONG& rLength );	731	sal_uInt32& rLength );
732	/*	732	/*
733	Konstruktor	733	Konstruktor
734	===========	734	===========
Lines 779-785 Link Here
779	void Scale(PolyPolygon& rPoly) const;	779	void Scale(PolyPolygon& rPoly) const;
780	void Scale(XPolygon& rPoly) const;	780	void Scale(XPolygon& rPoly) const;
781	void Scale(XPolyPolygon& rPoly) const;	781	void Scale(XPolyPolygon& rPoly) const;
782	void ScaleEmu(long& rVal) const;	782	void ScaleEmu(sal_Int32& rVal) const;
783	UINT32 ScalePt( UINT32 nPt ) const;	783	UINT32 ScalePt( UINT32 nPt ) const;
784	INT32 ScalePoint( INT32 nVal ) const;	784	INT32 ScalePoint( INT32 nVal ) const;
785		785





    const SvxFont&  rFont;

    const sal_Int32*     pDXArray;

	// #101498# BiDi level needs to be transported, too.
	BYTE			mnBiDiLevel;

	sal_Bool IsRTL() const;

    DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen,
		const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const sal_Int32* pDXArr, BYTE nBiDiLevel)
        :	rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx),
			pDXArray(pDXArr), mnBiDiLevel(nBiDiLevel)
	    {


	// #101498#
	virtual void    DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,
						const sal_Int32* pDXArray, const SvxFont& rFont,
						USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);

	Size            CalcTextSize();




	void ImpReformatAllEdgeObjects();	// #103122#
	void ImpCreateTables();
	void ImpCtor(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable,
		bool bLoadRefCounts = TRUE);

#endif // __PRIVATE


	// Zeichenobjekte verwenden moechte. Setzt man degegen nur vom abstrakten
	// Basisobjekt SdrObject abgeleitete Objekte ein, so ist man frei in der
	// Wahl des Pools.
	SdrModel(SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, bool bLoadRefCounts = LOADREFCOUNTS);
	SdrModel(const String& rPath, SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, bool bLoadRefCounts = LOADREFCOUNTS);
	SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts = LOADREFCOUNTS);
	SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts = LOADREFCOUNTS);
	virtual ~SdrModel();
	void    Clear();
	// Intern genutzt:

Lines 287-293 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/accessibility/AccessibleContextBase.cxx (-1 / +1 lines)
287	an exception for a wrong index.	287	an exception for a wrong index.
288	*/	288	*/
289	uno::Reference<XAccessible> SAL_CALL	289	uno::Reference<XAccessible> SAL_CALL
290	AccessibleContextBase::getAccessibleChild (long nIndex)	290	AccessibleContextBase::getAccessibleChild (sal_Int32 nIndex)
291	throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)	291	throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
292	{	292	{
293	ThrowIfDisposed ();	293	ThrowIfDisposed ();

Lines 939-945 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/dialog/tpline.cxx (-1 / +1 lines)
939	#endif	939	#endif
940	VirtualDevice aVDev;	940	VirtualDevice aVDev;
941	aVDev.SetMapMode(MapMode(MAP_100TH_MM));	941	aVDev.SetMapMode(MapMode(MAP_100TH_MM));
942	SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);	942	SdrModel* pModel = new SdrModel(NULL, NULL, (INT32) LOADREFCOUNTS);
943	pModel->GetItemPool().FreezeIdRanges();	943	pModel->GetItemPool().FreezeIdRanges();
944	SdrPage* pPage = new SdrPage( *pModel, FALSE );	944	SdrPage* pPage = new SdrPage( *pModel, FALSE );
945	pPage->SetSize(Size(1000,1000));	945	pPage->SetSize(Size(1000,1000));

Lines 959-966 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/dialog/transfrm.cxx (-2 / +2 lines)
959	{	959	{
960	if ( maMtrPosX.IsValueModified() \|\| maMtrPosY.IsValueModified() )	960	if ( maMtrPosX.IsValueModified() \|\| maMtrPosY.IsValueModified() )
961	{	961	{
962	long lX = GetCoreValue( maMtrPosX, mePoolUnit );	962	sal_Int32 lX = GetCoreValue( maMtrPosX, mePoolUnit );
963	long lY = GetCoreValue( maMtrPosY, mePoolUnit );	963	sal_Int32 lY = GetCoreValue( maMtrPosY, mePoolUnit );
964		964
965	// Altes Rechteck mit CoreUnit	965	// Altes Rechteck mit CoreUnit
966	maRect = mpView->GetAllMarkedRect();	966	maRect = mpView->GetAllMarkedRect();




	return aPaM;
}

sal_uInt32 ImpEditEngine::GetTextHeight() const
{
	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: GetTextHeight" );
	DBG_ASSERT( IsFormatted() || IsFormatting(), "GetTextHeight: Nicht formatiert" );
	return nCurTextHeight;
}

sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
{
	// Wenn noch nicht formatiert und nicht gerade dabei.
	// Wird in der Formatierung bei AutoPageSize gerufen.

	return (ULONG)nMaxWidth;
}

sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )
{
	USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() );
    ULONG nOldLayoutMode = GetRefDevice()->GetLayoutMode();

    return nWidth;
}

sal_uInt32 ImpEditEngine::CalcTextHeight()
{
	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: CalcTextHeight" );
	ULONG nY = 0;

	return 0xFFFF;
}

sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph )
{
	ULONG nHeight = 0;


Lines 2155-2161 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/editeng/impedit4.cxx (-2 / +2 lines)
2155		2155
2156	xub_StrLen nLen = nCurrentEnd - nCurrentStart;	2156	xub_StrLen nLen = nCurrentEnd - nCurrentStart;
2157		2157
2158	Sequence <long> aOffsets;	2158	Sequence <sal_Int32> aOffsets;
2159	String aNewText( aTranslitarationWrapper.transliterate( *pNode, nLanguage, nCurrentStart, nLen, &aOffsets ) );	2159	String aNewText( aTranslitarationWrapper.transliterate( *pNode, nLanguage, nCurrentStart, nLen, &aOffsets ) );
2160		2160
2161	if( ( nLen != aNewText.Len() ) \|\| !pNode->Equals( aNewText, nCurrentStart, nLen ) )	2161	if( ( nLen != aNewText.Len() ) \|\| !pNode->Equals( aNewText, nCurrentStart, nLen ) )
Lines 2180-2186 Link Here
2180		2180
2181	// Change text without loosing the attributes	2181	// Change text without loosing the attributes
2182	USHORT nCharsAfterTransliteration = aOffsets.getLength();	2182	USHORT nCharsAfterTransliteration = aOffsets.getLength();
2183	const long* pOffsets = aOffsets.getConstArray();	2183	const sal_Int32* pOffsets = aOffsets.getConstArray();
2184	short nDiffs = 0;	2184	short nDiffs = 0;
2185	for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ )	2185	for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ )
2186	{	2186	{




ImpPolygonCutter::~ImpPolygonCutter()
{
	while(aPolyList.Count())
		delete aPolyList.Remove(0UL);
}

void ImpPolygonCutter::RemoveIncludedPolygons(BOOL bUseOr)

		ImpExtraPolyInfo& rInfo = pInfos[a];

		if((bUseOr && rInfo.GetDepth() != 0) || (!bUseOr && rInfo.GetDepth() < 1))
			DeletePoly(aPolyList.Remove(b));
		else
			b++;
	}

	// solve cuts
	while(rCuts.Count())
	{
		ImpSimpleCut* pCut = rCuts.Remove(0UL);
		pCut->Solve();
		delete pCut;
	}

void ImpPolygonCutter::PolysToList(ImpPolyNode*& rpList)
{
	while(aPolyList.Count())
		AddAllNodes(aPolyList.Remove(0UL), rpList);
}

void ImpPolygonCutter::ListToPolys(ImpPolyNode*& rpList)

{
	while(aPolyList.Count())
	{
		ImpPolyNode* pCand = aPolyList.Remove(0UL);
		ImpPolyNode* pAct = pCand;
		UINT16 nCount(0);
		

	}

	while(aNotClosedPolys.Count())
		rPoly.Insert(aNotClosedPolys.Remove(0UL));
}

ImpSimpleCut* ImpPolygonCutter::GetExistingCut(ImpSimpleCutList& rTmpCuts, ImpPolyNode* pA, ImpPolyNode* pB)


	// remove all nodes of this poly from list
	ImpPolyNode* pAct = pStart;
	UINT32 nNumNodes(0UL);
	do {
		pAct->RemFromList(rpList);
		pAct = pAct->GetNext();

		
		// copy new cuts to cuts
		while(aNewCuts.Count())
			aCuts.Insert(aNewCuts.Remove(0UL));
	}

	// second job: if there were cuts, split polys

					// this cuts enter/leave a common same-direction section between
					// polygons pCandA, pCandB. If it is a real crossover, a cutpoint
					// for it is needed, else it can be ignored.
					ImpSimpleCut* pCutA = aTmpCuts.Remove(0UL);
					ImpPolyNode* pActA = pCutA->GetLeft();
					ImpPolyNode* pActB = pCutA->GetRight();
					BOOL bPrevSamePos(IsPrevSamePos(pActA, pActB));


				// copy new cuts to all cuts
				while(aNewCuts.Count())
					aCuts.Insert(aNewCuts.Remove(0UL), LIST_APPEND);
			}
		}
	}

Lines 210-217 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/inc/GraphCtlAccessibleContext.hxx (-2 / +2 lines)
210		210
211	//===== XAccessibleContext ==============================================	211	//===== XAccessibleContext ==============================================
212		212
213	virtual long SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException);	213	virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException);
214	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (long nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);	214	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
215	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException);	215	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException);
216	virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException);	216	virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException);
217	virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);	217	virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);

Lines 225-235 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/inc/svxrectctaccessiblecontext.hxx (-2 / +2 lines)
225		225
226	//===== XAccessibleContext ==============================================	226	//===== XAccessibleContext ==============================================
227		227
228	virtual long SAL_CALL	228	virtual sal_Int32 SAL_CALL
229	getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException );	229	getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException );
230		230
231	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL	231	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
232	getAccessibleChild( long nIndex )	232	getAccessibleChild( sal_Int32 nIndex )
233	throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException );	233	throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException );
234		234
235	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL	235	virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL




		Scale( rPoly[ nPolyNum ] );
}

void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const
{
	rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv );
}

		aObjData.bChildAnchor = maShapeRecords.SeekToContent( rSt, DFF_msofbtChildAnchor, SEEK_FROM_CURRENT_AND_RESTART );
		if ( aObjData.bChildAnchor )
		{
            long l, o, r, u;
            rSt >> l >> o >> r >> u;
            Scale( l );
            Scale( o );

	BYTE   nVer;
	USHORT nInst;
	USHORT nFbt;
	sal_uInt32  nLength;
	if( !this->ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return;

	BOOL bOk;

	BYTE   nVer;
	USHORT nInst;
	USHORT nFbt;
	sal_uInt32 nLength;

	ULONG nLenBStoreCont = 0, nLenFBSE = 0, nRead = 0;


//
void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, ULONG nLenDg )
{
	BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength;

	ULONG nReadDg = 0;


												  ULONG nLenShapeGroupCont,
												  BOOL bPatriarch )
{
	BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength;
	long nStartShapeGroupCont = rSt.Tell();
	// Wir stehen in einem Shape Group Container (ggfs. mehrere pro Seite)
	// und muessen nun


BOOL SvxMSDffManager::GetShapeContainerData( SvStream& rSt, ULONG nLenShapeCont, ULONG nPosGroup )
{
	BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength;
	long  nStartShapeCont = rSt.Tell();
	// Wir stehen in einem Shape Container (ggfs. mehrere pro Sh. Group)
	// und muessen nun

	int nRes = GRFILTER_OPENERROR;  // Fehlervariable initialisieren

	// nachschauen, ob es sich auch wirklich um ein BLIP handelt
	sal_uInt32  nLength;
	USHORT nInst, nFbt;
	BYTE   nVer;
	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )

											  BYTE&     rVer,
											  USHORT&   rInst,
											  USHORT&   rFbt,
											  sal_uInt32&    rLength )
{
	sal_uInt16 nTmp;
	rSt >> nTmp >> rFbt >> rLength;

Lines 169-175 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outleeng.cxx (-1 / +1 lines)
169	}	169	}
170		170
171	// #101498#	171	// #101498#
172	void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)	172	void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)
173	{	173	{
174	if ( nIndex == 0 )	174	if ( nIndex == 0 )
175	{	175	{

Lines 86-92 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outleeng.hxx (-1 / +1 lines)
86	virtual void ParagraphDeleted( USHORT nDeletedParagraph );	86	virtual void ParagraphDeleted( USHORT nDeletedParagraph );
87		87
88	// #101498#	88	// #101498#
89	virtual void DrawingText(const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft);	89	virtual void DrawingText(const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft);
90		90
91	virtual void StyleSheetChanged( SfxStyleSheet* pStyle );	91	virtual void StyleSheetChanged( SfxStyleSheet* pStyle );
92	virtual void ParaAttribsChanged( USHORT nPara );	92	virtual void ParaAttribsChanged( USHORT nPara );

Lines 1195-1201 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outliner.cxx (-2 / +2 lines)
1195	else	1195	else
1196	{	1196	{
1197	Font aSvxFont( aBulletFont );	1197	Font aSvxFont( aBulletFont );
1198	long* pBuf = new long[ pPara->GetText().Len() ];	1198	sal_Int32* pBuf = new sal_Int32[ pPara->GetText().Len() ];
1199	pOutDev->GetTextArray( pPara->GetText(), pBuf );	1199	pOutDev->GetTextArray( pPara->GetText(), pBuf );
1200	// aTextPos ist Bottom, jetzt die Baseline liefern:	1200	// aTextPos ist Bottom, jetzt die Baseline liefern:
1201	FontMetric aMetric( pOutDev->GetFontMetric() );	1201	FontMetric aMetric( pOutDev->GetFontMetric() );
Lines 2039-2045 Link Here
2039	}	2039	}
2040		2040
2041	// #101498#	2041	// #101498#
2042	void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray,const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)	2042	void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)
2043	{	2043	{
2044	DBG_CHKTHIS(Outliner,0);	2044	DBG_CHKTHIS(Outliner,0);
2045		2045

Lines 847-853 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdedtv2.cxx (-2 / +2 lines)
847		847
848	// clear list	848	// clear list
849	while(aEntryList.Count())	849	while(aEntryList.Count())
850	delete aEntryList.Remove((UINT32)0L);	850	delete aEntryList.Remove(0UL);
851	}	851	}
852		852
853	if(eVer != SvxDistributeVerticalNone)	853	if(eVer != SvxDistributeVerticalNone)
Lines 935-941 Link Here
935		935
936	// clear list	936	// clear list
937	while(aEntryList.Count())	937	while(aEntryList.Count())
938	delete aEntryList.Remove((UINT32)0L);	938	delete aEntryList.Remove(0UL);
939	}	939	}
940		940
941	// UNDO-Comment and end of UNDO	941	// UNDO-Comment and end of UNDO




TYPEINIT1(SdrModel,SfxBroadcaster);

void SdrModel::ImpCtor(SfxItemPool* pPool, SvPersist* pPers,
	FASTBOOL bUseExtColorTable, bool bLoadRefCounts)
{
	mbInDestruction=false;
	aObjUnit=SdrEngineDefaults::GetMapFraction();

	ImpCreateTables();
}

SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, bool bLoadRefCounts):
	aInfo(TRUE),
	maPages(1024,32,32),
	maMaPag(1024,32,32)

	ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
}

SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, bool bLoadRefCounts):
	aInfo(TRUE),
	maPages(1024,32,32),
	maMaPag(1024,32,32),

	ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
}

SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts):
	aInfo(TRUE),
	maPages(1024,32,32),
	maMaPag(1024,32,32)

	ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
}

SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts):
	aInfo(TRUE),
	maPages(1024,32,32),
	maMaPag(1024,32,32),

Lines 561-571 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdoattr.cxx (-2 / +2 lines)
561	nSttWdt /= 2;	561	nSttWdt /= 2;
562		562
563	// Lieber etwas mehr, dafuer keine Wurzel ziehen	563	// Lieber etwas mehr, dafuer keine Wurzel ziehen
564	long nSttAdd = Max(nSttWdt, nSttHgt);	564	sal_Int32 nSttAdd = Max(nSttWdt, nSttHgt);
565	nSttAdd *= 3;	565	nSttAdd *= 3;
566	nSttAdd /= 2;	566	nSttAdd /= 2;
567		567
568	long nEndWdt = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue();	568	sal_Int32 nEndWdt = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue();
569		569
570	if(nEndWdt < 0)	570	if(nEndWdt < 0)
571	nEndWdt = -nLineWdt * nEndWdt / 100; // <0 = relativ	571	nEndWdt = -nLineWdt * nEndWdt / 100; // <0 = relativ

Lines 2168-2174 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdobj.cxx (-1 / +1 lines)
2168	ImpSkeleton::~ImpSkeleton()	2168	ImpSkeleton::~ImpSkeleton()
2169	{	2169	{
2170	while(maList.Count())	2170	while(maList.Count())
2171	delete maList.Remove((UINT32)0L);	2171	delete maList.Remove(0UL);
2172	}	2172	}
2173		2173
2174	BOOL ImpSkeleton::ImpSimpleFindCutPoint(	2174	BOOL ImpSkeleton::ImpSimpleFindCutPoint(




					XPolygon& rPoly = rPolyPolygon[a];
					for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++)
					{
						rPoly[b].X() = ImplTwipsToMM((double)rPoly[b].X());
						rPoly[b].Y() = ImplTwipsToMM((double)rPoly[b].Y());
					}
				}


					XPolygon& rPoly = aNewPolyPolygon[a];
					for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++)
					{
						rPoly[b].X() = ImplMMToTwips((double)rPoly[b].X());
						rPoly[b].Y() = ImplMMToTwips((double)rPoly[b].Y());
					}
				}


Return to issue 25584

Lines 428-434 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/inc/outliner.hxx (-3 / +3 lines)
428		428
429	const SvxFont& rFont;	429	const SvxFont& rFont;
430		430
431	const long* pDXArray;	431	const sal_Int32* pDXArray;
432		432
433	// #101498# BiDi level needs to be transported, too.	433	// #101498# BiDi level needs to be transported, too.
434	BYTE mnBiDiLevel;	434	BYTE mnBiDiLevel;
Lines 437-443 Link Here
437	sal_Bool IsRTL() const;	437	sal_Bool IsRTL() const;
438		438
439	DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen,	439	DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen,
440	const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const long* pDXArr, BYTE nBiDiLevel)	440	const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const sal_Int32* pDXArr, BYTE nBiDiLevel)
441	: rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx),	441	: rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx),
442	pDXArray(pDXArr), mnBiDiLevel(nBiDiLevel)	442	pDXArray(pDXArr), mnBiDiLevel(nBiDiLevel)
443	{	443	{
Lines 816-822 Link Here
816		816
817	// #101498#	817	// #101498#
818	virtual void DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,	818	virtual void DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen,
819	const long* pDXArray, const SvxFont& rFont,	819	const sal_Int32* pDXArray, const SvxFont& rFont,
820	USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);	820	USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);
821		821
822	Size CalcTextSize();	822	Size CalcTextSize();

Lines 397-403 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/inc/svdmodel.hxx (-5 / +5 lines)
397	void ImpReformatAllEdgeObjects(); // #103122#	397	void ImpReformatAllEdgeObjects(); // #103122#
398	void ImpCreateTables();	398	void ImpCreateTables();
399	void ImpCtor(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable,	399	void ImpCtor(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable,
400	FASTBOOL bLoadRefCounts = TRUE);	400	bool bLoadRefCounts = TRUE);
401		401
402	#endif // __PRIVATE	402	#endif // __PRIVATE
403		403
Lines 421-430 Link Here
421	// Zeichenobjekte verwenden moechte. Setzt man degegen nur vom abstrakten	421	// Zeichenobjekte verwenden moechte. Setzt man degegen nur vom abstrakten
422	// Basisobjekt SdrObject abgeleitete Objekte ein, so ist man frei in der	422	// Basisobjekt SdrObject abgeleitete Objekte ein, so ist man frei in der
423	// Wahl des Pools.	423	// Wahl des Pools.
424	SdrModel(SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, INT32 bLoadRefCounts = LOADREFCOUNTS);	424	SdrModel(SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, bool bLoadRefCounts = LOADREFCOUNTS);
425	SdrModel(const String& rPath, SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, INT32 bLoadRefCounts = LOADREFCOUNTS);	425	SdrModel(const String& rPath, SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, bool bLoadRefCounts = LOADREFCOUNTS);
426	SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts = LOADREFCOUNTS);	426	SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts = LOADREFCOUNTS);
427	SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts = LOADREFCOUNTS);	427	SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts = LOADREFCOUNTS);
428	virtual ~SdrModel();	428	virtual ~SdrModel();
429	void Clear();	429	void Clear();
430	// Intern genutzt:	430	// Intern genutzt:

Lines 2802-2815 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/editeng/impedit2.cxx (-5 / +5 lines)
2802	return aPaM;	2802	return aPaM;
2803	}	2803	}
2804		2804
2805	ULONG ImpEditEngine::GetTextHeight() const	2805	sal_uInt32 ImpEditEngine::GetTextHeight() const
2806	{	2806	{
2807	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: GetTextHeight" );	2807	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: GetTextHeight" );
2808	DBG_ASSERT( IsFormatted() \|\| IsFormatting(), "GetTextHeight: Nicht formatiert" );	2808	DBG_ASSERT( IsFormatted() \|\| IsFormatting(), "GetTextHeight: Nicht formatiert" );
2809	return nCurTextHeight;	2809	return nCurTextHeight;
2810	}	2810	}
2811		2811
2812	ULONG ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )	2812	sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
2813	{	2813	{
2814	// Wenn noch nicht formatiert und nicht gerade dabei.	2814	// Wenn noch nicht formatiert und nicht gerade dabei.
2815	// Wird in der Formatierung bei AutoPageSize gerufen.	2815	// Wird in der Formatierung bei AutoPageSize gerufen.
Lines 2875-2881 Link Here
2875	return (ULONG)nMaxWidth;	2875	return (ULONG)nMaxWidth;
2876	}	2876	}
2877		2877
2878	ULONG ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )	2878	sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )
2879	{	2879	{
2880	USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() );	2880	USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() );
2881	ULONG nOldLayoutMode = GetRefDevice()->GetLayoutMode();	2881	ULONG nOldLayoutMode = GetRefDevice()->GetLayoutMode();
Lines 2923-2929 Link Here
2923	return nWidth;	2923	return nWidth;
2924	}	2924	}
2925		2925
2926	ULONG ImpEditEngine::CalcTextHeight()	2926	sal_uInt32 ImpEditEngine::CalcTextHeight()
2927	{	2927	{
2928	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: CalcTextHeight" );	2928	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: CalcTextHeight" );
2929	ULONG nY = 0;	2929	ULONG nY = 0;
Lines 2973-2979 Link Here
2973	return 0xFFFF;	2973	return 0xFFFF;
2974	}	2974	}
2975		2975
2976	ULONG ImpEditEngine::GetParaHeight( USHORT nParagraph )	2976	sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph )
2977	{	2977	{
2978	ULONG nHeight = 0;	2978	ULONG nHeight = 0;
2979		2979

Lines 3024-3030 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/engine3d/poly3d.cxx (-10 / +10 lines)
3024	ImpPolygonCutter::~ImpPolygonCutter()	3024	ImpPolygonCutter::~ImpPolygonCutter()
3025	{	3025	{
3026	while(aPolyList.Count())	3026	while(aPolyList.Count())
3027	delete aPolyList.Remove((UINT32)0L);	3027	delete aPolyList.Remove(0UL);
3028	}	3028	}
3029		3029
3030	void ImpPolygonCutter::RemoveIncludedPolygons(BOOL bUseOr)	3030	void ImpPolygonCutter::RemoveIncludedPolygons(BOOL bUseOr)
Lines 3062-3068 Link Here
3062	ImpExtraPolyInfo& rInfo = pInfos[a];	3062	ImpExtraPolyInfo& rInfo = pInfos[a];
3063		3063
3064	if((bUseOr && rInfo.GetDepth() != 0) \|\| (!bUseOr && rInfo.GetDepth() < 1))	3064	if((bUseOr && rInfo.GetDepth() != 0) \|\| (!bUseOr && rInfo.GetDepth() < 1))
3065	DeletePoly(aPolyList.Remove((UINT32)b));	3065	DeletePoly(aPolyList.Remove(b));
3066	else	3066	else
3067	b++;	3067	b++;
3068	}	3068	}
Lines 3081-3087 Link Here
3081	// solve cuts	3081	// solve cuts
3082	while(rCuts.Count())	3082	while(rCuts.Count())
3083	{	3083	{
3084	ImpSimpleCut* pCut = rCuts.Remove((UINT32)0L);	3084	ImpSimpleCut* pCut = rCuts.Remove(0UL);
3085	pCut->Solve();	3085	pCut->Solve();
3086	delete pCut;	3086	delete pCut;
3087	}	3087	}
Lines 3109-3115 Link Here
3109	void ImpPolygonCutter::PolysToList(ImpPolyNode*& rpList)	3109	void ImpPolygonCutter::PolysToList(ImpPolyNode*& rpList)
3110	{	3110	{
3111	while(aPolyList.Count())	3111	while(aPolyList.Count())
3112	AddAllNodes(aPolyList.Remove((UINT32)0L), rpList);	3112	AddAllNodes(aPolyList.Remove(0UL), rpList);
3113	}	3113	}
3114		3114
3115	void ImpPolygonCutter::ListToPolys(ImpPolyNode*& rpList)	3115	void ImpPolygonCutter::ListToPolys(ImpPolyNode*& rpList)
Lines 3182-3188 Link Here
3182	{	3182	{
3183	while(aPolyList.Count())	3183	while(aPolyList.Count())
3184	{	3184	{
3185	ImpPolyNode* pCand = aPolyList.Remove((UINT32)0L);	3185	ImpPolyNode* pCand = aPolyList.Remove(0UL);
3186	ImpPolyNode* pAct = pCand;	3186	ImpPolyNode* pAct = pCand;
3187	UINT16 nCount(0);	3187	UINT16 nCount(0);
3188		3188
Lines 3209-3215 Link Here
3209	}	3209	}
3210		3210
3211	while(aNotClosedPolys.Count())	3211	while(aNotClosedPolys.Count())
3212	rPoly.Insert(aNotClosedPolys.Remove(0L));	3212	rPoly.Insert(aNotClosedPolys.Remove(0UL));
3213	}	3213	}
3214		3214
3215	ImpSimpleCut* ImpPolygonCutter::GetExistingCut(ImpSimpleCutList& rTmpCuts, ImpPolyNode* pA, ImpPolyNode* pB)	3215	ImpSimpleCut* ImpPolygonCutter::GetExistingCut(ImpSimpleCutList& rTmpCuts, ImpPolyNode* pA, ImpPolyNode* pB)
Lines 3230-3236 Link Here
3230		3230
3231	// remove all nodes of this poly from list	3231	// remove all nodes of this poly from list
3232	ImpPolyNode* pAct = pStart;	3232	ImpPolyNode* pAct = pStart;
3233	UINT32 nNumNodes(0L);	3233	UINT32 nNumNodes(0UL);
3234	do {	3234	do {
3235	pAct->RemFromList(rpList);	3235	pAct->RemFromList(rpList);
3236	pAct = pAct->GetNext();	3236	pAct = pAct->GetNext();
Lines 3338-3344 Link Here
3338		3338
3339	// copy new cuts to cuts	3339	// copy new cuts to cuts
3340	while(aNewCuts.Count())	3340	while(aNewCuts.Count())
3341	aCuts.Insert(aNewCuts.Remove((UINT32)0L));	3341	aCuts.Insert(aNewCuts.Remove(0UL));
3342	}	3342	}
3343		3343
3344	// second job: if there were cuts, split polys	3344	// second job: if there were cuts, split polys
Lines 3595-3601 Link Here
3595	// this cuts enter/leave a common same-direction section between	3595	// this cuts enter/leave a common same-direction section between
3596	// polygons pCandA, pCandB. If it is a real crossover, a cutpoint	3596	// polygons pCandA, pCandB. If it is a real crossover, a cutpoint
3597	// for it is needed, else it can be ignored.	3597	// for it is needed, else it can be ignored.
3598	ImpSimpleCut* pCutA = aTmpCuts.Remove((UINT32)0L);	3598	ImpSimpleCut* pCutA = aTmpCuts.Remove(0UL);
3599	ImpPolyNode* pActA = pCutA->GetLeft();	3599	ImpPolyNode* pActA = pCutA->GetLeft();
3600	ImpPolyNode* pActB = pCutA->GetRight();	3600	ImpPolyNode* pActB = pCutA->GetRight();
3601	BOOL bPrevSamePos(IsPrevSamePos(pActA, pActB));	3601	BOOL bPrevSamePos(IsPrevSamePos(pActA, pActB));
Lines 3663-3669 Link Here
3663		3663
3664	// copy new cuts to all cuts	3664	// copy new cuts to all cuts
3665	while(aNewCuts.Count())	3665	while(aNewCuts.Count())
3666	aCuts.Insert(aNewCuts.Remove((UINT32)0L), LIST_APPEND);	3666	aCuts.Insert(aNewCuts.Remove(0UL), LIST_APPEND);
3667	}	3667	}
3668	}	3668	}
3669	}	3669	}

Lines 227-245 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/inc/editeng.hxx (-10 / +10 lines)
227		227
228	String GetText( LineEnd eEnd = LINEEND_LF ) const;	228	String GetText( LineEnd eEnd = LINEEND_LF ) const;
229	String GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const;	229	String GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const;
230	ULONG GetTextLen() const;	230	sal_uInt32 GetTextLen() const;
231	ULONG GetTextHeight() const;	231	sal_uInt32 GetTextHeight() const;
232	ULONG CalcTextWidth();	232	sal_uInt32 CalcTextWidth();
233		233
234	String GetText( USHORT nParagraph ) const;	234	String GetText( USHORT nParagraph ) const;
235	xub_StrLen GetTextLen( USHORT nParagraph ) const;	235	xub_StrLen GetTextLen( USHORT nParagraph ) const;
236	ULONG GetTextHeight( USHORT nParagraph ) const;	236	sal_uInt32 GetTextHeight( USHORT nParagraph ) const;
237		237
238	USHORT GetParagraphCount() const;	238	USHORT GetParagraphCount() const;
239		239
240	USHORT GetLineCount( USHORT nParagraph ) const;	240	USHORT GetLineCount( USHORT nParagraph ) const;
241	xub_StrLen GetLineLen( USHORT nParagraph, USHORT nLine ) const;	241	xub_StrLen GetLineLen( USHORT nParagraph, USHORT nLine ) const;
242	ULONG GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );	242	sal_uInt32 GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
243	USHORT GetFirstLineOffset( USHORT nParagraph );	243	USHORT GetFirstLineOffset( USHORT nParagraph );
244	ParagraphInfos GetParagraphInfos( USHORT nPara );	244	ParagraphInfos GetParagraphInfos( USHORT nPara );
245	USHORT FindParagraph( long nDocPosY );	245	USHORT FindParagraph( long nDocPosY );
Lines 322-329 Link Here
322	void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );	322	void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 );
323		323
324	// ULONG: Fehlercode des Streams.	324	// ULONG: Fehlercode des Streams.
325	ULONG Read( SvStream& rInput, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );	325	sal_uInt32 Read( SvStream& rInput, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
326	ULONG Write( SvStream& rOutput, EETextFormat );	326	sal_uInt32 Write( SvStream& rOutput, EETextFormat );
327		327
328	void SetStatusEventHdl( const Link& rLink );	328	void SetStatusEventHdl( const Link& rLink );
329	Link GetStatusEventHdl() const;	329	Link GetStatusEventHdl() const;
Lines 338-345 Link Here
338	BOOL IsFlatMode() const;	338	BOOL IsFlatMode() const;
339	void SetFlatMode( BOOL bFlat );	339	void SetFlatMode( BOOL bFlat );
340		340
341	void SetControlWord( ULONG nWord );	341	void SetControlWord( sal_uInt32 nWord );
342	ULONG GetControlWord() const;	342	sal_uInt32 GetControlWord() const;
343		343
344	void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );	344	void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
345	void QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );	345	void QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
Lines 444-450 Link Here
444		444
445	static void SetGetAutoCorrectHdl( const Link& rHdl );	445	static void SetGetAutoCorrectHdl( const Link& rHdl );
446	static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE );	446	static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE );
447	static ULONG RegisterClipboardFormatName();	447	static sal_uInt32 RegisterClipboardFormatName();
448	static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent );	448	static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent );
449	static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent );	449	static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent );
450	static BOOL IsSimpleCharInput( const KeyEvent& rKeyEvent );	450	static BOOL IsSimpleCharInput( const KeyEvent& rKeyEvent );

Lines 127-133 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/inc/editstat.hxx (-4 / +4 lines)
127	EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return.	127	EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return.
128	*/	128	*/
129		129
130	inline void SetFlags( ULONG& rBits, const ULONG nMask, FASTBOOL bOn )	130	inline void SetFlags( sal_uInt32& rBits, const ULONG nMask, FASTBOOL bOn )
131	{	131	{
132	if ( bOn )	132	if ( bOn )
133	rBits \|= nMask;	133	rBits \|= nMask;
Lines 139-145 Link Here
139	{	139	{
140	protected:	140	protected:
141	ULONG nStatusBits;	141	ULONG nStatusBits;
142	ULONG nControlBits;	142	sal_uInt32 nControlBits;
143	USHORT nPrevPara; // fuer EE_STAT_CRSRLEFTPARA	143	USHORT nPrevPara; // fuer EE_STAT_CRSRLEFTPARA
144		144
145	public:	145	public:
Lines 152-159 Link Here
152	ULONG GetStatusWord() const { return nStatusBits; }	152	ULONG GetStatusWord() const { return nStatusBits; }
153	ULONG& GetStatusWord() { return nStatusBits; }	153	ULONG& GetStatusWord() { return nStatusBits; }
154		154
155	ULONG GetControlWord() const { return nControlBits; }	155	sal_uInt32 GetControlWord() const { return nControlBits; }
156	ULONG& GetControlWord() { return nControlBits; }	156	sal_uInt32& GetControlWord() { return nControlBits; }
157		157
158	USHORT GetPrevParagraph() const { return nPrevPara; }	158	USHORT GetPrevParagraph() const { return nPrevPara; }
159	USHORT& GetPrevParagraph() { return nPrevPara; }	159	USHORT& GetPrevParagraph() { return nPrevPara; }

Lines 221-234 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/inc/editview.hxx (-4 / +4 lines)
221	void RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 );	221	void RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 );
222	void RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );	222	void RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
223		223
224	ULONG Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );	224	sal_uInt32 Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
225	ULONG Write( SvStream& rOutput, EETextFormat eFormat );	225	sal_uInt32 Write( SvStream& rOutput, EETextFormat eFormat );
226		226
227	void SetBackgroundColor( const Color& rColor );	227	void SetBackgroundColor( const Color& rColor );
228	Color GetBackgroundColor() const;	228	Color GetBackgroundColor() const;
229		229
230	void SetControlWord( ULONG nWord );	230	void SetControlWord( sal_uInt32 nWord );
231	ULONG GetControlWord() const;	231	sal_uInt32 GetControlWord() const;
232		232
233	EditTextObject* CreateTextObject();	233	EditTextObject* CreateTextObject();
234	void InsertText( const EditTextObject& rTextObject );	234	void InsertText( const EditTextObject& rTextObject );

Lines 1865-1871 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/msfilter/msdffimp.cxx (-9 / +9 lines)
1865	Scale( rPoly[ nPolyNum ] );	1865	Scale( rPoly[ nPolyNum ] );
1866	}	1866	}
1867		1867
1868	void SvxMSDffManager::ScaleEmu( long& rVal ) const	1868	void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const
1869	{	1869	{
1870	rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv );	1870	rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv );
1871	}	1871	}
Lines 2966-2972 Link Here
2966	aObjData.bChildAnchor = maShapeRecords.SeekToContent( rSt, DFF_msofbtChildAnchor, SEEK_FROM_CURRENT_AND_RESTART );	2966	aObjData.bChildAnchor = maShapeRecords.SeekToContent( rSt, DFF_msofbtChildAnchor, SEEK_FROM_CURRENT_AND_RESTART );
2967	if ( aObjData.bChildAnchor )	2967	if ( aObjData.bChildAnchor )
2968	{	2968	{
2969	INT32 l, o, r, u;	2969	long l, o, r, u;
2970	rSt >> l >> o >> r >> u;	2970	rSt >> l >> o >> r >> u;
2971	Scale( l );	2971	Scale( l );
2972	Scale( o );	2972	Scale( o );
Lines 4158-4164 Link Here
4158	BYTE nVer;	4158	BYTE nVer;
4159	USHORT nInst;	4159	USHORT nInst;
4160	USHORT nFbt;	4160	USHORT nFbt;
4161	ULONG nLength;	4161	sal_uInt32 nLength;
4162	if( !this->ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return;	4162	if( !this->ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return;
4163		4163
4164	BOOL bOk;	4164	BOOL bOk;
Lines 4203-4209 Link Here
4203	BYTE nVer;	4203	BYTE nVer;
4204	USHORT nInst;	4204	USHORT nInst;
4205	USHORT nFbt;	4205	USHORT nFbt;
4206	ULONG nLength;	4206	sal_uInt32 nLength;
4207		4207
4208	ULONG nLenBStoreCont = 0, nLenFBSE = 0, nRead = 0;	4208	ULONG nLenBStoreCont = 0, nLenFBSE = 0, nRead = 0;
4209		4209
Lines 4288-4294 Link Here
4288	//	4288	//
4289	void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, ULONG nLenDg )	4289	void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, ULONG nLenDg )
4290	{	4290	{
4291	BYTE nVer;USHORT nInst;USHORT nFbt;ULONG nLength;	4291	BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength;
4292		4292
4293	ULONG nReadDg = 0;	4293	ULONG nReadDg = 0;
4294		4294
Lines 4321-4327 Link Here
4321	ULONG nLenShapeGroupCont,	4321	ULONG nLenShapeGroupCont,
4322	BOOL bPatriarch )	4322	BOOL bPatriarch )
4323	{	4323	{
4324	BYTE nVer;USHORT nInst;USHORT nFbt;ULONG nLength;	4324	BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength;
4325	long nStartShapeGroupCont = rSt.Tell();	4325	long nStartShapeGroupCont = rSt.Tell();
4326	// Wir stehen in einem Shape Group Container (ggfs. mehrere pro Seite)	4326	// Wir stehen in einem Shape Group Container (ggfs. mehrere pro Seite)
4327	// und muessen nun	4327	// und muessen nun
Lines 4360-4366 Link Here
4360		4360
4361	BOOL SvxMSDffManager::GetShapeContainerData( SvStream& rSt, ULONG nLenShapeCont, ULONG nPosGroup )	4361	BOOL SvxMSDffManager::GetShapeContainerData( SvStream& rSt, ULONG nLenShapeCont, ULONG nPosGroup )
4362	{	4362	{
4363	BYTE nVer;USHORT nInst;USHORT nFbt;ULONG nLength;	4363	BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength;
4364	long nStartShapeCont = rSt.Tell();	4364	long nStartShapeCont = rSt.Tell();
4365	// Wir stehen in einem Shape Container (ggfs. mehrere pro Sh. Group)	4365	// Wir stehen in einem Shape Container (ggfs. mehrere pro Sh. Group)
4366	// und muessen nun	4366	// und muessen nun
Lines 4725-4731 Link Here
4725	int nRes = GRFILTER_OPENERROR; // Fehlervariable initialisieren	4725	int nRes = GRFILTER_OPENERROR; // Fehlervariable initialisieren
4726		4726
4727	// nachschauen, ob es sich auch wirklich um ein BLIP handelt	4727	// nachschauen, ob es sich auch wirklich um ein BLIP handelt
4728	ULONG nLength;	4728	sal_uInt32 nLength;
4729	USHORT nInst, nFbt;	4729	USHORT nInst, nFbt;
4730	BYTE nVer;	4730	BYTE nVer;
4731	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )	4731	if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
Lines 4926-4932 Link Here
4926	BYTE& rVer,	4926	BYTE& rVer,
4927	USHORT& rInst,	4927	USHORT& rInst,
4928	USHORT& rFbt,	4928	USHORT& rFbt,
4929	ULONG& rLength )	4929	sal_uInt32& rLength )
4930	{	4930	{
4931	sal_uInt16 nTmp;	4931	sal_uInt16 nTmp;
4932	rSt >> nTmp >> rFbt >> rLength;	4932	rSt >> nTmp >> rFbt >> rLength;

Lines 336-342 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdmodel.cxx (-5 / +5 lines)
336	TYPEINIT1(SdrModel,SfxBroadcaster);	336	TYPEINIT1(SdrModel,SfxBroadcaster);
337		337
338	void SdrModel::ImpCtor(SfxItemPool* pPool, SvPersist* pPers,	338	void SdrModel::ImpCtor(SfxItemPool* pPool, SvPersist* pPers,
339	FASTBOOL bUseExtColorTable, FASTBOOL bLoadRefCounts)	339	FASTBOOL bUseExtColorTable, bool bLoadRefCounts)
340	{	340	{
341	mbInDestruction=false;	341	mbInDestruction=false;
342	aObjUnit=SdrEngineDefaults::GetMapFraction();	342	aObjUnit=SdrEngineDefaults::GetMapFraction();
Lines 451-457 Link Here
451	ImpCreateTables();	451	ImpCreateTables();
452	}	452	}
453		453
454	SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts):	454	SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, bool bLoadRefCounts):
455	aInfo(TRUE),	455	aInfo(TRUE),
456	maPages(1024,32,32),	456	maPages(1024,32,32),
457	maMaPag(1024,32,32)	457	maMaPag(1024,32,32)
Lines 464-470 Link Here
464	ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);	464	ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
465	}	465	}
466		466
467	SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts):	467	SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, bool bLoadRefCounts):
468	aInfo(TRUE),	468	aInfo(TRUE),
469	maPages(1024,32,32),	469	maPages(1024,32,32),
470	maMaPag(1024,32,32),	470	maMaPag(1024,32,32),
Lines 478-484 Link Here
478	ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);	478	ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
479	}	479	}
480		480
481	SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts):	481	SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts):
482	aInfo(TRUE),	482	aInfo(TRUE),
483	maPages(1024,32,32),	483	maPages(1024,32,32),
484	maMaPag(1024,32,32)	484	maMaPag(1024,32,32)
Lines 491-497 Link Here
491	ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);	491	ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
492	}	492	}
493		493
494	SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts):	494	SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts):
495	aInfo(TRUE),	495	aInfo(TRUE),
496	maPages(1024,32,32),	496	maPages(1024,32,32),
497	maMaPag(1024,32,32),	497	maMaPag(1024,32,32),

Lines 3330-3337 Link Here

(-)ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdopath.cxx (-4 / +4 lines)
3330	XPolygon& rPoly = rPolyPolygon[a];	3330	XPolygon& rPoly = rPolyPolygon[a];
3331	for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++)	3331	for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++)
3332	{	3332	{
3333	rPoly[b].X() = ImplTwipsToMM(rPoly[b].X());	3333	rPoly[b].X() = ImplTwipsToMM((double)rPoly[b].X());
3334	rPoly[b].Y() = ImplTwipsToMM(rPoly[b].Y());	3334	rPoly[b].Y() = ImplTwipsToMM((double)rPoly[b].Y());
3335	}	3335	}
3336	}	3336	}
3337		3337
Lines 3401-3408 Link Here
3401	XPolygon& rPoly = aNewPolyPolygon[a];	3401	XPolygon& rPoly = aNewPolyPolygon[a];
3402	for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++)	3402	for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++)
3403	{	3403	{
3404	rPoly[b].X() = ImplMMToTwips(rPoly[b].X());	3404	rPoly[b].X() = ImplMMToTwips((double)rPoly[b].X());
3405	rPoly[b].Y() = ImplMMToTwips(rPoly[b].Y());	3405	rPoly[b].Y() = ImplMMToTwips((double)rPoly[b].Y());
3406	}	3406	}
3407	}	3407	}
3408		3408