diff options
53 files changed, 662 insertions, 662 deletions
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 760d9a079cc3..e833d8b005ce 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -826,7 +826,7 @@ public: inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, sal_Int32 nAttr) { - return (nAttr < (sal_Int32)rAttribs.size()) ? rAttribs[nAttr].get() : nullptr; + return (nAttr < static_cast<sal_Int32>(rAttribs.size())) ? rAttribs[nAttr].get() : nullptr; } void CheckOrderedList(const CharAttribList::AttribsType& rAttribs); diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx index fcdf93ac5d68..7d5e9647b00c 100644 --- a/editeng/qa/lookuptree/lookuptree_test.cxx +++ b/editeng/qa/lookuptree/lookuptree_test.cxx @@ -45,35 +45,35 @@ void LookupTreeTest::testTrie() std::vector<OUString> suggestions; trie.findSuggestions( OUString(), suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(0), suggestions.size() ); trie.insert( OUString() ); trie.findSuggestions( OUString(), suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(0), suggestions.size() ); trie.findSuggestions( "a", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(0), suggestions.size() ); trie.insert( "abc" ); trie.insert( "abcdefghijklmnopqrstuvwxyz" ); trie.findSuggestions( "a", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 2, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(2), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("abc"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("abcdefghijklmnopqrstuvwxyz"), suggestions[1] ); suggestions.clear(); trie.findSuggestions( "abc", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(1), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("abcdefghijklmnopqrstuvwxyz"), suggestions[0] ); suggestions.clear(); trie.findSuggestions( "abe", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(0), suggestions.size() ); suggestions.clear(); trie.insert( "abe" ); trie.findSuggestions( "", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 3, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(3), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("abc"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("abcdefghijklmnopqrstuvwxyz"), suggestions[1] ); CPPUNIT_ASSERT_EQUAL( OUString("abe"), suggestions[2] ); @@ -82,42 +82,42 @@ void LookupTreeTest::testTrie() trie.insert( "H31l0" ); trie.findSuggestions( "H", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(1), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); trie.insert( "H1" ); trie.findSuggestions( "H", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 2, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(2), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("H1"), suggestions[1] ); suggestions.clear(); trie.findSuggestions( "H3", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(1), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); trie.insert( OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ) ); trie.findSuggestions( "H", suggestions ); - CPPUNIT_ASSERT_EQUAL( (size_t) 3, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(3), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("H1"), suggestions[1] ); CPPUNIT_ASSERT_EQUAL( OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ), suggestions[2] ); suggestions.clear(); trie.findSuggestions( "H3", suggestions ); - CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(1), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); trie.findSuggestions( OStringToOUString("H\xC3\xA4", RTL_TEXTENCODING_UTF8), suggestions ); - CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(1), suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OStringToOUString("H\xC3\xA4llo", RTL_TEXTENCODING_UTF8), suggestions[0] ); suggestions.clear(); trie.findSuggestions( "", suggestions); - CPPUNIT_ASSERT_EQUAL( (size_t) 6, suggestions.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(6), suggestions.size() ); suggestions.clear(); } @@ -125,18 +125,18 @@ void LookupTreeTest::testTrieGetAllEntries() { editeng::Trie trie; - CPPUNIT_ASSERT_EQUAL( (size_t) 0, trie.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(0), trie.size() ); trie.insert("A"); - CPPUNIT_ASSERT_EQUAL( (size_t) 1, trie.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(1), trie.size() ); trie.insert("B"); trie.insert("C"); - CPPUNIT_ASSERT_EQUAL( (size_t) 3, trie.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(3), trie.size() ); trie.insert("AA"); trie.insert("AAA"); - CPPUNIT_ASSERT_EQUAL( (size_t) 5, trie.size() ); + CPPUNIT_ASSERT_EQUAL( size_t(5), trie.size() ); } } // namespace end diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 6f527440fcca..2e122cc59c1d 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -187,19 +187,19 @@ void Test::testLineSpacing() // Force multiple lines aEditEngine.SetPaperSize(Size(1000, 6000)); - CPPUNIT_ASSERT_EQUAL((sal_Int32)4, aEditEngine.GetLineCount(0)); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aEditEngine.GetLineCount(0)); // Assert changes ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0]; ContentNode* const pNode = pParaPortion->GetNode(); const SvxLineSpacingItem& rLSItem = pNode->GetContentAttribs().GetItem(EE_PARA_SBL); CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem.GetInterLineSpaceRule()); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)60, rLSItem.GetPropLineSpace()); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(60), rLSItem.GetPropLineSpace()); // Check the first line ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)122, aInfo.nFirstLineMaxAscent); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)153, (sal_uInt16)aEditEngine.GetLineHeight(0)); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(122), aInfo.nFirstLineMaxAscent); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(153), static_cast<sal_uInt16>(aEditEngine.GetLineHeight(0))); // Prepare second case - 150% std::unique_ptr<SfxItemSet> pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet())); @@ -217,12 +217,12 @@ void Test::testLineSpacing() // Assert changes const SvxLineSpacingItem& rLSItem2 = pNode->GetContentAttribs().GetItem(EE_PARA_SBL); CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem2.GetInterLineSpaceRule()); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)150, rLSItem2.GetPropLineSpace()); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(150), rLSItem2.GetPropLineSpace()); // Check the first line ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)269, aInfo2.nFirstLineMaxAscent); - CPPUNIT_ASSERT_EQUAL((sal_uInt16)382, (sal_uInt16)aEditEngine.GetLineHeight(0)); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(269), aInfo2.nFirstLineMaxAscent); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(382), static_cast<sal_uInt16>(aEditEngine.GetLineHeight(0))); } void Test::testConstruction() @@ -846,10 +846,10 @@ void Test::testHyperlinkSearch() OUString aContent = pNode->GetExpandedText(); CPPUNIT_ASSERT_EQUAL_MESSAGE("get text", OUString("Please write email to jim@bob.com. if you find a fish(not a dog)."), aContent); - CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong length", (sal_uLong)aContent.getLength(), rDoc.GetTextLen()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong length", static_cast<sal_uLong>(aContent.getLength()), rDoc.GetTextLen()); // Check expansion and positioning re-work - CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong length", (sal_uLong)aContent.getLength(), + CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong length", static_cast<sal_uLong>(aContent.getLength()), pNode->GetExpandedLen()); for (sal_Int32 n = 0; n < aContent.getLength(); n++) { @@ -967,23 +967,23 @@ void Test::testBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(3), aAttrs1.size() ); const editeng::Section* pSecAttr = &aAttrs1[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs1[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs1[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 20, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 20, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); // Apply Italic to appropriate selection pSet.reset( new SfxItemSet(aEditEngine.GetEmptyItemSet()) ); @@ -999,37 +999,37 @@ void Test::testBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(5), aAttrs2.size() ); pSecAttr = &aAttrs2[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs2[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 8, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 8, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs2[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 8, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 8, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs2[3]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs2[4]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 20, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 20, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); // Copy text using legacy format uno::Reference< datatransfer::XTransferable > xData = aEditEngine.CreateTransferable( ESelection(0,1,0,aTextLen-1) ); @@ -1050,64 +1050,64 @@ void Test::testBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(9), aAttrs3.size() ); pSecAttr = &aAttrs3[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs3[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 8, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 8, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs3[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 8, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 8, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[3]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[4]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 21, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 21, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs3[5]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 21, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 27, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 21, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 27, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs3[6]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 27, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 33, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 27, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[7]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 33, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 37, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 37, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[8]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 37, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 38, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 37, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 38, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); } // Auxiliary function to test Underline text Copy/Paste using Legacy Format @@ -1165,23 +1165,23 @@ void Test::testUnderlineCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(3), aAttrs1.size() ); const editeng::Section* pSecAttr = &aAttrs1[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 6, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 6, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs1[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 6, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 6, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be underlined.", hasUnderline(*pSecAttr) ); pSecAttr = &aAttrs1[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 22, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 22, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); // Copy text using legacy format uno::Reference< datatransfer::XTransferable > xData = aEditEngine.CreateTransferable( ESelection(0,6,0,aTextLen-4) ); @@ -1202,29 +1202,29 @@ void Test::testUnderlineCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(4), aAttrs2.size() ); pSecAttr = &aAttrs2[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 6, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 6, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs2[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 6, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 6, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be underlined.", hasUnderline(*pSecAttr) ); pSecAttr = &aAttrs2[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 22, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 22, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs2[3]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 22, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 34, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 22, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 34, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be underlined.", hasUnderline(*pSecAttr) ); } @@ -1325,48 +1325,48 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(7), aAttrs1.size() ); const editeng::Section* pSecAttr = &aAttrs1[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs1[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs1[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs1[3]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs1[4]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 19, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 19, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs1[5]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 19, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 24, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 19, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 24, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs1[6]; - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); // Apply Italic to appropriate selection pSet.reset( new SfxItemSet(aEditEngine.GetEmptyItemSet()) ); @@ -1382,64 +1382,64 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(9), aAttrs2.size() ); pSecAttr = &aAttrs2[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs2[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs2[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs2[3]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs2[4]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs2[5]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 9, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs2[6]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 9, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 19, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 19, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs2[7]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 19, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 24, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 19, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 24, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs2[8]; - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); // Copy text using legacy format uno::Reference< datatransfer::XTransferable > xData = aEditEngine.CreateTransferable( ESelection(0,8,1,14) ); @@ -1465,105 +1465,105 @@ void Test::testParaBoldItalicCopyPaste() CPPUNIT_ASSERT_EQUAL( size_t(15), aAttrs3.size() ); pSecAttr = &aAttrs3[0]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs3[1]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs3[2]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[3]; - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 18, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 18, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[4]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[5]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 9, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[6]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 9, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 19, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 19, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs3[7]; - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 19, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 24, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 19, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 24, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs3[8]; - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->maAttributes.size()) ); pSecAttr = &aAttrs3[9]; - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 23, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 29, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 23, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 29, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); pSecAttr = &aAttrs3[10]; - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 29, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 33, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 29, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[11]; - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 33, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 38, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 33, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 38, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[12]; - CPPUNIT_ASSERT_EQUAL( 3, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 0, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 3, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 0, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be italic.", hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[13]; - CPPUNIT_ASSERT_EQUAL( 3, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 5, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 9, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 2, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 3, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 5, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 2, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr) ); pSecAttr = &aAttrs3[14]; - CPPUNIT_ASSERT_EQUAL( 3, (int)pSecAttr->mnParagraph ); - CPPUNIT_ASSERT_EQUAL( 9, (int)pSecAttr->mnStart ); - CPPUNIT_ASSERT_EQUAL( 14, (int)pSecAttr->mnEnd ); - CPPUNIT_ASSERT_EQUAL( 1, (int)pSecAttr->maAttributes.size() ); + CPPUNIT_ASSERT_EQUAL( 3, static_cast<int>(pSecAttr->mnParagraph) ); + CPPUNIT_ASSERT_EQUAL( 9, static_cast<int>(pSecAttr->mnStart) ); + CPPUNIT_ASSERT_EQUAL( 14, static_cast<int>(pSecAttr->mnEnd) ); + CPPUNIT_ASSERT_EQUAL( 1, static_cast<int>(pSecAttr->maAttributes.size()) ); CPPUNIT_ASSERT_MESSAGE( "This section must be bold.", hasBold(*pSecAttr) ); } @@ -1642,26 +1642,26 @@ void Test::testSectionAttributes() // First section should be 0-3 of paragraph 0, and it should only have boldness applied. const editeng::Section* pSecAttr = &aAttrs[0]; - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(3, (int)pSecAttr->mnEnd); - CPPUNIT_ASSERT_EQUAL(1, (int)pSecAttr->maAttributes.size()); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(pSecAttr->mnEnd)); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(pSecAttr->maAttributes.size())); CPPUNIT_ASSERT_MESSAGE("This section must be bold.", hasBold(*pSecAttr)); // Second section should be 3-6, and it should be both bold and italic. pSecAttr = &aAttrs[1]; - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(3, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(6, (int)pSecAttr->mnEnd); - CPPUNIT_ASSERT_EQUAL(2, (int)pSecAttr->maAttributes.size()); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(6, static_cast<int>(pSecAttr->mnEnd)); + CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(pSecAttr->maAttributes.size())); CPPUNIT_ASSERT_MESSAGE("This section must be bold and italic.", hasBold(*pSecAttr) && hasItalic(*pSecAttr)); // Third section should be 6-9, and it should be only italic. pSecAttr = &aAttrs[2]; - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(6, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(9, (int)pSecAttr->mnEnd); - CPPUNIT_ASSERT_EQUAL(1, (int)pSecAttr->maAttributes.size()); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(6, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(9, static_cast<int>(pSecAttr->mnEnd)); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(pSecAttr->maAttributes.size())); CPPUNIT_ASSERT_MESSAGE("This section must be italic.", hasItalic(*pSecAttr)); } @@ -1689,37 +1689,37 @@ void Test::testSectionAttributes() // 1st, 3rd and 5th sections should correspond with 1st, 3rd and 5th paragraphs. const editeng::Section* pSecAttr = &aAttrs[0]; - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(3, (int)pSecAttr->mnEnd); - CPPUNIT_ASSERT_EQUAL(1, (int)pSecAttr->maAttributes.size()); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(pSecAttr->mnEnd)); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(pSecAttr->maAttributes.size())); CPPUNIT_ASSERT_MESSAGE("This section must be bold.", hasBold(*pSecAttr)); pSecAttr = &aAttrs[2]; - CPPUNIT_ASSERT_EQUAL(2, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(3, (int)pSecAttr->mnEnd); - CPPUNIT_ASSERT_EQUAL(1, (int)pSecAttr->maAttributes.size()); + CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(pSecAttr->mnEnd)); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(pSecAttr->maAttributes.size())); CPPUNIT_ASSERT_MESSAGE("This section must be bold.", hasBold(*pSecAttr)); pSecAttr = &aAttrs[4]; - CPPUNIT_ASSERT_EQUAL(4, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(5, (int)pSecAttr->mnEnd); - CPPUNIT_ASSERT_EQUAL(1, (int)pSecAttr->maAttributes.size()); + CPPUNIT_ASSERT_EQUAL(4, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(5, static_cast<int>(pSecAttr->mnEnd)); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(pSecAttr->maAttributes.size())); CPPUNIT_ASSERT_MESSAGE("This section must be bold.", hasBold(*pSecAttr)); // The 2nd and 4th paragraphs should be empty. pSecAttr = &aAttrs[1]; - CPPUNIT_ASSERT_EQUAL(1, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnEnd); + CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnEnd)); CPPUNIT_ASSERT_MESSAGE("Attribute array should be empty.", pSecAttr->maAttributes.empty()); pSecAttr = &aAttrs[3]; - CPPUNIT_ASSERT_EQUAL(3, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnEnd); + CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnEnd)); CPPUNIT_ASSERT_MESSAGE("Attribute array should be empty.", pSecAttr->maAttributes.empty()); } @@ -1750,9 +1750,9 @@ void Test::testSectionAttributes() CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aAttrs.size()); const editeng::Section* pSecAttr = &aAttrs[0]; - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnParagraph); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnStart); - CPPUNIT_ASSERT_EQUAL(0, (int)pSecAttr->mnEnd); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnParagraph)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnStart)); + CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(pSecAttr->mnEnd)); std::set<sal_uInt16> whiches; for (size_t i = 0; i < pSecAttr->maAttributes.size(); ++i) { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index d985d6648cea..6f4aa8791ffd 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -1529,7 +1529,7 @@ namespace accessibility const SvxNumBulletItem& rNumBullet = rCacheTF.GetParaAttribs(GetParagraphIndex()).Get(EE_PARA_NUMBULLET); if(rNumBullet.GetNumRule()->GetLevelCount()==0) { - rRes.Value <<= (sal_Int16)-1; + rRes.Value <<= sal_Int16(-1); rRes.Handle = -1; rRes.State = PropertyState_DIRECT_VALUE; } @@ -1554,7 +1554,7 @@ namespace accessibility bool bVis = aAttribs.Get( EE_PARA_BULLETSTATE ).GetValue(); if(bVis) { - rRes.Value <<= (sal_Int16)-1; + rRes.Value <<= sal_Int16(-1); rRes.Handle = -1; rRes.State = PropertyState_DIRECT_VALUE; } diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index c83bbde71081..0601217bc71e 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -64,7 +64,7 @@ namespace accessibility void AccessibleParaManager::SetNum( sal_Int32 nNumParas ) { - if( (size_t)nNumParas < maChildren.size() ) + if( static_cast<size_t>(nNumParas) < maChildren.size() ) Release( nNumParas, maChildren.size() ); maChildren.resize( nNumParas ); diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx index 7370f2debc1c..02cca758ed79 100644 --- a/editeng/source/editeng/editattr.cxx +++ b/editeng/source/editeng/editattr.cxx @@ -289,7 +289,7 @@ EditCharAttribEscapement::EditCharAttribEscapement( const SvxEscapementItem& rAt void EditCharAttribEscapement::SetFont( SvxFont& rFont, OutputDevice* ) { sal_uInt16 const nProp = static_cast<const SvxEscapementItem*>(GetItem())->GetProportionalHeight(); - rFont.SetPropr( (sal_uInt8)nProp ); + rFont.SetPropr( static_cast<sal_uInt8>(nProp) ); short nEsc = static_cast<const SvxEscapementItem*>(GetItem())->GetEsc(); if ( nEsc == DFLT_ESC_AUTO_SUPER ) diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index c93477eb7309..297fbf7a98dd 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -165,7 +165,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) case EE_CHAR_LANGUAGE_CJK: case EE_CHAR_LANGUAGE_CTL: aDebStr.append("Language="); - aDebStr.append((sal_Int32)static_cast<sal_uInt16>(static_cast<const SvxLanguageItem&>(rItem).GetLanguage())); + aDebStr.append(static_cast<sal_Int32>(static_cast<sal_uInt16>(static_cast<const SvxLanguageItem&>(rItem).GetLanguage()))); break; case EE_CHAR_COLOR: { @@ -276,7 +276,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem) { aDebStr.append("Kerning="); aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxKerningItem&>(rItem).GetValue())); - Size aSz( 0, (short)static_cast<const SvxKerningItem&>(rItem).GetValue() ); + Size aSz( 0, static_cast<short>(static_cast<const SvxKerningItem&>(rItem).GetValue()) ); MapUnit eUnit = rPool.GetMetric( rItem.Which() ); MapMode aItemMapMode(eUnit); MapMode aPntMap( MapUnit::MapPoint ); diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 07a495d2bb1f..d7caea2f78df 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -391,7 +391,7 @@ void TextPortionList::DeleteFromPortion(sal_Int32 nDelFrom) sal_Int32 TextPortionList::Count() const { - return (sal_Int32)maPortions.size(); + return static_cast<sal_Int32>(maPortions.size()); } const TextPortion& TextPortionList::operator[](sal_Int32 nPos) const @@ -692,17 +692,17 @@ sal_Int32 ParaPortionList::GetPos(const ParaPortion* p) const ParaPortion* ParaPortionList::operator [](sal_Int32 nPos) { - return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? maPortions[nPos].get() : nullptr; + return 0 <= nPos && nPos < static_cast<sal_Int32>(maPortions.size()) ? maPortions[nPos].get() : nullptr; } const ParaPortion* ParaPortionList::operator [](sal_Int32 nPos) const { - return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? maPortions[nPos].get() : nullptr; + return 0 <= nPos && nPos < static_cast<sal_Int32>(maPortions.size()) ? maPortions[nPos].get() : nullptr; } ParaPortion* ParaPortionList::Release(sal_Int32 nPos) { - if (nPos < 0 || (sal_Int32)maPortions.size() <= nPos) + if (nPos < 0 || static_cast<sal_Int32>(maPortions.size()) <= nPos) { SAL_WARN( "editeng", "ParaPortionList::Release - out of bounds pos " << nPos); return nullptr; @@ -714,7 +714,7 @@ ParaPortion* ParaPortionList::Release(sal_Int32 nPos) void ParaPortionList::Remove(sal_Int32 nPos) { - if (nPos < 0 || (sal_Int32)maPortions.size() <= nPos) + if (nPos < 0 || static_cast<sal_Int32>(maPortions.size()) <= nPos) { SAL_WARN( "editeng", "ParaPortionList::Remove - out of bounds pos " << nPos); return; @@ -724,7 +724,7 @@ void ParaPortionList::Remove(sal_Int32 nPos) void ParaPortionList::Insert(sal_Int32 nPos, ParaPortion* p) { - if (nPos < 0 || (sal_Int32)maPortions.size() < nPos) + if (nPos < 0 || static_cast<sal_Int32>(maPortions.size()) < nPos) { SAL_WARN( "editeng", "ParaPortionList::Insert - out of bounds pos " << nPos); return; @@ -781,12 +781,12 @@ sal_Int32 ParaPortionList::FindParagraph(long nYOffset) const const ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos) const { - return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? maPortions[nPos].get() : nullptr; + return 0 <= nPos && nPos < static_cast<sal_Int32>(maPortions.size()) ? maPortions[nPos].get() : nullptr; } ParaPortion* ParaPortionList::SafeGetObject(sal_Int32 nPos) { - return 0 <= nPos && nPos < (sal_Int32)maPortions.size() ? maPortions[nPos].get() : nullptr; + return 0 <= nPos && nPos < static_cast<sal_Int32>(maPortions.size()) ? maPortions[nPos].get() : nullptr; } #if OSL_DEBUG_LEVEL > 0 @@ -1041,7 +1041,7 @@ Size EditLine::CalcTextSize( ParaPortion& rParaPortion ) } } - SetHeight( (sal_uInt16)aSz.Height() ); + SetHeight( static_cast<sal_uInt16>(aSz.Height()) ); return aSz; } @@ -1889,7 +1889,7 @@ const SfxPoolItem* ItemList::First() const SfxPoolItem* ItemList::Next() { - if ( CurrentItem + 1 < (sal_Int32)aItemPool.size() ) + if ( CurrentItem + 1 < static_cast<sal_Int32>(aItemPool.size()) ) { ++CurrentItem; return aItemPool[ CurrentItem ]; @@ -2011,7 +2011,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S const SvxEscapementItem& rEsc = rSet.Get( EE_CHAR_ESCAPEMENT ); sal_uInt16 const nProp = rEsc.GetProportionalHeight(); - rFont.SetPropr( (sal_uInt8)nProp ); + rFont.SetPropr( static_cast<sal_uInt8>(nProp) ); short nEsc = rEsc.GetEsc(); if ( nEsc == DFLT_ESC_AUTO_SUPER ) @@ -2062,12 +2062,12 @@ sal_Int32 EditDoc::GetPos(const ContentNode* p) const const ContentNode* EditDoc::GetObject(sal_Int32 nPos) const { - return 0 <= nPos && nPos < (sal_Int32)maContents.size() ? maContents[nPos].get() : nullptr; + return 0 <= nPos && nPos < static_cast<sal_Int32>(maContents.size()) ? maContents[nPos].get() : nullptr; } ContentNode* EditDoc::GetObject(sal_Int32 nPos) { - return 0 <= nPos && nPos < (sal_Int32)maContents.size() ? maContents[nPos].get() : nullptr; + return 0 <= nPos && nPos < static_cast<sal_Int32>(maContents.size()) ? maContents[nPos].get() : nullptr; } const ContentNode* EditDoc::operator[](sal_Int32 nPos) const @@ -2092,7 +2092,7 @@ void EditDoc::Insert(sal_Int32 nPos, ContentNode* p) void EditDoc::Remove(sal_Int32 nPos) { - if (nPos < 0 || nPos >= (sal_Int32)maContents.size()) + if (nPos < 0 || nPos >= static_cast<sal_Int32>(maContents.size())) { SAL_WARN( "editeng", "EditDoc::Remove - out of bounds pos " << nPos); return; @@ -2102,7 +2102,7 @@ void EditDoc::Remove(sal_Int32 nPos) void EditDoc::Release(sal_Int32 nPos) { - if (nPos < 0 || nPos >= (sal_Int32)maContents.size()) + if (nPos < 0 || nPos >= static_cast<sal_Int32>(maContents.size())) { SAL_WARN( "editeng", "EditDoc::Release - out of bounds pos " << nPos); return; @@ -2767,10 +2767,10 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool ) #if OSL_DEBUG_LEVEL > 0 CharAttribList::DbgCheckAttribs(*this); #endif - for (sal_Int32 i = 0; i < (sal_Int32)aAttribs.size(); ++i) + for (sal_Int32 i = 0; i < static_cast<sal_Int32>(aAttribs.size()); ++i) { EditCharAttrib& rAttr = *aAttribs[i].get(); - for (sal_Int32 nNext = i+1; nNext < (sal_Int32)aAttribs.size(); ++nNext) + for (sal_Int32 nNext = i+1; nNext < static_cast<sal_Int32>(aAttribs.size()); ++nNext) { EditCharAttrib& rNext = *aAttribs[nNext].get(); if (!rAttr.IsFeature() && rNext.GetStart() == rAttr.GetEnd() && rNext.Which() == rAttr.Which()) @@ -2877,7 +2877,7 @@ void CharAttribList::Remove(const EditCharAttrib* p) void CharAttribList::Remove(sal_Int32 nPos) { - if (nPos >= (sal_Int32)aAttribs.size()) + if (nPos >= static_cast<sal_Int32>(aAttribs.size())) return; aAttribs.erase(aAttribs.begin()+nPos); diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index c896e9aeb2f7..d2531b0f769b 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -273,8 +273,8 @@ void EditEngine::Draw( OutputDevice* pOutDev, const tools::Rectangle& rOutRect, { // Clip only if necessary... if ( rStartDocPos.X() || rStartDocPos.Y() || - ( rOutRect.GetHeight() < (long)GetTextHeight() ) || - ( rOutRect.GetWidth() < (long)CalcTextWidth() ) ) + ( rOutRect.GetHeight() < static_cast<long>(GetTextHeight()) ) || + ( rOutRect.GetWidth() < static_cast<long>(CalcTextWidth()) ) ) { // Some printer drivers cause problems if characters graze the // ClipRegion, therefore rather add a pixel more ... @@ -1964,7 +1964,7 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph ) // TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst()) ); sal_Int32 nSpaceBefore = 0; pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore ); - short nX = (short)(rLRItem.GetTextLeft() + short nX = static_cast<short>(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore); aPoint.X() = pImpEditEngine->GetXValue( nX @@ -1997,7 +1997,7 @@ bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder ) // take unrotated positions for calculation here Point aDocPos = GetDocPos( rPaperPos ); - if ( ( aDocPos.Y() > 0 ) && ( aDocPos.Y() < (long)pImpEditEngine->GetTextHeight() ) ) + if ( ( aDocPos.Y() > 0 ) && ( aDocPos.Y() < static_cast<long>(pImpEditEngine->GetTextHeight()) ) ) { EditPaM aPaM = pImpEditEngine->GetPaM( aDocPos, false ); if ( aPaM.GetNode() ) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index b9a8fd82baff..d990d6d2d578 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -941,7 +941,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs ) // Go through all formatted paragraphs, and store format items. std::vector<editeng::Section>::iterator itAttr = aAttrs.begin(); - for (sal_Int32 nPara = 0; nPara < (sal_Int32)aContents.size(); ++nPara) + for (sal_Int32 nPara = 0; nPara < static_cast<sal_Int32>(aContents.size()); ++nPara) { const ContentInfo& rC = *aContents[nPara].get(); diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 13f066dafc02..aa02fa49f1d6 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -424,7 +424,7 @@ void EditUndoMoveParagraphs::Undo() aTmpRange.Min() += nDiff; aTmpRange.Max() += nDiff; - if ( nParagraphs.Min() < (long)nDest ) + if ( nParagraphs.Min() < static_cast<long>(nDest) ) { long nLen = aTmpRange.Len(); aTmpRange.Min() -= nLen; diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 7b1b123ddcf4..6e1c66f42353 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -140,8 +140,8 @@ LanguageType EditView::CheckLanguage( LanguageType nTmpLang = aLangList[i]; if (nTmpLang != LANGUAGE_NONE && nTmpLang != LANGUAGE_DONTKNOW) { - if (xSpell->hasLanguage( (sal_uInt16)nTmpLang ) && - xSpell->isValid( rText, (sal_uInt16)nTmpLang, Sequence< PropertyValue >() )) + if (xSpell->hasLanguage( static_cast<sal_uInt16>(nTmpLang) ) && + xSpell->isValid( rText, static_cast<sal_uInt16>(nTmpLang), Sequence< PropertyValue >() )) { nLang = nTmpLang; break; @@ -883,11 +883,11 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo 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); // Are there any replace suggestions? Reference< linguistic2::XSpellAlternatives > xSpellAlt = - xSpeller->spell( aSelected, (sal_uInt16)pImpEditView->pEditEngine->pImpEditEngine->GetLanguage( aPaM2 ), aPropVals ); + xSpeller->spell( aSelected, static_cast<sal_uInt16>(pImpEditView->pEditEngine->pImpEditEngine->GetLanguage( aPaM2 )), aPropVals ); Reference< linguistic2::XLanguageGuessing > xLangGuesser( EditDLL::Get().GetGlobalData()->GetLanguageGuesser() ); @@ -940,7 +940,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo if (xSpellAlt.is()) aAlt = xSpellAlt->getAlternatives(); const OUString *pAlt = aAlt.getConstArray(); - sal_uInt16 nWords = (sal_uInt16) aAlt.getLength(); + sal_uInt16 nWords = static_cast<sal_uInt16>(aAlt.getLength()); if ( nWords ) { for ( sal_uInt16 nW = 0; nW < nWords; nW++ ) @@ -971,7 +971,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo aDics = xDicList->getDictionaries(); pDic = aDics.getConstArray(); LanguageType nCheckedLanguage = pImpEditView->pEditEngine->pImpEditEngine->GetLanguage( aPaM2 ); - sal_uInt16 nDicCount = (sal_uInt16)aDics.getLength(); + sal_uInt16 nDicCount = static_cast<sal_uInt16>(aDics.getLength()); for (sal_uInt16 i = 0; i < nDicCount; i++) { uno::Reference< linguistic2::XDictionary > xDicTmp( pDic[i], uno::UNO_QUERY ); @@ -1377,7 +1377,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo { nHeight = OutputDevice::LogicToLogic( nHeight, MapUnit::MapPoint, eUnit ) / 10; - if( nHeight != (long)aFontHeightItem.GetHeight() ) + if( nHeight != static_cast<long>(aFontHeightItem.GetHeight()) ) { aFontHeightItem.SetHeight( nHeight ); std::unique_ptr<SfxPoolItem> pNewItem(aFontHeightItem.CloneSetWhich(*pWhich)); diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index e123b64c2bec..1ca0587715f6 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -381,7 +381,7 @@ void WrongList::ClearWrongs( size_t nStart, size_t nEnd, { i->mnStart = nEnd; // Blanks? - while (i->mnStart < (size_t)pNode->Len() && + while (i->mnStart < static_cast<size_t>(pNode->Len()) && (pNode->GetChar(i->mnStart) == ' ' || pNode->IsFeature(i->mnStart))) { diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index b746b1347b74..44f21112d828 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -632,8 +632,8 @@ void EditHTMLParser::ImpSetStyleSheet( sal_uInt16 nHLevel ) if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) ) { SvxULSpaceItem aULSpaceItem( EE_PARA_ULSPACE ); - aULSpaceItem.SetUpper( (sal_uInt16)OutputDevice::LogicToLogic( 42, MapUnit::Map10thMM, eUnit ) ); - aULSpaceItem.SetLower( (sal_uInt16)OutputDevice::LogicToLogic( 35, MapUnit::Map10thMM, eUnit ) ); + aULSpaceItem.SetUpper( static_cast<sal_uInt16>(OutputDevice::LogicToLogic( 42, MapUnit::Map10thMM, eUnit )) ); + aULSpaceItem.SetLower( static_cast<sal_uInt16>(OutputDevice::LogicToLogic( 35, MapUnit::Map10thMM, eUnit )) ); aItems.Put( aULSpaceItem ); } } diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 4601aac8f54d..7c056db7c24d 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -325,7 +325,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) { sal_uInt32 nHeight = static_cast<const SvxFontHeightItem*>(pItem)->GetHeight(); long nNewHeight; - nNewHeight = OutputDevice::LogicToLogic( (long)nHeight, eSrcUnit, eDestUnit ); + nNewHeight = OutputDevice::LogicToLogic( static_cast<long>(nHeight), eSrcUnit, eDestUnit ); SvxFontHeightItem aFntHeightItem( nNewHeight, 100, aFntHeightIem ); aFntHeightItem.SetProp( @@ -352,7 +352,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) { nEsc = nEsc * 100 / nEscFontHeight; - SvxEscapementItem aEscItem( (short) nEsc, static_cast<const SvxEscapementItem*>(pItem)->GetProportionalHeight(), EE_CHAR_ESCAPEMENT ); + SvxEscapementItem aEscItem( static_cast<short>(nEsc), static_cast<const SvxEscapementItem*>(pItem)->GetProportionalHeight(), EE_CHAR_ESCAPEMENT ); rSet.GetAttrSet().Put( aEscItem ); } } diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 2faa22c69e3b..f7f17639c6eb 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -653,9 +653,9 @@ void ImpEditView::SetOutputArea( const tools::Rectangle& rRect ) aOutArea.Bottom() = aOutArea.Top(); if ( DoBigScroll() ) - SetScrollDiffX( (sal_uInt16)aOutArea.GetWidth() * 3 / 10 ); + SetScrollDiffX( static_cast<sal_uInt16>(aOutArea.GetWidth()) * 3 / 10 ); else - SetScrollDiffX( (sal_uInt16)aOutArea.GetWidth() * 2 / 10 ); + SetScrollDiffX( static_cast<sal_uInt16>(aOutArea.GetWidth()) * 2 / 10 ); } void ImpEditView::InvalidateAtWindow(const tools::Rectangle& rRect) @@ -981,7 +981,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor ) // Scroll right, negative: nDocDiffX = aEditCursor.Left() - aTmpVisArea.Left(); // Can it be a little more? - if ( aEditCursor.Left() > ( - (long)GetScrollDiffX() ) ) + if ( aEditCursor.Left() > ( - static_cast<long>(GetScrollDiffX()) ) ) nDocDiffX -= GetScrollDiffX(); else nDocDiffX -= aEditCursor.Left(); @@ -1190,7 +1190,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck ) aNewVisArea.Bottom() -= ndX; } } - if ( ( nRangeCheck == ScrollRangeCheck::PaperWidthTextSize ) && ( aNewVisArea.Bottom() > (long)pEditEngine->pImpEditEngine->GetTextHeight() ) ) + if ( ( nRangeCheck == ScrollRangeCheck::PaperWidthTextSize ) && ( aNewVisArea.Bottom() > static_cast<long>(pEditEngine->pImpEditEngine->GetTextHeight()) ) ) { // GetTextHeight still optimizing! long nDiff = pEditEngine->pImpEditEngine->GetTextHeight() - aNewVisArea.Bottom(); // negative @@ -1218,7 +1218,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck ) aNewVisArea.Right() += ndY; } } - if ( ( nRangeCheck == ScrollRangeCheck::PaperWidthTextSize ) && ( aNewVisArea.Right() > (long)pEditEngine->pImpEditEngine->CalcTextWidth( false ) ) ) + if ( ( nRangeCheck == ScrollRangeCheck::PaperWidthTextSize ) && ( aNewVisArea.Right() > static_cast<long>(pEditEngine->pImpEditEngine->CalcTextWidth( false )) ) ) { long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( false ) - aNewVisArea.Right(); // negative aNewVisArea.Move( nDiff, 0 ); // could end up in the negative area... @@ -1902,8 +1902,8 @@ void ImpEditView::dragGestureRecognized(const css::datatransfer::dnd::DragGestur // Sensitive area to be scrolled. Size aSz( 5, 0 ); aSz = GetWindow()->PixelToLogic( aSz ); - pDragAndDropInfo->nSensibleRange = (sal_uInt16) aSz.Width(); - pDragAndDropInfo->nCursorWidth = (sal_uInt16) aSz.Width() / 2; + pDragAndDropInfo->nSensibleRange = static_cast<sal_uInt16>(aSz.Width()); + pDragAndDropInfo->nCursorWidth = static_cast<sal_uInt16>(aSz.Width()) / 2; pDragAndDropInfo->aBeginDragSel = pEditEngine->pImpEditEngine->CreateESel( aCopySel ); uno::Reference<datatransfer::XTransferable> xData = pEditEngine->CreateTransferable(aCopySel); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 30694a1e5c1d..64b04166563d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -404,7 +404,7 @@ public: // If possible invalidate more than OutputArea, for the DrawingEngine text frame void SetInvalidateMore( sal_uInt16 nPixel ) { nInvMore = nPixel; } - sal_uInt16 GetInvalidateMore() const { return (sal_uInt16)nInvMore; } + sal_uInt16 GetInvalidateMore() const { return static_cast<sal_uInt16>(nInvMore); } }; @@ -1181,7 +1181,7 @@ inline short ImpEditEngine::GetXValue( short nXValue ) const if ( !aStatus.DoStretch() || ( nStretchX == 100 ) ) return nXValue; - return (short) ((long)nXValue*nStretchX/100); + return static_cast<short>(static_cast<long>(nXValue)*nStretchX/100); } @@ -1198,7 +1198,7 @@ inline short ImpEditEngine::GetYValue( short nYValue ) const if ( !aStatus.DoStretch() || ( nStretchY == 100 ) ) return nYValue; - return (short) ((long)nYValue*nStretchY/100); + return static_cast<short>(static_cast<long>(nYValue)*nStretchY/100); } inline sal_uInt16 ImpEditEngine::GetYValue( sal_uInt16 nYValue ) const @@ -1206,7 +1206,7 @@ inline sal_uInt16 ImpEditEngine::GetYValue( sal_uInt16 nYValue ) const if ( !aStatus.DoStretch() || ( nStretchY == 100 ) ) return nYValue; - return (sal_uInt16) ((long)nYValue*nStretchY/100); + return static_cast<sal_uInt16>(static_cast<long>(nYValue)*nStretchY/100); } inline const Pointer& ImpEditView::GetPointer() diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index f837b2a57cac..c5d8c2ad4830 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -211,7 +211,7 @@ void ImpEditEngine::SetRefDevice( OutputDevice* pRef ) else pRefDev = pSharedVCL->GetVirtualDevice(); - nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width(); + nOnePixelInRef = static_cast<sal_uInt16>(pRefDev->PixelToLogic( Size( 1, 0 ) ).Width()); if ( IsFormatted() ) { @@ -232,7 +232,7 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode ) SetRefDevice( pRefDev ); pRefDev->SetMapMode( rMapMode ); - nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width(); + nOnePixelInRef = static_cast<sal_uInt16>(pRefDev->PixelToLogic( Size( 1, 0 ) ).Width()); if ( IsFormatted() ) { FormatFullDoc(); @@ -1122,7 +1122,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView const * pEditView, const bool bRTLPortion = rTextPortion.IsRightToLeft(); // -1: We are 'behind' the character - long nVisPos = (long)ubidi_getVisualIndex( pBidi, bWasBehind ? nPosInLine-1 : nPosInLine, &nError ); + long nVisPos = static_cast<long>(ubidi_getVisualIndex( pBidi, bWasBehind ? nPosInLine-1 : nPosInLine, &nError )); if ( bVisualToLeft ) { if ( !bWasBehind || bRTLPortion ) @@ -2112,9 +2112,9 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars ) EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 nNewPos ) { aOldPositions.Justify(); - bool bValidAction = ( (long)nNewPos < aOldPositions.Min() ) || ( (long)nNewPos > aOldPositions.Max() ); + bool bValidAction = ( static_cast<long>(nNewPos) < aOldPositions.Min() ) || ( static_cast<long>(nNewPos) > aOldPositions.Max() ); OSL_ENSURE( bValidAction, "Move in itself?" ); - OSL_ENSURE( aOldPositions.Max() <= (long)GetParaPortions().Count(), "totally over it: MoveParagraphs" ); + OSL_ENSURE( aOldPositions.Max() <= static_cast<long>(GetParaPortions().Count()), "totally over it: MoveParagraphs" ); EditSelection aSelection; @@ -2862,14 +2862,14 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( EditPaM& rPaM, bool bKeepEndingAttrib { // Correct only if really a word gets overlapped in the process of // Spell checking - if (i->mnStart > (size_t)nEnd) + if (i->mnStart > static_cast<size_t>(nEnd)) { pRWrongs->push_back(*i); editeng::MisspellRange& rRWrong = pRWrongs->back(); rRWrong.mnStart = rRWrong.mnStart - nEnd; rRWrong.mnEnd = rRWrong.mnEnd - nEnd; } - else if (i->mnStart < (size_t)nEnd && i->mnEnd > (size_t)nEnd) + else if (i->mnStart < static_cast<size_t>(nEnd) && i->mnEnd > static_cast<size_t>(nEnd)) i->mnEnd = nEnd; } sal_Int32 nInv = nEnd ? nEnd-1 : nEnd; @@ -3149,7 +3149,7 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace ) } nMaxWidth++; // widen it, because in CreateLines for >= is wrapped. - return (sal_uInt32)nMaxWidth; + return static_cast<sal_uInt32>(nMaxWidth); } sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, bool bIgnoreExtraSpace ) @@ -4007,7 +4007,7 @@ long ImpEditEngine::GetXPos( if( pLine->GetCharPosArray().size() ) { sal_Int32 nPos = nIndex - 1 - pLine->GetStart(); - if (nPos < 0 || nPos >= (sal_Int32)pLine->GetCharPosArray().size()) + if (nPos < 0 || nPos >= static_cast<sal_Int32>(pLine->GetCharPosArray().size())) { nPos = pLine->GetCharPosArray().size()-1; OSL_FAIL("svx::ImpEditEngine::GetXPos(), index out of range!"); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index a0fb2db2a8ff..7b048386c0e0 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -120,8 +120,8 @@ Point Rotate( const Point& rPoint, short nOrientation, const Point& rOrigin ) aTranslatedPos -= rOrigin; // Rotation... - aRotatedPos.X() = (long) ( nCos*aTranslatedPos.X() + nSin*aTranslatedPos.Y() ); - aRotatedPos.Y() = (long) - ( nSin*aTranslatedPos.X() - nCos*aTranslatedPos.Y() ); + aRotatedPos.X() = static_cast<long>( nCos*aTranslatedPos.X() + nSin*aTranslatedPos.Y() ); + aRotatedPos.Y() = static_cast<long>(- ( nSin*aTranslatedPos.X() - nCos*aTranslatedPos.Y() )); aTranslatedPos = aRotatedPos; // Translation... @@ -237,8 +237,8 @@ static Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin, double nSin, dou Point aTranslatedPos( rPos); aTranslatedPos -= rOrigin; - aRotatedPos.X() = (long) ( nCos*aTranslatedPos.X() + nSin*aTranslatedPos.Y() ); - aRotatedPos.Y() = (long) - ( nSin*aTranslatedPos.X() - nCos*aTranslatedPos.Y() ); + aRotatedPos.X() = static_cast<long>( nCos*aTranslatedPos.X() + nSin*aTranslatedPos.Y() ); + aRotatedPos.Y() = static_cast<long>(- ( nSin*aTranslatedPos.X() - nCos*aTranslatedPos.Y() )); aTranslatedPos = aRotatedPos; // Translation... aTranslatedPos += rOrigin; @@ -405,7 +405,7 @@ void ImpEditEngine::FormatDoc() if ( aInvalidRect.IsEmpty() ) { // For Paperwidth 0 (AutoPageSize) it would otherwise be Empty()... - long nWidth = std::max( (long)1, ( !IsVertical() ? aPaperSize.Width() : aPaperSize.Height() ) ); + long nWidth = std::max( long(1), ( !IsVertical() ? aPaperSize.Width() : aPaperSize.Height() ) ); Range aInvRange( GetInvalidYOffsets( pParaPortion ) ); aInvalidRect = tools::Rectangle( Point( 0, nY+aInvRange.Min() ), Size( nWidth, aInvRange.Len() ) ); @@ -432,7 +432,7 @@ void ImpEditEngine::FormatDoc() aStatus.GetStatusWord() |= !IsVertical() ? EditStatusFlags::TextHeightChanged : EditStatusFlags::TEXTWIDTHCHANGED; if ( nNewHeight < nCurTextHeight ) { - aInvalidRect.Bottom() = (long)std::max( nNewHeight, nCurTextHeight ); + aInvalidRect.Bottom() = static_cast<long>(std::max( nNewHeight, nCurTextHeight )); if ( aInvalidRect.IsEmpty() ) { aInvalidRect.Top() = 0; @@ -734,7 +734,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) { aBulletArea = GetEditEnginePtr()->GetBulletArea( GetParaPortions().GetPos( pParaPortion ) ); if ( aBulletArea.Right() > 0 ) - pParaPortion->SetBulletX( (sal_Int32) GetXValue( aBulletArea.Right() ) ); + pParaPortion->SetBulletX( static_cast<sal_Int32>(GetXValue( aBulletArea.Right() )) ); else pParaPortion->SetBulletX( 0 ); // if Bullet is set incorrectly } @@ -881,7 +881,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) { // Try further down in the polygon. // Below the polygon use the Paper Width. - nTextExtraYOffset += std::max( (long)(nTextLineHeight / 10), (long)1 ); + nTextExtraYOffset += std::max( static_cast<long>(nTextLineHeight / 10), long(1) ); if ( ( nTextY + nTextExtraYOffset ) > GetTextRanger()->GetBoundRect().Bottom() ) { nXWidth = !IsVertical() ? GetPaperSize().Width() : GetPaperSize().Height(); @@ -973,7 +973,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTextLeft()/* + rLRItem.GetTextLeft()*/ + nSpaceBeforeAndMinLabelWidth); aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/, aEditDoc.GetDefTab() ); - aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) ); + aCurrentTab.nTabPos = GetXValue( static_cast<long>( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) ); aCurrentTab.bValid = false; // Switch direction in R2L para... @@ -1385,7 +1385,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) aTextSize.Height() = ImplCalculateFontIndependentLineSpacing( aTmpFont.GetFontHeight() ); else aTextSize.Height() = aTmpFont.GetPhysTxtSize( pRefDev ).Height(); - pLine->SetHeight( (sal_uInt16)aTextSize.Height() ); + pLine->SetHeight( static_cast<sal_uInt16>(aTextSize.Height()) ); } // The font metrics can not be calculated continuously, if the font is @@ -1429,7 +1429,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) { // The Ascent has to be adjusted for the difference: long nDiff = nMinHeight - nTxtHeight; - pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + nDiff) ); + pLine->SetMaxAscent( static_cast<sal_uInt16>(pLine->GetMaxAscent() + nDiff) ); pLine->SetHeight( nMinHeight, nTxtHeight ); } } @@ -1437,7 +1437,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) { sal_uInt16 nFixHeight = GetYValue( rLSItem.GetLineHeight() ); sal_uInt16 nTxtHeight = pLine->GetHeight(); - pLine->SetMaxAscent( (sal_uInt16)(pLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) ); + pLine->SetMaxAscent( static_cast<sal_uInt16>(pLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) ); pLine->SetHeight( nFixHeight, nTxtHeight ); } else if ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) @@ -1467,8 +1467,8 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) long nDiff = pLine->GetHeight() - nH; if ( nDiff > pLine->GetMaxAscent() ) nDiff = pLine->GetMaxAscent(); - pLine->SetMaxAscent( (sal_uInt16)( pLine->GetMaxAscent() - nDiff ) * 4 / 5 ); // 80% - pLine->SetHeight( (sal_uInt16)nH, nTxtHeight ); + pLine->SetMaxAscent( static_cast<sal_uInt16>( pLine->GetMaxAscent() - nDiff ) * 4 / 5 ); // 80% + pLine->SetHeight( static_cast<sal_uInt16>(nH), nTxtHeight ); } } } @@ -1564,8 +1564,8 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) pLine->SetStartPosX( pLine->GetStartPosX() + nTextXOffset ); if ( nTextExtraYOffset ) { - pLine->SetHeight( (sal_uInt16) ( pLine->GetHeight() + nTextExtraYOffset ), 0 ); - pLine->SetMaxAscent( (sal_uInt16) ( pLine->GetMaxAscent() + nTextExtraYOffset ) ); + pLine->SetHeight( static_cast<sal_uInt16>( pLine->GetHeight() + nTextExtraYOffset ), 0 ); + pLine->SetMaxAscent( static_cast<sal_uInt16>( pLine->GetMaxAscent() + nTextExtraYOffset ) ); } } @@ -1708,7 +1708,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion ) { aBulletArea = GetEditEnginePtr()->GetBulletArea( GetParaPortions().GetPos( pParaPortion ) ); if ( aBulletArea.Right() > 0 ) - pParaPortion->SetBulletX( (sal_Int32) GetXValue( aBulletArea.Right() ) ); + pParaPortion->SetBulletX( static_cast<sal_Int32>(GetXValue( aBulletArea.Right() )) ); else pParaPortion->SetBulletX( 0 ); // If Bullet set incorrectly. if ( pParaPortion->GetBulletX() > nStartX ) @@ -1731,7 +1731,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion ) FormatterFontMetric aFormatterMetrics; RecalcFormatterFontMetrics( aFormatterMetrics, aTmpFont ); pTmpLine->SetMaxAscent( aFormatterMetrics.nMaxAscent ); - pTmpLine->SetHeight( (sal_uInt16) pDummyPortion->GetSize().Height() ); + pTmpLine->SetHeight( static_cast<sal_uInt16>(pDummyPortion->GetSize().Height()) ); sal_uInt16 nLineHeight = aFormatterMetrics.GetHeight(); if ( nLineHeight > pTmpLine->GetHeight() ) pTmpLine->SetHeight( nLineHeight ); @@ -1762,7 +1762,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion ) { // The Ascent has to be adjusted for the difference: long nDiff = nMinHeight - nTxtHeight; - pTmpLine->SetMaxAscent( (sal_uInt16)(pTmpLine->GetMaxAscent() + nDiff) ); + pTmpLine->SetMaxAscent( static_cast<sal_uInt16>(pTmpLine->GetMaxAscent() + nDiff) ); pTmpLine->SetHeight( nMinHeight, nTxtHeight ); } } @@ -1771,7 +1771,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion ) sal_uInt16 nFixHeight = rLSItem.GetLineHeight(); sal_uInt16 nTxtHeight = pTmpLine->GetHeight(); - pTmpLine->SetMaxAscent( (sal_uInt16)(pTmpLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) ); + pTmpLine->SetMaxAscent( static_cast<sal_uInt16>(pTmpLine->GetMaxAscent() + ( nFixHeight - nTxtHeight ) ) ); pTmpLine->SetHeight( nFixHeight, nTxtHeight ); } else if ( rLSItem.GetInterLineSpaceRule() == SvxInterLineSpaceRule::Prop ) @@ -1791,8 +1791,8 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion ) long nDiff = pTmpLine->GetHeight() - nH; if ( nDiff > pTmpLine->GetMaxAscent() ) nDiff = pTmpLine->GetMaxAscent(); - pTmpLine->SetMaxAscent( (sal_uInt16)(pTmpLine->GetMaxAscent() - nDiff) ); - pTmpLine->SetHeight( (sal_uInt16)nH, nTxtHeight ); + pTmpLine->SetMaxAscent( static_cast<sal_uInt16>(pTmpLine->GetMaxAscent() - nDiff) ); + pTmpLine->SetHeight( static_cast<sal_uInt16>(nH), nTxtHeight ); } } } @@ -1801,12 +1801,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion ) if ( !bLineBreak ) { long nMinHeight = aBulletArea.GetHeight(); - if ( nMinHeight > (long)pTmpLine->GetHeight() ) + if ( nMinHeight > static_cast<long>(pTmpLine->GetHeight()) ) { - long nDiff = nMinHeight - (long)pTmpLine->GetHeight(); + long nDiff = nMinHeight - static_cast<long>(pTmpLine->GetHeight()); // distribute nDiff upwards and downwards - pTmpLine->SetMaxAscent( (sal_uInt16)(pTmpLine->GetMaxAscent() + nDiff/2) ); - pTmpLine->SetHeight( (sal_uInt16)nMinHeight ); + pTmpLine->SetMaxAscent( static_cast<sal_uInt16>(pTmpLine->GetMaxAscent() + nDiff/2) ); + pTmpLine->SetHeight( static_cast<sal_uInt16>(nMinHeight) ); } } else @@ -2179,7 +2179,7 @@ void ImpEditEngine::ImpAdjustBlocks( ParaPortion* pParaPortion, EditLine* pLine, const long nMore4Everyone = nRemainingSpace / nGaps; long nSomeExtraSpace = nRemainingSpace - nMore4Everyone*nGaps; - DBG_ASSERT( nSomeExtraSpace < (long)nGaps, "AdjustBlocks: ExtraSpace too large" ); + DBG_ASSERT( nSomeExtraSpace < static_cast<long>(nGaps), "AdjustBlocks: ExtraSpace too large" ); DBG_ASSERT( nSomeExtraSpace >= 0, "AdjustBlocks: ExtraSpace < 0 " ); // Correct the positions in the Array and the portion widths: @@ -2825,7 +2825,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_Int32 nPos, SvxFont& rFo nKerning *= nStretchX; nKerning /= 100; } - rFont.SetFixKerning( (short)nKerning ); + rFont.SetFixKerning( static_cast<short>(nKerning) ); } } } @@ -2903,11 +2903,11 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics sal_uInt16 nAscent, nDescent; FontMetric aMetric( pRefDev->GetFontMetric() ); - nAscent = (sal_uInt16)aMetric.GetAscent(); + nAscent = static_cast<sal_uInt16>(aMetric.GetAscent()); if ( IsAddExtLeading() ) nAscent = sal::static_int_cast< sal_uInt16 >( nAscent + aMetric.GetExternalLeading() ); - nDescent = (sal_uInt16)aMetric.GetDescent(); + nDescent = static_cast<sal_uInt16>(aMetric.GetDescent()); if ( IsFixedCellHeight() ) { @@ -2916,7 +2916,7 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics } else { - sal_uInt16 nIntLeading = ( aMetric.GetInternalLeading() > 0 ) ? (sal_uInt16)aMetric.GetInternalLeading() : 0; + sal_uInt16 nIntLeading = ( aMetric.GetInternalLeading() > 0 ) ? static_cast<sal_uInt16>(aMetric.GetInternalLeading()) : 0; // Fonts without leading cause problems if ( ( nIntLeading == 0 ) && ( pRefDev->GetOutDevType() == OUTDEV_PRINTER ) ) { @@ -2927,8 +2927,8 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics // This is so that the Leading does not count itself out again, // if the whole line has the font, nTmpLeading. - nAscent = (sal_uInt16)aMetric.GetAscent(); - nDescent = (sal_uInt16)aMetric.GetDescent(); + nAscent = static_cast<sal_uInt16>(aMetric.GetAscent()); + nDescent = static_cast<sal_uInt16>(aMetric.GetDescent()); } } if ( nAscent > rCurMetrics.nMaxAscent ) @@ -2940,16 +2940,16 @@ void ImpEditEngine::RecalcFormatterFontMetrics( FormatterFontMetric& rCurMetrics { // Now in consideration of Escape/Propr // possibly enlarge Ascent or Descent - short nDiff = (short)(rFont.GetFontSize().Height()*rFont.GetEscapement()/100L); + short nDiff = static_cast<short>(rFont.GetFontSize().Height()*rFont.GetEscapement()/100L); if ( rFont.GetEscapement() > 0 ) { - nAscent = (sal_uInt16) (((long)nAscent)*nPropr/100 + nDiff); + nAscent = static_cast<sal_uInt16>(static_cast<long>(nAscent)*nPropr/100 + nDiff); if ( nAscent > rCurMetrics.nMaxAscent ) rCurMetrics.nMaxAscent = nAscent; } else // has to be < 0 { - nDescent = (sal_uInt16) (((long)nDescent)*nPropr/100 - nDiff); + nDescent = static_cast<sal_uInt16>(static_cast<long>(nDescent)*nPropr/100 - nDiff); if ( nDescent > rCurMetrics.nMaxDescent ) rCurMetrics.nMaxDescent= nDescent; } @@ -3431,7 +3431,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po break; } - if(nStart < (size_t)nIndex) + if(nStart < static_cast<size_t>(nIndex)) { nStart = nIndex; } @@ -3664,7 +3664,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, tools::Rectangle aClipRect, Po } Color aOldColor( pOutDev->GetLineColor() ); pOutDev->SetLineColor( Color( GetColorConfig().GetColorValue( svtools::SPELL ).nColor ) ); - lcl_DrawRedLines( pOutDev, aTmpFont.GetFontSize().Height(), aRedLineTmpPos, (size_t)nIndex, (size_t)nIndex + rTextPortion.GetLen(), pDXArray, pPortion->GetNode()->GetWrongList(), nOrientation, aOrigin, IsVertical(), rTextPortion.IsRightToLeft() ); + lcl_DrawRedLines( pOutDev, aTmpFont.GetFontSize().Height(), aRedLineTmpPos, static_cast<size_t>(nIndex), static_cast<size_t>(nIndex) + rTextPortion.GetLen(), pDXArray, pPortion->GetNode()->GetWrongList(), nOrientation, aOrigin, IsVertical(), rTextPortion.IsRightToLeft() ); pOutDev->SetLineColor( aOldColor ); } } @@ -4642,7 +4642,7 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* long* pDXArray = pLine->GetCharPosArray().data() + (nTxtPortionStart - pLine->GetStart()); if ( pTP->GetExtraInfos()->pOrgDXArray ) memcpy( pDXArray, pTP->GetExtraInfos()->pOrgDXArray.get(), (pTP->GetLen()-1)*sizeof(sal_Int32) ); - ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, (sal_uInt16)nCompressPercent, true ); + ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, static_cast<sal_uInt16>(nCompressPercent), true ); } } } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 8a1e7a67d520..01a94950bee7 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -506,9 +506,9 @@ ErrCode ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) // DefTab: MapMode aTwpMode( MapUnit::MapTwip ); - sal_uInt16 nDefTabTwps = (sal_uInt16) GetRefDevice()->LogicToLogic( + sal_uInt16 nDefTabTwps = static_cast<sal_uInt16>(GetRefDevice()->LogicToLogic( Point( aEditDoc.GetDefTab(), 0 ), - &GetRefMapMode(), &aTwpMode ).X(); + &GetRefMapMode(), &aTwpMode ).X()); rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_DEFTAB ); rOutput.WriteUInt32AsString( nDefTabTwps ); rOutput << endl; @@ -699,7 +699,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, rOutput.WriteInt32AsString( nTxtFirst ); rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI ); sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()); - nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft ); + nTxtLeft = static_cast<sal_uInt32>(LogicToTwips( nTxtLeft )); rOutput.WriteInt32AsString( nTxtLeft ); rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI ); sal_uInt32 nTxtRight = static_cast<const SvxLRSpaceItem&>(rItem).GetRight(); @@ -711,7 +711,7 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, { rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SB ); sal_uInt32 nUpper = static_cast<const SvxULSpaceItem&>(rItem).GetUpper(); - nUpper = (sal_uInt32)LogicToTwips( nUpper ); + nUpper = static_cast<sal_uInt32>(LogicToTwips( nUpper )); rOutput.WriteUInt32AsString( nUpper ); rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SA ); sal_uInt32 nLower = static_cast<const SvxULSpaceItem&>(rItem).GetLower(); @@ -1181,7 +1181,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject bool bUsePortionInfo = false; XParaPortionList* pPortionInfo = rTextObject.mpImpl->GetPortionInfo(); - if ( pPortionInfo && ( (long)pPortionInfo->GetPaperWidth() == aPaperSize.Width() ) + if ( pPortionInfo && ( static_cast<long>(pPortionInfo->GetPaperWidth()) == aPaperSize.Width() ) && ( pPortionInfo->GetRefMapMode() == GetRefDevice()->GetMapMode() ) && ( pPortionInfo->GetStretchX() == nStretchX ) && ( pPortionInfo->GetStretchY() == nStretchY ) ) @@ -1861,7 +1861,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView ) { LanguageType eLang = GetLanguage( aCurSel.Max() ); SvxSpellWrapper::CheckSpellLang( xSpeller, eLang ); - xSpellAlt = xSpeller->spell( aWord, (sal_uInt16)eLang, aEmptySeq ); + xSpellAlt = xSpeller->spell( aWord, static_cast<sal_uInt16>(eLang), aEmptySeq ); } if ( !xSpellAlt.is() ) @@ -1909,7 +1909,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r } if ( !aWord.isEmpty() ) - xSpellAlt = xSpeller->spell( aWord, (sal_uInt16)GetLanguage( aCurSel.Max() ), aEmptySeq ); + xSpellAlt = xSpeller->spell( aWord, static_cast<sal_uInt16>(GetLanguage( aCurSel.Max() )), aEmptySeq ); if ( !xSpellAlt.is() ) aCurSel = WordRight( aCurSel.Min(), css::i18n::WordType::DICTIONARY_WORD ); @@ -2285,7 +2285,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, bool bSpellAtC { const sal_Int32 nWStart = aSel.Min().GetIndex(); const sal_Int32 nWEnd = aSel.Max().GetIndex(); - if ( !xSpeller->isValid( aWord, (sal_uInt16)GetLanguage( EditPaM( aSel.Min().GetNode(), nWStart+1 ) ), aEmptySeq ) ) + if ( !xSpeller->isValid( aWord, static_cast<sal_uInt16>(GetLanguage( EditPaM( aSel.Min().GetNode(), nWStart+1 ) )), aEmptySeq ) ) { // Check if already marked correctly... const sal_Int32 nXEnd = bDottAdded ? nWEnd -1 : nWEnd; @@ -2433,7 +2433,7 @@ EESpellState ImpEditEngine::HasSpellErrors() { LanguageType eLang = GetLanguage( aCurSel.Max() ); SvxSpellWrapper::CheckSpellLang( xSpeller, eLang ); - xSpellAlt = xSpeller->spell( aWord, (sal_uInt16)eLang, aEmptySeq ); + xSpellAlt = xSpeller->spell( aWord, static_cast<sal_uInt16>(eLang), aEmptySeq ); } aCurSel = WordRight( aCurSel.Max(), css::i18n::WordType::DICTIONARY_WORD ); } diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index e62b15d4c73d..2694cac0720d 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -488,23 +488,23 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderLineStyle nStyle, sal_uInt16 nOut sal_uInt16 SvxBorderLine::GetOutWidth() const { - sal_uInt16 nOut = (sal_uInt16)Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv ); + sal_uInt16 nOut = static_cast<sal_uInt16>(Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv )); if ( m_bMirrorWidths ) - nOut = (sal_uInt16)Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv ); + nOut = static_cast<sal_uInt16>(Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv )); return nOut; } sal_uInt16 SvxBorderLine::GetInWidth() const { - sal_uInt16 nIn = (sal_uInt16)Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv ); + sal_uInt16 nIn = static_cast<sal_uInt16>(Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv )); if ( m_bMirrorWidths ) - nIn = (sal_uInt16)Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv ); + nIn = static_cast<sal_uInt16>(Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv )); return nIn; } sal_uInt16 SvxBorderLine::GetDistance() const { - return (sal_uInt16)Scale( m_aWidthImpl.GetGap( m_nWidth ), m_nMult, m_nDiv ); + return static_cast<sal_uInt16>(Scale( m_aWidthImpl.GetGap( m_nWidth ), m_nMult, m_nDiv )); } @@ -644,15 +644,15 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, else { OUString sMetric = EditResId(GetMetricId( eDestUnit )); - aStr += GetMetricText( (long)GetInWidth(), eSrcUnit, eDestUnit, pIntl ); + aStr += GetMetricText( static_cast<long>(GetInWidth()), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; aStr += cpDelim; - aStr += GetMetricText( (long)GetOutWidth(), eSrcUnit, eDestUnit, pIntl ); + aStr += GetMetricText( static_cast<long>(GetOutWidth()), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; aStr += cpDelim; - aStr += GetMetricText( (long)GetDistance(), eSrcUnit, eDestUnit, pIntl ); + aStr += GetMetricText( static_cast<long>(GetDistance()), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index af28642f87cf..206b32595f58 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -26,7 +26,7 @@ #include <tools/tenccvt.hxx> #include <vcl/dibtools.hxx> -#define BULITEM_VERSION ((sal_uInt16)2) +#define BULITEM_VERSION (sal_uInt16(2)) SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ) diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index cb46bec99858..d88f17f00c5f 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -396,40 +396,40 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case 0: { css::frame::status::LeftRightMarginScale aLRSpace; - aLRSpace.Left = (sal_Int32)(bConvert ? convertTwipToMm100(nLeftMargin) : nLeftMargin); - aLRSpace.TextLeft = (sal_Int32)(bConvert ? convertTwipToMm100(nTxtLeft) : nTxtLeft); - aLRSpace.Right = (sal_Int32)(bConvert ? convertTwipToMm100(nRightMargin) : nRightMargin); - aLRSpace.ScaleLeft = (sal_Int16)nPropLeftMargin; - aLRSpace.ScaleRight = (sal_Int16)nPropRightMargin; - aLRSpace.FirstLine = (sal_Int32)(bConvert ? convertTwipToMm100(nFirstLineOfst) : nFirstLineOfst); - aLRSpace.ScaleFirstLine = (sal_Int16)(nPropFirstLineOfst); + aLRSpace.Left = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nLeftMargin) : nLeftMargin); + aLRSpace.TextLeft = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nTxtLeft) : nTxtLeft); + aLRSpace.Right = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nRightMargin) : nRightMargin); + aLRSpace.ScaleLeft = static_cast<sal_Int16>(nPropLeftMargin); + aLRSpace.ScaleRight = static_cast<sal_Int16>(nPropRightMargin); + aLRSpace.FirstLine = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nFirstLineOfst) : nFirstLineOfst); + aLRSpace.ScaleFirstLine = static_cast<sal_Int16>(nPropFirstLineOfst); aLRSpace.AutoFirstLine = IsAutoFirst(); rVal <<= aLRSpace; break; } case MID_L_MARGIN: - rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nLeftMargin) : nLeftMargin); + rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nLeftMargin) : nLeftMargin); break; case MID_TXT_LMARGIN : - rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nTxtLeft) : nTxtLeft); + rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nTxtLeft) : nTxtLeft); break; case MID_R_MARGIN: - rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nRightMargin) : nRightMargin); + rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nRightMargin) : nRightMargin); break; case MID_L_REL_MARGIN: - rVal <<= (sal_Int16)nPropLeftMargin; + rVal <<= static_cast<sal_Int16>(nPropLeftMargin); break; case MID_R_REL_MARGIN: - rVal <<= (sal_Int16)nPropRightMargin; + rVal <<= static_cast<sal_Int16>(nPropRightMargin); break; case MID_FIRST_LINE_INDENT: - rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nFirstLineOfst) : nFirstLineOfst); + rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nFirstLineOfst) : nFirstLineOfst); break; case MID_FIRST_LINE_REL_INDENT: - rVal <<= (sal_Int16)(nPropFirstLineOfst); + rVal <<= static_cast<sal_Int16>(nPropFirstLineOfst); break; case MID_FIRST_AUTO: @@ -468,8 +468,8 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SetRight(bConvert ? convertMm100ToTwip(aLRSpace.Right) : aLRSpace.Right); nPropLeftMargin = aLRSpace.ScaleLeft; nPropRightMargin = aLRSpace.ScaleRight; - SetTextFirstLineOfst((short)(bConvert ? convertMm100ToTwip(aLRSpace.FirstLine) : aLRSpace.FirstLine)); - SetPropTextFirstLineOfst ( (sal_uInt16)aLRSpace.ScaleFirstLine ); + SetTextFirstLineOfst(static_cast<short>(bConvert ? convertMm100ToTwip(aLRSpace.FirstLine) : aLRSpace.FirstLine)); + SetPropTextFirstLineOfst ( static_cast<sal_uInt16>(aLRSpace.ScaleFirstLine) ); SetAutoFirst( aLRSpace.AutoFirstLine ); break; } @@ -491,20 +491,20 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX) { if(MID_L_REL_MARGIN== nMemberId) - nPropLeftMargin = (sal_uInt16)nRel; + nPropLeftMargin = static_cast<sal_uInt16>(nRel); else - nPropRightMargin = (sal_uInt16)nRel; + nPropRightMargin = static_cast<sal_uInt16>(nRel); } else return false; } break; case MID_FIRST_LINE_INDENT : - SetTextFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal)); + SetTextFirstLineOfst(static_cast<short>(bConvert ? convertMm100ToTwip(nVal) : nVal)); break; case MID_FIRST_LINE_REL_INDENT: - SetPropTextFirstLineOfst ( (sal_uInt16)nVal ); + SetPropTextFirstLineOfst ( static_cast<sal_uInt16>(nVal) ); break; case MID_FIRST_AUTO: @@ -582,7 +582,7 @@ bool SvxLRSpaceItem::GetPresentation Application::GetSettings().GetUILanguageTag()); } else - rText += GetMetricText( (long)nFirstLineOfst, + rText += GetMetricText( static_cast<long>(nFirstLineOfst), eCoreUnit, ePresUnit, &rIntl ); rText += OUString(cpDelim); if ( 100 != nRightMargin ) @@ -617,7 +617,7 @@ bool SvxLRSpaceItem::GetPresentation else { rText = rText + - GetMetricText( (long)nFirstLineOfst, + GetMetricText( static_cast<long>(nFirstLineOfst), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } @@ -652,7 +652,7 @@ sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const void SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv ) { - nFirstLineOfst = (short)Scale( nFirstLineOfst, nMult, nDiv ); + nFirstLineOfst = static_cast<short>(Scale( nFirstLineOfst, nMult, nDiv )); nTxtLeft = Scale( nTxtLeft, nMult, nDiv ); nLeftMargin = Scale( nLeftMargin, nMult, nDiv ); nRightMargin = Scale( nRightMargin, nMult, nDiv ); @@ -716,18 +716,18 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case 0: { css::frame::status::UpperLowerMarginScale aUpperLowerMarginScale; - aUpperLowerMarginScale.Upper = (sal_Int32)(bConvert ? convertTwipToMm100(nUpper) : nUpper); - aUpperLowerMarginScale.Lower = (sal_Int32)(bConvert ? convertTwipToMm100(nLower) : nPropUpper); - aUpperLowerMarginScale.ScaleUpper = (sal_Int16)nPropUpper; - aUpperLowerMarginScale.ScaleLower = (sal_Int16)nPropLower; + aUpperLowerMarginScale.Upper = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nUpper) : nUpper); + aUpperLowerMarginScale.Lower = static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nLower) : nPropUpper); + aUpperLowerMarginScale.ScaleUpper = static_cast<sal_Int16>(nPropUpper); + aUpperLowerMarginScale.ScaleLower = static_cast<sal_Int16>(nPropLower); rVal <<= aUpperLowerMarginScale; break; } - case MID_UP_MARGIN: rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nUpper) : nUpper); break; - case MID_LO_MARGIN: rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nLower) : nLower); break; + case MID_UP_MARGIN: rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nUpper) : nUpper); break; + case MID_LO_MARGIN: rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nLower) : nLower); break; case MID_CTX_MARGIN: rVal <<= bContext; break; - case MID_UP_REL_MARGIN: rVal <<= (sal_Int16) nPropUpper; break; - case MID_LO_REL_MARGIN: rVal <<= (sal_Int16) nPropLower; break; + case MID_UP_REL_MARGIN: rVal <<= static_cast<sal_Int16>(nPropUpper); break; + case MID_LO_REL_MARGIN: rVal <<= static_cast<sal_Int16>(nPropLower); break; } return true; } @@ -747,8 +747,8 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if ( !(rVal >>= aUpperLowerMarginScale )) return false; { - SetUpper((sal_uInt16)(bConvert ? convertMm100ToTwip( aUpperLowerMarginScale.Upper ) : aUpperLowerMarginScale.Upper)); - SetLower((sal_uInt16)(bConvert ? convertMm100ToTwip( aUpperLowerMarginScale.Lower ) : aUpperLowerMarginScale.Lower)); + SetUpper(static_cast<sal_uInt16>(bConvert ? convertMm100ToTwip( aUpperLowerMarginScale.Upper ) : aUpperLowerMarginScale.Upper)); + SetLower(static_cast<sal_uInt16>(bConvert ? convertMm100ToTwip( aUpperLowerMarginScale.Lower ) : aUpperLowerMarginScale.Lower)); if( aUpperLowerMarginScale.ScaleUpper > 1 ) nPropUpper = aUpperLowerMarginScale.ScaleUpper; if( aUpperLowerMarginScale.ScaleLower > 1 ) @@ -759,12 +759,12 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) case MID_UP_MARGIN : if(!(rVal >>= nVal) || nVal < 0) return false; - SetUpper((sal_uInt16)(bConvert ? convertMm100ToTwip(nVal) : nVal)); + SetUpper(static_cast<sal_uInt16>(bConvert ? convertMm100ToTwip(nVal) : nVal)); break; case MID_LO_MARGIN : if(!(rVal >>= nVal) || nVal < 0) return false; - SetLower((sal_uInt16)(bConvert ? convertMm100ToTwip(nVal) : nVal)); + SetLower(static_cast<sal_uInt16>(bConvert ? convertMm100ToTwip(nVal) : nVal)); break; case MID_CTX_MARGIN : if (!(rVal >>= bVal)) @@ -778,9 +778,9 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if((rVal >>= nRel) && nRel > 1 ) { if(MID_UP_REL_MARGIN == nMemberId) - nPropUpper = (sal_uInt16)nRel; + nPropUpper = static_cast<sal_uInt16>(nRel); else - nPropLower = (sal_uInt16)nRel; + nPropLower = static_cast<sal_uInt16>(nRel); } else return false; @@ -833,7 +833,7 @@ bool SvxULSpaceItem::GetPresentation Application::GetSettings().GetUILanguageTag()); } else - rText = GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, &rIntl ); + rText = GetMetricText( static_cast<long>(nUpper), eCoreUnit, ePresUnit, &rIntl ); rText += OUString(cpDelim); if ( 100 != nPropLower ) { @@ -841,7 +841,7 @@ bool SvxULSpaceItem::GetPresentation Application::GetSettings().GetUILanguageTag()); } else - rText += GetMetricText( (long)nLower, eCoreUnit, ePresUnit, &rIntl ); + rText += GetMetricText( static_cast<long>(nLower), eCoreUnit, ePresUnit, &rIntl ); return true; } case SfxItemPresentation::Complete: @@ -855,7 +855,7 @@ bool SvxULSpaceItem::GetPresentation else { rText = rText + - GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, &rIntl ) + + GetMetricText( static_cast<long>(nUpper), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } rText = rText + OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER); @@ -867,7 +867,7 @@ bool SvxULSpaceItem::GetPresentation else { rText = rText + - GetMetricText( (long)nLower, eCoreUnit, ePresUnit, &rIntl ) + + GetMetricText( static_cast<long>(nLower), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } return true; @@ -886,8 +886,8 @@ sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const void SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv ) { - nUpper = (sal_uInt16)Scale( nUpper, nMult, nDiv ); - nLower = (sal_uInt16)Scale( nLower, nMult, nDiv ); + nUpper = static_cast<sal_uInt16>(Scale( nUpper, nMult, nDiv )); + nLower = static_cast<sal_uInt16>(Scale( nLower, nMult, nDiv )); } @@ -1240,7 +1240,7 @@ bool SvxShadowItem::GetPresentation rText = rText + EditResId(pId) + OUString(cpDelim) + - GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, &rIntl ) + + GetMetricText( static_cast<long>(nWidth), eCoreUnit, ePresUnit, &rIntl ) + OUString(cpDelim) + EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); return true; @@ -1257,7 +1257,7 @@ bool SvxShadowItem::GetPresentation rText = rText + EditResId(pId) + OUString(cpDelim) + - GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, &rIntl ) + + GetMetricText( static_cast<long>(nWidth), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + OUString(cpDelim) + EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); @@ -1283,7 +1283,7 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) void SvxShadowItem::ScaleMetrics( long nMult, long nDiv ) { - nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv ); + nWidth = static_cast<sal_uInt16>(Scale( nWidth, nMult, nDiv )); } @@ -1465,11 +1465,11 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const aSeq[1] <<= SvxBoxItem::SvxLineToLine(GetRight(), bConvert); aSeq[2] <<= SvxBoxItem::SvxLineToLine(GetBottom(), bConvert); aSeq[3] <<= SvxBoxItem::SvxLineToLine(GetTop(), bConvert); - aSeq[4] <<= (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance()); - aSeq[5] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist ); - aSeq[6] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist ); - aSeq[7] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist ); - aSeq[8] <<= (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist ); + aSeq[4] <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance()); + aSeq[5] <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist ); + aSeq[6] <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist ); + aSeq[7] <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist ); + aSeq[8] <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist ); rVal <<= aSeq; return true; } @@ -1518,7 +1518,7 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } if( bDistMember ) - rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(nDist) : nDist); + rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(nDist) : nDist); else rVal <<= aRetLine; @@ -1780,11 +1780,11 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if ( aSeq[0] >>= nVal ) aBorderLine.Color = nVal; if ( aSeq[1] >>= nVal ) - aBorderLine.InnerLineWidth = (sal_Int16) nVal; + aBorderLine.InnerLineWidth = static_cast<sal_Int16>(nVal); if ( aSeq[2] >>= nVal ) - aBorderLine.OuterLineWidth = (sal_Int16) nVal; + aBorderLine.OuterLineWidth = static_cast<sal_Int16>(nVal); if ( aSeq[3] >>= nVal ) - aBorderLine.LineDistance = (sal_Int16) nVal; + aBorderLine.LineDistance = static_cast<sal_Int16>(nVal); if (aSeq.getLength() >= 5) // fdo#40874 added fields { if (aSeq[4] >>= nVal) @@ -1855,18 +1855,18 @@ bool SvxBoxItem::GetPresentation rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp; } } - rText += GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, &rIntl ); + rText += GetMetricText( static_cast<long>(nTopDist), eCoreUnit, ePresUnit, &rIntl ); if( nTopDist != nBottomDist || nTopDist != nLeftDist || nTopDist != nRightDist ) { rText = rText + cpDelimTmp + - GetMetricText( (long)nBottomDist, eCoreUnit, + GetMetricText( static_cast<long>(nBottomDist), eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, &rIntl ) + + GetMetricText( static_cast<long>(nLeftDist), eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp + - GetMetricText( (long)nRightDist, eCoreUnit, + GetMetricText( static_cast<long>(nRightDist), eCoreUnit, ePresUnit, &rIntl ); } return true; @@ -1923,7 +1923,7 @@ bool SvxBoxItem::GetPresentation nTopDist == nRightDist ) { rText = rText + - GetMetricText( (long)nTopDist, eCoreUnit, + GetMetricText( static_cast<long>(nTopDist), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } @@ -1931,22 +1931,22 @@ bool SvxBoxItem::GetPresentation { rText = rText + EditResId(RID_SVXITEMS_BORDER_TOP) + - GetMetricText( (long)nTopDist, eCoreUnit, + GetMetricText( static_cast<long>(nTopDist), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_BORDER_BOTTOM) + - GetMetricText( (long)nBottomDist, eCoreUnit, + GetMetricText( static_cast<long>(nBottomDist), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_BORDER_LEFT) + - GetMetricText( (long)nLeftDist, eCoreUnit, + GetMetricText( static_cast<long>(nLeftDist), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + EditResId(RID_SVXITEMS_BORDER_RIGHT) + - GetMetricText( (long)nRightDist, eCoreUnit, + GetMetricText( static_cast<long>(nRightDist), eCoreUnit, ePresUnit, &rIntl ) + " " + EditResId(GetMetricId(ePresUnit)); } @@ -2016,10 +2016,10 @@ void SvxBoxItem::ScaleMetrics( long nMult, long nDiv ) if ( pBottom ) pBottom->ScaleMetrics( nMult, nDiv ); if ( pLeft ) pLeft->ScaleMetrics( nMult, nDiv ); if ( pRight ) pRight->ScaleMetrics( nMult, nDiv ); - nTopDist = (sal_uInt16)Scale( nTopDist, nMult, nDiv ); - nBottomDist = (sal_uInt16)Scale( nBottomDist, nMult, nDiv ); - nLeftDist = (sal_uInt16)Scale( nLeftDist, nMult, nDiv ); - nRightDist = (sal_uInt16)Scale( nRightDist, nMult, nDiv ); + nTopDist = static_cast<sal_uInt16>(Scale( nTopDist, nMult, nDiv )); + nBottomDist = static_cast<sal_uInt16>(Scale( nBottomDist, nMult, nDiv )); + nLeftDist = static_cast<sal_uInt16>(Scale( nLeftDist, nMult, nDiv )); + nRightDist = static_cast<sal_uInt16>(Scale( nRightDist, nMult, nDiv )); } @@ -2371,7 +2371,7 @@ void SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv ) { if ( pHori ) pHori->ScaleMetrics( nMult, nDiv ); if ( pVert ) pVert->ScaleMetrics( nMult, nDiv ); - nDefDist = (sal_uInt16)Scale( nDefDist, nMult, nDiv ); + nDefDist = static_cast<sal_uInt16>(Scale( nDefDist, nMult, nDiv )); } @@ -2409,7 +2409,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const nVal |= 0x04; aSeq[2] <<= nVal; aSeq[3] <<= static_cast<sal_Int16>(nValidFlags); - aSeq[4] <<= (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()); + aSeq[4] <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()); rVal <<= aSeq; return true; } @@ -2436,7 +2436,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const break; case MID_DISTANCE: bIntMember = true; - rVal <<= (sal_Int32)(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()); + rVal <<= static_cast<sal_Int32>(bConvert ? convertTwipToMm100(GetDefDist()) : GetDefDist()); break; default: OSL_FAIL("Wrong MemberId!"); return false; } @@ -2484,7 +2484,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { if( bConvert ) nVal = convertMm100ToTwip(nVal); - SetDefDist( (sal_uInt16)nVal ); + SetDefDist( static_cast<sal_uInt16>(nVal) ); } } return true; @@ -2517,11 +2517,11 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if ( aSeq[0] >>= nVal ) aBorderLine.Color = nVal; if ( aSeq[1] >>= nVal ) - aBorderLine.InnerLineWidth = (sal_Int16) nVal; + aBorderLine.InnerLineWidth = static_cast<sal_Int16>(nVal); if ( aSeq[2] >>= nVal ) - aBorderLine.OuterLineWidth = (sal_Int16) nVal; + aBorderLine.OuterLineWidth = static_cast<sal_Int16>(nVal); if ( aSeq[3] >>= nVal ) - aBorderLine.LineDistance = (sal_Int16) nVal; + aBorderLine.LineDistance = static_cast<sal_Int16>(nVal); if (aSeq.getLength() >= 5) // fdo#40874 added fields { if (aSeq[4] >>= nVal) @@ -2601,7 +2601,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { if( bConvert ) nVal = convertMm100ToTwip(nVal); - SetDefDist( (sal_uInt16)nVal ); + SetDefDist( static_cast<sal_uInt16>(nVal) ); } break; } @@ -2747,7 +2747,7 @@ SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm.WriteSChar( (sal_Int8)GetValue() ); + rStrm.WriteSChar( static_cast<sal_Int8>(GetValue()) ); return rStrm; } @@ -2957,9 +2957,9 @@ void SvxLineItem::SetLine( const SvxBorderLine* pNew ) pLine.reset( pNew ? new SvxBorderLine( *pNew ) : nullptr ); } -#define LOAD_GRAPHIC ((sal_uInt16)0x0001) -#define LOAD_LINK ((sal_uInt16)0x0002) -#define LOAD_FILTER ((sal_uInt16)0x0004) +#define LOAD_GRAPHIC (sal_uInt16(0x0001)) +#define LOAD_LINK (sal_uInt16(0x0002)) +#define LOAD_FILTER (sal_uInt16(0x0004)) SvxBrushItem::SvxBrushItem(sal_uInt16 _nWhich) : SfxPoolItem(_nWhich) @@ -3044,10 +3044,10 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n sal_uInt32 nRed = aTempColor.GetRed(); sal_uInt32 nGreen = aTempColor.GetGreen(); sal_uInt32 nBlue = aTempColor.GetBlue(); - nRed += (sal_uInt32)(aTempFillColor.GetRed())*2; - nGreen += (sal_uInt32)(aTempFillColor.GetGreen())*2; - nBlue += (sal_uInt32)(aTempFillColor.GetBlue())*2; - aColor = Color( (sal_Int8)(nRed/3), (sal_Int8)(nGreen/3), (sal_Int8)(nBlue/3) ); + nRed += static_cast<sal_uInt32>(aTempFillColor.GetRed())*2; + nGreen += static_cast<sal_uInt32>(aTempFillColor.GetGreen())*2; + nBlue += static_cast<sal_uInt32>(aTempFillColor.GetBlue())*2; + aColor = Color( static_cast<sal_Int8>(nRed/3), static_cast<sal_Int8>(nGreen/3), static_cast<sal_Int8>(nBlue/3) ); } break; @@ -3056,10 +3056,10 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n sal_uInt32 nRed = aTempColor.GetRed(); sal_uInt32 nGreen = aTempColor.GetGreen(); sal_uInt32 nBlue = aTempColor.GetBlue(); - nRed += (sal_uInt32)(aTempFillColor.GetRed()); - nGreen += (sal_uInt32)(aTempFillColor.GetGreen()); - nBlue += (sal_uInt32)(aTempFillColor.GetBlue()); - aColor = Color( (sal_Int8)(nRed/2), (sal_Int8)(nGreen/2), (sal_Int8)(nBlue/2) ); + nRed += static_cast<sal_uInt32>(aTempFillColor.GetRed()); + nGreen += static_cast<sal_uInt32>(aTempFillColor.GetGreen()); + nBlue += static_cast<sal_uInt32>(aTempFillColor.GetBlue()); + aColor = Color( static_cast<sal_Int8>(nRed/2), static_cast<sal_Int8>(nGreen/2), static_cast<sal_Int8>(nBlue/2) ); } break; @@ -3068,10 +3068,10 @@ SvxBrushItem::SvxBrushItem(SvStream& rStream, sal_uInt16 nVersion, sal_uInt16 _n sal_uInt32 nRed = aTempColor.GetRed()*2; sal_uInt32 nGreen = aTempColor.GetGreen()*2; sal_uInt32 nBlue = aTempColor.GetBlue()*2; - nRed += (sal_uInt32)(aTempFillColor.GetRed()); - nGreen += (sal_uInt32)(aTempFillColor.GetGreen()); - nBlue += (sal_uInt32)(aTempFillColor.GetBlue()); - aColor = Color( (sal_Int8)(nRed/3), (sal_Int8)(nGreen/3), (sal_Int8)(nBlue/3) ); + nRed += static_cast<sal_uInt32>(aTempFillColor.GetRed()); + nGreen += static_cast<sal_uInt32>(aTempFillColor.GetGreen()); + nBlue += static_cast<sal_uInt32>(aTempFillColor.GetBlue()); + aColor = Color( static_cast<sal_Int8>(nRed/3), static_cast<sal_Int8>(nGreen/3), static_cast<sal_Int8>(nBlue/3) ); } break; @@ -3189,7 +3189,7 @@ static inline sal_Int8 lcl_PercentToTransparency(long nPercent) sal_Int8 SvxBrushItem::TransparencyToPercent(sal_Int32 nTrans) { - return (sal_Int8)((nTrans * 100 + 127) / 254); + return static_cast<sal_Int8>((nTrans * 100 + 127) / 254); } @@ -3199,16 +3199,16 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const switch( nMemberId) { case MID_BACK_COLOR: - rVal <<= (sal_Int32)( aColor.GetColor() ); + rVal <<= static_cast<sal_Int32>( aColor.GetColor() ); break; case MID_BACK_COLOR_R_G_B: - rVal <<= (sal_Int32)( aColor.GetRGBColor() ); + rVal <<= static_cast<sal_Int32>( aColor.GetRGBColor() ); break; case MID_BACK_COLOR_TRANSPARENCY: rVal <<= SvxBrushItem::TransparencyToPercent(aColor.GetTransparency()); break; case MID_GRAPHIC_POSITION: - rVal <<= (style::GraphicLocation)(sal_Int16)eGraphicPos; + rVal <<= (style::GraphicLocation)static_cast<sal_Int16>(eGraphicPos); break; case MID_GRAPHIC: diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 98b0b8a72646..8d55c282ba26 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -130,7 +130,7 @@ OUString SvxNumberType::GetNumStr( sal_Int32 nNo, const css::lang::Locale& rLoca Sequence< PropertyValue > aProperties(2); PropertyValue* pValues = aProperties.getArray(); pValues[0].Name = "NumberingType"; - pValues[0].Value <<= (sal_uInt16)nNumType; + pValues[0].Value <<= static_cast<sal_uInt16>(nNumType); pValues[1].Name = "Value"; pValues[1].Value <<= nNo; @@ -194,7 +194,7 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) rStream.ReadUInt16( nTmp16 ); eNumAdjust = ( SvxAdjust )nTmp16; rStream.ReadUInt16( nTmp16 ); nInclUpperLevels = nTmp16; rStream.ReadUInt16( nStart ); - rStream.ReadUInt16( nTmp16 ); cBullet = (sal_Unicode)nTmp16; + rStream.ReadUInt16( nTmp16 ); cBullet = static_cast<sal_Unicode>(nTmp16); rStream.ReadInt16( nFirstLineOffset ); rStream.ReadInt16( nAbsLSpace ); @@ -893,7 +893,7 @@ void SvxNumRule::UnLinkGraphics() aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), &eOrient ); } } - else if((SVX_NUM_BITMAP|LINK_TOKEN) == (int)aFmt.GetNumberingType()) + else if((SVX_NUM_BITMAP|LINK_TOKEN) == static_cast<int>(aFmt.GetNumberingType())) aFmt.SetNumberingType(SVX_NUM_BITMAP); SetLevel(i, aFmt); } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 141bd4649e2c..d45f7fc2a4e6 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -125,7 +125,7 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const if(eInterLineSpaceRule == SvxInterLineSpaceRule::Fix) { aLSp.Mode = style::LineSpacingMode::LEADING; - aLSp.Height = ( bConvert ? (short)convertTwipToMm100(nInterLineSpace) : nInterLineSpace); + aLSp.Height = ( bConvert ? static_cast<short>(convertTwipToMm100(nInterLineSpace)) : nInterLineSpace); } else if(eInterLineSpaceRule == SvxInterLineSpaceRule::Off) { @@ -141,7 +141,7 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case SvxLineSpaceRule::Fix : case SvxLineSpaceRule::Min : aLSp.Mode = eLineSpaceRule == SvxLineSpaceRule::Fix ? style::LineSpacingMode::FIX : style::LineSpacingMode::MINIMUM; - aLSp.Height = ( bConvert ? (short)convertTwipToMm100(nLineHeight) : nLineHeight ); + aLSp.Height = ( bConvert ? static_cast<short>(convertTwipToMm100(nLineHeight)) : nLineHeight ); break; default: ;//prevent warning about SvxLineSpaceRule::End @@ -188,14 +188,14 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) eLineSpaceRule = SvxLineSpaceRule::Auto; nInterLineSpace = aLSp.Height; if(bConvert) - nInterLineSpace = (short)convertMm100ToTwip(nInterLineSpace); + nInterLineSpace = static_cast<short>(convertMm100ToTwip(nInterLineSpace)); } break; case style::LineSpacingMode::PROP: { eLineSpaceRule = SvxLineSpaceRule::Auto; - nPropLineSpace = (sal_Int16)aLSp.Height; + nPropLineSpace = static_cast<sal_Int16>(aLSp.Height); if(100 == aLSp.Height) eInterLineSpaceRule = SvxInterLineSpaceRule::Off; else @@ -209,7 +209,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) eLineSpaceRule = aLSp.Mode == style::LineSpacingMode::FIX ? SvxLineSpaceRule::Fix : SvxLineSpaceRule::Min; nLineHeight = aLSp.Height; if(bConvert) - nLineHeight = (sal_uInt16)convertMm100ToTwip(nLineHeight); + nLineHeight = static_cast<sal_uInt16>(convertMm100ToTwip(nLineHeight)); } break; } @@ -577,13 +577,13 @@ bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) con rVal <<= bHyphen; break; case MID_HYPHEN_MIN_LEAD: - rVal <<= (sal_Int16)nMinLead; + rVal <<= static_cast<sal_Int16>(nMinLead); break; case MID_HYPHEN_MIN_TRAIL: - rVal <<= (sal_Int16)nMinTrail; + rVal <<= static_cast<sal_Int16>(nMinTrail); break; case MID_HYPHEN_MAX_HYPHENS: - rVal <<= (sal_Int16)nMaxHyphens; + rVal <<= static_cast<sal_Int16>(nMaxHyphens); break; } return true; @@ -604,13 +604,13 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) bHyphen = Any2Bool(rVal); break; case MID_HYPHEN_MIN_LEAD: - nMinLead = (sal_uInt8)nNewVal; + nMinLead = static_cast<sal_uInt8>(nNewVal); break; case MID_HYPHEN_MIN_TRAIL: - nMinTrail = (sal_uInt8)nNewVal; + nMinTrail = static_cast<sal_uInt8>(nNewVal); break; case MID_HYPHEN_MAX_HYPHENS: - nMaxHyphens = (sal_uInt8)nNewVal; + nMaxHyphens = static_cast<sal_uInt8>(nNewVal); break; } return true; @@ -865,7 +865,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) maTabStops.clear(); const style::TabStop* pArr = aSeq.getConstArray(); - const sal_uInt16 nCount = (sal_uInt16)aSeq.getLength(); + const sal_uInt16 nCount = static_cast<sal_uInt16>(aSeq.getLength()); for(sal_uInt16 i = 0; i < nCount ; i++) { SvxTabAdjust eAdjust = SvxTabAdjust::Default; diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 1895536c090d..5f1da109f15f 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -659,7 +659,7 @@ void SvxDoDrawCapital::DoSpace( const bool bDraw ) { if ( bDraw || pFont->IsWordLineMode() ) { - sal_uLong nDiff = (sal_uLong)(aPos.X() - aSpacePos.X()); + sal_uLong nDiff = static_cast<sal_uLong>(aPos.X() - aSpacePos.X()); if ( nDiff ) { bool bWordWise = pFont->IsWordLineMode(); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 69055c2b0ade..bb2e6d65a013 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -222,9 +222,9 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const css::awt::FontDescriptor aFontDescriptor; aFontDescriptor.Name = aFamilyName; aFontDescriptor.StyleName = aStyleName; - aFontDescriptor.Family = (sal_Int16)(eFamily); - aFontDescriptor.CharSet = (sal_Int16)(eTextEncoding); - aFontDescriptor.Pitch = (sal_Int16)(ePitch); + aFontDescriptor.Family = static_cast<sal_Int16>(eFamily); + aFontDescriptor.CharSet = static_cast<sal_Int16>(eTextEncoding); + aFontDescriptor.Pitch = static_cast<sal_Int16>(ePitch); rVal <<= aFontDescriptor; } break; @@ -234,9 +234,9 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const case MID_FONT_STYLE_NAME: rVal <<= aStyleName; break; - case MID_FONT_FAMILY : rVal <<= (sal_Int16)(eFamily); break; - case MID_FONT_CHAR_SET : rVal <<= (sal_Int16)(eTextEncoding); break; - case MID_FONT_PITCH : rVal <<= (sal_Int16)(ePitch); break; + case MID_FONT_FAMILY : rVal <<= static_cast<sal_Int16>(eFamily); break; + case MID_FONT_CHAR_SET : rVal <<= static_cast<sal_Int16>(eTextEncoding); break; + case MID_FONT_PITCH : rVal <<= static_cast<sal_Int16>(ePitch); break; } return true; } @@ -255,7 +255,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) aFamilyName = aFontDescriptor.Name; aStyleName = aFontDescriptor.StyleName; eFamily = (FontFamily)aFontDescriptor.Family; - eTextEncoding = (rtl_TextEncoding)aFontDescriptor.CharSet; + eTextEncoding = static_cast<rtl_TextEncoding>(aFontDescriptor.CharSet); ePitch = (FontPitch)aFontDescriptor.Pitch; } break; @@ -288,7 +288,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) sal_Int16 nSet = sal_Int16(); if(!(rVal >>= nSet)) return false; - eTextEncoding = (rtl_TextEncoding)nSet; + eTextEncoding = static_cast<rtl_TextEncoding>(nSet); } break; case MID_FONT_PITCH : @@ -372,7 +372,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const aStyle = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet()); // Set the "correct" textencoding - eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding ); + eFontTextEncoding = static_cast<sal_uInt8>(GetSOLoadTextEncoding( eFontTextEncoding )); // at some point, the StarBats changes from ANSI font to SYMBOL font if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName == "StarBats" ) @@ -394,7 +394,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxFontItem( (FontFamily)_eFamily, aName, aStyle, - (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() ); + (FontPitch)eFontPitch, static_cast<rtl_TextEncoding>(eFontTextEncoding), Which() ); } @@ -473,7 +473,7 @@ bool SvxPostureItem::GetPresentation OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); + DBG_ASSERT( nPos <= sal_uInt16(ITALIC_NORMAL), "enum overflow!" ); FontItalic eItalic = (FontItalic)nPos; const char* pId = nullptr; @@ -635,7 +635,7 @@ OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const }; static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, "must match"); - assert(nPos <= (sal_uInt16)WEIGHT_BLACK && "enum overflow!" ); + assert(nPos <= sal_uInt16(WEIGHT_BLACK) && "enum overflow!" ); return EditResId(RID_SVXITEMS_WEIGHTS[nPos]); } @@ -672,9 +672,9 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int32 nValue = 0; if(!(rVal >>= nValue)) return false; - fValue = (float)nValue; + fValue = static_cast<float>(nValue); } - SetValue( vcl::unohelper::ConvertFontWeight((float)fValue) ); + SetValue( vcl::unohelper::ConvertFontWeight(static_cast<float>(fValue)) ); } break; } @@ -740,7 +740,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm, { sal_uInt8 nP; rStrm .ReadUChar( nP ); - nprop = (sal_uInt16)nP; + nprop = static_cast<sal_uInt16>(nP); } if( FONTHEIGHT_UNIT_VERSION <= nVersion ) @@ -781,7 +781,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const // CONVERT_TWIPS is not set. if( bConvert ) { - aFontHeight.Height = (float)( nHeight / 20.0 ); + aFontHeight.Height = static_cast<float>( nHeight / 20.0 ); } else { @@ -791,9 +791,9 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const aFontHeight.Height = fRoundPoints; } - aFontHeight.Prop = (sal_Int16)(MapUnit::MapRelative == ePropUnit ? nProp : 100); + aFontHeight.Prop = static_cast<sal_Int16>(MapUnit::MapRelative == ePropUnit ? nProp : 100); - float fRet = (float)(short)nProp; + float fRet = static_cast<float>(static_cast<short>(nProp)); switch( ePropUnit ) { case MapUnit::MapRelative: @@ -821,7 +821,7 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const // CONVERT_TWIPS is not set. if( bConvert ) { - rVal <<= (float)( nHeight / 20.0 ); + rVal <<= static_cast<float>( nHeight / 20.0 ); } else { @@ -833,11 +833,11 @@ bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const } break; case MID_FONTHEIGHT_PROP: - rVal <<= (sal_Int16)(MapUnit::MapRelative == ePropUnit ? nProp : 100); + rVal <<= static_cast<sal_Int16>(MapUnit::MapRelative == ePropUnit ? nProp : 100); break; case MID_FONTHEIGHT_DIFF: { - float fRet = (float)(short)nProp; + float fRet = static_cast<float>(static_cast<short>(nProp)); switch( ePropUnit ) { case MapUnit::MapRelative: @@ -884,19 +884,19 @@ static sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, M break; case MapUnit::MapPoint: { - short nTemp = (short)nProp; + short nTemp = static_cast<short>(nProp); nDiff = nTemp * 20; if(!bCoreInTwip) - nDiff = (short)convertTwipToMm100((long)nDiff); + nDiff = static_cast<short>(convertTwipToMm100(static_cast<long>(nDiff))); break; } case MapUnit::Map100thMM: //then the core is surely also in 1/100 mm - nDiff = (short)nProp; + nDiff = static_cast<short>(nProp); break; case MapUnit::MapTwip: // Here surely TWIP - nDiff = ((short)nProp); + nDiff = static_cast<short>(nProp); break; default: break; @@ -926,7 +926,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) if( fPoint < 0. || fPoint > 10000. ) return false; - nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips + nHeight = static_cast<long>( fPoint * 20.0 + 0.5 ); // Twips if (!bConvert) nHeight = convertTwipToMm100(nHeight); // Convert, if the item contains 1/100mm @@ -946,12 +946,12 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int32 nValue = 0; if(!(rVal >>= nValue)) return false; - fPoint = (float)nValue; + fPoint = static_cast<float>(nValue); } if(fPoint < 0. || fPoint > 10000.) return false; - nHeight = (long)( fPoint * 20.0 + 0.5 ); // Twips + nHeight = static_cast<long>( fPoint * 20.0 + 0.5 ); // Twips if (!bConvert) nHeight = convertTwipToMm100(nHeight); // Convert, if the item contains 1/100mm } @@ -979,11 +979,11 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) sal_Int32 nValue = 0; if(!(rVal >>= nValue)) return false; - fValue = (float)nValue; + fValue = static_cast<float>(nValue); } - sal_Int16 nCoreDiffValue = (sal_Int16)(fValue * 20.); + sal_Int16 nCoreDiffValue = static_cast<sal_Int16>(fValue * 20.); nHeight += bConvert ? nCoreDiffValue : convertTwipToMm100(nCoreDiffValue); - nProp = (sal_uInt16)((sal_Int16)fValue); + nProp = static_cast<sal_uInt16>(static_cast<sal_Int16>(fValue)); ePropUnit = MapUnit::MapPoint; } break; @@ -1002,14 +1002,14 @@ bool SvxFontHeightItem::GetPresentation { if( MapUnit::MapRelative != ePropUnit ) { - rText = OUString::number( (short)nProp ) + + rText = OUString::number( static_cast<short>(nProp) ) + " " + EditResId( GetMetricId( ePropUnit ) ); - if( 0 <= (short)nProp ) + if( 0 <= static_cast<short>(nProp) ) rText = "+" + rText; } else if( 100 == nProp ) { - rText = GetMetricText( (long)nHeight, + rText = GetMetricText( static_cast<long>(nHeight), eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); } @@ -1029,7 +1029,7 @@ sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const void SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv ) { - nHeight = (sal_uInt32)Scale( nHeight, nMult, nDiv ); + nHeight = static_cast<sal_uInt32>(Scale( nHeight, nMult, nDiv )); } @@ -1044,7 +1044,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); if( MapUnit::MapRelative != eUnit ) - nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit, + nHeight = nNewHeight + ::ItemToControl( short(nNewProp), eUnit, FUNIT_TWIP ); else if( 100 != nNewProp ) nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 ); @@ -1062,7 +1062,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp, if( MapUnit::MapRelative != eMetric ) nHeight = nNewHeight + - ::ControlToItem( ::ItemToControl((short)nNewProp, eMetric, + ::ControlToItem( ::ItemToControl(static_cast<short>(nNewProp), eMetric, FUNIT_TWIP ), FUNIT_TWIP, eCoreMetric ); else if( 100 != nNewProp ) @@ -1167,10 +1167,10 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= GetBoolValue(); break; case MID_TL_STYLE: - rVal <<= (sal_Int16)(GetValue()); + rVal <<= static_cast<sal_Int16>(GetValue()); break; case MID_TL_COLOR: - rVal <<= (sal_Int32)( mColor.GetColor() ); + rVal <<= static_cast<sal_Int32>( mColor.GetColor() ); break; case MID_TL_HASCOLOR: rVal <<= !mColor.GetTransparency(); @@ -1275,7 +1275,7 @@ OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_UL_BOLDWAVE }; static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, "must match"); - assert(nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE && "enum overflow!"); + assert(nPos <= sal_uInt16(LINESTYLE_BOLDWAVE) && "enum overflow!"); return EditResId(RID_SVXITEMS_UL[nPos]); } @@ -1326,7 +1326,7 @@ OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_OL_BOLDWAVE }; static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, "must match"); - assert(nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE && "enum overflow!"); + assert(nPos <= sal_uInt16(LINESTYLE_BOLDWAVE) && "enum overflow!"); return EditResId(RID_SVXITEMS_OL[nPos]); } @@ -1408,7 +1408,7 @@ OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const RID_SVXITEMS_STRIKEOUT_X }; static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, "must match"); - assert(nPos <= (sal_uInt16)STRIKEOUT_X && "enum overflow!"); + assert(nPos <= sal_uInt16(STRIKEOUT_X) && "enum overflow!"); return EditResId(RID_SVXITEMS_STRIKEOUT[nPos]); } @@ -1421,7 +1421,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const rVal <<= GetBoolValue(); break; case MID_CROSS_OUT: - rVal <<= (sal_Int16)(GetValue()); + rVal <<= static_cast<sal_Int16>(GetValue()); break; } return true; @@ -1656,7 +1656,7 @@ bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) c } default: { - rVal <<= (sal_Int32)(aColor.GetColor()); + rVal <<= static_cast<sal_Int32>(aColor.GetColor()); break; } } @@ -1731,7 +1731,7 @@ bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { - rVal <<= (sal_Int32)(mColor.GetColor()); + rVal <<= static_cast<sal_Int32>(mColor.GetColor()); return true; } @@ -1836,7 +1836,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const void SvxKerningItem::ScaleMetrics( long nMult, long nDiv ) { - SetValue( (sal_Int16)Scale( GetValue(), nMult, nDiv ) ); + SetValue( static_cast<sal_Int16>(Scale( GetValue(), nMult, nDiv )) ); } @@ -1857,7 +1857,7 @@ bool SvxKerningItem::GetPresentation switch ( ePres ) { case SfxItemPresentation::Nameless: - rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, &rIntl ) + + rText = GetMetricText( static_cast<long>(GetValue()), eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); return true; case SfxItemPresentation::Complete: @@ -1873,7 +1873,7 @@ bool SvxKerningItem::GetPresentation if (pId) rText += EditResId(pId); rText = rText + - GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, &rIntl ) + + GetMetricText( static_cast<long>(GetValue()), eCoreUnit, MapUnit::MapPoint, &rIntl ) + " " + EditResId(GetMetricId(MapUnit::MapPoint)); return true; } @@ -1886,7 +1886,7 @@ bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Int16 nVal = GetValue(); if(nMemberId & CONVERT_TWIPS) - nVal = (sal_Int16)convertTwipToMm100(nVal); + nVal = static_cast<sal_Int16>(convertTwipToMm100(nVal)); rVal <<= nVal; return true; } @@ -1897,7 +1897,7 @@ bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId) if(!(rVal >>= nVal)) return false; if(nMemberId & CONVERT_TWIPS) - nVal = (sal_Int16)convertMm100ToTwip(nVal); + nVal = static_cast<sal_Int16>(convertMm100ToTwip(nVal)); SetValue(nVal); return true; } @@ -2093,10 +2093,10 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const switch(nMemberId) { case MID_ESC: - rVal <<= (sal_Int16)(nEsc); + rVal <<= static_cast<sal_Int16>(nEsc); break; case MID_ESC_HEIGHT: - rVal <<= (sal_Int8)(nProp); + rVal <<= static_cast<sal_Int8>(nProp); break; case MID_AUTO_ESC: rVal <<= (DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER == nEsc); @@ -2191,7 +2191,7 @@ bool SvxLanguageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const switch(nMemberId) { case MID_LANG_INT: // for basic conversions! - rVal <<= (sal_Int16)(sal_uInt16)GetValue(); + rVal <<= static_cast<sal_Int16>(static_cast<sal_uInt16>(GetValue())); break; case MID_LANG_LOCALE: lang::Locale aRet( LanguageTag::convertToLocale( GetValue(), false)); @@ -2351,7 +2351,7 @@ bool SvxEmphasisMarkItem::GetPresentation FontEmphasisMark nVal = GetEmphasisMark(); rText = EditResId(RID_SVXITEMS_EMPHASIS[ - (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style )]); + (sal_uInt16)static_cast<FontEmphasisMark>( nVal & FontEmphasisMark::Style )]); const char* pId = ( FontEmphasisMark::PosAbove & nVal ) ? RID_SVXITEMS_EMPHASIS_ABOVE_POS : ( FontEmphasisMark::PosBelow & nVal ) @@ -2593,7 +2593,7 @@ bool SvxTextRotateItem::QueryValue(css::uno::Any& rVal, switch (nMemberId) { case MID_ROTATE: - rVal <<= (sal_Int16)GetValue(); + rVal <<= static_cast<sal_Int16>(GetValue()); break; default: bRet = false; @@ -2612,7 +2612,7 @@ bool SvxTextRotateItem::PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) { sal_Int16 nVal = 0; if ((rVal >>= nVal) && (0 == nVal || 900 == nVal || 2700 == nVal)) - SetValue((sal_uInt16)nVal); + SetValue(static_cast<sal_uInt16>(nVal)); else bRet = false; break; @@ -2777,7 +2777,7 @@ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI sal_Int16 nValue = sal_Int16(); if (rVal >>= nValue) { - SetValue( (sal_uInt16) nValue ); + SetValue( static_cast<sal_uInt16>(nValue) ); return true; } @@ -2789,7 +2789,7 @@ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ { // 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; } diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 00410af6ed71..52e4bcaeef92 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -86,7 +86,7 @@ bool SvxWritingModeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) case WritingMode_LR_TB: case WritingMode_RL_TB: case WritingMode_TB_RL: - SetValue( (sal_uInt16)nVal ); + SetValue( static_cast<sal_uInt16>(nVal) ); bRet = true; break; default: diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx index c71f15d20692..5c28cba3de24 100644 --- a/editeng/source/items/xmlcnitm.cxx +++ b/editeng/source/items/xmlcnitm.cxx @@ -87,7 +87,7 @@ bool SvXMLAttrContainerItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nM Reference<XUnoTunnel> xTunnel(rVal, UNO_QUERY); if( xTunnel.is() ) - pContainer = reinterpret_cast<SvUnoAttributeContainer*>((sal_uLong)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId())); + pContainer = reinterpret_cast<SvUnoAttributeContainer*>(static_cast<sal_uLong>(xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId()))); if( pContainer ) { @@ -171,7 +171,7 @@ bool SvXMLAttrContainerItem::AddAttr( const OUString& rPrefix, sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const { - return (sal_uInt16)pImpl->GetAttrCount(); + return static_cast<sal_uInt16>(pImpl->GetAttrCount()); } OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 272a6388947a..b7e6420b11c8 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -184,7 +184,7 @@ sal_Int16 SvxSpellWrapper::CheckSpellLang( if (SVX_LANG_NEED_CHECK == (nVal & 0x00FF)) { sal_uInt16 nTmpVal = SVX_LANG_MISSING_DO_WARN; - if (xSpell.is() && xSpell->hasLanguage( (sal_uInt16)nLang )) + if (xSpell.is() && xSpell->hasLanguage( static_cast<sal_uInt16>(nLang) )) nTmpVal = SVX_LANG_OK; nVal &= 0xFF00; nVal |= nTmpVal; @@ -192,7 +192,7 @@ sal_Int16 SvxSpellWrapper::CheckSpellLang( rLCS[ nLang ] = nVal; } - return (sal_Int16) nVal; + return static_cast<sal_Int16>(nVal); } sal_Int16 SvxSpellWrapper::CheckHyphLang( @@ -217,7 +217,7 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang( rLCS[ nLang ] = nVal; } - return (sal_Int16) nVal; + return static_cast<sal_Int16>(nVal); } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 8131483e0241..fc8fb97e140f 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -426,10 +426,10 @@ bool SvxAutoCorrect::FnCapitalStartWord( SvxAutoCorrDoc& rDoc, const OUString& r // Check that word isn't correctly spelled before correcting: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpeller = LinguMgr::GetSpellChecker(); - if( xSpeller->hasLanguage((sal_uInt16)eLang) ) + if( xSpeller->hasLanguage(static_cast<sal_uInt16>(eLang)) ) { Sequence< css::beans::PropertyValue > aEmptySeq; - if (xSpeller->isValid(sWord, (sal_uInt16)eLang, aEmptySeq)) + if (xSpeller->isValid(sWord, static_cast<sal_uInt16>(eLang), aEmptySeq)) { return false; } diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index 9537f7e4a371..d7805ba40559 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -44,13 +44,13 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, bVertical( bVert ) { sal_uInt32 nCount(rPolyPolygon.count()); - mpPolyPolygon = new tools::PolyPolygon( (sal_uInt16)nCount ); + mpPolyPolygon = new tools::PolyPolygon( static_cast<sal_uInt16>(nCount) ); for(sal_uInt32 i(0); i < nCount; i++) { const basegfx::B2DPolygon aCandidate(rPolyPolygon.getB2DPolygon(i).getDefaultAdaptiveSubdivision()); nPointCount += aCandidate.count(); - mpPolyPolygon->Insert( tools::Polygon(aCandidate), (sal_uInt16)i ); + mpPolyPolygon->Insert( tools::Polygon(aCandidate), static_cast<sal_uInt16>(i) ); } if( pLinePolyPolygon ) @@ -62,7 +62,7 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, { const basegfx::B2DPolygon aCandidate(pLinePolyPolygon->getB2DPolygon(i).getDefaultAdaptiveSubdivision()); nPointCount += aCandidate.count(); - mpLinePolyPolygon->Insert( tools::Polygon(aCandidate), (sal_uInt16)i ); + mpLinePolyPolygon->Insert( tools::Polygon(aCandidate), static_cast<sal_uInt16>(i) ); } } else diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 00d06a8c15fb..57c03f20d26a 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -680,8 +680,8 @@ SvxAlternativeSpelling SvxGetAltSpelling( aAltWord( rHyphWord->getHyphenatedWord() ); sal_Int16 nHyphenationPos = rHyphWord->getHyphenationPos(), nHyphenPos = rHyphWord->getHyphenPos(); - sal_Int16 nLen = (sal_Int16)aWord.getLength(); - sal_Int16 nAltLen = (sal_Int16)aAltWord.getLength(); + sal_Int16 nLen = static_cast<sal_Int16>(aWord.getLength()); + sal_Int16 nAltLen = static_cast<sal_Int16>(aAltWord.getLength()); const sal_Unicode *pWord = aWord.getStr(), *pAltWord = aAltWord.getStr(); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 3cc9b49917e9..5112c7cfd000 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -230,7 +230,7 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth ) { if( nMaxDepth != nDepth ) { - nMaxDepth = std::min( nDepth, (sal_Int16)(SVX_MAX_NUM-1) ); + nMaxDepth = std::min( nDepth, sal_Int16(SVX_MAX_NUM-1) ); } } @@ -940,8 +940,8 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, // Translation... aTextPos -= rOrigin; // Rotation... - aRotatedPos.X()=(long) (nCos*aTextPos.X() + nSin*aTextPos.Y()); - aRotatedPos.Y()=(long) - (nSin*aTextPos.X() - nCos*aTextPos.Y()); + aRotatedPos.X()=static_cast<long>(nCos*aTextPos.X() + nSin*aTextPos.Y()); + aRotatedPos.Y()=static_cast<long>(- (nSin*aTextPos.X() - nCos*aTextPos.Y())); aTextPos = aRotatedPos; // Translation... aTextPos += rOrigin; @@ -1067,7 +1067,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, void Outliner::InvalidateBullet(sal_Int32 nPara) { - long nLineHeight = (long)pEditEngine->GetLineHeight(nPara ); + long nLineHeight = static_cast<long>(pEditEngine->GetLineHeight(nPara )); for (OutlinerView* pView : aViewList) { Point aPos( pView->pEditView->GetWindowPosTopLeft(nPara ) ); @@ -1522,7 +1522,7 @@ tools::Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, boo const SvxLRSpaceItem& rLR = pEditEngine->GetParaAttrib( nPara, bOutlineMode ? EE_PARA_OUTLLRSPACE : EE_PARA_LRSPACE ); aTopLeft.X() = rLR.GetTextLeft() + rLR.GetTextFirstLineOfst() + nSpaceBefore; - long nBulletWidth = std::max( (long) -rLR.GetTextFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) ); + long nBulletWidth = std::max( static_cast<long>(-rLR.GetTextFirstLineOfst()), static_cast<long>((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) ); if ( nBulletWidth < aBulletSize.Width() ) // The Bullet creates its space nBulletWidth = aBulletSize.Width(); diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 5706eada0f87..0c380d570604 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -1088,7 +1088,7 @@ void OutlinerView::ApplyBulletsNumbering( } } - const sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount()); + const sal_uInt16 nParaCount = static_cast<sal_uInt16>(pOwner->pParaList->GetParagraphCount()); pOwner->ImplCheckParagraphs( nStartPara, nParaCount ); pOwner->pEditEngine->QuickMarkInvalid( ESelection( nStartPara, 0, nParaCount, 0 ) ); @@ -1139,7 +1139,7 @@ void OutlinerView::SwitchOffBulletsNumbering( } } - const sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount()); + const sal_uInt16 nParaCount = static_cast<sal_uInt16>(pOwner->pParaList->GetParagraphCount()); pOwner->ImplCheckParagraphs( nStartPara, nParaCount ); pOwner->pEditEngine->QuickMarkInvalid( ESelection( nStartPara, 0, nParaCount, 0 ) ); diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index 6db6172ce078..a4e907f41ba9 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -85,9 +85,9 @@ void Paragraph::SetParaIsNumberingRestart( bool bParaIsNumberingRestart ) void Paragraph::dumpAsXml(struct _xmlTextWriter* pWriter) const { xmlTextWriterStartElement(pWriter, BAD_CAST("Paragraph")); - xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("nDepth"), "%" SAL_PRIdINT32, (sal_Int32)nDepth); - xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("mnNumberingStartValue"), "%" SAL_PRIdINT32, (sal_Int32)mnNumberingStartValue); - xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("mbParaIsNumberingRestart"), "%" SAL_PRIdINT32, (sal_Int32)mbParaIsNumberingRestart); + xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("nDepth"), "%" SAL_PRIdINT32, static_cast<sal_Int32>(nDepth)); + xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("mnNumberingStartValue"), "%" SAL_PRIdINT32, static_cast<sal_Int32>(mnNumberingStartValue)); + xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("mbParaIsNumberingRestart"), "%" SAL_PRIdINT32, static_cast<sal_Int32>(mbParaIsNumberingRestart)); xmlTextWriterEndElement(pWriter); } diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 6b6f87e9e1ec..a9cde574ab83 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -296,7 +296,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) if( aPardMap.nOutlineLvl ) { pSet->Put( SfxInt16Item( aPardMap.nOutlineLvl, - (sal_uInt16)nTokenValue )); + static_cast<sal_uInt16>(nTokenValue) )); } break; @@ -433,7 +433,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) if( nTokenValue > 200 ) // Data value for PropLnSp nTokenValue = 200; // is one BYTE !!! - aLSpace.SetPropLineSpace( (sal_uInt8)nTokenValue ); + aLSpace.SetPropLineSpace( static_cast<sal_uInt8>(nTokenValue) ); aLSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto ); pSet->Put( aLSpace ); @@ -471,7 +471,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet ) CalcValue(); if (eLnSpc != SvxLineSpaceRule::Auto) - aLSpace.SetLineHeight( (sal_uInt16)nTokenValue ); + aLSpace.SetLineHeight( static_cast<sal_uInt16>(nTokenValue) ); aLSpace.SetLineSpaceRule(eLnSpc); pSet->Put(aLSpace); @@ -569,7 +569,7 @@ SET_FONTALIGNMENT: } else { - nEs = (short)-nTokenValue; + nEs = static_cast<short>(-nTokenValue); nProp = (nToken == RTF_SUB) ? DFLT_ESC_PROP : 100; } pSet->Put( SvxEscapementItem( nEs, nProp, nEsc )); @@ -593,7 +593,7 @@ SET_FONTALIGNMENT: nTokenValue *= 5; if( IsCalcValue() ) CalcValue(); - pSet->Put( SvxKerningItem( (short)nTokenValue, aPlainMap.nKering )); + pSet->Put( SvxKerningItem( static_cast<short>(nTokenValue), aPlainMap.nKering )); } break; @@ -618,7 +618,7 @@ SET_FONTALIGNMENT: nTokenValue = 0; if( IsCalcValue() ) CalcValue(); - pSet->Put( SvxKerningItem( (short)nTokenValue, aPlainMap.nKering )); + pSet->Put( SvxKerningItem( static_cast<short>(nTokenValue), aPlainMap.nKering )); } break; @@ -653,7 +653,7 @@ SET_FONTALIGNMENT: // if( IsCalcValue() ) // CalcValue(); SvxFontHeightItem aTmpItem( - (sal_uInt16)nTokenValue, 100, + static_cast<sal_uInt16>(nTokenValue), 100, SID_ATTR_CHAR_FONTHEIGHT ); SetScriptAttr( eCharType, *pSet, aTmpItem ); } @@ -917,7 +917,7 @@ ATTR_SETOVERLINE: } else { - nEs = (short)nTokenValue; + nEs = static_cast<short>(nTokenValue); nProp = (nToken == RTF_SUPER) ? DFLT_ESC_PROP : 100; } pSet->Put( SvxEscapementItem( nEs, nProp, nEsc )); @@ -1509,23 +1509,23 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet, switch( nBorderTyp ) { case RTF_BRDRB: - aAttr.SetDistance( (sal_uInt16)nTokenValue, SvxBoxItemLine::BOTTOM ); + aAttr.SetDistance( static_cast<sal_uInt16>(nTokenValue), SvxBoxItemLine::BOTTOM ); break; case RTF_BRDRT: - aAttr.SetDistance( (sal_uInt16)nTokenValue, SvxBoxItemLine::TOP ); + aAttr.SetDistance( static_cast<sal_uInt16>(nTokenValue), SvxBoxItemLine::TOP ); break; case RTF_BRDRL: - aAttr.SetDistance( (sal_uInt16)nTokenValue, SvxBoxItemLine::LEFT ); + aAttr.SetDistance( static_cast<sal_uInt16>(nTokenValue), SvxBoxItemLine::LEFT ); break; case RTF_BRDRR: - aAttr.SetDistance( (sal_uInt16)nTokenValue, SvxBoxItemLine::RIGHT ); + aAttr.SetDistance( static_cast<sal_uInt16>(nTokenValue), SvxBoxItemLine::RIGHT ); break; case RTF_BOX: - aAttr.SetAllDistances( (sal_uInt16)nTokenValue ); + aAttr.SetAllDistances( static_cast<sal_uInt16>(nTokenValue) ); break; } } @@ -1590,7 +1590,7 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, case RTF_CLSHDNG: case RTF_CHSHDNG: case RTF_SHADING: - nFillValue = (sal_uInt8)( nTokenValue / 100 ); + nFillValue = static_cast<sal_uInt8>( nTokenValue / 100 ); break; case RTF_CLBGDKHOR: @@ -1677,9 +1677,9 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet, aColor = aCol; else aColor = Color( - (sal_uInt8)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ), - (sal_uInt8)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ), - (sal_uInt8)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) ); + static_cast<sal_uInt8>(CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue )), + static_cast<sal_uInt8>(CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue )), + static_cast<sal_uInt8>(CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue )) ); rSet.Put( SvxBrushItem( aColor, nWh ) ); SkipToken(); diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 1ba1562e8a49..3e2b8da1fd6e 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -332,10 +332,10 @@ void SvxRTFParser::ReadStyleTable() case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break; case RTF_OUTLINELEVEL: case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break; - case RTF_S: nStyleNo = (short)nTokenValue; + case RTF_S: nStyleNo = static_cast<short>(nTokenValue); bHasStyleNo = true; break; - case RTF_CS: nStyleNo = (short)nTokenValue; + case RTF_CS: nStyleNo = static_cast<short>(nTokenValue); bHasStyleNo = true; break; @@ -510,7 +510,7 @@ void SvxRTFParser::ReadFontTable() if (-1 != nTokenValue) { rtl_TextEncoding nrtl_TextEncoding = rtl_getTextEncodingFromWindowsCharset( - (sal_uInt8)nTokenValue); + static_cast<sal_uInt8>(nTokenValue)); pFont->SetCharSet(nrtl_TextEncoding); //When we're in a font, the fontname is in the font //charset, except for symbol fonts I believe @@ -533,7 +533,7 @@ void SvxRTFParser::ReadFontTable() case RTF_F: bCheckNewFont = true; nInsFontNo = nFontNo; - nFontNo = (short)nTokenValue; + nFontNo = static_cast<short>(nTokenValue); break; case RTF_FALT: bIsAltFntNm = true; diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx index 7ca710e6e183..d49032f00423 100644 --- a/editeng/source/uno/unoedprx.cxx +++ b/editeng/source/uno/unoedprx.cxx @@ -207,7 +207,7 @@ void SvxAccessibleTextIndex::SetEEIndex( sal_uInt16 nEEIndex, const SvxTextForwa break; } - mnIndex += std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); + mnIndex += std::max(aFieldInfo.aCurrentText.getLength()-1, sal_Int32(0)); } } @@ -260,13 +260,13 @@ void SvxAccessibleTextIndex::SetIndex( sal_Int32 nIndex, const SvxTextForwarder& if( aFieldInfo.aPosition.nIndex > mnEEIndex ) break; - mnEEIndex -= std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0); + mnEEIndex -= std::max(aFieldInfo.aCurrentText.getLength()-1, sal_Int32(0)); // we're within a field if( aFieldInfo.aPosition.nIndex >= mnEEIndex ) { AreInField(); - SetFieldOffset( std::max(aFieldInfo.aCurrentText.getLength()-1, (sal_Int32)0) - (aFieldInfo.aPosition.nIndex - mnEEIndex), + SetFieldOffset( std::max(aFieldInfo.aCurrentText.getLength()-1, sal_Int32(0)) - (aFieldInfo.aPosition.nIndex - mnEEIndex), aFieldInfo.aCurrentText.getLength() ); mnEEIndex = aFieldInfo.aPosition.nIndex ; break; diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index dea8043b778a..b906326a9d55 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -44,9 +44,9 @@ void SvxUnoFontDescriptor::ConvertToFont( const awt::FontDescriptor& rDesc, vcl: rFont.SetStyleName( rDesc.StyleName ); rFont.SetFontSize( Size( rDesc.Width, rDesc.Height ) ); rFont.SetFamily( (FontFamily)rDesc.Family ); - rFont.SetCharSet( (rtl_TextEncoding)rDesc.CharSet ); + rFont.SetCharSet( static_cast<rtl_TextEncoding>(rDesc.CharSet) ); rFont.SetPitch( (FontPitch)rDesc.Pitch ); - rFont.SetOrientation( (short)(rDesc.Orientation*10) ); + rFont.SetOrientation( static_cast<short>(rDesc.Orientation*10) ); rFont.SetKerning( rDesc.Kerning ? FontKerning::FontSpecific : FontKerning::NONE ); rFont.SetWeight( vcl::unohelper::ConvertFontWeight(rDesc.Weight) ); rFont.SetItalic( (FontItalic)rDesc.Slant ); @@ -89,7 +89,7 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte { SvxFontHeightItem aFontHeightItem( 0, 100, EE_CHAR_FONTHEIGHT ); - aTemp <<= (float)rDesc.Height; + aTemp <<= static_cast<float>(rDesc.Height); static_cast<SfxPoolItem*>(&aFontHeightItem)->PutValue( aTemp, MID_FONTHEIGHT|CONVERT_TWIPS ); rSet.Put(aFontHeightItem); } @@ -103,7 +103,7 @@ void SvxUnoFontDescriptor::FillItemSet( const awt::FontDescriptor& rDesc, SfxIte { SvxUnderlineItem aUnderlineItem( LINESTYLE_NONE, EE_CHAR_UNDERLINE ); - aTemp <<= (sal_Int16)rDesc.Underline; + aTemp <<= static_cast<sal_Int16>(rDesc.Underline); static_cast<SfxPoolItem*>(&aUnderlineItem)->PutValue( aTemp, MID_TL_STYLE ); rSet.Put( aUnderlineItem ); } diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 8d4b41e4ffb1..3db1c4f2ff8a 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -102,7 +102,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* if( nullptr == pItem && pPool ) pItem = &(pPool->GetDefaultItem( pMap->nWID )); - const MapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : MapUnit::Map100thMM; + const MapUnit eMapUnit = pPool ? pPool->GetMetric(static_cast<sal_uInt16>(pMap->nWID)) : MapUnit::Map100thMM; sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); if( eMapUnit == MapUnit::Map100thMM ) nMemberId &= (~CONVERT_TWIPS); @@ -163,7 +163,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa { uno::Any aValue( rVal ); - const MapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pMap->nWID) : MapUnit::Map100thMM; + const MapUnit eMapUnit = pPool ? pPool->GetMetric(static_cast<sal_uInt16>(pMap->nWID)) : MapUnit::Map100thMM; // check for needed metric translation if( (pMap->nMemberId & SFX_METRIC_ITEM) && eMapUnit != MapUnit::Map100thMM ) @@ -197,7 +197,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* return *pUsrAny; // No UsrAny detected yet, generate Default entry and return this - const MapUnit eMapUnit = mrItemPool.GetMetric((sal_uInt16)pMap->nWID); + const MapUnit eMapUnit = mrItemPool.GetMetric(static_cast<sal_uInt16>(pMap->nWID)); sal_uInt8 nMemberId = pMap->nMemberId & (~SFX_METRIC_ITEM); if( eMapUnit == MapUnit::Map100thMM ) nMemberId &= (~CONVERT_TWIPS); @@ -283,19 +283,19 @@ void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, uno::Any & rMetric ) throw switch( rMetric.getValueTypeClass() ) { case uno::TypeClass_BYTE: - rMetric <<= (sal_Int8)(TWIPS_TO_MM(*o3tl::forceAccess<sal_Int8>(rMetric))); + rMetric <<= static_cast<sal_Int8>(TWIPS_TO_MM(*o3tl::forceAccess<sal_Int8>(rMetric))); break; case uno::TypeClass_SHORT: - rMetric <<= (sal_Int16)(TWIPS_TO_MM(*o3tl::forceAccess<sal_Int16>(rMetric))); + rMetric <<= static_cast<sal_Int16>(TWIPS_TO_MM(*o3tl::forceAccess<sal_Int16>(rMetric))); break; case uno::TypeClass_UNSIGNED_SHORT: - rMetric <<= (sal_uInt16)(TWIPS_TO_MM(*o3tl::forceAccess<sal_uInt16>(rMetric))); + rMetric <<= static_cast<sal_uInt16>(TWIPS_TO_MM(*o3tl::forceAccess<sal_uInt16>(rMetric))); break; case uno::TypeClass_LONG: - rMetric <<= (sal_Int32)(TWIPS_TO_MM(*o3tl::forceAccess<sal_Int32>(rMetric))); + rMetric <<= static_cast<sal_Int32>(TWIPS_TO_MM(*o3tl::forceAccess<sal_Int32>(rMetric))); break; case uno::TypeClass_UNSIGNED_LONG: - rMetric <<= (sal_uInt32)(TWIPS_TO_MM(*o3tl::forceAccess<sal_uInt32>(rMetric))); + rMetric <<= static_cast<sal_uInt32>(TWIPS_TO_MM(*o3tl::forceAccess<sal_uInt32>(rMetric))); break; default: SAL_WARN("editeng", "AW: Missing unit translation to 100th mm, " << OString::number((sal_Int32)rMetric.getValueTypeClass())); @@ -320,19 +320,19 @@ void SvxUnoConvertFromMM( const MapUnit eDestinationMapUnit, uno::Any & rMetric switch( rMetric.getValueTypeClass() ) { case uno::TypeClass_BYTE: - rMetric <<= (sal_Int8)(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_Int8>(rMetric))); + rMetric <<= static_cast<sal_Int8>(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_Int8>(rMetric))); break; case uno::TypeClass_SHORT: - rMetric <<= (sal_Int16)(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_Int16>(rMetric))); + rMetric <<= static_cast<sal_Int16>(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_Int16>(rMetric))); break; case uno::TypeClass_UNSIGNED_SHORT: - rMetric <<= (sal_uInt16)(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_uInt16>(rMetric))); + rMetric <<= static_cast<sal_uInt16>(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_uInt16>(rMetric))); break; case uno::TypeClass_LONG: - rMetric <<= (sal_Int32)(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_Int32>(rMetric))); + rMetric <<= static_cast<sal_Int32>(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_Int32>(rMetric))); break; case uno::TypeClass_UNSIGNED_LONG: - rMetric <<= (sal_uInt32)(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_uInt32>(rMetric))); + rMetric <<= static_cast<sal_uInt32>(sanitiseMm100ToTwip(*o3tl::forceAccess<sal_uInt32>(rMetric))); break; default: OSL_FAIL("AW: Missing unit translation to 100th mm!"); diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 9c0dca69df4c..5a3b4a738e45 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -170,7 +170,7 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const { // NumberingRule aRule; - const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex); + const SvxNumberFormat& rFmt = maRule.GetLevel(static_cast<sal_uInt16>(nIndex)); sal_uInt16 nIdx = 0; const int nProps = 15; @@ -178,7 +178,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal Any aVal; { - aVal <<= (sal_uInt16)rFmt.GetNumberingType(); + aVal <<= static_cast<sal_uInt16>(rFmt.GetNumberingType()); beans::PropertyValue aAlignProp( UNO_NAME_NRULE_NUMBERINGTYPE, -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = aAlignProp; } @@ -241,21 +241,21 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal pArray[nIdx++] = aGraphicSizeProp; } - aVal <<= (sal_Int16)rFmt.GetStart(); + aVal <<= static_cast<sal_Int16>(rFmt.GetStart()); pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_START_WITH, -1, aVal, beans::PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)rFmt.GetAbsLSpace(); + aVal <<= static_cast<sal_Int32>(rFmt.GetAbsLSpace()); pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_LEFT_MARGIN, -1, aVal, beans::PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)rFmt.GetFirstLineOffset(); + aVal <<= static_cast<sal_Int32>(rFmt.GetFirstLineOffset()); pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_FIRST_LINE_OFFSET, -1, aVal, beans::PropertyState_DIRECT_VALUE); pArray[nIdx++] = beans::PropertyValue("SymbolTextDistance", -1, aVal, beans::PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int32)rFmt.GetBulletColor().GetColor(); + aVal <<= static_cast<sal_Int32>(rFmt.GetBulletColor().GetColor()); pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_BULLET_COLOR, -1, aVal, beans::PropertyState_DIRECT_VALUE); - aVal <<= (sal_Int16)rFmt.GetBulletRelSize(); + aVal <<= static_cast<sal_Int16>(rFmt.GetBulletRelSize()); pArray[nIdx++] = beans::PropertyValue(UNO_NAME_NRULE_BULLET_RELSIZE, -1, aVal, beans::PropertyState_DIRECT_VALUE); DBG_ASSERT( nIdx <= nProps, "FixMe: overflow in Array!!! [CL]" ); @@ -266,7 +266,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::PropertyValue >& rProperties, sal_Int32 nIndex) { - SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex )); + SvxNumberFormat aFmt(maRule.GetLevel( static_cast<sal_uInt16>(nIndex) )); const beans::PropertyValue* pPropArray = rProperties.getConstArray(); for(int i = 0; i < rProperties.getLength(); i++) { @@ -337,7 +337,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert sal_Int16 nAdjust = sal_Int16(); if( aVal >>= nAdjust ) { - aFmt.SetNumAdjust(ConvertUnoAdjust( (unsigned short)nAdjust )); + aFmt.SetNumAdjust(ConvertUnoAdjust( static_cast<unsigned short>(nAdjust) )); continue; } } @@ -397,7 +397,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert sal_Int32 nMargin = 0; if( aVal >>= nMargin ) { - aFmt.SetAbsLSpace((sal_uInt16)nMargin); + aFmt.SetAbsLSpace(static_cast<sal_uInt16>(nMargin)); continue; } } @@ -406,7 +406,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert sal_Int32 nMargin = 0; if( aVal >>= nMargin ) { - aFmt.SetFirstLineOffset((sal_uInt16)nMargin); + aFmt.SetFirstLineOffset(static_cast<sal_uInt16>(nMargin)); continue; } } @@ -415,7 +415,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert sal_Int32 nTextDistance = 0; if( aVal >>= nTextDistance ) { - aFmt.SetCharTextDistance((sal_uInt16)nTextDistance); + aFmt.SetCharTextDistance(static_cast<sal_uInt16>(nTextDistance)); continue; } } @@ -439,7 +439,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert nSize = 100; } - aFmt.SetBulletRelSize( (short)nSize ); + aFmt.SetBulletRelSize( static_cast<short>(nSize) ); continue; } } @@ -461,7 +461,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert aFmt.SetGraphicBrush( &aBrushItem ); } } - maRule.SetLevel( (sal_uInt16)nIndex, aFmt ); + maRule.SetLevel( static_cast<sal_uInt16>(nIndex), aFmt ); } const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 75b9d339c7cf..7859b4f1185e 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1249,7 +1249,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp } case WID_NUMBERINGSTARTVALUE: - return uno::Any( (sal_Int16)-1 ); + return uno::Any( sal_Int16(-1) ); case WID_PARAISNUMBERINGRESTART: return uno::Any( false ); diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index ddd85b8f743f..77405e435fa8 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -92,7 +92,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements() { SolarMutexGuard aGuard; if( mpEditSource && !maContents.empty() ) - return (unsigned)mnNextParagraph < maContents.size(); + return static_cast<unsigned>(mnNextParagraph) < maContents.size(); else return false; } diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index b74c45ef9596..7ef144c78d8a 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -32,7 +32,7 @@ class SvXMLUnitConverter; [Description] This item describes the row orientation. */ -#define ADJUST_LASTBLOCK_VERSION ((sal_uInt16)0x0001) +#define ADJUST_LASTBLOCK_VERSION (sal_uInt16(0x0001)) class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface { diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index d2c155e822b3..a9b70f4c288a 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -43,12 +43,12 @@ enum class SvxBoxItemLine This version causes SvxBoxItem to store the 4 cell spacing distances separately when serializing to stream. */ -#define BOX_4DISTS_VERSION ((sal_uInt16)1) +#define BOX_4DISTS_VERSION (sal_uInt16(1)) /** This version causes SvxBoxItem to store the styles for its border lines when serializing to stream. */ -#define BOX_BORDER_STYLE_VERSION ((sal_uInt16)2) +#define BOX_BORDER_STYLE_VERSION (sal_uInt16(2)) class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem { diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 8aa177aa2adb..2275ed31d68a 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -32,7 +32,7 @@ class Graphic; class GraphicObject; -#define BRUSH_GRAPHIC_VERSION ((sal_uInt16)0x0001) +#define BRUSH_GRAPHIC_VERSION (sal_uInt16(0x0001)) enum SvxGraphicPosition { diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index a982e7a41e90..799c17cc6da3 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -33,8 +33,8 @@ class SvXMLUnitConverter; This item describes the font height */ -#define FONTHEIGHT_16_VERSION ((sal_uInt16)0x0001) -#define FONTHEIGHT_UNIT_VERSION ((sal_uInt16)0x0002) +#define FONTHEIGHT_16_VERSION (sal_uInt16(0x0001)) +#define FONTHEIGHT_UNIT_VERSION (sal_uInt16(0x0002)) class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem { diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 495ff3bc975a..771cef8f10f5 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -31,7 +31,7 @@ This item describes a wrap-attribute Automatic?, Page or column break, before or after? */ -#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001) +#define FMTBREAK_NOAUTO (sal_uInt16(0x0001)) class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem<SvxBreak> { diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index 5d6c576f28f3..4a2d9bd3992d 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -44,9 +44,9 @@ */ #define LRSPACE_16_VERSION ((sal_uInt16)0x0001) -#define LRSPACE_TXTLEFT_VERSION ((sal_uInt16)0x0002) +#define LRSPACE_TXTLEFT_VERSION (sal_uInt16(0x0002)) #define LRSPACE_AUTOFIRST_VERSION ((sal_uInt16)0x0003) -#define LRSPACE_NEGATIVE_VERSION ((sal_uInt16)0x0004) +#define LRSPACE_NEGATIVE_VERSION (sal_uInt16(0x0004)) class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem { diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index 62c6120652bf..324bda43e5f9 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -24,7 +24,7 @@ // define ---------------------------------------------------------------- -#define PAPERBIN_PRINTER_SETTINGS ((sal_uInt8)0xFF) +#define PAPERBIN_PRINTER_SETTINGS (sal_uInt8(0xFF)) // class SvxPaperBinItem ------------------------------------------------- diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index 969ac9101ce6..8b821a5917f4 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -55,7 +55,7 @@ public: sal_uInt8 GetPropr() const { return nPropr; } void SetPropr( const sal_uInt8 nNewPropr ) { nPropr = nNewPropr; } void SetProprRel( const sal_uInt8 nNewPropr ) - { SetPropr( (sal_uInt8)( (long)nNewPropr * (long)nPropr / 100L ) ); } + { SetPropr( static_cast<sal_uInt8>( static_cast<long>(nNewPropr) * static_cast<long>(nPropr) / 100L ) ); } // Kerning short GetFixKerning() const { return nKern; } diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index 559638d72a85..5734afbf5696 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -30,7 +30,7 @@ This item describes the Upper- and Lower space of a page or paragraph. */ -#define ULSPACE_16_VERSION ((sal_uInt16)0x0001) +#define ULSPACE_16_VERSION (sal_uInt16(0x0001)) class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem { |