diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index e49f3996835c..da04e95e1e70 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -25,11 +25,6 @@ #include #include -extern "C" ::com::sun::star::uno::XInterface * - SAL_CALL com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation( - ::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence const &); - /** * SvNumberFormatsSupplierServiceObject - a number formats supplier which * - can be instantiated as an service @@ -38,16 +33,10 @@ extern "C" ::com::sun::star::uno::XInterface * * with a specific language (i.e. ::com::sun::star::lang::Locale) */ class SvNumberFormatsSupplierServiceObject - :protected SvNumberFormatsSupplierObj + :public SvNumberFormatsSupplierObj ,public ::com::sun::star::lang::XInitialization ,public ::com::sun::star::lang::XServiceInfo -{ // don't want the Set-/GetNumberFormatter to be accessible from outside - - friend ::com::sun::star::uno::XInterface * - SAL_CALL com_sun_star_uno_util_numbers_SvNumberFormatsSupplierServiceObject_get_implementation( - ::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence const &); - +{ protected: SvNumberFormatter* m_pOwnFormatter; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 8e02fd804482..00e81d8915fb 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -26,7 +26,10 @@ #include #include #include -#include + +namespace com { namespace sun { namespace star { namespace uno { + class XComponentContext; +} } } } class PathService : public ::cppu::WeakImplHelper2< css::frame::XConfigManager, css::lang::XServiceInfo > { diff --git a/svl/util/svl.component b/svl/util/svl.component index e50f91874abc..eabd64d46085 100644 --- a/svl/util/svl.component +++ b/svl/util/svl.component @@ -18,7 +18,7 @@ --> + xmlns="http://openoffice.org/2010/uno-components">