Kaydet (Commit) f96926c1 authored tarafından Matúš Kukan's avatar Matúš Kukan

vbaobj: One more ctor feature for ScVbaGlobals.

Change-Id: I741d1e0af1d6f631b321b76172b988262c0f709f
üst 65a43d68
...@@ -46,10 +46,6 @@ namespace window ...@@ -46,10 +46,6 @@ namespace window
{ {
extern sdecl::ServiceDecl const serviceDecl; extern sdecl::ServiceDecl const serviceDecl;
} }
namespace globals
{
extern sdecl::ServiceDecl const serviceDecl;
}
namespace hyperlink namespace hyperlink
{ {
extern sdecl::ServiceDecl const serviceDecl; extern sdecl::ServiceDecl const serviceDecl;
...@@ -66,7 +62,7 @@ extern "C" ...@@ -66,7 +62,7 @@ extern "C"
registry::XRegistryKey * pRegistryKey ) registry::XRegistryKey * pRegistryKey )
{ {
void* pRet = component_getFactoryHelper( void* pRet = component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ); pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
return pRet; return pRet;
} }
} }
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <vbahelper/helperdecl.hxx>
#include "vbaglobals.hxx" #include "vbaglobals.hxx"
#include <sal/macros.h> #include <sal/macros.h>
...@@ -288,14 +287,12 @@ ScVbaGlobals::getServiceNames() ...@@ -288,14 +287,12 @@ ScVbaGlobals::getServiceNames()
return aServiceNames; return aServiceNames;
} }
namespace globals extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
ScVbaGlobals_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &arguments)
{ {
namespace sdecl = comphelper::service_decl; return cppu::acquire(new ScVbaGlobals(arguments, context));
sdecl::vba_service_class_<ScVbaGlobals, sdecl::with_args<true> > serviceImpl;
extern sdecl::ServiceDecl const serviceDecl(
serviceImpl,
"ScVbaGlobals",
"ooo.vba.excel.Globals" );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
constructor="ScVbaEventsHelper_get_implementation"> constructor="ScVbaEventsHelper_get_implementation">
<service name="com.sun.star.script.vba.VBASpreadsheetEventProcessor"/> <service name="com.sun.star.script.vba.VBASpreadsheetEventProcessor"/>
</implementation> </implementation>
<implementation name="ScVbaGlobals"> <implementation name="ScVbaGlobals"
constructor="ScVbaGlobals_get_implementation">
<service name="ooo.vba.excel.Globals"/> <service name="ooo.vba.excel.Globals"/>
</implementation> </implementation>
<implementation name="ScVbaHyperlink"> <implementation name="ScVbaHyperlink">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment