summaryrefslogtreecommitdiff
path: root/idl/inc
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:51:11 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-21 18:51:11 +0200
commit200bc6c582d6cf2365001f27928c1e3d1f9c9845 (patch)
tree0f27abe75bc3603341aef715372676aee8d86835 /idl/inc
parent01ea92166c12fe080575f8faba4162779fb46c28 (diff)
parent1b465fcc0f5f699308c6ee5113dde6b82842c3dd (diff)
resyncing to master
Diffstat (limited to 'idl/inc')
-rw-r--r--idl/inc/database.hxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 74ccbd575354..c8ad5cf2bff7 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -82,7 +82,6 @@ class SvIdlDataBase
protected:
#ifdef IDL_COMPILER
- ByteString aModulePrefix;
SvMetaObjectMemberStack aContextStack;
String aPath;
SvIdlError aError;
@@ -117,7 +116,6 @@ public:
void SetExportFile( const String& rName )
{ aExportFile = rName; }
void AppendAttr( SvMetaAttribute *pSlot );
- const ByteString& GetActModulePrefix() const { return aModulePrefix; }
const SvIdlError & GetError() const { return aError; }
void SetError( const SvIdlError & r )
{ aError = r; }
@@ -128,7 +126,7 @@ public:
void Write( const ByteString & rText );
void WriteError( const ByteString & rErrWrn,
const ByteString & rFileName,
- const ByteString & rErrorText,
+ const rtl::OString& rErrorText,
sal_uLong nRow = 0, sal_uLong nColumn = 0 ) const;
void WriteError( SvTokenStream & rInStm );
void SetError( const ByteString & rError, SvToken * pTok );