summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-23 12:34:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-24 08:35:27 +0200
commitfdb68feeb12362f1d9d8f70d8cae49b2fa004493 (patch)
treec6b0ff1d26badd4658e29c5ec11935c3de6afb12
parentd8c41e6fe52d0b086dbb6a0a947573b87a3311dc (diff)
FmInterfaceItem is dead
ever since commit a0c7b2bc4511da87c776b92aaa77ba7680542fa1 Date: Tue Nov 16 10:24:21 2004 +0000 INTEGRATION: CWS eforms2 (1.48.52); FILE MERGED Change-Id: Id8568ba19c4b7f1b7e5d8e8ebead0b4b2a1f5e0e Reviewed-on: https://gerrit.libreoffice.org/62231 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--svx/Library_svxcore.mk1
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx7
-rw-r--r--svx/source/form/filtnav.cxx1
-rw-r--r--svx/source/form/fmitems.cxx42
-rw-r--r--svx/source/form/fmshell.cxx1
-rw-r--r--svx/source/form/fmshimp.cxx1
-rw-r--r--svx/source/form/fmview.cxx1
-rw-r--r--svx/source/form/navigatortree.cxx1
-rw-r--r--svx/source/form/tbxform.cxx1
-rw-r--r--svx/source/inc/fmitems.hxx45
10 files changed, 1 insertions, 100 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 54b551e5e0b5..84ec127c76b3 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -443,7 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/form/fmdpage \
svx/source/form/fmexch \
svx/source/form/fmexpl \
- svx/source/form/fmitems \
svx/source/form/fmmodel \
svx/source/form/fmobj \
svx/source/form/fmpage \
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index b4ad25d981b7..ede783e1d746 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/fmgridif.hxx>
-#include <fmitems.hxx>
#include <fmprop.hxx>
#include <svx/fmtools.hxx>
#include <fmservs.hxx>
@@ -789,7 +788,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
OUString aFieldType;
bool bReplace = false;
InspectorAction eInspectorAction = eNone;
- Reference< XPropertySet > xColumnToInspect;
OString sExecutionResult = rMenu.GetCurItemIdent();
if (sExecutionResult.isEmpty())
@@ -826,7 +824,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
else if (sExecutionResult == "column")
{
eInspectorAction = rMenu.IsItemChecked(rMenu.GetItemId("column")) ? eOpenInspector : eCloseInspector;
- xColumnToInspect.set( xCols->getByIndex( nPos ), UNO_QUERY );
}
else if (sExecutionResult.startsWith(FM_COL_TEXTFIELD))
{
@@ -943,7 +940,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
::comphelper::disposeComponent( xReplaced );
eInspectorAction = eUpdateInspector;
- xColumnToInspect = xNewCol;
}
else
{
@@ -977,12 +973,11 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if ( eInspectorAction != eNone )
{
- FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction != eCloseInspector );
pCurrentFrame->GetBindings().GetDispatcher()->ExecuteList(
SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON,
- { &aIFaceItem, &aShowItem });
+ { &aShowItem });
}
}
}
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index e4ab2f039c78..24b601d57bdc 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -21,7 +21,6 @@
#include <filtnav.hxx>
#include <fmexch.hxx>
#include <helpids.h>
-#include <fmitems.hxx>
#include <fmprop.hxx>
#include <svx/strings.hrc>
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
deleted file mode 100644
index 832da669928f..000000000000
--- a/svx/source/form/fmitems.cxx
+++ /dev/null
@@ -1,42 +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 .
- */
-
-#include <fmitems.hxx>
-
-#include <svx/svxids.hrc>
-#include <tools/stream.hxx>
-
-
-// class FmInterfaceItem
-
-
-bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
-{
- assert(SfxPoolItem::operator==(rAttr));
- return xInterface == static_cast<const FmInterfaceItem&>(rAttr).xInterface;
-}
-
-
-SfxPoolItem* FmInterfaceItem::Clone( SfxItemPool* ) const
-{
- return new FmInterfaceItem( *this );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 5732394ddf1c..3404c091c21c 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -23,7 +23,6 @@
#include <fmservs.hxx>
#include <fmprop.hxx>
#include <fmpgeimp.hxx>
-#include <fmitems.hxx>
#include <fmundo.hxx>
#include <vcl/waitobj.hxx>
#include <com/sun/star/form/XLoadable.hpp>
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 0709e3eec852..3a84358d7ef2 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -20,7 +20,6 @@
#include <sal/macros.h>
#include <sal/log.hxx>
-#include <fmitems.hxx>
#include <fmobj.hxx>
#include <fmpgeimp.hxx>
#include <svx/fmtools.hxx>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 025ceff9d991..c69812fd717b 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -37,7 +37,6 @@
#include <sfx2/dispatch.hxx>
#include <basic/sbuno.hxx>
#include <basic/sbx.hxx>
-#include <fmitems.hxx>
#include <fmobj.hxx>
#include <svx/svditer.hxx>
#include <svx/svdpagv.hxx>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index e1761279fdd4..1e073238e26b 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -31,7 +31,6 @@
#include <fmservs.hxx>
#include <fmundo.hxx>
#include <fmpgeimp.hxx>
-#include <fmitems.hxx>
#include <fmobj.hxx>
#include <fmprop.hxx>
#include <sal/log.hxx>
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 908576260c0b..87a89350ed23 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -25,7 +25,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/fixed.hxx>
#include <vcl/settings.hxx>
-#include <fmitems.hxx>
#include <formtoolbars.hxx>
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
deleted file mode 100644
index 7947b9e75028..000000000000
--- a/svx/source/inc/fmitems.hxx
+++ /dev/null
@@ -1,45 +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_SVX_SOURCE_INC_FMITEMS_HXX
-#define INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX
-
-
-#include <svl/poolitem.hxx>
-
-
-class FmInterfaceItem : public SfxPoolItem
-{
- css::uno::Reference< css::uno::XInterface > xInterface;
-
-public:
-
- FmInterfaceItem( const sal_uInt16 nId, const css::uno::Reference< css::uno::XInterface >& rxInterface )
- :SfxPoolItem( nId )
- ,xInterface( rxInterface )
- {}
-
- // "purely virtual methods" of the SfxPoolItem
- virtual bool operator==( const SfxPoolItem& ) const override;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-};
-
-#endif // INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */