blob: 053048ec6f717604ecb5a89ed9e462d36d22cdad (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- svx/source/msfilter/msdffimp.cxx 2006-11-22
11:22:41.000000000 +0100
+++ svx/source/msfilter/msdffimp.cxx 2006-11-22
11:52:34.000000000 +0100
@@ -3516,7 +3516,7 @@
Scale( rPoly[ nPolyNum ] );
}
-void SvxMSDffManager::ScaleEmu( long& rVal ) const
+void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const
{
rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv );
}
--- svx/source/svdraw/svdtxhdl.cxx 2006-11-22
11:22:43.000000000 +0100
+++ svx/source/svdraw/svdtxhdl.cxx 2006-11-22
11:53:00.000000000 +0100
@@ -183,7 +183,7 @@
rOutliner.Clear();
rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX));
rOutliner.SetText(*pPara);
- sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), rOutliner.GetParagraphCount()));
+ sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), (sal_uInt32)rOutliner.GetParagraphCount()));
if ( nCnt == 1 ) bToLastPoint = TRUE;
else bToLastPoint = FALSE;
|
