ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

remove unused HasDialog from SDI files

Browse Source 
Change-Id: I26f2cef48fcc7a6c4a6b93668b836879254f3eb0
Reviewed-on: https://gerrit.libreoffice.org/22098
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-02-04 11:39:51 +00:00
committed by Noel Grandin
parent 5ec98c7698
commit 228a5704b3
16 changed files with 7 additions and 2025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idl/inc/globals.hxx
-2
View File
@@ -79,7 +79,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_ExecMethod;
SvStringHashEntryRef MM_StateMethod;
SvStringHashEntryRef MM_GroupId;
SvStringHashEntryRef MM_HasDialog;
SvStringHashEntryRef MM_TypeLibFile;
SvStringHashEntryRef MM_Export;
SvStringHashEntryRef MM_Automation;
@@ -179,7 +178,6 @@ HASH_INLINE(StateMethod)
HASH_INLINE(GroupId)
HASH_INLINE(float)
HASH_INLINE(double)
HASH_INLINE(HasDialog)
HASH_INLINE(TypeLibFile)
HASH_INLINE(Export)
HASH_INLINE(Automation)
idl/inc/slot.hxx
-2
View File
@@ -48,7 +48,6 @@ class SvMetaSlot : public SvMetaAttribute
SvBOOL aNoRecord;
SvBOOL aRecordAbsolute;
SvBOOL aHasDialog;
SvBOOL aMenuConfig;
SvBOOL aToolBoxConfig;
SvBOOL aStatusBarConfig;
@@ -158,7 +157,6 @@ public:
bool GetNoRecord() const;
bool GetRecordAbsolute() const;
bool GetHasDialog() const;
const OString& GetPseudoPrefix() const;
const OString& GetUnoName() const;
bool GetMenuConfig() const;
idl/source/objects/slot.cxx
-8
View File
@@ -191,11 +191,6 @@ bool SvMetaSlot::GetRecordAbsolute() const
return aRecordAbsolute;
return static_cast<SvMetaSlot *>(GetRef())->GetRecordAbsolute();
}
bool SvMetaSlot::GetHasDialog() const
{
if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
return static_cast<SvMetaSlot *>(GetRef())->GetHasDialog();
}
const OString& SvMetaSlot::GetPseudoPrefix() const
{
if( !aPseudoPrefix.getString().isEmpty() || !GetRef() ) return aPseudoPrefix.getString();
@@ -298,7 +293,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
SetNoRecord( aNoRecord ), bOk = true;
bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm );
bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
bOk |= aMenuConfig.ReadSvIdl( SvHash_MenuConfig(), rInStm );
bOk |= aToolBoxConfig.ReadSvIdl( SvHash_ToolBoxConfig(), rInStm );
@@ -822,8 +816,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
rOutStm.WriteCharPtr( MakeSlotName( SvHash_NoRecord() ).getStr() ).WriteChar( '|' );
if( GetRecordAbsolute() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordAbsolute() ).getStr() ).WriteChar( '|' );
if( GetHasDialog() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_HasDialog() ).getStr() ).WriteChar( '|' );
if( GetMenuConfig() )
rOutStm.WriteCharPtr( MakeSlotName( SvHash_MenuConfig() ).getStr() ).WriteChar( '|' );
if( GetToolBoxConfig() )
idl/source/prj/command.cxx
-1
View File
@@ -84,7 +84,6 @@ char const * SyntaxStrings[] = {
"\t\tFastCall",
"\t\tGet, Set",
"\t\tGroupId = Identifier",
"\t\tHasDialog",
"\t\tIsCollection",
"\t\tImageRotation",
"\t\tImageReflection",
idl/source/prj/globals.cxx
-1
View File
@@ -106,7 +106,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(ExecMethod)
A_ENTRY(StateMethod)
A_ENTRY(GroupId)
A_ENTRY(HasDialog)
A_ENTRY(TypeLibFile)
A_ENTRY(Export)
A_ENTRY(Automation)
include/sfx2/msg.hxx
+1 -2
View File
@@ -34,7 +34,6 @@ enum class SfxSlotMode {
TOGGLE = 0x0004L, // inverted for Execute old value
AUTOUPDATE = 0x0008L, // invalidated the status automatically after execute
ASYNCHRON = 0x0020L, // via Post-Message
HASDIALOG = 0x0080L, // Coordinates for dialogue after reconfig
NORECORD = 0x0100L, // no recording
RECORDPERITEM = 0x0200L, // each item, one statement
@@ -62,7 +61,7 @@ enum class SfxSlotMode {
namespace o3tl
{
template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1ffffaeL> {};
template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x1ffff2eL> {};
}
sc/sdi/cellsh.sdi
-1
View File
@@ -139,7 +139,6 @@ interface CellSelection
ExecMethod = ExecuteEdit ;
StateMethod = GetBlockState ;
GroupId = GID_EDIT ; //FS
HasDialog ;
MenuConfig , AccelConfig ;
]
SID_DELETE_CONTENTS [ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ]
sc/sdi/scalc.sdi
-360
View File
File diff suppressed because it is too large Load Diff
sd/sdi/_drvwsh.sdi
+3 -3
View File
@@ -297,7 +297,7 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
GroupId = GID_DOCUMENT ;
HasDialog , Export ,
Export ,
MenuConfig , AccelConfig , ToolBoxConfig ;
]
SID_CHARMAP // ole : no, status : ?
@@ -352,7 +352,7 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
GroupId = GID_INSERT ;
HasDialog , Export , Asynchron ,
Export , Asynchron ,
MenuConfig , AccelConfig , ToolBoxConfig ;
]
SID_MANAGE_LINKS // ole : no, status : ?
@@ -376,7 +376,7 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
GroupId = GID_DOCUMENT ;
HasDialog , Export , Asynchron ,
Export , Asynchron ,
MenuConfig , AccelConfig , ToolBoxConfig ;
]
SID_BMPMASK // ole : yes, status : ?
sd/sdi/outlnvsh.sdi
+3 -3
View File
@@ -186,19 +186,19 @@ interface OutlineView
[
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
HasDialog , Export ;
Export ;
]
SID_CHAR_DLG // ole : no, status : ?
[
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
// HasDialog , Export ;
// Export ;
]
SID_CHAR_DLG_EFFECT // wj for sym2_1876
[
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
// HasDialog , Export ;
// Export ;
]
SID_SELECTALL // ole : no, status : ?
[
sd/sdi/sdnew.sdi
-3
View File
@@ -22,7 +22,6 @@ SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL
/* flags: */
AutoUpdate = TRUE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -42,7 +41,6 @@ SvxObjectItem RulerObject SID_RULER_OBJECT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
@@ -70,7 +68,6 @@ SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
sd/sdi/sdraw.sdi
-283
View File
File diff suppressed because it is too large Load Diff
sfx2/sdi/sfx.sdi
-302
View File
File diff suppressed because it is too large Load Diff
starmath/sdi/smath.sdi
-36
View File
@@ -22,7 +22,6 @@ SfxVoidItem ChangeAlignment SID_ALIGN
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -44,7 +43,6 @@ SfxVoidItem ChangeDistance SID_DISTANCE
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -66,7 +64,6 @@ SfxVoidItem ChangeFont SID_FONT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -88,7 +85,6 @@ SfxVoidItem ChangeFontSize SID_FONTSIZE
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -110,7 +106,6 @@ SfxVoidItem CommandWindow SID_CMDBOXWINDOW
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -132,7 +127,6 @@ SfxVoidItem ElementsDockingWindow SID_ELEMENTSDOCKINGWINDOW
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -154,7 +148,6 @@ SfxVoidItem Preferences SID_PREFERENCES
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -176,7 +169,6 @@ SfxStringItem ConfigName SID_TEXT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -200,7 +192,6 @@ SfxVoidItem CopyObject SID_COPYOBJECT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -222,7 +213,6 @@ SfxVoidItem Draw SID_DRAW
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -244,7 +234,6 @@ SfxBoolItem FormelCursor SID_FORMULACURSOR
/* flags: */
AutoUpdate = TRUE,
FastCall = TRUE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = TRUE,
Container = FALSE,
@@ -266,7 +255,6 @@ SfxInt16Item Graphic SID_GAPHIC_SM
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -290,7 +278,6 @@ SfxVoidItem InsertCommand SID_INSERTCOMMAND
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -312,7 +299,6 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -335,7 +321,6 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -358,7 +343,6 @@ SfxBoolItem ImportFormula SID_IMPORT_FORMULA
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -380,7 +364,6 @@ SfxBoolItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
/* flags: */
AutoUpdate = FALSE,
FastCall = TRUE,
HasDialog = FALSE, /*obsolete */
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -401,7 +384,6 @@ SfxVoidItem LoadSymbols SID_LOADSYMBOLS
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -424,7 +406,6 @@ SfxStringItem ModifyStatus SID_MODIFYSTATUS
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -448,7 +429,6 @@ SfxVoidItem NextError SID_NEXTERR
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -470,7 +450,6 @@ SfxVoidItem NextMark SID_NEXTMARK
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -492,7 +471,6 @@ SfxVoidItem PasteObject SID_PASTEOBJECT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -514,7 +492,6 @@ SfxVoidItem PrevError SID_PREVERR
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -536,7 +513,6 @@ SfxVoidItem PrevMark SID_PREVMARK
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -558,7 +534,6 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW
/* flags: */
AutoUpdate = TRUE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -582,7 +557,6 @@ SfxVoidItem SaveSymbols SID_SAVESYMBOLS
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -604,7 +578,6 @@ SfxVoidItem SetPaperSize SID_GETEDITTEXT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -626,7 +599,6 @@ SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -648,7 +620,6 @@ SfxVoidItem Symbols SID_SYMBOLS
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = TRUE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -670,7 +641,6 @@ SfxBoolItem Textmode SID_TEXTMODE
/* flags: */
AutoUpdate = TRUE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -694,7 +664,6 @@ SfxStringItem TextStatus SID_TEXTSTATUS
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -718,7 +687,6 @@ SfxVoidItem UnicodeNotationToggle SID_UNICODE_NOTATION_TOGGLE
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -740,7 +708,6 @@ SfxVoidItem ToolBoxWindow SID_TOOLBOXWINDOW
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -762,7 +729,6 @@ SfxBoolItem ToolBox SID_TOOLBOX
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
@@ -786,7 +752,6 @@ SfxVoidItem ZoomIn SID_ZOOMIN
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
@@ -808,7 +773,6 @@ SfxVoidItem ZoomOut SID_ZOOMOUT
/* flags: */
AutoUpdate = FALSE,
FastCall = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
svx/sdi/svx.sdi
-599
View File
File diff suppressed because it is too large Load Diff
sw/sdi/swriter.sdi
-419
View File
File diff suppressed because it is too large Load Diff