sd/source/ui/inc/DrawViewShell.hxx | 8 ++++----
sd/source/ui/inc/ViewShell.hxx | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 75e04a3a2848137b2eeed338165c08e7bc7144eb
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 29 09:26:37 2024 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jul 29 10:39:45 2024 +0200
CppunitTest_sd_annotation_tests: fix gcc build
sd/qa/unit/AnnotationTest.cxx:256: error: undefined reference to 'typeinfo
for sd::DrawViewShell'
sd/qa/unit/AnnotationTest.cxx:256: error: undefined reference to 'typeinfo
for sd::ViewShell'
Seems SAL_DLLPUBLIC_RTTI expands to __attribute__
((type_visibility("default"))) with clang, but not with gcc.
Change-Id: Ib110ad76069c4e0ed781b7aa14d3e69bd6bfaedf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171175
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index 09de1c685361..8c91f4d6f0ff 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -66,7 +66,7 @@ class ViewOverlayManager;
overview over several slides or a textual
overview over the text in an Impress document (OutlineViewShell).
*/
-class SAL_DLLPUBLIC_RTTI DrawViewShell
+class SD_DLLPUBLIC DrawViewShell
: public ViewShell,
public SfxListener,
public utl::ConfigurationListener
@@ -223,7 +223,7 @@ public:
void ExecGoToLastPage (SfxRequest& rReq);
void GetStateGoToLastPage (SfxItemSet& rSet);
- SD_DLLPUBLIC void ExecChar(SfxRequest& rReq);
+ void ExecChar(SfxRequest& rReq);
void ExecuteAnnotation (SfxRequest const & rRequest);
void GetAnnotationState (SfxItemSet& rItemSet);
@@ -246,7 +246,7 @@ public:
void ResetActualPage();
void ResetActualLayer();
- SD_DLLPUBLIC bool SwitchPage(sal_uInt16 nPage, bool bAllowChangeFocus =
true);
+ bool SwitchPage(sal_uInt16 nPage, bool bAllowChangeFocus = true);
bool IsSwitchPageAllowed() const;
/**
@@ -347,7 +347,7 @@ public:
/** Return a pointer to the tab control for layers.
*/
- SD_DLLPUBLIC LayerTabBar* GetLayerTabControl(); // export for unit test
+ LayerTabBar* GetLayerTabControl();
/** Renames the given slide using an SvxNameDialog
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index d9fd8564edd0..1b5251e6c4b1 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -87,7 +87,7 @@ const DrawModeFlags OUTPUT_DRAWMODE_CONTRAST
<p>This class replaces the former ViewShell class.</p>
*/
-class SAL_DLLPUBLIC_RTTI ViewShell
+class SD_DLLPUBLIC ViewShell
: public SfxShell
{
public:
@@ -143,17 +143,17 @@ public:
::sd::View* GetView() const { return mpView; }
inline SdrView* GetDrawView() const;
- SD_DLLPUBLIC DrawDocShell* GetDocSh() const;
+ DrawDocShell* GetDocSh() const;
SdDrawDocument* GetDoc() const;
- SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const;
+ SfxViewFrame* GetViewFrame() const;
/** The active window is usually the mpContentWindow. When there is a
show running then the active window is a ShowWindow.
*/
::sd::Window* GetActiveWindow() const { return mpActiveWindow;}
- SD_DLLPUBLIC weld::Window* GetFrameWeld() const;
+ weld::Window* GetFrameWeld() const;
/** Set the active window. When the shell is displayed in the center
pane then the window of the ViewShellBase is also set to the given
@@ -333,7 +333,7 @@ public:
// virtual void InnerResizePixel(const Point &rPos, const Size &rSize);
// Exported for unit test
- SD_DLLPUBLIC ViewShellBase& GetViewShellBase() const;
+ ViewShellBase& GetViewShellBase() const;
/** Return <TRUE/> when the called view shell is the main sub shell of
its ViewShellBase object, i.e. is display in the center pane. This
@@ -355,7 +355,7 @@ public:
/** Return the type of the shell.
*/
- SD_DLLPUBLIC ShellType GetShellType() const; //Export for unit test
+ ShellType GetShellType() const;
/** This method is more or less an alias to Deactivate(). It is called
before an object of this class is taken from the stack of view
