diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-26 12:14:44 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-26 14:25:32 +0200 |
| commit | b9f27c0529207c0f78e27e2ae67da3c7cae72e01 (patch) | |
| tree | 53d45092e847bcb497eaceb881b7abc354fbc746 /sw/source/uibase/shells/textsh.cxx | |
| parent | 62391d51788eb5a9b72b26e25cbb42fa21b0c091 (diff) | |
sal_uInt16: avoid temporaries, simplify, constify, use USHRT_MAX
Change-Id: Ibfa44aa10d08ac1b19b7d34790f76effc9de0c9c
Diffstat (limited to 'sw/source/uibase/shells/textsh.cxx')
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 4f27e883f077..c3d3eda5e672 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -143,7 +143,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem = 0; - sal_uInt16 nSlot = rReq.GetSlot(); + const sal_uInt16 nSlot = rReq.GetSlot(); if(pArgs) pArgs->GetItemState(nSlot, false, &pItem ); @@ -529,8 +529,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if( 0!= dynamic_cast< SwWebDocShell*>( GetView().GetDocShell()) ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); - sal_uInt16 nExport = rHtmlOpt.GetExportMode(); - if( HTML_CFG_MSIE == nExport ) + if( HTML_CFG_MSIE == rHtmlOpt.GetExportMode() ) { bSingleCol = true; } @@ -552,7 +551,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aSize = ((SvxSizeItem *)pItem)->GetSize(); if(pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SFX_ITEM_SET) { - sal_uInt16 nCols = ((SfxUInt16Item *)pItem)->GetValue(); + const sal_uInt16 nCols = ((SfxUInt16Item *)pItem)->GetValue(); if( !bSingleCol && 1 < nCols ) { SwFmtCol aFmtCol; @@ -684,7 +683,7 @@ static bool lcl_IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect void SwTextShell::StateInsert( SfxItemSet &rSet ) { - sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell()); + const bool bHtmlModeOn = ::GetHtmlMode(GetView().GetDocShell()) & HTMLMODE_ON; SfxWhichIter aIter( rSet ); SwWrtShell &rSh = GetShell(); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -745,10 +744,10 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) { rSet.DisableItem( nWhich ); } - else if(SID_INSERT_FLOATINGFRAME == nWhich && nHtmlMode&HTMLMODE_ON) + else if(SID_INSERT_FLOATINGFRAME == nWhich && bHtmlModeOn) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); - sal_uInt16 nExport = rHtmlOpt.GetExportMode(); + const sal_uInt16 nExport = rHtmlOpt.GetExportMode(); if(HTML_CFG_MSIE != nExport && HTML_CFG_WRITER != nExport ) rSet.DisableItem(nWhich); } @@ -808,7 +807,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) } aHLinkItem.SetInsertMode((SvxLinkInsertMode)(aHLinkItem.GetInsertMode() | - ((nHtmlMode & HTMLMODE_ON) != 0 ? HLINK_HTMLMODE : 0))); + (bHtmlModeOn ? HLINK_HTMLMODE : 0))); aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT| HYPERDLG_EVENT_MOUSECLICK_OBJECT | HYPERDLG_EVENT_MOUSEOUT_OBJECT ); @@ -838,7 +837,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) if( bDisable ) { const SwSection* pCurrSection = rSh.GetCurrSection(); - sal_uInt16 nFullSectCnt = rSh.GetFullSelectedSectionCount(); + const sal_uInt16 nFullSectCnt = rSh.GetFullSelectedSectionCount(); if( pCurrSection && ( !rSh.HasSelection() || 0 != nFullSectCnt )) bDisable = false; else if( |