[Libreoffice-commits] core.git: include/sfx2 sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Feb 22 17:04:11 UTC 2019
include/sfx2/docfilt.hxx | 2 -
include/sfx2/frmdescr.hxx | 1
include/sfx2/mailmodelapi.hxx | 2 -
include/sfx2/sidebar/DeckDescriptor.hxx | 1
include/sfx2/sidebar/PanelDescriptor.hxx | 1
include/sfx2/sidebar/TabBar.hxx | 3 --
include/sfx2/tabdlg.hxx | 1
include/sfx2/templatelocalview.hxx | 1
sfx2/source/appl/helpinterceptor.cxx | 39 ++++++----------------------
sfx2/source/appl/helpinterceptor.hxx | 11 -------
sfx2/source/bastyp/fltfnc.cxx | 1
sfx2/source/control/templatedefaultview.cxx | 1
sfx2/source/control/templatelocalview.cxx | 2 -
sfx2/source/dialog/tabdlg.cxx | 3 --
sfx2/source/doc/docfilt.cxx | 5 ---
sfx2/source/doc/doctempl.cxx | 3 --
sfx2/source/doc/frmdescr.cxx | 3 --
sfx2/source/sidebar/DeckDescriptor.cxx | 2 -
sfx2/source/sidebar/PanelDescriptor.cxx | 2 -
sfx2/source/sidebar/ResourceManager.cxx | 4 --
sfx2/source/sidebar/TabBar.cxx | 1
sfx2/source/view/viewsh.cxx | 4 --
22 files changed, 12 insertions(+), 81 deletions(-)
New commits:
commit e79e8117dcc7475d8d90afeaaac9eb7050ff244e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 22 12:25:46 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 22 18:03:27 2019 +0100
loplugin:unusedfields in sfx2
Change-Id: I92b25efa78e156c89a0532aec632a31ec2029e05
Reviewed-on: https://gerrit.libreoffice.org/68202
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 54d4a26922c4..2cd8d5fa0fb2 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -47,7 +47,6 @@ class SFX2_DLLPUBLIC SfxFilter
OUString aServiceName;
OUString aMimeType;
OUString maFilterName;
- OUString aPattern;
OUString aUIName;
OUString aDefaultTemplate;
@@ -101,7 +100,6 @@ public:
const OUString& GetDefaultTemplate() const { return aDefaultTemplate; }
void SetDefaultTemplate( const OUString& rStr ) { aDefaultTemplate = rStr; }
bool UsesStorage() const { return GetFormat() != SotClipboardFormatId::NONE; }
- void SetURLPattern( const OUString& rStr );
void SetUIName( const OUString& rName ) { aUIName = rName; }
void SetVersion( sal_Int32 nVersionP ) { nVersion = nVersionP; }
sal_Int32 GetVersion() const { return nVersion; }
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 295ba098dcfb..99e26280bebb 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -51,7 +51,6 @@ class SfxItemSet;
class SFX2_DLLPUBLIC SfxFrameDescriptor
{
INetURLObject aURL;
- INetURLObject aActualURL;
OUString aName;
Size aMargin;
ScrollingMode eScroll;
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 5c16060d7934..e28b148a9523 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -51,7 +51,6 @@ protected:
private:
std::unique_ptr<AddressList_Impl> mpToList;
OUString maFromAddress;
- OUString maSubject;
static SaveResult ShowFilterOptionsDialog( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR,
const css::uno::Reference< css::frame::XModel >& xModel,
@@ -73,7 +72,6 @@ public:
~SfxMailModel();
void AddToAddress( const OUString& rAddress );
- void SetSubject( const OUString& rSubject ) { maSubject = rSubject; }
/** attaches a document to the current attachment list, can be called more than once.
* at the moment there will be a dialog for export executed for every model which is going to be attached.
diff --git a/include/sfx2/sidebar/DeckDescriptor.hxx b/include/sfx2/sidebar/DeckDescriptor.hxx
index 49c290d0f369..086de40068b8 100644
--- a/include/sfx2/sidebar/DeckDescriptor.hxx
+++ b/include/sfx2/sidebar/DeckDescriptor.hxx
@@ -35,7 +35,6 @@ public:
OUString msHighContrastIconURL;
OUString msTitleBarIconURL;
OUString msHighContrastTitleBarIconURL;
- OUString msHelpURL;
OUString msHelpText;
ContextList maContextList;
bool mbIsEnabled;
diff --git a/include/sfx2/sidebar/PanelDescriptor.hxx b/include/sfx2/sidebar/PanelDescriptor.hxx
index f62076e12bd0..ad40f6a42af0 100644
--- a/include/sfx2/sidebar/PanelDescriptor.hxx
+++ b/include/sfx2/sidebar/PanelDescriptor.hxx
@@ -33,7 +33,6 @@ public:
OUString msDeckId;
OUString msTitleBarIconURL;
OUString msHighContrastTitleBarIconURL;
- OUString msHelpURL;
ContextList maContextList;
OUString msImplementationURL;
sal_Int32 mnOrderIndex;
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 783741ac7443..1736a478aea2 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -50,7 +50,7 @@ class SFX2_DLLPUBLIC TabBar
: public vcl::Window
{
public:
- /** DeckMenuData has entries for display name, deck id, and a flag:
+ /** DeckMenuData has entries for display name, and a flag:
- isCurrentDeck for the deck selection data
- isEnabled for the show/hide menu
*/
@@ -58,7 +58,6 @@ public:
{
public:
OUString msDisplayName;
- OUString msDeckId;
bool mbIsCurrentDeck;
bool mbIsActive;
bool mbIsEnabled;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 47c6418c2707..33ff5175769e 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -69,7 +69,6 @@ friend class SfxTabDialogUIObject;
VclPtr<TabControl> m_pTabCtrl;
VclPtr<PushButton> m_pOKBtn;
- VclPtr<PushButton> m_pApplyBtn;
VclPtr<PushButton> m_pUserBtn;
VclPtr<CancelButton> m_pCancelBtn;
VclPtr<HelpButton> m_pHelpBtn;
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index ce2e64b828b7..b739549580a8 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -173,7 +173,6 @@ protected:
protected:
sal_uInt16 mnCurRegionId;
- OUString maCurRegionName;
TemplateViewItem *maSelectedItem;
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 8c782108857a..0b6034a6c0da 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -51,30 +51,22 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl()
void HelpInterceptor_Impl::addURL( const OUString& rURL )
{
- if ( !m_pHistory )
- m_pHistory.reset( new std::vector<std::unique_ptr<HelpHistoryEntry_Impl>> );
-
- size_t nCount = m_pHistory->size();
+ size_t nCount = m_vHistoryUrls.size();
if ( nCount && m_nCurPos < ( nCount - 1 ) )
{
for ( size_t i = nCount - 1; i > m_nCurPos; i-- )
{
- m_pHistory->erase( m_pHistory->begin() + i );
+ m_vHistoryUrls.erase( m_vHistoryUrls.begin() + i );
}
}
Reference<XFrame> xFrame(m_xIntercepted, UNO_QUERY);
Reference<XController> xController;
if(xFrame.is())
xController = xFrame->getController();
- if(xController.is() && !m_pHistory->empty())
- {
- m_pHistory->at( m_nCurPos )->aViewData = xController->getViewData();
- }
m_aCurrentURL = rURL;
- Any aEmptyViewData;
- m_pHistory->emplace_back( new HelpHistoryEntry_Impl( rURL, aEmptyViewData ) );
- m_nCurPos = m_pHistory->size() - 1;
+ m_vHistoryUrls.emplace_back( rURL );
+ m_nCurPos = m_vHistoryUrls.size() - 1;
// TODO ?
if ( m_xListener.is() )
{
@@ -101,12 +93,12 @@ void HelpInterceptor_Impl::setInterception( const Reference< XFrame >& xFrame )
bool HelpInterceptor_Impl::HasHistoryPred() const
{
- return m_pHistory && ( m_nCurPos > 0 );
+ return m_nCurPos > 0;
}
bool HelpInterceptor_Impl::HasHistorySucc() const
{
- return m_pHistory && ( m_nCurPos < ( m_pHistory->size() - 1 ) );
+ return m_nCurPos < ( m_vHistoryUrls.size() - 1 );
}
@@ -199,30 +191,17 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
if ( !bBack && aURL.Complete != ".uno:Forward" )
return;
- if ( !m_pHistory )
+ if ( m_vHistoryUrls.empty() )
return;
- if(m_pHistory->size() > m_nCurPos)
- {
- Reference<XFrame> xFrame(m_xIntercepted, UNO_QUERY);
- Reference<XController> xController;
- if(xFrame.is())
- xController = xFrame->getController();
- if(xController.is())
- {
- m_pHistory->at( m_nCurPos )->aViewData = xController->getViewData();
- }
- }
-
sal_uIntPtr nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos
- : ( !bBack && m_nCurPos < m_pHistory->size() - 1 )
+ : ( !bBack && m_nCurPos < m_vHistoryUrls.size() - 1 )
? ++m_nCurPos
: ULONG_MAX;
if ( nPos < ULONG_MAX )
{
- HelpHistoryEntry_Impl* pEntry = m_pHistory->at( nPos ).get();
- m_pWindow->loadHelpContent(pEntry->aURL, false); // false => don't add item to history again!
+ m_pWindow->loadHelpContent(m_vHistoryUrls[nPos], false); // false => don't add item to history again!
}
m_pWindow->UpdateToolbox();
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 1c7b29803472..c6cb021680bb 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -31,15 +31,6 @@
#include <vector>
#include <memory>
-struct HelpHistoryEntry_Impl
-{
- OUString const aURL;
- css::uno::Any aViewData;
-
- HelpHistoryEntry_Impl( const OUString& rURL, const css::uno::Any& rViewData ) :
- aURL( rURL ), aViewData(rViewData) {}
-};
-
class SfxHelpWindow_Impl;
class HelpInterceptor_Impl : public ::cppu::WeakImplHelper<
css::frame::XDispatchProviderInterceptor,
@@ -60,7 +51,7 @@ friend class SfxHelpWindow_Impl;
css::uno::Reference< css::frame::XStatusListener > m_xListener;
- std::unique_ptr<std::vector<std::unique_ptr<HelpHistoryEntry_Impl>>> m_pHistory;
+ std::vector<OUString> m_vHistoryUrls;
VclPtr<SfxHelpWindow_Impl> m_pWindow;
sal_uIntPtr m_nCurPos;
OUString m_aCurrentURL;
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index e506de0bc734..7f4d919546a3 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1079,7 +1079,6 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
{
pFilt->SetVersion( nFormatVersion );
}
- pFilt->SetURLPattern(sPattern);
}
void SfxFilterContainer::ReadFilters_Impl( bool bUpdate )
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index b5ca2ba75123..dd75a537177e 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -53,7 +53,6 @@ void TemplateDefaultView::reload()
void TemplateDefaultView::showAllTemplates()
{
mnCurRegionId = 0;
- maCurRegionName.clear();
insertItems(maAllTemplates, false);
maOpenRegionHdl.Call(nullptr);
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 75d9296e390e..d15109f8943b 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -183,7 +183,6 @@ void TemplateLocalView::reload ()
void TemplateLocalView::showAllTemplates()
{
mnCurRegionId = 0;
- maCurRegionName.clear();
insertItems(maAllTemplates, false, true);
@@ -193,7 +192,6 @@ void TemplateLocalView::showAllTemplates()
void TemplateLocalView::showRegion(TemplateContainerItem const *pItem)
{
mnCurRegionId = pItem->mnRegionId+1;
- maCurRegionName = pItem->maTitle;
insertItems(pItem->maTemplates);
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 2c7f0a4e3c63..90ab0b9246e3 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -455,7 +455,6 @@ void SfxTabDialog::dispose()
m_pBox.clear();
m_pTabCtrl.clear();
m_pOKBtn.clear();
- m_pApplyBtn.clear();
m_pUserBtn.clear();
m_pCancelBtn.clear();
m_pHelpBtn.clear();
@@ -486,8 +485,6 @@ void SfxTabDialog::Init_Impl()
if (m_bOwnsOKBtn)
m_pOKBtn = VclPtr<OKButton>::Create(m_pActionArea);
- m_pApplyBtn = m_pUIBuilder->get<PushButton>("apply");
- m_pUserBtn = m_pUIBuilder->get<PushButton>("user");
m_pCancelBtn = m_pUIBuilder->get<CancelButton>("cancel");
m_bOwnsCancelBtn = m_pCancelBtn == nullptr;
if (m_bOwnsCancelBtn)
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index ef1bef3235d6..32c56d8f2b9f 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -97,11 +97,6 @@ OUString SfxFilter::GetDefaultExtension() const
}
-void SfxFilter::SetURLPattern( const OUString& rStr )
-{
- aPattern = rStr.toAsciiLowerCase();
-}
-
OUString SfxFilter::GetSuffixes() const
{
OUString aRet = GetWildcard().getGlob();
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 5dcbd550ec9f..139d4aaa4c41 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -148,7 +148,6 @@ class RegionData_Impl
std::vector<std::unique_ptr<DocTempl_EntryData_Impl>> maEntries;
OUString maTitle;
OUString maOwnURL;
- OUString maTargetURL;
private:
size_t GetEntryPos( const OUString& rTitle,
@@ -159,7 +158,6 @@ public:
RegionData_Impl( const SfxDocTemplate_Impl* pParent,
const OUString& rTitle );
- void SetTargetURL( const OUString& rURL ) { maTargetURL = rURL; }
void SetHierarchyURL( const OUString& rURL) { maOwnURL = rURL; }
DocTempl_EntryData_Impl* GetEntry( size_t nIndex ) const;
@@ -1069,7 +1067,6 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s
if ( xTemplates->renameGroup( pRegion->GetTitle(), rName ) )
{
pRegion->SetTitle( rName );
- pRegion->SetTargetURL( "" );
pRegion->SetHierarchyURL( "" );
return true;
}
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 2912b57c529e..09fb74c19da8 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -50,9 +50,8 @@ void SfxFrameDescriptor::SetURL( const OUString& rURL )
SetActualURL(aURL.GetMainURL( INetURLObject::DecodeMechanism::ToIUri ));
}
-void SfxFrameDescriptor::SetActualURL( const OUString& rURL )
+void SfxFrameDescriptor::SetActualURL( const OUString& )
{
- aActualURL = INetURLObject(rURL);
if ( m_pArgs )
m_pArgs->ClearItem();
}
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx
index fd4f6400fe4f..6a55dfbd202c 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -28,7 +28,6 @@ DeckDescriptor::DeckDescriptor()
msHighContrastIconURL(),
msTitleBarIconURL(),
msHighContrastTitleBarIconURL(),
- msHelpURL(),
msHelpText(),
maContextList(),
mbIsEnabled(true),
@@ -45,7 +44,6 @@ DeckDescriptor::DeckDescriptor (const DeckDescriptor& rOther)
msHighContrastIconURL(rOther.msHighContrastIconURL),
msTitleBarIconURL(rOther.msTitleBarIconURL),
msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
- msHelpURL(rOther.msHelpURL),
msHelpText(rOther.msHelpText),
maContextList(rOther.maContextList),
mbIsEnabled(rOther.mbIsEnabled),
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx
index 43426171e925..90d4183ae4b2 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -28,7 +28,6 @@ PanelDescriptor::PanelDescriptor()
msDeckId(),
msTitleBarIconURL(),
msHighContrastTitleBarIconURL(),
- msHelpURL(),
maContextList(),
msImplementationURL(),
mnOrderIndex(10000), // Default value as defined in Sidebar.xcs
@@ -45,7 +44,6 @@ PanelDescriptor::PanelDescriptor (const PanelDescriptor& rOther)
msDeckId(rOther.msDeckId),
msTitleBarIconURL(rOther.msTitleBarIconURL),
msHighContrastTitleBarIconURL(rOther.msHighContrastTitleBarIconURL),
- msHelpURL(rOther.msHelpURL),
maContextList(rOther.maContextList),
msImplementationURL(rOther.msImplementationURL),
mnOrderIndex(rOther.mnOrderIndex),
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 669402270691..3ef85d0a09ea 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -268,7 +268,6 @@ void ResourceManager::ReadDeckList()
rDeckDescriptor.msHighContrastIconURL = getString(aDeckNode, "HighContrastIconURL");
rDeckDescriptor.msTitleBarIconURL = getString(aDeckNode, "TitleBarIconURL");
rDeckDescriptor.msHighContrastTitleBarIconURL = getString(aDeckNode, "HighContrastTitleBarIconURL");
- rDeckDescriptor.msHelpURL = getString(aDeckNode, "HelpURL");
rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle;
rDeckDescriptor.mnOrderIndex = getInt32(aDeckNode, "OrderIndex");
rDeckDescriptor.mbExperimental = getBool(aDeckNode, "IsExperimental");
@@ -429,7 +428,6 @@ void ResourceManager::ReadPanelList()
rPanelDescriptor.msDeckId = getString(aPanelNode, "DeckId");
rPanelDescriptor.msTitleBarIconURL = getString(aPanelNode, "TitleBarIconURL");
rPanelDescriptor.msHighContrastTitleBarIconURL = getString(aPanelNode, "HighContrastTitleBarIconURL");
- rPanelDescriptor.msHelpURL = getString(aPanelNode, "HelpURL");
rPanelDescriptor.msImplementationURL = getString(aPanelNode, "ImplementationURL");
rPanelDescriptor.mnOrderIndex = getInt32(aPanelNode, "OrderIndex");
rPanelDescriptor.mbShowForReadOnlyDocuments = getBool(aPanelNode, "ShowForReadOnlyDocument");
@@ -663,7 +661,6 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XController>& rxC
rDeckDescriptor.msHighContrastIconURL = rDeckDescriptor.msIconURL;
rDeckDescriptor.msTitleBarIconURL.clear();
rDeckDescriptor.msHighContrastTitleBarIconURL.clear();
- rDeckDescriptor.msHelpURL = getString(aChildNode, "HelpURL");
rDeckDescriptor.msHelpText = rDeckDescriptor.msTitle;
rDeckDescriptor.mbIsEnabled = true;
rDeckDescriptor.mnOrderIndex = 100000 + nReadIndex;
@@ -677,7 +674,6 @@ void ResourceManager::ReadLegacyAddons (const Reference<frame::XController>& rxC
rPanelDescriptor.msDeckId = rsNodeName;
rPanelDescriptor.msTitleBarIconURL.clear();
rPanelDescriptor.msHighContrastTitleBarIconURL.clear();
- rPanelDescriptor.msHelpURL = getString(aChildNode, "HelpURL");
rPanelDescriptor.msImplementationURL = rsNodeName;
rPanelDescriptor.mnOrderIndex = 100000 + nReadIndex;
rPanelDescriptor.mbShowForReadOnlyDocuments = false;
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 670f8fbf6ef9..d2e9f699ad46 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -393,7 +393,6 @@ IMPL_LINK_NOARG(TabBar, OnToolboxClicked, Button*, void)
{
DeckMenuData aData;
aData.msDisplayName = xDeckDescriptor->msTitle;
- aData.msDeckId = xDeckDescriptor->msId;
aData.mbIsCurrentDeck = item.mpButton->IsChecked();
aData.mbIsActive = !item.mbIsHidden;
aData.mbIsEnabled = item.mpButton->IsEnabled();
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 8471cdc845c8..47fbfd7afbf7 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -452,10 +452,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
SfxMailModel aModel;
OUString aDocType;
- const SfxStringItem* pMailSubject = rReq.GetArg<SfxStringItem>(SID_MAIL_SUBJECT);
- if ( pMailSubject )
- aModel.SetSubject( pMailSubject->GetValue() );
-
const SfxStringItem* pMailRecipient = rReq.GetArg<SfxStringItem>(SID_MAIL_RECIPIENT);
if ( pMailRecipient )
{
More information about the Libreoffice-commits
mailing list