[Libreoffice-commits] core.git: 12 commits - accessibility/inc accessibility/source chart2/source cui/source dbaccess/qa dbaccess/source desktop/source extensions/source filter/source forms/source fpicker/source include/svtools include/svx reportdesign/source sc/source sd/source sfx2/source svtools/source svx/inc svx/source sw/source
Noel Grandin
noel at peralex.com
Sun Mar 23 23:13:19 PDT 2014
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 4
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx | 2
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 4
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 2
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 2
accessibility/source/extended/accessiblebrowseboxcell.cxx | 4
accessibility/source/helper/acc_factory.cxx | 4
chart2/source/controller/dialogs/DataBrowser.cxx | 32 -
chart2/source/controller/dialogs/DataBrowser.hxx | 6
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 2
cui/source/dialogs/about.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/options/connpooloptions.cxx | 22
dbaccess/qa/unit/firebird.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 4
dbaccess/source/ui/app/AppIconControl.cxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 4
dbaccess/source/ui/browser/sbagrid.cxx | 14
dbaccess/source/ui/control/RelationControl.cxx | 21
dbaccess/source/ui/control/TableGrantCtrl.cxx | 18
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 34 -
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 6
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 8
dbaccess/source/ui/inc/sbagrid.hxx | 4
dbaccess/source/ui/misc/TokenWriter.cxx | 6
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 37 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 6
dbaccess/source/ui/tabledesign/TEditControl.cxx | 30 -
dbaccess/source/ui/tabledesign/TEditControl.hxx | 8
dbaccess/source/ui/tabledesign/TableUndo.cxx | 8
desktop/source/app/app.cxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 2
extensions/source/propctrlr/usercontrol.cxx | 18
filter/source/msfilter/escherex.cxx | 2
forms/source/richtext/clipboarddispatcher.cxx | 4
fpicker/source/office/iodlgimp.cxx | 6
include/svtools/acceleratorexecute.hxx | 8
include/svtools/accessibilityoptions.hxx | 36 -
include/svtools/accessiblefactory.hxx | 2
include/svtools/accessibleruler.hxx | 8
include/svtools/accessibletable.hxx | 22
include/svtools/accessibletableprovider.hxx | 40 -
include/svtools/addresstemplate.hxx | 2
include/svtools/apearcfg.hxx | 20
include/svtools/asynclink.hxx | 13
include/svtools/brwbox.hxx | 182 +++---
include/svtools/calendar.hxx | 60 +-
include/svtools/cliplistener.hxx | 2
include/svtools/colorcfg.hxx | 26
include/svtools/ctrlbox.hxx | 32 -
include/svtools/ctrltool.hxx | 14
include/svtools/editbrowsebox.hxx | 86 +--
include/svtools/editimplementation.hxx | 6
include/svtools/ehdl.hxx | 12
include/svtools/embedtransfer.hxx | 2
include/svtools/extcolorcfg.hxx | 31 -
include/svtools/filectrl.hxx | 10
include/svtools/fileview.hxx | 26
include/svtools/fmtfield.hxx | 72 +-
include/svtools/fontsubstconfig.hxx | 14
include/svtools/framestatuslistener.hxx | 4
include/svtools/genericunodialog.hxx | 6
include/svtools/grfmgr.hxx | 98 +--
include/svtools/headbar.hxx | 48 -
include/svtools/helpopt.hxx | 12
include/svtools/htmlcfg.hxx | 30 -
include/svtools/htmlout.hxx | 8
include/svtools/hyperlabel.hxx | 2
include/svtools/imagemgr.hxx | 40 -
include/svtools/imap.hxx | 6
include/svtools/imapcirc.hxx | 16
include/svtools/imapobj.hxx | 20
include/svtools/imappoly.hxx | 18
include/svtools/imaprect.hxx | 14
include/svtools/inetimg.hxx | 4
include/svtools/inettbc.hxx | 28
include/svtools/insdlg.hxx | 2
include/svtools/ivctrl.hxx | 48 -
include/svtools/localresaccess.hxx | 2
include/svtools/menuoptions.hxx | 2
include/svtools/miscopt.hxx | 40 -
include/svtools/openfiledroptargetlistener.hxx | 2
include/svtools/optionsdrawinglayer.hxx | 46 -
include/svtools/parhtml.hxx | 2
include/svtools/printoptions.hxx | 24
include/svtools/prnsetup.hxx | 2
include/svtools/svtabbx.hxx | 36 -
include/svtools/table/tablecontrol.hxx | 20
include/svx/galctrl.hxx | 2
include/svx/gridctrl.hxx | 12
reportdesign/source/ui/dlg/GroupsSorting.cxx | 30 -
reportdesign/source/ui/report/ReportController.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/view/cellsh.cxx | 2
sc/source/ui/view/editsh.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 2
sd/source/ui/view/drviews7.cxx | 2
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 4
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/bastyp/frmhtmlw.cxx | 2
sfx2/source/control/shell.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/menu/mnumgr.cxx | 2
svtools/source/brwbox/brwbox1.cxx | 186 +++---
svtools/source/brwbox/brwbox2.cxx | 186 +++---
svtools/source/brwbox/brwbox3.cxx | 37 -
svtools/source/brwbox/datwin.cxx | 6
svtools/source/brwbox/ebbcontrols.cxx | 64 +-
svtools/source/brwbox/editbrowsebox.cxx | 151 ++---
svtools/source/brwbox/editbrowsebox2.cxx | 4
svtools/source/config/accessibilityoptions.cxx | 124 ++--
svtools/source/config/apearcfg.cxx | 6
svtools/source/config/colorcfg.cxx | 136 ++--
svtools/source/config/extcolorcfg.cxx | 14
svtools/source/config/fontsubstconfig.cxx | 2
svtools/source/config/helpopt.cxx | 32 -
svtools/source/config/htmlcfg.cxx | 44 -
svtools/source/config/menuoptions.cxx | 34 -
svtools/source/config/miscopt.cxx | 136 ++--
svtools/source/config/optionsdrawinglayer.cxx | 168 ++---
svtools/source/config/printoptions.cxx | 95 +--
svtools/source/contnr/fileview.cxx | 198 +++----
svtools/source/contnr/imivctl1.cxx | 10
svtools/source/contnr/ivctrl.cxx | 52 -
svtools/source/contnr/svtabbx.cxx | 52 -
svtools/source/contnr/templwin.cxx | 8
svtools/source/control/asynclink.cxx | 12
svtools/source/control/calendar.cxx | 282 +++++-----
svtools/source/control/ctrlbox.cxx | 82 +-
svtools/source/control/ctrltool.cxx | 24
svtools/source/control/filectrl.cxx | 2
svtools/source/control/fmtfield.cxx | 133 ++--
svtools/source/control/headbar.cxx | 120 ++--
svtools/source/control/hyperlabel.cxx | 10
svtools/source/control/inettbc.cxx | 118 ++--
svtools/source/dialogs/addresstemplate.cxx | 10
svtools/source/dialogs/insdlg.cxx | 6
svtools/source/dialogs/prnsetup.cxx | 4
svtools/source/graphic/grfattr.cxx | 6
svtools/source/graphic/grfmgr.cxx | 90 +--
svtools/source/graphic/grfmgr2.cxx | 44 -
svtools/source/misc/acceleratorexecute.cxx | 8
svtools/source/misc/cliplistener.cxx | 2
svtools/source/misc/ehdl.cxx | 22
svtools/source/misc/imagemgr.cxx | 262 ++++-----
svtools/source/misc/imap.cxx | 86 +--
svtools/source/misc/openfiledroptargetlistener.cxx | 6
svtools/source/misc/svtaccessiblefactory.cxx | 2
svtools/source/svhtml/htmlout.cxx | 12
svtools/source/svhtml/htmlsupp.cxx | 2
svtools/source/table/tablecontrol.cxx | 24
svtools/source/uno/framestatuslistener.cxx | 6
svtools/source/uno/genericunodialog.cxx | 14
svtools/source/uno/unoiface.cxx | 6
svtools/source/uno/unoimap.cxx | 14
svtools/source/urlobj/inetimg.cxx | 8
svx/inc/svdibrow.hxx | 2
svx/source/dialog/imapwnd.cxx | 20
svx/source/dialog/linkwarn.cxx | 4
svx/source/fmcomp/fmgridcl.cxx | 28
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/fmcomp/gridcell.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 48 -
svx/source/gallery2/galctrl.cxx | 4
svx/source/svdraw/svdibrow.cxx | 8
sw/source/filter/html/css1atr.cxx | 8
sw/source/filter/html/htmlatr.cxx | 25
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/htmldraw.cxx | 2
sw/source/filter/html/htmlfldw.cxx | 2
sw/source/filter/html/htmlfly.cxx | 10
sw/source/filter/html/htmlforw.cxx | 8
sw/source/filter/html/htmlftn.cxx | 10
sw/source/filter/html/htmlnum.cxx | 2
sw/source/filter/html/htmlplug.cxx | 4
sw/source/filter/html/htmltabw.cxx | 39 -
sw/source/filter/html/wrthtml.cxx | 10
sw/source/ui/index/cnttab.cxx | 26
182 files changed, 2568 insertions(+), 2582 deletions(-)
New commits:
commit a4dc5ea2f7290a925bf225e1b9babbf4df43b7e6
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 20 17:16:37 2014 +0200
svtools: sal_Bool->bool
Change-Id: I288a5c8b86d21a1b91f464aaf162aed9aca35a42
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index f045590..0985a26 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -176,7 +176,7 @@ void AboutDialog::SetLogo()
// fdo#67401 set AntiAliasing for SVG logo
SvtOptionsDrawinglayer aDrawOpt;
sal_Bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing();
- aDrawOpt.SetAntiAliasing(sal_True);
+ aDrawOpt.SetAntiAliasing(true);
// load svg logo, specify desired width, scale height isotrophically
if( SfxApplication::loadBrandSvg("flat_logo", aLogoBitmap, nWidth) &&
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 5388488..7ff7a91 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -66,7 +66,7 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1<
private:
void implts_BeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors );
void implts_EndDrag();
- sal_Bool implts_IsDropFormatSupported( SotFormatStringId nFormat );
+ bool implts_IsDropFormatSupported( SotFormatStringId nFormat );
void implts_OpenFile( const OUString& rFilePath );
};
diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx
index 101ca4c..ccc7a44 100644
--- a/include/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
@@ -106,48 +106,48 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
@seealso configuration package "org.openoffice.Office.Common/Drawinglayer"
*//*-*****************************************************************************************************/
- sal_Bool IsOverlayBuffer() const;
- sal_Bool IsPaintBuffer() const;
+ bool IsOverlayBuffer() const;
+ bool IsPaintBuffer() const;
Color GetStripeColorA() const;
Color GetStripeColorB() const;
sal_uInt16 GetStripeLength() const;
// #i73602#
- sal_Bool IsOverlayBuffer_Calc() const;
- sal_Bool IsOverlayBuffer_Writer() const;
- sal_Bool IsOverlayBuffer_DrawImpress() const;
+ bool IsOverlayBuffer_Calc() const;
+ bool IsOverlayBuffer_Writer() const;
+ bool IsOverlayBuffer_DrawImpress() const;
// #i74769#, #i75172#
- sal_Bool IsPaintBuffer_Calc() const;
- sal_Bool IsPaintBuffer_Writer() const;
- sal_Bool IsPaintBuffer_DrawImpress() const;
+ bool IsPaintBuffer_Calc() const;
+ bool IsPaintBuffer_Writer() const;
+ bool IsPaintBuffer_DrawImpress() const;
// #i4219#
- sal_uInt32 GetMaximumPaperWidth() const;
- sal_uInt32 GetMaximumPaperHeight() const;
- sal_uInt32 GetMaximumPaperLeftMargin() const;
- sal_uInt32 GetMaximumPaperRightMargin() const;
- sal_uInt32 GetMaximumPaperTopMargin() const;
- sal_uInt32 GetMaximumPaperBottomMargin() const;
+ sal_uInt32 GetMaximumPaperWidth() const;
+ sal_uInt32 GetMaximumPaperHeight() const;
+ sal_uInt32 GetMaximumPaperLeftMargin() const;
+ sal_uInt32 GetMaximumPaperRightMargin() const;
+ sal_uInt32 GetMaximumPaperTopMargin() const;
+ sal_uInt32 GetMaximumPaperBottomMargin() const;
// #i95644# helper to check if AA is allowed on this system. Currently, for WIN its disabled
// and OutDevSupport_TransparentRect is checked (this hits XRenderExtension, e.g.
// currently for SunRay as long as not supported there)
- sal_Bool IsAAPossibleOnThisSystem() const;
+ bool IsAAPossibleOnThisSystem() const;
// primitives
- bool IsAntiAliasing() const;
- sal_Bool IsSnapHorVerLinesToDiscrete() const;
- sal_Bool IsSolidDragCreate() const;
- sal_Bool IsRenderDecoratedTextDirect() const;
- sal_Bool IsRenderSimpleTextDirect() const;
+ bool IsAntiAliasing() const;
+ bool IsSnapHorVerLinesToDiscrete() const;
+ bool IsSolidDragCreate() const;
+ bool IsRenderDecoratedTextDirect() const;
+ bool IsRenderSimpleTextDirect() const;
sal_uInt32 GetQuadratic3DRenderLimit() const;
sal_uInt32 GetQuadraticFormControlRenderLimit() const;
- void SetAntiAliasing( sal_Bool bState );
+ void SetAntiAliasing( bool bState );
// #i97672# selection settings
- sal_Bool IsTransparentSelection() const;
+ bool IsTransparentSelection() const;
sal_uInt16 GetTransparentSelectionPercent() const;
sal_uInt16 GetSelectionMaximumLuminancePercent() const;
@@ -156,7 +156,7 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
// combined with Application::GetSettings().GetStyleSettings().GetHighlightColor())
Color getHilightColor() const;
- void SetTransparentSelection( sal_Bool bState );
+ void SetTransparentSelection( bool bState );
void SetTransparentSelectionPercent( sal_uInt16 nPercent );
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 65817b8..67497ca 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -256,7 +256,7 @@ public:
// Einen Kommentar um den Inhalt von <SCRIPT> oder <STYLE> entfernen
// Bei 'bFull' wird ggf. die gesammte Zeile hinter einem "<!--"
// entfernt (fuer JavaSript)
- static void RemoveSGMLComment( OUString &rString, sal_Bool bFull );
+ static void RemoveSGMLComment( OUString &rString, bool bFull );
static bool InternalImgToPrivateURL( OUString& rURL );
static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader );
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index 2d90abf..4e39946 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -51,29 +51,29 @@ public:
SvtBasePrintOptions();
virtual ~SvtBasePrintOptions();
- sal_Bool IsReduceTransparency() const;
+ bool IsReduceTransparency() const;
sal_Int16 GetReducedTransparencyMode() const;
- sal_Bool IsReduceGradients() const;
+ bool IsReduceGradients() const;
sal_Int16 GetReducedGradientMode() const;
sal_Int16 GetReducedGradientStepCount() const;
- sal_Bool IsReduceBitmaps() const;
+ bool IsReduceBitmaps() const;
sal_Int16 GetReducedBitmapMode() const;
sal_Int16 GetReducedBitmapResolution() const;
- sal_Bool IsReducedBitmapIncludesTransparency() const;
- sal_Bool IsConvertToGreyscales() const;
- sal_Bool IsPDFAsStandardPrintJobFormat() const;
+ bool IsReducedBitmapIncludesTransparency() const;
+ bool IsConvertToGreyscales() const;
+ bool IsPDFAsStandardPrintJobFormat() const;
- void SetReduceTransparency( sal_Bool bState );
+ void SetReduceTransparency( bool bState );
void SetReducedTransparencyMode( sal_Int16 nMode );
- void SetReduceGradients( sal_Bool bState );
+ void SetReduceGradients( bool bState );
void SetReducedGradientMode( sal_Int16 nMode );
void SetReducedGradientStepCount( sal_Int16 nStepCount );
- void SetReduceBitmaps( sal_Bool bState );
+ void SetReduceBitmaps( bool bState );
void SetReducedBitmapMode( sal_Int16 bState );
void SetReducedBitmapResolution( sal_Int16 nResolution );
- void SetReducedBitmapIncludesTransparency( sal_Bool bState );
- void SetConvertToGreyscales( sal_Bool bState );
- void SetPDFAsStandardPrintJobFormat( sal_Bool bState );
+ void SetReducedBitmapIncludesTransparency( bool bState );
+ void SetConvertToGreyscales( bool bState );
+ void SetPDFAsStandardPrintJobFormat( bool bState );
public:
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index b0dbf62..7b0daef 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -81,7 +81,7 @@ public:
void ImplFillPrnDlgListBox( const Printer* pPrinter,
ListBox* pBox, PushButton* pPropBtn );
-void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear = sal_True );
+void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear = true );
Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
Printer* pPrinter, Printer* pTempPrinter );
Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter );
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 7d42660..515501b 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -42,22 +42,22 @@ using namespace ::osl ;
using namespace ::com::sun::star::uno ;
#define ROOTNODE_START OUString("Office.Common/Drawinglayer" )
-#define DEFAULT_OVERLAYBUFFER sal_True
-#define DEFAULT_PAINTBUFFER sal_True
+#define DEFAULT_OVERLAYBUFFER true
+#define DEFAULT_PAINTBUFFER true
#define DEFAULT_STRIPE_COLOR_A 0
#define DEFAULT_STRIPE_COLOR_B 16581375
#define DEFAULT_STRIPE_LENGTH 4
// #i73602#
// #i74769#, #i75172# : Change default for Calc and Writer to True
-#define DEFAULT_OVERLAYBUFFER_CALC sal_True
-#define DEFAULT_OVERLAYBUFFER_WRITER sal_True
-#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS sal_True
+#define DEFAULT_OVERLAYBUFFER_CALC true
+#define DEFAULT_OVERLAYBUFFER_WRITER true
+#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS true
// #i74769#, #i75172#
-#define DEFAULT_PAINTBUFFER_CALC sal_True
-#define DEFAULT_PAINTBUFFER_WRITER sal_True
-#define DEFAULT_PAINTBUFFER_DRAWIMPRESS sal_True
+#define DEFAULT_PAINTBUFFER_CALC true
+#define DEFAULT_PAINTBUFFER_WRITER true
+#define DEFAULT_PAINTBUFFER_DRAWIMPRESS true
// #i4219#
#define DEFAULT_MAXIMUMPAPERWIDTH 300
@@ -68,16 +68,16 @@ using namespace ::com::sun::star::uno ;
#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN 9999
// primitives
-#define DEFAULT_ANTIALIASING sal_True
-#define DEFAULT_SNAPHORVERLINESTODISCRETE sal_True
-#define DEFAULT_SOLIDDRAGCREATE sal_True
-#define DEFAULT_RENDERDECORATEDTEXTDIRECT sal_True
-#define DEFAULT_RENDERSIMPLETEXTDIRECT sal_True
+#define DEFAULT_ANTIALIASING true
+#define DEFAULT_SNAPHORVERLINESTODISCRETE true
+#define DEFAULT_SOLIDDRAGCREATE true
+#define DEFAULT_RENDERDECORATEDTEXTDIRECT true
+#define DEFAULT_RENDERSIMPLETEXTDIRECT true
#define DEFAULT_QUADRATIC3DRENDERLIMIT 1000000
#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT 45000
// #i97672# selection settings
-#define DEFAULT_TRANSPARENTSELECTION sal_True
+#define DEFAULT_TRANSPARENTSELECTION true
#define DEFAULT_TRANSPARENTSELECTIONPERCENT 75
#define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT 70
@@ -181,50 +181,50 @@ public:
// public interface
- sal_Bool IsOverlayBuffer() const;
- sal_Bool IsPaintBuffer() const;
+ bool IsOverlayBuffer() const;
+ bool IsPaintBuffer() const;
Color GetStripeColorA() const;
Color GetStripeColorB() const;
sal_uInt16 GetStripeLength() const;
// #i73602#
- sal_Bool IsOverlayBuffer_Calc() const;
- sal_Bool IsOverlayBuffer_Writer() const;
- sal_Bool IsOverlayBuffer_DrawImpress() const;
+ bool IsOverlayBuffer_Calc() const;
+ bool IsOverlayBuffer_Writer() const;
+ bool IsOverlayBuffer_DrawImpress() const;
// #i74769#, #i75172#
- sal_Bool IsPaintBuffer_Calc() const;
- sal_Bool IsPaintBuffer_Writer() const;
- sal_Bool IsPaintBuffer_DrawImpress() const;
+ bool IsPaintBuffer_Calc() const;
+ bool IsPaintBuffer_Writer() const;
+ bool IsPaintBuffer_DrawImpress() const;
// #i4219#
- sal_uInt32 GetMaximumPaperWidth() const;
- sal_uInt32 GetMaximumPaperHeight() const;
- sal_uInt32 GetMaximumPaperLeftMargin() const;
- sal_uInt32 GetMaximumPaperRightMargin() const;
- sal_uInt32 GetMaximumPaperTopMargin() const;
- sal_uInt32 GetMaximumPaperBottomMargin() const;
+ sal_uInt32 GetMaximumPaperWidth() const;
+ sal_uInt32 GetMaximumPaperHeight() const;
+ sal_uInt32 GetMaximumPaperLeftMargin() const;
+ sal_uInt32 GetMaximumPaperRightMargin() const;
+ sal_uInt32 GetMaximumPaperTopMargin() const;
+ sal_uInt32 GetMaximumPaperBottomMargin() const;
// helper
- sal_Bool IsAAPossibleOnThisSystem() const;
+ bool IsAAPossibleOnThisSystem() const;
// primitives
- sal_Bool IsAntiAliasing() const;
- sal_Bool IsSnapHorVerLinesToDiscrete() const;
- sal_Bool IsSolidDragCreate() const;
- sal_Bool IsRenderDecoratedTextDirect() const;
- sal_Bool IsRenderSimpleTextDirect() const;
+ bool IsAntiAliasing() const;
+ bool IsSnapHorVerLinesToDiscrete() const;
+ bool IsSolidDragCreate() const;
+ bool IsRenderDecoratedTextDirect() const;
+ bool IsRenderSimpleTextDirect() const;
sal_uInt32 GetQuadratic3DRenderLimit() const;
sal_uInt32 GetQuadraticFormControlRenderLimit() const;
- void SetAntiAliasing( sal_Bool bState );
+ void SetAntiAliasing( bool bState );
// #i97672# selection settings
- sal_Bool IsTransparentSelection() const;
+ bool IsTransparentSelection() const;
sal_uInt16 GetTransparentSelectionPercent() const;
sal_uInt16 GetSelectionMaximumLuminancePercent() const;
- void SetTransparentSelection( sal_Bool bState );
+ void SetTransparentSelection( bool bState );
void SetTransparentSelectionPercent( sal_uInt16 nPercent );
@@ -241,21 +241,21 @@ private:
private:
- sal_Bool m_bOverlayBuffer;
- sal_Bool m_bPaintBuffer;
+ bool m_bOverlayBuffer;
+ bool m_bPaintBuffer;
Color m_bStripeColorA;
Color m_bStripeColorB;
sal_uInt16 m_nStripeLength;
// #i73602#
- sal_Bool m_bOverlayBuffer_Calc;
- sal_Bool m_bOverlayBuffer_Writer;
- sal_Bool m_bOverlayBuffer_DrawImpress;
+ bool m_bOverlayBuffer_Calc;
+ bool m_bOverlayBuffer_Writer;
+ bool m_bOverlayBuffer_DrawImpress;
// #i74769#, #i75172#
- sal_Bool m_bPaintBuffer_Calc;
- sal_Bool m_bPaintBuffer_Writer;
- sal_Bool m_bPaintBuffer_DrawImpress;
+ bool m_bPaintBuffer_Calc;
+ bool m_bPaintBuffer_Writer;
+ bool m_bPaintBuffer_DrawImpress;
// #i4219#
sal_uInt32 m_nMaximumPaperWidth;
@@ -266,18 +266,18 @@ private:
sal_uInt32 m_nMaximumPaperBottomMargin;
// primitives
- sal_Bool m_bAntiAliasing;
- sal_Bool m_bSnapHorVerLinesToDiscrete;
- sal_Bool m_bSolidDragCreate;
- sal_Bool m_bRenderDecoratedTextDirect;
- sal_Bool m_bRenderSimpleTextDirect;
+ bool m_bAntiAliasing;
+ bool m_bSnapHorVerLinesToDiscrete;
+ bool m_bSolidDragCreate;
+ bool m_bRenderDecoratedTextDirect;
+ bool m_bRenderSimpleTextDirect;
sal_uInt32 m_nQuadratic3DRenderLimit;
sal_uInt32 m_nQuadraticFormControlRenderLimit;
// #i97672# selection settings
sal_uInt16 m_nTransparentSelectionPercent;
sal_uInt16 m_nSelectionMaximumLuminancePercent;
- sal_Bool m_bTransparentSelection;
+ bool m_bTransparentSelection;
// local values
bool m_bAllowAA : 1;
@@ -693,7 +693,7 @@ void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<OU
// public method
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
{
return m_bOverlayBuffer;
}
@@ -701,7 +701,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const
// public method
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const
{
return m_bPaintBuffer;
}
@@ -731,33 +731,33 @@ sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const
}
// #i73602#
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Calc() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Calc() const
{
return m_bOverlayBuffer_Calc;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Writer() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_Writer() const
{
return m_bOverlayBuffer_Writer;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer_DrawImpress() const
{
return m_bOverlayBuffer_DrawImpress;
}
// #i74769#, #i75172#
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Calc() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Calc() const
{
return m_bPaintBuffer_Calc;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Writer() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_Writer() const
{
return m_bPaintBuffer_Writer;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer_DrawImpress() const
{
return m_bPaintBuffer_DrawImpress;
}
@@ -794,7 +794,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const
}
// helper
-sal_Bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
+bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
{
if(!m_bAllowAAChecked)
{
@@ -819,27 +819,27 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsAAPossibleOnThisSystem() const
}
// primitives
-sal_Bool SvtOptionsDrawinglayer_Impl::IsAntiAliasing() const
+bool SvtOptionsDrawinglayer_Impl::IsAntiAliasing() const
{
return m_bAntiAliasing;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsSnapHorVerLinesToDiscrete() const
+bool SvtOptionsDrawinglayer_Impl::IsSnapHorVerLinesToDiscrete() const
{
return m_bSnapHorVerLinesToDiscrete;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsSolidDragCreate() const
+bool SvtOptionsDrawinglayer_Impl::IsSolidDragCreate() const
{
return m_bSolidDragCreate;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsRenderDecoratedTextDirect() const
+bool SvtOptionsDrawinglayer_Impl::IsRenderDecoratedTextDirect() const
{
return m_bRenderDecoratedTextDirect;
}
-sal_Bool SvtOptionsDrawinglayer_Impl::IsRenderSimpleTextDirect() const
+bool SvtOptionsDrawinglayer_Impl::IsRenderSimpleTextDirect() const
{
return m_bRenderSimpleTextDirect;
}
@@ -854,7 +854,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetQuadraticFormControlRenderLimit() con
return m_nQuadraticFormControlRenderLimit;
}
-void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( sal_Bool bState )
+void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( bool bState )
{
if(m_bAntiAliasing != bState)
{
@@ -864,12 +864,12 @@ void SvtOptionsDrawinglayer_Impl::SetAntiAliasing( sal_Bool bState )
}
// #i97672# selection settings
-sal_Bool SvtOptionsDrawinglayer_Impl::IsTransparentSelection() const
+bool SvtOptionsDrawinglayer_Impl::IsTransparentSelection() const
{
return m_bTransparentSelection;
}
-void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( sal_Bool bState )
+void SvtOptionsDrawinglayer_Impl::SetTransparentSelection( bool bState )
{
if(m_bTransparentSelection != bState)
{
@@ -995,7 +995,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
// public method
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsOverlayBuffer();
@@ -1004,7 +1004,7 @@ sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const
// public method
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsPaintBuffer();
@@ -1038,38 +1038,38 @@ sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const
}
// #i73602#
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_Calc() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer_Calc() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsOverlayBuffer_Calc();
}
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_Writer() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer_Writer() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsOverlayBuffer_Writer();
}
-sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer::IsOverlayBuffer_DrawImpress() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsOverlayBuffer_DrawImpress();
}
// #i74769#, #i75172#
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_Calc() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer_Calc() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsPaintBuffer_Calc();
}
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_Writer() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer_Writer() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsPaintBuffer_Writer();
}
-sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer_DrawImpress() const
+bool SvtOptionsDrawinglayer::IsPaintBuffer_DrawImpress() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsPaintBuffer_DrawImpress();
@@ -1113,7 +1113,7 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const
}
// helper
-sal_Bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const
+bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const
{
return m_pDataContainer->IsAAPossibleOnThisSystem();
}
@@ -1125,25 +1125,25 @@ bool SvtOptionsDrawinglayer::IsAntiAliasing() const
return m_pDataContainer->IsAntiAliasing() && IsAAPossibleOnThisSystem();
}
-sal_Bool SvtOptionsDrawinglayer::IsSnapHorVerLinesToDiscrete() const
+bool SvtOptionsDrawinglayer::IsSnapHorVerLinesToDiscrete() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsAntiAliasing() && m_pDataContainer->IsSnapHorVerLinesToDiscrete();
}
-sal_Bool SvtOptionsDrawinglayer::IsSolidDragCreate() const
+bool SvtOptionsDrawinglayer::IsSolidDragCreate() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsSolidDragCreate();
}
-sal_Bool SvtOptionsDrawinglayer::IsRenderDecoratedTextDirect() const
+bool SvtOptionsDrawinglayer::IsRenderDecoratedTextDirect() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsRenderDecoratedTextDirect();
}
-sal_Bool SvtOptionsDrawinglayer::IsRenderSimpleTextDirect() const
+bool SvtOptionsDrawinglayer::IsRenderSimpleTextDirect() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsRenderSimpleTextDirect();
@@ -1161,20 +1161,20 @@ sal_uInt32 SvtOptionsDrawinglayer::GetQuadraticFormControlRenderLimit() const
return m_pDataContainer->GetQuadraticFormControlRenderLimit();
}
-void SvtOptionsDrawinglayer::SetAntiAliasing( sal_Bool bState )
+void SvtOptionsDrawinglayer::SetAntiAliasing( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetAntiAliasing( bState );
}
// #i97672# selection settings
-sal_Bool SvtOptionsDrawinglayer::IsTransparentSelection() const
+bool SvtOptionsDrawinglayer::IsTransparentSelection() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsTransparentSelection();
}
-void SvtOptionsDrawinglayer::SetTransparentSelection( sal_Bool bState )
+void SvtOptionsDrawinglayer::SetTransparentSelection( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetTransparentSelection( bState );
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index fc0f0c1..2e58a6c 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -76,39 +76,37 @@ public:
SvtPrintOptions_Impl( const OUString& rConfigRoot );
~SvtPrintOptions_Impl();
- sal_Bool IsReduceTransparency() const ;
+ bool IsReduceTransparency() const ;
sal_Int16 GetReducedTransparencyMode() const ;
- sal_Bool IsReduceGradients() const ;
+ bool IsReduceGradients() const ;
sal_Int16 GetReducedGradientMode() const ;
sal_Int16 GetReducedGradientStepCount() const ;
- sal_Bool IsReduceBitmaps() const ;
+ bool IsReduceBitmaps() const ;
sal_Int16 GetReducedBitmapMode() const ;
sal_Int16 GetReducedBitmapResolution() const ;
- sal_Bool IsReducedBitmapIncludesTransparency() const ;
- sal_Bool IsConvertToGreyscales() const;
- sal_Bool IsPDFAsStandardPrintJobFormat() const;
+ bool IsReducedBitmapIncludesTransparency() const ;
+ bool IsConvertToGreyscales() const;
+ bool IsPDFAsStandardPrintJobFormat() const;
- void SetReduceTransparency( sal_Bool bState ) ;
+ void SetReduceTransparency( bool bState ) ;
void SetReducedTransparencyMode( sal_Int16 nMode ) ;
- void SetReduceGradients( sal_Bool bState ) ;
+ void SetReduceGradients( bool bState ) ;
void SetReducedGradientMode( sal_Int16 nMode ) ;
void SetReducedGradientStepCount( sal_Int16 nStepCount ) ;
- void SetReduceBitmaps( sal_Bool bState ) ;
+ void SetReduceBitmaps( bool bState ) ;
void SetReducedBitmapMode( sal_Int16 nMode ) ;
void SetReducedBitmapResolution( sal_Int16 nResolution ) ;
- void SetReducedBitmapIncludesTransparency( sal_Bool bState ) ;
- void SetConvertToGreyscales( sal_Bool bState ) ;
- void SetPDFAsStandardPrintJobFormat( sal_Bool bState ) ;
+ void SetReducedBitmapIncludesTransparency( bool bState ) ;
+ void SetConvertToGreyscales( bool bState ) ;
+ void SetPDFAsStandardPrintJobFormat( bool bState ) ;
// private API
private:
- void impl_setValue (const OUString& sProp,
- ::sal_Bool bNew );
- void impl_setValue (const OUString& sProp,
- ::sal_Int16 nNew );
+ void impl_setValue (const OUString& sProp, bool bNew );
+ void impl_setValue (const OUString& sProp, sal_Int16 nNew );
// private member
@@ -147,9 +145,9 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
}
}
-sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const
+bool SvtPrintOptions_Impl::IsReduceTransparency() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
if (m_xNode.is())
@@ -187,9 +185,9 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
return nRet;
}
-sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const
+bool SvtPrintOptions_Impl::IsReduceGradients() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
if (m_xNode.is())
@@ -253,9 +251,9 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
return nRet;
}
-sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const
+bool SvtPrintOptions_Impl::IsReduceBitmaps() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
if (m_xNode.is())
@@ -319,9 +317,9 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
return nRet;
}
-sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
+bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
try
{
if (m_xNode.is())
@@ -341,9 +339,9 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
return bRet;
}
-sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
+bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{
if (m_xNode.is())
@@ -364,9 +362,9 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
}
-sal_Bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
+bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
try
{
if (m_xNode.is())
@@ -386,7 +384,7 @@ sal_Bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
return bRet;
}
-void SvtPrintOptions_Impl::SetReduceTransparency(sal_Bool bState)
+void SvtPrintOptions_Impl::SetReduceTransparency(bool bState)
{
impl_setValue(PROPERTYNAME_REDUCETRANSPARENCY, bState);
}
@@ -396,7 +394,7 @@ void SvtPrintOptions_Impl::SetReducedTransparencyMode(sal_Int16 nMode)
impl_setValue(PROPERTYNAME_REDUCEDTRANSPARENCYMODE, nMode);
}
-void SvtPrintOptions_Impl::SetReduceGradients(sal_Bool bState)
+void SvtPrintOptions_Impl::SetReduceGradients(bool bState)
{
impl_setValue(PROPERTYNAME_REDUCEGRADIENTS, bState);
}
@@ -411,7 +409,7 @@ void SvtPrintOptions_Impl::SetReducedGradientStepCount(sal_Int16 nStepCount )
impl_setValue(PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT, nStepCount);
}
-void SvtPrintOptions_Impl::SetReduceBitmaps(sal_Bool bState )
+void SvtPrintOptions_Impl::SetReduceBitmaps(bool bState )
{
impl_setValue(PROPERTYNAME_REDUCEBITMAPS, bState);
}
@@ -426,17 +424,17 @@ void SvtPrintOptions_Impl::SetReducedBitmapResolution(sal_Int16 nResolution )
impl_setValue(PROPERTYNAME_REDUCEDBITMAPRESOLUTION, nResolution);
}
-void SvtPrintOptions_Impl::SetReducedBitmapIncludesTransparency(sal_Bool bState )
+void SvtPrintOptions_Impl::SetReducedBitmapIncludesTransparency(bool bState )
{
impl_setValue(PROPERTYNAME_REDUCEDBITMAPINCLUDESTRANSPARENCY, bState);
}
-void SvtPrintOptions_Impl::SetConvertToGreyscales(sal_Bool bState)
+void SvtPrintOptions_Impl::SetConvertToGreyscales(bool bState)
{
impl_setValue(PROPERTYNAME_CONVERTTOGREYSCALES, bState);
}
-void SvtPrintOptions_Impl::SetPDFAsStandardPrintJobFormat(sal_Bool bState)
+void SvtPrintOptions_Impl::SetPDFAsStandardPrintJobFormat(bool bState)
{
impl_setValue(PROPERTYNAME_PDFASSTANDARDPRINTJOBFORMAT, bState);
}
@@ -447,8 +445,7 @@ SvtPrintOptions_Impl::~SvtPrintOptions_Impl()
m_xCfg.clear();
}
-void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
- ::sal_Bool bNew )
+void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp, bool bNew )
{
try
{
@@ -459,7 +456,7 @@ void SvtPrintOptions_Impl::impl_setValue (const OUString& sProp,
if ( ! xSet.is())
return;
- ::sal_Bool bOld = ! bNew;
+ bool bOld = ! bNew;
if ( ! (xSet->getPropertyValue(sProp) >>= bOld))
return;
@@ -534,7 +531,7 @@ Mutex& SvtBasePrintOptions::GetOwnStaticMutex()
return *pMutex;
}
-sal_Bool SvtBasePrintOptions::IsReduceTransparency() const
+bool SvtBasePrintOptions::IsReduceTransparency() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReduceTransparency();
@@ -546,7 +543,7 @@ sal_Int16 SvtBasePrintOptions::GetReducedTransparencyMode() const
return m_pDataContainer->GetReducedTransparencyMode();
}
-sal_Bool SvtBasePrintOptions::IsReduceGradients() const
+bool SvtBasePrintOptions::IsReduceGradients() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReduceGradients();
@@ -564,7 +561,7 @@ sal_Int16 SvtBasePrintOptions::GetReducedGradientStepCount() const
return m_pDataContainer->GetReducedGradientStepCount();
}
-sal_Bool SvtBasePrintOptions::IsReduceBitmaps() const
+bool SvtBasePrintOptions::IsReduceBitmaps() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReduceBitmaps();
@@ -582,25 +579,25 @@ sal_Int16 SvtBasePrintOptions::GetReducedBitmapResolution() const
return m_pDataContainer->GetReducedBitmapResolution();
}
-sal_Bool SvtBasePrintOptions::IsReducedBitmapIncludesTransparency() const
+bool SvtBasePrintOptions::IsReducedBitmapIncludesTransparency() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsReducedBitmapIncludesTransparency();
}
-sal_Bool SvtBasePrintOptions::IsConvertToGreyscales() const
+bool SvtBasePrintOptions::IsConvertToGreyscales() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsConvertToGreyscales();
}
-sal_Bool SvtBasePrintOptions::IsPDFAsStandardPrintJobFormat() const
+bool SvtBasePrintOptions::IsPDFAsStandardPrintJobFormat() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsPDFAsStandardPrintJobFormat();
}
-void SvtBasePrintOptions::SetReduceTransparency( sal_Bool bState )
+void SvtBasePrintOptions::SetReduceTransparency( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetReduceTransparency( bState ) ;
@@ -612,7 +609,7 @@ void SvtBasePrintOptions::SetReducedTransparencyMode( sal_Int16 nMode )
m_pDataContainer->SetReducedTransparencyMode( nMode );
}
-void SvtBasePrintOptions::SetReduceGradients( sal_Bool bState )
+void SvtBasePrintOptions::SetReduceGradients( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetReduceGradients( bState );
@@ -630,7 +627,7 @@ void SvtBasePrintOptions::SetReducedGradientStepCount( sal_Int16 nStepCount )
m_pDataContainer->SetReducedGradientStepCount( nStepCount );
}
-void SvtBasePrintOptions::SetReduceBitmaps( sal_Bool bState )
+void SvtBasePrintOptions::SetReduceBitmaps( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetReduceBitmaps( bState );
@@ -648,19 +645,19 @@ void SvtBasePrintOptions::SetReducedBitmapResolution( sal_Int16 nResolution )
m_pDataContainer->SetReducedBitmapResolution( nResolution );
}
-void SvtBasePrintOptions::SetReducedBitmapIncludesTransparency( sal_Bool bState )
+void SvtBasePrintOptions::SetReducedBitmapIncludesTransparency( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetReducedBitmapIncludesTransparency( bState );
}
-void SvtBasePrintOptions::SetConvertToGreyscales( sal_Bool bState )
+void SvtBasePrintOptions::SetConvertToGreyscales( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetConvertToGreyscales( bState );
}
-void SvtBasePrintOptions::SetPDFAsStandardPrintJobFormat( sal_Bool bState )
+void SvtBasePrintOptions::SetPDFAsStandardPrintJobFormat( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetPDFAsStandardPrintJobFormat( bState );
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index d6adef7..90b0477 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -44,7 +44,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
-void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear )
+void ImplFreePrnDlgListBox( ListBox* pBox, bool bClear )
{
if ( bClear )
pBox->Clear();
@@ -245,7 +245,7 @@ PrinterSetupDialog::PrinterSetupDialog(Window* pParent)
PrinterSetupDialog::~PrinterSetupDialog()
{
- ImplFreePrnDlgListBox(m_pLbName, sal_False);
+ ImplFreePrnDlgListBox(m_pLbName, false);
delete mpTempPrinter;
}
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 85c25bc..655c8ed 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -170,19 +170,19 @@ void OpenFileDropTargetListener::implts_EndDrag()
/* } SAFE */
}
-sal_Bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFormat )
+bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFormat )
{
/* SAFE { */
SolarMutexGuard aGuard;
DataFlavorExVector::iterator aIter( m_pFormats->begin() ), aEnd( m_pFormats->end() );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
while ( aIter != aEnd )
{
if ( nFormat == (*aIter++).mnSotId )
{
- bRet = sal_True;
+ bRet = true;
aIter = aEnd;
}
}
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index f1de1c0..7069e4e 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -82,7 +82,7 @@ bool HTMLParser::ParseScriptOptions( OUString& rLangString, const OUString& rBas
return true;
}
-void HTMLParser::RemoveSGMLComment( OUString &rString, sal_Bool bFull )
+void HTMLParser::RemoveSGMLComment( OUString &rString, bool bFull )
{
sal_Unicode c = 0;
while( !rString.isEmpty() &&
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 354a8b7..83d63c3 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -104,7 +104,7 @@ void SwHTMLParser::EndScript()
{
// Fuer JavaScript und StarBasic noch ein Basic-Modul anlegen
// Das Basic entfernt natuerlich weiterhin keine SGML-Kommentare
- RemoveSGMLComment( aScriptSource, sal_True );
+ RemoveSGMLComment( aScriptSource, true );
// get library name
OUString aLibName;
commit b41badb803b4d4597901fdc6c899305f3e914aaa
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 20 16:41:09 2014 +0200
svtools: sal_Bool->bool
Change-Id: I37352e90a5304e75ce0c8ae922a167b1e70625e8
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index a585270..1a868bb 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -41,7 +41,7 @@ void FirebirdTest::setUp()
{
DBTestBase::setUp();
SvtMiscOptions aMiscOptions;
- aMiscOptions.SetExperimentalMode(sal_True);
+ aMiscOptions.SetExperimentalMode(true);
}
/**
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 402dbb2..1220094 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1565,7 +1565,7 @@ int Desktop::Main()
// which does only work for VCL dialogs!!
SvtMiscOptions aMiscOptions;
pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
- aMiscOptions.SetUseSystemFileDialog( sal_False );
+ aMiscOptions.SetUseSystemFileDialog( false );
}
pExecGlobals->bRestartRequested = xRestartManager->isRestartRequested(
diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx
index 43368b4..f970772 100644
--- a/include/svtools/localresaccess.hxx
+++ b/include/svtools/localresaccess.hxx
@@ -60,7 +60,7 @@ namespace svt
FreeResource();
}
- inline sal_Bool IsAvailableRes( const ResId& _rId ) const
+ inline bool IsAvailableRes( const ResId& _rId ) const
{
return Resource::IsAvailableRes( _rId );
}
diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx
index 788dcc2..917915d 100644
--- a/include/svtools/menuoptions.hxx
+++ b/include/svtools/menuoptions.hxx
@@ -87,7 +87,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options
@seealso configuration package "org.openoffice.Office.Common/View/Menu"
*//*-*****************************************************************************************************/
- sal_Bool IsEntryHidingEnabled() const;
+ bool IsEntryHidingEnabled() const;
TriState GetMenuIconsState() const;
void SetMenuIconsState(TriState eState);
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 8d0e1db..e9c6fada6 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -70,16 +70,16 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
SvtMiscOptions();
virtual ~SvtMiscOptions();
- void AddListenerLink( const Link& rLink );
- void RemoveListenerLink( const Link& rLink );
+ void AddListenerLink( const Link& rLink );
+ void RemoveListenerLink( const Link& rLink );
- sal_Bool UseSystemFileDialog() const;
- void SetUseSystemFileDialog( sal_Bool bSet );
- sal_Bool IsUseSystemFileDialogReadOnly() const;
+ bool UseSystemFileDialog() const;
+ void SetUseSystemFileDialog( bool bSet );
+ bool IsUseSystemFileDialogReadOnly() const;
- sal_Bool DisableUICustomization() const;
+ bool DisableUICustomization() const;
- sal_Bool IsPluginsEnabled() const;
+ bool IsPluginsEnabled() const;
sal_Int16 GetSymbolsSize() const;
void SetSymbolsSize( sal_Int16 eSet );
@@ -94,24 +94,24 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
sal_Int16 GetToolboxStyle() const;
void SetToolboxStyle( sal_Int16 nStyle );
- sal_Bool IsModifyByPrinting() const;
- void SetModifyByPrinting(sal_Bool bSet );
+ bool IsModifyByPrinting() const;
+ void SetModifyByPrinting(bool bSet );
- sal_Bool UseSystemPrintDialog() const;
- void SetUseSystemPrintDialog( sal_Bool bSet );
+ bool UseSystemPrintDialog() const;
+ void SetUseSystemPrintDialog( bool bSet );
- sal_Bool ShowLinkWarningDialog() const;
- void SetShowLinkWarningDialog( sal_Bool bSet );
- sal_Bool IsShowLinkWarningDialogReadOnly() const;
+ bool ShowLinkWarningDialog() const;
+ void SetShowLinkWarningDialog( bool bSet );
+ bool IsShowLinkWarningDialogReadOnly() const;
- void SetSaveAlwaysAllowed( sal_Bool bSet );
- sal_Bool IsSaveAlwaysAllowed() const;
+ void SetSaveAlwaysAllowed( bool bSet );
+ bool IsSaveAlwaysAllowed() const;
- void SetExperimentalMode( sal_Bool bSet );
- sal_Bool IsExperimentalMode() const;
+ void SetExperimentalMode( bool bSet );
+ bool IsExperimentalMode() const;
- void SetMacroRecorderMode( sal_Bool bSet );
- sal_Bool IsMacroRecorderMode() const;
+ void SetMacroRecorderMode( bool bSet );
+ bool IsMacroRecorderMode() const;
private:
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 569c2d7..216d53a 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2466,7 +2466,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
aMenu.InsertItem( TBI_SOURCEVIEW, SfxResId(STR_HELP_BUTTON_SOURCEVIEW).toString() );
}
- if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False )
+ if( ! SvtMenuOptions().IsEntryHidingEnabled() )
aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
sal_uInt16 nId = aMenu.Execute( this, aPos );
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 500af44..f4ef62a 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -72,7 +72,7 @@ using namespace com::sun::star;
void TryToHideDisabledEntries_Impl( Menu* pMenu )
{
DBG_ASSERT( pMenu, "invalid menu" );
- if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False )
+ if( ! SvtMenuOptions().IsEntryHidingEnabled() )
{
pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
}
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index f95f0a4..4089969 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -41,8 +41,8 @@ using namespace ::osl ;
using namespace ::com::sun::star::uno ;
#define ROOTNODE_MENU OUString("Office.Common/View/Menu" )
-#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False
-#define DEFAULT_FOLLOWMOUSE sal_True
+#define DEFAULT_DONTHIDEDISABLEDENTRIES false
+#define DEFAULT_FOLLOWMOUSE true
#define DEFAULT_MENUICONS TRISTATE_INDET
#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString("DontHideDisabledEntry" )
@@ -71,8 +71,8 @@ class SvtMenuOptions_Impl : public ConfigItem
private:
::std::list<Link> aList;
- sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
- sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
+ bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
+ bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
TriState m_eMenuIcons ; /// cache "MenuIcons" of Menu section
@@ -143,16 +143,16 @@ class SvtMenuOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- sal_Bool IsEntryHidingEnabled() const
+ bool IsEntryHidingEnabled() const
{ return m_bDontHideDisabledEntries; }
- sal_Bool IsFollowMouseEnabled() const
+ bool IsFollowMouseEnabled() const
{ return m_bFollowMouse; }
TriState GetMenuIconsState() const
{ return m_eMenuIcons; }
- void SetEntryHidingState ( sal_Bool bState )
+ void SetEntryHidingState ( bool bState )
{
m_bDontHideDisabledEntries = bState;
SetModified();
@@ -161,7 +161,7 @@ class SvtMenuOptions_Impl : public ConfigItem
Commit();
}
- void SetFollowMouseState ( sal_Bool bState )
+ void SetFollowMouseState ( bool bState )
{
m_bFollowMouse = bState;
SetModified();
@@ -221,13 +221,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
- sal_Bool bMenuIcons = sal_True;
- sal_Bool bSystemMenuIcons = sal_True;
+ bool bMenuIcons = true;
+ bool bSystemMenuIcons = true;
if (m_eMenuIcons == TRISTATE_INDET)
- bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetPreferredUseImagesInMenus());
+ bMenuIcons = Application::GetSettings().GetStyleSettings().GetPreferredUseImagesInMenus();
else
{
- bSystemMenuIcons = sal_False;
+ bSystemMenuIcons = false;
bMenuIcons = m_eMenuIcons ? sal_True : sal_False;
}
@@ -299,13 +299,13 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
bool bMenuSettingsChanged = false;
- sal_Bool bMenuIcons = sal_True;
- sal_Bool bSystemMenuIcons = sal_True;
+ bool bMenuIcons = true;
+ bool bSystemMenuIcons = true;
if (m_eMenuIcons == TRISTATE_INDET)
- bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
+ bMenuIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
else
{
- bSystemMenuIcons = sal_False;
+ bSystemMenuIcons = false;
bMenuIcons = m_eMenuIcons ? sal_True : sal_False;
}
@@ -468,7 +468,7 @@ SvtMenuOptions::~SvtMenuOptions()
// public method
-sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
+bool SvtMenuOptions::IsEntryHidingEnabled() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsEntryHidingEnabled();
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index c5a2ffa..cd73b51 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -72,24 +72,24 @@ class SvtMiscOptions_Impl : public ConfigItem
{
private:
::std::list<Link> aList;
- sal_Bool m_bUseSystemFileDialog;
- sal_Bool m_bIsUseSystemFileDialogRO;
- sal_Bool m_bPluginsEnabled;
- sal_Bool m_bIsPluginsEnabledRO;
+ bool m_bUseSystemFileDialog;
+ bool m_bIsUseSystemFileDialogRO;
+ bool m_bPluginsEnabled;
+ bool m_bIsPluginsEnabledRO;
sal_Int16 m_nSymbolsSize;
- sal_Bool m_bIsSymbolsSizeRO;
- sal_Bool m_bIsSymbolsStyleRO;
+ bool m_bIsSymbolsSizeRO;
+ bool m_bIsSymbolsStyleRO;
sal_Int16 m_nToolboxStyle;
- sal_Bool m_bIsToolboxStyleRO;
- sal_Bool m_bUseSystemPrintDialog;
- sal_Bool m_bIsUseSystemPrintDialogRO;
- sal_Bool m_bShowLinkWarningDialog;
- sal_Bool m_bIsShowLinkWarningDialogRO;
- sal_Bool m_bDisableUICustomization;
- sal_Bool m_bAlwaysAllowSave;
- sal_Bool m_bExperimentalMode;
- sal_Bool m_bMacroRecorderMode;
- sal_Bool m_bIconThemeWasSetAutomatically;
+ bool m_bIsToolboxStyleRO;
+ bool m_bUseSystemPrintDialog;
+ bool m_bIsUseSystemPrintDialogRO;
+ bool m_bShowLinkWarningDialog;
+ bool m_bIsShowLinkWarningDialogRO;
+ bool m_bDisableUICustomization;
+ bool m_bAlwaysAllowSave;
+ bool m_bExperimentalMode;
+ bool m_bMacroRecorderMode;
+ bool m_bIconThemeWasSetAutomatically;
public:
@@ -137,40 +137,40 @@ class SvtMiscOptions_Impl : public ConfigItem
// public interface
- inline sal_Bool UseSystemFileDialog() const
+ inline bool UseSystemFileDialog() const
{ return m_bUseSystemFileDialog; }
- inline void SetUseSystemFileDialog( sal_Bool bSet )
+ inline void SetUseSystemFileDialog( bool bSet )
{ m_bUseSystemFileDialog = bSet; SetModified(); }
- inline sal_Bool IsUseSystemFileDialogReadOnly() const
+ inline bool IsUseSystemFileDialogReadOnly() const
{ return m_bIsUseSystemFileDialogRO; }
- inline sal_Bool DisableUICustomization() const
+ inline bool DisableUICustomization() const
{ return m_bDisableUICustomization; }
- inline void SetSaveAlwaysAllowed( sal_Bool bSet )
+ inline void SetSaveAlwaysAllowed( bool bSet )
{ m_bAlwaysAllowSave = bSet; SetModified(); }
- inline sal_Bool IsSaveAlwaysAllowed() const
+ inline bool IsSaveAlwaysAllowed() const
{ return m_bAlwaysAllowSave; }
- inline void SetExperimentalMode( sal_Bool bSet )
+ inline void SetExperimentalMode( bool bSet )
{ m_bExperimentalMode = bSet; SetModified(); }
- inline sal_Bool IsExperimentalMode() const
+ inline bool IsExperimentalMode() const
{ return m_bExperimentalMode; }
- inline void SetMacroRecorderMode( sal_Bool bSet )
+ inline void SetMacroRecorderMode( bool bSet )
{ m_bMacroRecorderMode = bSet; SetModified(); }
- inline sal_Bool IsMacroRecorderMode() const
+ inline bool IsMacroRecorderMode() const
{ return m_bMacroRecorderMode; }
- inline sal_Bool IsPluginsEnabled() const
+ inline bool IsPluginsEnabled() const
{ return m_bPluginsEnabled; }
- inline sal_Bool IsPluginsEnabledReadOnly() const
+ inline bool IsPluginsEnabledReadOnly() const
{ return m_bIsPluginsEnabledRO; }
inline sal_Int16 GetSymbolsSize()
@@ -178,7 +178,7 @@ class SvtMiscOptions_Impl : public ConfigItem
void SetSymbolsSize( sal_Int16 nSet );
- inline sal_Bool IsGetSymbolsSizeReadOnly()
+ inline bool IsGetSymbolsSizeReadOnly()
{ return m_bIsSymbolsSizeRO; }
OUString GetIconTheme() const;
@@ -208,7 +208,7 @@ class SvtMiscOptions_Impl : public ConfigItem
*/
void SetIconThemeAutomatically(SetModifiedFlag = SET_MODIFIED);
- inline sal_Bool IsGetSymbolsStyleReadOnly()
+ inline bool IsGetSymbolsStyleReadOnly()
{ return m_bIsSymbolsStyleRO; }
// translate to VCL settings ( "0" = 3D, "1" = FLAT )
@@ -218,25 +218,25 @@ class SvtMiscOptions_Impl : public ConfigItem
// translate from VCL settings
void SetToolboxStyle( sal_Int16 nStyle, bool _bSetModified );
- inline sal_Bool IsGetToolboxStyleReadOnly()
+ inline bool IsGetToolboxStyleReadOnly()
{ return m_bIsToolboxStyleRO; }
- inline sal_Bool UseSystemPrintDialog() const
+ inline bool UseSystemPrintDialog() const
{ return m_bUseSystemPrintDialog; }
- inline void SetUseSystemPrintDialog( sal_Bool bSet )
+ inline void SetUseSystemPrintDialog( bool bSet )
{ m_bUseSystemPrintDialog = bSet; SetModified(); }
- inline sal_Bool IsUseSystemPrintDialogReadOnly() const
+ inline bool IsUseSystemPrintDialogReadOnly() const
{ return m_bIsUseSystemPrintDialogRO; }
- inline sal_Bool ShowLinkWarningDialog() const
+ inline bool ShowLinkWarningDialog() const
{ return m_bShowLinkWarningDialog; }
- void SetShowLinkWarningDialog( sal_Bool bSet )
+ void SetShowLinkWarningDialog( bool bSet )
{ m_bShowLinkWarningDialog = bSet; SetModified(); }
- sal_Bool IsShowLinkWarningDialogReadOnly() const
+ bool IsShowLinkWarningDialogReadOnly() const
{ return m_bIsShowLinkWarningDialogRO; }
void AddListenerLink( const Link& rLink );
@@ -276,23 +276,23 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
// Init baseclasses first
: ConfigItem( ROOTNODE_MISC )
- , m_bUseSystemFileDialog( sal_False )
- , m_bIsUseSystemFileDialogRO( sal_False )
- , m_bPluginsEnabled( sal_False )
- , m_bIsPluginsEnabledRO( sal_False )
+ , m_bUseSystemFileDialog( false )
+ , m_bIsUseSystemFileDialogRO( false )
+ , m_bPluginsEnabled( false )
+ , m_bIsPluginsEnabledRO( false )
, m_nSymbolsSize( 0 )
- , m_bIsSymbolsSizeRO( sal_False )
- , m_bIsSymbolsStyleRO( sal_False )
+ , m_bIsSymbolsSizeRO( false )
+ , m_bIsSymbolsStyleRO( false )
, m_nToolboxStyle( 1 )
- , m_bIsToolboxStyleRO( sal_False )
- , m_bUseSystemPrintDialog( sal_False )
- , m_bIsUseSystemPrintDialogRO( sal_False )
- , m_bShowLinkWarningDialog( sal_True )
- , m_bIsShowLinkWarningDialogRO( sal_False )
- , m_bAlwaysAllowSave( sal_False )
- , m_bExperimentalMode( sal_False )
- , m_bMacroRecorderMode( sal_False )
- , m_bIconThemeWasSetAutomatically( sal_False )
+ , m_bIsToolboxStyleRO( false )
+ , m_bUseSystemPrintDialog( false )
+ , m_bIsUseSystemPrintDialogRO( false )
+ , m_bShowLinkWarningDialog( true )
+ , m_bIsShowLinkWarningDialogRO( false )
+ , m_bAlwaysAllowSave( false )
+ , m_bExperimentalMode( false )
+ , m_bMacroRecorderMode( false )
+ , m_bIconThemeWasSetAutomatically( false )
{
// Use our static list of configuration keys to get his values.
Sequence< OUString > seqNames = GetPropertyNames ( );
@@ -776,22 +776,22 @@ SvtMiscOptions::~SvtMiscOptions()
}
}
-sal_Bool SvtMiscOptions::UseSystemFileDialog() const
+bool SvtMiscOptions::UseSystemFileDialog() const
{
return m_pDataContainer->UseSystemFileDialog();
}
-void SvtMiscOptions::SetUseSystemFileDialog( sal_Bool bEnable )
+void SvtMiscOptions::SetUseSystemFileDialog( bool bEnable )
{
m_pDataContainer->SetUseSystemFileDialog( bEnable );
}
-sal_Bool SvtMiscOptions::IsUseSystemFileDialogReadOnly() const
+bool SvtMiscOptions::IsUseSystemFileDialogReadOnly() const
{
return m_pDataContainer->IsUseSystemFileDialogReadOnly();
}
-sal_Bool SvtMiscOptions::IsPluginsEnabled() const
+bool SvtMiscOptions::IsPluginsEnabled() const
{
return m_pDataContainer->IsPluginsEnabled();
}
@@ -839,7 +839,7 @@ void SvtMiscOptions::SetIconTheme(const OUString& iconTheme)
m_pDataContainer->SetIconTheme(iconTheme);
}
-sal_Bool SvtMiscOptions::DisableUICustomization() const
+bool SvtMiscOptions::DisableUICustomization() const
{
return m_pDataContainer->DisableUICustomization();
}
@@ -854,57 +854,57 @@ void SvtMiscOptions::SetToolboxStyle( sal_Int16 nStyle )
m_pDataContainer->SetToolboxStyle( nStyle, true );
}
-sal_Bool SvtMiscOptions::UseSystemPrintDialog() const
+bool SvtMiscOptions::UseSystemPrintDialog() const
{
return m_pDataContainer->UseSystemPrintDialog();
}
-void SvtMiscOptions::SetUseSystemPrintDialog( sal_Bool bEnable )
+void SvtMiscOptions::SetUseSystemPrintDialog( bool bEnable )
{
m_pDataContainer->SetUseSystemPrintDialog( bEnable );
}
-sal_Bool SvtMiscOptions::ShowLinkWarningDialog() const
+bool SvtMiscOptions::ShowLinkWarningDialog() const
{
return m_pDataContainer->ShowLinkWarningDialog();
}
-void SvtMiscOptions::SetShowLinkWarningDialog( sal_Bool bSet )
+void SvtMiscOptions::SetShowLinkWarningDialog( bool bSet )
{
m_pDataContainer->SetShowLinkWarningDialog( bSet );
}
-sal_Bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const
+bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const
{
return m_pDataContainer->IsShowLinkWarningDialogReadOnly();
}
-void SvtMiscOptions::SetSaveAlwaysAllowed( sal_Bool bSet )
+void SvtMiscOptions::SetSaveAlwaysAllowed( bool bSet )
{
m_pDataContainer->SetSaveAlwaysAllowed( bSet );
}
-sal_Bool SvtMiscOptions::IsSaveAlwaysAllowed() const
+bool SvtMiscOptions::IsSaveAlwaysAllowed() const
{
return m_pDataContainer->IsSaveAlwaysAllowed();
}
-void SvtMiscOptions::SetExperimentalMode( sal_Bool bSet )
+void SvtMiscOptions::SetExperimentalMode( bool bSet )
{
m_pDataContainer->SetExperimentalMode( bSet );
}
-sal_Bool SvtMiscOptions::IsExperimentalMode() const
+bool SvtMiscOptions::IsExperimentalMode() const
{
return m_pDataContainer->IsExperimentalMode();
}
-void SvtMiscOptions::SetMacroRecorderMode( sal_Bool bSet )
+void SvtMiscOptions::SetMacroRecorderMode( bool bSet )
{
m_pDataContainer->SetMacroRecorderMode( bSet );
}
-sal_Bool SvtMiscOptions::IsMacroRecorderMode() const
+bool SvtMiscOptions::IsMacroRecorderMode() const
{
return m_pDataContainer->IsMacroRecorderMode();
}
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index e46ebfc..1f223ce 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -32,7 +32,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString& _rF
// load state of "warning on" checkbox from misc options
SvtMiscOptions aMiscOpt;
- m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() == sal_True );
+ m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() );
if( aMiscOpt.IsShowLinkWarningDialogReadOnly() )
m_pWarningOnBox->Disable();
}
@@ -41,7 +41,7 @@ SvxLinkWarningDialog::~SvxLinkWarningDialog()
{
// save value of "warning off" checkbox, if necessary
SvtMiscOptions aMiscOpt;
- sal_Bool bChecked = m_pWarningOnBox->IsChecked();
+ bool bChecked = m_pWarningOnBox->IsChecked();
if ( aMiscOpt.ShowLinkWarningDialog() != bChecked )
aMiscOpt.SetShowLinkWarningDialog( bChecked );
}
commit f7074d8de59f58367b31d7266037880403ac27ef
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 20 16:07:35 2014 +0200
svtools: sal_Bool->bool
Change-Id: I2044e6c1f15579b6051fad5d36fcfa8795f88953
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 447fefb..8c901d4 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -222,7 +222,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
SetCtrlPos ( meChoicePos );
maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
maIconCtrl.Show();
- maIconCtrl.SetChoiceWithCursor ( sal_True );
+ maIconCtrl.SetChoiceWithCursor ( true );
maIconCtrl.SetSelectionMode( SINGLE_SELECTION );
maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL );
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index ad6f505..62afddd 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -56,7 +56,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
- SetChoiceWithCursor( sal_True );
+ SetChoiceWithCursor( true );
SetSelectionMode(SINGLE_SELECTION);
}
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 2bc796a..2ff7d55 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -154,9 +154,9 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
INetURLObject aObject( pBox->GetViewURL() );
sal_Int32 nCount = aObject.getSegmentCount();
- ::svtools::VolumeInfo aVolInfo( sal_True /* volume */, sal_False /* remote */,
- sal_False /* removable */, sal_False /* floppy */,
- sal_False /* compact disk */ );
+ ::svtools::VolumeInfo aVolInfo( true /* volume */, false /* remote */,
+ false /* removable */, false /* floppy */,
+ false /* compact disk */ );
Image aVolumeImage( SvFileInformationManager::GetFolderImage( aVolInfo ) );
while ( nCount >= 1 )
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 59735a0..2df6463 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -33,24 +33,24 @@ namespace svtools {
struct VolumeInfo
{
- sal_Bool m_bIsVolume;
- sal_Bool m_bIsRemote;
- sal_Bool m_bIsRemoveable;
- sal_Bool m_bIsFloppy;
- sal_Bool m_bIsCompactDisc;
+ bool m_bIsVolume;
+ bool m_bIsRemote;
+ bool m_bIsRemoveable;
+ bool m_bIsFloppy;
+ bool m_bIsCompactDisc;
VolumeInfo() :
- m_bIsVolume ( sal_False ),
- m_bIsRemote ( sal_False ),
- m_bIsRemoveable ( sal_False ),
- m_bIsFloppy ( sal_False ),
- m_bIsCompactDisc( sal_False ) {}
+ m_bIsVolume ( false ),
+ m_bIsRemote ( false ),
+ m_bIsRemoveable ( false ),
+ m_bIsFloppy ( false ),
+ m_bIsCompactDisc( false ) {}
- VolumeInfo( sal_Bool _bIsVolume,
- sal_Bool _bIsRemote,
- sal_Bool _bIsRemoveable,
- sal_Bool _bIsFloppy,
- sal_Bool _bIsCompactDisc ) :
+ VolumeInfo( bool _bIsVolume,
+ bool _bIsRemote,
+ bool _bIsRemoveable,
+ bool _bIsFloppy,
+ bool _bIsCompactDisc ) :
m_bIsVolume ( _bIsVolume ),
m_bIsRemote ( _bIsRemote ),
m_bIsRemoveable ( _bIsRemoveable ),
@@ -63,13 +63,13 @@ struct VolumeInfo
class SvFileInformationManager
{
private:
- SVT_DLLPRIVATE static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder );
+ SVT_DLLPRIVATE static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder );
public:
- SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False );
- SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False );
+ SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, bool bBig = false );
+ SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, bool bBig = false );
+ SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, bool bBig = false );
+ SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, bool bBig = false );
SVT_DLLPUBLIC static rtl::OUString GetDescription( const INetURLObject& rObject );
SVT_DLLPUBLIC static rtl::OUString GetFileDescription( const INetURLObject& rObject );
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index f421b2f..951251d 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -79,8 +79,8 @@ public:
ImageMap& operator=( const ImageMap& rImageMap );
// Vergleichsoperator (es wird alles auf Gleichheit geprueft)
- sal_Bool operator==( const ImageMap& rImageMap );
- sal_Bool operator!=( const ImageMap& rImageMap );
+ bool operator==( const ImageMap& rImageMap );
+ bool operator!=( const ImageMap& rImageMap );
// In die Map wird ein neues IMap-Obkekt ans Ende eingefuegt
void InsertIMapObject( const IMapObject& rIMapObject );
@@ -137,7 +137,7 @@ class IMapCompat
IMapCompat() {}
IMapCompat( const IMapCompat& ) {}
IMapCompat& operator=( const IMapCompat& ) { return *this; }
- sal_Bool operator==( const IMapCompat& ) { return sal_False; }
+ bool operator==( const IMapCompat& ) { return false; }
public:
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index ef39268..1750dc7 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -30,7 +30,7 @@ class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
Point aCenter;
sal_Int32 nRadius;
- void ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel );
+ void ImpConstruct( const Point& rCenter, sal_uLong nRad, bool bPixel );
protected:
@@ -47,15 +47,15 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive = sal_True,
- sal_Bool bPixelCoords = sal_True );
+ bool bActive = true,
+ bool bPixelCoords = true );
virtual ~IMapCircleObject() {};
- virtual sal_uInt16 GetType() const;
- virtual sal_Bool IsHit( const Point& rPoint ) const;
+ virtual sal_uInt16 GetType() const;
+ virtual bool IsHit( const Point& rPoint ) const;
- Point GetCenter( sal_Bool bPixelCoords = sal_True ) const;
- sal_uLong GetRadius( sal_Bool bPixelCoords = sal_True ) const;
+ Point GetCenter( bool bPixelCoords = true ) const;
+ sal_uLong GetRadius( bool bPixelCoords = true ) const;
// liefert das BoundRect des Kreis-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const;
@@ -63,7 +63,7 @@ public:
void Scale( const Fraction& rFractX, const Fraction& rFracY );
using IMapObject::IsEqual;
- sal_Bool IsEqual( const IMapCircleObject& rEqObj );
+ bool IsEqual( const IMapCircleObject& rEqObj );
// Im-/Export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index f04cbb7..9c0f73b 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -59,7 +59,7 @@ class SVT_DLLPUBLIC IMapObject
OUString aTarget;
OUString aName;
SvxMacroTableDtor aEventList;
- sal_Bool bActive;
+ bool bActive;
protected:
sal_uInt16 nReadVersion;
@@ -84,12 +84,12 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive );
+ bool bActive );
virtual ~IMapObject() {};
virtual sal_uInt16 GetVersion() const;
virtual sal_uInt16 GetType() const = 0;
- virtual sal_Bool IsHit( const Point& rPoint ) const = 0;
+ virtual bool IsHit( const Point& rPoint ) const = 0;
void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
void Read( SvStream& rIStm, const OUString& rBaseURL );
@@ -111,22 +111,22 @@ public:
const OUString& GetName() const { return aName; }
void SetName( const OUString& rName ) { aName = rName; }
- sal_Bool IsActive() const { return bActive; }
- void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; }
+ bool IsActive() const { return bActive; }
+ void SetActive( bool bSetActive = true ) { bActive = bSetActive; }
- sal_Bool IsEqual( const IMapObject& rEqObj );
+ bool IsEqual( const IMapObject& rEqObj );
// IMap-Events
inline const SvxMacroTableDtor& GetMacroTable() const { return aEventList;}
inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aEventList = rTbl; }
inline const SvxMacro& GetEvent( sal_uInt16 nEvent ) const;
- inline sal_Bool HasEvent( sal_uInt16 nEvent ) const;
+ inline bool HasEvent( sal_uInt16 nEvent ) const;
void SetEvent( sal_uInt16 nEvent, const SvxMacro& );
- inline sal_Bool DelEvent( sal_uInt16 nEvent );
+ inline bool DelEvent( sal_uInt16 nEvent );
};
-inline sal_Bool IMapObject::HasEvent( sal_uInt16 nEvent ) const
+inline bool IMapObject::HasEvent( sal_uInt16 nEvent ) const
{
return aEventList.IsKeyValid( nEvent );
}
@@ -134,7 +134,7 @@ inline const SvxMacro& IMapObject::GetEvent( sal_uInt16 nEvent ) const
{
return *(aEventList.Get( nEvent ));
}
-inline sal_Bool IMapObject::DelEvent( sal_uInt16 nEvent )
+inline bool IMapObject::DelEvent( sal_uInt16 nEvent )
{
return aEventList.Erase( nEvent );
}
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index 24f8a14..5c7615e 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -30,9 +30,9 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
{
Polygon aPoly;
Rectangle aEllipse;
- sal_Bool bEllipse;
+ bool bEllipse;
- SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, sal_Bool bPixel );
+ SVT_DLLPRIVATE void ImpConstruct( const Polygon& rPoly, bool bPixel );
protected:
@@ -40,7 +40,7 @@ protected:
virtual void WriteIMapObject( SvStream& rOStm ) const;
virtual void ReadIMapObject( SvStream& rIStm );
- sal_Bool ReadPreProLine( SvStream& rIStm, OUString& rStr );
+ bool ReadPreProLine( SvStream& rIStm, OUString& rStr );
public:
IMapPolygonObject() {};
@@ -50,26 +50,26 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive = sal_True,
- sal_Bool bPixelCoords = sal_True );
+ bool bActive = true,
+ bool bPixelCoords = true );
virtual ~IMapPolygonObject() {};
virtual sal_uInt16 GetType() const;
- virtual sal_Bool IsHit( const Point& rPoint ) const;
+ virtual bool IsHit( const Point& rPoint ) const;
- Polygon GetPolygon( sal_Bool bPixelCoords = sal_True ) const;
+ Polygon GetPolygon( bool bPixelCoords = true ) const;
// liefert das BoundRect des Polygon-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const { return aPoly.GetBoundRect(); }
- sal_Bool HasExtraEllipse() const { return bEllipse; }
+ bool HasExtraEllipse() const { return bEllipse; }
const Rectangle& GetExtraEllipse() const { return aEllipse; }
void SetExtraEllipse( const Rectangle& rEllipse );
void Scale( const Fraction& rFractX, const Fraction& rFracY );
using IMapObject::IsEqual;
- sal_Bool IsEqual( const IMapPolygonObject& rEqObj );
+ bool IsEqual( const IMapPolygonObject& rEqObj );
// Im-/Export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index 35cf320..7210626 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -29,7 +29,7 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
{
Rectangle aRect;
- SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, sal_Bool bPixel );
+ SVT_DLLPRIVATE void ImpConstruct( const Rectangle& rRect, bool bPixel );
protected:
@@ -46,14 +46,14 @@ public:
const OUString& rDesc,
const OUString& rTarget,
const OUString& rName,
- sal_Bool bActive = sal_True,
- sal_Bool bPixelCoords = sal_True );
+ bool bActive = true,
+ bool bPixelCoords = true );
virtual ~IMapRectangleObject() {};
- virtual sal_uInt16 GetType() const;
- virtual sal_Bool IsHit( const Point& rPoint ) const;
+ virtual sal_uInt16 GetType() const;
+ virtual bool IsHit( const Point& rPoint ) const;
- Rectangle GetRectangle( sal_Bool bPixelCoords = sal_True ) const;
+ Rectangle GetRectangle( bool bPixelCoords = true ) const;
// liefert das BoundRect des Rechteck-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const { return aRect; }
@@ -61,7 +61,7 @@ public:
void Scale( const Fraction& rFractX, const Fraction& rFracY );
using IMapObject::IsEqual;
- sal_Bool IsEqual( const IMapRectangleObject& rEqObj );
+ bool IsEqual( const IMapRectangleObject& rEqObj );
// Im-/Export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index f9b86f1..1f5274e 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -67,8 +67,8 @@ public:
const Size& GetSizePixel() const { return aSizePixel; }
// Im-/Export
- sal_Bool Write( SvStream& rOStm, sal_uLong nFormat ) const;
- sal_Bool Read( SvStream& rIStm, sal_uLong nFormat );
+ bool Write( SvStream& rOStm, sal_uLong nFormat ) const;
+ bool Read( SvStream& rIStm, sal_uLong nFormat );
};
#endif // INCLUDED_SVTOOLS_INETIMG_HXX
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 0ee7b10..0d14ba1 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -38,17 +38,17 @@ friend class SvtURLBox_Impl;
rtl::Reference< SvtMatchContext_Impl > pCtx;
SvtURLBox_Impl* pImp;
INetProtocol eSmartProtocol;
- sal_Bool bAutoCompleteMode : 1;
- sal_Bool bOnlyDirectories : 1;
- sal_Bool bCtrlClick : 1;
- sal_Bool bHistoryDisabled : 1;
- sal_Bool bNoSelection : 1;
- sal_Bool bIsAutoCompleteEnabled : 1;
+ bool bAutoCompleteMode : 1;
+ bool bOnlyDirectories : 1;
+ bool bCtrlClick : 1;
+ bool bHistoryDisabled : 1;
+ bool bNoSelection : 1;
+ bool bIsAutoCompleteEnabled : 1;
- SVT_DLLPRIVATE sal_Bool ProcessKey( const KeyCode& rCode );
- SVT_DLLPRIVATE void TryAutoComplete();
- SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
- DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
+ SVT_DLLPRIVATE bool ProcessKey( const KeyCode& rCode );
+ SVT_DLLPRIVATE void TryAutoComplete();
+ SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
+ DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, void* );
SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID);
protected:
@@ -67,11 +67,11 @@ public:
const OUString& GetBaseURL() const { return aBaseURL; }
void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
const Link& GetOpenHdl() const { return aOpenHdl; }
- void SetOnlyDirectories( sal_Bool bDir = sal_True );
- void SetNoURLSelection( sal_Bool bSet = sal_True );
+ void SetOnlyDirectories( bool bDir = true );
+ void SetNoURLSelection( bool bSet = true );
INetProtocol GetSmartProtocol() const { return eSmartProtocol; }
void SetSmartProtocol( INetProtocol eProt );
- sal_Bool IsCtrlOpen()
+ bool IsCtrlOpen()
{ return bCtrlClick; }
OUString GetURL();
void DisableHistory();
@@ -82,7 +82,7 @@ public:
void SetFilter(const OUString& _sFilter);
- inline void EnableAutocompletion( sal_Bool _bEnable = sal_True )
+ inline void EnableAutocompletion( bool _bEnable = true )
{ bIsAutoCompleteEnabled = _bEnable; }
void SetPlaceHolder( const OUString& sPlaceHolder )
{ aPlaceHolder = sPlaceHolder; }
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 763b4ef..7bdfe48 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -71,7 +71,7 @@ class SVT_DLLPUBLIC SvPasteObjectHelper
{
public:
static OUString GetSotFormatUIName( SotFormatStringId nId );
- static sal_Bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat);
+ static bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat);
};
#endif // INCLUDED_SVTOOLS_INSDLG_HXX
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index e2b2c97..82ee158 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -125,18 +125,18 @@ public:
const Rectangle & GetBoundRect() const { return aRect; }
- void SetFocus ( sal_Bool bSet )
+ void SetFocus ( bool bSet )
{ nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); }
- SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; }
- sal_uInt16 GetFlags() const { return nFlags; }
- sal_Bool IsSelected() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); }
- sal_Bool IsFocused() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); }
- sal_Bool IsInUse() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); }
- sal_Bool IsCursored() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); }
- sal_Bool IsDropTarget() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
- sal_Bool IsBlockingEmphasis() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
- sal_Bool IsPosLocked() const { return (sal_Bool)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
+ SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; }
+ sal_uInt16 GetFlags() const { return nFlags; }
+ bool IsSelected() const { return ((nFlags & ICNVIEW_FLAG_SELECTED) !=0); }
+ bool IsFocused() const { return ((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); }
+ bool IsInUse() const { return ((nFlags & ICNVIEW_FLAG_IN_USE) !=0); }
+ bool IsCursored() const { return ((nFlags & ICNVIEW_FLAG_CURSORED) !=0); }
+ bool IsDropTarget() const { return ((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); }
+ bool IsBlockingEmphasis() const { return ((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); }
+ bool IsPosLocked() const { return ((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); }
// Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead
SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; }
@@ -225,15 +225,15 @@ class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control
Link _aVisRectChangedHdl;
KeyEvent* _pCurKeyEvent;
SvxIconChoiceCtrl_Impl* _pImp;
- sal_Bool _bAutoFontColor;
+ bool _bAutoFontColor;
protected:
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual sal_Bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, sal_Bool bCancelled );
+ virtual bool EditedEntry( SvxIconChoiceCtrlEntry*, const OUString& rNewText, bool bCancelled );
virtual void DocumentRectChanged();
virtual void VisibleRectChanged();
- virtual sal_Bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
+ virtual bool EditingEntry( SvxIconChoiceCtrlEntry* pEntry );
virtual void Command( const CommandEvent& rCEvt );
virtual void Paint( const Rectangle& rRect );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -253,7 +253,7 @@ protected:
OUString GetEntryText(
SvxIconChoiceCtrlEntry* pEntry,
- sal_Bool bInplaceEdit );
+ bool bInplaceEdit );
virtual void FillLayoutData() const;
@@ -267,7 +267,7 @@ public:
void SetStyle( WinBits nWinStyle );
WinBits GetStyle() const;
- sal_Bool SetChoiceWithCursor ( sal_Bool bDo = sal_True );
+ bool SetChoiceWithCursor ( bool bDo = true );
void SetFont( const Font& rFont );
void SetPointFont( const Font& rFont );
@@ -301,9 +301,9 @@ public:
*/
void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics );
- sal_Bool DoKeyInput( const KeyEvent& rKEvt );
+ bool DoKeyInput( const KeyEvent& rKEvt );
- sal_Bool IsEntryEditing() const;
+ bool IsEntryEditing() const;
sal_uLong GetEntryCount() const;
SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const;
@@ -317,7 +317,7 @@ public:
// bHit==sal_False: Eintrag gilt als getroffen, wenn Position im BoundRect liegt
// ==sal_True : Bitmap oder Text muss getroffen sein
- SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, sal_Bool bHit = sal_False ) const;
+ SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, bool bHit = false ) const;
// in dem sal_uLong wird die Position in der Liste des gefunden Eintrags zurueckgegeben
SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uLong& rPos ) const;
@@ -326,13 +326,13 @@ public:
void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 );
#endif
- virtual sal_Bool HasBackground() const;
- virtual sal_Bool HasFont() const;
- virtual sal_Bool HasFontTextColor() const;
- virtual sal_Bool HasFontFillColor() const;
+ virtual bool HasBackground() const;
+ virtual bool HasFont() const;
+ virtual bool HasFontTextColor() const;
+ virtual bool HasFontFillColor() const;
- void SetFontColorToBackground ( sal_Bool bDo = sal_True ) { _bAutoFontColor = bDo; }
- sal_Bool AutoFontColor () { return _bAutoFontColor; }
+ void SetFontColorToBackground ( bool bDo = true ) { _bAutoFontColor = bDo; }
+ bool AutoFontColor () { return _bAutoFontColor; }
Point GetPixelPos( const Point& rPosLogic ) const;
void SetSelectionMode( SelectionMode eMode );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4c1b055..1ac8533 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1056,7 +1056,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
aURL.SetSmartProtocol( INET_PROT_FILE );
aURL.SetSmartURL( aFactory);
const OUString& rMainURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
- Image aImage = SvFileInformationManager::GetImage( aURL, sal_True );
+ Image aImage = SvFileInformationManager::GetImage( aURL, true );
if ( GetDPIScaleFactor() > 1)
{
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index b40e892..b27663e 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -372,7 +372,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
if ( !bImageSet && !aCmd.isEmpty() )
{
Image aImage = SvFileInformationManager::GetImage(
- INetURLObject(aCmd), sal_False );
+ INetURLObject(aCmd), false );
if ( !!aImage )
pActMenu->SetItemImage( nItemId, aImage );
}
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 4986350..a3d15ba 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2151,10 +2151,10 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
::svtools::VolumeInfo aVolInfo( (*aIt)->mbIsVolume, (*aIt)->mbIsRemote,
(*aIt)->mbIsRemoveable, (*aIt)->mbIsFloppy,
(*aIt)->mbIsCompactDisc );
- (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
+ (*aIt)->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, false );
}
else
- (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), sal_False );
+ (*aIt)->maImage = SvFileInformationManager::GetFileImage( INetURLObject( (*aIt)->maTargetURL ), false );
}
}
@@ -2240,7 +2240,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
if( aValue != SEPARATOR_STR )
{
INetURLObject aObj( !pEntry->maImageURL.isEmpty() ? pEntry->maImageURL : pEntry->maTargetURL );
- pEntry->maImage = SvFileInformationManager::GetImage( aObj, sal_False );
+ pEntry->maImage = SvFileInformationManager::GetImage( aObj, false );
}
maContent.push_back( pEntry );
}
@@ -2448,7 +2448,7 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString&
::svtools::VolumeInfo aVolInfo;
pData->maType = SvFileInformationManager::GetFolderDescription( aVolInfo );
- pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, sal_False );
+ pData->maImage = SvFileInformationManager::GetFolderImage( aVolInfo, false );
OUString aValue;
OUString aTab( "\t" );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 690e9e4..87c8c24 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -386,7 +386,7 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, sal_Bo
nFlags &= ~F_CLEARING_SELECTION;
}
}
- if( pEntry->IsSelected() != bSelect )
+ if( (pEntry->IsSelected() ? 1 : 0) != bSelect )
{
pHdlEntry = pEntry;
sal_uInt16 nEntryFlags = pEntry->GetFlags();
@@ -1672,7 +1672,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect,
{
OUString aText;
if( !pStr )
- aText = pView->GetEntryText( pEntry, sal_False );
+ aText = pView->GetEntryText( pEntry, false );
else
aText = *pStr;
@@ -1788,7 +1788,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P
}
*/
- OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) );
+ OUString aEntryText( pView->GetEntryText( pEntry, false ) );
Rectangle aTextRect( CalcTextRect(pEntry,&rPos,sal_False,&aEntryText));
Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) );
@@ -3197,7 +3197,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry )
SetNoSelection();
pCurEditedEntry = pEntry;
- OUString aEntryText( pView->GetEntryText( pEntry, sal_True ) );
+ OUString aEntryText( pView->GetEntryText( pEntry, true ) );
Rectangle aRect( CalcTextRect( pEntry, 0, sal_True, &aEntryText ) );
MakeVisible( aRect );
Point aPos( aRect.TopLeft() );
@@ -3672,7 +3672,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
return sal_False;
OUString sQuickHelpText = pEntry->GetQuickHelpText();
- OUString aEntryText( pView->GetEntryText( pEntry, sal_False ) );
+ OUString aEntryText( pView->GetEntryText( pEntry, false ) );
Rectangle aTextRect( CalcTextRect( pEntry, 0, sal_False, &aEntryText ) );
if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
return sal_False;
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index e7992a5..0035f80 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -77,7 +77,7 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) :
_pCurKeyEvent ( NULL ),
_pImp ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ),
- _bAutoFontColor ( sal_False )
+ _bAutoFontColor ( false )
{
SetLineColor();
@@ -101,14 +101,14 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const OUString& rText, c
return pEntry;
}
-sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, sal_Bool )
+bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const OUString&, bool )
{
- return sal_True;
+ return true;
}
-sal_Bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
+bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
{
- return sal_True;
+ return true;
}
void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev )
@@ -116,29 +116,29 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
rDev.DrawImage( rPos, pEntry->GetImage() );
}
-OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool )
{
return pEntry->GetText();
}
-sal_Bool SvtIconChoiceCtrl::HasBackground() const
+bool SvtIconChoiceCtrl::HasBackground() const
{
- return sal_False;
+ return false;
}
-sal_Bool SvtIconChoiceCtrl::HasFont() const
+bool SvtIconChoiceCtrl::HasFont() const
{
- return sal_False;
+ return false;
}
-sal_Bool SvtIconChoiceCtrl::HasFontTextColor() const
+bool SvtIconChoiceCtrl::HasFontTextColor() const
{
- return sal_True;
+ return true;
}
-sal_Bool SvtIconChoiceCtrl::HasFontFillColor() const
+bool SvtIconChoiceCtrl::HasFontFillColor() const
{
- return sal_True;
+ return true;
}
void SvtIconChoiceCtrl::Paint( const Rectangle& rRect )
@@ -178,7 +178,7 @@ void SvtIconChoiceCtrl::ArrangeIcons()
aFullSize.setWidth ( aFullSize.getWidth()+aEntryRect.GetWidth() );
}
- _pImp->Arrange ( sal_False, aFullSize.getWidth() );
+ _pImp->Arrange ( false, aFullSize.getWidth() );
}
else if ( GetStyle() & WB_ALIGN_LEFT )
{
@@ -193,13 +193,13 @@ void SvtIconChoiceCtrl::ArrangeIcons()
aFullSize.setHeight ( aFullSize.getHeight()+aEntryRect.GetHeight() );
}
- _pImp->Arrange ( sal_False, 0, aFullSize.getHeight() );
+ _pImp->Arrange ( false, 0, aFullSize.getHeight() );
}
else
{
_pImp->Arrange();
}
- _pImp->Arrange( sal_False, 0, 1000 );
+ _pImp->Arrange( false, 0, 1000 );
}
void SvtIconChoiceCtrl::Resize()
{
@@ -257,7 +257,7 @@ void SvtIconChoiceCtrl::SetPointFont( const Font& rFont )
_pImp->FontModified();
}
}
-SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, sal_Bool bHit ) const
+SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( const Point& rPixPos, bool bHit ) const
{
Point aPos( rPixPos );
aPos -= GetMapMode().GetOrigin();
@@ -316,19 +316,19 @@ void SvtIconChoiceCtrl::ClickIcon()
GetSelectedEntry ( nPos );
_aClickIconHdl.Call( this );
}
-sal_Bool SvtIconChoiceCtrl::IsEntryEditing() const
+bool SvtIconChoiceCtrl::IsEntryEditing() const
{
return _pImp->IsEntryEditing();
}
-sal_Bool SvtIconChoiceCtrl::SetChoiceWithCursor ( sal_Bool bDo )
+bool SvtIconChoiceCtrl::SetChoiceWithCursor ( bool bDo )
{
return _pImp->SetChoiceWithCursor (bDo);
}
void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
{
- sal_Bool bKeyUsed = DoKeyInput( rKEvt );
+ bool bKeyUsed = DoKeyInput( rKEvt );
if ( !bKeyUsed )
{
_pCurKeyEvent = (KeyEvent*)&rKEvt;
@@ -336,13 +336,13 @@ void SvtIconChoiceCtrl::KeyInput( const KeyEvent& rKEvt )
_pCurKeyEvent = NULL;
}
}
-sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
+bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt )
{
// under OS/2, we get key up/down even while editing
if( IsEntryEditing() )
- return sal_True;
+ return true;
_pCurKeyEvent = (KeyEvent*)&rKEvt;
- sal_Bool bHandled = _pImp->KeyInput( rKEvt );
+ bool bHandled = _pImp->KeyInput( rKEvt );
_pCurKeyEvent = NULL;
return bHandled;
}
@@ -463,9 +463,9 @@ void SvtIconChoiceCtrl::FillLayoutData() const
Point aPos = _pImp->GetEntryBoundRect( pEntry ).TopLeft();
OUString sEntryText = pEntry->GetDisplayText( );
- Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, sal_False, &sEntryText );
+ Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, false, &sEntryText );
- sal_Bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
+ bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
_pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, GetLayoutData() );
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 5032b0c..39d6a82 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -167,7 +167,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) :
aIconCtrl.SetAccessibleName( OUString( "Groups" ) );
aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL );
- aIconCtrl.SetChoiceWithCursor( sal_True );
+ aIconCtrl.SetChoiceWithCursor( true );
aIconCtrl.SetSelectionMode( SINGLE_SELECTION );
aIconCtrl.Show();
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 5a2e8b8..34d55e1 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -81,7 +81,7 @@ public:
std::vector<OUString> aCompletions;
std::vector<WildCard> m_aFilters;
- static sal_Bool TildeParsing( OUString& aText, OUString& aBaseUrl );
+ static bool TildeParsing( OUString& aText, OUString& aBaseUrl );
inline SvtURLBox_Impl( )
{
@@ -100,8 +100,8 @@ class SvtMatchContext_Impl: public salhelper::Thread
OUString aBaseURL;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list