diff options
Diffstat (limited to 'sw/source/uibase')
32 files changed, 113 insertions, 113 deletions
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 36a9d777e0d0..f02549e38c6f 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -77,23 +77,23 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) bool bTextDialog = (nId == SID_SW_EDITOPTIONS); // the options for the Web- and Textdialog are put together here - SwViewOption aViewOpt = *GetUsrPref(!bTextDialog); - SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref.get() : m_pWebUsrPref.get(); - // no MakeUsrPref, because only options from textdoks can be used here - SwView* pAppView = GetView(); - if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current()) - pAppView = nullptr; - if(pAppView) + SwViewOption aViewOpt = *GetUsrPref(!bTextDialog); + SwMasterUsrPref* pPref = bTextDialog ? m_pUsrPref.get() : m_pWebUsrPref.get(); + // no MakeUsrPref, because only options from textdoks can be used here + SwView* pAppView = GetView(); + if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current()) + pAppView = nullptr; + if(pAppView) + { + bool bWebView = dynamic_cast<SwWebView*>( pAppView ) != nullptr; + // if Text then no WebView and vice versa + if (bWebView != bTextDialog) { - bool bWebView = dynamic_cast<SwWebView*>( pAppView ) != nullptr; - // if Text then no WebView and vice versa - if (bWebView != bTextDialog) - { - aViewOpt = *pAppView->GetWrtShell().GetViewOptions(); - } - else - pAppView = nullptr; // with View, there's nothing to win here + aViewOpt = *pAppView->GetWrtShell().GetViewOptions(); } + else + pAppView = nullptr; // with View, there's nothing to win here + } // Options/Edit auto pRet = std::make_unique<SfxItemSet>( @@ -191,7 +191,7 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId ) { const SvxTabStopItem& rDefTabs = pAppView->GetWrtShell().GetDefault(RES_PARATR_TABSTOP); - pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(::GetTabDist(rDefTabs)))); + pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(::GetTabDist(rDefTabs)))); } else pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, static_cast<sal_uInt16>(convertMm100ToTwip(pPref->GetDefTabInMm100())))); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 0d30c019c1d0..5f4f72a7da8c 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1408,8 +1408,8 @@ void SwDocShell::SetModified( bool bSet ) SfxObjectShell::SetModified( bSet ); if( IsEnableSetModified()) { - if (!m_xDoc->getIDocumentState().IsInCallModified()) - { + if (!m_xDoc->getIDocumentState().IsInCallModified()) + { EnableSetModified( false ); if( bSet ) { @@ -1424,7 +1424,7 @@ void SwDocShell::SetModified( bool bSet ) m_xDoc->getIDocumentState().ResetModified(); EnableSetModified(); - } + } UpdateChildWindows(); Broadcast(SfxHint(SfxHintId::DocChanged)); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 5f680efb389e..d181b485602f 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -206,7 +206,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) // #107782# OJ use korean language if latin was used if ( i == 0 ) { - LanguageType eUiLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); + LanguageType eUiLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); if (MsLangId::isKorean(eUiLanguage)) eLanguage = eUiLanguage; } diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 089b4aa99c20..e57b4e50e0d7 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -733,8 +733,8 @@ void SwDocShell::Edit( { SwCharFormat* pCFormat = m_pWrtShell->GetCurCharFormat(); pDStyle->GetCharFormat()->SetDerivedFrom( pCFormat ); - if( pCFormat ) - pDStyle->PresetParent( pCFormat->GetName() ); + if( pCFormat ) + pDStyle->PresetParent( pCFormat->GetName() ); } } break; diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 024ad5f370b0..4bfa5bc72333 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -135,7 +135,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b { if( pOut && bIsScript ) { - Color aOldLineColor( pOut->GetLineColor() ); + Color aOldLineColor( pOut->GetLineColor() ); pOut->SetLineColor( COL_GRAY ); // to make it look nice, we subtract two pixels everywhere sal_uInt16 nPix = s_nPixelTwips * 2; @@ -145,7 +145,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix ); const SwRect aRect( aTopLeft, aBotRight ); DrawRect( pOut, aRect, s_aScriptIndicatorColor ); - pOut->SetLineColor( aOldLineColor ); + pOut->SetLineColor( aOldLineColor ); } } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 0c99d8424688..247192893a2f 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -480,7 +480,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo } if( m_pWrtShell->IsFrameSelected() ) { - SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} ); + SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} ); m_pWrtShell->GetFlyFrameAttr( aSet ); const SwFormatURL& rURL = aSet.Get( RES_URL ); if( rURL.GetMap() ) @@ -614,7 +614,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo bOK = SetObject( &m_aDocShellRef, SWTRANSFER_OBJECTTYPE_SWOLE, rFlavor ); break; - default: break; + default: break; } } return bOK; @@ -1959,7 +1959,7 @@ bool SwTransferable::PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, uno::Reference< embed::XStorage > xTmpStor; uno::Reference < embed::XEmbeddedObject > xObj; OUString aName; - comphelper::EmbeddedObjectContainer aCnt; + comphelper::EmbeddedObjectContainer aCnt; if ( xStrm.is() ) { diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 7c693ebe5e48..ac843adaf2e7 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -256,7 +256,7 @@ void AnchorOverlayObject::implEnsureGeometry() maLine.append(GetSixthPosition()); } - if(!maLineTop.count()) + if(!maLineTop.count()) { maLineTop.append(GetSixthPosition()); maLineTop.append(GetSeventhPosition()); @@ -321,7 +321,7 @@ void AnchorOverlayObject::SetSixthPosition(const basegfx::B2DPoint& rNew) if(rNew != maSixthPosition) { maSixthPosition = rNew; - implResetGeometry(); + implResetGeometry(); objectChange(); } } @@ -331,7 +331,7 @@ void AnchorOverlayObject::SetSeventhPosition(const basegfx::B2DPoint& rNew) if(rNew != maSeventhPosition) { maSeventhPosition = rNew; - implResetGeometry(); + implResetGeometry(); objectChange(); } } diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index ce9a65ad8eda..be3ae822967d 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2260,7 +2260,7 @@ sal_uInt16 SwPostItMgr::SearchReplace(const SwFormatField &pField, const i18nuti void SwPostItMgr::AssureStdModeAtShell() { // deselect any drawing or frame and leave editing mode - SdrView* pSdrView = mpWrtShell->GetDrawView(); + SdrView* pSdrView = mpWrtShell->GetDrawView(); if ( pSdrView && pSdrView->IsTextEdit() ) { bool bLockView = mpWrtShell->IsViewLocked(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 43f1b9ad920c..494d0ad575cb 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -5343,10 +5343,10 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.SetExtTextInputData( *pData ); } } - uno::Reference< frame::XDispatchRecorder > xRecorder = + uno::Reference< frame::XDispatchRecorder > xRecorder = m_rView.GetViewFrame()->GetBindings().GetRecorder(); - if(!xRecorder.is()) - { + if(!xRecorder.is()) + { SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get(); SvxAutoCorrect* pACorr = rACfg.GetAutoCorrect(); if( pACorr && @@ -5359,7 +5359,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) // ... request for auto completion help to be shown. ShowAutoTextCorrectQuickHelp(sWord, &rACfg, pACorr, true); } - } + } } } break; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 92faf193d56f..64c93b7f1a07 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -470,24 +470,24 @@ SwField* SwFieldMgr::GetCurField() // provide group range const SwFieldGroupRgn& SwFieldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) { -static SwFieldGroupRgn const aRanges[] = -{ - { /* Document */ GRP_DOC_BEGIN, GRP_DOC_END }, - { /* Functions */ GRP_FKT_BEGIN, GRP_FKT_END }, - { /* Cross-Refs */ GRP_REF_BEGIN, GRP_REF_END }, - { /* DocInfos */ GRP_REG_BEGIN, GRP_REG_END }, - { /* Database */ GRP_DB_BEGIN, GRP_DB_END }, - { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } -}; -static SwFieldGroupRgn const aWebRanges[] = -{ - { /* Document */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, - { /* Functions */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, - { /* Cross-Refs */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, - { /* DocInfos */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, - { /* Database */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, - { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } -}; + static SwFieldGroupRgn const aRanges[] = + { + { /* Document */ GRP_DOC_BEGIN, GRP_DOC_END }, + { /* Functions */ GRP_FKT_BEGIN, GRP_FKT_END }, + { /* Cross-Refs */ GRP_REF_BEGIN, GRP_REF_END }, + { /* DocInfos */ GRP_REG_BEGIN, GRP_REG_END }, + { /* Database */ GRP_DB_BEGIN, GRP_DB_END }, + { /* User */ GRP_VAR_BEGIN, GRP_VAR_END } + }; + static SwFieldGroupRgn const aWebRanges[] = + { + { /* Document */ GRP_WEB_DOC_BEGIN, GRP_WEB_DOC_END }, + { /* Functions */ GRP_WEB_FKT_BEGIN, GRP_WEB_FKT_END }, + { /* Cross-Refs */ GRP_WEB_REF_BEGIN, GRP_WEB_REF_END }, + { /* DocInfos */ GRP_WEB_REG_BEGIN, GRP_WEB_REG_END }, + { /* Database */ GRP_WEB_DB_BEGIN, GRP_WEB_DB_END }, + { /* User */ GRP_WEB_VAR_BEGIN, GRP_WEB_VAR_END } + }; if (bHtmlMode) return aWebRanges[nGrpId]; diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index 4c8ec00ad591..b343ae05c6d1 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -78,10 +78,10 @@ void SwHyphWrapper::SpellContinue() pWait.reset(new SwWait( *pView->GetDocShell(), true )); } - uno::Reference< uno::XInterface > xHyphWord = bInSelection ? + uno::Reference< uno::XInterface > xHyphWord = bInSelection ? PSH->HyphContinue( nullptr, nullptr ) : PSH->HyphContinue( &nPageCount, &nPageStart ); - SetLast( xHyphWord ); + SetLast( xHyphWord ); // for automatic separation, make actions visible only at the end if( bAutomatic ) diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx index aafc47876851..bd7b43e377e7 100644 --- a/sw/source/uibase/lingu/sdrhhcwrap.cxx +++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx @@ -68,7 +68,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, MapMode aMapMode (MapUnit::MapTwip); SetRefMapMode(aMapMode); - Size aSize( 1, 1 ); + Size aSize( 1, 1 ); SetPaperSize( aSize ); pOutlView.reset( new OutlinerView( this, &(pView->GetEditWin()) ) ); @@ -79,7 +79,7 @@ SdrHHCWrapper::SdrHHCWrapper( SwView* pVw, InsertView( pOutlView.get() ); Point aPoint( 0, 0 ); - tools::Rectangle aRect( aPoint, aSize ); + tools::Rectangle aRect( aPoint, aSize ); pOutlView->SetOutputArea( aRect ); // SetText( NULL ); ClearModifyFlag(); diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 4aa0bdeedd64..351cccb629f7 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -272,15 +272,15 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) m_pSh->EndCreate(SdrCreateCmd::ForceEnd); if (OBJ_NONE == nDrawMode) // Text border inserted { - uno::Reference< frame::XDispatchRecorder > xRecorder = + uno::Reference< frame::XDispatchRecorder > xRecorder = m_pSh->GetView().GetViewFrame()->GetBindings().GetRecorder(); if ( xRecorder.is() ) { SfxRequest aReq(m_pSh->GetView().GetViewFrame(),FN_INSERT_FRAME); - aReq.AppendItem(SfxUInt16Item( FN_INSERT_FRAME, + aReq .AppendItem(SfxUInt16Item( FN_INSERT_FRAME, static_cast<sal_uInt16>(RndStdIds::FLY_AT_PARA) )); - aReq.AppendItem(SfxPointItem( FN_PARAM_1, m_pSh->GetAnchorObjDiff())); - aReq.AppendItem(SvxSizeItem( FN_PARAM_2, m_pSh->GetObjSize())); + aReq.AppendItem(SfxPointItem( FN_PARAM_1, m_pSh->GetAnchorObjDiff())); + aReq.AppendItem(SvxSizeItem( FN_PARAM_2, m_pSh->GetObjSize())); aReq.Done(); } bAutoCap = true; @@ -473,7 +473,7 @@ void SwDrawBase::BreakCreate() void SwDrawBase::SetDrawPointer() { SdrView *pSdrView = m_pSh->GetDrawView(); - Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); + Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); aPnt = m_pWin->PixelToLogic(m_pWin->ScreenToOutputPixel(aPnt)); const Pointer aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut()); const Pointer aDrawPt(aPointTyp); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 5b14408bf170..6bc570387af3 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -503,7 +503,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) } else aNewAttr.Put(*pArgs); - break; + break; } case SID_PARA_DLG: { diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index b5de83ed9218..f0a3cc3d31b0 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -188,7 +188,7 @@ void SwDrawFormShell::GetState(SfxItemSet& rSet) uno::Reference< beans::XPropertySetInfo > xInfo = xPropSet->getPropertySetInfo(); if(xInfo->hasPropertyByName( "ButtonType" )) { - form::FormButtonType eButtonType = form::FormButtonType_URL; + form::FormButtonType eButtonType = form::FormButtonType_URL; aTmp = xPropSet->getPropertyValue( "ButtonType" ); if( aTmp >>= eButtonType ) { diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 5a13c7a1f5ba..f839e71615cf 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -384,22 +384,22 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) } break; case SID_CHARMAP: - { // Insert special character - InsertSymbol(rReq); - break; - } - case FN_INSERT_STRING: - { + { // Insert special character + InsertSymbol(rReq); + break; + } + case FN_INSERT_STRING: + { const SfxItemSet *pNewAttrs = rReq.GetArgs(); - sal_uInt16 nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pItem = nullptr; - if(pNewAttrs) + if(pNewAttrs) { - pNewAttrs->GetItemState(nSlot, false, &pItem ); - pOLV->InsertText(static_cast<const SfxStringItem *>(pItem)->GetValue()); + pNewAttrs->GetItemState(nSlot, false, &pItem ); + pOLV->InsertText(static_cast<const SfxStringItem *>(pItem)->GetValue()); } - break; - } + break; + } case SID_SELECTALL: { diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index ea73b2032ecd..95237f233af4 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -94,7 +94,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq ) rSh.MakeDrawView(); Size aDocSz( rSh.GetDocSize() ); - const SwRect& rVisArea = rSh.VisArea(); + const SwRect& rVisArea = rSh.VisArea(); Point aPos( rVisArea.Center() ); Size aSize; diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index 13e27d1a162c..c495e9b1b7aa 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -61,7 +61,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, if (rSh.BeginCreate(OBJ_FM_BUTTON, SdrInventor::FmForm, aStartPos)) { pSdrView->SetOrtho(false); - Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); + Size aSz(GetView().GetEditWin().PixelToLogic(Size(140, 20))); Point aEndPos(aSz.Width(), aSz.Height()); rSh.MoveCreate(aStartPos + aEndPos); diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 2b9603e28fca..58e9648c9c7d 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -499,9 +499,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) { //FN_INSERT_FRAME sal_uInt16 nAnchor = static_cast<sal_uInt16>(aMgr.GetAnchor()); - rReq.AppendItem(SfxUInt16Item(nSlot, nAnchor)); - rReq.AppendItem(SfxPointItem(FN_PARAM_1, rShell.GetObjAbsPos())); - rReq.AppendItem(SvxSizeItem(FN_PARAM_2, rShell.GetObjSize())); + rReq.AppendItem(SfxUInt16Item(nSlot, nAnchor)); + rReq.AppendItem(SfxPointItem(FN_PARAM_1, rShell.GetObjAbsPos())); + rReq.AppendItem(SvxSizeItem(FN_PARAM_2, rShell.GetObjSize())); rReq.Done(); } diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 0520e65184b4..1c77242e1af8 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -63,7 +63,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); const SfxItemSet *pArgs = rReq.GetArgs(); - int eState = STATE_TOGGLE; + int eState = STATE_TOGGLE; sal_uInt16 nWhich = rReq.GetSlot(); if(pArgs ) diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 48a668f25f0d..3a4dee55a4d5 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -141,7 +141,7 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent ) Swap( aPaperSize ); } - maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Width() ), FieldUnit::TWIP ); + maWidthHeightField->SetValue( maWidthHeightField->Normalize( aPaperSize.Width() ), FieldUnit::TWIP ); aWidthStr = localeDataWrapper.getNum( maWidthHeightField->GetValue(), maWidthHeightField->GetDecimalDigits(), diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx index 8e6b1b2d5046..76cadb99a208 100644 --- a/sw/source/uibase/uiview/formatclipboard.cxx +++ b/sw/source/uibase/uiview/formatclipboard.cxx @@ -99,7 +99,7 @@ std::unique_ptr<SfxItemSet> lcl_CreateEmptyItemSet( SelectionType nSelectionType void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh ) { SvxBrushItem aBrush( RES_BACKGROUND ); - rSh.GetBoxBackground(aBrush); + rSh.GetBoxBackground(aBrush); rSet.Put( aBrush ); if(rSh.GetRowBackground(aBrush)) { diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 466f05770c12..b94b017c2ad4 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -457,7 +457,7 @@ void SwPagePreviewWin::Command( const CommandEvent& rCEvt ) const CommandWheelData aDataNew(pData->GetDelta(),pData->GetNotchDelta(),COMMAND_WHEEL_PAGESCROLL, pData->GetMode(),pData->GetModifier(),pData->IsHorz(), pData->IsDeltaPixel()); const CommandEvent aEvent( rCEvt.GetMousePosPixel(),rCEvt.GetCommand(),rCEvt.IsMouseEvent(),&aDataNew); - bCallBase = !mrView.HandleWheelCommands( aEvent ); + bCallBase = !mrView.HandleWheelCommands( aEvent ); } else bCallBase = !mrView.HandleWheelCommands( rCEvt ); @@ -1676,12 +1676,12 @@ sal_uInt16 SwPagePreview::SetPrinter( SfxPrinter *pNew, SfxPrinterChangeFlags n SID_RULER_BORDERS, SID_RULER_PAGE_POS, 0 }; #if OSL_DEBUG_LEVEL > 0 - { - const sal_uInt16* pPtr = aInval + 1; - do { - OSL_ENSURE( *(pPtr - 1) < *pPtr, "wrong sorting!" ); - } while( *++pPtr ); - } + { + const sal_uInt16* pPtr = aInval + 1; + do { + OSL_ENSURE( *(pPtr - 1) < *pPtr, "wrong sorting!" ); + } while( *++pPtr ); + } #endif GetViewFrame()->GetBindings().Invalidate(aInval); diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index 763d6e7965b8..59e57d9f5888 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -107,15 +107,15 @@ void SwScrollbar::AutoShow() { long nVis = GetVisibleSize(); long nLen = GetRange().Len(); - if( nVis >= nLen - 1) - { - if(ScrollBar::IsVisible()) - ScrollBar::Show(false); - } - else if ( !ScrollBar::IsVisible() ) - { - ScrollBar::Show(); - } + if( nVis >= nLen - 1) + { + if(ScrollBar::IsVisible()) + ScrollBar::Show(false); + } + else if ( !ScrollBar::IsVisible() ) + { + ScrollBar::Show(); + } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 15c6926f021f..af8a22b53001 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -504,7 +504,7 @@ extern "C" IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) { - if ( GetEditWin().IsChainMode() ) + if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); //Opt: Not if PaintLocked. During unlock a notify will be once more triggered. diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 331309ef025a..a1d8b6b4b1f0 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -160,7 +160,7 @@ Point SwView::AlignToPixel(const Point &rPt) const void SwView::DocSzChgd(const Size &rSz) { -m_aDocSz = rSz; + m_aDocSz = rSz; if( !m_pWrtShell || m_aVisArea.IsEmpty() ) // no shell -> no change { diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 70b2bd98cf56..ca2aa004a257 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -378,7 +378,7 @@ void SwView::ExecSearch(SfxRequest& rReq) } nFound = FUNC_Search( aOpts ); // create it just to overwrite it with stack cursor - m_pWrtShell->CreateCursor(); + m_pWrtShell->CreateCursor(); // i#8288 restore the original cursor position m_pWrtShell->Pop(SwCursorShell::PopMode::DeleteCurrent); m_pWrtShell->EndAllAction(); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index a5f4c242097f..77d8c51b995d 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -623,7 +623,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq ) SvxTabStopItem aTabStops( static_cast<const SvxTabStopItem&>(pReqArgs-> Get( nWhich ))); aTabStops.SetWhich(RES_PARATR_TABSTOP); - const SvxTabStopItem& rDefTabs = rSh.GetDefault(RES_PARATR_TABSTOP); + const SvxTabStopItem& rDefTabs = rSh.GetDefault(RES_PARATR_TABSTOP); // Default tab at pos 0 SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} ); @@ -1474,7 +1474,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) aLR.SetWhich(nWhich); rSet.Put(aLR); } - break; + break; } case SID_ATTR_PARA_ULSPACE: diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 9dde82793d77..70c4647fd3ab 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1167,7 +1167,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption SfxViewFrame* pFrame = SfxViewFrame::LoadHiddenDocument( *pDocShell, SfxInterfaceId(7) ); SfxRequest aReq(FN_PRINT_PAGEPREVIEW, SfxCallMode::SYNCHRON, pDocShell->GetDoc()->GetAttrPool()); - aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true)); + aReq.AppendItem(SfxBoolItem(FN_PRINT_PAGEPREVIEW, true)); for ( int n = 0; n < xOptions.getLength(); ++n ) { @@ -2271,7 +2271,7 @@ void SwXTextDocument::updateLinks( ) throw DisposedException("", static_cast< XTextDocument* >(this)); SwDoc* pDoc = pDocShell->GetDoc(); - sfx2::LinkManager& rLnkMan = pDoc->getIDocumentLinksAdministration().GetLinkManager(); + sfx2::LinkManager& rLnkMan = pDoc->getIDocumentLinksAdministration().GetLinkManager(); if( !rLnkMan.GetLinks().empty() ) { UnoActionContext aAction(pDoc); diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 73693825f740..18c6341e20c8 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -58,9 +58,9 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt ) { TransferableDataHelper aData( rEvt.maDropEvent.Transferable ); - const DataFlavorExVector& rVector = aData.GetDataFlavorExVector(); - if(OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)) - { + const DataFlavorExVector& rVector = aData.GetDataFlavorExVector(); + if(OColumnTransferable::canExtractColumnDescriptor(rVector, ColumnTransferFormatFlags::COLUMN_DESCRIPTOR)) + { ODataAccessDescriptor aColDesc = OColumnTransferable::extractColumnDescriptor( aData); OUString sDBName; @@ -82,7 +82,7 @@ sal_Int8 ConditionEdit::ExecuteDrop( const ExecuteDropEvent& rEvt ) SetText( sDBName ); nRet = DND_ACTION_COPY; - } + } } return nRet; } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 7b630d16fe80..9d27cd0ef02f 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3642,7 +3642,7 @@ void SwContentLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::Ren void SwContentTree::DataChanged(const DataChangedEvent& rDCEvt) { - if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && + if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { FindActiveTypeAndRemoveUserData(); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 8e468e8f3910..e5d049f65ce9 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -937,7 +937,7 @@ void SwGlobalTree::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SfxStringItem aFactory(SID_NEWDOCDIRECT, SwDocShell::Factory().GetFilterContainer()->GetName()); - const SfxFrameItem* pItem = static_cast<const SfxFrameItem*>( + const SfxFrameItem* pItem = static_cast<const SfxFrameItem*>( rDispatch.ExecuteList(SID_NEWDOCDIRECT, SfxCallMode::SYNCHRON, { &aFactory })); |