Kaydet (Commit) fdb68fee authored tarafından Noel Grandin's avatar Noel Grandin

FmInterfaceItem is dead

ever since
    commit a0c7b2bc
    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: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst d8c41e6f
...@@ -443,7 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ ...@@ -443,7 +443,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/form/fmdpage \ svx/source/form/fmdpage \
svx/source/form/fmexch \ svx/source/form/fmexch \
svx/source/form/fmexpl \ svx/source/form/fmexpl \
svx/source/form/fmitems \
svx/source/form/fmmodel \ svx/source/form/fmmodel \
svx/source/form/fmobj \ svx/source/form/fmobj \
svx/source/form/fmpage \ svx/source/form/fmpage \
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
*/ */
#include <svx/fmgridif.hxx> #include <svx/fmgridif.hxx>
#include <fmitems.hxx>
#include <fmprop.hxx> #include <fmprop.hxx>
#include <svx/fmtools.hxx> #include <svx/fmtools.hxx>
#include <fmservs.hxx> #include <fmservs.hxx>
...@@ -789,7 +788,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe ...@@ -789,7 +788,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
OUString aFieldType; OUString aFieldType;
bool bReplace = false; bool bReplace = false;
InspectorAction eInspectorAction = eNone; InspectorAction eInspectorAction = eNone;
Reference< XPropertySet > xColumnToInspect;
OString sExecutionResult = rMenu.GetCurItemIdent(); OString sExecutionResult = rMenu.GetCurItemIdent();
if (sExecutionResult.isEmpty()) if (sExecutionResult.isEmpty())
...@@ -826,7 +824,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe ...@@ -826,7 +824,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
else if (sExecutionResult == "column") else if (sExecutionResult == "column")
{ {
eInspectorAction = rMenu.IsItemChecked(rMenu.GetItemId("column")) ? eOpenInspector : eCloseInspector; eInspectorAction = rMenu.IsItemChecked(rMenu.GetItemId("column")) ? eOpenInspector : eCloseInspector;
xColumnToInspect.set( xCols->getByIndex( nPos ), UNO_QUERY );
} }
else if (sExecutionResult.startsWith(FM_COL_TEXTFIELD)) else if (sExecutionResult.startsWith(FM_COL_TEXTFIELD))
{ {
...@@ -943,7 +940,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe ...@@ -943,7 +940,6 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
::comphelper::disposeComponent( xReplaced ); ::comphelper::disposeComponent( xReplaced );
eInspectorAction = eUpdateInspector; eInspectorAction = eUpdateInspector;
xColumnToInspect = xNewCol;
} }
else else
{ {
...@@ -977,12 +973,11 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe ...@@ -977,12 +973,11 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if ( eInspectorAction != eNone ) if ( eInspectorAction != eNone )
{ {
FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction != eCloseInspector ); SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction != eCloseInspector );
pCurrentFrame->GetBindings().GetDispatcher()->ExecuteList( pCurrentFrame->GetBindings().GetDispatcher()->ExecuteList(
SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON, SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON,
{ &aIFaceItem, &aShowItem }); { &aShowItem });
} }
} }
} }
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <filtnav.hxx> #include <filtnav.hxx>
#include <fmexch.hxx> #include <fmexch.hxx>
#include <helpids.h> #include <helpids.h>
#include <fmitems.hxx>
#include <fmprop.hxx> #include <fmprop.hxx>
#include <svx/strings.hrc> #include <svx/strings.hrc>
......
/* -*- 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: */
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <fmservs.hxx> #include <fmservs.hxx>
#include <fmprop.hxx> #include <fmprop.hxx>
#include <fmpgeimp.hxx> #include <fmpgeimp.hxx>
#include <fmitems.hxx>
#include <fmundo.hxx> #include <fmundo.hxx>
#include <vcl/waitobj.hxx> #include <vcl/waitobj.hxx>
#include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/form/XLoadable.hpp>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <sal/macros.h> #include <sal/macros.h>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <fmitems.hxx>
#include <fmobj.hxx> #include <fmobj.hxx>
#include <fmpgeimp.hxx> #include <fmpgeimp.hxx>
#include <svx/fmtools.hxx> #include <svx/fmtools.hxx>
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx>
#include <basic/sbuno.hxx> #include <basic/sbuno.hxx>
#include <basic/sbx.hxx> #include <basic/sbx.hxx>
#include <fmitems.hxx>
#include <fmobj.hxx> #include <fmobj.hxx>
#include <svx/svditer.hxx> #include <svx/svditer.hxx>
#include <svx/svdpagv.hxx> #include <svx/svdpagv.hxx>
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include <fmservs.hxx> #include <fmservs.hxx>
#include <fmundo.hxx> #include <fmundo.hxx>
#include <fmpgeimp.hxx> #include <fmpgeimp.hxx>
#include <fmitems.hxx>
#include <fmobj.hxx> #include <fmobj.hxx>
#include <fmprop.hxx> #include <fmprop.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <vcl/toolbox.hxx> #include <vcl/toolbox.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <fmitems.hxx>
#include <formtoolbars.hxx> #include <formtoolbars.hxx>
......
/* -*- 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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment