remove unused GET/SET/STATUSBARCONFIG in .SDI files

Change-Id: I74404d72e9146950a9881d2a59323c2bf08c9742 Reviewed-on: https://gerrit.libreoffice.org/22100Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>

remove unused GET/SET/STATUSBARCONFIG in .SDI files
Change-Id: I74404d72e9146950a9881d2a59323c2bf08c9742 Reviewed-on: https://gerrit.libreoffice.org/22100Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
ccbed01b · Noel Grandin · Noel Grandin · 4f039858 · ccbed01b · ccbed01b
Kaydet (Commit) ccbed01b authored Şub 04, 2016 tarafından Noel Grandin Kaydeden (comit) Noel Grandin Şub 04, 2016
14 changed files
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -40,8 +40,6 @@ struct SvGlobalHashNames
    SvStringHashEntryRef MM_HelpText;
    SvStringHashEntryRef MM_void;
    SvStringHashEntryRef MM_shell;
-    SvStringHashEntryRef MM_Get;
-    SvStringHashEntryRef MM_Set;
    SvStringHashEntryRef MM_SlotId;
    SvStringHashEntryRef MM_Volatile;
    SvStringHashEntryRef MM_Toggle;
@@ -85,7 +83,6 @@ struct SvGlobalHashNames
    SvStringHashEntryRef MM_define;
    SvStringHashEntryRef MM_MenuConfig;
    SvStringHashEntryRef MM_ToolBoxConfig;
-    SvStringHashEntryRef MM_StatusBarConfig;
    SvStringHashEntryRef MM_AccelConfig;
    SvStringHashEntryRef MM_AllConfig;
    SvStringHashEntryRef MM_FastCall;
@@ -140,8 +137,6 @@ HASH_INLINE(uuid)
 HASH_INLINE(HelpContext)
 HASH_INLINE(HelpText)
 HASH_INLINE(shell)
-HASH_INLINE(Get)
-HASH_INLINE(Set)
 HASH_INLINE(SlotId)
 HASH_INLINE(Volatile)
 HASH_INLINE(Toggle)
@@ -183,7 +178,6 @@ HASH_INLINE(PseudoPrefix)
 HASH_INLINE(define)
 HASH_INLINE(MenuConfig)
 HASH_INLINE(ToolBoxConfig)
-HASH_INLINE(StatusBarConfig)
 HASH_INLINE(AccelConfig)
 HASH_INLINE(AllConfig)
 HASH_INLINE(FastCall)

--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -33,8 +33,6 @@ class SvMetaSlot : public SvMetaAttribute
    SvIdentifier    aStateMethod;
    SvIdentifier    aDefault;
    SvBOOL          aPseudoSlots;
-    SvBOOL          aGet;
-    SvBOOL          aSet;

    SvBOOL          aVolatile;
    SvBOOL          aToggle;
@@ -49,7 +47,6 @@ class SvMetaSlot : public SvMetaAttribute

    SvBOOL          aMenuConfig;
    SvBOOL          aToolBoxConfig;
-    SvBOOL          aStatusBarConfig;
    SvBOOL          aAccelConfig;
    SvBOOL          aFastCall;
    SvBOOL          aContainer;
@@ -114,7 +111,6 @@ protected:
            {
                aMenuConfig     = bSet;
                aToolBoxConfig  = bSet;
-                aStatusBarConfig = bSet;
                aAccelConfig    = bSet;
            }

@@ -153,7 +149,6 @@ public:
    const OString&     GetUnoName() const;
    bool                GetMenuConfig() const;
    bool                GetToolBoxConfig() const;
-    bool                GetStatusBarConfig() const;
    bool                GetAccelConfig() const;
    bool                GetFastCall() const;
    bool                GetContainer() const;

--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -198,11 +198,6 @@ bool SvMetaSlot::GetToolBoxConfig() const
    if( aToolBoxConfig.IsSet() || !GetRef() ) return aToolBoxConfig;
    return static_cast<SvMetaSlot *>(GetRef())->GetToolBoxConfig();
 }
-bool SvMetaSlot::GetStatusBarConfig() const
-{
-    if( aStatusBarConfig.IsSet() || !GetRef() ) return aStatusBarConfig;
-    return static_cast<SvMetaSlot *>(GetRef())->GetStatusBarConfig();
-}
 bool SvMetaSlot::GetAccelConfig() const
 {
    if( aAccelConfig.IsSet() || !GetRef() ) return aAccelConfig;
@@ -249,20 +244,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
    bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm );
    bOk |= aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm );
    bOk |= aDisableFlags.ReadSvIdl( SvHash_DisableFlags(), rInStm );
-    if( aGet.ReadSvIdl( SvHash_Get(), rInStm ) )
-    {
-        SvIdlDataBase::WriteError( "warning", OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
-                    "<Get> old style, use Readonly",
-                    rInStm.GetToken().GetLine(),
-                    rInStm.GetToken().GetColumn() );
-    }
-    if( aSet.ReadSvIdl( SvHash_Set(), rInStm ) )
-    {
-        SvIdlDataBase::WriteError( "warning", OUStringToOString(rInStm.GetFileName(), RTL_TEXTENCODING_UTF8),
-                    "<Set> old style, use method declaration",
-                    rInStm.GetToken().GetLine(),
-                    rInStm.GetToken().GetColumn() );
-    }

    if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) )
        SetVolatile( aVolatile ), bOk = true;
