office-gobmx/include/svx/svddrag.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

165 lines
7.7 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_SVDDRAG_HXX
#define INCLUDED_SVX_SVDDRAG_HXX
#include <tools/gen.hxx>
#include <tools/fract.hxx>
#include <svx/svxdllapi.h>
#include <memory>
#include <vector>
// Status information for specialized object dragging. In order for the model
// to stay status free, the status data is kept on the View
// and handed over to the object at the appropriate time as a parameter.
// This also includes the status of the operation and Interactive
// Object creation. In this case, pHdl is null.
class SdrHdl;
class SdrView;
class SdrPageView;
class SdrDragMethod;
struct SdrDragStatUserData
{
virtual ~SdrDragStatUserData() = 0;
};
class SVXCORE_DLLPUBLIC SdrDragStat final
{
SdrHdl* pHdl; // The Handle for the User
SdrView* pView;
SdrPageView* pPageView;
std::vector<Point> mvPnts; // All previous Points: [0]=Start, [Count()-2]=Prev
Point aRef1; // Referencepoint: Resize fixed point, (axis of rotation,
Point aRef2; // axis of reflection, ...)
Point aPos0; // Position at the last Event
Point aRealNow; // Current dragging position without Snap, Ortho and Limit
tools::Rectangle aActionRect;
bool bEndDragChangesAttributes;
bool bEndDragChangesGeoAndAttributes;
/// Table row drag: table will re-layout itself later.
bool mbEndDragChangesLayout;
bool bMouseIsUp;
bool bShown; // Xor visible?
sal_uInt16 nMinMov; // So much has to be minimally moved first
bool bMinMoved; // MinMove surpassed?
bool bHorFixed; // Dragging only vertical
bool bVerFixed; // Dragging only horizontal
bool bWantNoSnap; // To decide if pObj-> MovCreate () should use NoSnapPos or not.
// Therefore, NoSnapPos is written into the buffer.
bool bOrtho4;
bool bOrtho8;
SdrDragMethod* pDragMethod;
std::unique_ptr<SdrDragStatUserData> mpUserData; // Userdata
void Clear();
sal_Int32 GetPrevPos() const { return mvPnts.size()-(mvPnts.size()>1 ? 2 : 1); }
public:
SdrDragStat() { Reset(); }
~SdrDragStat();
void Reset();
SdrView* GetView() const { return pView; }
void SetView(SdrView* pV) { pView=pV; }
SdrPageView* GetPageView() const { return pPageView; }
void SetPageView(SdrPageView* pPV) { pPageView=pPV; }
const Point& GetPoint(sal_Int32 nNum) const { return mvPnts[nNum]; }
sal_Int32 GetPointCount() const { return mvPnts.size(); }
const Point& GetStart() const { return mvPnts[0]; }
const Point& GetPrev() const { return mvPnts[GetPrevPos()]; }
const Point& GetPos0() const { return aPos0; }
const Point& GetNow() const { return mvPnts.back(); }
void SetNow(Point const &pt) { mvPnts.back() = pt; }
const Point& GetRef1() const { return aRef1; }
void SetRef1(const Point &pt) { aRef1 = pt; }
const Point& GetRef2() const { return aRef2; }
void SetRef2(const Point &pt) { aRef2 = pt; }
const SdrHdl* GetHdl() const { return pHdl; }
void SetHdl(SdrHdl* pH) { pHdl=pH; }
SdrDragStatUserData* GetUser() const { return mpUserData.get(); }
void SetUser(std::unique_ptr<SdrDragStatUserData> pU) { mpUserData = std::move(pU); }
bool IsShown() const { return bShown; }
void SetShown(bool bOn) { bShown=bOn; }
bool IsMinMoved() const { return bMinMoved; }
void SetMinMoved() { bMinMoved=true; }
void ResetMinMoved() { bMinMoved=false; }
void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
bool IsHorFixed() const { return bHorFixed; }
void SetHorFixed(bool bOn) { bHorFixed=bOn; }
bool IsVerFixed() const { return bVerFixed; }
void SetVerFixed(bool bOn) { bVerFixed=bOn; }
// Here, the object can say: "I do not want to snap to coordinates!"
// for example, the angle of the arc ...
bool IsNoSnap() const { return bWantNoSnap; }
void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; }
// And here the Obj say which Ortho (if there is one) can be usefully applied to him.
// Ortho4 means Ortho in four directions (for Rect and CIRT)
bool IsOrtho4Possible() const { return bOrtho4; }
void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; }
// Ortho8 means Ortho in 8 directions (for lines)
bool IsOrtho8Possible() const { return bOrtho8; }
void SetOrtho8Possible(bool bOn = true) { bOrtho8=bOn; }
// Is set by an object that was dragged.
bool IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; }
void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; }
bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; }
void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; }
bool IsEndDragChangesLayout() const { return mbEndDragChangesLayout; }
void SetEndDragChangesLayout(bool bOn) { mbEndDragChangesLayout=bOn; }
// Is set by the view and can be evaluated by Obj
bool IsMouseDown() const { return !bMouseIsUp; }
void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; }
void Reset(const Point& rPnt);
void NextMove(const Point& rPnt);
void NextPoint();
void PrevPoint();
bool CheckMinMoved(const Point& rPnt);
long GetDX() const { return GetNow().X()-GetPrev().X(); }
long GetDY() const { return GetNow().Y()-GetPrev().Y(); }
Fraction GetXFact() const;
Fraction GetYFact() const;
SdrDragMethod* GetDragMethod() const { return pDragMethod; }
void SetDragMethod(SdrDragMethod* pMth) { pDragMethod=pMth; }
const tools::Rectangle& GetActionRect() const { return aActionRect; }
void SetActionRect(const tools::Rectangle& rR) { aActionRect=rR; }
// Also considering 1stPointAsCenter
void TakeCreateRect(tools::Rectangle& rRect) const;
};
#endif // INCLUDED_SVX_SVDDRAG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */