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

[Caolán McNamara]

 editeng/source/editeng/textconv.cxx |   12 ------------
 sw/source/core/crsr/crbm.cxx        |    2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 848c78ff19e18dfc4e3a97f7d66fb6c6e50673a9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 3 20:59:26 2015 +0100

    drop useless temp debugging strings
    
    Change-Id: I9adc765654cf15633a53576e620c13eddcdc3b82

diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 62c9a29..060fd80 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -477,9 +477,6 @@ void TextConvWrapper::ChangeText( const OUString &rNewText,
                 {
                     const sal_Int32 nChgLen = nIndex - nChgPos;
                     const sal_Int32 nConvChgLen = nPos - nConvChgPos;
-#ifdef DEBUG
-                    OUString aInOrig( rOrigText.copy( nChgPos, nChgLen ) );
-#endif
                     OUString aInNew( rNewText.copy( nConvChgPos, nConvChgLen ) );
 
                     // set selection to sub string to be replaced in original text
@@ -488,9 +485,6 @@ void TextConvWrapper::ChangeText( const OUString &rNewText,
                     aSel.nStartPos = nChgInNodeStartIndex;
                     aSel.nEndPos   = nChgInNodeStartIndex + nChgLen;
                     m_pEditView->SetSelection( aSel );
-#ifdef DEBUG
-                    OUString aSelTxt1( m_pEditView->GetSelected() );
-#endif
 
                     // replace selected sub string with the corresponding
                     // sub string from the new text while keeping as
@@ -536,14 +530,8 @@ void TextConvWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttri
         // save attributes to be restored
         SfxItemSet aSet( m_pEditView->GetAttribs() );
 
-#ifdef DEBUG
-        OUString aSelTxt1( m_pEditView->GetSelected() );
-#endif
         // replace old text and select new text
         m_pEditView->InsertText( rNewText, true );
-#ifdef DEBUG
-        OUString aSelTxt2( m_pEditView->GetSelected() );
-#endif
 
         // since 'SetAttribs' below function like merging with the attributes
         // from the itemset with any existing ones we have to get rid of all
commit 2b03336d18bf2137a318c959617a2beb4f68e02c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun May 3 09:35:29 2015 +0100

    cppcheck: noExplicitConstructor
    
    Change-Id: I38ba88252e2fcadb1a9b36fd0ee1db7d61959bbb

diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index b75dbe1..0fa19ec 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -32,7 +32,7 @@ namespace
 {
     struct CrsrStateHelper
     {
-        CrsrStateHelper(SwCrsrShell& rShell)
+        explicit CrsrStateHelper(SwCrsrShell& rShell)
             : m_aLink(rShell)
             , m_pCrsr(rShell.GetSwCrsr())
             , m_aSaveState(*m_pCrsr)