Remove obsolete RestrictedPath env var support

Change-Id: Ia4ea7d60d7b69c863c1e891887060265e73e1cb6

7 files changed, 5 insertions, 53 deletions

diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 04515152915b..ac4215de33fc 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -356,7 +356,6 @@
 #include <svl/poolitem.hxx>
 #include <svl/smplhint.hxx>
 #include <svl/stritem.hxx>
-#include <svl/urlfilter.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index decda28f110d..4a0db744575f 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "contentenumeration.hxx"
-#include <svl/urlfilter.hxx>
 #include <svtools/inettbc.hxx>
 #include <svtools/imagemgr.hxx>
 
@@ -89,7 +88,6 @@ namespace svt
         ,m_rContent              ( _rContentToFill )
         ,m_rContentMutex         ( _rContentMutex  )
         ,m_xCommandEnv           ( _rxCommandEnv   )
-        ,m_pFilter               ( NULL            )
         ,m_pTranslator           ( _pTranslator    )
         ,m_bCancelled            ( false           )
         ,m_rBlackList            ( ::com::sun::star::uno::Sequence< OUString >() )
@@ -108,7 +106,6 @@ namespace svt
         m_bCancelled = true;
         m_pResultHandler = NULL;
         m_pTranslator = NULL;
-        m_pFilter = NULL;
         m_aFolder.aContent = ::ucbhelper::Content();
         m_aFolder.sURL = String();
     }
@@ -116,13 +113,11 @@ namespace svt
     //--------------------------------------------------------------------
     EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
         const FolderDescriptor& _rFolder,
-        const IUrlFilter* _pFilter,
         const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
     {
         {
             ::osl::MutexGuard aGuard( m_aMutex );
             m_aFolder = _rFolder;
-            m_pFilter = _pFilter;
             m_pResultHandler = NULL;
             m_rBlackList = rBlackList;
         }
@@ -131,11 +126,10 @@ namespace svt
 
     //--------------------------------------------------------------------
     void FileViewContentEnumerator::enumerateFolderContent(
-        const FolderDescriptor& _rFolder, const IUrlFilter* _pFilter, IEnumerationResultHandler* _pResultHandler )
+        const FolderDescriptor& _rFolder, IEnumerationResultHandler* _pResultHandler )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_aFolder = _rFolder;
-        m_pFilter = _pFilter;
         m_pResultHandler = _pResultHandler;
 
         OSL_ENSURE( m_aFolder.aContent.get().is() || m_aFolder.sURL.Len(),
@@ -240,9 +234,6 @@ namespace svt
                             // check for restrictions
                             {
                                 ::osl::MutexGuard aGuard( m_aMutex );
-                                if ( m_pFilter && !m_pFilter->isUrlAllowed( sRealURL ) )
-                                    continue;
-
                                 if ( /* m_rBlackList.hasElements() && */ URLOnBlackList ( sRealURL ) )
                                     continue;
                             }
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index ab4c3442f4b1..95da38a71bfe 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.hxx
@@ -29,7 +29,6 @@
 #include <tools/string.hxx>
 #include <vcl/image.hxx>
 
-class IUrlFilter;
 //........................................................................
 namespace svt
 {
@@ -193,7 +192,6 @@ namespace svt
         FolderDescriptor                m_aFolder;
         ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >
                                         m_xCommandEnv;
-        const IUrlFilter*               m_pFilter;
         const IContentTitleTranslation* m_pTranslator;
         IEnumerationResultHandler*      m_pResultHandler;
         bool                            m_bCancelled;
@@ -234,7 +232,6 @@ namespace svt
         */
         void    enumerateFolderContent(
                     const FolderDescriptor& _rFolder,
-                    const IUrlFilter* _pFilter,
                     IEnumerationResultHandler* _pResultHandler
                 );
 
@@ -242,7 +239,6 @@ namespace svt
         */
         EnumerationResult   enumerateFolderContentSync(
                     const FolderDescriptor& _rFolder,
-                    const IUrlFilter* _pFilter,
                     const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >()
                 );
 
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7a99e67817f0..f8104b65e2e2 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -461,7 +461,6 @@ public:
 
     ViewTabListBox_Impl*    mpView;
     NameTranslator_Impl*    mpNameTrans;
-    const IUrlFilter*       mpUrlFilter;
     sal_uInt16              mnSortColumn;
     sal_Bool                mbAscending     : 1;
     sal_Bool                mbOnlyFolder    : 1;
@@ -1623,12 +1622,6 @@ void SvtFileView::SetConfigString( const String& rCfgStr )
 }
 
 // -----------------------------------------------------------------------
-void SvtFileView::SetUrlFilter( const IUrlFilter* _pFilter )
-{
-    mpImp->mpUrlFilter = _pFilter;
-}
-
-// -----------------------------------------------------------------------
 void SvtFileView::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_ENABLE )
