diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-04 08:32:59 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-04 13:06:03 +0000 |
commit | ccbed01b40c9bc4421943ebe1fe818d43aadcc7d (patch) | |
tree | 23f0e1eaee7523c171a10c80bd365f376a36ef89 /idl | |
parent | 4f0398587f2854e41a8b544f5e2a00e3680122b6 (diff) |
remove unused GET/SET/STATUSBARCONFIG in .SDI files
Change-Id: I74404d72e9146950a9881d2a59323c2bf08c9742
Reviewed-on: https://gerrit.libreoffice.org/22100
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/globals.hxx | 6 | ||||
-rw-r--r-- | idl/inc/slot.hxx | 5 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 28 | ||||
-rw-r--r-- | idl/source/prj/command.cxx | 2 | ||||
-rw-r--r-- | idl/source/prj/globals.cxx | 3 |
5 files changed, 1 insertions, 43 deletions
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 09e2a4c40830..320117c00949 100644 --- 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) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 7c86e72cbbde..42b90db63ab5 100644 --- 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; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 5ba52dbb865b..3b8e59ccb634 100644 --- 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" ); } diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index b9a13124f46b..ccf99c0d2444 100644 --- 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", diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 2de068224a04..71a9869031d8 100644 --- 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) |