summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx6
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport8.cxx2
-rw-r--r--sw/source/core/text/frmcrsr.cxx2
-rw-r--r--sw/source/core/text/txtdrop.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx4
-rw-r--r--sw/source/uibase/shells/tabsh.cxx2
-rw-r--r--sw/source/uibase/uiview/view1.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx2
9 files changed, 14 insertions, 14 deletions
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 68187a49c4ab..0fcc0a48e2a2 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -612,7 +612,7 @@ void Test::testMSCharBackgroundEditing()
case 3: nBackColor = 0x00ff00; break; //green
case 4: nBackColor = 0xff00ff; break; //magenta
}
- xRun->setPropertyValue("CharBackColor", uno::makeAny(static_cast<sal_Int32>(nBackColor)));
+ xRun->setPropertyValue("CharBackColor", uno::makeAny(nBackColor));
// Remove highlighting
xRun->setPropertyValue("CharHighlight", uno::makeAny(static_cast<sal_Int32>(COL_TRANSPARENT)));
// Remove shading marker
@@ -661,11 +661,11 @@ void Test::testMSCharBackgroundEditing()
if( strcmp(aFilterNames[nFilter], "writer8") == 0 )
{
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), static_cast<sal_Int32>(COL_TRANSPARENT), getProperty<sal_Int32>(xRun,"CharHighlight"));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), static_cast<sal_Int32>(nBackColor), getProperty<sal_Int32>(xRun,"CharBackColor"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nBackColor, getProperty<sal_Int32>(xRun,"CharBackColor"));
}
else
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), static_cast<sal_Int32>(nBackColor), getProperty<sal_Int32>(xRun,"CharHighlight"));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nBackColor, getProperty<sal_Int32>(xRun,"CharHighlight"));
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), static_cast<sal_Int32>(COL_TRANSPARENT), getProperty<sal_Int32>(xRun,"CharBackColor"));
}
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 166d4658fda0..b954283754a9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -2065,7 +2065,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf90810, "tdf90810short.docx")
uno::Reference<text::XFootnote> xFootnote(xFootnoteIdxAcc->getByIndex(0), uno::UNO_QUERY);
uno::Reference<text::XText> xFootnoteText(xFootnote, uno::UNO_QUERY);
rtl::OUString sFootnoteText = xFootnoteText->getString();
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(90), static_cast<sal_Int32>(sFootnoteText.getLength()));
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(90), sFootnoteText.getLength());
}
DECLARE_OOXMLEXPORT_TEST(testTdf89165, "tdf89165.docx")
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 807507fd743e..18c26d55c591 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1238,7 +1238,7 @@ bool SwTextFrame::UnitDown_(SwPaM *pPam, const SwTwips nOffset,
if( nFormat <= GetOfst() )
{
nFormat = std::min( sal_Int32( GetOfst() + MIN_OFFSET_STEP ),
- static_cast<sal_Int32>(nTmpLen) );
+ nTmpLen );
if( nFormat <= GetOfst() )
break;
}
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 23f2d7534b71..2c2df17c0b70 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -569,7 +569,7 @@ SwDropPortion *SwTextFormatter::NewDropPortion( SwTextFormatInfo &rInf )
// find next attribute change / script change
const sal_Int32 nTmpIdx = nNextChg;
- sal_Int32 nNextAttr = std::min( static_cast<sal_Int32>(GetNextAttr()), rInf.GetText().getLength() );
+ sal_Int32 nNextAttr = std::min( GetNextAttr(), rInf.GetText().getLength() );
nNextChg = m_pScriptInfo->NextScriptChg( nTmpIdx );
if( nNextChg > nNextAttr )
nNextChg = nNextAttr;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 0f95e9cb27bc..6c83fae8a43d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1516,7 +1516,7 @@ SvxFrameDirection MSWordExportBase::GetDefaultFrameDirection( ) const
}
else if ( dynamic_cast< const SwTextFormatColl *>( m_pOutFormatNode ) != nullptr )
{
- if ( MsLangId::isRightToLeft( static_cast<LanguageType>(GetAppLanguage())) )
+ if ( MsLangId::isRightToLeft( GetAppLanguage()) )
nDir = SvxFrameDirection::Horizontal_RL_TB;
else
nDir = SvxFrameDirection::Horizontal_LR_TB; //what else can we do :-(
@@ -1526,7 +1526,7 @@ SvxFrameDirection MSWordExportBase::GetDefaultFrameDirection( ) const
if ( nDir == SvxFrameDirection::Environment )
{
// fdo#44029 put direction right when the locale are RTL.
- if( MsLangId::isRightToLeft( static_cast<LanguageType>(GetAppLanguage())) )
+ if( MsLangId::isRightToLeft( GetAppLanguage()) )
nDir = SvxFrameDirection::Horizontal_RL_TB;
else
nDir = SvxFrameDirection::Horizontal_LR_TB; //Set something
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 5d2cf4a3bdfc..1a1afc25b1e7 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -415,8 +415,8 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE));
m_nOldLeftMargin = static_cast< sal_uInt16 >(rLR.GetLeft());
m_nOldRightMargin = static_cast< sal_uInt16 >(rLR.GetRight());
- m_nOldUpperMargin = static_cast< sal_uInt16 >(rUL.GetUpper());
- m_nOldLowerMargin = static_cast< sal_uInt16 >(rUL.GetLower());
+ m_nOldUpperMargin = rUL.GetUpper();
+ m_nOldLowerMargin = rUL.GetLower();
// position
const SwFormatHoriOrient& rHori = static_cast<const SwFormatHoriOrient&>(rSet.Get(RES_HORI_ORIENT));
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 45312455c19b..6d744b14c38b 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -952,7 +952,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
const sal_uInt16 nDispatchSlot = (nSlot == FN_TABLE_INSERT_COL_DLG)
? FN_TABLE_INSERT_COL_AFTER : FN_TABLE_INSERT_ROW_AFTER;
- SfxUInt16Item aCountItem( nDispatchSlot, static_cast< sal_uInt16 >(pDlg->getInsertCount()) );
+ SfxUInt16Item aCountItem( nDispatchSlot, pDlg->getInsertCount() );
SfxBoolItem aAfter( FN_PARAM_INSERT_AFTER, !pDlg->isInsertBefore() );
SfxViewFrame* pVFrame = GetView().GetViewFrame();
if( pVFrame )
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 98a4be6e7cb5..f8b949368494 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -149,8 +149,8 @@ void SwView::ExecFormatPaintbrush(SfxRequest& rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
if( pArgs && pArgs->Count() >= 1 )
{
- bPersistentCopy = static_cast<bool>(static_cast<const SfxBoolItem &>(pArgs->Get(
- SID_FORMATPAINTBRUSH)).GetValue());
+ bPersistentCopy = static_cast<const SfxBoolItem &>(pArgs->Get(
+ SID_FORMATPAINTBRUSH)).GetValue();
}
m_pFormatClipboard->Copy( GetWrtShell(), GetPool(), bPersistentCopy );
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index af8853741696..07530d82e1bc 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2094,7 +2094,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
aAny <<= getRuntimeUID();
break;
case WID_DOC_LOCK_UPDATES :
- aAny <<= static_cast<bool>( pDocShell->GetDoc()->IsInReading() );
+ aAny <<= pDocShell->GetDoc()->IsInReading();
break;
case WID_DOC_BUILDID:
aAny <<= maBuildId;
generated by cgit (git 2.34.1) at 2025-02-23 00:11:20 +0000