[Libreoffice-commits] core.git: 3 commits - sd/source svx/source

[Caolán McNamara]

 sd/source/core/PageListWatcher.cxx                    |    2 +-
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |    2 +-
 svx/source/svdraw/svdedtv2.cxx                        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b3530c2c3eadeaed8637fbd22f6df1fdf2416850
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 29 20:56:08 2014 +0000

    coverity#1194891 Copy-paste error
    
    Change-Id: I79c5587725850fc14a54f827b931959fbadaf566

diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index ed73841..5c2bc12 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -109,7 +109,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum)
             else
             {
                 SAL_WARN( "sd.core",
-                          "ImpPageListWatcher::GetSdPage(PK_NOTES): page number " << nPgNum << " >= " << maPageVectorStandard.size() );
+                          "ImpPageListWatcher::GetSdPage(PK_NOTES): page number " << nPgNum << " >= " << maPageVectorNotes.size() );
             }
             break;
         }
commit 62979b4cdf2153c38cf581a4e55eec70300abce2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 29 20:54:50 2014 +0000

    coverity#1194928 allocation too small for type
    
    Change-Id: I4d1a3838ef95906b69bf52ba0d04c56859201db8

diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index fe25d8d..da3c5df 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -194,7 +194,7 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText( const SdrObjCustom
         if ( bHasText )
         {
             // #i37011# also create a text object and add at rPos + 1
-            SdrTextObj* pTextObj = (SdrTextObj*)SdrObjFactory::MakeNewObject(
+            SdrObject* pTextObj = SdrObjFactory::MakeNewObject(
                 pCustoObj->GetObjInventor(), OBJ_TEXT, 0L, pCustoObj->GetModel());
 
             // Copy text content
commit 3d2d60960e8a8d5bc8a90199fe90d64ca798f55c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 29 20:54:07 2014 +0000

    coverity#1194927 allocation too small for type
    
    Change-Id: I6ddf12cee4ea6d170c791a79014bb8400ab7d779

diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 2c755b0..c82e4e6 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1556,7 +1556,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
                 if(pCustomShape->HasText() && !pCustomShape->IsTextPath())
                 {
                     // #i37011# also create a text object and add at rPos + 1
-                    SdrTextObj* pTextObj = (SdrTextObj*)SdrObjFactory::MakeNewObject(
+                    SdrObject* pTextObj = SdrObjFactory::MakeNewObject(
                         pCustomShape->GetObjInventor(), OBJ_TEXT, 0L, pCustomShape->GetModel());
 
                     // Copy text content