[Libreoffice-commits] core.git: 52 commits - avmedia/source basctl/source basegfx/source bridges/source codemaker/source compilerplugins/clang cppuhelper/test cppu/source cui/source dbaccess/source editeng/source embeddedobj/source extensions/source hwpfilter/source i18nlangtag/source i18npool/source include/avmedia include/basebmp include/basegfx include/cppu include/editeng include/rtl include/sfx2 include/svl include/svtools include/svx include/tools include/unotools include/vcl l10ntools/inc l10ntools/source pyuno/source registry/tools rsc/inc rsc/source sal/osl sal/rtl sal/textenc sax/source scaddins/source sc/inc sc/source sdext/source sd/inc sd/source sfx2/inc sfx2/source sot/source svl/source svtools/source svx/source sw/inc sw/source toolkit/source tools/source unotools/source vcl/source
Stephan Bergmann
sbergman at redhat.com
Fri Jan 10 08:12:28 PST 2014
avmedia/source/framework/mediaitem.cxx | 2
basctl/source/basicide/sbxitem.cxx | 2
basctl/source/inc/sbxitem.hxx | 2
basegfx/source/polygon/b2dpolygonclipper.cxx | 2
basegfx/source/polygon/b2dpolygontools.cxx | 2
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 4
basegfx/source/polygon/b3dpolygon.cxx | 4
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 2
codemaker/source/javamaker/javatype.cxx | 2
compilerplugins/clang/plugin.cxx | 6 -
cppu/source/AffineBridge/AffineBridge.cxx | 6 -
cppu/source/LogBridge/LogBridge.cxx | 6 -
cppu/source/UnsafeBridge/UnsafeBridge.cxx | 6 -
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 4
cppuhelper/test/bootstrap/TestEnv.cxx | 6 -
cui/source/dialogs/SpellAttrib.cxx | 6 -
cui/source/dialogs/SpellAttrib.hxx | 6 -
cui/source/options/cfgchart.cxx | 2
cui/source/options/cfgchart.hxx | 2
cui/source/options/connpoolsettings.cxx | 2
cui/source/options/connpoolsettings.hxx | 2
cui/source/options/dbregistersettings.cxx | 2
cui/source/options/dbregistersettings.hxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2
dbaccess/source/ui/dlg/dsnItem.hxx | 2
dbaccess/source/ui/dlg/optionalboolitem.cxx | 2
dbaccess/source/ui/dlg/optionalboolitem.hxx | 2
dbaccess/source/ui/inc/propertysetitem.hxx | 2
dbaccess/source/ui/inc/stringlistitem.hxx | 2
dbaccess/source/ui/misc/propertysetitem.cxx | 2
dbaccess/source/ui/misc/stringlistitem.cxx | 2
editeng/source/items/bulitem.cxx | 2
editeng/source/items/flditem.cxx | 2
editeng/source/items/frmitems.cxx | 22 ++--
editeng/source/items/numitem.cxx | 2
editeng/source/items/optitems.cxx | 4
editeng/source/items/paraitem.cxx | 10 -
editeng/source/items/textitem.cxx | 26 ++--
editeng/source/items/writingmodeitem.cxx | 2
editeng/source/items/xmlcnitm.cxx | 2
embeddedobj/source/inc/oleembobj.hxx | 2
embeddedobj/source/msole/olemisc.cxx | 6 -
extensions/source/nsplugin/source/npshell.cxx | 1
extensions/source/plugin/unx/npnapi.cxx | 2
hwpfilter/source/drawing.h | 16 +-
hwpfilter/source/hbox.h | 50 ++++-----
hwpfilter/source/hgzip.cxx | 2
hwpfilter/source/hpara.cxx | 2
hwpfilter/source/hpara.h | 2
hwpfilter/source/hwpeq.cxx | 3
hwpfilter/source/hwpread.cxx | 54 +++++-----
hwpfilter/source/lexer.cxx | 12 +-
i18nlangtag/source/isolang/isolang.cxx | 2
i18npool/source/breakiterator/breakiteratorImpl.cxx | 6 -
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 2
include/avmedia/mediaitem.hxx | 2
include/basebmp/clippedlinerenderer.hxx | 12 +-
include/basebmp/polypolygonrenderer.hxx | 2
include/basegfx/matrix/b2dhommatrixtools.hxx | 2
include/cppu/Enterable.hxx | 2
include/editeng/adjustitem.hxx | 2
include/editeng/boxitem.hxx | 4
include/editeng/brushitem.hxx | 2
include/editeng/bulletitem.hxx | 2
include/editeng/charrotateitem.hxx | 2
include/editeng/colritem.hxx | 2
include/editeng/crossedoutitem.hxx | 2
include/editeng/escapementitem.hxx | 2
include/editeng/fhgtitem.hxx | 2
include/editeng/flditem.hxx | 2
include/editeng/flstitem.hxx | 2
include/editeng/fontitem.hxx | 2
include/editeng/formatbreakitem.hxx | 2
include/editeng/frmdiritem.hxx | 2
include/editeng/fwdtitem.hxx | 2
include/editeng/hyphenzoneitem.hxx | 2
include/editeng/lineitem.hxx | 2
include/editeng/lrspitem.hxx | 2
include/editeng/lspcitem.hxx | 2
include/editeng/numitem.hxx | 2
include/editeng/optitems.hxx | 4
include/editeng/paravertalignitem.hxx | 2
include/editeng/postitem.hxx | 2
include/editeng/protitem.hxx | 2
include/editeng/shaditem.hxx | 2
include/editeng/sizeitem.hxx | 2
include/editeng/tstpitem.hxx | 2
include/editeng/twolinesitem.hxx | 2
include/editeng/udlnitem.hxx | 4
include/editeng/ulspitem.hxx | 2
include/editeng/wghtitem.hxx | 2
include/editeng/writingmodeitem.hxx | 2
include/editeng/xmlcnitm.hxx | 2
include/rtl/math.hxx | 6 -
include/sfx2/app.hxx | 2
include/sfx2/dinfdlg.hxx | 2
include/sfx2/evntconf.hxx | 2
include/sfx2/fcontnr.hxx | 2
include/sfx2/frame.hxx | 6 -
include/sfx2/frmdescr.hxx | 2
include/sfx2/minfitem.hxx | 2
include/sfx2/objitem.hxx | 2
include/sfx2/objsh.hxx | 2
include/sfx2/tplpitem.hxx | 2
include/sfx2/viewfrm.hxx | 4
include/sfx2/zoomitem.hxx | 2
include/svl/cenumitm.hxx | 4
include/svl/cintitem.hxx | 8 -
include/svl/cntwall.hxx | 2
include/svl/ctypeitm.hxx | 2
include/svl/custritm.hxx | 2
include/svl/eitem.hxx | 2
include/svl/flagitem.hxx | 2
include/svl/globalnameitem.hxx | 2
include/svl/grabbagitem.hxx | 2
include/svl/ilstitem.hxx | 2
include/svl/imageitm.hxx | 2
include/svl/intitem.hxx | 2
include/svl/itempool.hxx | 4
include/svl/itemset.hxx | 2
include/svl/lckbitem.hxx | 2
include/svl/macitem.hxx | 2
include/svl/poolitem.hxx | 18 +--
include/svl/ptitem.hxx | 2
include/svl/rectitem.hxx | 2
include/svl/rngitem.hxx | 4
include/svl/slstitm.hxx | 2
include/svl/srchitem.hxx | 2
include/svl/szitem.hxx | 2
include/svl/undo.hxx | 7 -
include/svl/visitem.hxx | 2
include/svl/zformat.hxx | 2
include/svtools/svparser.hxx | 2
include/svtools/xwindowitem.hxx | 2
include/svx/AffineMatrixItem.hxx | 2
include/svx/SmartTagItem.hxx | 2
include/svx/algitem.hxx | 2
include/svx/chrtitem.hxx | 2
include/svx/clipfmtitem.hxx | 2
include/svx/drawitem.hxx | 12 +-
include/svx/e3ditem.hxx | 2
include/svx/galleryitem.hxx | 2
include/svx/grafctrl.hxx | 2
include/svx/grfcrop.hxx | 2
include/svx/hlnkitem.hxx | 2
include/svx/numinf.hxx | 2
include/svx/ofaitem.hxx | 4
include/svx/optgrid.hxx | 2
include/svx/pageitem.hxx | 2
include/svx/rulritem.hxx | 10 -
include/svx/sdasaitm.hxx | 2
include/svx/sdasitm.hxx | 2
include/svx/sdtfsitm.hxx | 2
include/svx/svxgrahicitem.hxx | 2
include/svx/sxfiitm.hxx | 2
include/svx/viewlayoutitem.hxx | 2
include/svx/xbtmpit.hxx | 2
include/svx/xcolit.hxx | 2
include/svx/xflftrit.hxx | 2
include/svx/xflgrit.hxx | 2
include/svx/xflhtit.hxx | 2
include/svx/xit.hxx | 2
include/svx/xlndsit.hxx | 2
include/svx/xlnedit.hxx | 2
include/svx/xlnstit.hxx | 2
include/svx/zoomslideritem.hxx | 2
include/tools/b3dtrans.hxx | 2
include/tools/debug.hxx | 31 ++---
include/tools/stream.hxx | 2
include/tools/wldcrd.hxx | 2
include/unotools/textsearch.hxx | 16 +-
include/vcl/graph.hxx | 8 -
include/vcl/toolbox.hxx | 4
include/vcl/txtattr.hxx | 12 +-
l10ntools/inc/export.hxx | 2
l10ntools/source/merge.cxx | 5
pyuno/source/module/pyuno_impl.hxx | 8 -
registry/tools/options.cxx | 6 -
rsc/inc/rscdef.hxx | 2
rsc/inc/rscflag.hxx | 2
rsc/inc/rscrange.hxx | 3
rsc/source/parser/rscyacc.y | 2
rsc/source/prj/start.cxx | 2
rsc/source/tools/rscdef.cxx | 2
sal/osl/unx/process.cxx | 8 -
sal/rtl/alloc_arena.cxx | 4
sal/rtl/alloc_cache.cxx | 8 -
sal/rtl/hash.cxx | 2
sal/textenc/tcvtutf7.cxx | 4
sal/textenc/tcvtutf8.cxx | 6 -
sax/source/fastparser/fastparser.cxx | 4
sc/inc/attrib.hxx | 16 +-
sc/inc/defaultsoptions.hxx | 2
sc/inc/docoptio.hxx | 2
sc/inc/formulaopt.hxx | 2
sc/inc/patattr.hxx | 2
sc/inc/printopt.hxx | 2
sc/inc/viewopti.hxx | 2
sc/source/core/data/attrib.cxx | 16 +-
sc/source/core/data/patattr.cxx | 2
sc/source/core/tool/defaultsoptions.cxx | 2
sc/source/core/tool/docoptio.cxx | 2
sc/source/core/tool/formulaopt.cxx | 2
sc/source/core/tool/printopt.cxx | 2
sc/source/core/tool/viewopti.cxx | 2
sc/source/ui/app/uiitems.cxx | 18 +--
sc/source/ui/inc/uiitems.hxx | 18 +--
scaddins/source/analysis/analysis.cxx | 4
sd/inc/sdattr.hxx | 2
sd/source/core/sdattr.cxx | 2
sd/source/ui/app/optsitem.cxx | 10 -
sd/source/ui/inc/optsitem.hxx | 10 -
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 2
sfx2/inc/sorgitm.hxx | 2
sfx2/source/config/evntconf.cxx | 2
sfx2/source/control/minfitem.cxx | 2
sfx2/source/control/sorgitm.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/tplpitem.cxx | 2
sfx2/source/doc/frmdescr.cxx | 2
sfx2/source/doc/objitem.cxx | 4
sfx2/source/doc/zoomitem.cxx | 2
sfx2/source/view/frame.cxx | 6 -
sfx2/source/view/viewfrm.cxx | 2
sot/source/sdstor/stgdir.cxx | 2
sot/source/sdstor/stgstrms.cxx | 6 -
svl/source/items/cenumitm.cxx | 6 -
svl/source/items/cintitem.cxx | 8 -
svl/source/items/cntwall.cxx | 9 -
svl/source/items/ctypeitm.cxx | 2
svl/source/items/custritm.cxx | 2
svl/source/items/flagitem.cxx | 2
svl/source/items/globalnameitem.cxx | 2
svl/source/items/grabbagitem.cxx | 2
svl/source/items/ilstitem.cxx | 2
svl/source/items/imageitm.cxx | 4
svl/source/items/intitem.cxx | 2
svl/source/items/itemset.cxx | 8 -
svl/source/items/lckbitem.cxx | 2
svl/source/items/macitem.cxx | 2
svl/source/items/poolio.cxx | 6 -
svl/source/items/poolitem.cxx | 6 -
svl/source/items/ptitem.cxx | 2
svl/source/items/rectitem.cxx | 2
svl/source/items/rngitem.cxx | 4
svl/source/items/sitem.cxx | 2
svl/source/items/slstitm.cxx | 2
svl/source/items/srchitem.cxx | 2
svl/source/items/szitem.cxx | 2
svl/source/items/visitem.cxx | 2
svtools/source/contnr/treelistbox.cxx | 4
svtools/source/control/ruler.cxx | 2
svtools/source/dialogs/restartdialog.cxx | 4
svtools/source/misc/xwindowitem.cxx | 2
svtools/source/svhtml/parhtml.cxx | 16 +-
svtools/source/svrtf/parrtf.cxx | 8 -
svx/source/dialog/optgrid.cxx | 2
svx/source/dialog/rulritem.cxx | 10 -
svx/source/dialog/svxgrahicitem.cxx | 2
svx/source/form/fmitems.cxx | 2
svx/source/inc/fmitems.hxx | 2
svx/source/items/SmartTagItem.cxx | 2
svx/source/items/algitem.cxx | 2
svx/source/items/chrtitem.cxx | 2
svx/source/items/clipfmtitem.cxx | 2
svx/source/items/customshapeitem.cxx | 2
svx/source/items/drawitem.cxx | 12 +-
svx/source/items/e3ditem.cxx | 2
svx/source/items/galleryitem.cxx | 2
svx/source/items/grfitem.cxx | 2
svx/source/items/hlnkitem.cxx | 2
svx/source/items/numinf.cxx | 2
svx/source/items/ofaitem.cxx | 2
svx/source/items/pageitem.cxx | 2
svx/source/items/viewlayoutitem.cxx | 2
svx/source/items/zoomslideritem.cxx | 2
svx/source/svdraw/svdattr.cxx | 6 -
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/xoutdev/xattr.cxx | 16 +-
svx/source/xoutdev/xattr2.cxx | 2
svx/source/xoutdev/xattrbmp.cxx | 2
sw/inc/ccoll.hxx | 2
sw/inc/cellatr.hxx | 6 -
sw/inc/fchrfmt.hxx | 2
sw/inc/fmtanchr.hxx | 2
sw/inc/fmtautofmt.hxx | 2
sw/inc/fmtclds.hxx | 2
sw/inc/fmtcnct.hxx | 2
sw/inc/fmtcntnt.hxx | 2
sw/inc/fmtflcnt.hxx | 2
sw/inc/fmtfld.hxx | 2
sw/inc/fmtfsize.hxx | 2
sw/inc/fmtftn.hxx | 2
sw/inc/fmtftntx.hxx | 2
sw/inc/fmthdft.hxx | 4
sw/inc/fmtinfmt.hxx | 2
sw/inc/fmtline.hxx | 2
sw/inc/fmtmeta.hxx | 2
sw/inc/fmtornt.hxx | 4
sw/inc/fmtpdsc.hxx | 2
sw/inc/fmtrfmrk.hxx | 2
sw/inc/fmtruby.hxx | 2
sw/inc/fmtsrnd.hxx | 2
sw/inc/fmturl.hxx | 2
sw/inc/fmtwrapinfluenceonobjpos.hxx | 2
sw/inc/grfatr.hxx | 6 -
sw/inc/hints.hxx | 2
sw/inc/paratr.hxx | 4
sw/inc/tgrditem.hxx | 2
sw/inc/tox.hxx | 2
sw/source/core/attr/cellatr.cxx | 6 -
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 2
sw/source/core/attr/hints.cxx | 2
sw/source/core/graphic/grfatr.cxx | 6 -
sw/source/core/layout/atrfrm.cxx | 30 ++---
sw/source/core/para/paratr.cxx | 4
sw/source/core/tox/tox.cxx | 2
sw/source/core/txtnode/atrfld.cxx | 2
sw/source/core/txtnode/atrflyin.cxx | 2
sw/source/core/txtnode/atrftn.cxx | 2
sw/source/core/txtnode/atrref.cxx | 2
sw/source/core/txtnode/fmtatr2.cxx | 10 -
sw/source/filter/inc/fltshell.hxx | 10 -
sw/source/filter/ww1/fltshell.cxx | 10 -
sw/source/ui/chrdlg/ccoll.cxx | 2
sw/source/ui/config/cfgitems.cxx | 10 -
sw/source/ui/dialog/swwrtshitem.cxx | 2
sw/source/ui/envelp/envimg.cxx | 2
sw/source/ui/envelp/labimg.cxx | 2
sw/source/ui/inc/cfgitems.hxx | 10 -
sw/source/ui/inc/envimg.hxx | 2
sw/source/ui/inc/labimg.hxx | 2
sw/source/ui/inc/swwrtshitem.hxx | 2
sw/source/ui/inc/uiitems.hxx | 8 -
sw/source/ui/utlui/uiitems.cxx | 8 -
toolkit/source/controls/stdtabcontroller.cxx | 2
tools/source/debug/debug.cxx | 10 -
tools/source/fsys/wldcrd.cxx | 10 -
tools/source/generic/poly.cxx | 6 -
tools/source/inet/inetmime.cxx | 6 -
tools/source/rc/resmgr.cxx | 2
tools/source/zcodec/zcodec.cxx | 2
unotools/source/config/dynamicmenuoptions.cxx | 2
vcl/source/edit/txtattr.cxx | 10 -
vcl/source/window/printdlg.cxx | 2
345 files changed, 694 insertions(+), 711 deletions(-)
New commits:
commit e7a86f2d68adb40807deba29a57792a2e3d1f319
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:09:01 2014 +0100
Use bool
Change-Id: I2f1c543b106e24ff49f876dbb3d8e94f4ebf03ba
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index c43994e..acc15a5 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -130,7 +130,7 @@ public:
sal_Unicode GetNextChar();
void RereadLookahead();
- inline int IsParserWorking() const { return SVPAR_WORKING == eState; }
+ inline bool IsParserWorking() const { return SVPAR_WORKING == eState; }
Link GetAsynchCallLink() const
{ return STATIC_LINK( this, SvParser, NewDataRead ); }
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 9cda95d..b8076fe 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -421,13 +421,13 @@ int HTMLParser::FilterToken( int nToken )
int HTMLParser::ScanText( const sal_Unicode cBreak )
{
OUStringBuffer sTmpBuffer( MAX_LEN );
- int bContinue = true;
- int bEqSignFound = false;
+ bool bContinue = true;
+ bool bEqSignFound = false;
sal_Unicode cQuote = 0U;
while( bContinue && IsParserWorking() )
{
- int bNextCh = true;
+ bool bNextCh = true;
switch( nNextCh )
{
case '&':
@@ -844,12 +844,12 @@ int HTMLParser::_GetNextRawToken()
}
// Default return value: HTML_RAWDATA
- int bContinue = true;
+ bool bContinue = true;
int nToken = HTML_RAWDATA;
SaveState( 0 );
while( bContinue && IsParserWorking() )
{
- int bNextCh = true;
+ bool bNextCh = true;
switch( nNextCh )
{
case '<':
@@ -865,7 +865,7 @@ int HTMLParser::_GetNextRawToken()
sal_uLong nLinePos = GetLinePos();
// Start of an end token?
- int bOffState = false;
+ bool bOffState = false;
if( '/' == (nNextCh = GetNextChar()) )
{
bOffState = true;
@@ -1089,7 +1089,7 @@ int HTMLParser::_GetNextToken()
}
do {
- int bNextCh = true;
+ bool bNextCh = true;
switch( nNextCh )
{
case '<':
@@ -1098,7 +1098,7 @@ int HTMLParser::_GetNextToken()
sal_uLong nLineNr = GetLineNr();
sal_uLong nLinePos = GetLinePos();
- int bOffState = false;
+ bool bOffState = false;
if( '/' == (nNextCh = GetNextChar()) )
{
bOffState = true;
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 1c28b78..4e0f971 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -54,7 +54,7 @@ int SvRTFParser::_GetNextToken()
{
int nRet = 0;
do {
- int bNextCh = true;
+ bool bNextCh = true;
switch( nNextCh )
{
case '\\':
@@ -116,7 +116,7 @@ int SvRTFParser::_GetNextToken()
}
// minus before numeric parameters
- int bNegValue = false;
+ bool bNegValue = false;
if( '-' == nNextCh )
{
bNegValue = true;
@@ -304,10 +304,10 @@ sal_Unicode SvRTFParser::GetHexValue()
void SvRTFParser::ScanText( const sal_Unicode cBreak )
{
OUStringBuffer aStrBuffer;
- int bContinue = true;
+ bool bContinue = true;
while( bContinue && IsParserWorking() && aStrBuffer.getLength() < MAX_STRING_LEN)
{
- int bNextCh = true;
+ bool bNextCh = true;
switch( nNextCh )
{
case '\\':
commit 680a5290a0c7c1caf85641251a40664247e83129
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:08:30 2014 +0100
Use proper bool operations
Change-Id: I758a84205044e51f1af6b18f145e2033f32921e1
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index d1ec6dc..018fcbd 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3085,8 +3085,8 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT
sal_Bool bInUse = pEntry->HasInUseEmphasis();
// if a ClipRegion was set from outside, we don't have to reset it
const WinBits nWindowStyle = GetStyle();
- const sal_Bool bResetClipRegion = !bHasClipRegion;
- const sal_Bool bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0;
+ const bool bResetClipRegion = !bHasClipRegion;
+ const bool bHideSelection = (nWindowStyle & WB_HIDESELECTION) !=0 && !HasFocus();
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
Font aHighlightFont( GetFont() );
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 6b74fdc..d4a72f9 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1535,7 +1535,7 @@ sal_Bool Ruler::ImplHitTest( const Point& rPos, RulerSelection* pHitTest,
nStyle &= RULER_INDENT_STYLE;
n1 = mpData->pIndents[i-1].nPos;
- if ( (nStyle == RULER_INDENT_BOTTOM) ^ (!bIsHori) )
+ if ( (nStyle == RULER_INDENT_BOTTOM) != !bIsHori )
{
aRect.Left() = n1-nIndentWidth2;
aRect.Right() = n1+nIndentWidth2;
commit 99ffbb9dc1c06704f3e259ee9765fbeb408b1629
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:07:27 2014 +0100
EndDialog takes long nResult, not bool
Change-Id: I04210f48f091a652b7867754484a9c5dd6b19471
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index e5d64de..8924c74 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -58,12 +58,12 @@ private:
};
IMPL_LINK_NOARG(RestartDialog, hdlYes) {
- EndDialog(true);
+ EndDialog(RET_OK);
return 0;
}
IMPL_LINK_NOARG(RestartDialog, hdlNo) {
- EndDialog(false);
+ EndDialog(RET_CANCEL);
return 0;
}
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c44dee7..bff8cf5 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1513,7 +1513,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
if( pButton == mpOKButton || pButton == mpCancelButton )
{
storeToSettings();
- EndDialog( pButton == mpOKButton );
+ EndDialog( pButton == mpOKButton ? RET_OK : RET_CANCEL );
}
else if( pButton == mpHelpButton )
{
commit a53cb5d7b49c0d4ae298805caea7b0f023612ed2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:04:48 2014 +0100
Use bool
Change-Id: I38f7ec288b907e889c71821cfbfac46a9688ba0c
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 98f8a01..8f380da 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -216,9 +216,9 @@ public:
void SetFileFormatVersion( sal_uInt16 nFileFormatVersion );
bool IsCurrentVersionLoading() const;
- static int IsWhich(sal_uInt16 nId) {
+ static bool IsWhich(sal_uInt16 nId) {
return nId && nId <= SFX_WHICH_MAX; }
- static int IsSlot(sal_uInt16 nId) {
+ static bool IsSlot(sal_uInt16 nId) {
return nId && nId > SFX_WHICH_MAX; }
static const SfxItemPool* GetStoringPool();
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 00522c6..8da6edf 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -220,11 +220,8 @@ namespace svl
class SAL_NO_VTABLE IUndoManager
{
public:
- enum
- {
- CurrentLevel = true,
- TopLevel = false
- };
+ static bool const CurrentLevel = true;
+ static bool const TopLevel = false;
virtual ~IUndoManager() { };
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index e4e0113..f63327b 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -820,7 +820,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
rStream >> nSlot;
sal_uInt16 nMappedWhich = GetWhich(nSlot, sal_False);
- int bKnownItem = bOwnPool || IsWhich(nMappedWhich);
+ bool bKnownItem = bOwnPool || IsWhich(nMappedWhich);
sal_uInt16 nRef(0), nCount(0), nVersion(0);
sal_uInt32 nAttrSize(0);
@@ -915,7 +915,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
*ppArr = pNewArr;
// die Items merken, die schon im Pool sind
- int bEmpty = sal_True;
+ bool bEmpty = true;
if ( 0 != pOldArr )
for ( size_t n = 0; bEmpty && n < pOldArr->size(); ++n )
bEmpty = pOldArr->operator[](n) == 0;
@@ -968,7 +968,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
rStream >> nSlot;
sal_uInt16 nMappedWhich = GetWhich(nSlot, sal_False);
- int bKnownItem = bOwnPool || IsWhich(nMappedWhich);
+ bool bKnownItem = bOwnPool || IsWhich(nMappedWhich);
sal_uLong nPos = nLastPos;
sal_uInt32 nSize(0);
commit 3c232d2f86f6944a3d86df0d1f710491cee1b064
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:04:16 2014 +0100
Use proper bool operations
Change-Id: I5b4af4fbd9d286393d8553b9346ad7e74f690a85
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 43a4730..10ec8c6 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -107,7 +107,7 @@ public:
bSet = true;
}
bool IsSet() const { return bSet; }
- void SetDate( bool bDateP ) { bDate = (bDateP != 0); }
+ void SetDate( bool bDateP ) { bDate = bDateP; }
};
class CharClass;
commit e2d4ca69ab8dd90c2eaec0cede1e5aed4a092611
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:02:56 2014 +0100
SfxItemSet::Set should return bool
Change-Id: Icb38319f1307e94ce5c6d43b999a08db1fc38d85
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index a4261cc..5c05647 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -133,7 +133,7 @@ public:
SfxItemState eDontCareAs = SFX_ITEM_UNKNOWN,
SfxItemState eDefaultAs = SFX_ITEM_UNKNOWN );
- virtual int Set( const SfxItemSet&, sal_Bool bDeep = sal_True );
+ virtual bool Set( const SfxItemSet&, sal_Bool bDeep = sal_True );
virtual void Intersect( const SfxItemSet& rSet );
virtual void MergeValues( const SfxItemSet& rSet, sal_Bool bOverwriteDefaults = sal_False );
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 761d781..c17af64 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -863,7 +863,7 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges )
// -----------------------------------------------------------------------
-int SfxItemSet::Set
+bool SfxItemSet::Set
(
const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems
"ubernommen werden sollen */
@@ -892,10 +892,10 @@ int SfxItemSet::Set
[R"uckgabewert]
- int sal_True
+ bool true
es wurden SfxPoolItems "ubernommen
- sal_False
+ false
es wurden keine SfxPoolItems "ubernommen,
da z.B. die Which-Bereiche der SfxItemSets
keine Schnittmenge haben oder in der
@@ -906,7 +906,7 @@ int SfxItemSet::Set
{
DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
- int bRet = sal_False;
+ bool bRet = false;
if ( _nCount )
ClearItem();
if ( bDeep )
commit d1043892df97078546bf9c5ac697bcb65b457cc9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jan 10 17:01:52 2014 +0100
SfxPoolItem::operator ==, != should return bool
...and SfxEnumItemInterface::HasBoolValue, too.
Change-Id: Ia032e3d35a4c3b4c1efdc515ca36e466be03fc0a
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index b57abfe..f8e0f43 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -114,7 +114,7 @@ MediaItem::~MediaItem()
// ------------------------------------------------------------------------------
-int MediaItem::operator==( const SfxPoolItem& rItem ) const
+bool MediaItem::operator==( const SfxPoolItem& rItem ) const
{
assert( SfxPoolItem::operator==(rItem));
MediaItem const& rOther(static_cast< const MediaItem& >(rItem));
diff --git a/basctl/source/basicide/sbxitem.cxx b/basctl/source/basicide/sbxitem.cxx
index 75ff877..7a1f2e9 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -57,7 +57,7 @@ SfxPoolItem *SbxItem::Clone(SfxItemPool*) const
return new SbxItem(*this);
}
-int SbxItem::operator==(const SfxPoolItem& rCmp) const
+bool SbxItem::operator==(const SfxPoolItem& rCmp) const
{
SbxItem const* pSbxItem = dynamic_cast<SbxItem const*>(&rCmp);
DBG_ASSERT(pSbxItem, "==: no SbxItem!" );
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 1d4b224..c3c02cc 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -49,7 +49,7 @@ public:
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const;
- virtual int operator==(const SfxPoolItem&) const;
+ virtual bool operator==(const SfxPoolItem&) const;
ScriptDocument const& GetDocument () const { return m_aDocument; }
OUString const& GetLibName () const { return m_aLibName; }
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index 48631df..5a68941 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -59,7 +59,7 @@ TextAttrib* SpellErrorAttrib::Clone() const
}
//-----------------------------------------------------------------------
-int SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const
+bool SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const
{
return Which() == rAttr.Which() &&
m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription;
@@ -97,7 +97,7 @@ TextAttrib* SpellLanguageAttrib::Clone() const
}
//-----------------------------------------------------------------------
-int SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const
+bool SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const
{
return Which() == rAttr.Which() &&
m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage;
@@ -135,7 +135,7 @@ TextAttrib* SpellBackgroundAttrib::Clone() const
}
//-----------------------------------------------------------------------
-int SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const
+bool SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const
{
return Which() == rAttr.Which() &&
m_aBackgroundColor == static_cast<const SpellBackgroundAttrib&>(rAttr).m_aBackgroundColor;
diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx
index 72910c0..0e945e4 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -114,7 +114,7 @@ public:
virtual void SetFont( Font& rFont ) const;
virtual TextAttrib* Clone() const;
- virtual int operator==( const TextAttrib& rAttr ) const;
+ virtual bool operator==( const TextAttrib& rAttr ) const;
};
//-------------------------------------------------
@@ -137,7 +137,7 @@ public:
virtual void SetFont( Font& rFont ) const;
virtual TextAttrib* Clone() const;
- virtual int operator==( const TextAttrib& rAttr ) const;
+ virtual bool operator==( const TextAttrib& rAttr ) const;
};
//-------------------------------------------------
@@ -159,7 +159,7 @@ public:
virtual void SetFont( Font& rFont ) const;
virtual TextAttrib* Clone() const;
- virtual int operator==( const TextAttrib& rAttr ) const;
+ virtual bool operator==( const TextAttrib& rAttr ) const;
};
}//namespace svx
#endif
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index 2fdd1e4..5a36064 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -290,7 +290,7 @@ SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const
return new SvxChartColorTableItem( *this );
}
-int SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "SvxChartColorTableItem::operator== : types differ" );
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index c72948f..b656d95 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -98,7 +98,7 @@ public:
SvxChartColorTableItem( const SvxChartColorTableItem& );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
void SetOptions( SvxChartOptions* pOpts ) const;
const SvxChartColorTable & GetColorList() const ;
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 12e1b16d..12d8fad 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -63,7 +63,7 @@ namespace offapp
}
//--------------------------------------------------------------------
- int DriverPoolingSettingsItem::operator==( const SfxPoolItem& _rCompare ) const
+ bool DriverPoolingSettingsItem::operator==( const SfxPoolItem& _rCompare ) const
{
const DriverPoolingSettingsItem* pItem = PTR_CAST(DriverPoolingSettingsItem, &_rCompare);
if (!pItem)
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 3a40015..f1ddfbb 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -87,7 +87,7 @@ namespace offapp
DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
const DriverPoolingSettings& getSettings() const { return m_aSettings; }
diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index 9cfd86b..a3f993e 100644
--- a/cui/source/options/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -38,7 +38,7 @@ namespace svx
}
//--------------------------------------------------------------------
- int DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const
+ bool DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const
{
const DatabaseMapItem* pItem = PTR_CAST(DatabaseMapItem, &_rCompare);
if ( !pItem )
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 68063d9..f3a0fb3 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -76,7 +76,7 @@ namespace svx
DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
const DatabaseRegistrations&
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 6919c73..b8b06cd 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -1114,7 +1114,7 @@ DbuTypeCollectionItem::DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSour
{
}
-int DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const
+bool DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const
{
DbuTypeCollectionItem* pCompare = PTR_CAST(DbuTypeCollectionItem, &_rItem);
return pCompare && (pCompare->getCollection() == getCollection());
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index 0f425cd..e1df6b7 100644
--- a/dbaccess/source/ui/dlg/dsnItem.hxx
+++ b/dbaccess/source/ui/dlg/dsnItem.hxx
@@ -40,7 +40,7 @@ namespace dbaui
DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL);
DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource);
- virtual int operator==(const SfxPoolItem& _rItem) const;
+ virtual bool operator==(const SfxPoolItem& _rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const;
::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; }
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx
index 301896d..f00a295 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.cxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx
@@ -36,7 +36,7 @@ namespace dbaui
{
}
- int OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const
+ bool OptionalBoolItem::operator==( const SfxPoolItem& _rItem ) const
{
const OptionalBoolItem* pCompare = PTR_CAST( OptionalBoolItem, &_rItem );
if ( !pCompare )
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx
index d341da2..bebe97a 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.hxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx
@@ -37,7 +37,7 @@ namespace dbaui
OptionalBoolItem( sal_Int16 nWhich );
OptionalBoolItem( const OptionalBoolItem& _rSource );
- virtual int operator==( const SfxPoolItem& _rItem ) const;
+ virtual bool operator==( const SfxPoolItem& _rItem ) const;
virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const;
bool HasValue() const { return !!m_aValue; }
diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx
index 47bd221..4c8459b 100644
--- a/dbaccess/source/ui/inc/propertysetitem.hxx
+++ b/dbaccess/source/ui/inc/propertysetitem.hxx
@@ -40,7 +40,7 @@ namespace dbaui
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet);
OPropertySetItem(const OPropertySetItem& _rSource);
- virtual int operator==(const SfxPoolItem& _rItem) const;
+ virtual bool operator==(const SfxPoolItem& _rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index f8edbc8..229185e 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -40,7 +40,7 @@ public:
OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList);
OStringListItem(const OStringListItem& _rSource);
- virtual int operator==(const SfxPoolItem& _rItem) const;
+ virtual bool operator==(const SfxPoolItem& _rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const;
::com::sun::star::uno::Sequence< OUString > getList() const { return m_aList; }
diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx
index 81b33cd..85a769c 100644
--- a/dbaccess/source/ui/misc/propertysetitem.cxx
+++ b/dbaccess/source/ui/misc/propertysetitem.cxx
@@ -44,7 +44,7 @@ namespace dbaui
{
}
- int OPropertySetItem::operator==(const SfxPoolItem& _rItem) const
+ bool OPropertySetItem::operator==(const SfxPoolItem& _rItem) const
{
const OPropertySetItem* pCompare = PTR_CAST(OPropertySetItem, &_rItem);
if ((!pCompare) || (pCompare->m_xSet.get() != m_xSet.get()))
diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx
index 0fc3352..a794011 100644
--- a/dbaccess/source/ui/misc/stringlistitem.cxx
+++ b/dbaccess/source/ui/misc/stringlistitem.cxx
@@ -38,7 +38,7 @@ OStringListItem::OStringListItem(const OStringListItem& _rSource)
{
}
-int OStringListItem::operator==(const SfxPoolItem& _rItem) const
+bool OStringListItem::operator==(const SfxPoolItem& _rItem) const
{
const OStringListItem* pCompare = PTR_CAST(OStringListItem, &_rItem);
if ((!pCompare) || (pCompare->m_aList.getLength() != m_aList.getLength()))
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index da40d02..1c681c4 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -268,7 +268,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
// -----------------------------------------------------------------------
-int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT(rItem.ISA(SvxBulletItem),"operator==Types not matching");
const SvxBulletItem& rBullet = (const SvxBulletItem&)rItem;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 11c079b..5f661c6 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -352,7 +352,7 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co
// -----------------------------------------------------------------------
-int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index b48f8d3..6b8c60a 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -312,7 +312,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
// -----------------------------------------------------------------------
-int SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -558,7 +558,7 @@ void SvxLRSpaceItem::AdjustLeft()
// -----------------------------------------------------------------------
-int SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -925,7 +925,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// -----------------------------------------------------------------------
-int SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -1168,7 +1168,7 @@ SfxItemPresentation SvxOpaqueItem::GetPresentation
// class SvxProtectItem --------------------------------------------------
-int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -1398,7 +1398,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// -----------------------------------------------------------------------
-int SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -1655,7 +1655,7 @@ inline sal_Bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2
// -----------------------------------------------------------------------
-int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -2528,7 +2528,7 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy )
// -----------------------------------------------------------------------
-int SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const
{
SvxBoxInfoItem& rBoxInfo = (SvxBoxInfoItem&)rAttr;
@@ -2914,7 +2914,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// class SvxFmtBreakItem -------------------------------------------------
-int SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" );
@@ -3140,7 +3140,7 @@ SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine )
// -----------------------------------------------------------------------
-int SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -3844,7 +3844,7 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem )
// -----------------------------------------------------------------------
-int SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -4166,7 +4166,7 @@ SvxFrameDirectionItem::~SvxFrameDirectionItem()
{
}
-int SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const
+bool SvxFrameDirectionItem::operator==( const SfxPoolItem& rCmp ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 08f0a63..719970f 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -961,7 +961,7 @@ SvxNumBulletItem::~SvxNumBulletItem()
delete pNumRule;
}
-int SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const
+bool SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const
{
return *pNumRule == *((SvxNumBulletItem&)rCopy).pNumRule;
}
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 53f9228..3cb1f4c 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -92,7 +92,7 @@ SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const
// -----------------------------------------------------------------------
-int SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const
+bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rItem), "unequal types" );
return ( xSpellCheck == ( (const SfxSpellCheckItem& )rItem ).GetXSpellChecker() );
@@ -120,7 +120,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) :
// -----------------------------------------------------------------------
-int SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
+bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 7476641..1207f36 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -94,7 +94,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId
// -----------------------------------------------------------------------
-int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -355,7 +355,7 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId )
// -----------------------------------------------------------------------
-int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -726,7 +726,7 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
// -----------------------------------------------------------------------
-int SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -1077,7 +1077,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
// -----------------------------------------------------------------------
-int SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -1608,7 +1608,7 @@ bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
return sal_False;
}
-int SvxParaVertAlignItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxParaVertAlignItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return SfxUInt16Item::operator==( rItem );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 7352f57..9b2d207 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -183,7 +183,7 @@ SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const
// -----------------------------------------------------------------------
-int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -341,7 +341,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
// -----------------------------------------------------------------------
-int SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -593,7 +593,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
// -----------------------------------------------------------------------
-int SvxPostureItem::HasBoolValue() const
+bool SvxPostureItem::HasBoolValue() const
{
return sal_True;
}
@@ -623,7 +623,7 @@ SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
// -----------------------------------------------------------------------
-int SvxWeightItem::HasBoolValue() const
+bool SvxWeightItem::HasBoolValue() const
{
return sal_True;
}
@@ -812,7 +812,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
// -----------------------------------------------------------------------
-int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return GetHeight() == ((SvxFontHeightItem&)rItem).GetHeight() &&
@@ -1193,7 +1193,7 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
// -----------------------------------------------------------------------
-int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return GetWidth() == ((SvxFontWidthItem&)rItem).GetWidth() &&
@@ -1278,7 +1278,7 @@ SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId
// -----------------------------------------------------------------------
-int SvxTextLineItem::HasBoolValue() const
+bool SvxTextLineItem::HasBoolValue() const
{
return sal_True;
}
@@ -1426,7 +1426,7 @@ bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-int SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return SfxEnumItem::operator==( rItem ) &&
@@ -1508,7 +1508,7 @@ SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16
// -----------------------------------------------------------------------
-int SvxCrossedOutItem::HasBoolValue() const
+bool SvxCrossedOutItem::HasBoolValue() const
{
return sal_True;
}
@@ -1966,7 +1966,7 @@ sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
// -----------------------------------------------------------------------
-int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -2354,7 +2354,7 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc,
// -----------------------------------------------------------------------
-int SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -2992,7 +2992,7 @@ SvxTwoLinesItem::~SvxTwoLinesItem()
{
}
-int SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attribute types" );
return bOn == ((SvxTwoLinesItem&)rAttr).bOn &&
@@ -3235,7 +3235,7 @@ bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
return bRet;
}
-int SvxCharRotateItem::operator==( const SfxPoolItem& rItem ) const
+bool SvxCharRotateItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return SfxUInt16Item::operator==( rItem ) &&
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index 3cca427..1a715be 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -36,7 +36,7 @@ SvxWritingModeItem::~SvxWritingModeItem()
{
}
-int SvxWritingModeItem::operator==( const SfxPoolItem& rCmp ) const
+bool SvxWritingModeItem::operator==( const SfxPoolItem& rCmp ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal types" );
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 8cd6de2..32b6b36 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -49,7 +49,7 @@ SvXMLAttrContainerItem::~SvXMLAttrContainerItem()
delete pImpl;
}
-int SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const
+bool SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( rItem.ISA(SvXMLAttrContainerItem),
"SvXMLAttrContainerItem::operator ==(): Bad type");
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx
index 7304e40..b76a9b0 100644
--- a/include/avmedia/mediaitem.hxx
+++ b/include/avmedia/mediaitem.hxx
@@ -70,7 +70,7 @@ public:
MediaItem( const MediaItem& rMediaItem );
virtual ~MediaItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreUnit,
diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 926f994..642d036 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -54,7 +54,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index 25adaf7..adc325f 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -70,7 +70,7 @@ public:
SvxBoxItem &operator=( const SvxBoxItem& rBox );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
@@ -180,7 +180,7 @@ public:
SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 10339ac..d31e637 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -85,7 +85,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 7fca7a1..ad6d473 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -116,7 +116,7 @@ public:
void SetScale( sal_uInt16 nNew ) { nScale = nNew; }
virtual sal_uInt16 GetVersion(sal_uInt16 nFileVersion) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index ebf0bdf..27b9433 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -64,7 +64,7 @@ public:
return *this;
}
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
// our currently only degree values
void SetTopToBotton() { SetValue( 2700 ); }
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 7d7c023..0755f08 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -49,7 +49,7 @@ public:
~SvxColorItem();
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx
index 0ab6da0..6163545 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -57,7 +57,7 @@ public:
void SetValue( sal_uInt16 nNewVal )
{SfxEnumItem::SetValue(nNewVal); }
- virtual int HasBoolValue() const;
+ virtual bool HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx
index 608d38b..d2a28ca 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -52,7 +52,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index e401ecc..4a3403a 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -48,7 +48,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 34ff0b9..d7c8cdc 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -81,7 +81,7 @@ public:
SvxFieldItem( const SvxFieldItem& rItem );
~SvxFieldItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVer ) const;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index 3fa6ee2..fe71e10b 100644
--- a/include/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
@@ -48,7 +48,7 @@ public:
const sal_uInt16 nId );
SvxFontListItem( const SvxFontListItem& rItem );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index c281162..7264c3c 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -54,7 +54,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index e05e253..897abd6 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -44,7 +44,7 @@ public:
inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 3b4e8dd..71174df 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -45,7 +45,7 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx
index 9509c73..51f6539 100644
--- a/include/editeng/fwdtitem.hxx
+++ b/include/editeng/fwdtitem.hxx
@@ -42,7 +42,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 7b46e47..5d1cd57 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -49,7 +49,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index b20c0a2..e85b912 100644
--- a/include/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
@@ -48,7 +48,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 1c81759..d56b268 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -70,7 +70,7 @@ public:
inline SvxLRSpaceItem& operator=( const SvxLRSpaceItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index d04e876..8bb2fad 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -53,7 +53,7 @@ public:
SvxLineSpacingItem( sal_uInt16 nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 067ae96..cd5e83c 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -301,7 +301,7 @@ public:
virtual SfxPoolItem* Create(SvStream &rStream, sal_uInt16 nItemVersion) const;
sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
virtual SvStream& Store(SvStream &rStream, sal_uInt16 nItemVersion ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 954c79c..55102d1 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -48,7 +48,7 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 >
@@ -73,7 +73,7 @@ public:
SfxHyphenRegionItem( const sal_uInt16 nId );
SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx
index d4b20b4..d864b90 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -60,7 +60,7 @@ public:
return *this;
}
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
};
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 921908b..88a9651 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -55,7 +55,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual int HasBoolValue() const;
+ virtual bool HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index b107064..de46da7 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -45,7 +45,7 @@ public:
inline SvxProtectItem &operator=( const SvxProtectItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 5c47b9b..2415997 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -52,7 +52,7 @@ public:
inline SvxShadowItem& operator=( const SvxShadowItem& rFmtShadow );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx
index 60e2bf9..f3095b0 100644
--- a/include/editeng/sizeitem.hxx
+++ b/include/editeng/sizeitem.hxx
@@ -44,7 +44,7 @@ public:
inline SvxSizeItem& operator=( const SvxSizeItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index b2d8256..5f47d64 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -146,7 +146,7 @@ public:
}
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index a157f49..6ebc9d2 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -39,7 +39,7 @@ public:
virtual ~SvxTwoLinesItem();
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const;
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 1d77351..8b64997 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -57,11 +57,11 @@ public:
// MS VC4.0 messes things up
void SetValue( sal_uInt16 nNewVal )
{SfxEnumItem::SetValue(nNewVal); }
- virtual int HasBoolValue() const;
+ virtual bool HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
inline SvxTextLineItem& operator=(const SvxTextLineItem& rTextLine)
{
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index 4faaa9c..46e4a31 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -47,7 +47,7 @@ public:
inline SvxULSpaceItem& operator=( const SvxULSpaceItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 548e232..c4dc9ac 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -55,7 +55,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual int HasBoolValue() const;
+ virtual bool HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx
index 565a599..78c3f8e 100644
--- a/include/editeng/writingmodeitem.hxx
+++ b/include/editeng/writingmodeitem.hxx
@@ -40,7 +40,7 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index 7d4c117..5d02694 100644
--- a/include/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
@@ -40,7 +40,7 @@ public:
SvXMLAttrContainerItem( const SvXMLAttrContainerItem& );
virtual ~SvXMLAttrContainerItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
using SfxPoolItem::Compare;
virtual int Compare( const SfxPoolItem &rWith ) const;
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 6827ce6..5a5cf36 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -106,7 +106,7 @@ class SfxLinkItem : public SfxPoolItem
public:
virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const
{ return new SfxLinkItem( *this ); }
- virtual int operator==( const SfxPoolItem& rL) const
+ virtual bool operator==( const SfxPoolItem& rL) const
{ return ((SfxLinkItem&)rL).aLink == aLink; }
SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId )
{ aLink = rValue; }
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a4d6acd..f13514d 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -171,7 +171,7 @@ public:
void SetCmisProperties(::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > cmisProps );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 6a1a599..8cdd19e 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -78,7 +78,7 @@ public:
SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {}
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 3e8ee68..ad04fde 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -51,7 +51,7 @@ class SfxRefItem : public SfxPoolItem
public:
virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const
{ return new SfxRefItem( *this ); }
- virtual int operator==( const SfxPoolItem& rL) const
+ virtual bool operator==( const SfxPoolItem& rL) const
{ return ((SfxRefItem&)rL).aRef == aRef; }
SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId )
{ aRef = rValue; }
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 73d1056..9512f21 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -239,7 +239,7 @@ public:
SfxFrameItem( SfxFrame *p=0 );
SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual OUString GetValueText() const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -260,7 +260,7 @@ public:
SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny );
::com::sun::star::uno::Any GetValue() const
{ return aValue; }
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
@@ -278,7 +278,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
GetFrame() const
{ return m_xFrame; }
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 7837849..bd8a2b0 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -237,7 +237,7 @@ public:
virtual ~SfxFrameDescriptorItem();
- virtual int operator ==( const SfxPoolItem& ) const;
+ virtual bool operator ==( const SfxPoolItem& ) const;
SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index 83e023b..85b855b 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -46,7 +46,7 @@ public:
SfxMacroInfoItem( const SfxMacroInfoItem& );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
OUString GetComment() const
{ return aCommentText; }
void SetComment( const OUString& r )
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index d801df9..bee4106 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -35,7 +35,7 @@ public:
TYPEINFO();
SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
SfxShell* GetShell() const
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index de041fbf..7477963 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -789,7 +789,7 @@ public:
pObjSh( pObjShell )
{}
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual OUString GetValueText() const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 30fa06e..b8e664c 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -40,7 +40,7 @@ public:
const OUString& GetStyleName() const { return aStyle; }
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual sal_uInt8 GetFlagCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index cf316b7..8c245ab 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -303,7 +303,7 @@ public:
pFrame( pViewFrame)
{}
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual OUString GetValueText() const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -323,7 +323,7 @@ public:
SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index df1a0db..10181da 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -61,7 +61,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const;
virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 1444cdd..e950729 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -38,7 +38,7 @@ protected:
public:
TYPEINFO();
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation,
SfxMapUnit, SfxMapUnit,
@@ -74,7 +74,7 @@ public:
virtual void SetEnumValue(sal_uInt16 nValue) = 0;
- virtual int HasBoolValue() const;
+ virtual bool HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index a4d2e8e..94d1ed2 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -43,7 +43,7 @@ public:
virtual ~CntByteItem() { DBG_DTOR(CntByteItem, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
@@ -105,7 +105,7 @@ public:
virtual ~CntUInt16Item() { DBG_DTOR(CntUInt16Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
@@ -167,7 +167,7 @@ public:
virtual ~CntInt32Item() { DBG_DTOR(CntInt32Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
@@ -229,7 +229,7 @@ public:
virtual ~CntUInt32Item() { DBG_DTOR(CntUInt32Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index d6ef543..3a398bc 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -45,7 +45,7 @@ public:
virtual sal_uInt16 GetVersion(sal_uInt16) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const;
virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx
index a4bf8cc..2fa5f97 100644
--- a/include/svl/ctypeitm.hxx
+++ b/include/svl/ctypeitm.hxx
@@ -41,7 +41,7 @@ public:
sal_uInt16 nItemVersion ) const;
virtual SvStream & Store(SvStream & rStream, sal_uInt16) const;
- virtual int operator==( const SfxPoolItem& rOrig ) const;
+ virtual bool operator==( const SfxPoolItem& rOrig ) const;
virtual sal_uInt16 GetVersion(sal_uInt16) const;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 0da93d6..4c7e658 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -47,7 +47,7 @@ public:
virtual ~CntUnencodedStringItem() { DBG_DTOR(CntUnencodedStringItem, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index 51d2d67..0feb03f 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -86,7 +86,7 @@ public:
void SetValue(bool const bTheValue) { m_bValue = bTheValue; }
// SfxPoolItem
- virtual int operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
+ virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE;
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 36fdbec..a5510a6 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -45,7 +45,7 @@ public:
virtual sal_uInt8 GetFlagCount() const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index f911bbf..05385ea 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -37,7 +37,7 @@ public:
SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& );
~SfxGlobalNameItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
SvGlobalName GetValue() const { return m_aName; }
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index e28f213..0f3f763 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -33,7 +33,7 @@ public:
void SetGrabBag(const std::map<OUString, com::sun::star::uno::Any>& rMap);
const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const;
- virtual int operator==(const SfxPoolItem&) const;
+ virtual bool operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0);
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index cc7c75a..a5d1d6b 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -45,7 +45,7 @@ public:
void GetList( ::std::vector < sal_Int32 >& rList ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx
index b36f7ba..dbedde8 100644
--- a/include/svl/imageitm.hxx
+++ b/include/svl/imageitm.hxx
@@ -34,7 +34,7 @@ public:
virtual ~SfxImageItem();
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 6807a80..0ca7c29 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -60,7 +60,7 @@ public:
virtual ~SfxInt16Item() { DBG_DTOR(SfxInt16Item, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 7797565..102a851 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -38,7 +38,7 @@ public:
SfxLockBytesItem( const SfxLockBytesItem& );
~SfxLockBytesItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 7744538..0b5eb82 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -137,7 +137,7 @@ public:
explicit inline SvxMacroItem ( const sal_uInt16 nId );
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index fc5d5bf..37838ca 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -194,8 +194,8 @@ public:
sal_uInt16 Which() const {
DBG_CHKTHIS(SfxPoolItem, 0);
return m_nWhich; }
- virtual int operator==( const SfxPoolItem& ) const = 0;
- int operator!=( const SfxPoolItem& rItem ) const
+ virtual bool operator==( const SfxPoolItem& ) const = 0;
+ bool operator!=( const SfxPoolItem& rItem ) const
{ return !(*this == rItem); }
virtual int Compare( const SfxPoolItem &rWith ) const;
virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const;
@@ -301,27 +301,27 @@ inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const
// -----------------------------------------------------------------------
-inline int IsPoolDefaultItem(const SfxPoolItem *pItem )
+inline bool IsPoolDefaultItem(const SfxPoolItem *pItem )
{
return pItem && pItem->GetKind() == SFX_ITEMS_POOLDEFAULT;
}
-inline int IsStaticDefaultItem(const SfxPoolItem *pItem )
+inline bool IsStaticDefaultItem(const SfxPoolItem *pItem )
{
return pItem && pItem->GetKind() == SFX_ITEMS_STATICDEFAULT;
}
-inline int IsDefaultItem( const SfxPoolItem *pItem )
+inline bool IsDefaultItem( const SfxPoolItem *pItem )
{
return pItem && pItem->GetKind() >= SFX_ITEMS_STATICDEFAULT;
}
-inline int IsPooledItem( const SfxPoolItem *pItem )
+inline bool IsPooledItem( const SfxPoolItem *pItem )
{
return pItem && pItem->GetRefCount() > 0 && pItem->GetRefCount() <= SFX_ITEMS_MAXREF;
}
-inline int IsInvalidItem(const SfxPoolItem *pItem)
+inline bool IsInvalidItem(const SfxPoolItem *pItem)
{
return pItem == (SfxPoolItem *)-1;
}
@@ -338,7 +338,7 @@ public:
SfxVoidItem( const SfxVoidItem& );
~SfxVoidItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -366,7 +366,7 @@ public:
SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 );
~SfxSetItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 89e4684..dedcc29 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -47,7 +47,7 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 19d900b..c5a280b 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -48,7 +48,7 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx
index 11f3403..069929e 100644
--- a/include/svl/rngitem.hxx
+++ b/include/svl/rngitem.hxx
@@ -37,7 +37,7 @@ public:
SfxRangeItem();
SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
SfxRangeItem( const SfxRangeItem& rItem );
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -66,7 +66,7 @@ public:
SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream );
SfxUShortRangesItem( const SfxUShortRangesItem& rItem );
virtual ~SfxUShortRangesItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index ea810f9..9481206 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -53,7 +53,7 @@ public:
void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList );
void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 037e619..95cce81 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -83,7 +83,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual int operator == ( const SfxPoolItem& ) const;
+ virtual bool operator == ( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index 4f79db3..e75d432 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -47,7 +47,7 @@ public:
OUString &rText,
const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 7aad26f..7d98b19 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -50,7 +50,7 @@ public:
virtual ~SfxVisibilityItem() { DBG_DTOR(SfxVisibilityItem, 0); }
- virtual int operator ==(const SfxPoolItem & rItem) const;
+ virtual bool operator ==(const SfxPoolItem & rItem) const;
using SfxPoolItem::Compare;
virtual int Compare(const SfxPoolItem & rWith) const;
diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx
index e7f2562..33ce019 100644
--- a/include/svtools/xwindowitem.hxx
+++ b/include/svtools/xwindowitem.hxx
@@ -45,7 +45,7 @@ public:
~XWindowItem();
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual int operator == ( const SfxPoolItem& rAttr ) const;
+ virtual bool operator == ( const SfxPoolItem& rAttr ) const;
Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); }
com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; }
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index a9f3eac..b5480b0 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -39,7 +39,7 @@ public:
AffineMatrixItem(const AffineMatrixItem&);
virtual ~AffineMatrixItem();
- virtual int operator==(const SfxPoolItem&) const;
+ virtual bool operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index aea4883..6ba81ac 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -64,7 +64,7 @@ public:
const OUString& rRangeText );
// "pure virtual Methoden" vom SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; // leer
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 83af82d..58caee4 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -90,7 +90,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const;
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 95e8c3a..54c4ab0 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -317,7 +317,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0) const;
- virtual int operator == (const SfxPoolItem&) const;
+ virtual bool operator == (const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const;
virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 362915f..3407b5e 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxClipboardFmtItem : public SfxPoolItem
SvxClipboardFmtItem_Impl* pImpl;
protected:
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
public:
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 23df7cd..a1b07f8 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -45,7 +45,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
@@ -75,7 +75,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
@@ -105,7 +105,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
@@ -136,7 +136,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
@@ -167,7 +167,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
@@ -195,7 +195,7 @@ public:
SfxMapUnit ePresMetric,
OUString &rText, const IntlWrapper * = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 544411d..fae604d 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -40,7 +40,7 @@ public:
SvxB3DVectorItem( const SvxB3DVectorItem& );
~SvxB3DVectorItem();
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 2411cab..9509c87 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -60,7 +60,7 @@ public:
const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > GetGraphic() const { return m_xGraphic; }
// pure virtual methods from SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual bool operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
// bridge to UNO
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index ec7afbb..f8c1186 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -36,7 +36,7 @@ public:
TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list