summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/actiontriggercontainer.hxx2
-rw-r--r--framework/inc/classes/actiontriggerpropertyset.hxx3
-rw-r--r--framework/inc/classes/actiontriggerseparatorpropertyset.hxx3
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx2
-rw-r--r--framework/inc/framework/actiontriggerhelper.hxx2
-rw-r--r--framework/inc/helper/propertysetcontainer.hxx6
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx10
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx2
-rw-r--r--framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx2
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx10
-rw-r--r--framework/source/fwe/helper/actiontriggerhelper.cxx3
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx2
12 files changed, 19 insertions, 28 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 5c8488053a63..116a18602fe7 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -39,7 +39,7 @@ class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer,
public com::sun::star::lang::XTypeProvider
{
public:
- ActionTriggerContainer( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+ ActionTriggerContainer();
virtual ~ActionTriggerContainer();
// XInterface
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index fbeaefe628da..55e87c1a658f 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -27,7 +27,6 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -47,7 +46,7 @@ class ActionTriggerPropertySet : public ThreadHelpBase ,
public ::cppu::OWeakObject
{
public:
- FWE_DLLPUBLIC ActionTriggerPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+ FWE_DLLPUBLIC ActionTriggerPropertySet();
FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet();
// XInterface
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index ba451843f93d..44f035604aad 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -25,7 +25,6 @@
#include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx>
#include <rtl/ustring.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -46,7 +45,7 @@ class ActionTriggerSeparatorPropertySet : public ThreadHelpBase
public ::cppu::OWeakObject
{
public:
- ActionTriggerSeparatorPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+ ActionTriggerSeparatorPropertySet();
virtual ~ActionTriggerSeparatorPropertySet();
// XInterface
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 7b09159b3aa2..726f29c23c7d 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -43,7 +43,7 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
public com::sun::star::container::XNamed
{
public:
- RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+ RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier);
virtual ~RootActionTriggerContainer();
// XInterface
diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx
index 1cecdf749ede..2061d6534b1c 100644
--- a/framework/inc/framework/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -21,7 +21,6 @@
#define __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/menu.hxx>
#include <framework/fwedllapi.h>
@@ -49,7 +48,6 @@ namespace framework
// the above mentioned restriction!!!
static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier );
// Fills the submitted rActionTriggerContainer with the structure of the menu
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index 2cff66e4253e..27d453b23ea5 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -25,7 +25,6 @@
*/
#include <vector>
#include <cppuhelper/weak.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <threadhelp/threadhelpbase.hxx>
@@ -39,7 +38,7 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn
public ::cppu::OWeakObject
{
public:
- PropertySetContainer( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& );
+ PropertySetContainer();
virtual ~PropertySetContainer();
// XInterface
@@ -76,9 +75,6 @@ class FWE_DLLPUBLIC PropertySetContainer : public com::sun::star::container::XIn
virtual sal_Bool SAL_CALL hasElements()
throw (::com::sun::star::uno::RuntimeException);
- protected:
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
-
private:
typedef std::vector< com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > > PropertySetVector;
PropertySetVector m_aPropertySetVector;
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 2f901583838b..0a2efcf76c46 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -31,8 +31,8 @@ using namespace com::sun::star::container;
namespace framework
{
-ActionTriggerContainer::ActionTriggerContainer( const Reference< XMultiServiceFactory >& rServiceManager ) :
- PropertySetContainer( rServiceManager )
+ActionTriggerContainer::ActionTriggerContainer() :
+ PropertySetContainer()
{
}
@@ -75,11 +75,11 @@ Reference< XInterface > SAL_CALL ActionTriggerContainer::createInstance( const :
throw ( ::com::sun::star::uno::Exception, RuntimeException)
{
if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER ))
- return (OWeakObject *)( new ActionTriggerPropertySet( m_xServiceManager ));
+ return (OWeakObject *)( new ActionTriggerPropertySet());
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER ))
- return (OWeakObject *)( new ActionTriggerContainer( m_xServiceManager ));
+ return (OWeakObject *)( new ActionTriggerContainer());
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR ))
- return (OWeakObject *)( new ActionTriggerSeparatorPropertySet( m_xServiceManager ));
+ return (OWeakObject *)( new ActionTriggerSeparatorPropertySet());
else
throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this );
}
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index f786bd692437..bcde553aa713 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -51,7 +51,7 @@ enum EPROPERTIES
namespace framework
{
-ActionTriggerPropertySet::ActionTriggerPropertySet( const Reference< XMultiServiceFactory >& /*xServiceManager*/ )
+ActionTriggerPropertySet::ActionTriggerPropertySet()
: ThreadHelpBase ( &Application::GetSolarMutex() )
, OBroadcastHelper ( m_aLock.getShareableOslMutex() )
, OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)))
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index 3d8d5914818a..c5b33ad2687c 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -45,7 +45,7 @@ enum EPROPERTIES
namespace framework
{
-ActionTriggerSeparatorPropertySet::ActionTriggerSeparatorPropertySet( const Reference< XMultiServiceFactory >& /*ServiceManager*/ )
+ActionTriggerSeparatorPropertySet::ActionTriggerSeparatorPropertySet()
: ThreadHelpBase ( &Application::GetSolarMutex() )
, OBroadcastHelper ( m_aLock.getShareableOslMutex() )
, OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) )
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 18b99685662a..8fab56fc1a10 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -47,8 +47,8 @@ static Sequence< sal_Int8 > impl_getStaticIdentifier()
}
-RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier, const Reference< XMultiServiceFactory >& rServiceManager ) :
- PropertySetContainer( rServiceManager )
+RootActionTriggerContainer::RootActionTriggerContainer( const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier ) :
+ PropertySetContainer()
, m_bContainerCreated( sal_False )
, m_bContainerChanged( sal_False )
, m_bInContainerCreation( sal_False )
@@ -96,11 +96,11 @@ Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstance( con
throw ( Exception, RuntimeException )
{
if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGER ))
- return (OWeakObject *)( new ActionTriggerPropertySet( m_xServiceManager ));
+ return (OWeakObject *)( new ActionTriggerPropertySet());
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERCONTAINER ))
- return (OWeakObject *)( new ActionTriggerContainer( m_xServiceManager ));
+ return (OWeakObject *)( new ActionTriggerContainer());
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR ))
- return (OWeakObject *)( new ActionTriggerSeparatorPropertySet( m_xServiceManager ));
+ return (OWeakObject *)( new ActionTriggerSeparatorPropertySet());
else
throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this );
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index c6ebcfcf69da..7a258345322b 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -382,11 +382,10 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu(
}
Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Menu* pMenu,
const ::rtl::OUString* pMenuIdentifier )
{
- return new RootActionTriggerContainer( pMenu, pMenuIdentifier, xServiceFactory );
+ return new RootActionTriggerContainer( pMenu, pMenuIdentifier );
}
}
diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx
index 4482d5db70ec..48357b16caf1 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::beans;
namespace framework
{
-PropertySetContainer::PropertySetContainer( const Reference< XMultiServiceFactory >& )
+PropertySetContainer::PropertySetContainer()
: ThreadHelpBase( &Application::GetSolarMutex() )
, OWeakObject()
generated by cgit (git 2.34.1) at 2024-07-19 08:54:51 +0000