@@ -286,7 +267,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
    bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
    bOk |= aMenuConfig.ReadSvIdl( SvHash_MenuConfig(), rInStm );
    bOk |= aToolBoxConfig.ReadSvIdl( SvHash_ToolBoxConfig(), rInStm );
-    bOk |= aStatusBarConfig.ReadSvIdl( SvHash_StatusBarConfig(), rInStm );
    bOk |= aAccelConfig.ReadSvIdl( SvHash_AccelConfig(), rInStm );

    SvBOOL aAllConfig;
@@ -808,8 +788,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
        rOutStm.WriteCharPtr( MakeSlotName( SvHash_MenuConfig() ).getStr() ).WriteChar( '|' );
    if( GetToolBoxConfig() )
        rOutStm.WriteCharPtr( MakeSlotName( SvHash_ToolBoxConfig() ).getStr() ).WriteChar( '|' );
-    if( GetStatusBarConfig() )
-        rOutStm.WriteCharPtr( MakeSlotName( SvHash_StatusBarConfig() ).getStr() ).WriteChar( '|' );
    if( GetAccelConfig() )
        rOutStm.WriteCharPtr( MakeSlotName( SvHash_AccelConfig() ).getStr() ).WriteChar( '|' );
    if( GetFastCall() )
@@ -890,12 +868,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
        // Method/Property flags
        if( IsMethod() )
            rOutStm.WriteCharPtr( "SfxSlotMode::METHOD|" );
-        if( IsVariable() )
-        {
-            rOutStm.WriteCharPtr( "SfxSlotMode::PROPGET|" );
-            if( !GetReadonly() )
-                rOutStm.WriteCharPtr( "SfxSlotMode::PROPSET|" );
-        }

        rOutStm.WriteCharPtr( "SfxSlotMode::NONE" );
    }

--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -74,7 +74,7 @@ char const * SyntaxStrings[] = {
 "\t'['\n",

 "\t\titem-method-args",
-"\t\tAccelConfig, MenuConfig, StatusBarConfig, ToolbarConfig",
+"\t\tAccelConfig, MenuConfig, ToolbarConfig",
 "\t\tAutomation*",
 "\t\tAutoUpdate",
 "\t\tContainer",

--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -68,8 +68,6 @@ SvGlobalHashNames::SvGlobalHashNames()
    , MM_HelpText( INS( "HelpText" ) )
    , MM_void( INS( "void" ) )
    , MM_shell( INS( "shell" ) )
-    , MM_Get( INS( "Get" ) )
-    , MM_Set( INS( "Set" ) )
    , MM_SlotId( INS( "SlotId" ) )
    , MM_Toggle( INS( "Toggle" ) )
    , MM_AutoUpdate( INS( "AutoUpdate" ) )
@@ -112,7 +110,6 @@ SvGlobalHashNames::SvGlobalHashNames()
    A_ENTRY(define)
    A_ENTRY(MenuConfig)
    A_ENTRY(ToolBoxConfig)
-    A_ENTRY(StatusBarConfig)
    A_ENTRY(AccelConfig)
    A_ENTRY(AllConfig)
    A_ENTRY(FastCall)

--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -41,13 +41,10 @@ enum class SfxSlotMode {
    RECORDABSOLUTE  = 0x1000000L, // Recording with absolute Target
    STANDARD        =   0x00400L, // RECORDPERSET;

-    PROPGET         =    0x1000L, // get property
-    PROPSET         =    0x2000L, // set property, exclusive to METHOD
-    METHOD          =    0x4000L, // Method, exclusiv to PROPSET
+    METHOD          =    0x4000L,

    FASTCALL        =    0x8000L, // No test if disabled before Execute

-    STATUSBARCONFIG =   0x10000L, // configurable status row
    MENUCONFIG      =   0x20000L, // configurable Menu
    TOOLBOXCONFIG   =   0x40000L, // configurable Toolboxen
    ACCELCONFIG     =   0x80000L, // configurable keys
@@ -60,7 +57,7 @@ enum class SfxSlotMode {

 namespace o3tl
 {
-    template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1fff72eL> {};
+    template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1fec72eL> {};
 }



--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -413,7 +413,6 @@ interface CellMovement
    SID_TABLE_CELL
    [
         // "Tabellenzelle" soll nicht im Anpassen-Dialog auftauchen:
-        StatusBarConfig = FALSE ;
        StateMethod = GetState ;
    ]
    SID_DATA_SELECT         [ ExecMethod = Execute; StateMethod = GetState; ]

--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
--- a/sd/sdi/sdnew.sdi
+++ b/sd/sdi/sdnew.sdi
@@ -30,7 +30,6 @@ SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_FORMAT;
 ]
@@ -57,7 +56,6 @@ SvxObjectItem RulerObject SID_RULER_OBJECT
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = ;
 ]
@@ -77,7 +75,6 @@ SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -31,7 +31,6 @@ SfxVoidItem ChangeAlignment SID_ALIGN
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_FORMAT;
 ]
