convert SvXMLGraphicHelperMode to scoped enum

Change-Id: Ib0360b395fafe3c8123a0cc0fd0cbfd581fa5414

5 files changed, 19 insertions, 19 deletions

diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 7aa925377f91..a2504fab258f 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -181,7 +181,7 @@ css::uno::Reference<css::uno::XInterface> create(
     }
     else if ( rServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" )
     {
-        SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ );
+        SvXMLGraphicHelper* pGraphicHelper = SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode::Read );
         uno::Reference< uno::XInterface> xRet( static_cast< ::cppu::OWeakObject* >( pGraphicHelper ) );
         pGraphicHelper->release();
         return xRet;
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index fda59d3a7169..820b545b2ced 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -80,7 +80,7 @@ bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutputSt
                 xObjectResolver = pObjectHelper;
             }
 
-            pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_WRITE );
+            pGraphicHelper = SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode::Write );
             xGraphicResolver = pGraphicHelper;
 
             if( bDocRet )
@@ -176,7 +176,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInputStr
             xTargetModel->lockControllers();
 
 
-        pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ );
+        pGraphicHelper = SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode::Read );
         xGraphicResolver = pGraphicHelper;
 
         ::comphelper::IEmbeddedHelper *pPersist = pModel->GetPersist();
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 66f2a1866c41..cc8bb484fde5 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -359,7 +359,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) :
 SvXMLGraphicHelper::SvXMLGraphicHelper()
     : ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver,
                                       css::document::XBinaryStreamResolver >( maMutex )
-    , meCreateMode(GRAPHICHELPER_MODE_READ)
+    , meCreateMode(SvXMLGraphicHelperMode::Read)
     , mbDirect(false)
 {
 }
@@ -409,7 +409,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co
         {
             xRetStorage = mxRootStorage->openStorageElement(
                 maCurStorageName = rStorageName,
-                ( GRAPHICHELPER_MODE_WRITE == meCreateMode )
+                ( SvXMLGraphicHelperMode::Write == meCreateMode )
                     ? embed::ElementModes::READWRITE
                     : embed::ElementModes::READ );
         }
@@ -441,13 +441,13 @@ SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt
     if( aRet.xStorage.is() )
     {
         sal_Int32 nMode = embed::ElementModes::READ;
-        if ( GRAPHICHELPER_MODE_WRITE == meCreateMode )
+        if ( SvXMLGraphicHelperMode::Write == meCreateMode )
         {
             nMode = embed::ElementModes::READWRITE;
         }
 
         aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName, nMode );
