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 /svx/source/tbxctrls | |
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 'svx/source/tbxctrls')
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 8 | ||||
-rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 36 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 16 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 8 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 8 |
6 files changed, 41 insertions, 41 deletions
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index dfc2903725b1..16756ad67021 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -497,7 +497,7 @@ void SvxColorDockingWindow::GetFocus() bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) { - bool nRet = false; + bool bRet = false; if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); @@ -506,12 +506,12 @@ bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) { case KEY_ESCAPE: GrabFocusToDocument(); - nRet = true; + bRet = true; break; } } - return nRet || SfxDockingWindow::Notify( rNEvt ); + return bRet || SfxDockingWindow::Notify( rNEvt ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 3f17bd999465..4c157868cda7 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -376,7 +376,7 @@ bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) { - bool nHandled = ListBox::Notify( rNEvt ); + bool bHandled = ListBox::Notify( rNEvt ); if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -387,7 +387,7 @@ bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) case KEY_RETURN: { Select(); - nHandled = true; + bHandled = true; } break; @@ -395,13 +395,13 @@ bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) { SelectEntryPos( mnCurPos ); ImplReleaseFocus(); - nHandled = true; + bHandled = true; } break; } } - return nHandled; + return bHandled; } void ImplGrafModeControl::ImplReleaseFocus() diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index e82be830bedd..391d2e74fa35 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -179,7 +179,7 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { - bool nHandled = LineLB::Notify( rNEvt ); + bool bHandled = LineLB::Notify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -189,17 +189,17 @@ bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: Select(); - nHandled = true; + bHandled = true; break; case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = true; + bHandled = true; break; } } - return nHandled; + return bHandled; } @@ -352,7 +352,7 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) bool SvxMetricField::Notify( NotifyEvent& rNEvt ) { - bool nHandled = MetricField::Notify( rNEvt ); + bool bHandled = MetricField::Notify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -364,13 +364,13 @@ bool SvxMetricField::Notify( NotifyEvent& rNEvt ) (void)pSh->KeyInput( *pKEvt ); else { - bool bHandled = false; + bool bHandledInside = false; switch ( rKey.GetCode() ) { case KEY_RETURN: Reformat(); - bHandled = true; + bHandledInside = true; break; case KEY_ESCAPE: @@ -379,15 +379,15 @@ bool SvxMetricField::Notify( NotifyEvent& rNEvt ) break; } - if ( bHandled ) + if ( bHandledInside ) { - nHandled = true; + bHandled = true; Modify(); ReleaseFocus_Impl(); } } } - return nHandled; + return bHandled; } void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) @@ -438,7 +438,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { - bool nHandled = FillTypeLB::Notify( rNEvt ); + bool bHandled = FillTypeLB::Notify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -446,7 +446,7 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) switch ( pKEvt->GetKeyCode().GetCode() ) { case KEY_RETURN: - nHandled = true; + bHandled = true; ( (Link<>&)GetSelectHdl() ).Call( this ); break; case KEY_TAB: @@ -458,11 +458,11 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = true; + bHandled = true; break; } } - return nHandled; + return bHandled; } @@ -505,7 +505,7 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { - bool nHandled = FillAttrLB::Notify( rNEvt ); + bool bHandled = FillAttrLB::Notify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -515,7 +515,7 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: ( (Link<>&)GetSelectHdl() ).Call( this ); - nHandled = true; + bHandled = true; break; case KEY_TAB: bRelease = false; @@ -525,11 +525,11 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = true; + bHandled = true; break; } } - return nHandled; + return bHandled; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6a94bce85b15..11fde489fb97 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -498,7 +498,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) { - bool nHandled = false; + bool bHandled = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -513,7 +513,7 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) const sal_Int32 nItem = GetSelectEntryPos() - 1; if(nItem < MAX_STYLES_ENTRIES) m_pButtons[nItem]->ExecuteMenu(); - nHandled = true; + bHandled = true; } break; } @@ -523,7 +523,7 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) bRelease = false; else - nHandled = true; + bHandled = true; Select(); break; } @@ -531,11 +531,11 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurSel ); ReleaseFocus(); - nHandled = true; + bHandled = true; break; } } - return nHandled || ComboBox::Notify( rNEvt ); + return bHandled || ComboBox::Notify( rNEvt ); } void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) @@ -1017,7 +1017,7 @@ bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) { - bool nHandled = false; + bool bHandled = false; mbEndPreview = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYUP ) mbEndPreview = true; @@ -1034,7 +1034,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) bRelease = false; else - nHandled = true; + bHandled = true; Select(); break; } @@ -1055,7 +1055,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) EndPreview(); } - return nHandled || FontNameBox::Notify( rNEvt ); + return bHandled || FontNameBox::Notify( rNEvt ); } void SvxFontNameBox_Impl::SetOptimalSize() diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 42bb4ce66e60..c450408fd558 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -218,7 +218,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) { - bool nHandled = false; + bool bHandled = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -232,7 +232,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) m_bRelease = false; else - nHandled = true; + bHandled = true; Select(); break; } @@ -240,7 +240,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SetText( m_aCurText ); ReleaseFocus_Impl(); - nHandled = true; + bHandled = true; break; } } @@ -251,7 +251,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) SetText(GetSavedValue()); } - return nHandled || FontSizeBox::Notify( rNEvt ); + return bHandled || FontSizeBox::Notify( rNEvt ); } void SvxFontSizeBox_Impl::SetOptimalSize() diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index ddae54583704..0d7e707d5f53 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -190,7 +190,7 @@ void FindTextFieldControl::SetTextToSelected_Impl() bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { - bool nRet= ComboBox::PreNotify( rNEvt ); + bool bRet= ComboBox::PreNotify( rNEvt ); switch ( rNEvt.GetType() ) { @@ -209,7 +209,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) // Close the search bar on Escape if ( KEY_ESCAPE == nCode ) { - nRet = true; + bRet = true; GrabFocusToDocument(); // hide the findbar @@ -240,7 +240,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) ToolBox* pToolBox = static_cast<ToolBox*>(pWindow); impl_executeSearch( m_xContext, m_xFrame, pToolBox, bShift); - nRet = true; + bRet = true; } break; } @@ -253,7 +253,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) break; } - return nRet; + return bRet; } SearchToolbarControllersManager::SearchToolbarControllersManager() |