summaryrefslogtreecommitdiff
path: root/ucb/source/sorter
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-19 16:01:15 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-19 16:01:15 +0000
commitc42172867e6e0a66c38260b3db657652f26fec11 (patch)
tree8a74c7ebba003eb282a11b4a97aa8a564f7ef191 /ucb/source/sorter
parent5271bd2c86f95d588a8ff8b0832d7c1bb88114bc (diff)
INTEGRATION: CWS warningfixes02 (1.12.4); FILE MERGED
2006/06/30 12:19:52 sb 1.12.4.1: #i66577# Made the code compile (warning-free) on a unxlngi6.pro GCC 4.1.1 Linux box.
Diffstat (limited to 'ucb/source/sorter')
-rw-r--r--ucb/source/sorter/sortresult.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index d2988bdff501..a84e3038cf29 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sortresult.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 05:18:35 $
+ * last change: $Author: kz $ $Date: 2006-07-19 17:01:15 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -961,7 +961,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
else if ( PropertyName.compareToAscii( "IsRowCountFinal" ) == 0 )
{
sal_uInt32 nOrgCount;
- sal_Bool bOrgFinal;
+ sal_Bool bOrgFinal = false;
Any aOrgRet;
aRet <<= (sal_Bool) sal_False;
@@ -1526,8 +1526,7 @@ void SortedResultSet::CheckProperties( long nOldCount, sal_Bool bWasFinal )
OUString aName = OUString::createFromAscii( "IsRowCountFinal" );
Any aRet = getPropertyValue( aName );
- aRet >>= bIsFinal;
- if ( bIsFinal != bWasFinal )
+ if ( (aRet >>= bIsFinal) && bIsFinal != bWasFinal )
{
aEvt.PropertyName = aName;
aEvt.Further = sal_False;