diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-28 21:08:29 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-28 21:10:27 +0000 |
| commit | eacce9bf4cd6877fdfc02555326fdddf29fb96b8 (patch) | |
| tree | 053490c5239d9750b340771c1c2b63316801c52f /sfx2/source/doc | |
| parent | 42c428b9fd84490cb4bbd25fedc3034755bf3fe3 (diff) | |
coverity#704303 Logically dead code
Change-Id: I3c58b83df2b8b124b777802f12b6014a16c796a7
Diffstat (limited to 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 844f78278bf5..5f3716842e13 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/document/XDocumentRevisionListPersistence.hpp> #include <com/sun/star/document/LockedDocumentRequest.hpp> #include <com/sun/star/document/OwnLockOnDocumentRequest.hpp> -#include <com/sun/star/document/LockedOnSavingRequest.hpp> #include <com/sun/star/document/LockFileIgnoreRequest.hpp> #include <com/sun/star/document/ChangedByOthersRequest.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -888,7 +887,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& a xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( document::OwnLockOnDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo, !bIsLoading ) ) ); } - else + else /*logically therefore bIsLoading is set */ { if ( aData.getLength() > LOCKFILE_EDITTIME_ID ) { @@ -905,17 +904,8 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& a } } - if ( bIsLoading ) - { - xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::LockedDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); - } - else - { - xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::LockedOnSavingRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); - - } + xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( + document::LockedDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); } uno::Sequence< uno::Reference< task::XInteractionContinuation > > aContinuations( 3 ); |