[Libreoffice-commits] core.git: sd/inc sd/source

[Noel Grandin (via logerrit)]

 sd/inc/sdmod.hxx              |    6 +++---
 sd/source/ui/app/sdmod.cxx    |    2 +-
 sd/source/ui/dlg/morphdlg.cxx |    4 ++--
 sd/source/ui/dlg/vectdlg.cxx  |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f370aa88faf3c0ef7138b87d2bcf89f5eb8541c1
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Apr 1 09:24:58 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Apr 1 11:11:44 2020 +0200

    convert SdOptionStreamMode to scoped enum
    
    Change-Id: Ib9784c5364e52dde03c0ba2a91cc8fab9d286029
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91464
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index f37b79771f3e..7b12253c07d8 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -49,10 +49,10 @@ namespace com { namespace sun { namespace star { namespace frame {
     class XFrame;
 } } } }
 
-enum SdOptionStreamMode
+enum class SdOptionStreamMode
 {
-    SD_OPTION_LOAD = 0,
-    SD_OPTION_STORE = 1
+    Load = 0,
+    Store = 1
 };
 
 typedef std::map< SfxItemPropertyMapEntry const * , css::uno::Reference<css::beans::XPropertySetInfo> > SdExtPropertySetInfoCache;
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 077ab4b259bd..27fea87ae28b 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -193,7 +193,7 @@ tools::SvRef<SotStorageStream> SdModule::GetOptionStream( const OUString& rOptio
 
         aStmName += rOptionName;
 
-        if( SD_OPTION_STORE == eMode || xOptionStorage->IsContained( aStmName ) )
+        if( SdOptionStreamMode::Store == eMode || xOptionStorage->IsContained( aStmName ) )
             xStm = xOptionStorage->OpenSotStream( aStmName );
     }
 
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index b359b802fb19..c0d7f4e5af20 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -66,7 +66,7 @@ MorphDlg::~MorphDlg()
 void MorphDlg::LoadSettings()
 {
     tools::SvRef<SotStorageStream>  xIStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING ,
-                               SD_OPTION_LOAD ) );
+                               SdOptionStreamMode::Load ) );
     sal_uInt16              nSteps;
     bool                bOrient, bAttrib;
 
@@ -90,7 +90,7 @@ void MorphDlg::LoadSettings()
 void MorphDlg::SaveSettings() const
 {
     tools::SvRef<SotStorageStream> xOStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING ,
-                               SD_OPTION_STORE ) );
+                               SdOptionStreamMode::Store ) );
 
     if( xOStm.is() )
     {
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 6bc0f8dffa7b..843d593f5e28 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -292,7 +292,7 @@ void SdVectorizeDlg::LoadSettings()
 {
     tools::SvRef<SotStorageStream>  xIStm( SD_MOD()->GetOptionStream(
                                SD_OPTION_VECTORIZE ,
-                               SD_OPTION_LOAD ) );
+                               SdOptionStreamMode::Load ) );
     sal_uInt16              nLayers;
     sal_uInt16              nReduce;
     sal_uInt16              nFillHoles;
@@ -323,7 +323,7 @@ void SdVectorizeDlg::SaveSettings() const
 {
     tools::SvRef<SotStorageStream> xOStm( SD_MOD()->GetOptionStream(
                               SD_OPTION_VECTORIZE  ,
-                              SD_OPTION_STORE ) );
+                              SdOptionStreamMode::Store ) );
 
     if( xOStm.is() )
     {