[Libreoffice-commits] core.git: 26 commits - basic/source chart2/source connectivity/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source include/basic include/editeng include/sfx2 include/svl include/svtools include/svx linguistic/source reportdesign/source sc/source sd/source sfx2/source svl/source svtools/source svx/source sw/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 28 01:23:49 PDT 2015
basic/source/classes/sbxmod.cxx | 6 --
basic/source/runtime/methods.cxx | 6 --
basic/source/uno/namecont.cxx | 4 -
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
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 4 -
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 4 -
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 2
connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx | 2
connectivity/source/commontools/dbtools.cxx | 2
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 8 +--
connectivity/source/drivers/mork/MResultSet.cxx | 12 ++---
connectivity/source/drivers/mork/MResultSet.hxx | 3 -
cui/source/dialogs/cuicharmap.cxx | 4 -
cui/source/inc/align.hxx | 2
cui/source/inc/autocdlg.hxx | 4 -
cui/source/inc/backgrnd.hxx | 2
cui/source/inc/border.hxx | 2
cui/source/inc/chardlg.hxx | 8 +--
cui/source/inc/cuioptgenrl.hxx | 2
cui/source/inc/cuitabarea.hxx | 14 ++---
cui/source/inc/cuitabline.hxx | 6 +-
cui/source/inc/grfpage.hxx | 2
cui/source/inc/numfmt.hxx | 4 -
cui/source/inc/numpages.hxx | 12 ++---
cui/source/inc/page.hxx | 2
cui/source/inc/paragrph.hxx | 6 +-
cui/source/inc/swpossizetabpage.hxx | 2
cui/source/inc/tabstpge.hxx | 2
cui/source/inc/transfrm.hxx | 6 +-
cui/source/options/optcolor.cxx | 2
cui/source/options/optcolor.hxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/options/optgdlg.hxx | 2
cui/source/options/optgenrl.cxx | 2
cui/source/options/optinet2.cxx | 2
cui/source/options/optinet2.hxx | 2
cui/source/options/optmemory.cxx | 2
cui/source/options/optmemory.hxx | 2
cui/source/tabpages/align.cxx | 2
cui/source/tabpages/autocdlg.cxx | 4 -
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/chardlg.cxx | 8 +--
cui/source/tabpages/grfpage.cxx | 4 -
cui/source/tabpages/numfmt.cxx | 12 ++---
cui/source/tabpages/numpages.cxx | 24 +++++-----
cui/source/tabpages/page.cxx | 2
cui/source/tabpages/paragrph.cxx | 6 +-
cui/source/tabpages/swpossizetabpage.cxx | 2
cui/source/tabpages/tabstpge.cxx | 2
cui/source/tabpages/tparea.cxx | 4 -
cui/source/tabpages/tpbitmap.cxx | 2
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
cui/source/tabpages/tpline.cxx | 2
cui/source/tabpages/tplnedef.cxx | 2
cui/source/tabpages/tplneend.cxx | 2
cui/source/tabpages/tpshadow.cxx | 2
cui/source/tabpages/transfrm.cxx | 6 +-
dbaccess/source/filter/xml/xmlHelper.cxx | 4 -
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/browser/dbloader.cxx | 4 -
dbaccess/source/ui/browser/formadapter.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 8 +--
dbaccess/source/ui/dlg/CollectionView.cxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/dlg/adminpages.hxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 4 -
dbaccess/source/ui/dlg/tablespage.hxx | 2
dbaccess/source/ui/inc/WCopyTable.hxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 6 +-
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
desktop/source/deployment/registry/package/dp_package.cxx | 2
editeng/source/items/numitem.cxx | 8 +--
editeng/source/outliner/outliner.cxx | 4 -
editeng/source/rtf/rtfitem.cxx | 4 -
extensions/source/propctrlr/controlfontdialog.cxx | 2
extensions/source/propctrlr/taborder.cxx | 2
extensions/source/scanner/sanedlg.cxx | 2
filter/source/flash/swfexporter.cxx | 4 -
filter/source/pdf/impdialog.cxx | 2
forms/source/component/FormComponent.cxx | 2
forms/source/helper/formnavigation.cxx | 2
fpicker/source/aqua/SalAquaFilePicker.mm | 2
fpicker/source/office/iodlg.cxx | 6 +-
framework/source/classes/menumanager.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 2
include/basic/sbmod.hxx | 2
include/editeng/numitem.hxx | 2
include/editeng/outliner.hxx | 2
include/editeng/svxrtf.hxx | 4 -
include/sfx2/dinfdlg.hxx | 4 -
include/sfx2/dispatch.hxx | 4 -
include/sfx2/mgetempl.hxx | 2
include/sfx2/printopt.hxx | 2
include/sfx2/tabdlg.hxx | 2
include/svl/macitem.hxx | 2
include/svtools/wizardmachine.hxx | 2
include/svtools/wizdlg.hxx | 2
include/svx/hdft.hxx | 2
include/svx/optgrid.hxx | 2
include/svx/xbitmap.hxx | 2
linguistic/source/dicimp.cxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 4 -
sc/source/filter/rtf/rtfparse.cxx | 4 -
sc/source/ui/attrdlg/tabpages.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 4 -
sc/source/ui/inc/tabpages.hxx | 2
sc/source/ui/inc/tpcalc.hxx | 2
sc/source/ui/inc/tpcompatibility.hxx | 2
sc/source/ui/inc/tpdefaults.hxx | 2
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/inc/tphf.hxx | 2
sc/source/ui/inc/tpprint.hxx | 2
sc/source/ui/inc/tpsort.hxx | 4 -
sc/source/ui/inc/tptable.hxx | 2
sc/source/ui/inc/tpusrlst.hxx | 2
sc/source/ui/inc/tpview.hxx | 4 -
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6 +-
sc/source/ui/optdlg/tpcalc.cxx | 4 -
sc/source/ui/optdlg/tpcompatibility.cxx | 2
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 2
sc/source/ui/optdlg/tpprint.cxx | 2
sc/source/ui/optdlg/tpusrlst.cxx | 2
sc/source/ui/optdlg/tpview.cxx | 4 -
sc/source/ui/pagedlg/tphf.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 2
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2
sd/source/ui/dlg/brkdlg.cxx | 2
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/inc/tpoption.hxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4 -
sfx2/source/appl/linkmgr2.cxx | 4 -
sfx2/source/control/dispatch.cxx | 18 ++-----
sfx2/source/dialog/dinfdlg.cxx | 6 +-
sfx2/source/dialog/mgetempl.cxx | 6 +-
sfx2/source/dialog/printopt.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/inc/workwin.hxx | 2
sfx2/source/view/sfxbasecontroller.cxx | 2
svl/source/items/macitem.cxx | 8 +--
svtools/source/dialogs/prnsetup.cxx | 4 -
svtools/source/dialogs/wizardmachine.cxx | 6 +-
svtools/source/dialogs/wizdlg.cxx | 4 -
svx/source/dialog/hdft.cxx | 2
svx/source/dialog/optgrid.cxx | 2
svx/source/form/fmsrcimp.cxx | 2
svx/source/form/formcontroller.cxx | 2
svx/source/table/tablertfimporter.cxx | 2
svx/source/xoutdev/xattrbmp.cxx | 8 +--
sw/source/core/unocore/unotbl.cxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/chrdlg/swuiccoll.cxx | 2
sw/source/ui/envelp/envfmt.cxx | 2
sw/source/ui/envelp/envfmt.hxx | 2
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/envprt.cxx | 2
sw/source/ui/envelp/envprt.hxx | 2
sw/source/ui/envelp/label1.cxx | 10 ++--
sw/source/ui/envelp/labfmt.cxx | 4 -
sw/source/ui/envelp/labfmt.hxx | 2
sw/source/ui/envelp/labprt.cxx | 4 -
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/envelp/swuilabimp.hxx | 8 +--
sw/source/ui/frmdlg/column.cxx | 4 -
sw/source/ui/frmdlg/frmpage.cxx | 8 +--
sw/source/ui/frmdlg/wrap.cxx | 4 -
sw/source/ui/index/cnttab.cxx | 6 +-
sw/source/ui/misc/num.cxx | 4 -
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/misc/pgfnote.cxx | 4 -
sw/source/ui/misc/pggrid.cxx | 2
sw/source/ui/table/tabledlg.cxx | 8 +--
sw/source/ui/vba/vbaaddin.cxx | 2
sw/source/uibase/inc/column.hxx | 2
sw/source/uibase/inc/drpcps.hxx | 2
sw/source/uibase/inc/envlop.hxx | 2
sw/source/uibase/inc/frmpage.hxx | 4 -
sw/source/uibase/inc/num.hxx | 2
sw/source/uibase/inc/outline.hxx | 2
sw/source/uibase/inc/pgfnote.hxx | 2
sw/source/uibase/inc/pggrid.hxx | 2
sw/source/uibase/inc/swuiccoll.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 6 +-
sw/source/uibase/inc/wrap.hxx | 2
sw/source/uibase/table/tablepg.hxx | 4 -
xmloff/source/style/xmlnumfi.cxx | 8 +--
xmloff/source/text/txtprhdl.cxx | 14 ++---
197 files changed, 342 insertions(+), 353 deletions(-)
New commits:
commit 1be56811950a81583c21d0d069257498e769561c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:35:41 2015 +0200
SfxChildWin_Impl::nVisibility is of type sal_uInt16/SVX_VISIBILITY_*
Change-Id: I4dd0556557ead72b2a2e9f45ccdb35a77efeab4d
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 1d52817..7abf4d3 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -133,7 +133,7 @@ struct SfxChildWin_Impl
pWin(0),
bCreate(false),
pCli(0),
- nVisibility( sal_False ),
+ nVisibility( SFX_VISIBILITY_UNVISIBLE ),
bEnable( true ),
bDisabled( false )
{}
commit db72475a51813edc4f6057c85d9a595841be4bcf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:32:39 2015 +0200
SfxDispatcher::GetShellAndSlot_Impl return type wants to be bool
Change-Id: I7897ce11621a7aac991ea64897d8fdeb06c3d2d7
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 971082d..c6c2425 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -185,7 +185,7 @@ public:
SAL_DLLPRIVATE void SetMenu_Impl();
SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc.
SAL_DLLPRIVATE bool IsUpdated_Impl() const;
- SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
+ SAL_DLLPRIVATE bool GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
bool bOwnShellsOnly, bool bModal, bool bRealSlot=true );
SAL_DLLPRIVATE void SetReadOnly_Impl( bool bOn );
SAL_DLLPRIVATE bool GetReadOnly_Impl() const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f04c968..a7a4f22 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -784,7 +784,7 @@ void SfxDispatcher::DoParentDeactivate_Impl()
sal_False
The SfxShell was not found, ppShell and ppSlot are invalid.
*/
-int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
+bool SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
const SfxSlot** ppSlot, bool bOwnShellsOnly, bool bModal, bool bRealSlot)
{
SFX_STACK(SfxDispatcher::GetShellAndSlot_Impl);
@@ -794,7 +794,7 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
if ( _FindServer(nSlot, aSvr, bModal) )
{
if ( bOwnShellsOnly && aSvr.GetShellLevel() >= xImp->aStack.size() )
- return sal_False;
+ return false;
*ppShell = GetShell(aSvr.GetShellLevel());
*ppSlot = aSvr.GetSlot();
@@ -802,12 +802,12 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
*ppSlot = (*ppShell)->GetInterface()->GetRealSlot(*ppSlot);
// Check only real slots as enum slots don't have an execute function!
if ( bRealSlot && ((0 == *ppSlot) || (0 == (*ppSlot)->GetExecFnc()) ))
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
/** This method performs a request for a cached <Slot-Server>.
commit d6690c1cae0264dccd4b663206284a450c7d5733
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:30:13 2015 +0200
bFound var wants to be of type bool
Change-Id: I106f8414fcf28fe314b14156d004bdb0cf20f023
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 31ccada..b39ab71 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -108,7 +108,7 @@ void LinkManager::CloseCachedComps()
void LinkManager::Remove( SvBaseLink *pLink )
{
// No duplicate links inserted
- int bFound = sal_False;
+ bool bFound = false;
for( size_t n = 0; n < aLinkTbl.size(); )
{
SvBaseLinkRef* pTmp = aLinkTbl[ n ];
@@ -117,7 +117,7 @@ void LinkManager::Remove( SvBaseLink *pLink )
(*pTmp)->Disconnect();
(*pTmp)->SetLinkManager( NULL );
(*pTmp).Clear();
- bFound = sal_True;
+ bFound = true;
}
// Remove empty ones if they exist
commit a32478a49277b9dd466d41773c641023792f4ece
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:29:03 2015 +0200
SfxDispatcher::Call_Impl return value is unused
Change-Id: Iecaff2b1b5449751a9787a3b27c70495d82cc623
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 9307b5e..971082d 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -90,7 +90,7 @@ friend class SfxViewFrame;
DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * );
DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
- SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );
+ SAL_DLLPRIVATE void Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );
SAL_DLLPRIVATE void _Update_Impl( bool,bool,bool,SfxWorkWindow*);
SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 0aa5dc5..f04c968 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -212,7 +212,7 @@ bool SfxDispatcher::IsAppDispatcher() const
/** Helper function to check whether a slot can be executed and
check the execution itself
*/
-int SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord)
+void SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord)
{
SFX_STACK(SfxDispatcher::Call_Impl);
@@ -269,7 +269,7 @@ int SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
}
// do nothing after this object is dead
- return rReq.IsDone() ? 1 : 0;
+ return;
}
}
@@ -296,12 +296,8 @@ int SfxDispatcher::Call_Impl(SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
pBindings->Update(rSlot.GetSlotId());
}
}
-
- return sal_True;
}
}
-
- return sal_False;
}
void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
commit b9bcc9ff9fc6b639e2cf1760bb408c837418be4c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:24:44 2015 +0200
DBG_PRINT_ENTRY expects a 4th arg of type int
Change-Id: Id89f3436d9f9e142d8845381b483bdf8697dd1da
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index 1e0a658..9c36c5b 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -255,7 +255,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException )
void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException )
{
- DBG_PRINT_ENTRY(CLASS_NAME, __func__, "multiSelectable?", bMode);
+ DBG_PRINT_ENTRY(CLASS_NAME, __func__, "multiSelectable?", int(bMode));
SolarMutexGuard aGuard;
commit e8db4aacd3208dbc8e9d66cfb56b31fa6417eb87
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:23:20 2015 +0200
FlashExporter::exportBackgrounds return type is sal_uInt16
Change-Id: Ic75d0893f4e0e8893c683661d3c6f3f91653b267
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 2d0feeb..c443a1e 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -322,7 +322,7 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, R
{
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
if( !xDrawPage.is() || !xPropSet.is() )
- return sal_False;
+ return 0;
if( NULL == mpWriter )
{
@@ -351,7 +351,7 @@ sal_uInt16 FlashExporter::exportBackgrounds( Reference< XDrawPage > xDrawPage, s
{
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
if( !xDrawPage.is() || !xPropSet.is() )
- return sal_False;
+ return 0;
bool bBackgroundVisible = true;
bool bBackgroundObjectsVisible = true;
commit c1a4cd6c4e0dc79bcebfc050f17963cc8f642ce3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:20:34 2015 +0200
Dialog::Execute return type is short/VclResponseType
Change-Id: I40fb77dff3112ee154d6d413757af6593486280d
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index e30c771..ae9c4d5 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -258,7 +258,7 @@ short SaneDlg::Execute()
{
MessageDialog aErrorBox(NULL, SaneResId(STR_COULD_NOT_BE_INIT));
aErrorBox.Execute();
- return sal_False;
+ return RET_CANCEL;
}
LoadState();
return ModalDialog::Execute();
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 498f038..72cff7f 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -345,7 +345,7 @@ short PrinterSetupDialog::Execute()
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
{
SAL_WARN( "svtools.dialogs", "PrinterSetupDialog::Execute() - No Printer or printer is printing" );
- return sal_False;
+ return RET_CANCEL;
}
Printer::updatePrinters();
@@ -358,7 +358,7 @@ short PrinterSetupDialog::Execute()
short nRet = ModalDialog::Execute();
// update data if the dialog was terminated with OK
- if ( nRet == sal_True )
+ if ( nRet == RET_OK )
{
if ( mpTempPrinter )
mpPrinter->SetPrinterProps( mpTempPrinter );
commit 5c859f4f91fa99fc59ef4cd3ebc7b1a762e172f8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 18:18:37 2015 +0200
executedDialog _nExecutionResult param is of type sal_Int16/VclResponseType
Change-Id: Ied27330db3af9b33ddccbda52da927202f112dab
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 371ca6a..675f2aa 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -167,7 +167,7 @@ namespace pcr
void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult)
{
OSL_ENSURE(m_pDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!");
- if (m_pDialog && (sal_True == _nExecutionResult) && m_xControlModel.is())
+ if (m_pDialog && (RET_OK == _nExecutionResult) && m_xControlModel.is())
{
const SfxItemSet* pOutput = static_cast<ControlCharacterDialog*>(m_pDialog)->GetOutputItemSet();
if (pOutput)
commit 532911eb2b838a7b52514b636322cf327d3c4a58
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:59:51 2015 +0200
SvxRTFParser::ReadBorder/BackgroundAttr bTableDef param wants to be bool
Change-Id: I78c34a539a62ed129309305ce6e37a8feb19b1fd
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index ac62e58..fdfda07 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1388,7 +1388,7 @@ static void SetBorderLine( int nBorderTyp, SvxBoxItem& rItem,
}
void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
- int bTableDef )
+ bool bTableDef )
{
// then read the border attribute
SvxBoxItem aAttr( aPardMap.nBox );
@@ -1577,7 +1577,7 @@ inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uIn
}
void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
- int bTableDef )
+ bool bTableDef )
{
// then read the border attribute
bool bContinue = true;
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 857e18c..39290ec 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -328,8 +328,8 @@ public:
RTFPardAttrMapIds& GetPardMap() { return aPardMap; }
RTFPlainAttrMapIds& GetPlainMap() { return aPlainMap; }
// to be able to assign them from the outside as for example table cells
- void ReadBorderAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False );
- void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, int bTableDef=sal_False );
+ void ReadBorderAttr( int nToken, SfxItemSet& rSet, bool bTableDef=false );
+ void ReadBackgroundAttr( int nToken, SfxItemSet& rSet, bool bTableDef=false );
// for asynchronous read from the SvStream
virtual void Continue( int nToken ) SAL_OVERRIDE;
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index ef818ce..31065f0 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -392,11 +392,11 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo )
{
case RTF_SHADINGDEF:
static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBackgroundAttr(
- pInfo->nToken, pInsDefault->aItemSet, sal_True );
+ pInfo->nToken, pInsDefault->aItemSet, true );
break;
case RTF_BRDRDEF:
static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(
- pInfo->nToken, pInsDefault->aItemSet, sal_True );
+ pInfo->nToken, pInsDefault->aItemSet, true );
break;
}
}
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index caf0570..a241d61 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -415,7 +415,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
// ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
break;
case RTF_BRDRDEF:
- static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
+ static_cast<SvxRTFParser*>(pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, true );
break;
}
}
commit 930b60d9a16e2111d3c35371241a753193168936
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:56:06 2015 +0200
Outliner::RemovingPagesHdl return type wants to be bool
Change-Id: I7d57d560f28683a840022cf766ef22cc50683349
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 50c88f0..cecf2b2 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1771,9 +1771,9 @@ void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const OUString&
}
}
-long Outliner::RemovingPagesHdl( OutlinerView* pView )
+bool Outliner::RemovingPagesHdl( OutlinerView* pView )
{
- return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True;
+ return !aRemovingPagesHdl.IsSet() || aRemovingPagesHdl.Call( pView );
}
bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 _nFirstPage, sal_Int32 nPages )
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 960caa8..12bb779 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -777,7 +777,7 @@ public:
sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); }
ParaFlag GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
- long RemovingPagesHdl( OutlinerView* );
+ bool RemovingPagesHdl( OutlinerView* );
void SetRemovingPagesHdl(const Link& rLink){aRemovingPagesHdl=rLink;}
Link GetRemovingPagesHdl() const { return aRemovingPagesHdl; }
long IndentingPagesHdl( OutlinerView* );
commit a602a1ce43ea5debf6693d83dd5b164942574969
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:43:11 2015 +0200
operator == return type wants to be bool
Change-Id: I7ef0a09b718ca701ed2b6f4a50593f8ef1421dd3
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index be252b4..b3fc0d8 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -740,13 +740,13 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
return *this;
}
-int SvxNumRule::operator==( const SvxNumRule& rCopy) const
+bool SvxNumRule::operator==( const SvxNumRule& rCopy) const
{
if(nLevelCount != rCopy.nLevelCount ||
nFeatureFlags != rCopy.nFeatureFlags ||
bContinuousNumbering != rCopy.bContinuousNumbering ||
eNumberingType != rCopy.eNumberingType)
- return sal_False;
+ return false;
for(sal_uInt16 i = 0; i < nLevelCount; i++)
{
if (
@@ -756,10 +756,10 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const
(aFmts[i] && *aFmts[i] != *rCopy.aFmts[i])
)
{
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
const SvxNumberFormat* SvxNumRule::Get(sal_uInt16 nLevel)const
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 7a12b5b..e959b70 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -262,7 +262,7 @@ public:
SvxNumRule(SvStream &rStream);
virtual ~SvxNumRule();
- int operator==( const SvxNumRule& ) const;
+ bool operator==( const SvxNumRule& ) const;
bool operator!=( const SvxNumRule& rRule ) const {return !(*this == rRule);}
SvxNumRule& operator=( const SvxNumRule& );
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 73d1edf..a4ab2a7 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -86,7 +86,7 @@ public:
inline SvxMacroTableDtor( const SvxMacroTableDtor &rCpy ) : aSvxMacroTable(rCpy.aSvxMacroTable) { }
SvxMacroTableDtor& operator=( const SvxMacroTableDtor &rCpy );
- int operator==( const SvxMacroTableDtor& rOther ) const;
+ bool operator==( const SvxMacroTableDtor& rOther ) const;
// deletes all entries
void clear() { aSvxMacroTable.clear(); }
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 4229d62..a1f0132 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -45,7 +45,7 @@ public:
~XOBitmap();
XOBitmap& operator=( const XOBitmap& rXOBitmap );
- int operator==( const XOBitmap& rXOBitmap ) const;
+ bool operator==( const XOBitmap& rXOBitmap ) const;
void Bitmap2Array();
void Array2Bitmap();
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index e36c79d..8f0b66a 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -77,11 +77,11 @@ SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl )
return *this;
}
-int SvxMacroTableDtor::operator==( const SvxMacroTableDtor& rOther ) const
+bool SvxMacroTableDtor::operator==( const SvxMacroTableDtor& rOther ) const
{
// Count different => odd in any case
if ( aSvxMacroTable.size() != rOther.aSvxMacroTable.size() )
- return sal_False;
+ return false;
// Compare single ones; the sequence matters due to performance reasons
SvxMacroTable::const_iterator it1 = aSvxMacroTable.begin();
@@ -93,10 +93,10 @@ int SvxMacroTableDtor::operator==( const SvxMacroTableDtor& rOther ) const
if ( it1->first != it2->first ||
rOwnMac.GetLibName() != rOtherMac.GetLibName() ||
rOwnMac.GetMacName() != rOtherMac.GetMacName() )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, sal_uInt16 nVersion )
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 0518bdd..a016e03 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -101,7 +101,7 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
return *this;
}
-int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
+bool XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
{
if( eType != rXOBitmap.eType ||
aGraphicObject != rXOBitmap.aGraphicObject ||
@@ -110,7 +110,7 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
aBckgrColor != rXOBitmap.aBckgrColor ||
bGraphicDirty != rXOBitmap.bGraphicDirty )
{
- return sal_False;
+ return false;
}
if( pPixelArray && rXOBitmap.pPixelArray )
@@ -119,10 +119,10 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
for( sal_uInt16 i = 0; i < nCount; i++ )
{
if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) )
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
Bitmap XOBitmap::GetBitmap() const
commit 99d4b08d05c6edba43675661c70736a2a062af21
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:37:55 2015 +0200
WizardDialog::DeactivatePage return type wants to be bool
Change-Id: Ib44006e339a4e1ee9b5c9201e48861fceef865fd
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 388ee1c..32fa0a7 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -324,7 +324,7 @@ namespace dbaui
virtual ~OCopyTableWizard();
- virtual long DeactivatePage() SAL_OVERRIDE;
+ virtual bool DeactivatePage() SAL_OVERRIDE;
OKButton& GetOKButton() { return static_cast<OKButton&>(*m_pbFinish); }
Wizard_Button_Style GetPressedButton() const { return m_ePressed; }
void EnableButton(Wizard_Button_Style eStyle, bool bEnable);
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index d5e57ff..90f1894 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -834,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
{
m_ePressed = WIZARD_FINISH;
- bool bFinish = DeactivatePage() != 0;
+ bool bFinish = DeactivatePage();
if(bFinish)
{
@@ -989,10 +989,10 @@ void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle, bool bEnable)
}
-long OCopyTableWizard::DeactivatePage()
+bool OCopyTableWizard::DeactivatePage()
{
OWizardPage* pPage = static_cast<OWizardPage*>(GetPage(GetCurLevel()));
- return pPage ? pPage->LeavePage() : sal_False;
+ return pPage && pPage->LeavePage();
}
void OCopyTableWizard::AddWizardPage(OWizardPage* pPage)
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 56bd679..b5cd150 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -200,7 +200,7 @@ namespace svt
protected:
// WizardDialog overridables
virtual void ActivatePage() SAL_OVERRIDE;
- virtual long DeactivatePage() SAL_OVERRIDE;
+ virtual bool DeactivatePage() SAL_OVERRIDE;
// our own overridables
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 93d19ad..a8c7e4e 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -248,7 +248,7 @@ public:
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void ActivatePage();
- virtual long DeactivatePage();
+ virtual bool DeactivatePage();
virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 4339551..6cc2233 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -270,12 +270,12 @@ namespace svt
}
- long OWizardMachine::DeactivatePage()
+ bool OWizardMachine::DeactivatePage()
{
WizardState nCurrentState = getCurrentState();
if (!leaveState(nCurrentState) || !WizardDialog::DeactivatePage())
- return sal_False;
- return sal_True;
+ return false;
+ return true;
}
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index e520313..5c42e0c 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -480,12 +480,12 @@ void WizardDialog::ActivatePage()
-long WizardDialog::DeactivatePage()
+bool WizardDialog::DeactivatePage()
{
if ( maDeactivateHdl.IsSet() )
return maDeactivateHdl.Call( this );
else
- return sal_True;
+ return true;
}
commit 56a2bc14b5ca23e26b33b3c55a026b81bbeb244b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:25:24 2015 +0200
css.sdbc.XResultSet.getRow return type is long
Change-Id: I764a88f110f5528cabc1e223ffc63079954c534f
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index c1d9cf0..54ef4761 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -631,7 +631,7 @@ sal_Int32 SAL_CALL SbaXFormAdapter::getRow() throw( ::com::sun::star::sdbc::SQLE
{
if (m_xMainForm.is())
return m_xMainForm->getRow();
- return sal_False;
+ return 0;
}
sal_Bool SAL_CALL SbaXFormAdapter::absolute(sal_Int32 row) throw( ::com::sun::star::sdbc::SQLException, RuntimeException, std::exception )
commit 4bece188f175d9792611e9f07875ca7739a44c60
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:23:08 2015 +0200
Simplify sal_Bool expressions
Change-Id: I4f9dd7b273e52fa97a7f79bf77a76ae5412c5e10
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index b6299e7..206790b 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -191,8 +191,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
if ( sComponentURL == URL_COMPONENT_DATASOURCEBROWSER )
{
- bool bDisableBrowser = ( sal_False == aLoadArgs.getOrDefault( "ShowTreeViewButton", sal_True ) ) // compatibility name
- || ( sal_False == aLoadArgs.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True ) );
+ bool bDisableBrowser = !aLoadArgs.getOrDefault( "ShowTreeViewButton", sal_True ) // compatibility name
+ || !aLoadArgs.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True );
if ( bDisableBrowser )
{
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 7ec0b2a..ddc38f8 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3109,16 +3109,16 @@ void SbaTableQueryBrowser::impl_initialize()
// disable the browser if either of ShowTreeViewButton (compatibility name) or EnableBrowser
// is present and set to FALSE
- bool bDisableBrowser = ( sal_False == rArguments.getOrDefault( "ShowTreeViewButton", sal_True ) ) // compatibility name
- || ( sal_False == rArguments.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True ) );
+ bool bDisableBrowser = !rArguments.getOrDefault( "ShowTreeViewButton", sal_True ) // compatibility name
+ || !rArguments.getOrDefault( OUString(PROPERTY_ENABLE_BROWSER), sal_True );
OSL_ENSURE( !rArguments.has( "ShowTreeViewButton" ),
"SbaTableQueryBrowser::impl_initialize: ShowTreeViewButton is superseded by EnableBrowser!" );
m_bEnableBrowser = !bDisableBrowser;
// hide the tree view it is disabled in general, or if the settings tell to hide it initially
bool bHideTreeView = ( !m_bEnableBrowser )
- || ( sal_False == rArguments.getOrDefault( "ShowTreeView", sal_True ) ) // compatibility name
- || ( sal_False == rArguments.getOrDefault( OUString(PROPERTY_SHOW_BROWSER), sal_True ) );
+ || !rArguments.getOrDefault( "ShowTreeView", sal_True ) // compatibility name
+ || !rArguments.getOrDefault( OUString(PROPERTY_SHOW_BROWSER), sal_True );
OSL_ENSURE( !rArguments.has( "ShowTreeView" ),
"SbaTableQueryBrowser::impl_initialize: ShowTreeView is superseded by ShowBrowser!" );
commit d0b17e6ed881fbfbf35a851f9fe876e1846b5ce6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:21:29 2015 +0200
SvXMLEnumMapEntry holds all values as sal_uInt16
Change-Id: I3af5f97e77240a0f0a3c96cffc03c8a005e8f0aa
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index fcbdbc4..43a7fec 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -56,8 +56,8 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
{
static const SvXMLEnumMapEntry aDisplayMap[] =
{
- { XML_VISIBLE, sal_True },
- { XML_COLLAPSE, sal_False },
+ { XML_VISIBLE, sal_uInt16(true) },
+ { XML_COLLAPSE, sal_uInt16(false) },
{ XML_TOKEN_INVALID, 0 }
};
m_pDisplayHandler.reset(new XMLConstantsPropertyHandler(aDisplayMap, XML_TOKEN_INVALID ));
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index d5a44c3..a422b25 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -322,15 +322,15 @@ static const ColorData aNumFmtStdColors[XML_NUMF_COLORCOUNT] =
static const SvXMLEnumMapEntry aStyleValueMap[] =
{
- { XML_SHORT, sal_False },
- { XML_LONG, sal_True },
+ { XML_SHORT, sal_uInt16(false) },
+ { XML_LONG, sal_uInt16(true) },
{ XML_TOKEN_INVALID, 0 }
};
static const SvXMLEnumMapEntry aFormatSourceMap[] =
{
- { XML_FIXED, sal_False },
- { XML_LANGUAGE, sal_True },
+ { XML_FIXED, sal_uInt16(false) },
+ { XML_LANGUAGE, sal_uInt16(true) },
{ XML_TOKEN_INVALID, 0 }
};
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index d39aa77..0cc3464 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -124,13 +124,13 @@ static SvXMLEnumMapEntry const pXML_HoriRelFrame_Enum[] =
static SvXMLEnumMapEntry const pXML_HoriMirror_Enum[] =
{
- { XML_FROM_LEFT, sal_False },
- { XML_FROM_INSIDE, sal_True },
- { XML_LEFT, sal_False },
- { XML_INSIDE, sal_True },
- { XML_CENTER, sal_False },
- { XML_RIGHT, sal_False },
- { XML_OUTSIDE, sal_True },
+ { XML_FROM_LEFT, sal_uInt16(false) },
+ { XML_FROM_INSIDE, sal_uInt16(true) },
+ { XML_LEFT, sal_uInt16(false) },
+ { XML_INSIDE, sal_uInt16(true) },
+ { XML_CENTER, sal_uInt16(false) },
+ { XML_RIGHT, sal_uInt16(false) },
+ { XML_OUTSIDE, sal_uInt16(true) },
{ XML_TOKEN_INVALID, 0 }
};
commit 9d56ec4e4d498193b6553c5a8c65ddce88a2d925
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:18:05 2015 +0200
UpdateFormatListBox_Impl bCat param wants to be of type bool
Change-Id: Idf6831ef21cf94926667ca532d9df2a18926e452
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index edf9e40..9a6172a 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -136,7 +136,7 @@ private:
void FillCurrencyBox();
void FillFormatListBox_Impl( std::vector<OUString>& rEntries );
void UpdateOptions_Impl( bool bCheckCatChange );
- void UpdateFormatListBox_Impl( sal_uInt16 bCat, bool bUpdateEdit );
+ void UpdateFormatListBox_Impl( bool bCat, bool bUpdateEdit );
void Obstructing();
void EnableBySourceFormat_Impl();
void SetCategory( sal_uInt16 nPos );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index da6c8e1..bc6f142 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -567,7 +567,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet )
m_pLbLanguage->SelectLanguage( eLangType );
if(pAutoEntryAttr)
AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue());
- UpdateFormatListBox_Impl(sal_False,true);
+ UpdateFormatListBox_Impl(false,true);
//! This spoils everything because it rematches currency formats based on
//! the selected m_pLbCurrency entry instead of the current format.
@@ -925,7 +925,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa
else
SetCategory(nCategory );
- UpdateFormatListBox_Impl( sal_True, false );
+ UpdateFormatListBox_Impl( true, false );
}
}
else if ( m_pLbFormat->GetEntryCount() > 0 )
@@ -998,7 +998,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa
void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
(
- sal_uInt16 bCat, // Category or country/language ListBox?
+ bool bCat, // Category or country/language ListBox?
bool bUpdateEdit
)
{
@@ -1225,7 +1225,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
// category-ListBox -------------------------------------------------
if (pLb == m_pLbCategory || pLb == m_pLbCurrency)
{
- UpdateFormatListBox_Impl( sal_True, true );
+ UpdateFormatListBox_Impl( true, true );
EditHdl_Impl( NULL );
UpdateOptions_Impl( false );
@@ -1236,7 +1236,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
// language/country-ListBox ----------------------------------------------
if (pLb == m_pLbLanguage)
{
- UpdateFormatListBox_Impl( sal_False, true );
+ UpdateFormatListBox_Impl( false, true );
EditHdl_Impl(m_pEdFormat);
return 0;
commit 93fed09bfbeae299aa56c7c6d929d57607ac087b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 17:15:51 2015 +0200
Dialog::EndDialog nResult param is of type long/VclResponseType
Change-Id: I31f1941daf158676518fcf259ef8a9e84863473e
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index f239f7f..6764c45 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -402,7 +402,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl)
OUString aOUStr( &cChar, 1 );
m_pShowText->SetText( aOUStr );
}
- EndDialog( sal_True );
+ EndDialog( RET_OK );
return 0;
}
@@ -497,7 +497,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl)
sal_UCS4 cChar = m_pShowSet->GetSelectCharacter();
m_pShowText->SetText(OUString(&cChar, 1));
}
- EndDialog( sal_True );
+ EndDialog( RET_OK );
return 0;
}
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index f437d31..aa50eb9 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -174,7 +174,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click)
return 0;
}
m_pName->SetText(sName);
- EndDialog( sal_True );
+ EndDialog( RET_OK );
}
}
catch( const Exception& )
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 80a10be..8c64920 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -281,7 +281,7 @@ namespace pcr
// TODO: UNO action (to bracket all the single actions which are being created)
m_xModel->setControlModels( aSortedControlModelSeq );
- EndDialog( sal_True );
+ EndDialog( RET_OK );
return 0;
}
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 64bd977..9851aa8 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -305,7 +305,7 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const
IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl)
{
- EndDialog( sal_False );
+ EndDialog( RET_CANCEL );
return 0;
}
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 2a4b1fa..93ace60 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -806,7 +806,7 @@ IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl)
}
else
{
- EndDialog( sal_False );
+ EndDialog( RET_CANCEL );
}
return 1L;
}
@@ -1113,7 +1113,7 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
if ( nRet )
{
- pThis->EndDialog( sal_True );
+ pThis->EndDialog( RET_OK );
}
return nRet;
@@ -1380,7 +1380,7 @@ void SvtFileDialog::OpenMultiSelection_Impl()
nRet = 1;
if ( nRet )
- EndDialog( sal_True );
+ EndDialog( RET_OK );
}
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 4b30c53..b2299f7 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -113,7 +113,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl)
sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId();
Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO );
m_aTabBgColor = aColor;
- EndDialog( sal_True );
+ EndDialog( RET_OK );
return 0;
}
@@ -125,7 +125,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl)
sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId();
Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO );
m_aTabBgColor = aColor;
- EndDialog( sal_True );
+ EndDialog( RET_OK );
return 0;
}
@@ -156,7 +156,7 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
sal_uInt16 nItemId = GetSelectItemId();
const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : Color( COL_AUTO );
m_pTabBgColorDlg->m_aTabBgColor = aColor;
- m_pTabBgColorDlg->EndDialog(sal_True);
+ m_pTabBgColorDlg->EndDialog(RET_OK);
}
break;
}
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index b258ba2..239f195 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -311,7 +311,7 @@ IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl
if( pControl == mpLBEffects )
{
if( mpLBEffects->GetSelectEntryCount() )
- mpParent->EndDialog( sal_True );
+ mpParent->EndDialog( RET_OK );
}
return 0;
}
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 6f1ebc6..ce7448d 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -157,7 +157,7 @@ short BreakDlg::Execute()
IMPL_LINK_NOARG(BreakDlg, InitialUpdate)
{
pDrView->DoImportMarkedMtf(pProgrInfo);
- EndDialog(sal_True);
+ EndDialog(RET_OK);
return 0L;
}
commit a8e7b4966846dc1005898add66a965eba9409840
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 16:57:53 2015 +0200
Use TriState instead of 0/1/-1
Change-Id: I6f53cd0ee1e7acd724186ab914bde43026ef6708
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 5fdf918..ff5351a 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -109,7 +109,7 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne
,m_nNewRow(0)
,m_nUpdatedRow(0)
,m_RowStates(0)
- ,m_bIsReadOnly(-1)
+ ,m_bIsReadOnly(TRISTATE_INDET)
{
//m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
}
@@ -683,7 +683,7 @@ void OResultSet::getFastPropertyValue(
break;
case PROPERTY_ID_ISBOOKMARKABLE:
const_cast< OResultSet* >( this )->determineReadOnly();
- rValue <<= !m_bIsReadOnly;
+ rValue <<= (m_bIsReadOnly == TRISTATE_FALSE);
break;
}
}
@@ -1070,7 +1070,7 @@ void OResultSet::fillRowData()
// If the query is a 0=1 then set Row count to 0 and return
if ( m_bIsAlwaysFalseQuery )
{
- m_bIsReadOnly = 1;
+ m_bIsReadOnly = TRISTATE_TRUE;
return;
}
@@ -1837,14 +1837,14 @@ bool OResultSet::determineReadOnly()
{
// OSL_FAIL( "OResultSet::determineReadOnly( ) not implemented" );
- if (m_bIsReadOnly == -1)
+ if (m_bIsReadOnly == TRISTATE_INDET)
{
- m_bIsReadOnly = sal_True;
+ m_bIsReadOnly = TRISTATE_TRUE;
// OConnection* xConnection = static_cast<OConnection*>(m_pStatement->getConnection().get());
// m_bIsReadOnly = !m_aQueryHelper.isWritable(xConnection) || m_bIsAlwaysFalseQuery;
}
- return m_bIsReadOnly != 0;
+ return m_bIsReadOnly != TRISTATE_FALSE;
}
void OResultSet::setTable(OTable* _rTable)
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index d4c930b..e35fa79 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase12.hxx>
#include <comphelper/proparrhlp.hxx>
+#include <tools/gen.hxx>
#include "MStatement.hxx"
#include "MQueryHelper.hxx"
#include <connectivity/CommonTools.hxx>
@@ -241,7 +242,7 @@ protected:
sal_Int32 m_nNewRow; //inserted row
sal_Int32 m_nUpdatedRow; //updated row
sal_Int32 m_RowStates;
- sal_Int32 m_bIsReadOnly;
+ TriState m_bIsReadOnly;
inline void resetParameters() { m_nParamIndex = 0; }
::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns
commit 9a492cee4b68ffbc68886a6fa628f9741a29576d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 16:56:27 2015 +0200
css.sdbc.XResultSetMetaData.isNullable return type is long (oddly enough)
Change-Id: I7dfb69ff45ddba07255cb0000efea9f87c13cd2b
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index cd15132..81550e1 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -147,7 +147,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col
if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
return (*m_mColumnsIter).second.isNullable();
- return sal_False;
+ return sal_Int32(false);
}
sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception)
commit 2709a759bcc6095094d80e0e3c40707c87d0668f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 16:52:35 2015 +0200
Make use of comphelper::log::convert::convetLogArgToString bool overload
Change-Id: Ic91c65fc1f74fbde86c2448d1c394a5e30452a75
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 3d6179c..feadbce 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -541,7 +541,7 @@ bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethodName
{
m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
jboolean out( java_lang_Object::callBooleanMethod(_pMethodName,_inout_MethodID) );
- m_aLogger.log< const sal_Char*, sal_Int16>( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
+ m_aLogger.log< const sal_Char*, bool>( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
return out;
}
@@ -584,7 +584,7 @@ bool java_sql_DatabaseMetaData::impl_callBooleanMethodWithIntArg( const char* _p
jboolean out( callBooleanMethodWithIntArg(_pMethodName,_inout_MethodID,_nArgument) );
- m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
+ m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out );
return out;
}
@@ -1004,7 +1004,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
}
- m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
+ m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
return out;
}
@@ -1346,7 +1346,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
}
- m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
+ m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
return out;
}
commit f36b923276a07151a07a9e5ff619a7e9f002e6c4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 16:47:05 2015 +0200
css.util.XNumberFormats.genarateFormat nLeading param is of type short
Change-Id: If535bbe07df95f93d052705cb665d1b4cae5af01
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 4f5e395..adbb61f 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -179,7 +179,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType,
{
// generate a new format if necessary
Reference< XNumberFormats > xFormats(_xTypes, UNO_QUERY);
- OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, sal_True);
+ OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, 1);
// and add it to the formatter if necessary
nFormat = xFormats->queryKey(sNewFormat, _rLocale, sal_False);
commit 60ee74e8ae3c671f0c78c54f5e2546a5cb3185dd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 16:44:25 2015 +0200
GLEW_VERSION_3_3 is of type GLboolean already
Change-Id: Id565602f4cb488176451cfcc1d2aa05e7acab964
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 29cdb5c..044e4df 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -213,7 +213,7 @@ OpenGL3DRenderer::ShaderResources::~ShaderResources()
void OpenGL3DRenderer::CheckGLSLVersion()
{
- maResources.m_b330Support = GLEW_VERSION_3_3 == 1;
+ maResources.m_b330Support = GLEW_VERSION_3_3;
}
void OpenGL3DRenderer::ShaderResources::LoadShaders()
commit 8a26a4053db946da7c8d8cdbf2444faf3c459291
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 16:43:07 2015 +0200
SfxTabPage::DeactivatePage wants to return SfxTabPage::sfxpg
Change-Id: Iba538bb51635e6cae1e033d14e8da3dabfb36634
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 9bcb6e8..c746056 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 3dfeecd..61eb83c 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 bb92e78..875c71f 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 ff8bbe7..3f0a99c 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();
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index f3e0cfd..b6d9e46 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -64,7 +64,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
private:
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index f27f2a4..8d6d1bc 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -263,7 +263,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE;
@@ -322,7 +322,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
void SetLanguage(LanguageType eSet);
};
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 6c3298e..0686c81 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -66,7 +66,7 @@ public:
void EnableTransparency(bool bColor, bool bGraphic);
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 244faa2..9e2ed66 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -56,7 +56,7 @@ public:
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
void SetTableMode();
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
private:
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 43d7d61..9a471ff 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -148,7 +148,7 @@ public:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
virtual ~SvxCharNamePage();
@@ -230,7 +230,7 @@ private:
public:
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
@@ -310,7 +310,7 @@ public:
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
public:
@@ -355,7 +355,7 @@ public:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 500bf7c..e6906f1 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -60,7 +60,7 @@ private:
void SetLinks ();
protected:
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
public:
SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 5d8c23d..3fe91da 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -168,7 +168,7 @@ public:
virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
void SetPageType(sal_uInt16 nInType) { nPageType = nInType; }
@@ -298,7 +298,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
@@ -364,7 +364,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
@@ -443,7 +443,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
void SetGradientList( XGradientListRef pGrdLst)
@@ -519,7 +519,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -605,7 +605,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -739,7 +739,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
XPropertyListRef GetPropertyList( XPropertyListType t );
void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 5db3330..3155070 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -215,7 +215,7 @@ public:
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -311,7 +311,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
void SetDashList( XDashListRef pDshLst ) { pDashList = pDshLst; }
void SetObjSelected( bool bHasObj ) { bObjSelected = bHasObj; }
@@ -381,7 +381,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
void SetLineEndList( XLineEndListRef pInList ) { pLineEndList = pInList; }
void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; }
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 8d7392a..18769ae 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -115,7 +115,7 @@ public:
virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index e866670..edf9e40 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -78,7 +78,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
void SetInfoItem( const SvxNumberInfoItem& rItem );
void SetNumberFormatList( const SvxNumberInfoItem& rItem )
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 8398776..739249f 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -114,7 +114,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -150,7 +150,7 @@ class SvxBulletPickTabPage : public SfxTabPage
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -193,7 +193,7 @@ class SvxNumPickTabPage : public SfxTabPage
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -238,7 +238,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -350,7 +350,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -450,7 +450,7 @@ public:
virtual ~SvxNumPositionTabPage();
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index fac3304..90dadae 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -185,7 +185,7 @@ private:
protected:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 461f56a..e0ca89f 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -94,7 +94,7 @@ private:
DECL_LINK( AutoHdl_Impl, CheckBox* );
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
@@ -159,7 +159,7 @@ class SvxParaAlignTabPage : public SfxTabPage
virtual ~SvxParaAlignTabPage();
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
@@ -204,7 +204,7 @@ public:
void DisablePageBreak();
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 94f34aa..d293468 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -131,7 +131,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
void EnableAnchorTypes(sal_uInt16 nAnchorEnable);
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 0bc84e3..39c761a 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -60,7 +60,7 @@ public:
void DisableControls( const sal_uInt16 nFlag );
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
private:
SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 5272a41..ccc70d1 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -155,7 +155,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -211,7 +211,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -256,7 +256,7 @@ public:
virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ae9b3be..e71e31b 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1129,7 +1129,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet* )
UpdateColorConfig();
}
-int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ )
+SfxTabPage::sfxpg SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
FillItemSet( pSet_ );
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 509d9f1..4948748 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -55,7 +55,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 107f3f1..2ee207c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -183,7 +183,7 @@ void OpenGLCfg::setForceOpenGL(bool bOpenGL)
// class OfaMiscTabPage --------------------------------------------------
-int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
+SvxGeneralTabPage::sfxpg OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
FillItemSet( pSet_ );
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 5652811..f4b4ee7 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ private:
DECL_LINK( OnFileDlgToggled, void* );
#endif
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index d1504f9..9cb1c1b 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -431,7 +431,7 @@ void SvxGeneralTabPage::SetAddress_Impl()
-int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ )
+SvxGeneralTabPage::sfxpg SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
FillItemSet( pSet_ );
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 4c61088..17e97d2 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -884,7 +884,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
{
}
-int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 37c97c1..2d137ba 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -171,7 +171,7 @@ private:
protected:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 07011b6..a8bac70 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -102,7 +102,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes
m_pNfGraphicObjectCache->SetLast( long( double( nSizeInBytes ) * BYTES2NF ) );
}
-int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 666010f..1ba1a1e 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -53,7 +53,7 @@ private:
inline void SetNfGraphicObjectCacheMax( long nSizeInBytes );
inline void SetNfGraphicObjectCacheLast( long nSizeInBytes );
protected:
- virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 22b5088..8a80c50 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -298,7 +298,7 @@ void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs )
UpdateEnableControls();
}
-int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 6a7d690..5c46ca9 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -916,7 +916,7 @@ void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true);
}
-int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* )
+SfxTabPage::sfxpg OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* )
{
return LEAVE_PAGE;
}
@@ -1417,7 +1417,7 @@ void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage(true);
}
-int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* )
+SfxTabPage::sfxpg OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* )
{
return LEAVE_PAGE;
}
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 1fe7aed..6be4495 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1037,7 +1037,7 @@ bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, s
-int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
/* [Description]
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 8a3a29a..8037793 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -576,7 +576,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
-int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 67c13dd..6df37aa 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1171,7 +1171,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet )
-int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
@@ -1711,7 +1711,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox )
}
-int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
@@ -2878,7 +2878,7 @@ void SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet )
-int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
@@ -3442,7 +3442,7 @@ void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet )
-int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index eeac4d7..c416ad7 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -382,11 +382,11 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
CalcZoom();
}
-int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet)
+SfxTabPage::sfxpg SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet)
{
if ( _pSet )
FillItemSet( _pSet );
- return sal_True;
+ return LEAVE_PAGE;
}
/*--------------------------------------------------------------------
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 04c8e6e..da6c8e1 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -794,7 +794,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
}
-int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 921e7db..a725a70 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -276,11 +276,11 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
bModified = false;
}
-int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
+SfxTabPage::sfxpg SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
FillItemSet(_pSet);
- return sal_True;
+ return LEAVE_PAGE;
}
void SvxSingleNumPickTabPage::Reset( const SfxItemSet* rSet )
@@ -435,11 +435,11 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
bModified = false;
}
-int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
+SfxTabPage::sfxpg SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
FillItemSet(_pSet);
- return sal_True;
+ return LEAVE_PAGE;
}
void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet )
@@ -632,11 +632,11 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
bModified = false;
}
-int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
+SfxTabPage::sfxpg SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
FillItemSet(_pSet);
- return sal_True;
+ return LEAVE_PAGE;
}
void SvxNumPickTabPage::Reset( const SfxItemSet* rSet )
@@ -863,11 +863,11 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
bModified = false;
}
-int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet)
+SfxTabPage::sfxpg SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
FillItemSet(_pSet);
- return sal_True;
+ return LEAVE_PAGE;
}
bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -1192,11 +1192,11 @@ void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
}
-int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
+SfxTabPage::sfxpg SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet)
{
if(_pSet)
FillItemSet(_pSet);
- return sal_True;
+ return LEAVE_PAGE;
}
bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet* rSet )
@@ -2954,7 +2954,7 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
m_pPreviewWIN->Invalidate();
}
-int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
+SfxTabPage::sfxpg SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
{
@@ -2963,7 +2963,7 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
DistanceHdl_Impl(m_pIndentMF);
FillItemSet(_pSet);
}
- return sal_True;
+ return LEAVE_PAGE;
}
bool SvxNumPositionTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7b86c46..ef8dc6a 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1450,7 +1450,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
-int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
{
// Inquiry whether the page margins are beyond the printing area.
// If not, ask user whether they shall be taken.
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 7d1e279..527f4f7 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -599,7 +599,7 @@ void SvxStdParagraphTabPage::EnableRelativeMode()
bRelativeMode = true;
}
-int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
{
ELRLoseFocusHdl( NULL );
@@ -1020,7 +1020,7 @@ SvxParaAlignTabPage::~SvxParaAlignTabPage()
{
}
-int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
@@ -1786,7 +1786,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
m_pOrphanBox->SaveValue();
}
-int SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxExtParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index f116816..dcf3b94 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1047,7 +1047,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet)
}
}
-int SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxSwPosSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 7772da1..4d589e7 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -353,7 +353,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
-int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 882f185..944aff6 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -472,7 +472,7 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet)
InitPreview ( rSet );
}
-int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
+SfxTabPage::sfxpg SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet)
{
if( _pSet )
FillItemSet( _pSet );
@@ -932,7 +932,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
-int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( nDlgType == 0 ) // area dialog
{
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 3712626..3ce5ff5 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -215,7 +215,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
-int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
+SfxTabPage::sfxpg SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
{
if ( CheckChanges_Impl() == -1L )
return KEEP_PAGE;
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 42baaad..165736e 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -478,7 +478,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
-int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( CheckChanges_Impl() == -1L )
return KEEP_PAGE;
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index a4b866e..b2c3348 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -228,7 +228,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
-int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( CheckChanges_Impl() == -1L )
return KEEP_PAGE;
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 7a7557b..418a7ce 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -217,7 +217,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
-int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( CheckChanges_Impl() == -1L )
return KEEP_PAGE;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 0ebcf15..119d599 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -653,7 +653,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
-int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( nDlgType == 0 ) // Line dialog
{
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 66de7c9..9e947e8 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -194,7 +194,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
-int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
{
CheckChanges_Impl();
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 0c2ed94..194b0cd 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -172,7 +172,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
-int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet )
{
CheckChanges_Impl();
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index fe94d0e..e1121a6 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -239,7 +239,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
-int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
FillItemSet( _pSet );
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 9ec39aa..5658f7a 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -326,7 +326,7 @@ void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/)
-int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
{
@@ -560,7 +560,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
-int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
{
@@ -996,7 +996,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
-int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
+SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
{
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 0d15109..ffb2c8d 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -66,7 +66,7 @@ namespace dbaui
SetExchangeSupport(true);
}
- int OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet)
+ SfxTabPage::sfxpg OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet)
{
if (_pSet)
{
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 77f4278..b866cd7 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -149,7 +149,7 @@ namespace dbaui
protected:
/// default implementation: call FillItemSet, call prepareLeave,
- virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
/// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False
virtual void Reset(const SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 3a1ef5d..59d9af9 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -389,9 +389,9 @@ namespace dbaui
m_pTablesList->checkWildcard(m_pTablesList->getAllObjectsEntry());
}
- int OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet)
+ SfxTabPage::sfxpg OTableSubscriptionPage::DeactivatePage(SfxItemSet* _pSet)
{
- int nResult = OGenericAdministrationPage::DeactivatePage(_pSet);
+ sfxpg nResult = OGenericAdministrationPage::DeactivatePage(_pSet);
// dispose the connection, we don't need it anymore, so we're not wasting resources
try
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 37db79c..bd1568a 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -50,7 +50,7 @@ namespace dbaui
public:
virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet* _pSet) SAL_OVERRIDE;
using OGenericAdministrationPage::DeactivatePage;
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 9179c69..58c874c 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -518,7 +518,7 @@ protected:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
@@ -640,7 +640,7 @@ protected:
virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* );
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index e6f1f8e..6b5ba43 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -94,7 +94,7 @@ protected:
using TabPage::ActivatePage;
virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE;
using TabPage::DeactivatePage;
- virtual int DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE;
};
#endif
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 4857ce4..3fcf7a0 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -89,7 +89,7 @@ private:
protected:
using TabPage::DeactivatePage;
- virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
public:
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 2465321..b54d974 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -272,7 +272,7 @@ public:
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& );
- virtual int DeactivatePage( SfxItemSet* pSet = 0 );
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 );
void SetUserData(const OUString& rString)
{ aUserString = rString; }
OUString GetUserData() { return aUserString; }
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index ad0a5cc..53450d3 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -65,7 +65,7 @@ protected:
static const sal_uInt16 pRanges[];
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId );
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 1d6e62b..02c74ca 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -108,7 +108,7 @@ public:
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
private:
CheckBox* pCbxUseGridsnap;
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index ea485cb..2202754 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -137,7 +137,7 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs )
return bAttrsChanged;
}
-int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
+SfxTabPage::sfxpg ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
{
if ( pSetP )
FillItemSet( pSetP );
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 9dbc066..c1a0770 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -310,7 +310,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
}
}
-int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
+SfxTabPage::sfxpg ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
{
if ( pDlg )
{
@@ -752,7 +752,7 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
}
}
-int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
+SfxTabPage::sfxpg ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
{
bool bPosInputOk = true;
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 95423203..69f12bd 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -36,7 +36,7 @@ public:
protected:
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
private:
ScTabPageProtection( vcl::Window* pParent,
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 629eb73..034e49f 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -37,7 +37,7 @@ public:
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
- virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
private:
ScTpCalcOptions( vcl::Window* pParent,
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index 6ddeeec..5ab6e54 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -23,7 +23,7 @@ public:
virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
private:
explicit ScTpCompatOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs);
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 251c367..6580efd 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -23,7 +23,7 @@ public:
virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE;
- virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
private:
explicit ScTpDefaultsOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet);
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index adf1c64..cf901f1 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -37,7 +37,7 @@ public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list