[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Kohei Yoshida]

 sc/source/ui/unoobj/scdetect.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6215ebbe96c2e827b4e607986372ed8ebaab903e
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date:   Mon Aug 19 16:47:42 2013 -0400

    Return on NULL right away, to avoid null dereferencing below.
    
    Change-Id: I17b45a5fb6ac5d30be5d3575fec76a61662decdf
    (cherry picked from commit e7164ec2858a25a9f57fac199132dea0e70a8555)
    Reviewed-on: https://gerrit.libreoffice.org/5520
    Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
    Tested-by: Fridrich Strba <fridr...@documentfoundation.org>

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index de4959e..ffdb7ea 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -637,7 +637,7 @@ OUString SAL_CALL ScFilterDetect::detect( 
uno::Sequence<beans::PropertyValue>& l
     }
 
     if (!pFilter)
-        aTypeName.Erase();
+        return OUString();
 
     if (nIndexOfFilterName == -1)
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits