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>
173 lines
5.4 KiB
C++
173 lines
5.4 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_INC_GALOBJ_HXX
|
|
#define INCLUDED_SVX_INC_GALOBJ_HXX
|
|
|
|
#include <tools/urlobj.hxx>
|
|
#include <vcl/graph.hxx>
|
|
#include <vcl/gdimtf.hxx>
|
|
#include <svx/galmisc.hxx>
|
|
|
|
#define S_THUMB 80
|
|
|
|
|
|
enum GalSoundType
|
|
{
|
|
SOUND_STANDARD = 0,
|
|
SOUND_COMPUTER = 1,
|
|
SOUND_MISC = 2,
|
|
SOUND_MUSIC = 3,
|
|
SOUND_NATURE = 4,
|
|
SOUND_SPEECH = 5,
|
|
SOUND_TECHNIC = 6,
|
|
SOUND_ANIMAL = 7
|
|
};
|
|
|
|
class SVXCORE_DLLPUBLIC SgaObject
|
|
{
|
|
friend class GalleryTheme;
|
|
|
|
private:
|
|
|
|
void ImplUpdateURL( const INetURLObject& rNewURL ) { aURL = rNewURL; }
|
|
|
|
protected:
|
|
|
|
BitmapEx aThumbBmp; // Allow transparence to survive
|
|
GDIMetaFile aThumbMtf;
|
|
INetURLObject aURL;
|
|
OUString aTitle;
|
|
bool bIsValid;
|
|
bool bIsThumbBmp;
|
|
|
|
virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const;
|
|
virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
|
|
|
|
bool CreateThumb( const Graphic& rGraphic );
|
|
|
|
public:
|
|
SgaObject();
|
|
virtual ~SgaObject() {};
|
|
|
|
virtual SgaObjKind GetObjKind() const = 0;
|
|
virtual sal_uInt16 GetVersion() const = 0;
|
|
|
|
virtual BitmapEx GetThumbBmp() const { return aThumbBmp; }
|
|
const GDIMetaFile& GetThumbMtf() const { return aThumbMtf; }
|
|
const INetURLObject& GetURL() const { return aURL; }
|
|
bool IsValid() const { return bIsValid; }
|
|
bool IsThumbBitmap() const { return bIsThumbBmp; }
|
|
|
|
OUString const & GetTitle() const;
|
|
void SetTitle( const OUString& rTitle );
|
|
|
|
friend SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj );
|
|
friend SvStream& ReadSgaObject( SvStream& rIn, SgaObject& rObj );
|
|
|
|
BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
|
|
};
|
|
|
|
class SgaObjectSound final : public SgaObject
|
|
{
|
|
private:
|
|
|
|
GalSoundType eSoundType;
|
|
|
|
virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override;
|
|
virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override;
|
|
|
|
virtual sal_uInt16 GetVersion() const override { return 6; }
|
|
|
|
public:
|
|
|
|
SgaObjectSound();
|
|
SgaObjectSound( const INetURLObject& rURL );
|
|
virtual ~SgaObjectSound() override;
|
|
|
|
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Sound; }
|
|
virtual BitmapEx GetThumbBmp() const override;
|
|
};
|
|
|
|
class FmFormModel;
|
|
|
|
class SgaObjectSvDraw final : public SgaObject
|
|
{
|
|
using SgaObject::CreateThumb;
|
|
|
|
private:
|
|
|
|
bool CreateThumb( const FmFormModel& rModel );
|
|
|
|
virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override;
|
|
virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override;
|
|
|
|
virtual sal_uInt16 GetVersion() const override { return 5; }
|
|
|
|
public:
|
|
|
|
SgaObjectSvDraw();
|
|
SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject& rURL );
|
|
SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL );
|
|
|
|
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::SvDraw; }
|
|
};
|
|
|
|
class SgaObjectBmp: public SgaObject
|
|
{
|
|
private:
|
|
|
|
void Init( const Graphic& rGraphic, const INetURLObject& rURL );
|
|
|
|
virtual void WriteData( SvStream& rOut, const OUString& rDestDir ) const override;
|
|
virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) override;
|
|
|
|
virtual sal_uInt16 GetVersion() const override { return 5; }
|
|
|
|
public:
|
|
|
|
SgaObjectBmp();
|
|
SgaObjectBmp( const INetURLObject& rURL );
|
|
SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL );
|
|
|
|
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Bitmap; }
|
|
};
|
|
|
|
class SgaObjectAnim : public SgaObjectBmp
|
|
{
|
|
public:
|
|
|
|
SgaObjectAnim();
|
|
SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL );
|
|
|
|
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Animation; }
|
|
};
|
|
|
|
class SgaObjectINet final : public SgaObjectAnim
|
|
{
|
|
public:
|
|
|
|
SgaObjectINet();
|
|
SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL );
|
|
|
|
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Inet; }
|
|
};
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|