summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-01-29 10:02:54 +0000
committerKurt Zenker <kz@openoffice.org>2009-01-29 10:02:54 +0000
commit3cb9494b42a5be33d4bc210cc7481aeafd851656 (patch)
tree632352fc2d1e0189510208019647a28bdfbfef2e
parentd0f8e2fb691766435d388752a425ed98712e04d9 (diff)
CWS-TOOLING: integrate CWS cmcfixes52
2009-01-05 10:49:04 +0100 cmc r265860 : #i97763# remove low-hanging warnings
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx2
-rw-r--r--uui/source/masterpasscrtdlg.cxx2
-rw-r--r--uui/source/passcrtdlg.cxx2
-rw-r--r--uui/source/passworddlg.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/inc/db/Block.hxx8
-rw-r--r--xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx6
-rw-r--r--xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx4
-rw-r--r--xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx2
-rw-r--r--xmlhelp/source/cxxhelp/qe/DocGenerator.cxx2
-rw-r--r--xmlhelp/source/cxxhelp/qe/Search.cxx2
-rw-r--r--xmloff/inc/xmloff/xmlexp.hxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx2
-rw-r--r--xmloff/source/draw/sdpropls.cxx6
13 files changed, 24 insertions, 18 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 07c0fbca21..faa070c2a9 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -438,7 +438,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
// Distinguish between closing the dialog and programatically
// canceling the dialog (headless VCL):
approve = n == RET_OK
- || n == RET_CANCEL && !Application::IsDialogCancelEnabled();
+ || (n == RET_CANCEL && !Application::IsDialogCancelEnabled());
}
}
else if (request >>= licAgreementExc)
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index c2f4445a2e..c085c9cafd 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -117,7 +117,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog
long nNewLabelHeight = 0;
for( nNewLabelHeight = ( nTextWidth / nLableWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
- nNewLabelHeight += nTextHeight );
+ nNewLabelHeight += nTextHeight ) ;
long nDelta = nNewLabelHeight - nLabelHeight;
Size aNewDlgSize = GetSizePixel();
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
index 6a48122352..3b548d3511 100644
--- a/uui/source/passcrtdlg.cxx
+++ b/uui/source/passcrtdlg.cxx
@@ -101,7 +101,7 @@ PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr )
long nNewLabelHeight = 0;
for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
- nNewLabelHeight += nTextHeight );
+ nNewLabelHeight += nTextHeight ) ;
long nDelta = nNewLabelHeight - nLabelHeight;
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 1be6742283..453e7eb0f9 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -92,7 +92,7 @@ PasswordDialog::PasswordDialog
long nNewLabelHeight = 0;
for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
nNewLabelHeight < aRect.GetHeight();
- nNewLabelHeight += nTextHeight );
+ nNewLabelHeight += nTextHeight ) ;
long nDelta = nNewLabelHeight - nLabelHeight;
diff --git a/xmlhelp/source/cxxhelp/inc/db/Block.hxx b/xmlhelp/source/cxxhelp/inc/db/Block.hxx
index d12cfe9f05..d11b817b36 100644
--- a/xmlhelp/source/cxxhelp/inc/db/Block.hxx
+++ b/xmlhelp/source/cxxhelp/inc/db/Block.hxx
@@ -99,10 +99,10 @@ namespace xmlsearch {
inline sal_Int32 getInteger_( const sal_Int8* v )
{
- return (((((( v[0]&0xFF ) << 8 )
- | v[1]&0xFF ) << 8 )
- | v[2]&0xFF ) << 8 )
- | v[3]&0xFF;
+ return (((((( (v[0]&0xFF) ) << 8 )
+ | (v[1]&0xFF) ) << 8 )
+ | (v[2]&0xFF) ) << 8 )
+ | (v[3]&0xFF);
}
diff --git a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
index 775c68b765..217870a549 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx
@@ -67,9 +67,9 @@ namespace xmlsearch {
bool crEquals( ConceptData* r ) { return cEquals( r ) && role_ == r->role_; }
bool crqEquals( ConceptData* r ) { return crEquals( r ) && queryNo_ == r->queryNo_; }
bool compareWith( ConceptData* r ) { return
- concept_ < r->concept_ ||
- cEquals( r ) && role_ < r->role_ ||
- crEquals( r ) && penalty_ < r->penalty_; }
+ (concept_ < r->concept_) ||
+ (cEquals( r ) && role_ < r->role_) ||
+ (crEquals( r ) && penalty_ < r->penalty_); }
void addLast( ConceptData* r );
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index d2d15ae283..4e64994802 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -93,9 +93,9 @@ namespace xmlsearch {
bool smallerThan( NextDocGenerator* other )
{
return
- document_ < other->document_
+ (document_ < other->document_)
||
- document_ == other->document_ && concept_ < other->concept_;
+ (document_ == other->document_ && concept_ < other->concept_);
}
diff --git a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx
index 55ca0534ab..78a5150c50 100644
--- a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx
+++ b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx
@@ -52,10 +52,12 @@ namespace xmlsearch {
IndexAccessor( const rtl::OUString& dirName )
{
if( dirName.getLength() )
+ {
if( dirName.getStr()[dirName.getLength()-1] != sal_Unicode( '/' ) )
dirName_ = ( dirName + rtl::OUString::createFromAscii( "/" ) ) ;
else
dirName_ = dirName;
+ }
}
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
index 61fb87f950..a6bbdf04e9 100644
--- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
+++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx
@@ -473,6 +473,7 @@ bool GeneratorHeap::next( std::vector< RoleFiller* >& array ) throw( xmlsearch::
if( heapSize_ > 0 )
{
if( ! heap_[0]->next() ) // no more
+ {
if( heapSize_ > 1)
{
delete heap_[0];
@@ -484,6 +485,7 @@ bool GeneratorHeap::next( std::vector< RoleFiller* >& array ) throw( xmlsearch::
heapSize_ = 0;
return false;
}
+ }
heapify(0);
heap_[0]->generateFillers( array );
return true;
diff --git a/xmlhelp/source/cxxhelp/qe/Search.cxx b/xmlhelp/source/cxxhelp/qe/Search.cxx
index 4dd8e78176..d98cb176e2 100644
--- a/xmlhelp/source/cxxhelp/qe/Search.cxx
+++ b/xmlhelp/source/cxxhelp/qe/Search.cxx
@@ -347,6 +347,7 @@ void Search::startSearch()
for (j = i + 1; j < free2_; j++ )
{
if( conceptData_[j].is() )
+ {
if( conceptData_[i]->cEquals( conceptData_[j].get() ) )
{
conceptData_[i]->addLast( conceptData_[j].get() );
@@ -354,6 +355,7 @@ void Search::startSearch()
}
else
i = j;
+ }
}
}
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index 5bf36c9360..9d62b7c550 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -575,7 +575,7 @@ public:
::com::sun::star::uno::XInterface> const & i_xIfc);
// --> OD 2008-11-26 #158694#
- const sal_Bool exportTextNumberElement() const;
+ sal_Bool exportTextNumberElement() const;
// <--
};
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index a8287f8f5b..1aee3bfa02 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2375,7 +2375,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
}
// --> OD 2008-11-26 #158694#
-const sal_Bool SvXMLExport::exportTextNumberElement() const
+sal_Bool SvXMLExport::exportTextNumberElement() const
{
return mpImpl->mbExportTextNumberElement;
}
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 3453dc2379..42d3ab356b 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1602,7 +1602,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
case CTF_PAGE_TRANSITION_TYPE:
{
if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) ||
- ((*property).maValue >>= nTransitionType) && (nTransitionType == 0) )
+ (((*property).maValue >>= nTransitionType) && (nTransitionType == 0)) )
(*property).mnIndex = -1;
}
break;
@@ -1610,7 +1610,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
{
sal_Int16 nTransitionSubtype = sal_Int16();
if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) ||
- ((*property).maValue >>= nTransitionSubtype) && (nTransitionSubtype == 0) )
+ (((*property).maValue >>= nTransitionSubtype) && (nTransitionSubtype == 0)) )
(*property).mnIndex = -1;
}
@@ -1619,7 +1619,7 @@ void XMLPageExportPropertyMapper::ContextFilter(
{
sal_Bool bDirection = sal_Bool();
if( ((mrExport.getExportFlags() & EXPORT_OASIS) == 0) ||
- ((*property).maValue >>= bDirection) && bDirection )
+ (((*property).maValue >>= bDirection) && bDirection) )
(*property).mnIndex = -1;
}
break;