[Libreoffice] [PATCH 7/8] Easyhack fdo#38831 remove SvStrings

Hi,

See attached.

Remove unused variables.

Regards,
Brad

From 6ffc7eb2a90a83c39785761b7a6add8cbf733cf9 Mon Sep 17 00:00:00 2001
From: Brad Sowden <code@sowden.org>
Date: Thu, 29 Dec 2011 18:28:00 +1300
Subject: [PATCH 7/8] Remove unused variables

---
 sc/source/ui/inc/parawin.hxx |    8 --------
 sfx2/inc/sfx2/frmdescr.hxx   |    3 ---
 sfx2/source/appl/appcfg.cxx  |    2 --
 sfx2/source/appl/appdata.cxx |    4 ----
 sfx2/source/inc/appdata.hxx  |    2 --
 5 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index bacbc2c..a934419 100644
--- a/sc/source/ui/inc/parawin.hxx
+++ b/sc/source/ui/inc/parawin.hxx
@@ -36,13 +36,6 @@
 #include <vcl/group.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/tabpage.hxx>
-
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
-
-#endif
 #include <vcl/tabctrl.hxx>
 
 #include <vector>
@@ -96,7 +89,6 @@ private:
 
         ArgInput        aArgInput[4];
         String          aDefaultString;
-        SvStrings       aParaArray;
         DECL_LINK( ScrollHdl, ScrollBar* );
         DECL_LINK( ModifyHdl, ArgInput* );
         DECL_LINK( GetEdFocusHdl, ArgInput* );
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx
index ab268e1..beb4085 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 f035e02..85e5374 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<String> &aList = ((SfxStringListItem*)pItem)->GetList();
         sal_uInt32 nCount = aList.size();
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 4d8e910..055f130 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -31,8 +31,6 @@
 #include <svl/inetstrm.hxx>
 #include <svl/stritem.hxx>
 
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
 #include <osl/mutex.hxx>
 
 #include <vcl/menu.hxx>
@@ -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 8783675..99baa53 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -41,7 +41,6 @@
 #include <vector>
 
 class SfxApplication;
-class SvStrings;
 class SfxProgress;
 class SfxChildWinFactArr_Impl;
 class SfxDdeDocTopics_Impl;
@@ -125,7 +124,6 @@ public:
     // global pointers
     SfxItemPool*                        pPool;
     std::vector<sal_uInt16>*            pDisabledSlotList;
-    SvStrings*                          pSecureURLs;
     SvtSaveOptions*                     pSaveOptions;
     SvtUndoOptions*                     pUndoOptions;
     SvtHelpOptions*                     pHelpOptions;
-- 
1.7.7.4