commit 570fe620e9d573cfc9fc260e6518563c6a6c1a3c
author Stephan Bergmann <sbergman@redhat.com> Wed Jul 24 09:31:41 2013 +0200
committer Stephan Bergmann <sbergman@redhat.com> Wed Jul 24 09:31:41 2013 +0200
tree 414ea7b7f09999aa1ca8edb7d8180d08afd3db0e
parent 8bae88b146529d469742b33ead50b3a01457e313

Keep passing XComponentContext into officecfg:: wrapper fns, where available

Change-Id: I10448edd04c6c7e7f03c539bf85aba4e00c7e311

fpicker/source/win32/filepicker/VistaFilePicker.cxx

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index b7f7d83..20eff44 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -218,12 +218,13 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
    throw (css::lang::IllegalArgumentException,
           css::uno::RuntimeException         )
{
    bool bChanged = officecfg::Office::Common::Path::Info::WorkPathChanged::get();

    bool bChanged = officecfg::Office::Common::Path::Info::WorkPathChanged::get(
        comphelper::getComponentContext(m_xSMGR));
    if (bChanged )
    {
        boost::shared_ptr< comphelper::ConfigurationChanges > batch(
            comphelper::ConfigurationChanges::create());
            comphelper::ConfigurationChanges::create(
                comphelper::getComponentContext(m_xSMGR)));
        officecfg::Office::Common::Path::Info::WorkPathChanged::set(
            false, batch);
        batch->commit();

writerfilter/source/dmapper/DomainMapper_Impl.cxx

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9427e60..c85f0aa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -189,7 +189,7 @@ DomainMapper_Impl::DomainMapper_Impl(
    getTableManager( ).setHandler(m_pTableHandler);

    getTableManager( ).startLevel();
    m_bUsingEnhancedFields = officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get();
    m_bUsingEnhancedFields = officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get(m_xComponentContext);

    m_pSdtHelper = new SdtHelper(*this);