[Libreoffice-commits] core.git: 8 commits - accessibility/source basctl/source chart2/source cui/source dbaccess/source extensions/source formula/source include/svtools include/svx reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/source
Noel Grandin
noel at peralex.com
Tue Mar 25 05:33:34 PDT 2014
accessibility/source/extended/accessiblelistbox.cxx | 8
accessibility/source/extended/accessiblelistboxentry.cxx | 8
basctl/source/basicide/baside2.hxx | 4
basctl/source/basicide/baside2b.cxx | 4
basctl/source/basicide/moduldl2.cxx | 4
basctl/source/basicide/moduldlg.cxx | 6
basctl/source/basicide/moduldlg.hxx | 10
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 6
chart2/source/controller/dialogs/tp_ChartType.cxx | 4
chart2/source/controller/dialogs/tp_ChartType.hxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 14
chart2/source/controller/dialogs/tp_DataSource.hxx | 2
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 6
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 2
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 4
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx | 2
chart2/source/controller/inc/dlg_CreationWizard.hxx | 2
chart2/source/controller/main/ChartTransferable.cxx | 8
chart2/source/controller/main/ChartTransferable.hxx | 4
cui/source/customize/acccfg.cxx | 14
cui/source/customize/cfg.cxx | 10
cui/source/customize/cfgutil.cxx | 13
cui/source/customize/macropg.cxx | 4
cui/source/customize/selector.cxx | 12
cui/source/dialogs/hlmarkwn.cxx | 6
cui/source/dialogs/linkdlg.cxx | 20
cui/source/dialogs/scriptdlg.cxx | 4
cui/source/dialogs/thesdlg.cxx | 4
cui/source/inc/cfg.hxx | 2
cui/source/options/fontsubs.cxx | 10
cui/source/options/optaboutconfig.cxx | 4
cui/source/options/optdict.cxx | 10
cui/source/options/optfltr.cxx | 4
cui/source/options/optjava.cxx | 2
cui/source/options/optlingu.cxx | 16
cui/source/options/radiobtnbox.cxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/tabpages/autocdlg.cxx | 22
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/numfmt.cxx | 4
cui/source/tabpages/swpossizetabpage.cxx | 8
cui/source/tabpages/tparea.cxx | 4
cui/source/tabpages/transfrm.cxx | 14
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 14
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 6
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 10
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 14
dbaccess/source/ui/app/AppDetailView.cxx | 2
dbaccess/source/ui/browser/dbexchange.cxx | 6
dbaccess/source/ui/browser/unodatbr.cxx | 6
dbaccess/source/ui/control/dbtreelistbox.cxx | 10
dbaccess/source/ui/control/tabletree.cxx | 10
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 3
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/adminpages.hxx | 2
dbaccess/source/ui/dlg/dbwiz.cxx | 12
dbaccess/source/ui/dlg/dbwizsetup.cxx | 30 -
dbaccess/source/ui/dlg/indexdialog.cxx | 13
dbaccess/source/ui/inc/JoinExchange.hxx | 2
dbaccess/source/ui/inc/TableRowExchange.hxx | 4
dbaccess/source/ui/inc/dbexchange.hxx | 4
dbaccess/source/ui/inc/dbtreelistbox.hxx | 6
dbaccess/source/ui/inc/dbwiz.hxx | 4
dbaccess/source/ui/inc/dbwizsetup.hxx | 6
dbaccess/source/ui/inc/indexdialog.hxx | 2
dbaccess/source/ui/misc/HtmlReader.cxx | 4
dbaccess/source/ui/misc/WCopyTable.cxx | 2
dbaccess/source/ui/misc/WNameMatch.cxx | 6
dbaccess/source/ui/querydesign/JoinExchange.cxx | 6
dbaccess/source/ui/querydesign/JoinTableView.cxx | 12
dbaccess/source/ui/querydesign/TableWindow.cxx | 4
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 14
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 10
extensions/source/abpilot/abpfinalpage.cxx | 10
extensions/source/abpilot/abpfinalpage.hxx | 2
extensions/source/abpilot/abspage.cxx | 2
extensions/source/abpilot/abspilot.cxx | 22
extensions/source/abpilot/abspilot.hxx | 4
extensions/source/abpilot/tableselectionpage.cxx | 6
extensions/source/abpilot/tableselectionpage.hxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 12
extensions/source/abpilot/typeselectionpage.hxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 14
extensions/source/dbpilots/commonpagesdbp.hxx | 4
extensions/source/dbpilots/controlwizard.cxx | 4
extensions/source/dbpilots/gridwizard.cxx | 20
extensions/source/dbpilots/gridwizard.hxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 26 -
extensions/source/dbpilots/groupboxwiz.hxx | 10
extensions/source/dbpilots/listcombowizard.cxx | 36 -
extensions/source/dbpilots/listcombowizard.hxx | 10
extensions/source/propctrlr/selectlabeldialog.cxx | 8
extensions/source/propctrlr/taborder.cxx | 6
formula/source/ui/dlg/structpg.cxx | 4
include/svtools/embedtransfer.hxx | 2
include/svtools/roadmap.hxx | 20
include/svtools/roadmapwizard.hxx | 2
include/svtools/rtfout.hxx | 4
include/svtools/ruler.hxx | 44 -
include/svtools/scrwin.hxx | 2
include/svtools/simptabl.hxx | 18
include/svtools/statusbarcontroller.hxx | 2
include/svtools/stringtransfer.hxx | 4
include/svtools/svlbitm.hxx | 34 -
include/svtools/svmedit2.hxx | 4
include/svtools/svparser.hxx | 28 -
include/svtools/svtabbx.hxx | 14
include/svtools/tabbar.hxx | 100 ++--
include/svtools/templatefoldercache.hxx | 6
include/svtools/templdlg.hxx | 2
include/svtools/toolboxcontroller.hxx | 8
include/svtools/transfer.hxx | 120 ++---
include/svtools/treelist.hxx | 26 -
include/svtools/treelistbox.hxx | 98 ++--
include/svtools/unitconv.hxx | 4
include/svtools/unoimap.hxx | 2
include/svtools/wizardmachine.hxx | 24 -
include/svtools/wizdlg.hxx | 10
include/svx/checklbx.hxx | 2
include/svx/dbaexchange.hxx | 6
include/svx/dbaobjectex.hxx | 2
include/svx/galmisc.hxx | 4
include/svx/xmlexchg.hxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 10
reportdesign/source/ui/dlg/GroupExchange.cxx | 4
reportdesign/source/ui/dlg/GroupExchange.hxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 14
reportdesign/source/ui/inc/dlgedclip.hxx | 2
reportdesign/source/ui/report/dlgedclip.cxx | 6
sc/source/ui/app/drwtrans.cxx | 10
sc/source/ui/app/lnktrans.cxx | 4
sc/source/ui/app/seltrans.cxx | 4
sc/source/ui/app/transobj.cxx | 6
sc/source/ui/cctrl/checklistmenu.cxx | 2
sc/source/ui/inc/drwtrans.hxx | 4
sc/source/ui/inc/lnktrans.hxx | 2
sc/source/ui/inc/seltrans.hxx | 2
sc/source/ui/inc/transobj.hxx | 4
sc/source/ui/miscdlgs/conflictsdlg.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 2
sc/source/ui/navipi/content.cxx | 10
sd/source/ui/animations/CustomAnimationList.cxx | 8
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/app/sdxfer.cxx | 14
sd/source/ui/dlg/copydlg.cxx | 8
sd/source/ui/dlg/custsdlg.cxx | 2
sd/source/ui/dlg/dlgsnap.cxx | 4
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/dlg/sdtreelb.cxx | 46 +-
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 4
sd/source/ui/inc/TabControl.hxx | 2
sd/source/ui/inc/sdtreelb.hxx | 2
sd/source/ui/inc/sdxfer.hxx | 4
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/tabcontr.cxx | 4
sfx2/source/appl/newhelp.cxx | 4
sfx2/source/bastyp/sfxhtml.cxx | 2
sfx2/source/dialog/templdlg.cxx | 20
sfx2/source/dialog/versdlg.cxx | 8
sfx2/source/doc/doctempl.cxx | 2
sfx2/source/doc/objembed.cxx | 2
sfx2/source/doc/objmisc.cxx | 4
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/inc/templdgi.hxx | 2
svtools/source/contnr/fileview.cxx | 26 -
svtools/source/contnr/simptabl.cxx | 19
svtools/source/contnr/svlbitm.cxx | 37 -
svtools/source/contnr/svtabbx.cxx | 28 -
svtools/source/contnr/templwin.cxx | 4
svtools/source/contnr/treelist.cxx | 66 +-
svtools/source/contnr/treelistbox.cxx | 222 +++++-----
svtools/source/control/roadmap.cxx | 62 +-
svtools/source/control/ruler.cxx | 163 +++----
svtools/source/control/scrwin.cxx | 28 -
svtools/source/control/tabbar.cxx | 206 ++++-----
svtools/source/dialogs/roadmapwizard.cxx | 2
svtools/source/dialogs/wizardmachine.cxx | 76 +--
svtools/source/dialogs/wizdlg.cxx | 20
svtools/source/edit/svmedit2.cxx | 4
svtools/source/misc/embedtransfer.cxx | 12
svtools/source/misc/stringtransfer.cxx | 10
svtools/source/misc/templatefoldercache.cxx | 86 +--
svtools/source/misc/transfer.cxx | 166 +++----
svtools/source/misc/transfer2.cxx | 22
svtools/source/misc/unitconv.cxx | 4
svtools/source/svrtf/rtfout.cxx | 4
svtools/source/svrtf/svparser.cxx | 18
svtools/source/uno/generictoolboxcontroller.cxx | 2
svtools/source/uno/statusbarcontroller.cxx | 12
svtools/source/uno/toolboxcontroller.cxx | 34 -
svtools/source/uno/treecontrolpeer.cxx | 20
svtools/source/uno/unoimap.cxx | 4
svtools/source/uno/wizard/wizardpagecontroller.cxx | 6
svtools/source/uno/wizard/wizardpagecontroller.hxx | 2
svtools/source/uno/wizard/wizardshell.cxx | 12
svtools/source/uno/wizard/wizardshell.hxx | 4
svx/source/dialog/checklbx.cxx | 6
svx/source/dialog/ctredlin.cxx | 2
svx/source/dialog/docrecovery.cxx | 4
svx/source/dialog/fontlb.cxx | 2
svx/source/dialog/fontwork.cxx | 16
svx/source/dialog/optgrid.cxx | 8
svx/source/fmcomp/dbaexchange.cxx | 12
svx/source/fmcomp/dbaobjectex.cxx | 4
svx/source/fmcomp/xmlexchg.cxx | 4
svx/source/form/datanavi.cxx | 18
svx/source/form/filtnav.cxx | 26 -
svx/source/form/fmexch.cxx | 8
svx/source/form/navigatortree.cxx | 30 -
svx/source/form/tabwin.cxx | 8
svx/source/gallery2/galmisc.cxx | 8
svx/source/inc/filtnav.hxx | 4
svx/source/inc/fmexch.hxx | 4
svx/source/inc/fmexpl.hxx | 4
svx/source/inc/tabwin.hxx | 2
svx/source/tbxctrls/colrctrl.cxx | 12
svx/source/tbxctrls/itemwin.cxx | 4
sw/source/core/uibase/dbui/dbtree.cxx | 8
sw/source/core/uibase/dochdl/swdtflvr.cxx | 18
sw/source/core/uibase/inc/conttree.hxx | 6
sw/source/core/uibase/inc/glossary.hxx | 2
sw/source/core/uibase/inc/swdtflvr.hxx | 4
sw/source/core/uibase/misc/redlndlg.cxx | 20
sw/source/core/uibase/utlui/content.cxx | 28 -
sw/source/core/uibase/utlui/glbltree.cxx | 22
sw/source/core/uibase/utlui/navipi.cxx | 6
sw/source/ui/chrdlg/swuiccoll.cxx | 4
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/mailmergewizard.cxx | 4
sw/source/ui/dbui/mmaddressblockpage.cxx | 10
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dbui/mmdocselectpage.cxx | 4
sw/source/ui/dbui/mmdocselectpage.hxx | 2
sw/source/ui/dbui/mmgreetingspage.cxx | 4
sw/source/ui/dbui/mmgreetingspage.hxx | 4
sw/source/ui/dbui/mmlayoutpage.cxx | 4
sw/source/ui/dbui/mmlayoutpage.hxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 16
sw/source/ui/dbui/mmpreparemergepage.cxx | 4
sw/source/ui/dbui/mmpreparemergepage.hxx | 2
sw/source/ui/dbui/selectdbtabledialog.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/fldui/flddinf.cxx | 4
sw/source/ui/fldui/fldref.cxx | 4
sw/source/ui/misc/glossary.cxx | 6
249 files changed, 1671 insertions(+), 1669 deletions(-)
New commits:
commit 80ef0dfedcbba5a0c2cb8de409cc24200191fab8
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 25 14:20:18 2014 +0200
svtools: sal_Bool->bool
Change-Id: I42a341b5805e0b2a7d619ba552700db35815afd5
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index d0b745d..6b018be 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -69,7 +69,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
m_apDialogModel.reset( new DialogModel( m_xChartModel, m_xCC ));
// Do not call FreeResource(), because there are no sub-elements defined in
// the dialog resource
- ShowButtonFixedLine( sal_True );
+ ShowButtonFixedLine( true );
defaultButton( WZB_FINISH );
if( m_nOnePageOnlyIndex < 0 || m_nOnePageOnlyIndex >= nPageCount )
@@ -155,7 +155,7 @@ svt::OWizardPage* CreationWizard::createPage(WizardState nState)
return pRet;
}
-sal_Bool CreationWizard::leaveState( WizardState /*_nState*/ )
+bool CreationWizard::leaveState( WizardState /*_nState*/ )
{
return m_bCanTravel;
}
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 0c78e59..d010648 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -941,7 +941,7 @@ void ChartTypeTabPage::initializePage()
}
}
-sal_Bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//commit changes to model
if( !m_bDoLiveUpdate && m_pCurrentMainType )
@@ -951,7 +951,7 @@ sal_Bool ChartTypeTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eR
commitToModel( aParameter );
}
- return sal_True;//return false if this page should not be left
+ return true; // return false if this page should not be left
}
uno::Reference< XChartTypeTemplate > ChartTypeTabPage::getCurrentTemplate() const
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index c796276..21ea308 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -58,7 +58,7 @@ public:
virtual ~ChartTypeTabPage();
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index aa15051..b73f7b6 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -303,16 +303,16 @@ void DataSourceTabPage::commitPage()
commitPage(::svt::WizardTypes::eFinish);
}
-sal_Bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool DataSourceTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//ranges may have been edited in the meanwhile (dirty is true in that case here)
if( isValid() )
{
updateModelFromControl( 0 /*update all*/ );
- return sal_True;//return false if this page should not be left
+ return true; //return false if this page should not be left
}
else
- return sal_False;
+ return false;
}
bool DataSourceTabPage::isRangeFieldContentValid( Edit & rEdit )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 819f02a..6cb17bc 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -71,7 +71,7 @@ public:
protected:
// OWizardPage
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
//TabPage
virtual void DeactivatePage();
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index cc2ed79..63052fb 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -173,16 +173,16 @@ void RangeChooserTabPage::commitPage()
commitPage(::svt::WizardTypes::eFinish);
}
-sal_Bool RangeChooserTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool RangeChooserTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
//ranges may have been edited in the meanwhile (dirty is true in that case here)
if( isValid() )
{
changeDialogModelAccordingToControls();
- return sal_True;//return false if this page should not be left
+ return true; // return false if this page should not be left
}
else
- return sal_False;
+ return false;
}
void RangeChooserTabPage::changeDialogModelAccordingToControls()
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 3c6bf37..b8ca0bf 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -60,7 +60,7 @@ protected: //methods
//OWizardPage
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
//TabPage
virtual void DeactivatePage();
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index ba62a07..e551c54 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -92,11 +92,11 @@ void TitlesAndObjectsTabPage::initializePage()
m_bCommitToModel = true;
}
-sal_Bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
+bool TitlesAndObjectsTabPage::commitPage( ::svt::WizardTypes::CommitPageReason /*eReason*/ )
{
if( m_xTitleResources->IsModified() ) //titles may have changed in the meanwhile
commitToModel();
- return sal_True;//return false if this page should not be left
+ return true;//return false if this page should not be left
}
void TitlesAndObjectsTabPage::commitToModel()
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 0cd35d6..33bb097 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -46,7 +46,7 @@ public:
::com::sun::star::uno::XComponentContext >& xContext );
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason );
virtual bool canAdvance() const;
protected:
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 2f762fd..83c2a24 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -59,7 +59,7 @@ public:
virtual void setValidPage( TabPage * pTabPage );
protected:
- virtual sal_Bool leaveState( WizardState _nState );
+ virtual bool leaveState( WizardState _nState );
virtual WizardState determineNextState(WizardState nCurrentState) const;
virtual void enterState(WizardState nState);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 84aa0b2..0b9a01c 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -550,10 +550,10 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInA
setOptimalRelWidth();
FieldUnit eDlgUnit = GetModuleFieldUnit( rInAttrs );
- SetFieldUnit( *m_pHoriByMF, eDlgUnit, sal_True );
- SetFieldUnit( *m_pVertByMF, eDlgUnit, sal_True );
- SetFieldUnit( *m_pWidthMF , eDlgUnit, sal_True );
- SetFieldUnit( *m_pHeightMF, eDlgUnit, sal_True );
+ SetFieldUnit( *m_pHoriByMF, eDlgUnit, true );
+ SetFieldUnit( *m_pVertByMF, eDlgUnit, true );
+ SetFieldUnit( *m_pWidthMF , eDlgUnit, true );
+ SetFieldUnit( *m_pHeightMF, eDlgUnit, true );
SetExchangeSupport();
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 8fdda34..488c8e1 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -687,8 +687,8 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
break;
default: ;//prevent warning
}
- SetFieldUnit( *m_pMtrFldXSize, eFUnit, sal_True );
- SetFieldUnit( *m_pMtrFldYSize, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldXSize, eFUnit, true );
+ SetFieldUnit( *m_pMtrFldYSize, eFUnit, true );
// get PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index d74790a..bdaee0c 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -229,8 +229,8 @@ void SvxAngleTabPage::Construct()
{
DBG_ASSERT(pView, "No valid view (!)");
eDlgUnit = GetModuleFieldUnit(GetItemSet());
- SetFieldUnit(*m_pMtrPosX, eDlgUnit, sal_True);
- SetFieldUnit(*m_pMtrPosY, eDlgUnit, sal_True);
+ SetFieldUnit(*m_pMtrPosX, eDlgUnit, true);
+ SetFieldUnit(*m_pMtrPosY, eDlgUnit, true);
if(FUNIT_MILE == eDlgUnit || FUNIT_KM == eDlgUnit)
{
@@ -465,7 +465,7 @@ void SvxSlantTabPage::Construct()
// get the range
DBG_ASSERT(pView, "no valid view (!)");
eDlgUnit = GetModuleFieldUnit(GetItemSet());
- SetFieldUnit(*m_pMtrRadius, eDlgUnit, sal_True);
+ SetFieldUnit(*m_pMtrRadius, eDlgUnit, true);
{ // #i75273#
Rectangle aTempRect(pView->GetAllMarkedRect());
@@ -689,10 +689,10 @@ void SvxPositionSizeTabPage::Construct()
// get range and work area
DBG_ASSERT( mpView, "no valid view (!)" );
meDlgUnit = GetModuleFieldUnit( GetItemSet() );
- SetFieldUnit( *m_pMtrPosX, meDlgUnit, sal_True );
- SetFieldUnit( *m_pMtrPosY, meDlgUnit, sal_True );
- SetFieldUnit( *m_pMtrWidth, meDlgUnit, sal_True );
- SetFieldUnit( *m_pMtrHeight, meDlgUnit, sal_True );
+ SetFieldUnit( *m_pMtrPosX, meDlgUnit, true );
+ SetFieldUnit( *m_pMtrPosY, meDlgUnit, true );
+ SetFieldUnit( *m_pMtrWidth, meDlgUnit, true );
+ SetFieldUnit( *m_pMtrHeight, meDlgUnit, true );
if(FUNIT_MILE == meDlgUnit || FUNIT_KM == meDlgUnit)
{
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 3e0fc45..29e3c4c 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -243,20 +243,20 @@ namespace dbmm
}
}
- sal_Bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
+ bool MacroMigrationDialog::prepareLeaveCurrentState( CommitPageReason _eReason )
{
if ( !MacroMigrationDialog_Base::prepareLeaveCurrentState( _eReason ) )
- return sal_False;
+ return false;
switch ( getCurrentState() )
{
case STATE_CLOSE_SUB_DOCS:
if ( !impl_closeSubDocs_nothrow() )
- return sal_False;
+ return false;
break;
case STATE_BACKUP_DBDOC:
if ( !impl_backupDocument_nothrow() )
- return sal_False;
+ return false;
break;
case STATE_MIGRATE:
break;
@@ -266,10 +266,10 @@ namespace dbmm
OSL_FAIL( "MacroMigrationDialog::prepareLeaveCurrentState: unhandled state!" );
}
- return sal_True;
+ return true;
}
- sal_Bool MacroMigrationDialog::leaveState( WizardState _nState )
+ bool MacroMigrationDialog::leaveState( WizardState _nState )
{
return MacroMigrationDialog_Base::leaveState( _nState );
}
@@ -279,7 +279,7 @@ namespace dbmm
return MacroMigrationDialog_Base::determineNextState( _nCurrentState );
}
- sal_Bool MacroMigrationDialog::onFinish()
+ bool MacroMigrationDialog::onFinish()
{
return MacroMigrationDialog_Base::onFinish();
}
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 43e6e12..e55a770 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -50,10 +50,10 @@ namespace dbmm
protected:
// OWizardMachine overridables
virtual void enterState( WizardState _nState );
- virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
- virtual sal_Bool leaveState( WizardState _nState );
+ virtual bool prepareLeaveCurrentState( CommitPageReason _eReason );
+ virtual bool leaveState( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
// Dialog overridables
virtual bool Close();
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index d76ade6..762a5e9 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -152,18 +152,18 @@ namespace dbmm
return !m_aSaveAsLocation.GetText().isEmpty();
}
- sal_Bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if ( !MacroMigrationPage::commitPage( _eReason ) )
- return sal_False;
+ return false;
if ( ::svt::WizardTypes::eTravelBackward == _eReason )
- return sal_True;
+ return true;
if ( !m_aLocationController.prepareCommit() )
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
TabPage* SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 8e36d49..8b6a87d 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -95,7 +95,7 @@ namespace dbmm
protected:
// IWizardPageController overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
private:
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 76d0f9b..1f19928 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -174,7 +174,8 @@ namespace dbaui
callModifiedHdl();
}
- sal_Bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
+
+ bool OConnectionTabPageSetup::commitPage( ::svt::WizardTypes::CommitPageReason /*_eReason*/ )
{
return commitURL();
}
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 59cfa0f..b6d54b3 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -54,7 +54,7 @@ namespace dbaui
virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs);
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(false); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 57e8174..6495e5b 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -183,9 +183,9 @@ namespace dbaui
if ( m_pItemSetHelper )
Reset(*m_pItemSetHelper->getOutputSet());
}
- sal_Bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason )
+ bool OGenericAdministrationPage::commitPage( ::svt::WizardTypes::CommitPageReason )
{
- return sal_True;
+ return true;
}
bool OGenericAdministrationPage::canAdvance() const
{
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index c7e5519..6012405 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -145,7 +145,7 @@ namespace dbaui
// svt::IWizardPageController
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
void SetRoadmapStateValue( sal_Bool _bDoEnable ) { m_abEnableRoadmap = _bDoEnable; }
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 39b820d..22212d9 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -83,9 +83,9 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
m_eType = m_pImpl->getDatasourceType(*m_pOutSet);
SetPageSizePixel(LogicToPixel(::Size(PAGE_X, PAGE_Y), MAP_APPFONT));
- ShowButtonFixedLine(sal_True);
+ ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
enableAutomaticNextButtonState( true );
m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
@@ -296,12 +296,12 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
return pPage;
}
-sal_Bool ODbTypeWizDialog::leaveState(WizardState _nState)
+bool ODbTypeWizDialog::leaveState(WizardState _nState)
{
SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState));
if ( pPage )
pPage->FillItemSet(*m_pOutSet);
- return sal_True;
+ return true;
}
void ODbTypeWizDialog::setTitle(const OUString& _sTitle)
@@ -339,10 +339,10 @@ IWizardPageController* ODbTypeWizDialog::getPageController( TabPage* _pCurrentPa
return pPage;
}
-sal_Bool ODbTypeWizDialog::onFinish()
+bool ODbTypeWizDialog::onFinish()
{
saveDatasource();
- return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False;
+ return m_pImpl->saveChanges(*m_pOutSet) && OWizardMachine::onFinish();
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 2816b9f..9e50c18 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -153,9 +153,9 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT));
- ShowButtonFixedLine(sal_True);
+ ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
- enableButtons(WZB_FINISH, sal_True);
+ enableButtons(WZB_FINISH, true);
enableAutomaticNextButtonState();
::dbaccess::ODsnTypeCollection::TypeIterator aIter = m_pCollection->begin();
@@ -324,7 +324,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), true );
enableState(PAGE_DBSETUPWIZARD_FINAL, true );
- enableButtons( WZB_FINISH, sal_True);
+ enableButtons( WZB_FINISH, true);
}
break;
case OGeneralPageWizard::eConnectExternal:
@@ -576,7 +576,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _
enableState(PAGE_DBSETUPWIZARD_FINAL, m_bIsConnectable);
enableState(PAGE_DBSETUPWIZARD_AUTHENTIFICATION, m_bIsConnectable);
if (getCurrentState() == PAGE_DBSETUPWIZARD_FINAL)
- enableButtons( WZB_FINISH, sal_True);
+ enableButtons( WZB_FINISH, true);
else
enableButtons( WZB_FINISH, m_bIsConnectable);
enableButtons( WZB_NEXT, m_bIsConnectable && (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL));
@@ -631,7 +631,7 @@ void ODbTypeWizDialogSetup::enterState(WizardState _nState)
m_sOldURL = m_sURL;
break;
case PAGE_DBSETUPWIZARD_FINAL:
- enableButtons( WZB_FINISH, sal_True);
+ enableButtons( WZB_FINISH, true);
if ( m_pFinalPage )
m_pFinalPage->enableTableWizardCheckBox(m_pCollection->supportsTableCreation(m_sURL));
break;
@@ -646,10 +646,10 @@ sal_Bool ODbTypeWizDialogSetup::saveDatasource()
return sal_True;
}
-sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
+bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
{
if (_nState == PAGE_DBSETUPWIZARD_MYSQL_INTRO)
- return sal_True;
+ return true;
if ( _nState == PAGE_DBSETUPWIZARD_INTRO && m_sURL != m_sOldURL )
{
resetPages(m_pImpl->getCurrentDataSource());
@@ -983,7 +983,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
}
}
- sal_Bool ODbTypeWizDialogSetup::onFinish()
+ bool ODbTypeWizDialogSetup::onFinish()
{
if ( m_pGeneralPage->GetDatabaseCreationMode() == OGeneralPageWizard::eOpenExisting )
{
@@ -991,8 +991,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
// wants us to load could be a non-database document. Instead, we asynchronously
// open the selected document. Thus, the wizard's return value is RET_CANCEL,
// which means to not continue loading the database document
- if ( !OWizardMachine::Finnish( RET_CANCEL ) )
- return sal_False;
+ if ( !OWizardMachine::Finish( RET_CANCEL ) )
+ return false;
try
{
@@ -1005,7 +1005,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
DBG_UNHANDLED_EXCEPTION();
}
- return sal_True;
+ return true;
}
if (getCurrentState() != PAGE_DBSETUPWIZARD_FINAL)
@@ -1013,11 +1013,11 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
skipUntil(PAGE_DBSETUPWIZARD_FINAL);
}
if (getCurrentState() == PAGE_DBSETUPWIZARD_FINAL)
- return SaveDatabaseDocument() ? OWizardMachine::onFinish() : sal_False;
+ return SaveDatabaseDocument() && OWizardMachine::onFinish();
else
{
- enableButtons( WZB_FINISH, sal_False );
- return sal_False;
+ enableButtons( WZB_FINISH, false );
+ return false;
}
}
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index b678953..53ebf42 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -94,10 +94,10 @@ protected:
/// to override to create new pages
virtual TabPage* createPage(WizardState _nState);
virtual WizardState determineNextState(WizardState _nCurrentState) const;
- virtual sal_Bool leaveState(WizardState _nState);
+ virtual bool leaveState(WizardState _nState);
virtual ::svt::IWizardPageController*
getPageController( TabPage* _pCurrentPage ) const;
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
protected:
inline sal_Bool isUIEnabled() const { return m_bUIEnabled; }
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index b0500ed..5b43eb9 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -128,10 +128,10 @@ public:
protected:
/// to override to create new pages
virtual TabPage* createPage(WizardState _nState);
- virtual sal_Bool leaveState(WizardState _nState);
- virtual void enterState(WizardState _nState);
+ virtual bool leaveState(WizardState _nState);
+ virtual void enterState(WizardState _nState);
virtual ::svt::IWizardPageController* getPageController( TabPage* _pCurrentPage ) const;
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
protected:
inline sal_Bool isUIEnabled() const { return m_bUIEnabled; }
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 9ffaa14..88e9fed 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -667,7 +667,7 @@ void OCopyTableWizard::construct()
SetPrevButton( &m_pbPrev );
SetNextButton( &m_pbNext );
- ShowButtonFixedLine( sal_True );
+ ShowButtonFixedLine( true );
m_pbNext.GrabFocus();
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 4e9d69c..871f4be 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -125,15 +125,15 @@ namespace abp
}
- sal_Bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!AddressBookSourcePage::commitPage(_eReason))
- return sal_False;
+ return false;
if ( ( ::svt::WizardTypes::eTravelBackward != _eReason )
&& ( !m_aLocationController.prepareCommit() )
)
- return sal_False;
+ return false;
AddressSettings& rSettings = getSettings();
rSettings.sDataSourceName = m_aLocationController.getURL();
@@ -141,7 +141,7 @@ namespace abp
if ( rSettings.bRegisterDataSource )
rSettings.sRegisteredDataSourceName = m_aName.GetText();
- return sal_True;
+ return true;
}
@@ -168,7 +168,7 @@ namespace abp
// default the "next" button, again
getDialog()->defaultButton( WZB_NEXT );
// disable the finish button
- getDialog()->enableButtons( WZB_FINISH, sal_False );
+ getDialog()->enableButtons( WZB_FINISH, false );
}
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index a65af43..84ccc9f 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -58,7 +58,7 @@ namespace abp
protected:
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
// TabDialog overridables
virtual void ActivatePage();
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index a6245db..f1277a8 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -40,7 +40,7 @@ namespace abp
void AddressBookSourcePage::DeactivatePage()
{
AddressBookSourcePage_Base::DeactivatePage();
- getDialog()->enableButtons(WZB_NEXT, sal_True);
+ getDialog()->enableButtons(WZB_NEXT, true);
}
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 765890a..cfad994 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -67,7 +67,7 @@ namespace abp
{
SetPageSizePixel(LogicToPixel(Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MAP_APPFONT));
- ShowButtonFixedLine(sal_True);
+ ShowButtonFixedLine(true);
declarePath( PATH_COMPLETE,
STATE_SELECT_ABTYPE,
@@ -122,7 +122,7 @@ namespace abp
m_aSettings.bIgnoreNoTable = false;
defaultButton(WZB_NEXT);
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
ActivatePage();
typeSelectionChanged( m_aSettings.eType );
@@ -209,16 +209,16 @@ namespace abp
}
- sal_Bool OAddessBookSourcePilot::onFinish()
+ bool OAddessBookSourcePilot::onFinish()
{
if ( !OAddessBookSourcePilot_Base::onFinish() )
- return sal_False;
+ return false;
implCommitAll();
addressconfig::markPilotSuccess( getORB() );
- return sal_True;
+ return true;
}
@@ -244,15 +244,15 @@ namespace abp
}
- sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
+ bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
{
if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) )
- return sal_False;
+ return false;
if ( _eReason == eTravelBackward )
- return sal_True;
+ return true;
- sal_Bool bAllow = sal_True;
+ bool bAllow = true;
switch ( getCurrentState() )
{
@@ -266,7 +266,7 @@ namespace abp
if ( !connectToDataSource( sal_False ) )
{
// connecting did not succeed -> do not allow proceeding
- bAllow = sal_False;
+ bAllow = false;
break;
}
@@ -279,7 +279,7 @@ namespace abp
if ( RET_YES != QueryBox( this, ModuleRes( ( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_QRY_NO_EVO_GW : RID_QRY_NOTABLES ) ) ).Execute() )
{
// cannot ask the user, or the user chose to use this data source, though there are no tables
- bAllow = sal_False;
+ bAllow = false;
break;
}
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 082c461..beecbf0 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -71,8 +71,8 @@ namespace abp
// OWizardMachine overridables
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual void enterState( WizardState _nState );
- virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
- virtual sal_Bool onFinish();
+ virtual bool prepareLeaveCurrentState( CommitPageReason _eReason );
+ virtual bool onFinish();
// RoadmapWizard
virtual OUString getStateDisplayName( WizardState _nState ) const;
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index 655b901..4b66b83 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -99,15 +99,15 @@ namespace abp
}
- sal_Bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!AddressBookSourcePage::commitPage(_eReason))
- return sal_False;
+ return false;
AddressSettings& rSettings = getSettings();
rSettings.sSelectedTable = m_aTableList.GetSelectEntry();
- return sal_True;
+ return true;
}
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 99be33c..43ed889 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -43,7 +43,7 @@ namespace abp
protected:
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
// TabDialog overridables
virtual void ActivatePage();
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index b5d0c86..0903175 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -188,14 +188,14 @@ namespace abp
}
}
- getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
+ getDialog()->enableButtons(WZB_PREVIOUS, false);
}
void TypeSelectionPage::DeactivatePage()
{
AddressBookSourcePage::DeactivatePage();
- getDialog()->enableButtons(WZB_PREVIOUS, sal_True);
+ getDialog()->enableButtons(WZB_PREVIOUS, true);
}
@@ -233,22 +233,22 @@ namespace abp
}
- sal_Bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!AddressBookSourcePage::commitPage(_eReason))
- return sal_False;
+ return false;
if (AST_INVALID == getSelectedType( ))
{
ErrorBox aError(this, ModuleRes(RID_ERR_NEEDTYPESELECTION));
aError.Execute();
- return sal_False;
+ return false;
}
AddressSettings& rSettings = getSettings();
rSettings.eType = getSelectedType();
- return sal_True;
+ return true;
}
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 2290d03..bc0ef97 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -75,7 +75,7 @@ namespace abp
protected:
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
// TabDialog overridables
virtual void ActivatePage();
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 1bb6bd0..ba38dac 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -153,10 +153,10 @@ namespace dbp
}
- sal_Bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OControlWizardPage::commitPage(_eReason))
- return sal_False;
+ return false;
const OControlWizardContext& rContext = getContext();
try
@@ -179,14 +179,14 @@ namespace dbp
setFormConnection( xOldConn, sal_False );
if (!updateContext())
- return sal_False;
+ return false;
}
catch(const Exception&)
{
OSL_FAIL("OTableSelectionPage::commitPage: caught an exception!");
}
- return sal_True;
+ return true;
}
@@ -481,14 +481,14 @@ namespace dbp
}
- sal_Bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OMaybeListSelectionPage::commitPage(_eReason))
- return sal_False;
+ return false;
implCommit(getDBFieldSetting());
- return sal_True;
+ return true;
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index ff61894..78f119a 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -56,7 +56,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
protected:
DECL_LINK( OnListboxSelection, ListBox* );
@@ -123,7 +123,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
// own overridables
virtual OUString& getDBFieldSetting() = 0;
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 900b0e5..a1f70e3 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -281,9 +281,9 @@ namespace dbp
initContext();
SetPageSizePixel(LogicToPixel(::Size(WINDOW_SIZE_X, WINDOW_SIZE_Y), MAP_APPFONT));
- ShowButtonFixedLine(sal_True);
+ ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
}
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 6ddfa06..0f3d457 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -261,33 +261,33 @@ namespace dbp
enableButtons(WZB_PREVIOUS, m_bHadDataSelection ? (GW_STATE_DATASOURCE_SELECTION < _nState) : GW_STATE_FIELDSELECTION < _nState);
enableButtons(WZB_NEXT, GW_STATE_FIELDSELECTION != _nState);
if (_nState < GW_STATE_FIELDSELECTION)
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
if (GW_STATE_FIELDSELECTION == _nState)
defaultButton(WZB_FINISH);
}
- sal_Bool OGridWizard::leaveState(WizardState _nState)
+ bool OGridWizard::leaveState(WizardState _nState)
{
if (!OControlWizard::leaveState(_nState))
- return sal_False;
+ return false;
if (GW_STATE_FIELDSELECTION == _nState)
defaultButton(WZB_NEXT);
- return sal_True;
+ return true;
}
- sal_Bool OGridWizard::onFinish()
+ bool OGridWizard::onFinish()
{
if ( !OControlWizard::onFinish() )
- return sal_False;
+ return false;
implApplySettings();
- return sal_True;
+ return true;
}
@@ -357,10 +357,10 @@ namespace dbp
}
- sal_Bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGridPage::commitPage(_eReason))
- return sal_False;
+ return false;
OGridSettings& rSettings = getSettings();
sal_uInt16 nSelected = m_aSelFields.GetEntryCount();
@@ -371,7 +371,7 @@ namespace dbp
for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected)
*pSelected = m_aSelFields.GetEntry(i);
- return sal_True;
+ return true;
}
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 9d8044b..aacd04c 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -59,8 +59,8 @@ namespace dbp
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
virtual void enterState( WizardState _nState );
- virtual sal_Bool leaveState( WizardState _nState );
- virtual sal_Bool onFinish();
+ virtual bool leaveState( WizardState _nState );
+ virtual bool onFinish();
virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -105,7 +105,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
protected:
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index acca965..08d90da 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -170,7 +170,7 @@ namespace dbp
}
- sal_Bool OGroupBoxWizard::onFinish()
+ bool OGroupBoxWizard::onFinish()
{
// commit the basic control setttings
commitControlSettings(&m_aSettings);
@@ -248,10 +248,10 @@ namespace dbp
}
- sal_Bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGBWPage::commitPage(_eReason))
- return sal_False;
+ return false;
// copy the names of the radio buttons to be inserted
// and initialize the values
@@ -266,7 +266,7 @@ namespace dbp
rSettings.aValues.push_back(OUString::number((i + 1)));
}
- return sal_True;
+ return true;
}
@@ -378,15 +378,15 @@ namespace dbp
}
- sal_Bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OMaybeListSelectionPage::commitPage(_eReason))
- return sal_False;
+ return false;
OOptionGroupSettings& rSettings = getSettings();
implCommit(rSettings.sDefaultField);
- return sal_True;
+ return true;
}
@@ -468,10 +468,10 @@ namespace dbp
}
- sal_Bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGBWPage::commitPage(_eReason))
- return sal_False;
+ return false;
OOptionGroupSettings& rSettings = getSettings();
@@ -480,7 +480,7 @@ namespace dbp
// copy the uncommitted values
rSettings.aValues = m_aUncommittedValues;
- return sal_True;
+ return true;
}
@@ -536,14 +536,14 @@ namespace dbp
}
- sal_Bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OGBWPage::commitPage(_eReason))
- return sal_False;
+ return false;
getSettings().sControlLabel = m_aName.GetText();
- return sal_True;
+ return true;
}
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index c38e712..1f23558 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -65,7 +65,7 @@ namespace dbp
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
virtual void enterState( WizardState _nState );
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -108,7 +108,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
DECL_LINK( OnMoveEntry, PushButton* );
@@ -136,7 +136,7 @@ namespace dbp
protected:
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
};
@@ -167,7 +167,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
void implTraveledOptions();
@@ -209,7 +209,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
};
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 5cf9b66..dd98d94 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -131,22 +131,22 @@ namespace dbp
enableButtons(WZB_PREVIOUS, m_bHadDataSelection ? (LCW_STATE_DATASOURCE_SELECTION < _nState) : LCW_STATE_TABLESELECTION < _nState);
enableButtons(WZB_NEXT, getFinalState() != _nState);
if (_nState < getFinalState())
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
if (getFinalState() == _nState)
defaultButton(WZB_FINISH);
}
- sal_Bool OListComboWizard::leaveState(WizardState _nState)
+ bool OListComboWizard::leaveState(WizardState _nState)
{
if (!OControlWizard::leaveState(_nState))
- return sal_False;
+ return false;
if (getFinalState() == _nState)
defaultButton(WZB_NEXT);
- return sal_True;
+ return true;
}
@@ -210,13 +210,13 @@ namespace dbp
}
- sal_Bool OListComboWizard::onFinish()
+ bool OListComboWizard::onFinish()
{
if ( !OControlWizard::onFinish() )
- return sal_False;
+ return false;
implApplySettings();
- return sal_True;
+ return true;
}
@@ -343,18 +343,18 @@ namespace dbp
}
- sal_Bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OLCPage::commitPage(_eReason))
- return sal_False;
+ return false;
OListComboSettings& rSettings = getSettings();
rSettings.sListContentTable = m_aSelectTable.GetSelectEntry();
if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason))
// need to select a table
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
@@ -421,14 +421,14 @@ namespace dbp
}
- sal_Bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OLCPage::commitPage(_eReason))
- return sal_False;
+ return false;
getSettings().sListContentField = m_aSelectTableField.GetSelectEntry();
- return sal_True;
+ return true;
}
@@ -499,15 +499,15 @@ namespace dbp
}
- sal_Bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+ bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if (!OLCPage::commitPage(_eReason))
- return sal_False;
+ return false;
getSettings().sLinkedFormField = m_aValueListField.GetText();
getSettings().sLinkedListField = m_aTableField.GetText();
- return sal_True;
+ return true;
}
@@ -530,7 +530,7 @@ namespace dbp
void OComboDBFieldPage::ActivatePage()
{
ODBFieldPage::ActivatePage();
- getDialog()->enableButtons(WZB_FINISH, sal_True);
+ getDialog()->enableButtons(WZB_FINISH, true);
}
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index 0b594b6..adb02f5 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -71,8 +71,8 @@ namespace dbp
virtual ::svt::OWizardPage* createPage( WizardState _nState );
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
virtual void enterState( WizardState _nState );
- virtual sal_Bool leaveState( WizardState _nState );
- virtual sal_Bool onFinish();
+ virtual bool leaveState( WizardState _nState );
+ virtual bool onFinish();
virtual sal_Bool approveControl(sal_Int16 _nClassId);
@@ -120,7 +120,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
protected:
@@ -154,7 +154,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
};
@@ -181,7 +181,7 @@ namespace dbp
// OWizardPage overridables
virtual void initializePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
private:
diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx
index 6beb4b4..e95bb90 100644
--- a/include/svtools/unitconv.hxx
+++ b/include/svtools/unitconv.hxx
@@ -31,8 +31,8 @@ typedef long (*FUNC_CONVERT)(long);
// Functions -------------------------------------------------------------
-SVT_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, sal_Bool bAll = sal_False );
-SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, sal_Bool bAll = sal_False );
+SVT_DLLPUBLIC void SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, bool bAll = false );
+SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, bool bAll = false );
SVT_DLLPUBLIC long CalcToUnit( float nIn, SfxMapUnit eUnit );
SVT_DLLPUBLIC long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor );
diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx
index 6592c03..a369ca8 100644
--- a/include/svtools/unoimap.hxx
+++ b/include/svtools/unoimap.hxx
@@ -32,7 +32,7 @@ SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems );
SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems );
-SVT_DLLPUBLIC sal_Bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap );
+SVT_DLLPUBLIC bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap );
#endif
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index ecaeb62..94e7a4a 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -67,7 +67,7 @@ namespace svt
// to be committed for this.
// So initializePage and commitPage are designated to initialitzing/committing data on the page.
virtual void initializePage() = 0;
- virtual sal_Bool commitPage( WizardTypes::CommitPageReason _eReason ) = 0;
+ virtual bool commitPage( WizardTypes::CommitPageReason _eReason ) = 0;
/** determines whether or not it is allowed to advance to a next page
@@ -104,7 +104,7 @@ namespace svt
// IWizardPageController overridables
virtual void initializePage();
- virtual sal_Bool commitPage( WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
protected:
@@ -180,7 +180,7 @@ namespace svt
~OWizardMachine();
/// enable (or disable) buttons
- void enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable);
+ void enableButtons(sal_uInt32 _nWizardButtonFlags, bool _bEnable);
/// set the default style for a button
void defaultButton(sal_uInt32 _nWizardButtonFlags);
/// set the default style for a button
@@ -223,7 +223,7 @@ namespace svt
@return
<TRUE/> if and only if the page is allowed to be left
*/
- virtual sal_Bool prepareLeaveCurrentState( CommitPageReason _eReason );
+ virtual bool prepareLeaveCurrentState( CommitPageReason _eReason );
/** will be called when the given state is left
@@ -237,7 +237,7 @@ namespace svt
@return
<TRUE/> if and only if the page is allowed to be left
*/
- virtual sal_Bool leaveState( WizardState _nState );
+ virtual bool leaveState( WizardState _nState );
/** determine the next state to travel from the given one
@@ -248,15 +248,15 @@ namespace svt
virtual WizardState determineNextState( WizardState _nCurrentState ) const;
/** called when the finish button is pressed
- <p>By default, only the base class' Finnish method (which is not virtual) is called</p>
+ <p>By default, only the base class' Finish method (which is not virtual) is called</p>
*/
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
/// travel to the next state
- sal_Bool travelNext();
+ bool travelNext();
/// travel to the previous state
- sal_Bool travelPrevious();
+ bool travelPrevious();
/** enables the automatic enabled/disabled state of the "Next" button
@@ -287,7 +287,7 @@ namespace svt
@see skipUntil
@see skipBackwardUntil
*/
- sal_Bool skip( sal_Int32 _nSteps = 1 );
+ bool skip( sal_Int32 _nSteps = 1 );
/** skips one or more states, until a given state is reached
@@ -303,7 +303,7 @@ namespace svt
@see skip
@see skipBackwardUntil
*/
- sal_Bool skipUntil( WizardState _nTargetState );
+ bool skipUntil( WizardState _nTargetState );
/** moves back one or more states, until a given state is reached
@@ -321,7 +321,7 @@ namespace svt
@see skipUntil
@see skip
*/
- sal_Bool skipBackwardUntil( WizardState _nTargetState );
+ bool skipBackwardUntil( WizardState _nTargetState );
/** returns the current state of the machine
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 517d439..836fd6a 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -265,10 +265,10 @@ public:
virtual void queue_resize();
- sal_Bool ShowPrevPage();
- sal_Bool ShowNextPage();
- sal_Bool ShowPage( sal_uInt16 nLevel );
- sal_Bool Finnish( long nResult = 0 );
+ bool ShowPrevPage();
+ bool ShowNextPage();
+ bool ShowPage( sal_uInt16 nLevel );
+ bool Finish( long nResult = 0 );
sal_uInt16 GetCurLevel() const { return mnCurLevel; }
void AddPage( TabPage* pPage );
@@ -284,7 +284,7 @@ public:
void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; }
PushButton* GetNextButton() const { return mpNextBtn; }
- void ShowButtonFixedLine( sal_Bool bVisible );
+ void ShowButtonFixedLine( bool bVisible );
void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
Window* GetViewWindow() const { return mpViewWindow; }
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index f6d223d..7ff5aaa 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -77,10 +77,10 @@ CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs,
FieldUnit eFUnit( SfxModule::GetCurrentFieldUnit() );
- SetFieldUnit( *m_pMtrFldMoveX, eFUnit, sal_True );
- SetFieldUnit( *m_pMtrFldMoveY, eFUnit, sal_True );
- SetFieldUnit( *m_pMtrFldWidth, eFUnit, sal_True );
- SetFieldUnit( *m_pMtrFldHeight, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldMoveX, eFUnit, true );
+ SetFieldUnit( *m_pMtrFldMoveY, eFUnit, true );
+ SetFieldUnit( *m_pMtrFldWidth, eFUnit, true );
+ SetFieldUnit( *m_pMtrFldHeight, eFUnit, true );
Reset();
}
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index af0c14d..d13cd69 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -56,8 +56,8 @@ SdSnapLineDlg::SdSnapLineDlg(
m_pBtnDelete->SetClickHdl(LINK(this, SdSnapLineDlg, ClickHdl));
- SetFieldUnit( *m_pMtrFldX, eUIUnit, sal_True );
- SetFieldUnit( *m_pMtrFldY, eUIUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldX, eUIUnit, true );
+ SetFieldUnit( *m_pMtrFldY, eUIUnit, true );
// get WorkArea
Rectangle aWorkArea = pView->GetWorkArea();
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 43809ec..84eaced 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -314,11 +314,11 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
{
// set metrics
sal_Int64 nVal = m_pMtrFldOriginalWidth->Denormalize( m_pMtrFldOriginalWidth->GetValue( FUNIT_TWIP ) );
- SetFieldUnit( *m_pMtrFldOriginalWidth, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldOriginalWidth, eFUnit, true );
m_pMtrFldOriginalWidth->SetValue( m_pMtrFldOriginalWidth->Normalize( nVal ), FUNIT_TWIP );
nVal = m_pMtrFldOriginalHeight->Denormalize( m_pMtrFldOriginalHeight->GetValue( FUNIT_TWIP ) );
- SetFieldUnit( *m_pMtrFldOriginalHeight, eFUnit, sal_True );
+ SetFieldUnit( *m_pMtrFldOriginalHeight, eFUnit, true );
m_pMtrFldOriginalHeight->SetValue( m_pMtrFldOriginalHeight->Normalize( nVal ), FUNIT_TWIP );
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 27d47a1..0c92cb6 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -89,9 +89,9 @@ namespace svt
}
- sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
+ bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
{
- return sal_True;
+ return true;
}
@@ -106,13 +106,13 @@ namespace svt
// the WizardDialog does not allow non-linear transitions (e.g. it's
// not possible to add pages in a non-linear order), so we need some own maintainance data
- sal_Bool m_bAutoNextButtonState;
+ bool m_bAutoNextButtonState;
bool m_bTravelingSuspended;
WizardMachineImplData()
:nFirstUnknownPage( 0 )
- ,m_bAutoNextButtonState( sal_False )
+ ,m_bAutoNextButtonState( false )
,m_bTravelingSuspended( false )
{
}
@@ -366,7 +366,7 @@ namespace svt
}
- void OWizardMachine::enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable)
+ void OWizardMachine::enableButtons(sal_uInt32 _nWizardButtonFlags, bool _bEnable)
{
if (m_pFinish && (_nWizardButtonFlags & WZB_FINISH))
m_pFinish->Enable(_bEnable);
@@ -399,19 +399,19 @@ namespace svt
}
- sal_Bool OWizardMachine::leaveState(WizardState)
+ bool OWizardMachine::leaveState(WizardState)
{
// no need to ask the page here.
// If we reach this point, we already gave the current page the chance to commit it's data,
// and it was allowed to commit it's data
- return sal_True;
+ return true;
}
- sal_Bool OWizardMachine::onFinish()
+ bool OWizardMachine::onFinish()
{
- return Finnish( RET_OK );
+ return Finish( RET_OK );
}
@@ -434,19 +434,19 @@ namespace svt
}
- sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason )
+ bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason )
{
IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
- ENSURE_OR_RETURN( pController != NULL, "OWizardMachine::prepareLeaveCurrentState: no controller for the current page!", sal_True );
+ ENSURE_OR_RETURN( pController != NULL, "OWizardMachine::prepareLeaveCurrentState: no controller for the current page!", true );
return pController->commitPage( _eReason );
}
- sal_Bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState )
+ bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState )
{
// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelBackward ) )
- return sal_False;
+ return false;
// don't travel directly on m_pImpl->aStateHistory, in case something goes wrong
::std::stack< WizardState > aTravelVirtually = m_pImpl->aStateHistory;
@@ -463,19 +463,19 @@ namespace svt
if ( !ShowPage( _nTargetState ) )
{
m_pImpl->aStateHistory = aOldStateHistory;
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
- sal_Bool OWizardMachine::skipUntil( WizardState _nTargetState )
+ bool OWizardMachine::skipUntil( WizardState _nTargetState )
{
WizardState nCurrentState = getCurrentState();
// allowed to leave the current page?
if ( !prepareLeaveCurrentState( nCurrentState < _nTargetState ? eTravelForward : eTravelBackward ) )
- return sal_False;
+ return false;
// don't travel directly on m_pImpl->aStateHistory, in case something goes wrong
::std::stack< WizardState > aTravelVirtually = m_pImpl->aStateHistory;
@@ -486,7 +486,7 @@ namespace svt
if ( WZS_INVALID_STATE == nNextState )
{
OSL_FAIL( "OWizardMachine::skipUntil: the given target state does not exist!" );
- return sal_False;
+ return false;
}
// remember the skipped state in the history
@@ -503,18 +503,18 @@ namespace svt
// but ShowPage doesn't? Somebody behaves very strange here ....
OSL_FAIL( "OWizardMachine::skipUntil: very unpolite ...." );
m_pImpl->aStateHistory = aOldStateHistory;
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
- sal_Bool OWizardMachine::skip(sal_Int32 _nSteps)
+ bool OWizardMachine::skip(sal_Int32 _nSteps)
{
DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!");
// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelForward ) )
- return sal_False;
+ return false;
WizardState nCurrentState = getCurrentState();
WizardState nNextState = determineNextState(nCurrentState);
@@ -522,7 +522,7 @@ namespace svt
while (_nSteps-- > 0)
{
if (WZS_INVALID_STATE == nNextState)
- return sal_False;
+ return false;
// remember the skipped state in the history
m_pImpl->aStateHistory.push(nCurrentState);
@@ -541,25 +541,25 @@ namespace svt
// if somebody does a skip and then does not allow to leave ...
// (can't be a commit error, as we've already committed the current page. So if ShowPage fails here,
// somebody behaves really strange ...)
- return sal_False;
+ return false;
}
// all fine
- return sal_True;
+ return true;
}
- sal_Bool OWizardMachine::travelNext()
+ bool OWizardMachine::travelNext()
{
// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelForward ) )
- return sal_False;
+ return false;
// determine the next state to travel to
WizardState nCurrentState = getCurrentState();
WizardState nNextState = determineNextState(nCurrentState);
if (WZS_INVALID_STATE == nNextState)
- return sal_False;
+ return false;
// the state history is used by the enterState method
// all fine
@@ -567,20 +567,20 @@ namespace svt
if (!ShowPage(nNextState))
{
m_pImpl->aStateHistory.pop();
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
- sal_Bool OWizardMachine::travelPrevious()
+ bool OWizardMachine::travelPrevious()
{
DBG_ASSERT(m_pImpl->aStateHistory.size() > 0, "OWizardMachine::travelPrevious: have no previous page!");
// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelBackward ) )
- return sal_False;
+ return false;
// the next state to switch to
WizardState nPreviousState = m_pImpl->aStateHistory.top();
@@ -591,11 +591,11 @@ namespace svt
if (!ShowPage(nPreviousState))
{
m_pImpl->aStateHistory.push(nPreviousState);
- return sal_False;
+ return false;
}
// all fine
- return sal_True;
+ return true;
}
@@ -637,8 +637,8 @@ namespace svt
if ( isTravelingSuspended() )
return 0;
WizardTravelSuspension aTravelGuard( *this );
- sal_Int32 nRet = travelPrevious();
- return nRet;
+ bool nRet = travelPrevious();
+ return nRet ? 1 : 0;
}
@@ -647,8 +647,8 @@ namespace svt
if ( isTravelingSuspended() )
return 0;
WizardTravelSuspension aTravelGuard( *this );
- sal_Int32 nRet = travelNext();
- return nRet;
+ bool nRet = travelNext();
+ return nRet ? 1 : 0;
}
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 332787e..7ef7a7a 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -508,38 +508,38 @@ long WizardDialog::DeactivatePage()
-sal_Bool WizardDialog::ShowNextPage()
+bool WizardDialog::ShowNextPage()
{
return ShowPage( mnCurLevel+1 );
}
-sal_Bool WizardDialog::ShowPrevPage()
+bool WizardDialog::ShowPrevPage()
{
if ( !mnCurLevel )
- return sal_False;
+ return false;
return ShowPage( mnCurLevel-1 );
}
-sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel )
+bool WizardDialog::ShowPage( sal_uInt16 nLevel )
{
if ( DeactivatePage() )
{
mnCurLevel = nLevel;
ActivatePage();
ImplShowTabPage( ImplGetPage( mnCurLevel ) );
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
-sal_Bool WizardDialog::Finnish( long nResult )
+bool WizardDialog::Finish( long nResult )
{
if ( DeactivatePage() )
{
@@ -550,10 +550,10 @@ sal_Bool WizardDialog::Finnish( long nResult )
EndDialog( nResult );
else if ( GetStyle() & WB_CLOSEABLE )
Close();
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
@@ -690,7 +690,7 @@ void WizardDialog::RemoveButton( Button* pButton )
-void WizardDialog::ShowButtonFixedLine( sal_Bool bVisible )
+void WizardDialog::ShowButtonFixedLine( bool bVisible )
{
if ( !mpFixedLine )
{
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index af3c237..f9b3a88 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -21,7 +21,7 @@
-void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll )
+void SetFieldUnit( MetricField& rField, FieldUnit eUnit, bool bAll )
{
sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) );
@@ -81,7 +81,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll )
-void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll )
+void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, bool bAll )
{
sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) );
sal_Int64 nMax = rBox.Denormalize( rBox.GetMax( FUNIT_TWIP ) );
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index e0a26d6..ca7b153 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -761,11 +761,11 @@ Reference< XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, cons
return (XWeak*)new SvUnoImageMap( rMap, pSupportedMacroItems );
}
-sal_Bool SvUnoImageMap_fillImageMap( Reference< XInterface > xImageMap, ImageMap& rMap )
+bool SvUnoImageMap_fillImageMap( Reference< XInterface > xImageMap, ImageMap& rMap )
{
SvUnoImageMap* pUnoImageMap = SvUnoImageMap::getImplementation( xImageMap );
if( NULL == pUnoImageMap )
- return sal_False;
+ return false;
return pUnoImageMap->fillImageMap( rMap );
}
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index acecba6..992caa5 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -139,10 +139,10 @@ namespace svt { namespace uno
}
- sal_Bool WizardPageController::commitPage( WizardTypes::CommitPageReason i_eReason )
+ bool WizardPageController::commitPage( WizardTypes::CommitPageReason i_eReason )
{
if ( !m_xWizardPage.is() )
- return sal_True;
+ return true;
try
{
@@ -153,7 +153,7 @@ namespace svt { namespace uno
DBG_UNHANDLED_EXCEPTION();
}
- return sal_True;
+ return true;
}
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index bcd224f..2e1d1b2 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -46,7 +46,7 @@ namespace svt { namespace uno
// IWizardPageController overridables
virtual void initializePage();
- virtual sal_Bool commitPage( WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >&
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 7534f84..e25f27f 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -145,13 +145,13 @@ namespace svt { namespace uno
}
- sal_Bool WizardShell::leaveState( WizardState i_nState )
+ bool WizardShell::leaveState( WizardState i_nState )
{
if ( !WizardShell_Base::leaveState( i_nState ) )
- return sal_False;
+ return false;
if ( !m_xController.is() )
- return sal_True;
+ return true;
try
{
@@ -162,7 +162,7 @@ namespace svt { namespace uno
DBG_UNHANDLED_EXCEPTION();
}
- return sal_True;
+ return true;
}
@@ -248,12 +248,12 @@ namespace svt { namespace uno
}
- sal_Bool WizardShell::onFinish()
+ bool WizardShell::onFinish()
{
try
{
if ( m_xController.is() && !m_xController->confirmFinish() )
- return sal_False;
+ return false;
}
catch( const Exception& )
{
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
index c62cb77..5eeb4e6 100644
--- a/svtools/source/uno/wizard/wizardshell.hxx
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -57,10 +57,10 @@ namespace svt { namespace uno
// OWizardMachine overridables
virtual TabPage* createPage( WizardState i_nState );
virtual void enterState( WizardState i_nState );
- virtual sal_Bool leaveState( WizardState i_nState );
+ virtual bool leaveState( WizardState i_nState );
virtual OUString getStateDisplayName( WizardState i_nState ) const;
virtual bool canAdvance() const;
- virtual sal_Bool onFinish();
+ virtual bool onFinish();
virtual IWizardPageController*
getPageController( TabPage* _pCurrentPage ) const;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 5620c82..dd6a045 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -245,10 +245,10 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
// Set System metric
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
- SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
- SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
- SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
- SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldDistance, eDlgUnit, true );
+ SetFieldUnit( aMtrFldTextStart, eDlgUnit, true );
+ SetFieldUnit( aMtrFldShadowX, eDlgUnit, true );
+ SetFieldUnit( aMtrFldShadowY, eDlgUnit, true );
if( eDlgUnit == FUNIT_MM )
{
aMtrFldDistance.SetSpinSize( 50 );
@@ -723,16 +723,16 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
if( eDlgUnit != aMtrFldDistance.GetUnit() )
{
- SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
- SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldDistance, eDlgUnit, true );
+ SetFieldUnit( aMtrFldTextStart, eDlgUnit, true );
aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
}
if( eDlgUnit != aMtrFldShadowX.GetUnit() &&
aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) )
{
- SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
- SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldShadowX, eDlgUnit, true );
+ SetFieldUnit( aMtrFldShadowY, eDlgUnit, true );
aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
}
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index d211172..976dd5c 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -159,11 +159,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
long nFirst, nLast, nMin, nMax;
lcl_GetMinMax(*pMtrFldDrawX , nFirst, nLast, nMin, nMax);
- SetFieldUnit( *pMtrFldDrawX , eFUnit, sal_True );
+ SetFieldUnit( *pMtrFldDrawX , eFUnit, true );
lcl_SetMinMax(*pMtrFldDrawX , nFirst, nLast, nMin, nMax);
lcl_GetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit( *pMtrFldDrawY, eFUnit, sal_True );
+ SetFieldUnit( *pMtrFldDrawY, eFUnit, true );
lcl_SetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
@@ -273,14 +273,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
long nVal = static_cast<long>(pMtrFldDrawX->Denormalize( pMtrFldDrawX->GetValue( FUNIT_TWIP ) ));
lcl_GetMinMax(*pMtrFldDrawX, nFirst, nLast, nMin, nMax);
- SetFieldUnit( *pMtrFldDrawX, eFUnit, sal_True );
+ SetFieldUnit( *pMtrFldDrawX, eFUnit, true );
lcl_SetMinMax(*pMtrFldDrawX, nFirst, nLast, nMin, nMax);
pMtrFldDrawX->SetValue( pMtrFldDrawX->Normalize( nVal ), FUNIT_TWIP );
nVal = static_cast<long>(pMtrFldDrawY->Denormalize( pMtrFldDrawY->GetValue( FUNIT_TWIP ) ));
lcl_GetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit(*pMtrFldDrawY, eFUnit, sal_True );
+ SetFieldUnit(*pMtrFldDrawY, eFUnit, true );
lcl_SetMinMax(*pMtrFldDrawY, nFirst, nLast, nMin, nMax);
pMtrFldDrawY->SetValue( pMtrFldDrawY->Normalize( nVal ), FUNIT_TWIP );
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 96365b3..a84ae54 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -473,7 +473,7 @@ SvxMetricField::SvxMetricField(
SetFirst( 0 );
eDlgUnit = SfxModule::GetModuleFieldUnit( mxFrame );
- SetFieldUnit( *this, eDlgUnit, sal_False );
+ SetFieldUnit( *this, eDlgUnit, false );
Show();
}
@@ -547,7 +547,7 @@ void SvxMetricField::RefreshDlgUnit()
if ( eDlgUnit != eTmpUnit )
{
eDlgUnit = eTmpUnit;
- SetFieldUnit( *this, eDlgUnit, sal_False );
+ SetFieldUnit( *this, eDlgUnit, false );
}
}
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index d96f6d7..445f028 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -61,9 +61,9 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem
m_nRestartPage( MM_DOCUMENTSELECTPAGE )
{
FreeResource();
- ShowButtonFixedLine(sal_True);
+ ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
- enableButtons(WZB_FINISH, sal_False);
+ enableButtons(WZB_FINISH, false);
m_pFinish->SetText(m_sFinish);
m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE);
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 3ca25c9..87e01e1 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -127,11 +127,11 @@ void SwMailMergeAddressBlockPage::ActivatePage()
}
}
-sal_Bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
if ( ::svt::WizardTypes::eTravelForward == _eReason && !m_pWizard->GetConfigItem().GetResultSet().is() )
- return sal_False;
- return sal_True;
+ return false;
+ return true;
}
IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl)
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index ae73bd8..c064fa2 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -74,7 +74,7 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
void EnableAddressBlock(sal_Bool bAll, sal_Bool bSelective);
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
virtual bool canAdvance() const;
public:
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index feed6f6..6ff68e8 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -159,9 +159,9 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
return 0;
}
-sal_Bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
- sal_Bool bReturn = sal_False;
+ bool bReturn = false;
bool bNext = _eReason == ::svt::WizardTypes::eTravelForward;
if(bNext || _eReason == ::svt::WizardTypes::eValidate )
{
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 88381a2..faacb43 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -47,7 +47,7 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage
DECL_LINK(DocSelectHdl, RadioButton*);
DECL_LINK(FileSelectHdl, PushButton*);
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
public:
SwMailMergeDocSelectPage( SwMailMergeWizard* _pParent);
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 083415f..4499e74 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -325,7 +325,7 @@ void SwMailMergeGreetingsPage::ActivatePage()
m_pWizard->enableButtons(WZB_NEXT, m_pWizard->isStateEnabled(MM_PREPAREMERGEPAGE));
}
-sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason )
+bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason )
{
SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem();
@@ -354,7 +354,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage
lcl_StoreGreetingsBox(*m_pNeutralCB, rConfig, SwMailMergeConfigItem::NEUTRAL);
rConfig.SetGreetingLine(m_pGreetingLineCB->IsChecked(), sal_False);
rConfig.SetIndividualGreeting(m_pPersonalizedCB->IsChecked(), sal_False);
- return sal_True;
+ return true;
}
IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox)
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 8939dd0..84d12f6 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -84,9 +84,9 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage,
DECL_LINK(GreetingSelectHdl_Impl, void *);
DECL_LINK(AssignHdl_Impl, PushButton*);
- virtual void UpdatePreview();
+ virtual void UpdatePreview();
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
public:
SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent);
~SwMailMergeGreetingsPage();
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 8137662..416ef7b 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -214,7 +214,7 @@ void SwMailMergeLayoutPage::ActivatePage()
}
}
-sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
//now insert the frame and the greeting
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -228,7 +228,7 @@ sal_Bool SwMailMergeLayoutPage::commitPage( ::svt::WizardTypes::CommitPageReason
Point(nLeft, nTop),
m_pAlignToBodyCB->IsChecked());
}
- return sal_True;
+ return true;
}
SwFrmFmt* SwMailMergeLayoutPage::InsertAddressAndGreeting(SwView* pView,
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 7f77c5c..7eefddb 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -80,7 +80,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
static void InsertGreeting(SwWrtShell& rShell, SwMailMergeConfigItem& rConfigItem, bool bExample);
virtual void ActivatePage();
- virtual sal_Bool commitPage(::svt::WizardTypes::CommitPageReason _eReason);
+ virtual bool commitPage(::svt::WizardTypes::CommitPageReason _eReason);
public:
SwMailMergeLayoutPage( SwMailMergeWizard* _pParent);
~SwMailMergeLayoutPage();
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index ca4c88d..438df84 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -574,7 +574,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton)
rConfigItem.AddSavedDocument(
aURL.GetMainURL(INetURLObject::DECODE_TO_IURI));
pButton->Enable(false);
- m_pWizard->enableButtons(WZB_FINISH, sal_True);
+ m_pWizard->enableButtons(WZB_FINISH, true);
pButton->Enable(false);
}
@@ -686,7 +686,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
aSaveMonitor.m_pPrinter->SetText( INetURLObject( sPath ).getFSysPath( INetURLObject::FSYS_DETECT ) );
m_bCancelSaving = false;
aSaveMonitor.Show();
- m_pWizard->enableButtons(WZB_CANCEL, sal_False);
+ m_pWizard->enableButtons(WZB_CANCEL, false);
for(sal_uInt32 nDoc = nBegin; nDoc < nEnd && !m_bCancelSaving; ++nDoc)
{
@@ -762,8 +762,8 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
}
::osl::File::remove( sTargetTempURL );
}
- m_pWizard->enableButtons(WZB_CANCEL, sal_True);
- m_pWizard->enableButtons(WZB_FINISH, sal_True);
+ m_pWizard->enableButtons(WZB_CANCEL, true);
+ m_pWizard->enableButtons(WZB_FINISH, true);
return 0;
}
@@ -853,7 +853,7 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
SfxObjectShell* pObjSh = pTargetView->GetViewFrame()->GetObjectShell();
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh));
SfxBoolItem aMergeSilent(SID_SILENT, false);
- m_pWizard->enableButtons(WZB_CANCEL, sal_False);
+ m_pWizard->enableButtons(WZB_CANCEL, false);
uno::Sequence < beans::PropertyValue > aProps( 2 );
aProps[0]. Name = "MonitorVisible";
@@ -865,8 +865,8 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl)
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), pObjSh));
pTargetView->SetMailMergeConfigItem(0, 0, sal_False);
- m_pWizard->enableButtons(WZB_CANCEL, sal_True);
- m_pWizard->enableButtons(WZB_FINISH, sal_True);
+ m_pWizard->enableButtons(WZB_CANCEL, true);
+ m_pWizard->enableButtons(WZB_FINISH, true);
return 0;
}
@@ -1257,7 +1257,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
pDlg->EnableDesctruction();
::osl::File::remove( sTargetTempURL );
- m_pWizard->enableButtons(WZB_FINISH, sal_True);
+ m_pWizard->enableButtons(WZB_FINISH, true);
//the dialog deletes itself
//delete pDlg;
return 0;
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index af42dd3..0dfd0c0 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -139,7 +139,7 @@ void SwMailMergePrepareMergePage::ActivatePage()
/*-------------------------------------------------------------------------
merge the data into a new file
-----------------------------------------------------------------------*/
-sal_Bool SwMailMergePrepareMergePage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
+bool SwMailMergePrepareMergePage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
{
SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
if(::svt::WizardTypes::eTravelForward == _eReason && !rConfigItem.IsMergeDone())
@@ -148,7 +148,7 @@ sal_Bool SwMailMergePrepareMergePage::commitPage( ::svt::WizardTypes::CommitPag
m_pWizard->SetRestartPage(MM_MERGEPAGE);
m_pWizard->EndDialog(RET_TARGET_CREATED);
}
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx
index d92cce1..9893b0a 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.hxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.hxx
@@ -45,7 +45,7 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage
DECL_LINK(MoveHdl_Impl, void*);
virtual void ActivatePage();
- virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
+ virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
public:
SwMailMergePrepareMergePage( SwMailMergeWizard* _pParent);
commit b5e11641a7cec634c603213869a3475b1e01084e
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 25 11:01:20 2014 +0200
svtools: sal_Bool->bool
Change-Id: I90320997ed79be2556eafa4c35af6b968b378454
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index 08e2aee..a04d755 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -75,10 +75,10 @@ void ChartTransferable::AddSupportedFormats()
AddFormat( SOT_FORMAT_BITMAP );
}
-sal_Bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
{
sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if( HasFormat( nFormat ))
{
@@ -101,12 +101,12 @@ sal_Bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataF
return bResult;
}
-sal_Bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
const datatransfer::DataFlavor& /* rFlavor */ )
{
// called from SetObject, put data into stream
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch ( nUserObjectId )
{
case CHARTTRANSFER_OBJECTTYPE_DRAWMODEL:
diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx
index efbd1b3..d8d4ba0 100644
--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -43,8 +43,8 @@ protected:
// implementation of TransferableHelper methods
virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+ virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
private:
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index e7d6fd2..9a0fd82 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -134,7 +134,7 @@ namespace dbaui
osl_atomic_decrement( &m_refCount );
}
- sal_Bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
{
if (nUserObjectId == SOT_FORMAT_RTF || nUserObjectId == SOT_FORMATSTR_ID_HTML )
{
@@ -145,7 +145,7 @@ namespace dbaui
return pExport->Write();
}
}
- return sal_False;
+ return false;
}
void ODataClipboard::AddSupportedFormats()
@@ -159,7 +159,7 @@ namespace dbaui
ODataAccessObjectTransferable::AddSupportedFormats();
}
- sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor )
+ bool ODataClipboard::GetData( const DataFlavor& rFlavor )
{
const sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
switch (nFormat)
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 0d83f99..4f7d5bb 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -61,7 +61,7 @@ namespace dbaui
protected:
virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
virtual void DragFinished( sal_Int8 nDropAction );
static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 0f03474..360603b 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -34,8 +34,8 @@ namespace dbaui
OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow);
protected:
virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
virtual void ObjectReleased();
};
}
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 8db7074..047044f 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -77,9 +77,9 @@ namespace dbaui
protected:
virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
virtual void ObjectReleased();
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor );
};
}
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 5ee0fb6..4488c53 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -113,16 +113,16 @@ namespace dbaui
AddFormat( SOT_FORMATSTR_ID_SBA_TABID );
}
- sal_Bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
+ bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
{
sal_uInt32 nFormat = SotExchange::GetFormat(rFlavor);
if ( SOT_FORMATSTR_ID_SBA_JOIN == nFormat )
// this is a HACK
// we don't really copy our data, the instances using us have to call GetSourceDescription ....
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list