diff options
| author | Chris Sherlock <chris.sherlock@collabora.com> | 2015-02-23 11:51:18 +1100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-12 10:05:05 +0100 |
| commit | b47901e5831e480caacab837b1c8a999ae515c02 (patch) | |
| tree | 6e8f2b10db0d4f14caaf0ceab0435e8cefb35e31 /sw/util | |
| parent | f71acd40e351517c64ff19a47e8422dedfd49cf9 (diff) | |
sw: further components converted to constructor method
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, with fixes for:
* copy missing parts from SwXAutoTextContainer_createInstance to
SwXAutoTextContainer_get_implementation
* include (dummy) SwXMailMerge_get_implementation if
!HAVE_FEATURE_DBCONNECTIVITY
Change-Id: I36f5b5cad42bda55139bdf96d9a0621dc5ec2419
Diffstat (limited to 'sw/util')
| -rw-r--r-- | sw/util/sw.component | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/util/sw.component b/sw/util/sw.component index 0b75e6776618..e89271febeee 100644 --- a/sw/util/sw.component +++ b/sw/util/sw.component @@ -18,17 +18,18 @@ --> <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" prefix="sw" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="SwXAutoTextContainer"> + <implementation name="SwXAutoTextContainer" constructor="SwXAutoTextContainer_get_implementation"> <service name="com.sun.star.text.AutoTextContainer"/> </implementation> - <implementation name="SwXMailMerge"> + <implementation name="SwXMailMerge" constructor="SwXMailMerge_get_implementation"> <service name="com.sun.star.sdb.DataAccessDescriptor"/> <service name="com.sun.star.text.MailMerge"/> </implementation> - <implementation name="SwXModule"> + <implementation name="SwXModule" constructor="SwXModule_get_implementation"> <service name="com.sun.star.text.GlobalSettings"/> </implementation> - <implementation name="com.sun.star.comp.Writer.FilterOptionsDialog"> + <implementation name="com.sun.star.comp.Writer.FilterOptionsDialog" + constructor="com_sun_star_comp_Writer_FilterOptionsDialog_get_implementation"> <service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/> </implementation> <implementation name="com.sun.star.comp.Writer.GlobalDocument" @@ -105,10 +106,12 @@ constructor="com_sun_star_comp_Writer_XMLStylesExporter_get_implementation"> <service name="com.sun.star.comp.Writer.XMLStylesExporter"/> </implementation> - <implementation name="com.sun.star.util.comp.FinalThreadManager"> + <implementation name="com.sun.star.util.comp.FinalThreadManager" + constructor="com_sun_star_util_comp_FinalThreadManager_get_implementation"> <service name="com.sun.star.util.JobManager"/> </implementation> - <implementation name="com.sun.star.comp.Writer.LayoutDump"> + <implementation name="com.sun.star.comp.Writer.LayoutDump" + constructor="com_sun_star_comp_Writer_LayoutDump_get_implementation"> <service name="com.sun.star.comp.Writer.LayoutDump"/> </implementation> <implementation name="org.apache.openoffice.comp.sw.sidebar.SwPanelFactory" |