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

6 files changed, 13 insertions, 13 deletions

diff --git a/bridges/source/remote/urp/urp_job.hxx b/bridges/source/remote/urp/urp_job.hxx
index ed31e33c387b..02ef755ecfae 100644
--- a/bridges/source/remote/urp/urp_job.hxx
+++ b/bridges/source/remote/urp/urp_job.hxx
@@ -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 )
diff --git a/bridges/source/remote/urp/urp_marshal.hxx b/bridges/source/remote/urp/urp_marshal.hxx
index f66528d74703..60292cd23612 100644
--- a/bridges/source/remote/urp/urp_marshal.hxx
+++ b/bridges/source/remote/urp/urp_marshal.hxx
@@ -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));
     }
diff --git a/bridges/source/remote/urp/urp_marshal_decl.hxx b/bridges/source/remote/urp/urp_marshal_decl.hxx
index a07f6ea48f5a..639d08e47e5c 100644
--- a/bridges/source/remote/urp/urp_marshal_decl.hxx
+++ b/bridges/source/remote/urp/urp_marshal_decl.hxx
@@ -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:
diff --git a/codemaker/source/cunomaker/cunotype.hxx b/codemaker/source/cunomaker/cunotype.hxx
index 89e1347715f3..8df7a066a0a4 100644
--- a/codemaker/source/cunomaker/cunotype.hxx
+++ b/codemaker/source/cunomaker/cunotype.hxx
@@ -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()
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index bbb4a5b2016d..c08721ee84d4 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -123,7 +123,7 @@ public:
 
     ORegKey*    getRootKey();
 
-    const store::OStoreFile& getStoreFile()
+    const store::OStoreFile& getStoreFile() const
         { return m_file; }
 
     const rtl::OUString&    getName() const
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index b40fb806d4ae..5755defd7739 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -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: