summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/invmerge.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2011-03-10 16:55:21 -0500
committerKohei Yoshida <kyoshida@novell.com>2011-03-10 20:21:13 -0500
commit12343c15568dcc2c9209d8ca41fda2263122448f (patch)
tree3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/view/invmerge.cxx
parent99745dbcbb25b61437914c9782475d0b67a4b0bd (diff)
parentce6308e4fad2281241bf4ca78280eba29f744d43 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/view/invmerge.cxx')
-rw-r--r--sc/source/ui/view/invmerge.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index cb913677e962..c65b29ba1a6e 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -164,7 +164,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect )
}
else
{
- BOOL bDone = FALSE;
+ sal_Bool bDone = false;
if ( aJustified.Top() == aLineRect.Top() &&
aJustified.Bottom() == aLineRect.Bottom() )
{
@@ -172,12 +172,12 @@ void ScInvertMerger::AddRect( const Rectangle& rRect )
if ( aJustified.Left() == aLineRect.Right() + 1 )
{
aLineRect.Right() = aJustified.Right();
- bDone = TRUE;
+ bDone = sal_True;
}
else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout
{
aLineRect.Left() = aJustified.Left();
- bDone = TRUE;
+ bDone = sal_True;
}
}
if (!bDone)