summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-04-10 15:13:22 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-04-10 15:13:22 +0100
commit0319ebf2426097d0b0cf5df808c8ec5abe42f692 (patch)
tree91dc20e95a4ec79a3ce2d858165e367e073d4783
parentbb01f1c1d2b0ed9fbe1203536d6414d9b9355b31 (diff)
svidl: more helpful error message for missing slot / types.
Change-Id: I89537f526e465137f5e8c17b4d7fd134ba59af4a
-rw-r--r--idl/source/objects/basobj.cxx1
-rw-r--r--idl/source/objects/types.cxx8
-rw-r--r--idl/source/prj/database.cxx2
3 files changed, 9 insertions, 2 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 491d485a528b..80d440027f1c 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -182,6 +182,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
if( !SetName( aName.getString(), &rBase ) )
rInStm.Seek( nTokPos );
}
+
aHelpContext.ReadSvIdl( rBase, SvHash_HelpContext(), rInStm );
aHelpText.ReadSvIdl( rBase, rInStm );
aConfigName.ReadSvIdl( SvHash_ConfigName(), rInStm );
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 3416266889ef..d55083f7c09e 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -218,7 +218,13 @@ sal_Bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
bOk = SvMetaName::ReadSvIdl( rBase, rInStm );
}
else
- rBase.SetError( "unknown type", rInStm.GetToken() );
+ {
+ SvToken *pTok = rInStm.GetToken();
+ rBase.SetError( "unknown type of token. Each new SID needs an "
+ "item statement in an SDI file, eg. "
+ "SfxVoidItem FooItem " + pTok->GetTokenAsString() +
+ " ... which describes the slot more fully", pTok );
+ }
if( !bOk )
rInStm.Seek( nTokPos );
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 8850d9813d8e..e0c6fe62acc3 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -160,7 +160,7 @@ void SvIdlDataBase::Save( SvStream & rStm, sal_uInt32 nFlags )
void SvIdlDataBase::SetError( const OString& rError, SvToken * pTok )
{
if( pTok->GetLine() > 10000 )
- aError.SetText( "hgchcg" );
+ aError.SetText( "line count overflow" );
if( aError.nLine < pTok->GetLine()
|| (aError.nLine == pTok->GetLine() && aError.nColumn < pTok->GetColumn()) )