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 | |
| 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
260 files changed, 1587 insertions, 1584 deletions
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index b344eed5d4c9..d2cdb61fec9c 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -432,7 +432,7 @@ inline void SwHTMLTableLayout::SetCell( std::unique_ptr<SwHTMLTableLayoutCell> p inline long SwHTMLTableLayout::GetBrowseWidthMin() const { - return (long)( (!m_nWidthOption || m_bPrcWidthOption) ? m_nMin : m_nRelTabWidth ); + return static_cast<long>( (!m_nWidthOption || m_bPrcWidthOption) ? m_nMin : m_nRelTabWidth ); } void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ) diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 0ea5412a6592..2aefe871f750 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -140,7 +140,7 @@ public: { return !operator==( rCmp ); } RedlineType_t GetType() const - { return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } + { return static_cast<RedlineType_t>(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK); } std::size_t GetAuthor() const { return nAuthor; } const OUString& GetComment() const { return sComment; } @@ -151,7 +151,7 @@ public: void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; } void SetAutoFormatFlag() - { eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); } + { eType = static_cast<RedlineType_t>(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); } bool CanCombine( const SwRedlineData& rCmp ) const; // ExtraData gets copied, the pointer is therefore not taken over by @@ -221,7 +221,7 @@ public: const DateTime& GetTimeStamp( sal_uInt16 nPos = 0) const; RedlineType_t GetRealType( sal_uInt16 nPos = 0 ) const; RedlineType_t GetType( sal_uInt16 nPos = 0) const - { return ( (RedlineType_t)(GetRealType( nPos ) & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } + { return static_cast<RedlineType_t>(GetRealType( nPos ) & nsRedlineType_t::REDLINE_NO_FLAG_MASK); } const OUString& GetComment( sal_uInt16 nPos = 0 ) const; void SetComment( const OUString& rS ) { pRedlineData->SetComment( rS ); } diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index bc9e2f219cc3..1d240de469ba 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -194,7 +194,7 @@ public: /// Set the new table style name for this table. void SetTableStyleName(const OUString& rName) { maTableStyleName = rName; } - sal_uInt16 GetRowsToRepeat() const { return std::min( (sal_uInt16)GetTabLines().size(), m_nRowsToRepeat ); } + sal_uInt16 GetRowsToRepeat() const { return std::min( static_cast<sal_uInt16>(GetTabLines().size()), m_nRowsToRepeat ); } void SetRowsToRepeat( sal_uInt16 nNumOfRows ) { m_nRowsToRepeat = nNumOfRows; } bool IsHeadline( const SwTableLine& rLine ) const; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 566653342451..e3329b4c931d 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -87,8 +87,8 @@ namespace vcl // Define for flags needed in ctor or layers below. // Currently the Preview flag is needed for DrawPage. -#define VSHELLFLAG_ISPREVIEW ((long)0x1) -#define VSHELLFLAG_SHARELAYOUT ((long)0x2) +#define VSHELLFLAG_ISPREVIEW (long(0x1)) +#define VSHELLFLAG_SHARELAYOUT (long(0x2)) typedef std::shared_ptr<SwRootFrame> SwRootFramePtr; class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell> diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index e91b8fd8ac20..2ef71ad10f62 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1583,20 +1583,20 @@ void SwDocTest::testMarkMove() ::sw::mark::IMark* pBM2 = pMarksAccess->findMark("Para2")->get(); ::sw::mark::IMark* pBM3 = pMarksAccess->findMark("Para3")->get(); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 0 , pBM1->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 11, pBM1->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0) , pBM1->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(11), pBM1->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM1->GetMarkStart().nNode.GetIndex(), pBM1->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 0 , pBM2->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 11, pBM2->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0) , pBM2->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(11), pBM2->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM2->GetMarkStart().nNode.GetIndex(), pBM2->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 11, pBM3->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 22, pBM3->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(11), pBM3->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(22), pBM3->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM3->GetMarkStart().nNode.GetIndex(), pBM3->GetMarkEnd().nNode.GetIndex()); @@ -1620,20 +1620,20 @@ void SwDocTest::testMarkMove() pBM2 = pMarksAccess->findMark("Para2")->get(); pBM3 = pMarksAccess->findMark("Para3")->get(); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 0, pBM1->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM1->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pBM1->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pBM1->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM1->GetMarkStart().nNode.GetIndex(), pBM1->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM2->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 12, pBM2->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pBM2->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(12), pBM2->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM2->GetMarkStart().nNode.GetIndex(), pBM2->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 12, pBM3->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 23, pBM3->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(12), pBM3->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(23), pBM3->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM3->GetMarkStart().nNode.GetIndex(), pBM3->GetMarkEnd().nNode.GetIndex()); @@ -1656,20 +1656,20 @@ void SwDocTest::testMarkMove() pBM2 = pMarksAccess->findMark("Para2")->get(); pBM3 = pMarksAccess->findMark("Para3")->get(); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 0, pBM1->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM1->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pBM1->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pBM1->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM1->GetMarkStart().nNode.GetIndex(), pBM1->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 6, pBM2->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 4, pBM2->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(6), pBM2->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), pBM2->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM2->GetMarkStart().nNode.GetIndex()+1, pBM2->GetMarkEnd().nNode.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 4, pBM3->GetMarkStart().nContent.GetIndex()); - CPPUNIT_ASSERT_EQUAL((sal_Int32) 15, pBM3->GetMarkEnd().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), pBM3->GetMarkStart().nContent.GetIndex()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(15), pBM3->GetMarkEnd().nContent.GetIndex()); CPPUNIT_ASSERT_EQUAL( pBM3->GetMarkStart().nNode.GetIndex(), pBM3->GetMarkEnd().nNode.GetIndex()); diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index f571b66cfbe8..4e57a415e786 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -721,7 +721,7 @@ DECLARE_ODFEXPORT_TEST(testCharacterBorder, "charborder.odt") // Shadow const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"ParaShadowFormat"); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aShadow.Color); - CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent); + CPPUNIT_ASSERT_EQUAL(false, static_cast<bool>(aShadow.IsTransparent)); CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(0), aShadow.Location); CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aShadow.ShadowWidth); } @@ -751,7 +751,7 @@ DECLARE_ODFEXPORT_TEST(testCharacterBorder, "charborder.odt") // Shadow const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF3333), aShadow.Color); - CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent); + CPPUNIT_ASSERT_EQUAL(false, static_cast<bool>(aShadow.IsTransparent)); CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(2), aShadow.Location); CPPUNIT_ASSERT_EQUAL(sal_Int16(280), aShadow.ShadowWidth); @@ -759,7 +759,7 @@ DECLARE_ODFEXPORT_TEST(testCharacterBorder, "charborder.odt") { uno::Reference< style::XAutoStyleFamily > xAutoStyleFamily(getAutoStyles("ParagraphStyles")); uno::Reference < container::XEnumeration > xAutoStylesEnum( xAutoStyleFamily->createEnumeration() ); - CPPUNIT_ASSERT_EQUAL(true, (bool)xAutoStylesEnum->hasMoreElements()); + CPPUNIT_ASSERT_EQUAL(true, static_cast<bool>(xAutoStylesEnum->hasMoreElements())); // First paragraph autostyle uno::Reference < beans::XPropertySet > xPSet( xAutoStylesEnum->nextElement(), uno::UNO_QUERY ); @@ -818,7 +818,7 @@ DECLARE_ODFEXPORT_TEST(testCharacterBorder, "charborder.odt") // Shadow const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aShadow.Color); - CPPUNIT_ASSERT_EQUAL(false, (bool)aShadow.IsTransparent); + CPPUNIT_ASSERT_EQUAL(false, static_cast<bool>(aShadow.IsTransparent)); CPPUNIT_ASSERT_EQUAL(table::ShadowLocation(3), aShadow.Location); CPPUNIT_ASSERT_EQUAL(sal_Int16(79), aShadow.ShadowWidth); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 1027750aba3f..dfb0a118ebfb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -408,7 +408,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableBorders, "table-borders.docx") uno::Sequence<OUString> const cells = xTextTable->getCellNames(); sal_Int32 nLength = cells.getLength(); - CPPUNIT_ASSERT_EQUAL((sal_Int32)cellBorders.size(), nLength); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(cellBorders.size()), nLength); for (sal_Int32 i = 0; i < nLength; ++i) { @@ -704,7 +704,7 @@ DECLARE_OOXMLEXPORT_TEST(testWatermarkFont, "watermark-font.docx") // Check font size CPPUNIT_ASSERT(xPropertySet->getPropertyValue("CharHeight") >>= nFontSize); - CPPUNIT_ASSERT_EQUAL((float)72, nFontSize); + CPPUNIT_ASSERT_EQUAL(float(72), nFontSize); } DECLARE_OOXMLEXPORT_TEST(testFdo43093, "fdo43093.docx") diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index 458c91652873..fab775935801 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -657,9 +657,9 @@ DECLARE_OOXMLEXPORT_TEST(testFixedDateFields, "fixed-date-field.docx") // Check fixed property was imported and date value was parsed correctly CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xField, "IsFixed")); css::util::DateTime date = getProperty<css::util::DateTime>(xField, "DateTimeValue"); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)24, date.Day); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)7, date.Month); - CPPUNIT_ASSERT_EQUAL((sal_Int16)2014, date.Year); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(24), date.Day); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(7), date.Month); + CPPUNIT_ASSERT_EQUAL(sal_Int16(2014), date.Year); if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) { diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 98ba60f066cd..6504b0aac42b 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1472,7 +1472,7 @@ DECLARE_RTFEXPORT_TEST(testWatermark, "watermark.rtf") // Check font size CPPUNIT_ASSERT(xPropertySet->getPropertyValue("CharHeight") >>= nFontSize); - CPPUNIT_ASSERT_EQUAL((float)66, nFontSize); + CPPUNIT_ASSERT_EQUAL(float(66), nFontSize); } DECLARE_RTFEXPORT_TEST(testTdf109790, "tdf109790.rtf") diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 4bed2db8ed28..5949f6f8f7a2 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -42,7 +42,7 @@ static char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/"; static std::ostream& operator<<(std::ostream& os, ViewShellId id) { - os << (sal_Int32)id; + os << static_cast<sal_Int32>(id); return os; } diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 995f905fd7b9..e8bc2ea51aae 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -886,7 +886,7 @@ void SwUiWriterTest::testDOCXAutoTextMultiple() std::unique_ptr<SwTextBlocks> pGlossary = readDOCXAutotext("autotext-multiple.dotx"); // check entries count - CPPUNIT_ASSERT_EQUAL((sal_uInt16)3, pGlossary->GetCount()); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(3), pGlossary->GetCount()); // check names of entries, sorted order CPPUNIT_ASSERT_EQUAL(OUString("Anothercomplex"), pGlossary->GetLongName(0)); @@ -938,7 +938,7 @@ void SwUiWriterTest::testDOCXAutoTextGallery() CPPUNIT_ASSERT(pDoc != nullptr); // check entries count - CPPUNIT_ASSERT_EQUAL((sal_uInt16)1, pGlossary->GetCount()); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pGlossary->GetCount()); // check entry name (if not contains gallery type) CPPUNIT_ASSERT_EQUAL(OUString("Multiple"), pGlossary->GetLongName(0)); @@ -953,14 +953,14 @@ void SwUiWriterTest::testWatermarkDOCX() CPPUNIT_ASSERT(eState >= SfxItemState::DEFAULT); CPPUNIT_ASSERT(pItem); - CPPUNIT_ASSERT_EQUAL((unsigned short)SID_WATERMARK, pItem->Which()); + CPPUNIT_ASSERT_EQUAL(static_cast<unsigned short>(SID_WATERMARK), pItem->Which()); const SfxWatermarkItem* pWatermark = static_cast<const SfxWatermarkItem*>(pItem); CPPUNIT_ASSERT_EQUAL(OUString("CustomWatermark"), pWatermark->GetText()); CPPUNIT_ASSERT_EQUAL(OUString("DejaVu Sans Light"), pWatermark->GetFont()); - CPPUNIT_ASSERT_EQUAL((sal_Int16)45, pWatermark->GetAngle()); - CPPUNIT_ASSERT_EQUAL((sal_uInt32)0x548dd4, pWatermark->GetColor()); - CPPUNIT_ASSERT_EQUAL((sal_Int16)50, pWatermark->GetTransparency()); + CPPUNIT_ASSERT_EQUAL(sal_Int16(45), pWatermark->GetAngle()); + CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x548dd4), pWatermark->GetColor()); + CPPUNIT_ASSERT_EQUAL(sal_Int16(50), pWatermark->GetTransparency()); } void SwUiWriterTest::testWatermarkPosition() @@ -2350,14 +2350,14 @@ void SwUiWriterTest::testSearchWithTransliterate() sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,SwDocPositions::Start,SwDocPositions::End); SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true); CPPUNIT_ASSERT_EQUAL(OUString(),pShellCursor->GetText()); - CPPUNIT_ASSERT_EQUAL(0,(int)case1); + CPPUNIT_ASSERT_EQUAL(0,static_cast<int>(case1)); SearchOpt.searchString = "paragraph"; SearchOpt.transliterateFlags = TransliterationFlags::IGNORE_KASHIDA_CTL; //transliteration option set so that all search strings are found sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,SwDocPositions::Start,SwDocPositions::End); pShellCursor = pWrtShell->getShellCursor(true); CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCursor->GetText()); - CPPUNIT_ASSERT_EQUAL(1,(int)case2); + CPPUNIT_ASSERT_EQUAL(1,static_cast<int>(case2)); } void SwUiWriterTest::testTdf73660() @@ -3680,13 +3680,13 @@ void SwUiWriterTest::testTdf90883TableBoxGetCoordinates() pWrtShell->Down(true); SwSelBoxes aBoxes; ::GetTableSel( *pWrtShell, aBoxes ); - CPPUNIT_ASSERT_EQUAL( 2, (int)aBoxes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(aBoxes.size()) ); Point pos ( aBoxes[0]->GetCoordinates() ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pos.Y() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pos.X()) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pos.Y()) ); pos = aBoxes[1]->GetCoordinates(); - CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pos.Y() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pos.X()) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pos.Y()) ); } void SwUiWriterTest::testEmbeddedDataSource() diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index 0695c309951b..3d977881c677 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -270,8 +270,8 @@ DECLARE_WW8EXPORT_TEST(testTdf91687, "tdf91687.doc") // Exported Watermarks were resized uno::Reference<drawing::XShape> xWatermark = getShape(1); - CPPUNIT_ASSERT_EQUAL((sal_Int32)5172, xWatermark->getSize().Height); - CPPUNIT_ASSERT_EQUAL((sal_Int32)18105, xWatermark->getSize().Width); + CPPUNIT_ASSERT_EQUAL(sal_Int32(5172), xWatermark->getSize().Height); + CPPUNIT_ASSERT_EQUAL(sal_Int32(18105), xWatermark->getSize().Width); } DECLARE_WW8EXPORT_TEST(testTdf114308, "tdf114308.doc") @@ -279,7 +279,7 @@ DECLARE_WW8EXPORT_TEST(testTdf114308, "tdf114308.doc") // Watermark with no additional padding uno::Reference<drawing::XShape> xWatermark = getShape(1); - CPPUNIT_ASSERT_EQUAL((sal_Int32)8729, xWatermark->getSize().Height); + CPPUNIT_ASSERT_EQUAL(sal_Int32(8729), xWatermark->getSize().Height); } DECLARE_WW8EXPORT_TEST(testTdf111480, "tdf111480.doc") diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index be8f61a891d3..90fff856bf2e 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -428,7 +428,7 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground() uno::Reference<XAccessibleComponent> xCompoentDoc(xAccDoc, uno::UNO_QUERY); if (xCompoentDoc.is()) { - crBack = (sal_uInt32)xCompoentDoc->getBackground(); + crBack = static_cast<sal_uInt32>(xCompoentDoc->getBackground()); } } } diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 8b101756331d..1a3a0ef43147 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1865,7 +1865,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( rPropVal.Name = sMMToPixelRatio; const Size a100thMMSize( 1000, 1000 ); const Size aPixelSize = GetMap()->LogicToPixel( a100thMMSize ); - const float fRatio = ((float)a100thMMSize.Width()/100)/aPixelSize.Width(); + const float fRatio = (static_cast<float>(a100thMMSize.Width())/100)/aPixelSize.Width(); rPropVal.Value <<= fRatio; rPropVal.Handle = -1; rPropVal.State = beans::PropertyState_DEFAULT_VALUE; @@ -2161,7 +2161,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, uno::Reference<XAccessibleComponent> xComponent(this); if (xComponent.is()) { - crBack = (sal_uInt32)xComponent->getBackground(); + crBack = static_cast<sal_uInt32>(xComponent->getBackground()); } rValue.Value <<= crBack; } @@ -2203,7 +2203,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, sal_Int32 nLen = 1; if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) ) { - rValue.Value <<= (sal_uInt16)LINESTYLE_WAVE; + rValue.Value <<= sal_uInt16(LINESTYLE_WAVE); } } } @@ -2224,7 +2224,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, sal_Int32 nLen = 1; if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) ) { - rValue.Value <<= (sal_Int32)0x00ff0000; + rValue.Value <<= sal_Int32(0x00ff0000); continue; } } @@ -2274,7 +2274,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex, { if ( GetPortionData().IsIndexInFootnode(nIndex) ) { - rValue.Value <<= (sal_Int32)101; + rValue.Value <<= sal_Int32(101); } continue; } diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 46944a646cce..8fe7bf63ed3a 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1587,7 +1587,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getBackground() uno::Reference<XAccessibleComponent> xCompoentDoc(xAccDoc,uno::UNO_QUERY); if (xCompoentDoc.is()) { - crBack = (sal_uInt32)xCompoentDoc->getBackground(); + crBack = static_cast<sal_uInt32>(xCompoentDoc->getBackground()); } } } diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx index eba3848b898a..81316418a55e 100644 --- a/sw/source/core/bastyp/bparr.cxx +++ b/sw/source/core/bastyp/bparr.cxx @@ -406,7 +406,7 @@ sal_uInt16 BigPtrArray::Compress() sal_uInt16 nFirstChgPos = USHRT_MAX; // at which position was the 1st change? // convert fill percentage into number of remaining elements - short const nMax = MAXENTRY - (long) MAXENTRY * COMPRESSLVL / 100; + short const nMax = MAXENTRY - long(MAXENTRY) * COMPRESSLVL / 100; for( sal_uInt16 cur = 0; cur < m_nBlock; ++cur ) { diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index cb903b36ba7f..cf7e1a4ac513 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -914,9 +914,9 @@ SwSbxValue SwCalc::Term() { GetToken(); SwSbxValue e = Prim(); - sal_Int32 nYear = (sal_Int32) floor( left.GetDouble() ); + sal_Int32 nYear = static_cast<sal_Int32>(floor( left.GetDouble() )); nYear = nYear & 0x0000FFFF; - sal_Int32 nMonth = (sal_Int32) floor( e.GetDouble() ); + sal_Int32 nMonth = static_cast<sal_Int32>(floor( e.GetDouble() )); nMonth = ( nMonth & 0x000000FF ) << 16; left.PutLong( nMonth + nYear ); m_eCurrOper = CALC_DAY; @@ -926,9 +926,9 @@ SwSbxValue SwCalc::Term() { GetToken(); SwSbxValue e = Prim(); - sal_Int32 nYearMonth = (sal_Int32) floor( left.GetDouble() ); + sal_Int32 nYearMonth = static_cast<sal_Int32>(floor( left.GetDouble() )); nYearMonth = nYearMonth & 0x00FFFFFF; - sal_Int32 nDay = (sal_Int32) floor( e.GetDouble() ); + sal_Int32 nDay = static_cast<sal_Int32>(floor( e.GetDouble() )); nDay = ( nDay & 0x000000FF ) << 24; left = lcl_ConvertToDateValue( m_rDoc, nDay + nYearMonth ); } @@ -940,7 +940,7 @@ SwSbxValue SwCalc::Term() double fVal = 0; double fFac = 1; - sal_Int32 nDec = (sal_Int32) floor( e.GetDouble() ); + sal_Int32 nDec = static_cast<sal_Int32>(floor( e.GetDouble() )); if( nDec < -20 || nDec > 20 ) { m_eError = SwCalcError::Overflow; diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index d63d66cbf41d..5ea33060dae6 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -623,7 +623,7 @@ bool SwPaM::DoSearch( const i18nutil::SearchOptions2& rSearchOpt, utl::TextSearc if( (bSrchForward || pSttNd != &rNdIdx.GetNode()) && Move( fnMoveForward, GoInContent ) && (!bSrchForward || pSttNd != &GetPoint()->nNode.GetNode()) && - 1 == std::abs( (int)( GetPoint()->nNode.GetIndex() - + 1 == std::abs( static_cast<int>( GetPoint()->nNode.GetIndex() - GetMark()->nNode.GetIndex()) ) ) { // if backward search, switch point and mark @@ -735,7 +735,7 @@ sal_uLong SwCursor::Find( const i18nutil::SearchOptions2& rSearchOpt, bool bSear bool bSearchSel = 0 != (rSearchOpt.searchFlag & SearchFlags::REG_NOT_BEGINOFLINE); if( bSearchSel ) - eFndRngs = (FindRanges)(eFndRngs | FindRanges::InSel); + eFndRngs = static_cast<FindRanges>(eFndRngs | FindRanges::InSel); SwFindParaText aSwFindParaText( rSearchOpt, bSearchInNotes, bReplace, *this ); sal_uLong nRet = FindAll( aSwFindParaText, nStart, nEnd, eFndRngs, bCancel ); pDoc->SetOle2Link( aLnk ); diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index ada13c575aa6..051dffe9be08 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -65,7 +65,7 @@ bool SwCursorShell::GoNextCell( bool bAppendLine ) pTableNd = IsCursorInTable(); assert (pTableNd); pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(), - (sal_uInt16)(pTableBox->getRowSpan() + pCursor->GetCursorRowSpanOffset() ) ); + static_cast<sal_uInt16>(pTableBox->getRowSpan() + pCursor->GetCursorRowSpanOffset() ) ); pTableBoxStartNode = pTableBox->GetSttNd(); } } @@ -150,7 +150,7 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool bRowSimple ) const bool bCheckProtected = !IsReadOnlyAvailable(); if( bCheckProtected ) - eType = (SwTableSearchType)(eType | SwTableSearchType::Protect); + eType = static_cast<SwTableSearchType>(eType | SwTableSearchType::Protect); if ( !bRowSimple ) { diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index c3bd626e21e6..135fcb50f782 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -186,24 +186,24 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF css::uno::Sequence < css::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7); sal_Int32 n=0; aStat[n].Name = "TableCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nTable; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nTable); aStat[n].Name = "ImageCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nGrf); aStat[n].Name = "ObjectCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nOLE; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nOLE); if ( mpDocStat->nPage ) { aStat[n].Name = "PageCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nPage; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nPage); } aStat[n].Name = "ParagraphCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nPara; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nPara); aStat[n].Name = "WordCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nWord; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nWord); aStat[n].Name = "CharacterCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nChar; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nChar); aStat[n].Name = "NonWhitespaceCharacterCount"; - aStat[n++].Value <<= (sal_Int32)mpDocStat->nCharExcludingSpaces; + aStat[n++].Value <<= static_cast<sal_Int32>(mpDocStat->nCharExcludingSpaces); // For e.g. autotext documents there is no pSwgInfo (#i79945) SwDocShell* pObjShell(m_rDoc.GetDocShell()); diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index 316217ba8907..822c6acd7049 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -675,7 +675,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, { SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING ); SvxULSpaceItem aUL( 0, PT_7, RES_UL_SPACE ); - aLSpc.SetPropLineSpace( (sal_uInt8) 115 ); + aLSpc.SetPropLineSpace( sal_uInt8(115) ); if( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) ) aUL.SetLower( HTML_PARSPACE ); aSet.Put( aUL ); aSet.Put( aLSpc ); @@ -691,7 +691,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, case RES_POOLCOLL_TEXT_NEGIDENT: // Text body neg. indentation { SvxLRSpaceItem aLR( RES_LR_SPACE ); - aLR.SetTextFirstLineOfst( -(short)GetMetricVal( CM_05 )); + aLR.SetTextFirstLineOfst( -static_cast<short>(GetMetricVal( CM_05 ))); aLR.SetTextLeft( GetMetricVal( CM_1 )); SvxTabStopItem aTStops(RES_PARATR_TABSTOP); aTStops.Insert( SvxTabStop( 0 )); @@ -905,7 +905,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, case RES_POOLCOLL_ENDNOTE: // paragraph style Endnote { SvxLRSpaceItem aLR( RES_LR_SPACE ); - aLR.SetTextFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) ); + aLR.SetTextFirstLineOfst( -static_cast<short>( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) ); aLR.SetTextLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ); SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) ); aSet.Put( aLR ); @@ -1712,8 +1712,8 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool } SvxULSpaceItem aUL( RES_UL_SPACE ); { - aUL.SetUpper( (sal_uInt16)aLR.GetLeft() ); - aUL.SetLower( (sal_uInt16)aLR.GetLeft() ); + aUL.SetUpper( static_cast<sal_uInt16>(aLR.GetLeft()) ); + aUL.SetLower( static_cast<sal_uInt16>(aLR.GetLeft()) ); } SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrameFormatSetRange ); @@ -1783,8 +1783,8 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool { lcl_PutStdPageSizeIntoItemSet( &m_rDoc, aSet ); aLR.SetRight( GetMetricVal( CM_1 )); - aUL.SetUpper( (sal_uInt16)aLR.GetRight() ); - aUL.SetLower( (sal_uInt16)aLR.GetRight() ); + aUL.SetUpper( static_cast<sal_uInt16>(aLR.GetRight()) ); + aUL.SetLower( static_cast<sal_uInt16>(aLR.GetRight()) ); aSet.Put( aLR ); aSet.Put( aUL ); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 805767d783d1..4e9853581854 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -528,7 +528,7 @@ sal_uInt16 PostItField_::GetPageNo( sal_uInt16 nPgNo = pFrame->GetPhyPageNum(); if( rRangeEnum.hasValue( nPgNo, &rPossiblePages )) { - rLineNo = (sal_uInt16)(pFrame->GetLineCount( nPos ) + + rLineNo = static_cast<sal_uInt16>(pFrame->GetLineCount( nPos ) + pFrame->GetAllLines() - pFrame->GetThisLines()); rVirtPgNo = pFrame->GetVirtPageNum(); return nPgNo; diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index 4d3335e31c72..5917905a9139 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -54,10 +54,10 @@ static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs ) pUnoArgs[i] <<= pVar->GetOUString(); break; case SbxCHAR: - pUnoArgs[i] <<= (sal_Int16)pVar->GetChar() ; + pUnoArgs[i] <<= static_cast<sal_Int16>(pVar->GetChar()) ; break; case SbxUSHORT: - pUnoArgs[i] <<= (sal_Int16)pVar->GetUShort(); + pUnoArgs[i] <<= static_cast<sal_Int16>(pVar->GetUShort()); break; case SbxLONG: pUnoArgs[i] <<= pVar->GetLong(); diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index bffbc59e30c7..861ad72a6073 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -107,8 +107,8 @@ static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId, SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE ); - aUL.SetUpper( (sal_uInt16)nMinTop ); - aUL.SetLower( (sal_uInt16)nMinBottom ); + aUL.SetUpper( static_cast<sal_uInt16>(nMinTop) ); + aUL.SetLower( static_cast<sal_uInt16>(nMinBottom) ); aLR.SetRight( nMinRight ); aLR.SetLeft( nMinLeft ); diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index ae759ef8aca3..2acd8c41561e 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -214,7 +214,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView ) SwUndoDrawGroup *const pUndo = (!GetIDocumentUndoRedo().DoesUndo()) ? nullptr - : new SwUndoDrawGroup( (sal_uInt16)rMrkList.GetMarkCount() , this); + : new SwUndoDrawGroup( static_cast<sal_uInt16>(rMrkList.GetMarkCount()) , this); // #i53320# bool bGroupMembersNotPositioned( false ); @@ -434,7 +434,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView ) SwUndoDrawDelete *const pUndo = (!GetIDocumentUndoRedo().DoesUndo()) ? nullptr - : new SwUndoDrawDelete( (sal_uInt16)rMrkList.GetMarkCount(), this ); + : new SwUndoDrawDelete( static_cast<sal_uInt16>(rMrkList.GetMarkCount()), this ); // Destroy ContactObjects, save formats. for( size_t i = 0; i < rMrkList.GetMarkCount(); ++i ) diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 27fafaf0de90..32d1d9f936da 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -582,7 +582,7 @@ void SwDoc::ChangeDBFields( const std::vector<OUString>& rOldNames, SwDBData aNewDBData; aNewDBData.sDataSource = rNewName.getToken(0, DB_DELIM); aNewDBData.sCommand = rNewName.getToken(1, DB_DELIM); - aNewDBData.nCommandType = (short)rNewName.getToken(2, DB_DELIM).toInt32(); + aNewDBData.nCommandType = static_cast<short>(rNewName.getToken(2, DB_DELIM).toInt32()); SwSectionFormats& rArr = GetSections(); for (auto n = rArr.size(); n; ) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index b0ebf2254b48..58c58c8ea189 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2249,7 +2249,7 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c if( sNm.startsWith( aName ) ) { // Determine Number and set the Flag - nNum = (sal_uInt16)sNm.copy( nNmLen ).toInt32(); + nNum = static_cast<sal_uInt16>(sNm.copy( nNmLen ).toInt32()); if( nNum-- && nNum < mpNumRuleTable->size() ) pSetFlags[ nNum / 8 ] |= (0x01 << ( nNum & 0x07 )); } diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 74dc25118e1c..6dd0a3a6cd11 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1838,7 +1838,7 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew) // Search for identical entries and remove the trailing one if(TOX_AUTHORITIES == SwTOXBase::GetType()) { - for(short i = (short)aRange.Min(); i < (short)aRange.Max(); ++i) + for(short i = static_cast<short>(aRange.Min()); i < static_cast<short>(aRange.Max()); ++i) { SwTOXSortTabBase* pOld = aSortArr[i]; if(*pOld == *pNew) diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index d3cbdbcaf564..05b2cb1d192f 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -312,7 +312,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByVisArea( const SwDoc& rDoc ) SwViewShell const *pVSh = rDoc.getIDocumentLayoutAccess().GetCurrentViewShell(); if( pVSh ) { - return (sal_uInt16)pVSh->GetBrowseWidth(); + return static_cast<sal_uInt16>(pVSh->GetBrowseWidth()); } return 0; @@ -326,7 +326,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidth( const SwDoc& rDoc ) { const SwFrame *pPageFrame = pRootFrame->GetLower(); if( pPageFrame ) - return (sal_uInt16)pPageFrame->getFramePrintArea().Width(); + return static_cast<sal_uInt16>(pPageFrame->getFramePrintArea().Width()); } // #i91658# @@ -982,7 +982,7 @@ void SwHTMLTableLayout::AutoLayoutPass1() { // the next column gets the rest sal_uInt16 nColWidth = - (sal_uInt16)((pColumn->GetMax() * nRelLeft) / nFixMax); + static_cast<sal_uInt16>((pColumn->GetMax() * nRelLeft) / nFixMax); pColumn->SetWidthOption( nColWidth ); } } @@ -1122,8 +1122,8 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv { sal_uLong nAbsLeftFillL = nAbsLeftFill, nAbsRightFillL = nAbsRightFill; - m_nRelLeftFill = (sal_uInt16)((nAbsLeftFillL * nRelAvail) / nAbsAvail); - m_nRelRightFill = (sal_uInt16)((nAbsRightFillL * nRelAvail) / nAbsAvail); + m_nRelLeftFill = static_cast<sal_uInt16>((nAbsLeftFillL * nRelAvail) / nAbsAvail); + m_nRelRightFill = static_cast<sal_uInt16>((nAbsRightFillL * nRelAvail) / nAbsAvail); nAbsAvail -= (nAbsLeftFill + nAbsRightFill); if( nRelAvail ) @@ -1155,9 +1155,9 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv // Let's play such games now anyway. We had a graphic in a 1% wide // table and it didn't fit in of course. - nAbsTabWidth = (sal_uInt16)( ((sal_uLong)nAbsAvail * m_nWidthOption) / 100 ); + nAbsTabWidth = static_cast<sal_uInt16>( (static_cast<sal_uLong>(nAbsAvail) * m_nWidthOption) / 100 ); if( IsTopTable() && - ( /*MayBeInFlyFrame() ||*/ (sal_uLong)nAbsTabWidth > m_nMin ) ) + ( /*MayBeInFlyFrame() ||*/ static_cast<sal_uLong>(nAbsTabWidth) > m_nMin ) ) { nRelAvail = USHRT_MAX; m_bUseRelWidth = true; @@ -1187,7 +1187,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv // Step 3: Identify the column width and, if applicable, the absolute // and relative table widths. - if( (!IsTopTable() && m_nMin > (sal_uLong)nAbsAvail) || + if( (!IsTopTable() && m_nMin > static_cast<sal_uLong>(nAbsAvail)) || m_nMin > MAX_TABWIDTH ) { // If @@ -1224,17 +1224,17 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv if( nColMin <= USHRT_MAX ) { pColumn->SetAbsColWidth( - (sal_uInt16)((nColMin * nAbsTabWidth) / m_nMin) ); + static_cast<sal_uInt16>((nColMin * nAbsTabWidth) / m_nMin) ); pColumn->SetRelColWidth( - (sal_uInt16)((nColMin * m_nRelTabWidth) / m_nMin) ); + static_cast<sal_uInt16>((nColMin * m_nRelTabWidth) / m_nMin) ); } else { double nColMinD = nColMin; pColumn->SetAbsColWidth( - (sal_uInt16)((nColMinD * nAbsTabWidth) / m_nMin) ); + static_cast<sal_uInt16>((nColMinD * nAbsTabWidth) / m_nMin) ); pColumn->SetRelColWidth( - (sal_uInt16)((nColMinD * m_nRelTabWidth) / m_nMin) ); + static_cast<sal_uInt16>((nColMinD * m_nRelTabWidth) / m_nMin) ); } nAbs = nAbs + pColumn->GetAbsColWidth(); @@ -1261,17 +1261,17 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv if( nColMin <= USHRT_MAX ) { pColumn->SetAbsColWidth( - (sal_uInt16)((((nColMin-nRealColMin) * nDistAbs) / nDistMin) + nRealColMin) ); + static_cast<sal_uInt16>((((nColMin-nRealColMin) * nDistAbs) / nDistMin) + nRealColMin) ); pColumn->SetRelColWidth( - (sal_uInt16)((((nColMin-nRealColMin) * nDistRel) / nDistMin) + nRealColMin) ); + static_cast<sal_uInt16>((((nColMin-nRealColMin) * nDistRel) / nDistMin) + nRealColMin) ); } else { double nColMinD = nColMin; pColumn->SetAbsColWidth( - (sal_uInt16)((((nColMinD-nRealColMin) * nDistAbs) / nDistMin) + nRealColMin) ); + static_cast<sal_uInt16>((((nColMinD-nRealColMin) * nDistAbs) / nDistMin) + nRealColMin) ); pColumn->SetRelColWidth( - (sal_uInt16)((((nColMinD-nRealColMin) * nDistRel) / nDistMin) + nRealColMin) ); + static_cast<sal_uInt16>((((nColMinD-nRealColMin) * nDistRel) / nDistMin) + nRealColMin) ); } nAbs = nAbs + pColumn->GetAbsColWidth(); @@ -1282,7 +1282,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv pColumn->SetRelColWidth( m_nRelTabWidth - nRel ); } } - else if( m_nMax <= (sal_uLong)(nAbsTabWidth ? nAbsTabWidth : nAbsAvail) ) + else if( m_nMax <= static_cast<sal_uLong>(nAbsTabWidth ? nAbsTabWidth : nAbsAvail) ) { // If // - the table has a fixed width and the table's maximum is @@ -1294,7 +1294,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv // No fixed width, use the maximum. if( !nAbsTabWidth ) - nAbsTabWidth = (sal_uInt16)m_nMax; + nAbsTabWidth = static_cast<sal_uInt16>(m_nMax); // A top table may also get wider then the available space. if( nAbsTabWidth > nAbsAvail ) @@ -1311,7 +1311,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv { if (nAbsAvail == 0) throw o3tl::divide_by_zero(); - m_nRelTabWidth = (sal_uInt16)((nAbsTabWidthL * nRelAvail) / nAbsAvail); + m_nRelTabWidth = static_cast<sal_uInt16>((nAbsTabWidthL * nRelAvail) / nAbsAvail); } else m_nRelTabWidth = nAbsTabWidth; @@ -1349,7 +1349,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv // The column keeps its width. nFixedCols++; sal_uLong nColMax = pColumn->GetMax(); - pColumn->SetAbsColWidth( (sal_uInt16)nColMax ); + pColumn->SetAbsColWidth( static_cast<sal_uInt16>(nColMax) ); sal_uLong nRelColWidth = (nColMax * m_nRelTabWidth) / nAbsTabWidth; @@ -1359,10 +1359,10 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv nRelColWidth++; else if( nChkWidth > nColMax ) nRelColWidth--; - pColumn->SetRelColWidth( (sal_uInt16)nRelColWidth ); + pColumn->SetRelColWidth( static_cast<sal_uInt16>(nRelColWidth) ); - nAbs = nAbs + (sal_uInt16)nColMax; - nRel = nRel + (sal_uInt16)nRelColWidth; + nAbs = nAbs + static_cast<sal_uInt16>(nColMax); + nRel = nRel + static_cast<sal_uInt16>(nRelColWidth); } } @@ -1391,9 +1391,9 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv { sal_uLong nColMax = pColumn->GetMax(); pColumn->SetAbsColWidth( - (sal_uInt16)((nColMax * nDistAbsTabWidth) / nDistMax) ); + static_cast<sal_uInt16>((nColMax * nDistAbsTabWidth) / nDistMax) ); pColumn->SetRelColWidth( - (sal_uInt16)((nColMax * nDistRelTabWidth) / nDistMax) ); + static_cast<sal_uInt16>((nColMax * nDistRelTabWidth) / nDistMax) ); } nAbs = nAbs + pColumn->GetAbsColWidth(); nRel = nRel + pColumn->GetRelColWidth(); @@ -1410,9 +1410,9 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv { sal_uLong nColMax = GetColumn( i )->GetMax(); GetColumn( i )->SetAbsColWidth( - (sal_uInt16)((nColMax * nAbsTabWidth) / m_nMax) ); + static_cast<sal_uInt16>((nColMax * nAbsTabWidth) / m_nMax) ); GetColumn( i )->SetRelColWidth( - (sal_uInt16)((nColMax * m_nRelTabWidth) / m_nMax) ); + static_cast<sal_uInt16>((nColMax * m_nRelTabWidth) / m_nMax) ); } } } @@ -1423,7 +1423,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv if( !nAbsTabWidth ) nAbsTabWidth = nAbsAvail; if( nAbsTabWidth < m_nMin ) - nAbsTabWidth = (sal_uInt16)m_nMin; + nAbsTabWidth = static_cast<sal_uInt16>(m_nMin); if( nAbsTabWidth > nAbsAvail ) { @@ -1437,7 +1437,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv { if (nAbsAvail == 0) throw o3tl::divide_by_zero(); - m_nRelTabWidth = (sal_uInt16)((nAbsTabWidthL * nRelAvail) / nAbsAvail); + m_nRelTabWidth = static_cast<sal_uInt16>((nAbsTabWidthL * nRelAvail) / nAbsAvail); } else m_nRelTabWidth = nAbsTabWidth; @@ -1447,15 +1447,15 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv for( sal_uInt16 i=0; i<m_nCols-1; i++ ) { double nd = GetColumn( i )->GetMax() - GetColumn( i )->GetMin(); - sal_uLong nAbsColWidth = GetColumn( i )->GetMin() + (sal_uLong)((nd*nW)/nD); + sal_uLong nAbsColWidth = GetColumn( i )->GetMin() + static_cast<sal_uLong>((nd*nW)/nD); sal_uLong nRelColWidth = nRelAvail ? (nAbsColWidth * m_nRelTabWidth) / nAbsTabWidth : nAbsColWidth; - GetColumn( i )->SetAbsColWidth( (sal_uInt16)nAbsColWidth ); - GetColumn( i )->SetRelColWidth( (sal_uInt16)nRelColWidth ); - nAbs = nAbs + (sal_uInt16)nAbsColWidth; - nRel = nRel + (sal_uInt16)nRelColWidth; + GetColumn( i )->SetAbsColWidth( static_cast<sal_uInt16>(nAbsColWidth) ); + GetColumn( i )->SetRelColWidth( static_cast<sal_uInt16>(nRelColWidth) ); + nAbs = nAbs + static_cast<sal_uInt16>(nAbsColWidth); + nRel = nRel + static_cast<sal_uInt16>(nRelColWidth); } GetColumn( m_nCols-1 )->SetAbsColWidth( nAbsTabWidth - nAbs ); GetColumn( m_nCols-1 )->SetRelColWidth( m_nRelTabWidth - nRel ); @@ -1471,8 +1471,8 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv { // Calculate the width of additional cells we use for // aligning inner tables. - sal_uInt16 nAbsDist = (sal_uInt16)(nAbsAvail-nAbsTabWidth); - sal_uInt16 nRelDist = (sal_uInt16)(nRelAvail-m_nRelTabWidth); + sal_uInt16 nAbsDist = static_cast<sal_uInt16>(nAbsAvail-nAbsTabWidth); + sal_uInt16 nRelDist = static_cast<sal_uInt16>(nRelAvail-m_nRelTabWidth); sal_uInt16 nParentInhAbsLeftSpace = 0, nParentInhAbsRightSpace = 0; // Calculate the size and position of the additional cells. @@ -1551,7 +1551,7 @@ static void lcl_ResizeBox( const SwTableBox* pBox, sal_uInt16* pWidth ) } else { - *pWidth = *pWidth + (sal_uInt16)pBox->GetFrameFormat()->GetFrameSize().GetSize().Width(); + *pWidth = *pWidth + static_cast<sal_uInt16>(pBox->GetFrameFormat()->GetFrameSize().GetSize().Width()); } } @@ -1644,7 +1644,7 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail, aFrameSize.SetWidth( m_nRelTabWidth ); bool bRel = m_bUseRelWidth && text::HoriOrientation::FULL!=pFrameFormat->GetHoriOrient().GetHoriOrient(); - aFrameSize.SetWidthPercent( (sal_uInt8)(bRel ? m_nWidthOption : 0) ); + aFrameSize.SetWidthPercent( static_cast<sal_uInt8>(bRel ? m_nWidthOption : 0) ); pFrameFormat->SetFormatAttr( aFrameSize ); const_cast<SwTable *>(m_pSwTable)->UnlockModify(); @@ -1662,7 +1662,7 @@ void SwHTMLTableLayout::SetWidths( bool bCallPass2, sal_uInt16 nAbsAvail, // For percentage settings we set the width to the minimum. aFlyFrameSize.SetWidth( m_nMin > USHRT_MAX ? USHRT_MAX : m_nMin ); - aFlyFrameSize.SetWidthPercent( (sal_uInt8)m_nWidthOption ); + aFlyFrameSize.SetWidthPercent( static_cast<sal_uInt8>(m_nWidthOption) ); } pFlyFrameFormat->SetFormatAttr( aFlyFrameSize ); } diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index e064ec069a32..009047c73584 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -656,8 +656,8 @@ void SwNoTextFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBord // Did the height change? SwTwips nChgHght = IsVertical() ? - (SwTwips)(aNewSize.Width() - getFramePrintArea().Width()) : - (SwTwips)(aNewSize.Height() - getFramePrintArea().Height()); + static_cast<SwTwips>(aNewSize.Width() - getFramePrintArea().Width()) : + static_cast<SwTwips>(aNewSize.Height() - getFramePrintArea().Height()); if( nChgHght > 0) Grow( nChgHght ); else if( nChgHght < 0) diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index e818e67fac76..8491a9c6f360 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -551,7 +551,7 @@ bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const // --- from 680/dr25 on: store strings as UTF-8 write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_sNumFormatString, RTL_TEXTENCODING_UTF8); - rStream.WriteUInt16( (sal_uInt16)m_eSysLanguage ).WriteUInt16( (sal_uInt16)m_eNumFormatLanguage ); + rStream.WriteUInt16( static_cast<sal_uInt16>(m_eSysLanguage) ).WriteUInt16( static_cast<sal_uInt16>(m_eNumFormatLanguage) ); return ERRCODE_NONE == rStream.GetError(); } @@ -1313,7 +1313,7 @@ bool SwTableAutoFormatTable::Load( SvStream& rStream ) OSL_ENSURE( false, "The Header contains more or newer Data" ); rStream.Seek( nPos + nCnt ); } - rStream.SetStreamCharSet( (rtl_TextEncoding)nChrSet ); + rStream.SetStreamCharSet( static_cast<rtl_TextEncoding>(nChrSet) ); rStream.SetVersion( nFileVers ); } diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 5632e007ab84..fa0b16627fc0 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -314,7 +314,7 @@ namespace aInfo.mbSelected = true; if( mnStartCol == USHRT_MAX ) { - mnStartCol = (sal_uInt16)maLines[nLine].size(); + mnStartCol = static_cast<sal_uInt16>(maLines[nLine].size()); if( pSelBoxes->size() < 2 ) { pSelBoxes = nullptr; @@ -367,7 +367,7 @@ namespace const sal_uInt16 nLineCount = rLines.size(); if( nLineCount < mnAddLine ) mnAddLine = nLineCount; - sal_uInt16 nLine = (sal_uInt16)maLines.size(); + sal_uInt16 nLine = static_cast<sal_uInt16>(maLines.size()); maLines.resize( nLine + mnAddLine ); while( mnAddLine ) { diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 83fb9250fe7d..505ecc7c92eb 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -88,9 +88,9 @@ struct CpyTabFrame { Value.pFrameFormat = pAktFrameFormat; } bool operator==( const CpyTabFrame& rCpyTabFrame ) const - { return (sal_uLong)Value.nSize == (sal_uLong)rCpyTabFrame.Value.nSize; } + { return static_cast<sal_uLong>(Value.nSize) == static_cast<sal_uLong>(rCpyTabFrame.Value.nSize); } bool operator<( const CpyTabFrame& rCpyTabFrame ) const - { return (sal_uLong)Value.nSize < (sal_uLong)rCpyTabFrame.Value.nSize; } + { return static_cast<sal_uLong>(Value.nSize) < static_cast<sal_uLong>(rCpyTabFrame.Value.nSize); } }; struct CR_SetBoxWidth @@ -108,7 +108,7 @@ struct CR_SetBoxWidth SwTwips nMax, SwTableNode* pTNd ) : pTableNd( pTNd ), pUndo( nullptr ), nDiff( nDif ), nSide( nSid ), nMaxSize( nMax ), nLowerDiff( 0 ), - nTableWidth( (sal_uInt16)nTableW ), nRemainWidth( 0 ), nBoxWidth( 0 ), + nTableWidth( static_cast<sal_uInt16>(nTableW) ), nRemainWidth( 0 ), nBoxWidth( 0 ), bSplittBox( false ), bAnyBoxFnd( false ) { bLeft = TableChgWidthHeightType::ColLeft == extractPosition( eType ) || @@ -700,7 +700,7 @@ void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, // JP 02.04.97: 1st part for Bug 36271 // First the left/right edges - if( nDelPos + 1 < (sal_uInt16)rTableBoxes.size() ) + if( nDelPos + 1 < static_cast<sal_uInt16>(rTableBoxes.size()) ) { SwTableBox* pNxtBox = rTableBoxes[ nDelPos + 1 ]; const SvxBoxItem& rNxtBoxItem = pNxtBox->GetFrameFormat()->GetBox(); @@ -726,7 +726,7 @@ void DeleteBox_( SwTable& rTable, SwTableBox* pBox, SwUndo* pUndo, SwTableBox* pPrvBox = rTableBoxes[ nDelPos - 1 ]; const SvxBoxItem& rPrvBoxItem = pPrvBox->GetFrameFormat()->GetBox(); - SwTableBox* pNxtBox = nDelPos + 1 < (sal_uInt16)rTableBoxes.size() + SwTableBox* pNxtBox = nDelPos + 1 < static_cast<sal_uInt16>(rTableBoxes.size()) ? rTableBoxes[ nDelPos + 1 ] : nullptr; if( pPrvBox->GetSttNd() && !rPrvBoxItem.GetRight() && @@ -882,7 +882,7 @@ lcl_FndNxtPrvDelBox( const SwTableLines& rTableLns, --*pCurPos; pAllDelBoxes->erase( pAllDelBoxes->begin() + nFndPos ); } - } while( bNxt ? ( nLinePos + 1 < (sal_uInt16)rTableLns.size() ) : nLinePos != 0 ); + } while( bNxt ? ( nLinePos + 1 < static_cast<sal_uInt16>(rTableLns.size()) ) : nLinePos != 0 ); return pFndBox; } @@ -925,7 +925,7 @@ lcl_SaveUpperLowerBorder( SwTable& rTable, const SwTableBox& rBox, pPrvBox = ::lcl_FndNxtPrvDelBox( *pTableLns, nBoxStt, nBoxWidth, nLnPos, false, pAllDelBoxes, pCurPos ); - if( nLnPos + 1 < (sal_uInt16)pTableLns->size() ) // Successor? + if( nLnPos + 1 < static_cast<sal_uInt16>(pTableLns->size()) ) // Successor? pNxtBox = ::lcl_FndNxtPrvDelBox( *pTableLns, nBoxStt, nBoxWidth, nLnPos, true, pAllDelBoxes, pCurPos ); @@ -1392,7 +1392,7 @@ static void lcl_Merge_MoveBox(FndBox_ & rFndBox, InsULPara *const pULPara) } else // Right // if there are Boxes behind it, move them - if( (nPos = pFndTableBox->GetUpper()->GetBoxPos( pFndTableBox )) +1 < (sal_uInt16)pBoxes->size() ) + if( (nPos = pFndTableBox->GetUpper()->GetBoxPos( pFndTableBox )) +1 < static_cast<sal_uInt16>(pBoxes->size()) ) { nInsPos = pULPara->pInsLine->GetTabBoxes().size(); lcl_CpyBoxes( nPos+1, pBoxes->size(), @@ -1463,7 +1463,7 @@ static void lcl_Merge_MoveLine(FndLine_& rFndLine, InsULPara *const pULPara) } else // If there are Lines after it, move them - if( (nPos = pLines->GetPos( pFndLn )) + 1 < (sal_uInt16)pLines->size() ) + if( (nPos = pLines->GetPos( pFndLn )) + 1 < static_cast<sal_uInt16>(pLines->size()) ) { nInsPos = pULPara->pInsBox->GetTabLines().size(); lcl_CpyLines( nPos+1, pLines->size(), *pLines, @@ -1497,7 +1497,7 @@ static void lcl_Merge_MoveLine(FndLine_& rFndLine, InsULPara *const pULPara) } else // If there are Lines after it, move them - if( (nPos = pLines->GetPos( pFndLn )) + 1 < (sal_uInt16)pLines->size() ) + if( (nPos = pLines->GetPos( pFndLn )) + 1 < static_cast<sal_uInt16>(pLines->size()) ) lcl_CpyLines( nPos+1, pLines->size(), *pLines, pLMBox ); lcl_CalcWidth( pLMBox ); // calculate the Box's width @@ -1697,7 +1697,7 @@ static sal_uInt16 lcl_GetBoxOffset( const FndBox_& rBox ) { if (pBox==pCmp) break; - nRet = nRet + (sal_uInt16) pCmp->GetFrameFormat()->GetFrameSize().GetWidth(); + nRet = nRet + static_cast<sal_uInt16>(pCmp->GetFrameFormat()->GetFrameSize().GetWidth()); } pBox = pBox->GetUpper()->GetUpper(); } while( pBox ); @@ -1790,8 +1790,8 @@ static void lcl_CalcNewWidths(const FndLines_t& rFndLines, CpyPara& rPara) nNextPos -= rPara.nMinLeft; nNextPos *= rPara.nNewSize; nNextPos /= nSelSize; - rWidth[ nBox ] = (sal_uLong)(nNextPos - nLastPos); - nLastPos = (sal_uLong)nNextPos; + rWidth[ nBox ] = static_cast<sal_uLong>(nNextPos - nLastPos); + nLastPos = static_cast<sal_uLong>(nNextPos); } } } @@ -1843,7 +1843,7 @@ static void lcl_CopyBoxToDoc(FndBox_ const& rFndBox, CpyPara *const pCpyPara) const CpyTabFrames::size_type nFndPos = itFind - pCpyPara->rTabFrameArr.begin(); if( itFind == pCpyPara->rTabFrameArr.end() || !(*itFind == aFindFrame) || ( aFrameSz = ( aFindFrame = pCpyPara->rTabFrameArr[ nFndPos ]).pNewFrameFormat-> - GetFrameSize()).GetWidth() != (SwTwips)nSize ) + GetFrameSize()).GetWidth() != static_cast<SwTwips>(nSize) ) { // It doesn't exist yet, so copy it aFindFrame.pNewFrameFormat = pCpyPara->pDoc->MakeTableBoxFormat(); @@ -2202,7 +2202,7 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTable, sal_uInt16 nFndPos; if( !GetTabBoxes().empty() && pSrchBox && USHRT_MAX != ( nFndPos = GetBoxPos( pSrchBox )) && - nFndPos + 1 != (sal_uInt16)GetTabBoxes().size() ) + nFndPos + 1 != static_cast<sal_uInt16>(GetTabBoxes().size()) ) { pBox = GetTabBoxes()[ nFndPos + 1 ]; while( !pBox->GetTabLines().empty() ) @@ -2215,7 +2215,7 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTable, nFndPos = GetUpper()->GetTabLines().GetPos( pLine ); OSL_ENSURE( USHRT_MAX != nFndPos, "Line is not in the Table" ); // Is there another Line? - if( nFndPos+1 >= (sal_uInt16)GetUpper()->GetTabLines().size() ) + if( nFndPos+1 >= static_cast<sal_uInt16>(GetUpper()->GetTabLines().size()) ) return GetUpper()->GetUpper()->FindNextBox( rTable, GetUpper(), bOvrTableLns ); pLine = GetUpper()->GetTabLines()[nFndPos+1]; } @@ -2223,7 +2223,7 @@ SwTableBox* SwTableLine::FindNextBox( const SwTable& rTable, { // Search for the next Line in the Table nFndPos = rTable.GetTabLines().GetPos( pLine ); - if( nFndPos + 1 >= (sal_uInt16)rTable.GetTabLines().size() ) + if( nFndPos + 1 >= static_cast<sal_uInt16>(rTable.GetTabLines().size()) ) return nullptr; // there are no more Boxes pLine = rTable.GetTabLines()[ nFndPos+1 ]; @@ -3010,7 +3010,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam, { n = rBoxes.size(); nCntEnd = 0; - nBoxChkStt = (sal_uInt16)rParam.nSide; + nBoxChkStt = static_cast<sal_uInt16>(rParam.nSide); nBoxChkEnd = static_cast<sal_uInt16>(rParam.nSide + rParam.nBoxWidth); } else @@ -3018,7 +3018,7 @@ static bool lcl_DelSelBox( SwTableLine* pTabLine, CR_SetBoxWidth& rParam, n = 0; nCntEnd = rBoxes.size(); nBoxChkStt = static_cast<sal_uInt16>(rParam.nSide - rParam.nBoxWidth); - nBoxChkEnd = (sal_uInt16)rParam.nSide; + nBoxChkEnd = static_cast<sal_uInt16>(rParam.nSide); } while( n != nCntEnd ) @@ -3405,7 +3405,7 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType, { fnSelBox = lcl_DelSelBox; fnOtherBox = lcl_DelOtherBox; - aParam.nBoxWidth = (sal_uInt16)rAktBox.GetFrameFormat()->GetFrameSize().GetWidth(); + aParam.nBoxWidth = static_cast<sal_uInt16>(rAktBox.GetFrameFormat()->GetFrameSize().GetWidth()); if( bLeft ) nDistStt = rSz.GetWidth(); } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index ceecdac0f0ac..cb10bdb711f7 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -347,7 +347,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts, // If the ColumnArray has a wrong count, ignore it! if( pColArr && - (size_t)(nCols + ( text::HoriOrientation::NONE == eAdjust ? 2 : 1 )) != pColArr->size() ) + static_cast<size_t>(nCols + ( text::HoriOrientation::NONE == eAdjust ? 2 : 1 )) != pColArr->size() ) pColArr = nullptr; } @@ -2308,7 +2308,7 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam ) SwPaM* pTmp = &rPam; while( &rPam != ( pTmp = pTmp->GetNext() )) for( int i = 0; i < 2; ++i ) - pTmp->GetBound( (bool)i ) = *rPam.GetPoint(); + pTmp->GetBound( static_cast<bool>(i) ) = *rPam.GetPoint(); } // Merge them @@ -2911,7 +2911,7 @@ void SwCollectTableLineBoxes::AddBox( const SwTableBox& rBox ) aPosArr.push_back(nWidth); SwTableBox* p = const_cast<SwTableBox*>(&rBox); m_Boxes.push_back(p); - nWidth = nWidth + (sal_uInt16)rBox.GetFrameFormat()->GetFrameSize().GetWidth(); + nWidth = nWidth + static_cast<sal_uInt16>(rBox.GetFrameFormat()->GetFrameSize().GetWidth()); } const SwTableBox* SwCollectTableLineBoxes::GetBoxOfPos( const SwTableBox& rBox ) @@ -2934,7 +2934,7 @@ const SwTableBox* SwCollectTableLineBoxes::GetBoxOfPos( const SwTableBox& rBox ) if( n >= aPosArr.size() ) --n; - nWidth = nWidth + (sal_uInt16)rBox.GetFrameFormat()->GetFrameSize().GetWidth(); + nWidth = nWidth + static_cast<sal_uInt16>(rBox.GetFrameFormat()->GetFrameSize().GetWidth()); pRet = m_Boxes[ n ]; } return pRet; @@ -3650,7 +3650,7 @@ static bool lcl_SetAFormatBox(FndBox_ & rBox, SetAFormatTabPara *pSetPara, bool else if( pSetPara->nCurBox == pSetPara->nEndBox ) pSetPara->nAFormatBox = 3; else - pSetPara->nAFormatBox = (sal_uInt8)(1 + ((pSetPara->nCurBox-1) & 1)); + pSetPara->nAFormatBox = static_cast<sal_uInt8>(1 + ((pSetPara->nCurBox-1) & 1)); } if (rBox.GetBox()->GetSttNd()) @@ -3764,7 +3764,7 @@ bool SwDoc::SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat else if (static_cast<size_t>(n+1) == rFLns.size()) aPara.nAFormatLine = 3; else - aPara.nAFormatLine = (sal_uInt8)(1 + ((n-1) & 1 )); + aPara.nAFormatLine = static_cast<sal_uInt8>(1 + ((n-1) & 1 )); aPara.nAFormatBox = 0; aPara.nCurBox = 0; diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index f5c1d04fe1ee..d5070c99cf6b 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -306,7 +306,7 @@ void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew ) } std::vector<SwTableFormatCmp*> aFormatCmp; - aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) ); + aFormatCmp.reserve( std::max( 255, static_cast<int>(aRowArr.size()) ) ); for( auto pLn : aRowArr ) ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew ); @@ -379,7 +379,7 @@ void SwDoc::SetRowHeight( const SwCursor& rCursor, const SwFormatFrameSize &rNew } std::vector<SwTableFormatCmp*> aFormatCmp; - aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) ); + aFormatCmp.reserve( std::max( 255, static_cast<int>(aRowArr.size()) ) ); for ( auto pLn : aRowArr ) ::lcl_ProcessRowSize( aFormatCmp, pLn, rNew ); SwTableFormatCmp::Delete( aFormatCmp ); @@ -454,7 +454,7 @@ bool SwDoc::BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly ) } std::vector<SwTableFormatCmp*> aFormatCmp; - aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) ); + aFormatCmp.reserve( std::max( 255, static_cast<int>(aRowArr.size()) ) ); for( auto pLn : aRowArr ) ::lcl_ProcessRowSize( aFormatCmp, pLn, aNew ); SwTableFormatCmp::Delete( aFormatCmp ); @@ -483,7 +483,7 @@ void SwDoc::SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew } std::vector<SwTableFormatCmp*> aFormatCmp; - aFormatCmp.reserve( std::max( 255, (int)aRowArr.size() ) ); + aFormatCmp.reserve( std::max( 255, static_cast<int>(aRowArr.size()) ) ); for( auto pLn : aRowArr ) ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew ); @@ -1293,7 +1293,7 @@ static sal_uInt16 lcl_CalcCellFit( const SwLayoutFrame *pCell ) // To compensate for the accuracy of calculation later on in SwTable::SetTabCols // we keep adding up a little. nRet += COLFUZZY; - return (sal_uInt16)std::max( long(MINLAY), nRet ); + return static_cast<sal_uInt16>(std::max( long(MINLAY), nRet )); } /* The Line is within the Selection but not outlined by the TabCols. diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index e149fbf1d94a..607a8978bf1d 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -878,8 +878,8 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou convertTwipToMm100(aCrop.GetBottom()) ); // Compute delta to apply - double fScaleX = ( aGraphicSize.Width() - aCropRectangle.Left() - aCropRectangle.Right() ) / (double)nOldWidth; - double fScaleY = ( aGraphicSize.Height() - aCropRectangle.Top() - aCropRectangle.Bottom() ) / (double)nOldHeight; + double fScaleX = ( aGraphicSize.Width() - aCropRectangle.Left() - aCropRectangle.Right() ) / static_cast<double>(nOldWidth); + double fScaleY = ( aGraphicSize.Height() - aCropRectangle.Top() - aCropRectangle.Bottom() ) / static_cast<double>(nOldHeight); sal_Int32 nDiffLeft = aNewRect.Left() - aOldRect.Left(); sal_Int32 nDiffTop = aNewRect.Top() - aOldRect.Top(); diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 9b7d43e4c716..04f718761373 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -1310,7 +1310,7 @@ void SwAutoFormat::BuildTextIndent() IsSentenceAtEnd( *m_pCurTextNd ); if( m_aFlags.bAFormatByInput ) - m_pCurTextNd->SetAutoFormatLvl( (sal_uInt8)CalcLevel( *m_pCurTextNd ) ); + m_pCurTextNd->SetAutoFormatLvl( static_cast<sal_uInt8>(CalcLevel( *m_pCurTextNd )) ); SetColl( RES_POOLCOLL_TEXT_MOVE ); if( !bBreak ) @@ -1748,7 +1748,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) SwTextFrameInfo aFInfo( m_pCurTextFrame ); const SwTextNode* pNxtNd = GetNextNode(); while( CanJoin( pNxtNd ) && - 20 < std::abs( (long)(nSpaces - aFInfo.SetFrame( + 20 < std::abs( static_cast<long>(nSpaces - aFInfo.SetFrame( GetFrame( *pNxtNd ) ).GetLineStart() )) ) { diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index d679a4105acd..f4e4736b02e0 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -448,15 +448,15 @@ uno::Reference<text::XTextField> lcl_InsertParagraphSignature(const uno::Referen DateTime aDateTime = DateTime::CreateFromUnixTime(time(nullptr)); aDateTime.ConvertToLocalTime(); OUStringBuffer rBuffer; - rBuffer.append((sal_Int32)aDateTime.GetYear()); + rBuffer.append(static_cast<sal_Int32>(aDateTime.GetYear())); rBuffer.append('-'); if (aDateTime.GetMonth() < 10) rBuffer.append('0'); - rBuffer.append((sal_Int32)aDateTime.GetMonth()); + rBuffer.append(static_cast<sal_Int32>(aDateTime.GetMonth())); rBuffer.append('-'); if (aDateTime.GetDay() < 10) rBuffer.append('0'); - rBuffer.append((sal_Int32)aDateTime.GetDay()); + rBuffer.append(static_cast<sal_Int32>(aDateTime.GetDay())); // Now set the RDF on the paragraph, since that's what is preserved in .doc(x). const css::uno::Reference<css::rdf::XResource> xParaSubject(xParagraph, uno::UNO_QUERY); @@ -1634,7 +1634,7 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark) // tdf#108494 the header height was switched to height of a watermark // and shape was moved to the lower part of a page - xPageStyle->setPropertyValue(UNO_NAME_HEADER_HEIGHT, uno::makeAny((sal_Int32)11)); + xPageStyle->setPropertyValue(UNO_NAME_HEADER_HEIGHT, uno::makeAny(sal_Int32(11))); xPageStyle->setPropertyValue(UNO_NAME_HEADER_HEIGHT, uno::makeAny(nOldValue)); xPageStyle->setPropertyValue(UNO_NAME_HEADER_IS_DYNAMIC_HEIGHT, uno::Any(bDynamicHeight)); } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 45e4927340aa..9cf389eaa3a4 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -859,7 +859,7 @@ uno::Reference< XSpellAlternatives > if( xSpell.is() ) { LanguageType eActLang = pNode->GetLang( nBegin, nLen ); - if( xSpell->hasLanguage( (sal_uInt16)eActLang )) + if( xSpell->hasLanguage( static_cast<sal_uInt16>(eActLang) )) { // restrict the maximal number of suggestions displayed // in the context menu. @@ -874,9 +874,9 @@ uno::Reference< XSpellAlternatives > Sequence< PropertyValue > aPropVals(1); PropertyValue &rVal = aPropVals.getArray()[0]; rVal.Name = UPN_MAX_NUMBER_OF_SUGGESTIONS; - rVal.Value <<= (sal_Int16) 7; + rVal.Value <<= sal_Int16(7); - xSpellAlt = xSpell->spell( aWord, (sal_uInt16)eActLang, aPropVals ); + xSpellAlt = xSpell->spell( aWord, static_cast<sal_uInt16>(eActLang), aPropVals ); } } diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index de93b316c375..1333b6bff464 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -197,7 +197,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const switch( nWhichId ) { case FIELD_PROP_BYTE1: - rAny <<= (sal_Int8)nLevel; + rAny <<= static_cast<sal_Int8>(nLevel); break; case FIELD_PROP_USHORT1: diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index ab3d1a10f7b0..04bc60b6dcb6 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -373,7 +373,7 @@ bool SwDBField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= 0 == (GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE); break; case FIELD_PROP_FORMAT: - rAny <<= (sal_Int32)GetFormat(); + rAny <<= static_cast<sal_Int32>(GetFormat()); break; case FIELD_PROP_PAR1: rAny <<= aContent; @@ -677,7 +677,7 @@ void SwDBNumSetField::Evaluate(SwDoc const * pDoc) if( bCondValid && pMgr && pMgr->IsInMerge() && pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, true)) { // condition OK -> adjust current Set - pMgr->ToRecordId(std::max((sal_uInt16)aPar2.toInt32(), sal_uInt16(1))-1); + pMgr->ToRecordId(std::max(static_cast<sal_uInt16>(aPar2.toInt32()), sal_uInt16(1))-1); } } @@ -846,7 +846,7 @@ bool SwDBSetNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const switch( nWhichId ) { case FIELD_PROP_USHORT1: - rAny <<= (sal_Int16)GetFormat(); + rAny <<= static_cast<sal_Int16>(GetFormat()); break; case FIELD_PROP_FORMAT: rAny <<= nNumber; diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index fe2d9cf2cefe..67ade96872d2 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -224,7 +224,7 @@ OUString SwPageNumberField::GetPar2() const void SwPageNumberField::SetPar2(const OUString& rStr) { - nOffset = (short)rStr.toInt32(); + nOffset = static_cast<short>(rStr.toInt32()); } sal_uInt16 SwPageNumberField::GetSubType() const @@ -237,7 +237,7 @@ bool SwPageNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const switch( nWhichId ) { case FIELD_PROP_FORMAT: - rAny <<= (sal_Int16)GetFormat(); + rAny <<= static_cast<sal_Int16>(GetFormat()); break; case FIELD_PROP_USHORT1: rAny <<= nOffset; @@ -799,7 +799,7 @@ bool SwDocStatField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const switch ( nWhichId ) { case FIELD_PROP_USHORT2: - rAny <<= (sal_Int16)GetFormat(); + rAny <<= static_cast<sal_Int16>(GetFormat()); break; default: @@ -1173,7 +1173,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_USHORT1: - rAny <<= (sal_Int16)aContent.toInt32(); + rAny <<= static_cast<sal_Int16>(aContent.toInt32()); break; case FIELD_PROP_BOOL1: @@ -1181,7 +1181,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_FORMAT: - rAny <<= (sal_Int32)GetFormat(); + rAny <<= static_cast<sal_Int32>(GetFormat()); break; case FIELD_PROP_DOUBLE: @@ -2114,7 +2114,7 @@ OUString SwRefPageSetField::GetPar2() const void SwRefPageSetField::SetPar2(const OUString& rStr) { - SetOffset( (short) rStr.toInt32() ); + SetOffset( static_cast<short>(rStr.toInt32()) ); } bool SwRefPageSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const @@ -2125,7 +2125,7 @@ bool SwRefPageSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= bOn; break; case FIELD_PROP_USHORT1: - rAny <<= (sal_Int16)nOffset; + rAny <<= static_cast<sal_Int16>(nOffset); break; default: assert(false); @@ -2360,7 +2360,7 @@ bool SwRefPageGetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const switch( nWhichId ) { case FIELD_PROP_USHORT1: - rAny <<= (sal_Int16)GetFormat(); + rAny <<= static_cast<sal_Int16>(GetFormat()); break; case FIELD_PROP_PAR1: rAny <<= sText; diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 3b73ebeca588..43c471f4c2ac 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -414,10 +414,10 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= GetValue(); break; case FIELD_PROP_FORMAT: - rAny <<= (sal_Int32)GetFormat(); + rAny <<= static_cast<sal_Int32>(GetFormat()); break; case FIELD_PROP_USHORT1: - rAny <<= (sal_Int16)nSubType; + rAny <<= static_cast<sal_Int16>(nSubType); break; case FIELD_PROP_PAR1: rAny <<= GetFormula(); @@ -1063,13 +1063,13 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= 0 == (nSubType & nsSwExtendedSubType::SUB_INVISIBLE); break; case FIELD_PROP_FORMAT: - rAny <<= (sal_Int32)GetFormat(); + rAny <<= static_cast<sal_Int32>(GetFormat()); break; case FIELD_PROP_USHORT2: - rAny <<= (sal_Int16)GetFormat(); + rAny <<= static_cast<sal_Int16>(GetFormat()); break; case FIELD_PROP_USHORT1: - rAny <<= (sal_Int16)nSeqNo; + rAny <<= static_cast<sal_Int16>(nSeqNo); break; case FIELD_PROP_PAR1: rAny <<= SwStyleNameMapper::GetProgName(GetPar1(), SwGetPoolIdFromName::TxtColl ); diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index ef12474832f2..aac0b4def6aa 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -168,10 +168,10 @@ bool SwDateTimeField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const rVal <<= (nSubType & DATEFLD) != 0; break; case FIELD_PROP_FORMAT: - rVal <<= (sal_Int32)GetFormat(); + rVal <<= static_cast<sal_Int32>(GetFormat()); break; case FIELD_PROP_SUBTYPE: - rVal <<= (sal_Int32)nOffset; + rVal <<= static_cast<sal_Int32>(nOffset); break; case FIELD_PROP_DATE_TIME: { diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index efb7c0fe9c3d..8a014dffe069 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -660,7 +660,7 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= Expand(); break; case FIELD_PROP_SHORT1: - rAny <<= (sal_Int16)nSeqNo; + rAny <<= static_cast<sal_Int16>(nSeqNo); break; default: assert(false); diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 749bfe58bc62..f5a1181903ad 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -171,7 +171,7 @@ bool SwTableField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= sExpand; break; case FIELD_PROP_FORMAT: - rAny <<= (sal_Int32)GetFormat(); + rAny <<= static_cast<sal_Int32>(GetFormat()); break; default: bRet = false; diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 061bb5cbb72c..1d9048dd2b49 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -118,7 +118,7 @@ bool SwUserField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const rAny <<= 0 == (nSubType & nsSwExtendedSubType::SUB_INVISIBLE); break; case FIELD_PROP_FORMAT: - rAny <<= (sal_Int32)GetFormat(); + rAny <<= static_cast<sal_Int32>(GetFormat()); break; default: return SwField::QueryValue(rAny, nWhichId); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index bfd7a0a1bf8b..31d19e06748a 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -3095,7 +3095,7 @@ long SwFEShell::GetSectionWidth( SwFormat const & rFormat ) const aSet.Put( SdrTextAniKindItem( SdrTextAniKind::Slide ) ); aSet.Put( SdrTextAniDirectionItem( SdrTextAniDirection::Left ) ); aSet.Put( SdrTextAniCountItem( 1 ) ); - aSet.Put( SdrTextAniAmountItem( (sal_Int16)GetWin()->PixelToLogic(Size(2,1)).Width()) ); + aSet.Put( SdrTextAniAmountItem( static_cast<sal_Int16>(GetWin()->PixelToLogic(Size(2,1)).Width())) ); pObj->SetMergedItemSetAndBroadcast(aSet); } } diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 16c640698c41..3de36c61ad2d 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -540,10 +540,10 @@ void SwFEShell::GetTabCols_(SwTabCols &rToFill, const SwFrame *pBox) const } if ( !bDel && - m_pColumnCache->pLastCols->GetLeftMin () == (sal_uInt16)nLeftMin && - m_pColumnCache->pLastCols->GetLeft () == (sal_uInt16)aRectFnSet.GetLeft(pTab->getFramePrintArea()) && - m_pColumnCache->pLastCols->GetRight () == (sal_uInt16)aRectFnSet.GetRight(pTab->getFramePrintArea())&& - m_pColumnCache->pLastCols->GetRightMax() == (sal_uInt16)nRightMax - m_pColumnCache->pLastCols->GetLeftMin() ) + m_pColumnCache->pLastCols->GetLeftMin () == static_cast<sal_uInt16>(nLeftMin) && + m_pColumnCache->pLastCols->GetLeft () == static_cast<sal_uInt16>(aRectFnSet.GetLeft(pTab->getFramePrintArea())) && + m_pColumnCache->pLastCols->GetRight () == static_cast<sal_uInt16>(aRectFnSet.GetRight(pTab->getFramePrintArea()))&& + m_pColumnCache->pLastCols->GetRightMax() == static_cast<sal_uInt16>(nRightMax) - m_pColumnCache->pLastCols->GetLeftMin() ) { if (m_pColumnCache->pLastCellFrame != pBox) { diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 83164e9e1058..23553e79ae16 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -1819,9 +1819,9 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrame *pStart, long nEd1 = ::lcl_CalcWish( pEnd, nWish, nPrtWidth ) + nOfst; if ( nSt1 <= nEd1 ) - nEd1 += (long)((nEdSz * nPrtWidth) / nWish) - 1; + nEd1 += static_cast<long>((nEdSz * nPrtWidth) / nWish) - 1; else - nSt1 += (long)((nStSz * nPrtWidth) / nWish) - 1; + nSt1 += static_cast<long>((nStSz * nPrtWidth) / nWish) - 1; long nSt2; long nEd2; diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 545ee807ea0c..53a1df5601d4 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -162,7 +162,7 @@ bool SwRotationGrf::QueryValue( uno::Any& rVal, sal_uInt8 ) const { // SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w) // where we still want this to be a sal_Int16 - rVal <<= (sal_Int16)GetValue(); + rVal <<= static_cast<sal_Int16>(GetValue()); return true; } @@ -174,7 +174,7 @@ bool SwRotationGrf::PutValue( const uno::Any& rVal, sal_uInt8 ) if (rVal >>= nValue) { // sal_uInt16 argument needed - SetValue( (sal_uInt16) nValue ); + SetValue( static_cast<sal_uInt16>(nValue) ); return true; } @@ -305,7 +305,7 @@ bool SwDrawModeGrf::PutValue( const uno::Any& rVal, sal_Int32 eVal = SWUnoHelper::GetEnumAsInt32( rVal ); if(eVal >= 0 && eVal <= (sal_uInt16)GraphicDrawMode::Watermark) { - SetEnumValue((sal_uInt16)eVal); + SetEnumValue(static_cast<sal_uInt16>(eVal)); return true; } return false; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 1ad720d0d2d5..31fab60ce388 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1081,8 +1081,8 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA, rGA.SetInvert( rSet.GetInvertGrf().GetValue() ); const sal_uInt16 nTrans = rSet.GetTransparencyGrf().GetValue(); - rGA.SetTransparency( (sal_uInt8) FRound( - std::min( nTrans, (sal_uInt16) 100 ) * 2.55 ) ); + rGA.SetTransparency( static_cast<sal_uInt8>(FRound( + std::min( nTrans, sal_uInt16(100) ) * 2.55 )) ); return rGA; } diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx index d678c996f8c1..b48ffb4c330c 100644 --- a/sw/source/core/inc/UndoTable.hxx +++ b/sw/source/core/inc/UndoTable.hxx @@ -215,8 +215,8 @@ public: nCurrBox = nBoxIdx; nCount = nMode; nSetColType = nType; - nAbsDiff = (sal_uInt16)nAbsDif; - nRelDiff = (sal_uInt16)nRelDif; + nAbsDiff = static_cast<sal_uInt16>(nAbsDif); + nRelDiff = static_cast<sal_uInt16>(nRelDif); } }; diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx index c1435a5a0029..01669a9efabd 100644 --- a/sw/source/core/inc/tblrwcl.hxx +++ b/sw/source/core/inc/tblrwcl.hxx @@ -129,7 +129,7 @@ struct SwGCLineBorder SwGCLineBorder( const SwTableBox& rBox ) : pLines( &rBox.GetTabLines() ), pShareFormats(nullptr), nLinePos( 0 ) {} - bool IsLastLine() const { return nLinePos + 1 >= (sal_uInt16)pLines->size(); } + bool IsLastLine() const { return nLinePos + 1 >= static_cast<sal_uInt16>(pLines->size()); } }; class SwGCBorder_BoxBrd diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index d0e38a0ca4e0..54eb27e68022 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -237,7 +237,7 @@ public: return nIdx < maList.size() ? maList[nIdx].mnPos : 0; } - sal_uInt16 Count() const { return (sal_uInt16)maList.size(); } + sal_uInt16 Count() const { return static_cast<sal_uInt16>(maList.size()); } void Insert( const OUString& rType, css::uno::Reference< css::container::XStringKeyMap > const & xPropertyBag, diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 04bbc8f0ace6..168ca934de67 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -225,13 +225,13 @@ bool SwFormatFrameSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; case MID_FRMSIZE_REL_HEIGHT: - rVal <<= (sal_Int16)(GetHeightPercent() != SwFormatFrameSize::SYNCED ? GetHeightPercent() : 0); + rVal <<= static_cast<sal_Int16>(GetHeightPercent() != SwFormatFrameSize::SYNCED ? GetHeightPercent() : 0); break; case MID_FRMSIZE_REL_HEIGHT_RELATION: rVal <<= GetHeightPercentRelation(); break; case MID_FRMSIZE_REL_WIDTH: - rVal <<= (sal_Int16)(GetWidthPercent() != SwFormatFrameSize::SYNCED ? GetWidthPercent() : 0); + rVal <<= static_cast<sal_Int16>(GetWidthPercent() != SwFormatFrameSize::SYNCED ? GetWidthPercent() : 0); break; case MID_FRMSIZE_REL_WIDTH_RELATION: rVal <<= GetWidthPercentRelation(); @@ -243,23 +243,23 @@ bool SwFormatFrameSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= SwFormatFrameSize::SYNCED == GetWidthPercent(); break; case MID_FRMSIZE_WIDTH : - rVal <<= (sal_Int32)convertTwipToMm100(m_aSize.Width()); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(m_aSize.Width())); break; case MID_FRMSIZE_HEIGHT: // #95848# returned size should never be zero. // (there was a bug that allowed for setting height to 0. // Thus there some documents existing with that not allowed // attribute value which may cause problems on import.) - rVal <<= (sal_Int32)convertTwipToMm100(m_aSize.Height() < MINLAY ? MINLAY : m_aSize.Height() ); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(m_aSize.Height() < MINLAY ? MINLAY : m_aSize.Height() )); break; case MID_FRMSIZE_SIZE_TYPE: - rVal <<= (sal_Int16)GetHeightSizeType(); + rVal <<= static_cast<sal_Int16>(GetHeightSizeType()); break; case MID_FRMSIZE_IS_AUTO_HEIGHT: rVal <<= ATT_FIX_SIZE != GetHeightSizeType(); break; case MID_FRMSIZE_WIDTH_TYPE: - rVal <<= (sal_Int16)GetWidthSizeType(); + rVal <<= static_cast<sal_Int16>(GetWidthSizeType()); break; } return true; @@ -294,7 +294,7 @@ bool SwFormatFrameSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int16 nSet = 0; rVal >>= nSet; if(nSet >= 0 && nSet < SwFormatFrameSize::SYNCED) - SetHeightPercent((sal_uInt8)nSet); + SetHeightPercent(static_cast<sal_uInt8>(nSet)); else bRet = false; } @@ -311,7 +311,7 @@ bool SwFormatFrameSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int16 nSet = 0; rVal >>= nSet; if(nSet >= 0 && nSet < SwFormatFrameSize::SYNCED) - SetWidthPercent((sal_uInt8)nSet); + SetWidthPercent(static_cast<sal_uInt8>(nSet)); else bRet = false; } @@ -554,7 +554,7 @@ void SwFormatContent::SetNewContentIdx( const SwNodeIndex *pIdx ) bool SwFormatContent::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - if( (bool)m_pStartNode != (bool)static_cast<const SwFormatContent&>(rAttr).m_pStartNode ) + if( static_cast<bool>(m_pStartNode) != static_cast<bool>(static_cast<const SwFormatContent&>(rAttr).m_pStartNode) ) return false; if( m_pStartNode ) return ( *m_pStartNode == *static_cast<const SwFormatContent&>(rAttr).GetContentIdx() ); @@ -695,7 +695,7 @@ bool SwFormatPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const ::boost::optional<sal_uInt16> oOffset = GetNumOffset(); if (oOffset) { - rVal <<= (sal_Int16)oOffset.get(); + rVal <<= static_cast<sal_Int16>(oOffset.get()); } else { @@ -1064,8 +1064,8 @@ bool SwFormatCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) const text::TextColumn* pArray = aSetColumns.getConstArray(); m_aColumns.clear(); //max count is 64k here - this is something the array can't do - sal_uInt16 nCount = std::min( (sal_uInt16)aSetColumns.getLength(), - (sal_uInt16) 0x3fff ); + sal_uInt16 nCount = std::min( static_cast<sal_uInt16>(aSetColumns.getLength()), + sal_uInt16(0x3fff) ); sal_uInt16 nWidthSum = 0; // #101224# one column is no column @@ -1319,14 +1319,14 @@ bool SwFormatVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { case MID_VERTORIENT_ORIENT: { - rVal <<= (sal_Int16)m_eOrient; + rVal <<= static_cast<sal_Int16>(m_eOrient); } break; case MID_VERTORIENT_RELATION: - rVal <<= (sal_Int16)m_eRelation; + rVal <<= static_cast<sal_Int16>(m_eRelation); break; case MID_VERTORIENT_POSITION: - rVal <<= (sal_Int32)convertTwipToMm100(GetPos()); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(GetPos())); break; default: OSL_ENSURE( false, "unknown MemberId" ); @@ -1413,14 +1413,14 @@ bool SwFormatHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { case MID_HORIORIENT_ORIENT: { - rVal <<= (sal_Int16)m_eOrient; + rVal <<= static_cast<sal_Int16>(m_eOrient); } break; case MID_HORIORIENT_RELATION: - rVal <<= (sal_Int16)m_eRelation; + rVal <<= static_cast<sal_Int16>(m_eRelation); break; case MID_HORIORIENT_POSITION: - rVal <<= (sal_Int32)convertTwipToMm100(GetPos()); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(GetPos())); break; case MID_HORIORIENT_PAGETOGGLE: rVal <<= IsPosToggle(); @@ -1592,7 +1592,7 @@ bool SwFormatAnchor::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= eRet; break; case MID_ANCHOR_PAGENUM: - rVal <<= (sal_Int16)GetPageNum(); + rVal <<= static_cast<sal_Int16>(GetPageNum()); break; case MID_ANCHOR_ANCHORFRAME: { @@ -1927,11 +1927,11 @@ bool SwFormatFootnoteEndAtTextEnd::QueryValue( uno::Any& rVal, sal_uInt8 nMember case MID_RESTART_NUM : rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMSEQ; break; - case MID_NUM_START_AT: rVal <<= (sal_Int16) nOffset; break; + case MID_NUM_START_AT: rVal <<= static_cast<sal_Int16>(nOffset); break; case MID_OWN_NUM : rVal <<= GetValue() >= FTNEND_ATTXTEND_OWNNUMANDFMT; break; - case MID_NUM_TYPE : rVal <<= (sal_Int16)aFormat.GetNumberingType(); break; + case MID_NUM_TYPE : rVal <<= static_cast<sal_Int16>(aFormat.GetNumberingType()); break; case MID_PREFIX : rVal <<= sPrefix; break; case MID_SUFFIX : rVal <<= sSuffix; break; default: return false; @@ -2126,7 +2126,7 @@ bool SwFormatLineNumber::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= IsCount(); break; case MID_LINENUMBER_STARTVALUE: - rVal <<= (sal_Int32)GetStartValue(); + rVal <<= static_cast<sal_Int32>(GetStartValue()); break; default: OSL_ENSURE( false, "unknown MemberId" ); @@ -2236,17 +2236,17 @@ bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_GRID_BASEHEIGHT: OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0, "This value needs TWIPS-MM100 conversion" ); - rVal <<= (sal_Int32) convertTwipToMm100(m_nBaseHeight); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(m_nBaseHeight)); break; case MID_GRID_BASEWIDTH: OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0, "This value needs TWIPS-MM100 conversion" ); - rVal <<= (sal_Int32) convertTwipToMm100(m_nBaseWidth); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(m_nBaseWidth)); break; case MID_GRID_RUBYHEIGHT: OSL_ENSURE( (nMemberId & CONVERT_TWIPS) != 0, "This value needs TWIPS-MM100 conversion" ); - rVal <<= (sal_Int32)convertTwipToMm100(m_nRubyHeight); + rVal <<= static_cast<sal_Int32>(convertTwipToMm100(m_nRubyHeight)); break; case MID_GRID_TYPE: switch( GetGridType() ) @@ -2299,7 +2299,7 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int16 nTmp = 0; bRet = (rVal >>= nTmp); if( bRet && (nTmp >= 0) ) - SetLines( (sal_uInt16)nTmp ); + SetLines( static_cast<sal_uInt16>(nTmp) ); else bRet = false; } @@ -2331,15 +2331,15 @@ bool SwTextGridItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEHEIGHT ) { nTmp = std::max<sal_Int32>(nTmp, MIN_TEXTGRID_SIZE); - SetBaseHeight( (sal_uInt16)nTmp ); + SetBaseHeight( static_cast<sal_uInt16>(nTmp) ); } else if( (nMemberId & ~CONVERT_TWIPS) == MID_GRID_BASEWIDTH ) { nTmp = std::max<sal_Int32>(nTmp, MIN_TEXTGRID_SIZE); - SetBaseWidth( (sal_uInt16)nTmp ); + SetBaseWidth( static_cast<sal_uInt16>(nTmp) ); } else - SetRubyHeight( (sal_uInt16)nTmp ); + SetRubyHeight( static_cast<sal_uInt16>(nTmp) ); } else bRet = false; diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 969699fe6dbb..00dde9506a08 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -370,14 +370,14 @@ void SwImplProtocol::CheckLine( OString& rLine ) } break; case 4: { - sal_uInt8 nNew = (sal_uInt8)nVal; + sal_uInt8 nNew = static_cast<sal_uInt8>(nVal); if( bNo ) nTestMode &= ~nNew; // reset test mode else nTestMode |= nNew; // set test mode } break; - case 5: nMaxLines = (sal_uInt16)nVal; + case 5: nMaxLines = static_cast<sal_uInt16>(nVal); break; case 6: aVars.push_back( nVal ); break; diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 0daef994f355..b7d7da4f4230 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2515,8 +2515,8 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon& rContour, if ( aOrgSize.Width() && aOrgSize.Height() ) { - double fScaleX = (double) aOrig.Width() / aOrgSize.Width(); - double fScaleY = (double) aOrig.Height() / aOrgSize.Height(); + double fScaleX = static_cast<double>(aOrig.Width()) / aOrgSize.Width(); + double fScaleY = static_cast<double>(aOrig.Height()) / aOrgSize.Height(); for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 73683a400219..db2395c70a7c 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -3322,7 +3322,7 @@ bool IsExtraData( const SwDoc *pDoc ) const SwLineNumberInfo &rInf = pDoc->GetLineNumberInfo(); return rInf.IsPaintLineNumbers() || rInf.IsCountInFlys() || - ((sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE && + (static_cast<sal_Int16>(SW_MOD()->GetRedlineMarkPos()) != text::HoriOrientation::NONE && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty()); } diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 435903bc70f0..4b7e2bb0558e 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -110,7 +110,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream ) else nOffset = COMPLETE_STRING; aIo.CloseFlagRec(); - Insert( SW_LAYCACHE_IO_REC_PARA, nIndex, (sal_Int32)nOffset ); + Insert( SW_LAYCACHE_IO_REC_PARA, nIndex, static_cast<sal_Int32>(nOffset) ); aIo.CloseRec(); break; } @@ -119,7 +119,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream ) aIo.OpenFlagRec(); aIo.GetStream().ReadUInt32( nIndex ) .ReadUInt32( nOffset ); - Insert( SW_LAYCACHE_IO_REC_TABLE, nIndex, (sal_Int32)nOffset ); + Insert( SW_LAYCACHE_IO_REC_TABLE, nIndex, static_cast<sal_Int32>(nOffset) ); aIo.CloseFlagRec(); aIo.CloseRec(); break; @@ -246,7 +246,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) // immediately. if( pTab->GetFollow() ) { - if( nOfst == (sal_uLong) COMPLETE_STRING ) + if( nOfst == sal_uLong(COMPLETE_STRING) ) nOfst = 0; do { @@ -1067,7 +1067,7 @@ bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType ) { sal_uInt32 nVal(0); pStream->ReadUInt32( nVal ); - sal_uInt8 cRecTyp = (sal_uInt8)nVal; + sal_uInt8 cRecTyp = static_cast<sal_uInt8>(nVal); if (!nVal || cRecTyp != cType || !pStream->good()) { OSL_ENSURE( nVal, "OpenRec: Record-Header is 0" ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 1244316e310c..70781515d300 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -5176,7 +5176,7 @@ void SwFootnoteContFrame::PaintLine( const SwRect& rRect, SwRectFnSet aRectFnSet(this); SwTwips nPrtWidth = aRectFnSet.GetWidth(getFramePrintArea()); Fraction aFract( nPrtWidth, 1 ); - const SwTwips nWidth = (long)(aFract *= rInf.GetWidth()); + const SwTwips nWidth = static_cast<long>(aFract *= rInf.GetWidth()); SwTwips nX = aRectFnSet.GetPrtLeft(*this); switch ( rInf.GetAdj() ) @@ -6850,7 +6850,7 @@ void SwPageFrame::RefreshExtraData( const SwRect &rRect ) const { const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo(); bool bLineInFly = (rInfo.IsPaintLineNumbers() && rInfo.IsCountInFlys()) - || (sal_Int16)SW_MOD()->GetRedlineMarkPos() != text::HoriOrientation::NONE; + || static_cast<sal_Int16>(SW_MOD()->GetRedlineMarkPos()) != text::HoriOrientation::NONE; SwRect aRect( rRect ); ::SwAlignRect( aRect, gProp.pSGlobalShell, gProp.pSGlobalShell->GetOut() ); @@ -6877,7 +6877,7 @@ void SwLayoutFrame::RefreshExtraData( const SwRect &rRect ) const const SwLineNumberInfo &rInfo = GetFormat()->GetDoc()->GetLineNumberInfo(); bool bLineInBody = rInfo.IsPaintLineNumbers(), bLineInFly = bLineInBody && rInfo.IsCountInFlys(), - bRedLine = (sal_Int16)SW_MOD()->GetRedlineMarkPos()!=text::HoriOrientation::NONE; + bRedLine = static_cast<sal_Int16>(SW_MOD()->GetRedlineMarkPos())!=text::HoriOrientation::NONE; const SwContentFrame *pCnt = ContainsContent(); while ( pCnt && IsAnLower( pCnt ) ) diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 65ef231b294e..9ff64c1aa162 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4948,7 +4948,7 @@ void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder double nTmpWidth = nSumWidth; nTmpWidth *= nPrtWidth; nTmpWidth /= nWish; - nWidth = (SwTwips)nTmpWidth; + nWidth = static_cast<SwTwips>(nTmpWidth); // 3. calculate frame widths of cells up to this one: const SwFrame* pTmpCell = static_cast<const SwLayoutFrame*>(GetUpper())->Lower(); @@ -4968,7 +4968,7 @@ void SwCellFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder double nTmpWidth = nWidth; nTmpWidth *= nPrtWidth; nTmpWidth /= nWish; - nWidth = (SwTwips)nTmpWidth; + nWidth = static_cast<SwTwips>(nTmpWidth); } } } diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 04a798c029b0..4c3c029f5aa9 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -3340,10 +3340,10 @@ void SwLayoutFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBord } } - const sal_uInt16 nLeft = (sal_uInt16)pAttrs->CalcLeft(this); + const sal_uInt16 nLeft = static_cast<sal_uInt16>(pAttrs->CalcLeft(this)); const sal_uInt16 nUpper = bHideWhitespace ? 0 : pAttrs->CalcTop(); - const sal_uInt16 nRight = (sal_uInt16)pAttrs->CalcRight(this); + const sal_uInt16 nRight = static_cast<sal_uInt16>(pAttrs->CalcRight(this)); const sal_uInt16 nLower = bHideWhitespace ? 0 : pAttrs->CalcBottom(); const bool bVert = IsVertical() && !IsPageFrame(); @@ -3810,7 +3810,7 @@ void SwLayoutFrame::FormatWidthCols( const SwBorderAttrs &rAttrs, nDiff = nMinDiff; // If we should grow more than by nMinDiff we split it over // the columns - if ( std::abs(nDiff - nMinDiff) > nNumCols && nDiff > (long)nNumCols ) + if ( std::abs(nDiff - nMinDiff) > nNumCols && nDiff > static_cast<long>(nNumCols) ) nDiff /= nNumCols; if ( bMinDiff ) diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 2ed6c4812ba5..52d5172b08ff 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -113,9 +113,9 @@ bool SwFormatDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { switch(nMemberId&~CONVERT_TWIPS) { - case MID_DROPCAP_LINES : rVal <<= (sal_Int16)nLines; break; - case MID_DROPCAP_COUNT : rVal <<= (sal_Int16)nChars; break; - case MID_DROPCAP_DISTANCE : rVal <<= (sal_Int16) convertTwipToMm100(nDistance); break; + case MID_DROPCAP_LINES : rVal <<= static_cast<sal_Int16>(nLines); break; + case MID_DROPCAP_COUNT : rVal <<= static_cast<sal_Int16>(nChars); break; + case MID_DROPCAP_DISTANCE : rVal <<= static_cast<sal_Int16>(convertTwipToMm100(nDistance)); break; case MID_DROPCAP_FORMAT: { style::DropCapFormat aDrop; @@ -150,7 +150,7 @@ bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int8 nTemp = 0; rVal >>= nTemp; if(nTemp >=1 && nTemp < 0x7f) - nLines = (sal_uInt8)nTemp; + nLines = static_cast<sal_uInt8>(nTemp); } break; case MID_DROPCAP_COUNT : @@ -158,14 +158,14 @@ bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int16 nTemp = 0; rVal >>= nTemp; if(nTemp >=1 && nTemp < 0x7f) - nChars = (sal_uInt8)nTemp; + nChars = static_cast<sal_uInt8>(nTemp); } break; case MID_DROPCAP_DISTANCE : { sal_Int16 nVal = 0; if ( rVal >>= nVal ) - nDistance = (sal_Int16) convertMm100ToTwip((sal_Int32)nVal); + nDistance = static_cast<sal_Int16>(convertMm100ToTwip(static_cast<sal_Int32>(nVal))); else return false; break; diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index 03e84964a4ff..059e160ea0bb 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1058,7 +1058,7 @@ SwTableBox& SwTableBox::FindEndOfRowSpan( const SwTable& rTable, sal_uInt16 nMax return *this; if( nMaxStep > --nAbsSpan ) - nMaxStep = (sal_uInt16)nAbsSpan; + nMaxStep = static_cast<sal_uInt16>(nAbsSpan); const SwTableLine* pMyUpper = GetUpper(); sal_uInt16 nLine = rTable.GetTabLines().GetPos( pMyUpper ); nMaxStep = nLine + nMaxStep; @@ -1387,7 +1387,7 @@ static sal_uInt16 lcl_LineIndex( const SwTable& rTable, const SwSelBoxes& rBoxes nSpan = 0; else if( nSpan ) { - sal_uInt16 nEndOfRowSpan = (sal_uInt16)(nPos + nRowSpan - 1); + sal_uInt16 nEndOfRowSpan = static_cast<sal_uInt16>(nPos + nRowSpan - 1); if( nEndOfRowSpan > nSpan || nSpan == USHRT_MAX ) nSpan = nEndOfRowSpan; } diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 591a13352bfa..7e8bed4e28ce 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -736,7 +736,7 @@ static void lcl_ProcessBoxSet( SwTableBox *pBox, Parm &rParm ) SwTableBoxes& rTableBoxes = pBox->GetUpper()->GetTabBoxes(); if( nPos && rTableBoxes[ nPos - 1 ]->getRowSpan() != 1 ) nLeftDiff = 0; - if( nPos + 1 < (sal_uInt16)rTableBoxes.size() && + if( nPos + 1 < static_cast<sal_uInt16>(rTableBoxes.size()) && rTableBoxes[ nPos + 1 ]->getRowSpan() != 1 ) nRightDiff = 0; } @@ -1201,7 +1201,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, nOldPos = lcl_MulDiv64<long>(nOldPos, rParm.nOldWish, nOldWidth); if( nOldPos != nNewPos && nNewPos > 0 && nOldPos > 0 ) { - ColChange aChg( (sal_uInt16)nOldPos, (sal_uInt16)nNewPos ); + ColChange aChg( static_cast<sal_uInt16>(nOldPos), static_cast<sal_uInt16>(nNewPos) ); aOldNew.push_back( aChg ); } } @@ -1244,7 +1244,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, } aRowSpanPos.clear(); } - if( nCurr+1 < (sal_uInt16)rLines.size() ) + if( nCurr+1 < static_cast<sal_uInt16>(rLines.size()) ) { ChangeList aCopy; ChangeList::iterator pCop = aOldNew.begin(); @@ -1264,7 +1264,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, lcl_CalcNewWidths( aRowSpanPos, aCopy, rLines[++j], rParm.nOldWish, nOldWidth, false ); lcl_AdjustWidthsInLine( rLines[j], aCopy, rParm, 0 ); - bGoOn = !aRowSpanPos.empty() && j+1 < (sal_uInt16)rLines.size(); + bGoOn = !aRowSpanPos.empty() && j+1 < static_cast<sal_uInt16>(rLines.size()); } } ::lcl_AdjustWidthsInLine( rLines[nCurr], aOldNew, rParm, COLFUZZY ); diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 409ff87e520e..b07aa1a9b23f 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -801,7 +801,7 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType ) const LanguageType nDefaultLang = SwEnhancedPDFExportHelper::GetDefaultLanguage(); if ( nDefaultLang != nCurrentLanguage ) - mpPDFExtOutDevData->SetStructureAttributeNumerical( vcl::PDFWriter::Language, (sal_uInt16)nCurrentLanguage ); + mpPDFExtOutDevData->SetStructureAttributeNumerical( vcl::PDFWriter::Language, static_cast<sal_uInt16>(nCurrentLanguage) ); } if ( bLinkAttribute ) @@ -2036,7 +2036,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport() continue; // Get parent id from stack: - const sal_Int8 nLevel = (sal_Int8)mrSh.getIDocumentOutlineNodesAccess()->getOutlineLevel( i ); + const sal_Int8 nLevel = static_cast<sal_Int8>(mrSh.getIDocumentOutlineNodesAccess()->getOutlineLevel( i )); sal_Int8 nLevelOnTopOfStack = aOutlineStack.top().first; while ( nLevelOnTopOfStack >= nLevel && nLevelOnTopOfStack != -1 ) diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 794a90f1260a..b978e31fd218 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -292,7 +292,7 @@ void SwTextFrame::PaintExtraData( const SwRect &rRect ) const const SwFormatLineNumber &rLineNum = GetAttrSet()->GetLineNumber(); bool bLineNum = !IsInTab() && rLineInf.IsPaintLineNumbers() && ( !IsInFly() || rLineInf.IsCountInFlys() ) && rLineNum.IsCount(); - sal_Int16 eHor = (sal_Int16)SW_MOD()->GetRedlineMarkPos(); + sal_Int16 eHor = static_cast<sal_Int16>(SW_MOD()->GetRedlineMarkPos()); if( eHor != text::HoriOrientation::NONE && !IDocumentRedlineAccess::IsShowChanges( rIDRA.GetRedlineFlags() ) ) eHor = text::HoriOrientation::NONE; bool bRedLine = eHor != text::HoriOrientation::NONE; diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index de131470c958..ba8e4746fed9 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -426,7 +426,7 @@ void SwTextSizeInfo::GetTextSize( const SwScriptInfo* pSI, const sal_Int32 nInde aDrawInf.SetSnapToGrid( SnapToGrid() ); aDrawInf.SetKanaComp( nComp ); SwPosSize aSize( m_pFnt->GetTextSize_( aDrawInf ) ); - nMaxSizeDiff = (sal_uInt16)aDrawInf.GetKanaDiff(); + nMaxSizeDiff = static_cast<sal_uInt16>(aDrawInf.GetKanaDiff()); nMinSize = aSize.Width(); } @@ -908,7 +908,7 @@ static void lcl_DrawSpecial( const SwTextPaintInfo& rInf, const SwLinePortion& r Point aTmpPos( nX, nY ); const_cast<SwTextPaintInfo&>(rInf).SetPos( aTmpPos ); sal_uInt16 nOldWidth = rPor.Width(); - const_cast<SwLinePortion&>(rPor).Width( (sal_uInt16)aFontSize.Width() ); + const_cast<SwLinePortion&>(rPor).Width( static_cast<sal_uInt16>(aFontSize.Width()) ); rInf.DrawText( aTmp, rPor ); const_cast<SwLinePortion&>(rPor).Width( nOldWidth ); const_cast<SwTextPaintInfo&>(rInf).SetFont( const_cast<SwFont*>(pOldFnt) ); diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index 29ee5e81a438..ee37e1785040 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -467,7 +467,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent ) else nCompress = 10000 - nCompress; - ( pCurrent->GetKanaComp() )[ nKanaIdx ] = (sal_uInt16)nCompress; + ( pCurrent->GetKanaComp() )[ nKanaIdx ] = static_cast<sal_uInt16>(nCompress); nKanaDiffSum = 0; } diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 12ac9a1e3503..7d2915b02e28 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -348,7 +348,7 @@ public: SwMinMaxArgs( OutputDevice* pOutI, SwViewShell const * pShI, sal_uLong& rMinI, sal_uLong &rAbsI ) : pOut( pOutI ), pSh( pShI ), rMin( rMinI ), rAbsMin( rAbsI ) { nRowWidth = nWordWidth = nWordAdd = 0; nNoLineBreak = COMPLETE_STRING; } - void Minimum( long nNew ) const { if( (long)rMin < nNew ) rMin = nNew; } + void Minimum( long nNew ) const { if( static_cast<long>(rMin) < nNew ) rMin = nNew; } void NewWord() { nWordAdd = nWordWidth = 0; } }; @@ -382,7 +382,7 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString & else { rArg.nWordWidth += nAktWidth; - if( (long)rArg.rAbsMin < rArg.nWordWidth ) + if( static_cast<long>(rArg.rAbsMin) < rArg.nWordWidth ) rArg.rAbsMin = rArg.nWordWidth; rArg.Minimum( rArg.nWordWidth + rArg.nWordAdd ); bRet = true; @@ -628,7 +628,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM { case CH_BREAK : { - if( (long)rMax < aArg.nRowWidth ) + if( static_cast<long>(rMax) < aArg.nRowWidth ) rMax = aArg.nRowWidth; aArg.nRowWidth = 0; aArg.NewWord(); @@ -653,7 +653,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM nAktWidth = aIter.GetFnt()->GetTextSize_( aDrawInf ).Width(); aArg.nWordWidth += nAktWidth; aArg.nRowWidth += nAktWidth; - if( (long)rAbsMin < aArg.nWordWidth ) + if( static_cast<long>(rAbsMin) < aArg.nWordWidth ) rAbsMin = aArg.nWordWidth; aArg.Minimum( aArg.nWordWidth + aArg.nWordAdd ); aArg.nNoLineBreak = nIdx++; @@ -694,7 +694,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM // It were cleaner and maybe necessary later on to iterate over the content // of the text frame and call GetMinMaxSize recursively nAktWidth = FLYINCNT_MIN_WIDTH; // 0.5 cm - if( (long)rMax < USHRT_MAX ) + if( static_cast<long>(rMax) < USHRT_MAX ) rMax = USHRT_MAX; } else @@ -705,7 +705,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM aArg.nWordAdd = nOldWidth + nOldAdd; aArg.nWordWidth = nAktWidth; aArg.nRowWidth += nAktWidth; - if( (long)rAbsMin < aArg.nWordWidth ) + if( static_cast<long>(rAbsMin) < aArg.nWordWidth ) rAbsMin = aArg.nWordWidth; aArg.Minimum( aArg.nWordWidth + aArg.nWordAdd ); break; @@ -738,7 +738,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM break; } } - if( (long)rMax < aArg.nRowWidth ) + if( static_cast<long>(rMax) < aArg.nRowWidth ) rMax = aArg.nRowWidth; nLROffset += rSpace.GetRight(); @@ -747,9 +747,9 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM rAbsMin += nAdd; rMin += nLROffset; rMin += nAdd; - if( (long)rMin < aNodeArgs.nMinWidth ) + if( static_cast<long>(rMin) < aNodeArgs.nMinWidth ) rMin = aNodeArgs.nMinWidth; - if( (long)rAbsMin < aNodeArgs.nMinWidth ) + if( static_cast<long>(rAbsMin) < aNodeArgs.nMinWidth ) rAbsMin = aNodeArgs.nMinWidth; rMax += aNodeArgs.nMaxWidth; rMax += nLROffset; @@ -959,7 +959,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd SwTextIter aLine( pFrame, &aInf ); aLine.CharToLine( nStt ); pOut->SetMapMode( aOldMap ); - return (sal_uInt16)( nWidth ? + return static_cast<sal_uInt16>( nWidth ? ( ( 100 * aLine.GetCurr()->Height() ) / nWidth ) : 0 ); } // no frame or no paragraph, we take the height of the character @@ -969,8 +969,7 @@ sal_uInt16 SwTextNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd pOut->SetMapMode( aOldMap ); SwDrawTextInfo aDrawInf( pSh, *pOut, nullptr, GetText(), nStt, 1 ); - return (sal_uInt16) - ( nWidth ? ((100 * aIter.GetFnt()->GetTextSize_( aDrawInf ).Height()) / nWidth ) : 0 ); + return static_cast<sal_uInt16>( nWidth ? ((100 * aIter.GetFnt()->GetTextSize_( aDrawInf ).Height()) / nWidth ) : 0 ); } SwTwips SwTextNode::GetWidthOfLeadingTabs() const diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 58c811ca7f90..2a0778b2d23e 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -1562,7 +1562,7 @@ sal_Int32 SwTextCursor::GetCursorOfst( SwPosition *pPos, const Point &rPoint, nTmpY = pPor->Height() - nTmpY; if( nTmpY < 0 ) nTmpY = 0; - nX = (sal_uInt16)nTmpY; + nX = static_cast<sal_uInt16>(nTmpY); } if( static_cast<SwMultiPortion*>(pPor)->HasBrackets() ) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 04a1e3c46bee..2b7d853ee734 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -238,7 +238,7 @@ SwLinePortion *SwTextFormatter::Underflow( SwTextFormatInfo &rInf ) // line width is adjusted, so that pPor does not fit to current // line anymore - rInf.Width( (sal_uInt16)(rInf.X() + (pPor->Width() ? pPor->Width() - 1 : 0)) ); + rInf.Width( static_cast<sal_uInt16>(rInf.X() + (pPor->Width() ? pPor->Width() - 1 : 0)) ); rInf.SetLen( pPor->GetLen() ); rInf.SetFull( false ); if( pFly ) @@ -398,7 +398,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) { SwFontScript nNxtActual = rInf.GetFont()->GetActual(); SwFontScript nLstActual = nNxtActual; - sal_uInt16 nLstHeight = (sal_uInt16)rInf.GetFont()->GetHeight(); + sal_uInt16 nLstHeight = static_cast<sal_uInt16>(rInf.GetFont()->GetHeight()); bool bAllowBehind = false; const CharClass& rCC = GetAppCharClass(); @@ -441,7 +441,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) if ( pTmpFnt ) { nLstActual = pTmpFnt->GetActual(); - nLstHeight = (sal_uInt16)pTmpFnt->GetHeight(); + nLstHeight = static_cast<sal_uInt16>(pTmpFnt->GetHeight()); } } } @@ -504,7 +504,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) const SwTwips nRestWidth = rInf.Width() - rInf.X(); if ( nKernWidth <= nRestWidth ) - pGridKernPortion->Width( (sal_uInt16)nKernWidth ); + pGridKernPortion->Width( static_cast<sal_uInt16>(nKernWidth) ); } if ( pGridKernPortion != pPor ) @@ -593,7 +593,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) if( nTmp == m_pScriptInfo->NextScriptChg( nTmp - 1 ) && nTmp != rInf.GetText().getLength() ) { - const sal_uInt16 nDist = (sal_uInt16)(rInf.GetFont()->GetHeight()/5); + const sal_uInt16 nDist = static_cast<sal_uInt16>(rInf.GetFont()->GetHeight()/5); if( nDist ) { @@ -647,7 +647,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) 0; const SwTwips nTmpWidth = i * nGridWidth; const SwTwips nKernWidth = std::min(nTmpWidth - nSumWidth, nRestWidth); - const sal_uInt16 nKernWidth_1 = (sal_uInt16)(nKernWidth / 2); + const sal_uInt16 nKernWidth_1 = static_cast<sal_uInt16>(nKernWidth / 2); OSL_ENSURE( nKernWidth <= nRestWidth, "Not enough space left for adjusting non-asian text in grid mode" ); @@ -656,7 +656,7 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo &rInf ) rInf.X( rInf.X() + nKernWidth_1 ); if ( ! bFull ) - new SwKernPortion( *pPor, (short)(nKernWidth - nKernWidth_1), + new SwKernPortion( *pPor, static_cast<short>(nKernWidth - nKernWidth_1), false, true ); pGridKernPortion = nullptr; @@ -1337,7 +1337,7 @@ SwLinePortion *SwTextFormatter::NewPortion( SwTextFormatInfo &rInf ) POR_TABDECIMAL == pLastTabPortion->GetWhichPor() ) { OSL_ENSURE( rInf.X() >= pLastTabPortion->GetFix(), "Decimal tab stop position cannot be calculated" ); - const sal_uInt16 nWidthOfPortionsUpToDecimalPosition = (sal_uInt16)(rInf.X() - pLastTabPortion->GetFix() ); + const sal_uInt16 nWidthOfPortionsUpToDecimalPosition = static_cast<sal_uInt16>(rInf.X() - pLastTabPortion->GetFix() ); static_cast<SwTabDecimalPortion*>(pLastTabPortion)->SetWidthOfPortionsUpToDecimalPosition( nWidthOfPortionsUpToDecimalPosition ); rInf.SetTabDecimal( 0 ); } @@ -1710,7 +1710,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) nTmp = 100; nTmp *= nLineHeight; - nLineHeight = (sal_uInt16)(nTmp / 100); + nLineHeight = static_cast<sal_uInt16>(nTmp / 100); } m_pCurr->SetRealHeight( nLineHeight ); @@ -1744,7 +1744,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) nTmp /= 100; if( !nTmp ) ++nTmp; - nLineHeight = (sal_uInt16)nTmp; + nLineHeight = static_cast<sal_uInt16>(nTmp); sal_uInt16 nAsc = ( 4 * nLineHeight ) / 5; // 80% #if 0 // could do clipping here (like Word does) @@ -1799,7 +1799,7 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine ) nTmp /= 100; if( !nTmp ) ++nTmp; - nLineHeight = (sal_uInt16)nTmp; + nLineHeight = static_cast<sal_uInt16>(nTmp); break; } case SvxInterLineSpaceRule::Fix: @@ -2360,7 +2360,7 @@ void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo &rInf ) if( bForced ) { m_pCurr->SetForcedLeftMargin(); - rInf.ForcedLeftMargin( (sal_uInt16)aInter.Width() ); + rInf.ForcedLeftMargin( static_cast<sal_uInt16>(aInter.Width()) ); } if( bFullLine ) @@ -2450,7 +2450,7 @@ void SwTextFormatter::CalcFlyWidth( SwTextFormatInfo &rInf ) const long nNewWidth = ( i - 1 ) * nGridWidth - nOfst; if ( nNewWidth > 0 ) - rInf.Width( (sal_uInt16)nNewWidth ); + rInf.Width( static_cast<sal_uInt16>(nNewWidth) ); else rInf.Width( 0 ); diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index bb2148d4d97d..8816c02b8e8b 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -834,7 +834,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf ) if( bFull ) { - Width( rInf.Width() - (sal_uInt16)rInf.X() ); + Width( rInf.Width() - static_cast<sal_uInt16>(rInf.X()) ); if( bFly ) { SetLen( 0 ); @@ -891,7 +891,7 @@ void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) const return; } Point aPos( rInf.X() + GRFNUM_SECURE, rInf.Y() - GetRelPos() + GRFNUM_SECURE ); - long nTmpWidth = std::max( (long)0, (long)(nFixWidth - 2 * GRFNUM_SECURE) ); + long nTmpWidth = std::max( long(0), static_cast<long>(nFixWidth - 2 * GRFNUM_SECURE) ); Size aSize( nTmpWidth, GetGrfHeight() - 2 * GRFNUM_SECURE ); const bool bTmpLeft = mbLabelAlignmentPosAndSpaceModeActive || @@ -1215,7 +1215,7 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf ) SwDrawTextInfo aDrawInf( pSh, *rInf.GetOut(), nullptr, m_aExpand, i, 1 ); Size aSize = aTmpFont.GetTextSize_( aDrawInf ); const sal_uInt16 nAsc = aTmpFont.GetAscent( pSh, *rInf.GetOut() ); - aPos[ i ] = (sal_uInt16)aSize.Width(); + aPos[ i ] = static_cast<sal_uInt16>(aSize.Width()); if( i == nTop ) // enter the second line { nLowPos = nMaxDescent; @@ -1293,7 +1293,7 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf ) { if( rInf.GetLineStart() == rInf.GetIdx() && (!rInf.GetLast()->InFieldGrp() || !static_cast<SwFieldPortion*>(rInf.GetLast())->IsFollow() ) ) - Width( (sal_uInt16)( rInf.Width() - rInf.X() ) ); + Width( static_cast<sal_uInt16>( rInf.Width() - rInf.X() ) ); else { Truncate(); diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 526e3e7d846b..0f9f854bd10c 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -801,7 +801,7 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode, bool bRTL ) // If we are at the start of a group, we do not trust nScript, // we better get nScript from the breakiterator: if ( nChg == nGrpStart ) - nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg ); + nScript = static_cast<sal_uInt8>(g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg )); // INVALID DATA FROM THE SCRIPT INFO ARRAYS HAS TO BE DELETED: @@ -860,8 +860,8 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode, bool bRTL ) // Get next script type or set to weak in order to exit sal_uInt8 nNextScript = ( nEnd < rText.getLength() ) ? - (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rText, nEnd ) : - (sal_uInt8)WEAK; + static_cast<sal_uInt8>(g_pBreakIt->GetBreakIter()->getScriptType( rText, nEnd )) : + sal_uInt8(WEAK); if ( nScript != nNextScript ) { @@ -1157,7 +1157,7 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& rNode, bool bRTL ) } if ( nChg < rText.getLength() ) - nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg ); + nScript = static_cast<sal_uInt8>(g_pBreakIt->GetBreakIter()->getScriptType( rText, nChg )); nLastCompression = nChg; nLastKashida = nChg; diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index b1099af21feb..092efa9aae02 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -93,7 +93,7 @@ void SwLinePortion::PrePaint( const SwTextPaintInfo& rInf, sal_uInt16 nLastWidth = pLast->Width(); if ( pLast->InSpaceGrp() && rInf.GetSpaceAdd() ) - nLastWidth = nLastWidth + (sal_uInt16)pLast->CalcSpacing( rInf.GetSpaceAdd(), rInf ); + nLastWidth = nLastWidth + static_cast<sal_uInt16>(pLast->CalcSpacing( rInf.GetSpaceAdd(), rInf )); sal_uInt16 nPos; SwTextPaintInfo aInf( rInf ); diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 13222dc86c46..e04c0f5c6e75 100644 --- a/sw/source/core/text/porrst.cxx +++ b/sw/source/core/text/porrst.cxx @@ -188,7 +188,7 @@ SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) : SwArrowPortion::SwArrowPortion( const SwTextPaintInfo &rInf ) : bLeft( false ) { - Height( (sal_uInt16)(rInf.GetTextFrame()->getFramePrintArea().Height()) ); + Height( static_cast<sal_uInt16>(rInf.GetTextFrame()->getFramePrintArea().Height()) ); aPos.X() = rInf.GetTextFrame()->getFrameArea().Left() + rInf.GetTextFrame()->getFramePrintArea().Right(); aPos.Y() = rInf.GetTextFrame()->getFrameArea().Top() + @@ -425,7 +425,7 @@ bool SwTextFrame::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff ) nTmp /= 100; if( !nTmp ) ++nTmp; - rRegDiff = (sal_uInt16)nTmp; + rRegDiff = static_cast<sal_uInt16>(nTmp); nNetHeight = rRegDiff; break; } diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 58ca2664ab0e..d6da0f0db312 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -76,7 +76,7 @@ static sal_Int32 lcl_AddSpace( const SwTextSizeInfo &rInf, const OUString* pStr, if ( pSI ) nScript = pSI->ScriptType( nPos ); else - nScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( *pStr, nPos ); + nScript = static_cast<sal_uInt8>(g_pBreakIt->GetBreakIter()->getScriptType( *pStr, nPos )); // Note: rInf.GetIdx() can differ from nPos, // e.g., when rPor is a field portion. nPos referes to the string passed @@ -191,10 +191,10 @@ static sal_Int32 lcl_AddSpace( const SwTextSizeInfo &rInf, const OUString* pStr, pPor->GetExpText( rInf, aStr ); const_cast<SwTextSizeInfo &>(rInf).SetOnWin( bOldOnWin ); - nNextScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( aStr, 0 ); + nNextScript = static_cast<sal_uInt8>(g_pBreakIt->GetBreakIter()->getScriptType( aStr, 0 )); } else - nNextScript = (sal_uInt8)g_pBreakIt->GetBreakIter()->getScriptType( rInf.GetText(), nPos ); + nNextScript = static_cast<sal_uInt8>(g_pBreakIt->GetBreakIter()->getScriptType( rInf.GetText(), nPos )); if( ASIAN == nNextScript ) { @@ -222,7 +222,7 @@ void SwTextPortion::BreakCut( SwTextFormatInfo &rInf, const SwTextGuess &rGuess // The word/char is larger than the line // Special case 1: The word is larger than the line // We truncate ... - const sal_uInt16 nLineWidth = (sal_uInt16)(rInf.Width() - rInf.X()); + const sal_uInt16 nLineWidth = static_cast<sal_uInt16>(rInf.Width() - rInf.X()); sal_Int32 nLen = rGuess.CutPos() - rInf.GetIdx(); if (nLen > 0) { @@ -329,7 +329,7 @@ bool SwTextPortion::Format_( SwTextFormatInfo &rInf ) short nKern = rInf.GetFont()->CheckKerning(); if( nKern > 0 && rInf.Width() < rInf.X() + Width() + nKern ) { - nKern = (short)(rInf.Width() - rInf.X() - Width() - 1); + nKern = static_cast<short>(rInf.Width() - rInf.X() - Width() - 1); if( nKern < 0 ) nKern = 0; } diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index af89c69f513d..da8da1b27e90 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -219,7 +219,7 @@ short SwRedlineItr::Seek_(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) nStart = COMPLETE_STRING; nEnd = COMPLETE_STRING; - for( ; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nAct ) + for( ; nAct < static_cast<sal_Int32>(rDoc.getIDocumentRedlineAccess().GetRedlineTable().size()) ; ++nAct ) { rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd ); @@ -374,7 +374,7 @@ bool SwRedlineItr::CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd ) sal_Int32 nOldAct = nAct; bool bRet = false; - for( nAct = nFirst; nAct < (sal_Int32)rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++nAct ) + for( nAct = nFirst; nAct < static_cast<sal_Int32>(rDoc.getIDocumentRedlineAccess().GetRedlineTable().size()) ; ++nAct ) { rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ]->CalcStartEnd( nNdIdx, nStart, nEnd ); if( nChkEnd < nStart ) diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 7ec194348087..d6ffec0dc272 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -726,7 +726,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf aText[ nTmpIdx ] = aStr; aWishedHeight[ nTmpIdx ] = sal_uInt16(nWishedHeight); // save initial scaling factor - aFactor[ nTmpIdx ] = (sal_uInt16)nFactor; + aFactor[ nTmpIdx ] = static_cast<sal_uInt16>(nFactor); } bool bGrow = ( pDrop->GetLen() != 0 ); @@ -876,7 +876,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf else { if ( bUseCache ) - aFactor[ nTmpIdx ] = (sal_uInt16)nFactor; + aFactor[ nTmpIdx ] = static_cast<sal_uInt16>(nFactor); nMin = nFactor; } @@ -927,13 +927,13 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf pCurrPart = pCurrPart->GetFollow(); } - pDrop->SetY( (short)nDescent ); + pDrop->SetY( static_cast<short>(nDescent) ); } bool SwDropPortion::Format( SwTextFormatInfo &rInf ) { bool bFull = false; - nFix = (sal_uInt16)rInf.X(); + nFix = static_cast<sal_uInt16>(rInf.X()); SwLayoutModeModifier aLayoutModeModifier( *rInf.GetOut() ); aLayoutModeModifier.SetAuto(); @@ -971,7 +971,7 @@ bool SwDropPortion::Format( SwTextFormatInfo &rInf ) Width(); // set values - pCurrPart->SetWidth( (sal_uInt16)nTmpWidth ); + pCurrPart->SetWidth( static_cast<sal_uInt16>(nTmpWidth) ); // Move rInf.SetIdx( rInf.GetIdx() + pCurrPart->GetLen() ); @@ -980,7 +980,7 @@ bool SwDropPortion::Format( SwTextFormatInfo &rInf ) } SetJoinBorderWithNext(false); SetJoinBorderWithPrev(false); - Width( (sal_uInt16)(rInf.X() - nOldX) ); + Width( static_cast<sal_uInt16>(rInf.X() - nOldX) ); } // reset my length @@ -1018,7 +1018,7 @@ bool SwDropPortion::Format( SwTextFormatInfo &rInf ) else { const sal_uInt16 nWant = Width() + GetDistance(); - const sal_uInt16 nRest = (sal_uInt16)(rInf.Width() - rInf.X()); + const sal_uInt16 nRest = static_cast<sal_uInt16>(rInf.Width() - rInf.X()); if( ( nWant > nRest ) || lcl_IsDropFlyInter( rInf, Width() + GetDistance(), nDropHeight ) ) nDistance = 0; diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 2fb5c47a38a4..cf3a49147db0 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -263,7 +263,7 @@ const SwRect SwContourCache::ContourRect( const SwFormat* pFormat, pSdrObj[ 0 ] = pObj; // due to #37347 the Object must be entered only // after GetContour() pTextRanger[ 0 ] = new TextRanger( aPolyPolygon, pPolyPolygon, 20, - (sal_uInt16)rLRSpace.GetLeft(), (sal_uInt16)rLRSpace.GetRight(), + static_cast<sal_uInt16>(rLRSpace.GetLeft()), static_cast<sal_uInt16>(rLRSpace.GetRight()), pFormat->GetSurround().IsOutside(), false, pFrame->IsVertical() ); pTextRanger[ 0 ]->SetUpper( rULSpace.GetUpper() ); pTextRanger[ 0 ]->SetLower( rULSpace.GetLower() ); diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 87b6d3721274..b23817ad6f81 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2066,11 +2066,11 @@ sal_uInt16 SwTextFrame::GetParHeight() const if( !HasPara() ) { // For non-empty paragraphs this is a special case // For UnderSized we can simply just ask 1 Twip more - sal_uInt16 nRet = (sal_uInt16)getFramePrintArea().SSize().Height(); + sal_uInt16 nRet = static_cast<sal_uInt16>(getFramePrintArea().SSize().Height()); if( IsUndersized() ) { if( IsEmpty() || GetText().isEmpty() ) - nRet = (sal_uInt16)EmptyHeight(); + nRet = static_cast<sal_uInt16>(EmptyHeight()); else ++nRet; } @@ -2168,7 +2168,7 @@ SwTwips SwTextFrame::CalcFitToContent() SwHookOut aHook( aInf ); // i#54031 - assure mininum of MINLAY twips. - const SwTwips nMax = std::max( (SwTwips)MINLAY, aLine.CalcFitToContent_() + 1 ); + const SwTwips nMax = std::max( SwTwips(MINLAY), aLine.CalcFitToContent_() + 1 ); { SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); @@ -2466,7 +2466,7 @@ sal_uInt16 SwTextFrame::FirstLineHeight() const if ( !HasPara() ) { if( IsEmpty() && isFrameAreaDefinitionValid() ) - return IsVertical() ? (sal_uInt16)getFramePrintArea().Width() : (sal_uInt16)getFramePrintArea().Height(); + return IsVertical() ? static_cast<sal_uInt16>(getFramePrintArea().Width()) : static_cast<sal_uInt16>(getFramePrintArea().Height()); return USHRT_MAX; } const SwParaPortion *pPara = GetPara(); @@ -2509,7 +2509,7 @@ void SwTextFrame::ChgThisLines() if ( rInf.IsCountBlankLines() ) { aLine.Bottom(); - nNew = (sal_uLong)aLine.GetLineNr(); + nNew = static_cast<sal_uLong>(aLine.GetLineNr()); } else { diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index d50d9acb76d1..e44642494175 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -1144,7 +1144,7 @@ sal_Int32 SwTextFormatter::FormatQuoVadis( const sal_Int32 nOffset ) if( nDiff < 0 ) { nLastLeft = pQuo->GetAscent(); - nQuoWidth = (sal_uInt16)(-nDiff + nLastLeft); + nQuoWidth = static_cast<sal_uInt16>(-nDiff + nLastLeft); } else { diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 9dc567118f9f..0fb6c591242a 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -151,7 +151,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto const SvxTabStopItem& rTab = m_pFrame->GetAttrSet()->GetPool()->GetDefaultItem( RES_PARATR_TABSTOP ); if( rTab.Count() ) - nDefTabDist = (sal_uInt16)rTab[0].GetTabPos(); + nDefTabDist = static_cast<sal_uInt16>(rTab[0].GetTabPos()); else nDefTabDist = SVX_TAB_DEFDIST; m_aLineInf.SetDefTabStop( nDefTabDist ); diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 794458141e01..3aa391f92724 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -124,14 +124,14 @@ class XmlPortionDumper:public SwPortionHandler xmlTextWriterStartElement( writer, BAD_CAST( "Text" ) ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "nLength" ), - "%i", ( int ) nLength ); + "%i", static_cast<int>(nLength) ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "nType" ), "%s", getTypeName( nType ) ); if (nHeight > 0) - xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nHeight"), "%i", (int)nHeight); + xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nHeight"), "%i", static_cast<int>(nHeight)); if (nWidth > 0) - xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nWidth"), "%i", (int)nWidth); + xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nWidth"), "%i", static_cast<int>(nWidth)); xmlTextWriterEndElement( writer ); } @@ -156,7 +156,7 @@ class XmlPortionDumper:public SwPortionHandler xmlTextWriterStartElement( writer, BAD_CAST( "Special" ) ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "nLength" ), - "%i", ( int ) nLength ); + "%i", static_cast<int>(nLength) ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "nType" ), "%s", getTypeName( nType ) ); @@ -165,10 +165,10 @@ class XmlPortionDumper:public SwPortionHandler "%s", sText8.getStr( ) ); if (nHeight > 0) - xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nHeight"), "%i", (int)nHeight); + xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nHeight"), "%i", static_cast<int>(nHeight)); if (nWidth > 0) - xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nWidth"), "%i", (int)nWidth); + xmlTextWriterWriteFormatAttribute(writer, BAD_CAST("nWidth"), "%i", static_cast<int>(nWidth)); if (pFont) pFont->dumpAsXml(writer); @@ -183,7 +183,7 @@ class XmlPortionDumper:public SwPortionHandler if (nWidth > 0) xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "nWidth" ), - "%i", ( int ) nWidth ); + "%i", static_cast<int>(nWidth) ); xmlTextWriterEndElement( writer ); } @@ -196,7 +196,7 @@ class XmlPortionDumper:public SwPortionHandler xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "nLength" ), - "%i", ( int ) nLength ); + "%i", static_cast<int>(nLength) ); xmlTextWriterEndElement( writer ); ofs += nLength; } diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 87189bcc9d05..1dbf513ea962 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -672,7 +672,7 @@ sal_uInt16 SwTOXAuthority::GetLevel() const sal_uInt16 nRet = 1; if( pTOXIntl->IsNumeric( sText ) ) { - nRet = (sal_uInt16)sText.toInt32(); + nRet = static_cast<sal_uInt16>(sText.toInt32()); nRet++; } //illegal values are also set to 'ARTICLE' as non-numeric values are diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index fbb4ee5f4951..d29ae9518916 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -290,7 +290,7 @@ sal_uInt16 SwFntObj::GetFontAscent( const SwViewShell *pSh, const OutputDevice& const vcl::Font aOldFnt( rRefDev.GetFont() ); const_cast<OutputDevice&>(rRefDev).SetFont( *m_pPrtFont ); const FontMetric aOutMet( rRefDev.GetFontMetric() ); - m_nPrtAscent = (sal_uInt16) aOutMet.GetAscent(); + m_nPrtAscent = static_cast<sal_uInt16>(aOutMet.GetAscent()); const_cast<OutputDevice&>(rRefDev).SetFont( aOldFnt ); } @@ -331,7 +331,7 @@ sal_uInt16 SwFntObj::GetFontHeight( const SwViewShell* pSh, const OutputDevice& #if OSL_DEBUG_LEVEL > 0 // Check if vcl did not change the meaning of GetTextHeight const FontMetric aOutMet( rRefDev.GetFontMetric() ); - long nTmpPrtHeight = (sal_uInt16)aOutMet.GetAscent() + aOutMet.GetDescent(); + long nTmpPrtHeight = static_cast<sal_uInt16>(aOutMet.GetAscent()) + aOutMet.GetDescent(); // #i106098#: do not compare with == here due to rounding error OSL_ENSURE( std::abs(nTmpPrtHeight - m_nPrtHeight) < 3, "GetTextHeight != Ascent + Descent" ); @@ -483,9 +483,9 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) m_nZoom = USHRT_MAX - 1; } - m_nScrAscent = (sal_uInt16)pOut->GetFontMetric().GetAscent(); + m_nScrAscent = static_cast<sal_uInt16>(pOut->GetFontMetric().GetAscent()); if ( USHRT_MAX == m_nScrHeight ) - m_nScrHeight = (sal_uInt16)pOut->GetTextHeight(); + m_nScrHeight = static_cast<sal_uInt16>(pOut->GetTextHeight()); // reset original output device font pOut->SetFont( aOldOutFont ); @@ -1057,7 +1057,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) lcl_IsMonoSpaceFont( *(rInf.GetpOut()) ) ) { pSI->Compress( pKernArray.get(), rInf.GetIdx(), rInf.GetLen(), - rInf.GetKanaComp(), (sal_uInt16)m_aFont.GetFontSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ) , &aTextOriginPos ); + rInf.GetKanaComp(), static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()), lcl_IsFullstopCentered( rInf.GetOut() ) , &aTextOriginPos ); bSpecialJust = true; } ///Asian Justification @@ -1227,7 +1227,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { pSI->Compress( pKernArray.get(), rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16)m_aFont.GetFontSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ), &aTextOriginPos ); + static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()), lcl_IsFullstopCentered( rInf.GetOut() ), &aTextOriginPos ); bSpecialJust = true; } @@ -1431,10 +1431,10 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) Point aTmpPos( aTextOriginPos ); pSI->Compress( pScrArray.get(), rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16)m_aFont.GetFontSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ), &aTmpPos ); + static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()), lcl_IsFullstopCentered( rInf.GetOut() ), &aTmpPos ); pSI->Compress( pKernArray.get(), rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16)m_aFont.GetFontSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ), &aTextOriginPos ); + static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()), lcl_IsFullstopCentered( rInf.GetOut() ), &aTextOriginPos ); } // Asian Justification @@ -1905,7 +1905,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf ) if( bCompress ) rInf.SetKanaDiff( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn, rInf.GetKanaComp(), - (sal_uInt16)m_aFont.GetFontSize().Height() ,lcl_IsFullstopCentered( rInf.GetOut() ) ) ); + static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()) ,lcl_IsFullstopCentered( rInf.GetOut() ) ) ); else rInf.SetKanaDiff( 0 ); @@ -1967,7 +1967,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf ) rInf.GetIdx(), nLn ); rInf.SetKanaDiff( rInf.GetScriptInfo()->Compress( pKernArray.get(), rInf.GetIdx(), nLn, rInf.GetKanaComp(), - (sal_uInt16) m_aFont.GetFontSize().Height() ,lcl_IsFullstopCentered( rInf.GetOut() ) ) ); + static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()) ,lcl_IsFullstopCentered( rInf.GetOut() ) ) ); aTextSize.Width() = pKernArray[ nLn - 1 ]; } else @@ -2026,7 +2026,7 @@ sal_Int32 SwFntObj::GetCursorOfst( SwDrawTextInfo &rInf ) { pSI->Compress( pKernArray.get(), rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16) m_aFont.GetFontSize().Height(), + static_cast<sal_uInt16>(m_aFont.GetFontSize().Height()), lcl_IsFullstopCentered( rInf.GetOut() ) ); } @@ -2444,7 +2444,7 @@ sal_Int32 SwFont::GetTextBreak( SwDrawTextInfo const & rInf, long nTextWidth ) rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray.get(), rInf.GetIdx(), nLn ); if( rInf.GetScriptInfo()->Compress( pKernArray.get(), rInf.GetIdx(), nLn, - rInf.GetKanaComp(), (sal_uInt16)GetHeight( m_nActual ), + rInf.GetKanaComp(), static_cast<sal_uInt16>(GetHeight( m_nActual )), lcl_IsFullstopCentered( rInf.GetOut() ) ) ) { long nKernAdd = nKern; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index ebf7a3086f02..30f488513cc7 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -450,7 +450,7 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf ) rInf.SetLen( rInf.GetText().getLength() ); const Point aOldPos = rInf.GetPos(); - const sal_uInt16 nCapWidth = (sal_uInt16)( GetCapitalSize( rInf ).Width() ); + const sal_uInt16 nCapWidth = static_cast<sal_uInt16>( GetCapitalSize( rInf ).Width() ); rInf.SetPos(aOldPos); rInf.SetDrawSpace( GetUnderline() != LINESTYLE_NONE || diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index b065ff5964ae..9886c2b683ff 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -470,7 +470,7 @@ sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const DFLT_ESC_AUTO_SUB != GetEscapement() ) { const long nAscent = nOldAscent + - ( (long) m_nOrgHeight * GetEscapement() ) / 100; + ( static_cast<long>(m_nOrgHeight) * GetEscapement() ) / 100; if ( nAscent>0 ) return std::max<sal_uInt16>( nAscent, m_nOrgAscent ); } @@ -989,7 +989,7 @@ sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight, DFLT_ESC_AUTO_SUB != GetEscapement() ) { long nDescent = nOldHeight - nOldAscent - - ( (long) m_nOrgHeight * GetEscapement() ) / 100; + ( static_cast<long>(m_nOrgHeight) * GetEscapement() ) / 100; const sal_uInt16 nDesc = nDescent>0 ? std::max<sal_uInt16>( nDescent, m_nOrgHeight - m_nOrgAscent) : m_nOrgHeight - m_nOrgAscent; @@ -1093,7 +1093,7 @@ Size SwSubFont::GetTextSize_( SwDrawTextInfo& rInf ) const sal_uInt16 nAscent = pLastFont->GetFontAscent( rInf.GetShell(), rInf.GetOut() ); aTextSize.Height() = - (long)CalcEscHeight( (sal_uInt16)aTextSize.Height(), nAscent); + static_cast<long>(CalcEscHeight( static_cast<sal_uInt16>(aTextSize.Height()), nAscent)); } } @@ -1415,7 +1415,7 @@ void SwSubFont::CalcEsc( SwDrawTextInfo const & rInf, Point& rPos ) break; default : - nOfst = ((long)m_nOrgHeight * GetEscapement()) / 100; + nOfst = (static_cast<long>(m_nOrgHeight) * GetEscapement()) / 100; switch ( nDir ) { diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index fcfdb8cbc3d6..33d560aee5c7 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1039,7 +1039,7 @@ bool SwTextNode::Spell(SwSpellArgs* pArgs) if (pArgs->xSpeller.is()) { SvxSpellWrapper::CheckSpellLang( pArgs->xSpeller, eActLang ); - pArgs->xSpellAlt = pArgs->xSpeller->spell( rWord, (sal_uInt16)eActLang, + pArgs->xSpellAlt = pArgs->xSpeller->spell( rWord, static_cast<sal_uInt16>(eActLang), Sequence< PropertyValue >() ); } if( pArgs->xSpellAlt.is() ) @@ -1345,13 +1345,13 @@ SwRect SwTextFrame::AutoSpell_( const SwContentNode* pActNode, sal_Int32 nActPos // within the word LanguageType eActLang = aScanner.GetCurrentLanguage(); - bool bSpell = xSpell.is() && xSpell->hasLanguage( (sal_uInt16)eActLang ); + bool bSpell = xSpell.is() && xSpell->hasLanguage( static_cast<sal_uInt16>(eActLang) ); if( bSpell && !rWord.isEmpty() ) { // check for: bAlter => xHyphWord.is() OSL_ENSURE(!bSpell || xSpell.is(), "NULL pointer"); - if( !xSpell->isValid( rWord, (sal_uInt16)eActLang, Sequence< PropertyValue >() ) ) + if( !xSpell->isValid( rWord, static_cast<sal_uInt16>(eActLang), Sequence< PropertyValue >() ) ) { sal_Int32 nSmartTagStt = nBegin; sal_Int32 nDummy = 1; diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 0d8249567e73..0fde62e3091d 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -77,7 +77,7 @@ void SwUndoFlyBase::InsFly(::sw::UndoRedoContext & rContext, bool bShowSelFrame) if (RndStdIds::FLY_AT_PAGE == nRndId) { - aAnchor.SetPageNum( (sal_uInt16)nNdPgPos ); + aAnchor.SetPageNum( static_cast<sal_uInt16>(nNdPgPos) ); } else { diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 2deaa9f1b677..fa8e2003813f 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -314,7 +314,7 @@ void SwUndoDrawGroup::SetGroupFormat( SwDrawFrameFormat* pFormat ) SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj, const SwDoc* pDoc ) : SwUndo( SwUndoId::DRAWUNGROUP, pDoc ), bDelFormat( false ) { - nSize = (sal_uInt16)pObj->GetSubList()->GetObjCount() + 1; + nSize = static_cast<sal_uInt16>(pObj->GetSubList()->GetObjCount()) + 1; pObjArr.reset( new SwUndoGroupObjImpl[ nSize ] ); SwDrawContact *pContact = static_cast<SwDrawContact*>(GetUserCall(pObj)); diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index 2911e66a42dd..b9183e199d8c 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -384,7 +384,7 @@ void SwUndoTransliterate::AddChanges( SwTextNode& rTNd, { long nOffsLen = rOffsets.getLength(); UndoTransliterate_Data* pNew = new UndoTransliterate_Data( - rTNd.GetIndex(), nStart, (sal_Int32)nOffsLen, + rTNd.GetIndex(), nStart, static_cast<sal_Int32>(nOffsLen), rTNd.GetText().copy(nStart, nLen)); aChanges.push_back( std::unique_ptr<UndoTransliterate_Data>(pNew) ); diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 9a053f58e74d..16046257a0af 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1290,7 +1290,7 @@ void SaveBox::SaveContentAttrs( SwDoc* pDoc ) else { sal_uLong nEnd = pDoc->GetNodes()[ nSttNode ]->EndOfSectionIndex(); - Ptrs.pContentAttrs = new SfxItemSets( (sal_uInt8)(nEnd - nSttNode - 1 ) ); + Ptrs.pContentAttrs = new SfxItemSets( static_cast<sal_uInt8>(nEnd - nSttNode - 1 ) ); for( sal_uLong n = nSttNode + 1; n < nEnd; ++n ) { SwContentNode* pCNd = pDoc->GetNodes()[ n ]->GetContentNode(); @@ -2117,7 +2117,7 @@ void SwUndoTableMerge::SetSelBoxes( const SwSelBoxes& rBoxes ) } // as separator for inserts of new boxes after shifting - aNewSttNds.push_back( (sal_uLong)0 ); + aNewSttNds.push_back( sal_uLong(0) ); // The new table model does not delete overlapped cells (by row span), // so the rBoxes array might be empty even some cells have been merged. diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index 7390c0d1f8dc..38515ee84edb 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -83,23 +83,23 @@ void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, O // get A, B, C, ..., AA, AB, ... representation of column number if( nCol < 26 ) - output->append( (sal_Unicode)('A' + nCol) ); + output->append( static_cast<sal_Unicode>('A' + nCol) ); else if( nCol < 702 ) { - output->append( (sal_Unicode)('A' + nCol / 26 - 1 )); - output->append( (sal_Unicode)('A' + nCol % 26) ); + output->append( static_cast<sal_Unicode>('A' + nCol / 26 - 1 )); + output->append( static_cast<sal_Unicode>('A' + nCol % 26) ); } else // works for nCol <= 18,278 { - output->append( (sal_Unicode)('A' + nCol / 702 - 1 )); - output->append( (sal_Unicode)('A' + (nCol % 702) / 26 )); - output->append( (sal_Unicode)('A' + nCol % 26) ); + output->append( static_cast<sal_Unicode>('A' + nCol / 702 - 1 )); + output->append( static_cast<sal_Unicode>('A' + (nCol % 702) / 26 )); + output->append( static_cast<sal_Unicode>('A' + nCol % 26) ); } // write row number as number if( ! rCell.bRelativeRow ) output->append( '$' ); - output->append( rCell.nRow + (sal_Int32)1 ); + output->append( rCell.nRow + sal_Int32(1) ); } void lcl_getSingleCellAddressFromXMLString( diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index fac07e39e4c1..4dc670aab746 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -418,7 +418,7 @@ bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry if( pAny ) { if(rEntry.nWID == FN_UNO_NUM_LEVEL) - *pAny <<= (sal_Int16)(pTextNd->GetActualListLevel()); + *pAny <<= static_cast<sal_Int16>(pTextNd->GetActualListLevel()); else if(rEntry.nWID == FN_UNO_IS_NUMBER) { *pAny <<= pTextNd->IsCountedInList(); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 33e378bd8748..61d40eb889ea 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2978,14 +2978,14 @@ sal_Bool SAL_CALL SwXFieldEnumeration::hasMoreElements() { SolarMutexGuard aGuard; - return m_pImpl->m_nNextIndex < (sal_Int32)m_pImpl->m_Items.size(); + return m_pImpl->m_nNextIndex < static_cast<sal_Int32>(m_pImpl->m_Items.size()); } uno::Any SAL_CALL SwXFieldEnumeration::nextElement() { SolarMutexGuard aGuard; - if (m_pImpl->m_nNextIndex >= (sal_Int32)m_pImpl->m_Items.size()) + if (m_pImpl->m_nNextIndex >= static_cast<sal_Int32>(m_pImpl->m_Items.size())) throw container::NoSuchElementException( "SwXFieldEnumeration::nextElement", css::uno::Reference<css::uno::XInterface>()); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index ef28818d61a2..a347b0820708 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1469,17 +1469,17 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& pNoText->SetContour(nullptr); else if(aValue >>= aParam) { - tools::PolyPolygon aPoly((sal_uInt16)aParam.getLength()); + tools::PolyPolygon aPoly(static_cast<sal_uInt16>(aParam.getLength())); for(sal_Int32 i = 0; i < aParam.getLength(); i++) { const ::drawing::PointSequence* pPointSeq = aParam.getConstArray(); sal_Int32 nPoints = pPointSeq[i].getLength(); const ::awt::Point* pPoints = pPointSeq[i].getConstArray(); - tools::Polygon aSet( (sal_uInt16)nPoints ); + tools::Polygon aSet( static_cast<sal_uInt16>(nPoints) ); for(sal_Int32 j = 0; j < nPoints; j++) { Point aPoint(pPoints[j].X, pPoints[j].Y); - aSet.SetPoint(aPoint, (sal_uInt16)j); + aSet.SetPoint(aPoint, static_cast<sal_uInt16>(j)); } // Close polygon if it isn't closed already. aSet.Optimize( PolyOptimizeFlags::CLOSE ); @@ -2175,7 +2175,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) pObj = pFormat->FindSdrObject(); if( pObj ) { - aAny <<= (sal_Int32)pObj->GetOrdNum(); + aAny <<= static_cast<sal_Int32>(pObj->GetOrdNum()); } } else if(FN_UNO_CLSID == pEntry->nWID || FN_UNO_MODEL == pEntry->nWID|| @@ -2310,7 +2310,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here sal_Int32 nValue = 0; aAny >>= nValue; - aAny <<= (sal_Int16)nValue; + aAny <<= static_cast<sal_Int16>(nValue); } // check for needed metric translation diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 1180bcafd3bc..a336f4da8787 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -344,7 +344,7 @@ lcl_SetNodeNumStart(SwPaM & rCursor, uno::Any const& rValue) { sal_Int16 nTmp = 1; rValue >>= nTmp; - sal_uInt16 nStt = (nTmp < 0 ? USHRT_MAX : (sal_uInt16)nTmp); + sal_uInt16 nStt = (nTmp < 0 ? USHRT_MAX : static_cast<sal_uInt16>(nTmp)); SwDoc* pDoc = rCursor.GetDoc(); UnoActionContext aAction(pDoc); @@ -2517,7 +2517,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable) pArray[2] = beans::PropertyValue("IsSortColumns", -1, aVal, beans::PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32) 3; + aVal <<= sal_Int32(3); pArray[3] = beans::PropertyValue("MaxSortFieldsCount", -1, aVal, beans::PropertyState_DIRECT_VALUE); diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index ffadc4a88d86..4cafb4bd51ee 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -438,11 +438,11 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) break; case WID_NUMBERING_TYPE : { - aRet <<= (sal_Int16)rFootnoteInfo.aFormat.GetNumberingType(); + aRet <<= static_cast<sal_Int16>(rFootnoteInfo.aFormat.GetNumberingType()); } break; case WID_START_AT: - aRet <<= (sal_Int16)rFootnoteInfo.nFootnoteOffset; + aRet <<= static_cast<sal_Int16>(rFootnoteInfo.nFootnoteOffset); break; case WID_FOOTNOTE_COUNTING : { @@ -676,10 +676,10 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) aRet <<= rEndInfo.GetSuffix(); break; case WID_NUMBERING_TYPE : - aRet <<= (sal_Int16)rEndInfo.aFormat.GetNumberingType(); + aRet <<= static_cast<sal_Int16>(rEndInfo.aFormat.GetNumberingType()); break; case WID_START_AT: - aRet <<= (sal_Int16)rEndInfo.nFootnoteOffset; + aRet <<= static_cast<sal_Int16>(rEndInfo.nFootnoteOffset); break; case WID_PARAGRAPH_STYLE : { @@ -941,7 +941,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) } break; case WID_NUMBERING_TYPE : - aRet <<= (sal_Int16)rInfo.GetNumType().GetNumberingType(); + aRet <<= static_cast<sal_Int16>(rInfo.GetNumType().GetNumberingType()); break; case WID_NUMBER_POSITION : { @@ -973,13 +973,13 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) } break; case WID_INTERVAL : - aRet <<= (sal_Int16)rInfo.GetCountBy(); + aRet <<= static_cast<sal_Int16>(rInfo.GetCountBy()); break; case WID_SEPARATOR_TEXT : aRet <<= rInfo.GetDivider(); break; case WID_SEPARATOR_INTERVAL: - aRet <<= (sal_Int16)rInfo.GetDividerCountBy(); + aRet <<= static_cast<sal_Int16>(rInfo.GetDividerCountBy()); break; case WID_COUNT_EMPTY_LINES : aRet <<= rInfo.IsCountBlankLines(); @@ -1265,7 +1265,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( SolarMutexGuard aGuard; OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" ); - const SwNumFormat& rFormat = rNumRule.Get( (sal_uInt16)nIndex ); + const SwNumFormat& rFormat = rNumRule.Get( static_cast<sal_uInt16>(nIndex) ); SwCharFormat* pCharFormat = rFormat.GetCharFormat(); OUString CharStyleName; @@ -1498,7 +1498,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( SolarMutexGuard aGuard; OSL_ENSURE( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" ); - SwNumFormat aFormat(rNumRule.Get( (sal_uInt16)nIndex )); + SwNumFormat aFormat(rNumRule.Get( static_cast<sal_uInt16>(nIndex) )); OUString sHeadingStyleName; OUString sParagraphStyleName; @@ -1739,7 +1739,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat( sal_Int32 nValue = 0; pProp->Value >>= nValue; // #i23727# nValue can be negative - aFormat.SetAbsLSpace((short) convertMm100ToTwip(nValue)); + aFormat.SetAbsLSpace(static_cast<short>(convertMm100ToTwip(nValue))); } break; case 7: //UNO_NAME_SYMBOL_TEXT_DISTANCE, @@ -1747,7 +1747,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat( sal_Int32 nValue = 0; pProp->Value >>= nValue; if(nValue >= 0) - aFormat.SetCharTextDistance((short) convertMm100ToTwip(nValue)); + aFormat.SetCharTextDistance(static_cast<short>(convertMm100ToTwip(nValue))); else bWrongArg = true; } @@ -1758,7 +1758,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat( pProp->Value >>= nValue; // #i23727# nValue can be positive nValue = convertMm100ToTwip(nValue); - aFormat.SetFirstLineOffset((short)nValue); + aFormat.SetFirstLineOffset(static_cast<short>(nValue)); } break; case 9: // UNO_NAME_POSITION_AND_SPACE_MODE @@ -2299,7 +2299,7 @@ SwXTextColumns::SwXTextColumns(const SwFormatCol& rFormatCol) : { const sal_uInt16 nItemGutterWidth = rFormatCol.GetGutterWidth(); nAutoDistance = bIsAutomaticWidth ? - USHRT_MAX == nItemGutterWidth ? DEF_GUTTER_WIDTH : (sal_Int32)nItemGutterWidth + USHRT_MAX == nItemGutterWidth ? DEF_GUTTER_WIDTH : static_cast<sal_Int32>(nItemGutterWidth) : 0; nAutoDistance = convertTwipToMm100(nAutoDistance); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 9365b12a26ef..d7d3eb9b3fc2 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2303,7 +2303,7 @@ uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry // // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && aResult.getValueType() == cppu::UnoType<sal_Int32>::get()) - aResult <<= (sal_Int16)(aResult.get<sal_Int32>()); + aResult <<= static_cast<sal_Int16>(aResult.get<sal_Int32>()); // check for needed metric translation if(rEntry.nMemberId & SFX_METRIC_ITEM && GetDoc()) { @@ -4698,7 +4698,7 @@ SwBoxAutoFormat* SwXTextCellStyle::GetBoxAutoFormat(SwDocShell* pDocShell, const return nullptr; const auto& rTableTemplateMap = SwTableAutoFormat::GetTableTemplateMap(); - if (rTableTemplateMap.size() <= (size_t)nTemplateIndex) + if (rTableTemplateMap.size() <= static_cast<size_t>(nTemplateIndex)) return nullptr; SwTableAutoFormat* pTableAutoFormat = pDocShell->GetDoc()->GetTableStyles().FindAutoFormat(sParentName); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index cdd63b47805f..db6e6e6bbd76 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -231,7 +231,7 @@ static void lcl_SetSpecialProperty(SwFrameFormat* pFormat, sal_Int32 nRepeat = 0; aValue >>= nRepeat; if( nRepeat >= 0 && nRepeat < USHRT_MAX ) - pFormat->GetDoc()->SetRowsToRepeat( *pTable, (sal_uInt16) nRepeat ); + pFormat->GetDoc()->SetRowsToRepeat( *pTable, static_cast<sal_uInt16>(nRepeat) ); } } break; @@ -253,7 +253,7 @@ static void lcl_SetSpecialProperty(SwFrameFormat* pFormat, sal_Int16 nSet = 0; aValue >>= nSet; if(nSet && nSet <=100) - aSz.SetWidthPercent( (sal_uInt8)nSet ); + aSz.SetWidthPercent( static_cast<sal_uInt8>(nSet) ); } else if(FN_TABLE_IS_RELATIVE_WIDTH == pEntry->nWID) { @@ -1389,7 +1389,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) aRet <<= ATT_VAR_SIZE == rSize.GetHeightSizeType(); } else - aRet <<= (sal_Int32)(convertTwipToMm100(rSize.GetSize().Height())); + aRet <<= static_cast<sal_Int32>(convertTwipToMm100(rSize.GetSize().Height())); } break; @@ -2937,7 +2937,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) break; case FN_UNO_TABLE_COLUMN_RELATIVE_SUM: - aRet <<= (sal_Int16) UNO_TABLE_COLUMN_SUM; + aRet <<= sal_Int16(UNO_TABLE_COLUMN_SUM); break; case RES_ANCHOR: @@ -3980,7 +3980,7 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) // remove actions - TODO: why? UnoActionRemoveContext aRemoveContext(pUnoCursor->GetDoc()); } - pFrameFormat->GetDoc()->InsertRow(*pUnoCursor, (sal_uInt16)nCount, bAppend); + pFrameFormat->GetDoc()->InsertRow(*pUnoCursor, static_cast<sal_uInt16>(nCount), bAppend); } void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) @@ -4130,7 +4130,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) UnoActionRemoveContext aRemoveContext(pUnoCursor->GetDoc()); } - pFrameFormat->GetDoc()->InsertCol(*pUnoCursor, (sal_uInt16)nCount, bAppend); + pFrameFormat->GetDoc()->InsertCol(*pUnoCursor, static_cast<sal_uInt16>(nCount), bAppend); } ///@see SwXTableRows::removeByIndex (TODO: seems to be copy and paste programming here) diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 941093a7a581..9fcf616ee5cb 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -517,7 +517,7 @@ void SAL_CALL SwXStringKeyMap::insertValue(const OUString & aKey, const uno::Any OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) { - if ( (sal_uInt32)nIndex >= maMap.size() ) + if ( static_cast<sal_uInt32>(nIndex) >= maMap.size() ) throw lang::IndexOutOfBoundsException(); return OUString(); @@ -525,7 +525,7 @@ OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex) uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex) { - if ( (sal_uInt32)nIndex >= maMap.size() ) + if ( static_cast<sal_uInt32>(nIndex) >= maMap.size() ) throw lang::IndexOutOfBoundsException(); return uno::Any(); diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 31efda9e789d..b7c8fc3e9fd6 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -175,7 +175,7 @@ void SwViewShell::PrintProspect( { // Round percentages for Drawings so that these can paint their objects properly aScY *= Fraction( 1000, 1 ); - long nTmp = (long)aScY; + long nTmp = static_cast<long>(aScY); if( 1 < nTmp ) --nTmp; else diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 4d7c7ad48a2a..1805094a13c8 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -386,9 +386,9 @@ void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, if( nMaxFrame < MINLAY ) nMaxFrame = MINLAY; - if( nWidth > (sal_uInt16)nMaxFrame ) + if( nWidth > static_cast<sal_uInt16>(nMaxFrame) ) nWidth = nMaxFrame; - else if( nWidth > (sal_uInt16)nMinFrame ) + else if( nWidth > static_cast<sal_uInt16>(nMinFrame) ) nWidth = nMinFrame; } } diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx index 6d0596073868..5a342c9d3f35 100644 --- a/sw/source/filter/docx/swdocxreader.cxx +++ b/sw/source/filter/docx/swdocxreader.cxx @@ -209,7 +209,7 @@ bool SwDOCXReader::MakeEntries( SwDoc *pD, SwTextBlocks &rBlocks ) sal_uInt16 nCurPos = rBlocks.GetIndex( sShortcut ); sal_Int32 nLen = sShortcut.getLength(); - while( (sal_uInt16)-1 != nCurPos ) + while( sal_uInt16(-1) != nCurPos ) { sShortcut = sShortcut.copy( 0, nLen ); // add an Number to it diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 6d19d69ed054..c26e04acbbbf 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -176,7 +176,7 @@ OString lclConvToHex(sal_uInt16 nHex) sal_Char *pStr = aNToABuf + (sizeof(aNToABuf)-1); for( sal_uInt8 n = 0; n < 2; ++n ) { - *(--pStr) = (sal_Char)(nHex & 0xf ) + 48; + *(--pStr) = static_cast<sal_Char>(nHex & 0xf ) + 48; if( *pStr > '9' ) *pStr += 39; nHex >>= 4; @@ -423,18 +423,18 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, if( nBigVal <= LONG_MAX ) { // a long is sufficient - nLongVal = (long)nBigVal; + nLongVal = static_cast<long>(nBigVal); } else { - rOut.append(nBigVal / (sal_Int64)nFac); - if( (nBigVal % (sal_Int64)nFac) != 0 ) + rOut.append(nBigVal / static_cast<sal_Int64>(nFac)); + if( (nBigVal % static_cast<sal_Int64>(nFac)) != 0 ) { rOut.append('.'); - while( nFac > 1 && (nBigVal % (sal_Int64)nFac) != 0 ) + while( nFac > 1 && (nBigVal % static_cast<sal_Int64>(nFac)) != 0 ) { nFac /= 10; - rOut.append((nBigVal / (sal_Int64)nFac) % (sal_Int64)10); + rOut.append((nBigVal / static_cast<sal_Int64>(nFac)) % sal_Int64(10)); } } bOutLongVal = false; @@ -1949,7 +1949,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat nYPos -= aULItem.GetUpper(); if( nYPos < 0 ) { - aULItem.SetUpper( (sal_uInt16)(aULItem.GetUpper() + nYPos) ); + aULItem.SetUpper( static_cast<sal_uInt16>(aULItem.GetUpper() + nYPos) ); nYPos = 0; } } @@ -1965,7 +1965,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat nXPos -= aLRItem.GetLeft(); if( nXPos < 0 ) { - aLRItem.SetLeft( (sal_uInt16)(aLRItem.GetLeft() + nXPos) ); + aLRItem.SetLeft( static_cast<sal_uInt16>(aLRItem.GetLeft() + nXPos) ); nXPos = 0; } } @@ -2696,7 +2696,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt ) } if( nHeight ) - rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight ); + rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, static_cast<long>(nHeight) ); else if( nPrcHeight && !(nPrcHeight < 115 && rHTMLWrt.m_bParaDotLeaders )) // avoid HTML scrollbars and missing descenders { @@ -2916,7 +2916,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) // max-width = max-width - margin-left for TOC paragraphs with dot leaders if( rHTMLWrt.m_bParaDotLeaders ) - rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, (long)(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin ); + rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_max_width, long(DOT_LEADERS_MAX_WIDTH/2.54*72*20) - nLeftMargin ); } @@ -2926,7 +2926,7 @@ static Writer& OutCSS1_SvxLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) } // The LineIndent of the first line might contain the room for numbering - long nFirstLineIndent = (long)rLRItem.GetTextFirstLineOfst() - + long nFirstLineIndent = static_cast<long>(rLRItem.GetTextFirstLineOfst()) - rHTMLWrt.m_nFirstLineIndent; if( rHTMLWrt.m_nDfltFirstLineIndent != nFirstLineIndent ) { @@ -2946,13 +2946,13 @@ static Writer& OutCSS1_SvxULSpace( Writer& rWrt, const SfxPoolItem& rHt ) if( rHTMLWrt.m_nDfltTopMargin != rULItem.GetUpper() ) { rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_top, - (long)rULItem.GetUpper() ); + static_cast<long>(rULItem.GetUpper()) ); } if( rHTMLWrt.m_nDfltBottomMargin != rULItem.GetLower() ) { rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_margin_bottom, - (long)rULItem.GetLower() ); + static_cast<long>(rULItem.GetLower()) ); } return rWrt; diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index de89c4869588..f39989bffb98 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -108,12 +108,12 @@ sal_uInt16 SwHTMLWriter::GetDefListLvl( const OUString& rNm, sal_uInt16 nPoolId sDTDD += " "; if( rNm.startsWith(sDTDD) ) // DefinitionList - term - return (sal_uInt16)rNm.copy( sDTDD.getLength() ).toInt32() | HTML_DLCOLL_DT; + return static_cast<sal_uInt16>(rNm.copy( sDTDD.getLength() ).toInt32()) | HTML_DLCOLL_DT; sDTDD = OOO_STRING_SVTOOLS_HTML_dd " "; if( rNm.startsWith(sDTDD) ) // DefinitionList - definition - return (sal_uInt16)rNm.copy( sDTDD.getLength() ).toInt32() | HTML_DLCOLL_DD; + return static_cast<sal_uInt16>(rNm.copy( sDTDD.getLength() ).toInt32()) | HTML_DLCOLL_DD; return 0; } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 36686581e1c4..b8aa98f72f68 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -142,7 +142,7 @@ void SwHTMLParser::EndScript() while( bFound ) { m_aBasicModule = "Modul"; - m_aBasicModule += OUString::number( (sal_Int32)(++m_nSBModuleCnt) ); + m_aBasicModule += OUString::number( static_cast<sal_Int32>(++m_nSBModuleCnt) ); bFound = xModLib->hasByName( m_aBasicModule ); } } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index e66fd1408d09..c61f12ed55e9 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1467,7 +1467,7 @@ void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop, if( SfxItemState::SET == rItemSet.GetItemState( RES_CHRATR_FONTSIZE, false, &pItem ) ) { sal_uInt16 nProp = static_cast<const SvxFontHeightItem *>(pItem)->GetProp(); - nLines = (sal_uInt8)((nProp + 50) / 100); + nLines = static_cast<sal_uInt8>((nProp + 50) / 100); if( nLines < 1 ) nLines = 1; else if( nLines > MAX_DROPCAP_LINES ) @@ -1513,7 +1513,7 @@ void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop, { do { - aName = "first-letter " + OUString::number( (sal_Int32)(++m_nDropCapCnt) ); + aName = "first-letter " + OUString::number( static_cast<sal_Int32>(++m_nDropCapCnt) ); } while( m_pDoc->FindCharFormatByName(aName) ); } @@ -2044,7 +2044,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, switch( rPropInfo.m_eWidthType ) { case SVX_CSS1_LTYPE_PERCENTAGE: - nPrcWidth = rPropInfo.m_nWidth > 0 ? (sal_uInt8)rPropInfo.m_nWidth : 1; + nPrcWidth = rPropInfo.m_nWidth > 0 ? static_cast<sal_uInt8>(rPropInfo.m_nWidth) : 1; nWidth = MINFLY; break; case SVX_CSS1_LTYPE_TWIP: @@ -2057,7 +2057,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, switch( rPropInfo.m_eHeightType ) { case SVX_CSS1_LTYPE_PERCENTAGE: - nPrcHeight = rPropInfo.m_nHeight > 0 ? (sal_uInt8)rPropInfo.m_nHeight : 1; + nPrcHeight = rPropInfo.m_nHeight > 0 ? static_cast<sal_uInt8>(rPropInfo.m_nHeight) : 1; break; case SVX_CSS1_LTYPE_TWIP: // Netscape and MS-IE interpreting the height incorrectly as minimum height, @@ -2186,7 +2186,7 @@ void SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft, const SwHTMLNumRuleInfo& rInfo = const_cast<SwHTMLParser*>(this)->GetNumInfo(); if( rInfo.GetDepth() ) { - sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() + sal_uInt8 nLevel = static_cast<sal_uInt8>( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() : MAXLEVEL) - 1 ); const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get(nLevel); nLeft = nLeft + rNumFormat.GetAbsLSpace(); @@ -2241,7 +2241,7 @@ void SwHTMLParser::EndContextAttrs( HTMLAttrContext *pContext ) pAttr->Invalidate(); else if( nChars > MAX_DROPCAP_CHARS ) nChars = MAX_DROPCAP_CHARS; - static_cast<SwFormatDrop&>(pAttr->GetItem()).GetChars() = (sal_uInt8)nChars; + static_cast<SwFormatDrop&>(pAttr->GetItem()).GetChars() = static_cast<sal_uInt8>(nChars); } EndAttr( pAttr ); diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 457475246838..f6d64cdf2646 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -94,8 +94,8 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, aTwipSpc = Application::GetDefaultDevice()->PixelToLogic( aTwipSpc, MapMode(MapUnit::MapTwip) ); - nLeftSpace = nRightSpace = (sal_uInt16)aTwipSpc.Width(); - nUpperSpace = nLowerSpace = (sal_uInt16)aTwipSpc.Height(); + nLeftSpace = nRightSpace = static_cast<sal_uInt16>(aTwipSpc.Width()); + nUpperSpace = nLowerSpace = static_cast<sal_uInt16>(aTwipSpc.Height()); } // set left/right border @@ -308,11 +308,11 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) break; case HtmlOptionId::SCROLLAMOUNT: - nAmount = -((sal_Int16)rOption.GetNumber()); + nAmount = - static_cast<sal_Int16>(rOption.GetNumber()); break; case HtmlOptionId::SCROLLDELAY: - nDelay = (sal_uInt16)rOption.GetNumber(); + nDelay = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: @@ -525,7 +525,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) // The global pTable also can't be used, because the marquee can also be // in a sub-table. if( pCurTable && bPrcWidth) - RegisterDrawObjectToTable( pCurTable, m_pMarquee, (sal_uInt8)nWidth ); + RegisterDrawObjectToTable( pCurTable, m_pMarquee, static_cast<sal_uInt8>(nWidth) ); } void SwHTMLParser::EndMarquee() diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 1a709be3fb7a..0ee651f50568 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -308,7 +308,7 @@ void SwHTMLParser::NewField() pFormatOption->GetEnum( nFormat, aHTMLAuthorFieldFormatTable ); if( bFixed ) { - nFormat = (SwAuthorFormat)((int)nFormat | AF_FIXED); + nFormat = (SwAuthorFormat)(static_cast<int>(nFormat) | AF_FIXED); bInsOnEndTag = true; } @@ -338,7 +338,7 @@ void SwHTMLParser::NewField() nSub = TIMEFLD; pFormatTable = aHTMLTimeFieldFormatTable; if( !aValue.isEmpty() ) - nTime = (sal_uLong)aValue.toInt32(); + nTime = static_cast<sal_uLong>(aValue.toInt32()); } if( !aValue.isEmpty() ) nSub |= FIXEDFLD; @@ -413,7 +413,7 @@ void SwHTMLParser::NewField() short nOff = 0; if( nFormat!=SVX_NUM_CHAR_SPECIAL && !aValue.isEmpty() ) - nOff = (short)aValue.toInt32(); + nOff = static_cast<short>(aValue.toInt32()); else if( nSub == PG_NEXT ) nOff = 1; else if( nSub == PG_PREV ) @@ -437,8 +437,8 @@ void SwHTMLParser::NewField() if( pSubOption->GetEnum( nSub, aHTMLDocInfoFieldSubTable ) ) { sal_uInt16 nExtSub = 0; - if( DI_CREATE==(SwDocInfoSubType)nSub || - DI_CHANGE==(SwDocInfoSubType)nSub ) + if( DI_CREATE==static_cast<SwDocInfoSubType>(nSub) || + DI_CHANGE==static_cast<SwDocInfoSubType>(nSub) ) { nExtSub = DI_SUB_AUTHOR; if( pFormatOption ) @@ -502,7 +502,7 @@ void SwHTMLParser::NewField() pFormatOption->GetEnum( nFormat, aHTMLFileNameFieldFormatTable ); if( bFixed ) { - nFormat = (SwFileNameFormat)((int)nFormat | FF_FIXED); + nFormat = (SwFileNameFormat)(static_cast<int>(nFormat) | FF_FIXED); bInsOnEndTag = true; } diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 10839a86f691..5d1d22114fb7 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -148,7 +148,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, else { const OUString& rValue = pField->GetPar2(); - short nValue = (short)rValue.toInt32(); + short nValue = static_cast<short>(rValue.toInt32()); if( (eSubType == PG_NEXT && nValue!=1) || (eSubType == PG_PREV && nValue!=-1) || (eSubType == PG_RANDOM && nValue!=0) ) diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 1760b97bf4f4..68d3046e1eef 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -617,7 +617,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, aTwipSpc.Height() = ( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() + static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2; - m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); + m_nDfltTopMargin = m_nDfltBottomMargin = static_cast<sal_uInt16>(aTwipSpc.Height()); } if( (nFrameOpts & HtmlFrmOpts::Space) && @@ -884,7 +884,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma aTwipSpc.Height() = ( static_cast<const SvxULSpaceItem*>(pItem)->GetUpper() + static_cast<const SvxULSpaceItem*>(pItem)->GetLower() ) / 2; - m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height(); + m_nDfltTopMargin = m_nDfltBottomMargin = static_cast<sal_uInt16>(aTwipSpc.Height()); } if( (nFrameOptions & HtmlFrmOpts::Space) && @@ -1346,7 +1346,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat, aPixelBorder.Height() = 0; nBorderWidth = - (sal_uInt16)(aPixelBorder.Width() + aPixelBorder.Height()); + static_cast<sal_uInt16>(aPixelBorder.Width() + aPixelBorder.Height()); } if( pColBorderLine ) @@ -1573,9 +1573,9 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt, { if( nGutter && Application::GetDefaultDevice() ) { - nGutter = (sal_uInt16)Application::GetDefaultDevice() + nGutter = static_cast<sal_uInt16>(Application::GetDefaultDevice() ->LogicToPixel( Size(nGutter,0), - MapMode(MapUnit::MapTwip) ).Width(); + MapMode(MapUnit::MapTwip) ).Width()); } sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_gutter). append("=\"").append(static_cast<sal_Int32>(nGutter)).append("\""); @@ -1879,8 +1879,8 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat, nSize > HTML_PARSPACE && Application::GetDefaultDevice() ) { nSize -= HTML_PARSPACE; - nSize = (sal_Int16)Application::GetDefaultDevice() - ->LogicToPixel( Size(nSize,0), MapMode(MapUnit::MapTwip) ).Width(); + nSize = static_cast<sal_Int16>(Application::GetDefaultDevice() + ->LogicToPixel( Size(nSize,0), MapMode(MapUnit::MapTwip) ).Width()); aSpacer = OStringBuffer(OOO_STRING_SVTOOLS_HTML_spacer). append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type). diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 1c762f262086..71d461ba7bff 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -601,14 +601,14 @@ static void lcl_html_setFixedFontProperty( rPropSet->setPropertyValue("FontStyleName", aTmp ); - aTmp <<= (sal_Int16) aFixedFont.GetFamilyType(); + aTmp <<= static_cast<sal_Int16>(aFixedFont.GetFamilyType()); rPropSet->setPropertyValue("FontFamily", aTmp ); - aTmp <<= (sal_Int16) aFixedFont.GetCharSet(); + aTmp <<= static_cast<sal_Int16>(aFixedFont.GetCharSet()); rPropSet->setPropertyValue("FontCharset", aTmp ); - aTmp <<= (sal_Int16) aFixedFont.GetPitch(); + aTmp <<= static_cast<sal_Int16>(aFixedFont.GetPitch()); rPropSet->setPropertyValue("FontPitch", aTmp ); aTmp <<= float(10.0); @@ -968,8 +968,8 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int32)static_cast<const SvxColorItem *>(pItem)->GetValue() - .GetRGBColor(); + aTmp <<= static_cast<sal_Int32>(static_cast<const SvxColorItem *>(pItem)->GetValue() + .GetRGBColor()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1003,19 +1003,19 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sPropName = "FontFamily"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)pFontItem->GetFamily() ; + aTmp <<= static_cast<sal_Int16>(pFontItem->GetFamily()) ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } sPropName = "FontCharset"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)pFontItem->GetCharSet() ; + aTmp <<= static_cast<sal_Int16>(pFontItem->GetCharSet()) ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } sPropName = "FontPitch"; if( xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)pFontItem->GetPitch() ; + aTmp <<= static_cast<sal_Int16>(pFontItem->GetPitch()) ; rFCompPropSet->setPropertyValue( sPropName, aTmp ); } } @@ -1036,7 +1036,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)static_cast<const SvxPostureItem *>(pItem)->GetPosture(); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxPostureItem *>(pItem)->GetPosture()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1045,7 +1045,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)static_cast<const SvxUnderlineItem *>(pItem)->GetLineStyle(); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxUnderlineItem *>(pItem)->GetLineStyle()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1054,7 +1054,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( true, &pItem ) && xPropSetInfo->hasPropertyByName( sPropName ) ) { - aTmp <<= (sal_Int16)static_cast<const SvxCrossedOutItem *>(pItem)->GetStrikeout(); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxCrossedOutItem *>(pItem)->GetStrikeout()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1145,7 +1145,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( if( text::TextContentAnchorType_AT_PAGE == nAnchorType ) { - aTmp <<= (sal_Int16) 1 ; + aTmp <<= sal_Int16(1) ; xShapePropSet->setPropertyValue("AnchorPageNo", aTmp ); } else @@ -1162,12 +1162,12 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( if( bSetPos ) { - aTmp <<= (sal_Int16)text::HoriOrientation::NONE; + aTmp <<= sal_Int16(text::HoriOrientation::NONE); xShapePropSet->setPropertyValue("HoriOrient", aTmp ); aTmp <<= nXPos ; xShapePropSet->setPropertyValue("HoriOrientPosition", aTmp ); - aTmp <<= (sal_Int16)text::VertOrientation::NONE; + aTmp <<= sal_Int16(text::VertOrientation::NONE); xShapePropSet->setPropertyValue("VertOrient", aTmp ); aTmp <<= nYPos ; xShapePropSet->setPropertyValue("VertOrientPosition", aTmp ); @@ -1441,10 +1441,10 @@ void SwHTMLParser::InsertInput() bDisabled = true; break; case HtmlOptionId::MAXLENGTH: - nMaxLen = (sal_Int16)rOption.GetNumber(); + nMaxLen = static_cast<sal_Int16>(rOption.GetNumber()); break; case HtmlOptionId::SIZE: - nSize = (sal_uInt16)rOption.GetNumber(); + nSize = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::SRC: sImgSrc = rOption.GetString(); @@ -1618,7 +1618,7 @@ void SwHTMLParser::InsertInput() { if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { - aTmp <<= (sal_Int16)nTabIndex ; + aTmp <<= static_cast<sal_Int16>(nTabIndex) ; xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -1680,7 +1680,7 @@ void SwHTMLParser::InsertInput() aTmp <<= FormButtonType_SUBMIT; xPropSet->setPropertyValue("ButtonType", aTmp ); - aTmp <<= (sal_Int16) 0 ; + aTmp <<= sal_Int16(0) ; xPropSet->setPropertyValue("Border", aTmp ); } @@ -1737,7 +1737,7 @@ void SwHTMLParser::InsertInput() if( HTMLInputType::Password == eType ) { - aTmp <<= (sal_Int16)'*' ; + aTmp <<= sal_Int16('*') ; xPropSet->setPropertyValue("EchoChar", aTmp ); } @@ -1903,10 +1903,10 @@ void SwHTMLParser::NewTextArea() bDisabled = true; break; case HtmlOptionId::ROWS: - nRows = (sal_uInt16)rOption.GetNumber(); + nRows = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::COLS: - nCols = (sal_uInt16)rOption.GetNumber(); + nCols = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WRAP: nWrap = rOption.GetEnum( aHTMLTextAreaWrapTable, nWrap ); @@ -2010,7 +2010,7 @@ void SwHTMLParser::NewTextArea() if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { - aTmp <<= (sal_Int16)nTabIndex ; + aTmp <<= static_cast<sal_Int16>(nTabIndex) ; xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -2184,7 +2184,7 @@ void SwHTMLParser::NewSelect() bDisabled = true; break; case HtmlOptionId::SIZE: - m_nSelectEntryCnt = (sal_uInt16)rOption.GetNumber(); + m_nSelectEntryCnt = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::TABINDEX: @@ -2269,7 +2269,7 @@ void SwHTMLParser::NewSelect() if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX ) { - aTmp <<= (sal_Int16)nTabIndex ; + aTmp <<= static_cast<sal_Int16>(nTabIndex) ; xPropSet->setPropertyValue("TabIndex", aTmp ); } @@ -2359,8 +2359,8 @@ void SwHTMLParser::EndSelect() size_t nEntryCnt = m_pFormImpl->GetStringList().size(); if(!m_pFormImpl->GetStringList().empty()) { - Sequence<OUString> aList( (sal_Int32)nEntryCnt ); - Sequence<OUString> aValueList( (sal_Int32)nEntryCnt ); + Sequence<OUString> aList( static_cast<sal_Int32>(nEntryCnt) ); + Sequence<OUString> aValueList( static_cast<sal_Int32>(nEntryCnt) ); OUString *pStrings = aList.getArray(); OUString *pValues = aValueList.getArray(); @@ -2387,11 +2387,11 @@ void SwHTMLParser::EndSelect() m_pFormImpl->GetSelectedList().insert( m_pFormImpl->GetSelectedList().begin(), 0 ); nSelCnt = 1; } - Sequence<sal_Int16> aSelList( (sal_Int32)nSelCnt ); + Sequence<sal_Int16> aSelList( static_cast<sal_Int32>(nSelCnt) ); sal_Int16 *pSels = aSelList.getArray(); for(size_t i = 0; i < nSelCnt; ++i) { - pSels[i] = (sal_Int16)m_pFormImpl->GetSelectedList()[i]; + pSels[i] = static_cast<sal_Int16>(m_pFormImpl->GetSelectedList()[i]); } rPropSet->setPropertyValue("DefaultSelection", Any(aSelList) ); diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 749b01dcf142..b45adf42588f 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -94,7 +94,7 @@ sal_Int32 lcl_html_getEndNoteInfo( SwEndNoteInfo& rInfo, break; case 1: - rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : (sal_uInt16)aPart.toInt32(); + rInfo.nFootnoteOffset = aPart.isEmpty() ? 0 : static_cast<sal_uInt16>(aPart.toInt32()); break; case 2: @@ -263,13 +263,13 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) OSL_ENSURE( nPos == static_cast<size_t>(rHTMLWrt.m_nFootNote + rHTMLWrt.m_nEndNote), "OutHTML_SwFormatFootnote: wrong position" ); sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_anc; - sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( (sal_Int32)(++rHTMLWrt.m_nEndNote) ); + sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number( static_cast<sal_Int32>(++rHTMLWrt.m_nEndNote) ); } else { nPos = rHTMLWrt.m_nFootNote; sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_anc; - sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( (sal_Int32)(++rHTMLWrt.m_nFootNote)); + sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number( static_cast<sal_Int32>(++rHTMLWrt.m_nFootNote)); } if( !rHTMLWrt.m_pFootEndNotes ) @@ -325,13 +325,13 @@ void SwHTMLWriter::OutFootEndNotes() { sClass = OOO_STRING_SVTOOLS_HTML_sdendnote; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote; - sFootnoteName += OUString::number((sal_Int32)(++m_nEndNote)); + sFootnoteName += OUString::number(static_cast<sal_Int32>(++m_nEndNote)); } else { sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote; - sFootnoteName += OUString::number((sal_Int32)(++m_nFootNote)); + sFootnoteName += OUString::number(static_cast<sal_Int32>(++m_nFootNote)); } if( m_bLFPossible ) @@ -416,14 +416,14 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote, { sClass = OOO_STRING_SVTOOLS_HTML_sdendnote_sym; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote; - sFootnoteName += OUString::number((sal_Int32)m_nEndNote); + sFootnoteName += OUString::number(static_cast<sal_Int32>(m_nEndNote)); pInfo = &pDoc->GetEndNoteInfo(); } else { sClass = OOO_STRING_SVTOOLS_HTML_sdfootnote_sym; sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote; - sFootnoteName += OUString::number((sal_Int32)m_nFootNote); + sFootnoteName += OUString::number(static_cast<sal_Int32>(m_nFootNote)); pInfo = &pDoc->GetFootnoteInfo(); } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4f163ec49cf8..d9466e690128 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -376,7 +376,7 @@ void SwHTMLParser::InsertImage() sAltNm = rOption.GetString(); break; case HtmlOptionId::BORDER: - nBorder = (sal_uInt16)rOption.GetNumber(); + nBorder = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ISMAP: bIsMap = true; @@ -502,8 +502,8 @@ IMAGE_SETEVENT: long nHBorderWidth = 0, nVBorderWidth = 0; if( nBorder ) { - nHBorderWidth = (long)nBorder; - nVBorderWidth = (long)nBorder; + nHBorderWidth = static_cast<long>(nBorder); + nVBorderWidth = static_cast<long>(nBorder); SvxCSS1Parser::PixelToTwip( nVBorderWidth, nHBorderWidth ); ::editeng::SvxBorderLine aHBorderLine( nullptr, nHBorderWidth ); @@ -615,7 +615,7 @@ IMAGE_SETEVENT: // a percentage value if( bPrcWidth ) { - nPrcWidth = (sal_uInt8)nWidth; + nPrcWidth = static_cast<sal_uInt8>(nWidth); nPrcHeight = 255; } else @@ -627,7 +627,7 @@ IMAGE_SETEVENT: { if( bPrcHeight ) { - nPrcHeight = (sal_uInt8)nHeight; + nPrcHeight = static_cast<sal_uInt8>(nHeight); nPrcWidth = 255; } else @@ -642,10 +642,10 @@ IMAGE_SETEVENT: bSetTwipSize = false; if( bPrcWidth ) - nPrcWidth = (sal_uInt8)nWidth; + nPrcWidth = static_cast<sal_uInt8>(nWidth); if( bPrcHeight ) - nPrcHeight = (sal_uInt8)nHeight; + nPrcHeight = static_cast<sal_uInt8>(nHeight); } // set image map diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx index 2f310206174f..66cd293fca1e 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -110,7 +110,7 @@ inline void SwHTMLNumRuleInfo::Clear() inline sal_uInt8 SwHTMLNumRuleInfo::GetLevel() const { return - (sal_uInt8)( pNumRule!=nullptr && nDeep != 0 + static_cast<sal_uInt8>( pNumRule!=nullptr && nDeep != 0 ? ( nDeep<=MAXLEVEL ? nDeep-1 : MAXLEVEL - 1 ) : 0 ); } diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 4904426730ff..27045823103b 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -65,7 +65,7 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) // Increment the numbering depth rInfo.IncDepth(); - sal_uInt8 nLevel = (sal_uInt8)( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() + sal_uInt8 nLevel = static_cast<sal_uInt8>( (rInfo.GetDepth() <= MAXLEVEL ? rInfo.GetDepth() : MAXLEVEL) - 1 ); // Create rules if needed @@ -167,7 +167,7 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) break; case HtmlOptionId::START: { - sal_uInt16 nStart = (sal_uInt16)rOption.GetNumber(); + sal_uInt16 nStart = static_cast<sal_uInt16>(rOption.GetNumber()); if( bNewNumFormat ) { aNumFormat.SetStart( nStart ); @@ -200,10 +200,10 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) } break; case HtmlOptionId::WIDTH: - nWidth = (sal_uInt16)rOption.GetNumber(); + nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: - nHeight = (sal_uInt16)rOption.GetNumber(); + nHeight = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: eVertOri = rOption.GetEnum( aHTMLImgVAlignTable, eVertOri ); @@ -271,11 +271,11 @@ void SwHTMLParser::NewNumBulList( HtmlTokenId nToken ) nAbsLSpace < -aPropInfo.m_nLeftMargin ) nAbsLSpace = 0U; else if( aPropInfo.m_nLeftMargin > USHRT_MAX || - (long)nAbsLSpace + + static_cast<long>(nAbsLSpace) + aPropInfo.m_nLeftMargin > USHRT_MAX ) nAbsLSpace = USHRT_MAX; else - nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.m_nLeftMargin; + nAbsLSpace = nAbsLSpace + static_cast<sal_uInt16>(aPropInfo.m_nLeftMargin); aNumFormat.SetAbsLSpace( nAbsLSpace ); bChangeNumFormat = true; @@ -444,7 +444,7 @@ void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken ) switch( rOption.GetToken() ) { case HtmlOptionId::VALUE: - nStart = (sal_uInt16)rOption.GetNumber(); + nStart = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ID: aId = rOption.GetString(); diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index f363e40f49e3..e230f40f4c2e 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -270,7 +270,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, rWrt.Strm().WriteOString( sOut ); if( rWrt.m_bCfgOutStyles ) - OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), (sal_uInt8)i ); + OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), static_cast<sal_uInt8>(i) ); rWrt.Strm().WriteChar( '>' ); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 069aeea16efb..a0862890543b 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -137,7 +137,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, // process width if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.m_eWidthType ) { - nPrcWidth = (sal_uInt8)rCSS1PropInfo.m_nWidth; + nPrcWidth = static_cast<sal_uInt8>(rCSS1PropInfo.m_nWidth); aTwipSz.Width() = rTwipDfltSize.Width(); } else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.m_eWidthType ) @@ -146,7 +146,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } else if( bPrcWidth && rPixSize.Width() ) { - nPrcWidth = (sal_uInt8)rPixSize.Width(); + nPrcWidth = static_cast<sal_uInt8>(rPixSize.Width()); if( nPrcWidth > 100 ) nPrcWidth = 100; @@ -164,7 +164,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, // process height if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.m_eHeightType ) { - nPrcHeight = (sal_uInt8)rCSS1PropInfo.m_nHeight; + nPrcHeight = static_cast<sal_uInt8>(rCSS1PropInfo.m_nHeight); aTwipSz.Height() = rTwipDfltSize.Height(); } else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.m_eHeightType ) @@ -173,7 +173,7 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize, } else if( bPrcHeight && rPixSize.Height() ) { - nPrcHeight = (sal_uInt8)rPixSize.Height(); + nPrcHeight = static_cast<sal_uInt8>(rPixSize.Height()); if( nPrcHeight > 100 ) nPrcHeight = 100; @@ -209,7 +209,7 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace, Application::GetDefaultDevice()->PixelToLogic( aTwipSpc, MapMode(MapUnit::MapTwip) ); nLeftSpace = nRightSpace = aTwipSpc.Width(); - nUpperSpace = nLowerSpace = (sal_uInt16)aTwipSpc.Height(); + nUpperSpace = nLowerSpace = static_cast<sal_uInt16>(aTwipSpc.Height()); } // set left/right margin @@ -339,23 +339,23 @@ void SwHTMLParser::InsertEmbed() if( USHRT_MAX==aSize.Width() ) { bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); } break; case HtmlOptionId::HEIGHT: if( USHRT_MAX==aSize.Height() ) { bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); } break; case HtmlOptionId::HSPACE: if( USHRT_MAX==aSpace.Width() ) - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: if( USHRT_MAX==aSpace.Height() ) - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::UNKNOWN: if (rOption.GetTokenString().equalsIgnoreAsciiCase( @@ -530,11 +530,11 @@ void SwHTMLParser::NewObject() break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: eVertOri = rOption.GetEnum( aHTMLImgVAlignTable, eVertOri ); @@ -546,10 +546,10 @@ void SwHTMLParser::NewObject() aName = rOption.GetString(); break; case HtmlOptionId::HSPACE: - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::BORDER: break; @@ -694,17 +694,17 @@ void SwHTMLParser::InsertApplet() break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HSPACE: - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::MAYSCRIPT: bMayScript = true; @@ -845,17 +845,17 @@ void SwHTMLParser::InsertFloatingFrame() break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HSPACE: - aSpace.Width() = (long)rOption.GetNumber(); + aSpace.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - aSpace.Height() = (long)rOption.GetNumber(); + aSpace.Height() = static_cast<long>(rOption.GetNumber()); break; default: break; } diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 9a23aebaa8f9..1f838edd054c 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -567,7 +567,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) aDir = rOption.GetString(); break; case HtmlOptionId::COLS: - nCols = (sal_uInt16)rOption.GetNumber(); + nCols = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: nWidth = rOption.GetNumber(); @@ -576,7 +576,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) nWidth = 100; break; case HtmlOptionId::GUTTER: - nGutter = (sal_uInt16)rOption.GetNumber(); + nGutter = static_cast<sal_uInt16>(rOption.GetNumber()); break; default: break; } @@ -600,7 +600,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) aItemSet, aPropInfo, &aLang, &aDir ); // Calculate width. - sal_uInt8 nPrcWidth = bPrcWidth ? (sal_uInt8)nWidth : 0; + sal_uInt8 nPrcWidth = bPrcWidth ? static_cast<sal_uInt8>(nWidth) : 0; SwTwips nTwipWidth = 0; if( !bPrcWidth && nWidth && Application::GetDefaultDevice() ) { @@ -695,9 +695,9 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) if( nGutter && Application::GetDefaultDevice() ) { - nGutter = (sal_uInt16)Application::GetDefaultDevice() + nGutter = static_cast<sal_uInt16>(Application::GetDefaultDevice() ->PixelToLogic( Size(nGutter, 0), - MapMode(MapUnit::MapTwip) ).Width(); + MapMode(MapUnit::MapTwip) ).Width()); } SwFormatCol aFormatCol; diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 74a2c0951c98..0c8c72659f3e 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -929,7 +929,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) const Color& rBorderColor = pOptions->aBorderColor; - long nBorderOpt = (long)pOptions->nBorder; + long nBorderOpt = static_cast<long>(pOptions->nBorder); long nPWidth = nBorderOpt==USHRT_MAX ? NETSCAPE_DFLT_BORDER : nBorderOpt; long nPHeight = nBorderOpt==USHRT_MAX ? 0 : nBorderOpt; @@ -938,7 +938,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) // nBorder tells the width of the border as it's used in the width calculation of NetScape // If pOption->nBorder == USHRT_MAX, there wasn't a BORDER option given // Nonetheless, a 1 pixel wide border will be used for width calculation - m_nBorder = (sal_uInt16)nPWidth; + m_nBorder = static_cast<sal_uInt16>(nPWidth); if( nBorderOpt==USHRT_MAX ) nPWidth = 0; @@ -997,8 +997,8 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions ) nPWidth = pOptions->nHSpace; nPHeight = pOptions->nVSpace; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - m_nHSpace = (sal_uInt16)nPWidth; - m_nVSpace = (sal_uInt16)nPHeight; + m_nHSpace = static_cast<sal_uInt16>(nPWidth); + m_nVSpace = static_cast<sal_uInt16>(nPHeight); m_bColSpec = false; @@ -1313,11 +1313,11 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, pFrameFormat = pBox->ClaimFrameFormat(); // calculate width of the box - SwTwips nFrameWidth = (SwTwips)m_xLayoutInfo->GetColumn(nCol) - ->GetRelColWidth(); + SwTwips nFrameWidth = static_cast<SwTwips>(m_xLayoutInfo->GetColumn(nCol) + ->GetRelColWidth()); for( sal_uInt16 i=1; i<nColSpan; i++ ) - nFrameWidth += (SwTwips)m_xLayoutInfo->GetColumn(nCol+i) - ->GetRelColWidth(); + nFrameWidth += static_cast<SwTwips>(m_xLayoutInfo->GetColumn(nCol+i) + ->GetRelColWidth()); // Only set the border on edit boxes. // On setting the upper and lower border, keep in mind if @@ -1963,10 +1963,10 @@ void HTMLTable::InsertCell( std::shared_ptr<HTMLTableCnts> const& rCnts, bool bHasNumFormat, sal_uInt32 nNumFormat, bool bHasValue, double nValue, bool bNoWrap ) { - if( !nRowSpan || (sal_uInt32)m_nCurrentRow + nRowSpan > USHRT_MAX ) + if( !nRowSpan || static_cast<sal_uInt32>(m_nCurrentRow) + nRowSpan > USHRT_MAX ) nRowSpan = 1; - if( !nColSpan || (sal_uInt32)m_nCurrentColumn + nColSpan > USHRT_MAX ) + if( !nColSpan || static_cast<sal_uInt32>(m_nCurrentColumn) + nColSpan > USHRT_MAX ) nColSpan = 1; sal_uInt16 nColsReq = m_nCurrentColumn + nColSpan; @@ -2046,7 +2046,7 @@ void HTMLTable::InsertCell( std::shared_ptr<HTMLTableCnts> const& rCnts, // Only set width on the first cell! if( nCellWidth ) { - sal_uInt16 nTmp = bRelWidth ? nCellWidth : (sal_uInt16)aTwipSz.Width(); + sal_uInt16 nTmp = bRelWidth ? nCellWidth : static_cast<sal_uInt16>(aTwipSz.Width()); GetCell( m_nCurrentRow, m_nCurrentColumn ).SetWidth( nTmp, bRelWidth ); } @@ -2180,7 +2180,7 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, bool bRelWidt for( i=m_nCurrentColumn; i<nColsReq; i++ ) { HTMLTableColumn& rCol = m_aColumns[i]; - sal_uInt16 nTmp = bRelWidth ? nColWidth : (sal_uInt16)aTwipSz.Width(); + sal_uInt16 nTmp = bRelWidth ? nColWidth : static_cast<sal_uInt16>(aTwipSz.Width()); rCol.SetWidth( nTmp, bRelWidth ); rCol.SetAdjust( eAdjust ); rCol.SetVertOri( eVertOrient ); @@ -2395,7 +2395,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, { pFrameFormat->LockModify(); SwFormatFrameSize aFrameSize( pFrameFormat->GetFrameSize() ); - aFrameSize.SetWidthPercent( (sal_uInt8)m_nWidth ); + aFrameSize.SetWidthPercent( static_cast<sal_uInt8>(m_nWidth) ); pFrameFormat->SetFormatAttr( aFrameSize ); pFrameFormat->UnlockModify(); } @@ -2528,7 +2528,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt32 nMin = m_xLayoutInfo->GetMin(); if( nMin > USHRT_MAX ) nMin = USHRT_MAX; - SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY ); + SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, static_cast<SwTwips>(nMin), MINLAY ); aFlyFrameSize.SetWidthPercent( 100 ); m_pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize ); bIsInFlyFrame = false; @@ -2544,7 +2544,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt32 nMax = m_xLayoutInfo->GetMax(); if( nMax > USHRT_MAX ) nMax = USHRT_MAX; - SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY ); + SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, static_cast<SwTwips>(nMax), MINLAY ); m_pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize ); bIsInFlyFrame = false; } @@ -2571,7 +2571,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, SdrObject *pObj = (*m_pResizeDrawObjects)[i]; sal_uInt16 nRow = (*m_pDrawObjectPrcWidths)[3*i]; sal_uInt16 nCol = (*m_pDrawObjectPrcWidths)[3*i+1]; - sal_uInt8 nPrcWidth = (sal_uInt8)(*m_pDrawObjectPrcWidths)[3*i+2]; + sal_uInt8 nPrcWidth = static_cast<sal_uInt8>((*m_pDrawObjectPrcWidths)[3*i+2]); SwHTMLTableLayoutCell *pLayoutCell = m_xLayoutInfo->GetCell( nRow, nCol ); @@ -2579,7 +2579,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, sal_uInt16 nWidth2, nDummy; m_xLayoutInfo->GetAvail( nCol, nColSpan, nWidth2, nDummy ); - nWidth2 = static_cast< sal_uInt16 >(((long)m_nWidth * nPrcWidth) / 100); + nWidth2 = static_cast< sal_uInt16 >((static_cast<long>(m_nWidth) * nPrcWidth) / 100); SwHTMLParser::ResizeDrawObject( pObj, nWidth2 ); } @@ -2611,7 +2611,7 @@ void HTMLTable::RegisterDrawObject( SdrObject *pObj, sal_uInt8 nPrcWidth ) m_pDrawObjectPrcWidths = new std::vector<sal_uInt16>; m_pDrawObjectPrcWidths->push_back( m_nCurrentRow ); m_pDrawObjectPrcWidths->push_back( m_nCurrentColumn ); - m_pDrawObjectPrcWidths->push_back( (sal_uInt16)nPrcWidth ); + m_pDrawObjectPrcWidths->push_back( static_cast<sal_uInt16>(nPrcWidth) ); } void HTMLTable::MakeParentContents() @@ -3026,10 +3026,10 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl m_aId = rOption.GetString(); break; case HtmlOptionId::COLSPAN: - m_nColSpan = (sal_uInt16)rOption.GetNumber(); + m_nColSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ROWSPAN: - m_nRowSpan = (sal_uInt16)rOption.GetNumber(); + m_nRowSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: m_eAdjust = rOption.GetEnum( aHTMLPAlignTable, m_eAdjust ); @@ -3038,13 +3038,13 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl m_eVertOri = rOption.GetEnum( aHTMLTableVAlignTable, m_eVertOri ); break; case HtmlOptionId::WIDTH: - m_nWidth = (sal_uInt16)rOption.GetNumber(); // Just for Netscape + m_nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); // Just for Netscape m_bPrcWidth = (rOption.GetString().indexOf('%') != -1); if( m_bPrcWidth && m_nWidth>100 ) m_nWidth = 100; break; case HtmlOptionId::HEIGHT: - m_nHeight = (sal_uInt16)rOption.GetNumber(); // Just for Netscape + m_nHeight = static_cast<sal_uInt16>(rOption.GetNumber()); // Just for Netscape if( rOption.GetString().indexOf('%') != -1) m_nHeight = 0; // don't consider % attributes break; @@ -4427,10 +4427,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, InsertBookmark( rOption.GetString() ); break; case HtmlOptionId::SPAN: - pSaveStruct->nColGrpSpan = (sal_uInt16)rOption.GetNumber(); + pSaveStruct->nColGrpSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: - pSaveStruct->nColGrpWidth = (sal_uInt16)rOption.GetNumber(); + pSaveStruct->nColGrpWidth = static_cast<sal_uInt16>(rOption.GetNumber()); pSaveStruct->bRelColGrpWidth = (rOption.GetString().indexOf('*') != -1); break; @@ -4509,10 +4509,10 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable, InsertBookmark( rOption.GetString() ); break; case HtmlOptionId::SPAN: - nColSpan = (sal_uInt16)rOption.GetNumber(); + nColSpan = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: - nColWidth = (sal_uInt16)rOption.GetNumber(); + nColWidth = static_cast<sal_uInt16>(rOption.GetNumber()); bRelColWidth = (rOption.GetString().indexOf('*') != -1); break; @@ -4866,24 +4866,24 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, aId = rOption.GetString(); break; case HtmlOptionId::COLS: - nCols = (sal_uInt16)rOption.GetNumber(); + nCols = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: - nWidth = (sal_uInt16)rOption.GetNumber(); + nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); bPrcWidth = (rOption.GetString().indexOf('%') != -1); if( bPrcWidth && nWidth>100 ) nWidth = 100; break; case HtmlOptionId::HEIGHT: - nHeight = (sal_uInt16)rOption.GetNumber(); + nHeight = static_cast<sal_uInt16>(rOption.GetNumber()); if( rOption.GetString().indexOf('%') != -1 ) nHeight = 0; // don't use % attributes break; case HtmlOptionId::CELLPADDING: - nCellPadding = (sal_uInt16)rOption.GetNumber(); + nCellPadding = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::CELLSPACING: - nCellSpacing = (sal_uInt16)rOption.GetNumber(); + nCellSpacing = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ALIGN: { @@ -4902,7 +4902,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, !rOption.GetString().equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_border)) { - nBorder = (sal_uInt16)rOption.GetNumber(); + nBorder = static_cast<sal_uInt16>(rOption.GetNumber()); } else nBorder = 1; @@ -4950,10 +4950,10 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions, aDir = rOption.GetString(); break; case HtmlOptionId::HSPACE: - nHSpace = (sal_uInt16)rOption.GetNumber(); + nHSpace = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::VSPACE: - nVSpace = (sal_uInt16)rOption.GetNumber(); + nVSpace = static_cast<sal_uInt16>(rOption.GetNumber()); break; default: break; } @@ -5324,7 +5324,7 @@ std::shared_ptr<HTMLTable> SwHTMLParser::BuildTable(SvxAdjust eParentAdjust, } // Process SwTable - sal_uInt16 nBrowseWidth = (sal_uInt16)GetCurrentBrowseWidth(); + sal_uInt16 nBrowseWidth = static_cast<sal_uInt16>(GetCurrentBrowseWidth()); xSaveStruct->MakeTable(nBrowseWidth, *m_pPam->GetPoint(), m_xDoc.get()); } diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index a603499d688c..e4a745f1ca35 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -113,7 +113,7 @@ void SwHTMLWrtTable::Pixelize( sal_uInt16& rValue ) if( !aSz.Width() ) aSz.Width() = 1; aSz = Application::GetDefaultDevice()->PixelToLogic( aSz, MapMode(MapUnit::MapTwip) ); - rValue = (sal_uInt16)aSz.Width(); + rValue = static_cast<sal_uInt16>(aSz.Width()); } } @@ -905,7 +905,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode, const SwFormatFrameSize& rFrameSize = pFormat->GetFrameSize(); long nWidth = rFrameSize.GetSize().Width(); sal_uInt8 nPrcWidth = rFrameSize.GetWidthPercent(); - sal_uInt16 nBaseWidth = (sal_uInt16)nWidth; + sal_uInt16 nBaseWidth = static_cast<sal_uInt16>(nWidth); sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient(); diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index 13c46fc0b5c1..3afa5f73ad7b 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -39,8 +39,8 @@ #define LOOP_CHECK_RESTART \ nOldInPos = SAL_MAX_INT32; #define LOOP_CHECK_CHECK( where ) \ - OSL_ENSURE( nOldInPos!=nInPos || cNextCh==(sal_Unicode)EOF, where ); \ - if( nOldInPos==nInPos && cNextCh!=(sal_Unicode)EOF ) \ + OSL_ENSURE( nOldInPos!=nInPos || cNextCh==sal_Unicode(EOF), where ); \ + if( nOldInPos==nInPos && cNextCh!=sal_Unicode(EOF) ) \ break; \ else \ nOldInPos = nInPos; @@ -76,7 +76,7 @@ sal_Unicode CSS1Parser::GetNextChar() if( nInPos >= aIn.getLength() ) { bEOF = true; - return (sal_Unicode)EOF; + return sal_Unicode(EOF); } sal_Unicode c = aIn[nInPos]; @@ -570,7 +570,7 @@ CSS1Token CSS1Parser::GetNextToken() bWhiteSpace = true; break; - case (sal_Unicode)EOF: + case sal_Unicode(EOF): if( IsEOF() ) { eState = CSS1_PAR_ACCEPTED; @@ -1352,9 +1352,9 @@ bool CSS1Expression::GetColor( Color &rColor ) const if( bRet && nColor!=SAL_MAX_UINT32 ) { - rColor.SetRed( (sal_uInt8)((nColor & 0x00ff0000UL) >> 16) ); - rColor.SetGreen( (sal_uInt8)((nColor & 0x0000ff00UL) >> 8) ); - rColor.SetBlue( (sal_uInt8)(nColor & 0x000000ffUL) ); + rColor.SetRed( static_cast<sal_uInt8>((nColor & 0x00ff0000UL) >> 16) ); + rColor.SetGreen( static_cast<sal_uInt8>((nColor & 0x0000ff00UL) >> 8) ); + rColor.SetBlue( static_cast<sal_uInt8>(nColor & 0x000000ffUL) ); } return bRet; diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index 30b24ddbeb00..69d1b9c6894f 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -150,12 +150,12 @@ inline void CSS1Expression::Set( CSS1Token eTyp, const OUString &rVal, inline sal_uInt32 CSS1Expression::GetULength() const { - return nValue < 0. ? 0UL : (sal_uInt32)(nValue + .5); + return nValue < 0. ? 0UL : static_cast<sal_uInt32>(nValue + .5); } inline sal_Int32 CSS1Expression::GetSLength() const { - return (sal_Int32)(nValue + (nValue < 0. ? -.5 : .5 )); + return static_cast<sal_Int32>(nValue + (nValue < 0. ? -.5 : .5 )); } /** Parser of a style element/option diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index c8049583e65b..ce3651553e0c 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1020,10 +1020,10 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr, double fHeight = pExpr->GetNumber(); if (fHeight < SAL_MAX_INT32/2.0 && fHeight > SAL_MIN_INT32/2.0) { - long nPHeight = (long)fHeight; + long nPHeight = static_cast<long>(fHeight); long nPWidth = 0; SvxCSS1Parser::PixelToTwip(nPWidth, nPHeight); - nHeight = (sal_uLong)nPHeight; + nHeight = static_cast<sal_uLong>(nPHeight); } else { @@ -1033,7 +1033,7 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr, break; case CSS1_PERCENTAGE: // only for drop caps! - nPropHeight = (sal_uInt16)pExpr->GetNumber(); + nPropHeight = static_cast<sal_uInt16>(pExpr->GetNumber()); break; case CSS1_IDENT: { @@ -1180,7 +1180,7 @@ static void ParseCSS1_font_weight( const CSS1Expression *pExpr, break; case CSS1_NUMBER: { - sal_uInt16 nWeight = (sal_uInt16)pExpr->GetNumber(); + sal_uInt16 nWeight = static_cast<sal_uInt16>(pExpr->GetNumber()); SvxWeightItem aWeight( nWeight>400 ? WEIGHT_BOLD : WEIGHT_NORMAL, aItemIds.nWeight ); if( rParser.IsSetWesternProps() ) @@ -1485,7 +1485,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, // only distinguish between 0 and !0. Therefore pixel // can be handled like all other units. - sal_uLong nLength = (sal_uLong)pExpr->GetNumber(); + sal_uLong nLength = static_cast<sal_uLong>(pExpr->GetNumber()); if( !bHori ) { ePos = nLength ? GPOS_MM : GPOS_LT; @@ -1503,7 +1503,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, { // the percentage is converted to an enum - sal_uInt16 nPerc = (sal_uInt16)pExpr->GetNumber(); + sal_uInt16 nPerc = static_cast<sal_uInt16>(pExpr->GetNumber()); if( !bHori ) { ePos = nPerc < 25 ? GPOS_LT @@ -1649,30 +1649,30 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_LENGTH: - nHeight = (sal_uInt16)pExpr->GetULength(); + nHeight = static_cast<sal_uInt16>(pExpr->GetULength()); break; case CSS1_PIXLENGTH: { double fHeight = pExpr->GetNumber(); if (fHeight < SAL_MAX_INT32/2.0 && fHeight > SAL_MIN_INT32/2.0) { - long nPHeight = (long)fHeight; + long nPHeight = static_cast<long>(fHeight); long nPWidth = 0; SvxCSS1Parser::PixelToTwip(nPWidth, nPHeight); - nHeight = (sal_uInt16)nPHeight; + nHeight = static_cast<sal_uInt16>(nPHeight); } } break; case CSS1_PERCENTAGE: { - sal_uInt16 nPHeight = (sal_uInt16)pExpr->GetNumber(); - nPropHeight = nPHeight <= 200 ? (sal_uInt8)nPHeight : 200; + sal_uInt16 nPHeight = static_cast<sal_uInt16>(pExpr->GetNumber()); + nPropHeight = nPHeight <= 200 ? static_cast<sal_uInt8>(nPHeight) : 200; } break; case CSS1_NUMBER: { - sal_uInt16 nPHeight = (sal_uInt16)(pExpr->GetNumber() * 100); - nPropHeight = nPHeight <= 200 ? (sal_uInt8)nPHeight : 200; + sal_uInt16 nPHeight = static_cast<sal_uInt16>(pExpr->GetNumber() * 100); + nPropHeight = nPHeight <= 200 ? static_cast<sal_uInt8>(nPHeight) : 200; } break; default: @@ -1768,7 +1768,7 @@ static void ParseCSS1_font( const CSS1Expression *pExpr, } else { - eWeight = (sal_uInt16)pExpr->GetNumber() > 400 ? WEIGHT_BOLD + eWeight = static_cast<sal_uInt16>(pExpr->GetNumber()) > 400 ? WEIGHT_BOLD : WEIGHT_NORMAL; } @@ -1846,16 +1846,16 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_LENGTH: - rItemSet.Put( SvxKerningItem( (short)pExpr->GetSLength(), + rItemSet.Put( SvxKerningItem( static_cast<short>(pExpr->GetSLength()), aItemIds.nKerning ) ); break; case CSS1_PIXLENGTH: { - long nPWidth = (long)pExpr->GetNumber(); + long nPWidth = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - rItemSet.Put( SvxKerningItem( (short)nPWidth, aItemIds.nKerning ) ); + rItemSet.Put( SvxKerningItem( static_cast<short>(nPWidth), aItemIds.nKerning ) ); } break; @@ -1863,7 +1863,7 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, if( pExpr->GetNumber() == 0 ) { // normally unnecessary, but we are tolerant - rItemSet.Put( SvxKerningItem( (short)0, aItemIds.nKerning ) ); + rItemSet.Put( SvxKerningItem( short(0), aItemIds.nKerning ) ); } break; @@ -1871,7 +1871,7 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr, case CSS1_STRING: // As a precaution also MS-IE if( pExpr->GetString().equalsIgnoreAsciiCase( "normal" ) ) { - rItemSet.Put( SvxKerningItem( (short)0, aItemIds.nKerning ) ); + rItemSet.Put( SvxKerningItem( short(0), aItemIds.nKerning ) ); } break; default: @@ -2018,7 +2018,7 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr, switch( pExpr->GetType() ) { case CSS1_LENGTH: - nIndent = (short)pExpr->GetSLength(); + nIndent = static_cast<short>(pExpr->GetSLength()); bSet = true; break; case CSS1_PIXLENGTH: @@ -2026,10 +2026,10 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr, double fWidth = pExpr->GetNumber(); if (fWidth < SAL_MAX_INT32/2.0 && fWidth > SAL_MIN_INT32/2.0) { - long nPWidth = (long)fWidth; + long nPWidth = static_cast<long>(fWidth); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nIndent = (short)nPWidth; + nIndent = static_cast<short>(nPWidth); bSet = true; } } @@ -2080,7 +2080,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr, break; case CSS1_PIXLENGTH: { - nLeft = (long)pExpr->GetNumber(); + nLeft = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nLeft, nPHeight ); bSet = true; @@ -2103,13 +2103,13 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr, &pItem ) ) { SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) ); - aLRItem.SetTextLeft( (sal_uInt16)nLeft ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nLeft) ); rItemSet.Put( aLRItem ); } else { SvxLRSpaceItem aLRItem( aItemIds.nLRSpace ); - aLRItem.SetTextLeft( (sal_uInt16)nLeft ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nLeft) ); rItemSet.Put( aLRItem ); } rPropInfo.m_bLeftMargin = true; @@ -2135,7 +2135,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr, break; case CSS1_PIXLENGTH: { - nRight = (long)pExpr->GetNumber(); + nRight = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; SvxCSS1Parser::PixelToTwip( nRight, nPHeight ); bSet = true; @@ -2158,13 +2158,13 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr, &pItem ) ) { SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) ); - aLRItem.SetRight( (sal_uInt16)nRight ); + aLRItem.SetRight( static_cast<sal_uInt16>(nRight) ); rItemSet.Put( aLRItem ); } else { SvxLRSpaceItem aLRItem( aItemIds.nLRSpace ); - aLRItem.SetRight( (sal_uInt16)nRight ); + aLRItem.SetRight( static_cast<sal_uInt16>(nRight) ); rItemSet.Put( aLRItem ); } rPropInfo.m_bRightMargin = true; @@ -2187,18 +2187,18 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr, long nTmp = pExpr->GetSLength(); if( nTmp < 0 ) nTmp = 0; - nUpper = (sal_uInt16)nTmp; + nUpper = static_cast<sal_uInt16>(nTmp); bSet = true; } break; case CSS1_PIXLENGTH: { long nPWidth = 0; - long nPHeight = (long)pExpr->GetNumber(); + long nPHeight = static_cast<long>(pExpr->GetNumber()); if( nPHeight < 0 ) nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nUpper = (sal_uInt16)nPHeight; + nUpper = static_cast<sal_uInt16>(nPHeight); bSet = true; } break; @@ -2245,18 +2245,18 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr, long nTmp = pExpr->GetSLength(); if( nTmp < 0 ) nTmp = 0; - nLower = (sal_uInt16)nTmp; + nLower = static_cast<sal_uInt16>(nTmp); bSet = true; } break; case CSS1_PIXLENGTH: { long nPWidth = 0; - long nPHeight = (long)pExpr->GetNumber(); + long nPHeight = static_cast<long>(pExpr->GetNumber()); if( nPHeight < 0 ) nPHeight = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nLower = (sal_uInt16)nPHeight; + nLower = static_cast<sal_uInt16>(nPHeight); bSet = true; } break; @@ -2315,7 +2315,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, double fMargin = pExpr->GetNumber(); if (fMargin < SAL_MAX_INT32/2.0 && fMargin > SAL_MIN_INT32/2.0) { - nMargin = (long)fMargin; + nMargin = static_cast<long>(fMargin); long nPWidth = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nMargin ); bSetThis = true; @@ -2386,18 +2386,18 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, { SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem*>(pItem) ); if( bSetMargins[3] ) - aLRItem.SetLeft( (sal_uInt16)nMargins[3] ); + aLRItem.SetLeft( static_cast<sal_uInt16>(nMargins[3]) ); if( bSetMargins[1] ) - aLRItem.SetRight( (sal_uInt16)nMargins[1] ); + aLRItem.SetRight( static_cast<sal_uInt16>(nMargins[1]) ); rItemSet.Put( aLRItem ); } else { SvxLRSpaceItem aLRItem( aItemIds.nLRSpace ); if( bSetMargins[3] ) - aLRItem.SetLeft( (sal_uInt16)nMargins[3] ); + aLRItem.SetLeft( static_cast<sal_uInt16>(nMargins[3]) ); if( bSetMargins[1] ) - aLRItem.SetRight( (sal_uInt16)nMargins[1] ); + aLRItem.SetRight( static_cast<sal_uInt16>(nMargins[1]) ); rItemSet.Put( aLRItem ); } } @@ -2415,18 +2415,18 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr, { SvxULSpaceItem aULItem( *static_cast<const SvxULSpaceItem*>(pItem) ); if( bSetMargins[0] ) - aULItem.SetUpper( (sal_uInt16)nMargins[0] ); + aULItem.SetUpper( static_cast<sal_uInt16>(nMargins[0]) ); if( bSetMargins[2] ) - aULItem.SetLower( (sal_uInt16)nMargins[2] ); + aULItem.SetLower( static_cast<sal_uInt16>(nMargins[2]) ); rItemSet.Put( aULItem ); } else { SvxULSpaceItem aULItem( aItemIds.nULSpace ); if( bSetMargins[0] ) - aULItem.SetUpper( (sal_uInt16)nMargins[0] ); + aULItem.SetUpper( static_cast<sal_uInt16>(nMargins[0]) ); if( bSetMargins[2] ) - aULItem.SetLower( (sal_uInt16)nMargins[2] ); + aULItem.SetLower( static_cast<sal_uInt16>(nMargins[2]) ); rItemSet.Put( aULItem ); } @@ -2453,20 +2453,20 @@ static bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr, nTmp = 0; else if( nTmp > USHRT_MAX-1 ) nTmp = USHRT_MAX-1; - nDist = (sal_uInt16)nTmp; + nDist = static_cast<sal_uInt16>(nTmp); bSet = true; } break; case CSS1_PIXLENGTH: { - long nPWidth = (long)pExpr->GetNumber(); + long nPWidth = static_cast<long>(pExpr->GetNumber()); long nPHeight = 0; if( nPWidth < 0 ) nPWidth = 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); if( nPWidth > USHRT_MAX-1 ) nPWidth = USHRT_MAX-1; - nDist = (sal_uInt16)nPWidth; + nDist = static_cast<sal_uInt16>(nPWidth); bSet = true; } break; @@ -2592,7 +2592,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr, break; case CSS1_LENGTH: - nWidth = (sal_uInt16)pExpr->GetULength(); + nWidth = static_cast<sal_uInt16>(pExpr->GetULength()); break; case CSS1_PIXLENGTH: @@ -2606,7 +2606,7 @@ static void ParseCSS1_border_xxx( const CSS1Expression *pExpr, long nPWidth = bHori ? 0 : fWidth; long nPHeight = bHori ? fWidth : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nWidth = (sal_uInt16)(bHori ? nPHeight : nPWidth); + nWidth = static_cast<sal_uInt16>(bHori ? nPHeight : nPWidth); } else nWidth = 1; @@ -2667,18 +2667,18 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr, break; case CSS1_LENGTH: - nWidth = (sal_uInt16)pExpr->GetULength(); + nWidth = static_cast<sal_uInt16>(pExpr->GetULength()); break; case CSS1_PIXLENGTH: { bool bHori = nWhichLine == SvxBoxItemLine::TOP || nWhichLine == SvxBoxItemLine::BOTTOM; - long nWidthL = (long)pExpr->GetNumber(); + long nWidthL = static_cast<long>(pExpr->GetNumber()); long nPWidth = bHori ? 0 : nWidthL; long nPHeight = bHori ? nWidthL : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - nWidth = (sal_uInt16)(bHori ? nPHeight : nPWidth); + nWidth = static_cast<sal_uInt16>(bHori ? nPHeight : nPWidth); } break; @@ -2887,7 +2887,7 @@ static void ParseCSS1_length( const CSS1Expression *pExpr, double fLength = pExpr->GetNumber(); if (fLength < SAL_MAX_INT32/2.0 && fLength > SAL_MIN_INT32/2.0) { - long nWidthL = (long)fLength; + long nWidthL = static_cast<long>(fLength); long nPWidth = bHori ? 0 : nWidthL; long nPHeight = bHori ? nWidthL : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); @@ -2898,7 +2898,7 @@ static void ParseCSS1_length( const CSS1Expression *pExpr, break; case CSS1_PERCENTAGE: - rLength = (long)pExpr->GetNumber(); + rLength = static_cast<long>(pExpr->GetNumber()); if( rLength > 100 ) rLength = 100; rLengthType = SVX_CSS1_LTYPE_PERCENTAGE; @@ -2972,7 +2972,7 @@ static void ParseCSS1_size( const CSS1Expression *pExpr, case CSS1_PIXLENGTH: { - long nPHeight = (long)pExpr->GetNumber(); + long nPHeight = static_cast<long>(pExpr->GetNumber()); long nPWidth = n==0 ? nPHeight : 0; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); rPropInfo.m_nHeight = nPHeight; @@ -3055,7 +3055,7 @@ static void ParseCSS1_widows( const CSS1Expression *pExpr, if( CSS1_NUMBER == pExpr->GetType() ) { sal_uInt8 nVal = pExpr->GetNumber() <= 255 - ? (sal_uInt8)pExpr->GetNumber() + ? static_cast<sal_uInt8>(pExpr->GetNumber()) : 255; SvxWidowsItem aWidowsItem( nVal, aItemIds.nWidows ); rItemSet.Put( aWidowsItem ); @@ -3070,7 +3070,7 @@ static void ParseCSS1_orphans( const CSS1Expression *pExpr, if( CSS1_NUMBER == pExpr->GetType() ) { sal_uInt8 nVal = pExpr->GetNumber() <= 255 - ? (sal_uInt8)pExpr->GetNumber() + ? static_cast<sal_uInt8>(pExpr->GetNumber()) : 255; SvxOrphansItem aOrphansItem( nVal, aItemIds.nOrphans ); rItemSet.Put( aOrphansItem ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 92e87c8fef1d..9215f4f35dcc 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -226,8 +226,8 @@ ErrCode HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam, co pStrm->ResetError(); else if( SvParserState::Accepted != eState ) { - const OUString sErr(OUString::number((sal_Int32)xParser->GetLineNr()) - + "," + OUString::number((sal_Int32)xParser->GetLinePos())); + const OUString sErr(OUString::number(static_cast<sal_Int32>(xParser->GetLineNr())) + + "," + OUString::number(static_cast<sal_Int32>(xParser->GetLinePos()))); // use the stream as transport for error number nRet = *new StringErrorInfo( ERR_FORMAT_ROWCOL, sErr, @@ -3542,7 +3542,7 @@ void SwHTMLParser::NewBasefontAttr() switch( rOption.GetToken() ) { case HtmlOptionId::SIZE: - nSize = (sal_uInt16)rOption.GetNumber(); + nSize = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::ID: aId = rOption.GetString(); @@ -3651,14 +3651,14 @@ void SwHTMLParser::NewFontAttr( HtmlTokenId nToken ) '-' == rOption.GetString()[0] ) nSSize = o3tl::saturating_add<sal_Int32>(nBaseSize, rOption.GetSNumber()); else - nSSize = (sal_Int32)rOption.GetNumber(); + nSSize = static_cast<sal_Int32>(rOption.GetNumber()); if( nSSize < 1 ) nSSize = 1; else if( nSSize > 7 ) nSSize = 7; - nSize = (sal_uInt16)nSSize; + nSize = static_cast<sal_uInt16>(nSSize); nFontHeight = m_aFontHeights[nSize-1]; } break; @@ -4832,12 +4832,12 @@ void SwHTMLParser::InsertSpacer() case HtmlOptionId::WIDTH: // First only save as pixel value! bPrcWidth = (rOption.GetString().indexOf('%') != -1); - aSize.Width() = (long)rOption.GetNumber(); + aSize.Width() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::HEIGHT: // First only save as pixel value! bPrcHeight = (rOption.GetString().indexOf('%') != -1); - aSize.Height() = (long)rOption.GetNumber(); + aSize.Height() = static_cast<long>(rOption.GetNumber()); break; case HtmlOptionId::SIZE: // First only save as pixel value! @@ -4920,12 +4920,12 @@ void SwHTMLParser::InsertSpacer() { SvxULSpaceItem aULSpace( static_cast<const SvxULSpaceItem&>(pTextNode ->SwContentNode::GetAttr( RES_UL_SPACE )) ); - aULSpace.SetLower( aULSpace.GetLower() + (sal_uInt16)nSize ); + aULSpace.SetLower( aULSpace.GetLower() + static_cast<sal_uInt16>(nSize) ); pTextNode->SetAttr( aULSpace ); } else { - NewAttr(m_xAttrTab, &m_xAttrTab->pULSpace, SvxULSpaceItem(0, (sal_uInt16)nSize, RES_UL_SPACE)); + NewAttr(m_xAttrTab, &m_xAttrTab->pULSpace, SvxULSpaceItem(0, static_cast<sal_uInt16>(nSize), RES_UL_SPACE)); EndAttr( m_xAttrTab->pULSpace, false ); AppendTextNode(); // Don't change spacing! @@ -4951,7 +4951,7 @@ void SwHTMLParser::InsertSpacer() short nIndent = 0; GetMarginsFromContextWithNumBul( nLeft, nRight, nIndent ); - nIndent = nIndent + (short)nSize; + nIndent = nIndent + static_cast<short>(nSize); SvxLRSpaceItem aLRItem( RES_LR_SPACE ); aLRItem.SetTextLeft( nLeft ); @@ -4963,7 +4963,7 @@ void SwHTMLParser::InsertSpacer() } else { - NewAttr(m_xAttrTab, &m_xAttrTab->pKerning, SvxKerningItem( (short)nSize, RES_CHRATR_KERNING )); + NewAttr(m_xAttrTab, &m_xAttrTab->pKerning, SvxKerningItem( static_cast<short>(nSize), RES_CHRATR_KERNING )); OUString aTmp( ' ' ); m_xDoc->getIDocumentContentOperations().InsertString( *m_pPam, aTmp ); EndAttr( m_xAttrTab->pKerning ); @@ -4978,7 +4978,7 @@ sal_uInt16 SwHTMLParser::ToTwips( sal_uInt16 nPixel ) { long nTwips = Application::GetDefaultDevice()->PixelToLogic( Size( nPixel, nPixel ), MapMode( MapUnit::MapTwip ) ).Width(); - return nTwips <= USHRT_MAX ? (sal_uInt16)nTwips : USHRT_MAX; + return nTwips <= USHRT_MAX ? static_cast<sal_uInt16>(nTwips) : USHRT_MAX; } else return nPixel; @@ -5203,11 +5203,11 @@ void SwHTMLParser::InsertHorzRule() aId = rOption.GetString(); break; case HtmlOptionId::SIZE: - nSize = (sal_uInt16)rOption.GetNumber(); + nSize = static_cast<sal_uInt16>(rOption.GetNumber()); break; case HtmlOptionId::WIDTH: bPrcWidth = (rOption.GetString().indexOf('%') != -1); - nWidth = (sal_uInt16)rOption.GetNumber(); + nWidth = static_cast<sal_uInt16>(rOption.GetNumber()); if( bPrcWidth && nWidth>=100 ) { // the default case are 100% lines (no attributes necessary) @@ -5259,7 +5259,7 @@ void SwHTMLParser::InsertHorzRule() if( nSize ) { long nPWidth = 0; - long nPHeight = (long)nSize; + long nPHeight = static_cast<long>(nSize); SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); if ( !bNoShade ) { @@ -5292,12 +5292,12 @@ void SwHTMLParser::InsertHorzRule() { // fake length and alignment of line above paragraph indents long nBrowseWidth = GetCurrentBrowseWidth(); - nWidth = bPrcWidth ? (sal_uInt16)((nWidth*nBrowseWidth) / 100) - : ToTwips( (sal_uInt16)nBrowseWidth ); + nWidth = bPrcWidth ? static_cast<sal_uInt16>((nWidth*nBrowseWidth) / 100) + : ToTwips( static_cast<sal_uInt16>(nBrowseWidth) ); if( nWidth < MINLAY ) nWidth = MINLAY; - const SwFormatColl *pColl = ((long)nWidth < nBrowseWidth) ? GetCurrFormatColl() : nullptr; + const SwFormatColl *pColl = (static_cast<long>(nWidth) < nBrowseWidth) ? GetCurrFormatColl() : nullptr; if (pColl) { SvxLRSpaceItem aLRItem( pColl->GetLRSpace() ); @@ -5306,16 +5306,16 @@ void SwHTMLParser::InsertHorzRule() switch( eAdjust ) { case SvxAdjust::Right: - aLRItem.SetTextLeft( (sal_uInt16)nDist ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nDist) ); break; case SvxAdjust::Left: - aLRItem.SetRight( (sal_uInt16)nDist ); + aLRItem.SetRight( static_cast<sal_uInt16>(nDist) ); break; case SvxAdjust::Center: default: nDist /= 2; - aLRItem.SetTextLeft( (sal_uInt16)nDist ); - aLRItem.SetRight( (sal_uInt16)nDist ); + aLRItem.SetTextLeft( static_cast<sal_uInt16>(nDist) ); + aLRItem.SetRight( static_cast<sal_uInt16>(nDist) ); break; } diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 3213ab5ef868..9bc01910c409 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -632,8 +632,8 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, { if( nGutter && Application::GetDefaultDevice() ) { - nGutter = (sal_uInt16)Application::GetDefaultDevice() - ->LogicToPixel( Size(nGutter, 0), MapMode(MapUnit::MapTwip) ).Width(); + nGutter = static_cast<sal_uInt16>(Application::GetDefaultDevice() + ->LogicToPixel( Size(nGutter, 0), MapMode(MapUnit::MapTwip) ).Width()); } sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_gutter "=\"" + OString::number(nGutter) + "\""); } diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 96a6f1906ca2..d223e488c4ca 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -139,11 +139,11 @@ namespace o3tl { // bit 3,4,5 #define CSS1_OUTMODE_SPAN_NO_OFF 0x0000U -#define CSS1_OUTMODE_SPAN_TAG_OFF ((sal_uInt16)(0x0001U << 3)) -#define CSS1_OUTMODE_STYLE_OPT_OFF ((sal_uInt16)(0x0002U << 3)) -#define CSS1_OUTMODE_RULE_OFF ((sal_uInt16)(0x0003U << 3)) +#define CSS1_OUTMODE_SPAN_TAG_OFF (sal_uInt16(0x0001U << 3)) +#define CSS1_OUTMODE_STYLE_OPT_OFF (sal_uInt16(0x0002U << 3)) +#define CSS1_OUTMODE_RULE_OFF (sal_uInt16(0x0003U << 3)) #define CSS1_OUTMODE_SPAN_TAG1_OFF ((sal_uInt16)(0x0004U << 3)) -#define CSS1_OUTMODE_ANY_OFF ((sal_uInt16)(0x0007U << 3)) +#define CSS1_OUTMODE_ANY_OFF (sal_uInt16(0x0007U << 3)) #define CSS1_OUTMODE_ONOFF(a) (CSS1_OUTMODE_##a##_ON|CSS1_OUTMODE_##a##_OFF) #define CSS1_OUTMODE_SPAN_TAG CSS1_OUTMODE_ONOFF(SPAN_TAG) @@ -153,31 +153,31 @@ namespace o3tl { // the following flags specify what should be outputted // bit 6,7,8,9 #define CSS1_OUTMODE_TEMPLATE 0x0000U -#define CSS1_OUTMODE_BODY ((sal_uInt16)(0x0001U << 6)) -#define CSS1_OUTMODE_PARA ((sal_uInt16)(0x0002U << 6)) -#define CSS1_OUTMODE_HINT ((sal_uInt16)(0x0003U << 6)) -#define CSS1_OUTMODE_FRAME ((sal_uInt16)(0x0004U << 6)) -#define CSS1_OUTMODE_TABLE ((sal_uInt16)(0x0005U << 6)) -#define CSS1_OUTMODE_TABLEBOX ((sal_uInt16)(0x0006U << 6)) -#define CSS1_OUTMODE_DROPCAP ((sal_uInt16)(0x0007U << 6)) -#define CSS1_OUTMODE_SECTION ((sal_uInt16)(0x0008U << 6)) -#define CSS1_OUTMODE_SOURCE ((sal_uInt16)(0x000fU << 6)) +#define CSS1_OUTMODE_BODY (sal_uInt16(0x0001U << 6)) +#define CSS1_OUTMODE_PARA (sal_uInt16(0x0002U << 6)) +#define CSS1_OUTMODE_HINT (sal_uInt16(0x0003U << 6)) +#define CSS1_OUTMODE_FRAME (sal_uInt16(0x0004U << 6)) +#define CSS1_OUTMODE_TABLE (sal_uInt16(0x0005U << 6)) +#define CSS1_OUTMODE_TABLEBOX (sal_uInt16(0x0006U << 6)) +#define CSS1_OUTMODE_DROPCAP (sal_uInt16(0x0007U << 6)) +#define CSS1_OUTMODE_SECTION (sal_uInt16(0x0008U << 6)) +#define CSS1_OUTMODE_SOURCE (sal_uInt16(0x000fU << 6)) // bit 10 -#define CSS1_OUTMODE_ENCODE ((sal_uInt16)(0x0001U << 10)) +#define CSS1_OUTMODE_ENCODE (sal_uInt16(0x0001U << 10)) // bit 11,12,13 // don't care about script #define CSS1_OUTMODE_ANY_SCRIPT 0x0000U // no cjk or ctl items -#define CSS1_OUTMODE_WESTERN ((sal_uInt16)(0x0001U << 11)) +#define CSS1_OUTMODE_WESTERN (sal_uInt16(0x0001U << 11)) // no western or ctl items -#define CSS1_OUTMODE_CJK ((sal_uInt16)(0x0002U << 11)) +#define CSS1_OUTMODE_CJK (sal_uInt16(0x0002U << 11)) // no western or cjk items -#define CSS1_OUTMODE_CTL ((sal_uInt16)(0x0003U << 11)) +#define CSS1_OUTMODE_CTL (sal_uInt16(0x0003U << 11)) // no western, cjk or ctl items -#define CSS1_OUTMODE_NO_SCRIPT ((sal_uInt16)(0x0004U << 11)) -#define CSS1_OUTMODE_SCRIPT ((sal_uInt16)(0x0007U << 11)) +#define CSS1_OUTMODE_NO_SCRIPT (sal_uInt16(0x0004U << 11)) +#define CSS1_OUTMODE_SCRIPT (sal_uInt16(0x0007U << 11)) // the HTML writer struct HTMLControl @@ -489,7 +489,7 @@ public: sal_Int32 GetLineLen() { - return (sal_Int32)(Strm().Tell()-m_nLastLFPos); + return static_cast<sal_Int32>(Strm().Tell()-m_nLastLFPos); } void OutNewLine( bool bCheck=false ); diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 5af4efe89ffb..5332a1c307b9 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -191,7 +191,7 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox, void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine, bool bTable ) { - if( (sal_uInt32)-1 == m_nBorderColor ) + if( sal_uInt32(-1) == m_nBorderColor ) { Color aGrayColor( COL_GRAY ); if( !pBorderLine->GetColor().IsRGBEqual( aGrayColor ) ) @@ -335,15 +335,15 @@ sal_uInt16 SwWriteTable::GetAbsWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con nWidth -= GetLeftSpace( nCol ) + GetRightSpace( nCol, nColSpan ); OSL_ENSURE( nWidth > 0, "Column Width <= 0. OK?" ); - return nWidth > 0 ? (sal_uInt16)nWidth : 0; + return nWidth > 0 ? static_cast<sal_uInt16>(nWidth) : 0; } sal_uInt16 SwWriteTable::GetRelWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const { long nWidth = GetRawWidth( nCol, nColSpan ); - return (sal_uInt16)(long)Fraction( nWidth*256 + GetBaseWidth()/2, - GetBaseWidth() ); + return static_cast<sal_uInt16>(static_cast<long>(Fraction( nWidth*256 + GetBaseWidth()/2, + GetBaseWidth() ))); } sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const @@ -352,8 +352,8 @@ sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) con // Looks funny, but is nothing more than // [(100 * nWidth) + .5] without rounding errors - return (sal_uInt16)(long)Fraction( nWidth*100 + GetBaseWidth()/2, - GetBaseWidth() ); + return static_cast<sal_uInt16>(static_cast<long>(Fraction( nWidth*100 + GetBaseWidth()/2, + GetBaseWidth() ))); } long SwWriteTable::GetAbsHeight(long nRawHeight, size_t const nRow, @@ -656,7 +656,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, // The new table model may have true row span attributes const long nAttrRowSpan = pBox->getRowSpan(); if ( 1 < nAttrRowSpan ) - nRowSpan = (sal_uInt16)nAttrRowSpan; + nRowSpan = static_cast<sal_uInt16>(nAttrRowSpan); else if ( nAttrRowSpan < 1 ) nRowSpan = 0; @@ -726,7 +726,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow, SwWriteTable::SwWriteTable(const SwTable* pTable, const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth, bool bRel, sal_uInt16 nMaxDepth, sal_uInt16 nLSub, sal_uInt16 nRSub, sal_uInt32 nNumOfRowsToRepeat) - : m_pTable(pTable), m_nBorderColor((sal_uInt32)-1), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), + : m_pTable(pTable), m_nBorderColor(sal_uInt32(-1)), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), m_nInnerBorder(0), m_nBaseWidth(nBWidth), m_nHeadEndRow(USHRT_MAX), m_nLeftSub(nLSub), m_nRightSub(nRSub), m_nTabWidth(nWidth), m_bRelWidths(bRel), m_bUseLayoutHeights(true), @@ -759,7 +759,7 @@ SwWriteTable::SwWriteTable(const SwTable* pTable, const SwTableLines& rLines, lo } SwWriteTable::SwWriteTable(const SwTable* pTable, const SwHTMLTableLayout *pLayoutInfo) - : m_pTable(pTable), m_nBorderColor((sal_uInt32)-1), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), + : m_pTable(pTable), m_nBorderColor(sal_uInt32(-1)), m_nCellSpacing(0), m_nCellPadding(0), m_nBorder(0), m_nInnerBorder(0), m_nBaseWidth(pLayoutInfo->GetWidthOption()), m_nHeadEndRow(0), m_nLeftSub(0), m_nRightSub(0), m_nTabWidth(pLayoutInfo->GetWidthOption()), m_bRelWidths(pLayoutInfo->HasPrcWidthOption()), m_bUseLayoutHeights(false), diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 2a1dc9c68bdb..8bde2be39ada 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6891,7 +6891,7 @@ void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern ) { // auto kerning is bound to a minimum font size in Word - but is just a boolean in Writer :-( // kerning is based on half-point sizes, so 2 enables kerning for fontsize 1pt or higher. (1 is treated as size 12, and 0 is treated as disabled.) - const OString sFontSize = OString::number( (sal_uInt32) rAutoKern.GetValue() * 2 ); + const OString sFontSize = OString::number( static_cast<sal_uInt32>(rAutoKern.GetValue()) * 2 ); m_pSerializer->singleElementNS(XML_w, XML_kern, FSNS( XML_w, XML_val ), sFontSize.getStr(), FSEND ); } @@ -7909,8 +7909,8 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) else m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginRight = 0; - m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginLeft + (sal_uInt16)rLRSpace.GetLeft(); - m_pageMargins.nPageMarginRight = m_pageMargins.nPageMarginRight + (sal_uInt16)rLRSpace.GetRight(); + m_pageMargins.nPageMarginLeft = m_pageMargins.nPageMarginLeft + static_cast<sal_uInt16>(rLRSpace.GetLeft()); + m_pageMargins.nPageMarginRight = m_pageMargins.nPageMarginRight + static_cast<sal_uInt16>(rLRSpace.GetRight()); AddToAttrList( m_pSectionSpacingAttrList, 2, FSNS( XML_w, XML_left ), OString::number( m_pageMargins.nPageMarginLeft ).getStr(), @@ -8258,7 +8258,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) { // Calculate opacity value // Consider oox/source/vml/vmlformatting.cxx : decodeColor() function. - double fOpacity = (double)(*oAlpha) * 65535 / ::oox::drawingml::MAX_PERCENT; + double fOpacity = static_cast<double>(*oAlpha) * 65535 / ::oox::drawingml::MAX_PERCENT; OUString sOpacity = OUString::number(fOpacity) + "f"; AddToAttrList( m_rExport.SdrExporter().getFlyFillAttrList(), XML_opacity, OUStringToOString(sOpacity, RTL_TEXTENCODING_UTF8).getStr() ); @@ -8568,7 +8568,7 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCo for ( sal_uInt16 n = 0; n < nCols; ++n ) { FastAttributeList *pColAttrList = FastSerializerHelper::createAttrList(); - sal_uInt16 nWidth = rCol.CalcPrtColWidth( n, ( sal_uInt16 ) nPageSize ); + sal_uInt16 nWidth = rCol.CalcPrtColWidth( n, static_cast<sal_uInt16>(nPageSize) ); pColAttrList->add( FSNS( XML_w, XML_w ), OString::number( nWidth ).getStr( ) ); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index b8c4f47dfc63..ee18a6fbcd6e 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -98,12 +98,12 @@ void lclMovePositionWithRotation(awt::Point& aPos, const Size& rSize, sal_Int64 while (nRotation > 9000) nRotation = (18000 - (nRotation % 18000)); - double fVal = (double)nRotation * F_PI18000; + double fVal = static_cast<double>(nRotation) * F_PI18000; double fCos = cos(fVal); double fSin = sin(fVal); - double nWidthHalf = (double)rSize.Width() / 2; - double nHeightHalf = (double)rSize.Height() / 2; + double nWidthHalf = static_cast<double>(rSize.Width()) / 2; + double nHeightHalf = static_cast<double>(rSize.Height()) / 2; double nXDiff = fSin * nHeightHalf + fCos * nWidthHalf - nWidthHalf; double nYDiff = fSin * nWidthHalf + fCos * nHeightHalf - nHeightHalf; @@ -1009,7 +1009,8 @@ void DocxSdrExport::writeDMLEffectLst(const SwFrameFormat& rFrameFormat) return; // Distance is measured diagonally from corner - double nShadowDist = sqrt((double)aShadowItem.GetWidth() * aShadowItem.GetWidth() * 2.0); + double nShadowDist + = sqrt(static_cast<double>(aShadowItem.GetWidth()) * aShadowItem.GetWidth() * 2.0); OString aShadowDist(OString::number(TwipsToEMU(nShadowDist))); OString aShadowColor = msfilter::util::ConvertColor(aShadowItem.GetColor()); OString aShadowAlpha = lcl_ConvertTransparency(aShadowItem.GetColor()); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 882243ff9d06..770ae936c824 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -165,7 +165,7 @@ static OString OutTBLBorderLine(RtfExport const& rExport, const editeng::SvxBord } aRet.append(OOO_STRING_SVTOOLS_RTF_BRDRCF); - aRet.append((sal_Int32)rExport.GetColor(pLine->GetColor())); + aRet.append(static_cast<sal_Int32>(rExport.GetColor(pLine->GetColor()))); } return aRet.makeStringAndClear(); } @@ -177,7 +177,7 @@ static OString OutBorderLine(RtfExport const& rExport, const editeng::SvxBorderL OStringBuffer aRet; aRet.append(OutTBLBorderLine(rExport, pLine, pStr)); aRet.append(OOO_STRING_SVTOOLS_RTF_BRSP); - aRet.append((sal_Int32)nDist); + aRet.append(static_cast<sal_Int32>(nDist)); if (eShadowLocation == SvxShadowLocation::BottomRight) aRet.append(LO_STRING_SVTOOLS_RTF_BRDRSH); return aRet.makeStringAndClear(); @@ -630,19 +630,19 @@ void RtfAttributeOutput::Redline(const SwRedlineData* pRedline) { m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVISED); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTH); - m_aRun->append( - (sal_Int32)m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor()))); + m_aRun->append(static_cast<sal_Int32>( + m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor())))); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVDTTM); } else if (pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE) { m_aRun->append(OOO_STRING_SVTOOLS_RTF_DELETED); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVAUTHDEL); - m_aRun->append( - (sal_Int32)m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor()))); + m_aRun->append(static_cast<sal_Int32>( + m_rExport.GetRedline(SW_MOD()->GetRedlineAuthor(pRedline->GetAuthor())))); m_aRun->append(OOO_STRING_SVTOOLS_RTF_REVDTTMDEL); } - m_aRun->append((sal_Int32)sw::ms::DateTime2DTTM(pRedline->GetTimeStamp())); + m_aRun->append(static_cast<sal_Int32>(sw::ms::DateTime2DTTM(pRedline->GetTimeStamp()))); m_aRun->append(' '); } @@ -659,7 +659,7 @@ void RtfAttributeOutput::ParagraphStyle(sal_uInt16 nStyle) OString* pStyle = m_rExport.GetStyle(nStyle); OStringBuffer aStyle; aStyle.append(OOO_STRING_SVTOOLS_RTF_S); - aStyle.append((sal_Int32)nStyle); + aStyle.append(static_cast<sal_Int32>(nStyle)); if (pStyle) aStyle.append(pStyle->getStr()); if (!m_bBufferSectionHeaders) @@ -675,7 +675,7 @@ void RtfAttributeOutput::TableInfoCell( if (m_nTableDepth > 1) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ITAP); - m_aStyles.append((sal_Int32)m_nTableDepth); + m_aStyles.append(static_cast<sal_Int32>(m_nTableDepth)); } m_bWroteCellInfo = true; } @@ -715,9 +715,9 @@ void RtfAttributeOutput::TableDefinition( for (int i = 0; i < 4; ++i) { m_aRowDefs.append(aRowPadUnits[i]); - m_aRowDefs.append((sal_Int32)3); + m_aRowDefs.append(sal_Int32(3)); m_aRowDefs.append(aRowPadNames[i]); - m_aRowDefs.append((sal_Int32)rBox.GetDistance(aBorders[i])); + m_aRowDefs.append(static_cast<sal_Int32>(rBox.GetDistance(aBorders[i]))); } // The cell-dependent properties @@ -740,7 +740,7 @@ void RtfAttributeOutput::TableDefinition( // value of nSz is needed. nSz += pCellFormat->GetFrameSize().GetWidth(); m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CELLX); - m_aRowDefs.append((sal_Int32)(pFormat->GetLRSpace().GetLeft() + nSz)); + m_aRowDefs.append(static_cast<sal_Int32>(pFormat->GetLRSpace().GetLeft() + nSz)); } } @@ -783,9 +783,9 @@ void RtfAttributeOutput::TableDefaultBorders( if (rBox.GetDistance(aBorders[i])) { m_aRowDefs.append(aCellPadUnits[i]); - m_aRowDefs.append((sal_Int32)3); + m_aRowDefs.append(sal_Int32(3)); m_aRowDefs.append(aCellPadNames[i]); - m_aRowDefs.append((sal_Int32)rBox.GetDistance(aBorders[i])); + m_aRowDefs.append(static_cast<sal_Int32>(rBox.GetDistance(aBorders[i]))); } } } @@ -806,7 +806,7 @@ void RtfAttributeOutput::TableBackgrounds( if (!rBack.GetColor().GetTransparency()) { m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLCBPAT); - m_aRowDefs.append((sal_Int32)m_rExport.GetColor(rBack.GetColor())); + m_aRowDefs.append(static_cast<sal_Int32>(m_rExport.GetColor(rBack.GetColor()))); } } } @@ -936,7 +936,7 @@ void RtfAttributeOutput::TableOrientation( case text::HoriOrientation::NONE: case text::HoriOrientation::LEFT_AND_WIDTH: aTableAdjust.append(OOO_STRING_SVTOOLS_RTF_TRLEFT); - aTableAdjust.append((sal_Int32)pFormat->GetLRSpace().GetLeft()); + aTableAdjust.append(static_cast<sal_Int32>(pFormat->GetLRSpace().GetLeft())); break; default: break; @@ -1026,7 +1026,7 @@ void RtfAttributeOutput::EndTableCell() { m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_INTBL); m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_ITAP); - m_aAfterRuns.append((sal_Int32)m_nTableDepth); + m_aAfterRuns.append(static_cast<sal_Int32>(m_nTableDepth)); } if (m_nTableDepth > 1) m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_NESTCELL); @@ -1148,16 +1148,16 @@ void RtfAttributeOutput::StartStyle(const OUString& rName, StyleType eType, sal_ m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_S); else m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_CS); - m_aStylesheet.append((sal_Int32)nId); + m_aStylesheet.append(static_cast<sal_Int32>(nId)); if (nBase != 0x0FFF) { m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_SBASEDON); - m_aStylesheet.append((sal_Int32)nBase); + m_aStylesheet.append(static_cast<sal_Int32>(nBase)); } m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_SNEXT); - m_aStylesheet.append((sal_Int32)nNext); + m_aStylesheet.append(static_cast<sal_Int32>(nNext)); if (bAutoUpdate) m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_SAUTOUPD); @@ -1191,9 +1191,9 @@ void RtfAttributeOutput::OutlineNumbering(sal_uInt8 nLvl) nLvl = WW8ListManager::nMaxLevel - 1; m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); - m_aStyles.append((sal_Int32)nLvl); + m_aStyles.append(static_cast<sal_Int32>(nLvl)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL); - m_aStyles.append((sal_Int32)nLvl); + m_aStyles.append(static_cast<sal_Int32>(nLvl)); } void RtfAttributeOutput::PageBreakBefore(bool bBreak) @@ -1236,7 +1236,7 @@ void RtfAttributeOutput::EndSection() void RtfAttributeOutput::SectionFormProtection(bool bProtected) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED); - m_aSectionBreaks.append((sal_Int32)!bProtected); + m_aSectionBreaks.append(static_cast<sal_Int32>(!bProtected)); } void RtfAttributeOutput::SectionLineNumbering(sal_uLong /*nRestartNo*/, @@ -1291,7 +1291,7 @@ void RtfAttributeOutput::SectionPageNumbering( if (oPageRestartNumber) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGNSTARTS); - m_aSectionBreaks.append((sal_Int32)oPageRestartNumber.get()); + m_aSectionBreaks.append(static_cast<sal_Int32>(oPageRestartNumber.get())); m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGNRESTART); } @@ -1686,7 +1686,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bo m_aSectionHeaders.append(bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERY : OOO_STRING_SVTOOLS_RTF_FOOTERY); m_aSectionHeaders.append( - (sal_Int32)m_rExport.m_pAktPageDesc->GetMaster().GetULSpace().GetUpper()); + static_cast<sal_Int32>(m_rExport.m_pAktPageDesc->GetMaster().GetULSpace().GetUpper())); if (bTitlepg) m_aSectionHeaders.append(OOO_STRING_SVTOOLS_RTF_TITLEPG); m_aSectionHeaders.append('{'); @@ -2052,10 +2052,10 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi sal_Int16 nTemp = 0; xPropSet->getPropertyValue("DefaultState") >>= nTemp; m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES); - m_aRun->append((sal_Int32)nTemp); + m_aRun->append(static_cast<sal_Int32>(nTemp)); xPropSet->getPropertyValue("State") >>= nTemp; m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES); - m_aRun->append((sal_Int32)nTemp); + m_aRun->append(static_cast<sal_Int32>(nTemp)); m_aRun->append("}}"); @@ -2075,18 +2075,18 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi "{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_DATAFIELD " "); for (int i = 0; i < 8; i++) - aBuf.append((sal_Char)0x00); + aBuf.append(sal_Char(0x00)); xPropSet->getPropertyValue("Name") >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.m_eCurrentEncoding); - aBuf.append((sal_Char)aStr.getLength()); + aBuf.append(static_cast<sal_Char>(aStr.getLength())); aBuf.append(aStr); - aBuf.append((sal_Char)0x00); + aBuf.append(sal_Char(0x00)); xPropSet->getPropertyValue("DefaultText") >>= aTmp; aStr = OUStringToOString(aTmp, m_rExport.m_eCurrentEncoding); - aBuf.append((sal_Char)aStr.getLength()); + aBuf.append(static_cast<sal_Char>(aStr.getLength())); aBuf.append(aStr); for (int i = 0; i < 11; i++) - aBuf.append((sal_Char)0x00); + aBuf.append(sal_Char(0x00)); aStr = aBuf.makeStringAndClear(); pStr = aStr.getStr(); for (int i = 0; i < aStr.getLength(); i++, pStr++) @@ -2143,7 +2143,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi { m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFDEFRES); // a dropdown list can have only one 'selected item by default' - m_aRun->append((sal_Int32)aIntSeq[0]); + m_aRun->append(static_cast<sal_Int32>(aIntSeq[0])); } xPropSet->getPropertyValue("SelectedItems") >>= aIntSeq; @@ -2151,7 +2151,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi { m_aRun->append(OOO_STRING_SVTOOLS_RTF_FFRES); // a dropdown list can have only one 'currently selected item' - m_aRun->append((sal_Int32)aIntSeq[0]); + m_aRun->append(static_cast<sal_Int32>(aIntSeq[0])); } sName = "Name"; @@ -2232,8 +2232,8 @@ void RtfAttributeOutput::OutputFlyFrame_Impl(const ww8::Frame& rFrame, const Poi } break; default: - SAL_INFO("sw.rtf", - OSL_THIS_FUNC << ": unknown type (" << (int)rFrame.GetWriterType() << ")"); + SAL_INFO("sw.rtf", OSL_THIS_FUNC << ": unknown type (" + << static_cast<int>(rFrame.GetWriterType()) << ")"); break; } } @@ -2250,9 +2250,9 @@ void RtfAttributeOutput::CharCaseMap(const SvxCaseMapItem& rCaseMap) break; default: // Something that rtf does not support m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SCAPS); - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CAPS); - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); break; } } @@ -2262,14 +2262,14 @@ void RtfAttributeOutput::CharColor(const SvxColorItem& rColor) const Color aColor(rColor.GetValue()); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CF); - m_aStyles.append((sal_Int32)m_rExport.GetColor(aColor)); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(aColor))); } void RtfAttributeOutput::CharContour(const SvxContourItem& rContour) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTL); if (!rContour.GetValue()) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) @@ -2278,11 +2278,11 @@ void RtfAttributeOutput::CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) { case STRIKEOUT_NONE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKE); - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); break; case STRIKEOUT_DOUBLE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKED); - m_aStyles.append((sal_Int32)1); + m_aStyles.append(sal_Int32(1)); break; default: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_STRIKE); @@ -2332,7 +2332,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) m_aStyles.append('{'); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_IGNORE); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_UPDNPROP); - m_aStyles.append((sal_Int32)nProp); + m_aStyles.append(static_cast<sal_Int32>(nProp)); m_aStyles.append('}'); m_aStyles.append(pUpDn); @@ -2344,7 +2344,7 @@ void RtfAttributeOutput::CharEscapement(const SvxEscapementItem& rEscapement) * 100% Escapement */ - m_aStyles.append((sal_Int32)((long(nEsc) * nH) + 500) / 1000); + m_aStyles.append(static_cast<sal_Int32>((long(nEsc) * nH) + 500) / 1000); // 500 to round !! } @@ -2352,7 +2352,7 @@ void RtfAttributeOutput::CharFont(const SvxFontItem& rFont) { m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH); m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F); - m_aStylesEnd.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStylesEnd.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); if (!m_rExport.HasItem(RES_CHRATR_CJK_FONT) && !m_rExport.HasItem(RES_CHRATR_CTL_FONT)) { @@ -2360,7 +2360,7 @@ void RtfAttributeOutput::CharFont(const SvxFontItem& rFont) // just for the loch range. m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_HICH); m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_AF); - m_aStylesEnd.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStylesEnd.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); } // FIXME: this may be a tad expensive... but the charset needs to be @@ -2379,15 +2379,15 @@ void RtfAttributeOutput::CharFontSize(const SvxFontHeightItem& rFontSize) { case RES_CHRATR_FONTSIZE: m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_FS); - m_aStylesEnd.append((sal_Int32)(rFontSize.GetHeight() / 10)); + m_aStylesEnd.append(static_cast<sal_Int32>(rFontSize.GetHeight() / 10)); break; case RES_CHRATR_CJK_FONTSIZE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FS); - m_aStyles.append((sal_Int32)(rFontSize.GetHeight() / 10)); + m_aStyles.append(static_cast<sal_Int32>(rFontSize.GetHeight() / 10)); break; case RES_CHRATR_CTL_FONTSIZE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AFS); - m_aStyles.append((sal_Int32)(rFontSize.GetHeight() / 10)); + m_aStyles.append(static_cast<sal_Int32>(rFontSize.GetHeight() / 10)); break; } } @@ -2396,9 +2396,9 @@ void RtfAttributeOutput::CharKerning(const SvxKerningItem& rKerning) { // in quarter points then in twips m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPND); - m_aStyles.append((sal_Int32)(rKerning.GetValue() / 5)); + m_aStyles.append(static_cast<sal_Int32>(rKerning.GetValue() / 5)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPNDTW); - m_aStyles.append((sal_Int32)(rKerning.GetValue())); + m_aStyles.append(static_cast<sal_Int32>(rKerning.GetValue())); } void RtfAttributeOutput::CharLanguage(const SvxLanguageItem& rLanguage) @@ -2407,15 +2407,18 @@ void RtfAttributeOutput::CharLanguage(const SvxLanguageItem& rLanguage) { case RES_CHRATR_LANGUAGE: m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LANG); - m_aStylesEnd.append((sal_Int32) static_cast<sal_uInt16>(rLanguage.GetLanguage())); + m_aStylesEnd.append( + static_cast<sal_Int32>(static_cast<sal_uInt16>(rLanguage.GetLanguage()))); break; case RES_CHRATR_CJK_LANGUAGE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LANGFE); - m_aStyles.append((sal_Int32) static_cast<sal_uInt16>(rLanguage.GetLanguage())); + m_aStyles.append( + static_cast<sal_Int32>(static_cast<sal_uInt16>(rLanguage.GetLanguage()))); break; case RES_CHRATR_CTL_LANGUAGE: m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ALANG); - m_aStyles.append((sal_Int32) static_cast<sal_uInt16>(rLanguage.GetLanguage())); + m_aStyles.append( + static_cast<sal_Int32>(static_cast<sal_uInt16>(rLanguage.GetLanguage()))); break; } } @@ -2424,14 +2427,14 @@ void RtfAttributeOutput::CharPosture(const SvxPostureItem& rPosture) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I); if (rPosture.GetPosture() == ITALIC_NONE) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharShadow(const SvxShadowedItem& rShadow) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SHAD); if (!rShadow.GetValue()) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharUnderline(const SvxUnderlineItem& rUnderline) @@ -2504,7 +2507,7 @@ void RtfAttributeOutput::CharUnderline(const SvxUnderlineItem& rUnderline) // NEEDSWORK looks like here rUnderline.GetColor() is always black, // even if the color in the odt is for example green... m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ULC); - m_aStyles.append((sal_Int32)m_rExport.GetColor(rUnderline.GetColor())); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rUnderline.GetColor()))); } } @@ -2512,19 +2515,19 @@ void RtfAttributeOutput::CharWeight(const SvxWeightItem& rWeight) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B); if (rWeight.GetWeight() != WEIGHT_BOLD) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharAutoKern(const SvxAutoKernItem& rAutoKern) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KERNING); - m_aStyles.append((sal_Int32)(rAutoKern.GetValue() ? 1 : 0)); + m_aStyles.append(static_cast<sal_Int32>(rAutoKern.GetValue() ? 1 : 0)); } void RtfAttributeOutput::CharAnimatedText(const SvxBlinkItem& rBlink) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ANIMTEXT); - m_aStyles.append((sal_Int32)(rBlink.GetValue() ? 2 : 0)); + m_aStyles.append(static_cast<sal_Int32>(rBlink.GetValue() ? 2 : 0)); } void RtfAttributeOutput::CharBackground(const SvxBrushItem& rBrush) @@ -2532,7 +2535,7 @@ void RtfAttributeOutput::CharBackground(const SvxBrushItem& rBrush) if (!rBrush.GetColor().GetTransparency()) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHCBPAT); - m_aStyles.append((sal_Int32)m_rExport.GetColor(rBrush.GetColor())); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rBrush.GetColor()))); } } @@ -2540,7 +2543,7 @@ void RtfAttributeOutput::CharFontCJK(const SvxFontItem& rFont) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF); - m_aStyles.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); } void RtfAttributeOutput::CharFontSizeCJK(const SvxFontHeightItem& rFontSize) @@ -2557,21 +2560,21 @@ void RtfAttributeOutput::CharPostureCJK(const SvxPostureItem& rPosture) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I); if (rPosture.GetPosture() == ITALIC_NONE) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharWeightCJK(const SvxWeightItem& rWeight) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B); if (rWeight.GetWeight() != WEIGHT_BOLD) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharFontCTL(const SvxFontItem& rFont) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF); - m_aStyles.append((sal_Int32)m_rExport.m_aFontHelper.GetId(rFont)); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.m_aFontHelper.GetId(rFont))); } void RtfAttributeOutput::CharFontSizeCTL(const SvxFontHeightItem& rFontSize) @@ -2588,14 +2591,14 @@ void RtfAttributeOutput::CharPostureCTL(const SvxPostureItem& rPosture) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AI); if (rPosture.GetPosture() == ITALIC_NONE) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharWeightCTL(const SvxWeightItem& rWeight) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AB); if (rWeight.GetWeight() != WEIGHT_BOLD) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharBidiRTL(const SfxPoolItem& /*rItem*/) {} @@ -2605,7 +2608,7 @@ void RtfAttributeOutput::CharIdctHint(const SfxPoolItem& /*rItem*/) {} void RtfAttributeOutput::CharRotate(const SvxCharRotateItem& rRotate) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HORZVERT); - m_aStyles.append((sal_Int32)(rRotate.IsFitToLine() ? 1 : 0)); + m_aStyles.append(static_cast<sal_Int32>(rRotate.IsFitToLine() ? 1 : 0)); } void RtfAttributeOutput::CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) @@ -2643,14 +2646,14 @@ void RtfAttributeOutput::CharTwoLines(const SvxTwoLinesItem& rTwoLines) nType = 1; m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TWOINONE); - m_aStyles.append((sal_Int32)nType); + m_aStyles.append(static_cast<sal_Int32>(nType)); } } void RtfAttributeOutput::CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHARSCALEX); - m_aStyles.append((sal_Int32)rScaleWidth.GetValue()); + m_aStyles.append(static_cast<sal_Int32>(rScaleWidth.GetValue())); } void RtfAttributeOutput::CharRelief(const SvxCharReliefItem& rRelief) @@ -2677,7 +2680,7 @@ void RtfAttributeOutput::CharHidden(const SvxCharHiddenItem& rHidden) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_V); if (!rHidden.GetValue()) - m_aStyles.append((sal_Int32)0); + m_aStyles.append(sal_Int32(0)); } void RtfAttributeOutput::CharBorder(const editeng::SvxBorderLine* pAllBorder, @@ -2718,7 +2721,7 @@ void RtfAttributeOutput::TextCharFormat(const SwFormatCharFormat& rCharFormat) { sal_uInt16 nStyle = m_rExport.GetId(rCharFormat.GetCharFormat()); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CS); - m_aStyles.append((sal_Int32)nStyle); + m_aStyles.append(static_cast<sal_Int32>(nStyle)); OString* pString = m_rExport.GetStyle(nStyle); if (pString) m_aStyles.append(*pString); @@ -2777,9 +2780,9 @@ void RtfAttributeOutput::TextFootnote_Impl(const SwFormatFootnote& rFootnote) void RtfAttributeOutput::ParaLineSpacing_Impl(short nSpace, short nMulti) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SL); - m_aStyles.append((sal_Int32)nSpace); + m_aStyles.append(static_cast<sal_Int32>(nSpace)); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SLMULT); - m_aStyles.append((sal_Int32)nMulti); + m_aStyles.append(static_cast<sal_Int32>(nMulti)); } void RtfAttributeOutput::ParaAdjust(const SvxAdjustItem& rAdjust) @@ -2873,7 +2876,7 @@ void RtfAttributeOutput::ParaTabStop(const SvxTabStopItem& rTabStop) if (pAdjStr) m_aStyles.append(pAdjStr); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TX); - m_aStyles.append((sal_Int32)(rTS.GetTabPos() + nOffset)); + m_aStyles.append(static_cast<sal_Int32>(rTS.GetTabPos() + nOffset)); } else { @@ -2946,7 +2949,7 @@ void RtfAttributeOutput::ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 n m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); if (nLvl > 8) // RTF knows only 9 levels { - m_aStyles.append((sal_Int32)8); + m_aStyles.append(sal_Int32(8)); m_aStyles.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SOUTLVL); m_aStyles.append(nLvl); m_aStyles.append('}'); @@ -2957,7 +2960,7 @@ void RtfAttributeOutput::ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 n else m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB "}"); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LS); - m_aStyles.append((sal_Int32)m_rExport.GetId(*pRule) + 1); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetId(*pRule)) + 1); m_aStyles.append(' '); } FormatLRSpace(aLR); @@ -3016,9 +3019,9 @@ void RtfAttributeOutput::FormatFrameSize(const SwFormatFrameSize& rSize) if (m_rExport.m_bOutPageDescs) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGWSXN); - m_aSectionBreaks.append((sal_Int32)rSize.GetWidth()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rSize.GetWidth())); m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_PGHSXN); - m_aSectionBreaks.append((sal_Int32)rSize.GetHeight()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rSize.GetHeight())); if (!m_bBufferSectionBreaks) m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); } @@ -3038,12 +3041,12 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) if (rLRSpace.GetLeft()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGLSXN); - m_aSectionBreaks.append((sal_Int32)rLRSpace.GetLeft()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rLRSpace.GetLeft())); } if (rLRSpace.GetRight()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGRSXN); - m_aSectionBreaks.append((sal_Int32)rLRSpace.GetRight()); + m_aSectionBreaks.append(static_cast<sal_Int32>(rLRSpace.GetRight())); } if (!m_bBufferSectionBreaks) m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); @@ -3051,15 +3054,15 @@ void RtfAttributeOutput::FormatLRSpace(const SvxLRSpaceItem& rLRSpace) else { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LI); - m_aStyles.append((sal_Int32)rLRSpace.GetTextLeft()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextLeft())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RI); - m_aStyles.append((sal_Int32)rLRSpace.GetRight()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetRight())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LIN); - m_aStyles.append((sal_Int32)rLRSpace.GetTextLeft()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextLeft())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_RIN); - m_aStyles.append((sal_Int32)rLRSpace.GetRight()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetRight())); m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FI); - m_aStyles.append((sal_Int32)rLRSpace.GetTextFirstLineOfst()); + m_aStyles.append(static_cast<sal_Int32>(rLRSpace.GetTextFirstLineOfst())); } } else if (m_rExport.m_bRTFFlySyntax) @@ -3087,23 +3090,23 @@ void RtfAttributeOutput::FormatULSpace(const SvxULSpaceItem& rULSpace) if (aDistances.dyaTop) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaTop)); } if (aDistances.HasHeader()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_HEADERY); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrTop); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaHdrTop)); } if (aDistances.dyaBottom) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaBottom)); } if (aDistances.HasFooter()) { m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_FOOTERY); - m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom); + m_aSectionBreaks.append(static_cast<sal_Int32>(aDistances.dyaHdrBottom)); } if (!m_bBufferSectionBreaks) m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); @@ -3167,7 +3170,7 @@ void RtfAttributeOutput::FormatSurround(const SwFormatSurround& rSurround) eSurround = css::text::WrapTextMode_PARALLEL; RTFSurround aMC(bGold, static_cast<sal_uInt8>(eSurround)); m_aRunText->append(OOO_STRING_SVTOOLS_RTF_FLYMAINCNT); - m_aRunText->append((sal_Int32)aMC.GetValue()); + m_aRunText->append(static_cast<sal_Int32>(aMC.GetValue())); } else if (m_rExport.m_bOutFlyFrameAttrs && m_rExport.m_bRTFFlySyntax) { @@ -3338,7 +3341,7 @@ void RtfAttributeOutput::FormatBackground(const SvxBrushItem& rBrush) else if (!rBrush.GetColor().GetTransparency()) { m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CBPAT); - m_aStyles.append((sal_Int32)m_rExport.GetColor(rBrush.GetColor())); + m_aStyles.append(static_cast<sal_Int32>(m_rExport.GetColor(rBrush.GetColor()))); } } @@ -3614,7 +3617,7 @@ void RtfAttributeOutput::PostitField(const SwField* pField) m_aRunText->append('}'); } m_aRunText->append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ATNDATE " "); - m_aRunText->append((sal_Int32)sw::ms::DateTime2DTTM(rPField.GetDateTime())); + m_aRunText->append(static_cast<sal_Int32>(sw::ms::DateTime2DTTM(rPField.GetDateTime()))); m_aRunText->append('}'); if (const OutlinerParaObject* pObject = rPField.GetTextObject()) m_rExport.SdrExporter().WriteOutliner(*pObject, TXT_ATN); @@ -3873,9 +3876,9 @@ static OString ExportPICT(const SwFlyFrameFormat* pFlyFrameFormat, const Size& r //first, how much has the original been scaled to get the //final rendered size aRet.append(OOO_STRING_SVTOOLS_RTF_PICSCALEX); - aRet.append((sal_Int32)((100 * rRendered.Width()) / nXCroppedSize)); + aRet.append(static_cast<sal_Int32>((100 * rRendered.Width()) / nXCroppedSize)); aRet.append(OOO_STRING_SVTOOLS_RTF_PICSCALEY); - aRet.append((sal_Int32)((100 * rRendered.Height()) / nYCroppedSize)); + aRet.append(static_cast<sal_Int32>((100 * rRendered.Height()) / nYCroppedSize)); aRet.append(OOO_STRING_SVTOOLS_RTF_PICCROPL); aRet.append(rCr.GetLeft()); @@ -3887,19 +3890,19 @@ static OString ExportPICT(const SwFlyFrameFormat* pFlyFrameFormat, const Size& r aRet.append(rCr.GetBottom()); aRet.append(OOO_STRING_SVTOOLS_RTF_PICW); - aRet.append((sal_Int32)rMapped.Width()); + aRet.append(static_cast<sal_Int32>(rMapped.Width())); aRet.append(OOO_STRING_SVTOOLS_RTF_PICH); - aRet.append((sal_Int32)rMapped.Height()); + aRet.append(static_cast<sal_Int32>(rMapped.Height())); aRet.append(OOO_STRING_SVTOOLS_RTF_PICWGOAL); - aRet.append((sal_Int32)rOrig.Width()); + aRet.append(static_cast<sal_Int32>(rOrig.Width())); aRet.append(OOO_STRING_SVTOOLS_RTF_PICHGOAL); - aRet.append((sal_Int32)rOrig.Height()); + aRet.append(static_cast<sal_Int32>(rOrig.Height())); aRet.append(pBLIPType); if (bIsWMF) { - aRet.append((sal_Int32)8); + aRet.append(sal_Int32(8)); StripMetafileHeader(pGraphicAry, nSize); } aRet.append(SAL_NEWLINE_STRING); diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 83c1b0b08185..b65b50be104e 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -172,7 +172,8 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl break; } if (nWrapType) - m_aShapeStyle.append(OOO_STRING_SVTOOLS_RTF_SHPWR).append((sal_Int32)nWrapType); + m_aShapeStyle.append(OOO_STRING_SVTOOLS_RTF_SHPWR) + .append(static_cast<sal_Int32>(nWrapType)); } break; case ESCHER_Prop_fillColor: @@ -282,7 +283,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl // number of segments sal_uInt16 nSegments = impl_GetUInt16(pSegmentIt); sal_Int32 nVertices = 0; - aSegmentInfo.append("2;").append((sal_Int32)nSegments); + aSegmentInfo.append("2;").append(static_cast<sal_Int32>(nSegments)); pSegmentIt += 4; for (; nSegments; --nSegments) @@ -295,7 +296,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl unsigned char nSegmentType = (nSeg & 0xE000) >> 13; unsigned short nSegmentCount = nSeg & 0x03FF; - aSegmentInfo.append(';').append((sal_Int32)nSeg); + aSegmentInfo.append(';').append(static_cast<sal_Int32>(nSeg)); switch (nSegmentType) { case msopathLineTo: diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index b87573d9bfa4..c6d50ac73a1e 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -621,7 +621,7 @@ namespace sw for(a = 0; a < rPolyPoly.Count(); a++) { - nPointCount += (sal_uInt32)rPolyPoly[a].GetSize(); + nPointCount += static_cast<sal_uInt32>(rPolyPoly[a].GetSize()); } if(nPointCount > 0x0000ffff) @@ -630,7 +630,7 @@ namespace sw nPointCount = 0x0000ffff; } - tools::Polygon aRetval((sal_uInt16)nPointCount); + tools::Polygon aRetval(static_cast<sal_uInt16>(nPointCount)); sal_uInt32 nAppendIndex(0); for(a = 0; a < rPolyPoly.Count(); a++) @@ -639,7 +639,7 @@ namespace sw for(sal_uInt16 b(0); nAppendIndex <= nPointCount && b < rCandidate.GetSize(); b++) { - aRetval[(sal_uInt16)nAppendIndex++] = rCandidate[b]; + aRetval[static_cast<sal_uInt16>(nAppendIndex++)] = rCandidate[b]; } } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 0fdb886e5a13..d8756282b0f0 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1990,7 +1990,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat, const sal_uInt16 nCstScale = 635; // unit scale between AOO and MS Word const sal_uInt32 nShadowType = 131074; // shadow type of ms word. need to set the default value. - sal_uInt32 nColor = (sal_uInt32)(pSI->GetColor().GetColor()) ; + sal_uInt32 nColor = static_cast<sal_uInt32>(pSI->GetColor().GetColor()) ; sal_Int32 nOffX = pSI->GetWidth() * nCstScale; sal_Int32 nOffY = pSI->GetWidth() * nCstScale; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 5619ff7639f9..b49a86aa1ba4 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1343,7 +1343,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt break; case TOX_USER: - sText += "\" \\f \"" + OUString((sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); + sText += "\" \\f \"" + OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) )); SAL_FALLTHROUGH; case TOX_CONTENT: { diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 49bf605bae2d..3065a98a82a4 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -457,9 +457,9 @@ void MSWordExportBase::AbstractNumberingDefinitions() sal_Int32 nFnd = sNumStr.indexOf( sSrch ); if( -1 != nFnd ) { - *pLvlPos = (sal_uInt8)(nFnd + rFormat.GetPrefix().getLength() + 1 ); + *pLvlPos = static_cast<sal_uInt8>(nFnd + rFormat.GetPrefix().getLength() + 1 ); ++pLvlPos; - sNumStr = sNumStr.replaceAt( nFnd, 1, OUString((char)i) ); + sNumStr = sNumStr.replaceAt( nFnd, 1, OUString(static_cast<char>(i)) ); } } // #i86652# diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 812167721fbe..51fad2582a4e 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -379,7 +379,7 @@ OString const & MSWordStyles::GetStyleId(sal_uInt16 nId) const static void impl_SkipOdd( ww::bytes* pO, std::size_t nTableStrmTell ) { if ( ( nTableStrmTell + pO->size() ) & 1 ) // start on even - pO->push_back( (sal_uInt8)0 ); // Address + pO->push_back( sal_uInt8(0) ); // Address } void WW8AttributeOutput::EndStyle() @@ -437,7 +437,7 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal // write names SwWW8Writer::InsUInt16( *m_rWW8Export.pO, rName.getLength() ); // length SwWW8Writer::InsAsString16( *m_rWW8Export.pO, rName ); - m_rWW8Export.pO->push_back( (sal_uInt8)0 ); // Despite P-String 0 at the end! + m_rWW8Export.pO->push_back( sal_uInt8(0) ); // Despite P-String 0 at the end! } void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap ) @@ -639,7 +639,7 @@ void WW8AttributeOutput::StartStyles() sal_uLong nCurPos = m_rWW8Export.pTableStrm->Tell(); if ( nCurPos & 1 ) // start on even { - m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Address + m_rWW8Export.pTableStrm->WriteChar( char(0) ); // Address ++nCurPos; } rFib.m_fcStshfOrig = rFib.m_fcStshf = nCurPos; @@ -715,7 +715,7 @@ wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily memset(maWW8_FFN, 0, sizeof(maWW8_FFN)); - maWW8_FFN[0] = (sal_uInt8)( 6 - 1 + 0x22 + ( 2 * ( 1 + msFamilyNm.getLength() ) )); + maWW8_FFN[0] = static_cast<sal_uInt8>( 6 - 1 + 0x22 + ( 2 * ( 1 + msFamilyNm.getLength() ) )); if (mbAlt) maWW8_FFN[0] = static_cast< sal_uInt8 >(maWW8_FFN[0] + 2 * ( 1 + msAltNm.getLength())); @@ -1323,9 +1323,9 @@ void WW8AttributeOutput::SectFootnoteEndnotePr() m_rWW8Export.InsUInt16( NS_sprm::sprmSRncFtn ); switch( rInfo.eNum ) { - case FTNNUM_PAGE: m_rWW8Export.pO->push_back( (sal_uInt8) /*rncRstPage*/ 2 ); break; - case FTNNUM_CHAPTER: m_rWW8Export.pO->push_back( (sal_uInt8) /*rncRstSect*/ 1 ); break; - default: m_rWW8Export.pO->push_back( (sal_uInt8) /*rncCont*/ 0 ); break; + case FTNNUM_PAGE: m_rWW8Export.pO->push_back( sal_uInt8/*rncRstPage*/ (2) ); break; + case FTNNUM_CHAPTER: m_rWW8Export.pO->push_back( sal_uInt8/*rncRstSect*/ (1) ); break; + default: m_rWW8Export.pO->push_back( sal_uInt8/*rncCont*/ (0) ); break; } } @@ -1361,7 +1361,7 @@ void WW8AttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLin if ( nRestartNo ) { SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::sprmSLnnMin ); - SwWW8Writer::InsUInt16( *m_rWW8Export.pO, (sal_uInt16)nRestartNo - 1 ); + SwWW8Writer::InsUInt16( *m_rWW8Export.pO, static_cast<sal_uInt16>(nRestartNo) - 1 ); } } @@ -2252,7 +2252,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, // Commented text ranges as bookmarks (SttbfAtnBkmk) rFib.m_fcSttbfAtnbkmk = nFcStart; - SwWW8Writer::WriteShort( *rWrt.pTableStrm, (sal_Int16)(sal_uInt16)0xFFFF ); // SttbfAtnBkmk.fExtend + SwWW8Writer::WriteShort( *rWrt.pTableStrm, sal_Int16(sal_uInt16(0xFFFF)) ); // SttbfAtnBkmk.fExtend SwWW8Writer::WriteShort( *rWrt.pTableStrm, aRangeStartPos.size() ); // SttbfAtnBkmk.cData SwWW8Writer::WriteShort( *rWrt.pTableStrm, 0xA ); // SttbfAtnBkmk.cbExtra @@ -2379,7 +2379,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, "Impossible"); sal_uInt16 nFndPos = static_cast< sal_uInt16 >(aIter - aStrArr.begin()); OUString sInitials( aIter->second ); - sal_uInt8 nInitialsLen = (sal_uInt8)sInitials.getLength(); + sal_uInt8 nInitialsLen = static_cast<sal_uInt8>(sInitials.getLength()); if ( nInitialsLen > 9 ) { sInitials = sInitials.copy( 0, 9 ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 4a3086511b59..c5f1429262f7 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -230,9 +230,9 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm) if (aResult.second) { BKMK aBK(false,rNm); - BKMKCP* pBKCP = new BKMKCP((long)nStartCp,aBK); + BKMKCP* pBKCP = new BKMKCP(static_cast<long>(nStartCp),aBK); aSttCps.insert(std::pair<long,BKMKCP*>(nStartCp,pBKCP)); - aResult.first->second = (long)nStartCp; + aResult.first->second = static_cast<long>(nStartCp); } else { @@ -243,7 +243,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm) { if (aItr->second->second.first) nStartCp--; - aItr->second->first = (long)nStartCp; + aItr->second->first = static_cast<long>(nStartCp); break; } } @@ -309,7 +309,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo) { if (aItr->second) { - if (aItr->second->first == (long)nFrom) + if (aItr->second->first == static_cast<long>(nFrom)) { aItr->second->second.first = true; aItr->second->first = nTo; @@ -464,7 +464,7 @@ static void WriteDop( WW8Export& rWrt ) // write default TabStop const SvxTabStopItem& rTabStop = DefaultItemGet<SvxTabStopItem>(*rWrt.m_pDoc, RES_PARATR_TABSTOP); - rDop.dxaTab = (sal_uInt16)rTabStop[0].GetTabPos(); + rDop.dxaTab = static_cast<sal_uInt16>(rTabStop[0].GetTabPos()); // Zoom factor and type SwViewShell *pViewShell(rWrt.m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()); @@ -538,7 +538,7 @@ static void WriteDop( WW8Export& rWrt ) // and also for the Headers and Footers rDop.cWordsFootnoteEnd = rDStat.nWord; rDop.cChFootnoteEdn = rDStat.nChar; - rDop.cPgFootnoteEdn = (sal_Int16)rDStat.nPage; + rDop.cPgFootnoteEdn = static_cast<sal_Int16>(rDStat.nPage); rDop.cParasFootnoteEdn = rDStat.nPara; rDop.cLinesFootnoteEdn = rDStat.nPara; @@ -1046,7 +1046,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pS void WW8_WrPlcPn::WriteFkps() { - nFkpStartPage = (sal_uInt16) ( SwWW8Writer::FillUntil( rWrt.Strm() ) >> 9 ); + nFkpStartPage = static_cast<sal_uInt16>( SwWW8Writer::FillUntil( rWrt.Strm() ) >> 9 ); for(const std::unique_ptr<WW8_WrFkp> & rp : m_Fkps) { @@ -1133,10 +1133,10 @@ sal_uInt8 WW8_WrFkp::SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms sal_uInt8 nStart = pOfs[i * nItemSize]; if( nStart ) { // has Sprms - const sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 ); + const sal_uInt8* p = pFkp + ( static_cast<sal_uInt16>(nStart) << 1 ); if( ( CHP == ePlc ? (*p++ == nVarLen) - : (((sal_uInt16)*p++ << 1 ) == (( nVarLen+1) & 0xfffe)) ) + : ((static_cast<sal_uInt16>(*p++) << 1 ) == (( nVarLen+1) & 0xfffe)) ) && !memcmp( p, pSprms, nVarLen ) ) return nStart; // found it } @@ -1156,7 +1156,7 @@ sal_uInt8 *WW8_WrFkp::CopyLastSprms(sal_uInt8 &rLen) sal_uInt8 nStart = *(pStart + (nIMax-1) * nItemSize); - const sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 ); + const sal_uInt8* p = pFkp + ( static_cast<sal_uInt16>(nStart) << 1 ); if (!*p) p++; @@ -1210,22 +1210,22 @@ bool WW8_WrFkp::Append( WW8_FC nEndFc, sal_uInt16 nVarLen, const sal_uInt8* pSpr nPos &= 0xFFFE; // Pos for Sprms ( gerade Pos ) } - if( (sal_uInt16)nPos <= ( nIMax + 2U ) * 4U + ( nIMax + 1U ) * nItemSize ) + if( static_cast<sal_uInt16>(nPos) <= ( nIMax + 2U ) * 4U + ( nIMax + 1U ) * nItemSize ) // does it fits after the CPs and offsets? return false; // no reinterpret_cast<sal_Int32*>(pFkp)[nIMax + 1] = nEndFc; // insert FC - nOldVarLen = (sal_uInt8)nVarLen; + nOldVarLen = static_cast<sal_uInt8>(nVarLen); if( nVarLen && !nOldP ) { // insert it for real nOldStartGrp = nStartGrp; nStartGrp = nPos; - pOfs[nIMax * nItemSize] = (sal_uInt8)( nStartGrp >> 1 ); + pOfs[nIMax * nItemSize] = static_cast<sal_uInt8>( nStartGrp >> 1 ); // insert (start-of-data >> 1) sal_uInt8 nCnt = static_cast< sal_uInt8 >(CHP == ePlc - ? ( nVarLen < 256 ) ? (sal_uInt8) nVarLen : 255 + ? ( nVarLen < 256 ) ? static_cast<sal_uInt8>(nVarLen) : 255 : ( ( nVarLen + 1 ) >> 1 )); pFkp[ nOffset ] = nCnt; // Enter data length @@ -1288,7 +1288,7 @@ void WW8_WrFkp::MergeToNew( short& rVarLen, sal_uInt8 *& rpNewSprms ) sal_uInt8 nStart = pOfs[ (nIMax-1) * nItemSize ]; if( nStart ) { // has Sprms - sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 ); + sal_uInt8* p = pFkp + ( static_cast<sal_uInt16>(nStart) << 1 ); // old and new equal? Then copy only one into the new sprms if( nOldVarLen == rVarLen && !memcmp( p+1, rpNewSprms, nOldVarLen )) @@ -1384,7 +1384,7 @@ void WW8_WrPct::WritePc( WW8Export& rWrt ) sal_uLong nOldPos, nEndPos; nPctStart = rWrt.pTableStrm->Tell(); // Start piece table - rWrt.pTableStrm->WriteChar( ( char )0x02 ); // Status byte PCT + rWrt.pTableStrm->WriteChar( char(0x02) ); // Status byte PCT nOldPos = nPctStart + 1; // remember Position SwWW8Writer::WriteLong( *rWrt.pTableStrm, 0 ); // then the length @@ -1426,7 +1426,7 @@ void WW8_WrPct::SetParaBreak() WW8_CP WW8_WrPct::Fc2Cp( sal_uLong nFc ) const { - OSL_ENSURE( nFc >= (sal_uLong)nOldFc, "FilePos lies in front of last piece" ); + OSL_ENSURE( nFc >= static_cast<sal_uLong>(nOldFc), "FilePos lies in front of last piece" ); OSL_ENSURE( ! m_Pcts.empty(), "Fc2Cp no piece available" ); nFc -= nOldFc; @@ -1627,7 +1627,7 @@ void WW8Export::OutGrfBullets(const ww8::Frame & rFrame) m_pChpPlc->AppendFkpEntry( Strm().Tell(), pO->size(), pO->data() ); pO->clear(); // if links... - WriteChar( (char)1 ); + WriteChar( char(1) ); sal_uInt8 aArr[ 22 ]; sal_uInt8* pArr = aArr; @@ -2010,14 +2010,14 @@ void WW8AttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pT { /* Cell */ m_rWW8Export.InsUInt16( NS_sprm::sprmPFInTable ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); m_rWW8Export.InsUInt16( NS_sprm::sprmPItap ); m_rWW8Export.InsUInt32( nDepth ); if ( nDepth > 1 && pTableTextNodeInfoInner->isEndOfCell() ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTableCell ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); } } } @@ -2032,12 +2032,12 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa if ( pTableTextNodeInfoInner->isEndOfLine() ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFInTable ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); if ( nDepth == 1 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFTtp ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); } m_rWW8Export.InsUInt16( NS_sprm::sprmPItap ); @@ -2046,9 +2046,9 @@ void WW8AttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTa if ( nDepth > 1 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTableCell ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); m_rWW8Export.InsUInt16( NS_sprm::sprmPFInnerTtp ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x1 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x1) ); } TableDefinition( pTableTextNodeInfoInner ); @@ -2199,7 +2199,7 @@ void WW8AttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab if ( nHeight ) { m_rWW8Export.InsUInt16( NS_sprm::sprmTDyaRowHeight ); - m_rWW8Export.InsUInt16( (sal_uInt16)nHeight ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(nHeight) ); } } @@ -2428,8 +2428,8 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t if ( nWidthPercent > 0 && nWidthPercent <= 600 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmTTableWidth ); - m_rWW8Export.pO->push_back( (sal_uInt8) /*ftsPercent*/ 2 ); - m_rWW8Export.InsUInt16( (sal_uInt16) nWidthPercent * 50 ); + m_rWW8Export.pO->push_back( sal_uInt8/*ftsPercent*/ (2) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(nWidthPercent) * 50 ); } } @@ -2584,7 +2584,7 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t sal_uInt8 nBoxes = rTabBoxes.size(); m_rWW8Export.InsUInt16( NS_sprm::sprmTDefTableShd80 ); - m_rWW8Export.pO->push_back( (sal_uInt8)(nBoxes * 2) ); // Len + m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(nBoxes * 2) ); // Len for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { @@ -2780,7 +2780,7 @@ void MSWordExportBase::WriteText() if (bNeedExportBreakHere) //#120140# End of check { - ReplaceCr( (char)0xc ); // indicator for Page/Section-Break + ReplaceCr( char(0xc) ); // indicator for Page/Section-Break const SwSectionFormat* pParentFormat = rSect.GetFormat()->GetParent(); if ( !pParentFormat ) diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 36e8adb98f8a..31f4a501a019 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -394,7 +394,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) FieldFlags::Start | FieldFlags::CmdStart | FieldFlags::CmdEnd ); } - WriteChar( (char)1 ); // paste graphic symbols in the main text + WriteChar( char(1) ); // paste graphic symbols in the main text sal_uInt8 aArr[ 18 ]; sal_uInt8* pArr = aArr; @@ -425,7 +425,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) nHeight-=nFontHeight/20; Set_UInt16( pArr, NS_sprm::sprmCHpsPos ); - Set_UInt16( pArr, -((sal_Int16)nHeight)); + Set_UInt16( pArr, - static_cast<sal_Int16>(nHeight)); } } } @@ -452,7 +452,7 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame) ( (eAn == RndStdIds::FLY_AT_PARA) || (eAn == RndStdIds::FLY_AT_PAGE) ) ) { - WriteChar( (char)0x0d ); // close the surrounding frame with CR + WriteChar( char(0x0d) ); // close the surrounding frame with CR static sal_uInt8 nSty[2] = { 0, 0 }; pO->insert( pO->end(), nSty, nSty+2 ); // Style #0 @@ -497,12 +497,12 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, == pAttrSet->GetItemState(RES_GRFATR_CROPGRF, false, &pItem))) { const SwCropGrf& rCr = *static_cast<const SwCropGrf*>(pItem); - nCropL = (sal_Int16)rCr.GetLeft(); - nCropR = (sal_Int16)rCr.GetRight(); - nCropT = (sal_Int16)rCr.GetTop(); - nCropB = (sal_Int16)rCr.GetBottom(); - nXSizeAdd = nXSizeAdd - (sal_Int16)( rCr.GetLeft() + rCr.GetRight() ); - nYSizeAdd = nYSizeAdd - (sal_Int16)( rCr.GetTop() + rCr.GetBottom() ); + nCropL = static_cast<sal_Int16>(rCr.GetLeft()); + nCropR = static_cast<sal_Int16>(rCr.GetRight()); + nCropT = static_cast<sal_Int16>(rCr.GetTop()); + nCropB = static_cast<sal_Int16>(rCr.GetBottom()); + nXSizeAdd = nXSizeAdd - static_cast<sal_Int16>( rCr.GetLeft() + rCr.GetRight() ); + nYSizeAdd = nYSizeAdd - static_cast<sal_Int16>( rCr.GetTop() + rCr.GetBottom() ); } Size aGrTwipSz(rFly.GetSize()); @@ -600,7 +600,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, if ( !bIsSubstitutedSize ) { const double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd ); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else { @@ -617,7 +617,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly, if ( !bIsSubstitutedSize ) { const double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else { @@ -731,7 +731,7 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, if( aGrTwipSz.Width() + nXSizeAdd ) // set mx { double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else pArr += 2; @@ -739,7 +739,7 @@ void SwWW8WrGrf::WritePICBulletFHeader(SvStream& rStrm, const Graphic &rGrf, if( aGrTwipSz.Height() + nYSizeAdd ) // set my { double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd); - Set_UInt16( pArr, (sal_uInt16)::rtl::math::round(fVal) ); + Set_UInt16( pArr, static_cast<sal_uInt16>(::rtl::math::round(fVal)) ); } else pArr += 2; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 41a22c8bf29b..1d04d2b3e8b5 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -945,7 +945,7 @@ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) if( m_rWW8Export.m_pDoc->GetDocumentType() != SwDoc::DOCTYPE_MSWORD ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCFBiDi ); - m_rWW8Export.pO->push_back( (sal_uInt8)1 ); + m_rWW8Export.pO->push_back( sal_uInt8(1) ); } } @@ -953,7 +953,7 @@ void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript ) if (nScript == i18n::ScriptType::COMPLEX && !bIsRTL) { m_rWW8Export.InsUInt16( NS_sprm::sprmCFComplexScripts ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x81 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x81) ); m_rWW8Export.pDop->bUseThaiLineBreakingRules = true; } } @@ -1342,19 +1342,19 @@ void WW8AttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage ) { // use sprmCRgLid0_80 rather than sprmCLid m_rWW8Export.InsUInt16( nId ); - m_rWW8Export.InsUInt16( (sal_uInt16)rLanguage.GetLanguage() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLanguage.GetLanguage()) ); // Word 2000 and above apparently require both old and new versions of // these sprms to be set, without it spellchecking doesn't work if ( nId == NS_sprm::sprmCRgLid0_80 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCRgLid0 ); - m_rWW8Export.InsUInt16( (sal_uInt16)rLanguage.GetLanguage() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLanguage.GetLanguage()) ); } else if ( nId == NS_sprm::sprmCRgLid1_80 ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCRgLid1 ); - m_rWW8Export.InsUInt16( (sal_uInt16)rLanguage.GetLanguage() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLanguage.GetLanguage()) ); } } } @@ -1390,7 +1390,7 @@ void WW8AttributeOutput::CharEscapement( const SvxEscapementItem& rEscapement ) RES_CHRATR_FONTSIZE )).GetHeight(); m_rWW8Export.InsUInt16( NS_sprm::sprmCHpsPos ); - m_rWW8Export.InsUInt16( (short)(( nHeight * nEsc + 500 ) / 1000 )); + m_rWW8Export.InsUInt16( static_cast<short>(( nHeight * nEsc + 500 ) / 1000 )); if( 100 != nProp || !b ) { @@ -1420,7 +1420,7 @@ void WW8AttributeOutput::CharFontSize( const SvxFontHeightItem& rHeight ) { m_rWW8Export.InsUInt16( nId ); - m_rWW8Export.InsUInt16( (sal_uInt16)(( rHeight.GetHeight() + 5 ) / 10 ) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(( rHeight.GetHeight() + 5 ) / 10 ) ); } } @@ -1443,15 +1443,15 @@ void WW8AttributeOutput::CharRelief( const SvxCharReliefItem& rRelief ) if( nId ) { m_rWW8Export.InsUInt16( nId ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x81 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x81) ); } else { // switch both flags off m_rWW8Export.InsUInt16( NS_sprm::sprmCFEmboss ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x0 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x0) ); m_rWW8Export.InsUInt16( NS_sprm::sprmCFImprint ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x0 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x0) ); } } @@ -1461,7 +1461,7 @@ void WW8AttributeOutput::CharBidiRTL( const SfxPoolItem& rHt ) if( rAttr.GetValue() == 1 ) { m_rWW8Export.InsUInt16(0x85a); - m_rWW8Export.pO->push_back((sal_uInt8)1); + m_rWW8Export.pO->push_back(sal_uInt8(1)); } } @@ -1469,7 +1469,7 @@ void WW8AttributeOutput::CharIdctHint( const SfxPoolItem& rHt ) { const SfxInt16Item& rAttr = static_cast<const SfxInt16Item&>(rHt); m_rWW8Export.InsUInt16(0x286F); - m_rWW8Export.pO->push_back((sal_uInt8)(rAttr.GetValue())); + m_rWW8Export.pO->push_back(static_cast<sal_uInt8>(rAttr.GetValue())); } void WW8AttributeOutput::CharRotate( const SvxCharRotateItem& rRotate ) @@ -1485,8 +1485,8 @@ void WW8AttributeOutput::CharRotate( const SvxCharRotateItem& rRotate ) // here corrupts the table, hence !m_rWW8Export.bIsInTable m_rWW8Export.InsUInt16( NS_sprm::sprmCFELayout ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6 - m_rWW8Export.pO->push_back( (sal_uInt8)0x01 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x06) ); //len 6 + m_rWW8Export.pO->push_back( sal_uInt8(0x01) ); m_rWW8Export.InsUInt16( rRotate.IsFitToLine() ? 1 : 0 ); static const sal_uInt8 aZeroArr[ 3 ] = { 0, 0, 0 }; @@ -1658,11 +1658,11 @@ static void InsertSpecialChar( WW8Export& rWrt, sal_uInt8 c, // write attributes of hyperlink character 0x01 SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFFldVanish ); - aItems.push_back( (sal_uInt8)0x81 ); + aItems.push_back( sal_uInt8(0x81) ); SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCPicLocation ); SwWW8Writer::InsUInt32( aItems, nLinkPosInDataStrm ); SwWW8Writer::InsUInt16( aItems, NS_sprm::sprmCFData ); - aItems.push_back( (sal_uInt8)0x01 ); + aItems.push_back( sal_uInt8(0x01) ); } //Technically we should probably Remove all attribs @@ -2283,7 +2283,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if( TOX_USER == pTOX->GetType() ) { sStr += "\""; - sStr += OUString((sal_Char)( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) )); + sStr += OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) )); sStr += sEntryEnd; } } @@ -2336,7 +2336,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) } } - sal_uInt8 nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : (sal_uInt8)nTOXLvl; + sal_uInt8 nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : static_cast<sal_uInt8>(nTOXLvl); //output \o 1-X where X is the highest normal outline style to be included in the toc if ( nMaxMSAutoEvaluate ) @@ -3448,8 +3448,8 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) if ( rTwoLines.GetValue() ) { m_rWW8Export.InsUInt16( NS_sprm::sprmCFELayout ); - m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6 - m_rWW8Export.pO->push_back( (sal_uInt8)0x02 ); + m_rWW8Export.pO->push_back( sal_uInt8(0x06) ); //len 6 + m_rWW8Export.pO->push_back( sal_uInt8(0x02) ); sal_Unicode cStart = rTwoLines.GetStartBracket(); sal_Unicode cEnd = rTwoLines.GetEndBracket(); @@ -3579,7 +3579,7 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) { //"sprmPDxaWidth" m_rWW8Export.InsUInt16( NS_sprm::sprmPDxaWidth ); - m_rWW8Export.InsUInt16( (sal_uInt16)rSize.GetWidth() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rSize.GetWidth()) ); } if ( rSize.GetHeight() ) @@ -3591,8 +3591,8 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) switch ( rSize.GetHeightSizeType() ) { case ATT_VAR_SIZE: break; - case ATT_FIX_SIZE: nH = (sal_uInt16)rSize.GetHeight() & 0x7fff; break; - default: nH = (sal_uInt16)rSize.GetHeight() | 0x8000; break; + case ATT_FIX_SIZE: nH = static_cast<sal_uInt16>(rSize.GetHeight()) & 0x7fff; break; + default: nH = static_cast<sal_uInt16>(rSize.GetHeight()) | 0x8000; break; } m_rWW8Export.InsUInt16( nH ); } @@ -3914,7 +3914,7 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) // sprmPDxaFromText10 m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaFromText10 ); // use average, since WW only knows one value - m_rWW8Export.InsUInt16( (sal_uInt16) ( ( rLR.GetLeft() + rLR.GetRight() ) / 2 ) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>( ( rLR.GetLeft() + rLR.GetRight() ) / 2 ) ); } else if ( m_rWW8Export.m_bOutPageDescs ) // PageDescs { @@ -3927,8 +3927,8 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) } else nLDist = nRDist = 0; - nLDist = nLDist + (sal_uInt16)rLR.GetLeft(); - nRDist = nRDist + (sal_uInt16)rLR.GetRight(); + nLDist = nLDist + static_cast<sal_uInt16>(rLR.GetLeft()); + nRDist = nRDist + static_cast<sal_uInt16>(rLR.GetRight()); // sprmSDxaLeft m_rWW8Export.InsUInt16( NS_sprm::sprmSDxaLeft ); @@ -3942,11 +3942,11 @@ void WW8AttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLR ) { // normal paragraphs // sprmPDxaLeft m_rWW8Export.InsUInt16( 0x845E ); //asian version ? - m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetTextLeft() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLR.GetTextLeft()) ); // sprmPDxaRight m_rWW8Export.InsUInt16( 0x845D ); //asian version ? - m_rWW8Export.InsUInt16( (sal_uInt16)rLR.GetRight() ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>(rLR.GetRight()) ); // sprmPDxaLeft1 m_rWW8Export.InsUInt16( 0x8460 ); //asian version ? @@ -3963,7 +3963,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL ) // sprmPDyaFromText m_rWW8Export.InsUInt16( NS_sprm::sprmPDyaFromText ); // use average, since WW only knows one value - m_rWW8Export.InsUInt16( (sal_uInt16) ( ( rUL.GetUpper() + rUL.GetLower() ) / 2 ) ); + m_rWW8Export.InsUInt16( static_cast<sal_uInt16>( ( rUL.GetUpper() + rUL.GetLower() ) / 2 ) ); } else if ( m_rWW8Export.m_bOutPageDescs ) // Page-UL { @@ -4007,7 +4007,7 @@ void WW8AttributeOutput::FormatULSpace( const SvxULSpaceItem& rUL ) if (rUL.GetContext()) { m_rWW8Export.InsUInt16(NS_sprm::sprmPFContextualSpacing); - m_rWW8Export.pO->push_back( (sal_uInt8)rUL.GetContext() ); + m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(rUL.GetContext()) ); } } } @@ -4035,7 +4035,7 @@ void WW8AttributeOutput::FormatVertOrientation( const SwFormatVertOrient& rFlyVe switch( rFlyVert.GetVertOrient() ) { case text::VertOrientation::NONE: - nPos = (short)rFlyVert.GetPos(); + nPos = static_cast<short>(rFlyVert.GetPos()); break; case text::VertOrientation::CENTER: case text::VertOrientation::LINE_CENTER: @@ -4073,7 +4073,7 @@ void WW8AttributeOutput::FormatHorizOrientation( const SwFormatHoriOrient& rFlyH switch( rFlyHori.GetHoriOrient() ) { case text::HoriOrientation::NONE: - nPos = (short)rFlyHori.GetPos(); + nPos = static_cast<short>(rFlyHori.GetPos()); if( !nPos ) nPos = 1; // WW: 0 is reserved break; @@ -4465,7 +4465,7 @@ void WW8AttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFormatCol m_rWW8Export.pO->push_back( static_cast<sal_uInt8>(n) ); m_rWW8Export.InsUInt16( rCol. CalcPrtColWidth( n, - ( sal_uInt16 ) nPageSize ) ); + static_cast<sal_uInt16>(nPageSize) ) ); if ( n + 1 != nCols ) { @@ -4529,11 +4529,11 @@ void AttributeOutputBase::FormatColumns( const SwFormatCol& rCol ) // look if all columns are equal bool bEven = true; sal_uInt16 n; - sal_uInt16 nColWidth = rCol.CalcPrtColWidth( 0, (sal_uInt16)nPageSize ); + sal_uInt16 nColWidth = rCol.CalcPrtColWidth( 0, static_cast<sal_uInt16>(nPageSize) ); for ( n = 1; n < nCols; n++ ) { short nDiff = nColWidth - - rCol.CalcPrtColWidth( n, (sal_uInt16)nPageSize ); + rCol.CalcPrtColWidth( n, static_cast<sal_uInt16>(nPageSize) ); if ( nDiff > 10 || nDiff < -10 ) // Tolerance: 10 tw { @@ -4584,10 +4584,10 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) default: break; case SvxLineSpaceRule::Fix: // Fix - nSpace = -(short)rSpacing.GetLineHeight(); + nSpace = -static_cast<short>(rSpacing.GetLineHeight()); break; case SvxLineSpaceRule::Min: // At least - nSpace = (short)rSpacing.GetLineHeight(); + nSpace = static_cast<short>(rSpacing.GetLineHeight()); break; case SvxLineSpaceRule::Auto: { @@ -4612,13 +4612,13 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) OSL_ENSURE( pSet, "No attrset for lineheight :-(" ); if ( pSet ) { - nSpace = nSpace + (short)( AttrSetToLineHeight( GetExport().m_pDoc->getIDocumentSettingAccess(), + nSpace = nSpace + static_cast<short>( AttrSetToLineHeight( GetExport().m_pDoc->getIDocumentSettingAccess(), *pSet, *Application::GetDefaultDevice(), nScript ) ); } } else // Proportional { - nSpace = (short)( ( 240L * rSpacing.GetPropLineSpace() ) / 100L ); + nSpace = static_cast<short>( ( 240L * rSpacing.GetPropLineSpace() ) / 100L ); nMulti = 1; break; } @@ -5444,7 +5444,7 @@ const SwRedlineData* AttributeOutputBase::GetParagraphMarkerRedline( const SwTex // Maybe add here a check that also the start & end of the redline is the entire paragraph if ( ( uStartNodeIndex == uEndNodeIndex - 1 ) && - ( uStartCharIndex == (sal_uLong)rNode.Len() ) && + ( uStartCharIndex == static_cast<sal_uLong>(rNode.Len()) ) && ( uEndCharIndex == 0) ) { diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index d980d393d5d3..9c9e54f1ebef 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -156,7 +156,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, sal_Int32 nStart = 0; sal_uInt16 nCurPos = rBlocks.GetIndex( sShortcut ); sal_Int32 nLen = sShortcut.getLength(); - while( (sal_uInt16)-1 != nCurPos ) + while( sal_uInt16(-1) != nCurPos ) { sShortcut = sShortcut.copy( 0, nLen ); sShortcut += OUString::number(++nStart); // add an Number to it diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 34298b2cbfeb..c79f447b1a90 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -147,7 +147,7 @@ Color WW8TransCol(SVBT32 nWC) if (nWC[3] & 0x1) { // Special color gray - sal_uInt8 u = (sal_uInt8)( (sal_uLong)( 200 - nWC[0] ) * 256 / 200 ); + sal_uInt8 u = static_cast<sal_uInt8>( static_cast<sal_uLong>( 200 - nWC[0] ) * 256 / 200 ); return Color(u, u, u); } @@ -254,12 +254,12 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill ) { // Brush -> color mix Color aB( WW8TransCol( rFill.dlpcBg ) ); Color aF( WW8TransCol( rFill.dlpcFg ) ); - aB.SetRed( (sal_uInt8)( ( (sal_uLong)aF.GetRed() * nPatA[nPat] - + (sal_uLong)aB.GetRed() * ( 100 - nPatA[nPat] ) ) / 100 ) ); - aB.SetGreen( (sal_uInt8)( ( (sal_uLong)aF.GetGreen() * nPatA[nPat] - + (sal_uLong)aB.GetGreen() * ( 100 - nPatA[nPat] ) ) / 100 ) ); - aB.SetBlue( (sal_uInt8)( ( (sal_uLong)aF.GetBlue() * nPatA[nPat] - + (sal_uLong)aB.GetBlue() * ( 100 - nPatA[nPat] ) ) / 100 ) ); + aB.SetRed( static_cast<sal_uInt8>( ( static_cast<sal_uLong>(aF.GetRed()) * nPatA[nPat] + + static_cast<sal_uLong>(aB.GetRed()) * ( 100 - nPatA[nPat] ) ) / 100 ) ); + aB.SetGreen( static_cast<sal_uInt8>( ( static_cast<sal_uLong>(aF.GetGreen()) * nPatA[nPat] + + static_cast<sal_uLong>(aB.GetGreen()) * ( 100 - nPatA[nPat] ) ) / 100 ) ); + aB.SetBlue( static_cast<sal_uInt8>( ( static_cast<sal_uLong>(aF.GetBlue()) * nPatA[nPat] + + static_cast<sal_uLong>(aB.GetBlue()) * ( 100 - nPatA[nPat] ) ) / 100 ) ); rSet.Put( XFillColorItem( OUString(), aB ) ); } } @@ -313,13 +313,13 @@ SdrObject* SwWW8ImplReader::ReadLine(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet Point& rP0 = aP[0]; Point& rP1 = aP[1]; - rP0.X() = (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2; - rP0.Y() = (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2; + rP0.X() = static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2; + rP0.Y() = static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2; rP1 = rP0; - rP0.X() += (sal_Int16)SVBT16ToShort( aLine.xaStart ); - rP0.Y() += (sal_Int16)SVBT16ToShort( aLine.yaStart ); - rP1.X() += (sal_Int16)SVBT16ToShort( aLine.xaEnd ); - rP1.Y() += (sal_Int16)SVBT16ToShort( aLine.yaEnd ); + rP0.X() += static_cast<sal_Int16>(SVBT16ToShort( aLine.xaStart )); + rP0.Y() += static_cast<sal_Int16>(SVBT16ToShort( aLine.yaStart )); + rP1.X() += static_cast<sal_Int16>(SVBT16ToShort( aLine.xaEnd )); + rP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( aLine.yaEnd )); } ::basegfx::B2DPolygon aPolygon; @@ -340,11 +340,11 @@ SdrObject* SwWW8ImplReader::ReadRect(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet if( !ReadGrafStart( static_cast<void*>(&aRect), sizeof( aRect ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); SdrObject* pObj = new SdrRectObj( tools::Rectangle( aP0, aP1 ) ); @@ -361,11 +361,11 @@ SdrObject* SwWW8ImplReader::ReadElipse(WW8_DPHEAD const * pHd, SfxAllItemSet &rS if( !ReadGrafStart( static_cast<void*>(&aElipse), sizeof( aElipse ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); SdrObject* pObj = new SdrCircObj( OBJ_CIRC, tools::Rectangle( aP0, aP1 ) ); @@ -382,21 +382,21 @@ SdrObject* SwWW8ImplReader::ReadArc(WW8_DPHEAD const * pHd, SfxAllItemSet &rSet) if( !ReadGrafStart( static_cast<void*>(&aArc), sizeof( aArc ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ) * 2; - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ) * 2; + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )) * 2; + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )) * 2; short nA[] = { 2, 3, 1, 0 }; short nW = nA[ ( ( aArc.fLeft & 1 ) << 1 ) + ( aArc.fUp & 1 ) ]; if( !aArc.fLeft ){ - aP0.Y() -= (sal_Int16)SVBT16ToShort( pHd->dya ); - aP1.Y() -= (sal_Int16)SVBT16ToShort( pHd->dya ); + aP0.Y() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); + aP1.Y() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); } if( aArc.fUp ){ - aP0.X() -= (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.X() -= (sal_Int16)SVBT16ToShort( pHd->dxa ); + aP0.X() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.X() -= static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); } SdrObject* pObj = new SdrCircObj( OBJ_SECT, tools::Rectangle( aP0, aP1 ), @@ -428,9 +428,9 @@ SdrObject* SwWW8ImplReader::ReadPolyLine(WW8_DPHEAD const * pHd, SfxAllItemSet & for (sal_uInt16 i=0; i<nCount; ++i) { aPt.X() = SVBT16ToShort( xP[i << 1] ) + m_nDrawXOfs2 - + (sal_Int16)SVBT16ToShort( pHd->xa ); + + static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )); aPt.Y() = SVBT16ToShort( xP[( i << 1 ) + 1] ) + m_nDrawYOfs2 - + (sal_Int16)SVBT16ToShort( pHd->ya ); + + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )); aP[i] = aPt; } xP.reset(); @@ -1214,17 +1214,17 @@ SdrObject* SwWW8ImplReader::ReadTextBox(WW8_DPHEAD const * pHd, SfxAllItemSet &r if( !ReadGrafStart( static_cast<void*>(&aTextB), sizeof( aTextB ), pHd, rSet ) ) return nullptr; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( pHd->dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( pHd->dya ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )); SdrRectObj* pObj = new SdrRectObj( OBJ_TEXT, tools::Rectangle( aP0, aP1 ) ); pObj->SetModel( m_pDrawModel ); pObj->NbcSetSnapRect(tools::Rectangle(aP0, aP1)); - Size aSize( (sal_Int16)SVBT16ToShort( pHd->dxa ) , - (sal_Int16)SVBT16ToShort( pHd->dya ) ); + Size aSize( static_cast<sal_Int16>(SVBT16ToShort( pHd->dxa )) , + static_cast<sal_Int16>(SVBT16ToShort( pHd->dya )) ); long nStartCpFly,nEndCpFly; bool bContainsGraphics; @@ -1271,30 +1271,30 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox(WW8_DPHEAD const * pHd, SfxAllItemSet return nullptr; } - sal_uInt8 nTyp = (sal_uInt8)nCount - 1; + sal_uInt8 nTyp = static_cast<sal_uInt8>(nCount) - 1; if( nTyp == 1 && SVBT16ToShort( xP[0] ) == SVBT16ToShort( xP[2] ) ) nTyp = 0; - Point aP0( (sal_Int16)SVBT16ToShort( pHd->xa ) + - (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.xa ) + m_nDrawXOfs2, - (sal_Int16)SVBT16ToShort( pHd->ya ) - + (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.ya ) + m_nDrawYOfs2 ); + Point aP0( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.xa )) + m_nDrawXOfs2, + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.ya )) + m_nDrawYOfs2 ); Point aP1( aP0 ); - aP1.X() += (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa ); - aP1.Y() += (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya ); - Point aP2( (sal_Int16)SVBT16ToShort( pHd->xa ) - + (sal_Int16)SVBT16ToShort( aCallB.dpheadPolyLine.xa ) - + m_nDrawXOfs2 + (sal_Int16)SVBT16ToShort( xP[0] ), - (sal_Int16)SVBT16ToShort( pHd->ya ) - + (sal_Int16)SVBT16ToShort( aCallB.dpheadPolyLine.ya ) - + m_nDrawYOfs2 + (sal_Int16)SVBT16ToShort( xP[1] ) ); + aP1.X() += static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dxa )); + aP1.Y() += static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dya )); + Point aP2( static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadPolyLine.xa )) + + m_nDrawXOfs2 + static_cast<sal_Int16>(SVBT16ToShort( xP[0] )), + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )) + + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadPolyLine.ya )) + + m_nDrawYOfs2 + static_cast<sal_Int16>(SVBT16ToShort( xP[1] )) ); xP.reset(); SdrCaptionObj* pObj = new SdrCaptionObj( tools::Rectangle( aP0, aP1 ), aP2 ); pObj->SetModel( m_pDrawModel ); pObj->NbcSetSnapRect(tools::Rectangle(aP0, aP1)); - Size aSize( (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dxa ), - (sal_Int16)SVBT16ToShort( aCallB.dpheadTxbx.dya ) ); + Size aSize( static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dxa )), + static_cast<sal_Int16>(SVBT16ToShort( aCallB.dpheadTxbx.dya )) ); bool bEraseThisObject; InsertTxbxText(pObj, &aSize, 0, 0, 0, nullptr, false, bEraseThisObject ); @@ -1320,12 +1320,12 @@ SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD const * pHd, SfxAllItemSet &rSe nGrouped = (sal_Int16)OSL_SWAPWORD( nGrouped ); #endif - m_nDrawXOfs = m_nDrawXOfs + (sal_Int16)SVBT16ToShort( pHd->xa ); - m_nDrawYOfs = m_nDrawYOfs + (sal_Int16)SVBT16ToShort( pHd->ya ); + m_nDrawXOfs = m_nDrawXOfs + static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )); + m_nDrawYOfs = m_nDrawYOfs + static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )); SdrObject* pObj = new SdrObjGroup; - short nLeft = (sal_Int16)SVBT16ToShort( pHd->cb ) - sizeof( WW8_DPHEAD ); + short nLeft = static_cast<sal_Int16>(SVBT16ToShort( pHd->cb )) - sizeof( WW8_DPHEAD ); for (int i = 0; i < nGrouped; i++) { SfxAllItemSet aSet(m_pDrawModel->GetItemPool()); @@ -1340,8 +1340,8 @@ SdrObject *SwWW8ImplReader::ReadGroup(WW8_DPHEAD const * pHd, SfxAllItemSet &rSe } } - m_nDrawXOfs = m_nDrawXOfs - (sal_Int16)SVBT16ToShort( pHd->xa ); - m_nDrawYOfs = m_nDrawYOfs - (sal_Int16)SVBT16ToShort( pHd->ya ); + m_nDrawXOfs = m_nDrawXOfs - static_cast<sal_Int16>(SVBT16ToShort( pHd->xa )); + m_nDrawYOfs = m_nDrawYOfs - static_cast<sal_Int16>(SVBT16ToShort( pHd->ya )); return pObj; } @@ -1699,13 +1699,13 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject const * pSdrObj, // set distances from box's border to text contained within the box if( 0 < rInnerDist.Left() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Left(), SvxBoxItemLine::LEFT ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Left()), SvxBoxItemLine::LEFT ); if( 0 < rInnerDist.Top() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Top(), SvxBoxItemLine::TOP ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Top()), SvxBoxItemLine::TOP ); if( 0 < rInnerDist.Right() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Right(), SvxBoxItemLine::RIGHT ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Right()), SvxBoxItemLine::RIGHT ); if( 0 < rInnerDist.Bottom() ) - aBox.SetDistance( (sal_uInt16)rInnerDist.Bottom(), SvxBoxItemLine::BOTTOM ); + aBox.SetDistance( static_cast<sal_uInt16>(rInnerDist.Bottom()), SvxBoxItemLine::BOTTOM ); bool bFixSize = !(WW8ITEMVALUE(rOldSet, SDRATTR_TEXT_AUTOGROWHEIGHT, SdrOnOffItem)); @@ -1869,7 +1869,7 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins( if (rRecord.nXAlign == 1) { if ((nXRelTo == 0) || (nXRelTo == 2)) - rLR.SetLeft((sal_uInt16)0); + rLR.SetLeft(sal_uInt16(0)); } // Right adjustments - if horizontally aligned to right of @@ -1877,19 +1877,19 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins( if (rRecord.nXAlign == 3) { if ((nXRelTo == 0) || (nXRelTo == 2)) - rLR.SetRight((sal_uInt16)0); + rLR.SetRight(sal_uInt16(0)); } // Inside margin, remove left wrapping if ((rRecord.nXAlign == 4) && (nXRelTo == 0)) { - rLR.SetLeft((sal_uInt16)0); + rLR.SetLeft(sal_uInt16(0)); } // Outside margin, remove left wrapping if ((rRecord.nXAlign == 5) && (nXRelTo == 0)) { - rLR.SetRight((sal_uInt16)0); + rLR.SetRight(sal_uInt16(0)); } } @@ -1907,7 +1907,7 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins( if (rRecord.nYAlign == 1) { if ((nYRelTo == 0) || (nYRelTo == 1)) - rUL.SetUpper((sal_uInt16)0); + rUL.SetUpper(sal_uInt16(0)); } // Bottom adjustment - remove bottom wrapping if aligned to page or @@ -1915,12 +1915,12 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins( if (rRecord.nYAlign == 3) { if ((nYRelTo == 0) || (nYRelTo == 1)) - rUL.SetLower((sal_uInt16)0); + rUL.SetLower(sal_uInt16(0)); } // Remove top margin if aligned vertically inside margin if ((rRecord.nYAlign == 4) && (nYRelTo == 0)) - rUL.SetUpper((sal_uInt16)0); + rUL.SetUpper(sal_uInt16(0)); } void SwWW8ImplReader::MapWrapIntoFlyFormat(SvxMSDffImportRec const * pRecord, @@ -2920,7 +2920,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, deleted and useless. */ m_xMSDffManager->StoreShapeOrder(pF->nSpId, - (((sal_uLong)pRecord->aTextId.nTxBxS) << 16) + + (static_cast<sal_uLong>(pRecord->aTextId.nTxBxS) << 16) + pRecord->aTextId.nSequence, nullptr, pRetFrameFormat); // The Contact object has to be inserted into the draw page, so diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 04f5d1b33626..8a4f11102fb6 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -358,7 +358,7 @@ SwFlyFrameFormat* SwWW8ImplReader::MakeGrafNotInContent(const WW8PicDesc& rPD, sal_Int32 nNetHeight = nHeight + rPD.nCT + rPD.nCB; if (m_xSFlyPara->nLineSpace && m_xSFlyPara->nLineSpace > nNetHeight) m_xSFlyPara->nYPos = - (sal_uInt16)( m_xSFlyPara->nYPos + m_xSFlyPara->nLineSpace - nNetHeight ); + static_cast<sal_uInt16>( m_xSFlyPara->nYPos + m_xSFlyPara->nLineSpace - nNetHeight ); WW8FlySet aFlySet(*this, m_xWFlyPara.get(), m_xSFlyPara.get(), true); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 7d16cb4449d2..e875205ae5c9 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -971,8 +971,8 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, if ( nTextId ) { - pImpRec->aTextId.nTxBxS = (sal_uInt16)( nTextId >> 16 ); - pImpRec->aTextId.nSequence = (sal_uInt16)nTextId; + pImpRec->aTextId.nTxBxS = static_cast<sal_uInt16>( nTextId >> 16 ); + pImpRec->aTextId.nSequence = static_cast<sal_uInt16>(nTextId); } pImpRec->nDxWrapDistLeft = GetPropertyValue( @@ -1060,7 +1060,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, && (rObjData.nCalledByGroup < 2) ) ) StoreShapeOrder( pImpRec->nShapeId, - ( ( (sal_uLong)pImpRec->aTextId.nTxBxS ) << 16 ) + ( static_cast<sal_uLong>(pImpRec->aTextId.nTxBxS) << 16 ) + pImpRec->aTextId.nSequence, pObj ); } else @@ -2793,7 +2793,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet() { if (!m_aFontSrcCharSets.empty()) eSrcCharSet = m_aFontSrcCharSets.top(); - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && (size_t)m_nCharFormat < m_vColl.size() ) + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() ) eSrcCharSet = m_vColl[m_nCharFormat].GetCharSet(); if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size()) eSrcCharSet = m_vColl[m_nAktColl].GetCharSet(); @@ -2817,7 +2817,7 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet() { if (!m_aFontSrcCJKCharSets.empty()) eSrcCharSet = m_aFontSrcCJKCharSets.top(); - if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && (size_t)m_nCharFormat < m_vColl.size() ) + if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) && m_nCharFormat >= 0 && static_cast<size_t>(m_nCharFormat) < m_vColl.size() ) eSrcCharSet = m_vColl[m_nCharFormat].GetCJKCharSet(); if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW && StyleExists(m_nAktColl) && m_nAktColl < m_vColl.size()) eSrcCharSet = m_vColl[m_nAktColl].GetCJKCharSet(); @@ -2918,7 +2918,7 @@ bool SwWW8ImplReader::LangUsesHindiNumbers(LanguageType nLang) { bool bResult = false; - switch ((sal_uInt16)nLang) + switch (static_cast<sal_uInt16>(nLang)) { case 0x1401: // Arabic(Algeria) case 0x3c01: // Arabic(Bahrain) @@ -3583,7 +3583,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) case 0x15: if( !m_bSpec ) // Juristenparagraph { - cp_set::iterator aItr = m_aTOXEndCps.find((WW8_CP)nPosCp); + cp_set::iterator aItr = m_aTOXEndCps.find(static_cast<WW8_CP>(nPosCp)); if (aItr == m_aTOXEndCps.end()) cInsert = u'\x00a7'; else @@ -4117,9 +4117,9 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP nTextLen, ManTypes nType) if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT && l <= nTextLen) { if (nTextLen < WW8_CP_MAX/100) - m_nProgress = (sal_uInt16)(l * 100 / nTextLen); + m_nProgress = static_cast<sal_uInt16>(l * 100 / nTextLen); else - m_nProgress = (sal_uInt16)(l / nTextLen * 100); + m_nProgress = static_cast<sal_uInt16>(l / nTextLen * 100); m_xProgress->Update(m_nProgress); // Update } } diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index ef14cddc3787..5dd7b386bb2c 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -702,7 +702,7 @@ static void SetBaseAnlv(SwNumFormat &rNum, WW8_ANLV const &rAV, sal_uInt8 nSwLev rNum.SetNumAdjust( eAdjA[ rAV.aBits1 & 0x3] ); rNum.SetCharTextDistance( SVBT16ToShort( rAV.dxaSpace ) ); - sal_Int16 nIndent = std::abs((sal_Int16)SVBT16ToShort( rAV.dxaIndent )); + sal_Int16 nIndent = std::abs(static_cast<sal_Int16>(SVBT16ToShort( rAV.dxaIndent ))); if( rAV.aBits1 & 0x08 ) //fHang { rNum.SetFirstLineOffset( -nIndent ); @@ -1250,7 +1250,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen) const sal_uInt8* pT = &pS[1]; for (int i = 0; i <= nCols; i++, pT+=2) - nCenter[i] = (sal_Int16)SVBT16ToShort( pT ); // X-borders + nCenter[i] = static_cast<sal_Int16>(SVBT16ToShort( pT )); // X-borders if( nCols != nOldCols ) // different column count { @@ -1432,7 +1432,7 @@ void WW8TabBandDesc::ProcessSprmTDxaCol(const sal_uInt8* pParamsTDxaCol) { sal_uInt8 nitcFirst= pParamsTDxaCol[0]; // first col to be changed sal_uInt8 nitcLim = pParamsTDxaCol[1]; // (last col to be changed)+1 - short nDxaCol = (sal_Int16)SVBT16ToShort( pParamsTDxaCol + 2 ); + short nDxaCol = static_cast<sal_Int16>(SVBT16ToShort( pParamsTDxaCol + 2 )); for( int i = nitcFirst; (i < nitcLim) && (i < nWwCols); i++ ) { @@ -1975,10 +1975,10 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : m_bIsBiDi = SVBT16ToShort(pParams) != 0; break; case sprmTDxaGapHalf: - pNewBand->nGapHalf = (sal_Int16)SVBT16ToShort( pParams ); + pNewBand->nGapHalf = static_cast<sal_Int16>(SVBT16ToShort( pParams )); break; case sprmTDyaRowHeight: - pNewBand->nLineHeight = (sal_Int16)SVBT16ToShort( pParams ); + pNewBand->nLineHeight = static_cast<sal_Int16>(SVBT16ToShort( pParams )); m_bClaimLineFormat = true; break; case sprmTDefTable: @@ -1997,7 +1997,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : // parameter (meaning the left-most position) and then // shift the whole table to that margin (see below) { - short nDxaNew = (sal_Int16)SVBT16ToShort( pParams ); + short nDxaNew = static_cast<sal_Int16>(SVBT16ToShort( pParams )); if( nDxaNew < nTabeDxaNew ) nTabeDxaNew = nDxaNew; } @@ -2393,7 +2393,7 @@ void WW8TabDesc::CalcDefaults() sal_uInt16 j = ( pR->bLEmptyCol ) ? 1 : 0; for (i = 0; i < pR->nWwCols; ++i) { - pR->nTransCell[i] = (sal_Int8)j; + pR->nTransCell[i] = static_cast<sal_Int8>(j); if ( pR->nCenter[i] < pR->nCenter[i+1] ) { pR->bExist[i] = true; @@ -2422,8 +2422,8 @@ void WW8TabDesc::CalcDefaults() pR->nTransCell[n] = pR->nTransCell[k]; } - pR->nTransCell[i++] = (sal_Int8)(j++); // Can exceed by 2 among other - pR->nTransCell[i] = (sal_Int8)j; // things because of bREmptyCol + pR->nTransCell[i++] = static_cast<sal_Int8>(j++); // Can exceed by 2 among other + pR->nTransCell[i] = static_cast<sal_Int8>(j); // things because of bREmptyCol pR->nSwCols = pR->nSwCols + nAddCols; if( pR->nSwCols < nMinCols ) @@ -2665,9 +2665,9 @@ void WW8TabDesc::MergeCells() // start a new merge group if appropriate - OSL_ENSURE(nRow < (sal_uInt16)m_pTabLines->size(), + OSL_ENSURE(nRow < static_cast<sal_uInt16>(m_pTabLines->size()), "Too few lines, table ended early"); - if (nRow >= (sal_uInt16)m_pTabLines->size()) + if (nRow >= static_cast<sal_uInt16>(m_pTabLines->size())) return; m_pTabLine = (*m_pTabLines)[ nRow ]; m_pTabBoxes = &m_pTabLine->GetTabBoxes(); @@ -2788,7 +2788,7 @@ void WW8TabDesc::ParkPaM() { SwTableBox *pTabBox2 = nullptr; short nRow = m_nAktRow + 1; - if (nRow < (sal_uInt16)m_pTabLines->size()) + if (nRow < static_cast<sal_uInt16>(m_pTabLines->size())) { if (SwTableLine *pLine = (*m_pTabLines)[nRow]) { @@ -2949,7 +2949,7 @@ bool WW8TabDesc::IsValidCell(short nCol) const { return (static_cast<size_t>(nCol) < SAL_N_ELEMENTS(m_pActBand->bExist)) && m_pActBand->bExist[nCol] && - (sal_uInt16)m_nAktRow < m_pTabLines->size(); + static_cast<sal_uInt16>(m_nAktRow) < m_pTabLines->size(); } bool WW8TabDesc::InFirstParaInCell() const @@ -2992,7 +2992,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam) sal_uInt16 nCol = m_pActBand->transCell(nWwCol); - if ((sal_uInt16)m_nAktRow >= m_pTabLines->size()) + if (static_cast<sal_uInt16>(m_nAktRow) >= m_pTabLines->size()) { OSL_ENSURE(false, "Actual row bigger than expected." ); if (bPam) @@ -3254,7 +3254,7 @@ void WW8TabDesc::AdjustNewBand() InsertCells( m_pActBand->nSwCols - m_nDefaultSwCols ); SetPamInCell( 0, false); - OSL_ENSURE( m_pTabBoxes && m_pTabBoxes->size() == (sal_uInt16)m_pActBand->nSwCols, + OSL_ENSURE( m_pTabBoxes && m_pTabBoxes->size() == static_cast<sal_uInt16>(m_pActBand->nSwCols), "Wrong column count in table" ); if( m_bClaimLineFormat ) diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 8dc161d582d4..9acf6575441a 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -565,8 +565,8 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet for(int i=0;i<4;++i) rParaSprms.push_back(*pBegin++); short nDxaLeft = SVBT16ToShort(aSprm.pSprm); - aLVL.nDxaLeft = (0 < nDxaLeft) ? (sal_uInt16)nDxaLeft - : (sal_uInt16)(-nDxaLeft); + aLVL.nDxaLeft = (0 < nDxaLeft) ? static_cast<sal_uInt16>(nDxaLeft) + : static_cast<sal_uInt16>(-nDxaLeft); } // "sprmPDxaLeft1" pap.dxaLeft1;dxa;word; @@ -636,8 +636,8 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet if (bDoAdjust) { aLVL.nDxaLeft = (0 < nTabPos) - ? (sal_uInt16)nTabPos - : (sal_uInt16)(-nTabPos); + ? static_cast<sal_uInt16>(nTabPos) + : static_cast<sal_uInt16>(-nTabPos); aLVL.nDxaLeft1 = nDesired - aLVL.nDxaLeft; } @@ -710,7 +710,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet // 5. convert read values into Writer syntax if( 0 <= aLVL.nStartAt ) - nStartNo = (sal_uInt16)aLVL.nStartAt; + nStartNo = static_cast<sal_uInt16>(aLVL.nStartAt); switch( aLVL.nNFC ) { @@ -2010,7 +2010,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, } else { - m_nLFOPosition = (sal_uInt16)nData-1; + m_nLFOPosition = static_cast<sal_uInt16>(nData)-1; /* If we are a ww8+ style with ww7- style lists then there is a bizarre broken word bug where when the list is removed from a para @@ -2283,7 +2283,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, OUString aNm; if (xPropSetInfo->hasPropertyByName(aNm = "TextColor")) { - aTmp <<= (sal_Int32)static_cast<const SvxColorItem*>(pItem)->GetValue().GetColor(); + aTmp <<= static_cast<sal_Int32>(static_cast<const SvxColorItem*>(pItem)->GetValue().GetColor()); rPropSet->setPropertyValue(aNm, aTmp); } } @@ -2300,17 +2300,17 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, } if (xPropSetInfo->hasPropertyByName(aNm = "FontFamily")) { - aTmp <<= (sal_Int16)pFontItem->GetFamily(); + aTmp <<= static_cast<sal_Int16>(pFontItem->GetFamily()); rPropSet->setPropertyValue( aNm, aTmp ); } if (xPropSetInfo->hasPropertyByName(aNm = "FontCharset")) { - aTmp <<= (sal_Int16)pFontItem->GetCharSet(); + aTmp <<= static_cast<sal_Int16>(pFontItem->GetCharSet()); rPropSet->setPropertyValue( aNm, aTmp ); } if (xPropSetInfo->hasPropertyByName(aNm = "FontPitch")) { - aTmp <<= (sal_Int16)pFontItem->GetPitch(); + aTmp <<= static_cast<sal_Int16>(pFontItem->GetPitch()); rPropSet->setPropertyValue( aNm, aTmp ); } @@ -2327,7 +2327,7 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, { Size aSize( aFont.GetFontSize().Width(), static_cast<const SvxFontHeightItem*>(pItem)->GetHeight() ); - aTmp <<= ((float)aSize.Height()) / 20.0; + aTmp <<= static_cast<float>(aSize.Height()) / 20.0; aFont.SetFontSize(OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::MapTwip), MapMode(MapUnit::Map100thMM))); @@ -2341,17 +2341,17 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, break; case RES_CHRATR_UNDERLINE: - aTmp <<= (sal_Int16)(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); + aTmp <<= static_cast<sal_Int16>(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); aFont.SetUnderline(static_cast<const SvxUnderlineItem*>(pItem)->GetLineStyle()); break; case RES_CHRATR_CROSSEDOUT: - aTmp <<= (sal_Int16)( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); + aTmp <<= static_cast<sal_Int16>( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); aFont.SetStrikeout( static_cast<const SvxCrossedOutItem*>(pItem)->GetStrikeout() ); break; case RES_CHRATR_POSTURE: - aTmp <<= (sal_Int16)( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); + aTmp <<= static_cast<sal_Int16>( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); aFont.SetItalic( static_cast<const SvxPostureItem*>(pItem)->GetPosture() ); break; @@ -2494,7 +2494,7 @@ bool WW8FormulaCheckBox::Import(const uno::Reference < aTmp <<= msName; xPropSet->setPropertyValue("Name", aTmp ); - aTmp <<= (sal_Int16)mnChecked; + aTmp <<= static_cast<sal_Int16>(mnChecked); xPropSet->setPropertyValue("DefaultState", aTmp); if (!msToolTip.isEmpty()) @@ -2550,7 +2550,7 @@ bool SwMSConvertControls::InsertControl( xShapePropSet->setPropertyValue("AnchorType", uno::Any((sal_Int16)nTemp) ); - xShapePropSet->setPropertyValue("VertOrient", uno::Any((sal_Int16)text::VertOrientation::TOP) ); + xShapePropSet->setPropertyValue("VertOrient", uno::Any(sal_Int16(text::VertOrientation::TOP)) ); uno::Reference< text::XText > xDummyTextRef; uno::Reference< text::XTextRange > xTextRg = diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 27c49f859786..21cfb299c8e2 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -3581,7 +3581,7 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM const &rPaM, const OUString &rStr, // if NO String just ignore the \l if( !sParams.isEmpty() && sParams[0]>'0' && sParams[0]<='9' ) { - nLevel = (sal_uInt16)sParams.toInt32(); + nLevel = static_cast<sal_uInt16>(sParams.toInt32()); } } break; diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 95356895f1aa..7b5947ec34b6 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -839,7 +839,7 @@ void wwSectionManager::CreateSep(const long nTextPos) aLastSection = maSegments.back(); //Here - sal_uInt16 nLIdx = ( ( (sal_uInt16)mrReader.m_xWwFib->m_lid & 0xff ) == 0x9 ) ? 1 : 0; + sal_uInt16 nLIdx = ( ( static_cast<sal_uInt16>(mrReader.m_xWwFib->m_lid) & 0xff ) == 0x9 ) ? 1 : 0; //BEGIN read section values wwSection aNewSection(*mrReader.m_pPaM->GetPoint()); @@ -1542,7 +1542,7 @@ inline bool SetValSprm( sal_Int16* pVar, WW8PLCFx_Cp_FKP* pPap, sal_uInt16 nId ) { SprmResult aS = pPap->HasSprm(nId); if (aS.pSprm && aS.nRemainingData >= 2) - *pVar = (sal_Int16)SVBT16ToShort(aS.pSprm); + *pVar = static_cast<sal_Int16>(SVBT16ToShort(aS.pSprm)); return aS.pSprm != nullptr; } @@ -1550,7 +1550,7 @@ inline bool SetValSprm( sal_Int16* pVar, const WW8RStyle* pStyle, sal_uInt16 nId { SprmResult aS = pStyle->HasParaSprm(nId); if (aS.pSprm && aS.nRemainingData >= 2) - *pVar = (sal_Int16)SVBT16ToShort(aS.pSprm); + *pVar = static_cast<sal_Int16>(SVBT16ToShort(aS.pSprm)); return aS.pSprm != nullptr; } @@ -1898,7 +1898,7 @@ bToggelPos(false) nLoMgn = 0; break; // down default: - nYPos = rWW.nSp27 + (short)nIniFlyDy; + nYPos = rWW.nSp27 + static_cast<short>(nIniFlyDy); break; // corrections from ini file } @@ -1924,7 +1924,7 @@ bToggelPos(false) bToggelPos = true; break; // outside default: - nXPos = rWW.nSp26 + (short)nIniFlyDx; + nXPos = rWW.nSp26 + static_cast<short>(nIniFlyDx); break; // corrections from ini file } @@ -3362,7 +3362,7 @@ void SwWW8ImplReader::Read_SubSuperProp( sal_uInt16, const sal_uInt8* pData, sho nPos2 = 100; if( nPos2 < -100 ) nPos2 = -100; - SvxEscapementItem aEs( (short)nPos2, 100, RES_CHRATR_ESCAPEMENT ); + SvxEscapementItem aEs( static_cast<short>(nPos2), 100, RES_CHRATR_ESCAPEMENT ); NewAttr( aEs ); } @@ -3914,7 +3914,7 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen } NewAttr( SwFormatCharFormat( static_cast<SwCharFormat*>(m_vColl[nId].m_pFormat) ) ); - m_nCharFormat = (short) nId; + m_nCharFormat = static_cast<short>(nId); } /* @@ -3939,7 +3939,7 @@ void SwWW8ImplReader::Read_FontKern( sal_uInt16, const sal_uInt8* pData, short n return; } sal_Int16 nAutoKern = SVBT16ToShort( pData ); // Kerning in Twips - NewAttr(SvxAutoKernItem((bool)nAutoKern, RES_CHRATR_AUTOKERN)); + NewAttr(SvxAutoKernItem(static_cast<bool>(nAutoKern), RES_CHRATR_AUTOKERN)); } void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, short nLen ) @@ -4235,15 +4235,15 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short // as discussed with AMA, the limit is nonsensical if( n>200 ) n = 200; // SW_UI maximum - aLSpc.SetPropLineSpace( (sal_uInt8)n ); + aLSpc.SetPropLineSpace( static_cast<sal_uInt8>(n) ); const SvxFontHeightItem* pH = static_cast<const SvxFontHeightItem*>( GetFormatAttr( RES_CHRATR_FONTSIZE )); - nSpaceTw = (sal_uInt16)( n * pH->GetHeight() / 100 ); + nSpaceTw = static_cast<sal_uInt16>( n * pH->GetHeight() / 100 ); } else // Fixed / Minimum { // for negative space, the distance is "exact", otherwise "at least" - nSpaceTw = (sal_uInt16)nSpace; + nSpaceTw = static_cast<sal_uInt16>(nSpace); aLSpc.SetLineHeight( nSpaceTw ); aLSpc.SetLineSpaceRule( eLnSpc); } @@ -4900,16 +4900,16 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8*, short nLen) GetBorderDistance( aBrcs, aInnerDist ); if (nBorder & (1 << WW8_LEFT)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Left(), SvxBoxItemLine::LEFT ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Left()), SvxBoxItemLine::LEFT ); if (nBorder & (1 << WW8_TOP)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Top(), SvxBoxItemLine::TOP ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Top()), SvxBoxItemLine::TOP ); if (nBorder & (1 << WW8_RIGHT)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Right(), SvxBoxItemLine::RIGHT ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Right()), SvxBoxItemLine::RIGHT ); if (nBorder & (1 << WW8_BOT)) - aBox.SetDistance( (sal_uInt16)aInnerDist.Bottom(), SvxBoxItemLine::BOTTOM ); + aBox.SetDistance( static_cast<sal_uInt16>(aInnerDist.Bottom()), SvxBoxItemLine::BOTTOM ); NewAttr( aBox ); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 0ac70ba1be37..a881fab5be0c 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1010,8 +1010,8 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if (IsSevenMinus(GetFIBVersion())) { - aShortSprm[0] = (sal_uInt8)( ( nPrm & 0xfe) >> 1 ); - aShortSprm[1] = (sal_uInt8)( nPrm >> 8 ); + aShortSprm[0] = static_cast<sal_uInt8>( ( nPrm & 0xfe) >> 1 ); + aShortSprm[1] = static_cast<sal_uInt8>( nPrm >> 8 ); p->nSprmsLen = nPrm ? 2 : 0; // length // store Position of internal mini storage in Data Pointer @@ -1021,7 +1021,7 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) { p->pMemPos = nullptr; p->nSprmsLen = 0; - sal_uInt8 nSprmListIdx = (sal_uInt8)((nPrm & 0xfe) >> 1); + sal_uInt8 nSprmListIdx = static_cast<sal_uInt8>((nPrm & 0xfe) >> 1); if( nSprmListIdx ) { // process Sprm Id Matching as explained in MS Documentation @@ -1107,9 +1107,9 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p) if( nSprmId ) { // move Sprm Id and Sprm Param to internal mini storage: - aShortSprm[0] = (sal_uInt8) ( nSprmId & 0x00ff) ; - aShortSprm[1] = (sal_uInt8)( ( nSprmId & 0xff00) >> 8 ); - aShortSprm[2] = (sal_uInt8)( nPrm >> 8 ); + aShortSprm[0] = static_cast<sal_uInt8>( nSprmId & 0x00ff) ; + aShortSprm[1] = static_cast<sal_uInt8>( ( nSprmId & 0xff00) >> 8 ); + aShortSprm[2] = static_cast<sal_uInt8>( nPrm >> 8 ); // store Sprm Length in member: p->nSprmsLen = nPrm ? 3 : 0; @@ -1365,7 +1365,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const short nMSTotalWidth; //Specification in 8ths of a point, 1 Point = 20 Twips, so by 2.5 - nMSTotalWidth = (short)dptLineWidth() * 20 / 8; + nMSTotalWidth = static_cast<short>(dptLineWidth()) * 20 / 8; //Figure out the real size of the border according to word switch (brcType()) @@ -1418,7 +1418,7 @@ short WW8_BRCVer9::DetermineBorderProperties(short *pSpace) const } if (pSpace) - *pSpace = (short)dptSpace() * 20; // convert from points to twips + *pSpace = static_cast<short>(dptSpace()) * 20; // convert from points to twips return nMSTotalWidth; } @@ -4247,7 +4247,7 @@ void WW8PLCFx_Book::SetIdx2(sal_uInt32 nI) if( nIMax ) { pBook[1]->SetIdx( nI & 0x7fffffff ); - nIsEnd = (sal_uInt16)( ( nI >> 31 ) & 1 ); // 0 or 1 + nIsEnd = static_cast<sal_uInt16>( ( nI >> 31 ) & 1 ); // 0 or 1 } } @@ -6213,7 +6213,7 @@ void WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, m_wIdent ); Set_UInt16( pData, m_nFib ); Set_UInt16( pData, m_nProduct ); - Set_UInt16( pData, (sal_uInt16)m_lid ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_lid) ); Set_UInt16( pData, m_pnNext ); sal_uInt16 nBits16 = 0; @@ -6269,7 +6269,7 @@ void WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, m_wMagicCreatedPrivate ); Set_UInt16( pData, m_wMagicRevisedPrivate ); pData += 9 * sizeof( sal_Int16 ); - Set_UInt16( pData, (sal_uInt16)m_lidFE ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_lidFE) ); Set_UInt16( pData, m_clw ); } @@ -6417,10 +6417,10 @@ void WW8Fib::Write(SvStream& rStrm) if( !bVer8 ) { pData += 1*sizeof( sal_Int16); - Set_UInt16( pData, (sal_uInt16)m_pnChpFirst ); - Set_UInt16( pData, (sal_uInt16)m_pnPapFirst ); - Set_UInt16( pData, (sal_uInt16)m_cpnBteChp ); - Set_UInt16( pData, (sal_uInt16)m_cpnBtePap ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_pnChpFirst) ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_pnPapFirst) ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_cpnBteChp) ); + Set_UInt16( pData, static_cast<sal_uInt16>(m_cpnBtePap) ); } Set_UInt32( pData, m_fcPlcfdoaMom ); // only at Ver67, in Ver8 unused @@ -6493,8 +6493,8 @@ void WW8Fib::Write(SvStream& rStrm) Set_UInt32( pData, m_lcbPlcfTch ); pData += 0x3FA - 0x38A; - Set_UInt16( pData, (sal_uInt16)0x0002); - Set_UInt16( pData, (sal_uInt16)0x00D9); + Set_UInt16( pData, sal_uInt16(0x0002)); + Set_UInt16( pData, sal_uInt16(0x00D9)); pData += 0x41A - 0x3FE; Set_UInt32( pData, m_fcAtrdExtra ); @@ -6529,7 +6529,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs, LanguageType nLidLocale) OSL_ENSURE(chs <= 0x100, "overflowed winword charset set"); if (chs == 0x0100) return RTL_TEXTENCODING_APPLE_ROMAN; - if (chs == 0 && (sal_uInt16)nLidLocale >= 999) + if (chs == 0 && static_cast<sal_uInt16>(nLidLocale) >= 999) { /* nLidLocale: diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index b6f89d346316..bcf4311491c0 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -295,8 +295,8 @@ struct WW8_BRC // BoRder Code (WW8 version) aBits1[0] = _dptLineWidth; aBits1[1] = _brcType; aBits2[0] = _ico; - aBits2[1] = _dptSpace | ((sal_uInt8)_fShadow << 5) - | ((sal_uInt8)_fFrame << 6); + aBits2[1] = _dptSpace | (static_cast<sal_uInt8>(_fShadow) << 5) + | (static_cast<sal_uInt8>(_fFrame) << 6); } // Convert BRC from WW6 to WW8 format explicit WW8_BRC(const WW8_BRCVer6& brcVer6); @@ -346,8 +346,8 @@ struct WW8_BRCVer9 // BoRder Code (WW9 version) UInt32ToSVBT32(_cv, aBits1); aBits2[0] = _dptLineWidth; aBits2[1] = _brcType; - aBits2[2] = _dptSpace | ((sal_uInt8)_fShadow << 5) - | ((sal_uInt8)_fFrame << 6); + aBits2[2] = _dptSpace | (static_cast<sal_uInt8>(_fShadow) << 5) + | (static_cast<sal_uInt8>(_fFrame) << 6); aBits2[3] = 0; } // Convert BRC from WW8 to WW9 format @@ -582,10 +582,10 @@ private: public: WW8_SHD() : maBits(0) {} - sal_uInt8 GetFore() const { return (sal_uInt8)( maBits & 0x1f); } - sal_uInt8 GetBack() const { return (sal_uInt8)((maBits >> 5 ) & 0x1f); } + sal_uInt8 GetFore() const { return static_cast<sal_uInt8>( maBits & 0x1f); } + sal_uInt8 GetBack() const { return static_cast<sal_uInt8>((maBits >> 5 ) & 0x1f); } sal_uInt8 GetStyle(bool bVer67) const - { return (sal_uInt8)((maBits >> 10) & ( bVer67 ? 0x1f : 0x3f ) ); } + { return static_cast<sal_uInt8>((maBits >> 10) & ( bVer67 ? 0x1f : 0x3f ) ); } sal_uInt16 GetValue() const { return maBits; } diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index dd1f4269c9a6..01831bd6826f 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -469,7 +469,7 @@ void SwXMLExport::ExportContent_() if (xPropSet.is()) { Any aAny = xPropSet->getPropertyValue( "TwoDigitYear" ); - aAny <<= (sal_Int16)1930; + aAny <<= sal_Int16(1930); sal_Int16 nYear = 0; aAny >>= nYear; diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index ed6b8fdca1fa..6c2d08571f14 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -106,8 +106,7 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami rFormat.GetAttrSet().GetItemState( RES_BOXATR_FORMAT, false, &pItem ) ) { - sal_Int32 nFormat = (sal_Int32) - static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue(); + sal_Int32 nFormat = static_cast<sal_Int32>(static_cast<const SwTableBoxNumFormat *>(pItem)->GetValue()); if ( (nFormat != -1) && (nFormat != static_cast<sal_Int32>(getSwDefaultTextFormat())) ) { diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 0a837a0bfcda..d4e9344d6b8a 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -286,10 +286,10 @@ bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_L_MARGIN: - rLRSpace.SetTextLeft( nAbs, (sal_uInt16)nProp ); + rLRSpace.SetTextLeft( nAbs, static_cast<sal_uInt16>(nProp) ); break; case MID_R_MARGIN: - rLRSpace.SetRight( nAbs, (sal_uInt16)nProp ); + rLRSpace.SetRight( nAbs, static_cast<sal_uInt16>(nProp) ); break; } } @@ -307,7 +307,7 @@ bool SvXMLImportItemMapper::PutXMLValue( bOk = rUnitConverter.convertMeasureToCore(nAbs, rValue, -0x7fff, 0x7fff ); - rLRSpace.SetTextFirstLineOfst( (short)nAbs, (sal_uInt16)nProp ); + rLRSpace.SetTextFirstLineOfst( static_cast<short>(nAbs), static_cast<sal_uInt16>(nProp) ); } break; @@ -341,10 +341,10 @@ bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_UP_MARGIN: - rULSpace.SetUpper( (sal_uInt16)nAbs, (sal_uInt16)nProp ); + rULSpace.SetUpper( static_cast<sal_uInt16>(nAbs), static_cast<sal_uInt16>(nProp) ); break; case MID_LO_MARGIN: - rULSpace.SetLower( (sal_uInt16)nAbs, (sal_uInt16)nProp ); + rULSpace.SetLower( static_cast<sal_uInt16>(nAbs), static_cast<sal_uInt16>(nProp) ); break; default: OSL_FAIL("unknown MemberId"); @@ -456,16 +456,16 @@ bool SvXMLImportItemMapper::PutXMLValue( if( nMemberId == LEFT_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::LEFT ); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::LEFT ); if( nMemberId == RIGHT_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::RIGHT ); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::RIGHT ); if( nMemberId == TOP_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::TOP ); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::TOP ); if( nMemberId == BOTTOM_BORDER_PADDING || nMemberId == ALL_BORDER_PADDING ) - rBox.SetDistance( (sal_uInt16)nTemp, SvxBoxItemLine::BOTTOM); + rBox.SetDistance( static_cast<sal_uInt16>(nTemp), SvxBoxItemLine::BOTTOM); break; case ALL_BORDER: @@ -792,7 +792,7 @@ bool SvXMLImportItemMapper::PutXMLValue( // "auto" as "0" for tables - now that we support a real offset // 0, this fake "0" MUST NOT be imported as offset 0! if( bOk && nVal > 0 ) - rPageDesc.SetNumOffset( (sal_uInt16)nVal ); + rPageDesc.SetNumOffset( static_cast<sal_uInt16>(nVal) ); } } break; @@ -870,7 +870,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > 100 ) nValue = 100; - rFrameSize.SetWidthPercent( (sal_Int8)nValue ); + rFrameSize.SetWidthPercent( static_cast<sal_Int8>(nValue) ); } } break; @@ -905,7 +905,7 @@ bool SvXMLImportItemMapper::PutXMLValue( else if( nValue > USHRT_MAX ) nValue = USHRT_MAX; - rFrameSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetWidth( static_cast<sal_uInt16>(nValue) ); rFrameSize.SetHeightSizeType( ATT_VAR_SIZE ); bOk = true; } @@ -921,9 +921,9 @@ bool SvXMLImportItemMapper::PutXMLValue( if( bOk ) { if( bSetWidth ) - rFrameSize.SetWidth( (sal_uInt16)nValue ); + rFrameSize.SetWidth( static_cast<sal_uInt16>(nValue) ); if( bSetHeight ) - rFrameSize.SetHeight( (sal_uInt16)nValue ); + rFrameSize.SetHeight( static_cast<sal_uInt16>(nValue) ); if( bSetSizeType ) rFrameSize.SetHeightSizeType( eSizeType ); } diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index a4d23808bbaf..7272cd5ae31b 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -134,7 +134,7 @@ bool sw_frmitems_parseXMLBorder( const OUString& rValue, else if( !rHasWidth && rUnitConverter.convertMeasureToCore(nTemp, aToken, 0, USHRT_MAX)) { - rWidth = (sal_uInt16)nTemp; + rWidth = static_cast<sal_uInt16>(nTemp); rHasWidth = true; } else diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index b4d5d8189b9d..0cc6a161197b 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -147,7 +147,7 @@ void SwXMLImport::SetStatistics( // and autostyles. sal_Int32 nProgressReference = 250; if( nTokens & XML_TOK_META_STAT_PARA ) - nProgressReference = (sal_Int32)aDocStat.nPara; + nProgressReference = static_cast<sal_Int32>(aDocStat.nPara); else if ( nTokens & XML_TOK_META_STAT_PAGE ) o3tl::checked_multiply<sal_Int32>(aDocStat.nPage, 10, nProgressReference); ProgressBarHelper* pProgress = GetProgressBarHelper(); diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index d68d5e06148a..4077ce852723 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -88,9 +88,9 @@ struct SwXMLTableColumnCmpWidth_Impl { bool operator()( SwXMLTableColumn_Impl* const& lhs, SwXMLTableColumn_Impl* const& rhs ) const { - sal_Int32 n = (sal_Int32)lhs->GetWidthOpt() - (sal_Int32)rhs->GetWidthOpt(); + sal_Int32 n = static_cast<sal_Int32>(lhs->GetWidthOpt()) - static_cast<sal_Int32>(rhs->GetWidthOpt()); if( !n ) - n = (sal_Int32)lhs->GetRelWidth() - (sal_Int32)rhs->GetRelWidth(); + n = static_cast<sal_Int32>(lhs->GetRelWidth()) - static_cast<sal_Int32>(rhs->GetRelWidth()); return n < 0; } }; @@ -296,7 +296,7 @@ static OUString lcl_xmltble_appendBoxPrefix(const OUString& rNamePrefix, if( bTop ) { OUString sTmp; - sw_GetTableBoxColStr( (sal_uInt16)nCol, sTmp ); + sw_GetTableBoxColStr( static_cast<sal_uInt16>(nCol), sTmp ); return rNamePrefix + "." + sTmp + OUString::number(nRow + 1); } return rNamePrefix @@ -543,7 +543,7 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol ) } if( rCol.GetRelWidth() ) { - sValue.append( (sal_Int32)rCol.GetRelWidth() ); + sValue.append( static_cast<sal_Int32>(rCol.GetRelWidth()) ); sValue.append( '*' ); AddAttribute( XML_NAMESPACE_STYLE, XML_REL_COLUMN_WIDTH, sValue.makeStringAndClear() ); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 7025f9efb2f1..f1738423c6b4 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -470,13 +470,13 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( GetImport().GetTextImport()->SetCellParaStyleDefault(rValue); break; case XML_TOK_TABLE_NUM_COLS_SPANNED: - nColSpan = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nColSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); break; case XML_TOK_TABLE_NUM_ROWS_SPANNED: - nRowSpan = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nRowSpan = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); break; case XML_TOK_TABLE_NUM_COLS_REPEATED: - nColRepeat = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nColRepeat = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); break; case XML_TOK_TABLE_FORMULA: { @@ -751,7 +751,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( if( IsXMLToken( aLocalName, XML_STYLE_NAME ) ) aStyleName = rValue; else if( IsXMLToken( aLocalName, XML_NUMBER_COLUMNS_REPEATED ) ) - nColRep = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nColRep = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) aDfltCellStyleName = rValue; } @@ -891,7 +891,7 @@ SwXMLTableRowContext_Impl::SwXMLTableRowContext_Impl( SwXMLImport& rImport, } else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) { - nRowRepeat = (sal_uInt32)std::max<sal_Int32>(1, rValue.toInt32()); + nRowRepeat = static_cast<sal_uInt32>(std::max<sal_Int32>(1, rValue.toInt32())); } else if( IsXMLToken( aLocalName, XML_DEFAULT_CELL_STYLE_NAME ) ) { @@ -2400,12 +2400,12 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) } if( nRelWidth != m_nWidth && nRelWidth && nCols ) { - double n = (double)m_nWidth / (double)nRelWidth; + double n = static_cast<double>(m_nWidth) / static_cast<double>(nRelWidth); nRelWidth = 0; for( colIter = m_aColumnWidths.begin(); colIter < m_aColumnWidths.end() - 1; ++colIter) { - sal_Int32 nW = (sal_Int32)( colIter->width * n); - colIter->width = (sal_uInt16)nW; + sal_Int32 nW = static_cast<sal_Int32>( colIter->width * n); + colIter->width = static_cast<sal_uInt16>(nW); nRelWidth += nW; } m_aColumnWidths.back().width = (m_nWidth-nRelWidth); @@ -2420,7 +2420,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // The absolute space that is available for all columns with a // relative width. sal_Int32 nAbsForRelWidth = - m_nWidth > nAbsWidth ? m_nWidth - nAbsWidth : (sal_Int32)0L; + m_nWidth > nAbsWidth ? m_nWidth - nAbsWidth : sal_Int32(0L); // The relative width that has to be distributed in addition to // equally widthed columns. @@ -2430,7 +2430,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox ) // minimum widthed columns. sal_Int32 nMinAbs = nRelCols * MINLAY; sal_Int32 nExtraAbs = - nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L; + nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : sal_Int32(0L); bool bMin = false; // Do all columns get the mininum width? bool bMinExtra = false; // Do all columns get the minimum width plus @@ -2665,7 +2665,7 @@ void SwXMLTableContext::MakeTable() else { m_nWidth = pSize->GetWidth(); - if( m_nWidth < (sal_Int32)GetColumnCount() * MINLAY ) + if( m_nWidth < static_cast<sal_Int32>(GetColumnCount()) * MINLAY ) { m_nWidth = GetColumnCount() * MINLAY; } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 3e9016dabc70..2324d667cb39 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -134,10 +134,10 @@ static void lcl_addOutplaceProperties( *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), Any(sal_Int32(0)) ); pStates++; - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), Any((sal_Int32)aSize.Width()) ); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), Any(static_cast<sal_Int32>(aSize.Width())) ); pStates++; - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), Any((sal_Int32)aSize.Height()) ); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), Any(static_cast<sal_Int32>(aSize.Height())) ); } } diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 1a0afbb65ca5..0e2386f64dc6 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -53,7 +53,7 @@ void SwBreakDlg::Apply() oPgNum = boost::none; if (m_pPageNumBox->IsChecked()) { - oPgNum = (sal_uInt16)m_pPageNumEdit->GetValue(); + oPgNum = static_cast<sal_uInt16>(m_pPageNumEdit->GetValue()); } } } diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 3e79b84c2dd9..cac7cbfa27f0 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -183,7 +183,7 @@ OUString GetDefaultString(sal_Int32 nChars) { OUString aStr; for (sal_Int32 i = 0; i < nChars; i++) - aStr += OUString((char) (i + 65)); + aStr += OUString(static_cast<char>(i + 65)); return aStr; } @@ -758,9 +758,9 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit&, rEdit, void ) if (&rEdit == m_pDropCapsField || &rEdit == m_pTextEdit) m_pPict->SetText (sPreview); else if (&rEdit == m_pLinesField) - m_pPict->SetLines((sal_uInt8)m_pLinesField->GetValue()); + m_pPict->SetLines(static_cast<sal_uInt8>(m_pLinesField->GetValue())); else - m_pPict->SetDistance((sal_uInt16)m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP))); + m_pPict->SetDistance(static_cast<sal_uInt16>(m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP)))); bModified = true; } @@ -781,9 +781,9 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet ) if(bOn) { // quantity, lines, gap - aFormat.GetChars() = (sal_uInt8) m_pDropCapsField->GetValue(); - aFormat.GetLines() = (sal_uInt8) m_pLinesField->GetValue(); - aFormat.GetDistance() = (sal_uInt16) m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP)); + aFormat.GetChars() = static_cast<sal_uInt8>(m_pDropCapsField->GetValue()); + aFormat.GetLines() = static_cast<sal_uInt8>(m_pLinesField->GetValue()); + aFormat.GetDistance() = static_cast<sal_uInt16>(m_pDistanceField->Denormalize(m_pDistanceField->GetValue(FUNIT_TWIP))); aFormat.GetWholeWord() = m_pWholeWordCB->IsChecked(); // template diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 239b64060bd6..998c68db1507 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -169,7 +169,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); rSet->Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); rSet->Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, - bNumberNewStartChecked && bNewStartChecked ? (sal_uInt16)m_pNewStartNF->GetValue() : USHRT_MAX)); + bNumberNewStartChecked && bNewStartChecked ? static_cast<sal_uInt16>(m_pNewStartNF->GetValue()) : USHRT_MAX)); } if(m_pCountParaCB->IsValueChangedFromSaved()|| diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 6775525988eb..1787465d263b 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -175,7 +175,7 @@ bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) m_pConfigItem->SetMailServer(m_pServerED->GetText()); if(m_pPortNF->IsModified()) - m_pConfigItem->SetMailPort((sal_Int16)m_pPortNF->GetValue()); + m_pConfigItem->SetMailPort(static_cast<sal_Int16>(m_pPortNF->GetValue())); m_pConfigItem->SetSecureConnection(m_pSecureCB->IsChecked()); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index e03e43a2994e..688125e3202a 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -245,7 +245,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) aEntry.getValue<bool>( SvtCompatibilityEntry::Index::ProtectForm ), aEntry.getValue<bool>( SvtCompatibilityEntry::Index::MsWordTrailingBlanks ), aEntry.getValue<bool>( SvtCompatibilityEntry::Index::SubtractFlysAnchoredAtFlys ) ); - m_pFormattingLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)nOptions) ); + m_pFormattingLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(nOptions)) ); } m_pFormattingLB->SetDropDownLineCount( m_pFormattingLB->GetEntryCount() ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 476602aee9f2..6a09f0003446 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -118,7 +118,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) { // use only these metrics sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric ); - m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) ); + m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); break; } default:; //prevent warning @@ -221,7 +221,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) if ( m_pMetricLB->IsValueChangedFromSaved() ) { // Double-Cast for VA3.0 - const sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( nMPos )); + const sal_uInt16 nFieldUnit = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( nMPos ))); rSet->Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); bRet = true; } @@ -229,7 +229,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) if(m_pTabMF->IsVisible() && m_pTabMF->IsValueChangedFromSaved()) { rSet->Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, - (sal_uInt16)m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)))); + static_cast<sal_uInt16>(m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP))))); bRet = true; } @@ -329,7 +329,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) for ( sal_Int32 i = 0; i < m_pMetricLB->GetEntryCount(); ++i ) { - if ( (int)reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( i )) == (int)eFieldUnit ) + if ( static_cast<int>(reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( i ))) == static_cast<int>(eFieldUnit) ) { m_pMetricLB->SelectEntryPos( i ); break; @@ -501,7 +501,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) if (!pFieldType->GetName().isEmpty() && pFieldType->GetName() == m_pCategoryBox->GetText()) { - nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat(); + nSelFormat = static_cast<sal_uInt16>(static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat()); break; } } @@ -755,7 +755,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) for (sal_Int32 i = 0; i < m_pFormatBox->GetEntryCount(); i++) { - if (pOpt->GetNumType() == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData(i))) + if (pOpt->GetNumType() == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData(i)))) { m_pFormatBox->SelectEntryPos(i); break; @@ -818,7 +818,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry const * pEntry) pOpt->SetCategory(""); else pOpt->SetCategory(comphelper::string::strip(aName, ' ')); - pOpt->SetNumType((sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetSelectedEntryData())); + pOpt->SetNumType(static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pFormatBox->GetSelectedEntryData()))); pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString() ); pOpt->SetPos(m_pPosBox->GetSelectedEntryPos()); sal_Int32 nPos = m_pLbLevel->GetSelectedEntryPos(); @@ -887,8 +887,8 @@ void SwCaptionOptPage::InvalidatePreview() //#i61007# order of captions bool bOrderNumberingFirst = m_pLbCaptionOrder->GetSelectedEntryPos() == 1; // number - const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData( - m_pFormatBox->GetSelectedEntryPos() )); + const sal_uInt16 nNumFormat = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData( + m_pFormatBox->GetSelectedEntryPos() ))); if( SVX_NUM_NUMBER_NONE != nNumFormat ) { //#i61007# order of captions diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index ccbed1e2e6ac..8b9eb8f6fbcc 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -151,15 +151,15 @@ SwContentOptPage::SwContentOptPage( vcl::Window* pParent, if ( eFUnit != FUNIT_LINE ) { sal_Int32 nPos = m_pMetricLB->InsertEntry( sMetric ); - m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) ); + m_pMetricLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); m_pHMetric->InsertEntry( sMetric ); - m_pHMetric->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) ); + m_pHMetric->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); } // a vertical ruler has not the 'character' unit if ( eFUnit != FUNIT_CHAR ) { sal_Int32 nPos = m_pVMetric->InsertEntry( sMetric ); - m_pVMetric->SetEntryData( nPos, reinterpret_cast<void*>((sal_IntPtr)eFUnit) ); + m_pVMetric->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(eFUnit)) ); } break; } @@ -208,7 +208,7 @@ static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemS FieldUnit eFieldUnit = (FieldUnit)static_cast<const SfxUInt16Item*>(pItem)->GetValue(); for ( sal_Int32 i = 0; i < rMetric->GetEntryCount(); ++i ) { - if ( (int)reinterpret_cast<sal_IntPtr>(rMetric->GetEntryData( i )) == (int)eFieldUnit ) + if ( static_cast<int>(reinterpret_cast<sal_IntPtr>(rMetric->GetEntryData( i ))) == static_cast<int>(eFieldUnit) ) { rMetric->SelectEntryPos( i ); break; @@ -267,7 +267,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) if ( m_pMetricLB->IsValueChangedFromSaved() ) { // Double-Cast for VA3.0 - const sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( nMPos )); + const sal_uInt16 nFieldUnit = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(m_pMetricLB->GetEntryData( nMPos ))); rSet->Put( SfxUInt16Item( SID_ATTR_METRIC, nFieldUnit ) ); bRet = true; } @@ -276,7 +276,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) if ( m_pHMetric->IsValueChangedFromSaved() || nMPos != nGlobalMetricPos ) { // Double-Cast for VA3.0 - const sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pHMetric->GetEntryData( nMPos )); + const sal_uInt16 nFieldUnit = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(m_pHMetric->GetEntryData( nMPos ))); rSet->Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) ); bRet = true; } @@ -284,7 +284,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) if ( m_pVMetric->IsValueChangedFromSaved() || nMPos != nGlobalMetricPos ) { // Double-Cast for VA3.0 - const sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pVMetric->GetEntryData( nMPos )); + const sal_uInt16 nFieldUnit = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(m_pVMetric->GetEntryData( nMPos ))); rSet->Put( SfxUInt16Item( FN_VSCROLL_METRIC, nFieldUnit ) ); bRet = true; } @@ -651,7 +651,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, sal_Int32 nHeight, sal_uInt16 nFontHeightWhich) { - float fSize = (float)nHeight / 10; + float fSize = static_cast<float>(nHeight) / 10; nHeight = CalcToUnit( fSize, MapUnit::MapTwip ); SwTextFormatColl *pColl = pWrtShell->GetTextCollFromPool(nType); pColl->SetFormatAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich)); @@ -680,27 +680,27 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) m_pFontConfig->SetFontIndex(sIdx, m_nFontGroup); if(bStandardHeightChanged) { - float fSize = (float)m_pStandardHeightLB->GetValue() / 10; + float fSize = static_cast<float>(m_pStandardHeightLB->GetValue()) / 10; m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MapUnit::MapTwip ), FONT_STANDARD, m_nFontGroup ); } if(bTitleHeightChanged) { - float fSize = (float)m_pTitleHeightLB->GetValue() / 10; + float fSize = static_cast<float>(m_pTitleHeightLB->GetValue()) / 10; m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MapUnit::MapTwip ), FONT_OUTLINE, m_nFontGroup ); } if(bListHeightChanged) { - float fSize = (float)m_pListHeightLB->GetValue() / 10; + float fSize = static_cast<float>(m_pListHeightLB->GetValue()) / 10; m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MapUnit::MapTwip ), FONT_LIST, m_nFontGroup ); } if(bLabelHeightChanged) { - float fSize = (float)m_pLabelHeightLB->GetValue() / 10; + float fSize = static_cast<float>(m_pLabelHeightLB->GetValue()) / 10; m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MapUnit::MapTwip ), FONT_CAPTION, m_nFontGroup ); } if(bIndexHeightChanged) { - float fSize = (float)m_pIndexHeightLB->GetValue() / 10; + float fSize = static_cast<float>(m_pIndexHeightLB->GetValue()) / 10; m_pFontConfig->SetFontHeight( CalcToUnit( fSize, MapUnit::MapTwip ), FONT_INDEX, m_nFontGroup ); } @@ -728,7 +728,7 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* ) } if(bStandardHeightChanged) { - float fSize = (float)m_pStandardHeightLB->GetValue() / 10; + float fSize = static_cast<float>(m_pStandardHeightLB->GetValue()) / 10; m_pWrtShell->SetDefault(SvxFontHeightItem( CalcToUnit( fSize, MapUnit::MapTwip ), 100, nFontHeightWhich ) ); SwTextFormatColl *pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_STANDARD); pColl->ResetFormatAttr(nFontHeightWhich); @@ -894,7 +894,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONTSIZE : FONT_GROUP_CJK == m_nFontGroup ? RES_CHRATR_CJK_FONTSIZE : RES_CHRATR_CTL_FONTSIZE; const SvxFontHeightItem& rFontHeightStandard = static_cast<const SvxFontHeightItem& >(pColl->GetFormatAttr(nFontHeightWhich)); - nStandardHeight = (sal_Int32)rFontHeightStandard.GetHeight(); + nStandardHeight = static_cast<sal_Int32>(rFontHeightStandard.GetHeight()); pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_HEADLINE_BASE); const SvxFontItem& rFontHL = !m_nFontGroup ? pColl->GetFont() : @@ -902,7 +902,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_sShellTitle = sOutBackup = rFontHL.GetFamilyName(); const SvxFontHeightItem& rFontHeightTitle = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich )); - nTitleHeight = (sal_Int32)rFontHeightTitle.GetHeight(); + nTitleHeight = static_cast<sal_Int32>(rFontHeightTitle.GetHeight()); const sal_uInt16 nFontWhich = m_nFontGroup == FONT_GROUP_DEFAULT ? RES_CHRATR_FONT : @@ -914,7 +914,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_sShellList = sListBackup = rFontLS.GetFamilyName(); const SvxFontHeightItem& rFontHeightList = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich)); - nListHeight = (sal_Int32)rFontHeightList.GetHeight(); + nListHeight = static_cast<sal_Int32>(rFontHeightList.GetHeight()); m_bListHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_LABEL); @@ -923,7 +923,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); m_sShellLabel = sCapBackup = rFontCP.GetFamilyName(); const SvxFontHeightItem& rFontHeightLabel = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich)); - nLabelHeight = (sal_Int32)rFontHeightLabel.GetHeight(); + nLabelHeight = static_cast<sal_Int32>(rFontHeightLabel.GetHeight()); m_bLabelHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_REGISTER_BASE); @@ -932,7 +932,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) FONT_GROUP_CJK == m_nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); m_sShellIndex = sIdxBackup = rFontIDX.GetFamilyName(); const SvxFontHeightItem& rFontHeightIndex = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich)); - nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight(); + nIndexHeight = static_cast<sal_Int32>(rFontHeightIndex.GetHeight()); m_bIndexHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); } m_pStandardBox->SetText(sStdBackup ); @@ -1153,16 +1153,16 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); if(m_pRowMoveMF->IsModified()) - pModOpt->SetTableHMove( (sal_uInt16)m_pRowMoveMF->Denormalize( m_pRowMoveMF->GetValue(FUNIT_TWIP))); + pModOpt->SetTableHMove( static_cast<sal_uInt16>(m_pRowMoveMF->Denormalize( m_pRowMoveMF->GetValue(FUNIT_TWIP)))); if(m_pColMoveMF->IsModified()) - pModOpt->SetTableVMove( (sal_uInt16)m_pColMoveMF->Denormalize( m_pColMoveMF->GetValue(FUNIT_TWIP))); + pModOpt->SetTableVMove( static_cast<sal_uInt16>(m_pColMoveMF->Denormalize( m_pColMoveMF->GetValue(FUNIT_TWIP)))); if(m_pRowInsertMF->IsModified()) - pModOpt->SetTableHInsert((sal_uInt16)m_pRowInsertMF->Denormalize( m_pRowInsertMF->GetValue(FUNIT_TWIP))); + pModOpt->SetTableHInsert(static_cast<sal_uInt16>(m_pRowInsertMF->Denormalize( m_pRowInsertMF->GetValue(FUNIT_TWIP)))); if(m_pColInsertMF->IsModified()) - pModOpt->SetTableVInsert((sal_uInt16)m_pColInsertMF->Denormalize( m_pColInsertMF->GetValue(FUNIT_TWIP))); + pModOpt->SetTableVInsert(static_cast<sal_uInt16>(m_pColInsertMF->Denormalize( m_pColInsertMF->GetValue(FUNIT_TWIP)))); TableChgMode eMode; if(m_pFixRB->IsChecked()) diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 0f61460b4261..6fe3228c63eb 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -673,7 +673,7 @@ IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, void) } else if(pButton == m_pNextPB) { - if(nValue < (sal_uInt32)m_pSetNoNF->GetMax()) + if(nValue < static_cast<sal_uInt32>(m_pSetNoNF->GetMax())) ++nValue; } else //m_aEndPB @@ -694,7 +694,7 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl, Edit&, void) void SwCreateAddressListDialog::UpdateButtons() { sal_uInt32 nCurrent = static_cast< sal_uInt32 >(m_pSetNoNF->GetValue() ); - sal_uInt32 nSize = (sal_uInt32 )m_pCSVData->aDBData.size(); + sal_uInt32 nSize = static_cast<sal_uInt32>(m_pCSVData->aDBData.size()); m_pStartPB->Enable(nCurrent != 1); m_pPrevPB->Enable(nCurrent != 1); m_pNextPB->Enable(nCurrent != nSize); @@ -718,7 +718,7 @@ void SwCreateAddressListDialog::Find(const OUString& rSearch, sal_Int32 nColumn) { std::vector< OUString> const & aData = m_pCSVData->aDBData[nPos]; if(nColumn >=0) - bFound = -1 != aData[(sal_uInt32)nColumn].toAsciiLowerCase().indexOf(sSearch); + bFound = -1 != aData[static_cast<sal_uInt32>(nColumn)].toAsciiLowerCase().indexOf(sSearch); else { for( nElement = 0; nElement < aData.size(); ++nElement) diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 5833e0ff14a6..45eaf435c4ea 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -709,7 +709,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ) { const SwColumn* pCol = &rCols[i]; nStart1 = pCol->GetLeft() + nWidth1; - nWidth1 += (long)rCol.CalcColWidth( i, (sal_uInt16)nWidth ); + nWidth1 += static_cast<long>(rCol.CalcColWidth( i, static_cast<sal_uInt16>(nWidth) )); nEnd1 = nWidth1 - pCol->GetRight(); } if(nStart1 || nEnd1 != nWidth) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 084819ca76d9..68b6adde88f7 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -147,7 +147,7 @@ void SwMailMergeAddressBlockPage::ActivatePage() m_pWizard->GetConfigItem().GetAddressBlocks(); for(sal_Int32 nAddress = 0; nAddress < aBlocks.getLength(); ++nAddress) m_pSettingsWIN->AddAddress(aBlocks[nAddress]); - m_pSettingsWIN->SelectAddress((sal_uInt16)rConfigItem.GetCurrentAddressBlockIndex()); + m_pSettingsWIN->SelectAddress(static_cast<sal_uInt16>(rConfigItem.GetCurrentAddressBlockIndex())); m_pAddressCB->Check(rConfigItem.IsAddressBlock()); AddressBlockHdl_Impl(m_pAddressCB); m_pSettingsWIN->SetLayout(1, 2); @@ -515,11 +515,11 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( m_pFieldFT->Show(); m_pFieldCB->Show(); SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_SALUTATION)); - pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_SALUTATION) ); + pEntry->SetUserData(reinterpret_cast<void*>(sal_Int32(USER_DATA_SALUTATION)) ); pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_PUNCTUATION)); - pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_PUNCTUATION) ); + pEntry->SetUserData(reinterpret_cast<void*>(sal_Int32(USER_DATA_PUNCTUATION)) ); pEntry = m_pAddressElementsLB->InsertEntry(SwResId(ST_TEXT)); - pEntry->SetUserData(reinterpret_cast<void*>((sal_Int32)USER_DATA_TEXT) ); + pEntry->SetUserData(reinterpret_cast<void*>(sal_Int32(USER_DATA_TEXT)) ); for (size_t i = 0; i < SAL_N_ELEMENTS(RA_SALUTATION); ++i) m_aSalutations.push_back(SwResId(RA_SALUTATION[i])); for (size_t i = 0; i < SAL_N_ELEMENTS(RA_PUNCTUATION); ++i) @@ -552,7 +552,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( for (size_t i = 0; i < rHeaders.size(); ++i) { SvTreeListEntry* pEntry = m_pAddressElementsLB->InsertEntry(rHeaders[i].first); - pEntry->SetUserData(reinterpret_cast<void*>((sal_IntPtr)i)); + pEntry->SetUserData(reinterpret_cast<void*>(static_cast<sal_IntPtr>(i))); } m_pOK->SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl)); m_pAddressElementsLB->SetSelectHdl(LINK(this, SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl )); @@ -602,7 +602,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void) { - sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pBox->FirstSelected()->GetUserData()); + sal_Int32 nUserData = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(pBox->FirstSelected()->GetUserData())); // Check if the selected entry is already in the address and then forbid inserting m_pInsertFieldIB->Enable(nUserData >= 0 || !HasItem_Impl(nUserData)); } @@ -652,7 +652,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl() const OUString sEntry = m_pAddressElementsLB->GetEntryText(pEntry); if( sEntry == sSelected.copy( 1, sSelected.getLength() - 2 ) ) { - nRet = (sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData()); + nRet = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(pEntry->GetUserData())); break; } } @@ -666,7 +666,7 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData) for(sal_uLong i = 0; i < m_pAddressElementsLB->GetEntryCount(); ++i) { SvTreeListEntry* pEntry = m_pAddressElementsLB->GetEntry(i); - if((sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData()) == nUserData) + if(static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(pEntry->GetUserData())) == nUserData) { sEntry = m_pAddressElementsLB->GetEntryText(pEntry); break; @@ -763,7 +763,7 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl() m_pRemoveFieldIB->Enable(m_pDragED->HasCurrentItem()); SvTreeListEntry* pEntry = m_pAddressElementsLB->GetCurEntry(); m_pInsertFieldIB->Enable( pEntry && - (0 < (sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData()) || !m_pFieldCB->GetText().isEmpty())); + (0 < static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(pEntry->GetUserData())) || !m_pFieldCB->GetText().isEmpty())); } void SwCustomizeAddressBlockDialog::SetAddress(const OUString& rAddress) @@ -783,7 +783,7 @@ OUString SwCustomizeAddressBlockDialog::GetAddress() { SvTreeListEntry* pEntry = m_pAddressElementsLB->GetEntry(i); const OUString sEntry = "<" + m_pAddressElementsLB->GetEntryText(pEntry) + ">"; - sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData()); + sal_Int32 nUserData = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(pEntry->GetUserData())); switch(nUserData) { case USER_DATA_SALUTATION: @@ -1294,7 +1294,7 @@ void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) rtl::Reference<TransferDataContainer> pContainer = new TransferDataContainer; - sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData()); + sal_Int32 nUserData = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(pEntry->GetUserData())); //special entries can only be once in the address / greeting if(nUserData >= 0 || !m_pParentDialog->HasItem_Impl(nUserData)) { diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index c37570d6d038..4627abbbac44 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -650,7 +650,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl, SwOneExampleFrame& } Any aZoom; - aZoom <<= (sal_Int16)DocumentZoomType::ENTIRE_PAGE; + aZoom <<= sal_Int16(DocumentZoomType::ENTIRE_PAGE); m_xViewProperties->setPropertyValue(UNO_NAME_ZOOM_TYPE, aZoom); const SwFormatFrameSize& rPageSize = m_pExampleWrtShell->GetPageDesc( diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 0dd9bedcc917..4fe3d8ea6369 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -573,7 +573,7 @@ void SwSendMailDialog::UpdateTransferStatus() m_pErrorStatus->SetText(sStatus); if(m_pImpl->aDescriptors.size()) - m_pProgressBar->SetValue((sal_uInt16)(m_nSendCount * 100 / m_pImpl->aDescriptors.size())); + m_pProgressBar->SetValue(static_cast<sal_uInt16>(m_nSendCount * 100 / m_pImpl->aDescriptors.size())); else m_pProgressBar->SetValue(0); } diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index c1a160f08fee..ec440819b55b 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -96,9 +96,9 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat& rCurrent, const SwDocStat& { sal_Int64 nCharsPerStandardizedPage = officecfg::Office::Writer::WordCount::StandardizedPageSize::get(); setDoubleValue(m_pCurrentStandardizedPagesFT, - (double)rCurrent.nChar / nCharsPerStandardizedPage); + static_cast<double>(rCurrent.nChar) / nCharsPerStandardizedPage); setDoubleValue(m_pDocStandardizedPagesFT, - (double)rDoc.nChar / nCharsPerStandardizedPage); + static_cast<double>(rDoc.nChar) / nCharsPerStandardizedPage); } bool bShowCJK = (SvtCJKOptions().IsAnyEnabled() || rDoc.nAsianWord); 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()); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 790b1a187330..21cfda853898 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -192,7 +192,7 @@ void SwChangeDBDlg::UpdateFields() { OUString sTmp(m_pUsedDBTLB->GetEntryText( m_pUsedDBTLB->GetParent( pEntry )) + OUStringLiteral1(DB_DELIM) + m_pUsedDBTLB->GetEntryText( pEntry ) + OUStringLiteral1(DB_DELIM) + - OUString::number((int)reinterpret_cast<sal_uLong>(pEntry->GetUserData()))); + OUString::number(static_cast<int>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())))); aDBNames.push_back(sTmp); } pEntry = m_pUsedDBTLB->NextSelected(pEntry); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index cb2763b475a6..fe699d92475a 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -167,11 +167,11 @@ void SwFieldDBPage::Reset(const SfxItemSet*) OUString sUserData = GetUserData(); if (sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { - const sal_uInt16 nVal = (sal_uInt16)sUserData.getToken(1, ';').toInt32(); + const sal_uInt16 nVal = static_cast<sal_uInt16>(sUserData.getToken(1, ';').toInt32()); if(nVal != USHRT_MAX) { for (sal_Int32 i = 0; i < m_pTypeLB->GetEntryCount(); ++i) - if(nVal == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i))) + if(nVal == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i)))) { m_pTypeLB->SelectEntryPos(i); break; @@ -213,7 +213,7 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* ) if(!aData.sDataSource.isEmpty()) // without database no new field command { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); sal_uLong nFormat = 0; sal_uInt16 nSubType = 0; @@ -300,7 +300,7 @@ void SwFieldDBPage::TypeHdl( ListBox const * pBox ) if(!pSh) pSh = ::GetActiveWrtShell(); bool bCond = false, bSetNo = false, bFormat = false, bDBFormat = false; - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); m_pDatabaseTLB->ShowColumns(nTypeId == TYP_DBFLD); @@ -409,7 +409,7 @@ IMPL_LINK( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void ) void SwFieldDBPage::CheckInsert() { bool bInsert = true; - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); SvTreeListEntry* pEntry = m_pDatabaseTLB->GetCurEntry(); @@ -440,7 +440,7 @@ IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) SvTreeListEntry* pEntry = pBox->GetCurEntry(); if (pEntry) { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); pEntry = m_pDatabaseTLB->GetParent(pEntry); @@ -494,7 +494,7 @@ void SwFieldDBPage::FillUserData() { const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos(); const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos ) - ? USHRT_MAX : (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData( nEntryPos )); + ? USHRT_MAX : static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData( nEntryPos ))); SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel )); } diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 6943b0319cd5..a8011b87a3f8 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -193,12 +193,12 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) if (pSelEntry != nullptr) { m_pTypeTLB->Select(pSelEntry); - nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); + nSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); } else if ( m_pTypeTLB->GetEntry(0) ) { pSelEntry = m_pTypeTLB->GetEntry(0); - nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); + nSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); } FillSelectionLB(nSubType); @@ -234,14 +234,14 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) m_pTypeTLB->Select(pSelEntry); } else if (pOldEntry != pSelEntry) - FillSelectionLB((sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); + FillSelectionLB(static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()))); SubTypeHdl(*m_pSelectionLB); } IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) { - sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); + sal_uInt16 nSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); sal_uInt16 nExtSubType; SvNumFormatType nNewType = SvNumFormatType::ALL; @@ -285,7 +285,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) nPos = 0; } - nExtSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + nExtSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); } else nExtSubType = DI_SUB_TIME; @@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) nPos = m_pSelectionLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND ) { - nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + nSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); nOldSubType &= ~DI_SUB_FIXED; if (nOldSubType == nSubType) @@ -425,10 +425,10 @@ sal_Int32 SwFieldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) { - if (!pSelEntry || (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()) == USHRT_MAX) + if (!pSelEntry || static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())) == USHRT_MAX) return false; - sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); + sal_uInt16 nSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); sal_uInt32 nFormat = 0; @@ -439,7 +439,7 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) aName = m_pTypeTLB->GetEntryText(pSelEntry); if (nPos != LISTBOX_ENTRY_NOTFOUND) - nSubType |= (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + nSubType |= static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); if (m_pFixedCB->IsChecked()) nSubType |= DI_SUB_FIXED; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 628b037b6077..fe827cf1f560 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -182,7 +182,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) if(nVal != USHRT_MAX) { for(sal_Int32 i = 0; i < m_pTypeLB->GetEntryCount(); i++) - if(nVal == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i))) + if(nVal == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i)))) { m_pTypeLB->SelectEntryPos(i); break; @@ -225,7 +225,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) m_pDateFT->Hide(); m_pTimeFT->Hide(); - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); // fill Selection-Listbox m_pSelectionLB->Clear(); @@ -306,7 +306,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) AddSubType(TYP_PAGENUMBERFLD); AddSubType(TYP_PREVPAGEFLD); AddSubType(TYP_NEXTPAGEFLD); - nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(0)); + nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(0))); nCount = 3; m_pSelectionLB->SetSelectHdl(LINK(this, SwFieldDokPage, SubTypeHdl)); } @@ -361,8 +361,8 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) case TYP_NEXTPAGEFLD: if (IsFieldEdit()) { - const sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectedEntryPos() )); + const sal_uInt16 nTmp = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( + m_pFormatLB->GetSelectedEntryPos() ))); if(SVX_NUM_CHAR_SPECIAL != nTmp) { @@ -463,7 +463,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); FillFormatLB(nTypeId); const char* pTextRes = nullptr; @@ -475,8 +475,8 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) case TYP_PREVPAGEFLD: case TYP_NEXTPAGEFLD: - pTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectedEntryPos() )) + pTextRes = SVX_NUM_CHAR_SPECIAL == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( + m_pFormatLB->GetSelectedEntryPos() ))) ? STR_VALUE : STR_OFFSET; break; @@ -526,7 +526,7 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId) IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) { - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); if (nTypeId == USHRT_MAX) { @@ -534,14 +534,14 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); } if (nTypeId == TYP_NEXTPAGEFLD || nTypeId == TYP_PREVPAGEFLD) { // Prev/Next - PageNumFields special treatment: - sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectedEntryPos() )); + sal_uInt16 nTmp = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( + m_pFormatLB->GetSelectedEntryPos() ))); const OUString sOldText( m_pValueFT->GetText() ); const OUString sNewText( SwResId( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE : STR_OFFSET )); @@ -556,14 +556,14 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) bool SwFieldDokPage::FillItemSet(SfxItemSet* ) { - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); if (nTypeId == USHRT_MAX) { sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); } OUString aVal(m_pValueED->GetText()); @@ -581,7 +581,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) { sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) - nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); + nSubType = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos))); } switch (nTypeId) diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 74da178e3514..6842d030d471 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -188,7 +188,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* ) if(nVal != USHRT_MAX) { for(sal_Int32 i = 0; i < m_pTypeLB->GetEntryCount(); i++) - if(nVal == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i))) + if(nVal == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i)))) { m_pTypeLB->SelectEntryPos(i); break; @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) if (nOld == GetTypeSel()) return; - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); // fill Selection-Listbox UpdateSubType(); @@ -415,7 +415,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, ListBox&, void) { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); if( TYP_MACROFLD == nTypeId ) m_pNameED->SetText( m_pSelectionLB->GetSelectedEntry() ); @@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void) // renew types in SelectionBox void SwFieldFuncPage::UpdateSubType() { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); // fill Selection-Listbox m_pSelectionLB->SetUpdateMode(false); @@ -549,7 +549,7 @@ IMPL_LINK_NOARG( SwFieldFuncPage, MacroHdl, Button *, void) bool SwFieldFuncPage::FillItemSet(SfxItemSet* ) { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); sal_uInt16 nSubType = 0; @@ -636,7 +636,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl, Edit&, void) const sal_Int32 nLen = m_pNameED->GetText().getLength(); bool bEnable = true; - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); if( TYP_COMBINED_CHARS == nTypeId && (!nLen || nLen > MAX_COMBINED_CHARACTERS )) diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 75e8bf794f34..11044773dde1 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -145,7 +145,7 @@ void SwFieldRefPage::SaveSelectedTextNode() SvTreeListEntry* pEntry = m_pSelectionToolTipLB->GetCurEntry(); if ( pEntry ) { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); if ( nTypeId == REFFLDFLAG_HEADING ) { @@ -226,7 +226,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* ) if ((nsSwGetSetExpType::GSE_SEQ & pType->GetType()) && pType->HasWriterListeners() && pSh->IsUsed(*pType)) { nPos = m_pTypeLB->InsertEntry(pType->GetName()); - m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)(REFFLDFLAG | n))); + m_pTypeLB->SetEntryData(nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(REFFLDFLAG | n))); } } @@ -269,7 +269,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* ) { for(sal_Int32 i = 0; i < m_pTypeLB->GetEntryCount(); i++) { - if(nVal == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i))) + if(nVal == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i)))) { m_pTypeLB->SelectEntryPos(i); break; @@ -381,7 +381,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) if (nOld == GetTypeSel()) return; - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); // fill selection-ListBox OUString sFilter = comphelper::string::strip(m_pFilterED->GetText(), ' '); @@ -401,7 +401,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) switch (nTypeId) { case TYP_GETREFFLD: - if (REFFLDFLAG & (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld))) + if (REFFLDFLAG & static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld)))) // the old one stays nFieldDlgFormatSel = m_pFormatLB->GetSelectedEntryPos(); bName = true; @@ -417,7 +417,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) default: if( REFFLDFLAG & nTypeId ) { - const sal_uInt16 nOldId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld)); + const sal_uInt16 nOldId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld))); if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD ) // then the old one stays nFieldDlgFormatSel = m_pFormatLB->GetSelectedEntryPos(); @@ -449,7 +449,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void) } void SwFieldRefPage::SubTypeHdl() { - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); switch(nTypeId) { @@ -499,7 +499,7 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString) if(!pSh) pSh = ::GetActiveWrtShell(); SwGetRefField* pRefField = static_cast<SwGetRefField*>(GetCurField()); - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); OUString sOldSel; // #i83479# @@ -862,7 +862,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, Edit&, void) const bool bEmptyName = aName.isEmpty(); bool bEnable = true; - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); if ((nTypeId == TYP_SETREFFLD && !GetFieldMgr().CanInsertRefMark(aName)) || (bEmptyName && (nTypeId == TYP_GETREFFLD || nTypeId == TYP_SETREFFLD || @@ -877,7 +877,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, Edit&, void) bool SwFieldRefPage::FillItemSet(SfxItemSet* ) { bool bModified = false; - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); sal_uInt16 nSubType = 0; const sal_Int32 nEntryPos = m_pFormatLB->GetSelectedEntryPos(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index c4a7b6ffe580..cce918d0da8a 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -179,11 +179,11 @@ void SwFieldVarPage::Reset(const SfxItemSet* ) if(!IsRefresh() && sUserData.getToken(0, ';').equalsIgnoreAsciiCase(USER_DATA_VERSION_1)) { OUString sVal = sUserData.getToken(1, ';'); - sal_uInt16 nVal = (sal_uInt16)sVal.toInt32(); + sal_uInt16 nVal = static_cast<sal_uInt16>(sVal.toInt32()); if( USHRT_MAX != nVal ) { for(sal_Int32 i = 0; i < m_pTypeLB->GetEntryCount(); i++) - if(nVal == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i))) + if(nVal == static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(i)))) { m_pTypeLB->SelectEntryPos(i); break; @@ -245,7 +245,7 @@ IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void ) void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) { - sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); sal_Int32 nSelPos = m_pSelectionLB->GetSelectedEntryPos(); size_t nSelData = SIZE_MAX; @@ -569,7 +569,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) if(m_pSelectionLB->IsCallAddSelection()) { - nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); switch (nTypeId) { @@ -606,7 +606,7 @@ void SwFieldVarPage::UpdateSubType() m_pSelectionLB->SetUpdateMode(false); m_pSelectionLB->Clear(); - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); std::vector<OUString> aList; GetFieldMgr().GetSubTypes(nTypeId, aList); const size_t nCount = aList.size(); @@ -834,7 +834,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void) { OUString sValue(m_pValueED->GetText()); bool bHasValue = !sValue.isEmpty(); - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); bool bInsert = false, bApply = false, bDelete = false; OUString sName( m_pNameED->GetText() ); @@ -955,7 +955,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void) IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); const sal_uInt16 nCurId = pBox->GetCurItemId(); @@ -1007,7 +1007,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) sal_uLong nFormat = m_pFormatLB->GetSelectedEntryPos(); if (nFormat != LISTBOX_ENTRY_NOTFOUND) - nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData((sal_Int32)nFormat)); + nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(static_cast<sal_Int32>(nFormat))); if (pType) // change { @@ -1115,14 +1115,14 @@ IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, Edit&, void) bool SwFieldVarPage::FillItemSet(SfxItemSet* ) { - const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); + const sal_uInt16 nTypeId = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()))); OUString aVal(m_pValueED->GetText()); OUString aName(m_pNameED->GetText()); const sal_Int32 nSubPos = m_pSelectionLB->GetSelectedEntryPos(); sal_uInt16 nSubType = (nSubPos == LISTBOX_ENTRY_NOTFOUND) ? 0 : - (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nSubPos)); + static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nSubPos))); sal_uInt32 nFormat; @@ -1305,7 +1305,7 @@ void SwFieldVarPage::FillUserData() if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else - nTypeSel = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData( nTypeSel )); + nTypeSel = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData( nTypeSel ))); sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index c510ed5b4b7d..c7ff3e66539b 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -172,20 +172,20 @@ SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh) if (pCurrSection && (!rWrtShell.HasSelection() || 0 != nFullSectCnt)) { m_pApplyToLB->RemoveEntry( m_pApplyToLB->GetEntryPos( - reinterpret_cast<void*>((sal_IntPtr)( 1 >= nFullSectCnt + reinterpret_cast<void*>(static_cast<sal_IntPtr>( 1 >= nFullSectCnt ? LISTBOX_SECTIONS : LISTBOX_SECTION )))); } else { - m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SECTION) )); - m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SECTIONS) )); + m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(sal_IntPtr(LISTBOX_SECTION)) )); + m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(sal_IntPtr(LISTBOX_SECTIONS)) )); } if (!( rWrtShell.HasSelection() && rWrtShell.IsInsRegionAvailable() && ( !pCurrSection || ( 1 != nFullSectCnt && IsMarkInSameSection( rWrtShell, pCurrSection ) )))) - m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>((sal_IntPtr)LISTBOX_SELECTION) )); + m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(sal_IntPtr(LISTBOX_SELECTION)) )); if (!rWrtShell.GetFlyFrameFormat()) m_pApplyToLB->RemoveEntry(m_pApplyToLB->GetEntryPos( reinterpret_cast<void*>(LISTBOX_FRAME) )); @@ -387,7 +387,7 @@ void SwColumnPage::ResetColWidth() const sal_uInt16 nWidth = GetMaxWidth( m_pColMgr, m_nCols ) / m_nCols; for(sal_uInt16 i = 0; i < m_nCols; ++i) - m_nColWidth[i] = (long) nWidth; + m_nColWidth[i] = static_cast<long>(nWidth); } } @@ -594,8 +594,8 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) delete m_pColMgr; m_pColMgr = new SwColMgr(*rSet); m_nCols = m_pColMgr->GetCount() ; - m_pCLNrEdt->SetMax(std::max((sal_uInt16)m_pCLNrEdt->GetMax(), m_nCols)); - m_pCLNrEdt->SetLast(std::max(m_nCols,(sal_uInt16)m_pCLNrEdt->GetMax())); + m_pCLNrEdt->SetMax(std::max(static_cast<sal_uInt16>(m_pCLNrEdt->GetMax()), m_nCols)); + m_pCLNrEdt->SetLast(std::max(m_nCols,static_cast<sal_uInt16>(m_pCLNrEdt->GetMax()))); if(m_bFrame) { @@ -605,7 +605,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) { const SwFormatFrameSize& rSize = rSet->Get(RES_FRM_SIZE); const SvxBoxItem& rBox = rSet->Get(RES_BOX); - m_pColMgr->SetActualWidth((sal_uInt16)rSize.GetSize().Width() - rBox.GetSmallestDistance()); + m_pColMgr->SetActualWidth(static_cast<sal_uInt16>(rSize.GetSize().Width()) - rBox.GetSmallestDistance()); } } if(m_pBalanceColsCB->IsVisible()) @@ -744,7 +744,7 @@ IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, Edit&, void ) m_pLineColorDLB->GetSelectEntryColor() ); m_pColMgr->SetAdjust( SwColLineAdj( m_pLinePosDLB->GetSelectedEntryPos() + 1) ); - m_pColMgr->SetLineHeightPercent((short)m_pLineHeightEdit->GetValue()); + m_pColMgr->SetLineHeightPercent(static_cast<short>(m_pLineHeightEdit->GetValue())); bEnable = m_pColMgr->GetLineHeightPercent() != 100; } m_pLinePosLbl->Enable( bEnable ); @@ -957,7 +957,7 @@ IMPL_LINK( SwColumnPage, ColModify, Edit&, rEdit, void ) void SwColumnPage::ColModify(NumericField const * pNF) { - m_nCols = (sal_uInt16)m_pCLNrEdt->GetValue(); + m_nCols = static_cast<sal_uInt16>(m_pCLNrEdt->GetValue()); //#107890# the handler is also called from LoseFocus() //then no change has been made and thus no action should be taken // #i17816# changing the displayed types within the ValueSet @@ -968,7 +968,7 @@ void SwColumnPage::ColModify(NumericField const * pNF) if(pNF) m_pDefaultVS->SetNoSelection(); long nDist = static_cast< long >(m_aDistEd1.DenormalizePercent(m_aDistEd1.GetValue(FUNIT_TWIP))); - m_pColMgr->SetCount(m_nCols, (sal_uInt16)nDist); + m_pColMgr->SetCount(m_nCols, static_cast<sal_uInt16>(nDist)); for(sal_uInt16 i = 0; i < m_nCols; i++) m_nColDist[i] = nDist; m_nFirstVis = 0; @@ -1002,7 +1002,7 @@ IMPL_LINK( SwColumnPage, GapModify, Edit&, rEdit, void ) nActValue = nMaxGap; m_aDistEd1.SetPrcntValue(m_aDistEd1.NormalizePercent(nMaxGap), FUNIT_TWIP); } - m_pColMgr->SetGutterWidth((sal_uInt16)nActValue); + m_pColMgr->SetGutterWidth(static_cast<sal_uInt16>(nActValue)); for(sal_uInt16 i = 0; i < m_nCols; i++) m_nColDist[i] = nActValue; @@ -1067,7 +1067,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); long nDist = static_cast< long >(m_aDistEd1.DenormalizePercent(m_aDistEd1.GetValue(FUNIT_TWIP))); - m_pColMgr->SetCount(m_nCols, (sal_uInt16)nDist); + m_pColMgr->SetCount(m_nCols, static_cast<sal_uInt16>(nDist)); for(sal_uInt16 i = 0; i < m_nCols; i++) m_nColDist[i] = nDist; if(pBox->IsChecked()) @@ -1124,7 +1124,7 @@ void SwColumnPage::Timeout() if(nChanged == m_nCols - 1) { m_nColWidth[0] -= nDiff; - if(m_nColWidth[0] < (long)m_nMinWidth) + if(m_nColWidth[0] < static_cast<long>(m_nMinWidth)) { nNewWidth -= m_nMinWidth - m_nColWidth[0]; m_nColWidth[0] = m_nMinWidth; @@ -1134,7 +1134,7 @@ void SwColumnPage::Timeout() else if(nDiff) { m_nColWidth[nChanged + 1] -= nDiff; - if(m_nColWidth[nChanged + 1] < (long) m_nMinWidth) + if(m_nColWidth[nChanged + 1] < static_cast<long>(m_nMinWidth)) { nNewWidth -= m_nMinWidth - m_nColWidth[nChanged + 1]; m_nColWidth[nChanged + 1] = m_nMinWidth; diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index f1532f6599f6..5e675a3e91c5 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -209,7 +209,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : SwFieldType* pFieldType = pMgr->GetFieldType(SwFieldIds::Unknown, --i); if( pFieldType->GetName() == m_pCategoryBox->GetText() ) { - nSelFormat = (sal_uInt16)static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat(); + nSelFormat = static_cast<sal_uInt16>(static_cast<SwSetExpFieldType*>(pFieldType)->GetSeqFormat()); break; } } @@ -274,7 +274,7 @@ void SwCaptionDialog::Apply() aOpt.SetCategory(comphelper::string::strip(aName, ' ')); aOpt.SetNumSeparator( m_pNumberingSeparatorED->GetText() ); } - aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectedEntryData()) ); + aOpt.SetNumType( static_cast<sal_uInt16>(reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectedEntryData())) ); aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() ); aOpt.SetCaption( m_pTextEdit->GetText() ); aOpt.SetPos( m_pPosBox->GetSelectedEntryPos() ); @@ -355,7 +355,7 @@ void SwCaptionDialog::DrawSample() bool bNone = sFieldTypeName == m_sNone; if( !bNone ) { - const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectedEntryData()); + const sal_uInt16 nNumFormat = static_cast<sal_uInt16>(reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectedEntryData())); if( SVX_NUM_NUMBER_NONE != nNumFormat ) { // category @@ -494,7 +494,7 @@ void SwSequenceOptionDialog::Apply() SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType( SwFieldIds::SetExp, aFieldTypeName )); - sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectedEntryPos() - 1); + sal_Int8 nLvl = static_cast<sal_Int8>( m_pLbLevel->GetSelectedEntryPos() - 1); sal_Unicode cDelim = m_pEdDelim->GetText()[0]; bool bUpdate = true; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index f93d0fcffbb9..62a65de07e8f 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1208,12 +1208,12 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) if (m_pRelWidthCB->IsChecked()) { - aSz.SetWidthPercent((sal_uInt8)std::min( static_cast< sal_Int64 >(MAX_PERCENT_WIDTH), m_aWidthED.Convert(m_aWidthED.NormalizePercent(nNewWidth), FUNIT_TWIP, FUNIT_CUSTOM))); + aSz.SetWidthPercent(static_cast<sal_uInt8>(std::min( static_cast< sal_Int64 >(MAX_PERCENT_WIDTH), m_aWidthED.Convert(m_aWidthED.NormalizePercent(nNewWidth), FUNIT_TWIP, FUNIT_CUSTOM)))); } else aSz.SetWidthPercent(0); if (m_pRelHeightCB->IsChecked()) - aSz.SetHeightPercent((sal_uInt8)std::min(static_cast< sal_Int64 >(MAX_PERCENT_HEIGHT), m_aHeightED.Convert(m_aHeightED.NormalizePercent(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM))); + aSz.SetHeightPercent(static_cast<sal_uInt8>(std::min(static_cast< sal_Int64 >(MAX_PERCENT_HEIGHT), m_aHeightED.Convert(m_aHeightED.NormalizePercent(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM)))); else aSz.SetHeightPercent(0); @@ -2109,12 +2109,12 @@ IMPL_LINK( SwFramePage, ModifyHdl, Edit&, rEdit, void ) { if (&rEdit == m_aWidthED.get()) { - nHeight = SwTwips((double)nWidth / m_fWidthHeightRatio); + nHeight = SwTwips(static_cast<double>(nWidth) / m_fWidthHeightRatio); m_aHeightED.SetPrcntValue(m_aHeightED.NormalizePercent(nHeight), FUNIT_TWIP); } else if (&rEdit == m_aHeightED.get()) { - nWidth = SwTwips((double)nHeight * m_fWidthHeightRatio); + nWidth = SwTwips(static_cast<double>(nHeight) * m_fWidthHeightRatio); m_aWidthED.SetPrcntValue(m_aWidthED.NormalizePercent(nWidth), FUNIT_TWIP); } } @@ -2268,7 +2268,7 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset) // columns SwFormatCol aCol( rSet.Get(RES_COL) ); - ::FitToActualSize( aCol, (sal_uInt16)rSize.GetWidth() ); + ::FitToActualSize( aCol, static_cast<sal_uInt16>(rSize.GetWidth()) ); RndStdIds eAnchorId = GetAnchor(); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 2447745edc86..884512955450 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -339,8 +339,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) bool bBottomMod = m_pBottomMarginED->IsValueModified(); SvxULSpaceItem aUL( RES_UL_SPACE ); - aUL.SetUpper((sal_uInt16)m_pTopMarginED->Denormalize(m_pTopMarginED->GetValue(FUNIT_TWIP))); - aUL.SetLower((sal_uInt16)m_pBottomMarginED->Denormalize(m_pBottomMarginED->GetValue(FUNIT_TWIP))); + aUL.SetUpper(static_cast<sal_uInt16>(m_pTopMarginED->Denormalize(m_pTopMarginED->GetValue(FUNIT_TWIP)))); + aUL.SetLower(static_cast<sal_uInt16>(m_pBottomMarginED->Denormalize(m_pBottomMarginED->GetValue(FUNIT_TWIP)))); if ( bTopMod || bBottomMod ) { @@ -356,8 +356,8 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet *rSet) bool bRightMod = m_pRightMarginED->IsValueModified(); SvxLRSpaceItem aLR( RES_LR_SPACE ); - aLR.SetLeft((sal_uInt16)m_pLeftMarginED->Denormalize(m_pLeftMarginED->GetValue(FUNIT_TWIP))); - aLR.SetRight((sal_uInt16)m_pRightMarginED->Denormalize(m_pRightMarginED->GetValue(FUNIT_TWIP))); + aLR.SetLeft(static_cast<sal_uInt16>(m_pLeftMarginED->Denormalize(m_pLeftMarginED->GetValue(FUNIT_TWIP)))); + aLR.SetRight(static_cast<sal_uInt16>(m_pRightMarginED->Denormalize(m_pRightMarginED->GetValue(FUNIT_TWIP)))); if ( bLeftMod || bRightMod ) { @@ -407,8 +407,8 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) // #i18732# aVal.bFollowTextFlow = rSet.Get(RES_FOLLOW_TEXT_FLOW).GetValue(); - aVal.nHoriOrient = (short)rHori.GetHoriOrient(); - aVal.nVertOrient = (short)rVert.GetVertOrient(); + aVal.nHoriOrient = static_cast<short>(rHori.GetHoriOrient()); + aVal.nVertOrient = static_cast<short>(rVert.GetVertOrient()); aVal.nHPos = rHori.GetPos(); aVal.nHRelOrient = rHori.GetRelationOrient(); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index cc1f3cacc5f5..ee2e65127168 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -221,7 +221,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( xAcc->replaceByIndex(i, aAny); } } - lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LEVEL, (sal_Int16)rDesc.GetLevel()); + lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LEVEL, static_cast<sal_Int16>(rDesc.GetLevel())); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_MARKS, bool(nContentOptions & SwTOXElement::Mark )); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_OUTLINE, bool(nContentOptions & SwTOXElement::OutlineLevel)); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_EMBEDDED_OBJECTS,bool(nContentOptions & SwTOXElement::Ole )); @@ -345,7 +345,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( SwTwips nTempPos = aToken.nTabStopPosition >= 0 ? aToken.nTabStopPosition : 0; nTempPos = convertTwipToMm100(nTempPos); - pPropValArr[4].Value <<= (sal_Int32)nTempPos; + pPropValArr[4].Value <<= static_cast<sal_Int32>(nTempPos); } else if(TOKEN_TEXT == aToken.eTokenType) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5d557f334c3d..f2947e4a76ec 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -458,7 +458,7 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( pDesc->SetIndexOptions(pCurTOX->GetOptions()); pDesc->SetMainEntryCharStyle(pCurTOX->GetMainEntryCharStyle()); if(pDesc->GetTOXType() != TOX_INDEX) - pDesc->SetLevel((sal_uInt8)pCurTOX->GetLevel()); + pDesc->SetLevel(static_cast<sal_uInt8>(pCurTOX->GetLevel())); pDesc->SetCreateFromObjectNames(pCurTOX->IsFromObjectNames()); pDesc->SetSequenceName(pCurTOX->GetSequenceName()); pDesc->SetCaptionDisplay(pCurTOX->GetCaptionDisplay()); @@ -947,7 +947,7 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell const & rSh) if(nUserTypeCount > 1) { //insert all new user indexes names after the standard user index - sal_Int32 nPos = m_pTypeLB->GetEntryPos(reinterpret_cast<void*>((sal_uInt32)TO_USER)) + 1; + sal_Int32 nPos = m_pTypeLB->GetEntryPos(reinterpret_cast<void*>(sal_uInt32(TO_USER))) + 1; for(sal_uInt16 nUser = 1; nUser < nUserTypeCount; nUser++) { nPos = m_pTypeLB->InsertEntry(rSh.GetTOXType(TOX_USER, nUser)->GetTypeName(), nPos); @@ -1295,7 +1295,7 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) { if(_pSet) _pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE, - (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetSelectedEntryData()))); + static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetSelectedEntryData())))); FillTOXDescription(); return DeactivateRC::LeavePage; } @@ -2142,7 +2142,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { const SwTOXSortKey* pKey = pFType->GetSortKey(0); m_pFirstKeyLB->SelectEntryPos( - m_pFirstKeyLB->GetEntryPos(reinterpret_cast<void*>((sal_uIntPtr)pKey->eField))); + m_pFirstKeyLB->GetEntryPos(reinterpret_cast<void*>(static_cast<sal_uIntPtr>(pKey->eField)))); m_pFirstSortUpRB->Check(pKey->bSortAscending); m_pFirstSortDownRB->Check(!pKey->bSortAscending); } @@ -2150,7 +2150,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { const SwTOXSortKey* pKey = pFType->GetSortKey(1); m_pSecondKeyLB->SelectEntryPos( - m_pSecondKeyLB->GetEntryPos(reinterpret_cast<void*>((sal_uIntPtr)pKey->eField))); + m_pSecondKeyLB->GetEntryPos(reinterpret_cast<void*>(static_cast<sal_uIntPtr>(pKey->eField)))); m_pSecondSortUpRB->Check(pKey->bSortAscending); m_pSecondSortDownRB->Check(!pKey->bSortAscending); } @@ -2158,7 +2158,7 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) { const SwTOXSortKey* pKey = pFType->GetSortKey(2); m_pThirdKeyLB->SelectEntryPos( - m_pThirdKeyLB->GetEntryPos(reinterpret_cast<void*>((sal_uIntPtr)pKey->eField))); + m_pThirdKeyLB->GetEntryPos(reinterpret_cast<void*>(static_cast<sal_uIntPtr>(pKey->eField)))); m_pThirdSortUpRB->Check(pKey->bSortAscending); m_pThirdSortDownRB->Check(!pKey->bSortAscending); } @@ -2271,7 +2271,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectedEntryPos(); const OUString sToInsert(m_pAuthFieldsLB->GetSelectedEntry()); SwFormToken aInsert(TOKEN_AUTHORITY); - aInsert.nAuthorityField = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pAuthFieldsLB->GetEntryData(nSelPos)); + aInsert.nAuthorityField = static_cast<sal_uInt16>(reinterpret_cast<sal_uIntPtr>(m_pAuthFieldsLB->GetEntryData(nSelPos))); m_pTokenWIN->InsertAtSelection(SwForm::GetFormAuth(), aInsert); m_pAuthFieldsLB->RemoveEntry(sToInsert); m_pAuthFieldsLB->SelectEntryPos( nSelPos ? nSelPos - 1 : 0); @@ -2296,7 +2296,7 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken) //fill it into the ListBox sal_uInt32 nData = rToken.nAuthorityField; sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[nData])); - m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)nData)); + m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(nData))); } void SwTOXEntryTabPage::SetFocus2theAllBtn() @@ -2421,7 +2421,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) for( sal_uInt32 i = 0; i < AUTH_FIELD_END; i++) { sal_Int32 nPos = m_pAuthFieldsLB->InsertEntry(SwResId(STR_AUTH_FIELD_ARY[i])); - m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>((sal_uIntPtr)i)); + m_pAuthFieldsLB->SetEntryData(nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(i))); } // #i21237# @@ -2434,7 +2434,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) if(TOKEN_AUTHORITY == aToken.eTokenType) { sal_uInt32 nSearch = aToken.nAuthorityField; - sal_Int32 nLstBoxPos = m_pAuthFieldsLB->GetEntryPos( reinterpret_cast<void*>((sal_uIntPtr)nSearch) ); + sal_Int32 nLstBoxPos = m_pAuthFieldsLB->GetEntryPos( reinterpret_cast<void*>(static_cast<sal_uIntPtr>(nSearch)) ); OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND != nLstBoxPos, "Entry not found?"); m_pAuthFieldsLB->RemoveEntry(nLstBoxPos); } @@ -2569,7 +2569,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) { OUString sEntry = rBox.GetSelectedEntry(); - const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rBox.GetSelectedEntryData()); + const sal_uInt16 nId = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rBox.GetSelectedEntryData())); const bool bEqualsNoCharStyle = sEntry == sNoCharStyle; m_pEditStylePB->Enable(!bEqualsNoCharStyle); if (bEqualsNoCharStyle) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index f086622de253..dab6962eb74a 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -120,7 +120,7 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView const *pVw) m_pFormatLB->SelectNumberingType(nSelFormat); // position - m_pPosLB->SelectEntryPos((sal_Int32)rInf.GetPos()); + m_pPosLB->SelectEntryPos(static_cast<sal_Int32>(rInf.GetPos())); // offset sal_uInt16 nOffset = rInf.GetPosFromLeft(); @@ -222,16 +222,16 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, Button*, void) aInf.SetPos((LineNumberPosition)m_pPosLB->GetSelectedEntryPos()); // offset - aInf.SetPosFromLeft((sal_uInt16)m_pOffsetMF->Denormalize(m_pOffsetMF->GetValue(FUNIT_TWIP))); + aInf.SetPosFromLeft(static_cast<sal_uInt16>(m_pOffsetMF->Denormalize(m_pOffsetMF->GetValue(FUNIT_TWIP)))); // numbering offset - aInf.SetCountBy((sal_uInt16)m_pNumIntervalNF->GetValue()); + aInf.SetCountBy(static_cast<sal_uInt16>(m_pNumIntervalNF->GetValue())); // divider aInf.SetDivider(m_pDivisorED->GetText()); // divider offset - aInf.SetDividerCountBy((sal_uInt16)m_pDivIntervalNF->GetValue()); + aInf.SetDividerCountBy(static_cast<sal_uInt16>(m_pDivIntervalNF->GetValue())); // count aInf.SetCountBlankLines(m_pCountEmptyLinesCB->IsChecked()); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 979eff2f3433..7d0de2da79aa 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -284,13 +284,13 @@ void SwNumPositionTabPage::InitControls() long nDistBorderNum; if(bRelative) { - nDistBorderNum = (long)aNumFormatArr[nLvl]->GetAbsLSpace()+ aNumFormatArr[nLvl]->GetFirstLineOffset(); + nDistBorderNum = static_cast<long>(aNumFormatArr[nLvl]->GetAbsLSpace())+ aNumFormatArr[nLvl]->GetFirstLineOffset(); if(nLvl) - nDistBorderNum -= (long)aNumFormatArr[nLvl - 1]->GetAbsLSpace()+ aNumFormatArr[nLvl - 1]->GetFirstLineOffset(); + nDistBorderNum -= static_cast<long>(aNumFormatArr[nLvl - 1]->GetAbsLSpace())+ aNumFormatArr[nLvl - 1]->GetFirstLineOffset(); } else { - nDistBorderNum = (long)aNumFormatArr[nLvl]->GetAbsLSpace()+ aNumFormatArr[nLvl]->GetFirstLineOffset(); + nDistBorderNum = static_cast<long>(aNumFormatArr[nLvl]->GetAbsLSpace())+ aNumFormatArr[nLvl]->GetFirstLineOffset(); } m_pDistBorderMF->SetValue(m_pDistBorderMF->Normalize(nDistBorderNum),FUNIT_TWIP); } @@ -693,7 +693,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, SpinField&, rSpin, void ) } else { - aNumFormat.SetAbsLSpace( (short)nValue - aNumFormat.GetFirstLineOffset()); + aNumFormat.SetAbsLSpace( static_cast<short>(nValue) - aNumFormat.GetFirstLineOffset()); } } else if (&rField == m_pDistNumMF) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 11ec095da04e..0fdef493d8bd 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -352,7 +352,7 @@ short SwOutlineTabDialog::Ok() const SfxPoolItem & rItem = rTextColl.GetFormatAttr(RES_PARATR_NUMRULE, false); - if ((sal_uInt8)GetLevel(rTextColl.GetName()) == MAXLEVEL) + if (static_cast<sal_uInt8>(GetLevel(rTextColl.GetName())) == MAXLEVEL) { if(rTextColl.IsAssignedToListLevelOfOutlineStyle()) { @@ -592,8 +592,8 @@ IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, Edit&, rEdit, void ) if(nActLevel & nMask) { SwNumFormat aNumFormat(pNumRule->Get(i)); - aNumFormat.SetIncludeUpperLevels( std::min( (sal_uInt8)static_cast<NumericField&>(rEdit).GetValue(), - (sal_uInt8)(i + 1)) ); + aNumFormat.SetIncludeUpperLevels( std::min( static_cast<sal_uInt8>(static_cast<NumericField&>(rEdit).GetValue()), + static_cast<sal_uInt8>(i + 1)) ); pNumRule->Set(i, aNumFormat); } nMask <<= 1; @@ -692,7 +692,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) if(nActLevel & nMask) { SwNumFormat aNumFormat(pNumRule->Get(i)); - aNumFormat.SetStart( (sal_uInt16)static_cast<NumericField&>(rEdit).GetValue() ); + aNumFormat.SetStart( static_cast<sal_uInt16>(static_cast<NumericField&>(rEdit).GetValue()) ); pNumRule->Set(i, aNumFormat); } nMask <<= 1; diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index b638fe796b67..77aa10018c93 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -289,8 +289,8 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet) m_bHRulerChanged = true; } m_bVRulerChanged = true; - pView->GetHRuler().SetCharWidth((long)(m_pCharWidthMF->GetValue(FUNIT_TWIP)/56.7)); - pView->GetVRuler().SetLineHeight((long)(m_pTextSizeMF->GetValue(FUNIT_TWIP)/56.7)); + pView->GetHRuler().SetCharWidth(static_cast<long>(m_pCharWidthMF->GetValue(FUNIT_TWIP)/56.7)); + pView->GetVRuler().SetLineHeight(static_cast<long>(m_pTextSizeMF->GetValue(FUNIT_TWIP)/56.7)); } } @@ -386,7 +386,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField&, rField, void) { if(m_pCharsPerLineNF == &rField) { - long nWidth = (long)(m_aPageSize.Width() / m_pCharsPerLineNF->GetValue()); + long nWidth = static_cast<long>(m_aPageSize.Width() / m_pCharsPerLineNF->GetValue()); m_pTextSizeMF->SetValue(m_pTextSizeMF->Normalize(nWidth), FUNIT_TWIP); //prevent rounding errors in the MetricField by saving the used value m_nRubyUserValue = nWidth; diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index d3195845daff..e20fb410a7bb 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -292,9 +292,9 @@ void SwSortDlg::Apply() bCheck2 = m_pKeyCB2->IsChecked(); bCheck3 = m_pKeyCB3->IsChecked(); - nCol1 = (sal_uInt16)m_pColEdt1->GetValue(); - nCol2 = (sal_uInt16)m_pColEdt2->GetValue(); - nCol3 = (sal_uInt16)m_pColEdt3->GetValue(); + nCol1 = static_cast<sal_uInt16>(m_pColEdt1->GetValue()); + nCol2 = static_cast<sal_uInt16>(m_pColEdt2->GetValue()); + nCol3 = static_cast<sal_uInt16>(m_pColEdt3->GetValue()); nType1 = m_pTypDLB1->GetSelectedEntryPos(); nType2 = m_pTypDLB2->GetSelectedEntryPos(); diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index dbfe58a42214..8ad8aaf6be64 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -32,7 +32,7 @@ IMPL_LINK_NOARG(SwTableWidthDlg, LoseFocusHdl, Edit&, void) { - sal_uInt16 nId = (sal_uInt16)m_pColNF->GetValue()-1; + sal_uInt16 nId = static_cast<sal_uInt16>(m_pColNF->GetValue())-1; const SwTwips lWidth = rFnc.GetColWidth(nId); m_pWidthMF->SetMax(m_pWidthMF->Normalize(rFnc.GetMaxColWidth(nId)), FUNIT_TWIP); m_pWidthMF->SetValue(m_pWidthMF->Normalize(lWidth), FUNIT_TWIP); diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index eaa591d990be..07d1c56bb662 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -41,8 +41,8 @@ void SwInsTableDlg::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rC { sal_uInt16 nInsMode = 0; rName = m_pNameEdit->GetText(); - rRow = (sal_uInt16)m_pRowNF->GetValue(); - rCol = (sal_uInt16)m_pColNF->GetValue(); + rRow = static_cast<sal_uInt16>(m_pRowNF->GetValue()); + rCol = static_cast<sal_uInt16>(m_pColNF->GetValue()); if (m_pBorderCB->IsChecked()) nInsMode |= tabopts::DEFAULT_BORDER; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 6f8bdafbb0b4..eac8f630ebf0 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -679,8 +679,8 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } if(nColSum != pTableData->GetWidth()) { - SwTwips nMinWidth = std::min( (long)MINLAY, - (long) (pTableData->GetWidth() / + SwTwips nMinWidth = std::min( long(MINLAY), + static_cast<long>(pTableData->GetWidth() / pTableData->GetColCount() - 1)); SwTwips nDiff = nColSum - pTableData->GetWidth(); while ( std::abs(nDiff) > pTableData->GetColCount() + 1 ) diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index bce5d4b06581..7a342f1ff83e 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -480,7 +480,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl, Button*, void) IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) { bool bBtnEnable = false; - sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectedEntryPos(), nOldIdx = nIndex; + sal_uInt8 nSelPos = static_cast<sal_uInt8>(m_pLbFormat->GetSelectedEntryPos()), nOldIdx = nIndex; if( nSelPos >= nDfltStylePos ) { nIndex = nSelPos - nDfltStylePos; diff --git a/sw/source/ui/vba/vbalistlevel.cxx b/sw/source/ui/vba/vbalistlevel.cxx index 41a4aaf412cd..b7ef212d2864 100644 --- a/sw/source/ui/vba/vbalistlevel.cxx +++ b/sw/source/ui/vba/vbalistlevel.cxx @@ -312,7 +312,7 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher( ::sal_Int32 /*_resetonhigher*/ ) void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat ) { - sal_Int16 nStartWith = (sal_Int16)_startat; + sal_Int16 nStartWith = static_cast<sal_Int16>(_startat); pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith", uno::makeAny( nStartWith ) ); } @@ -364,7 +364,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float _textposition ) void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32 _trailingcharacter ) { - sal_Int16 nLabelFollowedBy = (sal_Int16)_trailingcharacter; + sal_Int16 nLabelFollowedBy = static_cast<sal_Int16>(_trailingcharacter); pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy", uno::makeAny( nLabelFollowedBy ) ); } diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 33df1d9bff40..dc8cdb200b9c 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -62,7 +62,7 @@ float SAL_CALL SwVbaParagraphFormat::getFirstLineIndent() { sal_Int32 indent = 0; mxParaProps->getPropertyValue("ParaFirstLineIndent") >>= indent; - return (float)( Millimeter::getInPoints( indent ) ); + return static_cast<float>( Millimeter::getInPoints( indent ) ); } void SAL_CALL SwVbaParagraphFormat::setFirstLineIndent( float _firstlineindent ) @@ -242,7 +242,7 @@ float SAL_CALL SwVbaParagraphFormat::getSpaceBefore() { sal_Int32 nSpace = 0; mxParaProps->getPropertyValue("ParaTopMargin") >>= nSpace; - return (float)( Millimeter::getInPoints( nSpace ) ); + return static_cast<float>( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceBefore( float _space ) @@ -255,7 +255,7 @@ float SAL_CALL SwVbaParagraphFormat::getSpaceAfter() { sal_Int32 nSpace = 0; mxParaProps->getPropertyValue("ParaBottomMargin") >>= nSpace; - return (float)( Millimeter::getInPoints( nSpace ) ); + return static_cast<float>( Millimeter::getInPoints( nSpace ) ); } void SAL_CALL SwVbaParagraphFormat::setSpaceAfter( float _space ) @@ -268,7 +268,7 @@ float SAL_CALL SwVbaParagraphFormat::getLeftIndent() { sal_Int32 nIndent = 0; mxParaProps->getPropertyValue("ParaLeftMargin") >>= nIndent; - return (float)( Millimeter::getInPoints( nIndent ) ); + return static_cast<float>( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setLeftIndent( float _leftindent ) @@ -281,7 +281,7 @@ float SAL_CALL SwVbaParagraphFormat::getRightIndent() { sal_Int32 nIndent = 0; mxParaProps->getPropertyValue("ParaRightMargin") >>= nIndent; - return (float)( Millimeter::getInPoints( nIndent ) ); + return static_cast<float>( Millimeter::getInPoints( nIndent ) ); } void SAL_CALL SwVbaParagraphFormat::setRightIndent( float _rightindent ) @@ -341,12 +341,12 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacing( float _lineSpace, sa aLineSpacing.Mode = style::LineSpacingMode::PROP; aLineSpacing.Height = PERCENT100; } - else if( _lineSpace == ( sal_Int16 )( CHARACTER_INDENT_FACTOR * 1.5 ) ) + else if( _lineSpace == sal_Int16( CHARACTER_INDENT_FACTOR * 1.5 ) ) { aLineSpacing.Mode = style::LineSpacingMode::PROP; aLineSpacing.Height = PERCENT150; } - else if( _lineSpace == ( sal_Int16 )( CHARACTER_INDENT_FACTOR * 2 ) ) + else if( _lineSpace == sal_Int16( CHARACTER_INDENT_FACTOR * 2 ) ) { aLineSpacing.Mode = style::LineSpacingMode::PROP; aLineSpacing.Height = PERCENT200; @@ -354,13 +354,13 @@ style::LineSpacing SwVbaParagraphFormat::getOOoLineSpacing( float _lineSpace, sa else { aLineSpacing.Mode = style::LineSpacingMode::FIX; - aLineSpacing.Height = ( sal_Int16 )( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) ); + aLineSpacing.Height = static_cast<sal_Int16>( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) ); } } else { aLineSpacing.Mode = mode; - aLineSpacing.Height = ( sal_Int16 )( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) ); + aLineSpacing.Height = static_cast<sal_Int16>( Millimeter::getInHundredthsOfOneMillimeter( _lineSpace ) ); } return aLineSpacing; } @@ -415,11 +415,11 @@ float SwVbaParagraphFormat::getMSWordLineSpacing( style::LineSpacing const & rLi float wdLineSpacing = 0; if( rLineSpacing.Mode != style::LineSpacingMode::PROP ) { - wdLineSpacing = (float)( Millimeter::getInPoints( rLineSpacing.Height ) ); + wdLineSpacing = static_cast<float>( Millimeter::getInPoints( rLineSpacing.Height ) ); } else { - wdLineSpacing = (float)( CHARACTER_INDENT_FACTOR * rLineSpacing.Height ) / PERCENT100; + wdLineSpacing = static_cast<float>( CHARACTER_INDENT_FACTOR * rLineSpacing.Height ) / PERCENT100; } return wdLineSpacing; } @@ -478,7 +478,7 @@ sal_Int16 SwVbaParagraphFormat::getCharHeight() { float fCharHeight = 0.0; mxParaProps->getPropertyValue("CharHeight") >>= fCharHeight; - return (sal_Int16)( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) ); + return static_cast<sal_Int16>( Millimeter::getInHundredthsOfOneMillimeter( fCharHeight ) ); } style::ParagraphAdjust SwVbaParagraphFormat::getOOoAlignment( sal_Int32 _alignment ) diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 7df607fbf52b..bb1a9fde7fbc 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -310,7 +310,7 @@ SwVbaRange::getListFormat() ::sal_Int32 SAL_CALL SwVbaRange::getLanguageID() { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); - return (sal_uInt16)SwVbaStyle::getLanguageID( xParaProps ); + return static_cast<sal_uInt16>(SwVbaStyle::getLanguageID( xParaProps )); } void SAL_CALL SwVbaRange::setLanguageID( ::sal_Int32 _languageid ) diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx index 2255ce34c1a5..dac431539e3c 100644 --- a/sw/source/ui/vba/vbarow.cxx +++ b/sw/source/ui/vba/vbarow.cxx @@ -49,7 +49,7 @@ uno::Any SAL_CALL SwVbaRow::getHeight() sal_Int32 nHeight = 0; mxRowProps->getPropertyValue("Height") >>= nHeight; - return uno::makeAny( (float)Millimeter::getInPoints( nHeight ) ); + return uno::makeAny( static_cast<float>(Millimeter::getInPoints( nHeight )) ); } void SAL_CALL SwVbaRow::setHeight( const uno::Any& _height ) diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx index f40255cb29af..4b9b98ce66f1 100644 --- a/sw/source/ui/vba/vbarows.cxx +++ b/sw/source/ui/vba/vbarows.cxx @@ -197,7 +197,7 @@ void SAL_CALL SwVbaRows::Delete( ) void SAL_CALL SwVbaRows::SetLeftIndent( float LeftIndent, ::sal_Int32 RulerStyle ) { uno::Reference< word::XColumns > xColumns( new SwVbaColumns( getParent(), mxContext, mxTextTable, mxTextTable->getColumns() ) ); - sal_Int32 nIndent = (sal_Int32) LeftIndent; + sal_Int32 nIndent = static_cast<sal_Int32>(LeftIndent); switch( RulerStyle ) { case word::WdRulerStyle::wdAdjustFirstColumn: @@ -263,7 +263,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) "(nNewWidth <= 0) || (nWidth <= 0)" ); } - double propFactor = (double)nNewWidth/(double)nWidth; + double propFactor = static_cast<double>(nNewWidth)/static_cast<double>(nWidth); // get all columns, calculate and set the new width of the columns uno::Reference< XCollection > xCol( xColumns, uno::UNO_QUERY_THROW ); @@ -272,7 +272,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) { uno::Reference< word::XColumn > xColumn( xCol->Item( uno::makeAny( i ), uno::Any() ), uno::UNO_QUERY_THROW ); sal_Int32 nColWidth = xColumn->getWidth(); - sal_Int32 nNewColWidth = ( sal_Int32 )( propFactor * nColWidth ); + sal_Int32 nNewColWidth = static_cast<sal_Int32>( propFactor * nColWidth ); xColumn->setWidth( nNewColWidth ); } @@ -292,7 +292,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) // get all columns, calculate and set the new width of the columns uno::Reference< XCollection > xCol( xColumns, uno::UNO_QUERY_THROW ); sal_Int32 nColCount = xCol->getCount(); - sal_Int32 nNewColWidth = (sal_Int32)( double( nNewWidth )/nColCount ); + sal_Int32 nNewColWidth = static_cast<sal_Int32>( double( nNewWidth )/nColCount ); for( sal_Int32 i = 0; i < nColCount; i++ ) { uno::Reference< word::XColumn > xColumn( xCol->Item( uno::makeAny( i ), uno::Any() ), uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index e7436e7baa0d..0edfc055cd12 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -618,7 +618,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w nPage = 1; if( nPage > nLastPage ) nPage = nLastPage; - xPageCursor->jumpToPage( ( sal_Int16 )nPage ); + xPageCursor->jumpToPage( static_cast<sal_Int16>(nPage) ); break; } case word::WdGoToItem::wdGoToSection: @@ -647,7 +647,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaSelection::GoTo( const uno::Any& _w } if( nPage == 0 ) throw uno::RuntimeException("Not implemented" ); - xPageCursor->jumpToPage( ( sal_Int16 )nPage ); + xPageCursor->jumpToPage( static_cast<sal_Int16>(nPage) ); break; } default: diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 1fd50b63812d..103a9b15d7f3 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -63,7 +63,7 @@ void SwVbaStyle::setLanguageID( const uno::Reference< beans::XPropertySet >& xTC ::sal_Int32 SAL_CALL SwVbaStyle::getLanguageID() { - return (sal_uInt16)getLanguageID( mxStyleProps ); + return static_cast<sal_uInt16>(getLanguageID( mxStyleProps )); } void SAL_CALL SwVbaStyle::setLanguageID( ::sal_Int32 _languageid ) diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index efcf9aadb6e9..1533f3fb3949 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -190,8 +190,8 @@ sal_Int32 SwVbaTableHelper::GetColWidth( sal_Int32 nCol, sal_Int32 nRow ) sal_Int32 nWidth = GetColWidth( aCols, nCol ); sal_Int32 nTableWidth = getTableWidth( ); - double dAbsWidth = ( (double)nWidth / UNO_TABLE_COLUMN_SUM ) * (double) nTableWidth; - return ( sal_Int32 )Millimeter::getInPoints( static_cast<int>(dAbsWidth) ); + double dAbsWidth = ( static_cast<double>(nWidth) / UNO_TABLE_COLUMN_SUM ) * static_cast<double>(nTableWidth); + return static_cast<sal_Int32>(Millimeter::getInPoints( static_cast<int>(dAbsWidth) )); } sal_Int32 SwVbaTableHelper::GetColWidth( SwTabCols& rCols, sal_Int32 nNum ) @@ -254,7 +254,7 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 aCols[ GetRightSeparator( aCols, nCol ) ] += nDiff; else { - int nDiffLeft = nDiff - (int)GetColWidth( aCols, nCol + 1) + (int)MINLAY; + int nDiffLeft = nDiff - static_cast<int>(GetColWidth( aCols, nCol + 1)) + int(MINLAY); aCols[ GetRightSeparator( aCols, nCol ) ] += (nDiff - nDiffLeft); aCols[ GetRightSeparator( aCols, nCol - 1 ) ] -= nDiffLeft; } @@ -263,7 +263,7 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width, sal_Int32 nCol, sal_Int32 aCols[ GetRightSeparator( aCols, nCol-1 ) ] -= nDiff; } else - aCols.SetRight( std::min( (long)nNewWidth, aCols.GetRightMax()) ); + aCols.SetRight( std::min( static_cast<long>(nNewWidth), aCols.GetRightMax()) ); pTable->SetTabCols(aCols, aOldCols, pStart, bCurRowOnly ); } diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index 34e72dcc552c..db85851c7eb6 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -243,7 +243,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) { OSL_ENSURE(pOldSh, "No document - wasn't 'Insert' disabled???"); SvxPaperBinItem aItem( RES_PAPER_BIN ); - aItem.SetValue((sal_uInt8)pSh->getIDocumentDeviceAccess().getPrinter(true)->GetPaperBin()); + aItem.SetValue(static_cast<sal_uInt8>(pSh->getIDocumentDeviceAccess().getPrinter(true)->GetPaperBin())); pOldSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetFormatAttr(aItem); } @@ -353,8 +353,8 @@ void SwModule::InsertEnv( SfxRequest& rReq ) long lLeft = rItem.m_nShiftRight, lUpper = rItem.m_nShiftDown; - sal_uInt16 nPageW = (sal_uInt16) std::max(rItem.m_nWidth, rItem.m_nHeight), - nPageH = (sal_uInt16) std::min(rItem.m_nWidth, rItem.m_nHeight); + sal_uInt16 nPageW = static_cast<sal_uInt16>(std::max(rItem.m_nWidth, rItem.m_nHeight)), + nPageH = static_cast<sal_uInt16>(std::min(rItem.m_nWidth, rItem.m_nHeight)); switch (rItem.m_eAlign) { @@ -371,8 +371,8 @@ void SwModule::InsertEnv( SfxRequest& rReq ) } SvxLRSpaceItem aLRMargin( RES_LR_SPACE ); SvxULSpaceItem aULMargin( RES_UL_SPACE ); - aLRMargin.SetLeft ((sal_uInt16) lLeft ); - aULMargin.SetUpper((sal_uInt16) lUpper); + aLRMargin.SetLeft (static_cast<sal_uInt16>(lLeft) ); + aULMargin.SetUpper(static_cast<sal_uInt16>(lUpper)); aLRMargin.SetRight(0); aULMargin.SetLower(0); rFormat.SetFormatAttr(aLRMargin); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index b731650e00a0..d2f8944c12df 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -242,8 +242,8 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) // Borders SvxLRSpaceItem aLRMargin( RES_LR_SPACE ); SvxULSpaceItem aULMargin( RES_UL_SPACE ); - aLRMargin.SetLeft ((sal_uInt16) rItem.m_lLeft ); - aULMargin.SetUpper((sal_uInt16) rItem.m_lUpper); + aLRMargin.SetLeft (static_cast<sal_uInt16>(rItem.m_lLeft) ); + aULMargin.SetUpper(static_cast<sal_uInt16>(rItem.m_lUpper)); aLRMargin.SetRight( 0 ); aULMargin.SetLower( 0 ); rFormat.SetFormatAttr(aLRMargin); @@ -273,7 +273,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) pPrt = pSh->getIDocumentDeviceAccess().getPrinter( true ); SvxPaperBinItem aItem( RES_PAPER_BIN ); - aItem.SetValue((sal_Int8)pPrt->GetPaperBin()); + aItem.SetValue(static_cast<sal_Int8>(pPrt->GetPaperBin())); rFormat.SetFormatAttr(aItem); // Determine orientation of the resulting page diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 6be4c2407e13..da877cea1e92 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -195,10 +195,10 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) const SvxTabStopItem& rDefTabs = static_cast<const SvxTabStopItem&>(pAppView->GetWrtShell(). GetDefault(RES_PARATR_TABSTOP)); - pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, (sal_uInt16)::GetTabDist(rDefTabs))); + pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(::GetTabDist(rDefTabs)))); } else - pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, (sal_uInt16)pPref->GetDefTab())); + pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(pPref->GetDefTab()))); } // Options for GridTabPage @@ -209,8 +209,8 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) aGridItem.SetGridVisible( aViewOpt.IsGridVisible()); const Size& rSnapSize = aViewOpt.GetSnapSize(); - aGridItem.SetFieldDrawX( (sal_uInt16) (rSnapSize.Width() )); - aGridItem.SetFieldDrawY( (sal_uInt16) (rSnapSize.Height())); + aGridItem.SetFieldDrawX( static_cast<sal_uInt16>(rSnapSize.Width() )); + aGridItem.SetFieldDrawY( static_cast<sal_uInt16>(rSnapSize.Height())); aGridItem.SetFieldDivisionX( aViewOpt.GetDivisionX()); aGridItem.SetFieldDivisionY( aViewOpt.GetDivisionY()); @@ -358,10 +358,10 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) Size aSize( pGridItem->GetFieldDrawX(), pGridItem->GetFieldDrawY() ); if( aViewOpt.GetSnapSize() != aSize ) aViewOpt.SetSnapSize( aSize ); - short nDiv = (short)pGridItem->GetFieldDivisionX() ; + short nDiv = static_cast<short>(pGridItem->GetFieldDivisionX()) ; if( aViewOpt.GetDivisionX() != nDiv ) aViewOpt.SetDivisionX( nDiv ); - nDiv = (short)pGridItem->GetFieldDivisionY(); + nDiv = static_cast<short>(pGridItem->GetFieldDivisionY()); if( aViewOpt.GetDivisionY() != nDiv ) aViewOpt.SetDivisionY( nDiv ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 3078677b7491..b43dbdc2a903 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -492,7 +492,7 @@ void SwDocShell::Execute(SfxRequest& rReq) aFileName = pTemplateItem->GetValue(); const SfxInt32Item* pFlagsItem = rReq.GetArg<SfxInt32Item>(SID_TEMPLATE_LOAD); if ( pFlagsItem ) - nFlags = static_cast<SfxTemplateFlags>((sal_uInt16) pFlagsItem->GetValue()); + nFlags = static_cast<SfxTemplateFlags>(static_cast<sal_uInt16>(pFlagsItem->GetValue())); } } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index fe99774d7a6c..8d6c86071324 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -697,8 +697,8 @@ void SwDocShell::SubInitNew() // only set Widow/Orphan defaults on a new, non-web document - not an opened one if( GetMedium() && GetMedium()->GetOrigURL().isEmpty() ) { - m_xDoc->SetDefault( SvxWidowsItem( (sal_uInt8) 2, RES_PARATR_WIDOWS) ); - m_xDoc->SetDefault( SvxOrphansItem( (sal_uInt8) 2, RES_PARATR_ORPHANS) ); + m_xDoc->SetDefault( SvxWidowsItem( sal_uInt8(2), RES_PARATR_WIDOWS) ); + m_xDoc->SetDefault( SvxOrphansItem( sal_uInt8(2), RES_PARATR_ORPHANS) ); } } diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index c5180e3038ae..a43fc90265dd 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -444,7 +444,7 @@ void SwStyleSheetIterator::SwPoolFormatList::Append( char cChar, const OUString& if (it != maUnique.end()) return; - maUnique[aStr] = (sal_uInt32)maImpl.size(); + maUnique[aStr] = static_cast<sal_uInt32>(maImpl.size()); maImpl.push_back(aStr); } diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 00992b9e196c..38a7371c61f3 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -613,7 +613,7 @@ sal_uInt16 SwModule::GetLinkUpdMode() const { if(!m_pUsrPref) GetUsrPref(false); - return (sal_uInt16)m_pUsrPref->GetUpdateLinkMode(); + return static_cast<sal_uInt16>(m_pUsrPref->GetUpdateLinkMode()); } SwFieldUpdateFlags SwModule::GetFieldUpdateFlags() const diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 2c320993e6ca..d90eaa50b47b 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -619,12 +619,12 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro { case 0: pValues[nProp] <<= rOpt.UseCaption(); break;//Enable case 1: pValues[nProp] <<= rOpt.GetCategory(); break;//Category - case 2: pValues[nProp] <<= (sal_Int32)rOpt.GetNumType(); break;//Numbering", + case 2: pValues[nProp] <<= static_cast<sal_Int32>(rOpt.GetNumType()); break;//Numbering", case 3: pValues[nProp] <<= rOpt.GetNumSeparator(); break;//NumberingSeparator", case 4: pValues[nProp] <<= rOpt.GetCaption(); break;//CaptionText", case 5: pValues[nProp] <<= rOpt.GetSeparator();break;//Delimiter", - case 6: pValues[nProp] <<= (sal_Int32)rOpt.GetLevel(); break;//Level", - case 7: pValues[nProp] <<= (sal_Int32)rOpt.GetPos(); break;//Position", + case 6: pValues[nProp] <<= static_cast<sal_Int32>(rOpt.GetLevel()); break;//Level", + case 7: pValues[nProp] <<= static_cast<sal_Int32>(rOpt.GetPos()); break;//Position", case 8: pValues[nProp] <<= rOpt.GetCharacterStyle(); break; //CharacterStyle case 9: pValues[nProp] <<= rOpt.CopyAttributes(); break; //ApplyAttributes } @@ -1151,10 +1151,10 @@ void SwTableConfig::ImplCommit() { switch(nProp) { - case 0 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableHMove); break; //"Shift/Row", - case 1 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableVMove); break; //"Shift/Column", - case 2 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableHInsert); break; //"Insert/Row", - case 3 : pValues[nProp] <<= (sal_Int32)convertTwipToMm100(nTableVInsert); break; //"Insert/Column", + case 0 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableHMove)); break; //"Shift/Row", + case 1 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableVMove)); break; //"Shift/Column", + case 2 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableHInsert)); break; //"Insert/Row", + case 3 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableVInsert)); break; //"Insert/Column", case 4 : pValues[nProp] <<= (sal_Int32)eTableChgMode; break; //"Change/Effect", case 5 : pValues[nProp] <<= bInsTableFormatNum; break; //"Input/NumberRecognition", case 6 : pValues[nProp] <<= bInsTableChangeNumFormat; break; //"Input/NumberFormatRecognition", @@ -1177,10 +1177,10 @@ void SwTableConfig::Load() sal_Int32 nTemp = 0; switch (nProp) { - case 0 : pValues[nProp] >>= nTemp; nTableHMove = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Shift/Row", - case 1 : pValues[nProp] >>= nTemp; nTableVMove = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Shift/Column", - case 2 : pValues[nProp] >>= nTemp; nTableHInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Insert/Row", - case 3 : pValues[nProp] >>= nTemp; nTableVInsert = (sal_uInt16)convertMm100ToTwip(nTemp); break; //"Insert/Column", + case 0 : pValues[nProp] >>= nTemp; nTableHMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Shift/Row", + case 1 : pValues[nProp] >>= nTemp; nTableVMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Shift/Column", + case 2 : pValues[nProp] >>= nTemp; nTableHInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Insert/Row", + case 3 : pValues[nProp] >>= nTemp; nTableVInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break; //"Insert/Column", case 4 : pValues[nProp] >>= nTemp; eTableChgMode = (TableChgMode)nTemp; break; //"Change/Effect", case 5 : bInsTableFormatNum = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/NumberRecognition", case 6 : bInsTableChangeNumFormat = *o3tl::doAccess<bool>(pValues[nProp]); break; //"Input/NumberFormatRecognition", @@ -1350,7 +1350,7 @@ void SwCompareConfig::ImplCommit() pValues[0] <<= (sal_Int32) eCmpMode; pValues[1] <<= bUseRsid; pValues[2] <<= bIgnorePieces; - pValues[3] <<= (sal_Int32) nPieceLen; + pValues[3] <<= static_cast<sal_Int32>(nPieceLen); pValues[4] <<= m_bStoreRsid; PutProperties(aNames, aValues); diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index ceae8d0b4eff..222ebe47b424 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -288,20 +288,20 @@ void SwLayoutViewConfig::ImplCommit() case 5: rVal <<= rParent.IsViewVRuler(true); break; // "Window/VerticalRuler", case 6: if(rParent.m_bIsHScrollMetricSet) - rVal <<= (sal_Int32)rParent.m_eHScrollMetric; // "Window/HorizontalRulerUnit" + rVal <<= static_cast<sal_Int32>(rParent.m_eHScrollMetric); // "Window/HorizontalRulerUnit" break; case 7: if(rParent.m_bIsVScrollMetricSet) - rVal <<= (sal_Int32)rParent.m_eVScrollMetric; // "Window/VerticalRulerUnit" + rVal <<= static_cast<sal_Int32>(rParent.m_eVScrollMetric); // "Window/VerticalRulerUnit" break; case 8: rVal <<= rParent.IsSmoothScroll(); break; // "Window/SmoothScroll", - case 9: rVal <<= (sal_Int32)rParent.GetZoom(); break; // "Zoom/Value", + case 9: rVal <<= static_cast<sal_Int32>(rParent.GetZoom()); break; // "Zoom/Value", case 10: rVal <<= (sal_Int32)rParent.GetZoomType(); break; // "Zoom/Type", case 11: rVal <<= rParent.IsAlignMathObjectsToBaseline(); break; // "Other/IsAlignMathObjectsToBaseline" - case 12: rVal <<= (sal_Int32)rParent.GetMetric(); break; // "Other/MeasureUnit", + case 12: rVal <<= static_cast<sal_Int32>(rParent.GetMetric()); break; // "Other/MeasureUnit", case 13: rVal <<= static_cast<sal_Int32>(convertTwipToMm100(rParent.GetDefTab())); break;// "Other/TabStop", case 14: rVal <<= rParent.IsVRulerRight(); break; // "Window/IsVerticalRulerRight", - case 15: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break; // "ViewLayout/Columns", + case 15: rVal <<= static_cast<sal_Int32>(rParent.GetViewLayoutColumns()); break; // "ViewLayout/Columns", case 16: rVal <<= rParent.IsViewLayoutBookMode(); break; // "ViewLayout/BookMode", case 17: rVal <<= rParent.IsSquaredPageMode(); break; // "Other/IsSquaredPageMode", case 18: rVal <<= rParent.IsApplyCharUnit(); break; // "Other/ApplyCharUnit", @@ -415,10 +415,10 @@ void SwGridConfig::ImplCommit() case 0: pValues[nProp] <<= rParent.IsSnap(); break;// "Option/SnapToGrid", case 1: pValues[nProp] <<= rParent.IsGridVisible(); break;//"Option/VisibleGrid", case 2: pValues[nProp] <<= rParent.IsSynchronize(); break;// "Option/Synchronize", - case 3: pValues[nProp] <<= (sal_Int32)convertTwipToMm100(rParent.GetSnapSize().Width()); break;// "Resolution/XAxis", - case 4: pValues[nProp] <<= (sal_Int32)convertTwipToMm100(rParent.GetSnapSize().Height()); break;// "Resolution/YAxis", - case 5: pValues[nProp] <<= (sal_Int16)rParent.GetDivisionX(); break;// "Subdivision/XAxis", - case 6: pValues[nProp] <<= (sal_Int16)rParent.GetDivisionY(); break;// "Subdivision/YAxis" + case 3: pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(rParent.GetSnapSize().Width())); break;// "Resolution/XAxis", + case 4: pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(rParent.GetSnapSize().Height())); break;// "Resolution/YAxis", + case 5: pValues[nProp] <<= static_cast<sal_Int16>(rParent.GetDivisionX()); break;// "Subdivision/XAxis", + case 6: pValues[nProp] <<= static_cast<sal_Int16>(rParent.GetDivisionY()); break;// "Subdivision/YAxis" } } PutProperties(aNames, aValues); @@ -448,8 +448,8 @@ void SwGridConfig::Load() case 2: rParent.SetSynchronize(bSet); break;// "Option/Synchronize", case 3: aSnap.Width() = convertMm100ToTwip(nSet); break;// "Resolution/XAxis", case 4: aSnap.Height() = convertMm100ToTwip(nSet); break;// "Resolution/YAxis", - case 5: rParent.SetDivisionX((short)nSet); break;// "Subdivision/XAxis", - case 6: rParent.SetDivisionY((short)nSet); break;// "Subdivision/YAxis" + case 5: rParent.SetDivisionX(static_cast<short>(nSet)); break;// "Subdivision/XAxis", + case 6: rParent.SetDivisionY(static_cast<short>(nSet)); break;// "Subdivision/YAxis" } } } @@ -498,7 +498,7 @@ void SwCursorConfig::ImplCommit() switch(nProp) { case 0: pValues[nProp] <<= rParent.IsShadowCursor(); break; // "DirectCursor/UseDirectCursor", - case 1: pValues[nProp] <<= (sal_Int32)rParent.GetShdwCursorFillMode(); break; // "DirectCursor/Insert", + case 1: pValues[nProp] <<= static_cast<sal_Int32>(rParent.GetShdwCursorFillMode()); break; // "DirectCursor/Insert", case 2: pValues[nProp] <<= rParent.IsCursorInProtectedArea(); break; // "Option/ProtectedArea" } } @@ -527,7 +527,7 @@ void SwCursorConfig::Load() switch(nProp) { case 0: rParent.SetShadowCursor(bSet); break; // "DirectCursor/UseDirectCursor", - case 1: rParent.SetShdwCursorFillMode((sal_uInt8)nSet); break; // "DirectCursor/Insert", + case 1: rParent.SetShdwCursorFillMode(static_cast<sal_uInt8>(nSet)); break; // "DirectCursor/Insert", case 2: rParent.SetCursorInProtectedArea(bSet); break; // "Option/ProtectedArea" } } @@ -559,7 +559,7 @@ void SwWebColorConfig::ImplCommit() { switch(nProp) { - case 0: pValues[nProp] <<= (sal_Int32)rParent.GetRetoucheColor().GetColor(); break;// "Color", + case 0: pValues[nProp] <<= static_cast<sal_Int32>(rParent.GetRetoucheColor().GetColor()); break;// "Color", } } PutProperties(aPropNames, aValues); diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 2061e8424013..68eb9ada8a12 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -306,7 +306,7 @@ void SwViewOption::Init( vcl::Window const *pWin ) { if( !m_nPixelTwips && pWin ) { - m_nPixelTwips = (sal_uInt16)pWin->PixelToLogic( Size(1,1) ).Height(); + m_nPixelTwips = static_cast<sal_uInt16>(pWin->PixelToLogic( Size(1,1) ).Height()); } } diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 2beeaa439bb7..102e6dd4ab71 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1945,7 +1945,7 @@ uno::Reference< sdbcx::XColumnsSupplier> SwDBManager::GetColumnSupplier(uno::Ref xRowProperties->setPropertyValue("DataSourceName", uno::makeAny(sDataSource)); xRowProperties->setPropertyValue("Command", uno::makeAny(rTableOrQuery)); xRowProperties->setPropertyValue("CommandType", uno::makeAny(nCommandType)); - xRowProperties->setPropertyValue("FetchSize", uno::makeAny((sal_Int32)10)); + xRowProperties->setPropertyValue("FetchSize", uno::makeAny(sal_Int32(10))); xRowProperties->setPropertyValue("ActiveConnection", uno::makeAny(xConnection)); xRowSet->execute(); xRet.set( xRowSet, uno::UNO_QUERY ); @@ -2345,7 +2345,7 @@ bool SwDBManager::OpenDataSource(const OUString& rDataSource, const OUString& rT try { pFound->bScrollable = xMetaData - ->supportsResultSetType((sal_Int32)sdbc::ResultSetType::SCROLL_INSENSITIVE); + ->supportsResultSetType(sal_Int32(sdbc::ResultSetType::SCROLL_INSENSITIVE)); } catch(const uno::Exception&) { diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 37081794c21b..f4211f6a8f46 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -248,7 +248,7 @@ void SwAddressPreview::SelectAddress(sal_uInt16 nSelect) pImpl->nSelectedAddress = nSelect; // now make it visible.. sal_uInt16 nSelectRow = nSelect / pImpl->nColumns; - sal_uInt16 nStartRow = (sal_uInt16)aVScrollBar->GetThumbPos(); + sal_uInt16 nStartRow = static_cast<sal_uInt16>(aVScrollBar->GetThumbPos()); if( (nSelectRow < nStartRow) || (nSelectRow >= (nStartRow + pImpl->nRows) )) aVScrollBar->SetThumbPos( nSelectRow ); } @@ -292,7 +292,7 @@ void SwAddressPreview::UpdateScrollBar() if(pImpl->nColumns) { aVScrollBar->SetVisibleSize(pImpl->nRows); - sal_uInt16 nResultingRows = (sal_uInt16)(pImpl->aAddresses.size() + pImpl->nColumns - 1) / pImpl->nColumns; + sal_uInt16 nResultingRows = static_cast<sal_uInt16>(pImpl->aAddresses.size() + pImpl->nColumns - 1) / pImpl->nColumns; ++nResultingRows; aVScrollBar->Show(pImpl->bEnableScrollBar && nResultingRows > pImpl->nRows); aVScrollBar->SetRange(Range(0, nResultingRows)); @@ -318,7 +318,7 @@ void SwAddressPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Re if(aVScrollBar->IsVisible()) { aSize.Width() -= aVScrollBar->GetSizePixel().Width(); - nStartRow = (sal_uInt16)aVScrollBar->GetThumbPos(); + nStartRow = static_cast<sal_uInt16>(aVScrollBar->GetThumbPos()); } Size aPartSize(aSize.Width() / pImpl->nColumns, aSize.Height() / pImpl->nRows); @@ -359,15 +359,15 @@ void SwAddressPreview::MouseButtonDown( const MouseEvent& rMEvt ) sal_uInt32 nRow = rMousePos.Y() / aPartSize.Height() ; if(aVScrollBar->IsVisible()) { - nRow += (sal_uInt16)aVScrollBar->GetThumbPos(); + nRow += static_cast<sal_uInt16>(aVScrollBar->GetThumbPos()); } sal_uInt32 nCol = rMousePos.X() / aPartSize.Width(); sal_uInt32 nSelect = nRow * pImpl->nColumns + nCol; if( nSelect < pImpl->aAddresses.size() && - pImpl->nSelectedAddress != (sal_uInt16)nSelect) + pImpl->nSelectedAddress != static_cast<sal_uInt16>(nSelect)) { - pImpl->nSelectedAddress = (sal_uInt16)nSelect; + pImpl->nSelectedAddress = static_cast<sal_uInt16>(nSelect); m_aSelectHdl.Call(nullptr); } Invalidate(); @@ -408,9 +408,9 @@ void SwAddressPreview::KeyInput( const KeyEvent& rKEvt ) } sal_uInt32 nSelect = nSelectedRow * pImpl->nColumns + nSelectedColumn; if( nSelect < pImpl->aAddresses.size() && - pImpl->nSelectedAddress != (sal_uInt16)nSelect) + pImpl->nSelectedAddress != static_cast<sal_uInt16>(nSelect)) { - pImpl->nSelectedAddress = (sal_uInt16)nSelect; + pImpl->nSelectedAddress = static_cast<sal_uInt16>(nSelect); m_aSelectHdl.Call(nullptr); Invalidate(); } @@ -640,7 +640,7 @@ uno::Any SwConnectionContext::getValueByName( const OUString& rName ) if( rName == "ServerName" ) aRet <<= m_sMailServer; else if( rName == "Port" ) - aRet <<= (sal_Int32) m_nPort; + aRet <<= static_cast<sal_Int32>(m_nPort); else if( rName == "ConnectionType" ) aRet <<= m_sConnectionType; return aRet; diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 9170ffe1cb14..957d65474724 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -533,7 +533,7 @@ void SwMailMergeConfigItem_Impl::ImplCommit() case 23: pValues[nProp] <<= m_sMailPassword; break; case 24 :pValues[nProp] <<= m_aDBData.sDataSource; break; case 25 :pValues[nProp] <<= m_aDBData.sCommand; break; - case 26 :pValues[nProp] <<= (short)m_aDBData.nCommandType; break; + case 26 :pValues[nProp] <<= static_cast<short>(m_aDBData.nCommandType); break; case 27 :pValues[nProp] <<= m_sFilter; break; case 28 :pValues[nProp] <<= m_aSavedDocuments; break; case 29: pValues[nProp] <<= m_bIsEMailSupported; break; @@ -882,7 +882,7 @@ Reference< XResultSet> const & SwMailMergeConfigItem::GetResultSet() const xRowProperties->setPropertyValue("DataSourceName", makeAny(m_pImpl->m_aDBData.sDataSource)); xRowProperties->setPropertyValue("Command", makeAny(m_pImpl->m_aDBData.sCommand)); xRowProperties->setPropertyValue("CommandType", makeAny(m_pImpl->m_aDBData.nCommandType)); - xRowProperties->setPropertyValue("FetchSize", makeAny((sal_Int32)10)); + xRowProperties->setPropertyValue("FetchSize", makeAny(sal_Int32(10))); xRowProperties->setPropertyValue("ActiveConnection", makeAny(m_pImpl->m_xConnection.getTyped())); try { diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 2fa820fea16f..494c348a6465 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -126,7 +126,7 @@ void SwGlossaryHdl::SetCurGroup(const OUString &rGrp, bool bApi, bool bAlwaysCre } } const OUString sPath = sGroup.getToken(1, GLOS_DELIM); - sal_uInt16 nComparePath = (sal_uInt16)sPath.toInt32(); + sal_uInt16 nComparePath = static_cast<sal_uInt16>(sPath.toInt32()); if(nCurrentPath == nComparePath && sGroup.getToken(0, GLOS_DELIM) == sCurBase) bPathEqual = true; @@ -277,7 +277,7 @@ OUString SwGlossaryHdl::GetGlossaryShortName(const OUString &rName) if(pTmp) { sal_uInt16 nIdx = pTmp->GetLongIndex( rName ); - if( nIdx != (sal_uInt16) -1 ) + if( nIdx != sal_uInt16(-1) ) sReturn = pTmp->GetShortName( nIdx ); if( !pCurGrp ) delete pTmp; @@ -290,7 +290,7 @@ bool SwGlossaryHdl::HasShortName(const OUString& rShortName) const { SwTextBlocks *pBlock = pCurGrp ? pCurGrp.get() : rStatGlossaries.GetGroupDoc( aCurGrp ); - bool bRet = pBlock->GetIndex( rShortName ) != (sal_uInt16) -1; + bool bRet = pBlock->GetIndex( rShortName ) != sal_uInt16(-1); if( !pCurGrp ) delete pBlock; return bRet; @@ -319,13 +319,13 @@ bool SwGlossaryHdl::NewGlossary(const OUString& rName, const OUString& rShortNam const sal_uInt16 nSuccess = pWrtShell->MakeGlossary( *pTmp, rName, rShortName, rCfg.IsSaveRelFile(), pOnlyText ); - if(nSuccess == (sal_uInt16) -1 ) + if(nSuccess == sal_uInt16(-1) ) { ScopedVclPtrInstance<MessageDialog>(pWrtShell->GetView().GetWindow(), SwResId(STR_ERR_INSERT_GLOS), VclMessageType::Info)->Execute(); } if( !pCurGrp ) delete pTmp; - return nSuccess != (sal_uInt16) -1; + return nSuccess != sal_uInt16(-1); } // Delete a autotext @@ -338,7 +338,7 @@ bool SwGlossaryHdl::DelGlossary(const OUString &rShortName) return false; sal_uInt16 nIdx = pGlossary->GetIndex( rShortName ); - if( nIdx != (sal_uInt16) -1 ) + if( nIdx != sal_uInt16(-1) ) pGlossary->Delete( nIdx ); if( !pCurGrp ) delete pGlossary; @@ -395,7 +395,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); sal_uInt16 nFound = !rCfg.IsSearchInAllCategories() ? pGlossary->GetIndex( aShortName ) : -1; // if not found then search in all groups - if( nFound == (sal_uInt16) -1 ) + if( nFound == sal_uInt16(-1) ) { const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore(); SwGlossaryList* pGlossaryList = ::GetGlossaryList(); @@ -454,7 +454,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, } else { - nFound = (sal_uInt16) -1; + nFound = sal_uInt16(-1); bCancel = true; } } @@ -462,7 +462,7 @@ bool SwGlossaryHdl::Expand( const OUString& rShortName, } // not found - if( nFound == (sal_uInt16) -1 ) + if( nFound == sal_uInt16(-1) ) { if( !bCancel ) { diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 4e2ee98fb52a..ad4c27719948 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -935,7 +935,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) AddFormat( SotClipboardFormatId::PNG ); AddFormat( SotClipboardFormatId::BITMAP ); } - m_eBufferType = (TransferBufferType)( TransferBufferType::Graphic | m_eBufferType ); + m_eBufferType = static_cast<TransferBufferType>( TransferBufferType::Graphic | m_eBufferType ); m_pClpGraphic.reset(new Graphic); if( !m_pWrtShell->GetDrawObjGraphic( SotClipboardFormatId::GDIMETAFILE, *m_pClpGraphic )) @@ -3613,7 +3613,7 @@ SwTransferable* SwTransferable::GetSwTransferable( const TransferableDataHelper& { sal_Int64 nHandle = xTunnel->getSomething( getUnoTunnelId() ); if ( nHandle ) - pSwTransferable = reinterpret_cast<SwTransferable*>( (sal_IntPtr) nHandle ); + pSwTransferable = reinterpret_cast<SwTransferable*>( static_cast<sal_IntPtr>(nHandle) ); } return pSwTransferable; diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index e7a76574bf22..6199d7c3cc34 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -152,7 +152,7 @@ namespace sw { namespace annotation { #define METABUTTON_WIDTH 16 #define METABUTTON_HEIGHT 18 #define METABUTTON_AREA_WIDTH 30 -#define POSTIT_META_HEIGHT (sal_Int32) 30 +#define POSTIT_META_HEIGHT sal_Int32(30) #define POSTIT_MINIMUMSIZE_WITHOUT_META 50 diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 0b982a5b8945..c19ec007369d 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1962,10 +1962,10 @@ void SwPostItMgr::CorrectPositions() // yeah, I know, if this is a left page it could be wrong, but finding the page and the note is probably not even faster than just doing it // check, if anchor overlay object exists. const long aAnchorX = pFirstPostIt->Anchor() - ? mpEditWin->LogicToPixel( Point((long)(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X() + ? mpEditWin->LogicToPixel( Point(static_cast<long>(pFirstPostIt->Anchor()->GetSixthPosition().getX()),0)).X() : 0; const long aAnchorY = pFirstPostIt->Anchor() - ? mpEditWin->LogicToPixel( Point(0,(long)(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1 + ? mpEditWin->LogicToPixel( Point(0,static_cast<long>(pFirstPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1 : 0; if (Point(aAnchorX,aAnchorY) != pFirstPostIt->GetPosPixel()) { @@ -1979,9 +1979,9 @@ void SwPostItMgr::CorrectPositions() if ( item->bShow && item->pPostIt && item->pPostIt->Anchor() ) { aAnchorPosX = pPage->eSidebarPosition == sw::sidebarwindows::SidebarPosition::LEFT - ? mpEditWin->LogicToPixel( Point((long)(item->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X() - : mpEditWin->LogicToPixel( Point((long)(item->pPostIt->Anchor()->GetSixthPosition().getX()),0)).X(); - aAnchorPosY = mpEditWin->LogicToPixel( Point(0,(long)(item->pPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1; + ? mpEditWin->LogicToPixel( Point(static_cast<long>(item->pPostIt->Anchor()->GetSeventhPosition().getX()),0)).X() + : mpEditWin->LogicToPixel( Point(static_cast<long>(item->pPostIt->Anchor()->GetSixthPosition().getX()),0)).X(); + aAnchorPosY = mpEditWin->LogicToPixel( Point(0,static_cast<long>(item->pPostIt->Anchor()->GetSixthPosition().getY()))).Y() + 1; item->pPostIt->SetPosPixel(Point(aAnchorPosX,aAnchorPosY)); } } @@ -2010,7 +2010,7 @@ unsigned long SwPostItMgr::GetSidebarWidth(bool bPx) const double fScaleX = double(mpWrtShell->GetOut()->GetMapMode().GetScaleX()); nZoom = fScaleX * 100; } - unsigned long aWidth = (unsigned long)(nZoom * 1.8); + unsigned long aWidth = static_cast<unsigned long>(nZoom * 1.8); if (bPx) return aWidth; diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 57c1d5457e54..a379a5f4e2e0 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -443,7 +443,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) } if ( EXCHG_IN_ACTION_DEFAULT != nEventAction ) - nUserOpt = (sal_Int8)nEventAction; + nUserOpt = static_cast<sal_Int8>(nEventAction); // show DropCursor or UserMarker ? if( SotExchangeDest::SWDOC_FREE_AREA_WEB == m_nDropDestination || diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 872ad7b79653..7bdc2deea632 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1038,10 +1038,10 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb ) aSnap = rSh.GetViewOptions()->GetSnapSize(); short nDiv = rSh.GetViewOptions()->GetDivisionX(); if ( nDiv > 0 ) - aSnap.Width() = std::max( (sal_uLong)1, (sal_uLong)aSnap.Width() / nDiv ); + aSnap.Width() = std::max( sal_uLong(1), static_cast<sal_uLong>(aSnap.Width()) / nDiv ); nDiv = rSh.GetViewOptions()->GetDivisionY(); if ( nDiv > 0 ) - aSnap.Height() = std::max( (sal_uLong)1, (sal_uLong)aSnap.Height() / nDiv ); + aSnap.Height() = std::max( sal_uLong(1), static_cast<sal_uLong>(aSnap.Height()) / nDiv ); } if(bHuge) @@ -1239,10 +1239,10 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir ) Size aSnap( rSh.GetViewOptions()->GetSnapSize() ); short nDiv = rSh.GetViewOptions()->GetDivisionX(); if ( nDiv > 0 ) - aSnap.Width() = std::max( (sal_uLong)1, (sal_uLong)aSnap.Width() / nDiv ); + aSnap.Width() = std::max( sal_uLong(1), static_cast<sal_uLong>(aSnap.Width()) / nDiv ); nDiv = rSh.GetViewOptions()->GetDivisionY(); if ( nDiv > 0 ) - aSnap.Height() = std::max( (sal_uLong)1, (sal_uLong)aSnap.Height() / nDiv ); + aSnap.Height() = std::max( sal_uLong(1), static_cast<sal_uLong>(aSnap.Height()) / nDiv ); if(bOnePixel) { diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 965ae6446396..235cfa6091e0 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -600,7 +600,7 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer*, pIdle, void ) sal_uInt16 nCount = 0; // at first the region around the cursor is processed TextSelection aSel = m_pTextView->GetSelection(); - sal_uInt16 nCur = (sal_uInt16)aSel.GetStart().GetPara(); + sal_uInt16 nCur = static_cast<sal_uInt16>(aSel.GetStart().GetPara()); if(nCur > 40) nCur -= 40; else @@ -725,7 +725,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO r.eType != svtools::HTMLKEYWORD && r.eType != svtools::HTMLUNKNOWN) r.eType = svtools::HTMLUNKNOWN; - Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue(r.eType).nColor); + Color aColor(static_cast<ColorData>(SW_MOD()->GetColorConfig().GetColorValue(r.eType).nColor)); sal_uInt16 nLine = nLineOff+r.nLine; m_pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 ); } diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index aa6c03d2ae7a..4830eb7f1e7b 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -291,7 +291,7 @@ bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const case MID_ENV_SEND_FROM_TOP : rVal <<= m_nSendFromTop; break; case MID_ENV_WIDTH : rVal <<= m_nWidth; break; case MID_ENV_HEIGHT : rVal <<= m_nHeight; break; - case MID_ENV_ALIGN : rVal <<= (sal_Int16) m_eAlign; break; + case MID_ENV_ALIGN : rVal <<= static_cast<sal_Int16>(m_eAlign); break; case MID_ENV_PRINT_FROM_ABOVE : rVal <<= m_bPrintFromAbove; break; case MID_ENV_SHIFT_RIGHT : rVal <<= m_nShiftRight; break; case MID_ENV_SHIFT_DOWN : rVal <<= m_nShiftDown; break; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 1fa8dfcf07cb..0b32da4ab064 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -783,7 +783,7 @@ OUString SwFieldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uInt32 nFormatId) cons // determine FormatId from Pseudo-ID sal_uInt16 SwFieldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uInt32 nFormatId) const { - sal_uInt16 nId = (sal_uInt16)nFormatId; + sal_uInt16 nId = static_cast<sal_uInt16>(nFormatId); switch( nTypeId ) { case TYP_DOCINFOFLD: @@ -838,7 +838,7 @@ sal_uInt16 SwFieldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uInt32 nFormatId) con sal_Int16 nCurrent = pTypes[nType]; if (nCurrent > NumberingType::CHARS_LOWER_LETTER_N) { - if (nValidEntry == ((sal_Int32)nFormatId)) + if (nValidEntry == static_cast<sal_Int32>(nFormatId)) { nId = pTypes[nType]; break; @@ -941,7 +941,7 @@ bool SwFieldMgr::InsertField( { SwScriptFieldType* pType = static_cast<SwScriptFieldType*>(pCurShell->GetFieldType(0, SwFieldIds::Script)); - pField = new SwScriptField(pType, rData.m_sPar1, rData.m_sPar2, (bool)nFormatId); + pField = new SwScriptField(pType, rData.m_sPar1, rData.m_sPar2, static_cast<bool>(nFormatId)); break; } @@ -998,14 +998,14 @@ bool SwFieldMgr::InsertField( case TYP_CHAPTERFLD: { - sal_uInt16 nByte = (sal_uInt16)rData.m_sPar2.toInt32(); + sal_uInt16 nByte = static_cast<sal_uInt16>(rData.m_sPar2.toInt32()); SwChapterFieldType* pTyp = static_cast<SwChapterFieldType*>( pCurShell->GetFieldType(0, SwFieldIds::Chapter) ); pField = new SwChapterField(pTyp, nFormatId); nByte = std::max(sal_uInt16(1), nByte); nByte = std::min(nByte, sal_uInt16(MAXLEVEL)); nByte -= 1; - static_cast<SwChapterField*>(pField)->SetLevel((sal_uInt8)nByte); + static_cast<SwChapterField*>(pField)->SetLevel(static_cast<sal_uInt8>(nByte)); break; } @@ -1013,7 +1013,7 @@ bool SwFieldMgr::InsertField( case TYP_PREVPAGEFLD: case TYP_PAGENUMBERFLD: { - short nOff = (short)rData.m_sPar2.toInt32(); + short nOff = static_cast<short>(rData.m_sPar2.toInt32()); if(rData.m_nTypeId == TYP_NEXTPAGEFLD) { @@ -1093,7 +1093,7 @@ bool SwFieldMgr::InsertField( { SwGetRefFieldType* pTyp = static_cast<SwGetRefFieldType*>( pCurShell->GetFieldType(0, SwFieldIds::GetRef) ); - sal_uInt16 nSeqNo = (sal_uInt16)rData.m_sPar2.toInt32(); + sal_uInt16 nSeqNo = static_cast<sal_uInt16>(rData.m_sPar2.toInt32()); pField = new SwGetRefField(pTyp, rData.m_sPar1, nSubType, nSeqNo, nFormatId); bExp = true; break; @@ -1444,7 +1444,7 @@ bool SwFieldMgr::InsertField( case TYP_SETREFPAGEFLD: pField = new SwRefPageSetField( static_cast<SwRefPageSetFieldType*>( pCurShell->GetFieldType( 0, SwFieldIds::RefPageSet ) ), - (short)rData.m_sPar2.toInt32(), 0 != nSubType ); + static_cast<short>(rData.m_sPar2.toInt32()), 0 != nSubType ); bPageVar = true; break; @@ -1575,17 +1575,17 @@ void SwFieldMgr::UpdateCurField(sal_uInt32 nFormat, case TYP_CHAPTERFLD: { - sal_uInt16 nByte = (sal_uInt16)rPar2.toInt32(); + sal_uInt16 nByte = static_cast<sal_uInt16>(rPar2.toInt32()); nByte = std::max(sal_uInt16(1), nByte); nByte = std::min(nByte, sal_uInt16(MAXLEVEL)); nByte -= 1; - static_cast<SwChapterField*>(pTmpField)->SetLevel((sal_uInt8)nByte); + static_cast<SwChapterField*>(pTmpField)->SetLevel(static_cast<sal_uInt8>(nByte)); bSetPar2 = false; break; } case TYP_SCRIPTFLD: - static_cast<SwScriptField*>(pTmpField)->SetCodeURL((bool)nFormat); + static_cast<SwScriptField*>(pTmpField)->SetCodeURL(static_cast<bool>(nFormat)); break; case TYP_NEXTPAGEFLD: @@ -1598,7 +1598,7 @@ void SwFieldMgr::UpdateCurField(sal_uInt32 nFormat, { if( nFormat + 2 == SVX_NUM_PAGEDESC ) nFormat = SVX_NUM_PAGEDESC; - short nOff = (short)sPar2.toInt32(); + short nOff = static_cast<short>(sPar2.toInt32()); nOff += 1; sPar2 = OUString::number(nOff); } @@ -1614,7 +1614,7 @@ void SwFieldMgr::UpdateCurField(sal_uInt32 nFormat, { if( nFormat + 2 == SVX_NUM_PAGEDESC ) nFormat = SVX_NUM_PAGEDESC; - short nOff = (short)sPar2.toInt32(); + short nOff = static_cast<short>(sPar2.toInt32()); nOff -= 1; sPar2 = OUString::number(nOff); } @@ -1629,10 +1629,10 @@ void SwFieldMgr::UpdateCurField(sal_uInt32 nFormat, case TYP_GETREFFLD: { bSetPar2 = false; - static_cast<SwGetRefField*>(pTmpField)->SetSubType( (sal_uInt16)rPar2.toInt32() ); + static_cast<SwGetRefField*>(pTmpField)->SetSubType( static_cast<sal_uInt16>(rPar2.toInt32()) ); const sal_Int32 nPos = rPar2.indexOf( '|' ); if( nPos>=0 ) - static_cast<SwGetRefField*>(pTmpField)->SetSeqNo( (sal_uInt16)rPar2.copy( nPos + 1 ).toInt32()); + static_cast<SwGetRefField*>(pTmpField)->SetSeqNo( static_cast<sal_uInt16>(rPar2.copy( nPos + 1 ).toInt32())); } break; case TYP_DROPDOWN: diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index cd71648e72fc..3c5fa5f07478 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -345,7 +345,7 @@ SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent) SetBorderStyle( WindowBorderStyle::MONO ); m_aFrameSize = SvxPaperInfo::GetPaperSize(PAPER_A4);// DIN A4 - ::FitToActualSize(m_aCols, (sal_uInt16)m_aFrameSize.Width()); + ::FitToActualSize(m_aCols, static_cast<sal_uInt16>(m_aFrameSize.Width())); long nHeight = m_aFrameSize.Height(); Fraction aScale( m_aWinSize.Height(), nHeight ); @@ -460,15 +460,15 @@ void SwColumnOnlyExample::SetColumns(const SwFormatCol& rCol) long nWish = pCol->GetWishWidth(); nWish *= nFrameWidth; nWish /= nWishSum; - pCol->SetWishWidth((sal_uInt16)nWish); + pCol->SetWishWidth(static_cast<sal_uInt16>(nWish)); long nLeft = pCol->GetLeft(); nLeft *= nFrameWidth; nLeft /= nWishSum; - pCol->SetLeft((sal_uInt16)nLeft); + pCol->SetLeft(static_cast<sal_uInt16>(nLeft)); long nRight = pCol->GetRight(); nRight *= nFrameWidth; nRight /= nWishSum; - pCol->SetRight((sal_uInt16)nRight); + pCol->SetRight(static_cast<sal_uInt16>(nRight)); } // #97495# make sure that the automatic column width's are always equal if(nColCount && m_aCols.IsOrtho()) diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx index ade307c7c29c..0a38bc2e44bd 100644 --- a/sw/source/uibase/frmdlg/colmgr.cxx +++ b/sw/source/uibase/frmdlg/colmgr.cxx @@ -79,12 +79,12 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos ) // height separation line short SwColMgr::GetLineHeightPercent() const { - return (short)aFormatCol.GetLineHeight(); + return static_cast<short>(aFormatCol.GetLineHeight()); } void SwColMgr::SetLineHeightPercent(short nPercent) { OSL_ENSURE(nPercent <= 100, "line height may be at most 100%"); - aFormatCol.SetLineHeight((sal_uInt8)nPercent); + aFormatCol.SetLineHeight(static_cast<sal_uInt8>(nPercent)); } // column width @@ -112,12 +112,12 @@ void SwColMgr::SetActualWidth(sal_uInt16 nW) SwColMgr::SwColMgr(const SfxItemSet& rSet) : aFormatCol(rSet.Get(RES_COL)) { - nWidth = (sal_uInt16)rSet.Get(RES_FRM_SIZE).GetWidth(); + nWidth = static_cast<sal_uInt16>(rSet.Get(RES_FRM_SIZE).GetWidth()); if (nWidth < MINLAY) nWidth = USHRT_MAX; const SvxLRSpaceItem &rLR = rSet.Get(RES_LR_SPACE); - nWidth = nWidth - (sal_uInt16)rLR.GetLeft(); - nWidth = nWidth - (sal_uInt16)rLR.GetRight(); + nWidth = nWidth - static_cast<sal_uInt16>(rLR.GetLeft()); + nWidth = nWidth - static_cast<sal_uInt16>(rLR.GetRight()); ::FitToActualSize(aFormatCol, nWidth); } diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index e07705367b55..d3a3107447c8 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -184,10 +184,10 @@ void SwHHCWrapper::SelectNewUnit_impl( sal_Int32 nUnitStart, sal_Int32 nUnitEnd pCursor->DeleteMark(); m_rWrtShell.Right( CRSR_SKIP_CHARS, /*bExpand*/ false, - (sal_uInt16) (m_nUnitOffset + nUnitStart), true ); + static_cast<sal_uInt16>(m_nUnitOffset + nUnitStart), true ); pCursor->SetMark(); m_rWrtShell.Right( CRSR_SKIP_CHARS, /*bExpand*/ true, - (sal_uInt16) (nUnitEnd - nUnitStart), true ); + static_cast<sal_uInt16>(nUnitEnd - nUnitStart), true ); // end selection now. Otherwise SHIFT+HOME (extending the selection) // won't work when the dialog is closed without any replacement. // (see #116346#) diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 879a2c93f5c2..f368f9560978 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -174,7 +174,7 @@ void SwSpellPopup::fillLangPopupMenu( { for (sal_Int32 i = 0; i < rLocales.getLength(); ++i) { - if (aLangItems.size() == (size_t)nMaxCount) + if (aLangItems.size() == size_t(nMaxCount)) break; const lang::Locale& rLocale = rLocales[i]; if (lcl_checkScriptType( nScriptType, SvtLanguageTable::GetLanguageType( rLocale.Language ))) diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index 424d54290981..ae1b4396b1ec 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -120,7 +120,7 @@ bool SwGlossaries::FindGroupName(OUString& rGroup) for(size_t i = 0; i < nCount; ++i) { const OUString sTemp( GetGroupName( i )); - sal_uInt16 nPath = (sal_uInt16)sTemp.getToken(1, GLOS_DELIM).toInt32(); + sal_uInt16 nPath = static_cast<sal_uInt16>(sTemp.getToken(1, GLOS_DELIM).toInt32()); if (!SWUnoHelper::UCB_IsCaseSensitiveFileName( m_PathArr[nPath] ) && rSCmp.isEqual( rGroup, sTemp.getToken( 0, GLOS_DELIM) ) ) @@ -180,7 +180,7 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const OUString &rName, bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) { const OUString sNewPath(rGroupName.getToken(1, GLOS_DELIM)); - sal_uInt16 nNewPath = (sal_uInt16)sNewPath.toInt32(); + sal_uInt16 nNewPath = static_cast<sal_uInt16>(sNewPath.toInt32()); if (static_cast<size_t>(nNewPath) >= m_PathArr.size()) return false; const OUString sNewFilePath(m_PathArr[nNewPath]); @@ -201,7 +201,7 @@ bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) bool SwGlossaries::RenameGroupDoc( const OUString& rOldGroup, OUString& rNewGroup, const OUString& rNewTitle ) { - sal_uInt16 nOldPath = (sal_uInt16)rOldGroup.getToken(1, GLOS_DELIM).toInt32(); + sal_uInt16 nOldPath = static_cast<sal_uInt16>(rOldGroup.getToken(1, GLOS_DELIM).toInt32()); if (static_cast<size_t>(nOldPath) >= m_PathArr.size()) return false; @@ -214,7 +214,7 @@ bool SwGlossaries::RenameGroupDoc( return false; } - sal_uInt16 nNewPath = (sal_uInt16)rNewGroup.getToken(1, GLOS_DELIM).toInt32(); + sal_uInt16 nNewPath = static_cast<sal_uInt16>(rNewGroup.getToken(1, GLOS_DELIM).toInt32()); if (static_cast<size_t>(nNewPath) >= m_PathArr.size()) return false; @@ -252,7 +252,7 @@ bool SwGlossaries::RenameGroupDoc( // Deletes a text block group bool SwGlossaries::DelGroupDoc(const OUString &rName) { - sal_uInt16 nPath = (sal_uInt16)rName.getToken(1, GLOS_DELIM).toInt32(); + sal_uInt16 nPath = static_cast<sal_uInt16>(rName.getToken(1, GLOS_DELIM).toInt32()); if (static_cast<size_t>(nPath) >= m_PathArr.size()) return false; const OUString sBaseName(rName.getToken(0, GLOS_DELIM)); @@ -275,7 +275,7 @@ SwGlossaries::~SwGlossaries() // read a block document SwTextBlocks* SwGlossaries::GetGlosDoc( const OUString &rName, bool bCreate ) const { - sal_uInt16 nPath = (sal_uInt16)rName.getToken(1, GLOS_DELIM).toInt32(); + sal_uInt16 nPath = static_cast<sal_uInt16>(rName.getToken(1, GLOS_DELIM).toInt32()); SwTextBlocks *pTmp = nullptr; if (static_cast<size_t>(nPath) < m_PathArr.size()) { diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 178fd82ac789..b89d45986e6e 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -151,11 +151,11 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) sal_Int16 nCurrent = pTypes[nType]; if(nCurrent > style::NumberingType::CHARS_LOWER_LETTER_N) { - if(LISTBOX_ENTRY_NOTFOUND == GetEntryPos(reinterpret_cast<void*>((sal_uLong)nCurrent))) + if(LISTBOX_ENTRY_NOTFOUND == GetEntryPos(reinterpret_cast<void*>(static_cast<sal_uLong>(nCurrent)))) { OUString aIdent = pImpl->xInfo->getNumberingIdentifier( nCurrent ); sal_Int32 nPos = InsertEntry(aIdent); - SetEntryData(nPos, reinterpret_cast<void*>((sal_uLong)nCurrent)); + SetEntryData(nPos, reinterpret_cast<void*>(static_cast<sal_uLong>(nCurrent))); } } } @@ -179,7 +179,7 @@ SvxNumType SwNumberingTypeListBox::GetSelectedNumberingType() bool SwNumberingTypeListBox::SelectNumberingType(SvxNumType nType) { - sal_Int32 nPos = GetEntryPos(reinterpret_cast<void*>((sal_uLong)nType)); + sal_Int32 nPos = GetEntryPos(reinterpret_cast<void*>(static_cast<sal_uLong>(nType))); SelectEntryPos( nPos ); return LISTBOX_ENTRY_NOTFOUND != nPos; } diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 33b039b790b0..05a9aa77265f 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -698,7 +698,7 @@ void SwRedlineAcceptDlg::RemoveParents(SwRedlineTable::size_type nStart, SwRedli } // clear TLB from behind - long nIdx = (long)aLBoxArr.size() - 1; + long nIdx = static_cast<long>(aLBoxArr.size()) - 1; while (nIdx >= 0) m_pTable->RemoveEntry(aLBoxArr[ static_cast< sal_uInt16 >(nIdx--) ]); diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index a07a14ced753..36f1050ace37 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -103,7 +103,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) aItemSet.Put( SdrTextAniDirectionItem( SdrTextAniDirection::Left ) ); aItemSet.Put( SdrTextAniCountItem( 0 ) ); aItemSet.Put( SdrTextAniAmountItem( - (sal_Int16)m_pWin->PixelToLogic(Size(2,1)).Width()) ); + static_cast<sal_Int16>(m_pWin->PixelToLogic(Size(2,1)).Width())) ); pObj->SetMergedItemSetAndBroadcast(aItemSet); } diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 32faf2d109e5..4e45d29dfbd5 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -179,7 +179,7 @@ void SwInputWindow::Resize() long nLeft = aEdit->GetPosPixel().X(); Size aEditSize = aEdit->GetSizePixel(); - aEditSize.Width() = std::max( ((long)(nWidth - nLeft - 5)), (long)0 ); + aEditSize.Width() = std::max( static_cast<long>(nWidth - nLeft - 5), long(0) ); aEdit->SetSizePixel( aEditSize ); aEdit->Invalidate(); } @@ -206,7 +206,7 @@ void SwInputWindow::ShowWin() sal_Int32 nPos = 0; short nSrch = -1; while( (nPos = rPos.indexOf( ':',nPos + 1 ) ) != -1 ) - nSrch = (short) nPos; + nSrch = static_cast<short>(nPos); aPos->SetText( rPos.copy( ++nSrch ) ); aAktTableName = pWrtShell->GetTableFormat()->GetName(); } @@ -486,11 +486,11 @@ void InputEdit::UpdateRange(const OUString& rBoxes, OUString aBoxes = aPrefix; aBoxes += rBoxes; Selection aSelection(GetSelection()); - sal_uInt16 nSel = (sal_uInt16) aSelection.Len(); + sal_uInt16 nSel = static_cast<sal_uInt16>(aSelection.Len()); // OS: The following expression ensures that in the overwrite mode, // the selected closing parenthesis will be not deleted. if( nSel && ( nSel > 1 || - GetText()[ (sal_uInt16)aSelection.Min() ] != cClose )) + GetText()[ static_cast<sal_uInt16>(aSelection.Min()) ] != cClose )) Cut(); else aSelection.Max() = aSelection.Min(); @@ -511,7 +511,7 @@ void InputEdit::UpdateRange(const OUString& rBoxes, { bool bFound = false; sal_Unicode cCh; - sal_uInt16 nPos, nEndPos = 0, nStartPos = (sal_uInt16) aSelection.Min(); + sal_uInt16 nPos, nEndPos = 0, nStartPos = static_cast<sal_uInt16>(aSelection.Min()); if( nStartPos-- ) { do { @@ -537,8 +537,8 @@ void InputEdit::UpdateRange(const OUString& rBoxes, ++nEndPos; } // Only if the current position lies in the range or right behind. - if( bFound && !( nStartPos < (sal_uInt16)aSelection.Max() && - (sal_uInt16)aSelection.Max() <= nEndPos + 1 )) + if( bFound && !( nStartPos < static_cast<sal_uInt16>(aSelection.Max()) && + static_cast<sal_uInt16>(aSelection.Max()) <= nEndPos + 1 )) bFound = false; } if( bFound ) @@ -552,7 +552,7 @@ void InputEdit::UpdateRange(const OUString& rBoxes, OUString aTmp = OUStringBuffer(). append(cOpen).append(aBoxes).append(cClose). makeStringAndClear(); - nPos = (sal_uInt16)aSelection.Min(); + nPos = static_cast<sal_uInt16>(aSelection.Min()); aActText = aActText.replaceAt( nPos, 0, aTmp ); nPos = nPos + aTmp.getLength(); } diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index d88e959813ec..6fee4959d27c 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -487,7 +487,7 @@ void SwZoomBox_Impl::Select() aZoom.SetType(SvxZoomType::WHOLEPAGE); else { - sal_uInt16 nZoom = (sal_uInt16)sEntry.toInt32(); + sal_uInt16 nZoom = static_cast<sal_uInt16>(sEntry.toInt32()); if(nZoom < MINZOOM) nZoom = MINZOOM; if(nZoom > MAXZOOM) @@ -619,7 +619,7 @@ void SwJumpToSpecificBox_Impl::Select() { OUString sEntry(GetText()); SfxUInt16Item aPageNum(nSlotId); - aPageNum.SetValue((sal_uInt16)sEntry.toInt32()); + aPageNum.SetValue(static_cast<sal_uInt16>(sEntry.toInt32())); SfxObjectShell* pCurrentShell = SfxObjectShell::Current(); pCurrentShell->GetDispatcher()->ExecuteList(nSlotId, SfxCallMode::ASYNCHRON, { &aPageNum }); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index df7f9072fce7..403171c9324a 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -862,7 +862,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) // RepeatHeaderLines if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_4, true, &pItem)) aInsTableOpts.mnRowsToRepeat = - (sal_uInt16)static_cast< const SfxInt16Item* >(pItem)->GetValue(); + static_cast<sal_uInt16>(static_cast< const SfxInt16Item* >(pItem)->GetValue()); //WithBorder if(SfxItemState::SET == pArgs->GetItemState( FN_PARAM_5, true, &pItem) && static_cast< const SfxBoolItem* >(pItem)->GetValue()) @@ -902,7 +902,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if(pTAFormat) aReq.AppendItem( SfxStringItem( FN_PARAM_2, pTAFormat->GetName())); aReq.AppendItem( SfxBoolItem ( FN_PARAM_3, 0 != (aInsTableOpts.mnInsMode & tabopts::HEADLINE))); - aReq.AppendItem( SfxInt16Item( FN_PARAM_4, (short)aInsTableOpts.mnRowsToRepeat )); + aReq.AppendItem( SfxInt16Item( FN_PARAM_4, static_cast<short>(aInsTableOpts.mnRowsToRepeat) )); aReq.AppendItem( SfxBoolItem ( FN_PARAM_5, 0 != (aInsTableOpts.mnInsMode & tabopts::DEFAULT_BORDER) )); aReq.AppendItem( SfxBoolItem ( FN_PARAM_6, !(aInsTableOpts.mnInsMode & tabopts::SPLIT_LAYOUT))); } @@ -2063,23 +2063,23 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq ) case SvtScriptType::LATIN: nCJKSize = nHeight * nCJKSize / nWesternSize; nCTLSize = nHeight * nCTLSize / nWesternSize; - nWesternSize = (sal_Int32) nHeight; + nWesternSize = static_cast<sal_Int32>(nHeight); break; case SvtScriptType::ASIAN: nCTLSize = nHeight* nCTLSize / nCJKSize; nWesternSize = nHeight * nWesternSize / nCJKSize; - nCJKSize = (sal_Int32) nHeight; + nCJKSize = static_cast<sal_Int32>(nHeight); break; case SvtScriptType::COMPLEX: nCJKSize = nHeight * nCJKSize / nCTLSize; nWesternSize = nHeight * nWesternSize / nCTLSize; - nCTLSize = (sal_Int32) nHeight; + nCTLSize = static_cast<sal_Int32>(nHeight); break; default: break; } - aHeightSet.Put( SvxFontHeightItem( (sal_uInt32)nWesternSize, 100, RES_CHRATR_FONTSIZE )); - aHeightSet.Put( SvxFontHeightItem( (sal_uInt32)nCJKSize, 100, RES_CHRATR_CJK_FONTSIZE )); - aHeightSet.Put( SvxFontHeightItem( (sal_uInt32)nCTLSize, 100, RES_CHRATR_CTL_FONTSIZE )); + aHeightSet.Put( SvxFontHeightItem( static_cast<sal_uInt32>(nWesternSize), 100, RES_CHRATR_FONTSIZE )); + aHeightSet.Put( SvxFontHeightItem( static_cast<sal_uInt32>(nCJKSize), 100, RES_CHRATR_CJK_FONTSIZE )); + aHeightSet.Put( SvxFontHeightItem( static_cast<sal_uInt32>(nCTLSize), 100, RES_CHRATR_CTL_FONTSIZE )); pArgs = &aHeightSet; } } @@ -2662,7 +2662,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) } if ( pFlags ) - aInsTableOpts.mnInsMode = (sal_uInt16) pFlags->GetValue(); + aInsTableOpts.mnInsMode = static_cast<sal_uInt16>(pFlags->GetValue()); else { const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); @@ -2692,7 +2692,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) _rRequest.AppendItem( SfxStringItem( FN_PARAM_2, aAutoName ) ); _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_COLUMN, nCols ) ); _rRequest.AppendItem( SfxUInt16Item( SID_ATTR_TABLE_ROW, nRows ) ); - _rRequest.AppendItem( SfxInt32Item( FN_PARAM_1, (sal_Int32) aInsTableOpts.mnInsMode ) ); + _rRequest.AppendItem( SfxInt32Item( FN_PARAM_1, static_cast<sal_Int32>(aInsTableOpts.mnInsMode) ) ); _rRequest.Done(); rSh.StartUndo(SwUndoId::INSTABLE); diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 330d72a10269..0231476eef58 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -283,7 +283,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, if(SfxItemState::SET == rSet.GetItemState(SID_BACKGRND_DESTINATION, false, &pItem)) { SwViewOption aUsrPref( *rSh.GetViewOptions() ); - aUsrPref.SetTableDest((sal_uInt8)static_cast<const SfxUInt16Item*>(pItem)->GetValue()); + aUsrPref.SetTableDest(static_cast<sal_uInt8>(static_cast<const SfxUInt16Item*>(pItem)->GetValue())); SW_MOD()->ApplyUsrPref(aUsrPref, &rSh.GetView()); } bool bBorder = ( SfxItemState::SET == rSet.GetItemState( RES_BOX ) || @@ -376,7 +376,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, SwFormatFrameSize aSz( ATT_VAR_SIZE, nWidth ); if(pRep->GetWidthPercent()) { - aSz.SetWidthPercent( (sal_uInt8)pRep->GetWidthPercent() ); + aSz.SetWidthPercent( static_cast<sal_uInt8>(pRep->GetWidthPercent()) ); } aSet.Put(aSz); } diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index cfa8661a620d..0ce7fe6db1eb 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -645,7 +645,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) SwScriptField* pField = static_cast<SwScriptField*>(aMgr.GetCurField()); bNew = !pField || (pField->GetTyp()->Which() != SwFieldIds::Script); - bUpdate = pField && ( bIsUrl != (bool)pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText ); + bUpdate = pField && ( bIsUrl != static_cast<bool>(pField->GetFormat()) || pField->GetPar2() != aType || pField->GetPar1() != aText ); } else { @@ -891,7 +891,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem) const OUString& rName = rHlnkItem.GetName(); const OUString& rURL = rHlnkItem.GetURL(); const OUString& rTarget = rHlnkItem.GetTargetFrame(); - sal_uInt16 nType = (sal_uInt16)rHlnkItem.GetInsertMode(); + sal_uInt16 nType = static_cast<sal_uInt16>(rHlnkItem.GetInsertMode()); nType &= ~HLINK_HTMLMODE; const SvxMacroTableDtor* pMacroTable = rHlnkItem.GetMacroTable(); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index 07cca5607a05..308c35b59421 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -230,7 +230,7 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, Button*, void ) IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) { - sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterMarginPresetLB->GetSelectedEntryData()); + sal_uInt16 nVal = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(mpFooterMarginPresetLB->GetSelectedEntryData())); mpFooterLRMarginItem->SetLeft(nVal); mpFooterLRMarginItem->SetRight(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_LRMARGIN, @@ -239,7 +239,7 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) IMPL_LINK_NOARG( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) { - sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterSpacingLB->GetSelectedEntryData()); + sal_uInt16 nVal = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(mpFooterSpacingLB->GetSelectedEntryData())); mpFooterSpacingItem->SetUpper(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_SPACING, SfxCallMode::RECORD, { mpFooterSpacingItem.get() } ); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index 8c3dcbef3916..0421b18e6200 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -233,7 +233,7 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, Button*, void ) IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) { - sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderMarginPresetLB->GetSelectedEntryData()); + sal_uInt16 nVal = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(mpHeaderMarginPresetLB->GetSelectedEntryData())); mpHeaderLRMarginItem->SetLeft(nVal); mpHeaderLRMarginItem->SetRight(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_LRMARGIN, @@ -242,7 +242,7 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) IMPL_LINK_NOARG( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) { - sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderSpacingLB->GetSelectedEntryData()); + sal_uInt16 nVal = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(mpHeaderSpacingLB->GetSelectedEntryData())); mpHeaderSpacingItem->SetLower(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_SPACING, SfxCallMode::RECORD, { mpHeaderSpacingItem.get() } ); diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index ac6f5556e6db..2dc454cde2b7 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -170,7 +170,7 @@ PageMarginControl::PageMarginControl( sal_uInt16 nId, vcl::Window* pParent ) m_pLast->SetClickHdl( LINK( this, PageMarginControl, SelectMarginHdl ) ); get( m_pContainer, "container" ); - m_pWidthHeightField = VclPtr<MetricField>::Create( m_pContainer.get(), (WinBits)0 ); + m_pWidthHeightField = VclPtr<MetricField>::Create( m_pContainer.get(), WinBits(0) ); m_pWidthHeightField->Hide(); m_pWidthHeightField->SetUnit( FUNIT_CM ); m_pWidthHeightField->SetMax( 9999 ); diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index e401668c3404..0d6e2623748c 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -214,7 +214,7 @@ IMPL_LINK_NOARG(WrapPropertyPanel, EnableContourHdl, Button*, void) IMPL_LINK(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) { - sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(rBox.GetSelectedEntryData()); + sal_uInt16 nVal = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(rBox.GetSelectedEntryData())); SvxLRSpaceItem aLRItem(nVal, nVal, 0, 0, RES_LR_SPACE); SvxULSpaceItem aULItem(nVal, nVal, RES_UL_SPACE); diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index 54d770158708..d848cbbca003 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -132,7 +132,7 @@ void SwTableFUNC::SetColWidth(sal_uInt16 nNum, SwTwips nNewWidth ) bCurrentOnly = true; SwTwips nWidth = GetColWidth(nNum); - int nDiff = (int)(nNewWidth - nWidth); + int nDiff = static_cast<int>(nNewWidth - nWidth); if( !nNum ) aCols[ GetRightSeparator(0) ] += nDiff; else if( nNum < GetColCount() ) @@ -141,7 +141,7 @@ void SwTableFUNC::SetColWidth(sal_uInt16 nNum, SwTwips nNewWidth ) aCols[ GetRightSeparator(nNum) ] += nDiff; else { - int nDiffLeft = nDiff - (int)GetColWidth(nNum + 1) + (int)MINLAY; + int nDiffLeft = nDiff - static_cast<int>(GetColWidth(nNum + 1)) + int(MINLAY); aCols[ GetRightSeparator(nNum) ] += (nDiff - nDiffLeft); aCols[ GetRightSeparator(nNum - 1) ] -= nDiffLeft; } @@ -346,7 +346,7 @@ sal_uInt16 SwTableFUNC::GetColCount() const int SwTableFUNC::GetRightSeparator(int nNum) const { - OSL_ENSURE( nNum < (int)GetColCount() ,"Index out of range"); + OSL_ENSURE( nNum < static_cast<int>(GetColCount()) ,"Index out of range"); int i = 0; while( nNum >= 0 ) { diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 5eb755d5cb9c..5d96f855411b 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -704,8 +704,8 @@ void SwPagePreview::Execute( SfxRequest &rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); if( pArgs && pArgs->Count() >= 2 ) { - sal_uInt8 nCols = (sal_uInt8)pArgs->Get(SID_ATTR_TABLE_COLUMN).GetValue(); - sal_uInt8 nRows = (sal_uInt8)pArgs->Get(SID_ATTR_TABLE_ROW).GetValue(); + sal_uInt8 nCols = static_cast<sal_uInt8>(pArgs->Get(SID_ATTR_TABLE_COLUMN).GetValue()); + sal_uInt8 nRows = static_cast<sal_uInt8>(pArgs->Get(SID_ATTR_TABLE_ROW).GetValue()); m_pViewWin->CalcWish( nRows, nCols ); } @@ -1460,7 +1460,7 @@ IMPL_LINK( SwPagePreview, EndScrollHdl, ScrollBar *, p, void ) if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() ) { // Scroll how many pages ?? - const sal_uInt16 nThmbPos = (sal_uInt16)pScrollbar->GetThumbPos(); + const sal_uInt16 nThmbPos = static_cast<sal_uInt16>(pScrollbar->GetThumbPos()); // adjust to new preview functionality if( nThmbPos != m_pViewWin->SelectedPage() ) { diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 60d34de9fdd9..4c4644bc81ab 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1152,7 +1152,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) sal_Int32 nOff = 0; SvxZoomType eZoom; if( !m_pWrtShell->GetViewOptions()->getBrowseMode() ) - eZoom = (SvxZoomType) (sal_uInt16)rUserData.getToken(nOff, ';', nPos ).toInt32(); + eZoom = (SvxZoomType) static_cast<sal_uInt16>(rUserData.getToken(nOff, ';', nPos ).toInt32()); else { eZoom = SvxZoomType::PERCENT; diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index c134967234f9..d2419aa4b2ee 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -1146,7 +1146,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY ) { const Fraction &rFrac = rX < rY ? rX : rY; - SetZoom( SvxZoomType::PERCENT, (short) long(rFrac * Fraction( 100, 1 )) ); + SetZoom( SvxZoomType::PERCENT, static_cast<short>(long(rFrac * Fraction( 100, 1 ))) ); // To minimize rounding errors we also adjust the odd values // of the base class if necessary. @@ -1205,9 +1205,9 @@ bool SwView::HandleWheelCommands( const CommandEvent& rCEvt ) { long nFact = m_pWrtShell->GetViewOptions()->GetZoom(); if( 0L > pWData->GetDelta() ) - nFact = std::max( (long) 20, basegfx::zoomtools::zoomOut( nFact )); + nFact = std::max( long(20), basegfx::zoomtools::zoomOut( nFact )); else - nFact = std::min( (long) 600, basegfx::zoomtools::zoomIn( nFact )); + nFact = std::min( long(600), basegfx::zoomtools::zoomIn( nFact )); SetZoom( SvxZoomType::PERCENT, nFact ); bOk = true; diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index e6fc466dfc9a..f377f35acdfe 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -660,7 +660,7 @@ bool SwView::SearchAll() m_pWrtShell->SttDoc(); } m_bExtra = false; - sal_uInt16 nFound = (sal_uInt16)FUNC_Search( aOpts ); + sal_uInt16 nFound = static_cast<sal_uInt16>(FUNC_Search( aOpts )); m_bFound = 0 != nFound; m_pWrtShell->EndAllAction(); diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 7f6e5afbaac2..9ec0f9b96042 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -244,7 +244,7 @@ void SwView::GetState(SfxItemSet &rSet) static_cast<const SvxTabStopItem&>(m_pWrtShell-> GetDefault(RES_PARATR_TABSTOP)); rSet.Put( SfxUInt16Item( nWhich, - (sal_uInt16)::GetTabDist(rDefTabs))); + static_cast<sal_uInt16>(::GetTabDist(rDefTabs)))); } break; case SID_ATTR_LANGUAGE: diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index 8bdf70217905..cf04fd818603 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -139,7 +139,7 @@ static void lcl_ConvertToCols(const SvxColumnItem& rColItem, // The difference between the total sum of the desired width and the so far // calculated columns and margins should result in the width of the last column. - rArr[rColItem.Count()-1].SetWishWidth( rCols.GetWishWidth() - (sal_uInt16)nSumAll ); + rArr[rColItem.Count()-1].SetWishWidth( rCols.GetWishWidth() - static_cast<sal_uInt16>(nSumAll) ); rCols.SetOrtho(false, 0, 0 ); } @@ -189,7 +189,7 @@ void ResizeFrameCols(SwFormatCol& rCol, long nLeftDelta ) { SwColumns& rArr = rCol.GetColumns(); - long nWishSum = (long)rCol.GetWishWidth(); + long nWishSum = static_cast<long>(rCol.GetWishWidth()); long nWishDiff = (nWishSum * 100/nOldWidth * nNewWidth) / 100 - nWishSum; long nNewWishWidth = nWishSum + nWishDiff; if(nNewWishWidth > 0xffffl) @@ -202,23 +202,23 @@ void ResizeFrameCols(SwFormatCol& rCol, SwColumn* pCol = &i; long nVal = pCol->GetWishWidth(); lcl_Scale(nVal, nScale); - pCol->SetWishWidth((sal_uInt16) nVal); + pCol->SetWishWidth(static_cast<sal_uInt16>(nVal)); nVal = pCol->GetLeft(); lcl_Scale(nVal, nScale); - pCol->SetLeft((sal_uInt16) nVal); + pCol->SetLeft(static_cast<sal_uInt16>(nVal)); nVal = pCol->GetRight(); lcl_Scale(nVal, nScale); - pCol->SetRight((sal_uInt16) nVal); + pCol->SetRight(static_cast<sal_uInt16>(nVal)); } lcl_Scale(nNewWishWidth, nScale); lcl_Scale(nWishDiff, nScale); } - rCol.SetWishWidth( (sal_uInt16)nNewWishWidth ); + rCol.SetWishWidth( static_cast<sal_uInt16>(nNewWishWidth) ); if( nLeftDelta >= 2 || nLeftDelta <= -2) - rArr.front().SetWishWidth(rArr.front().GetWishWidth() + (sal_uInt16)nWishDiff); + rArr.front().SetWishWidth(rArr.front().GetWishWidth() + static_cast<sal_uInt16>(nWishDiff)); else - rArr.back().SetWishWidth(rArr.back().GetWishWidth() + (sal_uInt16)nWishDiff); + rArr.back().SetWishWidth(rArr.back().GetWishWidth() + static_cast<sal_uInt16>(nWishDiff)); // Reset auto width rCol.SetOrtho(false, 0, 0 ); } @@ -300,7 +300,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) } SwFormatFrameSize aSize( pFormat->GetFrameSize() ); - long nOldWidth = (long) aSize.GetWidth(); + long nOldWidth = static_cast<long>(aSize.GetWidth()); if(aSize.GetWidthPercent()) { @@ -317,7 +317,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) { SwFormatCol aCol(pFormat->GetCol()); - ::ResizeFrameCols(aCol, nOldWidth, (long)aSize.GetWidth(), nDeltaX ); + ::ResizeFrameCols(aCol, nOldWidth, static_cast<long>(aSize.GetWidth()), nDeltaX ); aSet.Put(aCol); } @@ -365,8 +365,8 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) SwRect aSectRect = rSh.GetAnyCurRect(CurRectType::SectionPrt); const SwRect aTmpRect = rSh.GetAnyCurRect(CurRectType::Section); aSectRect.Pos() += aTmpRect.Pos(); - long nLeftDiff = aLongLR.GetLeft() - (long)(aSectRect.Left() - rPageRect.Left() ); - long nRightDiff = aLongLR.GetRight() - (long)( rPageRect.Right() - aSectRect.Right()); + long nLeftDiff = aLongLR.GetLeft() - static_cast<long>(aSectRect.Left() - rPageRect.Left() ); + long nRightDiff = aLongLR.GetRight() - static_cast<long>( rPageRect.Right() - aSectRect.Right()); //change the LRSpaceItem of the section accordingly const SwSection* pCurrSect = rSh.GetCurrSection(); const SwSectionFormat* pSectFormat = pCurrSect->GetFormat(); @@ -478,8 +478,8 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) SwRect aSectRect = rSh.GetAnyCurRect(CurRectType::SectionPrt); const SwRect aTmpRect = rSh.GetAnyCurRect(CurRectType::Section); aSectRect.Pos() += aTmpRect.Pos(); - const long nLeftDiff = aLongULSpace.GetUpper() - (long)(aSectRect.Top() - rPageRect.Top()); - const long nRightDiff = aLongULSpace.GetLower() - (long)(nPageHeight - aSectRect.Bottom() + rPageRect.Top()); + const long nLeftDiff = aLongULSpace.GetUpper() - static_cast<long>(aSectRect.Top() - rPageRect.Top()); + const long nRightDiff = aLongULSpace.GetLower() - static_cast<long>(nPageHeight - aSectRect.Bottom() + rPageRect.Top()); //change the LRSpaceItem of the section accordingly const SwSection* pCurrSect = rSh.GetCurrSection(); const SwSectionFormat* pSectFormat = pCurrSect->GetFormat(); @@ -508,9 +508,9 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) const bool bHead = bool(nFrameType & FrameTypeFlags::HEADER); SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() ); if ( bHead ) - aUL.SetUpper( (sal_uInt16)aLongULSpace.GetUpper() ); + aUL.SetUpper( static_cast<sal_uInt16>(aLongULSpace.GetUpper()) ); else - aUL.SetLower( (sal_uInt16)aLongULSpace.GetLower() ); + aUL.SetLower( static_cast<sal_uInt16>(aLongULSpace.GetLower()) ); aDesc.GetMaster().SetFormatAttr( aUL ); if( (bHead && pHeaderFormat) || (!bHead && pFooterFormat) ) @@ -529,8 +529,8 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) else { SvxULSpaceItem aUL(RES_UL_SPACE); - aUL.SetUpper((sal_uInt16)aLongULSpace.GetUpper()); - aUL.SetLower((sal_uInt16)aLongULSpace.GetLower()); + aUL.SetUpper(static_cast<sal_uInt16>(aLongULSpace.GetUpper())); + aUL.SetLower(static_cast<sal_uInt16>(aLongULSpace.GetLower())); aDesc.GetMaster().SetFormatAttr(aUL); } @@ -548,8 +548,8 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) SwPageDesc aDesc( rDesc ); { SvxULSpaceItem aUL(RES_UL_SPACE); - aUL.SetUpper((sal_uInt16)aLongULSpace.GetUpper()); - aUL.SetLower((sal_uInt16)aLongULSpace.GetLower()); + aUL.SetUpper(static_cast<sal_uInt16>(aLongULSpace.GetUpper())); + aUL.SetLower(static_cast<sal_uInt16>(aLongULSpace.GetLower())); aDesc.GetMaster().SetFormatAttr(aUL); } rSh.ChgPageDesc( nDescId, aDesc ); @@ -596,14 +596,14 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) long nColumnRight = 0; if ( nPageColumnType == 4 ) { - nColumnRight = (long)(nWidth/3); + nColumnRight = static_cast<long>(nWidth/3); nColumnLeft = nWidth - nColumnRight; aCols.GetColumns()[0].SetWishWidth( nColumnLeft ); aCols.GetColumns()[1].SetWishWidth( nColumnRight ); } else if ( nPageColumnType == 5 ) { - nColumnLeft = (long)(nWidth/3); + nColumnLeft = static_cast<long>(nWidth/3); nColumnRight = nWidth - nColumnLeft; aCols.GetColumns()[0].SetWishWidth( nColumnLeft ); aCols.GetColumns()[1].SetWishWidth( nColumnRight ); @@ -837,7 +837,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) rSh.GetTabCols(aTabCols); // left table border - long nBorder = (long)(aColItem.GetLeft() - aTabCols.GetLeftMin()); + long nBorder = static_cast<long>(aColItem.GetLeft() - aTabCols.GetLeftMin()); aTabCols.SetLeft( nBorder ); nBorder = (bVerticalWriting ? nPageHeight : nPageWidth) - aTabCols.GetLeftMin() - aColItem.GetRight(); @@ -1360,8 +1360,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) { // Page margin top bottom SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() ); - SvxLongULSpaceItem aLongUL( (long)aUL.GetUpper(), - (long)aUL.GetLower(), + SvxLongULSpaceItem aLongUL( static_cast<long>(aUL.GetUpper()), + static_cast<long>(aUL.GetLower()), SID_ATTR_LONG_ULSPACE); if ( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY ) @@ -1393,8 +1393,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) rSet.Put( aLongUL ); else { - SvxULSpaceItem aULTmp((sal_uInt16)aLongUL.GetUpper(), - (sal_uInt16)aLongUL.GetLower(), + SvxULSpaceItem aULTmp(static_cast<sal_uInt16>(aLongUL.GetUpper()), + static_cast<sal_uInt16>(aLongUL.GetLower()), nWhich); rSet.Put(aULTmp); } @@ -1406,8 +1406,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) { const SvxULSpaceItem aUL( rDesc.GetMaster().GetULSpace() ); SvxLongULSpaceItem aLongUL( - (long)aUL.GetUpper(), - (long)aUL.GetLower(), + static_cast<long>(aUL.GetUpper()), + static_cast<long>(aUL.GetLower()), SID_ATTR_PAGE_ULSPACE ); rSet.Put( aLongUL ); @@ -1799,8 +1799,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) aRect.Pos() += aTmpRect.Pos(); // make relative to page position: - aColItem.SetLeft ((sal_uInt16)( aRect.Left() - rPageRect.Left() )); - aColItem.SetRight((sal_uInt16)( rPageRect.Right() - aRect.Right())); + aColItem.SetLeft (static_cast<sal_uInt16>( aRect.Left() - rPageRect.Left() )); + aColItem.SetRight(static_cast<sal_uInt16>( rPageRect.Right() - aRect.Right())); } aColItem.SetOrtho(aColItem.CalcOrtho()); @@ -1871,12 +1871,12 @@ void SwView::StateTabWin(SfxItemSet& rSet) { if (bVerticalWriting) { - aColItem.SetLeft((sal_uInt16)rPagePrtRect.Top()); + aColItem.SetLeft(static_cast<sal_uInt16>(rPagePrtRect.Top())); aColItem.SetRight(sal_uInt16(nPageHeight - rPagePrtRect.Bottom())); } else { - aColItem.SetLeft((sal_uInt16)rPagePrtRect.Left()); + aColItem.SetLeft(static_cast<sal_uInt16>(rPagePrtRect.Left())); aColItem.SetRight(sal_uInt16(nPageWidth - rPagePrtRect.Right())); } } @@ -2046,9 +2046,9 @@ void SwView::StateTabWin(SfxItemSet& rSet) : CurRectType::Page, pPt )); // The width of the frame or within the page margins. - const sal_uInt16 nTotalWidth = (sal_uInt16)aRect.Width(); + const sal_uInt16 nTotalWidth = static_cast<sal_uInt16>(aRect.Width()); // The entire frame width - The difference is twice the distance to the edge. - const sal_uInt16 nOuterWidth = (sal_uInt16)aAbsRect.Width(); + const sal_uInt16 nOuterWidth = static_cast<sal_uInt16>(aAbsRect.Width()); int nWidth = 0, nEnd = 0; aRectangle.Left() = 0; @@ -2165,7 +2165,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) aRect.Pos() += rSh.GetAnyCurRect( CurRectType::FlyEmbedded, pPt ).Pos(); - const sal_uInt16 nTotalWidth = (sal_uInt16)aRect.Width(); + const sal_uInt16 nTotalWidth = static_cast<sal_uInt16>(aRect.Width()); // Initialize nStart and nEnd initialisieren for nNum == 0 int nWidth = 0, nStart = 0, @@ -2266,7 +2266,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) bool bShared = !rDesc.IsHeaderShared(); bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 - sal_uInt16 nLayout = ((int)bShared<<1) + (int)bFirst; + sal_uInt16 nLayout = (static_cast<int>(bShared)<<1) + static_cast<int>(bFirst); SfxInt16Item aLayoutItem(SID_ATTR_PAGE_HEADER_LAYOUT, nLayout); rSet.Put(aLayoutItem); } @@ -2291,7 +2291,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) bool bShared = !rDesc.IsFooterShared(); bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes for both header footer - tdf#100287 - sal_uInt16 nLayout = ((int)bShared<<1) + (int)bFirst; + sal_uInt16 nLayout = (static_cast<int>(bShared)<<1) + static_cast<int>(bFirst); SfxInt16Item aLayoutItem(SID_ATTR_PAGE_FOOTER_LAYOUT, nLayout); rSet.Put(aLayoutItem); } diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index c614793a2173..df78f47fc843 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -617,7 +617,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c sal_Int32 nTmp = 0; if(!(rValue >>= nTmp) || !(0 <= nTmp && nTmp < 100)) throw IllegalArgumentException(); - mpViewOption->SetDivisionX( (short) nTmp ); + mpViewOption->SetDivisionX( static_cast<short>(nTmp) ); } break; case HANDLE_VIEWSET_RASTER_SUBDIVISION_Y : @@ -625,7 +625,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c sal_Int32 nTmp = 0; if(!(rValue >>= nTmp) || !(0 <= nTmp && nTmp < 100)) throw IllegalArgumentException(); - mpViewOption->SetDivisionY( (short) nTmp ); + mpViewOption->SetDivisionY( static_cast<short>(nTmp) ); } break; case HANDLE_VIEWSET_ZOOM : @@ -633,7 +633,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c sal_Int16 nZoom = 0; if(!(rValue >>= nZoom) || nZoom > 1000 || nZoom < 5) throw lang::IllegalArgumentException(); - mpViewOption->SetZoom((sal_uInt16)nZoom); + mpViewOption->SetZoom(static_cast<sal_uInt16>(nZoom)); mbApplyZoom = true; } break; @@ -835,23 +835,23 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u case HANDLE_VIEWSET_SCROLLBAR_TIPS : bBoolVal = mpConstViewOption->IsShowScrollBarTips(); break; case HANDLE_VIEWSET_RASTER_RESOLUTION_X : bBool = false; - rValue <<= (sal_Int32) convertTwipToMm100(mpConstViewOption->GetSnapSize().Width()); + rValue <<= static_cast<sal_Int32>(convertTwipToMm100(mpConstViewOption->GetSnapSize().Width())); break; case HANDLE_VIEWSET_RASTER_RESOLUTION_Y : bBool = false; - rValue <<= (sal_Int32) convertTwipToMm100(mpConstViewOption->GetSnapSize().Height()); + rValue <<= static_cast<sal_Int32>(convertTwipToMm100(mpConstViewOption->GetSnapSize().Height())); break; case HANDLE_VIEWSET_RASTER_SUBDIVISION_X : bBool = false; - rValue <<= (sal_Int32) mpConstViewOption->GetDivisionX(); + rValue <<= static_cast<sal_Int32>(mpConstViewOption->GetDivisionX()); break; case HANDLE_VIEWSET_RASTER_SUBDIVISION_Y : bBool = false; - rValue <<= (sal_Int32) mpConstViewOption->GetDivisionY(); + rValue <<= static_cast<sal_Int32>(mpConstViewOption->GetDivisionY()); break; case HANDLE_VIEWSET_ZOOM : bBool = false; - rValue <<= (sal_Int16)mpConstViewOption->GetZoom(); + rValue <<= static_cast<sal_Int16>(mpConstViewOption->GetZoom()); break; case HANDLE_VIEWSET_ZOOM_TYPE: { @@ -904,12 +904,12 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { FieldUnit eUnit; pView->GetHRulerMetric( eUnit ); - rValue <<= (sal_Int32)eUnit; + rValue <<= static_cast<sal_Int32>(eUnit); } else { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref( false ); - rValue <<= (sal_Int32)pUsrPref->GetHScrollMetric(); + rValue <<= static_cast<sal_Int32>(pUsrPref->GetHScrollMetric()); } bBool = false; } @@ -920,12 +920,12 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { FieldUnit eUnit; pView->GetVRulerMetric( eUnit ); - rValue <<= (sal_Int32)eUnit; + rValue <<= static_cast<sal_Int32>(eUnit); } else { const SwMasterUsrPref* pUsrPref = SW_MOD()->GetUsrPref( false ); - rValue <<= (sal_Int32)pUsrPref->GetVScrollMetric(); + rValue <<= static_cast<sal_Int32>(pUsrPref->GetVScrollMetric()); } bBool = false; } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index d012967bee85..1161997994a5 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -779,11 +779,11 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > pSearch->FillSearchItemSet(aSearch); pSearch->FillReplaceItemSet(aReplace); bool bCancel; - nResult = (sal_Int32)pUnoCursor->Find( aSearch, !pSearch->m_bStyles, + nResult = static_cast<sal_Int32>(pUnoCursor->Find( aSearch, !pSearch->m_bStyles, eStart, eEnd, bCancel, (FindRanges)eRanges, !pSearch->m_sSearchText.isEmpty() ? &aSearchOpt : nullptr, - &aReplace ); + &aReplace )); } else if(pSearch->m_bStyles) { @@ -805,7 +805,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > (FindRanges)eRanges, true ); } - return (sal_Int32)nResult; + return static_cast<sal_Int32>(nResult); } @@ -908,10 +908,10 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{}); pSearch->FillSearchItemSet(aSearch); bool bCancel; - nResult = (sal_Int32)pUnoCursor->Find( aSearch, !pSearch->m_bStyles, + nResult = static_cast<sal_Int32>(pUnoCursor->Find( aSearch, !pSearch->m_bStyles, eStart, eEnd, bCancel, eRanges, - !pSearch->m_sSearchText.isEmpty() ? &aSearchOpt : nullptr ); + !pSearch->m_sSearchText.isEmpty() ? &aSearchOpt : nullptr )); } else if(pSearch->m_bStyles) { @@ -919,17 +919,17 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > //pSearch->sReplaceText SwTextFormatColl *pReplaceColl = nullptr; bool bCancel; - nResult = (sal_Int32)pUnoCursor->Find( *pSearchColl, + nResult = static_cast<sal_Int32>(pUnoCursor->Find( *pSearchColl, eStart, eEnd, bCancel, - eRanges, pReplaceColl ); + eRanges, pReplaceColl )); } else { //todo/mba: assuming that notes should be omitted bool bCancel; - nResult = (sal_Int32)pUnoCursor->Find( aSearchOpt, false/*bSearchInNotes*/, + nResult = static_cast<sal_Int32>(pUnoCursor->Find( aSearchOpt, false/*bSearchInNotes*/, eStart, eEnd, bCancel, - eRanges ); + eRanges )); } if(nResult || (eRanges&(FindRanges::InSelAll|FindRanges::InOther))) break; @@ -1010,21 +1010,21 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings() if(pData) aData = *pData; Any aVal; - aVal <<= (sal_Int16)aData.GetRow(); + aVal <<= static_cast<sal_Int16>(aData.GetRow()); pArray[0] = beans::PropertyValue("PageRows", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int16)aData.GetCol(); + aVal <<= static_cast<sal_Int16>(aData.GetCol()); pArray[1] = beans::PropertyValue("PageColumns", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)convertTwipToMm100(aData.GetLeftSpace()); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetLeftSpace())); pArray[2] = beans::PropertyValue("LeftMargin", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)convertTwipToMm100(aData.GetRightSpace()); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetRightSpace())); pArray[3] = beans::PropertyValue("RightMargin", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)convertTwipToMm100(aData.GetTopSpace()); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetTopSpace())); pArray[4] = beans::PropertyValue("TopMargin", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)convertTwipToMm100(aData.GetBottomSpace()); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetBottomSpace())); pArray[5] = beans::PropertyValue("BottomMargin", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)convertTwipToMm100(aData.GetHorzSpace()); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetHorzSpace())); pArray[6] = beans::PropertyValue("HoriMargin", -1, aVal, PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)convertTwipToMm100(aData.GetVertSpace()); + aVal <<= static_cast<sal_Int32>(convertTwipToMm100(aData.GetVertSpace())); pArray[7] = beans::PropertyValue("VertMargin", -1, aVal, PropertyState_DIRECT_VALUE); aVal <<= aData.GetLandscape(); pArray[8] = beans::PropertyValue("IsLandscape", -1, aVal, PropertyState_DIRECT_VALUE); @@ -1045,7 +1045,7 @@ static sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, bool& bException) sal_Int32 nVal=0; bException = !(rValue >>= nVal); if( !bException ) - nRet = (sal_uInt32)nVal; + nRet = static_cast<sal_uInt32>(nVal); } return nRet; @@ -1096,13 +1096,13 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue { if(!nVal || nVal > 0xff) throw RuntimeException("Invalid value"); - aData.SetRow((sal_uInt8)nVal); + aData.SetRow(static_cast<sal_uInt8>(nVal)); } else if(sName == "PageColumns") { if(!nVal || nVal > 0xff) throw RuntimeException("Invalid value"); - aData.SetCol((sal_uInt8)nVal); + aData.SetCol(static_cast<sal_uInt8>(nVal)); } else if(sName == "LeftMargin") { @@ -1183,7 +1183,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption { sal_Int32 nCopies = 0; aValue >>= nCopies; - aReq.AppendItem(SfxInt16Item( SID_PRINT_COPIES, (sal_Int16)nCopies ) ); + aReq.AppendItem(SfxInt16Item( SID_PRINT_COPIES, static_cast<sal_Int16>(nCopies) ) ); } // Collate-Property diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 29b0b19ffb2d..d924f7058b47 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -522,7 +522,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) size_t nPos = 0; for (size_t i = 0; i < nOutlineCount; ++i) { - const sal_Int8 nLevel = (sal_Int8)pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineLevel(i); + const sal_Int8 nLevel = static_cast<sal_Int8>(pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineLevel(i)); if(nLevel >= nOutlineLevel ) nMemberCount--; else @@ -1802,7 +1802,7 @@ void SwContentTree::Display( bool bActive ) && pVScroll->GetThumbPos() != nOldScrollPos) { sal_Int32 nDelta = pVScroll->GetThumbPos() - nOldScrollPos; - ScrollOutputArea( (short)nDelta ); + ScrollOutputArea( static_cast<short>(nDelta) ); } } @@ -3015,7 +3015,7 @@ void SwContentTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) case 110: nSelectedPopupEntry -= 100; if(m_nOutlineLevel != nSelectedPopupEntry ) - SetOutlineLevel((sal_Int8)nSelectedPopupEntry); + SetOutlineLevel(static_cast<sal_Int8>(nSelectedPopupEntry)); break; case 201: case 202: diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 357ec98cc461..6eab5a4aac29 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -253,7 +253,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) nRet = rEvt.mnAction; std::unique_ptr<SwGlblDocContents> pTempContents(new SwGlblDocContents); int nAbsContPos = pDropEntry ? - (int) GetModel()->GetAbsPos(pDropEntry): + static_cast<int>(GetModel()->GetAbsPos(pDropEntry)): - 1; sal_uLong nEntryCount = GetEntryCount(); @@ -944,7 +944,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SfxViewFrame* pGlobFrame = m_pActiveShell->GetView().GetViewFrame(); SwGlobalFrameListener_Impl aFrameListener(*pGlobFrame); - sal_uLong nEntryPos = pEntry ? GetModel()->GetAbsPos(pEntry) : (sal_uLong)-1; + sal_uLong nEntryPos = pEntry ? GetModel()->GetAbsPos(pEntry) : sal_uLong(-1); // Creating a new doc SfxStringItem aFactory(SID_NEWDOCDIRECT, SwDocShell::Factory().GetFilterContainer()->GetName()); @@ -970,7 +970,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { pGlobFrame->ToTop(); // Due to the update the entries are invalid - if(nEntryPos != (sal_uLong)-1) + if(nEntryPos != sal_uLong(-1)) { Update( false ); Display(); diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 785b0fbfd59b..9f2a54830503 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -38,7 +38,7 @@ #include <strings.hrc> -#define STRING_DELIM (char)0x0A +#define STRING_DELIM char(0x0A) #define GLOS_TIMEOUT 30000 // update every 30 seconds #define FIND_MAX_GLOS 20 diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index c98dba2dafb1..26785145dbaf 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -465,7 +465,7 @@ IMPL_LINK( SwNavigationPI, EditAction, NumEditAction&, rEdit, void ) { if(m_aPageChgIdle.IsActive()) m_aPageChgIdle.Stop(); - m_pCreateView->GetWrtShell().GotoPage((sal_uInt16)rEdit.GetValue(), true); + m_pCreateView->GetWrtShell().GotoPage(static_cast<sal_uInt16>(rEdit.GetValue()), true); m_pCreateView->GetEditWin().GrabFocus(); m_pCreateView->GetViewFrame()->GetBindings().Invalidate(FN_STAT_PAGE); } diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index c94fb328ca48..cf14a67ed9aa 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -76,19 +76,19 @@ bool SwPageFootnoteInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const bool bRet = true; switch(nMemberId & ~CONVERT_TWIPS) { - case MID_FTN_HEIGHT : rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetHeight());break; - case MID_LINE_WEIGHT : rVal <<= (sal_Int16)convertTwipToMm100(aFootnoteInfo.GetLineWidth());break; - case MID_LINE_COLOR : rVal <<= (sal_Int32)aFootnoteInfo.GetLineColor().GetColor();break; + case MID_FTN_HEIGHT : rVal <<= static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetHeight()));break; + case MID_LINE_WEIGHT : rVal <<= static_cast<sal_Int16>(convertTwipToMm100(aFootnoteInfo.GetLineWidth()));break; + case MID_LINE_COLOR : rVal <<= static_cast<sal_Int32>(aFootnoteInfo.GetLineColor().GetColor());break; case MID_LINE_RELWIDTH : { Fraction aTmp( 100, 1 ); aTmp *= aFootnoteInfo.GetWidth(); - rVal <<= (sal_Int8)(long)aTmp; + rVal <<= static_cast<sal_Int8>(static_cast<long>(aTmp)); } break; case MID_LINE_ADJUST : rVal <<= (sal_Int16)aFootnoteInfo.GetAdj();break;//text::HorizontalAdjust - case MID_LINE_TEXT_DIST : rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetTopDist());break; - case MID_LINE_FOOTNOTE_DIST: rVal <<= (sal_Int32)convertTwipToMm100(aFootnoteInfo.GetBottomDist());break; + case MID_LINE_TEXT_DIST : rVal <<= static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetTopDist()));break; + case MID_LINE_FOOTNOTE_DIST: rVal <<= static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetBottomDist()));break; case MID_FTN_LINE_STYLE : { switch ( aFootnoteInfo.GetLineStyle( ) ) diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 64107830e955..70cbb0994e6b 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -247,13 +247,13 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) if(0 ==(m_nStyleFlags&EX_SHOW_ONLINE_LAYOUT)) { uno::Any aZoom; - aZoom <<= (sal_Int16)view::DocumentZoomType::PAGE_WIDTH_EXACT; + aZoom <<= sal_Int16(view::DocumentZoomType::PAGE_WIDTH_EXACT); xViewProps->setPropertyValue(UNO_NAME_ZOOM_TYPE, aZoom); } else { uno::Any aZoom; - aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE; + aZoom <<= sal_Int16(view::DocumentZoomType::BY_VALUE); xViewProps->setPropertyValue(UNO_NAME_ZOOM_TYPE, aZoom); sal_Int16 nZoomValue = 50; @@ -352,7 +352,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer, void ) aSize <<= aPSize; xPProp->setPropertyValue(UNO_NAME_SIZE, aSize); - uno::Any aZero; aZero <<= (sal_Int32)0; + uno::Any aZero; aZero <<= sal_Int32(0); xPProp->setPropertyValue(UNO_NAME_LEFT_MARGIN, aZero); xPProp->setPropertyValue(UNO_NAME_RIGHT_MARGIN, aZero); } @@ -490,7 +490,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu, bool ) uno::Any aZoom; aZoom <<= nZoom; xViewProps->setPropertyValue(UNO_NAME_ZOOM_VALUE, aZoom); - aZoom <<= (sal_Int16)view::DocumentZoomType::BY_VALUE; + aZoom <<= sal_Int16(view::DocumentZoomType::BY_VALUE); xViewProps->setPropertyValue(UNO_NAME_ZOOM_TYPE, aZoom); } else if(ITEM_UP == nId || ITEM_DOWN == nId) |