[Libreoffice-commits] .: 8 commits - avmedia/source basic/source sfx2/source ucb/source xmloff/source xmlscript/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Oct 20 05:01:30 PDT 2010


 avmedia/source/gstreamer/gstplayer.cxx             |   21 +++++++++++++++------
 avmedia/source/gstreamer/gstuno.cxx                |    6 +++---
 basic/source/uno/dlgcont.cxx                       |    2 +-
 sfx2/source/doc/docmacromode.cxx                   |   11 +++++------
 ucb/source/ucp/hierarchy/hierarchydata.cxx         |    3 +--
 xmloff/source/draw/ximpshap.cxx                    |    1 -
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |    2 +-
 7 files changed, 26 insertions(+), 20 deletions(-)

New commits:
commit e7e85f10523f13830fe44992951ab8a9e4bba7b9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 11:09:42 2010 +0100

    WaE, silence warning

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index f7d7c17..8d2d94d 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -499,7 +499,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
 sal_Int16 SAL_CALL Player::getVolumeDB(  )
     throw (uno::RuntimeException)
 {
-    sal_Int16 nVolumeDB;
+    sal_Int16 nVolumeDB(0);
 
     if( mpPlaybin ) {
         double nGstVolume = 0.0;
commit 45687ecdcdde7735fd66c63f5f3a6e2c04253064
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 11:08:36 2010 +0100

    WaE, unused parameters

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index e415080..f7d7c17 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -217,7 +217,10 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
                         }
                     }
 
-                    sal_Bool aSuccess = osl_setCondition( maSizeCondition );
+#if DEBUG
+                    sal_Bool aSuccess =
+#endif
+                                          osl_setCondition( maSizeCondition );
                     DBG( "%p set condition result: %d", this, aSuccess );
                 }
             }
@@ -225,7 +228,10 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
     } else if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) {
         if( mnWidth == 0 ) {
             // an error occured, set condition so that OOo thread doesn't wait for us
-            sal_Bool aSuccess = osl_setCondition( maSizeCondition );
+#if DEBUG
+            sal_Bool aSuccess =
+#endif
+                                osl_setCondition( maSizeCondition );
             DBG( "%p set condition result: %d", this, aSuccess );
         }
     }
@@ -384,7 +390,7 @@ double SAL_CALL Player::getMediaTime(  )
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL Player::setStopTime( double fTime )
+void SAL_CALL Player::setStopTime( double /*fTime*/ )
     throw (uno::RuntimeException)
 {
     // TODO implement
@@ -402,7 +408,7 @@ double SAL_CALL Player::getStopTime(  )
 
 // ------------------------------------------------------------------------------
 
-void SAL_CALL Player::setRate( double fRate )
+void SAL_CALL Player::setRate( double /*fRate*/ )
     throw (uno::RuntimeException)
 {
     // TODO set the window rate
@@ -516,7 +522,10 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
     DBG( "%p Player::getPreferredPlayerWindowSize, member %d x %d", this, mnWidth, mnHeight );
 
     TimeValue aTimeout = { 10, 0 };
-    oslConditionResult aResult = osl_waitCondition( maSizeCondition, &aTimeout );
+#if DEBUG
+    oslConditionResult aResult =
+#endif
+                                 osl_waitCondition( maSizeCondition, &aTimeout );
 
     if( mbFakeVideo ) {
         mbFakeVideo = sal_False;
commit 3332b6b5f7012501b564ce7f2e5f886694f429ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 11:04:23 2010 +0100

    WaE, unused parameters

diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 14cc80b..96c199d 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -43,7 +43,7 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
 // - component_getImplementationEnvironment -
 // ------------------------------------------
 
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
+extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
@@ -52,7 +52,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char
 // - component_writeInfo -
 // -----------------------
 
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey )
+extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
 {
     sal_Bool bRet = sal_False;
 
@@ -79,7 +79,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* p
 // - component_getFactory -
 // ------------------------
 
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
     void*									pRet = 0;
commit 0e597092077708d0866c7df11c1a131ae07d8df3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 09:30:40 2010 +0100

    WaE, shadowed variable

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index fc59111..c57b048 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -356,11 +356,12 @@ namespace sfx2
                 {
                     ::rtl::OUString aStdLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
                     Sequence< ::rtl::OUString > aElements = xContainer->getElementNames();
-                    if ( aElements.getLength() )
+                    sal_Int32 nElementCount = aElements.getLength();
+                    if ( nElementCount )
                     {
                         // old check, if more than 1 library or the first library isn't the expected 'Standard'
                         // trigger the security 'nag' dialog
-                        if ( !bIsVBAMode && ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) ) )
+                        if ( !bIsVBAMode && ( nElementCount > 1 || !aElements[0].equals( aStdLibName ) ) )
                             bHasMacroLib = sal_True;
                         else
                         {
@@ -368,10 +369,8 @@ namespace sfx2
                             Reference< XLibraryQueryExecutable > xLib( xContainer, UNO_QUERY );
                             if ( xLib.is() )
                             {
-                                Sequence< ::rtl::OUString > aElements = xContainer->getElementNames();
-                                sal_Int32 nElementCount = aElements.getLength();
                                 const ::rtl::OUString* pElementName = aElements.getConstArray();
-                                for ( sal_Int32 index = 0; index < nElementCount; index++ )
+                                for ( sal_Int32 index = 0; index < nElementCount; ++index )
                                 {
                                     bHasMacroLib = xLib->HasExecutableCode( pElementName[index] );
                                     if ( bHasMacroLib )
@@ -390,7 +389,7 @@ namespace sfx2
                     Sequence< ::rtl::OUString > aElements = xDlgContainer->getElementNames();
                     sal_Int32 nElementCount = aElements.getLength();
                     const ::rtl::OUString* pElementName = aElements.getConstArray();
-                    for ( sal_Int32 index = 0; index < nElementCount; index++ )
+                    for ( sal_Int32 index = 0; index < nElementCount; ++index )
                     {
                         Reference< XNameAccess > xNameAccess;
                         xDlgContainer->getByName( pElementName[index] ) >>= xNameAccess;
commit 05e7937b33bff9abe92e562d800f91fb83e6a352
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 20 09:08:06 2010 +0100

    WaE unused parameter

diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 9a7b33b..1c89d20 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -486,7 +486,7 @@ void SfxDialogLibraryContainer::onNewRootStorage()
 }
 
 sal_Bool SAL_CALL
-SfxDialogLibraryContainer:: HasExecutableCode( const ::rtl::OUString& Library ) throw (uno::RuntimeException)
+SfxDialogLibraryContainer:: HasExecutableCode( const ::rtl::OUString& /*Library*/ ) throw (uno::RuntimeException)
 {
     return sal_False; // dialog library has no executable code
 }
commit d915969f54ddb26439865d2d6810f82d92df4484
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 19 21:18:22 2010 +0100

    this is just wrong

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index fbe68fe..a2abb08 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -99,7 +99,7 @@ void lclExportBindableAndListSourceBits( Reference< frame::XModel > const & xDoc
                 xConvertor->getPropertyValue( OUSTR("PersistentRepresentation") ) >>= sAddress;
                 OSL_TRACE("**** cell range source list %s",
                     rtl::OUStringToOString( sAddress, RTL_TEXTENCODING_UTF8 ).getStr() );
-                if ( sAddress.getLength() > 0 );
+                if ( sAddress.getLength() > 0 )
                     rModel.addAttribute( OUSTR(XMLNS_DIALOGS_PREFIX ":source-cell-range"), sAddress );
             }
             catch( uno::Exception& )
commit 9c3afd73dcd3c6e22b891c141fb2d3336f2d2e2f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 19 20:47:39 2010 +0100

    WaE: fix missing return

diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index d08bacb..d88099d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -813,9 +813,8 @@ sal_Bool HierarchyEntry::move(
 
         OSL_ENSURE( sal_False,
                     "HierarchyEntry::move - caught WrappedTargetException!" );
-        return sal_False;
     }
-
+    return sal_False;
 }
 
 //=========================================================================
commit a1e450926a5d2d5005fa9b82ed772c4b99422d94
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 19 20:43:10 2010 +0100

    WaE: remove shadowed variable

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index c865a5c..60a06dc 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -381,7 +381,6 @@ void SdXMLShapeContext::EndElement()
         if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName( sLink ) )
             xProp->setPropertyValue( sLink, uno::Any( msHyperlink ) );
         Reference< XEventsSupplier > xEventsSupplier( mxShape, UNO_QUERY_THROW );
-        Reference< XNameReplace > xEvents( xEventsSupplier->getEvents(), UNO_QUERY_THROW );
         const OUString sBookmark( RTL_CONSTASCII_USTRINGPARAM( "Bookmark" ) );
 
         if( xEventsSupplier.is() )


More information about the Libreoffice-commits mailing list