diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:41 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 20:13:41 +0100 |
commit | 0ae2d98d1f6d29c80bd1ee830db4c333e4ee1e1d (patch) | |
tree | d9b77eece17b7b144a4ea50592b639b9f7c87095 /sw/source/ui/envelp | |
parent | 506856ca50e676520bcc80a8b498355663d0388f (diff) |
More loplugin:cstylecast: sw
auto-rewrite with <https://gerrit.libreoffice.org/#/c/47798/> "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files
Change-Id: I0f49d21dfdf82742f11b27709f74294feb1e419e
Diffstat (limited to 'sw/source/ui/envelp')
-rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 28 | ||||
-rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 20 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 3c87cd77f8cd..057982b2a7b1 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -192,7 +192,7 @@ SwEnvFormatPage::SwEnvFormatPage(vcl::Window* pParent, const SfxItemSet& rSet) } } m_pSizeFormatBox->InsertEntry(SvxPaperInfo::GetName(PAPER_USER)); - aIDs.push_back( (sal_uInt16) PAPER_USER ); + aIDs.push_back( sal_uInt16(PAPER_USER) ); } @@ -236,11 +236,11 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) Paper ePaper = SvxPaperInfo::GetSvxPaper( Size(nRotatedWidth, nRotatedHeight), MapUnit::MapTwip); for (size_t i = 0; i < aIDs.size(); ++i) - if (aIDs[i] == (sal_uInt16)ePaper) + if (aIDs[i] == static_cast<sal_uInt16>(ePaper)) m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i)); // remember user size - if (aIDs[m_pSizeFormatBox->GetSelectedEntryPos()] == (sal_uInt16)PAPER_USER) + if (aIDs[m_pSizeFormatBox->GetSelectedEntryPos()] == sal_uInt16(PAPER_USER)) { lUserW = lWidth ; lUserH = lHeight; @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, ListBox&, void) long lAddrFromTop; const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectedEntryPos()]; - if (nPaper != (sal_uInt16)PAPER_USER) + if (nPaper != sal_uInt16(PAPER_USER)) { Size aSz = SvxPaperInfo::GetPaperSize((Paper)nPaper); lWidth = std::max(aSz.Width(), aSz.Height()); @@ -431,14 +431,14 @@ void SwEnvFormatPage::SetMinMax() lHeight = std::min(lWVal, lHVal); // Min and Max - m_pAddrLeftField->SetMin((long) 100 * (GetFieldVal(*m_pSendLeftField) + 566), FUNIT_TWIP); - m_pAddrLeftField->SetMax((long) 100 * (lWidth - 2 * 566), FUNIT_TWIP); - m_pAddrTopField->SetMin((long) 100 * (GetFieldVal(*m_pSendTopField ) + 2 * 566), FUNIT_TWIP); - m_pAddrTopField->SetMax((long) 100 * (lHeight - 2 * 566), FUNIT_TWIP); - m_pSendLeftField->SetMin((long) 100 * 566, FUNIT_TWIP); - m_pSendLeftField->SetMax((long) 100 * (GetFieldVal(*m_pAddrLeftField) - 566), FUNIT_TWIP); - m_pSendTopField->SetMin((long) 100 * 566, FUNIT_TWIP); - m_pSendTopField->SetMax((long) 100 * (GetFieldVal(*m_pAddrTopField ) - 2 * 566), FUNIT_TWIP); + m_pAddrLeftField->SetMin(long(100) * (GetFieldVal(*m_pSendLeftField) + 566), FUNIT_TWIP); + m_pAddrLeftField->SetMax(long(100) * (lWidth - 2 * 566), FUNIT_TWIP); + m_pAddrTopField->SetMin(long(100) * (GetFieldVal(*m_pSendTopField ) + 2 * 566), FUNIT_TWIP); + m_pAddrTopField->SetMax(long(100) * (lHeight - 2 * 566), FUNIT_TWIP); + m_pSendLeftField->SetMin(long(100) * 566, FUNIT_TWIP); + m_pSendLeftField->SetMax(long(100) * (GetFieldVal(*m_pAddrLeftField) - 566), FUNIT_TWIP); + m_pSendTopField->SetMin(long(100) * 566, FUNIT_TWIP); + m_pSendTopField->SetMax(long(100) * (GetFieldVal(*m_pAddrTopField ) - 2 * 566), FUNIT_TWIP); // First and last m_pAddrLeftField->SetFirst(m_pAddrLeftField->GetMin()); @@ -486,7 +486,7 @@ void SwEnvFormatPage::FillItem(SwEnvItem& rItem) rItem.m_nSendFromTop = static_cast< sal_Int32 >(GetFieldVal(*m_pSendTopField )); const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectedEntryPos()]; - if (nPaper == (sal_uInt16)PAPER_USER) + if (nPaper == sal_uInt16(PAPER_USER)) { long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField )); long lHVal = static_cast< long >(GetFieldVal(*m_pSizeHeightField)); @@ -517,7 +517,7 @@ void SwEnvFormatPage::Reset(const SfxItemSet* rSet) Size( std::min(rItem.m_nWidth, rItem.m_nHeight), std::max(rItem.m_nWidth, rItem.m_nHeight)), MapUnit::MapTwip); for (size_t i = 0; i < aIDs.size(); ++i) - if (aIDs[i] == (sal_uInt16)ePaper) + if (aIDs[i] == static_cast<sal_uInt16>(ePaper)) m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i)); // Metric fields diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index c60a46320ab9..5bf8ee7caf76 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -421,28 +421,28 @@ void SwLabFormatPage::ChangeMinMax() m_pHDistField->SetMin(nMinSize, FUNIT_CM); m_pVDistField->SetMin(nMinSize, FUNIT_CM); - m_pHDistField->SetMax((long) 100 * ((lMax - lLeft ) / std::max(1L, (long) nCols)), FUNIT_TWIP); - m_pVDistField->SetMax((long) 100 * ((lMax - lUpper) / std::max(1L, (long) nRows)), FUNIT_TWIP); + m_pHDistField->SetMax(long(100) * ((lMax - lLeft ) / std::max(1L, static_cast<long>(nCols))), FUNIT_TWIP); + m_pVDistField->SetMax(long(100) * ((lMax - lUpper) / std::max(1L, static_cast<long>(nRows))), FUNIT_TWIP); m_pWidthField->SetMin(nMinSize, FUNIT_CM); m_pHeightField->SetMin(nMinSize, FUNIT_CM); - m_pWidthField->SetMax((long) 100 * lHDist, FUNIT_TWIP); - m_pHeightField->SetMax((long) 100 * lVDist, FUNIT_TWIP); + m_pWidthField->SetMax(long(100) * lHDist, FUNIT_TWIP); + m_pHeightField->SetMax(long(100) * lVDist, FUNIT_TWIP); - m_pLeftField->SetMax((long) 100 * (lMax - nCols * lHDist), FUNIT_TWIP); - m_pUpperField->SetMax((long) 100 * (lMax - nRows * lVDist), FUNIT_TWIP); + m_pLeftField->SetMax(long(100) * (lMax - nCols * lHDist), FUNIT_TWIP); + m_pUpperField->SetMax(long(100) * (lMax - nRows * lVDist), FUNIT_TWIP); m_pColsField->SetMin( 1 ); m_pRowsField->SetMin( 1 ); m_pColsField->SetMax((lMax - lLeft ) / std::max(1L, lHDist)); m_pRowsField->SetMax((lMax - lUpper) / std::max(1L, lVDist)); - m_pPWidthField->SetMin( (long) 100 * lMinPWidth, FUNIT_TWIP ); - m_pPHeightField->SetMin( (long) 100 * lMinPHeight, FUNIT_TWIP ); + m_pPWidthField->SetMin( long(100) * lMinPWidth, FUNIT_TWIP ); + m_pPHeightField->SetMin( long(100) * lMinPHeight, FUNIT_TWIP ); - m_pPWidthField->SetMax( (long) 100 * lMax, FUNIT_TWIP); - m_pPHeightField->SetMax( (long) 100 * lMax, FUNIT_TWIP); + m_pPWidthField->SetMax( long(100) * lMax, FUNIT_TWIP); + m_pPHeightField->SetMax( long(100) * lMax, FUNIT_TWIP); // First and Last m_pHDistField->SetFirst(m_pHDistField->GetMin()); |