diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-01-10 15:16:13 +0100 |
|---|---|---|
| committer | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-07-28 20:51:53 +0000 |
| commit | 211cb2dec3501a9ea224512ebedbc7cd1c46cd45 (patch) | |
| tree | c286975f453b0570a572db2396c1453075f62b70 /sfx2 | |
| parent | Resolves: tdf#94940 don't load font history if option is disabled (diff) | |
| download | core-211cb2dec3501a9ea224512ebedbc7cd1c46cd45.tar.gz core-211cb2dec3501a9ea224512ebedbc7cd1c46cd45.zip | |
tdf#101094 (5) OPTIONS: Add options check in Content::getResourceType
Added some verbose SAL_INFO to detail server responses to PROPFIND.
Corrected a wrong comment and beautified a bit code I introduced
in commit 3b26a2a403ca5e99b0dd07d042d47501c091af16.
Change-Id: Id59749fe60fe0b451d8e0f4093d7902fe94bbed0
Reviewed-on: https://gerrit.libreoffice.org/27635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 7af4a7795844..4ac02407fbe8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -418,14 +418,14 @@ Reference < XContent > SfxMedium::GetContent() const Reference < css::ucb::XContent > xContent; // tdf#95144 add a default css::ucb::XCommandEnvironment - // in order to have http and https protocol manage certificates correctly + // in order to have the WebDAV UCP provider manage https protocol certificates correctly css:: uno::Reference< task::XInteractionHandler > xIH( css::task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), nullptr ) ); css::uno::Reference< css::ucb::XProgressHandler > xProgress; - ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment(new comphelper::SimpleFileAccessInteraction( xIH ), xProgress); + ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment( new comphelper::SimpleFileAccessInteraction( xIH ), xProgress ); - Reference < css::ucb::XCommandEnvironment > xEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); + Reference < css::ucb::XCommandEnvironment > xEnv( static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY ); const SfxUnoAnyItem* pItem = SfxItemSet::GetItem<SfxUnoAnyItem>(pImpl->m_pSet, SID_CONTENT, false); if ( pItem ) |