[Libreoffice-commits] core.git: framework/source sfx2/source
Stephan Bergmann
sbergman at redhat.com
Fri Nov 8 17:55:04 CET 2013
framework/source/classes/menumanager.cxx | 6 +--
framework/source/uielement/menubarmanager.cxx | 4 --
framework/source/uielement/newmenucontroller.cxx | 4 --
framework/source/uielement/popuptoolbarcontroller.cxx | 3 -
framework/source/uielement/recentfilesmenucontroller.cxx | 3 -
sfx2/source/appl/appdata.cxx | 1
sfx2/source/appl/appopen.cxx | 3 -
sfx2/source/appl/appserv.cxx | 1
sfx2/source/appl/sfxpicklist.cxx | 3 -
sfx2/source/control/recentdocsview.cxx | 4 --
sfx2/source/inc/referers.hxx | 30 ---------------
sfx2/source/inet/inettbc.cxx | 3 -
sfx2/source/toolbox/tbxitem.cxx | 1
13 files changed, 10 insertions(+), 56 deletions(-)
New commits:
commit dfe1a6fbd83beaddf21e885ae20098e40ffcace2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 8 17:54:16 2013 +0100
Unwind SFX_REFERER_USER
...and remove remaining unused content of sfx2/source/inc/referers.hxx.
Change-Id: I5c533f63e13da930f6944af0e85d4b061c30e5b0
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 85d6798..4866515 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 c65abbb..a344d3b 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 6965382..7028a80 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 4df44fb..37d84dc 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 43c0350..6449087 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";
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index d031fbc..1047a01 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 e376929..82c7b35 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 f7116e3..4820ba9 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 faaf6a6..9ec4aa3 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 706214e..888c3ad 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 fb895e8..0000000
--- 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 924896c..e7cec07 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 f712e14..aeb71eb 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>
More information about the Libreoffice-commits
mailing list