diff options
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r-- | svx/source/unodraw/XPropertyTable.cxx | 8 | ||||
-rw-r--r-- | svx/source/unodraw/unoctabl.cxx | 10 | ||||
-rw-r--r-- | svx/source/unodraw/unomod.cxx | 10 | ||||
-rw-r--r-- | svx/source/unodraw/unopage.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/unottabl.cxx | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 617d1737a482..4a54b30c6caa 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -457,7 +457,7 @@ uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw() drawing::LineDash aLineDash; - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle()); + aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); @@ -477,7 +477,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An XDash aXDash; - aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style))); + aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style))); aXDash.SetDots(aLineDash.Dots); aXDash.SetDotLen(aLineDash.DotLen); aXDash.SetDashes(aLineDash.Dashes); @@ -616,8 +616,8 @@ uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const thro awt::Gradient aGradient; aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle(); - aGradient.StartColor = (INT32)aXGradient.GetStartColor().GetColor(); - aGradient.EndColor = (INT32)aXGradient.GetEndColor().GetColor(); + aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); + aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); aGradient.Angle = (short)aXGradient.GetAngle(); aGradient.Border = aXGradient.GetBorder(); aGradient.XOffset = aXGradient.GetXOffset(); diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 48357f873ce3..6b54a1458307 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -100,11 +100,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceNam uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); const OUString * pArray = aSNL.getConstArray(); - for( INT32 i = 0; i < aSNL.getLength(); i++ ) + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException ) @@ -132,7 +132,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno:: if( hasByName( aName ) ) throw container::ElementExistException(); - INT32 nColor = 0; + sal_Int32 nColor = 0; if( !(aElement >>= nColor) ) throw lang::IllegalArgumentException(); @@ -157,7 +157,7 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - INT32 nColor = 0; + sal_Int32 nColor = 0; if( !(aElement >>= nColor) ) throw lang::IllegalArgumentException(); diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 195411b1e944..016128488ab4 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -192,11 +192,11 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( if( ServiceSpecifier.compareTo( aDrawingPrefix, aDrawingPrefix.getLength() ) == 0 ) { - UINT32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier ); + sal_uInt32 nType = aSdrShapeIdentifierMap.getId( ServiceSpecifier ); if( nType != UHASHMAP_NOTFOUND ) { - UINT16 nT = (UINT16)(nType & ~E3D_INVENTOR_FLAG); - UINT32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor; + sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG); + sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor; return uno::Reference< uno::XInterface >( (drawing::XShape*) SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI ) ); } @@ -225,7 +225,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames { UHashMapEntry* pMap = pSdrShapeIdentifierMap; - UINT32 nCount = 0; + sal_uInt32 nCount = 0; while (pMap->aIdentifier.getLength()) { pMap++; @@ -236,7 +236,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames OUString* pStrings = aSeq.getArray(); pMap = pSdrShapeIdentifierMap; - UINT32 nIdx = 0; + sal_uInt32 nIdx = 0; while(pMap->aIdentifier.getLength()) { pStrings[nIdx] = pMap->aIdentifier; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index a905aa0fd2f4..1efb94886194 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -625,7 +625,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x aNewPolygon.setClosed(true); pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon)); - // #107245# pObj->SetExtrudeCharacterMode(TRUE); + // #107245# pObj->SetExtrudeCharacterMode(sal_True); pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True)); } else if(pNewObj->ISA(E3dLatheObj)) @@ -638,7 +638,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x aNewPolygon.setClosed(true); pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon)); - // #107245# pObj->SetLatheCharacterMode(TRUE); + // #107245# pObj->SetLatheCharacterMode(sal_True); pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True)); } } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index fd8f9dd1d2d9..be20ca4421e3 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -394,7 +394,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const double fCamFocal = (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); - aCam.SetAutoAdjustProjection(FALSE); + aCam.SetAutoAdjustProjection(sal_False); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ); diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 46a84bf52fad..0f277467bd1f 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -84,7 +84,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService NameOrIndex* SvxUnoTransGradientTable::createItem() const throw() { XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem(); - pNewItem->SetEnabled( TRUE ); + pNewItem->SetEnabled( sal_True ); return pNewItem; } |