diff options
Diffstat (limited to 'svtools/source/uno/unoimap.cxx')
-rw-r--r-- | svtools/source/uno/unoimap.cxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 37fcc45f20f9..4c20ca232902 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -37,21 +37,17 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/PointSequence.hpp> - #include <comphelper/servicehelper.hxx> #include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/weakagg.hxx> - #include <cppuhelper/implbase3.hxx> - #include <list> #include <rtl/uuid.h> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> - -#include "unoevent.hxx" -#include "unoimap.hxx" +#include <svtools/unoevent.hxx> +#include <svtools/unoimap.hxx> #include <svtools/imap.hxx> #include <svtools/imapcirc.hxx> #include <svtools/imaprect.hxx> @@ -97,7 +93,7 @@ class SvUnoImageMapObject : public OWeakAggObject, public XUnoTunnel { public: - SvUnoImageMapObject( UINT16 nType, const SvEventDescription* pSupportedMacroItems ); + SvUnoImageMapObject( sal_uInt16 nType, const SvEventDescription* pSupportedMacroItems ); SvUnoImageMapObject( const IMapObject& rMapObject, const SvEventDescription* pSupportedMacroItems ); virtual ~SvUnoImageMapObject() throw(); @@ -130,10 +126,10 @@ public: virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw( RuntimeException ); private: - static PropertySetInfo* createPropertySetInfo( UINT16 nType ); + static PropertySetInfo* createPropertySetInfo( sal_uInt16 nType ); - UINT16 mnType; + sal_uInt16 mnType; ::rtl::OUString maURL; ::rtl::OUString maAltText; @@ -149,7 +145,7 @@ private: UNO3_GETIMPLEMENTATION_IMPL( SvUnoImageMapObject ); -PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType ) +PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( sal_uInt16 nType ) { switch( nType ) { @@ -206,7 +202,7 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType ) } } -SvUnoImageMapObject::SvUnoImageMapObject( UINT16 nType, const SvEventDescription* pSupportedMacroItems ) +SvUnoImageMapObject::SvUnoImageMapObject( sal_uInt16 nType, const SvEventDescription* pSupportedMacroItems ) : PropertySetHelper( createPropertySetInfo( nType ) ), mnType( nType ) , mbIsActive( true ) @@ -254,11 +250,11 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv { const Polygon aPoly( ((IMapPolygonObject*)&rMapObject)->GetPolygon(sal_False) ); - const USHORT nCount = aPoly.GetSize(); + const sal_uInt16 nCount = aPoly.GetSize(); maPolygon.realloc( nCount ); awt::Point* pPoints = maPolygon.getArray(); - for( USHORT nPoint = 0; nPoint < nCount; nPoint++ ) + for( sal_uInt16 nPoint = 0; nPoint < nCount; nPoint++ ) { const Point& rPoint = aPoly.GetPoint( nPoint ); pPoints->X = rPoint.X(); @@ -610,8 +606,8 @@ SvUnoImageMap::SvUnoImageMap( const ImageMap& rMap, const SvEventDescription* pS { maName = rMap.GetName(); - const UINT16 nCount = rMap.GetIMapObjectCount(); - for( UINT16 nPos = 0; nPos < nCount; nPos++ ) + const sal_uInt16 nCount = rMap.GetIMapObjectCount(); + for( sal_uInt16 nPos = 0; nPos < nCount; nPos++ ) { IMapObject* pMapObject = rMap.GetIMapObject( nPos ); SvUnoImageMapObject* pUnoObj = new SvUnoImageMapObject( *pMapObject, pSupportedMacroItems ); |