Kaydet (Commit) 11490409 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused UUID and VERSION from .SDI files

Change-Id: Ieb3e47c10c497a6f642f28a6741ac0fd2ecfd419
üst f811edfa
......@@ -17,9 +17,6 @@
*/
interface BasicIDEView
[
uuid = "D88DF7A2-EE63-11d0-89CA-008029E4B0B1";
]
{
}
......@@ -508,9 +505,6 @@ shell basctl_Shell
}
interface BasicIDEDocument
[
uuid = "D88DF7A1-EE63-11d0-89CA-008029E4B0B1";
]
{
}
......
......@@ -181,21 +181,13 @@ class SvMetaExtern : public SvMetaReference
{
SvMetaModule * pModule; // included in which module
SvUUId aUUId;
SvVersion aVersion;
bool bReadUUId;
bool bReadVersion;
public:
SvMetaExtern();
SvMetaModule * GetModule() const;
void GetUUId() const;
void SetModule( SvIdlDataBase & rBase );
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
};
class SvMetaExternMemberList : public SvRefMemberList<SvMetaExtern *> {};
......
......@@ -120,24 +120,6 @@ class SvHelpContext : public SvIdentifier
{
};
class SvUUId : public SvGlobalName
{
public:
SvUUId() {}
bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
};
class SvVersion
{
sal_uInt16 nMajorVersion;
sal_uInt16 nMinorVersion;
public:
SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
bool ReadSvIdl( SvTokenStream & rInStm );
};
#endif // INCLUDED_IDL_INC_BASTYPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -35,7 +35,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_String;
SvStringHashEntryRef MM_UCHAR;
SvStringHashEntryRef MM_USHORT;
SvStringHashEntryRef MM_uuid;
SvStringHashEntryRef MM_HelpContext;
SvStringHashEntryRef MM_HelpText;
SvStringHashEntryRef MM_void;
......@@ -65,7 +64,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_map;
SvStringHashEntryRef MM_Default;
SvStringHashEntryRef MM_HelpFile;
SvStringHashEntryRef MM_Version;
SvStringHashEntryRef MM_import;
SvStringHashEntryRef MM_SlotIdFile;
SvStringHashEntryRef MM_SvName;
......@@ -89,7 +87,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_Container;
SvStringHashEntryRef MM_ImageRotation;
SvStringHashEntryRef MM_ImageReflection;
SvStringHashEntryRef MM_IsCollection;
SvStringHashEntryRef MM_ReadOnlyDoc;
SvStringHashEntryRef MM_union;
SvStringHashEntryRef MM_struct;
......@@ -130,7 +127,6 @@ HASH_INLINE(interface)
HASH_INLINE(in)
HASH_INLINE(out)
HASH_INLINE(inout)
HASH_INLINE(uuid)
HASH_INLINE(HelpContext)
HASH_INLINE(HelpText)
HASH_INLINE(shell)
......@@ -156,7 +152,6 @@ HASH_INLINE(item)
HASH_INLINE(PseudoSlots)
HASH_INLINE(Default)
HASH_INLINE(HelpFile)
HASH_INLINE(Version)
HASH_INLINE(import)
HASH_INLINE(SlotIdFile)
HASH_INLINE(SvName)
......@@ -181,7 +176,6 @@ HASH_INLINE(SbxObject)
HASH_INLINE(Container)
HASH_INLINE(ImageRotation)
HASH_INLINE(ImageReflection)
HASH_INLINE(IsCollection)
HASH_INLINE(ReadOnlyDoc)
HASH_INLINE(union)
HASH_INLINE(struct)
......
......@@ -38,7 +38,6 @@ class SvMetaModule : public SvMetaExtern
bIsModified : 1;
SvGlobalName aBeginName;
SvGlobalName aEndName;
SvGlobalName aNextName;
protected:
virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
......@@ -48,7 +47,6 @@ public:
SvMetaModule( bool bImported );
bool FillNextName( SvGlobalName * );
bool IsImported() const { return bImported; }
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
......
......@@ -37,7 +37,6 @@ class SvMetaAttribute : public SvMetaReference
SvMetaTypeRef aType;
SvIdentifier aSlotId;
SvBOOL aExport;
SvBOOL aIsCollection;
SvBOOL aReadOnlyDoc;
SvBOOL aHidden;
bool bNewAttr;
......@@ -56,7 +55,6 @@ public:
const SvIdentifier & GetSlotId() const;
bool GetExport() const;
bool GetHidden() const;
bool GetIsCollection() const;
bool GetReadOnlyDoc() const;
SvMetaType * GetType() const;
......
......@@ -164,8 +164,6 @@ SvMetaReference::SvMetaReference()
SvMetaExtern::SvMetaExtern()
: pModule( nullptr )
, bReadUUId( false )
, bReadVersion( false )
{
}
......@@ -175,31 +173,14 @@ SvMetaModule * SvMetaExtern::GetModule() const
return pModule;
}
void SvMetaExtern::GetUUId() const
{
if( aUUId == SvGlobalName() )
GetModule()->FillNextName( &const_cast<SvMetaExtern *>(this)->aUUId );
}
void SvMetaExtern::SetModule( SvIdlDataBase & rBase )
{
pModule = static_cast<SvMetaModule *>(rBase.GetStack().Get( checkSvMetaObject<SvMetaModule> ));
}
void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
if( aUUId.ReadSvIdl( rBase, rInStm ) )
bReadUUId = true;
if( aVersion.ReadSvIdl( rInStm ) )
bReadVersion = true;
}
bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
SetModule( rBase );
GetUUId(); // id gets created
return SvMetaReference::ReadSvIdl( rBase, rInStm );
}
......
......@@ -28,36 +28,6 @@
#include <osl/diagnose.h>
#include <tools/stream.hxx>
static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( pName ) )
{
bool bOk = false;
if( rInStm.Read( '=' ) )
{
pTok = rInStm.GetToken_Next();
if( pTok->IsInteger() )
{
sal_uLong n = pTok->GetNumber();
if ( n >= nMin && n <= nMax )
{
*pValue = n;
bOk = true;
}
}
}
if( bOk )
return true;
}
rInStm.Seek( nTokPos );
return false;
}
bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
......@@ -195,55 +165,4 @@ void SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
}
bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->Is( SvHash_uuid() ) )
{
bool bOk = true;
bool bBraket = rInStm.Read( '(' );
if( bBraket || rInStm.Read( '=' ) )
{
pTok = &rInStm.GetToken();
if( pTok->IsString() )
{
pTok = rInStm.GetToken_Next();
bOk = MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
}
if( bOk && bBraket )
bOk = rInStm.Read( ')' );
}
if( bOk )
return true;
}
rInStm.Seek( nTokPos );
return false;
}
bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
{
sal_uLong n = 0;
sal_uInt32 nTokPos = rInStm.Tell();
if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
{
nMajorVersion = (sal_uInt16)n;
if( rInStm.Read( '.' ) )
{
SvToken * pTok = rInStm.GetToken_Next();
if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF )
{
nMinorVersion = (sal_uInt16)pTok->GetNumber();
return true;
}
}
else
return true;
}
rInStm.Seek( nTokPos );
return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -43,19 +43,6 @@ bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase )
return SvMetaExtern::SetName( rName );
}
bool SvMetaModule::FillNextName( SvGlobalName * pName )
{
*pName = aNextName;
if( aNextName < aEndName )
{
++aNextName;
bIsModified = true;
return true;
}
return false;
}
void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
......@@ -216,8 +203,6 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
rInStm.ReadDelemiter();
if( bOk )
{
aNextName = aBeginName;
rBase.Push( this ); // onto the context stack
if( ReadNameSvIdl( rBase, rInStm ) )
......
......@@ -31,7 +31,6 @@
SvMetaAttribute::SvMetaAttribute()
: aExport( true, false )
, aIsCollection ( false, false )
, aReadOnlyDoc ( true, false )
, aHidden( false, false )
, bNewAttr( false )
......@@ -41,7 +40,6 @@ SvMetaAttribute::SvMetaAttribute()
SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
: aType( pType )
, aExport( true, false )
, aIsCollection ( false, false)
, aReadOnlyDoc ( true, false)
, aHidden( false, false )
, bNewAttr( false )
......@@ -77,16 +75,6 @@ bool SvMetaAttribute::GetHidden() const
return static_cast<SvMetaAttribute *>(GetRef())->GetHidden();
}
bool SvMetaAttribute::GetIsCollection() const
{
if( aIsCollection.IsSet() || !GetRef() )
{
return aIsCollection;
}
return static_cast<SvMetaSlot *>(GetRef())->GetIsCollection();
}
bool SvMetaAttribute::GetReadOnlyDoc() const
{
if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc;
......@@ -170,7 +158,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase,
aSlotId.ReadSvIdl( rBase, SvHash_SlotId(), rInStm );
aExport.ReadSvIdl( SvHash_Export(), rInStm );
aHidden.ReadSvIdl( SvHash_Hidden(), rInStm );
aIsCollection.ReadSvIdl( SvHash_IsCollection(), rInStm );
aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
}
......
......@@ -83,7 +83,6 @@ char const * SyntaxStrings[] = {
"\t\tFastCall",
"\t\tGet, Set",
"\t\tGroupId = Identifier",
"\t\tIsCollection",
"\t\tImageRotation",
"\t\tImageReflection",
"\t\tPseudoPrefix = Identifier",
......
......@@ -63,7 +63,6 @@ SvGlobalHashNames::SvGlobalHashNames()
, MM_String( INS( "String" ) )
, MM_UCHAR( INS( "UCHAR" ) )
, MM_USHORT( INS( "USHORT" ) )
, MM_uuid( INS( "uuid" ) )
, MM_HelpContext( INS( "HelpContext" ) )
, MM_HelpText( INS( "HelpText" ) )
, MM_void( INS( "void" ) )
......@@ -92,7 +91,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(map)
A_ENTRY(Default)
A_ENTRY(HelpFile)
A_ENTRY(Version)
A_ENTRY(import)
A_ENTRY(SlotIdFile)
A_ENTRY(SvName)
......@@ -116,7 +114,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(Container)
A_ENTRY(ImageRotation)
A_ENTRY(ImageReflection)
A_ENTRY(IsCollection)
A_ENTRY(ReadOnlyDoc)
A_ENTRY(union)
A_ENTRY(struct)
......
......@@ -17,9 +17,6 @@
*/
interface StarCalc
[
uuid ( "AB3257C0-07D7-11CF-89CB-008029E4B0B1" )
]
{
FID_AUTOCOMPLETE [ ExecMethod = Execute; StateMethod = GetState; ]
SID_DETECTIVE_AUTO [ ExecMethod = Execute; StateMethod = GetState; ]
......
......@@ -18,9 +18,6 @@
interface CellSelection
[
uuid ( "D7680520-137B-11D3-B25B-006097DA68F3" )
]
{
SbxObject Movement
[
......@@ -242,9 +239,6 @@ interface CellSelection
interface CellMovement
[
uuid ( "FF2E35C0-137B-11D3-B25B-006097DA68F3" )
]
{
SID_NEXT_TABLE
[
......@@ -421,9 +415,6 @@ interface CellMovement
interface RangeSelection
[
uuid ( "0CAB4620-137C-11D3-B25B-006097DA68F3" )
]
{
import CellSelection;
import FormatForSelection;
......@@ -432,9 +423,6 @@ interface RangeSelection
}
interface Cell
[
uuid ( "F0645A00-1921-11D3-B25B-006097DA68F3" )
]
{
import CellSelection;
import CellMovement;
......
......@@ -18,9 +18,6 @@
interface TableSelection
[
uuid = "BA338A41-064E-11d0-89CB-008029E4B0B1" ;
]
{
SID_DELETE_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ]
SID_OPENDLG_EDIT_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ]
......@@ -59,9 +56,6 @@ interface TableSelection
interface TableDocument
[
uuid = "BA338A42-064E-11d0-89CB-008029E4B0B1" ;
]
{
SID_OPEN_CALC [ ExecMethod = Execute; StateMethod = GetState; ]
SID_SBA_IMPORT [ ExecMethod = Execute; StateMethod = GetState; ]
......@@ -77,10 +71,7 @@ interface TableDocument
SID_PIVOT_GET [ StateMethod = GetSbxState; ]
SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ]
SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ]
SbxObject OLEObjects
[
IsCollection ;
]
SbxObject OLEObjects []
SID_CHART_SOURCE [ ExecMethod = Execute; ]
SID_CHART_ADDSOURCE [ ExecMethod = Execute; ]
FID_AUTO_CALC [ ExecMethod = Execute; StateMethod = GetState; ]
......@@ -106,9 +97,6 @@ interface TableDocument
shell ScDocShell
[
uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" )
]
{
import TableDocument;
}
......@@ -18,9 +18,6 @@
interface TableFont
[
uuid ( "2E4AC1C0-137C-11D3-B25B-006097DA68F3" )
]
{
SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ]
SID_ATTR_CHAR_PREVIEW_FONT [ ExecMethod = ExecuteAttr; ]
......@@ -40,9 +37,6 @@ interface TableFont
interface FormatForSelection
[
uuid ( "40F448A0-137C-11D3-B25B-006097DA68F3" )
]
{
//Auch das Basic muss wieder laufen
SbxObject Font SID_PROP_FONT
......
......@@ -19,9 +19,6 @@
interface TableOLEObject
[
uuid ( "C04AA960-137B-11D3-B25B-006097DA68F3" )
]
{
SID_ACTIVE_OBJ_NAME [ StateMethod = GetObjectState; ]
SID_OLE_OBJECT [ StateMethod = GetObjectState; ]
......@@ -36,9 +33,6 @@ interface TableOLEObject
interface Tables
[
uuid = "5692EFC0-355B-11cf-89CB-008029E4B0B1" ;
]
{
FID_TAB_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ]
FID_TAB_DESELECTALL [ ExecMethod = Execute; StateMethod = GetState; ]
......@@ -55,9 +49,6 @@ interface Tables
interface BaseSelection
[
uuid = "02ABE040-137B-11D3-B25B-006097DA68F3" ;
]
{
// Einfuegen von Objekten {
......@@ -132,9 +123,6 @@ interface BaseSelection
}
interface TableEditView
[
uuid ( "16D7E4A0-2FB4-11CF-89CB-008029E4B0B1" )
]
{
SbxObject SearchSettings
[
......@@ -230,32 +218,20 @@ interface TableEditView
interface DataPilotTables
[
uuid ( "86DB0400-4EE6-11d1-89CB-008029E4B0B1" )
]
{
}
interface DataPilotTable
[
uuid ( "E8DBA2C1-4C5E-11d1-89CB-008029E4B0B1" )
]
{
SbxObject DataPilotFields SID_PIVOT_FIELDS
[ HelpText = "" ; ]
}
interface DataPilotFields
[
uuid ( "BA09AF20-4C70-11d1-89CB-008029E4B0B1" )
]
{
}
interface DataPilotField
[
uuid ( "D2C2C540-4C8B-11d1-89CB-008029E4B0B1" )
]
{
String FieldName SID_PFIELD_NAME
[ HelpText = "" ; ]
......
......@@ -17,9 +17,6 @@
*/
interface StarImpress
[
uuid ( "A1814AE0-07D4-11CF-89CA-008029E4B0B1" )
]
{
SID_NEWDOC // ole : ?, status : ?
[
......
......@@ -17,9 +17,6 @@
*/
interface ImpressDocument : DrawDocument
[
uuid ( "D8E15AE0-2FB4-11CF-89CA-008029E4B0B1" ) ;
]
{
}
......
......@@ -16,9 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
interface ImpressEditView : DrawView
[
uuid ( "661B07E0-2FB4-11CF-89CA-008029E4B0B1" ) ;
]
{
SID_MODIFYPAGE // ole : no, status : play rec
[
......
......@@ -17,9 +17,6 @@
*/
interface GraphicDocument : DrawDocument
[
uuid ( "D7474100-ACDF-11D0-89CB-008029E4B0B1" ) ; // created at 04.04.97
]
{
}
......
......@@ -17,9 +17,6 @@
*/
interface GraphicEditView : DrawView
[
uuid ( "95F11180-ACE0-11D0-89CA-008029E4B0B1" ) ;
]
{
SID_SEARCH_OPTIONS // ole : ?, status : ?
[
......
......@@ -17,9 +17,6 @@
*/
interface OutlineView
[
uuid ( "92E2F580-2FB4-11CF-89CA-008029E4B0B1" ) ;
]
{
SID_CUT // ole : no, status : ?
[
......
......@@ -17,9 +17,6 @@
*/
interface Documents
[
uuid = "61753B60-1114-101D-B8ED-3273768855A7" ;
]
{
SID_NEWDOC // ole(opt) api(final/play/rec)
[
......
......@@ -35,9 +35,6 @@ StarMath
include "svx.sdi"
include "smath.sdi"
interface StarMath
[
uuid ( "92B0FD20-2FC1-11CF-89CA-008029E4B0B1" )
]
{
SID_CONFIGEVENT //idlpp ole : no , status : no
[
......@@ -51,9 +48,6 @@ shell SmModule
}
interface FormulaDocument
[
uuid ( "815CBB20-2FC3-11CF-89CA-008029E4B0B1" )
]
{
SID_DOCTEMPLATE //idlpp ole : no , status : no
[
......@@ -147,9 +141,6 @@ shell SmDocShell
interface FormulaView
[
uuid ( "CE1A6C00-2FC3-11CF-89CA-008029E4B0B1" )
]
{
SID_FORMULACURSOR
[
......
......@@ -17,9 +17,6 @@
*/
interface Form
[
uuid = "F38D29A3-9EDA-11d1-AAF5-00A0248A7FBC"
]
{
SID_FM_CONFIG // ole : no, status : ?
[
......
......@@ -34,9 +34,6 @@ SlotIdFile( "svxslots.hrc" )
include "fmslots.sdi"
/* interface SearchSettings: Object
[
uuid = "19B54420-184C-101D-B8ED-3273768855A7";
]
{
SID_SEARCH_ITEM
[
......@@ -46,9 +43,6 @@ SlotIdFile( "svxslots.hrc" )
}
interface Interior : Object
[
uuid ( "6CFA4FC0-608E-11cf-89CB-008029E4B0B1" )
]
{
SID_ATTR_BRUSH // status(final|play)
[
......@@ -58,9 +52,6 @@ SlotIdFile( "svxslots.hrc" )
}
interface OLEObjects : Collection
[
uuid = "BA338A43-064E-11d0-89CB-008029E4B0B1" ;
]
{
}
*/
......
......@@ -802,7 +802,6 @@ interface BaseTextEditView
}
interface GlobalContents
[ uuid = "1FD80520-F517-11d0-AC9B-008029E867C6"; ]
{
UINT16 Type FN_COLL_TYPE
(
......
......@@ -17,9 +17,6 @@
*/
interface Annotation : _Annotation
[
uuid = "CA0C4280-293D-11D1-89CB-008029E4B0B1"
]
{
SID_THESAURUS // api:
......
......@@ -17,9 +17,6 @@
*/
interface TextSelection : BaseTextSelection
[
uuid = "F23BA0A8-73A0-11d0-89CA-008029E4B0B1"
]
{
// Here shall the slots are inserted which are not supported by
// StarWriter/WEB
......
......@@ -17,8 +17,6 @@
*/
interface TextBezier : TextSelection
[
uuid = "68EF7EA0-6876-11D0-A887-008029E86826" ]
{