diff options
author | Kurt Zenker <kz@openoffice.org> | 2009-01-29 10:02:54 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2009-01-29 10:02:54 +0000 |
commit | 4c39ae976837fe7c6a7529234ae369e7cc4519b7 (patch) | |
tree | c7aee2740d7ff95a31df0eb020ea6ec069d0ee29 | |
parent | 259ca3fe08291a243b2232a5d5ec2d8600bfe8a7 (diff) |
CWS-TOOLING: integrate CWS cmcfixes52
2009-01-05 10:49:04 +0100 cmc r265860 : #i97763# remove low-hanging warnings
-rw-r--r-- | i18npool/source/breakiterator/xdictionary.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 4 | ||||
-rw-r--r-- | transex3/source/tagtest.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/implncvt.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/outdev3.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/salgdilayout.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 6 |
7 files changed, 21 insertions, 9 deletions
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index eeafc899a39f..fb832f0b6468 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -193,7 +193,7 @@ static sal_Int16 JapaneseCharType(sal_Unicode c) { if (0x3041 <= c && c <= 0x309e) return HIRAKANA; - if (0x30a1 <= c && c <= 0x30fe || 0xff65 <= c && c <= 0xff9f) + if ((0x30a1 <= c && c <= 0x30fe) || (0xff65 <= c && c <= 0xff9f)) return KATAKANA; return KANJA; } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 526af00e5b5f..05ab0e1b0c91 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -1683,10 +1683,12 @@ BOOL BrowseBox::GoToRow( long nRow, BOOL bRowColMove, BOOL bKeepSelection ) CursorMoved(); if ( !bMultiSelection && !bKeepSelection ) + { if ( !bSelecting ) Select(); else bSelect = TRUE; + } return TRUE; } @@ -1727,10 +1729,12 @@ BOOL BrowseBox::GoToColumnId( USHORT nColId, BOOL bMakeVisible, BOOL bRowColMove USHORT nFrozen = FrozenColCount(); if ( bMakeVisible && nLastPos && nNewPos >= nFrozen && ( nNewPos < nFirstPos || nNewPos > nLastPos ) ) + { if ( nNewPos < nFirstPos ) ScrollColumns( nNewPos-nFirstPos ); else if ( nNewPos > nLastPos ) ScrollColumns( nNewPos-nLastPos ); + } DoShowCursor( "GoToColumnId" ); if (!bRowColMove) diff --git a/transex3/source/tagtest.cxx b/transex3/source/tagtest.cxx index 1a31221be7f0..89c1ecf15488 100644 --- a/transex3/source/tagtest.cxx +++ b/transex3/source/tagtest.cxx @@ -440,12 +440,12 @@ BOOL TokenInfo::IsPropertyInvariant( const ByteString &aName, const String &aVal BOOL TokenInfo::IsPropertyFixable( const ByteString &aName ) const { // name everything that is allowed to be fixed automatically here - if ( aTagName.EqualsAscii( "ahelp" ) && aName.Equals( "hid" ) - || aTagName.EqualsAscii( "link" ) && aName.Equals( "href" ) - || aTagName.EqualsAscii( "alt" ) && aName.Equals( "id" ) - || aTagName.EqualsAscii( "variable" ) && aName.Equals( "id" ) - || aTagName.EqualsAscii( "image" ) && aName.Equals( "src" ) - || aTagName.EqualsAscii( "image" ) && aName.Equals( "id" ) ) + if ( (aTagName.EqualsAscii( "ahelp" ) && aName.Equals( "hid" )) + || (aTagName.EqualsAscii( "link" ) && aName.Equals( "href" )) + || (aTagName.EqualsAscii( "alt" ) && aName.Equals( "id" )) + || (aTagName.EqualsAscii( "variable" ) && aName.Equals( "id" )) + || (aTagName.EqualsAscii( "image" ) && aName.Equals( "src" )) + || (aTagName.EqualsAscii( "image" ) && aName.Equals( "id" ) )) return TRUE; return FALSE; } diff --git a/vcl/source/gdi/implncvt.cxx b/vcl/source/gdi/implncvt.cxx index 9b570b539221..e59fde15b5be 100644 --- a/vcl/source/gdi/implncvt.cxx +++ b/vcl/source/gdi/implncvt.cxx @@ -367,7 +367,7 @@ const Polygon* ImplLineConverter::ImplGetNext() { // Spitzer Winkel : mnFloat0Points = 6; - mpFloat0[ 4 + nFirst ^ 1 ] = aDestPoint; + mpFloat0[ (4 + nFirst) ^ 1 ] = aDestPoint; aDestPoint -= aN2Vec; mpFloat0[ 4 + nFirst ] = aDestPoint; mpFloat0[ 1 + nFirst ] += aN1Vec; diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index bfe0751545c7..a77d8c2ac294 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -6384,10 +6384,12 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr, // check string index and length String aStr = rOrigStr; if( (ULONG)nMinIndex + nLen >= aStr.Len() ) + { if( nMinIndex < aStr.Len() ) nLen = aStr.Len() - nMinIndex; else return NULL; + } // filter out special markers if( bFilter ) diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 509ad4f725ce..1e9572887e0b 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -574,7 +574,7 @@ void SalGraphics::CopyBits( const SalTwoRect* pPosAry, (pSrcGraphics && ( (pSrcGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) || (pSrcOutDev && pSrcOutDev->IsRTLEnabled()) ) ) ) { SalTwoRect pPosAry2 = *pPosAry; - if( pSrcGraphics && (pSrcGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL) || (pSrcOutDev && pSrcOutDev->IsRTLEnabled()) ) + if( (pSrcGraphics && (pSrcGraphics->GetLayout() & SAL_LAYOUT_BIDI_RTL)) || (pSrcOutDev && pSrcOutDev->IsRTLEnabled()) ) mirror( pPosAry2.mnSrcX, pPosAry2.mnSrcWidth, pSrcOutDev ); if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev ); diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 81f6380ad160..0f5e6fb6a8db 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -352,10 +352,12 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCod { MenuItemData* pData = GetDataFromPos( rPos ); if ( pData->bEnabled && rI18nHelper.MatchMnemonic( pData->aText, cSelectChar ) ) + { if( nDuplicates > 1 && rPos == nCurrentPos ) continue; // select next entry with the same mnemonic else return pData; + } } } @@ -1588,10 +1590,12 @@ void Menu::SetPopupMenu( USHORT nItemId, PopupMenu* pMenu ) // set native submenu if( ImplGetSalMenu() && pData->pSalMenuItem ) + { if( pMenu ) ImplGetSalMenu()->SetSubMenu( pData->pSalMenuItem, pMenu->ImplGetSalMenu(), nPos ); else ImplGetSalMenu()->SetSubMenu( pData->pSalMenuItem, NULL, nPos ); + } ImplCallEventListeners( VCLEVENT_MENU_SUBMENUCHANGED, nPos ); } @@ -4669,10 +4673,12 @@ void MenuFloatingWindow::ImplCursorUpDown( BOOL bUp, BOOL bHomeEnd ) { n++; if ( n >= pMenu->GetItemCount() ) + { if ( !IsScrollMenu() || ( nHighlightedItem == ITEMPOS_INVALID ) ) n = 0; else break; + } } MenuItemData* pData = (MenuItemData*)pMenu->GetItemList()->GetDataFromPos( n ); |