diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-20 12:02:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-23 06:17:29 +0000 |
| commit | 7b26389414b203a4f3225acf0c027b93bcb234ac (patch) | |
| tree | 144aeb20c5e191840c4fb862106b0d0344d0260f /sw/source/uibase | |
| parent | 85ea267b7a8fbd5859569db6ef7ac8dd1bd9bcd1 (diff) | |
clang-tidy clang-analyzer-deadcode.DeadStores
Change-Id: I7113a13ac36db5beef3a17e9849c1f5506df2374
Reviewed-on: https://gerrit.libreoffice.org/25194
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unomod.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/prcntfld.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/uitool.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/select.cxx | 2 |
6 files changed, 2 insertions, 14 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 65603cfb4a97..626781f31fbd 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -678,7 +678,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false ); // mba: no BaseURL for clipboard SfxMedium aMedium( xWorkStore, OUString() ); - bRet = pEmbObj->DoSaveObjectAs( aMedium, false ); + pEmbObj->DoSaveObjectAs( aMedium, false ); pEmbObj->DoSaveCompleted(); uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY ); @@ -693,8 +693,6 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, pSrcStm.reset(); } - bRet = true; - xWorkStore->dispose(); xWorkStore.clear(); xStream->Commit(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 343772631d37..434ab27ef89a 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2528,7 +2528,6 @@ KEYINPUT_CHECKTABLE_INSDEL: case KS_NumOff: // shell change - so record in advance rSh.DelNumRules(); - eKeyState = eNextKeyState; break; case KS_OutlineLvOff: // delete autofmt outlinelevel later break; diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index cab2f7649949..d9622958af09 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -283,9 +283,6 @@ void SwXPrintSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, IllegalArgumentException, WrappedTargetException) { bool bVal; - if ( rInfo.mnHandle != HANDLE_PRINTSET_ANNOTATION_MODE && - rInfo.mnHandle != HANDLE_PRINTSET_FAX_NAME ) - bVal = *static_cast<sal_Bool const *>(rValue.getValue()); switch( rInfo.mnHandle ) { diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index 1234f805753a..fc29014faca3 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -173,11 +173,6 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit) { if (m_pField->GetUnit() != FUNIT_CUSTOM) m_pField->SetMax(nNewMax, eInUnit); - else - { - if (eInUnit == FUNIT_NONE) - eInUnit = eOldUnit; - } } sal_Int64 PercentField::NormalizePercent(sal_Int64 nValue) diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index fe0d61b004c8..f566769fe678 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -359,7 +359,6 @@ void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc ) { rPageDesc.ChgFirstShare(static_cast<const SfxBoolItem&>( rFooterSet.Get(SID_ATTR_PAGE_SHARED_FIRST)).GetValue()); - nFirstShare = rPageDesc.IsFirstShared() ? 1 : 0; } } else diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 1dd165c71cb3..4defb8b64f99 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -923,7 +923,7 @@ void SwWrtShell::SelectNextPrevHyperlink( bool bNext ) SttEndDoc(true); else SttEndDoc(false); - bRet = SwCursorShell::SelectNxtPrvHyperlink( bNext ); + SwCursorShell::SelectNxtPrvHyperlink( bNext ); } EndAction(); |