-        if( aRet.xStream.is() && ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) )
+        if( aRet.xStream.is() && ( SvXMLGraphicHelperMode::Write == meCreateMode ) )
         {
             OUString aPropName( "UseCommonStoragePasswordEncryption" );
             uno::Reference < beans::XPropertySet > xProps( aRet.xStream, uno::UNO_QUERY );
@@ -636,7 +636,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt
     {
         URLPair& rURLPair = maGrfURLs[ nInsertPos ];
 
-        if( GRAPHICHELPER_MODE_READ == meCreateMode )
+        if( SvXMLGraphicHelperMode::Read == meCreateMode )
         {
             const GraphicObject aObj( ImplReadGraphic( aPictureStorageName, aPictureStreamName ) );
 
@@ -767,7 +767,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto
 {
     mxRootStorage = rXMLStorage;
     meCreateMode = eCreateMode;
-    mbDirect = meCreateMode != GRAPHICHELPER_MODE_READ || bDirect;
+    mbDirect = meCreateMode != SvXMLGraphicHelperMode::Read || bDirect;
 }
 
 SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage,
@@ -853,7 +853,7 @@ Reference< XInputStream > SAL_CALL SvXMLGraphicHelper::getInputStream( const OUS
     OUString                    aPictureStorageName, aGraphicId;
 
 
-    if( ( GRAPHICHELPER_MODE_WRITE == meCreateMode ) &&
+    if( ( SvXMLGraphicHelperMode::Write == meCreateMode ) &&
         ImplGetStreamNames( rURL, aPictureStorageName, aGraphicId ) )
     {
         SvXMLGraphicInputStream* pInputStream = new SvXMLGraphicInputStream( aGraphicId );
@@ -872,7 +872,7 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
 {
     Reference< XOutputStream > xRet;
 
-    if( GRAPHICHELPER_MODE_READ == meCreateMode )
+    if( SvXMLGraphicHelperMode::Read == meCreateMode )
     {
         SvXMLGraphicOutputStream* pOutputStream = new SvXMLGraphicOutputStream;
 
@@ -890,7 +890,7 @@ OUString SAL_CALL SvXMLGraphicHelper::resolveOutputStream( const Reference< XOut
 {
     OUString aRet;
 
-    if( ( GRAPHICHELPER_MODE_READ == meCreateMode ) && rxBinaryStream.is() )
+    if( ( SvXMLGraphicHelperMode::Read == meCreateMode ) && rxBinaryStream.is() )
     {
         if( ::std::find( maGrfStms.begin(), maGrfStms.end(), rxBinaryStream ) != maGrfStms.end() )
         {
@@ -1042,7 +1042,7 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Ref
 OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName()
     throw (uno::RuntimeException, std::exception)
 {
-    if( m_eGraphicHelperMode == GRAPHICHELPER_MODE_READ )
+    if( m_eGraphicHelperMode == SvXMLGraphicHelperMode::Read )
         return OUString("com.sun.star.comp.Svx.GraphicImportHelper");
     return OUString("com.sun.star.comp.Svx.GraphicExportHelper");
 }
@@ -1073,7 +1073,7 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServic
 
     You should call dispose after you no longer need this component.
 
-    uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == sal_True in
+    uses eCreateMode == SvXMLGraphicHelperMode::Read, bDirect == sal_True in
     SvXMLGraphicHelper
  */
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@@ -1081,7 +1081,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_READ));
+    return cppu::acquire(new SvXMLGraphicImportExportHelper(SvXMLGraphicHelperMode::Read));
 }
 
 /** Create this with createInstanceWithArguments. service name
@@ -1093,7 +1093,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation(
     To write the Pictures stream, you have to call dispose at this component.
     Make sure you call dispose before you commit the parent storage.
 
-    uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in
+    uses eCreateMode == SvXMLGraphicHelperMode::Write, bDirect == sal_True in
     SvXMLGraphicHelper
  */
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@@ -1101,7 +1101,7 @@ com_sun_star_comp_Svx_GraphicExportHelper_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_WRITE));
+    return cppu::acquire(new SvXMLGraphicImportExportHelper(SvXMLGraphicHelperMode::Write));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index d5998b34212a..1e2192d2a51b 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -194,7 +194,7 @@ static void createStorageStream( uno::Reference < io::XOutputStream > *xOut,
     xStream = xSubStorage->openStreamElement(
                         "Content.xml",
                         embed::ElementModes::WRITE );
-    *ppGraphicHelper = SvXMLGraphicHelper::Create( xSubStorage, GRAPHICHELPER_MODE_WRITE );
+    *ppGraphicHelper = SvXMLGraphicHelper::Create( xSubStorage, SvXMLGraphicHelperMode::Write );
     initializeStreamMetadata( xStream );
     *xOut = xStream->getOutputStream();
 }
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index e2c35dedcb53..874d37c3f7f6 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -349,7 +349,7 @@ static void openStorageStream( xml::sax::InputSource *pParserInput,
         return;
     }
     pParserInput->aInputStream = xIStm->getInputStream();
-    *ppGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_READ );
+    *ppGraphicHelper = SvXMLGraphicHelper::Create( xStorage, SvXMLGraphicHelperMode::Read );
 }
 
 bool SvxXMLXTableImport::load( const OUString &rPath, const OUString &rReferer,