diff options
Diffstat (limited to 'sw')
25 files changed, 146 insertions, 149 deletions
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 0dd08e34ea56..9cf0253601ca 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -309,11 +309,11 @@ bool SwAccessibleFrameBase::GetSelectedState( ) // SELETED. SwFlyFrame* pFlyFrame = getFlyFrame(); const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat(); - const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); - const SwPosition *pPos = pAnchor.GetContentAnchor(); + const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); + const SwPosition *pPos = rAnchor.GetContentAnchor(); if( !pPos ) return false; - int pIndex = pPos->nContent.GetIndex(); + int nIndex = pPos->nContent.GetIndex(); if( pPos->nNode.GetNode().GetTextNode() ) { SwPaM* pCursor = GetCursor(); @@ -336,13 +336,13 @@ bool SwAccessibleFrameBase::GetSelectedState( ) sal_uLong nEndIndex = pEnd->nNode.GetIndex(); if( ( nHere >= nStartIndex ) && (nHere <= nEndIndex) ) { - if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) + if( rAnchor.GetAnchorId() == FLY_AS_CHAR ) { - if( ((nHere == nStartIndex) && (pIndex >= pStart->nContent.GetIndex())) || (nHere > nStartIndex) ) - if( ((nHere == nEndIndex) && (pIndex < pEnd->nContent.GetIndex())) || (nHere < nEndIndex) ) + if( ((nHere == nStartIndex) && (nIndex >= pStart->nContent.GetIndex())) || (nHere > nStartIndex) ) + if( ((nHere == nEndIndex) && (nIndex < pEnd->nContent.GetIndex())) || (nHere < nEndIndex) ) return true; } - else if( pAnchor.GetAnchorId() == FLY_AT_PARA ) + else if( rAnchor.GetAnchorId() == FLY_AT_PARA ) { if( ((nHere > nStartIndex) || pStart->nContent.GetIndex() ==0 ) && (nHere < nEndIndex ) ) diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 0f1f9d255fdc..7449a394c87b 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1156,7 +1156,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() { while( aIter != aEndIter ) { - SwAccessibleChild pFrame( (*aIter).first ); + SwAccessibleChild aFrame( (*aIter).first ); const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr; if( !pFrameFormat ) @@ -1164,10 +1164,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() ++aIter; continue; } - const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); - const SwPosition *pPos = pAnchor.GetContentAnchor(); + const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); + const SwPosition *pPos = rAnchor.GetContentAnchor(); - if(pAnchor.GetAnchorId() == FLY_AT_PAGE) + if(rAnchor.GetAnchorId() == FLY_AT_PAGE) { uno::Reference < XAccessible > xAcc( (*aIter).second ); if(xAcc.is()) @@ -1184,7 +1184,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() } if( pPos->nNode.GetNode().GetTextNode() ) { - int pIndex = pPos->nContent.GetIndex(); + int nIndex = pPos->nContent.GetIndex(); bool bMarked = false; if( pCursor != nullptr ) { @@ -1204,10 +1204,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() sal_uLong nEndIndex = pEnd->nNode.GetIndex(); if( ( nHere >= nStartIndex ) && (nHere <= nEndIndex) ) { - if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) + if( rAnchor.GetAnchorId() == FLY_AS_CHAR ) { - if( ( ((nHere == nStartIndex) && (pIndex >= pStart->nContent.GetIndex())) || (nHere > nStartIndex) ) - &&( ((nHere == nEndIndex) && (pIndex < pEnd->nContent.GetIndex())) || (nHere < nEndIndex) ) ) + if( ( ((nHere == nStartIndex) && (nIndex >= pStart->nContent.GetIndex())) || (nHere > nStartIndex) ) + &&( ((nHere == nEndIndex) && (nIndex < pEnd->nContent.GetIndex())) || (nHere < nEndIndex) ) ) { uno::Reference < XAccessible > xAcc( (*aIter).second ); if( xAcc.is() ) @@ -1220,7 +1220,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() static_cast < ::accessibility::AccessibleShape* >(xAcc.get())->ResetState( AccessibleStateType::SELECTED ); } } - else if( pAnchor.GetAnchorId() == FLY_AT_PARA ) + else if( rAnchor.GetAnchorId() == FLY_AT_PARA ) { if( ((nHere > nStartIndex) || pStart->nContent.GetIndex() ==0 ) && (nHere < nEndIndex ) ) @@ -1286,8 +1286,8 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat(); if (pFrameFormat) { - const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); - if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) + const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); + if( rAnchor.GetAnchorId() == FLY_AS_CHAR ) { uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent(); if (xAccParent.is()) @@ -1557,8 +1557,8 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa SwFrameFormat *pFrameFormat = pObj ? FindFrameFormat( pObj ) : nullptr; if (pFrameFormat) { - const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); - if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) + const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); + if( rAnchor.GetAnchorId() == FLY_AS_CHAR ) { uno::Reference< XAccessible > xPara = pAccShape->getAccessibleParent(); if (xPara.is()) diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 825876c812fb..e8b502a31fc9 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -3817,8 +3817,7 @@ sal_Int16 SAL_CALL SwAccessibleParagraph::getAccessibleRole() throw (css::uno::R sal_Int32 SwAccessibleParagraph::GetRealHeadingLevel() { uno::Reference< css::beans::XPropertySet > xPortion = CreateUnoPortion( 0, 0 ); - OUString pString = "ParaStyleName"; - uno::Any styleAny = xPortion->getPropertyValue( pString ); + uno::Any styleAny = xPortion->getPropertyValue( "ParaStyleName" ); OUString sValue; if (styleAny >>= sValue) { diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index dd674de28d30..8827404d44a5 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -125,11 +125,11 @@ static bool lcl_getSelectedState(const SwAccessibleChild& aChild, Reference<XAccessibleStateSet> pRStateSet = pRContext->getAccessibleStateSet(); if( pRStateSet.is() ) { - Sequence<short> pStates = pRStateSet->getStates(); - sal_Int32 count = pStates.getLength(); + Sequence<short> aStates = pRStateSet->getStates(); + sal_Int32 count = aStates.getLength(); for( sal_Int32 i = 0; i < count; i++ ) { - if( pStates[i] == AccessibleStateType::SELECTED) + if( aStates[i] == AccessibleStateType::SELECTED) return true; } } @@ -300,11 +300,11 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat(); if (pFrameFormat) { - const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor(); - if( pAnchor.GetAnchorId() == FLY_AS_CHAR ) + const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor(); + if( rAnchor.GetAnchorId() == FLY_AS_CHAR ) { - const SwFrame *pParaFrame = SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrame), m_rContext.IsInPagePreview() ); - aChild = pParaFrame; + const SwFrame *pParaFrame = SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrame), m_rContext.IsInPagePreview() ); + aChild = pParaFrame; } } } diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index de9853bc94b6..6e97ba4f04ab 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -95,8 +95,8 @@ static void lcl_notifyRow(const SwContentNode* pNode, SwCursorShell& rShell) { if (pContent->GetType() == SwFrameType::Tab) { - SwFormatFrameSize pSize = pLine->GetFrameFormat()->GetFrameSize(); - pRow->ModifyNotification(nullptr, &pSize); + SwFormatFrameSize aSize = pLine->GetFrameFormat()->GetFrameSize(); + pRow->ModifyNotification(nullptr, &aSize); return; } } diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index bd827289f405..5cb63da189d2 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -264,9 +264,9 @@ void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater) void ContentIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent) { - SwRedlineTable const & pRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable(); + SwRedlineTable const & rRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable(); long int nIdx = 0; - for (const SwRangeRedline* pRdl : pRedlineTable) + for (const SwRangeRedline* pRdl : rRedlineTable) { int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nContent ); int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nContent ) : diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 1e5ac689e0ae..2a02b440d4cf 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -485,10 +485,10 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag const ::std::vector<OUString>& (*pStringsFetchFunc)() = std::get<2>( *entry ); if ( pStringsFetchFunc ) { - const ::std::vector<OUString>& pStrings = pStringsFetchFunc(); + const ::std::vector<OUString>& rStrings = pStringsFetchFunc(); sal_uInt16 nIndex, nId; for ( nIndex = 0, nId = std::get<0>( *entry ) ; nId < std::get<1>( *entry ) ; nId++, nIndex++ ) - (*pHash)[pStrings[nIndex]] = nId; + (*pHash)[rStrings[nIndex]] = nId; } } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 3462e97f08f2..2c54cfe95b9d 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1123,8 +1123,8 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const { if( pNames ) { - OUString pTmp(static_cast<const SwFormatRefMark*>(pItem)->GetRefName()); - pNames->insert(pNames->begin() + nCount, pTmp); + OUString aTmp(static_cast<const SwFormatRefMark*>(pItem)->GetRefName()); + pNames->insert(pNames->begin() + nCount, aTmp); } ++nCount; } diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index eb955f673b14..1f9e8eff90d7 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -146,8 +146,8 @@ bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rT if (pTableCellRedline) { const SwTableBox *pRedTabBox = &pTableCellRedline->GetTableBox(); - const SwTable& pRedTable = pRedTabBox->GetSttNd()->FindTableNode()->GetTable(); - if ( &pRedTable == &rTable ) + const SwTable& rRedTable = pRedTabBox->GetSttNd()->FindTableNode()->GetTable(); + if ( &rRedTable == &rTable ) { // Redline for this table const SwRedlineData& aRedlineData = pTableCellRedline->GetRedlineData(); @@ -169,9 +169,9 @@ bool SwExtraRedlineTable::DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rT if (pTableRowRedline) { const SwTableLine *pRedTabLine = &pTableRowRedline->GetTableLine(); - const SwTableBoxes &pRedTabBoxes = pRedTabLine->GetTabBoxes(); - const SwTable& pRedTable = pRedTabBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); - if ( &pRedTable == &rTable ) + const SwTableBoxes &rRedTabBoxes = pRedTabLine->GetTabBoxes(); + const SwTable& rRedTable = rRedTabBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); + if ( &rRedTable == &rTable ) { // Redline for this table const SwRedlineData& aRedlineData = pTableRowRedline->GetRedlineData(); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b7e89b472ea5..b9ab3aa3c7e5 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2157,13 +2157,13 @@ void DrawGraphic( GraphicObject *pGrf = const_cast<GraphicObject*>(pBrush->GetGraphicObject()); if ( bConsiderBackgroundTransparency ) { - GraphicAttr pGrfAttr = pGrf->GetAttr(); - if ( (pGrfAttr.GetTransparency() != 0) && + GraphicAttr aGrfAttr = pGrf->GetAttr(); + if ( (aGrfAttr.GetTransparency() != 0) && (pBrush->GetColor() == COL_TRANSPARENT) ) { bTransparentGrfWithNoFillBackgrd = true; - nGrfTransparency = pGrfAttr.GetTransparency(); + nGrfTransparency = aGrfAttr.GetTransparency(); } } if ( pGrf->IsTransparent() ) diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx index 1c6aadeac4e6..0a20e999790a 100644 --- a/sw/source/core/swg/SwXMLBlockExport.cxx +++ b/sw/source/core/swg/SwXMLBlockExport.cxx @@ -52,7 +52,7 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) XML_LIST_NAME, OUString (rBlockList.GetName())); { - SvXMLElementExport pRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true); + SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST, XML_BLOCK_LIST, true, true); sal_uInt16 nBlocks= rBlockList.GetCount(); for ( sal_uInt16 i = 0; i < nBlocks; i++) { diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 009d5660fe3e..07e6027f43c1 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -4223,9 +4223,9 @@ namespace { { mrTextNode.RemoveFromList(); - const SwNumRuleItem& pNumRuleItem = + const SwNumRuleItem& rNumRuleItem = dynamic_cast<const SwNumRuleItem&>(pItem); - if ( !pNumRuleItem.GetValue().isEmpty() ) + if ( !rNumRuleItem.GetValue().isEmpty() ) { mbAddTextNodeToList = true; // #i105562# @@ -4238,12 +4238,12 @@ namespace { // handle RES_PARATR_LIST_ID case RES_PARATR_LIST_ID: { - const SfxStringItem& pListIdItem = + const SfxStringItem& rListIdItem = dynamic_cast<const SfxStringItem&>(pItem); - OSL_ENSURE( pListIdItem.GetValue().getLength() > 0, + OSL_ENSURE( rListIdItem.GetValue().getLength() > 0, "<HandleSetAttrAtTextNode(..)> - empty list id attribute not excepted. Serious defect." ); const OUString sListIdOfTextNode = rTextNode.GetListId(); - if ( pListIdItem.GetValue() != sListIdOfTextNode ) + if ( rListIdItem.GetValue() != sListIdOfTextNode ) { mbAddTextNodeToList = true; if ( mrTextNode.IsInList() ) diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 4c9a42176bb7..edee1e0c5519 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1018,10 +1018,10 @@ public: { m_vPropertyValues.clear(); } void Apply(SwXStyle& rStyle) { - for(auto& pPropertyPair : m_vPropertyValues) + for(const auto& rPropertyPair : m_vPropertyValues) { - if(pPropertyPair.second.hasValue()) - rStyle.setPropertyValue(pPropertyPair.first, pPropertyPair.second); + if(rPropertyPair.second.hasValue()) + rStyle.setPropertyValue(rPropertyPair.first, rPropertyPair.second); } } static void GetProperty(const OUString &rPropertyName, const uno::Reference < beans::XPropertySet > &rxPropertySet, uno::Any& rAny ) @@ -1588,34 +1588,34 @@ void SwXStyle::SetPropertyValue<FN_UNO_NUM_RULES>(const SfxItemPropertySimpleEnt if(!pFormat) continue; SwNumFormat aFormat(*pFormat); - const auto pCharName(pSwXRules->GetNewCharStyleNames()[i]); - if(!pCharName.isEmpty() - && !SwXNumberingRules::isInvalidStyle(pCharName) - && (!pFormat->GetCharFormat() || pFormat->GetCharFormat()->GetName() != pCharName)) + const auto& rCharName(pSwXRules->GetNewCharStyleNames()[i]); + if(!rCharName.isEmpty() + && !SwXNumberingRules::isInvalidStyle(rCharName) + && (!pFormat->GetCharFormat() || pFormat->GetCharFormat()->GetName() != rCharName)) { auto pCharFormatIt(std::find_if(m_pDoc->GetCharFormats()->begin(), m_pDoc->GetCharFormats()->end(), - [&pCharName] (SwCharFormat* pF) { return pF->GetName() == pCharName; })); + [&rCharName] (SwCharFormat* pF) { return pF->GetName() == rCharName; })); if(pCharFormatIt != m_pDoc->GetCharFormats()->end()) aFormat.SetCharFormat(*pCharFormatIt); else if(m_pBasePool) { - auto pBase(static_cast<SfxStyleSheetBasePool*>(m_pBasePool)->Find(pCharName, SFX_STYLE_FAMILY_CHAR)); + auto pBase(static_cast<SfxStyleSheetBasePool*>(m_pBasePool)->Find(rCharName, SFX_STYLE_FAMILY_CHAR)); if(!pBase) - pBase = &m_pBasePool->Make(pCharName, SFX_STYLE_FAMILY_CHAR); + pBase = &m_pBasePool->Make(rCharName, SFX_STYLE_FAMILY_CHAR); aFormat.SetCharFormat(static_cast<SwDocStyleSheet*>(pBase)->GetCharFormat()); } else aFormat.SetCharFormat(nullptr); } // same for fonts: - const auto pBulletName(pSwXRules->GetBulletFontNames()[i]); - if(!pBulletName.isEmpty() - && !SwXNumberingRules::isInvalidStyle(pBulletName) - && (!pFormat->GetBulletFont() || pFormat->GetBulletFont()->GetFamilyName() != pBulletName)) + const auto& rBulletName(pSwXRules->GetBulletFontNames()[i]); + if(!rBulletName.isEmpty() + && !SwXNumberingRules::isInvalidStyle(rBulletName) + && (!pFormat->GetBulletFont() || pFormat->GetBulletFont()->GetFamilyName() != rBulletName)) { const auto pFontListItem(static_cast<const SvxFontListItem*>(m_pDoc->GetDocShell()->GetItem(SID_ATTR_CHAR_FONTLIST))); const auto pList(pFontListItem->GetFontList()); - FontMetric aFontInfo(pList->Get(pBulletName, WEIGHT_NORMAL, ITALIC_NONE)); + FontMetric aFontInfo(pList->Get(rBulletName, WEIGHT_NORMAL, ITALIC_NONE)); vcl::Font aFont(aFontInfo); aFormat.SetBulletFont(&aFont); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index caccb2dd038a..b3fbaacb6af7 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4742,9 +4742,8 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S { // get interoperability information about embedded objects uno::Reference< beans::XPropertySet > xPropSet( m_rExport.m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; uno::Sequence< beans::PropertyValue > aGrabBag, aObjectsInteropList,aObjectInteropAttributes; - xPropSet->getPropertyValue( pName ) >>= aGrabBag; + xPropSet->getPropertyValue( UNO_NAME_MISC_OBJ_INTEROPGRABBAG ) >>= aGrabBag; for( sal_Int32 i=0; i < aGrabBag.getLength(); ++i ) if ( aGrabBag[i].Name == "EmbeddedObjects" ) { @@ -5038,12 +5037,12 @@ bool DocxAttributeOutput::IsDiagram( const SdrObject* sdrObject ) // if the shape doesn't have the InteropGrabBag property, it's not a diagram uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( !xPropSetInfo->hasPropertyByName( pName ) ) + OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( !xPropSetInfo->hasPropertyByName( aName ) ) return false; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aName ) >>= propList; for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp ) { // if we find any of the diagram components, it's a diagram diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 0ccfe9c375a6..b23506ec4a1c 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -882,11 +882,11 @@ void DocxExport::WriteSettings() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( xPropSetInfo->hasPropertyByName( pName ) ) + OUString aGrabBagName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( xPropSetInfo->hasPropertyByName( aGrabBagName ) ) { uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aGrabBagName ) >>= propList; for( sal_Int32 i=0; i < propList.getLength(); ++i ) { if ( propList[i].Name == "ThemeFontLangProps" ) @@ -961,13 +961,13 @@ void DocxExport::WriteTheme() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( !xPropSetInfo->hasPropertyByName( pName ) ) + OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( !xPropSetInfo->hasPropertyByName( aName ) ) return; uno::Reference<xml::dom::XDocument> themeDom; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aName ) >>= propList; for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp ) { OUString propName = propList[nProp].Name; @@ -999,14 +999,14 @@ void DocxExport::WriteGlossary() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( !xPropSetInfo->hasPropertyByName( pName ) ) + OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( !xPropSetInfo->hasPropertyByName( aName ) ) return; uno::Reference<xml::dom::XDocument> glossaryDocDom; uno::Sequence< uno::Sequence< uno::Any> > glossaryDomList; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aName ) >>= propList; sal_Int32 collectedProperties = 0; for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp ) { @@ -1070,14 +1070,14 @@ void DocxExport::WriteCustomXml() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( !xPropSetInfo->hasPropertyByName( pName ) ) + OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( !xPropSetInfo->hasPropertyByName( aName ) ) return; uno::Sequence<uno::Reference<xml::dom::XDocument> > customXmlDomlist; uno::Sequence<uno::Reference<xml::dom::XDocument> > customXmlDomPropslist; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aName ) >>= propList; for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp ) { OUString propName = propList[nProp].Name; @@ -1141,14 +1141,14 @@ void DocxExport::WriteActiveX() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( !xPropSetInfo->hasPropertyByName( pName ) ) + OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( !xPropSetInfo->hasPropertyByName( aName ) ) return; uno::Sequence<uno::Reference<xml::dom::XDocument> > activeXDomlist; uno::Sequence<uno::Reference<io::XInputStream> > activeXBinList; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aName ) >>= propList; for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp ) { OUString propName = propList[nProp].Name; @@ -1235,13 +1235,13 @@ void DocxExport::WriteEmbeddings() uno::Reference< beans::XPropertySet > xPropSet( m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; - if ( !xPropSetInfo->hasPropertyByName( pName ) ) + OUString aName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; + if ( !xPropSetInfo->hasPropertyByName( aName ) ) return; uno::Sequence< beans::PropertyValue > embeddingsList; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue( pName ) >>= propList; + xPropSet->getPropertyValue( aName ) >>= propList; for ( sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp ) { OUString propName = propList[nProp].Name; diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 7751927efcb0..5d60ca611f13 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -287,8 +287,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons m_pImpl->m_bParagraphHasDrawing = true; m_pImpl->m_pSerializer->startElementNS(XML_w, XML_drawing, FSEND); - const SvxLRSpaceItem pLRSpaceItem = pFrameFormat->GetLRSpace(false); - const SvxULSpaceItem pULSpaceItem = pFrameFormat->GetULSpace(false); + const SvxLRSpaceItem aLRSpaceItem = pFrameFormat->GetLRSpace(false); + const SvxULSpaceItem aULSpaceItem = pFrameFormat->GetULSpace(false); bool isAnchor; @@ -364,10 +364,10 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons lclMovePositionWithRotation(aPos, rSize, pObj->GetRotateAngle()); } attrList->add(XML_behindDoc, bOpaque ? "0" : "1"); - attrList->add(XML_distT, OString::number(TwipsToEMU(pULSpaceItem.GetUpper()) - nTopExt).getStr()); - attrList->add(XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower()) - nBottomExt).getStr()); - attrList->add(XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft()) - nLeftExt).getStr()); - attrList->add(XML_distR, OString::number(TwipsToEMU(pLRSpaceItem.GetRight()) - nRightExt).getStr()); + attrList->add(XML_distT, OString::number(TwipsToEMU(aULSpaceItem.GetUpper()) - nTopExt).getStr()); + attrList->add(XML_distB, OString::number(TwipsToEMU(aULSpaceItem.GetLower()) - nBottomExt).getStr()); + attrList->add(XML_distL, OString::number(TwipsToEMU(aLRSpaceItem.GetLeft()) - nLeftExt).getStr()); + attrList->add(XML_distR, OString::number(TwipsToEMU(aLRSpaceItem.GetRight()) - nRightExt).getStr()); attrList->add(XML_simplePos, "0"); attrList->add(XML_locked, "0"); attrList->add(XML_layoutInCell, "1"); @@ -556,10 +556,10 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons else { sax_fastparser::FastAttributeList* aAttrList = sax_fastparser::FastSerializerHelper::createAttrList(); - aAttrList->add(XML_distT, OString::number(TwipsToEMU(pULSpaceItem.GetUpper())).getStr()); - aAttrList->add(XML_distB, OString::number(TwipsToEMU(pULSpaceItem.GetLower())).getStr()); - aAttrList->add(XML_distL, OString::number(TwipsToEMU(pLRSpaceItem.GetLeft())).getStr()); - aAttrList->add(XML_distR, OString::number(TwipsToEMU(pLRSpaceItem.GetRight())).getStr()); + aAttrList->add(XML_distT, OString::number(TwipsToEMU(aULSpaceItem.GetUpper())).getStr()); + aAttrList->add(XML_distB, OString::number(TwipsToEMU(aULSpaceItem.GetLower())).getStr()); + aAttrList->add(XML_distL, OString::number(TwipsToEMU(aLRSpaceItem.GetLeft())).getStr()); + aAttrList->add(XML_distR, OString::number(TwipsToEMU(aLRSpaceItem.GetRight())).getStr()); const SdrObject* pObj = pFrameFormat->FindRealSdrObject(); if (pObj != nullptr) { @@ -1120,9 +1120,8 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat uno::Sequence< uno::Any > diagramDrawing; // retrieve the doms from the GrabBag - OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG; uno::Sequence< beans::PropertyValue > propList; - xPropSet->getPropertyValue(pName) >>= propList; + xPropSet->getPropertyValue(UNO_NAME_MISC_OBJ_INTEROPGRABBAG) >>= propList; for (sal_Int32 nProp=0; nProp < propList.getLength(); ++nProp) { OUString propName = propList[nProp].Name; diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 39b4a68fc5ae..73bf75704009 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -3843,7 +3843,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat if (rGraphic.GetType()==GRAPHIC_NONE) return; - ConvertDataFormat pConvertDestinationFormat = ConvertDataFormat::WMF; + ConvertDataFormat aConvertDestinationFormat = ConvertDataFormat::WMF; const sal_Char* pConvertDestinationBLIPType = OOO_STRING_SVTOOLS_RTF_WMETAFILE; GfxLink aGraphicLink; @@ -3880,7 +3880,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat break; case GFX_LINK_TYPE_NATIVE_GIF: // GIF is not supported by RTF, but we override default conversion to WMF, PNG seems fits better here. - pConvertDestinationFormat = ConvertDataFormat::PNG; + aConvertDestinationFormat = ConvertDataFormat::PNG; pConvertDestinationBLIPType = OOO_STRING_SVTOOLS_RTF_PNGBLIP; break; default: @@ -3991,7 +3991,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat else { aStream.Seek(0); - if (GraphicConverter::Export(aStream, rGraphic, pConvertDestinationFormat) != ERRCODE_NONE) + if (GraphicConverter::Export(aStream, rGraphic, aConvertDestinationFormat) != ERRCODE_NONE) SAL_WARN("sw.rtf", "failed to export the graphic"); pBLIPType = pConvertDestinationBLIPType; aStream.Seek(STREAM_SEEK_TO_END); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index b908572e65c5..efc41222338c 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -1566,14 +1566,14 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition, // #i25545# // #i100132# - a number format does not have to exist on given list level - SwNumFormat pFormat(rLFOInfo.pNumRule->Get(nLevel)); + SwNumFormat aFormat(rLFOInfo.pNumRule->Get(nLevel)); if (rReader.IsRightToLeft() && nLastLFOPosition != nLFOPosition) { - if ( pFormat.GetNumAdjust() == SVX_ADJUST_RIGHT) - pFormat.SetNumAdjust(SVX_ADJUST_LEFT); - else if ( pFormat.GetNumAdjust() == SVX_ADJUST_LEFT) - pFormat.SetNumAdjust(SVX_ADJUST_RIGHT); - rLFOInfo.pNumRule->Set(nLevel, pFormat); + if ( aFormat.GetNumAdjust() == SVX_ADJUST_RIGHT) + aFormat.SetNumAdjust(SVX_ADJUST_LEFT); + else if ( aFormat.GetNumAdjust() == SVX_ADJUST_LEFT) + aFormat.SetNumAdjust(SVX_ADJUST_RIGHT); + rLFOInfo.pNumRule->Set(nLevel, aFormat); } nLastLFOPosition = nLFOPosition; /* @@ -2316,11 +2316,11 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, { case RES_CHRATR_COLOR: { - OUString pNm; - if (xPropSetInfo->hasPropertyByName(pNm = "TextColor")) + OUString aNm; + if (xPropSetInfo->hasPropertyByName(aNm = "TextColor")) { aTmp <<= (sal_Int32)static_cast<const SvxColorItem*>(pItem)->GetValue().GetColor(); - rPropSet->setPropertyValue(pNm, aTmp); + rPropSet->setPropertyValue(aNm, aTmp); } } aFont.SetColor(static_cast<const SvxColorItem*>(pItem)->GetValue()); @@ -2328,26 +2328,26 @@ awt::Size SwWW8ImplReader::MiserableDropDownFormHack(const OUString &rString, case RES_CHRATR_FONT: { const SvxFontItem *pFontItem = static_cast<const SvxFontItem *>(pItem); - OUString pNm; - if (xPropSetInfo->hasPropertyByName(pNm = "FontStyleName")) + OUString aNm; + if (xPropSetInfo->hasPropertyByName(aNm = "FontStyleName")) { aTmp <<= OUString( pFontItem->GetStyleName()); - rPropSet->setPropertyValue( pNm, aTmp ); + rPropSet->setPropertyValue( aNm, aTmp ); } - if (xPropSetInfo->hasPropertyByName(pNm = "FontFamily")) + if (xPropSetInfo->hasPropertyByName(aNm = "FontFamily")) { aTmp <<= (sal_Int16)pFontItem->GetFamily(); - rPropSet->setPropertyValue( pNm, aTmp ); + rPropSet->setPropertyValue( aNm, aTmp ); } - if (xPropSetInfo->hasPropertyByName(pNm = "FontCharset")) + if (xPropSetInfo->hasPropertyByName(aNm = "FontCharset")) { aTmp <<= (sal_Int16)pFontItem->GetCharSet(); - rPropSet->setPropertyValue( pNm, aTmp ); + rPropSet->setPropertyValue( aNm, aTmp ); } - if (xPropSetInfo->hasPropertyByName(pNm = "FontPitch")) + if (xPropSetInfo->hasPropertyByName(aNm = "FontPitch")) { aTmp <<= (sal_Int16)pFontItem->GetPitch(); - rPropSet->setPropertyValue( pNm, aTmp ); + rPropSet->setPropertyValue( aNm, aTmp ); } aTmp <<= OUString( pFontItem->GetFamilyName()); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5d0939d4b49e..e192acd6556e 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -534,8 +534,8 @@ sal_uInt16 SwWW8ImplReader::End_Field() aFieldPam, m_aFieldStack.back().GetBookmarkName(), ODF_FORMTEXT ) ); OSL_ENSURE(pFieldmark!=nullptr, "hmmm; why was the bookmark not created?"); if (pFieldmark!=nullptr) { - const IFieldmark::parameter_map_t& pParametersToAdd = m_aFieldStack.back().getParameters(); - pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end()); + const IFieldmark::parameter_map_t& rParametersToAdd = m_aFieldStack.back().getParameters(); + pFieldmark->GetParameters()->insert(rParametersToAdd.begin(), rParametersToAdd.end()); } } break; @@ -607,8 +607,8 @@ sal_uInt16 SwWW8ImplReader::End_Field() ODF_UNHANDLED ); if ( pFieldmark ) { - const IFieldmark::parameter_map_t& pParametersToAdd = m_aFieldStack.back().getParameters(); - pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end()); + const IFieldmark::parameter_map_t& rParametersToAdd = m_aFieldStack.back().getParameters(); + pFieldmark->GetParameters()->insert(rParametersToAdd.begin(), rParametersToAdd.end()); OUString sFieldId = OUString::number( m_aFieldStack.back().mnFieldId ); pFieldmark->GetParameters()->insert( std::pair< OUString, uno::Any > ( diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 7fb511a6f66d..d7cccbf14e8e 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -370,10 +370,10 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl* pColl, bool bSende }; // BruteForce merge because MergeRange in SvTools is buggy: - std::vector<sal_uInt16> pVec = ::lcl_convertRangesToList(pRanges); + std::vector<sal_uInt16> aVec2 = ::lcl_convertRangesToList(pRanges); std::vector<sal_uInt16> aVec = ::lcl_convertRangesToList(aRanges); - pVec.insert(pVec.end(), aVec.begin(), aVec.end()); - std::unique_ptr<sal_uInt16[]> pNewRanges(::lcl_convertListToRanges(pVec)); + aVec2.insert(aVec2.end(), aVec.begin(), aVec.end()); + std::unique_ptr<sal_uInt16[]> pNewRanges(::lcl_convertListToRanges(aVec2)); pAddrSet = new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(), pNewRanges.get()); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 58f5b4409547..acac39f59642 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1156,7 +1156,7 @@ void SwSidebarWin::SetReadonly(bool bSet) void SwSidebarWin::SetLanguage(const SvxLanguageItem& rNewItem) { - Link<LinkParamNone*,void> pLink = Engine()->GetModifyHdl(); + Link<LinkParamNone*,void> aLink = Engine()->GetModifyHdl(); Engine()->SetModifyHdl( Link<LinkParamNone*,void>() ); ESelection aOld = GetOutlinerView()->GetSelection(); @@ -1167,7 +1167,7 @@ void SwSidebarWin::SetLanguage(const SvxLanguageItem& rNewItem) GetOutlinerView()->SetAttribs( aEditAttr ); GetOutlinerView()->SetSelection(aOld); - Engine()->SetModifyHdl( pLink ); + Engine()->SetModifyHdl( aLink ); const SwViewOption* pVOpt = mrView.GetWrtShellPtr()->GetViewOptions(); EEControlBits nCntrl = Engine()->GetControlWord(); diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 43d4eef57fd5..a6532d604250 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -635,15 +635,15 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) { std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> vFontHeight = rSh.GetItemWithPaM( RES_CHRATR_FONTSIZE ); - for ( std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM>>& pIt : vFontHeight ) + for ( const std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM>>& aIt : vFontHeight ) { - if (!pIt.first) + if (!aIt.first) { rSet.DisableItem(FN_GROW_FONT_SIZE); rSet.DisableItem(FN_SHRINK_FONT_SIZE); break; } - pSize = static_cast<const SvxFontHeightItem*>( pIt.first ); + pSize = static_cast<const SvxFontHeightItem*>( aIt.first ); sal_uInt32 nSize = pSize->GetHeight(); if( nSize == nFontMaxSz ) rSet.DisableItem( FN_GROW_FONT_SIZE ); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index bdf0fbb33bf5..3c335f6ea779 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -420,7 +420,7 @@ public: } ~MailMergeExecuteFinalizer() { - osl::MutexGuard pMgrGuard( GetMailMergeMutex() ); + osl::MutexGuard aMgrGuard( GetMailMergeMutex() ); m_pMailMerge->m_pMgr = nullptr; } @@ -838,7 +838,7 @@ void SAL_CALL SwXMailMerge::cancel() throw (css::uno::RuntimeException, std::exc { // Cancel may be called from a second thread, so this protects from m_pMgr /// cleanup in the execute function. - osl::MutexGuard pMgrGuard( GetMailMergeMutex() ); + osl::MutexGuard aMgrGuard( GetMailMergeMutex() ); if (m_pMgr) m_pMgr->MergeCancel(); } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 165289ba089d..072d82b3f1c0 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2711,10 +2711,10 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) } if ( !hasObjectMarked ) { - SwEditWin& pEditWindow = m_pActiveShell->GetView().GetEditWin(); + SwEditWin& rEditWindow = m_pActiveShell->GetView().GetEditWin(); vcl::KeyCode tempKeycode( KEY_ESCAPE ); KeyEvent rKEvt( 0 , tempKeycode ); - static_cast<vcl::Window*>(&pEditWindow)->KeyInput( rKEvt ); + static_cast<vcl::Window*>(&rEditWindow)->KeyInput( rKEvt ); } } } diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index 94678dee00ac..21fa08f59d04 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -137,11 +137,11 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, if(rLongName != sLong) continue; - TripleString pTriple; - pTriple.sGroup = pGroup->sName; - pTriple.sBlock = sLong; - pTriple.sShort = pGroup->sShortNames.getToken(j, STRING_DELIM); - aTripleStrings.push_back(pTriple); + TripleString aTriple; + aTriple.sGroup = pGroup->sName; + aTriple.sBlock = sLong; + aTriple.sShort = pGroup->sShortNames.getToken(j, STRING_DELIM); + aTripleStrings.push_back(aTriple); } } @@ -149,9 +149,9 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, nCount = aTripleStrings.size(); if(1 == nCount) { - const TripleString& pTriple(aTripleStrings.front()); - rShortName = pTriple.sShort; - rGroupName = pTriple.sGroup; + const TripleString& rTriple(aTripleStrings.front()); + rShortName = rTriple.sShort; + rGroupName = rTriple.sGroup; bRet = true; } else if(1 < nCount) @@ -168,9 +168,9 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, if(RET_OK == aDlg->Execute() && LISTBOX_ENTRY_NOTFOUND != rLB.GetSelectEntryPos()) { - const TripleString& pTriple(aTripleStrings[rLB.GetSelectEntryPos()]); - rShortName = pTriple.sShort; - rGroupName = pTriple.sGroup; + const TripleString& rTriple(aTripleStrings[rLB.GetSelectEntryPos()]); + rShortName = rTriple.sShort; + rGroupName = rTriple.sGroup; bRet = true; } else |