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

[Caolán McNamara]

 include/sfx2/sfxsids.hrc    |    1 -
 sfx2/inc/app.hrc            |    2 --
 sfx2/source/appl/appcfg.cxx |    5 +----
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit d97fba020b3e33d9f266c4a405fa221d9b84f946
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 6 12:10:13 2017 +0100

    SID_ATTR_PATHGROUP isn't used anywhere, luckily
    
    because it uses CONFIG_PATH_START + foo and all of the foo
    strings are removed long ago, mostly since...
    
    commit 35c86c4ad18eded8f29908e195fc9924ba58d6dd
    Date:   Wed Nov 3 08:57:12 2010 +0100
    
        undoapi: removed more dead resources
    
    Change-Id: I2f2e34491de33ee4b0448f57eb458c182a41a64c
    Reviewed-on: https://gerrit.libreoffice.org/38437
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 3384b0558287..78f2ab27f1a3 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -470,7 +470,6 @@
 #define SID_ATTR_APPLYCHARUNIT          (SID_OPTIONS_START + 88)
 
 // PathTabPage
-#define SID_ATTR_PATHGROUP              (SID_OPTIONS_START + 10)
 #define SID_ATTR_PATHNAME               (SID_OPTIONS_START + 11)
 
 // LinguTabPage
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
index 2a6f592816a4..aa6f54351ab2 100644
--- a/sfx2/inc/app.hrc
+++ b/sfx2/inc/app.hrc
@@ -30,8 +30,6 @@
 
 #define RID_STR_HELP                            (RID_SFX_APP_START+79)
 
-#define CONFIG_PATH_START               (RID_SFX_APP_START+98)
-
 #define STR_INFO_NOSEARCHRESULTS                (RID_SFX_APP_START+106)
 #define STR_INFO_NOSEARCHTEXTFOUND              (RID_SFX_APP_START+107)
 
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index c539b659e3ca..30df815ce39d 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -410,15 +410,12 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
                     }
                     break;
                 case SID_ATTR_PATHNAME :
-                case SID_ATTR_PATHGROUP :
                 {
-                    SfxAllEnumItem aNames(rPool.GetWhich(SID_ATTR_PATHGROUP));
                     SfxAllEnumItem aValues(rPool.GetWhich(SID_ATTR_PATHNAME));
                     SvtPathOptions aPathCfg;
                     for ( sal_uInt16 nProp = SvtPathOptions::PATH_ADDIN;
                           nProp <= SvtPathOptions::PATH_WORK; nProp++ )
                     {
-                        aNames.InsertValue( nProp, SfxResId(CONFIG_PATH_START + nProp) );
                         OUString aValue;
                         switch ( nProp )
                         {
@@ -448,7 +445,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
                         aValues.InsertValue( nProp, aValue );
                     }
 
-                    if ( rSet.Put(aNames) || rSet.Put(aValues) )
+                    if (rSet.Put(aValues))
                         bRet = true;
                 }
                 break;