[Libreoffice-commits] core.git: 17 commits - cui/source dbaccess/source editeng/source filter/qa filter/source forms/source include/dbaccess include/filter include/oox include/package include/sfx2 include/svl include/svtools include/svx include/vbahelper include/vcl oox/source package/source reportdesign/source sc/source sd/source sfx2/source svl/source svtools/source svx/source sw/inc sw/source toolkit/source vbahelper/source vcl/source
Noel Grandin
noel at peralex.com
Thu Apr 3 00:19:31 PDT 2014
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/tabpages/numpages.cxx | 12
cui/source/tabpages/page.cxx | 4
dbaccess/source/ui/app/AppController.cxx | 50 -
dbaccess/source/ui/app/AppController.hxx | 8
dbaccess/source/ui/app/AppControllerDnD.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 32 -
dbaccess/source/ui/browser/genericcontroller.cxx | 52 -
dbaccess/source/ui/browser/unodatbr.cxx | 10
dbaccess/source/ui/inc/JoinController.hxx | 2
dbaccess/source/ui/inc/RelationController.hxx | 2
dbaccess/source/ui/inc/TableController.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 2
dbaccess/source/ui/inc/querycontroller.hxx | 4
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 40 -
dbaccess/source/ui/querydesign/JoinController.cxx | 4
dbaccess/source/ui/querydesign/querycontroller.cxx | 20
dbaccess/source/ui/relationdesign/RelationController.cxx | 6
dbaccess/source/ui/tabledesign/TableController.cxx | 8
editeng/source/rtf/rtfitem.cxx | 4
editeng/source/uno/unofdesc.cxx | 14
filter/qa/cppunit/filters-pict-test.cxx | 6
filter/qa/cppunit/filters-tga-test.cxx | 6
filter/qa/cppunit/filters-tiff-test.cxx | 6
filter/source/graphicfilter/egif/egif.cxx | 5
filter/source/graphicfilter/eos2met/eos2met.cxx | 4
filter/source/graphicfilter/epbm/epbm.cxx | 4
filter/source/graphicfilter/epgm/epgm.cxx | 4
filter/source/graphicfilter/epict/epict.cxx | 4
filter/source/graphicfilter/eppm/eppm.cxx | 4
filter/source/graphicfilter/eps/eps.cxx | 4
filter/source/graphicfilter/eras/eras.cxx | 4
filter/source/graphicfilter/etiff/etiff.cxx | 4
filter/source/graphicfilter/expm/expm.cxx | 4
filter/source/graphicfilter/idxf/idxf.cxx | 12
filter/source/graphicfilter/ieps/ieps.cxx | 6
filter/source/graphicfilter/ios2met/ios2met.cxx | 4
filter/source/graphicfilter/ipbm/ipbm.cxx | 4
filter/source/graphicfilter/ipcd/ipcd.cxx | 4
filter/source/graphicfilter/ipcx/ipcx.cxx | 4
filter/source/graphicfilter/ipict/ipict.cxx | 4
filter/source/graphicfilter/ipsd/ipsd.cxx | 4
filter/source/graphicfilter/iras/iras.cxx | 4
filter/source/graphicfilter/itga/itga.cxx | 4
filter/source/graphicfilter/itiff/itiff.cxx | 17
filter/source/msfilter/dffpropset.cxx | 10
filter/source/msfilter/escherex.cxx | 424 +++++++--------
filter/source/msfilter/eschesdo.cxx | 62 +-
filter/source/msfilter/mscodec.cxx | 12
filter/source/msfilter/msdffimp.cxx | 152 ++---
filter/source/msfilter/msvbahelper.cxx | 8
filter/source/msfilter/svdfppt.cxx | 338 +++++------
filter/source/msfilter/svxmsbas2.cxx | 2
filter/source/xsltfilter/OleHandler.cxx | 4
forms/source/solar/component/navbarcontrol.cxx | 2
include/dbaccess/IController.hxx | 6
include/dbaccess/dbsubcomponentcontroller.hxx | 18
include/dbaccess/genericcontroller.hxx | 36 -
include/filter/msfilter/dffpropset.hxx | 10
include/filter/msfilter/escherex.hxx | 294 +++++-----
include/filter/msfilter/mscodec.hxx | 4
include/filter/msfilter/msdffimp.hxx | 108 +--
include/filter/msfilter/msvbahelper.hxx | 2
include/filter/msfilter/svdfppt.hxx | 130 ++--
include/filter/msfilter/svxmsbas.hxx | 2
include/oox/drawingml/clrscheme.hxx | 4
include/oox/drawingml/customshapeproperties.hxx | 24
include/oox/drawingml/shape.hxx | 28
include/oox/drawingml/table/tablecell.hxx | 18
include/oox/drawingml/table/tableproperties.hxx | 34 -
include/oox/drawingml/table/tablestylepart.hxx | 8
include/oox/drawingml/textparagraphproperties.hxx | 2
include/oox/export/chartexport.hxx | 16
include/oox/export/drawingml.hxx | 12
include/oox/export/shapes.hxx | 4
include/oox/export/vmlexport.hxx | 4
include/oox/ppt/headerfooter.hxx | 16
include/oox/ppt/pptshape.hxx | 6
include/oox/ppt/presentationfragmenthandler.hxx | 2
include/oox/ppt/slidepersist.hxx | 10
include/oox/ppt/slidetransition.hxx | 12
include/oox/ppt/slidetransitioncontext.hxx | 2
include/oox/vml/vmlshape.hxx | 4
include/package/Deflater.hxx | 14
include/package/Inflater.hxx | 8
include/sfx2/dispatch.hxx | 2
include/sfx2/objface.hxx | 10
include/sfx2/shell.hxx | 6
include/sfx2/tbxctrl.hxx | 12
include/svl/itemprop.hxx | 2
include/svl/itemset.hxx | 16
include/svtools/treelistentry.hxx | 10
include/svx/fmgridcl.hxx | 2
include/svx/fmtools.hxx | 26
include/svx/fmview.hxx | 4
include/svx/fontworkgallery.hxx | 4
include/svx/formatpaintbrushctrl.hxx | 4
include/svx/galbrws.hxx | 2
include/svx/svdcrtv.hxx | 2
include/svx/svdedxv.hxx | 10
include/svx/svdmrkv.hxx | 2
include/svx/svdpntv.hxx | 10
include/svx/svdview.hxx | 10
include/svx/tbcontrl.hxx | 3
include/svx/tbxctl.hxx | 3
include/svx/tbxcustomshapes.hxx | 3
include/vbahelper/vbacollectionimpl.hxx | 6
include/vbahelper/vbahelper.hxx | 14
include/vcl/fltcall.hxx | 12
include/vcl/gdimtf.hxx | 2
include/vcl/window.hxx | 2
oox/source/drawingml/clrscheme.cxx | 8
oox/source/drawingml/customshapegeometry.cxx | 4
oox/source/drawingml/customshapeproperties.cxx | 6
oox/source/drawingml/shape.cxx | 10
oox/source/drawingml/table/tablecell.cxx | 6
oox/source/drawingml/table/tableproperties.cxx | 22
oox/source/drawingml/textfield.cxx | 2
oox/source/drawingml/textparagraph.cxx | 2
oox/source/drawingml/textparagraphproperties.cxx | 2
oox/source/export/chartexport.cxx | 26
oox/source/export/drawingml.cxx | 58 +-
oox/source/export/shapes.cxx | 44 -
oox/source/export/vmlexport.cxx | 6
oox/source/ppt/pptgraphicshapecontext.cxx | 2
oox/source/ppt/pptshape.cxx | 2
oox/source/ppt/pptshapecontext.cxx | 2
oox/source/ppt/presentationfragmenthandler.cxx | 14
oox/source/ppt/slidefragmenthandler.cxx | 2
oox/source/ppt/slidepersist.cxx | 2
oox/source/ppt/slidetransition.cxx | 4
oox/source/ppt/slidetransitioncontext.cxx | 2
oox/source/vml/vmlshape.cxx | 4
oox/source/vml/vmlshapecontext.cxx | 2
package/source/zipapi/Deflater.cxx | 30 -
package/source/zipapi/Inflater.cxx | 16
package/source/zipapi/XUnbufferedStream.cxx | 4
package/source/zipapi/ZipFile.cxx | 6
package/source/zipapi/ZipOutputStream.cxx | 2
reportdesign/source/ui/inc/ReportController.hxx | 2
reportdesign/source/ui/report/ReportController.cxx | 36 -
sc/source/filter/excel/expop2.cxx | 2
sc/source/filter/excel/xiescher.cxx | 2
sc/source/filter/xcl97/xcl97esc.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/ui/drawfunc/fupoor.cxx | 2
sc/source/ui/navipi/content.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 2
sc/source/ui/vba/vbaformat.cxx | 4
sc/source/ui/vba/vbarange.cxx | 2
sc/source/ui/vba/vbawindow.cxx | 10
sd/source/filter/eppt/eppt.cxx | 6
sd/source/filter/eppt/epptso.cxx | 96 +--
sd/source/filter/eppt/escherex.cxx | 9
sd/source/filter/ppt/pptin.cxx | 18
sd/source/ui/dlg/sdtreelb.cxx | 24
sfx2/source/control/objface.cxx | 40 -
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/toolbox/tbxitem.cxx | 15
svl/source/items/itemprop.cxx | 6
svl/source/items/itemset.cxx | 32 -
svl/source/items/sitem.cxx | 4
svl/source/items/stylepool.cxx | 2
svtools/source/table/tablecontrol_impl.cxx | 2
svx/source/customshapes/tbxcustomshapes.cxx | 2
svx/source/dialog/hdft.cxx | 4
svx/source/engine3d/float3d.cxx | 4
svx/source/fmcomp/fmgridcl.cxx | 6
svx/source/fmcomp/gridcell.cxx | 8
svx/source/fmcomp/gridctrl.cxx | 4
svx/source/form/fmview.cxx | 10
svx/source/form/tbxform.cxx | 4
svx/source/gallery2/galbrws.cxx | 4
svx/source/inc/tbxform.hxx | 3
svx/source/sdr/properties/attributeproperties.cxx | 2
svx/source/sdr/properties/defaultproperties.cxx | 2
svx/source/sdr/properties/e3dsceneproperties.cxx | 4
svx/source/sdr/properties/groupproperties.cxx | 2
svx/source/svdraw/svdcrtv.cxx | 2
svx/source/svdraw/svdedxv.cxx | 10
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdpntv.cxx | 4
svx/source/svdraw/svdview.cxx | 30 -
svx/source/table/tablecontroller.cxx | 4
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/formatpaintbrushctrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/tbxctrls/tbxdrctl.cxx | 2
sw/inc/swatrset.hxx | 2
sw/source/core/attr/swatrset.cxx | 2
sw/source/core/doc/doclay.cxx | 4
sw/source/core/docnode/node.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 2
sw/source/core/txtnode/swfntcch.cxx | 2
sw/source/core/txtnode/thints.cxx | 4
sw/source/core/txtnode/txtedt.cxx | 4
sw/source/core/uibase/docvw/edtwin.cxx | 2
sw/source/core/uibase/shells/annotsh.cxx | 2
sw/source/core/uibase/shells/drwtxtex.cxx | 2
sw/source/core/uibase/shells/frmsh.cxx | 2
sw/source/core/uibase/shells/textsh.cxx | 6
sw/source/core/uibase/shells/textsh1.cxx | 2
sw/source/core/uibase/shells/txtattr.cxx | 6
sw/source/core/uibase/uiview/viewtab.cxx | 2
sw/source/core/uibase/uno/unotxdoc.cxx | 12
sw/source/core/uibase/utlui/content.cxx | 4
sw/source/core/undo/unattr.cxx | 6
sw/source/core/unocore/unoobj.cxx | 2
sw/source/filter/basflt/fltini.cxx | 2
sw/source/filter/html/css1atr.cxx | 10
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 4
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 12
sw/source/filter/ww8/ww8par.cxx | 12
sw/source/filter/ww8/ww8par.hxx | 4
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 6
sw/source/ui/vba/vbasystem.cxx | 8
toolkit/source/awt/vclxwindow.cxx | 6
toolkit/source/awt/vclxwindows.cxx | 2
vbahelper/source/vbahelper/vbahelper.cxx | 16
vbahelper/source/vbahelper/vbashapes.cxx | 2
vcl/source/filter/graphicfilter.cxx | 50 -
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/window/window.cxx | 8
227 files changed, 1681 insertions(+), 1715 deletions(-)
New commits:
commit a718b02f8e24d7c167a56456523bc921b12e4f64
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 3 09:13:34 2014 +0200
vcl: sal_Bool->bool and cleanup
- remove unused PFilterDlgCall typedef
- remove bool parameter from PFilterCall typedef - it was always being
called with false, and nothing was reading it
Change-Id: Ic56127e7d55254a7b9b65849a21cb286f52344d1
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index 913f8f9..7ba0145 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -18,9 +18,9 @@
extern "C"
{
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+ SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
- FilterConfigItem*, sal_Bool);
+ FilterConfigItem*);
}
using namespace ::com::sun::star;
@@ -54,7 +54,7 @@ bool PictFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, STREAM_READ);
Graphic aGraphic;
- return GraphicImport(aFileStream, aGraphic, NULL, 0);
+ return GraphicImport(aFileStream, aGraphic, NULL);
}
void PictFilterTest::testCVEs()
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index 37cdd21..615afbb 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -18,9 +18,9 @@
extern "C"
{
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+ SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
- FilterConfigItem*, sal_Bool);
+ FilterConfigItem*);
}
using namespace ::com::sun::star;
@@ -54,7 +54,7 @@ bool TgaFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, STREAM_READ);
Graphic aGraphic;
- return GraphicImport(aFileStream, aGraphic, NULL, 0);
+ return GraphicImport(aFileStream, aGraphic, NULL);
}
void TgaFilterTest::testCVEs()
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx
index 82b0a17..a37ed17 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -18,9 +18,9 @@
extern "C"
{
- SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+ SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport(SvStream & rStream, Graphic & rGraphic,
- FilterConfigItem*, sal_Bool);
+ FilterConfigItem*);
}
using namespace ::com::sun::star;
@@ -54,7 +54,7 @@ bool TiffFilterTest::load(const OUString &,
{
SvFileStream aFileStream(rURL, STREAM_READ);
Graphic aGraphic;
- return GraphicImport(aFileStream, aGraphic, NULL, 0);
+ return GraphicImport(aFileStream, aGraphic, NULL);
}
void TiffFilterTest::testCVEs()
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index df402c7..120f7a1 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -565,9 +565,8 @@ void GIFWriter::WriteTerminator()
#define GraphicExport egiGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport( SvStream& rStream, Graphic& rGraphic,
- FilterConfigItem* pConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem )
{
GIFWriter aWriter(rStream);
return aWriter.WriteGIF(rGraphic, pConfigItem);
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 04b7cba..44df91f 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -2577,8 +2577,8 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream,
#define GraphicExport emeGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool )
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
METWriter aMETWriter;
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index f77a0d6..833dd03 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -196,8 +196,8 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
#define GraphicExport epbGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
PBMWriter aPBMWriter(rStream);
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 5c151be..47c20d9 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -220,8 +220,8 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
#define GraphicExport epgGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
PGMWriter aPGMWriter(rStream);
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index a241382..cdb5d347 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2263,8 +2263,8 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea
#define GraphicExport eptGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
PictWriter aPictWriter;
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index fcb75e9..015d5b1 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -229,8 +229,8 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
#define GraphicExport eppGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
PPMWriter aPPMWriter(rStream);
return aPPMWriter.WritePPM( rGraphic, pFilterConfigItem );
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index d443bba..a385f18 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2866,8 +2866,8 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL
#define GraphicExport epsGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem )
{
PSWriter aPSWriter;
return aPSWriter.WritePS( rGraphic, rStream, pFilterConfigItem );
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index bf738a3..a7827ee 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -276,8 +276,8 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis )
#define GraphicExport eraGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
RASWriter aRASWriter(rStream);
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index e32b5a9..cad7c60 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -599,8 +599,8 @@ void TIFFWriter::EndCompression()
#define GraphicExport etiGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
TIFFWriter aWriter(rStream);
return aWriter.WriteTIFF( rGraphic, pFilterConfigItem );
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index fdd13b6..57a37da 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -254,8 +254,8 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber )
#define GraphicExport expGraphicExport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
{
XPMWriter aXPMWriter(rStream);
diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx
index 1a42be5..8ef33f3 100644
--- a/filter/source/graphicfilter/idxf/idxf.cxx
+++ b/filter/source/graphicfilter/idxf/idxf.cxx
@@ -36,20 +36,20 @@ class FilterConfigItem;
#define GraphicImport idxGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
DXFRepresentation aDXF;
DXF2GDIMetaFile aConverter;
GDIMetaFile aMTF;
if ( aDXF.Read( rStream, 0, 60 ) == sal_False )
- return sal_False;
+ return false;
if ( aConverter.Convert( aDXF, aMTF, 60, 100 ) == sal_False )
- return sal_False;
- rGraphic=Graphic(aMTF);
+ return false;
+ rGraphic = Graphic(aMTF);
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index fee898d..c01feba 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -480,11 +480,11 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
#define GraphicImport ipsGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
if ( rStream.GetError() )
- return sal_False;
+ return false;
Graphic aGraphic;
sal_Bool bRetValue = sal_False;
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index bb265fb..e9435de 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2719,8 +2719,8 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
#define GraphicImport imeGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
OS2METReader aOS2METReader;
GDIMetaFile aMTF;
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index a314f2b..f091ff9 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -527,8 +527,8 @@ sal_Bool PBMReader::ImplReadBody()
#define GraphicImport ipbGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PBMReader aPBMReader(rStream);
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 3f56bff..af591c2 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -374,8 +374,8 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
#define GraphicImport icdGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem )
{
PCDReader aPCDReader(rStream);
return aPCDReader.ReadPCD(rGraphic, pConfigItem);
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index c8e1e96..5984987 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -403,8 +403,8 @@ void PCXReader::ImplReadPalette( sal_uLong nCol )
#define GraphicImport ipxGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PCXReader aPCXReader(rStream);
sal_Bool nRetValue = aPCXReader.ReadPCX(rGraphic);
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 0730d4f..acf4b02 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1880,8 +1880,8 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
#define GraphicImport iptGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem* )
{
GDIMetaFile aMTF;
PictReader aPictReader;
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 7848463..f3b4f89 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -726,8 +726,8 @@ sal_Bool PSDReader::ImplReadBody()
#define GraphicImport ipdGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PSDReader aPSDReader(rStream);
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 101aab4..0d26b51 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -343,8 +343,8 @@ sal_uInt8 RASReader::ImplGetByte()
#define GraphicImport iraGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
RASReader aRASReader(rStream);
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index b03ca79..c2eb2c7 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -798,8 +798,8 @@ sal_Bool TGAReader::ImplReadPalette()
#define GraphicImport itgGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
TGAReader aTGAReader(rStream);
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index c274468..3444418 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -176,7 +176,7 @@ public:
delete pAlphaMask;
}
- sal_Bool ReadTIFF( SvStream & rTIFF, Graphic & rGraphic );
+ bool ReadTIFF( SvStream & rTIFF, Graphic & rGraphic );
};
//=================== Methods of TIFFReader ==============================
@@ -1154,7 +1154,7 @@ bool TIFFReader::HasAlphaChannel() const
-sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
+bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
{
sal_uInt16 i, nNumTags, nTagType;
sal_uInt64 nMaxPos;
@@ -1394,10 +1394,10 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
else
rGraphic = aAnimation; //aBitmap;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
@@ -1410,15 +1410,12 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
#define GraphicImport itiGraphicImport
#endif
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
-GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, sal_Bool)
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
+GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
TIFFReader aTIFFReader;
- if ( aTIFFReader.ReadTIFF( rStream, rGraphic ) == sal_False )
- return sal_False;
-
- return sal_True;
+ return aTIFFReader.ReadTIFF( rStream, rGraphic );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index b3f9814..bc87587 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -261,7 +261,7 @@ namespace frm
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetButtonRepeat( 10 );
aSettings.SetMouseSettings( aMouseSettings );
- pNavBar->SetSettings( aSettings, sal_True );
+ pNavBar->SetSettings( aSettings, true );
// outta here
return pPeer;
diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx
index c65cd4c..ca64e68 100644
--- a/include/vcl/fltcall.hxx
+++ b/include/vcl/fltcall.hxx
@@ -47,21 +47,13 @@ struct FltCallDialogParameter
eFieldUnit ( eFiUni ) {};
};
-typedef sal_Bool (*PFilterCall)(SvStream & rStream, Graphic & rGraphic,
- FilterConfigItem* pConfigItem, sal_Bool bPrefDialog);
+typedef bool (*PFilterCall)(SvStream & rStream, Graphic & rGraphic,
+ FilterConfigItem* pConfigItem);
// Of this type are both export-filter and import-filter functions
// rFileName is the complete path to the file to be imported or exported
// pCallBack can be NULL. pCallerData is handed to the callback function
// pOptionsConfig can be NULL; if not, the group of the config is already set
// and may not be changed by this filter!
- // If bPrefDialog==sal_True, a Preferences-Dialog might be called
-
-typedef sal_Bool ( *PFilterDlgCall )( FltCallDialogParameter& );
- // Of this type are both export-filter and import-filter functions
- // hands a pointer to the parent window and to the options config
- // pOptions and pWindow can be NULL; in this case sal_False is returned,
- // otherwise the group of the config is already set
- // and may not be changed by this filter!
#endif
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 4abf32d..0e22e98 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -117,7 +117,7 @@ private:
protected:
- virtual void Linker( OutputDevice* pOut, sal_Bool bLink );
+ virtual void Linker( OutputDevice* pOut, bool bLink );
virtual long Hook();
public:
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a527a8f..786cd0d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -699,7 +699,7 @@ public:
using OutputDevice::SetSettings;
virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE;
- virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild );
+ virtual void SetSettings( const AllSettings& rSettings, bool bChild );
void UpdateSettings( const AllSettings& rSettings, bool bChild = false );
void NotifyAllChildren( DataChangedEvent& rDCEvt );
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 9ee8e21..748e59a 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -840,7 +840,7 @@ namespace svt { namespace table
aMouseSettings.SetButtonRepeat( _nDelay );
aSettings.SetMouseSettings( aMouseSettings );
- _rWindow.SetSettings( aSettings, sal_True );
+ _rWindow.SetSettings( aSettings, true );
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 8527e85..28ba501 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -907,7 +907,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetWheelBehavior( nVclSetting );
aSettings.SetMouseSettings( aMouseSettings );
- m_pWindow->SetSettings( aSettings, sal_True );
+ m_pWindow->SetSettings( aSettings, true );
}
}
catch( const Exception& )
@@ -2522,7 +2522,7 @@ void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
aStyleSettings.SetSelectionOptions(
aStyleSettings.GetSelectionOptions() | SELECTION_OPTION_SHOWFIRST);
aSettings.SetStyleSettings(aStyleSettings);
- m_pWindow->SetSettings(aSettings, sal_True);
+ m_pWindow->SetSettings(aSettings, true);
// some initial properties
Reference< XPropertySet > xModel(m_rColumn.getModel());
@@ -2835,7 +2835,7 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::
aStyleSettings.SetSelectionOptions(
aStyleSettings.GetSelectionOptions() | SELECTION_OPTION_SHOWFIRST);
aSettings.SetStyleSettings(aStyleSettings);
- m_pWindow->SetSettings(aSettings, sal_True);
+ m_pWindow->SetSettings(aSettings, true);
if (!m_bFilterList)
{
@@ -2856,7 +2856,7 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::
aStyleSettings.SetSelectionOptions(
aStyleSettings.GetSelectionOptions() | SELECTION_OPTION_SHOWFIRST);
aSettings.SetStyleSettings(aStyleSettings);
- m_pWindow->SetSettings(aSettings, sal_True);
+ m_pWindow->SetSettings(aSettings, true);
}
}
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 03b322f..db4c119 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -383,8 +383,8 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle)
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
aSettings.SetMouseSettings(aMouseSettings);
- m_aNextBtn.SetSettings(aSettings, sal_True);
- m_aPrevBtn.SetSettings(aSettings, sal_True);
+ m_aNextBtn.SetSettings(aSettings, true);
+ m_aPrevBtn.SetSettings(aSettings, true);
m_aFirstBtn.Show();
m_aPrevBtn.Show();
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index ff2ab01..a301843 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -423,7 +423,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
aSettings.SetMouseSettings(aMouseSettings);
- rTbx.SetSettings(aSettings, sal_True);
+ rTbx.SetSettings(aSettings, true);
}
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 8eaef89..82ce136 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1267,7 +1267,7 @@ namespace toolkit
(aStyleSettings.*pSetter)( Color( nColor ) );
aSettings.SetStyleSettings( aStyleSettings );
- _pWindow->SetSettings( aSettings, sal_True );
+ _pWindow->SetSettings( aSettings, true );
}
}
@@ -1441,7 +1441,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
aMouseSettings.SetWheelBehavior( nVclBehavior );
aSettings.SetMouseSettings( aMouseSettings );
- pWindow->SetSettings( aSettings, sal_True );
+ pWindow->SetSettings( aSettings, true );
}
break;
@@ -1884,7 +1884,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
aMouseSettings.SetButtonRepeat( nRepeatDelay );
aSettings.SetMouseSettings( aMouseSettings );
- pWindow->SetSettings( aSettings, sal_True );
+ pWindow->SetSettings( aSettings, true );
}
}
break;
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 60f9ed4..da62c96 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -145,7 +145,7 @@ namespace toolkit
}
aSettings.SetStyleSettings( aStyleSettings );
- _pWindow->SetSettings( aSettings, sal_True );
+ _pWindow->SetSettings( aSettings, true );
}
Any getButtonLikeFaceColor( const Window* _pWindow )
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index d0e639a..8d80854 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -941,7 +941,6 @@ struct ImpFilterLibCacheEntry
#endif
OUString maFiltername;
PFilterCall mpfnImport;
- PFilterDlgCall mpfnImportDlg;
ImpFilterLibCacheEntry( const OUString& rPathname, const OUString& rFiltername );
bool operator==( const OUString& rFiltername ) const { return maFiltername == rFiltername; }
@@ -955,8 +954,7 @@ ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const OUString& rPathname, const
maLibrary ( rPathname ),
#endif
maFiltername ( rFiltername ),
- mpfnImport ( NULL ),
- mpfnImportDlg ( NULL )
+ mpfnImport ( NULL )
{
#ifdef DISABLE_DYNLOADING
(void) rPathname;
@@ -965,17 +963,17 @@ ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const OUString& rPathname, const
#ifdef DISABLE_DYNLOADING
-extern "C" sal_Bool icdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool idxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool imeGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool ipbGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool ipdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool ipsGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool iptGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool ipxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool iraGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool itgGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool itiGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
+extern "C" bool icdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool idxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool imeGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool ipbGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool ipdGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool ipsGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool iptGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool ipxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool iraGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool itgGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool itiGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
#endif
@@ -1717,7 +1715,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
pFilterConfigItem = new FilterConfigItem( aFilterConfigPath );
}
}
- if( !(*pFunc)( rIStream, rGraphic, pFilterConfigItem, sal_False ) )
+ if( !(*pFunc)( rIStream, rGraphic, pFilterConfigItem ) )
nStatus = GRFILTER_FORMATERROR;
else
{
@@ -1820,16 +1818,16 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
#ifndef DISABLE_EXPORT
-extern "C" sal_Bool egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool emeGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool epbGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool epgGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool eppGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool epsGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool eptGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool eraGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
-extern "C" sal_Bool expGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem, sal_Bool );
+extern "C" bool egiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool emeGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool epbGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool epgGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool eppGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool epsGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool eptGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool eraGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool etiGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
+extern "C" bool expGraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem );
#endif
@@ -2140,7 +2138,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
#endif
if( pFunc )
{
- if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem, false ) )
+ if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem ) )
nStatus = GRFILTER_FORMATERROR;
break;
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 797f14a..7aee9fa 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -261,7 +261,7 @@ void GDIMetaFile::Clear()
aList.clear();
}
-void GDIMetaFile::Linker( OutputDevice* pOut, sal_Bool bLink )
+void GDIMetaFile::Linker( OutputDevice* pOut, bool bLink )
{
if( bLink )
{
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 787d153..0596e0c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5530,18 +5530,18 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe
void Window::SetSettings( const AllSettings& rSettings )
{
- SetSettings( rSettings, sal_False );
+ SetSettings( rSettings, false );
}
-void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
+void Window::SetSettings( const AllSettings& rSettings, bool bChild )
{
if ( mpWindowImpl->mpBorderWindow )
{
- mpWindowImpl->mpBorderWindow->SetSettings( rSettings, sal_False );
+ mpWindowImpl->mpBorderWindow->SetSettings( rSettings, false );
if ( (mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) &&
((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow )
- ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->SetSettings( rSettings, sal_True );
+ ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->SetSettings( rSettings, true );
}
AllSettings aOldSettings(*mxSettings);
commit c3a89936abc7967ebe8916ca83cb38f6837f9aa1
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 2 15:18:03 2014 +0200
sfx2/tbxctrl.hxx: sal_Bool->bool
and clean up the mess around the two different Select methods
which just led to confusion in the overriding classes.
Change-Id: Iea0ea85752180d0dc50d2b4ddb3d861e8447fb0a
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 906d227..8dfe773 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -195,8 +195,7 @@ protected:
// old SfxToolBoxControl methods
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
- virtual void Select( bool bMod1 = false );
- virtual void Select( sal_uInt16 nModifier );
+ virtual void Select( sal_uInt16 nSelectModifier );
virtual void DoubleClick();
virtual void Click();
@@ -311,8 +310,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox );
virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
- using SfxToolBoxControl::Select;
- virtual void Select( bool bMod1 = false ) SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
};
@@ -341,8 +339,7 @@ protected:
class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl
{
protected:
- using SfxToolBoxControl::Select;
- virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -365,8 +362,7 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl
protected:
virtual void Click() SAL_OVERRIDE;
- using SfxToolBoxControl::Select;
- virtual void Select( bool ) SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE;
DECL_LINK( Activate, Menu * );
public:
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index a635aed..fba83a0 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -50,14 +50,12 @@ namespace svx
class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
{
- using SfxToolBoxControl::Select;
-
public:
SFX_DECL_TOOLBOX_CONTROL();
FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~FontWorkShapeTypeControl();
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
};
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index 5e7bc7c..d5d47c0 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -37,8 +37,6 @@ namespace svx
class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
{
- using SfxToolBoxControl::Select;
-
public:
SFX_DECL_TOOLBOX_CONTROL();
FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
@@ -46,7 +44,7 @@ public:
virtual void DoubleClick() SAL_OVERRIDE;
virtual void Click() SAL_OVERRIDE;
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 8254825..94868ea 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -266,7 +266,6 @@ public:
class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl
{
using SfxToolBoxControl::StateChanged;
- using SfxToolBoxControl::Select;
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
@@ -281,7 +280,7 @@ public:
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
- virtual void Select( bool bMod1 = false ) SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
};
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index 2be7c75..d15a53e 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -36,7 +36,6 @@ private:
void toggleToolbox();
protected:
- using SfxToolBoxControl::Select;
public:
SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
@@ -44,7 +43,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- virtual void Select( bool bMod1 = false ) SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index 5aee5c4..0948f16 100644
--- a/include/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
@@ -31,8 +31,7 @@
class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
{
public:
- using SfxToolBoxControl::Select;
- virtual void Select( bool bMod1 = false ) SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 866a3bc..957a335 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -188,7 +188,6 @@ struct SfxToolBoxControl_Impl
{
ToolBox* pBox;
bool bShowString;
- sal_uInt16 nSelectModifier;
SfxTbxCtrlFactory* pFact;
sal_uInt16 nTbxId;
sal_uInt16 nSlotId;
@@ -231,7 +230,6 @@ SfxToolBoxControl::SfxToolBoxControl(
pImpl->pBox = &rBox;
pImpl->bShowString = bShowStringItems;
- pImpl->nSelectModifier = 0;
pImpl->pFact = 0;
pImpl->nTbxId = nID;
pImpl->nSlotId = nSlotID;
@@ -627,6 +625,7 @@ void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::
SolarMutexGuard aGuard;
Select( (sal_uInt16)KeyModifier );
}
+
void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -969,17 +968,9 @@ void SfxToolBoxControl::StateChanged
-void SfxToolBoxControl::Select( sal_uInt16 nModifier )
-{
- pImpl->nSelectModifier = nModifier;
- Select( (nModifier & KEY_MOD1) != 0 );
-}
-
-
-
-void SfxToolBoxControl::Select( bool /*bMod1*/ )
+void SfxToolBoxControl::Select( sal_uInt16 nSelectModifier )
{
- svt::ToolboxController::execute( pImpl->nSelectModifier );
+ svt::ToolboxController::execute( nSelectModifier );
}
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index be13fd2..16d5afa 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -128,7 +128,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
-void SvxTbxCtlCustomShapes::Select( bool /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select(sal_uInt16 /*nSelectModifier*/)
{
if ( !m_aCommand.isEmpty() )
{
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 9573de5..ff2ab01 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -221,7 +221,7 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
}
-void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
+void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nSelectModifier*/ )
{
// Click auf den Button SID_FM_CONFIG in der ObjectBar
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index dad0950..60e622d 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -64,7 +64,6 @@ private:
sal_uInt16 nLastSlot;
protected:
- using SfxToolBoxControl::Select;
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -72,7 +71,7 @@ public:
SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxFmTbxCtlConfig() {}
- virtual void Select( sal_uInt16 nModifier ) SAL_OVERRIDE;
+ virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index a64036d..601c118 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -293,7 +293,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
-void FontWorkShapeTypeControl::Select( sal_Bool )
+void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/)
{
}
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index caaf1b0..0f0b04e 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -93,7 +93,7 @@ IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl)
}
-void FormatPaintBrushToolBoxControl::Select( sal_Bool )
+void FormatPaintBrushToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
{
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index db32999..5571771 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2585,7 +2585,7 @@ void SvxColorExtToolBoxControl::StateChanged(
-void SvxColorExtToolBoxControl::Select( bool )
+void SvxColorExtToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
{
OUString aCommand;
OUString aParamName;
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 84ed883..30bd2b3 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -101,7 +101,7 @@ void SvxTbxCtlDraw::toggleToolbox()
-void SvxTbxCtlDraw::Select( bool )
+void SvxTbxCtlDraw::Select(sal_uInt16 /*nSelectModifier*/)
{
toggleToolbox();
}
commit 508cbb96a17bb085d162e0d605010af3123abe62
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 2 14:10:41 2014 +0200
svx/fmgridcl.hxx: sal_Bool->bool
Change-Id: I610c408178f194db2a29e966feccba377f36e2cd
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 4b6c116..8af1bd4 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -120,7 +120,7 @@ public:
void positioned(const ::com::sun::star::lang::EventObject& rEvent);
// XBound
- sal_Bool commit();
+ bool commit();
// ::com::sun::star::form::XInsertListener
void inserted(const ::com::sun::star::lang::EventObject& rEvent);
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index db0e85b..42e3133 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1385,7 +1385,7 @@ void FmGridControl::positioned(const ::com::sun::star::lang::EventObject& /*rEve
implAdjustInSolarThread(false);
}
-sal_Bool FmGridControl::commit()
+bool FmGridControl::commit()
{
// Commit nur ausfuehren, wenn nicht bereits ein Update vom ::com::sun::star::form::component::GridControl ausgefuehrt
// wird
@@ -1394,10 +1394,10 @@ sal_Bool FmGridControl::commit()
if (Controller().Is() && Controller()->IsModified())
{
if (!SaveModified())
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
void FmGridControl::inserted(const ::com::sun::star::lang::EventObject& /*rEvent*/)
commit 64825d26b14e754171426bec634f5aaedf0466e2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 2 13:25:30 2014 +0200
svtools/treelistentry.hxx: sal_Bool->bool
Change-Id: I0fb2827c41024216f574266e61a11b1cbb7bce28
diff --git a/include/svtools/treelistentry.hxx b/include/svtools/treelistentry.hxx
index c457d20..d5cdf05 100644
--- a/include/svtools/treelistentry.hxx
+++ b/include/svtools/treelistentry.hxx
@@ -53,9 +53,9 @@ class SVT_DLLPUBLIC SvTreeListEntry
sal_uLong nAbsPos;
sal_uLong nListPos;
ItemsType maItems;
- sal_Bool bIsMarked;
- void* pUserData;
- sal_uInt16 nEntryFlags;
+ bool bIsMarked;
+ void* pUserData;
+ sal_uInt16 nEntryFlags;
private:
void ClearChildren();
@@ -99,8 +99,8 @@ public:
sal_uInt16 GetFlags() const;
void SetFlags( sal_uInt16 nFlags );
- sal_Bool GetIsMarked() const { return bIsMarked; }
- void SetMarked( sal_Bool IsMarked ) { bIsMarked = IsMarked; }
+ bool GetIsMarked() const { return bIsMarked; }
+ void SetMarked( bool IsMarked ) { bIsMarked = IsMarked; }
};
#endif
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 095c1a6..caa8a54 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -967,7 +967,7 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType )
{
SvTreeListEntry* pChild=InsertEntry( aName, pParent );
if(pChild)
- pChild->SetMarked( sal_False);
+ pChild->SetMarked(false);
Window* pWindow=NULL;
ScTabViewShell* pScTabViewShell=NULL;
ScDrawView* pScDrawView=NULL;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 2209ad2..3282ba2 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -357,7 +357,7 @@ void SdPageObjsTLB::MarkCurEntry( const OUString& rName )
if( aTmp1 != aTmp2)
{
// IA2 CWS. MT: Removed in SvTreeListEntry for now - only used in Sw/Sd/ScContentLBoxString, they should decide if they need this
- pEntry->SetMarked(sal_False);
+ pEntry->SetMarked(false);
}
}
}
@@ -368,11 +368,11 @@ void SdPageObjsTLB::MarkCurEntry( const OUString& rName )
aTmp2 = GetEntryText( pEntry );
if( aTmp2 == rName)
{
- pEntry->SetMarked(sal_True);
+ pEntry->SetMarked(true);
}
else
{
- pEntry->SetMarked(sal_False);
+ pEntry->SetMarked(false);
}
}
}
@@ -385,7 +385,7 @@ void SdPageObjsTLB:: FreshCurEntry()
SvTreeListEntry* pEntry =NULL;
for( pEntry = First(); pEntry ; pEntry = Next( pEntry ) )
{
- pEntry->SetMarked(sal_False);
+ pEntry->SetMarked(false);
}
Invalidate();
}
@@ -651,9 +651,9 @@ void SdPageObjsTLB::AddShapeList (
if(pEntry)
{
if(bMarked)
- pEntry->SetMarked(sal_True);
+ pEntry->SetMarked(true);
else
- pEntry->SetMarked( sal_False );
+ pEntry->SetMarked(false);
}
}
while( aIter.IsMore() )
@@ -694,9 +694,9 @@ void SdPageObjsTLB::AddShapeList (
if(pNewEntry)
{
if(bMarked)
- pNewEntry->SetMarked(sal_True);
+ pNewEntry->SetMarked(true);
else
- pNewEntry->SetMarked( sal_False );
+ pNewEntry->SetMarked(false);
}
}
}
@@ -729,11 +729,11 @@ void SdPageObjsTLB::AddShapeList (
{
if(bMarked)
{
- pNewEntry->SetMarked(sal_True);
+ pNewEntry->SetMarked(true);
}
else
{
- pNewEntry->SetMarked( sal_False );
+ pNewEntry->SetMarked(false);
}
}
}
@@ -778,11 +778,11 @@ void SdPageObjsTLB::AddShapeList (
{
if(bMarked)
{
- pNewEntry->SetMarked(sal_True);
+ pNewEntry->SetMarked(true);
}
else
{
- pNewEntry->SetMarked( sal_False );
+ pNewEntry->SetMarked(false);
}
}
}
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 2fa15b5..06adfaf 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -1376,7 +1376,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
//else the corresponding entry is set false .
SdrObject * pObj = GetDrawingObjectsByContent(pCnt);
if(pChild)
- pChild->SetMarked(sal_False);
+ pChild->SetMarked(false);
if(pObj)
{
SdrView* pDrawView = pActiveShell->GetDrawView();
@@ -1387,7 +1387,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
if(Marked)
{
//sEntry += String::CreateFromAscii(" *");
- pChild->SetMarked(sal_True);
+ pChild->SetMarked(true);
}
}
commit 0523304875cf810acb1ff7caf9c9a2ec5d982b70
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 2 12:56:48 2014 +0200
svl: sal_Bool->bool
Change-Id: I6938314a08d061d2b07d9129742d74a989bd1385
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index e1aecea..4bdd721 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -1106,7 +1106,7 @@ short IconChoiceDialog::Ok()
if ( !pOutSet )
{
if ( !pExampleSet && pSet )
- pOutSet = pSet->Clone( sal_False ); // without items
+ pOutSet = pSet->Clone( false ); // without items
else if ( pExampleSet )
pOutSet = new SfxItemSet( *pExampleSet );
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ffcc278..a85745a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -295,7 +295,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
if( eState != SFX_ITEM_SET )
{
- pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) );
+ pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) );
eState = SFX_ITEM_SET;
}
}
@@ -453,7 +453,7 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
if( eState != SFX_ITEM_SET )
{
- pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) );
+ pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) );
eState = SFX_ITEM_SET;
}
@@ -650,7 +650,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
if( eState != SFX_ITEM_SET )
{
- pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) );
+ pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) );
eState = SFX_ITEM_SET;
}
@@ -897,7 +897,7 @@ void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
if( eState != SFX_ITEM_SET )
{
- pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) );
+ pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) );
eState = SFX_ITEM_SET;
}
@@ -1218,7 +1218,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
if( eState != SFX_ITEM_SET )
{
- pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) );
+ pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) );
eState = SFX_ITEM_SET;
}
@@ -2986,7 +2986,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
if( eState != SFX_ITEM_SET )
{
- pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, sal_True ) );
+ pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, true ) );
eState = SFX_ITEM_SET;
}
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 84bf61c..06b3e8b 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1184,7 +1184,7 @@ void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
- (const SvxSetItem&)rSet.Get( nWhich, sal_False );
+ (const SvxSetItem&)rSet.Get( nWhich, false );
const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
const SfxBoolItem& rOn =
(const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -1215,7 +1215,7 @@ void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
- (const SvxSetItem&)rSet.Get( nWhich, sal_False );
+ (const SvxSetItem&)rSet.Get( nWhich, false );
const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
const SfxBoolItem& rOn =
(const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 5baa24e..fcabc86 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -814,7 +814,7 @@ ATTR_SETUNDERLINE:
aUL = *(SvxUnderlineItem*)pItem;
}
else
- aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
+ aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, false );
if( UNDERLINE_NONE == aUL.GetLineStyle() )
aUL.SetLineStyle( UNDERLINE_SINGLE );
@@ -909,7 +909,7 @@ ATTR_SETOVERLINE:
aOL = *(SvxOverlineItem*)pItem;
}
else
- aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nOverline, sal_False );
+ aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nOverline, false );
if( UNDERLINE_NONE == aOL.GetLineStyle() )
aOL.SetLineStyle( UNDERLINE_SINGLE );
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index 0382d90..8c1cb78 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -133,7 +133,7 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
{
const SfxPoolItem* pItem = NULL;
{
- SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, sal_True );
+ SvxFontItem* pFontItem = (SvxFontItem*)&rSet.Get( EE_CHAR_FONTINFO, true );
rDesc.Name = pFontItem->GetFamilyName();
rDesc.StyleName = pFontItem->GetStyleName();
rDesc.Family = sal::static_int_cast< sal_Int16 >(
@@ -143,37 +143,37 @@ void SvxUnoFontDescriptor::FillFromItemSet( const SfxItemSet& rSet, awt::FontDes
pFontItem->GetPitch());
}
{
- pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, sal_True );
+ pItem = &rSet.Get( EE_CHAR_FONTHEIGHT, true );
uno::Any aHeight;
if( pItem->QueryValue( aHeight, MID_FONTHEIGHT ) )
aHeight >>= rDesc.Height;
}
{
- pItem = &rSet.Get( EE_CHAR_ITALIC, sal_True );
+ pItem = &rSet.Get( EE_CHAR_ITALIC, true );
uno::Any aFontSlant;
if(pItem->QueryValue( aFontSlant, MID_POSTURE ))
aFontSlant >>= rDesc.Slant;
}
{
- pItem = &rSet.Get( EE_CHAR_UNDERLINE, sal_True );
+ pItem = &rSet.Get( EE_CHAR_UNDERLINE, true );
uno::Any aUnderline;
if(pItem->QueryValue( aUnderline, MID_TL_STYLE ))
aUnderline >>= rDesc.Underline;
}
{
- pItem = &rSet.Get( EE_CHAR_WEIGHT, sal_True );
+ pItem = &rSet.Get( EE_CHAR_WEIGHT, true );
uno::Any aWeight;
if(pItem->QueryValue( aWeight, MID_WEIGHT ))
aWeight >>= rDesc.Weight;
}
{
- pItem = &rSet.Get( EE_CHAR_STRIKEOUT, sal_True );
+ pItem = &rSet.Get( EE_CHAR_STRIKEOUT, true );
uno::Any aStrikeOut;
if(pItem->QueryValue( aStrikeOut, MID_CROSS_OUT ))
aStrikeOut >>= rDesc.Strikeout;
}
{
- SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, sal_True );
+ SvxWordLineModeItem* pWLMItem = (SvxWordLineModeItem*)&rSet.Get( EE_CHAR_WLM, true );
rDesc.WordLineMode = pWLMItem->GetValue();
}
}
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index 37d2d12..c84bcf1 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -106,7 +106,7 @@ class SVL_DLLPUBLIC SfxItemPropertySet
SfxItemPropertyMap m_aMap;
mutable com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo> m_xInfo;
protected:
- virtual bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, sal_Bool bGetProperty) const;
+ virtual bool FillItem(SfxItemSet& rSet, sal_uInt16 nWhich, bool bGetProperty) const;
public:
SfxItemPropertySet( const SfxItemPropertyMapEntry *pMap ) :
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index a05b33c..83d6ed7 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -87,13 +87,13 @@ public:
SfxItemSet( SfxItemPool&, const sal_uInt16* nWhichPairTable );
virtual ~SfxItemSet();
- virtual SfxItemSet * Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const;
+ virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = 0) const;
// Items erfragen
sal_uInt16 Count() const { return _nCount; }
sal_uInt16 TotalCount() const;
- virtual const SfxPoolItem& Get( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True ) const;
+ virtual const SfxPoolItem& Get( sal_uInt16 nWhich, bool bSrchInParent = true ) const;
const SfxPoolItem* GetItem( sal_uInt16 nWhich, bool bSrchInParent = true,
TypeId aItemType = 0 ) const;
@@ -109,8 +109,8 @@ public:
virtual void DisableItem(sal_uInt16 nWhich);
virtual void InvalidateItem( sal_uInt16 nWhich );
- virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0);
- virtual void ClearInvalidItems( sal_Bool bHardDefault = sal_False );
+ virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0);
+ virtual void ClearInvalidItems( bool bHardDefault = false );
void InvalidateAllItems(); // HACK(via nWhich = 0) ???
void InvalidateDefaultItems();
@@ -126,12 +126,12 @@ public:
SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN,
SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN );
- virtual bool Set( const SfxItemSet&, sal_Bool bDeep = sal_True );
+ virtual bool Set( const SfxItemSet&, bool bDeep = true );
virtual void Intersect( const SfxItemSet& rSet );
- virtual void MergeValues( const SfxItemSet& rSet, sal_Bool bOverwriteDefaults = sal_False );
+ virtual void MergeValues( const SfxItemSet& rSet, bool bOverwriteDefaults = false );
virtual void Differentiate( const SfxItemSet& rSet );
- virtual void MergeValue( const SfxPoolItem& rItem, sal_Bool bOverwriteDefaults = sal_False );
+ virtual void MergeValue( const SfxPoolItem& rItem, bool bOverwriteDefaults = false );
SfxItemPool* GetPool() const { return _pPool; }
const sal_uInt16* GetRanges() const { return _pWhichRanges; }
@@ -170,7 +170,7 @@ public:
SfxAllItemSet( const SfxItemSet & );
SfxAllItemSet( const SfxAllItemSet & );
- virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxItemSet * Clone( bool bItems = true, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE;
virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ) SAL_OVERRIDE;
using SfxItemSet::Put;
};
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index b57009b..62f5281 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -554,7 +554,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim
SfxItemSet* pDataSet = getCurrentDataSet();
if ( pDataSet )
{
- const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True);
+ const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, true);
SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL);
if(eState != SFX_ITEM_DONTCARE)
aCellProtection = uno::makeAny(rProtAttr.GetProtection());
@@ -587,7 +587,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno:
SfxItemSet* pDataSet = getCurrentDataSet();
if ( pDataSet )
{
- const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True);
+ const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, true);
SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL);
if(eState != SFX_ITEM_DONTCARE)
aBoolRet = uno::makeAny(rProtAttr.GetHideFormula());
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 853c806..6666f83 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -929,7 +929,7 @@ short SfxTabDialog::Ok()
if ( !pOutSet )
{
if ( !pExampleSet && pSet )
- pOutSet = pSet->Clone( sal_False ); // without Items
+ pOutSet = pSet->Clone( false ); // without Items
else if ( pExampleSet )
pOutSet = new SfxItemSet( *pExampleSet );
}
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index e2492d3..41f1a04 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -172,7 +172,7 @@ SfxItemPropertySet::~SfxItemPropertySet()
{
}
-bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const
+bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, bool) const
{
return false;
}
@@ -194,7 +194,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
else
{
SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
- if(FillItem(aSet, rEntry.nWID, sal_True))
+ if(FillItem(aSet, rEntry.nWID, true))
{
const SfxPoolItem& rItem = aSet.Get(rEntry.nWID);
rItem.QueryValue( rAny, rEntry.nMemberId );
@@ -250,7 +250,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
if(eState < SFX_ITEM_DEFAULT)
{
SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
- if(FillItem(aSet, rEntry.nWID, sal_False))
+ if(FillItem(aSet, rEntry.nWID, false))
{
const SfxPoolItem &rItem = aSet.Get(rEntry.nWID);
pNewItem = rItem.Clone();
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index cd48ed6..03905ea 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -351,7 +351,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
if ( nWhich <= SFX_WHICH_MAX )
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( *pItemToClear, rNew );
@@ -389,7 +389,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
if ( nWhich <= SFX_WHICH_MAX )
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( *pItemToClear, rNew );
@@ -417,7 +417,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
-void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault )
+void SfxItemSet::ClearInvalidItems( bool bHardDefault )
{
sal_uInt16* pPtr = _pWhichRanges;
SfxItemArray ppFnd = _aItems;
@@ -592,7 +592,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
if (nWhich <= SFX_WHICH_MAX )
{
const SfxPoolItem& rOld = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( rOld, rNew );
}
@@ -846,12 +846,12 @@ bool SfxItemSet::Set
const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems
"ubernommen werden sollen */
- sal_Bool bDeep /* sal_True (default)
+ bool bDeep /* true (default)
auch die SfxPoolItems aus den ggf. an
rSet vorhandenen Parents werden direkt
in das SfxItemSet "ubernommen
- sal_False
+ false
die SfxPoolItems aus den Parents von
rSet werden nicht ber"ucksichtigt */
)
@@ -950,7 +950,7 @@ const SfxPoolItem* SfxItemSet::GetItem
-const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) const
+const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const
{
// suche den Bereich in dem das Which steht:
const SfxItemSet* pAktSet = this;
@@ -1076,7 +1076,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
if(nWhich <= SFX_WHICH_MAX)
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( **ppFnd1, rNew );
@@ -1146,7 +1146,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
if(nWhich <= SFX_WHICH_MAX)
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( **ppFnd1, rNew );
@@ -1323,7 +1323,7 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount,
-void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
+void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults )
{
// Achtung!!! Bei Aenderungen/Bugfixes immer obenstehende Tabelle pflegen!
DBG_ASSERT( GetPool() == rSet.GetPool(), "MergeValues mit verschiedenen Pools" );
@@ -1380,7 +1380,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
-void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults )
+void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults )
{
SfxItemArray ppFnd = _aItems;
const sal_uInt16* pPtr = _pWhichRanges;
@@ -1470,7 +1470,7 @@ SvStream &SfxItemSet::Store
[Querverweise]
- <SfxItemSet::Load(SvStream&,sal_Bool,const SfxItemPool*)>
+ <SfxItemSet::Load(SvStream&,bool,const SfxItemPool*)>
*/
{
@@ -1541,7 +1541,7 @@ SvStream &SfxItemSet::Load
[Querverweise]
- <SfxItemSet::Store(Stream&,sal_Bool)const>
+ <SfxItemSet::Store(Stream&,bool)const>
*/
{
@@ -1660,7 +1660,7 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
-SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
+SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
{
if ( pToPool && pToPool != _pPool )
{
@@ -1944,7 +1944,7 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi
{
bIncrementCount = true;
pOld = _pParent ?
- &_pParent->Get( nWhich, sal_True )
+ &_pParent->Get( nWhich, true )
: nWhich <= SFX_WHICH_MAX ? &_pPool->GetDefaultItem( nWhich ) : 0;
}
@@ -1975,7 +1975,7 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich)
-SfxItemSet *SfxAllItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
+SfxItemSet *SfxAllItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
{
if ( pToPool && pToPool != _pPool )
{
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index dee7a63..b91b428 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -24,7 +24,7 @@
SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
SfxPoolItem(which),
- pSet(rSet.Clone(sal_True))
+ pSet(rSet.Clone(true))
{
}
@@ -41,7 +41,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) :
SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) :
SfxPoolItem(rCopy.Which()),
- pSet(rCopy.pSet->Clone(sal_True, pPool))
+ pSet(rCopy.pSet->Clone(true, pPool))
{
}
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 3b79dbc..b3d7b85 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -369,7 +369,7 @@ public:
: maRoot(),
mnCount(0),
mpIgnorableItems( pIgnorableItems != 0
- ? pIgnorableItems->Clone( sal_False )
+ ? pIgnorableItems->Clone( false )
: 0 )
{
DBG_ASSERT( !pIgnorableItems || !pIgnorableItems->Count(),
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 6e7f9f1..4c6953a 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -631,7 +631,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
- (const SvxSetItem&)rSet.Get( nWhich, sal_False );
+ (const SvxSetItem&)rSet.Get( nWhich, false );
const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
const SfxBoolItem& rOn =
(const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -661,7 +661,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
- (const SvxSetItem&)rSet.Get( nWhich, sal_False );
+ (const SvxSetItem&)rSet.Get( nWhich, false );
const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
const SfxBoolItem& rOn =
(const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 1873313..7320727 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -501,7 +501,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if(SFX_ITEM_DONTCARE == eState)
mpRemember2DAttributes->InvalidateItem(nWhich);
else if(SFX_ITEM_SET == eState)
- mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False));
+ mpRemember2DAttributes->Put(rAttrs.Get(nWhich, false));
nWhich = aIter.NextWhich();
}
@@ -1723,7 +1723,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
if(SFX_ITEM_DONTCARE == eState)
rAttrs.InvalidateItem(nWhich);
else if(SFX_ITEM_SET == eState)
- rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False));
+ rAttrs.Put(mpRemember2DAttributes->Get(nWhich, false));
nWhich = aIter.NextWhich();
}
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 9b2976c..87df678 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -267,7 +267,7 @@ namespace sdr
ImpRemoveStyleSheet();
}
- mpItemSet = mpItemSet->Clone(sal_False, pDestPool);
+ mpItemSet = mpItemSet->Clone(false, pDestPool);
GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel);
// set stylesheet (if used)
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index d3806c4..4eb2baf 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -52,7 +52,7 @@ namespace sdr
{
if(rProps.mpItemSet)
{
- mpItemSet = rProps.mpItemSet->Clone(sal_True);
+ mpItemSet = rProps.mpItemSet->Clone(true);
// do not keep parent info, this may be changed by later construrtors.
// This class just copies the ItemSet, ignore parent.
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index 58d1ace..da8e51f 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -98,7 +98,7 @@ namespace sdr
}
else
{
- mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
+ mpItemSet->MergeValue(rSet.Get(nWhich), true);
}
}
@@ -121,7 +121,7 @@ namespace sdr
{
// Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items.
// #i50808# Leak fix, Clone produces a new instance and we get ownership here
- SfxItemSet* pNewSet = rSet.Clone(sal_True);
+ SfxItemSet* pNewSet = rSet.Clone(true);
DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)");
for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++)
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 2336fdd..9f6ff55 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -98,7 +98,7 @@ namespace sdr
}
else
{
- mpItemSet->MergeValue(rSet.Get(nWhich), sal_True);
+ mpItemSet->MergeValue(rSet.Get(nWhich), true);
}
nWhich = aIter.NextWhich();
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 7fef316..d65585e 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2003,12 +2003,12 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false))
rAttr.InvalidateItem(nWhich);
else
- rAttr.MergeValue(rSet.Get(nWhich), sal_True);
+ rAttr.MergeValue(rSet.Get(nWhich), true);
}
else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
- rAttr.MergeValue(rItem, sal_True);
+ rAttr.MergeValue(rItem, true);
}
nWhich = aIter.NextWhich();
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 4a2c26d..1ebfce5 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -182,7 +182,7 @@ public:
SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable );
SwAttrSet( const SwAttrSet& );
- virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const SAL_OVERRIDE;
+ virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = 0) const SAL_OVERRIDE;
bool Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew );
bool Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew );
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index fbda6e1..3e3ba56 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -162,7 +162,7 @@ SwAttrSet::SwAttrSet( const SwAttrSet& rSet )
{
}
-SfxItemSet* SwAttrSet::Clone( sal_Bool bItems, SfxItemPool *pToPool ) const
+SfxItemSet* SwAttrSet::Clone( bool bItems, SfxItemPool *pToPool ) const
{
if ( pToPool && pToPool != GetPool() )
{
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index cac57ef..f56be96 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1232,7 +1232,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
/* #i6447#: Only the selected items are copied from the old
format. */
- SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( sal_True );
+ SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( true );
// Copy only the set attributes.
// The others should apply from the Templates.
@@ -1537,7 +1537,7 @@ lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
// The TxtAttribute needs to be destroyed.
// Unfortunately, this also destroys the Format next to the Frames.
// To avoid this, we disconnect the attribute from the Format.
- SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( sal_False );
+ SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( false );
// Protect the Frame's size and position
if ( rSdrObj.IsMoveProtect() || rSdrObj.IsResizeProtect() )
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index c7d8b14..125cc2b 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1588,7 +1588,7 @@ sal_Bool SwCntntNode::GetAttr( SfxItemSet& rSet, sal_Bool bInParent ) const
const SwAttrSet& rAttrSet = GetSwAttrSet();
if( bInParent )
- return rSet.Set( rAttrSet, sal_True ) ? sal_True : sal_False;
+ return rSet.Set( rAttrSet, true ) ? sal_True : sal_False;
rSet.Put( rAttrSet );
return rSet.Count() ? sal_True : sal_False;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 53bed9a..1ceadbf 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1047,7 +1047,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
SET_CURR_SHELL( (SwViewShell*)this );
- if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), sal_True ) )
+ if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), true ) )
return sal_False;
// now examine all attributes. Remove forbidden attributes, then
diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx
index 61e4b88..43702d9 100644
--- a/sw/source/core/txtnode/swfntcch.cxx
+++ b/sw/source/core/txtnode/swfntcch.cxx
@@ -42,7 +42,7 @@ SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) :
aSwFont.GoMagic( pSh, aSwFont.GetActual() );
const SwAttrSet& rAttrSet = ((SwTxtFmtColl *)pOwn)->GetAttrSet();
for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; i++)
- pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, sal_True );
+ pDefaultArray[ StackPos[ i ] ] = &rAttrSet.Get( i, true );
}
SwFontObj::~SwFontObj()
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index b6e23ce..e9dbd89 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -884,7 +884,7 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
if ( !pCurrentCharFmt || 0 == CharFmt::GetItem( *pCurrentCharFmt, pItem->Which() ) )
{
if ( !pNewSet )
- pNewSet = pNewStyle->Clone( sal_True );
+ pNewSet = pNewStyle->Clone( true );
pNewSet->ClearItem( pItem->Which() );
}
}
@@ -1001,7 +1001,7 @@ SwTxtAttr* MakeTxtAttr(
// different from rDoc's pool, we have to correct this:
const StylePool::SfxItemSet_Pointer_t pAutoStyle = static_cast<const SwFmtAutoFmt&>(rAttr).GetStyleHandle();
boost::scoped_ptr<const SfxItemSet> pNewSet(
- pAutoStyle->SfxItemSet::Clone( sal_True, &rDoc.GetAttrPool() ));
+ pAutoStyle->SfxItemSet::Clone( true, &rDoc.GetAttrPool() ));
SwTxtAttr* pNew = MakeTxtAttr( rDoc, *pNewSet, nStt, nEnd );
return pNew;
}
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 8cb0435..3c8adbe 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -311,7 +311,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
OSL_ENSURE( nWhichId, "lcl_HaveCommonAttributes not used correctly" );
if ( SFX_ITEM_SET == rSet2.GetItemState( nWhichId, false ) )
{
- pNewSet = rSet2.Clone( sal_True );
+ pNewSet = rSet2.Clone( true );
pNewSet->ClearItem( nWhichId );
}
}
@@ -324,7 +324,7 @@ static bool lcl_HaveCommonAttributes( IStyleAccess& rStyleAccess,
if ( SFX_ITEM_SET == rSet2.GetItemState( pItem->Which(), false ) )
{
if ( !pNewSet )
- pNewSet = rSet2.Clone( sal_True );
+ pNewSet = rSet2.Clone( true );
pNewSet->ClearItem( pItem->Which() );
}
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 7553024..b133211 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -2188,7 +2188,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
rSh.GetCurAttr(aSet);
if(SFX_ITEM_SET == aSet.GetItemState(RES_TXTATR_INETFMT, false))
{
- const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True);
+ const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true);
bNormalChar = false;
eKeyState = KS_End;
rSh.ClickToINetAttr((const SwFmtINetFmt&)rItem, URLLOAD_NOFILTER);
diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx
index 8b96156..cf09813 100644
--- a/sw/source/core/uibase/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
@@ -824,7 +824,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
if(nEEWhich)
{
- rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich);
+ rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich);
if(nEEWhich == EE_CHAR_KERNING)
{
SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true );
diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
index 8511fe5..b700ffe 100644
--- a/sw/source/core/uibase/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
@@ -945,7 +945,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet)
}
}
if(nEEWhich)
- rSet.Put(aEditAttr.Get(nEEWhich, sal_True), nWhich);
+ rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich);
nWhich = aIter.NextWhich();
}
diff --git a/sw/source/core/uibase/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
index 652ef4b..0a10d18 100644
--- a/sw/source/core/uibase/shells/frmsh.cxx
+++ b/sw/source/core/uibase/shells/frmsh.cxx
@@ -737,7 +737,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
case RES_PRINT:
case RES_SURROUND:
{
- rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), sal_True ));
+ rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), true ));
}
break;
case SID_OBJECT_ALIGN_LEFT :
diff --git a/sw/source/core/uibase/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx
index 57314e0..635e21e 100644
--- a/sw/source/core/uibase/shells/textsh.cxx
+++ b/sw/source/core/uibase/shells/textsh.cxx
@@ -1083,17 +1083,17 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
nScript = g_pBreakIt->GetAllScriptsOfText( aChars );
if( SCRIPTTYPE_LATIN & nScript )
{
- aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, sal_True ) );
+ aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, true ) );
aSet.Put( aNewFontItem, RES_CHRATR_FONT);
}
if( SCRIPTTYPE_ASIAN & nScript )
{
- aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, sal_True ) );
+ aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, true ) );
aSet.Put( aNewFontItem, RES_CHRATR_CJK_FONT );
}
if( SCRIPTTYPE_COMPLEX & nScript )
{
- aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, sal_True ) );
+ aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, true ) );
aSet.Put( aNewFontItem, RES_CHRATR_CTL_FONT );
}
diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx
index 05fccf2..52efc16 100644
--- a/sw/source/core/uibase/shells/textsh1.cxx
+++ b/sw/source/core/uibase/shells/textsh1.cxx
@@ -1281,7 +1281,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
rWrtSh.GetCurAttr(aSet);
if(SFX_ITEM_SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true ))
{
- const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, sal_True) );
+ const SwFmtINetFmt& rINetFmt = dynamic_cast<const SwFmtINetFmt&>( aSet.Get(RES_TXTATR_INETFMT, true) );
if( nSlot == FN_COPY_HYPERLINK_LOCATION )
{
::uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetView().GetEditWin().GetClipboard();
diff --git a/sw/source/core/uibase/shells/txtattr.cxx b/sw/source/core/uibase/shells/txtattr.cxx
index 1b4350b..628529c 100644
--- a/sw/source/core/uibase/shells/txtattr.cxx
+++ b/sw/source/core/uibase/shells/txtattr.cxx
@@ -692,10 +692,10 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
case RES_PARATR_DROP:
{
#if OSL_DEBUG_LEVEL > 1
- const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), sal_True);
+ const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), true);
rSet.Put(rItem);
#else
- rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), sal_True));
+ rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), true));
#endif
nSlot = 0;
}
@@ -716,7 +716,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
{
SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT);
rSh.GetCurAttr(aSet);
- const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, sal_True);
+ const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true);
rSet.Put(rItem);
nSlot = 0;
}
diff --git a/sw/source/core/uibase/uiview/viewtab.cxx b/sw/source/core/uibase/uiview/viewtab.cxx
index 83cd768..6d60fbd 100644
--- a/sw/source/core/uibase/uiview/viewtab.cxx
+++ b/sw/source/core/uibase/uiview/viewtab.cxx
@@ -847,7 +847,7 @@ void SwView::ExecTabWin( SfxRequest& rReq )
SwFmtCol aCols(
bSect ?
pSectFmt->GetCol() :
- (const SwFmtCol&)aSet.Get( RES_COL, sal_False ));
+ (const SwFmtCol&)aSet.Get( RES_COL, false ));
SwRect aCurRect = rSh.GetAnyCurRect(bSect ? RECT_SECTION_PRT : RECT_FLY_PRT_EMBEDDED);
const long lWidth = bVerticalWriting ? aCurRect.Height() : aCurRect.Width();
::lcl_ConvertToCols( aColItem, sal_uInt16(lWidth), aCols );
diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index da000d4..945bc0a 100644
--- a/sw/source/core/uibase/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
@@ -3230,19 +3230,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
LanguageType nLang = LANGUAGE_DONTKNOW;
if (bLatin)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, sal_False )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, false )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bAsian)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, sal_False )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, false )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bComplex)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, sal_False )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, false )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
@@ -3278,19 +3278,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
LanguageType nLang = LANGUAGE_DONTKNOW;
if (bLatin)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, sal_False )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, false )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bAsian)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, sal_False )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, false )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bComplex)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, sal_False )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, false )).GetLanguage();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list