Unwind SFX_REFERER_USER

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

Change-Id: I5c533f63e13da930f6944af0e85d4b061c30e5b0

5 files changed, 6 insertions, 14 deletions

diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 85d6798c3ef9..486651540234 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -86,8 +86,6 @@ namespace framework
 #define SID_AUTOPILOTMENU       (SID_SFX_START + 1381)
 #define SID_ADDONLIST           (SID_SFX_START + 1677)
 
-#define SFX_REFERER_USER        "private:user"
-
 #define aSlotNewDocDirect "slot:5537"
 #define aSlotAutoPilot "slot:6381"
 
@@ -695,7 +693,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
     aArgsList[0].Value = a;
 
     aArgsList[1].Name = OUString( "Referer" );
-    a <<= OUString( SFX_REFERER_USER );
+    a <<= OUString( "private:user" );
     aArgsList[1].Value = a;
 
     OUString aFilter( pMenuItemHandler->aFilter );
@@ -896,7 +894,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
                         // bookmark menu item selected
                         aArgs.realloc( 1 );
                         aArgs[0].Name = OUString( "Referer" );
-                        aArgs[0].Value <<= OUString( SFX_REFERER_USER );
+                        aArgs[0].Value <<= OUString( "private:user" );
                     }
 
                     xDispatch = pMenuItemHandler->xMenuItemDispatch;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index c65abbbeb7a3..a344d3b3b6c2 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -142,8 +142,6 @@ namespace framework
 #define SID_ADDONLIST           (SID_SFX_START + 1677)
 #define SID_HELPMENU            (SID_SFX_START + 410)
 
-#define SFX_REFERER_USER        "private:user"
-
 #define aCmdHelpIndex ".uno:HelpIndex"
 #define aCmdToolsMenu ".uno:ToolsMenu"
 #define aCmdHelpMenu ".uno:HelpMenu"
@@ -1075,7 +1073,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
                         // bookmark menu item selected
                         aArgs.realloc( 1 );
                         aArgs[0].Name = OUString( "Referer" );
-                        aArgs[0].Value <<= OUString( SFX_REFERER_USER );
+                        aArgs[0].Value <<= OUString( "private:user" );
                     }
 
                     xDispatch = pMenuItemHandler->xMenuItemDispatch;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 69653823a928..7028a8098fb7 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -57,8 +57,6 @@ using namespace com::sun::star::util;
 using namespace com::sun::star::container;
 using namespace com::sun::star::ui;
 
-static const char SFX_REFERER_USER[] = "private:user";
-
 namespace framework
 {
 
@@ -420,7 +418,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent
             xURLTransformer->parseStrict( aTargetURL );
 
             aArgsList[0].Name = OUString( "Referer" );
-            aArgsList[0].Value = makeAny( OUString(SFX_REFERER_USER ));
+            aArgsList[0].Value = makeAny( OUString( "private:user" ));
 
             OUString aTargetFrame( m_aTargetFrame );
             AddInfoForId::const_iterator pItem = m_aAddInfoForItem.find( rEvent.MenuId );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 4df44fb9694d..37d84dcbcc8a 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
 #define UNO_COMMAND_RECENT_FILE_LIST    ".uno:RecentFileList"
-#define SFX_REFERER_USER                "private:user"
 
 namespace framework
 {
@@ -310,7 +309,7 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
 
     css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
     aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer"  ));
-    aArgs[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER ) );
+    aArgs[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) );
 
     dispatchCommand( m_aLastURL, aArgs, aTarget );
 }
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 43c0350ded67..644908791eb8 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star::util;
 
 #define MAX_MENU_ITEMS  99
 
-static const char SFX_REFERER_USER[] = "private:user";
 static const char CMD_CLEAR_LIST[]   = ".uno:ClearRecentFileList";
 static const char CMD_PREFIX[]       = "vnd.sun.star.popup:RecentFileList?entry=";
 static const char MENU_SHORTCUT[]     = "~N. ";
@@ -215,7 +214,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex )
         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 in the picklist will never be opened as templates
         aArgsList[1].Name = "AsTemplate";