From bcf8f878899be13002b2c40f9f2b9363f20fec3a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 8 Sep 2016 13:38:38 +0100 Subject: remove IMAGEROTATION and IMAGEREFLECTION SfxSlotMode enums... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit unused since... commit 7affe26a1291eef8c77e890228061f13e987bff1 Author: Maxim Monastirsky Date: Mon Feb 22 18:47:15 2016 +0200 Kill sfx2 menu support Change-Id: I902957b8379be7c314f5357750aeba5a2fcc0a00 Reviewed-on: https://gerrit.libreoffice.org/28749 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- idl/inc/globals.hxx | 4 ---- idl/inc/slot.hxx | 4 ---- idl/source/objects/slot.cxx | 18 ------------------ idl/source/prj/command.cxx | 2 -- idl/source/prj/globals.cxx | 2 -- idl/source/prj/parser.cxx | 2 -- 6 files changed, 32 deletions(-) (limited to 'idl') diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 6092fbbba7ab..e49e81ef07f5 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -63,8 +63,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_FastCall; SvStringHashEntryRef MM_SbxObject; SvStringHashEntryRef MM_Container; - SvStringHashEntryRef MM_ImageRotation; - SvStringHashEntryRef MM_ImageReflection; SvStringHashEntryRef MM_ReadOnlyDoc; SvStringHashEntryRef MM_struct; SvStringHashEntryRef MM_SlotType; @@ -129,8 +127,6 @@ HASH_INLINE(AccelConfig) HASH_INLINE(FastCall) HASH_INLINE(SbxObject) HASH_INLINE(Container) -HASH_INLINE(ImageRotation) -HASH_INLINE(ImageReflection) HASH_INLINE(ReadOnlyDoc) HASH_INLINE(struct) HASH_INLINE(SlotType) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index bb807844447f..e3e8c196c5c3 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -48,8 +48,6 @@ public: SvBOOL aAccelConfig; SvBOOL aFastCall; SvBOOL aContainer; - SvBOOL aImageRotation; - SvBOOL aImageReflection; SvIdentifier aPseudoPrefix; OString aDisableFlags; SvMetaSlot* pLinkedSlot; @@ -123,8 +121,6 @@ public: bool GetAccelConfig() const; bool GetFastCall() const; bool GetContainer() const; - bool GetImageRotation() const; - bool GetImageReflection() const; bool GetReadOnlyDoc() const; bool GetExport() const; bool GetHidden() const; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index c17926a0e44f..a4df0c89dbb1 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -221,18 +221,6 @@ bool SvMetaSlot::GetContainer() const return static_cast(GetRef())->GetContainer(); } -bool SvMetaSlot::GetImageRotation() const -{ - if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation; - return static_cast(GetRef())->GetImageRotation(); -} - -bool SvMetaSlot::GetImageReflection() const -{ - if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection; - return static_cast(GetRef())->GetImageReflection(); -} - void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -292,8 +280,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm ); bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm ); - bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm ); - bOk |= aImageReflection.ReadSvIdl( SvHash_ImageReflection(), rInStm ); if( !bOk ) { @@ -774,10 +760,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, rOutStm.WriteOString( MakeSlotName( SvHash_Container() ) ).WriteChar( '|' ); if ( GetReadOnlyDoc() ) rOutStm.WriteOString( MakeSlotName( SvHash_ReadOnlyDoc() ) ).WriteChar( '|' ); - if( GetImageRotation() ) - rOutStm.WriteOString( MakeSlotName( SvHash_ImageRotation() ) ).WriteChar( '|' ); - if( GetImageReflection() ) - rOutStm.WriteOString( MakeSlotName( SvHash_ImageReflection() ) ).WriteChar( '|' ); rOutStm.WriteCharPtr( "SfxSlotMode::NONE" ); rOutStm.WriteChar( ',' ) << endl; diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index a939ee5a2be9..54e23ab53b32 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -83,8 +83,6 @@ char const * SyntaxStrings[] = { "\t\tFastCall", "\t\tGet, Set", "\t\tGroupId = Identifier", -"\t\tImageRotation", -"\t\tImageReflection", "\t\tPseudoPrefix = Identifier", "\t\tPseudoSlots", "\t\tReadOnlyDoc*", diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index dc24d94736c9..483c41dd4191 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -90,8 +90,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(FastCall) A_ENTRY(SbxObject) A_ENTRY(Container) - A_ENTRY(ImageRotation) - A_ENTRY(ImageReflection) A_ENTRY(ReadOnlyDoc) A_ENTRY(struct) A_ENTRY(SlotType) diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx index 849bf4c8c1ee..43bc649dfec6 100644 --- a/idl/source/prj/parser.cxx +++ b/idl/source/prj/parser.cxx @@ -424,8 +424,6 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) bOk |= ReadIfBoolAttribute(rSlot.aFastCall, SvHash_FastCall() ); bOk |= ReadIfBoolAttribute(rSlot.aContainer, SvHash_Container() ); - bOk |= ReadIfBoolAttribute(rSlot.aImageRotation, SvHash_ImageRotation() ); - bOk |= ReadIfBoolAttribute(rSlot.aImageReflection, SvHash_ImageReflection() ); if( bOk ) return; -- cgit