[Libreoffice-commits] core.git: include/sfx2 sw/source

[Stephan Bergmann]

 include/sfx2/viewsh.hxx           |    4 ++--
 sw/source/uibase/misc/glshell.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6f92b58987f754de31c9ca756e813deb7462d98e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jul 3 23:16:15 2014 +0200

    error: reference cannot be bound to dereferenced null pointer
    
    Change-Id: Ica39bcce389fc5d03a3902d9f703a0efa284ec92

diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 7c43c93..5cde831 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -104,7 +104,7 @@ private: \
 public: \
     static SfxViewShell  *CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldView); \
     static void           RegisterFactory( sal_uInt16 nPrio = USHRT_MAX ); \
-    static SfxViewFactory&Factory() { return *pFactory; } \
+    static SfxViewFactory*Factory() { return pFactory; } \
     static void           InitFactory()
 
 #define SFX_IMPL_NAMED_VIEWFACTORY(Class, AsciiViewName) \
@@ -119,7 +119,7 @@ public: \
     void Class::InitFactory()
 
 #define SFX_VIEW_REGISTRATION(DocClass) \
-            DocClass::Factory().RegisterViewFactory( Factory() )
+            DocClass::Factory().RegisterViewFactory( *Factory() )
 
 class SfxInPlaceClient;
 typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList;
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 48d33c0..45b7220 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -207,7 +207,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString
     if( pGroup && pGroup->GetCount() )
     {
         // query which view is registered. In WebWriter there is no normal view
-        sal_uInt16 nViewId = 0 != &SwView::Factory() ? 2 : 6;
+        sal_uInt16 nViewId = 0 != SwView::Factory() ? 2 : 6;
         const OUString sLongName = pGroup->GetLongName(pGroup->GetIndex( rShortName ));
 
         if( 6 == nViewId )