[Libreoffice-commits] .: extensions/source

[Michael Meeks]

 extensions/source/plugin/inc/plugin/aqua/sysplug.hxx |   12 ++++++------
 extensions/source/plugin/inc/plugin/unx/sysplug.hxx  |    6 +++---
 extensions/source/plugin/unx/nppapi.cxx              |    6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 68beee834404886a0efb749e8c041c329850e5e9
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Nov 8 15:52:56 2011 +0000

    fix build against new npapi.h (yet more), blind fixes for aqua too

diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index 53f137e..12428c0 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -115,22 +115,22 @@ public:
     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 mode, int16 argc,
+    virtual NPError     NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
                                  char* argn[], char* argv[], NPSavedData *saved );
     virtual NPError     NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream,
-                                       NPBool seekable, uint16* stype );
+                                       NPBool seekable, uint16_t* stype );
     virtual void        NPP_Print( NPP instance, NPPrint* platformPrint );
     virtual NPError     NPP_SetWindow( NPP instance, NPWindow* window );
     virtual void        NPP_Shutdown();
     virtual void        NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname );
     virtual void        NPP_URLNotify( NPP instance, const char* url,
                                        NPReason reason, void* notifyData );
-    virtual int32       NPP_Write( NPP instance, NPStream* stream, int32 offset,
-                                   int32 len, void* buffer );
-    virtual int32       NPP_WriteReady( NPP instance, NPStream* stream );
+    virtual int32_t       NPP_Write( NPP instance, NPStream* stream, int32 offset,
+                                   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       NPP_HandleEvent( NPP instance, void* event );
+    virtual int16_t       NPP_HandleEvent( NPP instance, void* event );
 
     virtual NPError     NPP_SetWindow( XPlugin_Impl* );
     virtual NPError     NPP_Destroy( XPlugin_Impl*, NPSavedData** save );
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index a10c688..0dc6a6e 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -70,9 +70,9 @@ public:
                                    const char* fname );
     virtual void NPP_URLNotify( NPP instance, const char* url, NPReason reason,
                                 void* notifyData );
-    virtual int32 NPP_Write( NPP instance, NPStream* stream, int32 offset,
-                             int32 len, void* buffer );
-    virtual int32 NPP_WriteReady( NPP instance, NPStream* stream );
+    virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset,
+                               int32_t len, void* buffer );
+    virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream );
     virtual char* NPP_GetMIMEDescription();
     virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value );
     virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 34ce8f8..87baa29 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -554,7 +554,7 @@ void UnxPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reaso
           NULL );
 }
 
-int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer )
+int32_t UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer )
 {
     GET_INSTANCE_RET( -1 );
     sal_uInt32 nFileID = GetStreamID( stream );
@@ -577,7 +577,7 @@ int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, in
     return aRet;
 }
 
-int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
+int32_t UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
 {
     GET_INSTANCE_RET( -1 );
     sal_uInt32 nFileID = GetStreamID( stream );
@@ -593,7 +593,7 @@ int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
     if( ! pMes )
         return 0;
 
-    int32 aRet = pMes->GetUINT32();
+    int32_t aRet = pMes->GetUINT32();
     delete pMes;
 
     return aRet;