[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 svx/sdi sw/sdi
Caolán McNamara
caolanm at redhat.com
Thu Sep 8 21:01:53 UTC 2016
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 --
include/sfx2/msg.hxx | 6 ++----
svx/sdi/svx.sdi | 34 ----------------------------------
sw/sdi/swriter.sdi | 39 ---------------------------------------
9 files changed, 2 insertions(+), 109 deletions(-)
New commits:
commit bcf8f878899be13002b2c40f9f2b9363f20fec3a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 8 13:38:38 2016 +0100
remove IMAGEROTATION and IMAGEREFLECTION SfxSlotMode enums...
unused since...
commit 7affe26a1291eef8c77e890228061f13e987bff1
Author: Maxim Monastirsky <momonasmon at gmail.com>
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 <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 6092fbb..e49e81e 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 bb80784..e3e8c19 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 c17926a..a4df0c8 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -221,18 +221,6 @@ bool SvMetaSlot::GetContainer() const
return static_cast<SvMetaSlot *>(GetRef())->GetContainer();
}
-bool SvMetaSlot::GetImageRotation() const
-{
- if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
- return static_cast<SvMetaSlot *>(GetRef())->GetImageRotation();
-}
-
-bool SvMetaSlot::GetImageReflection() const
-{
- if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
- return static_cast<SvMetaSlot *>(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 a939ee5..54e23ab 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 dc24d94..483c41d 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 849bf4c..43bc649 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;
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index c6c101b..12fe6e0 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -48,14 +48,12 @@ enum class SfxSlotMode {
ACCELCONFIG = 0x80000L, // configurable keys
CONTAINER = 0x100000L, // Operated by the container at InPlace
- READONLYDOC = 0x200000L, // also available for read-only Documents
- IMAGEROTATION = 0x400000L, // Rotate image on Vertical/Bi-directional writing
- IMAGEREFLECTION = 0x800000L // Mirror image on Vertical/Bi-directional writing
+ READONLYDOC = 0x200000L // also available for read-only Documents
};
namespace o3tl
{
- template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1fec72cL> {};
+ template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x13ec72cL> {};
}
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 69db251..72ea78b 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1010,8 +1010,6 @@ SfxBoolItem CenterPara SID_ATTR_PARA_ADJUST_CENTER
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -2324,8 +2322,6 @@ SfxVoidItem DefaultBullet FN_NUM_BULLET_ON
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
SlotType = SfxBoolItem
AccelConfig = TRUE,
@@ -4813,8 +4809,6 @@ SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
SlotType = SfxBoolItem
AccelConfig = TRUE,
@@ -5111,9 +5105,6 @@ SfxBoolItem JustifyPara SID_ATTR_PARA_ADJUST_BLOCK
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -5264,8 +5255,6 @@ SfxBoolItem LeftPara SID_ATTR_PARA_ADJUST_LEFT
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -5920,8 +5909,6 @@ SfxVoidItem OutlineBullet SID_OUTLINE_BULLET
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = TRUE,
@@ -7109,8 +7096,6 @@ SfxBoolItem RightPara SID_ATTR_PARA_ADJUST_RIGHT
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -7949,9 +7934,6 @@ SfxBoolItem SpacePara1 SID_ATTR_PARA_LINESPACE_10
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -7970,9 +7952,6 @@ SfxBoolItem SpacePara15 SID_ATTR_PARA_LINESPACE_15
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -7991,9 +7970,6 @@ SfxBoolItem SpacePara2 SID_ATTR_PARA_LINESPACE_20
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -9397,8 +9373,6 @@ SfxBoolItem ParaLeftToRight SID_ATTR_PARA_LEFT_TO_RIGHT
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -9417,8 +9391,6 @@ SfxBoolItem ParaRightToLeft SID_ATTR_PARA_RIGHT_TO_LEFT
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -10161,9 +10133,6 @@ SfxVoidItem IncrementIndent SID_INC_INDENT
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -10182,9 +10151,6 @@ SfxVoidItem DecrementIndent SID_DEC_INDENT
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 94a6e0f..96a05e1 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -478,8 +478,6 @@ SfxVoidItem BulletsAndNumberingDialog FN_NUMBER_BULLETS
RecordPerSet;
Asynchron;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -763,8 +761,6 @@ SfxVoidItem DecrementLevel FN_NUM_BULLET_DOWN
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -782,8 +778,6 @@ SfxVoidItem DecrementSubLevels FN_NUM_BULLET_OUTLINE_DOWN
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -2400,8 +2394,6 @@ SfxVoidItem IncrementLevel FN_NUM_BULLET_UP
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -2419,8 +2411,6 @@ SfxVoidItem IncrementSubLevels FN_NUM_BULLET_OUTLINE_UP
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -2760,9 +2750,6 @@ SfxBoolItem InsertField FN_INSERT_FIELD
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -2977,8 +2964,6 @@ SfxVoidItem InsertNeutralParagraph FN_NUM_BULLET_NONUM
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -4094,8 +4079,6 @@ SfxVoidItem MoveDown FN_NUM_BULLET_MOVEDOWN
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -4113,8 +4096,6 @@ SfxVoidItem MoveDownSubItems FN_NUM_BULLET_OUTLINE_MOVEDOWN
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -4132,8 +4113,6 @@ SfxVoidItem MoveUp FN_NUM_BULLET_MOVEUP
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -4151,8 +4130,6 @@ SfxVoidItem MoveUpSubItems FN_NUM_BULLET_OUTLINE_MOVEUP
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -4382,9 +4359,6 @@ SfxBoolItem NumberingStart FN_NUMBER_NEWSTART
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = TRUE,
@@ -4793,8 +4767,6 @@ SfxVoidItem RemoveBullets FN_NUM_BULLET_OFF
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -6326,8 +6298,6 @@ SfxBoolItem WrapContour FN_FRAME_WRAP_CONTOUR
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -6379,8 +6349,6 @@ SfxBoolItem WrapOff FN_FRAME_NOWRAP
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -6398,8 +6366,6 @@ SfxBoolItem WrapOn FN_FRAME_WRAP
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -6434,8 +6400,6 @@ SfxBoolItem WrapThrough FN_FRAME_WRAPTHRU
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
AccelConfig = TRUE,
MenuConfig = TRUE,
ToolBoxConfig = TRUE,
@@ -6800,9 +6764,6 @@ SfxBoolItem InsertFieldDataOnly FN_INSERT_FIELD_DATA_ONLY()
RecordAbsolute = FALSE,
RecordPerSet;
- ImageRotation = TRUE;
- ImageReflection = TRUE;
-
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
More information about the Libreoffice-commits
mailing list