diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-14 09:09:57 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-15 08:51:25 +0100 |
| commit | bdeb57c23973f3ef79020847b2fe39f312cf3c0b (patch) | |
| tree | 8e3b8d052b753c228bea7b438d9b18da39ac1b65 /svtools | |
| parent | a3f97e65570855858e73e89c050f9c6589d3c7be (diff) | |
Initialize constructor based implementations in one place.
Change-Id: I324f25bb5ec7d792c3e015815f2a11b08f519764
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/hatchwindow/documentcloser.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/uno/fpicker.cxx | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 1e198dab28bf..66c0ed51e6f0 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -281,12 +281,8 @@ com_sun_star_comp_embed_DocumentCloser_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, uno_Sequence * arguments) { - assert(arguments != 0 ); + assert(arguments != 0); (void) arguments; rtl::Reference<ODocumentCloser> x(new ODocumentCloser); - css::uno::Sequence<css::uno::Any> aArgs( - reinterpret_cast<css::uno::Any *>(arguments->elements), - arguments->nElements); - x->initialize(aArgs); x->acquire(); return static_cast<cppu::OWeakObject *>(x.get()); } diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index 9ff1f6da241c..89089d382958 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -20,7 +20,6 @@ #include "sal/types.h" #include "rtl/ustring.hxx" -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include "svtools/miscopt.hxx" @@ -58,7 +57,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_svt_FilePicker_get_implementation( css::uno::XComponentContext *context, uno_Sequence * arguments) { - assert(arguments != 0); + assert(arguments != 0); (void) arguments; Reference< css::uno::XInterface > xResult; Reference< css::lang::XMultiComponentFactory > xFactory (context->getServiceManager()); if (xFactory.is() && SvtMiscOptions().UseSystemFileDialog()) @@ -93,14 +92,6 @@ com_sun_star_comp_svt_FilePicker_get_implementation( // Add to FilePicker history. svt::addFilePicker (xResult); } - css::uno::Reference< css::lang::XInitialization > xx(xResult, css::uno::UNO_QUERY); - if (xx.is() && arguments->nElements) - { - css::uno::Sequence<css::uno::Any> aArgs( - reinterpret_cast<css::uno::Any *>(arguments->elements), - arguments->nElements); - xx->initialize(aArgs); - } xResult->acquire(); return xResult.get(); } |