diff options
36 files changed, 105 insertions, 104 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index dc2f0f1ab7c6..7ddb45878aaa 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -300,7 +300,7 @@ bool AccessibleShape::GetState (sal_Int16 aState) // OverWrite the parent's getAccessibleName method OUString SAL_CALL AccessibleShape::getAccessibleName() { - ThrowIfDisposed (); + ThrowIfDisposed (); if (m_pShape && !m_pShape->GetTitle().isEmpty()) return CreateAccessibleName() + " " + m_pShape->GetTitle(); else diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 12a6f3175059..7dad181c7d87 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -312,11 +312,11 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() } } } - } + } - // Return -1 to indicate that this object's parent does not know about the - // object. - return -1; + // Return -1 to indicate that this object's parent does not know about the + // object. + return -1; } diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index e36d20cf6589..32f8bf8db96b 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -487,7 +487,7 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe if( mpParent->mrParent.GetSelectIndexId() == mpParent->mnId ) { pStateSet->AddState( css::accessibility::AccessibleStateType::SELECTED ); - pStateSet->AddState( css::accessibility::AccessibleStateType::FOCUSED ); + pStateSet->AddState( css::accessibility::AccessibleStateType::FOCUSED ); } if ( mpParent->mnId >= mpParent->mrParent.FirstInView() && mpParent->mnId <= mpParent->mrParent.LastInView() ) { diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index c268899ad5c5..1c6982d4979a 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -894,7 +894,7 @@ double EnhancedCustomShape2d::GetEquationValueAsDouble( const sal_Int32 nIndex ) { SAL_WARN("svx", "EnhancedCustomShape2d::GetEquationValueAsDouble failed"); } - nLevel --; + nLevel --; } SAL_INFO( "svx", diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 90d5c75108b2..9601fd4c88da 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -705,12 +705,12 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor2Item( aAmbientSpot2Color ) ); pScene->GetProperties().SetObjectItem( makeSvx3DLightDirection2Item( aSpotLight2 ) ); - sal_uInt8 nSpotLight3 = 70; - basegfx::B3DVector aSpotLight3( 0.0, 0.0, 1.0 ); - pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff3Item( true ) ); - Color aAmbientSpot3Color( nSpotLight3, nSpotLight3, nSpotLight3 ); - pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor3Item( aAmbientSpot3Color ) ); - pScene->GetProperties().SetObjectItem( makeSvx3DLightDirection3Item( aSpotLight3 ) ); + sal_uInt8 nSpotLight3 = 70; + basegfx::B3DVector aSpotLight3( 0.0, 0.0, 1.0 ); + pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff3Item( true ) ); + Color aAmbientSpot3Color( nSpotLight3, nSpotLight3, nSpotLight3 ); + pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor3Item( aAmbientSpot3Color ) ); + pScene->GetProperties().SetObjectItem( makeSvx3DLightDirection3Item( aSpotLight3 ) ); double fSpecular = GetDouble( rGeometryItem, "Specularity", 0 ) / 100; bool bMetal = GetBool( rGeometryItem, "Metal", false ); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index aa5e1577aa04..fbd186bcc893 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -267,7 +267,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * const Size aTbxSize( m_pTbx1->CalcWindowSizePixel() ); Point aPos( m_pTbx1->GetPosPixel() ); - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; aMiscOptions.AddListenerLink( LINK( this, SvxSuperContourDlg, MiscHdl ) ); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 3403558c16bf..0770d0be6361 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1203,8 +1203,8 @@ BrokenRecoveryDialog::~BrokenRecoveryDialog() void BrokenRecoveryDialog::impl_refresh() { - m_bExecutionNeeded = false; - TURLList& rURLList = m_pCore->getURLListAccess(); + m_bExecutionNeeded = false; + TURLList& rURLList = m_pCore->getURLListAccess(); for (const TURLInfo& rInfo : rURLList) { if (m_bBeforeRecovery) diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 9f9334bfe543..7bc0df78cf2d 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -169,7 +169,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pVDev = VclPtr<VirtualDevice>::Create(*pDev); pVDev->SetMapMode(pDev->GetMapMode()); pVDev->EnableRTL( IsRTLEnabled() ); - pVDev->SetOutputSize( aRectSize ); + pVDev->SetOutputSize( aRectSize ); aOrgRect = aRect; pVDev->SetFillColor( aBackColor ); pVDev->SetLineColor(COL_LIGHTGRAY); @@ -544,7 +544,7 @@ void NumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pVDev = VclPtr<VirtualDevice>::Create(*pDev); pVDev->SetMapMode(pDev->GetMapMode()); pVDev->EnableRTL( IsRTLEnabled() ); - pVDev->SetOutputSize( aRectSize ); + pVDev->SetOutputSize( aRectSize ); aOrgRect = aRect; pVDev->SetFillColor( aBackColor ); pVDev->SetLineColor(COL_LIGHTGRAY); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index f8454b647a48..7524ddb689ae 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1345,7 +1345,7 @@ long SvxRuler::GetCorrectedDragPos( bool bLeft, bool bRight ) const long lNullPix = Ruler::GetNullOffset(); long lDragPos = GetDragPos() + lNullPix; ADD_DEBUG_TEXT("lDragPos: ", OUString::number(lDragPos)) - bool bHoriRows = bHorz && mxRulerImpl->bIsTableRows; + bool bHoriRows = bHorz && mxRulerImpl->bIsTableRows; if((bLeft || bHoriRows) && lDragPos < nMaxLeft) lDragPos = nMaxLeft; else if((bRight||bHoriRows) && lDragPos > nMaxRight) diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index 04bac4157564..725dffa0c4d3 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -86,7 +86,7 @@ namespace drawinglayer { // PolygonHairlinePrimitive3D const primitive3d::PolygonHairlinePrimitive3D& rPrimitive = static_cast< const primitive3d::PolygonHairlinePrimitive3D& >(rCandidate); - const basegfx::B3DPolygon& rPolygon = rPrimitive.getB3DPolygon(); + const basegfx::B3DPolygon& rPolygon = rPrimitive.getB3DPolygon(); const sal_uInt32 nCount(rPolygon.count()); for(sal_uInt32 a(0); a < nCount; a++) @@ -105,7 +105,7 @@ namespace drawinglayer { // PolyPolygonMaterialPrimitive3D const primitive3d::PolyPolygonMaterialPrimitive3D& rPrimitive = static_cast< const primitive3d::PolyPolygonMaterialPrimitive3D& >(rCandidate); - const basegfx::B3DPolyPolygon& rPolyPolygon = rPrimitive.getB3DPolyPolygon(); + const basegfx::B3DPolyPolygon& rPolyPolygon = rPrimitive.getB3DPolyPolygon(); const sal_uInt32 nPolyCount(rPolyPolygon.count()); for(sal_uInt32 a(0); a < nPolyCount; a++) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 7275f216e38e..6108564cea87 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2255,7 +2255,7 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) Any aSelection = xSelSupplier->getSelection(); DBG_ASSERT(aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE, "FmXGridPeer::selectionChanged : invalid selection !"); Reference< XPropertySet > xSelection; - aSelection >>= xSelection; + aSelection >>= xSelection; if (xSelection.is()) { Reference< XPropertySet > xCol; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 88ce72814899..73d6cbc391a7 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -726,7 +726,7 @@ namespace svxform void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) { - if ( _rEvent.ScriptType == "VBAInterop" ) + if ( _rEvent.ScriptType == "VBAInterop" ) return; // not handled here ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 810f18f08b27..942109f61000 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -559,16 +559,16 @@ namespace svx for (const auto& rFeature : _rDispatchers) { SfxSlotId nSlotId( rFeature.first ); - #if OSL_DEBUG_LEVEL > 0 - OUString sUnoSlotName; - if ( SfxGetpApp() ) - sUnoSlotName = lcl_getUnoSlotName( nSlotId ); - else - sUnoSlotName = "<unknown>"; - OString sUnoSlotNameAscii( "\"" ); - sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); - sUnoSlotNameAscii += "\""; - #endif +#if OSL_DEBUG_LEVEL > 0 + OUString sUnoSlotName; + if ( SfxGetpApp() ) + sUnoSlotName = lcl_getUnoSlotName( nSlotId ); + else + sUnoSlotName = "<unknown>"; + OString sUnoSlotNameAscii( "\"" ); + sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); + sUnoSlotNameAscii += "\""; +#endif if ( _bTranslateLatin ) { @@ -597,22 +597,22 @@ namespace svx bool bIsInPool = rPool.IsInRange( nWhich ); if ( bIsInPool ) { - #if OSL_DEBUG_LEVEL > 0 - bool bFeatureIsEnabled = rFeature.second->isFeatureEnabled(); - OString sMessage = "found a feature state for " + sUnoSlotNameAscii; - if ( !bFeatureIsEnabled ) - sMessage += " (disabled)"; - SAL_INFO("svx.form", sMessage ); - #endif +#if OSL_DEBUG_LEVEL > 0 + bool bFeatureIsEnabled = rFeature.second->isFeatureEnabled(); + OString sMessage = "found a feature state for " + sUnoSlotNameAscii; + if ( !bFeatureIsEnabled ) + sMessage += " (disabled)"; + SAL_INFO("svx.form", sMessage ); +#endif lcl_translateUnoStateToItem( nSlotId, rFeature.second->getFeatureState(), _rSet ); } - #if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 else { SAL_WARN("svx.form", "found a feature state for " << sUnoSlotNameAscii << ", but could not translate it into an item!" ); } - #endif +#endif } } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index ab967ceab0fd..afc4e2ca8b63 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1581,7 +1581,7 @@ namespace svxform if (m_nFormsSelected > 0) { // ... only forms // first of all collect PropertySet-Interfaces of the forms - SvLBoxEntrySortedArray::const_iterator it = m_arrCurrentSelection.begin(); + SvLBoxEntrySortedArray::const_iterator it = m_arrCurrentSelection.begin(); for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i ) { FmFormData* pFormData = static_cast<FmFormData*>((*it)->GetUserData()); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 3b61f6356f30..98d3b14dfbe8 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -794,7 +794,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpCurTheme->GetGraphic( nPos, aGraphic ); mpPreview->SetGraphic( aGraphic ); - mpPreview->Show(); + mpPreview->Show(); if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SgaObjKind::Sound ) GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index d36a2b59ac0d..67ef117a24b1 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -259,8 +259,8 @@ bool CreateDir( const INetURLObject& rURL ) aProps[0] = "Title"; aValues[0] <<= rURL.GetName(); - ::ucbhelper::Content aContent( rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aCmdEnv, comphelper::getProcessComponentContext() ); - bRet = aParent.insertNewContent( "application/vnd.sun.staroffice.fsys-folder", aProps, aValues, aContent ); + ::ucbhelper::Content aContent( rURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aCmdEnv, comphelper::getProcessComponentContext() ); + bRet = aParent.insertNewContent( "application/vnd.sun.staroffice.fsys-folder", aProps, aValues, aContent ); } catch( const ucb::ContentCreationException& ) { diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index 3a01278f2e1b..9acef8175f33 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -209,7 +209,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::crea if(mpExtractor && pPage) { // get displayed page's geometry - drawinglayer::primitive2d::Primitive2DContainer xPageContent; + drawinglayer::primitive2d::Primitive2DContainer xPageContent; const Size aPageSize(pPage->GetSize()); const double fPageWidth(aPageSize.getWidth()); const double fPageHeight(aPageSize.getHeight()); diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index a1fa52810eb2..14f49046893e 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -186,7 +186,7 @@ namespace sdr drawinglayer::primitive2d::Primitive2DContainer OverlaySelection::getOverlayObjectPrimitive2DSequence() const { // get current values - const OverlayType aNewOverlayType(impCheckPossibleOverlayType(meOverlayType)); + const OverlayType aNewOverlayType(impCheckPossibleOverlayType(meOverlayType)); const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; const sal_uInt16 nNewTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent()); diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 0d13c56091d5..806d4038e7a4 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -501,7 +501,7 @@ namespace drawinglayer attribute::FillGradientAttribute aGradient; attribute::FillHatchAttribute aHatch; attribute::SdrFillGraphicAttribute aFillGraphic; - return attribute::SdrFillAttribute( + return attribute::SdrFillAttribute( 1, basegfx::BColor( 0, 0, 0 ), aGradient, diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index d0067a99f683..fa8c554fa0be 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -85,7 +85,7 @@ namespace drawinglayer basegfx::B2DPolygon aExpandedUnitOutline(basegfx::utils::createPolygonFromRect(aExpandedRange)); aExpandedUnitOutline.transform(getTransform()); - aRetval.push_back( + aRetval.push_back( createPolygonLinePrimitive( aExpandedUnitOutline, getSdrLFSTAttribute().getLine(), @@ -96,7 +96,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - aRetval.push_back( + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 6c4e2f6bdadf..cde617b806ac 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -116,7 +116,7 @@ namespace drawinglayer basegfx::B2DPolygon aExpandedUnitOutline(basegfx::utils::createPolygonFromRect(aExpandedRange)); aExpandedUnitOutline.transform(getTransform()); - aRetval.push_back( + aRetval.push_back( createPolygonLinePrimitive( aExpandedUnitOutline, getSdrLFSTAttribute().getLine(), @@ -127,7 +127,7 @@ namespace drawinglayer basegfx::B2DPolygon aTransformed(aUnitOutline); aTransformed.transform(getTransform()); - aRetval.push_back( + aRetval.push_back( createPolygonLinePrimitive( aTransformed, getSdrLFSTAttribute().getLine(), diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index bfd03eeb1905..e414b91d4b62 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -490,7 +490,7 @@ void NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ _pSet->pNumSetting->sPrefix = aFmt.GetPrefix(); _pSet->pNumSetting->sSuffix = aFmt.GetSuffix(); - _pSet->pNumSetting->nNumberType = eNumType; + _pSet->pNumSetting->nNumberType = eNumType; _pSet->bIsCustomized = true; SvxNumRule aTmpRule1(aNum); @@ -643,8 +643,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m const SvxNumberFormat& aFmt(aNum.GetLevel(iLevel)); const OUString& sPrefix = aFmt.GetPrefix(); const OUString& sLclSuffix = aFmt.GetSuffix(); - sal_Int16 eNumType = aFmt.GetNumberingType(); - if( eNumType == SVX_NUM_CHAR_SPECIAL) + sal_Int16 eNumType = aFmt.GetNumberingType(); + if( eNumType == SVX_NUM_CHAR_SPECIAL) { sal_Unicode cChar = aFmt.GetBulletChar(); sal_Unicode ccChar = _pSet->sBulletChar[0]; @@ -856,7 +856,7 @@ void OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 { aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? aNum.GetLevelCount() : 0)); aFmt.SetCharFormatName(GetNumCharFmtName()); - if (isResetSize) aFmt.SetBulletRelSize(100); + if (isResetSize) aFmt.SetBulletRelSize(100); } if(pNumSettingsArr->size() > i) { aFmt.SetLabelFollowedBy(pLevelSettings->eLabelFollowedBy); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index dc54c3a59336..f382299d9be3 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1724,8 +1724,8 @@ void SdrEditView::GroupMarked() --nm; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); - AddUndoActions( CreateConnectorUndo( *pObj ) ); - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoRemoveObject( *pObj )); + AddUndoActions( CreateConnectorUndo( *pObj ) ); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoRemoveObject( *pObj )); } } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index eef8f83fc9bb..4e3f67431c22 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -295,35 +295,35 @@ OUString SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) cons if ( _nRow >= 0 && _nRow < static_cast<sal_Int32>(aList.size()) ) { auto& pEntry = aList[_nRow]; - if ( pEntry->bComment ) - { - if (_nColId == ITEMBROWSER_NAMECOL_ID) - sRet = pEntry->aName; - } - else + if ( pEntry->bComment ) + { + if (_nColId == ITEMBROWSER_NAMECOL_ID) + sRet = pEntry->aName; + } + else + { + sRet = "???"; + switch (_nColId) { - sRet = "???"; - switch (_nColId) + case ITEMBROWSER_WHICHCOL_ID: + sRet = OUString::number( pEntry->nWhichId ); break; + case ITEMBROWSER_STATECOL_ID: { - case ITEMBROWSER_WHICHCOL_ID: - sRet = OUString::number( pEntry->nWhichId ); break; - case ITEMBROWSER_STATECOL_ID: + switch (pEntry->eState) { - switch (pEntry->eState) - { - case SfxItemState::UNKNOWN : sRet = "Unknown"; break; - case SfxItemState::DISABLED: sRet = "Disabled"; break; - case SfxItemState::DONTCARE: sRet = "DontCare"; break; - case SfxItemState::SET : sRet = "Set"; break; - case SfxItemState::DEFAULT : sRet = "Default"; break; - case SfxItemState::READONLY: sRet = "ReadOnly"; break; - } // switch - } break; - case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break; - case ITEMBROWSER_NAMECOL_ID: sRet = pEntry->aName; break; - case ITEMBROWSER_VALUECOL_ID: sRet = pEntry->aValue; break; - } // switch - } + case SfxItemState::UNKNOWN : sRet = "Unknown"; break; + case SfxItemState::DISABLED: sRet = "Disabled"; break; + case SfxItemState::DONTCARE: sRet = "DontCare"; break; + case SfxItemState::SET : sRet = "Set"; break; + case SfxItemState::DEFAULT : sRet = "Default"; break; + case SfxItemState::READONLY: sRet = "ReadOnly"; break; + } // switch + } break; + case ITEMBROWSER_TYPECOL_ID: sRet = pEntry->GetItemTypeStr(); break; + case ITEMBROWSER_NAMECOL_ID: sRet = pEntry->aName; break; + case ITEMBROWSER_VALUECOL_ID: sRet = pEntry->aValue; break; + } // switch + } } return sRet; } diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index cc7e61c9dfe9..4a4bec00afc8 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -901,8 +901,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const too if (bUnt2) aXP[2].setY(aBewareRect2.Bottom() ); //+=500; if (pnQuality!=nullptr) { long nQ=std::abs(aXP[1].X()-aXP[0].X())+std::abs(aXP[1].Y()-aXP[0].Y()); - nQ+=std::abs(aXP[2].X()-aXP[1].X())+std::abs(aXP[2].Y()-aXP[1].Y()); - nQ+=std::abs(aXP[3].X()-aXP[2].X())+std::abs(aXP[3].Y()-aXP[2].Y()); + nQ+=std::abs(aXP[2].X()-aXP[1].X())+std::abs(aXP[2].Y()-aXP[1].Y()); + nQ+=std::abs(aXP[3].X()-aXP[2].X())+std::abs(aXP[3].Y()-aXP[2].Y()); *pnQuality=nQ; } if (bInfo) { @@ -1979,7 +1979,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat) rDragStat.GetView()->HideConnectMarker(); } - return true; + return true; } OUString SdrEdgeObj::getSpecialDragComment(const SdrDragStat& rDrag) const diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index bb70c3e8e9c4..c887ff06ab5d 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -425,7 +425,7 @@ namespace const double fSin(sin(fShearValue)); const double fCos(cos(fShearValue)); - aNewTransformB.shearX(-fSin); + aNewTransformB.shearX(-fSin); // Scale may lead to objects without height since fCos == 0.0 is possible. // Renderers need to handle that, it's not a forbidden value and does not @@ -448,7 +448,7 @@ namespace // scale in X to make as tight as needed. As with XFT_SLANT_X, this may // lead to primitives without width which the renderers will handle - aNewTransformA.scale(fCos, 1.0); + aNewTransformA.scale(fCos, 1.0); aNewTransformB.translate(aStartPos.getX(), aStartPos.getY()); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 90d6d687c81b..6e527f4ead8f 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1506,7 +1506,7 @@ void SdrPage::SetInserted( bool bIns ) // #i120437# go over whole hierarchy, not only over object level null (seen from grouping) SdrObjListIter aIter(this, SdrIterMode::DeepNoGroups); - while ( aIter.IsMore() ) + while ( aIter.IsMore() ) { SdrObject* pObj = aIter.Next(); if ( dynamic_cast<const SdrOle2Obj* >(pObj) != nullptr ) diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 940da6b700c5..232280b8d5d8 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -282,7 +282,8 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen double a=static_cast<double>(y0-nTop)/nHgt; a*=dy; rPnt.setY(y0+FRound(a) ); - } return 0.0; + } + return 0.0; } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 4b6f00928075..8201006ac17f 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -650,7 +650,7 @@ Graphic SdrExchangeView::GetObjGraphic(const SdrObject& rSdrObject) } } - return aRet; + return aRet; } diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 7a17b1027768..205d65890225 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -739,7 +739,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh void SAL_CALL AccessibleTableShape::clearAccessibleSelection() { - SolarMutexGuard aSolarGuard; + SolarMutexGuard aSolarGuard; SvxTableController* pController = getTableController(); if( pController ) @@ -749,7 +749,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() { - SolarMutexGuard aSolarGuard; + SolarMutexGuard aSolarGuard; // todo: force selection of shape? SvxTableController* pController = getTableController(); @@ -800,7 +800,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) { - SolarMutexGuard aSolarGuard; + SolarMutexGuard aSolarGuard; CellPos aPos; mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow ); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 5a69a8bf83c9..535ca23d7f55 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1476,7 +1476,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, too // supporting full width for vertical text. // if( SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting()) // { - rOutliner.SetMinAutoPaperSize(Size(aAnkRect.GetWidth(), 0)); + rOutliner.SetMinAutoPaperSize(Size(aAnkRect.GetWidth(), 0)); // } // else if(SDRTEXTVERTADJUST_BLOCK == eVAdj && IsVerticalWriting()) // { @@ -1647,7 +1647,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* aPaperMax=aMaxSiz; - aPaperMin.setWidth( aAnkSiz.Width() ); + aPaperMin.setWidth( aAnkSiz.Width() ); if (pViewMin!=nullptr) { @@ -2237,7 +2237,7 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag) case SdrHdlKind::Move: { - NbcMove( Size( rDrag.GetDX(), rDrag.GetDY() ) ); + NbcMove( Size( rDrag.GetDX(), rDrag.GetDY() ) ); break; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 831ba579d761..2441f6dc778e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2473,7 +2473,7 @@ struct SvxStyleToolBoxControl::Impl if(bSpecModeWriter) { Reference<container::XNameAccess> xParaStyles; - xStylesSupplier->getStyleFamilies()->getByName("ParagraphStyles") >>= + xStylesSupplier->getStyleFamilies()->getByName("ParagraphStyles") >>= xParaStyles; static const std::vector<OUString> aWriterStyles = { diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index a3617a8362cf..3ef977acedbf 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -236,7 +236,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { // Clear SearchLabel when altering the search string #if HAVE_FEATURE_DESKTOP - SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::Empty); + SvxSearchDialogWrapper::SetSearchLabel(SearchLabel::Empty); #endif const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 4959b44d99a1..5366297fe4d7 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -586,7 +586,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi if( nSID == SID_EXTRUSION_TOGGLE ) { - static const sal_uInt16 SidArray[] = { + static const sal_uInt16 SidArray[] = { SID_EXTRUSION_TILT_DOWN, SID_EXTRUSION_TILT_UP, SID_EXTRUSION_TILT_LEFT, diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index a353fd19336d..e820fe660d22 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -330,7 +330,7 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn++; if( nTreeFlags & SvTreeFlags::CHKBTN ) nColumn++; - if( nColumn < nCount ) + if( nColumn < nCount ) pItem = &pEntry->GetItem( nColumn ); } return pItem; diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 33a9b8ca0723..8da3c0d9f203 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -696,7 +696,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const if(nullptr != pSdrGrafObj) { - const Graphic& rGraphic(pSdrGrafObj->GetGraphic()); + const Graphic& rGraphic(pSdrGrafObj->GetGraphic()); if(GraphicType::Bitmap == rGraphic.GetType()) { |