summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-07-14 12:30:24 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-07-14 16:07:39 +0200
commitd24b51826109f73a23386b69879de66967a600db (patch)
tree082bba80b970ac60b3b1ff2ec0ad5745410c9e4f /sfx2
parentfeca4833447be51e97bcd8f1672e5256bf8c27b2 (diff)
Revert "Some cppcheck cleaning"
This reverts commit b21661ce4200fd8040a213770a3f9e63a4b9f137. this breaks with ../framework/source/lomenubar/MenuItemInfo.hxx:49:12: error: expected ‘;’ at end of member declaration
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/dialog/filtergrouping.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 8bc670491176..d22c4fd41158 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -620,7 +620,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt )
for( int i = 0; i < 2; ++i )
{
for( std::vector<DdeTopic*>::iterator iterTopic = rTopics.begin();
- iterTopic != rTopics.end(); ++iterTopic )
+ iterTopic != rTopics.end(); iterTopic++ )
if( (*iterTopic)->GetName() == sTopic )
return *iterTopic;
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index ce73733fa3e3..2745d65f1e49 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -1048,7 +1048,7 @@ namespace sfx2
if ( xFilterGroupManager.is() )
{
// Add both html/pdf filter as a filter group to get a separator between both groups
- if ( !aImportantFilterGroup.empty() )
+ if ( aImportantFilterGroup.size() > 0 )
{
Sequence< StringPair > aFilters( aImportantFilterGroup.size() );
for ( sal_Int32 i = 0; i < (sal_Int32)aImportantFilterGroup.size(); i++ )
@@ -1068,7 +1068,7 @@ namespace sfx2
}
}
- if ( !aFilterGroup.empty() )
+ if ( aFilterGroup.size() > 0 )
{
Sequence< StringPair > aFilters( aFilterGroup.size() );
for ( sal_Int32 i = 0; i < (sal_Int32)aFilterGroup.size(); i++ )