[Libreoffice-commits] core.git: idl/source

[Michael Meeks]

 idl/source/objects/basobj.cxx |    1 +
 idl/source/objects/types.cxx  |    8 +++++++-
 idl/source/prj/database.cxx   |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 4e3baf32d90a4747381f869837da5cf8fb3fb7f8
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Apr 10 15:13:22 2013 +0100

    svidl: more helpful error message for missing slot / types.
    
    Change-Id: I89537f526e465137f5e8c17b4d7fd134ba59af4a

diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 491d485..80d4400 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 3416266..d55083f 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 8850d98..e0c6fe6 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()) )