summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/source/classes/sbunoobj.cxx7
-rw-r--r--basic/source/inc/dlgcont.hxx2
-rw-r--r--basic/source/inc/namecont.hxx3
-rw-r--r--basic/source/inc/sbunoobj.hxx5
-rw-r--r--basic/source/inc/scriptcont.hxx2
-rw-r--r--basic/source/uno/dlgcont.cxx10
-rw-r--r--basic/source/uno/namecont.cxx6
-rw-r--r--basic/source/uno/scriptcont.cxx10
8 files changed, 13 insertions, 32 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 316234e0ceee..5bea51795de9 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3793,17 +3793,15 @@ SbUnoSingleton* findUnoSingleton( const OUString& rName )
{
Reference< XSingletonTypeDescription > xSingletonTypeDesc( xTypeDesc, UNO_QUERY );
if( xSingletonTypeDesc.is() )
- pSbUnoSingleton = new SbUnoSingleton( rName, xSingletonTypeDesc );
+ pSbUnoSingleton = new SbUnoSingleton( rName );
}
}
}
return pSbUnoSingleton;
}
-SbUnoSingleton::SbUnoSingleton( const OUString& aName_,
- const Reference< XSingletonTypeDescription >& xSingletonTypeDesc )
+SbUnoSingleton::SbUnoSingleton( const OUString& aName_ )
: SbxObject( aName_ )
- , m_xSingletonTypeDesc( xSingletonTypeDesc )
{
SbxVariableRef xGetMethodRef = new SbxMethod( OUString( "get" ), SbxOBJECT );
QuickInsert( static_cast<SbxVariable*>(xGetMethodRef) );
@@ -3991,7 +3989,6 @@ public:
virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override;
private:
- Reference< XIdlReflection > m_xCoreReflection;
Reference< XAllListener > m_xAllListener;
Reference< XIdlClass > m_xListenerType;
Any m_Helper;
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index 5f2ed0fa3d53..81121585a4a6 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -119,7 +119,6 @@ public:
(
ModifiableHelper& _rModifiable,
const OUString& aName,
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
SfxDialogLibraryContainer* pParent
);
@@ -128,7 +127,6 @@ public:
(
ModifiableHelper& _rModifiable,
const OUString& aName,
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly,
SfxDialogLibraryContainer* pParent
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index e286ffd8284d..cdc8a652c0c8 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -560,7 +560,6 @@ class SfxLibrary
friend class SfxDialogLibraryContainer;
friend class SfxScriptLibraryContainer;
- css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::ucb::XSimpleFileAccess3 > mxSFI;
ModifiableHelper& mrModifiable;
@@ -622,13 +621,11 @@ public:
SfxLibrary(
ModifiableHelper& _rModifiable,
const css::uno::Type& aType,
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI
);
SfxLibrary(
ModifiableHelper& _rModifiable,
const css::uno::Type& aType,
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL,
const OUString& aStorageURL,
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 4c01fb14a0b4..3cec557758dc 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -285,11 +285,8 @@ public:
// Wrapper for UNO Singleton
class SbUnoSingleton : public SbxObject
{
- const css::uno::Reference< css::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc;
-
public:
- SbUnoSingleton( const OUString& aName_,
- const css::uno::Reference< css::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
+ SbUnoSingleton( const OUString& aName_ );
void Notify( SfxBroadcaster&, const SfxHint& rHint ) override;
};
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index 69914c9a37a7..fccf638b9de1 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -148,14 +148,12 @@ public:
SfxScriptLibrary
(
ModifiableHelper& _rModifiable,
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI
);
SfxScriptLibrary
(
ModifiableHelper& _rModifiable,
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly
);
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index be8cd6a113e8..ba60807989fe 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -85,7 +85,7 @@ SfxDialogLibraryContainer::SfxDialogLibraryContainer( const uno::Reference< embe
// Methods to get library instances of the correct type
SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const OUString& aName )
{
- SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, mxContext, mxSFI, this );
+ SfxLibrary* pRet = new SfxDialogLibrary( maModifiable, aName, mxSFI, this );
return pRet;
}
@@ -94,7 +94,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink
const OUString& StorageURL, bool ReadOnly )
{
SfxLibrary* pRet = new SfxDialogLibrary
- ( maModifiable, aName, mxContext, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this );
+ ( maModifiable, aName, mxSFI, aLibInfoFileURL, StorageURL, ReadOnly, this );
return pRet;
}
@@ -467,10 +467,9 @@ Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceName
// Ctor
SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const OUString& aName,
- const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI,
SfxDialogLibraryContainer* pParent )
- : SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(), xContext, xSFI )
+ : SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(), xSFI )
, m_pParent( pParent )
, m_aName( aName )
{
@@ -478,14 +477,13 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable,
const OUString& aName,
- const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL,
const OUString& aStorageURL,
bool ReadOnly,
SfxDialogLibraryContainer* pParent )
: SfxLibrary( _rModifiable, cppu::UnoType<XInputStreamProvider>::get(),
- xContext, xSFI, aLibInfoFileURL, aStorageURL, ReadOnly)
+ xSFI, aLibInfoFileURL, aStorageURL, ReadOnly)
, m_pParent( pParent )
, m_aName( aName )
{
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index e3baba0d260e..472b74ee7697 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3003,9 +3003,8 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServic
// Ctor
SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
- const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI )
+ const Reference< XSimpleFileAccess3 >& xSFI )
: OComponentHelper( m_aMutex )
- , mxContext( xContext )
, mxSFI( xSFI )
, mrModifiable( _rModifiable )
, maNameContainer( new NameContainer(aType) )
@@ -3025,10 +3024,9 @@ SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
}
SfxLibrary::SfxLibrary( ModifiableHelper& _rModifiable, const Type& aType,
- const Reference< XComponentContext >& xContext, const Reference< XSimpleFileAccess3 >& xSFI,
+ const Reference< XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL, const OUString& aStorageURL, bool ReadOnly )
: OComponentHelper( m_aMutex )
- , mxContext( xContext )
, mxSFI( xSFI )
, mrModifiable( _rModifiable )
, maNameContainer( new NameContainer(aType) )
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 84ee6f68f4a0..f3be73ff5a6e 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -117,7 +117,7 @@ SfxScriptLibraryContainer::SfxScriptLibraryContainer( const uno::Reference< embe
SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName )
{
(void)aName; // Only needed for SfxDialogLibrary
- SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxContext, mxSFI );
+ SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxSFI );
return pRet;
}
@@ -127,7 +127,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink( const OUString& aN
bool ReadOnly )
{
(void)aName; // Only needed for SfxDialogLibrary
- SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxContext, mxSFI,
+ SfxLibrary* pRet = new SfxScriptLibrary( maModifiable, mxSFI,
aLibInfoFileURL, StorageURL, ReadOnly );
return pRet;
}
@@ -1181,21 +1181,19 @@ Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceName
// Ctor
SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable,
- const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI )
- : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xContext, xSFI )
+ : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xSFI )
, mbLoadedSource( false )
, mbLoadedBinary( false )
{
}
SfxScriptLibrary::SfxScriptLibrary( ModifiableHelper& _rModifiable,
- const Reference< XComponentContext >& xContext,
const Reference< XSimpleFileAccess3 >& xSFI,
const OUString& aLibInfoFileURL,
const OUString& aStorageURL,
bool ReadOnly )
- : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xContext, xSFI,
+ : SfxLibrary( _rModifiable, cppu::UnoType<OUString>::get(), xSFI,
aLibInfoFileURL, aStorageURL, ReadOnly)
, mbLoadedSource( false )
, mbLoadedBinary( false )
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 01:03:43 +0000