diff options
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/misc/glossary.cxx | 5 | ||||
-rw-r--r-- | sw/source/ui/vba/vbabookmarks.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafield.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/vba/vbatablehelper.cxx | 10 |
4 files changed, 11 insertions, 16 deletions
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index f2aa4a11616e..5043c77d6933 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -1102,10 +1102,9 @@ void SwGlossaryDlg::ResumeShowAutoText() { uno::Any aGroup = m_xAutoText->getByName(sGroup); uno::Reference< XAutoTextGroup > xGroup; - OUString uShortName(sShortName); - if((aGroup >>= xGroup) && xGroup->hasByName(uShortName)) + if((aGroup >>= xGroup) && xGroup->hasByName(sShortName)) { - uno::Any aEntry(xGroup->getByName(uShortName)); + uno::Any aEntry(xGroup->getByName(sShortName)); uno::Reference< XAutoTextEntry > xEntry; aEntry >>= xEntry; uno::Reference< XTextRange > xRange(xCursor, uno::UNO_QUERY); diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index 5a295b99c285..ceb5af2f2359 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -164,13 +164,12 @@ SwVbaBookmarks::Add( const OUString& rName, const uno::Any& rRange ) throw (uno: } // remove the exist bookmark - OUString aName = rName; - if( m_xNameAccess->hasByName( aName ) ) - removeBookmarkByName( aName ); + if( m_xNameAccess->hasByName( rName ) ) + removeBookmarkByName( rName ); - addBookmarkByName( mxModel, aName, xTextRange ); + addBookmarkByName( mxModel, rName, xTextRange ); - return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) ); + return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, rName ) ) ); } sal_Int32 SAL_CALL diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index bbae48f0f564..8bef2126c165 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -468,8 +468,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const if( bCustom ) { uno::Reference< beans::XPropertySet > xProps( xTextField, uno::UNO_QUERY_THROW ); - OUString sDocPropertyName( aDocProperty ); - xProps->setPropertyValue("Name", uno::makeAny( sDocPropertyName ) ); + xProps->setPropertyValue("Name", uno::makeAny( aDocProperty ) ); } return xTextField; diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 8ffa710dcba8..7ba020dae59a 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -71,11 +71,10 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( ) throw (uno::RuntimeExceptio return nRet; } -sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& CellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName ) throw (uno::RuntimeException) { sal_Int32 nRet = 0; - OUString sCellName(CellName); - SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox( sCellName )); + SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox( rCellName )); if( !pBox ) throw uno::RuntimeException(); @@ -86,11 +85,10 @@ sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& CellName ) throw (un return nRet; } -sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& CellName ) throw (uno::RuntimeException) +sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& rCellName ) throw (uno::RuntimeException) { sal_Int32 nRet = 0; - OUString sCellName(CellName); - const SwTableBox* pBox = pTable->GetTableBox( sCellName ); + const SwTableBox* pBox = pTable->GetTableBox( rCellName ); if( !pBox ) throw uno::RuntimeException(); const SwTableBoxes* pBoxes = &pBox->GetUpper()->GetTabBoxes(); |