diff options
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r-- | sw/source/uibase/uiview/viewmdi.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewsrch.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewtab.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index e8dd1a8ce4ea..460dce33e3b5 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -108,14 +108,14 @@ void SwView::SetZoom_( const Size &rEditSize, SvxZoomType eZoomType, if( UseOnPage::Mirror == rDesc.GetUseOn() ) // mirrored pages { const SvxLRSpaceItem &rLeftLRSpace = rDesc.GetLeft().GetLRSpace(); - aPageSize.Width() += std::abs( long(rLeftLRSpace.GetLeft()) - long(rLRSpace.GetLeft()) ); + aPageSize.Width() += std::abs( rLeftLRSpace.GetLeft() - rLRSpace.GetLeft() ); } if( SvxZoomType::OPTIMAL == eZoomType ) { if (!pPostItMgr->HasNotes() || !pPostItMgr->ShowNotes()) aPageSize.Width() -= ( rLRSpace.GetLeft() + rLRSpace.GetRight() + nLeftOfst * 2 ); - lLeftMargin = long(rLRSpace.GetLeft()) + DOCUMENTBORDER + nLeftOfst; + lLeftMargin = rLRSpace.GetLeft() + DOCUMENTBORDER + nLeftOfst; nFac = aWindowSize.Width() * 100 / aPageSize.Width(); } else if(SvxZoomType::WHOLEPAGE == eZoomType || SvxZoomType::PAGEWIDTH == eZoomType ) diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 3b3ff0ba371e..c94038539893 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -846,7 +846,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) !m_pSrchItem->GetPattern(), rOptions.eStart, rOptions.eEnd, - FindRanges(eRanges), + eRanges, !m_pSrchItem->GetSearchString().isEmpty() ? &aSearchOpt : nullptr, pReplSet ); } @@ -857,7 +857,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) nFound = m_pWrtShell->SearchTempl( m_pSrchItem->GetSearchString(), rOptions.eStart, rOptions.eEnd, - FindRanges(eRanges), + eRanges, bDoReplace ? &sRplStr : nullptr ); } else @@ -866,7 +866,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions ) nFound = m_pWrtShell->SearchPattern(aSearchOpt, m_pSrchItem->GetNotes(), rOptions.eStart, rOptions.eEnd, - FindRanges(eRanges), + eRanges, bDoReplace ); } m_pWrtShell->EndSelect(); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index 1e85f5fca224..7eff56c3f7e0 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -1127,7 +1127,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) { XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pReqArgs->Get( XATTR_FILLCOLOR )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_SOLID ) ); - rMaster.SetFormatAttr( XFillColorItem( aColorItem )); + rMaster.SetFormatAttr( aColorItem ); } break; @@ -1135,7 +1135,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) { XFillGradientItem aGradientItem( static_cast<const XFillGradientItem&>(pReqArgs->Get( XATTR_FILLGRADIENT )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_GRADIENT ) ); - rMaster.SetFormatAttr( XFillGradientItem( aGradientItem ) ); + rMaster.SetFormatAttr( aGradientItem ); } break; @@ -1143,7 +1143,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) { XFillHatchItem aHatchItem( static_cast<const XFillHatchItem&>(pReqArgs->Get( XATTR_FILLHATCH )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_HATCH ) ); - rMaster.SetFormatAttr( XFillHatchItem( aHatchItem )); + rMaster.SetFormatAttr( aHatchItem ); } break; @@ -1151,7 +1151,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) { XFillBitmapItem aBitmapItem( static_cast<const XFillBitmapItem&>(pReqArgs->Get( XATTR_FILLBITMAP )) ); rMaster.SetFormatAttr( XFillStyleItem( drawing::FillStyle_BITMAP ) ); - rMaster.SetFormatAttr( XFillBitmapItem( aBitmapItem )); + rMaster.SetFormatAttr( aBitmapItem ); } break; |