diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-12-06 05:47:07 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-12-06 05:47:07 +0000 |
| commit | 6c419a6edcaa4dbaedaf757fbd9cdb95ab001603 (patch) | |
| tree | 9dd02465c299640257fa6d38532ea67ebbc969fc /editors/openoffice-3-devel/files/patch-i71848 | |
| parent | According to author the driver works on 64-bit architectures (mostly amd64) (diff) | |
* Fix build on amd64 [1].
* Fix icons and menu installation and some cleanups [2].
Submitted by: many [1], jkim [2]
Diffstat (limited to 'editors/openoffice-3-devel/files/patch-i71848')
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i71848 | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i71848 b/editors/openoffice-3-devel/files/patch-i71848 new file mode 100644 index 000000000000..053048ec6f71 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i71848 @@ -0,0 +1,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; + + |