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

remove unused Automation from .SDI files

Change-Id: I65e1ca6e022dc76ac96ed75da2c5e78e9356a3e9
Reviewed-on: https://gerrit.libreoffice.org/22107Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 001272c9
......@@ -25,7 +25,7 @@ interface BasicIDEView
shell basctl_Shell
{
import BasicIDEView [Automation];
import BasicIDEView;
// Current, je nach aktuellem Fenster:
......@@ -516,6 +516,6 @@ interface BasicIDEDocument
shell basctl_DocShell
{
import BasicIDEDocument [Automation];
import BasicIDEDocument;
}
......@@ -78,7 +78,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_GroupId;
SvStringHashEntryRef MM_TypeLibFile;
SvStringHashEntryRef MM_Export;
SvStringHashEntryRef MM_Automation;
SvStringHashEntryRef MM_PseudoPrefix;
SvStringHashEntryRef MM_define;
SvStringHashEntryRef MM_MenuConfig;
......@@ -172,7 +171,6 @@ HASH_INLINE(float)
HASH_INLINE(double)
HASH_INLINE(TypeLibFile)
HASH_INLINE(Export)
HASH_INLINE(Automation)
HASH_INLINE(PseudoPrefix)
HASH_INLINE(define)
HASH_INLINE(MenuConfig)
......
......@@ -40,9 +40,8 @@ typedef ::std::vector< SvMetaClass* > SvMetaClassList;
typedef tools::SvRef<SvMetaClass> SvMetaClassRef;
class SvClassElement : public SvRttiBase
{
SvBOOL aAutomation;
OString aPrefix;
SvMetaClassRef xClass;
SvMetaClassRef xClass;
public:
SvClassElement();
......@@ -51,8 +50,6 @@ public:
const OString& GetPrefix() const
{ return aPrefix; }
void SetAutomation( bool rAutomation )
{ aAutomation = rAutomation; }
void SetClass( SvMetaClass * pClass )
{ xClass = pClass; }
SvMetaClass * GetClass() const
......@@ -68,8 +65,6 @@ class SvMetaClass : public SvMetaType
SvMetaAttributeMemberList aAttrList;
SvClassElementMemberList aClassList;
SvMetaClassRef aSuperClass;
SvBOOL aAutomation;
SvMetaClassRef xAutomationInterface;
bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
......
......@@ -36,7 +36,6 @@ class SvMetaAttribute : public SvMetaReference
{
SvMetaTypeRef aType;
SvIdentifier aSlotId;
SvBOOL aAutomation;
SvBOOL aExport;
SvBOOL aReadonly;
SvBOOL aIsCollection;
......@@ -59,7 +58,6 @@ public:
const SvIdentifier & GetSlotId() const;
bool GetExport() const;
bool GetHidden() const;
bool GetAutomation() const;
bool GetIsCollection() const;
bool GetReadOnlyDoc() const;
SvMetaType * GetType() const;
......
......@@ -36,7 +36,6 @@ SvClassElement::SvClassElement()
};
SvMetaClass::SvMetaClass()
: aAutomation( true, false )
{
}
......@@ -44,7 +43,6 @@ void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
SvMetaType::ReadAttributesSvIdl( rBase, rInStm );
aAutomation.ReadSvIdl( SvHash_Automation(), rInStm );
}
void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
......@@ -62,36 +60,6 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
xEle->SetClass( pClass );
aClassList.push_back( xEle );
if( rInStm.Read( '[' ) )
{
pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_Automation() ) )
{
if( rInStm.Read( ']' ) )
{
if( xAutomationInterface.Is() )
{
// set error
rBase.SetError( "Automation already set", rInStm.GetToken() );
rBase.WriteError( rInStm );
}
xAutomationInterface = pClass;
xEle->SetAutomation( true );
}
else
{
// set error
rBase.SetError( "missing ]", rInStm.GetToken() );
rBase.WriteError( rInStm );
}
}
else
{
// set error
rBase.SetError( "only attribute Automation allowed", rInStm.GetToken() );
rBase.WriteError( rInStm );
}
}
pTok = &rInStm.GetToken();
if( pTok->IsString() )
{
......
......@@ -30,8 +30,7 @@
#include <database.hxx>
SvMetaAttribute::SvMetaAttribute()
: aAutomation( true, false )
, aExport( true, false )
: aExport( true, false )
, aIsCollection ( false, false )
, aReadOnlyDoc ( true, false )
, aHidden( false, false )
......@@ -41,7 +40,6 @@ SvMetaAttribute::SvMetaAttribute()
SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
: aType( pType )
, aAutomation( true, false )
, aExport( true, false )
, aIsCollection ( false, false)
, aReadOnlyDoc ( true, false)
......@@ -85,12 +83,6 @@ bool SvMetaAttribute::GetHidden() const
return static_cast<SvMetaAttribute *>(GetRef())->GetHidden();
}
bool SvMetaAttribute::GetAutomation() const
{
if( aAutomation.IsSet() || !GetRef() ) return aAutomation;
return static_cast<SvMetaAttribute *>(GetRef())->GetAutomation();
}
bool SvMetaAttribute::GetIsCollection() const
{
if( aIsCollection.IsSet() || !GetRef() )
......@@ -184,7 +176,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase,
aSlotId.ReadSvIdl( rBase, SvHash_SlotId(), rInStm );
aExport.ReadSvIdl( SvHash_Export(), rInStm );
aHidden.ReadSvIdl( SvHash_Hidden(), rInStm );
aAutomation.ReadSvIdl( SvHash_Automation(), rInStm );
aIsCollection.ReadSvIdl( SvHash_IsCollection(), rInStm );
aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
if( aReadonly.ReadSvIdl( SvHash_Readonly(), rInStm ) )
......
......@@ -75,7 +75,6 @@ char const * SyntaxStrings[] = {
"\t\titem-method-args",
"\t\tAccelConfig, MenuConfig, ToolbarConfig",
"\t\tAutomation*",
"\t\tAutoUpdate",
"\t\tContainer",
"\t\tDefault = Identifier",
......
......@@ -105,7 +105,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(GroupId)
A_ENTRY(TypeLibFile)
A_ENTRY(Export)
A_ENTRY(Automation)
A_ENTRY(PseudoPrefix)
A_ENTRY(define)
A_ENTRY(MenuConfig)
......
......@@ -78,7 +78,7 @@ interface StarCalc
shell ScModule
{
import StarCalc[Automation];
import StarCalc;
}
......@@ -443,5 +443,5 @@ interface Cell
shell ScCellShell : ScFormatShell
{
import Cell[Automation];
import Cell;
}
......@@ -112,5 +112,5 @@ shell ScDocShell
uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" )
]
{
import TableDocument[Automation];
import TableDocument;
}
......@@ -145,7 +145,7 @@ interface FormatForSelection
shell ScFormatShell
{
import FormatForSelection[Automation];
import FormatForSelection;
// import Interior ".Interior";
import TableFont ".Font";
}
......
......@@ -273,7 +273,7 @@ shell ScTabViewShell
import TableOLEObject "SelectedObject";
import Tables "ActiveDocument.Tables";
import BaseSelection;
import TableEditView[Automation];
import TableEditView;
// import SearchSettings;
......
......@@ -322,10 +322,10 @@ interface SlideSorterView
shell SlideSorterController
{
import SlideSorterView[Automation];
import SlideSorterView;
}
shell SlideSorterViewShell
{
import SlideSorterView[Automation];
import SlideSorterView;
}
......@@ -143,5 +143,5 @@ interface ViewShellBaseView
shell ViewShellBase
{
import ViewShellBaseView[Automation];
import ViewShellBaseView;
}
......@@ -97,6 +97,6 @@ interface StarImpress
shell SdModule
{
import StarImpress[Automation];
import StarImpress;
}
......@@ -25,5 +25,5 @@ interface ImpressDocument : DrawDocument
shell DrawDocShell
{
import ImpressDocument[Automation];
import ImpressDocument;
}
......@@ -196,17 +196,17 @@ interface ImpressEditView : DrawView
shell DrawViewShell
{
import ImpressEditView[Automation];
import ImpressEditView;
}
shell PresentationViewShell
{
import ImpressEditView[Automation];
import ImpressEditView;
}
shell PreviewViewShell
{
import ImpressEditView[Automation];
import ImpressEditView;
}
......@@ -25,5 +25,5 @@ interface GraphicDocument : DrawDocument
shell GraphicDocShell
{
import GraphicDocument[Automation];
import GraphicDocument;
}
......@@ -36,7 +36,7 @@ interface GraphicEditView : DrawView
shell GraphicViewShell
{
import GraphicEditView[Automation];
import GraphicEditView;
SID_INSERT_POSTIT
[
ExecMethod = ExecuteAnnotation;
......
......@@ -552,6 +552,6 @@ interface OutlineView
shell OutlineViewShell
{
import OutlineView[Automation];
import OutlineView;
}
......@@ -17,9 +17,6 @@
*/
interface Application
[
Automation = FALSE ;
]
{
SID_AUTOPILOTMENU // ole(no) api(final/play/rec)
[
......@@ -220,7 +217,7 @@ interface Application
shell SfxApplication
{
import Application [Automation];
import Application;
import Documents "Documents";
SID_NEWDOCDIRECT // ole(no) api(no)
......
......@@ -59,9 +59,6 @@ interface Documents
interface Document
[
Automation = FALSE ;
]
{
SID_DOCTITLE // ole(opt) api(final/norec)
[
......@@ -95,9 +92,6 @@ interface Document
}
interface OfficeDocument : Document
[
Automation = FALSE
]
{
SID_DOCINFO_AUTHOR // ole(opt) api(todo)
[
......@@ -212,7 +206,7 @@ interface OfficeDocument : Document
shell SfxObjectShell
{
import OfficeDocument [Automation];
import OfficeDocument;
SID_DOCINFO // ole(no) api(final/play)
[
......
......@@ -17,9 +17,6 @@
*/
interface Window
[
Automation = FALSE ;
]
{
SID_HYPERLINK_DIALOG
[
......@@ -312,9 +309,6 @@ interface Window
}
interface BrowseWindow : Window
[
Automation = FALSE ;
]
{
SID_ACTIVATE // ole(no) api(final/play/rec)
[
......@@ -368,9 +362,6 @@ interface BrowseWindow : Window
}
interface TopWindow : BrowseWindow
[
Automation = FALSE ;
]
{
SID_NEWDOCDIRECT // ole(no) api(no)
[
......@@ -413,7 +404,7 @@ interface TopWindow : BrowseWindow
shell SfxViewFrame
{
import TopWindow [Automation];
import TopWindow;
SID_FORMATMENUSTATE
[
......
......@@ -17,9 +17,6 @@
*/
interface View
[
Automation = FALSE ;
]
{
SID_MAIL_SENDDOC // ole(no) api(todo)
......@@ -97,5 +94,5 @@ interface View
shell SfxViewShell
{
import View [Automation];
import View;
}
......@@ -47,7 +47,7 @@ StarMath
shell SmModule
{
import StarMath[Automation];
import StarMath;
}
interface FormulaDocument
......@@ -142,7 +142,7 @@ interface FormulaDocument
shell SmDocShell
{
import FormulaDocument[Automation];
import FormulaDocument;
}
......@@ -315,7 +315,7 @@ interface FormulaView
shell SmViewShell
{
import FormulaView[Automation];
import FormulaView;
}
}
......@@ -627,7 +627,7 @@ interface FormTextAttributeShell
shell FmFormShell
{
import FormTextAttributeShell;
import Form [Automation];
import Form;
SID_FM_CONFIG // ole : no, status : ?
[
......
......@@ -17,7 +17,6 @@
*/
interface _Annotation
[ Automation = FALSE; ]
{
FN_DELETE_COMMENT
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextSelection
[
Automation = FALSE;
]
{
SID_ATTR_BRUSH
[
......
......@@ -17,7 +17,6 @@
*/
interface _Bezier : Base
[ Automation = FALSE; ]
{
SID_DELETE
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextDocument
[
Automation = FALSE;
]
{
SID_PRINTPREVIEW
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextDrawBase
[
Automation = FALSE;
]
{
FN_DRAW_WRAP_DLG
[
......
......@@ -16,9 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
interface BaseTextDrawForm
[
Automation = FALSE;
]
{
SID_HYPERLINK_SETLINK
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextFrame
[
Automation = FALSE;
]
{
//UUUU
SID_ATTR_FILL_STYLE
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextGraphic
[
Automation = FALSE;
]
{
SID_FLIP_VERTICAL
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextList
[
Automation = FALSE
]
{
FN_NUM_BULLET_DOWN // status(final|play)
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextMedia
[
Automation = FALSE;
]
{
SID_DELETE
[
......
......@@ -8,7 +8,6 @@
*/
interface _Navigation
[ Automation = FALSE; ]
{
SfxVoidItem NavigateBack FN_NAVIGATION_BACK
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextOLEObject
[
Automation = FALSE;
]
{
}
......@@ -17,9 +17,6 @@
*/
interface BaseTextTable
[
Automation = FALSE;
]
{
FN_FORMAT_TABLE_DLG // status(final|play)
......
......@@ -16,9 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
interface BaseText
[
Automation = FALSE;
]
{
FN_NEW_GLOSSARY // status(final|play)
[
......
......@@ -17,9 +17,6 @@
*/
interface BaseTextEditView
[
Automation = FALSE;
]
{
FN_REFRESH_VIEW // status(final|play)
[
......
......@@ -379,5 +379,5 @@ interface Annotation : _Annotation
shell SwAnnotationShell
{
import Annotation[Automation];
import Annotation;
}
......@@ -49,6 +49,6 @@ interface TextSelection : BaseTextSelection
shell SwBaseShell
{
import TextSelection[Automation];
import TextSelection;
}
......@@ -120,6 +120,6 @@ interface TextBezier : TextSelection
shell SwBezierShell: SwBaseShell
{
import TextBezier[Automation];
import TextBezier;
}
......@@ -63,12 +63,12 @@ interface TextDocument : BaseTextDocument
shell SwDocShell
{
import TextDocument[Automation];
import TextDocument;
}
shell SwGlosDocShell : SwDocShell
{
import TextDocument[Automation];
import TextDocument;
SID_SAVEDOC // status()
[
......
......@@ -408,7 +408,7 @@ interface TextDraw : TextDrawBase
shell SwDrawShell : SwDrawBaseShell
{
import TextDraw [Automation];
import TextDraw;
// no export
......
......@@ -17,16 +17,13 @@
*/
interface TextDrawBase : BaseTextDrawBase
[
Automation = FALSE;
]
{
import TextSelection;
}
shell SwDrawBaseShell: SwBaseShell
{
import TextDrawBase[Automation];
import TextDrawBase;
import Sidebar;
SID_OBJECT_ALIGN
......
......@@ -710,7 +710,7 @@ interface TextDrawFont
shell SwDrawTextShell
{
import TextDrawText[Automation];
import TextDrawText;
import TextDrawFont ".DrawFont";
}
......@@ -25,6 +25,6 @@ interface TextDrawForm: BaseTextDrawForm
shell SwDrawFormShell : SwDrawBaseShell
{
import TextDrawForm[Automation];
import TextDrawForm;
}
......@@ -26,7 +26,7 @@ interface TextFrame : BaseTextFrame
shell SwFrameShell : SwBaseShell
{
import TextFrame[Automation];
import TextFrame;
FN_FRAME_CHAIN
[
......
......@@ -26,6 +26,6 @@ interface TextGraphic : BaseTextGraphic
shell SwGrfShell : SwBaseShell
{
import TextGraphic[Automation];
import TextGraphic;
}
......@@ -26,6 +26,6 @@ interface TextList : BaseTextList
shell SwListShell : SwBaseShell
{
import TextList[Automation];
import TextList;
}
......@@ -26,5 +26,5 @@ interface TextMedia : BaseTextMedia
shell SwMediaShell : SwBaseShell
{
import TextMedia[Automation];
import TextMedia;
}
......@@ -9,7 +9,7 @@
shell SwNavigationShell
{
import _Navigation[Automation];
import _Navigation;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -26,6 +26,6 @@ interface TextOLEObject : BaseTextOLEObject
shell SwOleShell: SwFrameShell
{
import TextOLEObject[Automation];
import TextOLEObject;
}