diff options
Diffstat (limited to 'svx/source/gallery2/galtheme.cxx')
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 730c1179a07e..bd1ae10cd746 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -79,7 +79,7 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) mnThemeLockCount ( 0 ), mnBroadcasterLockCount( 0 ), nDragPos ( 0 ), - bDragging ( FALSE ) + bDragging ( sal_False ) { ImplCreateSvDrawStorage(); @@ -95,9 +95,9 @@ GalleryTheme::~GalleryTheme() for( GalleryObject* pEntry = aObjectList.First(); pEntry; pEntry = aObjectList.Next() ) { - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete pEntry; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); } } @@ -107,10 +107,10 @@ void GalleryTheme::ImplCreateSvDrawStorage() { if( !pThm->IsImported() ) { - aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE ); + aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE ); // #i50423# ReadOnly may not been set though the file can't be written (because of security reasons) if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() ) - aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); + aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); } else aSvDrawStorageRef.Clear(); @@ -118,10 +118,10 @@ void GalleryTheme::ImplCreateSvDrawStorage() // ------------------------------------------------------------------------ -BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry ) +sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry ) { SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pOStm ) { @@ -144,7 +144,7 @@ BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, Galler pEntry->aURL = rObj.GetURL(); pEntry->nOffset = nOffset; pEntry->eObjKind = rObj.GetObjKind(); - bRet = TRUE; + bRet = sal_True; } delete pOStm; @@ -241,7 +241,7 @@ void GalleryTheme::ImplWrite() delete pOStm; } - ImplSetModified( FALSE ); + ImplSetModified( sal_False ); } } } @@ -286,14 +286,14 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const // ------------------------------------------------------------------------ -INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat ) +INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat ) { INetURLObject aDir( GetParent()->GetUserURL() ); INetURLObject aInfoFileURL( GetParent()->GetUserURL() ); INetURLObject aNewURL; sal_uInt32 nNextNumber = 1999; sal_Char const* pExt = NULL; - BOOL bExists; + sal_Bool bExists; aDir.Append( String( RTL_CONSTASCII_USTRINGPARAM( "dragdrop" ) ) ); CreateDir( aDir ); @@ -342,11 +342,11 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor String aFileName( RTL_CONSTASCII_USTRINGPARAM( "gallery/svdraw/dd" ) ); aNewURL = INetURLObject( aFileName += String::CreateFromInt32( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE ); - bExists = FALSE; + bExists = sal_False; for( GalleryObject* pEntry = aObjectList.First(); pEntry && !bExists; pEntry = aObjectList.Next() ) if( pEntry->aURL == aNewURL ) - bExists = TRUE; + bExists = sal_True; } else { @@ -377,7 +377,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor // ------------------------------------------------------------------------ -void GalleryTheme::ImplBroadcast( ULONG nUpdatePos ) +void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos ) { if( !IsBroadcasterLocked() ) { @@ -390,16 +390,16 @@ void GalleryTheme::ImplBroadcast( ULONG nUpdatePos ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::UnlockTheme() +sal_Bool GalleryTheme::UnlockTheme() { DBG_ASSERT( mnThemeLockCount, "Theme is not locked" ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( mnThemeLockCount ) { --mnThemeLockCount; - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -407,7 +407,7 @@ BOOL GalleryTheme::UnlockTheme() // ------------------------------------------------------------------------ -void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos ) +void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos ) { DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" ); @@ -417,9 +417,9 @@ void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rObj.IsValid() ) { @@ -454,7 +454,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos ) else ImplWriteSgaObject( rObj, nInsertPos, NULL ); - ImplSetModified( bRet = TRUE ); + ImplSetModified( bRet = sal_True ); ImplBroadcast( pFoundEntry ? aObjectList.GetPos( pFoundEntry ) : nInsertPos ); } @@ -463,7 +463,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos ) // ------------------------------------------------------------------------ -SgaObject* GalleryTheme::AcquireObject( ULONG nPos ) +SgaObject* GalleryTheme::AcquireObject( sal_uIntPtr nPos ) { return ImplReadSgaObject( aObjectList.GetObject( nPos ) ); } @@ -477,7 +477,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::RemoveObject( ULONG nPos ) +sal_Bool GalleryTheme::RemoveObject( sal_uIntPtr nPos ) { GalleryObject* pEntry = aObjectList.Remove( nPos ); @@ -489,11 +489,11 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos ) if( SGA_OBJ_SVDRAW == pEntry->eObjKind ) aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete pEntry; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); - ImplSetModified( TRUE ); + ImplSetModified( sal_True ); ImplBroadcast( nPos ); } @@ -502,9 +502,9 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos ) +sal_Bool GalleryTheme::ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( nOldPos != nNewPos ) { @@ -518,7 +518,7 @@ BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos ) nOldPos++; aObjectList.Remove( nOldPos ); - ImplSetModified( bRet = TRUE ); + ImplSetModified( bRet = sal_True ); ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) ); } } @@ -535,15 +535,15 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg Graphic aGraphic; String aFormat; GalleryObject* pEntry; - const ULONG nCount = aObjectList.Count(); - ULONG i; + const sal_uIntPtr nCount = aObjectList.Count(); + sal_uIntPtr i; LockBroadcaster(); - bAbortActualize = FALSE; + bAbortActualize = sal_False; // LoeschFlag zuruecksetzen for ( i = 0; i < nCount; i++ ) - aObjectList.GetObject( i )->bDummy = FALSE; + aObjectList.GetObject( i )->bDummy = sal_False; for( i = 0; ( i < nCount ) && !bAbortActualize; i++ ) { @@ -566,7 +566,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg { SgaObjectSound aObjSound( aURL ); if( !InsertObject( aObjSound ) ) - pEntry->bDummy = TRUE; + pEntry->bDummy = sal_True; } else { @@ -584,12 +584,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, aURL, aFormat ); if( !InsertObject( *pNewObj ) ) - pEntry->bDummy = TRUE; + pEntry->bDummy = sal_True; delete pNewObj; } else - pEntry->bDummy = TRUE; // Loesch-Flag setzen + pEntry->bDummy = sal_True; // Loesch-Flag setzen } } else @@ -606,7 +606,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg SgaObjectSvDraw aNewObj( *pIStm, pEntry->aURL ); if( !InsertObject( aNewObj ) ) - pEntry->bDummy = TRUE; + pEntry->bDummy = sal_True; pIStm->SetBufferSize( 0L ); } @@ -620,9 +620,9 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg { if( pEntry->bDummy ) { - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete aObjectList.Remove( pEntry ); - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); pEntry = aObjectList.GetCurObject(); } @@ -685,10 +685,10 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg CopyFile( aTmpURL, aInURL ); KillFile( aTmpURL ); - ULONG nStorErr = 0; + sal_uIntPtr nStorErr = 0; { - SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); + SvStorageRef aTempStorageRef( new SvStorage( sal_False, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); aSvDrawStorageRef->CopyTo( aTempStorageRef ); nStorErr = aSvDrawStorageRef->GetError(); } @@ -701,7 +701,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg } KillFile( aTmpURL ); - ImplSetModified( TRUE ); + ImplSetModified( sal_True ); ImplWrite(); UnlockBroadcaster(); } @@ -709,7 +709,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg // ------------------------------------------------------------------------ -GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ) +GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly ) { DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -724,7 +724,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO String aThemeName; sal_uInt32 nThemeId = 0; sal_uInt16 nVersion; - BOOL bThemeNameFromResource = FALSE; + sal_Bool bThemeNameFromResource = sal_False; *pIStm >> nVersion; @@ -776,7 +776,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO aPathURL.removeFinalSlash(); pRet = new GalleryThemeEntry( aPathURL, aThemeName, String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(), - bReadOnly, FALSE, FALSE, nThemeId, + bReadOnly, sal_False, sal_False, nThemeId, bThemeNameFromResource ); } @@ -789,16 +789,16 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL ) +sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool ) { SgaObject* pObj = AcquireObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObj ) { rBmp = pObj->GetThumbBmp(); ReleaseObject( pObj ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -806,10 +806,10 @@ BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) +sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject ) { @@ -837,7 +837,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) ImageMap aIMap; if( CreateIMapGraphic( *aModel.GetModel(), rGraphic, aIMap ) ) - bRet = TRUE; + bRet = sal_True; else { VirtualDevice aVDev; @@ -848,7 +848,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) aView.ShowSdrPage(aView.GetModel()->GetPage(0)); aView.MarkAll(); rGraphic = aView.GetAllMarkedGraphic(); - bRet = TRUE; + bRet = sal_True; } } } @@ -865,7 +865,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) aBmp.Replace( COL_LIGHTMAGENTA, COL_WHITE ); rGraphic = aBmp; ReleaseObject( pObj ); - bRet = TRUE; + bRet = sal_True; } } break; @@ -880,13 +880,13 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rGraphic.GetType() != GRAPHIC_NONE ) { - ULONG nExportFormat = CVT_UNKNOWN; + sal_uIntPtr nExportFormat = CVT_UNKNOWN; const GfxLink aGfxLink( ( (Graphic&) rGraphic ).GetLink() ); if( aGfxLink.GetDataSize() ) @@ -958,10 +958,10 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL ) +sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) { @@ -987,11 +987,11 @@ BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos ) { INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); SvStorageRef xStor( GetSvDrawStorage() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( xStor.Is() ) { @@ -1034,10 +1034,10 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStream, BOOL ) +sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxModelStream, sal_Bool ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) { @@ -1051,7 +1051,7 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea if( xIStm.Is() && !xIStm->GetError() ) { - UINT32 nVersion = 0; + sal_uInt32 nVersion = 0; xIStm->SetBufferSize( 16348 ); @@ -1087,11 +1087,11 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos ) { INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); SvStorageRef xStor( GetSvDrawStorage() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( xStor.Is() ) { @@ -1123,15 +1123,15 @@ BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL ) +sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject ) { rURL = INetURLObject( ImplGetURL( pObject ) ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -1139,13 +1139,13 @@ BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos ) { Graphic aGraphic; String aFormat; SgaObject* pNewObj = NULL; - const USHORT nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat ); - BOOL bRet = FALSE; + const sal_uInt16 nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat ); + sal_Bool bRet = sal_False; if( nImportRet != SGA_IMPORT_NONE ) { @@ -1160,7 +1160,7 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) pNewObj = (SgaObject*) new SgaObjectSound( rURL ); if( pNewObj && InsertObject( *pNewObj, nInsertPos ) ) - bRet = TRUE; + bRet = sal_True; delete pNewObj; @@ -1169,11 +1169,11 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos ) { INetURLObject aURL; ::std::vector< INetURLObject > aURLVector; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; try { @@ -1225,9 +1225,9 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rxTransferable.is() ) { @@ -1278,7 +1278,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran else { Graphic aGraphic; - ULONG nFormat = 0; + sal_uIntPtr nFormat = 0; if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) ) nFormat = SOT_FORMATSTR_ID_SVXB; @@ -1293,7 +1293,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran if( pGraphic ) { - bRet = FALSE; + bRet = sal_False; if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVIM ) ) { @@ -1331,7 +1331,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran // ----------------------------------------------------------------------------- -void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos ) +void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false ); pTransferable->CopyToClipboard( pWindow ); @@ -1339,7 +1339,7 @@ void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos ) // ----------------------------------------------------------------------------- -void GalleryTheme::StartDrag( Window* pWindow, ULONG nPos ) +void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true ); pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK ); @@ -1353,7 +1353,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const const INetURLObject aRelURL2( GetParent()->GetUserURL() ); INetURLObject aNewURL, aTempURL; sal_uInt32 nCount = GetObjectCount(); - BOOL bRel; + sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; rOStm << ByteString( GetRealName(), RTL_TEXTENCODING_UTF8 ); @@ -1367,7 +1367,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const if( SGA_OBJ_SVDRAW == pObj->eObjKind ) { aPath = GetSvDrawStreamNameFromURL( pObj->aURL ); - bRel = FALSE; + bRel = sal_False; } else { @@ -1399,7 +1399,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const } // neuerdings wird ein 512-Byte-Reservepuffer gechrieben; - // um diesen zu erkennen werden zwei ULONG-Ids geschrieben + // um diesen zu erkennen werden zwei sal_uIntPtr-Ids geschrieben rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' ); const long nReservePos = rOStm.Tell(); @@ -1438,7 +1438,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) if( nVersion >= 0x0004 ) { - UINT16 nTmp16; + sal_uInt16 nTmp16; rIStm >> nTmp16; nTextEncoding = (rtl_TextEncoding) nTmp16; } @@ -1453,13 +1453,13 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) INetURLObject aRelURL1( GetParent()->GetRelativeURL() ); INetURLObject aRelURL2( GetParent()->GetUserURL() ); sal_uInt32 nId1, nId2; - BOOL bRel; + sal_Bool bRel; for( pObj = aObjectList.First(); pObj; pObj = aObjectList.Next() ) { - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pObj ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) ); delete pObj; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pObj ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) ); } aObjectList.Clear(); @@ -1540,7 +1540,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) { VersionCompat* pCompat = new VersionCompat( rIStm, STREAM_READ ); sal_uInt32 nTemp32; - BOOL bThemeNameFromResource = FALSE; + sal_Bool bThemeNameFromResource = sal_False; rIStm >> nTemp32; @@ -1556,7 +1556,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) else rIStm.SetError( SVSTREAM_READ_ERROR ); - ImplSetModified( FALSE ); + ImplSetModified( sal_False ); return rIStm; } @@ -1575,25 +1575,25 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) return rTheme.ReadData( rIn ); } -void GalleryTheme::ImplSetModified( BOOL bModified ) +void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } -UINT32 GalleryTheme::GetId() const { return pThm->GetId(); } -void GalleryTheme::SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); } -BOOL GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); } -BOOL GalleryTheme::IsImported() const { return pThm->IsImported(); } -BOOL GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } -BOOL GalleryTheme::IsDefault() const { return pThm->IsDefault(); } -BOOL GalleryTheme::IsModified() const { return pThm->IsModified(); } +sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); } +void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); } +sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); } +sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); } +sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } +sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } +sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { - for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ ) + for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ ) rListBox.InsertEntry( String( GAL_RESID( i ) ) ); } |