Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/ure

This commit is contained in:
Jan Holesovsky 2010-11-25 21:00:57 +01:00
commit 90ce30a134
6 changed files with 13 additions and 13 deletions

View file

@ -117,13 +117,13 @@ public:
inline void setBridgePropertyCall()
{ m_bBridgePropertyCall = sal_True; }
inline sal_Bool isBridgePropertyCall()
inline sal_Bool isBridgePropertyCall() const
{ return m_bBridgePropertyCall; }
inline sal_Bool isOneway()
inline sal_Bool isOneway() const
{ return m_bOneway; }
inline void setUnmarshal( Unmarshal *p )
{ m_pUnmarshal = p; }
inline void setUnmarshal( Unmarshal *p )
{ m_pUnmarshal = p; }
public:
typelib_InterfaceMethodTypeDescription *m_pMethodType;
typelib_InterfaceAttributeTypeDescription *m_pAttributeType;
@ -248,7 +248,7 @@ public:
m_aEntries[m_nCalls].m_bIgnoreCache = bIgnoreCache;
}
inline sal_Bool isFull()
inline sal_Bool isFull() const
{ return m_nCalls >= m_nMaxMessages; }
inline sal_Int8 *getHeap( sal_Int32 nSizeToAlloc )

View file

@ -69,7 +69,7 @@ namespace bridges_urp
return ( m_pos - m_base ) == 2*sizeof( sal_Int32 );
}
inline sal_Int32 Marshal::getSize()
inline sal_Int32 Marshal::getSize() const
{
return ((sal_Int32) (m_pos - m_base));
}

View file

@ -87,12 +87,12 @@ namespace bridges_urp
// is only valid, after finish has been called.
// valid until destructed.
inline sal_Int32 getSize();
inline sal_Int32 getSize() const;
inline sal_Int32 getPos()
inline sal_Int32 getPos() const
{ return m_pos - m_base; }
inline sal_Bool isSystemLittleEndian()
inline sal_Bool isSystemLittleEndian() const
{ return g_bMarshalSystemIsLittleEndian; }
private:

View file

@ -124,7 +124,7 @@ protected:
::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False);
void dumpCppuGetTypeMemberDecl(FileStream& o, CunoTypeDecl eDeclFlag);
sal_Bool isNestedType()
sal_Bool isNestedType() const
{ return m_bIsNestedType; };
RegistryKeyNames& getNestedTypeNames()

View file

@ -123,7 +123,7 @@ public:
ORegKey* getRootKey();
const store::OStoreFile& getStoreFile()
const store::OStoreFile& getStoreFile() const
{ return m_file; }
const rtl::OUString& getName() const

View file

@ -199,12 +199,12 @@ class PolicyReader
inline void back( sal_Unicode c ) SAL_THROW( () )
{ m_back = c; }
inline bool isWhiteSpace( sal_Unicode c ) SAL_THROW( () )
inline bool isWhiteSpace( sal_Unicode c ) const SAL_THROW( () )
{ return (' ' == c || '\t' == c || '\n' == c || '\r' == c); }
void skipWhiteSpace()
SAL_THROW( (RuntimeException) );
inline bool isCharToken( sal_Unicode c ) SAL_THROW( () )
inline bool isCharToken( sal_Unicode c ) const SAL_THROW( () )
{ return (';' == c || ',' == c || '{' == c || '}' == c); }
public: