summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/plugin/aqua/sysplug.mm18
-rw-r--r--extensions/source/plugin/inc/plugin/aqua/sysplug.hxx2
-rw-r--r--extensions/source/plugin/inc/plugin/impl.hxx6
-rw-r--r--extensions/source/plugin/inc/plugin/model.hxx7
-rw-r--r--extensions/source/plugin/inc/plugin/plcom.hxx7
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx21
-rw-r--r--extensions/source/plugin/inc/plugin/unx/sysplug.hxx5
-rw-r--r--extensions/source/plugin/inc/plugin/win/sysplug.hxx2
-rw-r--r--extensions/source/plugin/unx/nppapi.cxx19
-rw-r--r--extensions/source/plugin/win/sysplug.cxx18
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx2
-rw-r--r--extensions/source/propctrlr/sqlcommanddesign.hxx9
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx1
-rw-r--r--extensions/source/propctrlr/xsddatatypes.hxx3
-rw-r--r--extensions/source/scanner/scanner.hxx2
-rw-r--r--extensions/source/update/check/download.hxx4
16 files changed, 5 insertions, 121 deletions
diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm
index 27134d038360..ad6210026851 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -761,24 +761,6 @@ NPError MacPluginComm::NPP_GetValue( NPP instance, NPPVariable variable, void *r
}
-NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value )
-{
- DBG_ASSERT( m_aNPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" );
- m_eCall = eNPP_SetValue;
- m_aArgs[0] = (void*)instance;
- m_aArgs[1] = (void*)variable;
- m_aArgs[2] = set_value;
- return (NPError)execute();
-}
-
-
-void * MacPluginComm::NPP_GetJavaClass()
-{
- OSL_FAIL( "no java class available!" );
- return 0;
-}
-
-
NPError MacPluginComm::NPP_Initialize()
{
return NPERR_NO_ERROR;
diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index 9c1f5cc53f14..a9b752244c7a 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -116,7 +116,6 @@ public:
public:
virtual NPError NPP_Destroy( NPP instance, NPSavedData** save );
virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason );
- virtual void * NPP_GetJavaClass();
virtual NPError NPP_Initialize();
virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
char* argn[], char* argv[], NPSavedData *saved );
@@ -132,7 +131,6 @@ public:
int32_t len, void* buffer );
virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream );
virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value );
- virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *ret_value );
virtual int16_t NPP_HandleEvent( NPP instance, void* event );
virtual NPError NPP_SetWindow( XPlugin_Impl* );
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index 80c45a7a6f8c..fdd05b7188b5 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -198,7 +198,6 @@ public:
rtl_TextEncoding getTextEncoding() { return m_aEncoding; }
NPP_t& getNPPInstance() { return m_aInstance; }
NPWindow& getNPWindow() { return m_aNPWindow; }
- SysPlugData& getSysPlugData() { return *m_pSysPlugData; }
void enterPluginCallback() { m_nCalledFromPlugin++; }
void leavePluginCallback() { m_nCalledFromPlugin--; }
@@ -232,10 +231,6 @@ public:
{ return m_rBrowserContext; }
void setPluginContext( const Reference< com::sun::star::plugin::XPluginContext > & );
- void secondLevelDispose();
-
-// static const Reference< com::sun::star::reflection::XIdlClass > & staticGetIdlClass();
-
// XInterface
virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE
@@ -340,7 +335,6 @@ public:
virtual ~PluginStream();
NPStream& getStream() { return m_aNPStream; }
- XPlugin_Impl* getPlugin() { return m_pPlugin; }
virtual PluginStreamType getStreamType() = 0;
};
diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx
index b5ac5477b9fc..bd1f2a22e7d0 100644
--- a/extensions/source/plugin/inc/plugin/model.hxx
+++ b/extensions/source/plugin/inc/plugin/model.hxx
@@ -54,9 +54,6 @@ public:
BroadcasterHelperHolder( osl::Mutex& rMutex ) :
m_aHelper( rMutex ) {}
~BroadcasterHelperHolder() {}
-
- ::cppu::OBroadcastHelper& getHelper() { return m_aHelper; }
-
};
class PluginModel : public BroadcasterHelperHolder,
@@ -84,10 +81,6 @@ class PluginModel : public BroadcasterHelperHolder,
PluginModel( const OUString& rURL, const OUString& rMimeType );
virtual ~PluginModel();
-
- const OUString& getCreationURL() { return m_aCreationURL; }
- void setMimeType( const OUString& rMime ) { m_aMimeType = rMime; }
-
// XInterface
virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
{ return OWeakAggObject::queryInterface( rType ); }
diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx
index 883a5a5122ce..213c6c494a96 100644
--- a/extensions/source/plugin/inc/plugin/plcom.hxx
+++ b/extensions/source/plugin/inc/plugin/plcom.hxx
@@ -42,12 +42,10 @@ public:
PluginComm( const OString& rLibName, bool bReusable = true );
virtual ~PluginComm();
- int getRefCount() { return m_nRefCount; }
void addRef() { m_nRefCount++; }
void decRef() { m_nRefCount--; if( ! m_nRefCount ) delete this; }
const OString& getLibName() { return m_aLibName; }
- void setLibName( const OString& rName ) { m_aLibName = rName; }
void addFileToDelete( const OUString& filename )
{ m_aFilesToDelete.push_back( filename ); }
@@ -55,7 +53,6 @@ public:
virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) = 0;
virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream,
NPError reason ) = 0;
- virtual void* NPP_GetJavaClass() = 0;
virtual NPError NPP_Initialize() = 0;
virtual NPError NPP_New( NPMIMEType pluginType, NPP instance,
uint16_t mode, int16_t argc,
@@ -64,7 +61,6 @@ public:
virtual NPError NPP_NewStream( NPP instance, NPMIMEType type,
NPStream* stream,
NPBool seekable, uint16_t* stype ) = 0;
- virtual void NPP_Print( NPP instance, NPPrint* platformPrint ) = 0;
virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) = 0;
virtual void NPP_Shutdown() = 0;
virtual void NPP_StreamAsFile( NPP instance, NPStream* stream,
@@ -74,9 +70,6 @@ public:
virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset,
int32_t len, void* buffer ) = 0;
virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) = 0;
- virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) = 0;
- virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
- void *value) = 0;
NPError NPP_SetWindow( XPlugin_Impl* );
NPError NPP_Destroy( XPlugin_Impl*, NPSavedData** save );
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index ee4787c3994a..cdfc471fcac6 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -60,22 +60,11 @@ struct MediatorMessage
delete [] m_pBytes;
}
- void Set( sal_uLong nBytes, char* pBytes )
- {
- if( m_pBytes )
- delete [] m_pBytes;
- m_nBytes = nBytes;
- m_pBytes = new char[ m_nBytes ];
- memcpy( m_pBytes, pBytes, (size_t)m_nBytes );
- }
-
sal_uLong ExtractULONG();
- char* GetString();
+ char* GetString();
sal_uInt32 GetUINT32();
- void* GetBytes( sal_uLong& );
- void* GetBytes() { sal_uLong nBytes; return GetBytes( nBytes ); }
-
- void Rewind() { m_pRun = NULL; }
+ void* GetBytes( sal_uLong& );
+ void* GetBytes() { sal_uLong nBytes; return GetBytes( nBytes ); }
};
class MediatorListener;
@@ -110,10 +99,6 @@ public:
void invalidate() { m_bValid = false; }
sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 );
- sal_uLong SendMessage( const OString& rMessage, sal_uLong nMessageID = 0 )
- {
- return SendMessage( rMessage.getLength(), rMessage.getStr(), nMessageID );
- }
bool WaitForMessage( sal_uLong nTimeOut = 5000 );
// timeout in ms
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index aac6e97e1745..b1ccb1e1283d 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -51,7 +51,6 @@ public:
virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) SAL_OVERRIDE;
virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream,
NPError reason ) SAL_OVERRIDE;
- virtual void* NPP_GetJavaClass() SAL_OVERRIDE;
virtual NPError NPP_Initialize() SAL_OVERRIDE;
virtual NPError NPP_New( NPMIMEType pluginType, NPP instance,
uint16_t mode, int16_t argc,
@@ -59,7 +58,6 @@ public:
virtual NPError NPP_NewStream( NPP instance, NPMIMEType type,
NPStream* stream,
NPBool seekable, uint16_t* stype ) SAL_OVERRIDE;
- virtual void NPP_Print( NPP instance, NPPrint* platformPrint ) SAL_OVERRIDE;
using PluginComm::NPP_SetWindow;
virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) SAL_OVERRIDE;
@@ -71,9 +69,6 @@ public:
virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset,
int32_t len, void* buffer ) SAL_OVERRIDE;
virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) SAL_OVERRIDE;
- virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) SAL_OVERRIDE;
- virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
- void *value) SAL_OVERRIDE;
static bool getPluginappPath(OString * path);
};
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 555d4004e3e2..3753212ac889 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -93,7 +93,6 @@ public:
using PluginComm::NPP_Destroy;
virtual NPError NPP_Destroy( NPP instance, NPSavedData** save );
virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason );
- virtual void * NPP_GetJavaClass();
virtual NPError NPP_Initialize();
virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
char* argn[], char* argv[], NPSavedData *saved );
@@ -111,7 +110,6 @@ public:
int32_t len, void* buffer );
virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream );
virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void *ret_alue );
- virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *ret_alue );
private:
BOOL retrieveFunction( TCHAR const * pName, void** ppFunc ) const;
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 9fbf3d3afd66..2ea3af174350 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -395,11 +395,6 @@ NPError UnxPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro
return aRet;
}
-void* UnxPluginComm::NPP_GetJavaClass()
-{
- return NULL;
-}
-
NPError UnxPluginComm::NPP_Initialize()
{
MediatorMessage* pMes =
@@ -503,10 +498,6 @@ NPError UnxPluginComm::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* s
return aRet;
}
-void UnxPluginComm::NPP_Print( NPP /*instance*/, NPPrint* /*platformPrint*/ )
-{
-}
-
NPError UnxPluginComm::NPP_SetWindow( NPP instance, NPWindow* window )
{
NPError aRet = NPERR_GENERIC_ERROR;
@@ -601,14 +592,4 @@ int32_t UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
return aRet;
}
-NPError UnxPluginComm::NPP_GetValue( NPP /*instance*/, NPPVariable /*variable*/, void* /*value*/ )
-{
- return 0;
-}
-
-NPError UnxPluginComm::NPP_SetValue( NPP /*instance*/, NPNVariable /*variable*/, void* /*value*/ )
-{
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index d34c80012295..58d8951b7d7e 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -418,24 +418,6 @@ NPError PluginComm_Impl::NPP_GetValue( NPP instance, NPPVariable variable, void
}
-NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value )
-{
- DBG_ASSERT( _NPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" );
- m_eCall = eNPP_SetValue;
- m_aArgs[0] = (void*)instance;
- m_aArgs[1] = (void*)variable;
- m_aArgs[2] = set_value;
- return (NPError)execute();
-}
-
-
-void * PluginComm_Impl::NPP_GetJavaClass()
-{
- OSL_FAIL( "no java class available!" );
- return 0;
-}
-
-
NPError PluginComm_Impl::NPP_Initialize()
{
return NPERR_NO_ERROR;
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index f204a86c8735..4d04ecb5faff 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -272,8 +272,6 @@ namespace pcr
return ( m_aDependencyHandlers.find( _rPropertyName ) != m_aDependencyHandlers.end() );
}
- sal_uInt32 GetPropertyPos(const OUString& _rPropName);
-
/** retrieves the value of the given property, by asking the appropriate XPropertyHandler
@param _rPropertyName
the name whose handler is to be obtained. Must be the name of a property
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index 41bb74e5e85f..43c1cdfcb2ea 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -170,15 +170,6 @@ namespace pcr
*/
bool impl_trySuspendDesigner_nothrow() const;
- /** gets the current value of the command property
- */
- OUString
- impl_getCommandPropertyValue_nothrow();
-
- /** sets anew value for the command property
- */
- void impl_setCommandPropertyValue_nothrow( const OUString& _rCommand ) const;
-
private:
SQLCommandDesigner( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION;
SQLCommandDesigner& operator=( const SQLCommandDesigner& ) SAL_DELETED_FUNCTION;
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index aa8e6aff5fd9..c85ef521935c 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -175,7 +175,6 @@ namespace pcr
when the hyperlink has been clicked by the user
*/
void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; }
- const Link<>& GetClickHdl( ) const { return m_aClickHandler; }
protected:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index cc1dd243ba80..37f92bba5c4e 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -49,9 +49,6 @@ namespace pcr
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
m_xFacetInfo;
- protected:
- inline ::com::sun::star::xsd::XDataType* getDataTypeInterface() const { return m_xDataType.get(); }
-
public:
XSDDataType(
const ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType >& _rxDataType
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index e7384e8ec476..70434d6fe6c4 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -81,7 +81,9 @@ public:
static OUString getImplementationName_Static() throw();
static Sequence< OUString > getSupportedServiceNames_Static() throw();
+#ifdef WIN32
void* GetData() const { return mpData; }
+#endif
void SetData( void* pData ) { ReleaseData(); mpData = pData; }
};
diff --git a/extensions/source/update/check/download.hxx b/extensions/source/update/check/download.hxx
index db3968f9163b..a8285d0f8459 100644
--- a/extensions/source/update/check/download.hxx
+++ b/extensions/source/update/check/download.hxx
@@ -64,10 +64,6 @@ public:
// stops the download after the next write operation
void stop();
- // returns true if the stop condition is set
- bool isStopped() const
- { return const_cast <Download *> (this)->m_aCondition.check(); };
-
protected:
// Determines the appropriate proxy settings for the given URL. Returns true if a proxy should be used
generated by cgit (git 2.34.1) at 2024-06-30 11:17:54 +0000