diff options
Diffstat (limited to 'sd/source/filter/cgm/sdcgmfilter.cxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/filter/cgm/sdcgmfilter.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 7d28e5285f40..af93b1f97504 100644..100755 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -67,8 +67,8 @@ using namespace ::com::sun::star::frame; // - Typedefs - // ------------ -typedef UINT32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, UINT32, Reference< XStatusIndicator >& ); -typedef BOOL ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); +typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_Bool ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); // --------------- // - SdPPTFilter - @@ -96,7 +96,7 @@ sal_Bool SdCGMFilter::Import() { ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - UINT32 nRetValue; + sal_uInt32 nRetValue; if( mrDocument.GetPageCount() == 0L ) mrDocument.CreateFirstPages(); @@ -106,7 +106,7 @@ sal_Bool SdCGMFilter::Import() if( nRetValue ) { - bRet = TRUE; + bRet = sal_True; if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white { // so we must not set a master page @@ -116,7 +116,7 @@ sal_Bool SdCGMFilter::Import() if(pSdPage) { // set PageFill to given color - const Color aColor((BYTE)(nRetValue >> 16), (BYTE)(nRetValue >> 8), (BYTE)(nRetValue >> 16)); + const Color aColor((sal_uInt8)(nRetValue >> 16), (sal_uInt8)(nRetValue >> 8), (sal_uInt8)(nRetValue >> 16)); pSdPage->getSdrPageProperties().PutItem(XFillColorItem(String(), aColor)); pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID)); } |