diff options
author | Stefan Heinemann <stefan.heinemann@codedump.ch> | 2015-09-25 13:06:09 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-09-29 18:33:40 +0000 |
commit | c50eb68af3096645246a77259bb3d1cc70eb6b63 (patch) | |
tree | a3f9442fa2d2c13464d1623f8bcf772b27426e72 /sfx2 | |
parent | 491c2e24ac110c9ebdb1a483c34ae3d14ab0d615 (diff) |
Renamed wrongly prefixed boolean variables
Fixed tdf#94269
Change-Id: I63109cc4e095bad680d7637a065080ea368860ae
Reviewed-on: https://gerrit.libreoffice.org/18851
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/app.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/appl/appdde.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 32 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 22 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/frame.cxx | 18 |
8 files changed, 50 insertions, 50 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 121bc98c1db5..858d97938781 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -501,15 +501,15 @@ IMPL_LINK_TYPED( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasi aMod.release(); // call basicide_handle_basic_error in basctl - bool nRet = pSymbol && pSymbol( pStarBasic ); + bool bRet = pSymbol && pSymbol( pStarBasic ); #else - bool nRet = basicide_handle_basic_error( pStarBasic ); + bool bRet = basicide_handle_basic_error( pStarBasic ); #endif - return nRet; + return bRet; #endif } diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 00139240937a..799f6e0ce9dd 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -534,8 +534,8 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat) { OUString sMimeType( SotExchange::GetFormatMimeType( nFormat )); ::com::sun::star::uno::Any aValue; - bool nRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue ); - if( nRet && aValue.hasValue() && ( aValue >>= aSeq ) ) + bool bRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue ); + if( bRet && aValue.hasValue() && ( aValue >>= aSeq ) ) { aData = DdeData( aSeq.getConstArray(), aSeq.getLength(), nFormat ); return &aData; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 785bb0cfde6d..1d7de9740fd8 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1259,7 +1259,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { - bool nRet = false; + bool bRet = false; MouseNotifyEvent nType = rNEvt.GetType(); if ( MouseNotifyEvent::KEYINPUT == nType ) { @@ -1267,12 +1267,12 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_DELETE == nCode && GetEntryCount() > 0 ) { DoAction( MID_DELETE ); - nRet = true; + bRet = true; } else if ( KEY_RETURN == nCode ) { GetDoubleClickHdl().Call( *this ); - nRet = true; + bRet = true; } } else if ( MouseNotifyEvent::COMMAND == nType ) @@ -1284,11 +1284,11 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) sal_uInt16 nId = aMenu.Execute( this, pCEvt->GetMousePosPixel() ); if ( nId != MENU_ITEM_NOTFOUND ) DoAction( nId ); - nRet = true; + bRet = true; } } - return nRet || ListBox::Notify( rNEvt ); + return bRet || ListBox::Notify( rNEvt ); } // class BookmarksTabPage_Impl ------------------------------------------- @@ -1655,7 +1655,7 @@ Size SfxHelpIndexWindow_Impl::GetOptimalSize() const bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) { - bool nDone = false; + bool bDone = false; MouseNotifyEvent nType = rNEvt.GetType(); if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() ) { @@ -1673,12 +1673,12 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) if ( !bCtrl && bShift && m_pActiveLB->HasChildPathFocus() ) { pControl->GrabFocus(); - nDone = true; + bDone = true; } else if ( !bCtrl && !bShift && pControl->HasChildPathFocus() ) { m_pActiveLB->GrabFocus(); - nDone = true; + bDone = true; } else if ( bCtrl ) { @@ -1692,7 +1692,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) m_pTabCtrl->SetCurPageId(m_pTabCtrl->GetPageId(nPagePos)); ActivatePageHdl( m_pTabCtrl ); - nDone = true; + bDone = true; } } else if ( m_pTabCtrl->HasFocus() && ( KEY_LEFT == nCode || KEY_RIGHT == nCode ) ) @@ -1701,7 +1701,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) } } - return nDone || Window::PreNotify( rNEvt ); + return bDone || Window::PreNotify( rNEvt ); } @@ -2384,7 +2384,7 @@ void SfxHelpTextWindow_Impl::Resize() bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { - bool nDone = false; + bool bDone = false; MouseNotifyEvent nType = rNEvt.GetType(); if ( MouseNotifyEvent::COMMAND == nType && rNEvt.GetCommandEvent() ) { @@ -2476,7 +2476,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nId = aMenu.Execute( this, aPos ); pHelpWin->DoAction( nId ); - nDone = true; + bDone = true; } } else if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() ) @@ -2488,22 +2488,22 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( KEYGROUP_ALPHA == nKeyGroup && !isHandledKey( rKeyCode ) ) { // do nothing disables the writer accelerators - nDone = true; + bDone = true; } else if ( rKeyCode.IsMod1() && ( KEY_F4 == nKey || KEY_W == nKey ) ) { // <CTRL><F4> or <CTRL><W> -> close top frame pHelpWin->CloseWindow(); - nDone = true; + bDone = true; } else if ( KEY_TAB == nKey && aOnStartupCB->HasChildPathFocus() ) { aToolBox->GrabFocus(); - nDone = true; + bDone = true; } } - return nDone || Window::PreNotify( rNEvt ); + return bDone || Window::PreNotify( rNEvt ); } diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 86354a28a0e8..fe4dc1d8f64b 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -68,7 +68,7 @@ ResizableMultiLineEdit::ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailV bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) { - bool nDone = false; + bool bDone = false; if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent& rKEvt = *rNEvt.GetKeyEvent(); @@ -80,7 +80,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) //fall-through case KEY_ESCAPE: mpItem->setEditTitle(false); - nDone = true; + bDone = true; break; default: break; @@ -91,7 +91,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) mpItem->setTitle( GetText() ); mpItem->setEditTitle(false, false); } - return nDone || VclMultiLineEdit::PreNotify(rNEvt); + return bDone || VclMultiLineEdit::PreNotify(rNEvt); } void ResizableMultiLineEdit::Modify() diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 992f1be9f162..db43463e2798 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -291,7 +291,7 @@ IMPL_LINK_NOARG_TYPED(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) { - bool nRet = false; + bool bRet = false; if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); @@ -300,18 +300,18 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode()) { pDialog->DeleteHdl( NULL ); - nRet = true; + bRet = true; } else if( KEY_RETURN == rKeyCode.GetCode()) { GetDoubleClickHdl().Call(this); - nRet = true; + bRet = true; } } } - if(!nRet) - nRet = SvTreeListBox::Notify( rNEvt ); - return nRet; + if(!bRet) + bRet = SvTreeListBox::Notify( rNEvt ); + return bRet; } /** ListBox class that starts a PopupMenu (designer specific) in the @@ -447,21 +447,21 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) { // handle <RETURN> as double click - bool nRet = false; + bool bRet = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() ) { aDoubleClickLink.Call( nullptr ); - nRet = true; + bRet = true; } } - if ( !nRet ) - nRet = DropListBox_Impl::Notify( rNEvt ); + if ( !bRet ) + bRet = DropListBox_Impl::Notify( rNEvt ); - return nRet; + return bRet; } /** NotifyMoving Handler; This leads via a link on the event to the dialog. diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index ff4e1eaae115..9f73e8764bc1 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -601,9 +601,9 @@ bool SfxObjectShell::PrepareClose DBG_ASSERT(pFrm->GetViewShell(),"No Shell"); if ( pFrm->GetViewShell() ) { - bool nRet = pFrm->GetViewShell()->PrepareClose( bUI ); - if ( !nRet ) - return nRet; + bool bRet = pFrm->GetViewShell()->PrepareClose( bUI ); + if ( !bRet ) + return bRet; } } diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 71d8bf28ad0c..b66c4bc709b0 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -995,10 +995,10 @@ void Theme::ProcessNewValue ( } case PT_Boolean: { - bool nValue (false); - if (rValue >>= nValue) + bool bValue (false); + if (rValue >>= bValue) { - maBooleans[nIndex] = nValue; + maBooleans[nIndex] = bValue; if (eItem == Bool_IsHighContrastModeActive) { mbIsHighContrastModeSetManually = true; diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 1594cf3ea344..70796e9a74aa 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -187,7 +187,7 @@ bool SfxFrame::DocIsModified_Impl() bool SfxFrame::PrepareClose_Impl( bool bUI ) { - bool nRet = true; + bool bRet = true; // prevent recursive calls if( !pImp->bPrepClosing ) @@ -210,27 +210,27 @@ bool SfxFrame::PrepareClose_Impl( bool bUI ) if ( bOther ) // if there are other views only the current view of this frame must be asked - nRet = GetCurrentViewFrame()->GetViewShell()->PrepareClose( bUI ); + bRet = GetCurrentViewFrame()->GetViewShell()->PrepareClose( bUI ); else // otherwise ask the document - nRet = pCur->PrepareClose( bUI ); + bRet = pCur->PrepareClose( bUI ); } - if ( nRet ) + if ( bRet ) { // if this frame has child frames, ask them too - for( sal_uInt16 nPos = GetChildFrameCount(); nRet && nPos--; ) - nRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI ); + for( sal_uInt16 nPos = GetChildFrameCount(); bRet && nPos--; ) + bRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI ); } pImp->bPrepClosing = false; } - if ( nRet && pImp->pWorkWin ) + if ( bRet && pImp->pWorkWin ) // if closing was accepted by the component the UI subframes must be asked also - nRet = pImp->pWorkWin->PrepareClose_Impl(); + bRet = pImp->pWorkWin->PrepareClose_Impl(); - return nRet; + return bRet; } |