[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sd/sdi svx/sdi
Noel Grandin
noel at peralex.com
Thu Feb 4 11:54:58 UTC 2016
idl/inc/globals.hxx | 2 --
idl/inc/slot.hxx | 14 +++-----------
idl/source/objects/slot.cxx | 18 +++---------------
idl/source/prj/command.cxx | 2 +-
idl/source/prj/globals.cxx | 1 -
include/sfx2/msg.hxx | 3 +--
sd/sdi/sdraw.sdi | 10 ----------
svx/sdi/svx.sdi | 23 -----------------------
8 files changed, 8 insertions(+), 65 deletions(-)
New commits:
commit 44e48e309ab92443f11b290a2153779703bca22f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 3 16:58:01 2016 +0200
remove unused RecordManual from SDI files
Change-Id: Ia6af0d00b68f5694c9fc9cc453fe36fb923f0a2d
Reviewed-on: https://gerrit.libreoffice.org/22099
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 033a044..09e2a4c 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -49,7 +49,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_Asynchron;
SvStringHashEntryRef MM_RecordPerSet;
SvStringHashEntryRef MM_RecordPerItem;
- SvStringHashEntryRef MM_RecordManual;
SvStringHashEntryRef MM_NoRecord;
SvStringHashEntryRef MM_RecordAbsolute;
SvStringHashEntryRef MM_enum;
@@ -150,7 +149,6 @@ HASH_INLINE(AutoUpdate)
HASH_INLINE(Asynchron)
HASH_INLINE(RecordPerItem)
HASH_INLINE(RecordPerSet)
-HASH_INLINE(RecordManual)
HASH_INLINE(NoRecord)
HASH_INLINE(RecordAbsolute)
HASH_INLINE(enum)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 25a7415..7c86e72 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -44,7 +44,6 @@ class SvMetaSlot : public SvMetaAttribute
SvBOOL aRecordPerItem;// exclusive
SvBOOL aRecordPerSet;
- SvBOOL aRecordManual;
SvBOOL aNoRecord;
SvBOOL aRecordAbsolute;
@@ -95,25 +94,19 @@ protected:
{
aRecordPerItem = bSet;
if( bSet )
- aRecordPerSet = aRecordManual = aNoRecord = false;
+ aRecordPerSet = aNoRecord = false;
}
void SetRecordPerSet( bool bSet )
{
aRecordPerSet = bSet;
if( bSet )
- aRecordPerItem = aRecordManual = aNoRecord = false;
- }
- void SetRecordManual( bool bSet )
- {
- aRecordManual = bSet;
- if( bSet )
- aRecordPerItem = aRecordPerSet = aNoRecord = false;
+ aRecordPerItem = aNoRecord = false;
}
void SetNoRecord( bool bSet )
{
aNoRecord = bSet;
if( bSet )
- aRecordPerItem = aRecordPerSet = aRecordManual = false;
+ aRecordPerItem = aRecordPerSet = false;
}
void SetRecordAbsolute( bool bSet )
{ aRecordAbsolute = bSet; }
@@ -153,7 +146,6 @@ public:
bool GetRecordPerItem() const;
bool GetRecordPerSet() const;
- bool GetRecordManual() const;
bool GetNoRecord() const;
bool GetRecordAbsolute() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 0f03eaf..5ba52db 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -157,7 +157,7 @@ bool SvMetaSlot::GetRecordPerItem() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
- || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
+ || aRecordPerSet.IsSet() )
return aRecordPerItem;
return static_cast<SvMetaSlot *>(GetRef())->GetRecordPerItem();
}
@@ -165,23 +165,15 @@ bool SvMetaSlot::GetRecordPerSet() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
- || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
+ || aRecordPerSet.IsSet() )
return aRecordPerSet;
return static_cast<SvMetaSlot *>(GetRef())->GetRecordPerSet();
}
-bool SvMetaSlot::GetRecordManual() const
-{
- // Record- PerItem, No, PerSet and Manual are exclusive
- if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
- || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
- return aRecordManual;
- return static_cast<SvMetaSlot *>(GetRef())->GetRecordManual();
-}
bool SvMetaSlot::GetNoRecord() const
{
// Record- PerItem, No, PerSet and Manual are exclusive
if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
- || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
+ || aRecordPerSet.IsSet() )
return aNoRecord;
return static_cast<SvMetaSlot *>(GetRef())->GetNoRecord();
}
@@ -288,8 +280,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SetRecordPerItem( aRecordPerItem ), bOk = true;
if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) )
SetRecordPerSet( aRecordPerSet ), bOk = true;
- if( aRecordManual.ReadSvIdl( SvHash_RecordManual(), rInStm ) )
- SetRecordManual( aRecordManual ), bOk = true;
if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
SetNoRecord( aNoRecord ), bOk = true;
@@ -810,8 +800,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordPerItem() ).getStr() ).WriteChar( '|' );
if( GetRecordPerSet() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordPerSet() ).getStr() ).WriteChar( '|' );
- if( GetRecordManual() )
- rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordManual() ).getStr() ).WriteChar( '|' );
if( GetNoRecord() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_NoRecord() ).getStr() ).WriteChar( '|' );
if( GetRecordAbsolute() )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index fa74f42..b9a1312 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -91,7 +91,7 @@ char const * SyntaxStrings[] = {
"\t\tPseudoSlots",
"\t\tReadOnly",
"\t\tReadOnlyDoc*",
-"\t\tRecordPerSet*, RecordPerItem, RecordManual, NoRecord",
+"\t\tRecordPerSet*, RecordPerItem, NoRecord",
"\t\tRecordAbsolute",
"\t\tStateMethod = Identifier",
"\t\tAsynchron",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 634212f..2de0682 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -76,7 +76,6 @@ SvGlobalHashNames::SvGlobalHashNames()
, MM_Asynchron( INS( "Asynchron" ) )
A_ENTRY(RecordPerSet)
A_ENTRY(RecordPerItem)
- A_ENTRY(RecordManual)
A_ENTRY(NoRecord)
A_ENTRY(RecordAbsolute)
A_ENTRY(enum)
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 0bb65fa..93f02c5 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -38,7 +38,6 @@ enum class SfxSlotMode {
NORECORD = 0x0100L, // no recording
RECORDPERITEM = 0x0200L, // each item, one statement
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 = 0x00400L, // RECORDPERSET;
@@ -61,7 +60,7 @@ enum class SfxSlotMode {
namespace o3tl
{
- template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1ffff2eL> {};
+ template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1fff72eL> {};
}
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 5a1924b..17e06b0 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -424,7 +424,6 @@ SfxBoolItem Cone SID_3D_CONE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -466,7 +465,6 @@ SfxBoolItem Connector SID_TOOL_CONNECTOR
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -1333,7 +1331,6 @@ SfxBoolItem Cube SID_3D_CUBE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -1375,7 +1372,6 @@ SfxBoolItem Cylinder SID_3D_CYLINDER
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -1397,7 +1393,6 @@ SfxBoolItem Cyramid SID_3D_PYRAMID
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -2307,7 +2302,6 @@ SfxBoolItem HalfSphere SID_3D_HALF_SPHERE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -4598,7 +4592,6 @@ SfxBoolItem Shell3D SID_3D_SHELL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -4750,7 +4743,6 @@ SfxBoolItem Sphere SID_3D_SPHERE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -4852,7 +4844,6 @@ SfxVoidItem SwitchPointEdit SID_SWITCH_POINTEDIT
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* config: */
AccelConfig = FALSE,
@@ -4980,7 +4971,6 @@ SfxBoolItem Torus SID_3D_TORUS
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 88a8097..3fa799f 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -521,7 +521,6 @@ SfxBoolItem Bezier_Unfilled SID_DRAW_BEZIER_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -705,7 +704,6 @@ SfxBoolItem BezierFill SID_DRAW_BEZIER_FILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -1659,7 +1657,6 @@ SfxVoidItem Circle SID_DRAW_CIRCLE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -1683,7 +1680,6 @@ SfxVoidItem Circle_Unfilled SID_DRAW_CIRCLE_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -1707,7 +1703,6 @@ SfxVoidItem CircleArc SID_DRAW_CIRCLEARC
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -1755,7 +1750,6 @@ SfxVoidItem CircleCut_Unfilled SID_DRAW_CIRCLECUT_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -1779,7 +1773,6 @@ SfxVoidItem CirclePie SID_DRAW_CIRCLEPIE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -1803,7 +1796,6 @@ SfxVoidItem CirclePie_Unfilled SID_DRAW_CIRCLEPIE_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -2980,7 +2972,6 @@ SfxVoidItem Ellipse_Unfilled SID_DRAW_ELLIPSE_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -3004,7 +2995,6 @@ SfxVoidItem EllipseCut SID_DRAW_ELLIPSECUT
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -3028,7 +3018,6 @@ SfxVoidItem EllipseCut_Unfilled SID_DRAW_ELLIPSECUT_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -6259,7 +6248,6 @@ SfxBoolItem Line_Diagonal SID_DRAW_XLINE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -7317,7 +7305,6 @@ SfxVoidItem Pie_Unfilled SID_DRAW_PIE_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -7363,7 +7350,6 @@ SfxBoolItem Polygon_Diagonal SID_DRAW_XPOLYGON
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -7386,7 +7372,6 @@ SfxBoolItem Polygon_Diagonal_Unfilled SID_DRAW_XPOLYGON_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -7409,7 +7394,6 @@ SfxBoolItem Polygon_Unfilled SID_DRAW_POLYGON_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
Readonly = FALSE,
@@ -7921,7 +7905,6 @@ SfxVoidItem Rect_Rounded SID_DRAW_RECT_ROUND
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -7945,7 +7928,6 @@ SfxVoidItem Rect_Rounded_Unfilled SID_DRAW_RECT_ROUND_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -7969,7 +7951,6 @@ SfxVoidItem Rect_Unfilled SID_DRAW_RECT_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -9313,7 +9294,6 @@ SfxVoidItem Square SID_DRAW_SQUARE
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -9337,7 +9317,6 @@ SfxVoidItem Square_Rounded SID_DRAW_SQUARE_ROUND
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -9361,7 +9340,6 @@ SfxVoidItem Square_Rounded_Unfilled SID_DRAW_SQUARE_ROUND_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
@@ -9385,7 +9363,6 @@ SfxVoidItem Square_Unfilled SID_DRAW_SQUARE_NOFILL
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
- RecordManual;
/* status: */
SlotType = SfxBoolItem
More information about the Libreoffice-commits
mailing list