diff options
Diffstat (limited to 'sw/source/core/unocore/unoframe.cxx')
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 3a3df506b457..1513d9960d96 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -143,8 +143,8 @@ class BaseFrameProperties_Impl public: virtual ~BaseFrameProperties_Impl(); - void SetProperty(USHORT nWID, BYTE nMemberId, const uno::Any& rVal); - sal_Bool GetProperty(USHORT nWID, BYTE nMemberId, const uno::Any*& pAny ); + void SetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any& rVal); + sal_Bool GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any*& pAny ); // void GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny ); // const SfxItemPropertyMap* GetMap() const {return _pMap;} @@ -162,14 +162,14 @@ BaseFrameProperties_Impl::~BaseFrameProperties_Impl() /* -----------------------------12.06.01 15:43-------------------------------- ---------------------------------------------------------------------------*/ -void BaseFrameProperties_Impl::SetProperty(USHORT nWID, BYTE nMemberId, const uno::Any& rVal) +void BaseFrameProperties_Impl::SetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any& rVal) { aAnyMap.SetValue( nWID, nMemberId, rVal ); } /* -----------------------------12.06.01 15:43-------------------------------- ---------------------------------------------------------------------------*/ -sal_Bool BaseFrameProperties_Impl::GetProperty(USHORT nWID, BYTE nMemberId, const uno::Any*& rpAny) +sal_Bool BaseFrameProperties_Impl::GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any*& rpAny) { return aAnyMap.FillValue( nWID, nMemberId, rpAny ); } @@ -678,7 +678,7 @@ sal_Bool SwGraphicProperties_Impl::AnyToItemSet( } - static const :: USHORT nIDs[] = + static const :: sal_uInt16 nIDs[] = { RES_GRFATR_CROPGRF, RES_GRFATR_ROTATION, @@ -696,7 +696,7 @@ sal_Bool SwGraphicProperties_Impl::AnyToItemSet( const ::uno::Any* pAny; for(sal_Int16 nIndex = 0; nIDs[nIndex]; nIndex++) { - BYTE nMId = RES_GRFATR_CROPGRF == nIDs[nIndex] ? CONVERT_TWIPS : 0; + sal_uInt8 nMId = RES_GRFATR_CROPGRF == nIDs[nIndex] ? CONVERT_TWIPS : 0; if(GetProperty(nIDs[nIndex], nMId, pAny )) { SfxPoolItem* pItem = ::GetDfltAttr( nIDs[nIndex] )->Clone(); @@ -730,10 +730,10 @@ sal_Bool SwOLEProperties_Impl::AnyToItemSet( { const ::uno::Any* pTemp; if(!GetProperty(FN_UNO_CLSID, 0, pTemp) && !GetProperty(FN_UNO_STREAM_NAME, 0, pTemp) ) - return FALSE; + return sal_False; SwFrameProperties_Impl::AnyToItemSet( pDoc, rFrmSet, rSet, rSizeFound); // - return TRUE; + return sal_True; } /****************************************************************** @@ -776,7 +776,7 @@ OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException ) /* -----------------------------06.04.00 14:20-------------------------------- ---------------------------------------------------------------------------*/ -BOOL SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) +sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) { return !rServiceName.compareToAscii("com.sun.star.text.BaseFrame")|| !rServiceName.compareToAscii("com.sun.star.text.TextContent") || @@ -1038,17 +1038,17 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: pNoTxt->SetContour(0); else if(aValue >>= aParam) { - PolyPolygon aPoly((USHORT)aParam.getLength()); + PolyPolygon aPoly((sal_uInt16)aParam.getLength()); for(sal_Int32 i = 0; i < aParam.getLength(); i++) { const :: drawing::PointSequence* pPointSeq = aParam.getConstArray(); sal_Int32 nPoints = pPointSeq[i].getLength(); const :: awt::Point* pPoints = pPointSeq[i].getConstArray(); - Polygon aSet( (USHORT)nPoints ); + Polygon aSet( (sal_uInt16)nPoints ); for(sal_Int32 j = 0; j < nPoints; j++) { Point aPoint(pPoints[j].X, pPoints[j].Y); - aSet.SetPoint(aPoint, (USHORT)j); + aSet.SetPoint(aPoint, (sal_uInt16)j); } // Close polygon if it isn't closed already. aSet.Optimize( POLY_OPTIMIZE_CLOSE ); @@ -1159,7 +1159,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: } // <-- - pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, FALSE ); + pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, sal_False ); delete pSet; } else @@ -1515,12 +1515,12 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) { drawing::PointSequenceSequence aPtSeq(aContour.Count()); drawing::PointSequence* pPSeq = aPtSeq.getArray(); - for(USHORT i = 0; i < aContour.Count(); i++) + for(sal_uInt16 i = 0; i < aContour.Count(); i++) { const Polygon& rPoly = aContour.GetObject(i); pPSeq[i].realloc(rPoly.GetSize()); awt::Point* pPoints = pPSeq[i].getArray(); - for(USHORT j = 0; j < rPoly.GetSize(); j++) + for(sal_uInt16 j = 0; j < rPoly.GetSize(); j++) { const Point& rPoint = rPoly.GetPoint(j); pPoints[j].X = rPoint.X(); @@ -1532,12 +1532,12 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else if(pEntry->nWID == FN_UNO_IS_AUTOMATIC_CONTOUR ) { - BOOL bValue = pNoTxt->HasAutomaticContour(); + sal_Bool bValue = pNoTxt->HasAutomaticContour(); aAny.setValue( &bValue, ::getBooleanCppuType() ); } else if(pEntry->nWID == FN_UNO_IS_PIXEL_CONTOUR ) { - BOOL bValue = pNoTxt->IsPixelContour(); + sal_Bool bValue = pNoTxt->IsPixelContour(); aAny.setValue( &bValue, ::getBooleanCppuType() ); } else @@ -1825,13 +1825,13 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode(); SfxItemSet aSet(pNoTxt->GetSwAttrSet()); aSet.GetItemState(pEntry->nWID); - if(SFX_ITEM_SET == aSet.GetItemState( pEntry->nWID, FALSE )) + if(SFX_ITEM_SET == aSet.GetItemState( pEntry->nWID, sal_False )) pStates[i] = beans::PropertyState_DIRECT_VALUE; } } else { - if(SFX_ITEM_SET == rFmtSet.GetItemState( pEntry->nWID, FALSE )) + if(SFX_ITEM_SET == rFmtSet.GetItemState( pEntry->nWID, sal_False )) pStates[i] = beans::PropertyState_DIRECT_VALUE; else pStates[i] = beans::PropertyState_DEFAULT_VALUE; @@ -1864,7 +1864,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) throw uno::RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "setPropertyToDefault: property is read-only: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); - BOOL bNextFrame; + sal_Bool bNextFrame; if( pEntry->nWID && pEntry->nWID != FN_UNO_ANCHOR_TYPES && pEntry->nWID != FN_PARAM_LINK_DISPLAY_NAME) |