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

[Miklos Vajna]

 sw/source/core/access/accnotextframe.cxx          |    6 ++++--
 writerfilter/source/rtftok/rtfdocumentfactory.cxx |   16 +++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit dbbaa85d296d5c3ee9db42a132649570d977b429
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat May 3 21:00:15 2014 +0200

    writerfilter: fix indentation in rtfdocumentfactory
    
    Change-Id: I9cf6abaf091d358670bbe71de9abe832fa139f42

diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
index 5bbbc92..8771295 100644
--- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
@@ -9,14 +9,16 @@
 
 #include <rtfdocumentimpl.hxx>
 
-namespace writerfilter {
-namespace rtftok {
+namespace writerfilter
+{
+namespace rtftok
+{
 
-RTFDocument::Pointer_t RTFDocumentFactory::createDocument(uno::Reference< uno::XComponentContext > const & xContext,
-        uno::Reference< io::XInputStream > const & xInputStream,
-        uno::Reference< lang::XComponent > const & xDstDoc,
-        uno::Reference< frame::XFrame > const & xFrame,
-        uno::Reference< task::XStatusIndicator > const & xStatusIndicator)
+RTFDocument::Pointer_t RTFDocumentFactory::createDocument(uno::Reference< uno::XComponentContext > const& xContext,
+        uno::Reference< io::XInputStream > const& xInputStream,
+        uno::Reference< lang::XComponent > const& xDstDoc,
+        uno::Reference< frame::XFrame > const& xFrame,
+        uno::Reference< task::XStatusIndicator > const& xStatusIndicator)
 {
     return RTFDocument::Pointer_t(new RTFDocumentImpl(xContext, xInputStream, xDstDoc, xFrame, xStatusIndicator));
 }
commit 26946775d73ee0b4f8fd3effa37549f463fde6db
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat May 3 20:53:02 2014 +0200

    coverity#1078575 Unchecked dynamic_cast
    
    Change-Id: Ie25c91ce0035c78629ebd8466baa717d62948503

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 33d4b7a..7481b12 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -109,8 +109,10 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
         // #i73249#
         case RES_TITLE_CHANGED:
         {
-            const OUString& sOldTitle(
-                        dynamic_cast<const SwStringMsgPoolItem*>(pOld)->GetString() );
+            OUString sOldTitle;
+            const SwStringMsgPoolItem* pOldItem = dynamic_cast<const SwStringMsgPoolItem*>(pOld);
+            if (pOldItem)
+                sOldTitle = pOldItem->GetString();
             const OUString& sNewTitle(
                         dynamic_cast<const SwStringMsgPoolItem*>(pNew)->GetString() );
             if ( sOldTitle == sNewTitle )