From 8a26a4053db946da7c8d8cdbf2444faf3c459291 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 27 Apr 2015 16:43:07 +0200
Subject: SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg

Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
---
 chart2/source/controller/dialogs/tp_AxisPositions.cxx | 2 +-
 chart2/source/controller/dialogs/tp_AxisPositions.hxx | 2 +-
 chart2/source/controller/dialogs/tp_Scale.cxx         | 2 +-
 chart2/source/controller/dialogs/tp_Scale.hxx         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'chart2')

diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 9bcb6e8e2938..c74605624733 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -252,7 +252,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
     }
 }
 
-int AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet)
+SfxTabPage::sfxpg AxisPositionsTabPage::DeactivatePage(SfxItemSet* pItemSet)
 {
     if( pItemSet )
         FillItemSet( pItemSet );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 3dfeecd8f3ff..61eb83c2dacd 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -38,7 +38,7 @@ public:
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
     using TabPage::DeactivatePage;
-    virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
+    virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
 
     void SetNumFormatter( SvNumberFormatter* pFormatter );
 
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index bb92e78c095d..875c71f9c991 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -382,7 +382,7 @@ void ScaleTabPage::Reset(const SfxItemSet* rInAttrs)
     SetNumFormat();
 }
 
-int ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
+SfxTabPage::sfxpg ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet)
 {
     if( !pNumFormatter )
     {
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index ff8bbe7e9d1b..3f0a99caa460 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -38,7 +38,7 @@ public:
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
     virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
     using TabPage::DeactivatePage;
-    virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
+    virtual sfxpg DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
 
     void SetNumFormatter( SvNumberFormatter* pFormatter );
     void SetNumFormat();
-- 
cgit