diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-04-30 19:50:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-02 08:18:14 +0200 |
| commit | a12dfa353122d1865b7c20513865a4632a621a38 (patch) | |
| tree | d37bb405e7f7783050a26b8fd98b39746cb3e278 /idl | |
| parent | 5eaad8eb1d46b6f85605c5ac210e8b1397b18b22 (diff) | |
create SfxGroupId based on o3tl::strong_int
Change-Id: Iaccf16f29b6f4b1a2c712d1e5e2bd0fa4fdb5e71
Reviewed-on: https://gerrit.libreoffice.org/37108
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/source/objects/object.cxx | 2 | ||||
| -rw-r--r-- | idl/source/objects/slot.cxx | 2 | ||||
| -rw-r--r-- | idl/source/prj/database.cxx | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 931ad3a1aacf..33a5fd75b6f6 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -327,7 +327,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) // at least one dummy WriteTab( rOutStm, 1 ); rOutStm.WriteCharPtr( "SFX_SLOT_ARG(" ).WriteOString( GetName() ) - .WriteCharPtr( ", 0, 0, " ) + .WriteCharPtr( ", 0, SfxGroupId(0), " ) .WriteCharPtr( "SFX_STUB_PTR_EXEC_NONE," ) .WriteCharPtr( "SFX_STUB_PTR_STATE_NONE," ) .WriteCharPtr( "SfxSlotMode::NONE, SfxVoidItem, 0, 0, \"\", SfxSlotMode::NONE )" ) << endl; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index b14b0ec1b031..dec49c26bd8a 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -434,7 +434,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, if( !GetGroupId().isEmpty() ) rOutStm.WriteOString( GetGroupId() ); else - rOutStm.WriteChar( '0' ); + rOutStm.WriteCharPtr( "SfxGroupId(0)" ); rOutStm.WriteChar( ',' ) << endl; WriteTab( rOutStm, 4 ); diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 377f507fe57d..3395183cf574 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -229,7 +229,12 @@ bool SvIdlDataBase::ReadIdFile( const OString& rOFileName ) } } OString aName(aNameBuf.makeStringAndClear()); - if (!ReadIdFile(aName)) + if (aName == "sfx2/groupid.hxx") + { + // contains C++ code which we cannot parse + // we special-case this by defining a macro internally in .... + } + else if (!ReadIdFile(aName)) { throw SvParseException("cannot read file: " + aName, rTok); } |