sd/inc/sdpage.hxx | 20 ++++++++++----------
sd/source/ui/inc/DrawController.hxx | 10 +++++++---
sd/source/ui/inc/DrawDocShell.hxx | 6 +++---
sd/source/ui/inc/drawview.hxx | 2 +-
sd/source/ui/inc/navigatr.hxx | 8 ++++----
sd/source/ui/inc/unomodel.hxx | 34 +++++++++++++++++-----------------
6 files changed, 42 insertions(+), 38 deletions(-)
New commits:
commit 6f61cb4b6333b88282978f7472d91c3c86bc628f
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Apr 26 19:56:38 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Apr 27 16:08:42 2024 +0200
reduce symbol visibility in sd
Change-Id: I3d4de2b8854278b8713992660268e764815fe738
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166761
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 3903a59b23ed..efaf3fa876bf 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -88,7 +88,7 @@ namespace sd {
class UndoAttrObject;
}
-class SD_DLLPUBLIC SdPage final : public FmFormPage, public SdrObjUserCall
+class SAL_DLLPUBLIC_RTTI SdPage final : public FmFormPage, public
SdrObjUserCall
{
SdPage& operator=(const SdPage&) = delete;
SdPage(const SdPage&) = delete;
@@ -163,10 +163,10 @@ public:
sd::ShapeList& GetPresentationShapeList() { return
maPresentationShapeList; }
void EnsureMasterPageDefaultBackground();
- SdrObject* CreatePresObj(PresObjKind eObjKind, bool bVertical, const
::tools::Rectangle& rRect);
- rtl::Reference<SdrObject> CreateDefaultPresObj(PresObjKind eObjKind);
- void DestroyDefaultPresObj(PresObjKind eObjKind);
- SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool
bFuzzySearch = false );
+ SD_DLLPUBLIC SdrObject* CreatePresObj(PresObjKind eObjKind, bool
bVertical, const ::tools::Rectangle& rRect);
+ SD_DLLPUBLIC rtl::Reference<SdrObject> CreateDefaultPresObj(PresObjKind
eObjKind);
+ SD_DLLPUBLIC void DestroyDefaultPresObj(PresObjKind eObjKind);
+ SD_DLLPUBLIC SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1,
bool bFuzzySearch = false );
PresObjKind GetPresObjKind(SdrObject* pObj) const;
OUString GetPresObjText(PresObjKind eObjKind) const;
SfxStyleSheet* GetStyleSheetForMasterPageBackground() const;
@@ -183,7 +183,7 @@ public:
/** inserts the given SdrObject into the presentation object list */
void InsertPresObj(SdrObject* pObj, PresObjKind eKind );
- void SetAutoLayout(AutoLayout eLayout, bool bInit=false, bool
bCreate=false);
+ SD_DLLPUBLIC void SetAutoLayout(AutoLayout eLayout, bool bInit=false, bool
bCreate=false);
AutoLayout GetAutoLayout() const { return meAutoLayout; }
void CreateTitleAndLayout(bool bInit=false, bool bCreate=false);
SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind
eObjKind, bool bVertical, const ::tools::Rectangle& rRect, bool bInit);
@@ -262,7 +262,7 @@ public:
void ScaleObjects(const Size& rNewPageSize, const
::tools::Rectangle& rNewBorderRect,
bool bScaleAllObj);
- const OUString& GetName() const;
+ SD_DLLPUBLIC const OUString& GetName() const;
OUString const & GetRealName() const { return FmFormPage::GetName(); };
void SetPresentationLayout(std::u16string_view rLayoutName,
@@ -313,10 +313,10 @@ public:
/** Set the name of the page and broadcast a model change.
*/
- void SetName (const OUString& rName);
+ SD_DLLPUBLIC void SetName(const OUString& rName);
- const sd::HeaderFooterSettings& getHeaderFooterSettings() const;
- void setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettings
);
+ SD_DLLPUBLIC const sd::HeaderFooterSettings& getHeaderFooterSettings()
const;
+ SD_DLLPUBLIC void setHeaderFooterSettings( const sd::HeaderFooterSettings&
rNewSettings );
/**
@return true if the object from the ViewObjectContact should
diff --git a/sd/source/ui/inc/DrawController.hxx
b/sd/source/ui/inc/DrawController.hxx
index 940efff5bf18..c935888fa92c 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -74,7 +74,7 @@ class ViewShellBase;
The implementation of the XControllerManager interface is not yet in its
final form.
*/
-class SD_DLLPUBLIC DrawController final
+class SAL_DLLPUBLIC_RTTI DrawController final
: public DrawControllerInterfaceBase,
private BroadcastHelperOwner,
public ::cppu::OPropertySetHelper
@@ -160,7 +160,11 @@ public:
*/
void ReleaseViewShellBase();
- DECLARE_XINTERFACE()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
) override;
+ SD_DLLPUBLIC virtual void SAL_CALL acquire() noexcept override;
+ SD_DLLPUBLIC virtual void SAL_CALL release() noexcept override;
+
DECLARE_XTYPEPROVIDER()
// XComponent
@@ -213,7 +217,7 @@ public:
// XControllerManager
- virtual
css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL
+ SD_DLLPUBLIC virtual
css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL
getConfigurationController() override;
virtual css::uno::Reference<css::drawing::framework::XModuleController>
SAL_CALL
diff --git a/sd/source/ui/inc/DrawDocShell.hxx
b/sd/source/ui/inc/DrawDocShell.hxx
index 2ae1a106d7c2..248b919f028d 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -48,7 +48,7 @@ class ViewShell;
class DrawViewShell;
// DrawDocShell
-class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell
+class SAL_DLLPUBLIC_RTTI DrawDocShell : public SfxObjectShell
{
public:
SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL)
@@ -59,7 +59,7 @@ private:
static void InitInterface_Impl();
public:
- DrawDocShell (
+ SD_DLLPUBLIC DrawDocShell (
SfxObjectCreateMode eMode,
bool bSdDataObj,
DocumentType);
@@ -130,7 +130,7 @@ public:
void GotoBookmark(std::u16string_view rBookmark);
- BitmapEx GetPagePreviewBitmap(SdPage* pPage);
+ SD_DLLPUBLIC BitmapEx GetPagePreviewBitmap(SdPage* pPage);
/** checks, if the given name is a valid new name for a slide
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index daa5cc026ff8..d5790c42458b 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -31,7 +31,7 @@ class DrawViewShell;
/**
* Derivative of ::sd::View; contains also a pointer to the document
*/
-class SD_DLLPUBLIC DrawView : public ::sd::View
+class SAL_DLLPUBLIC_RTTI DrawView : public ::sd::View
{
public:
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index a88ab7b4a2d6..4f84244bc96a 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -100,7 +100,7 @@ public:
}
-class SD_DLLPUBLIC SdNavigatorWin : public PanelLayout, public
sfx2::sidebar::IContextChangeReceiver
+class SAL_DLLPUBLIC_RTTI SdNavigatorWin : public PanelLayout, public
sfx2::sidebar::IContextChangeReceiver
{
public:
typedef ::std::function<void ()> UpdateRequestFunctor;
@@ -112,18 +112,18 @@ public:
update is necessary. When <FALSE/> the navigator will
rely on others to trigger updates.
*/
- SdNavigatorWin(weld::Widget* pParent, SfxBindings* pBindings,
SfxNavigator* pNavigatorDlg);
+ SD_DLLPUBLIC SdNavigatorWin(weld::Widget* pParent, SfxBindings* pBindings,
SfxNavigator* pNavigatorDlg);
void SetUpdateRequestFunctor(const UpdateRequestFunctor& rUpdateRequest);
virtual ~SdNavigatorWin() override;
- void InitTreeLB( const SdDrawDocument* pDoc );
+ SD_DLLPUBLIC void InitTreeLB( const SdDrawDocument* pDoc );
void RefreshDocumentLB( const OUString* pDocName =
nullptr );
void FirstFocus();
bool InsertFile(const OUString& rFileName);
NavigatorDragType GetNavigatorDragType();
- SdPageObjsTLV& GetObjects();
+ SD_DLLPUBLIC SdPageObjsTLV& GetObjects();
virtual void HandleContextChange(const vcl::EnumContext& eContext)
override;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index e0fa051d8826..dfb4ffb56f54 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -61,7 +61,7 @@ class DrawViewShell;
extern OUString getPageApiName( SdPage const * pPage );
extern OUString getPageApiNameFromUiName( const OUString& rUIName );
-class SD_DLLPUBLIC SdXImpressDocument final : public SfxBaseModel, //
implements SfxListener, OWEAKOBJECT & other
+class SAL_DLLPUBLIC_RTTI SdXImpressDocument final : public SfxBaseModel, //
implements SfxListener, OWEAKOBJECT & other
public SvxFmMSFactory,
public css::drawing::XDrawPageDuplicator,
public css::drawing::XLayerSupplier,
@@ -170,7 +170,7 @@ public:
virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL duplicate(
const css::uno::Reference< css::drawing::XDrawPage >& xPage ) override;
// XDrawPagesSupplier
- virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL
getDrawPages( ) override;
+ SD_DLLPUBLIC virtual css::uno::Reference< css::drawing::XDrawPages >
SAL_CALL getDrawPages( ) override;
// XMasterPagesSupplier
virtual css::uno::Reference< css::drawing::XDrawPages > SAL_CALL
getMasterPages( ) override;
@@ -224,7 +224,7 @@ public:
virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any&
aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions )
override;
// ITiledRenderable
- virtual void paintTile( VirtualDevice& rDevice,
+ SD_DLLPUBLIC virtual void paintTile( VirtualDevice& rDevice,
int nOutputWidth,
int nOutputHeight,
int nTilePosX,
@@ -232,12 +232,12 @@ public:
tools::Long nTileWidth,
tools::Long nTileHeight ) override;
virtual Size getDocumentSize() override;
- virtual void setPart( int nPart, bool bAllowChangeFocus = true )
override;
- virtual int getPart() override;
- virtual int getParts() override;
- virtual OUString getPartName( int nPart ) override;
- virtual OUString getPartHash( int nPart ) override;
- virtual VclPtr<vcl::Window> getDocWindow() override;
+ SD_DLLPUBLIC virtual void setPart( int nPart, bool bAllowChangeFocus =
true ) override;
+ SD_DLLPUBLIC virtual int getPart() override;
+ SD_DLLPUBLIC virtual int getParts() override;
+ SD_DLLPUBLIC virtual OUString getPartName( int nPart ) override;
+ SD_DLLPUBLIC virtual OUString getPartHash( int nPart ) override;
+ SD_DLLPUBLIC virtual VclPtr<vcl::Window> getDocWindow() override;
bool isMasterViewMode();
/// @see vcl::ITiledRenderable::setPartMode().
@@ -247,19 +247,19 @@ public:
/// @see vcl::ITiledRenderable::setEditMode().
virtual void setEditMode(int) override;
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
- virtual void initializeForTiledRendering(const
css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
+ SD_DLLPUBLIC virtual void initializeForTiledRendering(const
css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
/// @see vcl::ITiledRenderable::postKeyEvent().
- virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
+ SD_DLLPUBLIC virtual void postKeyEvent(int nType, int nCharCode, int
nKeyCode) override;
/// @see vcl::ITiledRenderable::postMouseEvent().
- virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int
nButtons, int nModifier) override;
+ SD_DLLPUBLIC virtual void postMouseEvent(int nType, int nX, int nY, int
nCount, int nButtons, int nModifier) override;
/// @see vcl::ITiledRenderable::setTextSelection().
- virtual void setTextSelection(int nType, int nX, int nY) override;
+ SD_DLLPUBLIC virtual void setTextSelection(int nType, int nX, int nY)
override;
/// @see vcl::ITiledRenderable::getSelection().
- virtual css::uno::Reference<css::datatransfer::XTransferable>
getSelection() override;
+ SD_DLLPUBLIC virtual css::uno::Reference<css::datatransfer::XTransferable>
getSelection() override;
/// @see vcl::ITiledRenderable::setGraphicSelection().
- virtual void setGraphicSelection(int nType, int nX, int nY) override;
+ SD_DLLPUBLIC virtual void setGraphicSelection(int nType, int nX, int nY)
override;
/// @see lok::Document::resetSelection().
- virtual void resetSelection() override;
+ SD_DLLPUBLIC virtual void resetSelection() override;
/// @see vcl::ITiledRenderable::setClientVisibleArea().
virtual void setClientVisibleArea(const tools::Rectangle& rRectangle)
override;
/// @see vcl::ITiledRenderable::setClipboard().
@@ -285,7 +285,7 @@ public:
virtual void setPaintTextEdit(bool bPaint) override { mbPaintTextEdit =
bPaint; }
/// @see vcl::ITiledRenderable::getViewRenderState().
- OString getViewRenderState(SfxViewShell* pViewShell = nullptr) override;
+ SD_DLLPUBLIC OString getViewRenderState(SfxViewShell* pViewShell =
nullptr) override;
// XComponent
