[Libreoffice-commits] core.git: basctl/source basic/source chart2/source comphelper/source connectivity/source cui/source dbaccess/source editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/source include/svl include/svx include/vbahelper oox/source reportdesign/source rsc/inc sc/inc sc/source sd/source sfx2/source slideshow/source svtools/source svx/source sw/inc sw/source unotools/source vcl/generic vcl/inc vcl/source xmloff/source
Stefan Heinemann
stefan.heinemann at codedump.ch
Tue Sep 29 11:34:03 PDT 2015
basctl/source/basicide/basicbox.cxx | 16 -
basctl/source/basicide/basides1.cxx | 6
basctl/source/basicide/bastypes.cxx | 6
basctl/source/basicide/moduldl2.cxx | 6
basic/source/runtime/methods.cxx | 12
chart2/source/controller/main/ElementSelector.cxx | 6
comphelper/source/misc/types.cxx | 6
connectivity/source/commontools/TSortIndex.cxx | 12
cui/source/customize/macropg.cxx | 4
cui/source/dialogs/hangulhanjadlg.cxx | 16 -
cui/source/inc/numfmt.hxx | 2
cui/source/tabpages/autocdlg.cxx | 10
cui/source/tabpages/numfmt.cxx | 6
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4
dbaccess/source/ui/browser/brwview.cxx | 6
dbaccess/source/ui/misc/WTypeSelect.cxx | 8
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 8
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 10
editeng/source/items/paraitem.cxx | 12
extensions/source/bibliography/bibcont.cxx | 8
extensions/source/bibliography/toolbar.cxx | 8
extensions/source/propctrlr/standardcontrol.cxx | 16 -
filter/source/graphicfilter/ipcx/ipcx.cxx | 6
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 10
forms/source/richtext/richtextvclcontrol.cxx | 6
forms/source/xforms/computedexpression.cxx | 4
formula/source/ui/dlg/formula.cxx | 8
formula/source/ui/dlg/funcpage.cxx | 4
formula/source/ui/dlg/funcutl.cxx | 12
fpicker/source/office/iodlg.cxx | 10
framework/source/uielement/comboboxtoolbarcontroller.cxx | 10
framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 10
framework/source/uielement/edittoolbarcontroller.cxx | 10
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 10
include/svl/poolitem.hxx | 8
include/svx/ctredlin.hxx | 12
include/vbahelper/vbareturntypes.hxx | 2
oox/source/ppt/slidetransition.cxx | 6
reportdesign/source/ui/report/DesignView.cxx | 10
rsc/inc/rscclass.hxx | 2
rsc/inc/rsctop.hxx | 2
sc/inc/chgviset.hxx | 12
sc/source/core/tool/chgviset.cxx | 6
sc/source/core/tool/interpr1.cxx | 174 +++++------
sc/source/filter/excel/xecontent.cxx | 16 -
sc/source/ui/docshell/docsh.cxx | 6
sc/source/ui/navipi/navipi.cxx | 12
sc/source/ui/view/gridwin.cxx | 8
sc/source/ui/view/tabvwsh4.cxx | 6
sd/source/ui/animations/CustomAnimationDialog.cxx | 8
sd/source/ui/dlg/navigatr.cxx | 6
sd/source/ui/view/ViewShellBase.cxx | 8
sd/source/ui/view/sdwindow.cxx | 10
sd/source/ui/view/viewshel.cxx | 12
sfx2/source/appl/app.cxx | 6
sfx2/source/appl/appdde.cxx | 4
sfx2/source/appl/newhelp.cxx | 32 +-
sfx2/source/control/thumbnailviewitem.cxx | 6
sfx2/source/dialog/templdlg.cxx | 22 -
sfx2/source/doc/objxtor.cxx | 6
sfx2/source/sidebar/Theme.cxx | 6
sfx2/source/view/frame.cxx | 18 -
slideshow/source/engine/slideshowimpl.cxx | 22 -
slideshow/source/engine/tools.cxx | 6
svtools/source/contnr/simptabl.cxx | 8
svtools/source/control/ctrlbox.cxx | 4
svtools/source/control/fileurlbox.cxx | 4
svtools/source/control/tabbar.cxx | 4
svtools/source/control/urlcontrol.cxx | 4
svtools/source/dialogs/roadmapwizard.cxx | 4
svtools/source/table/tabledatawindow.cxx | 6
svx/source/dialog/ctredlin.cxx | 34 +-
svx/source/dialog/rubydialog.cxx | 20 -
svx/source/form/datanavi.cxx | 6
svx/source/tbxctrls/colrctrl.cxx | 6
svx/source/tbxctrls/grafctrl.cxx | 8
svx/source/tbxctrls/itemwin.cxx | 36 +-
svx/source/tbxctrls/tbcontrl.cxx | 16 -
svx/source/tbxctrls/tbunocontroller.cxx | 8
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 8
sw/inc/fesh.hxx | 2
sw/inc/htmltbl.hxx | 2
sw/inc/viewsh.hxx | 2
sw/source/core/attr/swatrset.cxx | 8
sw/source/core/crsr/swcrsr.cxx | 4
sw/source/core/doc/fmtcol.cxx | 8
sw/source/core/docnode/node.cxx | 18 -
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/inc/swfont.hxx | 4
sw/source/core/text/itrcrsr.cxx | 14
sw/source/core/text/itrtxt.hxx | 2
sw/source/filter/ww8/ww8par6.cxx | 8
sw/source/ui/dbui/mmaddressblockpage.cxx | 12
sw/source/ui/fldui/fldvar.cxx | 4
sw/source/ui/misc/bookmark.cxx | 10
sw/source/uibase/app/docsh2.cxx | 6
sw/source/uibase/cctrl/actctrl.cxx | 8
sw/source/uibase/dochdl/swdtflvr.cxx | 188 ++++++------
sw/source/uibase/uiview/pview.cxx | 6
sw/source/uibase/utlui/content.cxx | 8
sw/source/uibase/wrtsh/move.cxx | 8
unotools/source/i18n/textsearch.cxx | 12
vcl/generic/fontmanager/fontconfig.cxx | 16 -
vcl/inc/win/salobj.h | 2
vcl/source/bitmap/BitmapSymmetryCheck.cxx | 8
vcl/source/control/combobox.cxx | 16 -
vcl/source/control/ilstbox.cxx | 6
vcl/source/control/lstbox.cxx | 20 -
vcl/source/control/spinfld.cxx | 18 -
vcl/source/control/tabctrl.cxx | 14
vcl/source/edit/vclmedit.cxx | 14
vcl/source/filter/graphicfilter.cxx | 8
vcl/source/window/dialog.cxx | 6
vcl/source/window/event.cxx | 10
vcl/source/window/floatwin.cxx | 6
vcl/source/window/layout.cxx | 6
vcl/source/window/winproc.cxx | 82 ++---
xmloff/source/style/XMLFontAutoStylePool.cxx | 8
118 files changed, 747 insertions(+), 747 deletions(-)
New commits:
commit c50eb68af3096645246a77259bb3d1cc70eb6b63
Author: Stefan Heinemann <stefan.heinemann at codedump.ch>
Date: Fri Sep 25 13:06:09 2015 +0200
Renamed wrongly prefixed boolean variables
Fixed tdf#94269
Change-Id: I63109cc4e095bad680d7637a065080ea368860ae
Reviewed-on: https://gerrit.libreoffice.org/18851
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 8801498..f4922b5 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -249,7 +249,7 @@ void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLo
bool LibBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
@@ -259,7 +259,7 @@ bool LibBox::PreNotify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
NotifyIDE();
- nDone = true;
+ bDone = true;
}
break;
@@ -267,7 +267,7 @@ bool LibBox::PreNotify( NotifyEvent& rNEvt )
{
SelectEntry( aCurText );
ReleaseFocus();
- nDone = true;
+ bDone = true;
}
break;
}
@@ -289,7 +289,7 @@ bool LibBox::PreNotify( NotifyEvent& rNEvt )
}
}
- return nDone || ListBox::PreNotify( rNEvt );
+ return bDone || ListBox::PreNotify( rNEvt );
}
void LibBox::Select()
@@ -469,7 +469,7 @@ void LanguageBox::Select()
bool LanguageBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
sal_uInt16 nKeyCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
@@ -478,14 +478,14 @@ bool LanguageBox::PreNotify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
SetLanguage();
- nDone = true;
+ bDone = true;
}
break;
case KEY_ESCAPE:
{
SelectEntry( m_sCurrentText );
- nDone = true;
+ bDone = true;
}
break;
}
@@ -497,7 +497,7 @@ bool LanguageBox::PreNotify( NotifyEvent& rNEvt )
{
}
- return nDone || ListBox::PreNotify( rNEvt );
+ return bDone || ListBox::PreNotify( rNEvt );
}
void LanguageBox::Update( const SfxStringItem* pItem )
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index a4215bb..f2b947b 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1110,11 +1110,11 @@ VclPtr<BaseWindow> Shell::FindWindow(
bool Shell::CallBasicErrorHdl( StarBASIC* pBasic )
{
- bool nRet = false;
+ bool bRet = false;
ModulWindow* pModWin = ShowActiveModuleWindow( pBasic );
if ( pModWin )
- nRet = pModWin->BasicErrorHdl( pBasic );
- return nRet;
+ bRet = pModWin->BasicErrorHdl( pBasic );
+ return bRet;
}
long Shell::CallBasicBreakHdl( StarBASIC* pBasic )
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 4d98fde..8ed33c3 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -110,7 +110,7 @@ void BaseWindow::ExecuteGlobal (SfxRequest&)
bool BaseWindow::Notify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -127,14 +127,14 @@ bool BaseWindow::Notify( NotifyEvent& rNEvt )
{
if (Shell* pShell = GetShell())
pShell->NextPage( nCode == KEY_PAGEUP );
- nDone = true;
+ bDone = true;
}
}
break;
}
}
- return nDone || Window::Notify( rNEvt );
+ return bDone || Window::Notify( rNEvt );
}
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index a9b8c69..700fde6 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -711,7 +711,7 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
IMPL_LINK_TYPED( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool )
{
- bool nRet = false;
+ bool bRet = false;
SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) );
@@ -724,14 +724,14 @@ IMPL_LINK_TYPED( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool )
OUString aOldPassword( pDlg->GetOldPassword() );
OUString aNewPassword( pDlg->GetNewPassword() );
xPasswd->changeLibraryPassword( aLibName, aOldPassword, aNewPassword );
- nRet = true;
+ bRet = true;
}
catch (...)
{
}
}
- return nRet;
+ return bRet;
}
void LibPage::NewLib()
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ae5b769..2c21bc3 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1636,26 +1636,26 @@ RTLFUNC(StrComp)
const OUString& rStr2 = rPar.Get(2)->GetOUString();
SbiInstance* pInst = GetSbData()->pInst;
- bool nTextCompare;
+ bool bTextCompare;
bool bCompatibility = ( pInst && pInst->IsCompatibility() );
if( bCompatibility )
{
SbiRuntime* pRT = pInst->pRun;
- nTextCompare = pRT && pRT->IsImageFlag( SbiImageFlags::COMPARETEXT );
+ bTextCompare = pRT && pRT->IsImageFlag( SbiImageFlags::COMPARETEXT );
}
else
{
- nTextCompare = true;
+ bTextCompare = true;
}
if ( rPar.Count() == 4 )
- nTextCompare = rPar.Get(3)->GetInteger();
+ bTextCompare = rPar.Get(3)->GetInteger();
if( !bCompatibility )
{
- nTextCompare = !nTextCompare;
+ bTextCompare = !bTextCompare;
}
sal_Int32 nRetValue = 0;
- if( nTextCompare )
+ if( bTextCompare )
{
::utl::TransliterationWrapper* pTransliterationWrapper = GetSbData()->pTransliterationWrapper;
if( !pTransliterationWrapper )
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 894f8a6..ce31668 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -202,7 +202,7 @@ void SelectorListBox::Select()
bool SelectorListBox::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -216,7 +216,7 @@ bool SelectorListBox::Notify( NotifyEvent& rNEvt )
if ( KEY_TAB == nCode )
m_bReleaseFocus = false;
else
- nHandled = true;
+ bHandled = true;
Select();
break;
}
@@ -233,7 +233,7 @@ bool SelectorListBox::Notify( NotifyEvent& rNEvt )
SelectEntryPos( GetSavedValue() );
}
- return nHandled || ListBox::Notify( rNEvt );
+ return bHandled || ListBox::Notify( rNEvt );
}
Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::CreateAccessible()
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 9ae263c..51fe425 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -91,12 +91,12 @@ OUString getString(const Any& _rAny)
bool getBOOL(const Any& _rAny)
{
- bool nReturn = false;
+ bool bReturn = false;
if (_rAny.getValueType() == cppu::UnoType<bool>::get())
- nReturn = *static_cast<sal_Bool const *>(_rAny.getValue());
+ bReturn = *static_cast<sal_Bool const *>(_rAny.getValue());
else
OSL_FAIL("comphelper::getBOOL : invalid argument !");
- return nReturn;
+ return bReturn;
}
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 11638fe..09c58ed 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -39,8 +39,8 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin();
for (::std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i)
{
- const bool nGreater = pIndex->getAscending(i) != SQL_ASC;
- const bool nLess = !nGreater;
+ const bool bGreater = pIndex->getAscending(i) != SQL_ASC;
+ const bool bLess = !bGreater;
// compare depending for type
switch (*aIter)
@@ -49,9 +49,9 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
{
sal_Int32 nRes = lhs.second->getKeyString(i).compareTo(rhs.second->getKeyString(i));
if (nRes < 0)
- return nLess;
+ return bLess;
else if (nRes > 0)
- return nGreater;
+ return bGreater;
}
break;
case SQL_ORDERBYKEY_DOUBLE:
@@ -60,9 +60,9 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
double d2 = rhs.second->getKeyDouble(i);
if (d1 < d2)
- return nLess;
+ return bLess;
else if (d1 > d2)
- return nGreater;
+ return bGreater;
}
break;
case SQL_ORDERBYKEY_NONE:
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 246d5d5..af78386 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -116,7 +116,7 @@ IMPL_LINK_TYPED( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
{
- bool nRet = Control::Notify( rNEvt );
+ bool bRet = Control::Notify( rNEvt );
if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
{
@@ -125,7 +125,7 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
maListBox->GrabFocus();
}
- return nRet;
+ return bRet;
}
MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle )
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 0ef8e1f..727042d 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1411,7 +1411,7 @@ namespace svx
bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -1426,7 +1426,7 @@ namespace svx
DoJump( bUp );
SetSelection( Selection( 0, SELECTION_MAX ) );
// Tab-travel doesn't really happen, so emulate it by setting a selection manually
- nHandled = true;
+ bHandled = true;
}
}
else if( KEY_UP == nCode || KEY_DOWN == nCode )
@@ -1435,27 +1435,27 @@ namespace svx
if( ShouldScroll( bUp ) )
{
DoJump( bUp );
- nHandled = true;
+ bHandled = true;
}
else if( bUp )
{
if( m_pPrev )
{
m_pPrev->GrabFocus();
- nHandled = true;
+ bHandled = true;
}
}
else if( m_pNext )
{
m_pNext->GrabFocus();
- nHandled = true;
+ bHandled = true;
}
}
}
- if( !nHandled )
- nHandled = Edit::PreNotify( rNEvt );
- return nHandled;
+ if( !bHandled )
+ bHandled = Edit::PreNotify( rNEvt );
+ return bHandled;
}
void SuggestionEdit::init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext)
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index f004a76..401d399 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -87,7 +87,7 @@ public:
{ SetInfoItem( rItem ); }
void SetOkHdl( const Link<SfxPoolItem*,void>& rOkHandler );
- void HideLanguage(bool nFlag=true);
+ void HideLanguage(bool bFlag=true);
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
private:
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b4374e7..25ab173 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2445,28 +2445,28 @@ void OfaAutoCompleteTabPage::AutoCompleteMultiListBox::dispose()
bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify(
NotifyEvent& rNEvt )
{
- bool nHandled = MultiListBox::PreNotify( rNEvt );
+ bool bHandled = MultiListBox::PreNotify( rNEvt );
- if( !nHandled && MouseNotifyEvent::KEYUP == rNEvt.GetType() )
+ if( !bHandled && MouseNotifyEvent::KEYUP == rNEvt.GetType() )
{
const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
switch( rKeyCode.GetModifier() | rKeyCode.GetCode() )
{
case KEY_DELETE:
m_pPage->DeleteHdl( 0 );
- nHandled = true;
+ bHandled = true;
break;
default:
if( KeyFuncType::COPY == rKeyCode.GetFunction() )
{
m_pPage->CopyToClipboard();
- nHandled = true;
+ bHandled = true;
}
break;
}
}
- return nHandled;
+ return bHandled;
}
VCL_BUILDER_DECL_FACTORY(AutoCompleteMultiListBox)
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 113ccae..89abd94 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -694,10 +694,10 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl()
#*
#************************************************************************/
-void SvxNumberFormatTabPage::HideLanguage(bool nFlag)
+void SvxNumberFormatTabPage::HideLanguage(bool bFlag)
{
- m_pFtLanguage->Show(!nFlag);
- m_pLbLanguage->Show(!nFlag);
+ m_pFtLanguage->Show(!bFlag);
+ m_pLbLanguage->Show(!bFlag);
}
/*************************************************************************
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 0228f6b..b4b6769 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -141,10 +141,10 @@ namespace
}
bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt )
{
- bool nRet = Window::Notify( rNEvt );
+ bool bRet = Window::Notify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE && IsInputEnabled() )
PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), NULL, true );
- return nRet;
+ return bRet;
}
IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void)
{
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 7a93fe3..4baa3b7 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -297,7 +297,7 @@ void UnoDataBrowserView::_disposing( const css::lang::EventObject& /*_rSource*/
bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if(rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{
bool bGrabAllowed = isGrabVclControlFocusAllowed(this);
@@ -314,11 +314,11 @@ bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
else if ( m_pTreeView && m_pVclControl && m_pVclControl->HasChildPathFocus() )
m_pTreeView->GrabFocus();
- nDone = true;
+ bDone = true;
}
}
}
- return nDone || ODataView::PreNotify(rNEvt);
+ return bDone || ODataView::PreNotify(rNEvt);
}
BrowserViewStatusDisplay::BrowserViewStatusDisplay( UnoDataBrowserView* _pView, const OUString& _rStatus )
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 99be537..aa71259 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -401,14 +401,14 @@ VCL_BUILDER_FACTORY(OWizTypeSelectList)
bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
{
- bool nDone = false;
+ bool bDone = false;
switch( rEvt.GetType() )
{
case MouseNotifyEvent::MOUSEBUTTONDOWN:
{
const MouseEvent* pMEvt = rEvt.GetMouseEvent();
if(pMEvt->IsRight() && !pMEvt->GetModifier())
- nDone = true;
+ bDone = true;
}
break;
case MouseNotifyEvent::COMMAND:
@@ -448,13 +448,13 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
}
break;
}
- nDone = true;
+ bDone = true;
}
break;
default:
break;
}
- return nDone || MultiListBox::PreNotify(rEvt);
+ return bDone || MultiListBox::PreNotify(rEvt);
}
void OWizTypeSelect::fillColumnList(sal_uInt32 nRows)
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 54a682e..decbd5d 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -49,12 +49,12 @@ LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl )
bool LimitBoxImpl::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
switch ( rNEvt.GetType() )
{
case MouseNotifyEvent::LOSEFOCUS:
{
- nHandled = LimitBox::Notify( rNEvt );
+ bHandled = LimitBox::Notify( rNEvt );
uno::Sequence< beans::PropertyValue > aArgs( 1 );
aArgs[0].Name = "DBLimit.Value";
aArgs[0].Value = uno::makeAny( GetValue() );
@@ -71,7 +71,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt )
// fall-through
case KEY_RETURN:
GrabFocusToDocument();
- nHandled = true;
+ bHandled = true;
break;
case KEY_TAB:
Select();
@@ -82,7 +82,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt )
default:
break;
}
- return nHandled || LimitBox::Notify( rNEvt );
+ return bHandled || LimitBox::Notify( rNEvt );
}
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 5e7f370..3510f68 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -66,18 +66,18 @@ void ORelationDesignView::initialize()
bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
{
if(m_pTableView && !m_pTableView->HasChildPathFocus())
{
m_pTableView->GrabTabWinFocus();
- nDone = true;
+ bDone = true;
}
}
- if(!nDone)
- nDone = OJoinDesignView::PreNotify(rNEvt);
- return nDone;
+ if(!bDone)
+ bDone = OJoinDesignView::PreNotify(rNEvt);
+ return bDone;
}
void ORelationDesignView::GetFocus()
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index e09f018..3c95e3d 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1358,9 +1358,9 @@ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, sal_uInt16) const
{
- bool nValue;
- rStrm.ReadCharAsBool( nValue );
- return new SvxHangingPunctuationItem( nValue, Which() );
+ bool bValue;
+ rStrm.ReadCharAsBool( bValue );
+ return new SvxHangingPunctuationItem( bValue, Which() );
}
sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
@@ -1398,9 +1398,9 @@ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, sal_uInt16) const
{
- bool nValue;
- rStrm.ReadCharAsBool( nValue );
- return new SvxForbiddenRuleItem( nValue, Which() );
+ bool bValue;
+ rStrm.ReadCharAsBool( bValue );
+ return new SvxForbiddenRuleItem( bValue, Which() );
}
sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index bd1a069..6666fef 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -216,7 +216,7 @@ void BibBookContainer::GetFocus()
bool BibBookContainer::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType() )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -239,14 +239,14 @@ bool BibBookContainer::PreNotify( NotifyEvent& rNEvt )
SetItemSize( nFirstWinId, nHeight );
SetItemSize( nSecondWinId, 100 - nHeight );
}
- nHandled = true;
+ bHandled = true;
}
else if( pKEvt->GetCharCode() && HandleShortCutKey( *pKEvt ) )
- nHandled = true;
+ bHandled = true;
}
}
- return nHandled;
+ return bHandled;
}
bool BibBookContainer::HandleShortCutKey( const KeyEvent& rKeyEvent )
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index a6f7316..7504e28 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -435,7 +435,7 @@ void BibToolBar::SetQueryString(const OUString& aStr)
bool BibToolBar::PreNotify( NotifyEvent& rNEvt )
{
- bool nResult = true;
+ bool bResult = true;
MouseNotifyEvent nSwitch=rNEvt.GetType();
if(aEdQuery->HasFocus() && nSwitch==MouseNotifyEvent::KEYINPUT)
@@ -452,14 +452,14 @@ bool BibToolBar::PreNotify( NotifyEvent& rNEvt )
pPropertyVal[1].Name="QueryField";
pPropertyVal[1].Value <<= aQueryField;
SendDispatch(TBC_BT_AUTOFILTER,aPropVal);
- return nResult;
+ return bResult;
}
}
- nResult=ToolBox::PreNotify(rNEvt);
+ bResult=ToolBox::PreNotify(rNEvt);
- return nResult;
+ return bResult;
}
IMPL_LINK( BibToolBar, SelHdl, ListBox*, /*pLb*/ )
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 3d1c199..3018c48 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -999,7 +999,7 @@ namespace pcr
bool OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt)
{
- bool nResult = true;
+ bool bResult = true;
MouseNotifyEvent nSwitch = _rNEvt.GetType();
if (MouseNotifyEvent::KEYINPUT == nSwitch)
@@ -1018,12 +1018,12 @@ namespace pcr
EndPopupMode();
}
else
- nResult=FloatingWindow::PreNotify(_rNEvt);
+ bResult=FloatingWindow::PreNotify(_rNEvt);
}
else
- nResult=FloatingWindow::PreNotify(_rNEvt);
+ bResult=FloatingWindow::PreNotify(_rNEvt);
- return nResult;
+ return bResult;
}
@@ -1101,7 +1101,7 @@ namespace pcr
bool DropDownEditControl::PreNotify( NotifyEvent& rNEvt )
{
- bool nResult = true;
+ bool bResult = true;
if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{
@@ -1127,7 +1127,7 @@ namespace pcr
|| m_nOperationMode == eMultiLineText
)
{
- nResult = DropDownEditControl_Base::PreNotify( rNEvt );
+ bResult = DropDownEditControl_Base::PreNotify( rNEvt );
}
else if ( m_nOperationMode == eStringList )
{
@@ -1151,9 +1151,9 @@ namespace pcr
}
}
else
- nResult = DropDownEditControl_Base::PreNotify(rNEvt);
+ bResult = DropDownEditControl_Base::PreNotify(rNEvt);
- return nResult;
+ return bResult;
}
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index f89bc7c..c9c5277 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -412,10 +412,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
{
PCXReader aPCXReader(rStream);
- bool nRetValue = aPCXReader.ReadPCX(rGraphic);
- if ( !nRetValue )
+ bool bRetValue = aPCXReader.ReadPCX(rGraphic);
+ if ( !bRetValue )
rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
- return nRetValue;
+ return bRetValue;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index f2d994f..1d6858e 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -986,8 +986,8 @@ void XMLFilterSettingsDialog::onClose()
bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
{
// Because of tab control first call the base class.
- bool nRet = ModelessDialog::Notify( rNEvt );
- if ( !nRet )
+ bool bRet = ModelessDialog::Notify( rNEvt );
+ if ( !bRet )
{
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -1004,7 +1004,7 @@ bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
}
}
- return nRet;
+ return bRet;
}
void XMLFilterSettingsDialog::disposeFilterList()
@@ -1386,12 +1386,12 @@ VCL_BUILDER_FACTORY(SvxPathControl)
bool SvxPathControl::Notify(NotifyEvent& rNEvt)
{
- bool nRet = Window::Notify(rNEvt);
+ bool bRet = Window::Notify(rNEvt);
if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
m_pFocusCtrl->GrabFocus();
- return nRet;
+ return bRet;
}
XMLFilterListBox::XMLFilterListBox(Window* pParent, SvxPathControl* pPathControl)
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index a444551..1beabd0 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -286,13 +286,13 @@ namespace frm
bool RichTextControl::Notify( NotifyEvent& _rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ( _rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent& rEvent = *_rNEvt.GetCommandEvent();
- nDone = m_pImpl->HandleCommand( rEvent );
+ bDone = m_pImpl->HandleCommand( rEvent );
}
- return nDone || Control::Notify( _rNEvt );
+ return bDone || Control::Notify( _rNEvt );
}
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index d51e71f..08fc751 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -96,11 +96,11 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const
sal_Int32 nLength = msExpression.getLength();
sal_Int32 nStart = 0;
sal_Int32 nEnd = nLength;
- bool nSearch = aTextSearch.SearchForward( msExpression, &nStart, &nEnd );
+ bool bSearch = aTextSearch.SearchForward( msExpression, &nStart, &nEnd );
// our expression is static only if 1) we found our regexp, and 2)
// the regexp goes from beginning to end.
- return ( nLength == 0 || nSearch )
+ return ( nLength == 0 || bSearch )
&& ( nStart == 0 && nEnd == nLength );
}
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 33c3d97..86f30c7 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -89,7 +89,7 @@ public:
void fillTree(IStructHelper* _pTree);
void UpdateTokenArray( const OUString& rStrExp);
OUString RepairFormula(const OUString& aFormula);
- void FillDialog(bool nFlag=true);
+ void FillDialog(bool bFlag=true);
bool EditNextFunc( bool bForward, sal_Int32 nFStart=NOT_FOUND );
void EditThisFunc(sal_Int32 nFStart);
@@ -810,13 +810,13 @@ void FormulaDlg_Impl::UpdateTokenArray( const OUString& rStrExp)
aCompiler.CompileTokenArray();
}
-void FormulaDlg_Impl::FillDialog(bool nFlag)
+void FormulaDlg_Impl::FillDialog(bool bFlag)
{
bool bNext=true, bPrev=true;
- if(nFlag)
+ if(bFlag)
FillControls(bNext, bPrev);
FillListboxes();
- if(nFlag)
+ if(bFlag)
{
m_pBtnBackward->Enable(bPrev);
m_pBtnForward->Enable(bNext);
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 60a7f30..539b8f2 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -48,14 +48,14 @@ bool FormulaListBox::PreNotify( NotifyEvent& rNEvt )
{
NotifyEvent aNotifyEvt=rNEvt;
- bool nResult = ListBox::PreNotify(rNEvt);
+ bool bResult = ListBox::PreNotify(rNEvt);
MouseNotifyEvent nSwitch=aNotifyEvt.GetType();
if(nSwitch==MouseNotifyEvent::KEYINPUT)
{
KeyInput(*aNotifyEvt.GetKeyEvent());
}
- return nResult;
+ return bResult;
}
VCL_BUILDER_FACTORY_ARGS(FormulaListBox, WB_BORDER | WB_SORT)
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 5c7d8ad..1091d07 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -369,9 +369,9 @@ void EditBox::GetFocus()
//first called and a PostUserEvent is sent.
bool EditBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nResult = true;
+ bool bResult = true;
- if(pMEdit==nullptr) return nResult;
+ if(pMEdit==nullptr) return bResult;
MouseNotifyEvent nSwitch=rNEvt.GetType();
if(nSwitch==MouseNotifyEvent::KEYINPUT)// || nSwitch==MouseNotifyEvent::KEYUP)
@@ -380,18 +380,18 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
sal_uInt16 nKey=aKeyCode.GetCode();
if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB )
{
- nResult = GetParent()->Notify(rNEvt);
+ bResult = GetParent()->Notify(rNEvt);
}
else
{
- nResult=Control::PreNotify(rNEvt);
+ bResult=Control::PreNotify(rNEvt);
Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ), NULL, true );
}
}
else
{
- nResult=Control::PreNotify(rNEvt);
+ bResult=Control::PreNotify(rNEvt);
if(nSwitch==MouseNotifyEvent::MOUSEBUTTONDOWN || nSwitch==MouseNotifyEvent::MOUSEBUTTONUP)
{
@@ -399,7 +399,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ), NULL, true );
}
}
- return nResult;
+ return bResult;
}
//When an Event cleared wurde, this routine is
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 0f850ea..d2714b4 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1671,7 +1671,7 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
{
MouseNotifyEvent nType = rNEvt.GetType();
- bool nRet = false;
+ bool bRet = false;
if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() )
{
@@ -1681,16 +1681,16 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
if ( !rKeyCode.GetModifier() &&
KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() )
{
- nRet = false;
+ bRet = false;
- if ( !nRet && _pImp->_pBtnUp->IsEnabled() )
+ if ( !bRet && _pImp->_pBtnUp->IsEnabled() )
{
PrevLevel_Impl();
- nRet = true;
+ bRet = true;
}
}
}
- return nRet || ModalDialog::Notify( rNEvt );
+ return bRet || ModalDialog::Notify( rNEvt );
}
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 15fb15c..ec54cd1 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -130,13 +130,13 @@ void ComboBoxControl::LoseFocus()
bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if ( m_pComboBoxListener )
- nRet = m_pComboBoxListener->PreNotify( rNEvt );
- if ( !nRet )
- nRet = ComboBox::PreNotify( rNEvt );
+ bRet = m_pComboBoxListener->PreNotify( rNEvt );
+ if ( !bRet )
+ bRet = ComboBox::PreNotify( rNEvt );
- return nRet;
+ return bRet;
}
ComboboxToolbarController::ComboboxToolbarController(
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 7d00fbc..34f0bfe 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -113,13 +113,13 @@ void ListBoxControl::LoseFocus()
bool ListBoxControl::PreNotify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if ( m_pListBoxListener )
- nRet = m_pListBoxListener->PreNotify( rNEvt );
- if ( !nRet )
- nRet = ListBox::PreNotify( rNEvt );
+ bRet = m_pListBoxListener->PreNotify( rNEvt );
+ if ( !bRet )
+ bRet = ListBox::PreNotify( rNEvt );
- return nRet;
+ return bRet;
}
DropdownToolbarController::DropdownToolbarController(
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 41403fd..1ec9059 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -112,13 +112,13 @@ void EditControl::LoseFocus()
bool EditControl::PreNotify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if ( m_pEditListener )
- nRet = m_pEditListener->PreNotify( rNEvt );
- if ( !nRet )
- nRet = Edit::PreNotify( rNEvt );
+ bRet = m_pEditListener->PreNotify( rNEvt );
+ if ( !bRet )
+ bRet = Edit::PreNotify( rNEvt );
- return nRet;
+ return bRet;
}
EditToolbarController::EditToolbarController(
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 6c9970c..21c2d57 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -165,13 +165,13 @@ void SpinfieldControl::DataChanged( const DataChangedEvent& rDCEvt )
bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if ( m_pSpinFieldListener )
- nRet = m_pSpinFieldListener->PreNotify( rNEvt );
- if ( !nRet )
- nRet = SpinField::PreNotify( rNEvt );
+ bRet = m_pSpinFieldListener->PreNotify( rNEvt );
+ if ( !bRet )
+ bRet = SpinField::PreNotify( rNEvt );
- return nRet;
+ return bRet;
}
SpinfieldToolbarController::SpinfieldToolbarController(
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 6ef022d..ad221b1 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -49,22 +49,22 @@ enum SfxItemKind {
// warning, if there is no boolean inside the any this will always return the value false
inline bool Any2Bool( const ::com::sun::star::uno::Any&rValue )
{
- bool nValue = false;
+ bool bValue = false;
if( rValue.hasValue() )
{
if( rValue.getValueType() == cppu::UnoType<bool>::get() )
{
- nValue = *static_cast<sal_Bool const *>(rValue.getValue());
+ bValue = *static_cast<sal_Bool const *>(rValue.getValue());
}
else
{
sal_Int32 nNum = 0;
if( rValue >>= nNum )
- nValue = nNum != 0;
+ bValue = nNum != 0;
}
}
- return nValue;
+ return bValue;
}
enum SfxMapUnit
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 130ff10..28b4f68 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -305,13 +305,13 @@ public:
void InsertCalcHeader();
SvxRedlinTable* GetTableControl() { return m_pViewData;}
- void EnableAccept(bool nFlag=true);
- void EnableAcceptAll(bool nFlag=true);
- void EnableReject(bool nFlag=true);
- void EnableRejectAll(bool nFlag=true);
- void EnableUndo(bool nFlag=true);
+ void EnableAccept(bool bFlag=true);
+ void EnableAcceptAll(bool bFlag=true);
+ void EnableReject(bool bFlag=true);
+ void EnableRejectAll(bool bFlag=true);
+ void EnableUndo(bool bFlag=true);
void DisableUndo() {EnableUndo(false);}
- void ShowUndo(bool nFlag=true);
+ void ShowUndo(bool bFlag=true);
void SetAcceptClickHdl( const Link<SvxTPView*,void>& rLink ) { AcceptClickLk = rLink; }
diff --git a/include/vbahelper/vbareturntypes.hxx b/include/vbahelper/vbareturntypes.hxx
index ac8508c..99885d6 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -55,7 +55,7 @@ namespace ooo
class ReturnBoolean : public ReturnBoolean_BASE
{
public:
- ReturnBoolean( bool nValue ) : ReturnBoolean_BASE( nValue ){}
+ ReturnBoolean( bool bValue ) : ReturnBoolean_BASE( bValue ){}
};
typedef DefaultReturnHelper< float, ov::msforms::XReturnSingle > ReturnSingle_BASE;
class ReturnSingle : public ReturnSingle_BASE
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index b3f8c72..65889fd 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -189,15 +189,15 @@ namespace oox { namespace ppt {
bool SlideTransition::ooxToOdpSideDirectionsDirectionNormal( ::sal_Int32 nOoxType )
{
- bool nOdpDirection = true;
+ bool bOdpDirection = true;
switch( nOoxType )
{
case XML_u:
case XML_l:
- nOdpDirection = false;
+ bOdpDirection = false;
break;
}
- return nOdpDirection;
+ return bOdpDirection;
}
sal_Int16 SlideTransition::ooxToOdpCornerDirections( ::sal_Int32 nOoxType )
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 16feb17..deb9d1e 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -180,7 +180,7 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt )
bool ODesignView::PreNotify( NotifyEvent& rNEvt )
{
- bool nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here
+ bool bRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here
switch(rNEvt.GetType())
{
case MouseNotifyEvent::KEYINPUT:
@@ -193,14 +193,14 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt )
{
const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
if ( handleKeyEvent(*pKeyEvent) )
- nRet = true;
- else if ( nRet && m_pAccel.get() )
+ bRet = true;
+ else if ( bRet && m_pAccel.get() )
{
const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode();
util::URL aUrl;
aUrl.Complete = m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode));
if ( aUrl.Complete.isEmpty() || !m_xController->isCommandEnabled( aUrl.Complete ) )
- nRet = false;
+ bRet = false;
}
}
break;
@@ -208,7 +208,7 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt )
break;
}
- return nRet;
+ return bRet;
}
void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 668098a..e4d3523 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -69,7 +69,7 @@ public:
virtual void EnumVariables( void * pData, VarEnumCallbackProc ) SAL_OVERRIDE;
RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
- bool nInitDflt = false,
+ bool bInitDflt = false,
RscTop * pCreateClass = NULL ) SAL_OVERRIDE;
RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ) SAL_OVERRIDE;
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 2deca69..f94f574 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -92,7 +92,7 @@ public:
// returned pData, pClass may be NULL
virtual RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
- bool nInitDflt = false,
+ bool bInitDflt = false,
RscTop * pCreateClass = NULL );
virtual RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName );
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index 94c10c7..14bfdf3 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -79,10 +79,10 @@ public:
~ScChangeViewSettings();
bool ShowChanges() const {return bShowIt;}
- void SetShowChanges(bool nFlag) {bShowIt=nFlag;}
+ void SetShowChanges(bool bFlag) {bShowIt=bFlag;}
bool HasDate() const {return bIsDate;}
- void SetHasDate(bool nFlag) {bIsDate=nFlag;}
+ void SetHasDate(bool bFlag) {bIsDate=bFlag;}
void SetTheDateMode(SvxRedlinDateMode eDatMod){ eDateMode=eDatMod; }
SvxRedlinDateMode GetTheDateMode() const { return eDateMode; }
@@ -94,13 +94,13 @@ public:
const DateTime& GetTheLastDateTime()const {return aLastDateTime;}
bool HasAuthor() const {return bIsAuthor;}
- void SetHasAuthor(bool nFlag) {bIsAuthor=nFlag;}
+ void SetHasAuthor(bool bFlag) {bIsAuthor=bFlag;}
OUString GetTheAuthorToShow()const {return aAuthorToShow;}
void SetTheAuthorToShow(const OUString& aString){aAuthorToShow=aString;}
bool HasComment() const {return bIsComment;}
- void SetHasComment(bool nFlag) {bIsComment=nFlag;}
+ void SetHasComment(bool bFlag) {bIsComment=bFlag;}
OUString GetTheComment()const {return aComment;}
void SetTheComment(const OUString& aString);
@@ -110,7 +110,7 @@ public:
bool IsEveryoneButMe() const {return bEveryoneButMe;}
bool HasRange() const {return bIsRange;}
- void SetHasRange(bool nFlag) {bIsRange=nFlag;}
+ void SetHasRange(bool bFlag) {bIsRange=bFlag;}
const ScRangeList& GetTheRangeList()const {return aRangeList;}
void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;}
@@ -127,7 +127,7 @@ public:
void AdjustDateMode( const ScDocument& rDoc );
bool HasActionRange() const { return mbIsActionRange; }
- void SetHasActionRange( bool nFlag = true ) { mbIsActionRange = nFlag; }
+ void SetHasActionRange( bool bFlag = true ) { mbIsActionRange = bFlag; }
void GetTheActionRange( sal_uLong& nFirst, sal_uLong& nLast ) const { nFirst = mnFirstAction; nLast = mnLastAction; }
void SetTheActionRange( sal_uLong nFirst, sal_uLong nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; }
};
diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx
index 0526c64..6785127 100644
--- a/sc/source/core/tool/chgviset.cxx
+++ b/sc/source/core/tool/chgviset.cxx
@@ -82,15 +82,15 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting
bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const
{
- bool nTheFlag = true;
+ bool bTheFlag = true;
if(pCommentSearcher)
{
sal_Int32 nStartPos = 0;
sal_Int32 nEndPos = pCommentStr->getLength();
- nTheFlag = pCommentSearcher->SearchForward(*pCommentStr, &nStartPos, &nEndPos);
+ bTheFlag = pCommentSearcher->SearchForward(*pCommentStr, &nStartPos, &nEndPos);
}
- return nTheFlag;
+ return bTheFlag;
}
void ScChangeViewSettings::SetTheComment(const OUString& rString)
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 0cb03ef..365812d 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1183,7 +1183,7 @@ void ScInterpreter::ScAnd()
if ( MustHaveParamCountMin( nParamCount, 1 ) )
{
bool bHaveValue = false;
- bool nRes = true;
+ bool bRes = true;
size_t nRefInList = 0;
while( nParamCount-- > 0)
{
@@ -1193,7 +1193,7 @@ void ScInterpreter::ScAnd()
{
case svDouble :
bHaveValue = true;
- nRes &= ( PopDouble() != 0.0 );
+ bRes &= ( PopDouble() != 0.0 );
break;
case svString :
Pop();
@@ -1210,7 +1210,7 @@ void ScInterpreter::ScAnd()
if (aCell.hasNumeric())
{
bHaveValue = true;
- nRes &= ( GetCellValue(aAdr, aCell) != 0.0 );
+ bRes &= ( GetCellValue(aAdr, aCell) != 0.0 );
}
// else: Xcl raises no error here
}
@@ -1231,7 +1231,7 @@ void ScInterpreter::ScAnd()
bHaveValue = true;
do
{
- nRes &= ( fVal != 0.0 );
+ bRes &= ( fVal != 0.0 );
} while ( (nErr == 0) &&
aValIter.GetNext( fVal, nErr ) );
}
@@ -1252,10 +1252,10 @@ void ScInterpreter::ScAnd()
if ( nErr )
{
SetError( nErr );
- nRes = false;
+ bRes = false;
}
else
- nRes &= (fVal != 0.0);
+ bRes &= (fVal != 0.0);
}
// else: GetMatrix did set errIllegalParameter
}
@@ -1269,7 +1269,7 @@ void ScInterpreter::ScAnd()
Pop();
}
if ( bHaveValue )
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
else
PushNoValue();
}
@@ -1282,7 +1282,7 @@ void ScInterpreter::ScOr()
if ( MustHaveParamCountMin( nParamCount, 1 ) )
{
bool bHaveValue = false;
- bool nRes = false;
+ bool bRes = false;
size_t nRefInList = 0;
while( nParamCount-- > 0)
{
@@ -1292,7 +1292,7 @@ void ScInterpreter::ScOr()
{
case svDouble :
bHaveValue = true;
- nRes |= ( PopDouble() != 0.0 );
+ bRes |= ( PopDouble() != 0.0 );
break;
case svString :
Pop();
@@ -1309,7 +1309,7 @@ void ScInterpreter::ScOr()
if (aCell.hasNumeric())
{
bHaveValue = true;
- nRes |= ( GetCellValue(aAdr, aCell) != 0.0 );
+ bRes |= ( GetCellValue(aAdr, aCell) != 0.0 );
}
// else: Xcl raises no error here
}
@@ -1330,7 +1330,7 @@ void ScInterpreter::ScOr()
bHaveValue = true;
do
{
- nRes |= ( fVal != 0.0 );
+ bRes |= ( fVal != 0.0 );
} while ( (nErr == 0) &&
aValIter.GetNext( fVal, nErr ) );
}
@@ -1352,10 +1352,10 @@ void ScInterpreter::ScOr()
if ( nErr )
{
SetError( nErr );
- nRes = false;
+ bRes = false;
}
else
- nRes |= (fVal != 0.0);
+ bRes |= (fVal != 0.0);
}
// else: GetMatrix did set errIllegalParameter
}
@@ -1369,7 +1369,7 @@ void ScInterpreter::ScOr()
Pop();
}
if ( bHaveValue )
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
else
PushNoValue();
}
@@ -1383,7 +1383,7 @@ void ScInterpreter::ScXor()
if ( MustHaveParamCountMin( nParamCount, 1 ) )
{
bool bHaveValue = false;
- bool nRes = false;
+ bool bRes = false;
size_t nRefInList = 0;
while( nParamCount-- > 0)
{
@@ -1393,7 +1393,7 @@ void ScInterpreter::ScXor()
{
case svDouble :
bHaveValue = true;
- nRes ^= ( PopDouble() != 0.0 );
+ bRes ^= ( PopDouble() != 0.0 );
break;
case svString :
Pop();
@@ -1410,7 +1410,7 @@ void ScInterpreter::ScXor()
if (aCell.hasNumeric())
{
bHaveValue = true;
- nRes ^= ( GetCellValue(aAdr, aCell) != 0.0 );
+ bRes ^= ( GetCellValue(aAdr, aCell) != 0.0 );
}
/* TODO: set error? Excel doesn't have XOR, but
* doesn't set an error in this case for AND and
@@ -1433,7 +1433,7 @@ void ScInterpreter::ScXor()
bHaveValue = true;
do
{
- nRes ^= ( fVal != 0.0 );
+ bRes ^= ( fVal != 0.0 );
} while ( (nErr == 0) &&
aValIter.GetNext( fVal, nErr ) );
}
@@ -1455,10 +1455,10 @@ void ScInterpreter::ScXor()
if ( nErr )
{
SetError( nErr );
- nRes = false;
+ bRes = false;
}
else
- nRes ^= ( fVal != 0.0 );
+ bRes ^= ( fVal != 0.0 );
}
// else: GetMatrix did set errIllegalParameter
}
@@ -1472,7 +1472,7 @@ void ScInterpreter::ScXor()
Pop();
}
if ( bHaveValue )
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
else
PushNoValue();
}
@@ -1861,12 +1861,12 @@ void ScInterpreter::ScIsEmpty()
bool ScInterpreter::IsString()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetRawStackType() )
{
case svString:
Pop();
- nRes = true;
+ bRes = true;
break;
case svDoubleRef :
case svSingleRef :
@@ -1883,10 +1883,10 @@ bool ScInterpreter::IsString()
{
case CELLTYPE_STRING :
case CELLTYPE_EDIT :
- nRes = true;
+ bRes = true;
break;
case CELLTYPE_FORMULA :
- nRes = (!aCell.mpFormula->IsValue() && !aCell.mpFormula->IsEmpty());
+ bRes = (!aCell.mpFormula->IsValue() && !aCell.mpFormula->IsEmpty());
break;
default:
; // nothing
@@ -1900,14 +1900,14 @@ bool ScInterpreter::IsString()
if ( !pMat )
; // nothing
else if ( !pJumpMatrix )
- nRes = pMat->IsString(0, 0) && !pMat->IsEmpty(0, 0);
+ bRes = pMat->IsString(0, 0) && !pMat->IsEmpty(0, 0);
else
{
SCSIZE nCols, nRows, nC, nR;
pMat->GetDimensions( nCols, nRows);
pJumpMatrix->GetPos( nC, nR);
if ( nC < nCols && nR < nRows )
- nRes = pMat->IsString( nC, nR) && !pMat->IsEmpty( nC, nR);
+ bRes = pMat->IsString( nC, nR) && !pMat->IsEmpty( nC, nR);
}
}
break;
@@ -1915,7 +1915,7 @@ bool ScInterpreter::IsString()
Pop();
}
nGlobalError = 0;
- return nRes;
+ return bRes;
}
void ScInterpreter::ScIsString()
@@ -1930,7 +1930,7 @@ void ScInterpreter::ScIsNonString()
void ScInterpreter::ScIsLogical()
{
- bool nRes = false;
+ bool bRes = false;
switch ( GetStackType() )
{
case svDoubleRef :
@@ -1947,7 +1947,7 @@ void ScInterpreter::ScIsLogical()
if (aCell.hasNumeric())
{
sal_uLong nFormat = GetCellNumberFormat(aAdr, aCell);
- nRes = (pFormatter->GetType(nFormat) == css::util::NumberFormat::LOGICAL);
+ bRes = (pFormatter->GetType(nFormat) == css::util::NumberFormat::LOGICAL);
}
}
}
@@ -1959,11 +1959,11 @@ void ScInterpreter::ScIsLogical()
default:
PopError();
if ( !nGlobalError )
- nRes = ( nCurFmtType == css::util::NumberFormat::LOGICAL );
+ bRes = ( nCurFmtType == css::util::NumberFormat::LOGICAL );
}
nCurFmtType = nFuncFmtType = css::util::NumberFormat::LOGICAL;
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
void ScInterpreter::ScType()
@@ -2438,7 +2438,7 @@ void ScInterpreter::ScCellExternal()
void ScInterpreter::ScIsRef()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetStackType() )
{
case svSingleRef :
@@ -2446,7 +2446,7 @@ void ScInterpreter::ScIsRef()
ScAddress aAdr;
PopSingleRef( aAdr );
if ( !nGlobalError )
- nRes = true;
+ bRes = true;
}
break;
case svDoubleRef :
@@ -2454,32 +2454,32 @@ void ScInterpreter::ScIsRef()
ScRange aRange;
PopDoubleRef( aRange );
if ( !nGlobalError )
- nRes = true;
+ bRes = true;
}
break;
case svRefList :
{
FormulaTokenRef x = PopToken();
if ( !nGlobalError )
- nRes = !x.get()->GetRefList()->empty();
+ bRes = !x.get()->GetRefList()->empty();
}
break;
default:
Pop();
}
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
void ScInterpreter::ScIsValue()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetRawStackType() )
{
case svDouble:
Pop();
- nRes = true;
+ bRes = true;
break;
case svDoubleRef :
case svSingleRef :
@@ -2495,10 +2495,10 @@ void ScInterpreter::ScIsValue()
switch (aCell.meType)
{
case CELLTYPE_VALUE :
- nRes = true;
+ bRes = true;
break;
case CELLTYPE_FORMULA :
- nRes = (aCell.mpFormula->IsValue() && !aCell.mpFormula->IsEmpty());
+ bRes = (aCell.mpFormula->IsValue() && !aCell.mpFormula->IsEmpty());
break;
default:
; // nothing
@@ -2514,7 +2514,7 @@ void ScInterpreter::ScIsValue()
else if ( !pJumpMatrix )
{
if (pMat->GetErrorIfNotString( 0, 0) == 0)
- nRes = pMat->IsValue( 0, 0);
+ bRes = pMat->IsValue( 0, 0);
}
else
{
@@ -2523,7 +2523,7 @@ void ScInterpreter::ScIsValue()
pJumpMatrix->GetPos( nC, nR);
if ( nC < nCols && nR < nRows )
if (pMat->GetErrorIfNotString( nC, nR) == 0)
- nRes = pMat->IsValue( nC, nR);
+ bRes = pMat->IsValue( nC, nR);
}
}
break;
@@ -2531,13 +2531,13 @@ void ScInterpreter::ScIsValue()
Pop();
}
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
void ScInterpreter::ScIsFormula()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetStackType() )
{
case svDoubleRef :
@@ -2547,14 +2547,14 @@ void ScInterpreter::ScIsFormula()
if ( !PopDoubleRefOrSingleRef( aAdr ) )
break;
- nRes = (pDok->GetCellType(aAdr) == CELLTYPE_FORMULA);
+ bRes = (pDok->GetCellType(aAdr) == CELLTYPE_FORMULA);
}
break;
default:
Pop();
}
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
void ScInterpreter::ScFormula()
@@ -2640,7 +2640,7 @@ void ScInterpreter::ScFormula()
void ScInterpreter::ScIsNV()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetStackType() )
{
case svDoubleRef :
@@ -2649,13 +2649,13 @@ void ScInterpreter::ScIsNV()
ScAddress aAdr;
bool bOk = PopDoubleRefOrSingleRef( aAdr );
if ( nGlobalError == NOTAVAILABLE )
- nRes = true;
+ bRes = true;
else if (bOk)
{
ScRefCellValue aCell;
aCell.assign(*pDok, aAdr);
sal_uInt16 nErr = GetCellErrCode(aCell);
- nRes = (nErr == NOTAVAILABLE);
+ bRes = (nErr == NOTAVAILABLE);
}
}
break;
@@ -2665,30 +2665,30 @@ void ScInterpreter::ScIsNV()
if ( !pMat )
; // nothing
else if ( !pJumpMatrix )
- nRes = (pMat->GetErrorIfNotString( 0, 0) == NOTAVAILABLE);
+ bRes = (pMat->GetErrorIfNotString( 0, 0) == NOTAVAILABLE);
else
{
SCSIZE nCols, nRows, nC, nR;
pMat->GetDimensions( nCols, nRows);
pJumpMatrix->GetPos( nC, nR);
if ( nC < nCols && nR < nRows )
- nRes = (pMat->GetErrorIfNotString( nC, nR) == NOTAVAILABLE);
+ bRes = (pMat->GetErrorIfNotString( nC, nR) == NOTAVAILABLE);
}
}
break;
default:
PopError();
if ( nGlobalError == NOTAVAILABLE )
- nRes = true;
+ bRes = true;
}
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
void ScInterpreter::ScIsErr()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetStackType() )
{
case svDoubleRef :
@@ -2697,13 +2697,13 @@ void ScInterpreter::ScIsErr()
ScAddress aAdr;
bool bOk = PopDoubleRefOrSingleRef( aAdr );
if ( !bOk || (nGlobalError && nGlobalError != NOTAVAILABLE) )
- nRes = true;
+ bRes = true;
else
{
ScRefCellValue aCell;
aCell.assign(*pDok, aAdr);
sal_uInt16 nErr = GetCellErrCode(aCell);
- nRes = (nErr && nErr != NOTAVAILABLE);
+ bRes = (nErr && nErr != NOTAVAILABLE);
}
}
break;
@@ -2711,11 +2711,11 @@ void ScInterpreter::ScIsErr()
{
ScMatrixRef pMat = PopMatrix();
if ( nGlobalError || !pMat )
- nRes = ((nGlobalError && nGlobalError != NOTAVAILABLE) || !pMat);
+ bRes = ((nGlobalError && nGlobalError != NOTAVAILABLE) || !pMat);
else if ( !pJumpMatrix )
{
sal_uInt16 nErr = pMat->GetErrorIfNotString( 0, 0);
- nRes = (nErr && nErr != NOTAVAILABLE);
+ bRes = (nErr && nErr != NOTAVAILABLE);
}
else
{
@@ -2725,7 +2725,7 @@ void ScInterpreter::ScIsErr()
if ( nC < nCols && nR < nRows )
{
sal_uInt16 nErr = pMat->GetErrorIfNotString( nC, nR);
- nRes = (nErr && nErr != NOTAVAILABLE);
+ bRes = (nErr && nErr != NOTAVAILABLE);
}
}
}
@@ -2733,16 +2733,16 @@ void ScInterpreter::ScIsErr()
default:
PopError();
if ( nGlobalError && nGlobalError != NOTAVAILABLE )
- nRes = true;
+ bRes = true;
}
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
void ScInterpreter::ScIsError()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
switch ( GetStackType() )
{
case svDoubleRef :
@@ -2751,16 +2751,16 @@ void ScInterpreter::ScIsError()
ScAddress aAdr;
if ( !PopDoubleRefOrSingleRef( aAdr ) )
{
- nRes = true;
+ bRes = true;
break;
}
if ( nGlobalError )
- nRes = true;
+ bRes = true;
else
{
ScRefCellValue aCell;
aCell.assign(*pDok, aAdr);
- nRes = (GetCellErrCode(aCell) != 0);
+ bRes = (GetCellErrCode(aCell) != 0);
}
}
break;
@@ -2768,32 +2768,32 @@ void ScInterpreter::ScIsError()
{
ScMatrixRef pMat = PopMatrix();
if ( nGlobalError || !pMat )
- nRes = true;
+ bRes = true;
else if ( !pJumpMatrix )
- nRes = (pMat->GetErrorIfNotString( 0, 0) != 0);
+ bRes = (pMat->GetErrorIfNotString( 0, 0) != 0);
else
{
SCSIZE nCols, nRows, nC, nR;
pMat->GetDimensions( nCols, nRows);
pJumpMatrix->GetPos( nC, nR);
if ( nC < nCols && nR < nRows )
- nRes = (pMat->GetErrorIfNotString( nC, nR) != 0);
+ bRes = (pMat->GetErrorIfNotString( nC, nR) != 0);
}
}
break;
default:
PopError();
if ( nGlobalError )
- nRes = true;
+ bRes = true;
}
nGlobalError = 0;
- PushInt( int(nRes) );
+ PushInt( int(bRes) );
}
bool ScInterpreter::IsEven()
{
nFuncFmtType = css::util::NumberFormat::LOGICAL;
- bool nRes = false;
+ bool bRes = false;
double fVal = 0.0;
switch ( GetStackType() )
{
@@ -2815,13 +2815,13 @@ bool ScInterpreter::IsEven()
{
case CELLTYPE_VALUE :
fVal = GetCellValue(aAdr, aCell);
- nRes = true;
+ bRes = true;
break;
case CELLTYPE_FORMULA :
if (aCell.mpFormula->IsValue())
{
fVal = GetCellValue(aAdr, aCell);
- nRes = true;
+ bRes = true;
}
break;
default:
@@ -2833,7 +2833,7 @@ bool ScInterpreter::IsEven()
case svDouble:
{
fVal = PopDouble();
- nRes = true;
+ bRes = true;
}
break;
case svMatrix:
@@ -2843,8 +2843,8 @@ bool ScInterpreter::IsEven()
; // nothing
else if ( !pJumpMatrix )
{
- nRes = pMat->IsValue( 0, 0);
- if ( nRes )
+ bRes = pMat->IsValue( 0, 0);
+ if ( bRes )
fVal = pMat->GetDouble( 0, 0);
}
else
@@ -2854,8 +2854,8 @@ bool ScInterpreter::IsEven()
pJumpMatrix->GetPos( nC, nR);
if ( nC < nCols && nR < nRows )
{
- nRes = pMat->IsValue( nC, nR);
- if ( nRes )
+ bRes = pMat->IsValue( nC, nR);
+ if ( bRes )
fVal = pMat->GetDouble( nC, nR);
}
else
@@ -2866,11 +2866,11 @@ bool ScInterpreter::IsEven()
default:
; // nothing
}
- if ( !nRes )
+ if ( !bRes )
SetError( errIllegalParameter);
else
- nRes = ( fmod( ::rtl::math::approxFloor( fabs( fVal ) ), 2.0 ) < 0.5 );
- return nRes;
+ bRes = ( fmod( ::rtl::math::approxFloor( fabs( fVal ) ), 2.0 ) < 0.5 );
+ return bRes;
}
void ScInterpreter::ScIsEven()
@@ -7957,13 +7957,13 @@ bool SAL_CALL lcl_getScriptClass(sal_uInt32 currentChar)
(MsLangId::getSystemLanguage() == LANGUAGE_JAPANESE) )
return true;
sal_uInt16 i;
- static bool nRet = false;
+ static bool bRet = false;
UBlockCode block = (UBlockCode)ublock_getCode((sal_uInt32)currentChar);
for ( i = 0; i < scriptListCount; i++) {
if (block <= scriptList[i].to) break;
}
- nRet = (i < scriptListCount && block >= scriptList[i].from);
- return nRet;
+ bRet = (i < scriptListCount && block >= scriptList[i].from);
+ return bRet;
}
bool IsDBCS(sal_Unicode ch)
{
@@ -8173,8 +8173,8 @@ void ScInterpreter::ScSearch()
utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL);
utl::SearchParam sPar(SearchStr, eSearchType, false, false, false);
utl::TextSearch sT( sPar, *ScGlobal::pCharClass );
- bool nBool = sT.SearchForward(sStr, &nPos, &nEndPos);
- if (!nBool)
+ bool bBool = sT.SearchForward(sStr, &nPos, &nEndPos);
+ if (!bBool)
PushNoValue();
else
PushDouble((double)(nPos) + 1);
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 0c7fb51..9cb6248 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -899,13 +899,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
{
bool bFmla2 = false;
ScConditionMode eOperation = mrFormatEntry.GetOperation();
- bool nAboveAverage = eOperation == SC_COND_ABOVE_AVERAGE ||
+ bool bAboveAverage = eOperation == SC_COND_ABOVE_AVERAGE ||
eOperation == SC_COND_ABOVE_EQUAL_AVERAGE;
- bool nEqualAverage = eOperation == SC_COND_ABOVE_EQUAL_AVERAGE ||
+ bool bEqualAverage = eOperation == SC_COND_ABOVE_EQUAL_AVERAGE ||
eOperation == SC_COND_BELOW_EQUAL_AVERAGE;
- bool nBottom = eOperation == SC_COND_BOTTOM10
+ bool bBottom = eOperation == SC_COND_BOTTOM10
|| eOperation == SC_COND_BOTTOM_PERCENT;
- bool nPercent = eOperation == SC_COND_TOP_PERCENT ||
+ bool bPercent = eOperation == SC_COND_TOP_PERCENT ||
eOperation == SC_COND_BOTTOM_PERCENT;
OString aRank("0");
if(IsTopBottomRule(eOperation))
@@ -930,10 +930,10 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
XML_type, GetTypeString( mrFormatEntry.GetOperation() ),
XML_priority, OString::number( mnPriority + 1 ).getStr(),
XML_operator, GetOperatorString( mrFormatEntry.GetOperation(), bFmla2 ),
- XML_aboveAverage, OString::number( int(nAboveAverage) ).getStr(),
- XML_equalAverage, OString::number( int(nEqualAverage) ).getStr(),
- XML_bottom, OString::number( int(nBottom) ).getStr(),
- XML_percent, OString::number( int(nPercent) ).getStr(),
+ XML_aboveAverage, OString::number( int(bAboveAverage) ).getStr(),
+ XML_equalAverage, OString::number( int(bEqualAverage) ).getStr(),
+ XML_bottom, OString::number( int(bBottom) ).getStr(),
+ XML_percent, OString::number( int(bPercent) ).getStr(),
XML_rank, aRank.getStr(),
XML_text, aText.getStr(),
XML_dxfId, OString::number( GetDxfs().GetDxfId( mrFormatEntry.GetStyle() ) ).getStr(),
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e724f68..140b525 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2539,11 +2539,11 @@ bool ScDocShell::PrepareClose( bool bUI )
}
// end handler code
- bool nRet = SfxObjectShell::PrepareClose( bUI );
- if (nRet) // true == close
+ bool bRet = SfxObjectShell::PrepareClose( bUI );
+ if (bRet) // true == close
aDocument.EnableIdle(false); // Do not mess around with it anymore!
- return nRet;
+ return bRet;
}
void ScDocShell::PrepareReload()
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6618057..f25e85b 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -90,7 +90,7 @@ ColumnEdit::~ColumnEdit()
bool ColumnEdit::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = SpinField::Notify( rNEvt );
+ bool bHandled = SpinField::Notify( rNEvt );
MouseNotifyEvent nType = rNEvt.GetType();
if ( nType == MouseNotifyEvent::KEYINPUT )
@@ -108,14 +108,14 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt )
{
ScNavigatorDlg::ReleaseFocus();
ExecuteCol();
- nHandled = true;
+ bHandled = true;
}
}
}
else if ( nType == MouseNotifyEvent::LOSEFOCUS ) // LoseFocus not called at VCL
EvalText(); // nCol set
- return nHandled;
+ return bHandled;
}
void ColumnEdit::LoseFocus()
@@ -262,7 +262,7 @@ RowEdit::~RowEdit()
bool RowEdit::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = NumericField::Notify( rNEvt );
+ bool bHandled = NumericField::Notify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -272,11 +272,11 @@ bool RowEdit::Notify( NotifyEvent& rNEvt )
{
ScNavigatorDlg::ReleaseFocus();
ExecuteRow();
- nHandled = true;
+ bHandled = true;
}
}
- return nHandled;
+ return bHandled;
}
void RowEdit::LoseFocus()
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index cf5d7b6..549008a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -291,7 +291,7 @@ void ScFilterListBox::LoseFocus()
bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
@@ -302,17 +302,17 @@ bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
if ( nKey == KEY_RETURN )
{
SelectHdl(); // select
- nDone = true;
+ bDone = true;
}
else if ( nKey == KEY_ESCAPE )
{
pGridWin->ClickExtern(); // clears the listbox
- nDone = true;
+ bDone = true;
}
}
}
- return nDone || ListBox::PreNotify( rNEvt );
+ return bDone || ListBox::PreNotify( rNEvt );
}
void ScFilterListBox::Select()
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 11a6d05..408687a 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -304,9 +304,9 @@ bool ScTabViewShell::PrepareClose(bool bUI)
if ( pFormShell )
{
- bool nRet = pFormShell->PrepareClose(bUI);
- if (!nRet)
- return nRet;
+ bool bRet = pFormShell->PrepareClose(bUI);
+ if (!bRet)
+ return bRet;
}
return SfxViewShell::PrepareClose(bUI);
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index bb5e989..831f990 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -376,7 +376,7 @@ void DropdownMenuBox::Resize()
bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nResult = true;
+ bool bResult = true;
MouseNotifyEvent nSwitch=rNEvt.GetType();
if (nSwitch==MouseNotifyEvent::KEYINPUT)
@@ -390,13 +390,13 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
}
else
{
- nResult=Edit::PreNotify(rNEvt);
+ bResult=Edit::PreNotify(rNEvt);
}
}
else
- nResult=Edit::PreNotify(rNEvt);
+ bResult=Edit::PreNotify(rNEvt);
- return nResult;
+ return bResult;
}
class CharHeightPropertyBox : public PropertySubControl
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 64024a8..bfd0e6c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -807,14 +807,14 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt)
*/
void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt )
{
- bool nOK = false;
+ bool bOK = false;
if (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE)
{
if( SdPageObjsTLB::IsInDrag() )
{
// during drag'n'drop we just stop the drag but do not close the navigator
- nOK = true;
+ bOK = true;
}
else
{
@@ -826,7 +826,7 @@ void SdNavigatorWin::KeyInput( const KeyEvent& rKEvt )
}
}
- if (!nOK)
+ if (!bOK)
{
Window::KeyInput(rKEvt);
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 7da0c4c..6c4e404 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -748,19 +748,19 @@ void ViewShellBase::SetZoomFactor (
bool ViewShellBase::PrepareClose (bool bUI)
{
- bool nResult = SfxViewShell::PrepareClose (bUI);
+ bool bResult = SfxViewShell::PrepareClose (bUI);
- if (nResult)
+ if (bResult)
{
mpImpl->mbIsClosing = true;
// Forward call to main sub shell.
ViewShell* pShell = GetMainViewShell().get();
if (pShell != NULL)
- nResult = pShell->PrepareClose (bUI);
+ bResult = pShell->PrepareClose (bUI);
}
- return nResult;
+ return bResult;
}
void ViewShellBase::WriteUserData (OUString& rString, bool bBrowse)
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index a4fdbd2..a9a4bd0 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -268,15 +268,15 @@ void Window::Command(const CommandEvent& rCEvt)
bool Window::Notify( NotifyEvent& rNEvt )
{
- bool nResult = false;
+ bool bResult = false;
if ( mpViewShell )
{
- nResult = mpViewShell->Notify(rNEvt, this);
+ bResult = mpViewShell->Notify(rNEvt, this);
}
- if( !nResult )
- nResult = vcl::Window::Notify( rNEvt );
+ if( !bResult )
+ bResult = vcl::Window::Notify( rNEvt );
- return nResult;
+ return bResult;
}
void Window::RequestHelp(const HelpEvent& rEvt)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index de5ebb1..642f33f 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -717,14 +717,14 @@ void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
bool ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin)
{
// handle scroll commands when they arrived at child windows
- bool nRet = false;
+ bool bRet = false;
if( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
// note: dynamic_cast is not possible as GetData() returns a void*
CommandEvent* pCmdEvent = static_cast< CommandEvent* >(rNEvt.GetData());
- nRet = HandleScrollCommand(*pCmdEvent, pWin);
+ bRet = HandleScrollCommand(*pCmdEvent, pWin);
}
- return nRet;
+ return bRet;
}
bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin)
@@ -1123,13 +1123,13 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab )
*/
bool ViewShell::PrepareClose (bool bUI)
{
- bool nResult = true;
+ bool bResult = true;
FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell();
if (pFormShell != NULL)
- nResult = pFormShell->PrepareClose (bUI);
+ bResult = pFormShell->PrepareClose (bUI);
- return nResult;
+ return bResult;
}
void ViewShell::UpdatePreview (SdPage*, bool )
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 121bc98..858d979 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 0013924..799f6e0 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 785bb0c..1d7de97 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 86354a2..fe4dc1d 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 992f1be..db43463 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 ff4e1ea..9f73e87 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 71d8bf2..b66c4bc7 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 1594cf3..70796e9 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;
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 9a145dd..db5f135 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1586,14 +1586,14 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
//adding support for erasing features in UserPaintOverlay
if ( rProperty.Name == "EraseAllInk" )
{
- bool nEraseAllInk(false);
- if (rProperty.Value >>= nEraseAllInk)
+ bool bEraseAllInk(false);
+ if (rProperty.Value >>= bEraseAllInk)
{
OSL_ENSURE( mbMouseVisible,
"setProperty(): User paint overrides invisible mouse" );
// enable user paint
- maEraseAllInk.reset( nEraseAllInk );
+ maEraseAllInk.reset( bEraseAllInk );
maEventMultiplexer.notifyEraseAllInk( *maEraseAllInk );
}
@@ -1602,15 +1602,15 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
if ( rProperty.Name == "SwitchPenMode" )
{
- bool nSwitchPenMode(false);
- if (rProperty.Value >>= nSwitchPenMode)
+ bool bSwitchPenMode(false);
+ if (rProperty.Value >>= bSwitchPenMode)
{
OSL_ENSURE( mbMouseVisible,
"setProperty(): User paint overrides invisible mouse" );
- if(nSwitchPenMode){
+ if(bSwitchPenMode){
// Switch to Pen Mode
- maSwitchPenMode.reset( nSwitchPenMode );
+ maSwitchPenMode.reset( bSwitchPenMode );
maEventMultiplexer.notifySwitchPenMode();
}
}
@@ -1619,14 +1619,14 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
if ( rProperty.Name == "SwitchEraserMode" )
{
- bool nSwitchEraserMode(false);
- if (rProperty.Value >>= nSwitchEraserMode)
+ bool bSwitchEraserMode(false);
+ if (rProperty.Value >>= bSwitchEraserMode)
{
OSL_ENSURE( mbMouseVisible,
"setProperty(): User paint overrides invisible mouse" );
- if(nSwitchEraserMode){
+ if(bSwitchEraserMode){
// switch to Eraser mode
- maSwitchEraserMode.reset( nSwitchEraserMode );
+ maSwitchEraserMode.reset( bSwitchEraserMode );
maEventMultiplexer.notifySwitchEraserMode();
}
}
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index 04edb71..1c46773 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -373,11 +373,11 @@ namespace slideshow
const ShapeSharedPtr& /*rShape*/,
const ::basegfx::B2DVector& /*rSlideBounds*/ )
{
- bool nTmp;
+ bool bTmp;
// try to extract bool value
- if( (rSourceAny >>= nTmp) )
+ if( (rSourceAny >>= bTmp) )
{
- o_rValue = nTmp;
+ o_rValue = bTmp;
// succeeded
return true;
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index de1c3ac..3b35614 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -52,7 +52,7 @@ void SvSimpleTableContainer::SetTable(SvSimpleTable* pTable)
bool SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt )
{
- bool nResult = true;
+ bool bResult = true;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const vcl::KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
@@ -62,12 +62,12 @@ bool SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt )
else if (m_pTable && m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT))
return false;
else
- nResult = Control::PreNotify( rNEvt );
+ bResult = Control::PreNotify( rNEvt );
}
else
- nResult = Control::PreNotify( rNEvt );
+ bResult = Control::PreNotify( rNEvt );
- return nResult;
+ return bResult;
}
void SvSimpleTableContainer::Resize()
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index fe3a390..4568f4a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -366,10 +366,10 @@ long BorderWidthImpl::GetGap( long nWidth ) const
return result;
}
-static double lcl_getGuessedWidth( long nTested, double nRate, bool nChanging )
+static double lcl_getGuessedWidth( long nTested, double nRate, bool bChanging )
{
double nWidth = -1.0;
- if ( nChanging )
+ if ( bChanging )
nWidth = double( nTested ) / nRate;
else
{
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 68e046a..8868747 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -85,9 +85,9 @@ namespace svt
&& ( IsInDropDown() )
)
{
- bool nReturn = SvtURLBox::Notify(_rNEvt);
+ bool bReturn = SvtURLBox::Notify(_rNEvt);
DisplayURL( m_sPreservedText );
- return nReturn;
+ return bReturn;
}
}
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 1a9ccee..54fdafc 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1587,11 +1587,11 @@ void TabBar::ActivatePage()
bool TabBar::ImplDeactivatePage()
{
- bool nRet = DeactivatePage();
+ bool bRet = DeactivatePage();
CallEventListeners(VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)));
- return nRet;
+ return bRet;
}
void TabBar::ImplPrePaint(vcl::RenderContext& /*rRenderContext*/)
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 0086412..9a5334f 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -59,7 +59,7 @@ namespace svt
if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode())
if (IsInDropDown())
{
- bool nReturn = SvtURLBox::Notify(_rNEvt);
+ bool bReturn = SvtURLBox::Notify(_rNEvt);
// build a system dependent (thus more user readable) file name
OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL);
@@ -69,7 +69,7 @@ namespace svt
// Update the pick list
UpdatePickList();
- return nReturn;
+ return bReturn;
}
return SvtURLBox::Notify(_rNEvt);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list