summaryrefslogtreecommitdiff
path: root/framework/inc/macros/xinterface.hxx
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 18:54:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 14:41:41 -0600
commitfcbefea01766e0888f7813672d9eddbdec5a9046 (patch)
tree8861652061bb2189350824217c98a259a9a9d2ec /framework/inc/macros/xinterface.hxx
parenta395c9fa387eabf2d09360f1023f5e3e66af21a8 (diff)
Remove visual noise from framework
Conflicts: framework/inc/dispatch/oxt_handler.hxx framework/inc/services/layoutmanager.hxx framework/inc/tabwin/tabwindow.hxx framework/source/dispatch/menudispatcher.cxx framework/source/helper/dockingareadefaultacceptor.cxx framework/source/helper/ocomponentaccess.cxx framework/source/helper/ocomponentenumeration.cxx framework/source/helper/oframes.cxx framework/source/layoutmanager/toolbarlayoutmanager.hxx framework/source/recording/dispatchrecorder.cxx framework/source/services/desktop.cxx framework/source/services/frame.cxx framework/source/services/urltransformer.cxx Change-Id: Ibb04e3f6f0796e7f2be16dcce38542f8b90708d4 Reviewed-on: https://gerrit.libreoffice.org/8265 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/inc/macros/xinterface.hxx')
-rw-r--r--framework/inc/macros/xinterface.hxx36
1 files changed, 18 insertions, 18 deletions
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index b7cabea59c79..8c245d0dbd49 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -45,11 +45,11 @@ namespace framework{
_________________________________________________________________________________________________________________*/
-//*****************************************************************************************************************
+
// private
// implementation of XInterface::aquire()
// XInterface::release()
-//*****************************************************************************************************************
+
#define PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \
void SAL_CALL CLASS::acquire() throw() \
{ \
@@ -63,10 +63,10 @@ ________________________________________________________________________________
BASECLASS::release(); \
}
-//*****************************************************************************************************************
+
// private
// implementation of XInterface::queryInterface() without any other interfaces!
-//*****************************************************************************************************************
+
#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS ) \
::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException ) \
{ \
@@ -76,10 +76,10 @@ ________________________________________________________________________________
return BASECLASS::queryInterface( aType ); \
}
-//*****************************************************************************************************************
+
// private
// implementation of XInterface::queryInterface() with max. 12 other interfaces!
-//*****************************************************************************************************************
+
#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) \
::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) \
{ \
@@ -97,10 +97,10 @@ ________________________________________________________________________________
return aReturn; \
}
-//*****************************************************************************************************************
+
// private
// implementation of XInterface::queryInterface() with more then 12 other interfaces!
-//*****************************************************************************************************************
+
#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \
::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) \
{ \
@@ -124,10 +124,10 @@ ________________________________________________________________________________
return aReturn; \
}
-//*****************************************************************************************************************
+
// private
// complete implementation of XInterface for different use cases
-//*****************************************************************************************************************
+
#define PRIVATE_DEFINE_XINTERFACE_PURE( CLASS, BASECLASS ) \
PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \
PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS )
@@ -140,10 +140,10 @@ ________________________________________________________________________________
PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \
PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND )
-//*****************************************************************************************************************
+
// private
// help macros to replace INTERFACES in queryInterface() [see before]
-//*****************************************************************************************************************
+
/*
#ifdef ENABLE_SERVICEDEBUG
#define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ) \
@@ -195,10 +195,10 @@ ________________________________________________________________________________
PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \
INTERFACE11
-//*****************************************************************************************************************
+
// public
// help macros for follow XInterface definitions
-//*****************************************************************************************************************
+
// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()!
#define DIRECT_INTERFACE( INTERFACE ) \
@@ -209,19 +209,19 @@ ________________________________________________________________________________
#define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \
static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) )
-//*****************************************************************************************************************
+
// public
// declaration of XInterface
-//*****************************************************************************************************************
+
#define FWK_DECLARE_XINTERFACE \
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); \
virtual void SAL_CALL acquire ( ) throw(); \
virtual void SAL_CALL release ( ) throw();
-//*****************************************************************************************************************
+
// public
// implementation of XInterface
-//*****************************************************************************************************************
+
// implementation of XInterface with 0 additional interface for queryInterface()
#define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \