Unwind SFX_REFERER_USER

...and remove remaining unused content of sfx2/source/inc/referers.hxx.

Change-Id: I5c533f63e13da930f6944af0e85d4b061c30e5b0

8 files changed, 4 insertions, 42 deletions

diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index d031fbcfe70c..1047a0191f88 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -39,7 +39,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include "referers.hxx"
 #include "app.hrc"
 #include "sfx2/sfxresid.hxx"
 #include "objshimp.hxx"
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index e37692935b5e..82c7b35d7047 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -87,7 +87,6 @@
 #include "objshimp.hxx"
 #include "openflag.hxx"
 #include <sfx2/passwd.hxx>
-#include "referers.hxx"
 #include <sfx2/request.hxx>
 #include "sfx2/sfxresid.hxx"
 #include <sfx2/viewsh.hxx>
@@ -681,7 +680,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
         if ( !aFilter.isEmpty() )
             rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) );
         rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) );
-        rReq.AppendItem( SfxStringItem( SID_REFERER, OUString(SFX_REFERER_USER) ) );
+        rReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) );
         delete pSet;
 
         if(!pURLList.empty())
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f7116e3e7d4b..4820ba9301a6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -83,7 +83,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include "frmload.hxx"
-#include "referers.hxx"
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index faaf6a60167d..9ec4aa3fb435 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -42,7 +42,6 @@
 #include <sfx2/event.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
-#include "referers.hxx"
 #include <sfx2/docfile.hxx>
 #include "objshimp.hxx"
 #include <sfx2/docfilt.hxx>
@@ -310,7 +309,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex )
     {
         SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, SFX_APP()->GetPool() );
         aReq.AppendItem( SfxStringItem( SID_FILE_NAME, pPick->aName ));
-        aReq.AppendItem( SfxStringItem( SID_REFERER, SFX_REFERER_USER ) );
+        aReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) );
         aReq.AppendItem( SfxStringItem( SID_TARGETNAME, "_default" ) );
         OUString aFilter( pPick->aFilter );
         aGuard.clear();
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index 706214e98509..888c3add81e6 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -37,8 +37,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 
-static const char SFX_REFERER_USER[] = "private:user";
-
 RecentDocsView::RecentDocsView( Window* pParent )
     : ThumbnailView(pParent)
     , mnFileTypes(TYPE_NONE)
@@ -225,7 +223,7 @@ void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem )
     sal_Int32 nSize = 2;
     aArgsList.realloc( nSize );
     aArgsList[0].Name = "Referer";
-    aArgsList[0].Value = makeAny( OUString( SFX_REFERER_USER ) );
+    aArgsList[0].Value = makeAny( OUString( "private:user" ) );
 
     // documents will never be opened as templates
     aArgsList[1].Name = "AsTemplate";
diff --git a/sfx2/source/inc/referers.hxx b/sfx2/source/inc/referers.hxx
deleted file mode 100644
index fb895e8dbe78..000000000000
--- a/sfx2/source/inc/referers.hxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SFX2_SOURCE_INC_REFERERS_HXX
-#define INCLUDED_SFX2_SOURCE_INC_REFERERS_HXX
-
-#define SFX_REFERER_USER        "private:user"
-#define SFX_REFERER_APPEVENT    "private:appevent"
-#define SFX_REFERER_EXPLORER    "private:explorer"
-#define SFX_REFERER_NEWMENU     "private:newmenu"
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 924896cf821e..e7cec074c04c 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -46,7 +46,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
-#include "referers.hxx"
 #include "sfxtypes.hxx"
 #include "helper.hxx"
 
@@ -113,7 +112,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew*
         {
             Sequence< PropertyValue > aArgs( 2 );
             aArgs[0].Name = "Referer";
-            aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER ));
+            aArgs[0].Value = makeAny( OUString( "private:user" ));
             aArgs[1].Name = "FileName";
             aArgs[1].Value = makeAny( OUString( aName ));
 
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f712e148465a..aeb71eb3c05f 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -84,7 +84,6 @@
 #include <sfx2/module.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfac.hxx>
-#include "referers.hxx"
 #include <sfx2/frmhtmlw.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/unoctitm.hxx>