cui/source/dialogs/insdlg.cxx | 4 ++-- filter/source/msfilter/msdffimp.cxx | 1 - filter/source/svg/svgexport.cxx | 1 - sw/source/core/unocore/unotbl.cxx | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit 944ae9cf3dbd08d9df5681745267591baf2819fd Author: Caolán McNamara <caol...@redhat.com> Date: Thu Oct 18 15:27:07 2012 +0100 missing checkbox, both height and width in same place Change-Id: I5a31f284ccb5d470cff7b0b76ee098711aba6e6d diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index df66ebc..069d26c 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -529,7 +529,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, , aFLMargin( this, CUI_RES( GB_MARGIN ) ) , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) ) , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) ) - , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) + , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINWIDTHDEFAULT ) ) , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) ) , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) ) , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) @@ -576,7 +576,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con , aFLMargin( this, CUI_RES( GB_MARGIN ) ) , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) ) , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) ) - , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) + , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINWIDTHDEFAULT ) ) , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) ) , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) ) , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) ) commit 1b472f650a01bf8b6f1f6d2c7b99dccb74963461 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Oct 18 15:05:45 2012 +0100 loplugin: unused strings Change-Id: I41a572ea28f827740b7084105a029854035ef9d7 diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 066c849..ed07cd1 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6967,7 +6967,6 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, break; } - String aShort, aFull; if( pIds->nId ) { // found! diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index a0ff05b..686cb51 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1987,7 +1987,6 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r // We create a set of bitmaps embedded into text shape. GDIMetaFile aMtf; - const Point aNullPt; const Size aSize( pObj->GetCurrentBoundRect().GetSize() ); MetaAction* pAction; sal_Bool bIsTextShapeStarted = sal_False; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 23dcb2e..6d5c49c 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -3229,7 +3229,6 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, } else if(bIsDescriptor) { - String aPropertyName(rPropertyName); pTableProps->SetProperty( pEntry->nWID, pEntry->nMemberId, aValue); } else @@ -3463,7 +3462,6 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be else if(bIsDescriptor) { const uno::Any* pAny = 0; - String aPropertyName(rPropertyName); if(!pTableProps->GetProperty(pEntry->nWID, pEntry->nMemberId, pAny)) throw lang::IllegalArgumentException(); else if(pAny)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits