From 47c4daf0d777771185823ac9367f2108e950d12e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 24 Aug 2016 09:59:39 +0200 Subject: convert SgaObjKind to scoped enum Change-Id: I1bc1244646db661f181d4224d81f12d613976362 --- svx/source/gallery2/galbrws2.cxx | 20 ++++++------- svx/source/gallery2/galexpl.cxx | 4 +-- svx/source/gallery2/galmisc.cxx | 16 +++++------ svx/source/gallery2/galobj.cxx | 4 +-- svx/source/gallery2/galtheme.cxx | 56 ++++++++++++++++++------------------ svx/source/unogallery/unogalitem.cxx | 6 ++-- 6 files changed, 53 insertions(+), 53 deletions(-) (limited to 'svx/source') diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 6f0ed1205fdf..c1ee1ad51650 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -242,7 +242,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL ); const bool bValidURL = ( aURL.GetProtocol() != INetProtocol::NotValid ); - mpPopupMenu->EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind ); + mpPopupMenu->EnableItem( MN_ADD, bValidURL && SgaObjKind::Sound != eObjKind ); mpPopupMenu->EnableItem( MN_PREVIEW, bValidURL ); @@ -303,7 +303,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos {} } - if( !mpBackgroundPopup->GetItemCount() || ( eObjKind == SGA_OBJ_SVDRAW ) || ( eObjKind == SGA_OBJ_SOUND ) ) + if( !mpBackgroundPopup->GetItemCount() || ( eObjKind == SgaObjKind::SvDraw ) || ( eObjKind == SgaObjKind::Sound ) ) mpPopupMenu->EnableItem( MN_BACKGROUND, false ); else { @@ -815,7 +815,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->SetGraphic( aGraphic ); mpPreview->Show(); - if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND ) + if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SgaObjKind::Sound ) GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); maViewBox->EnableItem( TBX_ID_ICON, false ); @@ -888,7 +888,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) mpCurTheme->GetGraphic( nPos, aGraphic ); mpPreview->SetGraphic( aGraphic ); - if( SGA_OBJ_SOUND == mpCurTheme->GetObjectKind( nPos ) ) + if( SgaObjKind::Sound == mpCurTheme->GetObjectKind( nPos ) ) GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); mpPreview->Invalidate(); @@ -1060,15 +1060,15 @@ void GalleryBrowser2::Dispatch( switch( mpCurTheme->GetObjectKind( mnCurActionPos ) ) { - case SGA_OBJ_BMP: - case SGA_OBJ_ANIM: - case SGA_OBJ_INET: + case SgaObjKind::Bitmap: + case SgaObjKind::Animation: + case SgaObjKind::Inet: // TODO drawing objects are inserted as drawings only via drag&drop - case SGA_OBJ_SVDRAW: + case SgaObjKind::SvDraw: nType = css::gallery::GalleryItemType::GRAPHIC; break; - case SGA_OBJ_SOUND : + case SgaObjKind::Sound : nType = css::gallery::GalleryItemType::MEDIA; break; @@ -1271,7 +1271,7 @@ OUString GalleryBrowser2::GetFilterName() const { const SgaObjKind eObjKind = mpCurTheme->GetObjectKind( mnCurActionPos ); - if( ( SGA_OBJ_BMP == eObjKind ) || ( SGA_OBJ_ANIM == eObjKind ) ) + if( ( SgaObjKind::Bitmap == eObjKind ) || ( SgaObjKind::Animation == eObjKind ) ) { GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aURL; diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 9c3e4c013035..672c0250080d 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -183,7 +183,7 @@ sal_uInt32 GalleryExplorer::GetSdrObjCount( const OUString& rThemeName ) if( pTheme ) { for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) - if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) ) + if( SgaObjKind::SvDraw == pTheme->GetObjectKind( i ) ) nRet++; pGal->ReleaseTheme( pTheme, aListener ); @@ -214,7 +214,7 @@ bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uInt32 nSdrMode { for( sal_uInt32 i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ ) { - if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) ) + if( SgaObjKind::SvDraw == pTheme->GetObjectKind( i ) ) { if( nActPos++ == nSdrModelPos ) { diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index b0fa80e914fa..1fb0777fd016 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -419,7 +419,7 @@ void GalleryTransferable::InitData( bool bLazy ) { switch( meObjectKind ) { - case SGA_OBJ_SVDRAW: + case SgaObjKind::SvDraw: { if( !bLazy ) { @@ -445,10 +445,10 @@ void GalleryTransferable::InitData( bool bLazy ) } break; - case SGA_OBJ_ANIM: - case SGA_OBJ_BMP: - case SGA_OBJ_INET: - case SGA_OBJ_SOUND: + case SgaObjKind::Animation: + case SgaObjKind::Bitmap: + case SgaObjKind::Inet: + case SgaObjKind::Sound: { if( !mpURL ) { @@ -461,7 +461,7 @@ void GalleryTransferable::InitData( bool bLazy ) } } - if( ( SGA_OBJ_SOUND != meObjectKind ) && !mpGraphicObject ) + if( ( SgaObjKind::Sound != meObjectKind ) && !mpGraphicObject ) { Graphic aGraphic; @@ -479,7 +479,7 @@ void GalleryTransferable::InitData( bool bLazy ) void GalleryTransferable::AddSupportedFormats() { - if( SGA_OBJ_SVDRAW == meObjectKind ) + if( SgaObjKind::SvDraw == meObjectKind ) { AddFormat( SotClipboardFormatId::DRAWING ); AddFormat( SotClipboardFormatId::SVXB ); @@ -516,7 +516,7 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons InitData( false ); - if( ( SotClipboardFormatId::DRAWING == nFormat ) && ( SGA_OBJ_SVDRAW == meObjectKind ) ) + if( ( SotClipboardFormatId::DRAWING == nFormat ) && ( SgaObjKind::SvDraw == meObjectKind ) ) { bRet = ( mxModelStream.Is() && SetObject( &mxModelStream, SotClipboardFormatId::NONE, rFlavor ) ); } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index d4fc256e6ad1..2a05f697ddb9 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -55,7 +55,7 @@ BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const if(rSizePixel.Width() && rSizePixel.Height()) { - if(SGA_OBJ_SOUND == GetObjKind()) + if(SgaObjKind::Sound == GetObjKind()) { aRetval = GAL_RES(RID_SVXBMP_GALLERY_MEDIA); } @@ -171,7 +171,7 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const { static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); - rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( GetObjKind() ); + rOut.WriteUInt32( nInventor ).WriteUInt16( 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( (sal_uInt16)GetObjKind() ); rOut.WriteBool( bIsThumbBmp ); if( bIsThumbBmp ) diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index baa7ee1927c2..719475728cf3 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -166,11 +166,11 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry ) switch( pEntry->eObjKind ) { - case SGA_OBJ_BMP: pSgaObj = new SgaObjectBmp(); break; - case SGA_OBJ_ANIM: pSgaObj = new SgaObjectAnim(); break; - case SGA_OBJ_INET: pSgaObj = new SgaObjectINet(); break; - case SGA_OBJ_SVDRAW: pSgaObj = new SgaObjectSvDraw(); break; - case SGA_OBJ_SOUND: pSgaObj = new SgaObjectSound(); break; + case SgaObjKind::Bitmap: pSgaObj = new SgaObjectBmp(); break; + case SgaObjKind::Animation: pSgaObj = new SgaObjectAnim(); break; + case SgaObjKind::Inet: pSgaObj = new SgaObjectINet(); break; + case SgaObjKind::SvDraw: pSgaObj = new SgaObjectSvDraw(); break; + case SgaObjKind::Sound: pSgaObj = new SgaObjectSound(); break; default: break; @@ -286,7 +286,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ConvertDat do { // get URL - if( SGA_OBJ_SVDRAW == eObjKind ) + if( SgaObjKind::SvDraw == eObjKind ) { OUString aFileName( "gallery/svdraw/dd" ); aNewURL = INetURLObject( aFileName += OUString::number( ++nNextNumber % 99999999 ), INetProtocol::PrivSoffice ); @@ -467,7 +467,7 @@ bool GalleryTheme::RemoveObject( size_t nPos ) if( pEntry ) { - if( SGA_OBJ_SVDRAW == pEntry->eObjKind ) + if( SgaObjKind::SvDraw == pEntry->eObjKind ) aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); @@ -534,12 +534,12 @@ void GalleryTheme::Actualize( const Link& rActualize rActualizeLink.Call( aURL ); // SvDraw objects will be updated later - if( pEntry->eObjKind != SGA_OBJ_SVDRAW ) + if( pEntry->eObjKind != SgaObjKind::SvDraw ) { // Still a function should be implemented, // which assigns files to the relevant entry. // insert graphics as graphic objects into the gallery - if( pEntry->eObjKind == SGA_OBJ_SOUND ) + if( pEntry->eObjKind == SgaObjKind::Sound ) { SgaObjectSound aObjSound( aURL ); if( !InsertObject( aObjSound ) ) @@ -553,7 +553,7 @@ void GalleryTheme::Actualize( const Link& rActualize { std::unique_ptr pNewObj; - if ( SGA_OBJ_INET == pEntry->eObjKind ) + if ( SgaObjKind::Inet == pEntry->eObjKind ) pNewObj.reset(static_cast(new SgaObjectINet( aGraphic, aURL, aFormat ))); else if ( aGraphic.IsAnimated() ) pNewObj.reset(static_cast(new SgaObjectAnim( aGraphic, aURL, aFormat ))); @@ -622,11 +622,11 @@ void GalleryTheme::Actualize( const Link& rActualize switch( pEntry->eObjKind ) { - case SGA_OBJ_BMP: pObj.reset(new SgaObjectBmp()); break; - case SGA_OBJ_ANIM: pObj.reset(new SgaObjectAnim()); break; - case SGA_OBJ_INET: pObj.reset(new SgaObjectINet()); break; - case SGA_OBJ_SVDRAW: pObj.reset(new SgaObjectSvDraw()); break; - case SGA_OBJ_SOUND: pObj.reset(new SgaObjectSound()); break; + case SgaObjKind::Bitmap: pObj.reset(new SgaObjectBmp()); break; + case SgaObjKind::Animation: pObj.reset(new SgaObjectAnim()); break; + case SgaObjKind::Inet: pObj.reset(new SgaObjectINet()); break; + case SgaObjKind::SvDraw: pObj.reset(new SgaObjectSvDraw()); break; + case SgaObjKind::Sound: pObj.reset(new SgaObjectSound()); break; default: break; @@ -777,16 +777,16 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgre switch( pObject->eObjKind ) { - case SGA_OBJ_BMP: - case SGA_OBJ_ANIM: - case SGA_OBJ_INET: + case SgaObjKind::Bitmap: + case SgaObjKind::Animation: + case SgaObjKind::Inet: { OUString aFilterDummy; bRet = ( GalleryGraphicImport( aURL, rGraphic, aFilterDummy, bProgress ) != GalleryGraphicImportRet::IMPORT_NONE ); } break; - case SGA_OBJ_SVDRAW: + case SgaObjKind::SvDraw: { SvxGalleryDrawModel aModel; @@ -815,7 +815,7 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgre } break; - case SGA_OBJ_SOUND: + case SgaObjKind::Sound: { SgaObject* pObj = AcquireObject( nPos ); @@ -883,7 +883,7 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPo nExportFormat = ConvertDataFormat::SVM; } - const INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_BMP, nExportFormat ) ); + const INetURLObject aURL( ImplCreateUniqueURL( SgaObjKind::Bitmap, nExportFormat ) ); std::unique_ptr pOStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC )); if( pOStm ) @@ -926,7 +926,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool ) const GalleryObject* pObject = ImplGetGalleryObject( nPos ); bool bRet = false; - if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) + if( pObject && ( SgaObjKind::SvDraw == pObject->eObjKind ) ) { const INetURLObject aURL( ImplGetURL( pObject ) ); tools::SvRef xStor( GetSvDrawStorage() ); @@ -950,7 +950,7 @@ bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool ) bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos ) { - INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); + INetURLObject aURL( ImplCreateUniqueURL( SgaObjKind::SvDraw ) ); tools::SvRef xStor( GetSvDrawStorage() ); bool bRet = false; @@ -998,7 +998,7 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRefeObjKind ) ) + if( pObject && ( SgaObjKind::SvDraw == pObject->eObjKind ) ) { const INetURLObject aURL( ImplGetURL( pObject ) ); tools::SvRef xStor( GetSvDrawStorage() ); @@ -1046,7 +1046,7 @@ bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, tools::SvRef& rxModelStream, sal_uIntPtr nInsertPos ) { - INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); + INetURLObject aURL( ImplCreateUniqueURL( SgaObjKind::SvDraw ) ); tools::SvRef xStor( GetSvDrawStorage() ); bool bRet = false; @@ -1294,7 +1294,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const const GalleryObject* pObj = ImplGetGalleryObject( i ); OUString aPath; - if( SGA_OBJ_SVDRAW == pObj->eObjKind ) + if( SgaObjKind::SvDraw == pObj->eObjKind ) { aPath = GetSvDrawStreamNameFromURL( pObj->aURL ); bRel = false; @@ -1339,7 +1339,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const rOStm.WriteBool( bRel ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); - rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( pObj->eObjKind ); + rOStm.WriteUInt32( pObj->nOffset ).WriteUInt16( (sal_uInt16)pObj->eObjKind ); } // more recently, a 512-byte reserve buffer is written, @@ -1447,7 +1447,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) } else { - if( SGA_OBJ_SVDRAW == pObj->eObjKind ) + if( SgaObjKind::SvDraw == pObj->eObjKind ) { OUString aDummyURL( "gallery/svdraw/" ); pObj->aURL = INetURLObject( aDummyURL += aFileName, INetProtocol::PrivSoffice ); diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index af4a2507ad7d..1c4fcf4b91f1 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -182,12 +182,12 @@ sal_Int8 SAL_CALL GalleryItem::getType() { switch( implGetObject()->eObjKind ) { - case SGA_OBJ_SOUND: - case SGA_OBJ_VIDEO: + case SgaObjKind::Sound: + case SgaObjKind::Video: nRet = gallery::GalleryItemType::MEDIA; break; - case SGA_OBJ_SVDRAW: + case SgaObjKind::SvDraw: nRet = gallery::GalleryItemType::DRAWING; break; -- cgit