@@ -52,7 +51,6 @@ SfxVoidItem ChangeDistance SID_DISTANCE
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_FORMAT;
 ]
@@ -73,7 +71,6 @@ SfxVoidItem ChangeFont SID_FONT
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_FORMAT;
 ]
@@ -94,7 +91,6 @@ SfxVoidItem ChangeFontSize SID_FONTSIZE
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_FORMAT;
 ]
@@ -115,7 +111,6 @@ SfxVoidItem CommandWindow SID_CMDBOXWINDOW
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_VIEW;
 ]
@@ -136,7 +131,6 @@ SfxVoidItem ElementsDockingWindow SID_ELEMENTSDOCKINGWINDOW
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_VIEW;
 ]
@@ -157,7 +151,6 @@ SfxVoidItem Preferences SID_PREFERENCES
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_OPTIONS;
 ]
@@ -180,7 +173,6 @@ SfxStringItem ConfigName SID_TEXT
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_VIEW;
 ]
@@ -201,7 +193,6 @@ SfxVoidItem CopyObject SID_COPYOBJECT
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_EDIT;
 ]
@@ -222,7 +213,6 @@ SfxVoidItem Draw SID_DRAW
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
@@ -243,7 +233,6 @@ SfxBoolItem FormelCursor SID_FORMULACURSOR
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_MATH;
 ]
@@ -266,7 +255,6 @@ SfxInt16Item Graphic SID_GAPHIC_SM
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_MATH;
 ]
@@ -288,7 +276,6 @@ SfxVoidItem InsertCommand SID_INSERTCOMMAND
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_INSERT;
 ]
@@ -309,7 +296,6 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_INSERT;
 ]
@@ -331,7 +317,6 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_INSERT;
 ]
@@ -353,7 +338,6 @@ SfxBoolItem ImportFormula SID_IMPORT_FORMULA
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_INSERT;
 ]
@@ -373,7 +357,6 @@ SfxBoolItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_INSERT;
 ]
@@ -394,7 +377,6 @@ SfxVoidItem LoadSymbols SID_LOADSYMBOLS
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_OPTIONS;
 ]
@@ -417,7 +399,6 @@ SfxStringItem ModifyStatus SID_MODIFYSTATUS
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = TRUE,
    ToolBoxConfig = FALSE,
    GroupId = GID_VIEW;
 ]
@@ -438,7 +419,6 @@ SfxVoidItem NextError SID_NEXTERR
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_NAVIGATOR;
 ]
@@ -459,7 +439,6 @@ SfxVoidItem NextMark SID_NEXTMARK
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_NAVIGATOR;
 ]
@@ -480,7 +459,6 @@ SfxVoidItem PasteObject SID_PASTEOBJECT
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_EDIT;
 ]
@@ -501,7 +479,6 @@ SfxVoidItem PrevError SID_PREVERR
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_NAVIGATOR;
 ]
@@ -522,7 +499,6 @@ SfxVoidItem PrevMark SID_PREVMARK
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_NAVIGATOR;
 ]
@@ -545,7 +521,6 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
@@ -566,7 +541,6 @@ SfxVoidItem SaveSymbols SID_SAVESYMBOLS
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_OPTIONS;
 ]
@@ -587,7 +561,6 @@ SfxVoidItem SetPaperSize SID_GETEDITTEXT
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_MATH;
 ]
@@ -608,7 +581,6 @@ SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_OPTIONS;
 ]
@@ -629,7 +601,6 @@ SfxVoidItem Symbols SID_SYMBOLS
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_OPTIONS;
 ]
@@ -652,7 +623,6 @@ SfxBoolItem Textmode SID_TEXTMODE
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
@@ -675,7 +645,6 @@ SfxStringItem TextStatus SID_TEXTSTATUS
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = TRUE,
    ToolBoxConfig = FALSE,
    GroupId = GID_VIEW;
 ]
@@ -696,7 +665,6 @@ SfxVoidItem UnicodeNotationToggle SID_UNICODE_NOTATION_TOGGLE
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_OPTIONS;
 ]
@@ -717,7 +685,6 @@ SfxVoidItem ToolBoxWindow SID_TOOLBOXWINDOW
    /* config: */
    AccelConfig = FALSE,
    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = FALSE,
    GroupId = GID_VIEW;
 ]
@@ -740,7 +707,6 @@ SfxBoolItem ToolBox SID_TOOLBOX
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
@@ -761,7 +727,6 @@ SfxVoidItem ZoomIn SID_ZOOMIN
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
@@ -782,7 +747,6 @@ SfxVoidItem ZoomOut SID_ZOOMOUT
    /* config: */
    AccelConfig = TRUE,
    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
    ToolBoxConfig = TRUE,
    GroupId = GID_VIEW;
 ]
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi