[Libreoffice-commits] core.git: 2 commits - sw/source vcl/unx

[Caolán McNamara]

 sw/source/core/swg/SwXMLTextBlocks.cxx   |   14 ++++++++++----
 vcl/unx/generic/dtrans/X11_selection.cxx |    2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 766ec29ce6557a83368fa1efdea009fd8f6f85dc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 8 16:26:35 2013 +0100

    CID#1078847 we're writing a byte, so use a byte
    
    Change-Id: I45fbcaae87b8ecff5fc25eca646e19849beda293

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 2cdf21d..e14baa4 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3836,7 +3836,7 @@ void SelectionManager::shutdown() throw()
                 Application::Reschedule();
             }
             // trigger poll()'s wait end by writing a dummy value
-            int dummy=0;
+            char dummy=0;
             dummy = write(m_EndThreadPipe[1], &dummy, 1);
         }
         osl_joinWithThread( m_aThread );
commit 731174ae31f854ddfd6ba11110f8746e74b4e9da
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 8 16:11:11 2013 +0100

    CID#1079275 uninitialized member variables
    
    also CID#1079276
    
    Change-Id: Ib8e5f56f6f970a4eaae334eff2f670b20b13ad2d

diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index ad9645c..9366504 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -57,7 +57,11 @@ void SwXMLTextBlocks::ResetBlockMode ( )
 }
 
 SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
-: SwImpBlocks( rFile ), bAutocorrBlock( sal_False ), nFlags ( 0 )
+    : SwImpBlocks(rFile)
+    , bAutocorrBlock(false)
+    , bBlock(false)
+    , nFlags(0)
+    , nCurBlk(0)
 {
     SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
     if( !pDocSh->DoInitNew( 0 ) )
@@ -98,9 +102,11 @@ SwXMLTextBlocks::SwXMLTextBlocks( const OUString& rFile )
 }
 
 SwXMLTextBlocks::SwXMLTextBlocks( const uno::Reference < embed::XStorage >& rStg, const OUString& rName )
-: SwImpBlocks( rName )
-, bAutocorrBlock( sal_True )
-, nFlags ( 0 )
+    : SwImpBlocks( rName )
+    , bAutocorrBlock(false)
+    , bBlock(false)
+    , nFlags(0)
+    , nCurBlk(0)
 {
     SwDocShell* pDocSh = new SwDocShell ( SFX_CREATE_MODE_INTERNAL );
     if( !pDocSh->DoInitNew( 0 ) )