@@ -1700,7 +1693,6 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
     ,m_bRunningAsyncAction      ( false )
     ,m_bAsyncActionCancelled    ( false )
     ,mpNameTrans                ( NULL )
-    ,mpUrlFilter                ( NULL )
     ,mnSortColumn               ( COLUMN_TITLE )
     ,mbAscending                ( sal_True )
     ,mbOnlyFolder               ( bOnlyFolder )
@@ -1779,7 +1771,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
 
     if ( !pAsyncDescriptor )
     {
-        ::svt::EnumerationResult eResult = m_pContentEnumerator->enumerateFolderContentSync( _rFolder, mpUrlFilter, rBlackList );
+        ::svt::EnumerationResult eResult = m_pContentEnumerator->enumerateFolderContentSync( _rFolder, rBlackList );
         if ( ::svt::SUCCESS == eResult )
         {
             implEnumerationSuccess();
@@ -1809,7 +1801,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     pTimeout->Seconds = nMinTimeout / 1000L;
     pTimeout->Nanosec = ( nMinTimeout % 1000L ) * 1000000L;
 
-    m_pContentEnumerator->enumerateFolderContent( _rFolder, mpUrlFilter, this );
+    m_pContentEnumerator->enumerateFolderContent( _rFolder, this );
 
     // wait until the enumeration is finished
     // for this, release our own mutex (which is used by the enumerator thread)
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index a7ff10cc2de2..3cb54c3b2890 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -529,15 +529,7 @@ void SvtFileViewWindow_Impl::OpenFolder( const String& rURL )
 
     rParent.SetPrevLevelButtonState( rURL );
 
-    aFileView.SetUrlFilter( &aURLFilter );
-
-    INetProtocol eProt = INetURLObject( rURL ).GetProtocol();
-    bIsTemplateFolder = ( eProt == INET_PROT_VND_SUN_STAR_HIER );
-    bool isNewDocumentFolder = ( eProt == INET_PROT_PRIVATE );
-
-    aURLFilter.enableFilter( !bIsTemplateFolder && !isNewDocumentFolder );
-
-    if ( isNewDocumentFolder )
+    if ( INetURLObject( rURL ).GetProtocol() == INET_PROT_PRIVATE )
     {
         aFileView.EnableNameReplacing( sal_False );
         aFileView.Initialize( GetNewDocContents() );
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 3d2240c32072..19cdfc1a5385 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -27,7 +27,6 @@
 #include <svtools/fileview.hxx>
 #include <svtools/ivctrl.hxx>
 #include <svtools/svmedit2.hxx>
-#include <svl/restrictedpaths.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
@@ -122,8 +121,6 @@ private:
     String              aFolderURL;
     String              aMyDocumentsURL;
     String              aSamplesFolderURL;
-    ::svt::RestrictedPaths
-                        aURLFilter;
 
     sal_Bool            bIsTemplateFolder;
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 2859c10b1c10..917639d1771c 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -79,13 +79,11 @@ class SvtURLBox_Impl
 public:
     std::vector<OUString>      aURLs;
     std::vector<OUString>      aCompletions;
-    const IUrlFilter*               pUrlFilter;
     ::std::vector< WildCard >       m_aFilters;
 
     static sal_Bool TildeParsing( String& aText, String& aBaseUrl );
 
     inline SvtURLBox_Impl( )
-        :pUrlFilter( NULL )
     {
         FilterMatch::createWildCardFilterList(String(),m_aFilters);
     }
@@ -242,14 +240,6 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
             // note: if this doesn't work, we're not interested in: we're checking the
             // untouched sCompletion then
 
-        if ( pBox->pImp->pUrlFilter )
-        {
-            if ( !pBox->pImp->pUrlFilter->isUrlAllowed( sURL ) )
-            {   // this URL is not allowed
-                bValidCompletionsFiltered = true;
-                continue;
-            }
-        }
         if ( !sURL.isEmpty() && ( sURL[sURL.getLength()-1] != '/' ))
         {
             String sUpperURL( sURL );
@@ -985,7 +975,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
 
                     String aURL( aCurObj.GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) );
 
-                    if ( aURL.Len() && ( !pImp->pUrlFilter || pImp->pUrlFilter->isUrlAllowed( aURL ) ) )
+                    if ( aURL.Len() )
                     {
                         sal_Bool bFound = (aURL.GetChar(aURL.Len()-1) == '/' );
                         if ( !bFound )
@@ -1387,11 +1377,6 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
     return sal_True;
 }
 
-void SvtURLBox::SetUrlFilter( const IUrlFilter* _pFilter )
-{
-    pImp->pUrlFilter = _pFilter;
-}
-
 void SvtURLBox::SetFilter(const String& _sFilter)
 {
     pImp->m_aFilters.clear();