[Libreoffice-commits] .: 2 commits - binfilter/filter

[Caolán McNamara]

 binfilter/filter/source/bf_offwrp/bf_wrapper.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 94b848408fc1579b44b18260f938382c09b6f1ad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 16 15:00:15 2010 +0000

    fix up comment

diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
index 3040bb3..b2115e3 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
@@ -78,11 +78,12 @@ Reference< XInterface >  SAL_CALL bf_OfficeWrapper_CreateInstance( const Referen
     return (XComponent*)0;
 }
 
-//added by jmeng for i31251 begin
-extern "C"{
+extern "C"
+{
+    //added for #i31251#
     void legcy_setBinfilterInitState(void);
 }
-//added by jmeng for i31251 end
+
 bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& )
     : pApp( new OfficeApplication )
     , aListeners( aMutex )
@@ -118,9 +119,8 @@ bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& )
         pSmDLL = new SmDLL;
         SmDLL::LibInit();
     }
-    //added by jmeng for i31251 begin
+    //added i#31251#
     legcy_setBinfilterInitState();
-    //added by jmeng for i31251 end
 }
 
 void SAL_CALL bf_OfficeWrapper::initialize( const Sequence< Any >& ) throw( Exception )
commit 8a413ea67a1ece2063e6ac3f45fbf11501384d8f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 16 14:58:26 2010 +0000

    WaE, fix warnings

diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
index d994bd4..3040bb3 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
@@ -83,9 +83,9 @@ extern "C"{
     void legcy_setBinfilterInitState(void);
 }
 //added by jmeng for i31251 end
-bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& xFactory )
-:	aListeners( aMutex ),
-    pApp( new OfficeApplication )
+bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& )
+    : pApp( new OfficeApplication )
+    , aListeners( aMutex )
 {
     SvtModuleOptions aMOpt;
 
@@ -123,7 +123,7 @@ bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& xF
     //added by jmeng for i31251 end
 }
 
-void SAL_CALL bf_OfficeWrapper::initialize( const Sequence< Any >& aArguments ) throw( Exception )
+void SAL_CALL bf_OfficeWrapper::initialize( const Sequence< Any >& ) throw( Exception )
 {
 }
 
@@ -202,7 +202,7 @@ extern "C"
 
 void SAL_CALL component_getImplementationEnvironment(	
     const sal_Char** ppEnvironmentTypeName,
-    uno_Environment** ppEnvironment)
+    uno_Environment** /*ppEnvironment*/)
 {
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -228,7 +228,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe
 void* SAL_CALL component_getFactory(	
     const sal_Char* pImplementationName,
     void* pServiceManager,
-    void* pRegistryKey)
+    void* /*pRegistryKey*/)
 {
     // Set default return value for this operation - if it failed.
     void* pReturn = NULL;