summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-17 17:04:22 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-17 18:45:14 +0100
commit20223e2374bb6a966e44471c224d22d968d19025 (patch)
treee7b935638da81c3df30a3fca00e39c8769c2a515 /sfx2
parent5169abbac92f30b950ab19c2c8e285c47fb1f0d7 (diff)
bool improvements
Change-Id: I9f5564100aa64ff4940dd93a81ff5a8d8edc7a07
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/bindings.cxx4
-rw-r--r--sfx2/source/control/templatelocalview.cxx2
-rw-r--r--sfx2/source/dialog/securitypage.cxx2
-rw-r--r--sfx2/source/doc/frmdescr.cxx2
-rw-r--r--sfx2/source/notify/eventsupplier.cxx2
-rw-r--r--sfx2/source/view/frame.cxx2
-rw-r--r--sfx2/source/view/viewfrm2.cxx2
7 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 064d978dcc2a..33e05cf80d53 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -188,10 +188,10 @@ struct SfxFoundCache_Impl
pCache(pC)
{}
- int operator<( const SfxFoundCache_Impl &r ) const
+ bool operator<( const SfxFoundCache_Impl &r ) const
{ return nWhichId < r.nWhichId; }
- int operator==( const SfxFoundCache_Impl &r ) const
+ bool operator==( const SfxFoundCache_Impl &r ) const
{ return nWhichId== r.nWhichId; }
};
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 4d85a202ff74..35890f71886e 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -281,7 +281,7 @@ sal_uInt16 TemplateLocalView::createRegion(const OUString &rName)
sal_uInt16 nItemId = getNextItemId();
if (!mpDocTemplates->InsertDir(rName,nRegionId))
- return false;
+ return 0;
OUString aRegionName = rName;
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index be59a6490f82..4b45f68d3829 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -93,7 +93,7 @@ namespace
}
-static short lcl_GetPassword(
+static bool lcl_GetPassword(
Window *pParent,
bool bProtect,
/*out*/OUString &rPassword )
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 7a8cba85891b..8ca270242f65 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -172,7 +172,7 @@ SfxFrameProperties& SfxFrameProperties::operator =(
return *this;
}
-int SfxFrameProperties::operator ==( const SfxFrameProperties& rProp ) const
+bool SfxFrameProperties::operator ==( const SfxFrameProperties& rProp ) const
{
return aURL == rProp.aURL && aName == rProp.aName && lMarginWidth == rProp.lMarginWidth && lMarginHeight == rProp.lMarginHeight &&
lSize == rProp.lSize && eScroll == rProp.eScroll && eSizeSelector == rProp.eSizeSelector &&
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 067ae2154abd..56e45f40d4ea 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -85,7 +85,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::
OUString sType;
if ( ( aNormalizedDescriptor.size() == 1 )
- && ( aNormalizedDescriptor.has( PROP_EVENT_TYPE) == 0 )
+ && !aNormalizedDescriptor.has( PROP_EVENT_TYPE ) //TODO
&& ( aNormalizedDescriptor.get( PROP_EVENT_TYPE ) >>= sType )
&& ( sType.isEmpty() )
)
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 7ad74291daf7..569dd190f97f 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -206,7 +206,7 @@ bool SfxFrame::PrepareClose_Impl( sal_Bool bUI )
{
// SFX components have a known behaviour
// First check if this frame is the only view to its current document
- int bOther = sal_False;
+ bool bOther = false;
for ( const SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pCur );
!bOther && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, pCur ) )
{
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 02ca4f0fcdb4..cba1a79b0aea 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -243,7 +243,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
{
// More Views on the same Document?
SfxObjectShell *pDocSh = GetObjectShell();
- int bOther = sal_False;
+ bool bOther = false;
for ( const SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocSh );
!bOther && pFrame;
pFrame = SfxViewFrame::GetNext( *pFrame, pDocSh ) )