Kaydet (Commit) 5ec98c76 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

remove unused Synchron from SDI files

Change-Id: I0b8c63a97bfa4a49ac87869e164ab22d2aa99de3
Reviewed-on: https://gerrit.libreoffice.org/22097Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 16431492
......@@ -46,7 +46,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_Volatile;
SvStringHashEntryRef MM_Toggle;
SvStringHashEntryRef MM_AutoUpdate;
SvStringHashEntryRef MM_Synchron;
SvStringHashEntryRef MM_Asynchron;
SvStringHashEntryRef MM_RecordPerSet;
SvStringHashEntryRef MM_RecordPerItem;
......@@ -149,7 +148,6 @@ HASH_INLINE(SlotId)
HASH_INLINE(Volatile)
HASH_INLINE(Toggle)
HASH_INLINE(AutoUpdate)
HASH_INLINE(Synchron)
HASH_INLINE(Asynchron)
HASH_INLINE(RecordPerItem)
HASH_INLINE(RecordPerSet)
......
......@@ -40,7 +40,6 @@ class SvMetaSlot : public SvMetaAttribute
SvBOOL aToggle;
SvBOOL aAutoUpdate;
SvBOOL aSynchron; // exclusive
SvBOOL aAsynchron;
SvBOOL aRecordPerItem;// exclusive
......@@ -88,17 +87,9 @@ protected:
aAutoUpdate = bSet;
}
void SetSynchron( bool bSet )
{
aSynchron = bSet;
if( bSet )
aAsynchron = false;
}
void SetAsynchron( bool bSet )
{
aAsynchron = bSet;
if( bSet )
aSynchron = false;
}
void SetRecordPerItem( bool bSet )
......@@ -159,7 +150,6 @@ public:
bool GetToggle() const;
bool GetAutoUpdate() const;
bool GetSynchron() const;
bool GetAsynchron() const;
bool GetRecordPerItem() const;
......
......@@ -34,8 +34,7 @@ SvMetaObject *SvMetaSlot::MakeClone() const
}
SvMetaSlot::SvMetaSlot()
: aSynchron( true, false )
, aRecordPerSet( true, false )
: aRecordPerSet( true, false )
, aRecordAbsolute( false, false )
, pLinkedSlot(nullptr)
, pNextSlot(nullptr)
......@@ -46,7 +45,6 @@ SvMetaSlot::SvMetaSlot()
SvMetaSlot::SvMetaSlot( SvMetaType * pType )
: SvMetaAttribute( pType )
, aSynchron( true, false )
, aRecordPerSet( true, false )
, aRecordAbsolute( false, false )
, pLinkedSlot(nullptr)
......@@ -148,17 +146,10 @@ bool SvMetaSlot::GetAutoUpdate() const
if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate;
return static_cast<SvMetaSlot *>(GetRef())->GetAutoUpdate();
}
bool SvMetaSlot::GetSynchron() const
{
// Synchron and Asynchron are exclusive
if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() )
return aSynchron;
return static_cast<SvMetaSlot *>(GetRef())->GetSynchron();
}
bool SvMetaSlot::GetAsynchron() const
{
// Synchron and Asynchron are exclusive
if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() )
if( !GetRef() || aAsynchron.IsSet() )
return aAsynchron;
return static_cast<SvMetaSlot *>(GetRef())->GetAsynchron();
}
......@@ -293,8 +284,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
SetAutoUpdate( aAutoUpdate ), bOk = true;
if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) )
SetSynchron( aSynchron ), bOk = true;
if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
SetAsynchron( aAsynchron ), bOk = true;
......@@ -821,8 +810,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
rOutStm.WriteCharPtr( MakeSlotName( SvHash_Toggle() ).getStr() ).WriteChar( '|' );
if( GetAutoUpdate() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_AutoUpdate() ).getStr() ).WriteChar( '|' );
if( GetSynchron() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_Synchron() ).getStr() ).WriteChar( '|' );
if( GetAsynchron() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_Asynchron() ).getStr() ).WriteChar( '|' );
if( GetRecordPerItem() )
......
......@@ -95,7 +95,7 @@ char const * SyntaxStrings[] = {
"\t\tRecordPerSet*, RecordPerItem, RecordManual, NoRecord",
"\t\tRecordAbsolute",
"\t\tStateMethod = Identifier",
"\t\tSynchron*, Asynchron",
"\t\tAsynchron",
"\t\tToggle",
"\t']'\n",
......
......@@ -73,7 +73,6 @@ SvGlobalHashNames::SvGlobalHashNames()
, MM_SlotId( INS( "SlotId" ) )
, MM_Toggle( INS( "Toggle" ) )
, MM_AutoUpdate( INS( "AutoUpdate" ) )
, MM_Synchron( INS( "Synchron" ) )
, MM_Asynchron( INS( "Asynchron" ) )
A_ENTRY(RecordPerSet)
A_ENTRY(RecordPerItem)
......
......@@ -33,8 +33,7 @@ enum class SfxSlotMode {
TOGGLE = 0x0004L, // inverted for Execute old value
AUTOUPDATE = 0x0008L, // invalidated the status automatically after execute
SYNCHRON = 0x0010L, // exclusive to ASYNCHRON, default
ASYNCHRON = 0x0020L, // via Post-Message, exclusive to SYNCHRON
ASYNCHRON = 0x0020L, // via Post-Message
HASDIALOG = 0x0080L, // Coordinates for dialogue after reconfig
NORECORD = 0x0100L, // no recording
......@@ -42,7 +41,7 @@ enum class SfxSlotMode {
RECORDPERSET = 0x0400L, // The whole Set is a Statement, default
RECORDMANUAL = 0x0800L, // Recording by the application developer is default
RECORDABSOLUTE = 0x1000000L, // Recording with absolute Target
STANDARD = 0x00410L, // SYNCHRON | RECORDPERSET;
STANDARD = 0x00400L, // RECORDPERSET;
PROPGET = 0x1000L, // get property
PROPSET = 0x2000L, // set property, exclusive to METHOD
......@@ -63,7 +62,7 @@ enum class SfxSlotMode {
namespace o3tl
{
template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1ffffbeL> {};
template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1ffffaeL> {};
}
......
This diff is collapsed.
......@@ -26,7 +26,6 @@ SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
Synchron;
Readonly = FALSE,
/* config: */
......@@ -46,7 +45,6 @@ SvxObjectItem RulerObject SID_RULER_OBJECT
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Synchron;
/* plugin: */
Container = FALSE,
......
This diff is collapsed.
This diff is collapsed.
......@@ -28,7 +28,6 @@ SfxVoidItem ChangeAlignment SID_ALIGN
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -51,7 +50,6 @@ SfxVoidItem ChangeDistance SID_DISTANCE
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -74,7 +72,6 @@ SfxVoidItem ChangeFont SID_FONT
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -97,7 +94,6 @@ SfxVoidItem ChangeFontSize SID_FONTSIZE
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -120,7 +116,6 @@ SfxVoidItem CommandWindow SID_CMDBOXWINDOW
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -143,7 +138,6 @@ SfxVoidItem ElementsDockingWindow SID_ELEMENTSDOCKINGWINDOW
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -166,7 +160,6 @@ SfxVoidItem Preferences SID_PREFERENCES
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -189,7 +182,6 @@ SfxStringItem ConfigName SID_TEXT
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -214,7 +206,6 @@ SfxVoidItem CopyObject SID_COPYOBJECT
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -237,7 +228,6 @@ SfxVoidItem Draw SID_DRAW
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -260,7 +250,6 @@ SfxBoolItem FormelCursor SID_FORMULACURSOR
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -283,7 +272,6 @@ SfxInt16Item Graphic SID_GAPHIC_SM
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -398,7 +386,6 @@ SfxBoolItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
Container = FALSE,
RecordAbsolute = FALSE, /*obsolete */
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -443,7 +430,6 @@ SfxStringItem ModifyStatus SID_MODIFYSTATUS
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -468,7 +454,6 @@ SfxVoidItem NextError SID_NEXTERR
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -491,7 +476,6 @@ SfxVoidItem NextMark SID_NEXTMARK
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -514,7 +498,6 @@ SfxVoidItem PasteObject SID_PASTEOBJECT
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -537,7 +520,6 @@ SfxVoidItem PrevError SID_PREVERR
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -560,7 +542,6 @@ SfxVoidItem PrevMark SID_PREVMARK
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -583,7 +564,6 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -608,7 +588,6 @@ SfxVoidItem SaveSymbols SID_SAVESYMBOLS
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -631,7 +610,6 @@ SfxVoidItem SetPaperSize SID_GETEDITTEXT
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -654,7 +632,6 @@ SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -677,7 +654,6 @@ SfxVoidItem Symbols SID_SYMBOLS
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -700,7 +676,6 @@ SfxBoolItem Textmode SID_TEXTMODE
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -725,7 +700,6 @@ SfxStringItem TextStatus SID_TEXTSTATUS
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -750,7 +724,6 @@ SfxVoidItem UnicodeNotationToggle SID_UNICODE_NOTATION_TOGGLE
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -773,7 +746,6 @@ SfxVoidItem ToolBoxWindow SID_TOOLBOXWINDOW
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = FALSE,
......@@ -796,7 +768,6 @@ SfxBoolItem ToolBox SID_TOOLBOX
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
......@@ -821,7 +792,6 @@ SfxVoidItem ZoomIn SID_ZOOMIN
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......@@ -844,7 +814,6 @@ SfxVoidItem ZoomOut SID_ZOOMOUT
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment