diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-03 23:16:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-03 23:16:15 +0200 |
| commit | 6f92b58987f754de31c9ca756e813deb7462d98e (patch) | |
| tree | 37f1f2e8862b620b0ab669fe025f95eb9957d020 | |
| parent | 16351a8ba50c04b9e4c7edbcf9491d2882a7eeda (diff) | |
error: reference cannot be bound to dereferenced null pointer
Change-Id: Ica39bcce389fc5d03a3902d9f703a0efa284ec92
| -rw-r--r-- | include/sfx2/viewsh.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/misc/glshell.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 7c43c93c0c95..5cde8317aa2b 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 48d33c00912c..45b72204e213 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 ) |