diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 09:21:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 09:47:39 +0100 |
| commit | 94f6a72f7ade62a146a1e1254cc0a4638d48efc5 (patch) | |
| tree | cb698945b819b85ad067acb02b4956f1e11e2337 /sc | |
| parent | add a simple timer for unit tests (diff) | |
| download | core-94f6a72f7ade62a146a1e1254cc0a4638d48efc5.tar.gz core-94f6a72f7ade62a146a1e1254cc0a4638d48efc5.zip | |
Revert "remove newly unused methods", used again
This reverts commit 9693764946ac3f27a0170d7556ee62276d7c3dcb.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/filters-test.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/ftools/fapihelper.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/inc/fapihelper.hxx | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index a96ee46d4344..3b9bc50a0914 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -500,7 +500,7 @@ void FiltersTest::testDatabaseRanges() void FiltersTest::testFormats() { const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("formats.")); - for(int i = 2; i < 3; ++i) + for(int i = 0; i < 3; ++i) { rtl::OUString aFileExtension(aFileFormats[i].pName, strlen(aFileFormats[i].pName), RTL_TEXTENCODING_UTF8 ); rtl::OUString aFilterName(aFileFormats[i].pFilterName, strlen(aFileFormats[i].pFilterName), RTL_TEXTENCODING_UTF8) ; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index b8fb6773ce38..82c720e559b9 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -130,6 +130,12 @@ Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( return xInt; } +Reference< XInterface > ScfApiHelper::CreateInstanceWithArgs( + const OUString& rServiceName, const Sequence< Any >& rArgs ) +{ + return CreateInstanceWithArgs( ::comphelper::getProcessServiceFactory(), rServiceName, rArgs ); +} + uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( SfxMedium& rMedium, ::comphelper::IDocPasswordVerifier& rVerifier, const ::std::vector< OUString >* pDefaultPasswords ) { diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 7a5f4dce388c..f8a338f959b3 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -97,6 +97,11 @@ public: const ::rtl::OUString& rServiceName, const UnoAnySequence& rArgs ); + /** Creates an instance from the passed service name, using the process service factory. */ + static XInterfaceRef CreateInstanceWithArgs( + const ::rtl::OUString& rServiceName, + const UnoAnySequence& rArgs ); + /** Opens a password dialog and returns the encryption data. @return The encryption data or an empty sequence on 'Cancel' or any error. */ static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > QueryEncryptionDataForMedium( SfxMedium& rMedium, |