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

[Caolán McNamara]

 sfx2/source/appl/appdata.cxx |    1 -
 sfx2/source/appl/appmisc.cxx |    2 --
 sfx2/source/inc/appdata.hxx  |    1 -
 3 files changed, 4 deletions(-)

New commits:
commit 947feaa896168430c78dd08dabee1447133f2740
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 29 10:21:07 2014 +0100

    pTemplateCommon is never set, so always NULL
    
    Change-Id: I2311b33034c281cba66d7cce80a6556e27b2b322

diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 81d8e60..a062e74 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -99,7 +99,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
     , pSaveOptions( 0 )
     , pHelpOptions( 0 )
     , pProgress(0)
-    , pTemplateCommon( 0 )
     , nDocModalMode(0)
     , nAutoTabPageId(0)
     , nRescheduleLocks(0)
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index a301d0b..62c7fb9 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -137,8 +137,6 @@ SfxModule* SfxApplication::GetModule_Impl()
 
 ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBindings )
 {
-    if( pAppData_Impl->pTemplateCommon )
-        return pAppData_Impl->pTemplateCommon;
     SfxChildWindow *pChild = rBindings.GetWorkWindow_Impl()->GetChildWindow_Impl(
         SfxTemplateDialogWrapper::GetChildWindowId() );
     if ( pChild )
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 8722602..8a5acb6 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -106,7 +106,6 @@ public:
 
     // "current" functionality
     SfxProgress*                        pProgress;
-    ISfxTemplateCommon*                 pTemplateCommon;
 
     sal_uInt16                              nDocModalMode;              // counts documents in modal mode
     sal_uInt16                              nAutoTabPageId;