summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bridges/source/jni_uno/jni_base.h8
-rw-r--r--include/ucbhelper/interactionrequest.hxx17
-rw-r--r--include/ucbhelper/propertyvalueset.hxx25
-rw-r--r--include/ucbhelper/resultsethelper.hxx12
-rw-r--r--io/source/stm/streamhelper.cxx11
-rw-r--r--io/source/stm/streamhelper.hxx3
-rw-r--r--pyuno/inc/pyuno/pyuno.hxx8
7 files changed, 0 insertions, 84 deletions
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index af93d6a35cac..4fd90eaa30f8 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -158,7 +158,6 @@ public:
inline bool is() const
{ return (0 != m_jo); }
inline jobject release();
- inline void reset();
inline void reset( jobject jo );
inline JLocalAutoRef & operator = ( JLocalAutoRef & auto_ref );
};
@@ -183,13 +182,6 @@ inline jobject JLocalAutoRef::release()
return jo;
}
-inline void JLocalAutoRef::reset()
-{
- if (0 != m_jo)
- m_jni->DeleteLocalRef( m_jo );
- m_jo = 0;
-}
-
inline void JLocalAutoRef::reset( jobject jo )
{
if (jo != m_jo)
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index d0996d703493..2cba1caf8033 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -529,14 +529,6 @@ public:
const OUString & getPassword() const { return m_aPassword; }
/**
- * This method returns the account that was supplied by the interaction
- * handler.
- *
- * @return the account.
- */
- const OUString & getAccount() const { return m_aAccount; }
-
- /**
* This method returns the authentication remember-mode for the password
* that was supplied by the interaction handler.
*
@@ -545,15 +537,6 @@ public:
const com::sun::star::ucb::RememberAuthentication &
getRememberPasswordMode() const { return m_eRememberPasswordMode; }
- /**
- * This method returns the authentication remember-mode for the account
- * that was supplied by the interaction handler.
- *
- * @return the remember-mode for the account.
- */
- const com::sun::star::ucb::RememberAuthentication &
- getRememberAccountMode() const { return m_eRememberAccountMode; }
-
bool getUseSystemCredentials() const { return m_bUseSystemCredentials; }
};
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index c55737379f47..09f5564b6397 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -193,62 +193,37 @@ public:
// Non-interface methods
-
void appendString( const OUString& rPropName, const OUString& rValue );
- void appendString( const sal_Char* pAsciiPropName, const OUString& rValue )
- {
- appendString( OUString::createFromAscii( pAsciiPropName ), rValue );
- }
void appendString( const ::com::sun::star::beans::Property& rProp, const OUString& rValue )
{
appendString( rProp.Name, rValue );
}
void appendBoolean( const OUString& rPropName, bool bValue );
- void appendBoolean( const sal_Char* pAsciiPropName, bool bValue )
- {
- appendBoolean( OUString::createFromAscii( pAsciiPropName ), bValue );
- }
void appendBoolean( const ::com::sun::star::beans::Property& rProp, bool bValue )
{
appendBoolean( rProp.Name, bValue );
}
void appendLong( const OUString& rPropName, sal_Int64 nValue );
- void appendLong( const sal_Char* pAsciiPropName, sal_Int64 nValue )
- {
- appendLong( OUString::createFromAscii( pAsciiPropName ), nValue );
- }
void appendLong( const ::com::sun::star::beans::Property& rProp, sal_Int64 nValue )
{
appendLong( rProp.Name, nValue );
}
void appendTimestamp( const OUString& rPropName, const ::com::sun::star::util::DateTime& rValue );
- void appendTimestamp( const sal_Char* pAsciiPropName, const ::com::sun::star::util::DateTime& rValue )
- {
- appendTimestamp( OUString::createFromAscii( pAsciiPropName ), rValue );
- }
void appendTimestamp( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::DateTime& rValue )
{
appendTimestamp( rProp.Name, rValue );
}
void appendObject( const OUString& rPropName, const ::com::sun::star::uno::Any& rValue );
- void appendObject( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Any& rValue )
- {
- appendObject( OUString::createFromAscii( pAsciiPropName ), rValue );
- }
void appendObject( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Any& rValue )
{
appendObject( rProp.Name, rValue );
}
void appendVoid( const OUString& rPropName );
- void appendVoid( const sal_Char* pAsciiPropName)
- {
- appendVoid( OUString::createFromAscii( pAsciiPropName ) );
- }
void appendVoid( const ::com::sun::star::beans::Property& rProp )
{
appendVoid( rProp.Name );
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index bd6575e6083c..5c7f9e23e1d3 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -201,18 +201,6 @@ public:
getCapabilities()
throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
- // Non-interface methods.
-
-
- /**
- * This method returns, whether the resultset is static or dynamic.
- * If neither getStatic() nor getDynamic() was called, the type
- * of the resultset is "dynamic".
- *
- * @return true, if the resultset type is "static". False, otherwise.
- */
- bool isStatic() const { return m_bStatic; }
};
}
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 988fb24a5c13..516d4e506912 100644
--- a/io/source/stm/streamhelper.cxx
+++ b/io/source/stm/streamhelper.cxx
@@ -202,17 +202,6 @@ void MemRingBuffer::forgetFromStart( sal_Int32 nBytesToForget ) throw (IRingBuff
}
-void MemRingBuffer::forgetFromEnd( sal_Int32 nBytesToForget ) throw (IRingBuffer_OutOfBoundsException)
-{
- checkInvariants();
- if( nBytesToForget > m_nOccupiedBuffer ) {
- throw IRingBuffer_OutOfBoundsException();
- }
- m_nOccupiedBuffer -= nBytesToForget;
- checkInvariants();
-}
-
-
void MemRingBuffer::shrink() throw ()
{
checkInvariants();
diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx
index 56b7412e0d89..0275557ace8c 100644
--- a/io/source/stm/streamhelper.hxx
+++ b/io/source/stm/streamhelper.hxx
@@ -57,7 +57,6 @@ public:
virtual void skip( sal_Int32 nBytesToSkip )
throw( I_FIFO_OutOfBoundsException )=0;
virtual sal_Int32 getSize() const throw( ) =0;
- virtual void shrink() throw() = 0;
virtual ~I_FIFO() {};
};
@@ -87,7 +86,6 @@ public:
throw( IRingBuffer_OutOfBoundsException )=0;
virtual sal_Int32 getSize() const throw( ) =0;
virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0;
- virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException)=0;
virtual void shrink() throw() = 0;
virtual ~IRingBuffer() {};
};
@@ -107,7 +105,6 @@ public:
throw( IRingBuffer_OutOfBoundsException ) SAL_OVERRIDE;
virtual sal_Int32 getSize() const throw( ) SAL_OVERRIDE;
virtual void forgetFromStart( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException) SAL_OVERRIDE;
- virtual void forgetFromEnd( sal_Int32 nBytesToForget ) throw(IRingBuffer_OutOfBoundsException) SAL_OVERRIDE;
virtual void shrink() throw() SAL_OVERRIDE;
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index 66ad8e69fc91..ae8f16eed2b8 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -133,14 +133,6 @@ public:
m = 0;
}
- /** clears the reference decreasing the refcount of the holded object.
- */
- void clear()
- {
- Py_XDECREF( m );
- m = 0;
- }
-
/** returns 1 when the reference points to a python object python object,
otherwise 0.
*/