[Libreoffice-commits] core.git: 9 commits - canvas/source extensions/source reportdesign/inc reportdesign/source unoxml/source uui/source vbahelper/source writerfilter/source writerperfect/source xmlhelp/source
Noel Grandin
noel at peralex.com
Thu May 1 23:58:01 PDT 2014
canvas/source/opengl/ogl_bitmapcanvashelper.cxx | 2
canvas/source/opengl/ogl_bitmapcanvashelper.hxx | 2
extensions/source/abpilot/abpfinalpage.cxx | 16 -
extensions/source/abpilot/abpfinalpage.hxx | 2
extensions/source/abpilot/abpservices.cxx | 4
extensions/source/abpilot/abspilot.cxx | 4
extensions/source/abpilot/abspilot.hxx | 10
extensions/source/abpilot/admininvokationimpl.cxx | 8
extensions/source/abpilot/admininvokationimpl.hxx | 2
extensions/source/abpilot/admininvokationpage.cxx | 6
extensions/source/abpilot/admininvokationpage.hxx | 2
extensions/source/abpilot/datasourcehandling.cxx | 30 +-
extensions/source/abpilot/datasourcehandling.hxx | 8
extensions/source/abpilot/fieldmappingimpl.cxx | 12 -
extensions/source/abpilot/fieldmappingimpl.hxx | 2
extensions/source/bibliography/bibbeam.cxx | 2
extensions/source/bibliography/bibconfig.cxx | 4
extensions/source/bibliography/bibconfig.hxx | 6
extensions/source/bibliography/bibcont.cxx | 12 -
extensions/source/bibliography/bibcont.hxx | 4
extensions/source/bibliography/bibload.cxx | 10
extensions/source/bibliography/bibshortcuthandler.hxx | 2
extensions/source/bibliography/bibtools.hxx | 6
extensions/source/bibliography/bibview.cxx | 12 -
extensions/source/bibliography/bibview.hxx | 2
extensions/source/bibliography/datman.cxx | 22 -
extensions/source/bibliography/datman.hxx | 22 -
extensions/source/bibliography/formcontrolcontainer.cxx | 14 -
extensions/source/bibliography/formcontrolcontainer.hxx | 4
extensions/source/bibliography/framectr.cxx | 106 ++++-----
extensions/source/bibliography/framectr.hxx | 6
extensions/source/bibliography/general.cxx | 14 -
extensions/source/bibliography/general.hxx | 2
extensions/source/bibliography/loadlisteneradapter.cxx | 12 -
extensions/source/bibliography/loadlisteneradapter.hxx | 8
extensions/source/bibliography/toolbar.cxx | 18 -
extensions/source/bibliography/toolbar.hxx | 6
extensions/source/dbpilots/commonpagesdbp.cxx | 4
extensions/source/dbpilots/controlwizard.cxx | 26 +-
extensions/source/dbpilots/controlwizard.hxx | 22 -
extensions/source/dbpilots/dbpservices.cxx | 4
extensions/source/dbpilots/gridwizard.cxx | 16 -
extensions/source/dbpilots/gridwizard.hxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 20 -
extensions/source/dbpilots/groupboxwiz.hxx | 6
extensions/source/dbpilots/listcombowizard.cxx | 28 +-
extensions/source/dbpilots/listcombowizard.hxx | 14 -
extensions/source/dbpilots/wizardcontext.hxx | 2
extensions/source/inc/componentmodule.cxx | 6
extensions/source/logging/csvformatter.cxx | 10
extensions/source/nsplugin/source/so_closelistener.hxx | 6
extensions/source/nsplugin/source/so_instance.cxx | 56 ++--
extensions/source/nsplugin/source/so_instance.hxx | 16 -
extensions/source/nsplugin/source/so_main.cxx | 6
extensions/source/plugin/base/xplugin.cxx | 8
extensions/source/plugin/inc/plugin/impl.hxx | 4
extensions/source/plugin/inc/plugin/plctrl.hxx | 6
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 4
extensions/source/plugin/unx/mediator.cxx | 12 -
extensions/source/plugin/unx/npnapi.cxx | 2
extensions/source/plugin/unx/nppapi.cxx | 2
extensions/source/plugin/unx/sysplug.cxx | 2
extensions/source/plugin/unx/unxmgr.cxx | 4
extensions/source/propctrlr/browserline.cxx | 26 +-
extensions/source/propctrlr/browserline.hxx | 16 -
extensions/source/propctrlr/browserlistbox.cxx | 22 -
extensions/source/propctrlr/browserlistbox.hxx | 10
extensions/source/propctrlr/cellbindinghandler.cxx | 6
extensions/source/propctrlr/cellbindinghelper.cxx | 2
extensions/source/propctrlr/cellbindinghelper.hxx | 2
extensions/source/propctrlr/commoncontrol.cxx | 6
extensions/source/propctrlr/commoncontrol.hxx | 6
extensions/source/propctrlr/composeduiupdate.cxx | 16 -
extensions/source/propctrlr/editpropertyhandler.cxx | 28 +-
extensions/source/propctrlr/eformspropertyhandler.cxx | 8
extensions/source/propctrlr/fontdialog.cxx | 12 -
extensions/source/propctrlr/formcomponenthandler.cxx | 20 -
extensions/source/propctrlr/formgeometryhandler.cxx | 4
extensions/source/propctrlr/formlinkdialog.cxx | 10
extensions/source/propctrlr/formlinkdialog.hxx | 2
extensions/source/propctrlr/formmetadata.cxx | 4
extensions/source/propctrlr/formmetadata.hxx | 2
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
extensions/source/propctrlr/handlerhelper.cxx | 20 -
extensions/source/propctrlr/handlerhelper.hxx | 12 -
extensions/source/propctrlr/inspectormodelbase.cxx | 14 -
extensions/source/propctrlr/listselectiondlg.cxx | 2
extensions/source/propctrlr/pcrservices.cxx | 4
extensions/source/propctrlr/propertyhandler.cxx | 2
extensions/source/propctrlr/pushbuttonnavigation.cxx | 2
extensions/source/propctrlr/pushbuttonnavigation.hxx | 2
extensions/source/propctrlr/selectlabeldialog.cxx | 6
extensions/source/propctrlr/selectlabeldialog.hxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 4
extensions/source/propctrlr/sqlcommanddesign.hxx | 6
extensions/source/propctrlr/stringrepresentation.cxx | 7
extensions/source/propctrlr/submissionhandler.cxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 6
extensions/source/scanner/grid.cxx | 2
extensions/source/scanner/grid.hxx | 4
extensions/source/scanner/sane.cxx | 124 +++++------
extensions/source/scanner/sane.hxx | 30 +-
extensions/source/scanner/sanedlg.cxx | 91 +++-----
extensions/source/scanner/sanedlg.hxx | 12 -
extensions/source/scanner/scanunx.cxx | 2
reportdesign/inc/PropertyForward.hxx | 4
reportdesign/inc/ReportDefinition.hxx | 6
reportdesign/inc/RptModel.hxx | 2
reportdesign/inc/RptObject.hxx | 10
reportdesign/inc/UndoActions.hxx | 14 -
reportdesign/inc/UndoEnv.hxx | 10
reportdesign/source/core/api/Functions.cxx | 2
reportdesign/source/core/api/Group.cxx | 2
reportdesign/source/core/api/Groups.cxx | 2
reportdesign/source/core/api/ReportComponent.cxx | 14 -
reportdesign/source/core/api/ReportControlModel.cxx | 2
reportdesign/source/core/api/ReportDefinition.cxx | 14 -
reportdesign/source/core/api/Section.cxx | 4
reportdesign/source/core/inc/FormatCondition.hxx | 2
reportdesign/source/core/inc/Group.hxx | 2
reportdesign/source/core/inc/ImageControl.hxx | 4
reportdesign/source/core/inc/ReportComponent.hxx | 2
reportdesign/source/core/inc/ReportControlModel.hxx | 8
reportdesign/source/core/inc/Section.hxx | 4
reportdesign/source/core/inc/Shape.hxx | 2
reportdesign/source/core/inc/Tools.hxx | 2
reportdesign/source/core/sdr/PropertyForward.cxx | 10
reportdesign/source/core/sdr/RptModel.cxx | 2
reportdesign/source/core/sdr/RptObject.cxx | 46 ++--
reportdesign/source/core/sdr/RptPage.cxx | 2
reportdesign/source/core/sdr/UndoActions.cxx | 6
reportdesign/source/core/sdr/UndoEnv.cxx | 16 -
reportdesign/source/core/sdr/formatnormalizer.hxx | 4
reportdesign/source/filter/xml/xmlControlProperty.cxx | 10
reportdesign/source/filter/xml/xmlControlProperty.hxx | 2
reportdesign/source/filter/xml/xmlExport.cxx | 28 +-
reportdesign/source/filter/xml/xmlExport.hxx | 4
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlFixedContent.cxx | 8
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 6
reportdesign/source/filter/xml/xmlReport.cxx | 2
reportdesign/source/filter/xml/xmlSection.cxx | 2
reportdesign/source/filter/xml/xmlSection.hxx | 4
reportdesign/source/filter/xml/xmlStyleImport.cxx | 8
reportdesign/source/filter/xml/xmlStyleImport.hxx | 10
reportdesign/source/filter/xml/xmlfilter.cxx | 24 +-
reportdesign/source/filter/xml/xmlfilter.hxx | 6
reportdesign/source/inc/GroupProperties.hxx | 14 -
reportdesign/source/ui/dlg/AddField.cxx | 4
reportdesign/source/ui/dlg/CondFormat.cxx | 2
reportdesign/source/ui/dlg/DateTime.cxx | 10
reportdesign/source/ui/dlg/GroupsSorting.cxx | 38 +--
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/inc/AddField.hxx | 4
reportdesign/source/ui/inc/ColorListener.hxx | 10
reportdesign/source/ui/inc/DateTime.hxx | 2
reportdesign/source/ui/inc/DefaultInspection.hxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 34 +--
reportdesign/source/ui/inc/GeometryHandler.hxx | 18 -
reportdesign/source/ui/inc/GroupsSorting.hxx | 6
reportdesign/source/ui/inc/ReportController.hxx | 14 -
reportdesign/source/ui/inc/ReportControllerObserver.hxx | 2
reportdesign/source/ui/inc/ReportRuler.hxx | 2
reportdesign/source/ui/inc/ReportSection.hxx | 12 -
reportdesign/source/ui/inc/ReportWindow.hxx | 24 +-
reportdesign/source/ui/inc/ScrollHelper.hxx | 24 +-
reportdesign/source/ui/inc/SectionWindow.hxx | 10
reportdesign/source/ui/inc/StartMarker.hxx | 4
reportdesign/source/ui/inc/ViewsWindow.hxx | 28 +-
reportdesign/source/ui/inc/dlgedclip.hxx | 2
reportdesign/source/ui/inc/dlgedfunc.hxx | 22 -
reportdesign/source/ui/inc/propbrw.hxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 4
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 66 ++---
reportdesign/source/ui/misc/ColorListener.cxx | 8
reportdesign/source/ui/misc/toolboxcontroller.cxx | 6
reportdesign/source/ui/report/DesignView.cxx | 50 ++--
reportdesign/source/ui/report/FixedTextColor.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 32 +-
reportdesign/source/ui/report/ReportControllerObserver.cxx | 7
reportdesign/source/ui/report/ReportSection.cxx | 18 -
reportdesign/source/ui/report/ReportWindow.cxx | 22 -
reportdesign/source/ui/report/ScrollHelper.cxx | 22 -
reportdesign/source/ui/report/SectionWindow.cxx | 8
reportdesign/source/ui/report/StartMarker.cxx | 4
reportdesign/source/ui/report/ViewsWindow.cxx | 64 ++---
reportdesign/source/ui/report/dlgedclip.cxx | 4
reportdesign/source/ui/report/dlgedfunc.cxx | 78 +++---
reportdesign/source/ui/report/propbrw.cxx | 10
unoxml/source/dom/document.cxx | 2
unoxml/source/dom/elementlist.cxx | 6
unoxml/source/dom/elementlist.hxx | 2
unoxml/source/events/event.cxx | 8
unoxml/source/events/event.hxx | 6
unoxml/source/events/eventdispatcher.cxx | 4
unoxml/source/events/eventdispatcher.hxx | 4
unoxml/source/events/mouseevent.cxx | 8
unoxml/source/events/mouseevent.hxx | 8
unoxml/source/events/testlistener.cxx | 2
unoxml/source/events/testlistener.hxx | 4
uui/source/alreadyopen.cxx | 2
uui/source/alreadyopen.hxx | 2
uui/source/iahndl-authentication.cxx | 4
uui/source/iahndl-ioexceptions.cxx | 2
uui/source/iahndl-ssl.cxx | 10
uui/source/iahndl.cxx | 2
uui/source/logindlg.cxx | 4
uui/source/logindlg.hxx | 10
uui/source/loginerr.hxx | 38 +--
uui/source/passwordcontainer.cxx | 2
vbahelper/source/msforms/vbacheckbox.cxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 18 -
vbahelper/source/msforms/vbacontrol.hxx | 8
vbahelper/source/msforms/vbalistbox.cxx | 10
vbahelper/source/msforms/vbaradiobutton.cxx | 2
vbahelper/source/msforms/vbatextbox.cxx | 2
vbahelper/source/msforms/vbatogglebutton.cxx | 2
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 6
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 14 -
vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 6
vbahelper/source/vbahelper/vbadocumentbase.cxx | 10
vbahelper/source/vbahelper/vbafontbase.cxx | 10
vbahelper/source/vbahelper/vbahelper.cxx | 8
vbahelper/source/vbahelper/vbapagesetupbase.cxx | 16 -
vbahelper/source/vbahelper/vbatextframe.cxx | 2
writerfilter/source/dmapper/CellColorHandler.cxx | 2
writerfilter/source/dmapper/CellColorHandler.hxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 8
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 4
writerfilter/source/dmapper/PropertyMap.cxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 4
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 2
writerfilter/source/filter/RtfFilter.cxx | 4
writerfilter/source/filter/WriterFilter.hxx | 2
writerfilter/source/filter/WriterFilterDetection.hxx | 2
writerperfect/source/impress/KeynoteImportFilter.cxx | 8
writerperfect/source/impress/KeynoteImportFilter.hxx | 2
writerperfect/source/writer/WordPerfectImportFilter.cxx | 12 -
writerperfect/source/writer/WordPerfectImportFilter.hxx | 6
xmlhelp/source/cxxhelp/inc/tvread.hxx | 2
xmlhelp/source/cxxhelp/provider/databases.cxx | 6
xmlhelp/source/cxxhelp/provider/databases.hxx | 2
xmlhelp/source/cxxhelp/provider/provider.cxx | 6
xmlhelp/source/cxxhelp/provider/provider.hxx | 2
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 2
xmlhelp/source/treeview/tvread.cxx | 6
247 files changed, 1302 insertions(+), 1301 deletions(-)
New commits:
commit e23c98d713ababb72de0616831a2abe0e48387f5
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 2 08:38:50 2014 +0200
reportdesign: sal_Bool->bool
Change-Id: I7a269dbf163f4c839b6c553c7b096185fe2f8a01
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index 6ff443b..2cac870 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -48,7 +48,7 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xSourceInfo;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDest;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> m_xDestInfo;
- sal_Bool m_bInChange;
+ bool m_bInChange;
OPropertyMediator(OPropertyMediator&);
void operator =(OPropertyMediator&);
protected:
@@ -61,7 +61,7 @@ namespace rptui
OPropertyMediator(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource
,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xDest
,const TPropertyNamePair& _aNameMap
- ,sal_Bool _bReverse = sal_False);
+ ,bool _bReverse = false);
// ::com::sun::star::beans::XPropertyChangeListener
virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 236d5c9..e7848d1 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -100,7 +100,7 @@ namespace reportdesign
OReportDefinition& operator=(const OReportDefinition&);
void setSection( const OUString& _sProperty
- ,const sal_Bool& _bOn
+ ,const bool& _bOn
,const OUString& _sName
,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
@@ -118,7 +118,7 @@ namespace reportdesign
}
/// write a single XML stream into the package
- sal_Bool WriteThroughComponent(
+ bool WriteThroughComponent(
/// the component we export
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent> & xComponent,
@@ -134,7 +134,7 @@ namespace reportdesign
/// write a single output stream
/// (to be called either directly or by WriteThroughComponent(...))
- sal_Bool WriteThroughComponent(
+ bool WriteThroughComponent(
const ::com::sun::star::uno::Reference<
::com::sun::star::io::XOutputStream> & xOutputStream,
const ::com::sun::star::uno::Reference<
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 40c48c0..005f36a 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -65,7 +65,7 @@ public:
virtual SvxNumType GetPageNumType() const SAL_OVERRIDE;
OXUndoEnvironment& GetUndoEnv();
- void SetModified(sal_Bool _bModified);
+ void SetModified(bool _bModified);
inline dbaui::DBSubComponentController* getController() const { return m_pController; }
inline void attachController( dbaui::DBSubComponentController& _rController ) { m_pController = &_rController; }
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 057dfb7..76a544f 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -83,14 +83,14 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> m_xSection;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xKeepShapeAlive;
OUString m_sComponentName;
- sal_Bool m_bIsListening;
+ bool m_bIsListening;
OObjectBase(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
OObjectBase(const OUString& _sComponentName);
virtual ~OObjectBase();
- inline sal_Bool isListening() const { return m_bIsListening; }
+ inline bool isListening() const { return m_bIsListening; }
void SetPropsFromRect(const Rectangle& _rRect);
@@ -109,12 +109,12 @@ private:
public:
void StartListening();
- void EndListening(sal_Bool bRemoveListener = sal_True);
+ void EndListening(bool bRemoveListener = true);
// PropertyChangeListener
virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException);
virtual void initializeOle() {}
- sal_Bool supportsService( const OUString& _sServiceName ) const;
+ bool supportsService( const OUString& _sServiceName ) const;
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> getReportComponent() const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
@@ -261,7 +261,7 @@ public:
/** creates the m_xMediator when it doesn't already exist.
@param _bReverse when set to <TRUE/> then the properties from the uno control will be copied into report control
*/
- void CreateMediator(sal_Bool _bReverse = sal_False);
+ void CreateMediator(bool _bReverse = false);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent() SAL_OVERRIDE;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index a2cf402..421442b 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -73,8 +73,8 @@ namespace rptui
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getFooter() { return m_xGroup->getFooter(); }
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup > getGroup() { return m_xGroup; }
- inline sal_Bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
- inline sal_Bool getFooterOn() { return m_xGroup->getFooterOn(); }
+ inline bool getHeaderOn() { return m_xGroup->getHeaderOn(); }
+ inline bool getFooterOn() { return m_xGroup->getFooterOn(); }
static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
@@ -97,10 +97,10 @@ namespace rptui
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getPageFooter() { return m_xReport->getPageFooter(); }
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getDetail() { return m_xReport->getDetail(); }
- inline sal_Bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
- inline sal_Bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
- inline sal_Bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
- inline sal_Bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }
+ inline bool getReportHeaderOn() { return m_xReport->getReportHeaderOn(); }
+ inline bool getReportFooterOn() { return m_xReport->getReportFooterOn(); }
+ inline bool getPageHeaderOn() { return m_xReport->getPageHeaderOn(); }
+ inline bool getPageFooterOn() { return m_xReport->getPageFooterOn(); }
static ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> getMemberFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
};
@@ -255,7 +255,7 @@ namespace rptui
*
* \param _bOld If set to <TRUE/> than the old value will be set otherwise the new value will be set.
*/
- void setProperty(sal_Bool _bOld);
+ void setProperty(bool _bOld);
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getObject();
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index d087b30..4c09850 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -48,7 +48,7 @@ namespace rptui
protected:
virtual ~OXUndoEnvironment();
- void SetUndoMode(sal_Bool _bUndo);
+ void SetUndoMode(bool _bUndo);
public:
OXUndoEnvironment(OReportModel& _rModel);
@@ -77,21 +77,21 @@ namespace rptui
:m_rUndoEnv(_rUndoEnv)
{
m_rUndoEnv.Lock();
- m_rUndoEnv.SetUndoMode(sal_True);
+ m_rUndoEnv.SetUndoMode(true);
}
~OUndoMode()
{
- m_rUndoEnv.SetUndoMode(sal_False);
+ m_rUndoEnv.SetUndoMode(false);
m_rUndoEnv.UnLock();
}
};
void Lock();
void UnLock();
- sal_Bool IsLocked() const;
+ bool IsLocked() const;
// returns sal_True is we are in UNDO
- sal_Bool IsUndoMode() const;
+ bool IsUndoMode() const;
// access control
struct Accessor { friend class OReportModel; private: Accessor() { } };
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index e87716f..3a188e5 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -72,7 +72,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle
{
{
::osl::MutexGuard aGuard(m_aMutex);
- sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size()));
+ bool bAdd = (Index == static_cast<sal_Int32>(m_aFunctions.size()));
if ( !bAdd )
checkIndex(Index);
uno::Reference< report::XFunction > xFunction(aElement,uno::UNO_QUERY);
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 57c4006..9c0c4b0 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -311,7 +311,7 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName
}
void OGroup::setSection( const OUString& _sProperty
- ,const sal_Bool& _bOn
+ ,const bool& _bOn
,const OUString& _sName
,uno::Reference< report::XSection>& _member)
{
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index f4b1904..bd19c41 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -87,7 +87,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen
{
{
::osl::MutexGuard aGuard(m_aMutex);
- sal_Bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size()));
+ bool bAdd = (Index == static_cast<sal_Int32>(m_aGroups.size()));
if ( !bAdd )
checkIndex(Index);
uno::Reference< report::XGroup > xGroup(aElement,uno::UNO_QUERY);
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index ad504ab..a580d7e 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -72,13 +72,13 @@ OFormatProperties::OFormatProperties()
,nCharCaseMap(0)
,nCharKerning(0)
,nCharEscapementHeight(100)
- ,m_bBackgroundTransparent(sal_True)
- ,bCharFlash(sal_False)
- ,bCharAutoKerning(sal_False)
- ,bCharCombineIsOn(sal_False)
- ,bCharHidden(sal_False)
- ,bCharShadowed(sal_False)
- ,bCharContoured(sal_False)
+ ,m_bBackgroundTransparent(true)
+ ,bCharFlash(false)
+ ,bCharAutoKerning(false)
+ ,bCharCombineIsOn(false)
+ ,bCharHidden(false)
+ ,bCharShadowed(false)
+ ,bCharContoured(false)
{
try
{
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index feadf9e..96c9c5a 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -56,7 +56,7 @@ void OReportControlModel::removeContainerListener( const uno::Reference< contain
aContainerListeners.removeInterface(xListener);
}
-sal_Bool OReportControlModel::hasElements( ) throw (uno::RuntimeException)
+bool OReportControlModel::hasElements( ) throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_rMutex);
return !m_aFormatConditions.empty();
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 300ea9a..09e9012 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1174,7 +1174,7 @@ uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) t
}
void OReportDefinition::setSection( const OUString& _sProperty
- ,const sal_Bool& _bOn
+ ,const bool& _bOn
,const OUString& _sName
,uno::Reference< report::XSection>& _member)
{
@@ -1260,7 +1260,7 @@ sal_Bool SAL_CALL OReportDefinition::attachResource( const OUString& /*_rURL*/,
try
{
fillArgs(aDescriptor);
- m_pImpl->m_pReportModel->SetModified(sal_False);
+ m_pImpl->m_pReportModel->SetModified(false);
}
catch (...)
{
@@ -1638,7 +1638,7 @@ void SAL_CALL OReportDefinition::removeStorageChangeListener( const uno::Referen
m_pImpl->m_aStorageChangeListeners.removeInterface(xListener);
}
-sal_Bool OReportDefinition::WriteThroughComponent(
+bool OReportDefinition::WriteThroughComponent(
const uno::Reference<lang::XComponent> & xComponent,
const sal_Char* pStreamName,
const sal_Char* pServiceName,
@@ -1655,11 +1655,11 @@ sal_Bool OReportDefinition::WriteThroughComponent(
OUString sStreamName = OUString::createFromAscii( pStreamName );
uno::Reference<io::XStream> xStream = xMyStorage->openStreamElement( sStreamName,embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
if ( !xStream.is() )
- return sal_False;
+ return false;
uno::Reference<io::XOutputStream> xOutputStream = xStream->getOutputStream();
OSL_ENSURE(xOutputStream.is(), "Can't create output stream in package!");
if ( ! xOutputStream.is() )
- return sal_False;
+ return false;
uno::Reference<beans::XPropertySet> xStreamProp(xOutputStream,uno::UNO_QUERY);
OSL_ENSURE(xStreamProp.is(),"No valid preoperty set for the output stream!");
@@ -1696,7 +1696,7 @@ sal_Bool OReportDefinition::WriteThroughComponent(
}
}
-sal_Bool OReportDefinition::WriteThroughComponent(
+bool OReportDefinition::WriteThroughComponent(
const uno::Reference<io::XOutputStream> & xOutputStream,
const uno::Reference<lang::XComponent> & xComponent,
const sal_Char* pServiceName,
@@ -1727,7 +1727,7 @@ sal_Bool OReportDefinition::WriteThroughComponent(
OSL_ENSURE( xExporter.is(),
"can't instantiate export filter component" );
if( !xExporter.is() )
- return sal_False;
+ return false;
// connect model and filter
xExporter->setSourceDocument( xComponent );
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 7237572..49f6fab 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -118,8 +118,8 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
,m_nForceNewPage(report::ForceNewPage::NONE)
,m_nNewRowOrCol(report::ForceNewPage::NONE)
,m_bKeepTogether(sal_False)
-,m_bCanGrow(sal_False)
-,m_bCanShrink(sal_False)
+,m_bCanGrow(false)
+,m_bCanShrink(false)
,m_bRepeatSection(sal_False)
,m_bVisible(sal_True)
,m_bBacktransparent(sal_True)
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index fcc9674..d31c03b 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -42,7 +42,7 @@ namespace reportdesign
public FormatConditionPropertySet
{
OFormatProperties m_aFormatProperties;
- OUString m_sFormula;
+ OUString m_sFormula;
sal_Bool m_bEnabled;
private:
OFormatCondition(const OFormatCondition&);
diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx
index 5cf5f28..1e19840 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -70,7 +70,7 @@ namespace reportdesign
l.notify();
}
void setSection( const OUString& _sProperty
- ,const sal_Bool& _bOn
+ ,const bool& _bOn
,const OUString& _sName
,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _member);
protected:
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index 599905a..4512f52 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -43,9 +43,9 @@ namespace reportdesign
{
friend class OShapeHelper;
OReportControlModel m_aProps;
- OUString m_aImageURL;
+ OUString m_aImageURL;
sal_Int16 m_nScaleMode;
- sal_Bool m_bPreserveIRI;
+ sal_Bool m_bPreserveIRI;
private:
OImageControl(const OImageControl&);
OImageControl& operator=(const OImageControl&);
diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx
index 0c7f961..1569398 100644
--- a/reportdesign/source/core/inc/ReportComponent.hxx
+++ b/reportdesign/source/core/inc/ReportComponent.hxx
@@ -67,7 +67,7 @@ namespace reportdesign
,m_nPosY(0)
,m_nBorderColor(0)
,m_nBorder(2)
- ,m_bPrintRepeatedValues(sal_True)
+ ,m_bPrintRepeatedValues(true)
{}
~OReportComponentProperties();
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index a15d0a7..0fecef6 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -89,8 +89,8 @@ namespace reportdesign
::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFormatCondition> >
m_aFormatConditions;
osl::Mutex& m_rMutex;
- OUString aDataField;
- OUString aConditionalPrintExpression;
+ OUString aDataField;
+ OUString aConditionalPrintExpression;
sal_Bool bPrintWhenGroupChange;
OReportControlModel(osl::Mutex& _rMutex
@@ -100,7 +100,7 @@ namespace reportdesign
,aComponent(_xContext)
,m_pOwner(_pOwner)
,m_rMutex(_rMutex)
- ,bPrintWhenGroupChange(sal_True)
+ ,bPrintWhenGroupChange(true)
{}
// XContainer
@@ -108,7 +108,7 @@ namespace reportdesign
void removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
// XElementAccess
- sal_Bool hasElements( ) throw (::com::sun::star::uno::RuntimeException);
+ bool hasElements( ) throw (::com::sun::star::uno::RuntimeException);
// XIndexReplace
void replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx
index 4ca7177..ffe330c 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -67,8 +67,8 @@ namespace reportdesign
::sal_Int16 m_nForceNewPage;
::sal_Int16 m_nNewRowOrCol;
sal_Bool m_bKeepTogether;
- sal_Bool m_bCanGrow;
- sal_Bool m_bCanShrink;
+ bool m_bCanGrow;
+ bool m_bCanShrink;
sal_Bool m_bRepeatSection;
sal_Bool m_bVisible;
sal_Bool m_bBacktransparent;
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 7bcea42..42a519a 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -47,7 +47,7 @@ namespace reportdesign
::std::auto_ptr< ::comphelper::OPropertyArrayAggregationHelper> m_pAggHelper;
OReportControlModel m_aProps;
com::sun::star::drawing::HomogenMatrix3 m_Transformation;
- ::sal_Int32 m_nZOrder;
+ sal_Int32 m_nZOrder;
sal_Bool m_bOpaque;
OUString m_sServiceName;
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 83dba68..39df3b2 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -35,7 +35,7 @@
namespace reportdesign
{
- template <class T> void lcl_createSectionIfNeeded(sal_Bool _bOn,const T& _xParent,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false)
+ template <class T> void lcl_createSectionIfNeeded(bool _bOn,const T& _xParent,::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection/*in/out*/,bool _bPageSection = false)
{
if ( _bOn && !_xSection.is() )
_xSection = OSection::createOSection(_xParent,_xParent->getContext(),_bPageSection);
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index e79e072..4c48427 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -36,12 +36,12 @@ namespace rptui
OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
,const Reference< XPropertySet>& _xDest
,const TPropertyNamePair& _aNameMap
- ,sal_Bool _bReverse)
+ ,bool _bReverse)
: OPropertyForward_Base(m_aMutex)
,m_aNameMap(_aNameMap)
,m_xSource(_xSource)
,m_xDest(_xDest)
- ,m_bInChange(sal_False)
+ ,m_bInChange(false)
{
osl_atomic_increment(&m_refCount);
OSL_ENSURE(m_xDest.is(),"Dest is NULL!");
@@ -96,10 +96,10 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
::osl::MutexGuard aGuard(m_aMutex);
if ( !m_bInChange )
{
- m_bInChange = sal_True;
+ m_bInChange = true;
try
{
- sal_Bool bDest = (evt.Source == m_xDest);
+ bool bDest = (evt.Source == m_xDest);
Reference<XPropertySet> xProp = bDest ? m_xSource : m_xDest;
Reference<XPropertySetInfo> xPropInfo = bDest ? m_xSourceInfo : m_xDestInfo;
if ( xProp.is() )
@@ -153,7 +153,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
{
OSL_FAIL("Exception catched!");
}
- m_bInChange = sal_False;
+ m_bInChange = false;
}
}
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 97914fe..f244817 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -94,7 +94,7 @@ OXUndoEnvironment& OReportModel::GetUndoEnv()
return *m_pUndoEnv;
}
-void OReportModel::SetModified(sal_Bool _bModified)
+void OReportModel::SetModified(bool _bModified)
{
if ( m_pController )
m_pController->setModified(_bModified);
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 96951b5..a32f242 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -148,7 +148,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon
pNewObj = OCustomShape::Create( _xComponent );
try
{
- sal_Bool bOpaque = sal_False;
+ bool bOpaque = false;
_xComponent->getPropertyValue(PROPERTY_OPAQUE) >>= bOpaque;
pNewObj->NbcSetLayer(bOpaque ? RPT_LAYER_FRONT : RPT_LAYER_BACK);
}
@@ -311,14 +311,14 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent)
-:m_bIsListening(sal_False)
+:m_bIsListening(false)
{
m_xReportComponent = _xComponent;
}
OObjectBase::OObjectBase(const OUString& _sComponentName)
:m_sComponentName(_sComponentName)
-,m_bIsListening(sal_False)
+,m_bIsListening(false)
{
}
@@ -355,7 +355,7 @@ void OObjectBase::StartListening()
if ( !isListening() && m_xReportComponent.is() )
{
- m_bIsListening = sal_True;
+ m_bIsListening = true;
if ( !m_xPropertyChangeListener.is() )
{
@@ -366,11 +366,11 @@ void OObjectBase::StartListening()
}
}
-void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
+void OObjectBase::EndListening(bool /*bRemoveListener*/)
{
OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!");
- m_bIsListening = sal_False;
+ m_bIsListening = false;
if ( isListening() && m_xReportComponent.is() )
{
// XPropertyChangeListener
@@ -417,9 +417,9 @@ void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/)
}
-sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const
+bool OObjectBase::supportsService( const OUString& _sServiceName ) const
{
- sal_Bool bSupports = sal_False;
+ bool bSupports = false;
Reference< lang::XServiceInfo > xServiceInfo( m_xReportComponent , UNO_QUERY );
// TODO: cache xServiceInfo as member?
@@ -475,14 +475,14 @@ OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xCo
,OObjectBase(_xComponent)
{
impl_setUnoShape( uno::Reference< uno::XInterface >(_xComponent,uno::UNO_QUERY) );
- m_bIsListening = sal_True;
+ m_bIsListening = true;
}
OCustomShape::OCustomShape(const OUString& _sComponentName)
:SdrObjCustomShape()
,OObjectBase(_sComponentName)
{
- m_bIsListening = sal_True;
+ m_bIsListening = true;
}
@@ -522,7 +522,7 @@ void OCustomShape::NbcMove( const Size& rSize )
{
if ( m_bIsListening )
{
- m_bIsListening = sal_False;
+ m_bIsListening = false;
if ( m_xReportComponent.is() )
{
@@ -535,7 +535,7 @@ void OCustomShape::NbcMove( const Size& rSize )
// set geometry properties
SetPropsFromRect(GetSnapRect());
- m_bIsListening = sal_True;
+ m_bIsListening = true;
}
else
SdrObjCustomShape::NbcMove( rSize );
@@ -709,7 +709,7 @@ void OUnoObject::NbcMove( const Size& rSize )
if ( m_bIsListening )
{
// stop listening
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
bool bPositionFixed = false;
Size aUndoSize(0,0);
@@ -757,7 +757,7 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac
SdrUnoObj::NbcResize( rRef, xFract, yFract );
// stop listening
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
// set geometry properties
SetPropsFromRect(GetLogicRect());
@@ -770,7 +770,7 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect)
{
SdrUnoObj::NbcSetLogicRect(rRect);
// stop listening
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
// set geometry properties
SetPropsFromRect(rRect);
@@ -848,7 +848,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw
Reference<XPropertySet> xControlModel(GetUnoControlModel(),uno::UNO_QUERY);
if ( xControlModel.is() )
{
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
try
{
xControlModel->setPropertyValue(PROPERTY_TEXTCOLOR,evt.NewValue);
@@ -875,7 +875,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw
if ( !aNewName.equals(aOldName) )
{
// set old name property
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
if ( m_xMediator.is() )
m_xMediator.get()->stopListening();
try
@@ -894,7 +894,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw
}
}
-void OUnoObject::CreateMediator(sal_Bool _bReverse)
+void OUnoObject::CreateMediator(bool _bReverse)
{
if ( !m_xMediator.is() )
{
@@ -954,7 +954,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,
{
impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
- m_bIsListening = sal_True;
+ m_bIsListening = true;
}
OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
@@ -963,7 +963,7 @@ OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
,m_nType(_nType)
,m_bOnlyOnce(true)
{
- m_bIsListening = sal_True;
+ m_bIsListening = true;
}
OOle2Obj::~OOle2Obj()
@@ -1005,7 +1005,7 @@ void OOle2Obj::NbcMove( const Size& rSize )
if ( m_bIsListening )
{
// stop listening
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
bool bPositionFixed = false;
Size aUndoSize(0,0);
@@ -1058,7 +1058,7 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
SdrOle2Obj::NbcResize( rRef, xFract, yFract );
// stop listening
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
// set geometry properties
SetPropsFromRect(GetLogicRect());
@@ -1071,7 +1071,7 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
{
SdrOle2Obj::NbcSetLogicRect(rRect);
// stop listening
- OObjectBase::EndListening(sal_False);
+ OObjectBase::EndListening(false);
// set geometry properties
SetPropsFromRect(rRect);
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index a4ad094..6b8300d 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -161,7 +161,7 @@ void OReportPage::removeTempObject(SdrObject *_pToRemoveObj)
void OReportPage::resetSpecialMode()
{
- const sal_Bool bChanged = rModel.IsChanged();
+ const bool bChanged = rModel.IsChanged();
::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin();
::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end();
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 2c442088..8d1fce6 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -353,13 +353,13 @@ ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const Property
void ORptUndoPropertyAction::Undo()
{
- setProperty(sal_True);
+ setProperty(true);
}
void ORptUndoPropertyAction::Redo()
{
- setProperty(sal_False);
+ setProperty(false);
}
Reference< XPropertySet> ORptUndoPropertyAction::getObject()
@@ -367,7 +367,7 @@ Reference< XPropertySet> ORptUndoPropertyAction::getObject()
return m_xObj;
}
-void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
+void ORptUndoPropertyAction::setProperty(bool _bOld)
{
Reference< XPropertySet> xObj = getObject();
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index e39bd24..558b7da 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -101,8 +101,8 @@ public:
::std::vector< uno::Reference< container::XChild> > m_aSections;
Reference< XIntrospection > m_xIntrospection;
oslInterlockedCount m_nLocks;
- sal_Bool m_bReadOnly;
- sal_Bool m_bIsUndo;
+ bool m_bReadOnly;
+ bool m_bIsUndo;
OXUndoEnvironmentImpl(OReportModel& _rModel);
};
@@ -111,8 +111,8 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_
,m_aFormatNormalizer( _rModel )
,m_aConditionUpdater()
,m_nLocks(0)
- ,m_bReadOnly(sal_False)
- ,m_bIsUndo(sal_False)
+ ,m_bReadOnly(false)
+ ,m_bIsUndo(false)
{
}
@@ -140,7 +140,7 @@ void OXUndoEnvironment::UnLock()
osl_atomic_decrement( &m_pImpl->m_nLocks );
}
-sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; }
+bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; }
void OXUndoEnvironment::RemoveSection(OReportPage* _pPage)
{
@@ -411,7 +411,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro
void OXUndoEnvironment::implSetModified()
{
- m_pImpl->m_rModel.SetModified( sal_True );
+ m_pImpl->m_rModel.SetModified( true );
}
@@ -638,12 +638,12 @@ void OXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement)
switchListening( xContainer, false );
}
-void OXUndoEnvironment::SetUndoMode(sal_Bool _bUndo)
+void OXUndoEnvironment::SetUndoMode(bool _bUndo)
{
m_pImpl->m_bIsUndo = _bUndo;
}
-sal_Bool OXUndoEnvironment::IsUndoMode() const
+bool OXUndoEnvironment::IsUndoMode() const
{
return m_pImpl->m_bIsUndo;
}
diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx
index 8aed524..d85ce59 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.hxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.hxx
@@ -45,9 +45,9 @@ namespace rptui
OUString sName;
sal_Int32 nDataType;
sal_Int32 nScale;
- sal_Bool bIsCurrency;
+ bool bIsCurrency;
- Field() : sName(), nDataType( 0 ), nScale( 0 ), bIsCurrency( 0 ) { }
+ Field() : sName(), nDataType( 0 ), nScale( 0 ), bIsCurrency( false ) { }
};
typedef ::std::vector< Field > FieldList;
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 4784722..f44d552 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -55,7 +55,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_xControl(_xControl)
,m_pContainer(_pContainer)
- ,m_bIsList(sal_False)
+ ,m_bIsList(false)
{
m_aPropType = ::getVoidCppuType();
@@ -198,7 +198,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
{
bool bValue(false);
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
::sax::Converter::convertBool(bValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
@@ -213,7 +213,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
{ // it's a real int32/16 property
sal_Int32 nValue(0);
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
::sax::Converter::convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
@@ -235,7 +235,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
{
double nValue = 0.0;
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
::sax::Converter::convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
@@ -266,7 +266,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
// first extract the double
double nValue = 0;
#if OSL_DEBUG_LEVEL > 0
- sal_Bool bSuccess =
+ bool bSuccess =
#endif
::sax::Converter::convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index a280923..1030d02 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -36,7 +36,7 @@ namespace rptxml
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aSequence;
OXMLControlProperty* m_pContainer;
::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently
- sal_Bool m_bIsList;
+ bool m_bIsList;
ORptFilter& GetOwnImport();
::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 7944be6..a43e13f 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -214,7 +214,7 @@ void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, sal_uInt16 nExportFlag)
: SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName, XML_REPORT, EXPORT_OASIS)
-,m_bAllreadyFilled(sal_False)
+,m_bAllreadyFilled(false)
{
setExportFlags( EXPORT_OASIS | nExportFlag);
GetMM100UnitConverter().SetCoreMeasureUnit(MAP_100TH_MM);
@@ -787,7 +787,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
nEmptyCellColSpan = 0;
for (; aColIter != aColEnd; ++aColIter)
{
- sal_Bool bCoveredCell = sal_False;
+ bool bCoveredCell = false;
sal_Int32 nColSpan = 0;
sal_Int32 nColIndex = aColIter - aRowIter->second.begin();
::std::map<sal_Int32,sal_Int32>::iterator aRowSpanFind = aRowSpan.find(nColIndex);
@@ -800,7 +800,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
if ( aColIter->nColSpan > 1 )
nColSpan += aColIter->nColSpan - 1;
- bCoveredCell = sal_True;
+ bCoveredCell = true;
aColIter = aColIter + (aColIter->nColSpan - 1);
}
else if ( aColIter->bSet )
@@ -808,7 +808,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
if ( nEmptyCellColSpan > 0 )
{
AddAttribute( XML_NAMESPACE_TABLE,XML_NUMBER_COLUMNS_SPANNED,implConvertNumber(nEmptyCellColSpan) );
- bCoveredCell = sal_True;
+ bCoveredCell = true;
nColSpan = nEmptyCellColSpan - 1;
nEmptyCellColSpan = 0;
}
@@ -817,7 +817,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
{
AddAttribute( XML_NAMESPACE_TABLE,XML_NUMBER_COLUMNS_SPANNED,implConvertNumber(nSpan) );
nColSpan = nSpan - 1;
- bCoveredCell = sal_True;
+ bCoveredCell = true;
}
nSpan = aColIter->nRowSpan;
if ( nSpan > 1 )
@@ -872,7 +872,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
Reference<XSection> xSection(xElement,uno::UNO_QUERY);
XMLTokenEnum eToken = XML_SECTION;
- sal_Bool bExportData = sal_False;
+ bool bExportData = false;
if ( xElement->supportsService(SERVICE_FIXEDTEXT) )
{
eToken = XML_FIXED_CONTENT;
@@ -880,7 +880,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
else if ( xElement->supportsService(SERVICE_FORMATTEDFIELD) )
{
eToken = XML_FORMATTED_TEXT;
- bExportData = sal_True;
+ bExportData = true;
}
else if ( xElement->supportsService(SERVICE_IMAGECONTROL) )
{
@@ -891,7 +891,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
sTargetLocation = GetRelativeReference(sTargetLocation);
AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation);
}
- bExportData = sal_True;
+ bExportData = true;
OUStringBuffer sValue;
const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions();
if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) )
@@ -1035,9 +1035,9 @@ void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,
}
}
-sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle)
+bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,bool _bExportAutoStyle)
{
- sal_Bool bGroupExported = sal_False;
+ bool bGroupExported = false;
if ( _xReportDefinition.is() )
{
Reference< XGroups > xGroups = _xReportDefinition->getGroups();
@@ -1046,7 +1046,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
sal_Int32 nCount = xGroups->getCount();
if ( _nPos >= 0 && _nPos < nCount )
{
- bGroupExported = sal_True;
+ bGroupExported = true;
Reference<XGroup> xGroup(xGroups->getByIndex(_nPos),uno::UNO_QUERY);
OSL_ENSURE(xGroup.is(),"No Group prepare for GPF");
if ( _bExportAutoStyle )
@@ -1272,7 +1272,7 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe
AddAttribute(XML_NAMESPACE_OFFICE, XML_MIMETYPE,_xReport->getMimeType());
- sal_Bool bEscapeProcessing( _xReport->getEscapeProcessing() );
+ bool bEscapeProcessing( _xReport->getEscapeProcessing() );
if ( !bEscapeProcessing )
AddAttribute( XML_NAMESPACE_REPORT, XML_ESCAPE_PROCESSING, ::xmloff::token::GetXMLToken( XML_FALSE ) );
@@ -1300,7 +1300,7 @@ void ORptExport::collectComponentStyles()
if ( m_bAllreadyFilled )
return;
- m_bAllreadyFilled = sal_True;
+ m_bAllreadyFilled = true;
Reference<XReportDefinition> xProp(getReportDefinition());
if ( xProp.is() )
{
@@ -1313,7 +1313,7 @@ void ORptExport::collectComponentStyles()
if ( xProp->getPageHeaderOn() )
exportSectionAutoStyle(xProp->getPageHeader());
- exportGroup(xProp,0,sal_True);
+ exportGroup(xProp,0,true);
if ( xProp->getPageFooterOn() )
exportSectionAutoStyle(xProp->getPageFooter());
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 2c981ad..7828eec 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -138,7 +138,7 @@ private:
mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
Reference<XReportDefinition> m_xReportDefinition;
- sal_Bool m_bAllreadyFilled;
+ bool m_bAllreadyFilled;
void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report">
void exportReportAttributes(const Reference<XReportDefinition>& _xReport);
@@ -146,7 +146,7 @@ private:
void exportFunction(const Reference< XFunction>& _xFunction);
void exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet);
void exportComponent(const Reference<XReportComponent>& _xReportComponent);
- sal_Bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle = sal_False);
+ bool exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,bool _bExportAutoStyle = false);
void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName);
void exportSection(const Reference<XSection>& _xProp,bool bHeader = false);
void exportContainer(const Reference< XSection>& _xSection);
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 27d4620..7973b07 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -166,7 +166,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
if ( !sFilter.isEmpty() )
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_FILTER),sFilter);
- const sal_Bool bEscapeProcessing( m_xDatabaseDataProvider->getEscapeProcessing() );
+ const bool bEscapeProcessing( m_xDatabaseDataProvider->getEscapeProcessing() );
if ( !bEscapeProcessing )
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE ));
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 8f77b44..34bd41f 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -50,7 +50,7 @@ public:
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Unicode c,
- sal_Bool bCount );
+ bool bCount );
OXMLCharContent(
SvXMLImport& rImport,
OXMLFixedContent* _pFixedContent,
@@ -69,7 +69,7 @@ OXMLCharContent::OXMLCharContent(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
sal_Unicode c,
- sal_Bool bCount )
+ bool bCount )
: XMLCharContext(rImport,nPrfx,rLName,xAttrList,c,bCount)
,m_pFixedContent(_pFixedContent)
{
@@ -149,7 +149,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
case XML_TOK_TEXT_TAB_STOP:
pContext = new OXMLCharContent( m_rImport, this,nPrefix,
rLocalName, xAttrList,
- 0x0009, sal_False );
+ 0x0009, false );
break;
case XML_TOK_TEXT_LINE_BREAK:
@@ -161,7 +161,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
case XML_TOK_TEXT_S:
pContext = new OXMLCharContent( m_rImport, this,nPrefix,
rLocalName, xAttrList,
- 0x0020, sal_True );
+ 0x0020, true );
break;
case XML_TOK_PAGE_NUMBER:
m_sPageText += s_sStringConcat + " PageNumber()";
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index e3b5e1e..4d41b65 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -118,7 +118,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) );
aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) );
- sal_Bool bHasCategories = sal_False;
+ bool bHasCategories = false;
uno::Reference< chart2::data::XDataSource > xDataSource(m_xModel, uno::UNO_QUERY);
if( xDataSource.is())
@@ -136,7 +136,7 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException,
&& aRole == "categories"
)
{
- bHasCategories = sal_True;
+ bHasCategories = true;
break;
}
}
@@ -257,7 +257,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const OUString & _sName, const
bExport = false;
else if ( _sName == "chart:plot-area" )
{
- sal_Bool bHasCategories = sal_True;
+ bool bHasCategories = true;
const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SvXMLTokenMap> pMasterElemTokenMap( OXMLHelper::GetSubDocumentElemTokenMap());
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 0dee143..36d8fdf 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -178,7 +178,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
m_xComponent->setPageFooterOn(sal_True);
- pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageFooter(),sal_False);
+ pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList ,m_xComponent->getPageFooter(),false);
}
break;
case XML_TOK_REPORT_FOOTER:
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index 3a97964..9094457 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -55,7 +55,7 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
const uno::Reference< xml::sax::XAttributeList > & _xAttrList
,const uno::Reference< report::XSection >& _xSection
- ,sal_Bool _bPageHeader)
+ ,bool _bPageHeader)
:SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_xSection(_xSection)
,m_bPageHeader(_bPageHeader)
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index 611e1e9..9f2107d 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -30,7 +30,7 @@ namespace rptxml
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > m_xSection;
- sal_Bool m_bPageHeader;
+ bool m_bPageHeader;
ORptFilter& GetOwnImport();
OXMLSection(const OXMLSection&);
@@ -42,7 +42,7 @@ namespace rptxml
,const OUString& rLName
,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
- ,sal_Bool _bPageHeader = sal_True);
+ ,bool _bPageHeader = true);
virtual ~OXMLSection();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 9138c7c..8e7ca2f 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -74,14 +74,14 @@ TYPEINIT1( OReportStylesContext, SvXMLStylesContext );
OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle ) :
+ SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) :
XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
sNumberFormat(OUString("NumberFormat")),
pStyles(&rStyles),
m_nNumberFormat(-1),
m_rImport(rImport),
- bConditionalFormatCreated(sal_False),
- bParentSet(sal_False)
+ bConditionalFormatCreated(false),
+ bParentSet(false)
{
}
@@ -160,7 +160,7 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
sal_uInt16 nPrfx ,
const OUString& rLName ,
const Reference< XAttributeList > & xAttrList,
- const sal_Bool bTempAutoStyles ) :
+ const bool bTempAutoStyles ) :
SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
m_sTableStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )),
m_sColumnStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 76bc198..ce32875 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -46,8 +46,8 @@ namespace rptxml
com::sun::star::uno::Any aConditionalFormat;
sal_Int32 m_nNumberFormat;
ORptFilter& m_rImport;
- sal_Bool bConditionalFormatCreated : 1;
- sal_Bool bParentSet : 1;
+ bool bConditionalFormatCreated : 1;
+ bool bParentSet : 1;
ORptFilter& GetOwnImport() const;
@@ -66,7 +66,7 @@ namespace rptxml
OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- SvXMLStylesContext& rStyles, sal_uInt16 nFamily, sal_Bool bDefaultStyle = sal_False );
+ SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false );
virtual ~OControlStyleContext();
@@ -89,7 +89,7 @@ namespace rptxml
const OUString m_sCellStyleFamilyName;
ORptFilter& m_rImport;
sal_Int32 m_nNumberFormatIndex;
- sal_Bool bAutoStyles : 1;
+ bool bAutoStyles : 1;
//mutable UniReference < SvXMLImportPropertyMapper > m_xControlImpPropMapper;
mutable UniReference < SvXMLImportPropertyMapper > m_xCellImpPropMapper;
@@ -132,7 +132,7 @@ namespace rptxml
OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx ,
const OUString& rLName ,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
- const sal_Bool bAutoStyles );
+ const bool bAutoStyles );
virtual ~OReportStylesContext();
virtual void EndElement() SAL_OVERRIDE;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 908fd7e..106c9d2 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -125,7 +125,7 @@ sal_Int32 ReadThroughComponent(
const sal_Char* /*pStreamName*/,
const uno::Reference<XComponentContext> & rContext,
const uno::Reference< XDocumentHandler >& _xFilter,
- sal_Bool /*bEncrypted*/ )
+ bool /*bEncrypted*/ )
{
OSL_ENSURE(xInputStream.is(), "input stream missing");
OSL_ENSURE(xModelComponent.is(), "document missing");
@@ -209,7 +209,7 @@ sal_Int32 ReadThroughComponent(
if ( xStorage.is() )
{
uno::Reference< io::XStream > xDocStream;
- sal_Bool bEncrypted = sal_False;
+ bool bEncrypted = false;
try
{
@@ -407,7 +407,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
throw (RuntimeException, std::exception)
{
Window* pFocusWindow = Application::GetFocusWindow();
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pFocusWindow )
pFocusWindow->EnterWait();
@@ -421,7 +421,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
return bRet;
}
-sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
+bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
OUString sFileName;
@@ -472,13 +472,13 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
}
}
}
- sal_Bool bRet = xStorage.is();
+ bool bRet = xStorage.is();
if ( bRet )
{
m_xReportDefinition.set(GetModel(),UNO_QUERY_THROW);
OSL_ENSURE(m_xReportDefinition.is(),"ReportDefinition is NULL!");
if ( !m_xReportDefinition.is() )
- return sal_False;
+ return false;
#if OSL_DEBUG_LEVEL > 1
uno::Reference < container::XNameAccess > xAccess( xStorage, uno::UNO_QUERY );
@@ -613,7 +613,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
// TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly! But for now this is the only way!
ErrorHandler::HandleError( nRet );
if( nRet & ERRCODE_WARNING_MASK )
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -652,13 +652,13 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
break;
case XML_TOK_DOC_STYLES:
GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = CreateStylesContext( rLocalName, xAttrList, sal_False);
+ pContext = CreateStylesContext( rLocalName, xAttrList, false);
break;
case XML_TOK_DOC_AUTOSTYLES:
// don't use the autostyles from the styles-document for the progress
if ( ! IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) )
GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = CreateStylesContext( rLocalName, xAttrList, sal_True);
+ pContext = CreateStylesContext( rLocalName, xAttrList, true);
break;
case XML_TOK_DOC_FONTDECLS:
GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
@@ -931,7 +931,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
}
SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName,
- const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle )
+ const uno::Reference< XAttributeList>& xAttrList, bool bIsAutoStyle )
{
SvXMLImportContext* pContext = bIsAutoStyle ? GetAutoStyles() : GetStyles();
if ( !pContext )
@@ -1041,9 +1041,9 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,con
return pContext;
}
-sal_Bool ORptFilter::isOldFormat() const
+bool ORptFilter::isOldFormat() const
{
- sal_Bool bOldFormat = sal_True;
+ bool bOldFormat = true;
uno::Reference<beans::XPropertySet> xProp = getImportInfo();
if ( xProp.is() )
{
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index f49d66d..cf23bdb 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -101,10 +101,10 @@ private:
Reference<XReportDefinition> m_xReportDefinition;
::boost::shared_ptr<rptui::OReportModel> m_pReportModel;
- sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
+ bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
- const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle );
+ const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
SvXMLImportContext* CreateMetaContext(const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName,
@@ -176,7 +176,7 @@ public:
virtual void enterEventContext();
virtual void leaveEventContext();
- sal_Bool isOldFormat() const;
+ bool isOldFormat() const;
};
/** Imports only settings
diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx
index d2ec0ac..2dd5a26 100644
--- a/reportdesign/source/inc/GroupProperties.hxx
+++ b/reportdesign/source/inc/GroupProperties.hxx
@@ -25,10 +25,10 @@ namespace rptshared
*/
struct GroupProperties
{
- ::sal_Int32 m_nGroupInterval;
- OUString m_sExpression;
- ::sal_Int16 m_nGroupOn;
- ::sal_Int16 m_nKeepTogether;
+ sal_Int32 m_nGroupInterval;
+ OUString m_sExpression;
+ sal_Int16 m_nGroupOn;
+ sal_Int16 m_nKeepTogether;
sal_Bool m_eSortAscending;
sal_Bool m_bStartNewColumn;
sal_Bool m_bResetPageNumber;
@@ -37,9 +37,9 @@ namespace rptshared
:m_nGroupInterval(1)
,m_nGroupOn(0)
,m_nKeepTogether(0)
- ,m_eSortAscending(sal_True)
- ,m_bStartNewColumn(sal_False)
- ,m_bResetPageNumber(sal_False)
+ ,m_eSortAscending(true)
+ ,m_bStartNewColumn(false)
+ ,m_bResetPageNumber(false)
{}
};
}
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 7031fcc..2d8f152 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -157,7 +157,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
,m_aHelpText(this, ModuleRes(ADDFIELD_HELP_FIELD) )
,m_aInsertButton(this, WB_TABSTOP|WB_CENTER)
,m_nCommandType(0)
- ,m_bEscapeProcessing(sal_False)
+ ,m_bEscapeProcessing(false)
,m_pChangeListener(NULL)
,m_pContainerListener(NULL)
{
@@ -319,7 +319,7 @@ void OAddFieldWindow::Update()
{
OUString sCommand( m_aCommandName );
sal_Int32 nCommandType( m_nCommandType );
- sal_Bool bEscapeProcessing( m_bEscapeProcessing );
+ bool bEscapeProcessing( m_bEscapeProcessing );
OUString sFilter( m_sFilter );
OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand );
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index d16d802..706f2d6 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -464,7 +464,7 @@ namespace rptui
continue;
Reference< XFormatCondition > xNewCond;
- sal_Bool bAppend = j >= m_xFormatConditions->getCount();
+ bool bAppend = j >= m_xFormatConditions->getCount();
if ( bAppend )
{
xNewCond = m_xFormatConditions->createFormatCondition();
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 7e66030..54e3ef4 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -134,10 +134,10 @@ short ODateTimeDialog::Execute()
aValues[nLength++].Value <<= m_pDate->IsChecked();
aValues[nLength].Name = PROPERTY_FORMATKEYDATE;
- aValues[nLength++].Value <<= getFormatKey(sal_True);
+ aValues[nLength++].Value <<= getFormatKey(true);
aValues[nLength].Name = PROPERTY_FORMATKEYTIME;
- aValues[nLength++].Value <<= getFormatKey(sal_False);
+ aValues[nLength++].Value <<= getFormatKey(false);
sal_Int32 nWidth = 0;
if ( m_pDate->IsChecked() )
@@ -198,8 +198,8 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
if ( _pBox == m_pDate || _pBox == m_pTime)
{
- sal_Bool bDate = m_pDate->IsChecked();
- sal_Bool bTime = m_pTime->IsChecked();
+ bool bDate = m_pDate->IsChecked();
+ bool bTime = m_pTime->IsChecked();
if (!bDate && !bTime)
{
m_pPB_OK->Disable();
@@ -212,7 +212,7 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
return 1L;
}
-sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const
+sal_Int32 ODateTimeDialog::getFormatKey(bool _bDate) const
{
sal_Int32 nFormatKey;
if ( _bDate )
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index c39ac44..ebaa44c 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -95,7 +95,7 @@ class OFieldExpressionControl : public TContainerListenerBase
OGroupsSortingDialog* m_pParent;
bool m_bIgnoreEvent;
- sal_Bool SaveModified(bool _bAppend);
+ bool SaveModified(bool _bAppend);
public:
OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId);
@@ -110,7 +110,7 @@ public:
void fillColumns(const uno::Reference< container::XNameAccess>& _xColumns);
void lateInit();
- sal_Bool IsDeleteAllowed( );
+ bool IsDeleteAllowed( );
void DeleteRows();
void cut();
void copy();
@@ -126,7 +126,7 @@ public:
/** move groups given by _aGroups
*/
- void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect = sal_True);
+ void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,bool _bSelect = true);
virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE;
using OFieldExpressionControl_Base::GetRowCount;
@@ -284,7 +284,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE
return nAction;
}
-void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect)
+void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,bool _bSelect)
{
if ( _aGroups.getLength() )
{
@@ -401,18 +401,18 @@ bool OFieldExpressionControl::SaveModified()
return SaveModified(true);
}
-sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
+bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
{
sal_Int32 nRow = GetCurRow();
if ( nRow != BROWSER_ENDOFSELECTION )
{
- sal_Bool bAppend = sal_False;
+ bool bAppend = false;
try
{
uno::Reference< report::XGroup> xGroup;
if ( m_aGroupPositions[nRow] == NO_GROUP )
{
- bAppend = sal_True;
+ bAppend = true;
OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString() );
xGroup = m_pParent->getGroups()->createGroup();
@@ -478,7 +478,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
}
}
- return sal_True;
+ return true;
}
OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
@@ -660,7 +660,7 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container
}
}
-sal_Bool OFieldExpressionControl::IsDeleteAllowed( )
+bool OFieldExpressionControl::IsDeleteAllowed( )
{
return !m_pParent->isReadOnly() && GetSelectRowCount() > 0;
}
@@ -697,12 +697,12 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
if ( nColId == HANDLE_ID )
{
PopupMenu aContextMenu(ModuleRes(RID_GROUPSROWPOPUPMENU));
- sal_Bool bEnable = sal_False;
+ bool bEnable = false;
long nIndex = FirstSelectedRow();
while( nIndex >= 0 && !bEnable )
{
if ( m_aGroupPositions[nIndex] != NO_GROUP )
- bEnable = sal_True;
+ bEnable = true;
nIndex = NextSelectedRow();
}
aContextMenu.EnableItem( SID_DELETE, IsDeleteAllowed() && bEnable );
@@ -738,7 +738,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
void OFieldExpressionControl::DeleteRows()
{
- sal_Bool bIsEditing = IsEditing();
+ bool bIsEditing = IsEditing();
if (bIsEditing)
{
DeactivateCell();
@@ -915,7 +915,7 @@ void OFieldExpressionControl::InsertRows( long nRow )
// class OGroupsSortingDialog
OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
- ,sal_Bool _bReadOnly
+ ,bool _bReadOnly
,OReportController* _pController)
: FloatingWindow( _pParent, ModuleRes(RID_GROUPS_SORTING) )
,OPropertyChangeListener(m_aMutex)
@@ -1014,7 +1014,7 @@ OGroupsSortingDialog::~OGroupsSortingDialog()
m_pCurrentGroupListener->dispose();
}
-sal_Bool OGroupsSortingDialog::isReadOnly( ) const
+bool OGroupsSortingDialog::isReadOnly( ) const
{
return m_bReadOnly;
}
@@ -1031,7 +1031,7 @@ void OGroupsSortingDialog::UpdateData( )
void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow )
{
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
- sal_Bool bEmpty = nGroupPos == NO_GROUP;
+ bool bEmpty = nGroupPos == NO_GROUP;
m_aHeaderLst.Enable(!bEmpty);
m_aFooterLst.Enable(!bEmpty);
m_aGroupOnLst.Enable(!bEmpty);
@@ -1183,7 +1183,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
if ( nIndex >= 0 && aClipboardList.getLength() )
{
m_pFieldExpression->SetNoSelection();
- m_pFieldExpression->moveGroups(aClipboardList,nIndex,sal_False);
+ m_pFieldExpression->moveGroups(aClipboardList,nIndex,false);
m_pFieldExpression->DeactivateCell();
m_pFieldExpression->GoToRow(nIndex);
m_pFieldExpression->ActivateCell(nIndex, m_pFieldExpression->GetCurColumnId());
@@ -1332,7 +1332,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
pControls[i]->SaveValue();
ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst};
- sal_Bool bReadOnly = !m_pController->isEditable();
+ bool bReadOnly = !m_pController->isEditable();
for (size_t i = 0; i < sizeof(pControlsLst2)/sizeof(pControlsLst2[0]); ++i)
pControlsLst2[i]->SetReadOnly(bReadOnly);
m_aGroupIntervalEd.SetReadOnly(bReadOnly);
@@ -1377,7 +1377,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
{
sal_Int32 nGroupCount = m_xGroups->getCount();
sal_Int32 nRowCount = m_pFieldExpression->GetRowCount();
- sal_Bool bEnabled = nGroupCount > 1;
+ bool bEnabled = nGroupCount > 1;
if (bEnabled && _nRow > 0 )
{
@@ -1399,7 +1399,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
if ( nGroupPos != NO_GROUP )
{
- sal_Bool bEnableDelete = nGroupCount > 0;
+ bool bEnableDelete = nGroupCount > 0;
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, bEnableDelete);
}
else
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 359c010..fd2fbbf 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -807,7 +807,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
{
sal_Int32 nPos = 1;
uno::Reference< report::XGroup> xGroup(_rEvent.Source,uno::UNO_QUERY);
- ::std::mem_fun_t< sal_Bool,OGroupHelper> pIsOn = ::std::mem_fun(&OGroupHelper::getHeaderOn);
+ ::std::mem_fun_t< bool,OGroupHelper> pIsOn = ::std::mem_fun(&OGroupHelper::getHeaderOn);
::std::mem_fun_t< uno::Reference<report::XSection> ,OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader);
if ( bFooterOn )
{
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index a73c009..304d9f3 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -65,7 +65,7 @@ class OAddFieldWindow :public FloatingWindow
OUString m_aCommandName;
OUString m_sFilter;
sal_Int32 m_nCommandType;
- sal_Bool m_bEscapeProcessing;
+ bool m_bEscapeProcessing;
::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener;
::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener;
@@ -86,7 +86,7 @@ public:
inline const OUString& GetCommand() const { return m_aCommandName; }
inline sal_Int32 GetCommandType() const { return m_nCommandType; }
- inline sal_Bool GetEscapeProcessing() const { return m_bEscapeProcessing; }
+ inline bool GetEscapeProcessing() const { return m_bEscapeProcessing; }
inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; }
inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getColumns() const { return m_xColumns; }
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 351b702..9a2e7a1 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -39,8 +39,8 @@ namespace rptui
OUString m_sColorEntry;
sal_Int32 m_nColor;
sal_Int32 m_nTextBoundaries;
- sal_Bool m_bCollapsed;
- sal_Bool m_bMarked;
+ bool m_bCollapsed;
+ bool m_bMarked;
virtual void ImplInitSettings() = 0;
protected:
@@ -56,14 +56,14 @@ namespace rptui
/** set the marker as marked or not marked
@param _bMark set the new state of the marker
*/
- void setMarked(sal_Bool _bMark);
+ void setMarked(bool _bMark);
/** returns if the section is marked
*/
- inline sal_Bool isMarked() const { return m_bMarked; }
+ inline bool isMarked() const { return m_bMarked; }
inline void setCollapsedHdl(const Link& _aLink ){ m_aCollapsedLink = _aLink; }
- inline sal_Bool isCollapsed() const { return m_bCollapsed; }
+ inline bool isCollapsed() const { return m_bCollapsed; }
/** collapse or expand
*
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index 759b091..c4ae66d 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -68,7 +68,7 @@ class ODateTimeDialog : public ModalDialog
/** returns the number format key
@param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex
*/
- sal_Int32 getFormatKey(sal_Bool _bDate) const;
+ sal_Int32 getFormatKey(bool _bDate) const;
DECL_LINK( CBClickHdl, CheckBox* );
ODateTimeDialog(const ODateTimeDialog&);
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index 21807cf..234c338 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -47,7 +47,7 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > m_xComponent; /// delegatee
bool m_bConstructed;
bool m_bHasHelpSection;
- sal_Bool m_bIsReadOnly;
+ bool m_bIsReadOnly;
sal_Int32 m_nMinHelpTextLines;
sal_Int32 m_nMaxHelpTextLines;
/// access to property meta data
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 4b2feec..61c4bc6 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -73,12 +73,12 @@ namespace rptui
DlgEdMode m_eMode;
sal_uInt16 m_nCurrentPosition;
sal_uInt16 m_eActObj;
- sal_Bool m_bFirstDraw;
+ bool m_bFirstDraw;
Size m_aGridSizeCoarse;
Size m_aGridSizeFine;
- sal_Bool m_bGridVisible;
- sal_Bool m_bGridSnap;
- sal_Bool m_bDeleted;
+ bool m_bGridVisible;
+ bool m_bGridSnap;
+ bool m_bDeleted;
DECL_LINK(MarkTimeout, void *);
@@ -130,7 +130,7 @@ namespace rptui
*
* \return <TRUE/> if paste is allowed
*/
- sal_Bool IsPasteAllowed() const;
+ bool IsPasteAllowed() const;
/** paste a new control in this section
*/
@@ -150,7 +150,7 @@ namespace rptui
void SelectAll(const sal_uInt16 _nObjectType);
/// checks if a selection exists
- sal_Bool HasSelection() const;
+ bool HasSelection() const;
void UpdatePropertyBrowserDelayed(OSectionView& _rView);
@@ -172,26 +172,26 @@ namespace rptui
inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; }
inline Size getGridSizeFine() const { return m_aGridSizeFine; }
- inline sal_Bool isGridSnap() const { return m_bGridSnap; }
- void setGridSnap(sal_Bool bOn);
- void setDragStripes(sal_Bool bOn);
+ inline bool isGridSnap() const { return m_bGridSnap; }
+ void setGridSnap(bool bOn);
+ void setDragStripes(bool bOn);
/** turns the grid on or off
*
* \param _bGridVisible
*/
- void toggleGrid(sal_Bool _bGridVisible);
+ void toggleGrid(bool _bGridVisible);
void togglePropertyBrowser(bool _bToogleOn);
- sal_Bool isAddFieldVisible() const;
+ bool isAddFieldVisible() const;
void toggleAddField();
- sal_Bool isReportExplorerVisible() const;
+ bool isReportExplorerVisible() const;
void toggleReportExplorer();
/** shows or hides the ruler.
*/
- void showRuler(sal_Bool _bShow);
+ void showRuler(bool _bShow);
/** unmark all objects on the views without the given one.
*
@@ -237,21 +237,21 @@ namespace rptui
@param _rCode the keycode
@return <TRUE/> if the keycode is handled otherwise <FALSE/>
*/
- sal_Bool handleKeyEvent(const KeyEvent& _rEvent);
+ bool handleKeyEvent(const KeyEvent& _rEvent);
/** set the section as marked or not marked
@param _pSectionView the section where to set the marked flag
@param _bMark the marked flag
*/
- void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark);
- void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark);
+ void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,bool _bMark);
+ void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,bool _bMark);
/** returns if the view handles the event by itself
*
* \param _nId the command id
* \return <FALSE/> is the event is not handled by the view otherwise <TRUE/>
*/
- sal_Bool isHandleEvent(sal_uInt16 _nId) const;
+ bool isHandleEvent(sal_uInt16 _nId) const;
sal_uInt32 getMarkedObjectCount() const;
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index b176f1c..9a429b5 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -48,8 +48,8 @@ namespace rptui
OUString m_sName;
OUString m_sSearchString;
OUString m_sFormula;
- sal_Bool m_bPreEvaluated;
- sal_Bool m_bDeepTraversing;
+ bool m_bPreEvaluated;
+ bool m_bDeepTraversing;
inline OUString getName() const { return m_sName; }
} ;
@@ -90,21 +90,21 @@ namespace rptui
*/
sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const;
- ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
+ ::com::sun::star::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
::com::sun::star::beans::Property getProperty(const OUString & PropertyName);
void implCreateListLikeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
,::com::sun::star::inspection::LineDescriptor & out_Descriptor
,sal_uInt16 _nResId
- ,sal_Bool _bReadOnlyControl
- ,sal_Bool _bTrueIfListBoxFalseIfComboBox
+ ,bool _bReadOnlyControl
+ ,bool _bTrueIfListBoxFalseIfComboBox
);
void implCreateListLikeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
,::com::sun::star::inspection::LineDescriptor & out_Descriptor
,const ::std::vector< OUString>& _aEntries
- ,sal_Bool _bReadOnlyControl
- ,sal_Bool _bTrueIfListBoxFalseIfComboBox
+ ,bool _bReadOnlyControl
+ ,bool _bTrueIfListBoxFalseIfComboBox
);
void checkPosAndSize( const ::com::sun::star::awt::Point& _aNewPos,
const ::com::sun::star::awt::Size& _aSize);
@@ -190,7 +190,7 @@ namespace rptui
* \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful.
* \return sal_True with known otherwise sal_False
*/
- sal_Bool isDefaultFunction(const OUString& _sQuotedFunction
+ bool isDefaultFunction(const OUString& _sQuotedFunction
,OUString& _Out_rDataField
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>& _xFunctionsSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>()
,bool _bSet = false) const;
@@ -202,7 +202,7 @@ namespace rptui
* \param _rsDefaultFunctionName
* \return
*/
- sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction
+ bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction
,OUString& _rDataField
,OUString& _rsDefaultFunctionName) const;
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 66e434a..36d94bd 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -89,7 +89,7 @@ class OGroupsSortingDialog : public FloatingWindow
::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener;
::com::sun::star::uno::Reference< ::com::sun::star::report::XGroups> m_xGroups;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns;
- sal_Bool m_bReadOnly;
+ bool m_bReadOnly;
private:
DECL_LINK( OnControlFocusLost, Control* );
DECL_LINK( OnControlFocusGot, Control* );
@@ -119,7 +119,7 @@ private:
/** returns <TRUE/> when the dialog should be read only
*/
- sal_Bool isReadOnly( ) const;
+ bool isReadOnly( ) const;
/** returns the data type for the given column name
@param _sColumnName
@@ -153,7 +153,7 @@ protected:
virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
public:
OGroupsSortingDialog( Window* pParent
- ,sal_Bool _bReadOnly
+ ,bool _bReadOnly
,::rptui::OReportController* _pController);
virtual ~OGroupsSortingDialog();
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 95e5eff..56fdfe4 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -121,12 +121,12 @@ namespace rptui
::sal_Int64 m_nAspect;
sal_Int16 m_nZoomValue;
SvxZoomType m_eZoomType;
- sal_Bool m_bShowRuler;
- sal_Bool m_bGridVisible;
- sal_Bool m_bGridUse;
- sal_Bool m_bShowProperties;
- sal_Bool m_bGroupFloaterWasVisible;
- sal_Bool m_bHelplinesMove;
+ bool m_bShowRuler;
+ bool m_bGridVisible;
+ bool m_bGridUse;
+ bool m_bShowProperties;
+ bool m_bGroupFloaterWasVisible;
+ bool m_bHelplinesMove;
bool m_bChartEnabled;
bool m_bChartEnabledAsked;
bool m_bInGeneratePreview;
@@ -349,7 +349,7 @@ namespace rptui
@param _nCommand the command id
@param _xControlFormat the report control format
*/
- sal_Bool isFormatCommandEnabled(sal_uInt16 _nCommand
+ bool isFormatCommandEnabled(sal_uInt16 _nCommand
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const;
virtual bool Construct(Window* pParent) SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index 125f4fa..a98790b 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -94,7 +94,7 @@ namespace rptui
void Lock();
void UnLock();
- sal_Bool IsLocked() const;
+ bool IsLocked() const;
void Clear();
private:
diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx
index 75519ca..dc3c394 100644
--- a/reportdesign/source/ui/inc/ReportRuler.hxx
+++ b/reportdesign/source/ui/inc/ReportRuler.hxx
@@ -30,7 +30,7 @@ namespace rptui
{
OReportSection* m_pSection;
OReportWindow* m_pParent;
- sal_Bool m_bShow;
+ bool m_bShow;
OReportRuler(OReportRuler&);
void operator =(OReportRuler&);
public:
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index e282695..08e939b 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -54,8 +54,8 @@ namespace rptui
sal_Int32 m_nPaintEntranceCount;
DlgEdMode m_eMode;
- sal_Bool m_bDialogModelChanged;
- sal_Bool m_bInDrag;
+ bool m_bDialogModelChanged;
+ bool m_bInDrag;
/** fills the section with all control from the report section
*/
@@ -113,15 +113,15 @@ namespace rptui
*
* \param _bVisible when <TRUE/> the grid is made visible
*/
- void SetGridVisible(sal_Bool _bVisible);
+ void SetGridVisible(bool _bVisible);
inline OSectionWindow* getSectionWindow() const { return m_pParent; }
inline OSectionView& getSectionView() const { return *m_pView; }
inline OReportPage* getPage() const { return m_pPage; }
inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; }
- void SetDialogModelChanged( sal_Bool bChanged = sal_True ) { m_bDialogModelChanged = bChanged; }
- sal_Bool IsDialogModelChanged() const { return m_bDialogModelChanged; }
+ void SetDialogModelChanged( bool bChanged = true ) { m_bDialogModelChanged = bChanged; }
+ bool IsDialogModelChanged() const { return m_bDialogModelChanged; }
DlgEdMode GetMode() const { return m_eMode; }
void SetMode( DlgEdMode m_eMode );
@@ -129,7 +129,7 @@ namespace rptui
@param _rCode the keycode
@return <TRUE/> if the keycode is handled otherwise <FALSE/>
*/
- sal_Bool handleKeyEvent(const KeyEvent& _rEvent);
+ bool handleKeyEvent(const KeyEvent& _rEvent);
/** returns the current control report model or <NULL/>
*/
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 7dcb645..e507956 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -79,9 +79,9 @@ namespace rptui
void SetMode( DlgEdMode m_eMode );
void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
- OUString GetInsertObjString() const;
- void setGridSnap(sal_Bool bOn);
- void setDragStripes(sal_Bool bOn);
+ OUString GetInsertObjString() const;
+ void setGridSnap(bool bOn);
+ void setDragStripes(bool bOn);
/** copies the current selection in this section
*/
@@ -91,7 +91,7 @@ namespace rptui
*
* \return <TRUE/> if paste is allowed
*/
- sal_Bool IsPasteAllowed() const;
+ bool IsPasteAllowed() const;
/** paste a new control in this section
*/
@@ -108,7 +108,7 @@ namespace rptui
/** returns <TRUE/> when a object is marked
*/
- sal_Bool HasSelection() const;
+ bool HasSelection() const;
Point getThumbPos() const;
@@ -132,12 +132,12 @@ namespace rptui
*
* \param _bVisible
*/
- void toggleGrid(sal_Bool _bVisible);
+ void toggleGrid(bool _bVisible);
/** shows the ruler
*/
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list