From 9da30d99715466cf161da283caaf2faadfc7e5d9 Mon Sep 17 00:00:00 2001 From: Brad Sowden Date: Thu, 29 Dec 2011 22:30:13 +1300 Subject: Easyhack fdo#38831 remove SvStrings Remove unused variables. --- sfx2/inc/sfx2/frmdescr.hxx | 3 --- sfx2/source/appl/appcfg.cxx | 2 -- sfx2/source/appl/appdata.cxx | 4 ---- sfx2/source/inc/appdata.hxx | 2 -- 4 files changed, 11 deletions(-) (limited to 'sfx2') diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index ab268e15068e..beb4085379d6 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -40,7 +40,6 @@ class SvStream; struct SfxFrameDescriptor_Impl; -class SvStrings; class SfxFrameDescriptor; class Wallpaper; typedef SfxFrameDescriptor* SfxFrameDescriptorPtr; @@ -96,8 +95,6 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor sal_Bool bHasUI; sal_Bool bReadOnly; SfxFrameDescriptor_Impl* pImp; - SvStrings* pScripts; - SvStrings* pComments; public: SfxFrameDescriptor(); diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index f035e026315d..85e5374c637b 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -760,8 +760,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) // Secure-Referers if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, sal_True, &pItem)) { - DELETEZ(pAppData_Impl->pSecureURLs); - DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected"); const std::vector &aList = ((SfxStringListItem*)pItem)->GetList(); sal_uInt32 nCount = aList.size(); diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 4d8e91096fb5..055f130a8e2a 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -31,8 +31,6 @@ #include #include -#define _SVSTDARR_STRINGS -#include #include #include @@ -101,7 +99,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) , pTemplates( 0 ) , pPool(0) , pDisabledSlotList( 0 ) - , pSecureURLs(0) , pSaveOptions( 0 ) , pUndoOptions( 0 ) , pHelpOptions( 0 ) @@ -140,7 +137,6 @@ SfxAppData_Impl::~SfxAppData_Impl() { DeInitDDE(); delete pTopFrames; - delete pSecureURLs; delete pBasicManager; BasicManagerRepository::revokeCreationListener( *pBasMgrListener ); diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 8783675fc40e..99baa538b132 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -41,7 +41,6 @@ #include class SfxApplication; -class SvStrings; class SfxProgress; class SfxChildWinFactArr_Impl; class SfxDdeDocTopics_Impl; @@ -125,7 +124,6 @@ public: // global pointers SfxItemPool* pPool; std::vector* pDisabledSlotList; - SvStrings* pSecureURLs; SvtSaveOptions* pSaveOptions; SvtUndoOptions* pUndoOptions; SvtHelpOptions* pHelpOptions; -- cgit