office-gobmx/include/svx/fmgridcl.hxx
Stephan Bergmann ff546a5dd3 tdf#128302: Split SVXCORE_DLLPUBLIC from SVX_DLLPUBLIC
Using SVX_DLLPUBLIC for both Library_svxcore and Library_svx had started to
cause failures with clang-cl on Windows now, presumably due to devirtualization:

> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::DataChanged(class DataChangedEvent const &)" (?DataChanged@SvxMetricField@@MEAAXAEBVDataChangedEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::PreNotify(class NotifyEvent &)" (?PreNotify@SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::EventNotify(class NotifyEvent &)" (?EventNotify@SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::Modify(void)" (?Modify@SvxMetricField@@MEAAXXZ)
> linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::PreNotify(class NotifyEvent &)" (?PreNotify@SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z)
> linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::EventNotify(class NotifyEvent &)" (?EventNotify@SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z)
> C:\lo-clang\core\instdir\program\svxcorelo.dll : fatal error LNK1120: 6 unresolved externals

Replacing certain uses of SVX_DLLPUBLIC with the newly introduced
SVXCORE_DLLPUBLIC (include/svx/svxdllapi.h) has been done on Linux as follows:

> git grep -w --line-number -e SVX_DLLPUBLIC --and --not -e '#define SVX_DLLPUBLIC' >LINES

to produce a file LINES containing all 640 uses.  (Conveniently, all uses
happen to be on different lines.)  Manually create a file TOKENS
with 640 corresponding lines, each containing the (class or function) name that
is made SVX_DLLPUBLIC by in the corresponding line in LINES.  Then

> nm -D --def instdir/program/libsvxcorelo.so | grep -ivw '[vw]' | c++filt >SVXCORESYMS
> nm -D --def instdir/program/libsvxlo.so | grep -ivw '[vw]' | c++filt >SVXSYMS
> n=$(cat TOKENS | wc -l)
> for ((i=1;i<="$n";++i)); do
>   tok=$(head -n "$i" TOKENS | tail -1)
>   printf @
>   grep -Fw "$tok" SVXCORESYMS >/dev/null && printf svxcore
>   printf @
>   grep -Fw "$tok" SVXSYMS >/dev/null && printf svx
>   printf '@ '
>   head -n "$i" LINES | tail -1
> done

to generate 640 output lines detailing for each SVX_DLLPUBLIC name occurrene
whether it is mentioned in exports from neither (@@@), only from svx (@@svx@),
only from svxcore (@svxcore@@), or from both libraries (@svxcore@svx@).  The
numbers that gives is

   10 @@@
  180 @@svx@
  424 @svxcore@@
   26 @svxcore@svx@

The 10 @@@ ask for follow-up clean up, but most of them are just left as
SVX_DLLPUBLIC for now.  The exceptions are sxv::ITextProvider
(include/svx/itextprovider.hxx) and SdrCustomShapeGeometryItem::PropertyPairHash
(include/svx/sdasitm.hxx, where PropertyPairHash is a member struct of
SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem).  Keeping them as SVX_DLLPUBLIC
would cause "unresolved externals" errors when linking Library_svxcore on
Windows.

The 180 @@svx@ are fine to keep as-is, and the 424 @svxcore@@ need rewriting.
The 26 @svxcore@svx@ needed manual inspection to decide (in some cases, the
chosen name in TOKENS was a too generic function name like Fill, in other cases
it was the name of a class exported from one library but also mentioned in the
arguments of a function exported from the other).

And for sdr::table::SdrTableObj the class itself is defined in svxcore while the
static member functions ExportAsRTF and ImportAsRTF are defined in svx.  But
MSVC does not allow to mark the class as SVXCORE_DLLPUBLIC and the two static
member functions as SVX_DLLPLUBIC, so move the two functions out of the class.
(There appears to be no real necessity that they were static member functions in
the first place; they don't even need to be friends of the class.  Nevertheless,
this mixture of functionality from svxcore and svx in include/svx/svdotable.hxx
may ask for follow-up clean up, one way or another.)

All the output lines that need rewriting (all the @svxcore@@ ones, and the
manually picked subset of @@@ and @svxcore@svx@ ones) are copied into a new file
CHANGE (containing 451 lines).  Then

> sed -E -e 's|^@.*@.*@ ([^:]+):([0-9]+):.*$|sed -i -e "\2 s/SVX_DLLPUBLIC/SVXCORE_DLLPUBLIC/" \1|' <CHANGE >COMMANDS
> . COMMANDS

to do the changes.

Change-Id: If9b6dd1c9e9ba2eb883dbdac4385d28c6fc8a203
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87794
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-02 18:39:50 +01:00

199 lines
7.3 KiB
C++

/* -*- 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_FMGRIDCL_HXX
#define INCLUDED_SVX_FMGRIDCL_HXX
#include <svx/gridctrl.hxx>
#include <vcl/transfer.hxx>
#include <svx/svxdllapi.h>
#include <memory>
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::container { class XIndexContainer; }
namespace com::sun::star::container { class XNameAccess; }
// FmGridHeader
struct FmGridHeaderData;
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmGridHeader
:public ::svt::EditBrowserHeader
,public DropTargetHelper
{
protected:
std::unique_ptr<FmGridHeaderData> m_pImpl;
public:
FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG );
virtual ~FmGridHeader() override;
virtual void dispose() override;
public:
// trigger context menu execution
void triggerColumnContextMenu( const ::Point& _rPreferredPos );
protected:
virtual void Command( const CommandEvent& rCEvt ) override;
virtual void RequestHelp( const HelpEvent& rHEvt ) override;
virtual void Select() override;
/** the value returned by GetItemPos is meaningless for the grid model if there are hidden columns,
so use GetModelColumnPos instead
*/
sal_uInt16 GetModelColumnPos(sal_uInt16 nId) const;
/** This is called before executing a context menu for a column. rMenu contains the initial entries
handled by this base class' method (which always has to be called).
Derived classes may alter the menu in any way and handle any additional entries in
PostExecuteColumnContextMenu.
All disabled entries will be removed before executing the menu, so be careful with separators
near entries you probably wish to disable ...
*/
virtual void PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMenu);
/** After executing the context menu for a column this method is called.
*/
virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult);
// DropTargetHelper
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
/** selects the column at the selection supplier.
@param nColumnId
The column id.
*/
void notifyColumnSelect(sal_uInt16 nColumnId);
private:
DECL_LINK( OnAsyncExecuteDrop, void*, void );
};
// FmGridControl
class FmXGridPeer;
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmGridControl : public DbGridControl
{
friend class FmGridHeader;
friend class FmXGridPeer;
FmXGridPeer* m_pPeer;
sal_Int32 m_nCurrentSelectedColumn; // this is the column model (not the view) position...
sal_uInt16 m_nMarkedColumnId;
bool m_bSelecting;
bool m_bInColumnMove : 1;
public:
FmGridControl(
const css::uno::Reference< css::uno::XComponentContext >&,
vcl::Window* pParent,
FmXGridPeer* _pPeer,
WinBits nBits);
// Window
virtual void KeyInput( const KeyEvent& rKEvt ) override;
// css::beans::XPropertyChangeListener
void propertyChange(const css::beans::PropertyChangeEvent& evt);
// css::form::XPositioningListener
void positioned();
// XBound
bool commit();
// css::form::XInsertListener
void inserted();
void markColumn(sal_uInt16 nId);
bool isColumnMarked(sal_uInt16 nId) const;
sal_Int32 GetSelectedColumn() const { return m_nCurrentSelectedColumn;}
/** return the name of the specified object.
@param eObjType
The type to ask for
@param _nPosition
The position of a tablecell (index position), header bar column/row cell
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** return the description of the specified object.
@param eObjType
The type to ask for
@param _nPosition
The position of a tablecell (index position), header bar column/row cell
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
protected:
virtual void Command(const CommandEvent& rEvt) override;
virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) override;
virtual long QueryMinimumRowHeight() override;
virtual void RowHeightChanged() override;
virtual void ColumnResized(sal_uInt16 nId) override;
virtual void ColumnMoved(sal_uInt16 nId) override;
virtual void DeleteSelectedRows() override;
virtual void SetDesignMode(bool bMode) override;
virtual void CellModified() override;
virtual void HideColumn(sal_uInt16 nId) override;
virtual void ShowColumn(sal_uInt16 nId) override;
bool IsInColumnMove() const {return m_bInColumnMove;}
virtual void BeginCursorAction() override;
virtual void EndCursorAction() override;
virtual void Select() override;
// Initialize columns
// a.) only by column description
void InitColumnsByModels(const css::uno::Reference< css::container::XIndexContainer >& xColumns);
// b.) during alivemode by database fields
virtual void InitColumnsByFields(const css::uno::Reference< css::container::XIndexAccess >& xFields) override;
// some kind of impl version (for one single column) of our version of InitColumnsByFields
static void InitColumnByField(
DbGridColumn* _pColumn,
const css::uno::Reference< css::beans::XPropertySet >& _rxColumnModel,
const css::uno::Reference< css::container::XNameAccess >& _rxFieldsByNames,
const css::uno::Reference< css::container::XIndexAccess >& _rxFieldsByIndex
);
FmXGridPeer* GetPeer() const {return m_pPeer;}
css::uno::Sequence< css::uno::Any>
getSelectionBookmarks();
bool selectBookmarks(const css::uno::Sequence< css::uno::Any>& _rBookmarks);
/** returns if a column is selected
@param _pColumn
The column to compare with.
@return
<TRUE/> if the column is selected, otherwise <FALSE/>
*/
bool isColumnSelected(DbGridColumn const * _pColumn);
};
#endif // INCLUDED_SVX_FMGRIDCL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */