[Libreoffice-commits] core.git: 9 commits - dbaccess/source editeng/source registry/source sfx2/source sw/source uui/source vcl/workben

Caolán McNamara caolanm at redhat.com
Sun Jan 25 06:22:29 PST 2015


 dbaccess/source/core/dataaccess/documentdefinition.cxx |    7 +------
 editeng/source/editeng/impedit4.cxx                    |    2 --
 registry/source/reflread.cxx                           |    2 --
 sfx2/source/appl/appbas.cxx                            |    5 -----
 sw/source/core/layout/pagechg.cxx                      |    3 +--
 sw/source/filter/html/wrthtml.cxx                      |    3 +--
 sw/source/uibase/globdoc/globdoc.cxx                   |    1 -
 uui/source/fltdlg.cxx                                  |    1 -
 vcl/workben/vcldemo.cxx                                |    1 +
 9 files changed, 4 insertions(+), 21 deletions(-)

New commits:
commit 00c42b64ab57a54db2475084cdfd70e64405bd8c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:20:35 2015 +0000

    coverity#1266499 Uninitialized scalar field
    
    Change-Id: I788f0b34abd80feab247c3f2bba8ac5d49fc5c08

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 0d81a74..0a36eb8 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1209,6 +1209,7 @@ class DemoWin : public WorkWindow
             , mrWin(rWin)
         {
             maDelay.Seconds = nDelaySecs;
+            maDelay.Nanosec = 0;
             launch();
         }
         virtual ~RenderThread()
commit 688cade99564380bac9e9229519afa88f4d5fd04
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:19:36 2015 +0000

    coverity#1266500 Unused value
    
    Change-Id: I81441568c4c5b864abbf1375b561a9389a72ef90

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 0cbeb70..5711294 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -196,13 +196,8 @@ namespace dbaccess
         m_pDefinition = NULL;
     }
 
-    void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException, std::exception)
+    void SAL_CALL OEmbedObjectHolder::changingState( const lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (embed::WrongStateException, uno::RuntimeException, std::exception)
     {
-        if ( !m_bInChangingState && nNewState == EmbedStates::RUNNING && nOldState == EmbedStates::ACTIVE && m_pDefinition )
-        {
-            m_bInChangingState = true;
-            m_bInChangingState = false;
-        }
     }
 
     void SAL_CALL OEmbedObjectHolder::stateChanged( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (uno::RuntimeException, std::exception)
commit f8e7e33c6bd87065f2aa36b8bf7b830c11bdddfe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:17:08 2015 +0000

    coverity#1266501 Unused value
    
    Change-Id: I53a1f16a08c3552fcf77d17f5be4ae0d483c5933

diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 2e1ae47..23caf61 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -61,7 +61,6 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
     else if (nVersion == SOFFICE_FILEFORMAT_8)
     {
         *pClassName     = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
-        *pClipFormat    = SOT_FORMATSTR_ID_STARWRITERGLOB_8;
         *pClipFormat    = bTemplate ? SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITERGLOB_8;
         *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE);
     }
commit 5bf41f6026a656841c46efd77bd9e1d4e5dde504
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:16:06 2015 +0000

    coverity#1266503 Useless call
    
    Change-Id: Ifcbee64fcb41a99421b4894e3b4e2472c1ea58a4

diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index d6256cc..a24a34e 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -51,7 +51,6 @@ FilterDialog::FilterDialog( vcl::Window* pParentWindow )
 {
     get(m_pFtURL, "url");
     get(m_pLbFilters, "filters");
-    m_pFtURL->GetOutputSizePixel();
     Size aSize(pParentWindow->LogicToPixel(Size(182, 175), MAP_APPFONT));
     m_pLbFilters->set_height_request(aSize.Height());
     m_pLbFilters->set_width_request(aSize.Width());
commit f0a9acee2430a265a65e0b0a6047163397026b1b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:15:31 2015 +0000

    coverity#1266504 Useless call
    
    Change-Id: I11a2760799937393bfa1a91c1d454ccb3c4027e4

diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 4099e4a..2905bd3 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1241,8 +1241,6 @@ TypeRegistryEntry::TypeRegistryEntry(
         new ReferenceList(
             m_pBuffer + offset + entrySize, m_bufferLen - (offset + entrySize),
             readUINT16(offset), m_pCP.get()));
-
-    m_pReferences->parseIndex();
 }
 
 typereg_Version TypeRegistryEntry::getVersion() const {
commit f5768d772cf0d50b5fbf535c391212293a0565ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:14:41 2015 +0000

    coverity#1266505 Useless call
    
    Change-Id: I13934ef5b18668044fbe3a2e7d916f2f7c477723

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 85cbc66..18deea8 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -129,8 +129,6 @@ XLibraryContainer * SfxApplication::GetBasicContainer()
 #endif
 }
 
-
-
 StarBASIC* SfxApplication::GetBasic()
 {
 #if !HAVE_FEATURE_SCRIPTING
@@ -140,10 +138,8 @@ StarBASIC* SfxApplication::GetBasic()
 #endif
 }
 
-
 void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 {
-    rReq.GetArgs();
     sal_uInt16 nSID = rReq.GetSlot();
     switch ( nSID )
     {
@@ -163,7 +159,6 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
     }
 }
 
-
 void SfxApplication::PropState_Impl( SfxItemSet &rSet )
 {
     SfxWhichIter aIter(rSet);
commit c0c2bf988d8d6b2c13d99ffc7f8a81f100ef075f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:14:00 2015 +0000

    coverity#1266506 Useless call
    
    Change-Id: I0d2f493ddf410aa4980dbeeaf8976c052ea139e3

diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 667a969..e1231b7 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1685,8 +1685,6 @@ void ImpEditEngine::ImpConvert( OUString &rConvTxt, LanguageType &rConvTxtLang,
     OUString aRes;
     LanguageType nResLang = LANGUAGE_NONE;
 
-    /* ContentNode* pLastNode = */ aEditDoc.GetObject( aEditDoc.Count()-1 );
-
     EditPaM aPos( CreateEditPaM( pConvInfo->aConvContinue ) );
     EditSelection aCurSel = EditSelection( aPos, aPos );
 
commit a9ba6aeb78b6d7dacf86ec934ce424b533bd3100
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:13:25 2015 +0000

    coverity#1266507 Useless call
    
    Change-Id: I59164969de2872efeb50a4bb7b8748b1d541348f

diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index b811352..d23c4f9 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1447,9 +1447,8 @@ void SwRootFrm::AssertPageFlys( SwPageFrm *pPage )
 {
     while ( pPage )
     {
-        if ( pPage->GetSortedObjs() )
+        if (pPage->GetSortedObjs())
         {
-            pPage->GetSortedObjs();
             size_t i = 0;
             while ( pPage->GetSortedObjs() && i< pPage->GetSortedObjs()->size() )
             {
commit 6cde3ff3dd646f51f37f2342863371db8de9087a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 25 14:12:22 2015 +0000

    coverity#1266508 Useless call (gold)
    
    regression from
    
    commit 832e5aadbff006ec24959162c29756fe2b1982be
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Tue Oct 8 10:06:59 2013 +0100
        Related: fdo#38838 remove UniString::SearchAndReplaceAll
    
    Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c

diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index e32983e..64c8507 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1170,8 +1170,7 @@ void SwHTMLWriter::OutImplicitMark( const OUString& rMark,
 {
     if( !rMark.isEmpty() && !aImplicitMarks.empty() )
     {
-        OUString sMark( rMark );
-        sMark + OUStringLiteral1<cMarkSeparator>() + OUString::createFromAscii(pMarkType);
+        OUString sMark(rMark + OUStringLiteral1<cMarkSeparator>() + OUString::createFromAscii(pMarkType));
         if( 0 != aImplicitMarks.erase( sMark ) )
         {
             OutAnchor(sMark.replace('?', '_')); // '?' causes problems in IE/Netscape 5


More information about the Libreoffice-commits mailing list