diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-08 11:49:29 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-08 11:49:29 +0100 |
| commit | 5797fb363dd638178463a1d9dd4aa1d66c67fc99 (patch) | |
| tree | d3287f4b7c3025e5eb04df2ecd9fcbceeec04610 /chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | |
| parent | 76f355864a8c03b64ebfc71139f525a1fc25836a (diff) | |
| parent | 24684974fe50ca308a7af50a34c5f73d4b2d9d5f (diff) | |
CWS gnumake3: pull in cws removetooltypes01
Diffstat (limited to 'chart2/source/controller/drawinglayer/DrawViewWrapper.cxx')
| -rw-r--r-- | chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 9da7f7536d28..102393dd59f8 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -126,7 +126,7 @@ void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutline //if( bInit ) { pTargetOutliner->EraseVirtualDevice(); - pTargetOutliner->SetUpdateMode(FALSE); + pTargetOutliner->SetUpdateMode(sal_False); pTargetOutliner->SetEditTextObjectPool( pSourceOutliner->GetEditTextObjectPool() ); pTargetOutliner->SetDefTab( pSourceOutliner->GetDefTab() ); } @@ -140,7 +140,7 @@ void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutline pTargetOutliner->SetDefaultLanguage( pSourceOutliner->GetDefaultLanguage() ); pTargetOutliner->SetHyphenator( pSourceOutliner->GetHyphenator() ); - USHORT nX, nY; + sal_uInt16 nX, nY; pSourceOutliner->GetGlobalCharStretching( nX, nY ); pTargetOutliner->SetGlobalCharStretching( nX, nY ); @@ -234,8 +234,8 @@ void DrawViewWrapper::SetMarkHandles() SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const { SdrObject* pRet = NULL; - //ULONG nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST; - ULONG nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE; + //sal_uLong nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST; + sal_uLong nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE; SdrPageView* pSdrPageView = this->GetPageView(); this->SdrView::PickObj(rPnt, lcl_getHitTolerance( this->GetFirstOutputDevice() ), pRet, pSdrPageView, nOptions); |