[Libreoffice-commits] core.git: 4 commits - sc/source sw/source writerfilter/source

[Markus Mohrhard]

 sc/source/core/tool/stringutil.cxx              |    3 +++
 sc/source/ui/view/viewfun4.cxx                  |    2 +-
 sw/source/core/text/itrcrsr.cxx                 |    2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5b981e1dbfc1460e00bf35e0dd63e0c77a8119d9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Apr 10 18:01:37 2013 +0200

    add the missing type information for the parsed string
    
    Change-Id: I4e2567ba2a9000763c54b7d38ab4ba66a13a77f4

diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx
index 7753bdf..ac2ec76 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -358,7 +358,10 @@ ScInputStringType ScStringUtil::parseInputString(
         sal_uInt32 nNumFormat = rFormatter.GetStandardIndex(eLang);
 
         if (rFormatter.IsNumberFormat(rStr, nNumFormat, aRet.mfValue))
+        {
+            aRet.meType = ScInputStringType::Number;
             aRet.mnFormatType = rFormatter.GetType(nNumFormat);
+        }
         else if (!rStr.isEmpty())
             aRet.meType = ScInputStringType::Text;
 
commit 08fe6f085b9614cec51269f30f969617dd55d7db
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Apr 10 17:50:47 2013 +0200

    coverity#1000869: use of unitialized variable
    
    Change-Id: I3640f4c791e09e39998ec25858baebc37b58b6f6

diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 1a4660e..e13bb55 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1612,7 +1612,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
 
                 if ( nSpaceAdd )
                 {
-                    sal_Int32 nCharCnt;
+                    sal_Int32 nCharCnt = 0;
                     // #i41860# Thai justified alignemt needs some
                     // additional information:
                     aDrawInf.SetNumberOfBlanks( pPor->InTxtGrp() ?
commit 836dd78edf07955a3232b5d33bc6aef2353865ae
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Apr 10 17:44:11 2013 +0200

    coverity#1000707: out of bounds access
    
    Change-Id: I889ccb08f8f44bd558d95505342af0336dca0b0f

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 7fac285..8aca45e 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -240,7 +240,7 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask
 
     // Get the properties applying according to the mask
     PropertyMapPtr pProps( new PropertyMap( ) );
-    for (size_t i = 0; i < sizeof(aOrderedStyleTable); ++i)
+    for (size_t i = 0; i < sizeof(aOrderedStyleTable)/sizeof(aOrderedStyleTable[0]); ++i)
     {
         TblStylePrs::iterator pIt = m_aStyles.find( aOrderedStyleTable[ i ].type );
         if ( ( nMask & aOrderedStyleTable[ i ].mask ) && ( pIt != m_aStyles.end( ) ) )
commit 3ece9b4ed86c94a803bb728d5a845ea7cb89ed17
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Apr 10 17:04:01 2013 +0200

    coverity#1000602: fix check for null pointer
    
    Change-Id: Iaa48ebe1799960532483812e54aa08c625882388

diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 9606212..d2c7070 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -760,7 +760,7 @@ bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent )
     ScDocument* pDoc = GetViewData()->GetDocShell()->GetDocument();
 
     const EditTextObject* pData = pDoc->GetEditText(aPos);
-    if (pData)
+    if (!pData)
         return false;
 
     if (!pData->IsFieldObject())