diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:03:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 11:03:56 +0000 |
| commit | 6956fc665ec0e90238e1762ab389222aeb2587b4 (patch) | |
| tree | aa2469b91a3777282510487f677a51c0ea07de19 /svx/source/dialog/_contdlg.cxx | |
| parent | INTEGRATION: CWS sb59 (1.7.62); FILE MERGED (diff) | |
| download | core-6956fc665ec0e90238e1762ab389222aeb2587b4.tar.gz core-6956fc665ec0e90238e1762ab389222aeb2587b4.zip | |
INTEGRATION: CWS sb59 (1.13.60); FILE MERGED
2006/08/10 11:37:40 thb 1.13.60.2: #i67535# Added virtual destructor to ExpressionNode interface; added various static_int_casts for accessibility; corrected using <method> declarations in unoshape.hxx; removed dead code from EnhancedCustomShape3d; fixed ugly infinite recursion in _contdlg (induced by removing a warning via method renaming)
2006/08/04 11:22:20 cl 1.13.60.1: fixed compiler warnings
Diffstat (limited to 'svx/source/dialog/_contdlg.cxx')
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 59f22a7dcb6d..09e42195769b 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: _contdlg.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-09-17 04:09:27 $ + * last change: $Author: obo $ $Date: 2006-10-12 12:03:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -401,7 +401,7 @@ const void* SvxContourDlg::GetEditingObject() const void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { - pSuperClass->Update( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); + pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); } @@ -649,7 +649,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) |* \************************************************************************/ -void SvxSuperContourDlg::Update( const Graphic& rGraphic, BOOL _bGraphicLinked, +void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { aUpdateGraphic = rGraphic; |