diff options
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdundo.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 2 |
6 files changed, 5 insertions, 12 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index cf04846fdacb..a175bee62e53 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -68,7 +68,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl maVolumeSlider( VclPtr<Slider>::Create(this, WB_HORZ | WB_DRAG | WB_SLIDERSET) ), maZoomToolBox( VclPtr<ToolBox>::Create(this, WB_3DLOOK) ), mpZoomListBox( VclPtr<ListBox>::Create( maZoomToolBox.get(), WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL | WB_3DLOOK ) ), - maTimeEdit( VclPtr<Edit>::Create(this, WB_CENTER | WB_READONLY | WB_BORDER | WB_3DLOOK | WB_READONLY) ), + maTimeEdit( VclPtr<Edit>::Create(this, WB_CENTER | WB_READONLY | WB_BORDER | WB_3DLOOK ) ), meControlStyle( eControlStyle ), mbLocked( false ) { diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 9a6484a30690..160dca9945f8 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1296,7 +1296,7 @@ namespace { bool bRet = true; ::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef; - for (size_t i = 0; bRet && i < _pCondition->count() && bRet; ++i) + for (size_t i = 0; bRet && i < _pCondition->count(); ++i) { const ::connectivity::OSQLParseNode* pChild = _pCondition->getChild(i); if ( pChild->isToken() ) diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 5aee8a1e9bdf..8bd3af16f8df 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1377,12 +1377,6 @@ void TreeControlPeer::onChangeRootDisplayed( bool bIsRootDisplayed ) // todo fillTree( rTree, mxDataModel ); - if( mbIsRootDisplayed ) - { - } - else - { - } } bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage ) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 675edb830ae7..abc459fdfddb 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -648,7 +648,7 @@ void SdrUndoGeoObj::Undo() if (pTableObj && mbSkipChangeLayout) pTableObj->SetSkipChangeLayout(true); pObj->SetGeoData(*pUndoGeo); - if (pTableObj && mbSkipChangeLayout && pTableObj) + if (pTableObj && mbSkipChangeLayout) pTableObj->SetSkipChangeLayout(false); } } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index beb603900471..c722da9b6e8c 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -1082,8 +1082,7 @@ void SwFrame::CheckPageDescs( SwPageFrame *pStart, bool bNotifyFields, SwPageFra else if ( !pFormatWish ) //6. { // get format with inverted logic - if (!pFormatWish) - pFormatWish = bOdd ? pDesc->GetLeftFormat() : pDesc->GetRightFormat(); + pFormatWish = bOdd ? pDesc->GetLeftFormat() : pDesc->GetRightFormat(); if ( pPage->GetFormat() != pFormatWish ) pPage->SetFrameFormat( pFormatWish ); } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 02014b3e25b9..f40210598488 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -836,7 +836,7 @@ public: VCL_BUILDER_FACTORY_ARGS(SwAssignFieldsControl, WB_BORDER) SwAssignFieldsControl::SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits) : - Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP | WB_DIALOGCONTROL), + Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP), m_aVScroll(VclPtr<ScrollBar>::Create(this)), m_aHeaderHB(VclPtr<HeaderBar>::Create(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER)), m_aWindow(VclPtr<vcl::Window>::Create(this, WB_BORDER | WB_DIALOGCONTROL)), |