summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-15 14:37:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-19 07:52:24 +0100
commit4a19260d74c335fc6eb9216aacbf2d5bfbfc95aa (patch)
treefcd7206f54c72f9d457b56773b2483d4552ee7f0 /framework
parent2d2a76dd0ada087c168134c0a873e0f9a98eea05 (diff)
make some classes module-private
Change-Id: I53809ab01d5e8eb091305c3cb618a64920ad22ad Reviewed-on: https://gerrit.libreoffice.org/82783 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/actiontriggercontainer.hxx2
-rw-r--r--framework/inc/classes/actiontriggerpropertyset.hxx20
-rw-r--r--framework/inc/classes/imagewrapper.hxx3
-rw-r--r--framework/inc/classes/protocolhandlercache.hxx2
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx2
-rw-r--r--framework/inc/helper/mischelper.hxx2
-rw-r--r--framework/inc/helper/propertysetcontainer.hxx2
-rw-r--r--framework/inc/helper/shareablemutex.hxx2
-rw-r--r--framework/inc/uielement/itemcontainer.hxx2
-rw-r--r--framework/inc/xml/menudocumenthandler.hxx13
-rw-r--r--framework/inc/xml/statusbardocumenthandler.hxx4
-rw-r--r--framework/inc/xml/toolboxdocumenthandler.hxx4
-rw-r--r--framework/inc/xml/xmlnamespaces.hxx2
13 files changed, 29 insertions, 31 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index aa0b52a3ec6d..8bce32fa5e24 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -32,7 +32,7 @@
namespace framework
{
-class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer,
+class ActionTriggerContainer : public PropertySetContainer,
public css::lang::XMultiServiceFactory,
public css::lang::XServiceInfo,
public css::lang::XTypeProvider
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index be40992c8e5b..f1f730fd799c 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -44,22 +44,22 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:
- FWE_DLLPUBLIC ActionTriggerPropertySet();
- FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet() override;
+ ActionTriggerPropertySet();
+ virtual ~ActionTriggerPropertySet() override;
// XInterface
- virtual FWE_DLLPUBLIC css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- virtual FWE_DLLPUBLIC void SAL_CALL acquire() throw () override;
- virtual FWE_DLLPUBLIC void SAL_CALL release() throw () override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+ virtual void SAL_CALL acquire() throw () override;
+ virtual void SAL_CALL release() throw () override;
// XServiceInfo
- virtual FWE_DLLPUBLIC OUString SAL_CALL getImplementationName( ) override;
- virtual FWE_DLLPUBLIC sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
- virtual FWE_DLLPUBLIC css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XTypeProvider
- virtual FWE_DLLPUBLIC css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
- virtual FWE_DLLPUBLIC css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override;
private:
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 0a752a90b51d..90800837f976 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -29,8 +29,7 @@
namespace framework
{
-class FWE_DLLPUBLIC ImageWrapper :
- public ::cppu::WeakImplHelper< css::awt::XBitmap,
+class ImageWrapper : public ::cppu::WeakImplHelper< css::awt::XBitmap,
css::lang::XUnoTunnel >
{
public:
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 48dd25cac5fa..6baaf15343e7 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -126,7 +126,7 @@ class FWI_DLLPUBLIC HandlerCache final
@devstatus ready to use
@threadsafe no
*/
-class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem
+class HandlerCFGAccess : public ::utl::ConfigItem
{
private:
HandlerCache* m_pCache;
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 1613ac6616ec..94cf8b4c1d90 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -34,7 +34,7 @@
namespace framework
{
-class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
+class RootActionTriggerContainer : public PropertySetContainer,
public css::lang::XMultiServiceFactory,
public css::lang::XServiceInfo,
public css::lang::XUnoTunnel,
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 23e0c249002c..4d7b3a5a3bee 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -104,7 +104,7 @@ inline void RetrieveTypeNameFromResourceURL( const OUString& aResourceURL, OUStr
}
}
-class FWI_DLLPUBLIC LanguageGuessingHelper
+class LanguageGuessingHelper
{
mutable css::uno::Reference< css::linguistic2::XLanguageGuessing > m_xLanguageGuesser;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 5ef5ed1880e0..f5f6497305cf 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -32,7 +32,7 @@
namespace framework
{
-class FWE_DLLPUBLIC PropertySetContainer : public css::container::XIndexContainer ,
+class PropertySetContainer : public css::container::XIndexContainer ,
public ::cppu::OWeakObject
{
public:
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index 6607e0f44b20..9470983fb41d 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -30,7 +30,7 @@ namespace framework
/**
* This acts like a rtl::Reference<osl::Mutex>
*/
-class FWI_DLLPUBLIC ShareableMutex
+class ShareableMutex
{
public:
ShareableMutex();
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 1e0fdd62cae5..34f90cd533b9 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -33,7 +33,7 @@
namespace framework
{
class ConstItemContainer;
-class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper< css::container::XIndexContainer>
+class ItemContainer : public ::cppu::WeakImplHelper< css::container::XIndexContainer>
{
friend class ConstItemContainer;
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index d6079c096757..3aba335d16f5 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -33,8 +33,7 @@
namespace framework{
-class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
- public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
+class ReadMenuDocumentHandlerBase : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
{
public:
ReadMenuDocumentHandlerBase();
@@ -78,7 +77,7 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
OUString m_aStyle;
};
-class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuDocumentHandler(
@@ -106,7 +105,7 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory;
}; // OReadMenuDocumentHandler
-class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuBarHandler(
@@ -134,7 +133,7 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory;
}; // OReadMenuBarHandler
-class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer,
@@ -161,7 +160,7 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
css::uno::Reference< css::lang::XSingleComponentFactory > m_xContainerFactory;
}; // OReadMenuHandler
-class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
+class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
{
public:
OReadMenuPopupHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer,
@@ -193,7 +192,7 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
NextElementClose m_nNextElementExpected;
}; // OReadMenuPopupHandler
-class FWE_DLLPUBLIC OWriteMenuDocumentHandler final
+class OWriteMenuDocumentHandler final
{
public:
OWriteMenuDocumentHandler(
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 78e5fd1babf5..58b9a008719b 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -37,7 +37,7 @@ namespace framework{
// workaround for incremental linking bugs in MSVC2015
class SAL_DLLPUBLIC_TEMPLATE OReadStatusBarDocumentHandler_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {};
-class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : public OReadStatusBarDocumentHandler_Base
+class OReadStatusBarDocumentHandler : public OReadStatusBarDocumentHandler_Base
{
public:
enum StatusBar_XML_Entry
@@ -101,7 +101,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : public OReadStatusBarDocumen
css::uno::Reference< css::xml::sax::XLocator > m_xLocator;
};
-class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final
+class OWriteStatusBarDocumentHandler final
{
public:
OWriteStatusBarDocumentHandler(
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 18f30820f082..670e6229e8a0 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -37,7 +37,7 @@ namespace framework{
// workaround for incremental linking bugs in MSVC2015
class SAL_DLLPUBLIC_TEMPLATE OReadToolBoxDocumentHandler_Base : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > {};
-class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : public OReadToolBoxDocumentHandler_Base
+class OReadToolBoxDocumentHandler : public OReadToolBoxDocumentHandler_Base
{
public:
enum ToolBox_XML_Entry
@@ -117,7 +117,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : public OReadToolBoxDocumentHan
OUString m_aCommandURL;
};
-class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler final
+class OWriteToolBoxDocumentHandler final
{
public:
OWriteToolBoxDocumentHandler(
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index a5c4dde0a1e3..5f0c9670e8cf 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -28,7 +28,7 @@
namespace framework
{
-class FWE_DLLPUBLIC XMLNamespaces final
+class XMLNamespaces final
{
public:
/// @throws css::xml::sax::SAXException