diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-14 11:10:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 07:16:03 +0100 |
| commit | 8355734f3511f951972fa02e94f5d40052d873de (patch) | |
| tree | 6a3f5c8f4cda35f70af1c9b094617dd4a6f4d775 /svx | |
| parent | bd79b7154dec6ad6bcc3aa5d875d22d01270e39f (diff) | |
sal_uIntPtr->sal_Int32 in SvxSuperContourDlg
Change-Id: I765cd20b16cbb832e4e0fe2beca4c6b89fec7e05
Reviewed-on: https://gerrit.libreoffice.org/46481
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 10 | ||||
| -rw-r--r-- | svx/source/dialog/contimp.hxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 22c8321d964d..9059030fc3ca 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -217,7 +217,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * pUpdateEditingObject( nullptr ), pCheckObj ( nullptr ), aContourItem ( *this, *_pBindings ), - nGrfChanged ( 0 ), + mnGrfChanged ( 0 ), bExecState ( false ), bUpdateGraphicLinked( false ), bGraphicLinked ( false ) @@ -345,7 +345,7 @@ void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic ) { aUndoGraphic = aRedoGraphic = Graphic(); aGraphic = rGraphic; - nGrfChanged = 0; + mnGrfChanged = 0; m_pContourWnd->SetGraphic( aGraphic ); } @@ -486,7 +486,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) } else if (nId == mnUndoId) { - nGrfChanged = nGrfChanged ? nGrfChanged - 1 : 0UL; + mnGrfChanged = mnGrfChanged ? mnGrfChanged - 1 : 0; aRedoGraphic = aGraphic; aGraphic = aUndoGraphic; aUndoGraphic = Graphic(); @@ -494,7 +494,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) } else if (nId == mnRedoId) { - nGrfChanged++; + mnGrfChanged++; aUndoGraphic = aGraphic; aGraphic = aRedoGraphic; aRedoGraphic = Graphic(); @@ -700,7 +700,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) aRedoGraphic = Graphic(); aUndoGraphic = aGraphic; aGraphic = Graphic( BitmapEx( aBmp, aMask ) ); - nGrfChanged++; + mnGrfChanged++; bNewContour = ( aQBox->Execute() == RET_YES ); rWnd.SetGraphic( aGraphic, bNewContour ); diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index e3358b48ff9d..efc25ad375c7 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -59,7 +59,7 @@ class SvxSuperContourDlg : public SvxContourDlg VclPtr<MetricField> m_pMtfTolerance; VclPtr<ContourWindow> m_pContourWnd; VclPtr<StatusBar> m_pStbStatus; - sal_uIntPtr nGrfChanged; + sal_Int32 mnGrfChanged; bool bExecState; bool bUpdateGraphicLinked; bool bGraphicLinked; @@ -103,7 +103,7 @@ public: void SetGraphic( const Graphic& rGraphic ); const Graphic& GetGraphic() const { return aGraphic; } - bool IsGraphicChanged() const { return nGrfChanged > 0; } + bool IsGraphicChanged() const { return mnGrfChanged > 0; } void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly ); tools::PolyPolygon GetPolyPolygon(); |