summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-19 08:49:11 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-19 09:55:18 +0000
commit186dbb68907a2415b8cb2655aa2d1f4850509fb6 (patch)
tree25fed4018ba0acc6fb7e0c8b8cbb09370e9acf61
parent8f2522f931df9f1f24ef7016ee64d75fd23af000 (diff)
callcatcher: update unused code
Change-Id: If6e0cbf8544ca7a4668cdc67fcf390d8835b7017
-rw-r--r--forms/source/component/Filter.cxx6
-rw-r--r--forms/source/component/Filter.hxx1
-rw-r--r--forms/source/component/FormattedFieldWrapper.cxx34
-rw-r--r--forms/source/component/FormattedFieldWrapper.hxx5
-rw-r--r--forms/source/component/navigationbar.cxx11
-rw-r--r--forms/source/component/navigationbar.hxx1
-rw-r--r--forms/source/inc/forms_module.hxx14
-rw-r--r--forms/source/inc/forms_module_impl.hxx50
-rw-r--r--forms/source/richtext/richtextcontrol.cxx14
-rw-r--r--forms/source/richtext/richtextcontrol.hxx1
-rw-r--r--forms/source/runtime/formoperations.cxx10
-rw-r--r--forms/source/runtime/formoperations.hxx2
-rw-r--r--forms/source/solar/component/navbarcontrol.cxx6
-rw-r--r--forms/source/solar/component/navbarcontrol.hxx1
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx19
-rw-r--r--forms/source/xforms/xpathlib/extension.hxx5
-rw-r--r--reportdesign/source/core/api/Group.cxx17
-rw-r--r--reportdesign/source/core/inc/Group.hxx2
18 files changed, 0 insertions, 199 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 53316db0e901..87ed175e40f0 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -905,12 +905,6 @@ namespace frm
aNames[ 1 ] = "com.sun.star.awt.UnoControl";
return aNames;
}
-
- Reference< XInterface > SAL_CALL OFilterControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
- {
- return static_cast< XServiceInfo* >( new OFilterControl( comphelper::getComponentContext(_rxFactory) ) );
- }
-
} // namespace frm
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index cf979d4111ae..1513f86c6565 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -136,7 +136,6 @@ namespace frm
// com::sun::star::lang::XServiceInfo - static version
static OUString SAL_CALL getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
protected:
virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) SAL_OVERRIDE;
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 57c3c04a02bf..43d81f691f31 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -48,40 +48,6 @@ OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XComponentContext
{
}
-InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted)
-{
- OFormattedFieldWrapper *pRef = new OFormattedFieldWrapper(_rxFactory);
-
- if (bActAsFormatted)
- {
- // instantiate an FormattedModel
- InterfaceRef xFormattedModel;
- // (instantiate it directly ..., as the OFormattedModel isn't
- // registered for any service names anymore)
- OFormattedModel* pModel = new OFormattedModel(pRef->m_xContext);
- query_interface(static_cast<XWeak*>(pModel), xFormattedModel);
-
- pRef->m_xAggregate = Reference<XAggregation> (xFormattedModel, UNO_QUERY);
- OSL_ENSURE(pRef->m_xAggregate.is(), "the OFormattedModel didn't have an XAggregation interface !");
-
- // _before_ setting the delegator, give it to the member references
- query_interface(xFormattedModel, pRef->m_xFormattedPart);
- pRef->m_pEditPart = rtl::Reference< OEditModel >(new OEditModel(pRef->m_xContext));
- }
-
- increment(pRef->m_refCount);
-
- if (pRef->m_xAggregate.is())
- { // has to be in it's own block because of the temporary variable created by *this
- pRef->m_xAggregate->setDelegator(static_cast<XWeak*>(pRef));
- }
-
- InterfaceRef xRef(*pRef);
- decrement(pRef->m_refCount);
-
- return xRef;
-}
-
Reference< XCloneable > SAL_CALL OFormattedFieldWrapper::createClone() throw (RuntimeException, std::exception)
{
ensureAggregate();
diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx
index 6c0fdadd2bd1..b510957eed90 100644
--- a/forms/source/component/FormattedFieldWrapper.hxx
+++ b/forms/source/component/FormattedFieldWrapper.hxx
@@ -50,11 +50,6 @@ protected:
rtl::Reference< OEditModel > m_pEditPart;
// if we act as formatted this is used to write the EditModel part
::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject> m_xFormattedPart;
- // if we act as formatted, this is the PersistObject interface of our aggregate, used
- // to read and write the FormattedModel part
- // if bActAsFormatted is false, the state is undetermined until somebody calls
- // ::read or does anything which requires a living aggregate
- static InterfaceRef createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted);
protected:
virtual ~OFormattedFieldWrapper();
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index d784f032c83d..8f0bfad025e2 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -155,13 +155,11 @@ namespace frm
return getSupportedServiceNames_Static();
}
-
OUString SAL_CALL ONavigationBarModel::getImplementationName_Static()
{
return OUString( "com.sun.star.comp.form.ONavigationBarModel" );
}
-
Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames_Static()
{
Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames_Static();
@@ -173,25 +171,16 @@ namespace frm
return aSupported;
}
-
- Reference< XInterface > SAL_CALL ONavigationBarModel::Create( const Reference< XMultiServiceFactory >& _rxFactory )
- {
- return *( new ONavigationBarModel( comphelper::getComponentContext(_rxFactory) ) );
- }
-
-
void SAL_CALL ONavigationBarModel::disposing()
{
OControlModel::disposing( );
}
-
OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException, std::exception )
{
return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
}
-
#define PERSIST_TABSTOP 0x0001
#define PERSIST_BACKGROUND 0x0002
#define PERSIST_TEXTCOLOR 0x0004
diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx
index 0f6637b49bd1..f36d0c2b3077 100644
--- a/forms/source/component/navigationbar.hxx
+++ b/forms/source/component/navigationbar.hxx
@@ -70,7 +70,6 @@ namespace frm
// XServiceInfo - static version
static OUString SAL_CALL getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
protected:
// UNO
diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx
index 4dd4a6196d38..cf72d01cb0e6 100644
--- a/forms/source/inc/forms_module.hxx
+++ b/forms/source/inc/forms_module.hxx
@@ -90,20 +90,6 @@ namespace FORMS_MODULE_NAMESPACE
static void revokeComponent(
const OUString& _rImplementationName);
- /** creates a Factory for the component with the given implementation name.
- <p>Usually used from within component_getFactory.<p/>
- @param _rxServiceManager
- a pointer to an XMultiServiceFactory interface as got in component_getFactory
- @param _pImplementationName
- the implementation name of the component
- @return
- the XInterface access to a factory for the component
- */
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
- const OUString& _rImplementationName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager
- );
-
private:
/** ensure that the impl class exists
@precond m_aMutex is guarded when this method gets called
diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx
index bfcd4f10039f..1719262988aa 100644
--- a/forms/source/inc/forms_module_impl.hxx
+++ b/forms/source/inc/forms_module_impl.hxx
@@ -125,56 +125,6 @@ namespace FORMS_MODULE_NAMESPACE
}
}
-
- Reference< XInterface > OFormsModule::getComponentFactory(
- const OUString& _rImplementationName,
- const Reference< XMultiServiceFactory >& _rxServiceManager)
- {
- OSL_ENSURE(_rxServiceManager.is(), "OFormsModule::getComponentFactory : invalid argument (service manager) !");
- OSL_ENSURE(!_rImplementationName.isEmpty(), "OFormsModule::getComponentFactory : invalid argument (implementation name) !");
-
- if (!s_pImplementationNames)
- {
- OSL_FAIL("OFormsModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?");
- return NULL;
- }
- OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
- "OFormsModule::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
- "OFormsModule::getComponentFactory : inconsistent state !");
-
-
- Reference< XInterface > xReturn;
-
-
- sal_Int32 nLen = s_pImplementationNames->getLength();
- const OUString* pImplName = s_pImplementationNames->getConstArray();
- const Sequence< OUString >* pServices = s_pSupportedServices->getConstArray();
- const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray();
- const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray();
-
- for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices, ++pComponentFunction, ++pFactoryFunction)
- {
- if (pImplName->equals(_rImplementationName))
- {
- const FactoryInstantiation FactoryInstantiationFunction = reinterpret_cast<const FactoryInstantiation>(*pFactoryFunction);
- const ComponentInstantiation ComponentInstantiationFunction = reinterpret_cast<const ComponentInstantiation>(*pComponentFunction);
-
- xReturn = FactoryInstantiationFunction( _rxServiceManager, *pImplName, ComponentInstantiationFunction, *pServices, NULL);
- if (xReturn.is())
- {
- xReturn->acquire();
- return xReturn.get();
- }
- }
- }
-
- return NULL;
- }
-
-
} // namespace FORMS_MODULE_NAMESPACE
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index e40ec1fdf155..87af6fc4df0b 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -249,13 +249,11 @@ namespace frm
return getSupportedServiceNames_Static();
}
-
OUString SAL_CALL ORichTextControl::getImplementationName_Static()
{
return OUString( "com.sun.star.comp.form.ORichTextControl" );
}
-
Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static()
{
Sequence< OUString > aServices( 3 );
@@ -265,34 +263,22 @@ namespace frm
return aServices;
}
-
- Reference< XInterface > SAL_CALL ORichTextControl::Create( const Reference< XMultiServiceFactory >& )
- {
- return *( new ORichTextControl() );
- }
-
-
Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception)
{
FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags );
}
-
Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception)
{
FORWARD_TO_PEER_1_RET( Sequence< Reference< XDispatch > >, XDispatchProvider, queryDispatches, _rRequests );
}
-
bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const
{
return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName == PROPERTY_RICH_TEXT;
}
-
// ORichTextPeer
-
-
ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, vcl::Window* _pParentWindow, WinBits _nStyle )
{
DBG_TESTSOLARMUTEX();
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index e16a42757b75..cd1a48e75ff3 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -55,7 +55,6 @@ namespace frm
// XServiceInfo - static version
static OUString SAL_CALL getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
protected:
// UNO
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index cd95d32ffd66..d337a35bf7cf 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -129,18 +129,15 @@ namespace frm
{
}
-
FormOperations::~FormOperations()
{
}
-
OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException)
{
return OUString( "com.sun.star.comp.forms.FormOperations" );
}
-
Sequence< OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< OUString > aNames(1);
@@ -148,13 +145,6 @@ namespace frm
return aNames;
}
-
- Reference< XInterface > SAL_CALL FormOperations::Create(const Reference< XMultiServiceFactory >& _rxFactory )
- {
- return *new FormOperations( comphelper::getComponentContext(_rxFactory) );
- }
-
-
void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception)
{
if ( m_bConstructed )
diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx
index 7c3e604bc98e..731d4007f604 100644
--- a/forms/source/runtime/formoperations.hxx
+++ b/forms/source/runtime/formoperations.hxx
@@ -84,8 +84,6 @@ namespace frm
// XServiceInfo - static versions
static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException);
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
struct MethodAccess { friend class MethodGuard; private: MethodAccess() { } };
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index e812fea949ec..e76cce47cf93 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -193,12 +193,6 @@ namespace frm
}
- Reference< XInterface > SAL_CALL ONavigationBarControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
- {
- return *( new ONavigationBarControl( comphelper::getComponentContext(_rxFactory) ) );
- }
-
-
void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException, std::exception)
{
FORWARD_TO_PEER_1( XDispatchProviderInterception, registerDispatchProviderInterceptor, _rxInterceptor );
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index b511418fcf1d..5f10042bd984 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -55,7 +55,6 @@ namespace frm
// XServiceInfo - static version
static OUString SAL_CALL getImplementationName_Static();
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory );
protected:
// UNO
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index b7bb1f5156c9..a77b8a373d81 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -33,25 +33,6 @@ using namespace com::sun::star::xml::xpath;
using namespace com::sun::star::beans;
using com::sun::star::xml::dom::XNode;
-Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create(
- const Reference< XMultiServiceFactory >& /*aFactory*/)
-{
- Reference< XInterface > aInstance(static_cast< XXPathExtension* >(new CLibxml2XFormsExtension(/*aFactory*/)));
- return aInstance;
-}
-
-OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static()
-{
- return OUString("com.sun.star.comp.xml.xpath.XFormsExtension");
-}
-
-Sequence< OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aSequence(1);
- aSequence[0] = "com.sun.star.xml.xpath.XPathExtension";
- return aSequence;
-}
-
Libxml2ExtensionHandle SAL_CALL CLibxml2XFormsExtension::getLibxml2ExtensionHandle() throw (RuntimeException, std::exception)
{
Libxml2ExtensionHandle aHandle;
diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx
index 37e968dc5d2c..0edd542ee783 100644
--- a/forms/source/xforms/xpathlib/extension.hxx
+++ b/forms/source/xforms/xpathlib/extension.hxx
@@ -49,11 +49,6 @@ private:
public:
CLibxml2XFormsExtension() {}
- static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL Create(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& aFactory);
- static OUString SAL_CALL getImplementationName_Static();
- static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static();
-
com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel() { return m_aModel;}
com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode() { return m_aContextNode;}
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 9c0c4b0a70e5..b6fa289cefa1 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -57,23 +57,6 @@ OGroup::~OGroup()
{
}
-void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource)
-{
- ::comphelper::copyProperties(_xSource.get(),static_cast<GroupPropertySet*>(this));
-
- if ( _xSource->getHeaderOn() )
- {
- setHeaderOn(sal_True);
- OSection::lcl_copySection(_xSource->getHeader(),m_xHeader);
- }
-
- if ( _xSource->getFooterOn() )
- {
- setFooterOn(sal_True);
- OSection::lcl_copySection(_xSource->getFooter(),m_xFooter);
- }
-}
-
IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
OUString SAL_CALL OGroup::getImplementationName( ) throw(uno::RuntimeException, std::exception)
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index a4c45dfc3887..58f4ba22b661 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -102,8 +102,6 @@ namespace reportdesign
OGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups >& _xParent
,const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& context);
- void copyGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xSource);
-
DECLARE_XINTERFACE( )
// ::com::sun::star::lang::XServiceInfo
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;