strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/include/svx/gallery.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

137 lines
6.8 KiB
C++
Raw Blame History

/* -*- 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_GALLERY_HXX
#define INCLUDED_SVX_GALLERY_HXX
#include <svx/svxdllapi.h>
#include <rtl/ustring.hxx>
#include <vector>
// Defines for preinstalled themes
#define GALLERY_THEME_3D 1
#define GALLERY_THEME_BULLETS 3
#define GALLERY_THEME_HOMEPAGE 10
#define GALLERY_THEME_HTMLBUTTONS 15
#define GALLERY_THEME_POWERPOINT 16
#define GALLERY_THEME_RULERS 17
#define GALLERY_THEME_SOUNDS 18
#define GALLERY_THEME_MYTHEME 20
#define GALLERY_THEME_USERSOUNDS 21
#define GALLERY_THEME_DUMMY5 36
#define GALLERY_THEME_FONTWORK 37
#define GALLERY_THEME_FONTWORK_VERTICAL 38
#define RID_GALLERY_THEME_START (6000)
// ATTENTION: This list has to be in sync with
// * share/gallery (theme files are identified by id)
//
// Since galleries may be copied from older offices to newer, do *never* change
// these IDs except adding new ones (and adapting GALLERY_THEME_LAST). The ID
// *is* written into the binary file *.thm (which is a gallery theme combined
// of three files, *.thm, *.sdv and *.sdg)
#define RID_GALLERY_THEME_3D (RID_GALLERY_THEME_START + 1)
#define RID_GALLERY_THEME_ANIMATIONS (RID_GALLERY_THEME_START + 2)
#define RID_GALLERY_THEME_BULLETS (RID_GALLERY_THEME_START + 3)
#define RID_GALLERY_THEME_OFFICE (RID_GALLERY_THEME_START + 4)
#define RID_GALLERY_THEME_FLAGS (RID_GALLERY_THEME_START + 5)
#define RID_GALLERY_THEME_FLOWCHARTS (RID_GALLERY_THEME_START + 6)
#define RID_GALLERY_THEME_EMOTICONS (RID_GALLERY_THEME_START + 7)
#define RID_GALLERY_THEME_PHOTOS (RID_GALLERY_THEME_START + 8)
#define RID_GALLERY_THEME_BACKGROUNDS (RID_GALLERY_THEME_START + 9)
#define RID_GALLERY_THEME_HOMEPAGE (RID_GALLERY_THEME_START + 10)
#define RID_GALLERY_THEME_INTERACTION (RID_GALLERY_THEME_START + 11)
#define RID_GALLERY_THEME_MAPS (RID_GALLERY_THEME_START + 12)
#define RID_GALLERY_THEME_PEOPLE (RID_GALLERY_THEME_START + 13)
#define RID_GALLERY_THEME_SURFACES (RID_GALLERY_THEME_START + 14)
#define RID_GALLERY_THEME_SOUNDS (RID_GALLERY_THEME_START + 18)
#define RID_GALLERY_THEME_SYMBOLS (RID_GALLERY_THEME_START + 19)
#define RID_GALLERY_THEME_MYTHEME (RID_GALLERY_THEME_START + 20)
#define RID_GALLERY_THEME_ARROWS (RID_GALLERY_THEME_START + 22)
#define RID_GALLERY_THEME_BALLOONS (RID_GALLERY_THEME_START + 23)
#define RID_GALLERY_THEME_KEYBOARD (RID_GALLERY_THEME_START + 24)
#define RID_GALLERY_THEME_TIME (RID_GALLERY_THEME_START + 25)
#define RID_GALLERY_THEME_PRESENTATION (RID_GALLERY_THEME_START + 26)
#define RID_GALLERY_THEME_CALENDAR (RID_GALLERY_THEME_START + 27)
#define RID_GALLERY_THEME_NAVIGATION (RID_GALLERY_THEME_START + 28)
#define RID_GALLERY_THEME_COMMUNICATION (RID_GALLERY_THEME_START + 29)
#define RID_GALLERY_THEME_FINANCES (RID_GALLERY_THEME_START + 30)
#define RID_GALLERY_THEME_COMPUTER (RID_GALLERY_THEME_START + 31)
#define RID_GALLERY_THEME_CLIMA (RID_GALLERY_THEME_START + 32)
#define RID_GALLERY_THEME_EDUCATION (RID_GALLERY_THEME_START + 33)
#define RID_GALLERY_THEME_TROUBLE (RID_GALLERY_THEME_START + 34)
#define RID_GALLERY_THEME_SCREENBEANS (RID_GALLERY_THEME_START + 35)
#define RID_GALLERY_THEME_COMPUTERS (RID_GALLERY_THEME_START + 39)
#define RID_GALLERY_THEME_DIAGRAMS (RID_GALLERY_THEME_START + 40)
#define RID_GALLERY_THEME_ENVIRONMENT (RID_GALLERY_THEME_START + 41)
#define RID_GALLERY_THEME_FINANCE (RID_GALLERY_THEME_START + 42)
#define RID_GALLERY_THEME_TRANSPORT (RID_GALLERY_THEME_START + 43)
#define RID_GALLERY_THEME_TXTSHAPES (RID_GALLERY_THEME_START + 44)
#define RID_GALLERY_THEME_FIRST RID_GALLERY_THEME_3D
#define RID_GALLERY_THEME_LAST RID_GALLERY_THEME_TXTSHAPES
class SdrModel;
class Graphic;
class BitmapEx;
class SVXCORE_DLLPUBLIC GalleryExplorer
{
public:
static bool FillThemeList( std::vector<OUString>& rThemeList );
// FillObjList is filling rObjList with Strings of the internal Gallery Object URL
static bool FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList );
static bool FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList );
// FillObjTitleList is filling the rList with the title for each gallery object
static bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList );
static bool InsertURL( const OUString& rThemeName, const OUString& rURL );
static bool InsertURL( sal_uInt32 nThemeId, const OUString& rURL );
static bool GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos,
Graphic* pGraphic );
static bool GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
Graphic* pGraphic );
static sal_uInt32 GetSdrObjCount( const OUString& rThemeName );
static sal_uInt32 GetSdrObjCount( sal_uInt32 nThemeId );
static bool GetSdrObj( const OUString& rThemeName, sal_uInt32 nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb = nullptr );
static bool GetSdrObj( sal_uInt32 nThemeId, sal_uInt32 nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb = nullptr );
static bool BeginLocking( const OUString& rThemeName );
static bool BeginLocking( sal_uInt32 nThemeId );
static bool EndLocking( const OUString& rThemeName );
static bool EndLocking( sal_uInt32 nThemeId );
};
#endif // INCLUDED_SVX_GALLERY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in a new issue View git blame Copy permalink