ff546a5dd3
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>
95 lines
3.6 KiB
C++
95 lines
3.6 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_VIEWPT3D_HXX
|
|
#define INCLUDED_SVX_VIEWPT3D_HXX
|
|
|
|
#include <svx/svxdllapi.h>
|
|
#include <basegfx/matrix/b3dhommatrix.hxx>
|
|
#include <basegfx/point/b3dpoint.hxx>
|
|
#include <basegfx/vector/b3dvector.hxx>
|
|
#include <tools/gen.hxx>
|
|
|
|
// predefines
|
|
namespace basegfx { class B3DRange; } // end of namespace basegfx
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* enums for projection
|
|
|*
|
|
\************************************************************************/
|
|
|
|
enum class ProjectionType { Parallel, Perspective };
|
|
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* 3D viewport according to PHIGS
|
|
|*
|
|
\************************************************************************/
|
|
|
|
class SVXCORE_DLLPUBLIC Viewport3D
|
|
{
|
|
protected:
|
|
basegfx::B3DHomMatrix aViewTf; // the real transformations matrix
|
|
basegfx::B3DPoint aVRP; // View Reference Point
|
|
basegfx::B3DVector aVPN; // View Plane Normal
|
|
basegfx::B3DVector aVUV; // View Up Vector
|
|
basegfx::B3DPoint aPRP; // Projection Reference Point(View-coordinates)
|
|
// up to now only the z-coordinate is considered
|
|
|
|
ProjectionType eProjection; // kind of the projection
|
|
tools::Rectangle aDeviceRect; // position and size of the output area
|
|
|
|
struct
|
|
{
|
|
double X, Y, W, H; // position and size of the view window
|
|
} aViewWin; // in view coordinates
|
|
|
|
basegfx::B3DPoint aViewPoint; //observers position in world coordinates;
|
|
// is calculated by the transformation
|
|
bool bTfValid; // flag, if transformation is valid
|
|
|
|
public:
|
|
Viewport3D();
|
|
|
|
void SetVRP(const basegfx::B3DPoint& rNewVRP);
|
|
void SetVPN(const basegfx::B3DVector& rNewVPN);
|
|
void SetVUV(const basegfx::B3DVector& rNewVUV);
|
|
void SetPRP(const basegfx::B3DPoint& rNewPRP);
|
|
|
|
const basegfx::B3DPoint& GetVRP() const { return aVRP; }
|
|
const basegfx::B3DVector& GetVUV() const { return aVUV; }
|
|
|
|
void SetProjection(ProjectionType ePrj)
|
|
{ eProjection = ePrj; bTfValid = false; }
|
|
ProjectionType GetProjection() const { return eProjection; }
|
|
|
|
void SetViewWindow(double fX, double fY, double fW, double fH);
|
|
|
|
void SetDeviceWindow(const tools::Rectangle& rRect);
|
|
const tools::Rectangle& GetDeviceWindow() const { return aDeviceRect; }
|
|
|
|
// returns observers position in world coordinates
|
|
const basegfx::B3DPoint& GetViewPoint();
|
|
};
|
|
|
|
#endif // INCLUDED_SVX_VIEWPT3D_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|