summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Heinemann <stefan.heinemann@codedump.ch>2015-09-25 13:06:09 +0200
committerMichael Stahl <mstahl@redhat.com>2015-09-29 18:33:40 +0000
commitc50eb68af3096645246a77259bb3d1cc70eb6b63 (patch)
treea3f9442fa2d2c13464d1623f8bcf772b27426e72
parent491c2e24ac110c9ebdb1a483c34ae3d14ab0d615 (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>
-rw-r--r--basctl/source/basicide/basicbox.cxx16
-rw-r--r--basctl/source/basicide/basides1.cxx6
-rw-r--r--basctl/source/basicide/bastypes.cxx6
-rw-r--r--basctl/source/basicide/moduldl2.cxx6
-rw-r--r--basic/source/runtime/methods.cxx12
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx6
-rw-r--r--comphelper/source/misc/types.cxx6
-rw-r--r--connectivity/source/commontools/TSortIndex.cxx12
-rw-r--r--cui/source/customize/macropg.cxx4
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx16
-rw-r--r--cui/source/inc/numfmt.hxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx10
-rw-r--r--cui/source/tabpages/numfmt.cxx6
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx4
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx6
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/limitboxcontroller.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx10
-rw-r--r--editeng/source/items/paraitem.cxx12
-rw-r--r--extensions/source/bibliography/bibcont.cxx8
-rw-r--r--extensions/source/bibliography/toolbar.cxx8
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx16
-rw-r--r--filter/source/graphicfilter/ipcx/ipcx.cxx6
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx10
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx6
-rw-r--r--forms/source/xforms/computedexpression.cxx4
-rw-r--r--formula/source/ui/dlg/formula.cxx8
-rw-r--r--formula/source/ui/dlg/funcpage.cxx4
-rw-r--r--formula/source/ui/dlg/funcutl.cxx12
-rw-r--r--fpicker/source/office/iodlg.cxx10
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx10
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx10
-rw-r--r--include/svl/poolitem.hxx8
-rw-r--r--include/svx/ctredlin.hxx12
-rw-r--r--include/vbahelper/vbareturntypes.hxx2
-rw-r--r--oox/source/ppt/slidetransition.cxx6
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx10
-rw-r--r--rsc/inc/rscclass.hxx2
-rw-r--r--rsc/inc/rsctop.hxx2
-rw-r--r--sc/inc/chgviset.hxx12
-rw-r--r--sc/source/core/tool/chgviset.cxx6
-rw-r--r--sc/source/core/tool/interpr1.cxx174
-rw-r--r--sc/source/filter/excel/xecontent.cxx16
-rw-r--r--sc/source/ui/docshell/docsh.cxx6
-rw-r--r--sc/source/ui/navipi/navipi.cxx12
-rw-r--r--sc/source/ui/view/gridwin.cxx8
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx8
-rw-r--r--sd/source/ui/dlg/navigatr.cxx6
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx8
-rw-r--r--sd/source/ui/view/sdwindow.cxx10
-rw-r--r--sd/source/ui/view/viewshel.cxx12
-rw-r--r--sfx2/source/appl/app.cxx6
-rw-r--r--sfx2/source/appl/appdde.cxx4
-rw-r--r--sfx2/source/appl/newhelp.cxx32
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx6
-rw-r--r--sfx2/source/dialog/templdlg.cxx22
-rw-r--r--sfx2/source/doc/objxtor.cxx6
-rw-r--r--sfx2/source/sidebar/Theme.cxx6
-rw-r--r--sfx2/source/view/frame.cxx18
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx22
-rw-r--r--slideshow/source/engine/tools.cxx6
-rw-r--r--svtools/source/contnr/simptabl.cxx8
-rw-r--r--svtools/source/control/ctrlbox.cxx4
-rw-r--r--svtools/source/control/fileurlbox.cxx4
-rw-r--r--svtools/source/control/tabbar.cxx4
-rw-r--r--svtools/source/control/urlcontrol.cxx4
-rw-r--r--svtools/source/dialogs/roadmapwizard.cxx4
-rw-r--r--svtools/source/table/tabledatawindow.cxx6
-rw-r--r--svx/source/dialog/ctredlin.cxx34
-rw-r--r--svx/source/dialog/rubydialog.cxx20
-rw-r--r--svx/source/form/datanavi.cxx6
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx6
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx8
-rw-r--r--svx/source/tbxctrls/itemwin.cxx36
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx16
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx8
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx8
-rw-r--r--sw/inc/fesh.hxx2
-rw-r--r--sw/inc/htmltbl.hxx2
-rw-r--r--sw/inc/viewsh.hxx2
-rw-r--r--sw/source/core/attr/swatrset.cxx8
-rw-r--r--sw/source/core/crsr/swcrsr.cxx4
-rw-r--r--sw/source/core/doc/fmtcol.cxx8
-rw-r--r--sw/source/core/docnode/node.cxx18
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/inc/swfont.hxx4
-rw-r--r--sw/source/core/text/itrcrsr.cxx14
-rw-r--r--sw/source/core/text/itrtxt.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx12
-rw-r--r--sw/source/ui/fldui/fldvar.cxx4
-rw-r--r--sw/source/ui/misc/bookmark.cxx10
-rw-r--r--sw/source/uibase/app/docsh2.cxx6
-rw-r--r--sw/source/uibase/cctrl/actctrl.cxx8
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx188
-rw-r--r--sw/source/uibase/uiview/pview.cxx6
-rw-r--r--sw/source/uibase/utlui/content.cxx8
-rw-r--r--sw/source/uibase/wrtsh/move.cxx8
-rw-r--r--unotools/source/i18n/textsearch.cxx12
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx16
-rw-r--r--vcl/inc/win/salobj.h2
-rw-r--r--vcl/source/bitmap/BitmapSymmetryCheck.cxx8
-rw-r--r--vcl/source/control/combobox.cxx16
-rw-r--r--vcl/source/control/ilstbox.cxx6
-rw-r--r--vcl/source/control/lstbox.cxx20
-rw-r--r--vcl/source/control/spinfld.cxx18
-rw-r--r--vcl/source/control/tabctrl.cxx14
-rw-r--r--vcl/source/edit/vclmedit.cxx14
-rw-r--r--vcl/source/filter/graphicfilter.cxx8
-rw-r--r--vcl/source/window/dialog.cxx6
-rw-r--r--vcl/source/window/event.cxx10
-rw-r--r--vcl/source/window/floatwin.cxx6
-rw-r--r--vcl/source/window/layout.cxx6
-rw-r--r--vcl/source/window/winproc.cxx82
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx8
118 files changed, 747 insertions, 747 deletions
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 8801498bf7d0..f4922b5b5661 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 a4215bb10b74..f2b947b8db04 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 4d98fdee68f9..8ed33c36c22c 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 a9b8c6957ade..700fde648310 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 ae5b76965374..2c21bc3e768b 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 894f8a610545..ce31668418c0 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 9ae263cd549d..51fe425a472d 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 11638feb4905..09c58ed1dc3c 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 246d5d5706ac..af78386a551b 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 0ef8e1fd24eb..727042d530fb 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 f004a7633a66..401d399a3a97 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 b4374e7808dd..25ab173d60f8 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 113ccae31a31..89abd94bfcc6 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 0228f6b9c17f..b4b676915ea4 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 7a93fe301d7b..4baa3b70ed73 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 99be5378a93d..aa7125916aeb 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 54a682e77482..decbd5d64587 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 5e7f370b8600..3510f68e25e2 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 e09f0186b4ce..3c95e3de90d7 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 bd1a0693f52b..6666fef2d626 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 a6f731658059..7504e2876bcc 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 3d1c199a4b07..3018c48ef5b0 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 f89bc7c4b72b..c9c52774f8a2 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 f2d994fafcb7..1d6858ef0a0d 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 a444551929bf..1beabd0b0e8c 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 d51e71f8bed9..08fc7511f460 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 33c3d97b9101..86f30c77bf42 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 60a7f30cf7ef..539b8f28b5bf 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 5c7d8ad170da..1091d07f4159 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 0f850eabb3f2..d2714b466ce1 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 15fb15cfd3a9..ec54cd1b8a92 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 7d00fbcd70d9..34f0bfe842aa 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 41403fd9f7e7..1ec905902d76 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 6c9970c540a4..21c2d572f92b 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 6ef022d81e0f..ad221b1b9c3e 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 130ff107a160..28b4f68ddc60 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 ac8508ca7f87..99885d6ee2ab 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 b3f8c72828e7..65889fd1629d 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 16feb175f956..deb9d1e6856d 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 668098a3bc6e..e4d3523c31f1 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 2deca697455c..f94f574ea98a 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 94c10c787ae1..14bfdf3922de 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 0526c64d44ac..67851271f935 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 0cb03ef2b100..365812d8f813 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 0c7fb513aab0..9cb6248fdd57 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 e724f6811ac3..140b52510c0b 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 6618057df009..f25e85b15d2e 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 cf5d7b6b2fe2..549008a7731a 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 11a6d05ec143..408687ae31a7 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 bb5e9890a61c..831f990f64e6 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 64024a84d367..bfd0e6cbc359 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 7da0c4c5483a..6c4e4041eda6 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 a4fdbd28a687..a9a4bd035e81 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 de5ebb183369..642f33f14a45 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 121bc98c1db5..858d97938781 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -501,15 +501,15 @@ IMPL_LINK_TYPED( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasi
aMod.release();
// call basicide_handle_basic_error in basctl
- bool nRet = pSymbol && pSymbol( pStarBasic );
+ bool bRet = pSymbol && pSymbol( pStarBasic );
#else
- bool nRet = basicide_handle_basic_error( pStarBasic );
+ bool bRet = basicide_handle_basic_error( pStarBasic );
#endif
- return nRet;
+ return bRet;
#endif
}
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 00139240937a..799f6e0ce9dd 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -534,8 +534,8 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat)
{
OUString sMimeType( SotExchange::GetFormatMimeType( nFormat ));
::com::sun::star::uno::Any aValue;
- bool nRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue );
- if( nRet && aValue.hasValue() && ( aValue >>= aSeq ) )
+ bool bRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue );
+ if( bRet && aValue.hasValue() && ( aValue >>= aSeq ) )
{
aData = DdeData( aSeq.getConstArray(), aSeq.getLength(), nFormat );
return &aData;
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 785bb0cfde6d..1d7de9740fd8 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1259,7 +1259,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
MouseNotifyEvent nType = rNEvt.GetType();
if ( MouseNotifyEvent::KEYINPUT == nType )
{
@@ -1267,12 +1267,12 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
if ( KEY_DELETE == nCode && GetEntryCount() > 0 )
{
DoAction( MID_DELETE );
- nRet = true;
+ bRet = true;
}
else if ( KEY_RETURN == nCode )
{
GetDoubleClickHdl().Call( *this );
- nRet = true;
+ bRet = true;
}
}
else if ( MouseNotifyEvent::COMMAND == nType )
@@ -1284,11 +1284,11 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
sal_uInt16 nId = aMenu.Execute( this, pCEvt->GetMousePosPixel() );
if ( nId != MENU_ITEM_NOTFOUND )
DoAction( nId );
- nRet = true;
+ bRet = true;
}
}
- return nRet || ListBox::Notify( rNEvt );
+ return bRet || ListBox::Notify( rNEvt );
}
// class BookmarksTabPage_Impl -------------------------------------------
@@ -1655,7 +1655,7 @@ Size SfxHelpIndexWindow_Impl::GetOptimalSize() const
bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt)
{
- bool nDone = false;
+ bool bDone = false;
MouseNotifyEvent nType = rNEvt.GetType();
if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() )
{
@@ -1673,12 +1673,12 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt)
if ( !bCtrl && bShift && m_pActiveLB->HasChildPathFocus() )
{
pControl->GrabFocus();
- nDone = true;
+ bDone = true;
}
else if ( !bCtrl && !bShift && pControl->HasChildPathFocus() )
{
m_pActiveLB->GrabFocus();
- nDone = true;
+ bDone = true;
}
else if ( bCtrl )
{
@@ -1692,7 +1692,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt)
m_pTabCtrl->SetCurPageId(m_pTabCtrl->GetPageId(nPagePos));
ActivatePageHdl( m_pTabCtrl );
- nDone = true;
+ bDone = true;
}
}
else if ( m_pTabCtrl->HasFocus() && ( KEY_LEFT == nCode || KEY_RIGHT == nCode ) )
@@ -1701,7 +1701,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt)
}
}
- return nDone || Window::PreNotify( rNEvt );
+ return bDone || Window::PreNotify( rNEvt );
}
@@ -2384,7 +2384,7 @@ void SfxHelpTextWindow_Impl::Resize()
bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
MouseNotifyEvent nType = rNEvt.GetType();
if ( MouseNotifyEvent::COMMAND == nType && rNEvt.GetCommandEvent() )
{
@@ -2476,7 +2476,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
sal_uInt16 nId = aMenu.Execute( this, aPos );
pHelpWin->DoAction( nId );
- nDone = true;
+ bDone = true;
}
}
else if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() )
@@ -2488,22 +2488,22 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
if ( KEYGROUP_ALPHA == nKeyGroup && !isHandledKey( rKeyCode ) )
{
// do nothing disables the writer accelerators
- nDone = true;
+ bDone = true;
}
else if ( rKeyCode.IsMod1() && ( KEY_F4 == nKey || KEY_W == nKey ) )
{
// <CTRL><F4> or <CTRL><W> -> close top frame
pHelpWin->CloseWindow();
- nDone = true;
+ bDone = true;
}
else if ( KEY_TAB == nKey && aOnStartupCB->HasChildPathFocus() )
{
aToolBox->GrabFocus();
- nDone = true;
+ bDone = true;
}
}
- return nDone || Window::PreNotify( rNEvt );
+ return bDone || Window::PreNotify( rNEvt );
}
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 86354a28a0e8..fe4dc1d8f64b 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -68,7 +68,7 @@ ResizableMultiLineEdit::ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailV
bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt)
{
- bool nDone = false;
+ bool bDone = false;
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
@@ -80,7 +80,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt)
//fall-through
case KEY_ESCAPE:
mpItem->setEditTitle(false);
- nDone = true;
+ bDone = true;
break;
default:
break;
@@ -91,7 +91,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt)
mpItem->setTitle( GetText() );
mpItem->setEditTitle(false, false);
}
- return nDone || VclMultiLineEdit::PreNotify(rNEvt);
+ return bDone || VclMultiLineEdit::PreNotify(rNEvt);
}
void ResizableMultiLineEdit::Modify()
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 992f1be9f162..db43463e2798 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -291,7 +291,7 @@ IMPL_LINK_NOARG_TYPED(DropListBox_Impl, OnAsyncExecuteDrop, void*, void)
bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
@@ -300,18 +300,18 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode())
{
pDialog->DeleteHdl( NULL );
- nRet = true;
+ bRet = true;
}
else if( KEY_RETURN == rKeyCode.GetCode())
{
GetDoubleClickHdl().Call(this);
- nRet = true;
+ bRet = true;
}
}
}
- if(!nRet)
- nRet = SvTreeListBox::Notify( rNEvt );
- return nRet;
+ if(!bRet)
+ bRet = SvTreeListBox::Notify( rNEvt );
+ return bRet;
}
/** ListBox class that starts a PopupMenu (designer specific) in the
@@ -447,21 +447,21 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
{
// handle <RETURN> as double click
- bool nRet = false;
+ bool bRet = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() )
{
aDoubleClickLink.Call( nullptr );
- nRet = true;
+ bRet = true;
}
}
- if ( !nRet )
- nRet = DropListBox_Impl::Notify( rNEvt );
+ if ( !bRet )
+ bRet = DropListBox_Impl::Notify( rNEvt );
- return nRet;
+ return bRet;
}
/** NotifyMoving Handler; This leads via a link on the event to the dialog.
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index ff4e1eaae115..9f73e8764bc1 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -601,9 +601,9 @@ bool SfxObjectShell::PrepareClose
DBG_ASSERT(pFrm->GetViewShell(),"No Shell");
if ( pFrm->GetViewShell() )
{
- bool nRet = pFrm->GetViewShell()->PrepareClose( bUI );
- if ( !nRet )
- return nRet;
+ bool bRet = pFrm->GetViewShell()->PrepareClose( bUI );
+ if ( !bRet )
+ return bRet;
}
}
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 71d8bf28ad0c..b66c4bc709b0 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -995,10 +995,10 @@ void Theme::ProcessNewValue (
}
case PT_Boolean:
{
- bool nValue (false);
- if (rValue >>= nValue)
+ bool bValue (false);
+ if (rValue >>= bValue)
{
- maBooleans[nIndex] = nValue;
+ maBooleans[nIndex] = bValue;
if (eItem == Bool_IsHighContrastModeActive)
{
mbIsHighContrastModeSetManually = true;
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 1594cf3ea344..70796e9a74aa 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -187,7 +187,7 @@ bool SfxFrame::DocIsModified_Impl()
bool SfxFrame::PrepareClose_Impl( bool bUI )
{
- bool nRet = true;
+ bool bRet = true;
// prevent recursive calls
if( !pImp->bPrepClosing )
@@ -210,27 +210,27 @@ bool SfxFrame::PrepareClose_Impl( bool bUI )
if ( bOther )
// if there are other views only the current view of this frame must be asked
- nRet = GetCurrentViewFrame()->GetViewShell()->PrepareClose( bUI );
+ bRet = GetCurrentViewFrame()->GetViewShell()->PrepareClose( bUI );
else
// otherwise ask the document
- nRet = pCur->PrepareClose( bUI );
+ bRet = pCur->PrepareClose( bUI );
}
- if ( nRet )
+ if ( bRet )
{
// if this frame has child frames, ask them too
- for( sal_uInt16 nPos = GetChildFrameCount(); nRet && nPos--; )
- nRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI );
+ for( sal_uInt16 nPos = GetChildFrameCount(); bRet && nPos--; )
+ bRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI );
}
pImp->bPrepClosing = false;
}
- if ( nRet && pImp->pWorkWin )
+ if ( bRet && pImp->pWorkWin )
// if closing was accepted by the component the UI subframes must be asked also
- nRet = pImp->pWorkWin->PrepareClose_Impl();
+ bRet = pImp->pWorkWin->PrepareClose_Impl();
- return nRet;
+ return bRet;
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 9a145ddf8f13..db5f13547ae0 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 04edb7197121..1c4677394e1e 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 de1c3acde1a3..3b356140bffa 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 fe3a390e61d3..4568f4a49b05 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 68e046af6397..8868747254d9 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 1a9cceeb732e..54fdafcde3df 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 00864126fe0c..9a5334fa3ed4 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);
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 7354978b64fa..5993e2bad133 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -361,8 +361,8 @@ namespace svt
// allow advancing, the disable the state. This relieves derived classes
// from disabling all future states just because the current state does not
// (yet) allow advancing.
- const bool nUnconditionedDisable = !bCurrentPageCanAdvance && ( nItemIndex > nCurrentStatePathIndex );
- const bool bEnable = !nUnconditionedDisable && ( m_pImpl->aDisabledStates.find( nState ) == m_pImpl->aDisabledStates.end() );
+ const bool bUnconditionedDisable = !bCurrentPageCanAdvance && ( nItemIndex > nCurrentStatePathIndex );
+ const bool bEnable = !bUnconditionedDisable && ( m_pImpl->aDisabledStates.find( nState ) == m_pImpl->aDisabledStates.end() );
m_pImpl->pRoadmap->EnableRoadmapItem( m_pImpl->pRoadmap->GetItemID( nItemIndex ), bEnable );
}
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 49fc1605e6a8..37997eb31cdb 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -194,7 +194,7 @@ namespace svt { namespace table
bool TableDataWindow::Notify(NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -203,11 +203,11 @@ namespace svt { namespace table
const CommandWheelData* pData = rCEvt.GetWheelData();
if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
{
- nDone = HandleScrollCommand( rCEvt, m_rTableControl.getHorzScrollbar(), m_rTableControl.getVertScrollbar() );
+ bDone = HandleScrollCommand( rCEvt, m_rTableControl.getHorzScrollbar(), m_rTableControl.getVertScrollbar() );
}
}
}
- return nDone || Window::Notify( rNEvt );
+ return bDone || Window::Notify( rNEvt );
}
}} // namespace svt::table
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 17df6543e921..4e6e12a025ec 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -473,39 +473,39 @@ void SvxTPView::InsertCalcHeader()
m_pViewData->InsertHeaderEntry(aString);
}
-void SvxTPView::EnableAccept(bool nFlag)
+void SvxTPView::EnableAccept(bool bFlag)
{
- bEnableAccept = nFlag;
- m_pAccept->Enable(nFlag);
+ bEnableAccept = bFlag;
+ m_pAccept->Enable(bFlag);
}
-void SvxTPView::EnableAcceptAll(bool nFlag)
+void SvxTPView::EnableAcceptAll(bool bFlag)
{
- bEnableAcceptAll = nFlag;
- m_pAcceptAll->Enable(nFlag);
+ bEnableAcceptAll = bFlag;
+ m_pAcceptAll->Enable(bFlag);
}
-void SvxTPView::EnableReject(bool nFlag)
+void SvxTPView::EnableReject(bool bFlag)
{
- bEnableReject = nFlag;
- m_pReject->Enable(nFlag);
+ bEnableReject = bFlag;
+ m_pReject->Enable(bFlag);
}
-void SvxTPView::EnableRejectAll(bool nFlag)
+void SvxTPView::EnableRejectAll(bool bFlag)
{
- bEnableRejectAll = nFlag;
- m_pRejectAll->Enable(nFlag);
+ bEnableRejectAll = bFlag;
+ m_pRejectAll->Enable(bFlag);
}
-void SvxTPView::ShowUndo(bool nFlag)
+void SvxTPView::ShowUndo(bool bFlag)
{
- m_pUndo->Show(nFlag);
+ m_pUndo->Show(bFlag);
}
-void SvxTPView::EnableUndo(bool nFlag)
+void SvxTPView::EnableUndo(bool bFlag)
{
- bEnableUndo = nFlag;
- m_pUndo->Enable(nFlag);
+ bEnableUndo = bFlag;
+ m_pUndo->Enable(bFlag);
}
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index a79dafb6feb6..563ae7dfba3e 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -688,7 +688,7 @@ IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit)
IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool)
{
- bool nRet = false;
+ bool bRet = false;
if (m_pScrollSB->IsEnabled())
{
//scroll forward
@@ -698,7 +698,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool)
{
m_pScrollSB->SetThumbPos(m_pScrollSB->GetThumbPos() + 1);
aEditArr[6]->GrabFocus();
- nRet = true;
+ bRet = true;
}
}
//scroll backward
@@ -706,12 +706,12 @@ IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool)
{
m_pScrollSB->SetThumbPos(m_pScrollSB->GetThumbPos() - 1);
aEditArr[1]->GrabFocus();
- nRet = true;
+ bRet = true;
}
- if (nRet)
+ if (bRet)
ScrollHdl_Impl(m_pScrollSB);
}
- return nRet;
+ return bRet;
}
IMPL_LINK_TYPED(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32, nParam, void)
@@ -932,7 +932,7 @@ void RubyEdit::GetFocus()
bool RubyEdit::PreNotify(NotifyEvent& rNEvt)
{
- bool nHandled = false;
+ bool bHandled = false;
if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -943,7 +943,7 @@ bool RubyEdit::PreNotify(NotifyEvent& rNEvt)
{
sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1;
if(aScrollHdl.IsSet() && aScrollHdl.Call(nParam))
- nHandled = true;
+ bHandled = true;
}
else if (KEY_UP == nCode || KEY_DOWN == nCode)
{
@@ -951,9 +951,9 @@ bool RubyEdit::PreNotify(NotifyEvent& rNEvt)
aJumpHdl.Call(nParam);
}
}
- if (!nHandled)
- nHandled = Edit::PreNotify(rNEvt);
- return nHandled;
+ if (!bHandled)
+ bHandled = Edit::PreNotify(rNEvt);
+ return bHandled;
}
VCL_BUILDER_FACTORY(RubyEdit)
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a49e23b1dcf2..e8cdd5cf0c4a 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1030,7 +1030,7 @@ namespace svxform
bool XFormsPage::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -1039,12 +1039,12 @@ namespace svxform
switch ( nCode )
{
case KEY_DELETE:
- nHandled = DoMenuAction( m_nRemoveId );
+ bHandled = DoMenuAction( m_nRemoveId );
break;
}
}
- return nHandled || Window::Notify( rNEvt );
+ return bHandled || Window::Notify( rNEvt );
}
void XFormsPage::Resize()
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()
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 47fe673b85c1..478d07a717be 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -645,7 +645,7 @@ public:
@return error via enum. */
/// Split cell vertically or horizontally.
- bool SplitTab( bool nVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false );
+ bool SplitTab( bool bVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false );
bool Sort(const SwSortOptions&); //Sortieren.
void SetRowHeight( const SwFormatFrmSize &rSz );
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 928ae53023d6..aea633ce948f 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -97,7 +97,7 @@ public:
SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts,
sal_uInt16 nRSpan, sal_uInt16 nCSpan,
sal_uInt16 nWidthOpt, bool bPrcWdthOpt,
- bool nNWrapOpt );
+ bool bNWrapOpt );
~SwHTMLTableLayoutCell();
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 500f552f7c8d..70dfa75d50bf 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -400,7 +400,7 @@ public:
void SetAddExtLeading( bool bNew );
// Formatting by virtual device or printer.
- void SetUseVirDev( bool nNew );
+ void SetUseVirDev( bool bNew );
// Adding paragraph and table spacing at bottom
// of table cells.
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index b24f64a1c6b9..935f8fcb4199 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -196,9 +196,9 @@ bool SwAttrSet::Put_BC( const SfxPoolItem& rAttr,
{
pNewSet = pNew;
pOldSet = pOld;
- bool nRet = 0 != SfxItemSet::Put( rAttr );
+ bool bRet = 0 != SfxItemSet::Put( rAttr );
pOldSet = pNewSet = 0;
- return nRet;
+ return bRet;
}
bool SwAttrSet::Put_BC( const SfxItemSet& rSet,
@@ -206,9 +206,9 @@ bool SwAttrSet::Put_BC( const SfxItemSet& rSet,
{
pNewSet = pNew;
pOldSet = pOld;
- bool nRet = SfxItemSet::Put( rSet );
+ bool bRet = SfxItemSet::Put( rSet );
pOldSet = pNewSet = 0;
- return nRet;
+ return bRet;
}
sal_uInt16 SwAttrSet::ClearItem_BC( sal_uInt16 nWhich,
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index dbe8576ca629..f9630c1eb28e 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1432,8 +1432,8 @@ static OUString lcl_MaskDeletedRedlines( const SwTextNode* pTextNd )
//mask deleted redlines
OUString sNodeText(pTextNd->GetText());
const SwDoc& rDoc = *pTextNd->GetDoc();
- const bool nShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
- if ( nShowChg )
+ const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
+ if ( bShowChg )
{
sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTextNd, USHRT_MAX );
for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 28afa7c1dc06..a3d3db07d0ee 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -521,7 +521,7 @@ void SwCollCondition::RegisterToFormat( SwFormat& rFormat )
bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
{
- bool nRet = false;
+ bool bRet = false;
if( nCondition == rCmp.nCondition )
{
if( USRFLD_EXPRESSION & nCondition )
@@ -539,15 +539,15 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
if( pColl )
{
SwCalc aCalc( *pColl->GetDoc() );
- nRet = aCalc.Calculate( *pTmp ).GetBool();
+ bRet = aCalc.Calculate( *pTmp ).GetBool();
}
}
}
else if( aSubCondition.nSubCondition ==
rCmp.aSubCondition.nSubCondition )
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
void SwCollCondition::SetCondition( sal_uLong nCond, sal_uLong nSubCond )
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 75537b5920a5..64c7e59d9bae 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -156,7 +156,7 @@ bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNode& rNo
pStyleNames->Put( aNewSet );
}
- const bool nRet = aNewSet.Put( rSet );
+ const bool bRet = aNewSet.Put( rSet );
// #i76273# Robust
if ( pStyleNames )
@@ -165,10 +165,10 @@ bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNode& rNo
delete pStyleNames;
}
- if ( nRet )
+ if ( bRet )
GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
- return nRet;
+ return bRet;
}
bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
@@ -182,12 +182,12 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
if( rNode.GetModifyAtAttr() )
aNewSet.SetModifyAtAttr( &rNode );
- const bool nRet = aNewSet.Put_BC( rAttr, pOld, pNew );
+ const bool bRet = aNewSet.Put_BC( rAttr, pOld, pNew );
- if ( nRet )
+ if ( bRet )
GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
- return nRet;
+ return bRet;
}
bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
@@ -209,7 +209,7 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
if( rNode.GetModifyAtAttr() )
aNewSet.SetModifyAtAttr( &rNode );
- const bool nRet = aNewSet.Put_BC( rSet, pOld, pNew );
+ const bool bRet = aNewSet.Put_BC( rSet, pOld, pNew );
// #i76273# Robust
if ( pStyleNames )
@@ -218,10 +218,10 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
delete pStyleNames;
}
- if ( nRet )
+ if ( bRet )
GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
- return nRet;
+ return bRet;
}
sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2371e0dccbb4..76bc11ef6470 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -193,7 +193,7 @@ class SwAutoFormat
void DeleteSel( SwPaM& rPam );
bool DeleteCurNxtPara( const OUString& rNxtPara );
/// delete in the node start and/or end
- void DeleteCurrentParagraph( bool bStart = true, bool nEnd = true );
+ void DeleteCurrentParagraph( bool bStart = true, bool bEnd = true );
void DelEmptyLine( bool bTstNextPara = true );
/// when using multiline paragraphs delete the "left" and/or
/// "right" margins
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 70a0acabc743..aa470a9ef8d5 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -216,7 +216,7 @@ public:
inline void SetOverColor( const Color &rColor ) { aOverColor = rColor; }
inline void SetStrikeout( const FontStrikeout eStrikeout );
inline void SetOutline( const bool bOutline );
- void SetVertical( sal_uInt16 nDir, const bool nVertLayout = false );
+ void SetVertical( sal_uInt16 nDir, const bool bVertLayout = false );
inline void SetShadow( const bool bShadow );
inline void SetAutoKern( FontKerning nAutoKern );
inline void SetTransparent( const bool bTrans );
@@ -285,7 +285,7 @@ public:
FontWeight GetWeight() const { return aSub[nActual].GetWeight(); }
FontEmphasisMark GetEmphasisMark() const
{ return aSub[nActual].GetEmphasisMark(); }
- sal_uInt16 GetOrientation( const bool nVertLayout = false ) const;
+ sal_uInt16 GetOrientation( const bool bVertLayout = false ) const;
inline const OUString& GetName( const sal_uInt8 nWhich ) const
{ return aSub[nWhich].GetName(); }
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 746e5622db99..d11918f6535f 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1259,7 +1259,7 @@ bool SwTextCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
// Return: Offset in String
sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
- bool nChgNode, SwCrsrMoveState* pCMS ) const
+ bool bChgNode, SwCrsrMoveState* pCMS ) const
{
// If necessary, as catch up, do the adjustment
GetAdjusted();
@@ -1468,7 +1468,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
sal_uInt16 nHeight = pPor->Height();
if ( !nHeight || nHeight > nWidth )
nHeight = nWidth;
- if( nChgNode && nWidth - nHeight/2 > nX )
+ if( bChgNode && nWidth - nHeight/2 > nX )
--nCurrStart;
}
}
@@ -1479,7 +1479,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
if ( nWidth )
{
// Else we may not enter the character-supplying frame...
- if( !( nChgNode && pPos && pPor->IsFlyCntPortion() ) )
+ if( !( bChgNode && pPos && pPor->IsFlyCntPortion() ) )
{
if ( pPor->InFieldGrp() ||
( pPor->IsMultiPortion() &&
@@ -1585,7 +1585,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
}
return GetCrsrOfst( pPos, Point( GetLineStart() + nX, rPoint.Y() ),
- nChgNode, pCMS );
+ bChgNode, pCMS );
}
if( pPor->InTextGrp() )
{
@@ -1694,7 +1694,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
}
else
{
- if( nChgNode && pPos && pPor->IsFlyCntPortion()
+ if( bChgNode && pPos && pPor->IsFlyCntPortion()
&& !static_cast<SwFlyCntPortion*>(pPor)->IsDraw() )
{
// JP 24.11.94: if the Position is not in Fly, then
@@ -1702,7 +1702,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
// (BugId: 9692 + Change in feshview)
SwFlyInCntFrm *pTmp = static_cast<SwFlyCntPortion*>(pPor)->GetFlyFrm();
SwFrm* pLower = pTmp->GetLower();
- bool bChgNode = pLower
+ bool bChgNodeInner = pLower
&& (pLower->IsTextFrm() || pLower->IsLayoutFrm());
Point aTmpPoint( rPoint );
@@ -1712,7 +1712,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
if ( pFrm->IsVertical() )
pFrm->SwitchHorizontalToVertical( aTmpPoint );
- if( bChgNode && pTmp->Frm().IsInside( aTmpPoint ) &&
+ if( bChgNodeInner && pTmp->Frm().IsInside( aTmpPoint ) &&
!( pTmp->IsProtected() ) )
{
nLength = static_cast<SwFlyCntPortion*>(pPor)->
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 84454abb88ea..77a09886fb19 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -284,7 +284,7 @@ public:
bool GetEndCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
const long nMax = 0 );
sal_Int32 GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
- bool nChgNode, SwCrsrMoveState* = 0 ) const;
+ bool bChgNode, SwCrsrMoveState* = 0 ) const;
// Respects ambiguities: For the implementation see below
const SwLineLayout *CharCrsrToLine( const sal_Int32 nPos );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a68c025cd85d..3cea85acdd23 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -189,8 +189,8 @@ void wwSection::SetDirection()
break;
}
- sal_uInt8 nRTLPgn = maSep.fBiDi;
- if ((meDir == FRMDIR_HORI_LEFT_TOP) && nRTLPgn)
+ sal_uInt8 bRTLPgn = maSep.fBiDi;
+ if ((meDir == FRMDIR_HORI_LEFT_TOP) && bRTLPgn)
meDir = FRMDIR_HORI_RIGHT_TOP;
}
@@ -649,9 +649,9 @@ SwSectionFormat *wwSectionManager::InsertSection(
SfxItemSet aSet( mrReader.m_rDoc.GetAttrPool(), aFrameFormatSetRange );
- bool nRTLPgn = !maSegments.empty() && maSegments.back().IsBiDi();
+ bool bRTLPgn = !maSegments.empty() && maSegments.back().IsBiDi();
aSet.Put(SvxFrameDirectionItem(
- nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
+ bRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
if (2 == mrReader.m_pWDop->fpc)
aSet.Put( SwFormatFootnoteAtTextEnd(FTNEND_ATTXTEND));
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index d8387c1f8284..67daed33acfa 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1359,20 +1359,20 @@ void AddressMultiLineEdit::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
bool AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType() &&
rNEvt.GetKeyEvent()->GetCharCode())
{
- nHandled = true;
+ bHandled = true;
}
else if(MouseNotifyEvent::MOUSEBUTTONDOWN == rNEvt.GetType()) {
const MouseEvent *pMEvt = rNEvt.GetMouseEvent();
if(pMEvt->GetClicks() >= 2)
- nHandled = true;
+ bHandled = true;
}
- if(!nHandled)
- nHandled = VclMultiLineEdit::PreNotify( rNEvt );
- return nHandled;
+ if(!bHandled)
+ bHandled = VclMultiLineEdit::PreNotify( rNEvt );
+ return bHandled;
}
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index e1a08823e0b5..5b65c8cb9cc1 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1282,7 +1282,7 @@ VCL_BUILDER_DECL_FACTORY(SelectionListBox)
bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = ListBox::PreNotify( rNEvt );
+ bool bHandled = ListBox::PreNotify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::KEYUP )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -1299,7 +1299,7 @@ bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
bCallAddSelection = true;
}
- return nHandled;
+ return bHandled;
}
void SwFieldVarPage::FillUserData()
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 353f2e9a1357..40a7e6b2db66 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -225,17 +225,17 @@ sal_Int32 BookmarkCombo::GetSelectEntryPos( sal_Int32 nSelIndex ) const
bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType() &&
rNEvt.GetKeyEvent()->GetCharCode() )
{
OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );
if(-1 != aForbiddenChars.indexOf(sKey))
- nHandled = true;
+ bHandled = true;
}
- if(!nHandled)
- nHandled = SwComboBox::PreNotify( rNEvt );
- return nHandled;
+ if(!bHandled)
+ bHandled = SwComboBox::PreNotify( rNEvt );
+ return bHandled;
}
VCL_BUILDER_FACTORY_ARGS(BookmarkCombo, 0)
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index d6919ebb819a..d4fe645099cf 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -316,9 +316,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
// Notification Close Doc
bool SwDocShell::PrepareClose( bool bUI )
{
- bool nRet = SfxObjectShell::PrepareClose( bUI );
+ bool bRet = SfxObjectShell::PrepareClose( bUI );
- if( nRet )
+ if( bRet )
EndListening( *this );
if (m_pDoc && IsInPrepareClose())
@@ -332,7 +332,7 @@ bool SwDocShell::PrepareClose( bool bUI )
xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs );
}
}
- return nRet;
+ return bRet;
}
void SwDocShell::Execute(SfxRequest& rReq)
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index 95674b0d4f02..d17706730dcf 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -28,7 +28,7 @@ void NumEditAction::Action()
bool NumEditAction::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -39,13 +39,13 @@ bool NumEditAction::Notify( NotifyEvent& rNEvt )
!nModifier)
{
Action();
- nHandled = true;
+ bHandled = true;
}
}
- if(!nHandled)
+ if(!bHandled)
NumericField::Notify( rNEvt );
- return nHandled;
+ return bHandled;
}
void ReturnActionEdit::KeyInput( const KeyEvent& rEvt)
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 97a1759eaa41..235b975e5b2b 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1188,7 +1188,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
std::unique_ptr<SwTrnsfrActionAndUndo> pAction;
SwModule* pMod = SW_MOD();
- bool nRet = false;
+ bool bRet = false;
bool bCallAutoCaption = false;
if( pPt )
@@ -1274,14 +1274,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
if(bPrivateDrop)
{
// then internal Drag & Drop or XSelection
- nRet = pTrans->PrivateDrop( rSh, *pPt, DND_ACTION_MOVE == nDropAction,
+ bRet = pTrans->PrivateDrop( rSh, *pPt, DND_ACTION_MOVE == nDropAction,
bPasteSelection );
}
else if( !pPt && pTunneledTrans &&
EXCHG_OUT_ACTION_INSERT_PRIVATE == nAction )
{
// then internal paste
- nRet = pTunneledTrans->PrivatePaste( rSh );
+ bRet = pTunneledTrans->PrivatePaste( rSh );
}
else if( EXCHG_INOUT_ACTION_NONE != nAction )
{
@@ -1319,7 +1319,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
switch( nFormat )
{
case SotClipboardFormatId::DRAWING:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::Insert, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1329,7 +1329,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::HTML_NO_COMMENT:
case SotClipboardFormatId::RTF:
case SotClipboardFormatId::STRING:
- nRet = SwTransferable::_PasteFileContent( rData, rSh,
+ bRet = SwTransferable::_PasteFileContent( rData, rSh,
nFormat, bMsg );
break;
@@ -1340,25 +1340,25 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
{
SwFormatINetFormat aFormat( aBkmk.GetURL(), OUString() );
rSh.InsertURL( aFormat, aBkmk.GetDescription() );
- nRet = true;
+ bRet = true;
}
}
break;
case SotClipboardFormatId::SD_OLE:
- nRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
nActionFlags, bMsg );
break;
case SotClipboardFormatId::SVIM:
- nRet = SwTransferable::_PasteImageMap( rData, rSh );
+ bRet = SwTransferable::_PasteImageMap( rData, rSh );
break;
case SotClipboardFormatId::SVXB:
case SotClipboardFormatId::BITMAP:
case SotClipboardFormatId::PNG:
case SotClipboardFormatId::GDIMETAFILE:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::Insert,pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
@@ -1367,13 +1367,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::SBA_FIELDDATAEXCHANGE:
case SotClipboardFormatId::SBA_DATAEXCHANGE:
case SotClipboardFormatId::SBA_CTRLDATAEXCHANGE:
- nRet = SwTransferable::_PasteDBData( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteDBData( rData, rSh, nFormat,
EXCHG_IN_ACTION_LINK == nClearedAction,
pPt, bMsg );
break;
case SotClipboardFormatId::SIMPLE_FILE:
- nRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
( EXCHG_IN_ACTION_MOVE == nClearedAction
? SwPasteSdr::Replace
: EXCHG_IN_ACTION_LINK == nClearedAction
@@ -1384,7 +1384,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::FILE_LIST:
// then insert as graphics only
- nRet = SwTransferable::_PasteFileList( rData, rSh,
+ bRet = SwTransferable::_PasteFileList( rData, rSh,
EXCHG_IN_ACTION_LINK == nClearedAction,
pPt, bMsg );
break;
@@ -1405,14 +1405,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
}
}
rSh.NavigatorPaste( aBkmk, nClearedAction );
- nRet = true;
+ bRet = true;
}
}
break;
case SotClipboardFormatId::INET_IMAGE:
case SotClipboardFormatId::NETSCAPE_IMAGE:
- nRet = SwTransferable::_PasteTargetURL( rData, rSh,
+ bRet = SwTransferable::_PasteTargetURL( rData, rSh,
SwPasteSdr::Insert,
pPt, true );
break;
@@ -1425,7 +1425,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case EXCHG_OUT_ACTION_INSERT_FILE:
{
bool graphicInserted;
- nRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
SwPasteSdr::Insert, pPt,
nActionFlags, bMsg,
&graphicInserted );
@@ -1435,14 +1435,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
break;
case EXCHG_OUT_ACTION_INSERT_OLE:
- nRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
nActionFlags,bMsg );
break;
case EXCHG_OUT_ACTION_INSERT_DDE:
{
bool bReRead = 0 != CNT_HasGrf( rSh.GetCntType() );
- nRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg );
+ bRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg );
}
break;
@@ -1456,7 +1456,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
SwTransferable::_CheckForURLOrLNKFile( rData, sURL, &sDesc );
if( sDesc.isEmpty() )
sDesc = sURL;
- nRet = true;
+ bRet = true;
}
}
else
@@ -1466,11 +1466,11 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
{
sURL = aBkmk.GetURL();
sDesc = aBkmk.GetDescription();
- nRet = true;
+ bRet = true;
}
}
- if( nRet )
+ if( bRet )
{
SwFormatINetFormat aFormat( sURL, OUString() );
rSh.InsertURL( aFormat, sDesc );
@@ -1482,7 +1482,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
switch( nFormat )
{
case SotClipboardFormatId::DRAWING:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::SetAttr, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1494,7 +1494,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::SIMPLE_FILE:
case SotClipboardFormatId::FILEGRPDESCRIPTOR:
case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::SetAttr, pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
@@ -1505,7 +1505,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
break;
case EXCHG_OUT_ACTION_INSERT_DRAWOBJ:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::Insert, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1513,13 +1513,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case EXCHG_OUT_ACTION_INSERT_GDIMETAFILE:
case EXCHG_OUT_ACTION_INSERT_BITMAP:
case EXCHG_OUT_ACTION_INSERT_GRAPH:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::Insert, pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
case EXCHG_OUT_ACTION_REPLACE_DRAWOBJ:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::Replace, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1528,13 +1528,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case EXCHG_OUT_ACTION_REPLACE_GDIMETAFILE:
case EXCHG_OUT_ACTION_REPLACE_BITMAP:
case EXCHG_OUT_ACTION_REPLACE_GRAPH:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::Replace,pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
case EXCHG_OUT_ACTION_INSERT_INTERACTIVE:
- nRet = SwTransferable::_PasteAsHyperlink( rData, rSh, nFormat );
+ bRet = SwTransferable::_PasteAsHyperlink( rData, rSh, nFormat );
break;
default:
@@ -1553,7 +1553,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
if( bCallAutoCaption )
rSh.GetView().AutoCaption( GRAPHIC_CAP );
- return nRet;
+ return bRet;
}
SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh,
@@ -1630,7 +1630,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg )
{
sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
- bool nRet = false;
+ bool bRet = false;
MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -1702,10 +1702,10 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
if( IsError( aReader.Read( *pRead )) )
nResId = STR_ERROR_CLPBRD_READ;
else
- nResId = 0, nRet = true;
+ nResId = 0, bRet = true;
rSh.SetChgLnk( aOldLink );
- if( nRet )
+ if( bRet )
rSh.CallChgLnk();
}
else
@@ -1719,13 +1719,13 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
{
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES( nResId ), VCL_MESSAGE_INFO)->Execute();
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg )
{
- bool nRet = false;
+ bool bRet = false;
TransferableObjectDescriptor aObjDesc;
uno::Reference < io::XInputStream > xStrm;
uno::Reference < embed::XStorage > xStore;
@@ -1791,7 +1791,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SwPaM &rPAM = *rSh.GetCrsr();
SwReader aReader( xStore, aEmptyOUStr, rPAM );
if( !IsError( aReader.Read( *pRead )) )
- nRet = true;
+ bRet = true;
else if( bMsg )
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES(STR_ERROR_CLPBRD_READ), VCL_MESSAGE_INFO )->Execute();
}
@@ -1932,9 +1932,9 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
//End of Hack!
rSh.InsertOleObject( xObjRef );
- nRet = true;
+ bRet = true;
- if( nRet && ( nActionFlags &
+ if( bRet && ( nActionFlags &
( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ))
SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, 0, false );
@@ -1942,14 +1942,14 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SwOLEObj::UnloadObject( xObj, rSh.GetDoc(), embed::Aspects::MSOLE_CONTENT );
}
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
SwWrtShell& rSh, SwPasteSdr nAction,
const Point* pPt, bool bInsertGRF )
{
- bool nRet = false;
+ bool bRet = false;
INetImage aINetImg;
if( ( rData.HasFormat( SotClipboardFormatId::INET_IMAGE ) &&
rData.GetINetImage( SotClipboardFormatId::INET_IMAGE, aINetImg )) ||
@@ -1964,9 +1964,9 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
//!!! check at FileSystem - only then it make sense to test graphics !!!
Graphic aGraphic;
GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
- nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt );
+ bRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt );
- if( nRet )
+ if( bRet )
{
//Check and Perform rotation if needed
lclCheckAndPerformRotation(aGraphic);
@@ -2001,15 +2001,15 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
}
break;
default:
- nRet = false;
+ bRet = false;
}
}
}
else
- nRet = true;
+ bRet = true;
}
- if( nRet )
+ if( bRet )
{
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
rSh.GetFlyFrmAttr( aSet );
@@ -2024,7 +2024,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
rSh.SetFlyFrmAttr( aSet );
}
}
- return nRet;
+ return bRet;
}
void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrm,
@@ -2095,8 +2095,8 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
rData.HasFormat( nFormat = SotClipboardFormatId::BITMAP )) )
{
Graphic aGrf;
- bool nRet = rData.GetGraphic( nFormat, aGrf );
- if( nRet )
+ bool bRet = rData.GetGraphic( nFormat, aGrf );
+ if( bRet )
{
OUString sLnkTyp("DDE");
if ( bReReadGrf )
@@ -2104,7 +2104,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
else
rWrtShell.Insert( aCmd, sLnkTyp, aGrf );
}
- return nRet;
+ return bRet;
}
SwFieldType* pTyp = 0;
@@ -2233,7 +2233,7 @@ bool SwTransferable::_PasteSdrFormat( TransferableDataHelper& rData,
SwWrtShell& rSh, SwPasteSdr nAction,
const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste)
{
- bool nRet = false;
+ bool bRet = false;
tools::SvRef<SotStorageStream> xStrm;
if( rData.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStrm ))
{
@@ -2247,20 +2247,20 @@ bool SwTransferable::_PasteSdrFormat( TransferableDataHelper& rData,
}
rSh.Paste( *xStrm, nAction, pPt );
- nRet = true;
+ bRet = true;
- if( nRet && ( nActionFlags &
+ if( bRet && ( nActionFlags &
( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ))
SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, 0, false );
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt,
sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste)
{
- bool nRet = false;
+ bool bRet = false;
Graphic aGraphic;
INetBookmark aBkmk;
@@ -2271,7 +2271,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SotClipboardFormatId::BITMAP:
case SotClipboardFormatId::PNG:
case SotClipboardFormatId::GDIMETAFILE:
- nRet = rData.GetGraphic( nFormat, aGraphic );
+ bRet = rData.GetGraphic( nFormat, aGraphic );
break;
case SotClipboardFormatId::SVXB:
@@ -2281,7 +2281,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
if(rData.GetSotStorageStream(SotClipboardFormatId::SVXB, xStm))
{
ReadGraphic( *xStm, aGraphic );
- nRet = (GRAPHIC_NONE != aGraphic.GetType() && GRAPHIC_DEFAULT != aGraphic.GetType());
+ bRet = (GRAPHIC_NONE != aGraphic.GetType() && GRAPHIC_DEFAULT != aGraphic.GetType());
}
break;
@@ -2290,7 +2290,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SotClipboardFormatId::NETSCAPE_BOOKMARK:
case SotClipboardFormatId::FILEGRPDESCRIPTOR:
case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
- if( ( nRet = rData.GetINetBookmark( nFormat, aBkmk ) ))
+ if( ( bRet = rData.GetINetBookmark( nFormat, aBkmk ) ))
{
if( SwPasteSdr::SetAttr == nAction )
nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK;
@@ -2302,7 +2302,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SotClipboardFormatId::SIMPLE_FILE:
{
OUString sText;
- if( ( nRet = rData.GetString( nFormat, sText ) ) )
+ if( ( bRet = rData.GetString( nFormat, sText ) ) )
{
OUString sDesc;
SwTransferable::_CheckForURLOrLNKFile( rData, sText, &sDesc );
@@ -2317,7 +2317,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
break;
default:
- nRet = rData.GetGraphic( nFormat, aGraphic );
+ bRet = rData.GetGraphic( nFormat, aGraphic );
break;
}
@@ -2325,17 +2325,17 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
{
//!!! check at FileSystem - only then it makes sense to test the graphics !!!
GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
- nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr,
+ bRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr,
aGraphic, &rFlt );
- if( !nRet && SwPasteSdr::SetAttr == nAction &&
+ if( !bRet && SwPasteSdr::SetAttr == nAction &&
SotClipboardFormatId::SIMPLE_FILE == nFormat &&
// only at frame selection
rSh.IsFrmSelected() )
{
// then set as hyperlink after the graphic
nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK;
- nRet = true;
+ bRet = true;
}
}
@@ -2348,7 +2348,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
SwTransferable::SetSelInShell( rSh, true, pPt );
}
- if( nRet )
+ if( bRet )
{
//Check and Perform rotation if needed
lclCheckAndPerformRotation(aGraphic);
@@ -2426,13 +2426,13 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
}
default:
{
- nRet = false;
+ bRet = false;
break;
}
}
}
- if( nRet )
+ if( bRet )
{
if( nActionFlags &
@@ -2463,17 +2463,17 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
aURL.SetMap( &aMap );
aSet.Put( aURL );
rSh.SetFlyFrmAttr( aSet );
- nRet = true;
+ bRet = true;
}
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
SwWrtShell& rSh )
{
- bool nRet = false;
+ bool bRet = false;
if( rData.HasFormat( SotClipboardFormatId::SVIM ))
{
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
@@ -2490,15 +2490,15 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
aSet.Put( aURL );
rSh.SetFlyFrmAttr( aSet );
}
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat )
{
- bool nRet = false;
+ bool bRet = false;
OUString sFile;
if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() )
{
@@ -2534,9 +2534,9 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
sDesc.isEmpty() ? sFile : sDesc);
}
}
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
@@ -2545,12 +2545,12 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
sal_uInt8 nActionFlags, bool /* bMsg */,
bool * graphicInserted)
{
- bool nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, nAction,
+ bool bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, nAction,
pPt, nActionFlags, 0, false);
if (graphicInserted != 0) {
- *graphicInserted = nRet;
+ *graphicInserted = bRet;
}
- if( !nRet )
+ if( !bRet )
{
OUString sFile, sDesc;
if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() )
@@ -2592,7 +2592,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
Application::PostUserEvent( LINK( &rSh, SwWrtShell,
InsertRegionDialog ), pSect );
- nRet = true;
+ bRet = true;
}
else if( SwPasteSdr::SetAttr == nAction ||
( bIsURLFile && SwPasteSdr::Insert == nAction ))
@@ -2628,19 +2628,19 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
sDesc.isEmpty() ? sFile : sDesc );
}
}
- nRet = true;
+ bRet = true;
}
}
}
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bLink,
const Point* pDragPt, bool bMsg )
{
- bool nRet = false;
+ bool bRet = false;
OUString sText;
if( rData.GetString( nFormat, sText ) && !sText.isEmpty() )
{
@@ -2722,20 +2722,20 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
rSh.SwFEShell::InsertDrawObj( *pObj, *pDragPt );
}
}
- nRet = true;
+ bRet = true;
}
else if( bMsg )
{
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO)->Execute();
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
SwWrtShell& rSh, bool bLink,
const Point* pPt, bool bMsg )
{
- bool nRet = false;
+ bool bRet = false;
FileList aFileList;
if( rData.GetFileList( SotClipboardFormatId::FILE_LIST, aFileList ) &&
aFileList.Count() )
@@ -2757,7 +2757,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
sFlyNm = rSh.GetFlyName();
SwTransferable::SetSelInShell( rSh, false, pPt );
}
- nRet = true;
+ bRet = true;
}
}
if( !sFlyNm.isEmpty() )
@@ -2767,7 +2767,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
{
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO)->Execute();
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
@@ -2811,7 +2811,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
SotClipboardFormatId nFormat )
{
SwWait aWait( *rSh.GetView().GetDocShell(), false );
- bool nRet = false;
+ bool bRet = false;
SotClipboardFormatId nPrivateFormat = SotClipboardFormatId::PRIVATE;
SwTransferable *pClipboard = GetSwTransferable( rData );
@@ -2820,7 +2820,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
nPrivateFormat = SotClipboardFormatId::EMBED_SOURCE;
if( pClipboard && nPrivateFormat == nFormat )
- nRet = pClipboard->PrivatePaste( rSh );
+ bRet = pClipboard->PrivatePaste( rSh );
else if( rData.HasFormat( nFormat ) )
{
uno::Reference<XTransferable> xTransferable( rData.GetXTransferable() );
@@ -2842,10 +2842,10 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
lcl_getTransferPointer ( xTransferable ) );
if( EXCHG_INOUT_ACTION_NONE != nAction )
- nRet = SwTransferable::PasteData( rData, rSh, nAction, nFormat,
+ bRet = SwTransferable::PasteData( rData, rSh, nAction, nFormat,
nDestination, true, false );
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData,
@@ -2894,7 +2894,7 @@ bool SwTransferable::PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper&
bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, SotClipboardFormatId& rFormatUsed )
{
- bool nRet = false;
+ bool bRet = false;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rSh.GetView().GetEditWin() ));
@@ -2956,12 +2956,12 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
SotClipboardFormatId nFormat = pDlg->GetFormat( rData.GetTransferable() );
if( nFormat != SotClipboardFormatId::NONE )
- nRet = SwTransferable::PasteFormat( rSh, rData, nFormat );
+ bRet = SwTransferable::PasteFormat( rSh, rData, nFormat );
- if ( nRet )
+ if ( bRet )
rFormatUsed = nFormat;
- return nRet;
+ return bRet;
}
void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh,
@@ -3281,16 +3281,16 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
}
}
- bool nRet = rShell.Paste( m_pClpDocFac->GetDoc() );
+ bool bRet = rShell.Paste( m_pClpDocFac->GetDoc() );
if( bKillPaMs )
rShell.KillPams();
// If Smart Paste then insert blank
- if( nRet && bSmart && ((bInWrd && !bEndWrd )|| bSttWrd) )
+ if( bRet && bSmart && ((bInWrd && !bEndWrd )|| bSttWrd) )
rShell.SwEditShell::Insert(' ');
- return nRet;
+ return bRet;
}
bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 21c69c6e892e..199bd60ddf4b 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -890,12 +890,12 @@ void SwPagePreview::Execute( SfxRequest &rReq )
eMvMode = SwPagePreviewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE;
MOVEPAGE:
{
- bool nRet = ChgPage( eMvMode );
+ bool bRet = ChgPage( eMvMode );
// return value fuer Basic
if(bRetVal)
- rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !nRet));
+ rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !bRet));
- bRefresh = nRet;
+ bRefresh = bRet;
rReq.Done();
}
break;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 201b48b9ba5f..7edacd1bb0bf 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2274,12 +2274,12 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
{
- bool nMove = false;
+ bool bMove = false;
switch( nCmd )
{
case FN_ITEM_DOWN:
case FN_ITEM_UP:
- nMove = true;
+ bMove = true;
//fall-through
case FN_ITEM_LEFT:
case FN_ITEM_RIGHT:
@@ -2301,14 +2301,14 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
}
}
if ( nActPos < USHRT_MAX &&
- ( !nMove || pShell->IsOutlineMovable( nActPos )) )
+ ( !bMove || pShell->IsOutlineMovable( nActPos )) )
{
pShell->StartAllAction();
pShell->GotoOutline( nActPos); // If text selection != box selection
pShell->Push();
pShell->MakeOutlineSel( nActPos, nActPos,
bModifier);
- if( nMove )
+ if( bMove )
{
short nDir = nCmd == FN_ITEM_UP ? -1 : 1;
if( !bModifier && ( (nDir == -1 && nActPos > 0) ||
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 4d93e8bfcf34..271f75e0b29e 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -80,17 +80,17 @@ void SwWrtShell::MoveCrsr( bool bWithSelect )
bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, bool bSelect )
{
- bool nRet;
+ bool bRet;
if( bSelect )
{
SttCrsrMove();
MoveCrsr( true );
- nRet = (this->*FnSimpleMove)();
+ bRet = (this->*FnSimpleMove)();
EndCrsrMove();
}
- else if( ( nRet = (this->*FnSimpleMove)() ) )
+ else if( ( bRet = (this->*FnSimpleMove)() ) )
MoveCrsr();
- return nRet;
+ return bRet;
}
bool SwWrtShell::Left( sal_uInt16 nMode, bool bSelect,
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 046c581268d0..b469126f8e76 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -209,7 +209,7 @@ bool TextSearch::SearchForward( const OUString &rStr,
sal_Int32* pStart, sal_Int32* pEnd,
::com::sun::star::util::SearchResult* pRes)
{
- bool nRet = false;
+ bool bRet = false;
try
{
if( xTextSearch.is() )
@@ -217,7 +217,7 @@ bool TextSearch::SearchForward( const OUString &rStr,
SearchResult aRet( xTextSearch->searchForward( rStr, *pStart, *pEnd ));
if( aRet.subRegExpressions > 0 )
{
- nRet = true;
+ bRet = true;
// the XTextsearch returns in startOffset the higher position
// and the endposition is always exclusive.
// The caller of this function will have in startPos the
@@ -233,13 +233,13 @@ bool TextSearch::SearchForward( const OUString &rStr,
{
SAL_WARN( "unotools.i18n", "SearchForward: Exception caught!" );
}
- return nRet;
+ return bRet;
}
bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart,
sal_Int32* pEnde, SearchResult* pRes )
{
- bool nRet = false;
+ bool bRet = false;
try
{
if( xTextSearch.is() )
@@ -247,7 +247,7 @@ bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart,
SearchResult aRet( xTextSearch->searchBackward( rStr, *pStart, *pEnde ));
if( aRet.subRegExpressions )
{
- nRet = true;
+ bRet = true;
// the XTextsearch returns in startOffset the higher position
// and the endposition is always exclusive.
// The caller of this function will have in startPos the
@@ -263,7 +263,7 @@ bool TextSearch::SearchBackward( const OUString & rStr, sal_Int32* pStart,
{
SAL_WARN( "unotools.i18n", "SearchBackward: Exception caught!" );
}
- return nRet;
+ return bRet;
}
void TextSearch::ReplaceBackReferences( OUString& rReplaceStr, const OUString &rStr, const SearchResult& rResult )
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index f6ee508623c7..e9152f0297ed 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -132,13 +132,13 @@ namespace
{
FcChar8 *pNameA=NULL, *pNameB=NULL;
- bool nHaveA = FcPatternGetString(a, FC_FAMILY, 0, &pNameA) == FcResultMatch;
- bool nHaveB = FcPatternGetString(b, FC_FAMILY, 0, &pNameB) == FcResultMatch;
+ bool bHaveA = FcPatternGetString(a, FC_FAMILY, 0, &pNameA) == FcResultMatch;
+ bool bHaveB = FcPatternGetString(b, FC_FAMILY, 0, &pNameB) == FcResultMatch;
- if (nHaveA && nHaveB)
+ if (bHaveA && bHaveB)
return strcmp(reinterpret_cast<const char*>(pNameA), reinterpret_cast<const char*>(pNameB));
- return int(nHaveA) - int(nHaveB);
+ return int(bHaveA) - int(bHaveB);
}
//Sort fonts so that fonts with the same family name are side-by-side, with
@@ -154,13 +154,13 @@ namespace
int nVersionA=0, nVersionB=0;
- bool nHaveA = FcPatternGetInteger(a, FC_FONTVERSION, 0, &nVersionA) == FcResultMatch;
- bool nHaveB = FcPatternGetInteger(b, FC_FONTVERSION, 0, &nVersionB) == FcResultMatch;
+ bool bHaveA = FcPatternGetInteger(a, FC_FONTVERSION, 0, &nVersionA) == FcResultMatch;
+ bool bHaveB = FcPatternGetInteger(b, FC_FONTVERSION, 0, &nVersionB) == FcResultMatch;
- if (nHaveA && nHaveB)
+ if (bHaveA && bHaveB)
return nVersionA > nVersionB;
- return nHaveA > nHaveB;
+ return bHaveA > bHaveB;
}
};
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index 454a8563604d..a33150102a65 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -47,7 +47,7 @@ public:
virtual void EndSetClipRegion() SAL_OVERRIDE;
virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
virtual void Show( bool bVisible ) SAL_OVERRIDE;
- virtual void Enable( bool nEnable ) SAL_OVERRIDE;
+ virtual void Enable( bool bEnable ) SAL_OVERRIDE;
virtual void GrabFocus() SAL_OVERRIDE;
virtual const SystemEnvData* GetSystemData() const SAL_OVERRIDE;
};
diff --git a/vcl/source/bitmap/BitmapSymmetryCheck.cxx b/vcl/source/bitmap/BitmapSymmetryCheck.cxx
index ad96a09f2c7b..f1a600815f1c 100644
--- a/vcl/source/bitmap/BitmapSymmetryCheck.cxx
+++ b/vcl/source/bitmap/BitmapSymmetryCheck.cxx
@@ -30,8 +30,8 @@ bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess* pReadAccess)
long nHeightHalf = nHeight / 2;
long nWidthHalf = nWidth / 2;
- bool nHeightEven = (nHeight % 2) == 0;
- bool nWidthEven = (nWidth % 2) == 0;
+ bool bHeightEven = (nHeight % 2) == 0;
+ bool bWidthEven = (nWidth % 2) == 0;
for (long y = 0; y < nHeightHalf; ++y)
{
@@ -52,7 +52,7 @@ bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess* pReadAccess)
}
}
- if (nWidthEven)
+ if (bWidthEven)
{
for (long y = 0; y < nHeightHalf; ++y)
{
@@ -63,7 +63,7 @@ bool BitmapSymmetryCheck::checkImpl(BitmapReadAccess* pReadAccess)
}
}
- if (nHeightEven)
+ if (bHeightEven)
{
for (long x = 0; x < nWidthHalf; ++x)
{
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 1851ce1c1f7f..2eace9a7f8c6 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -767,7 +767,7 @@ bool ComboBox::PreNotify( NotifyEvent& rNEvt )
bool ComboBox::Notify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ((rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
&& (rNEvt.GetWindow() == m_pImpl->m_pSubEdit)
&& !IsReadOnly())
@@ -793,18 +793,18 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
SetSelection( Selection( 0, SELECTION_MAX ) );
m_pImpl->m_pFloatWin->StartFloat( false );
CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
- nDone = true;
+ bDone = true;
}
else if ((nKeyCode == KEY_UP) && m_pImpl->m_pFloatWin
&& m_pImpl->m_pFloatWin->IsInPopupMode()
&& aKeyEvt.GetKeyCode().IsMod2())
{
m_pImpl->m_pFloatWin->EndPopupMode();
- nDone = true;
+ bDone = true;
}
else
{
- nDone = m_pImpl->m_pImplLB->ProcessKeyInput( aKeyEvt );
+ bDone = m_pImpl->m_pImplLB->ProcessKeyInput( aKeyEvt );
}
}
break;
@@ -814,7 +814,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
if ((rNEvt.GetWindow() == m_pImpl->m_pSubEdit) && IsInDropDown())
{
m_pImpl->m_pImplLB->ProcessKeyInput( aKeyEvt );
- nDone = true;
+ bDone = true;
}
}
break;
@@ -838,11 +838,11 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
)
)
{
- nDone = m_pImpl->m_pImplLB->HandleWheelAsCursorTravel( *rNEvt.GetCommandEvent() );
+ bDone = m_pImpl->m_pImplLB->HandleWheelAsCursorTravel( *rNEvt.GetCommandEvent() );
}
else
{
- nDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context)
+ bDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context)
}
}
else if ((rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN)
@@ -851,7 +851,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
m_pImpl->m_pSubEdit->GrabFocus();
}
- return nDone || Edit::Notify( rNEvt );
+ return bDone || Edit::Notify( rNEvt );
}
void ComboBox::SetText( const OUString& rStr )
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 35248d9c062e..1fdf3879a6e6 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2503,7 +2503,7 @@ void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
bool ImplListBox::Notify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -2512,12 +2512,12 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt )
const CommandWheelData* pData = rCEvt.GetWheelData();
if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
{
- nDone = HandleScrollCommand( rCEvt, mpHScrollBar, mpVScrollBar );
+ bDone = HandleScrollCommand( rCEvt, mpHScrollBar, mpVScrollBar );
}
}
}
- return nDone || Window::Notify( rNEvt );
+ return bDone || Window::Notify( rNEvt );
}
const Wallpaper& ImplListBox::GetDisplayBackground() const
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index c5161985f80a..1ad96bb86b9e 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -876,7 +876,7 @@ void ListBox::StateChanged( StateChangedType nType )
bool ListBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if ( mpImplLB )
{
if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && ( rNEvt.GetWindow() == mpImplWin ) )
@@ -893,11 +893,11 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
mpBtn->SetPressed( true );
mpFloatWin->StartFloat( false );
CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
- nDone = true;
+ bDone = true;
}
else
{
- nDone = mpImplLB->ProcessKeyInput( aKeyEvt );
+ bDone = mpImplLB->ProcessKeyInput( aKeyEvt );
}
}
break;
@@ -907,11 +907,11 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
aKeyEvt.GetKeyCode().IsMod2() )
{
mpFloatWin->EndPopupMode();
- nDone = true;
+ bDone = true;
}
else
{
- nDone = mpImplLB->ProcessKeyInput( aKeyEvt );
+ bDone = mpImplLB->ProcessKeyInput( aKeyEvt );
}
}
break;
@@ -920,14 +920,14 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
if( IsInDropDown() )
{
mpImplLB->ProcessKeyInput( aKeyEvt );
- nDone = true;
+ bDone = true;
}
}
break;
default:
{
- nDone = mpImplLB->ProcessKeyInput( aKeyEvt );
+ bDone = mpImplLB->ProcessKeyInput( aKeyEvt );
}
}
}
@@ -947,16 +947,16 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
)
)
{
- nDone = mpImplLB->HandleWheelAsCursorTravel( *rNEvt.GetCommandEvent() );
+ bDone = mpImplLB->HandleWheelAsCursorTravel( *rNEvt.GetCommandEvent() );
}
else
{
- nDone = false; // Don't consume this event, let the default handling take it (i.e. scroll the context)
+ bDone = false; // Don't consume this event, let the default handling take it (i.e. scroll the context)
}
}
}
- return nDone || Control::PreNotify( rNEvt );
+ return bDone || Control::PreNotify( rNEvt );
}
void ListBox::Select()
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index e7058f88970e..52dcdd0f4082 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -515,7 +515,7 @@ void SpinField::MouseMove(const MouseEvent& rMEvt)
bool SpinField::Notify(NotifyEvent& rNEvt)
{
- bool nDone = false;
+ bool bDone = false;
if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{
const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
@@ -529,7 +529,7 @@ bool SpinField::Notify(NotifyEvent& rNEvt)
if (!nMod)
{
Up();
- nDone = true;
+ bDone = true;
}
}
break;
@@ -538,13 +538,13 @@ bool SpinField::Notify(NotifyEvent& rNEvt)
if (!nMod)
{
Down();
- nDone = true;
+ bDone = true;
}
else if ((nMod == KEY_MOD2) && !mbInDropDown && (GetStyle() & WB_DROPDOWN))
{
mbInDropDown = ShowDropDown(true);
Invalidate(Rectangle(Point(), GetOutputSizePixel()));
- nDone = true;
+ bDone = true;
}
}
break;
@@ -553,7 +553,7 @@ bool SpinField::Notify(NotifyEvent& rNEvt)
if (!nMod)
{
Last();
- nDone = true;
+ bDone = true;
}
}
break;
@@ -562,7 +562,7 @@ bool SpinField::Notify(NotifyEvent& rNEvt)
if (!nMod)
{
First();
- nDone = true;
+ bDone = true;
}
}
break;
@@ -585,15 +585,15 @@ bool SpinField::Notify(NotifyEvent& rNEvt)
Down();
else
Up();
- nDone = true;
+ bDone = true;
}
}
else
- nDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context)
+ bDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context)
}
}
- return nDone || Edit::Notify(rNEvt);
+ return bDone || Edit::Notify(rNEvt);
}
void SpinField::Command(const CommandEvent& rCEvt)
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index a8f7a51a29d4..0e6b1e807385 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -971,7 +971,7 @@ void TabControl::ImplDrawItem(vcl::RenderContext& rRenderContext, ImplTabItem* p
bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
{
- bool nRet = false;
+ bool bRet = false;
if ( GetPageCount() > 1 )
{
@@ -985,7 +985,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEUP) )
{
ImplActivateTabPage( false );
- nRet = true;
+ bRet = true;
}
}
else
@@ -993,13 +993,13 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEDOWN) )
{
ImplActivateTabPage( true );
- nRet = true;
+ bRet = true;
}
}
}
}
- return nRet;
+ return bRet;
}
IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl)
@@ -1609,12 +1609,12 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt )
bool TabControl::Notify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
- nRet = ImplHandleKeyEvent( *rNEvt.GetKeyEvent() );
+ bRet = ImplHandleKeyEvent( *rNEvt.GetKeyEvent() );
- return nRet || Control::Notify( rNEvt );
+ return bRet || Control::Notify( rNEvt );
}
void TabControl::ActivatePage()
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 127ce91a0d79..d2fc593594dd 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1439,24 +1439,24 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
bool VclMultiLineEdit::Notify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
- nDone = pImpVclMEdit->HandleCommand( *rNEvt.GetCommandEvent() );
+ bDone = pImpVclMEdit->HandleCommand( *rNEvt.GetCommandEvent() );
}
- return nDone || Edit::Notify( rNEvt );
+ return bDone || Edit::Notify( rNEvt );
}
bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = false;
+ bool bDone = false;
if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && ( !GetTextView()->IsCursorEnabled() ) )
{
const KeyEvent& rKEvent = *rNEvt.GetKeyEvent();
if ( !rKEvent.GetKeyCode().IsShift() && ( rKEvent.GetKeyCode().GetGroup() == KEYGROUP_CURSOR ) )
{
- nDone = true;
+ bDone = true;
TextSelection aSel = pImpVclMEdit->GetTextWindow()->GetTextView()->GetSelection();
if ( aSel.HasRange() )
{
@@ -1519,14 +1519,14 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
break;
default:
{
- nDone = false;
+ bDone = false;
}
}
}
}
}
- return nDone || Edit::PreNotify( rNEvt );
+ return bDone || Edit::PreNotify( rNEvt );
}
// Internals for derived classes, e.g. TextComponent
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 12a929454c37..7d79078450ca 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2180,7 +2180,7 @@ const Link<ConvertData&,bool> GraphicFilter::GetFilterCallback() const
IMPL_LINK_TYPED( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
{
- bool nRet = false;
+ bool bRet = false;
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
OString aShortName;
@@ -2205,17 +2205,17 @@ IMPL_LINK_TYPED( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
{
// Import
nFormat = GetImportFormatNumberForShortName( OStringToOUString( aShortName, RTL_TEXTENCODING_UTF8) );
- nRet = ImportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0;
+ bRet = ImportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0;
}
#ifndef DISABLE_EXPORT
else if( !aShortName.isEmpty() )
{
// Export
nFormat = GetExportFormatNumberForShortName( OStringToOUString(aShortName, RTL_TEXTENCODING_UTF8) );
- nRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0;
+ bRet = ExportGraphic( rData.maGraphic, OUString(), rData.mrStm, nFormat ) == 0;
}
#endif
- return nRet;
+ return bRet;
}
namespace
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 57be7b8cf795..7c8c3097c148 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -612,8 +612,8 @@ bool Dialog::ImplHandleCmdEvent( const CommandEvent& rCEvent )
bool Dialog::Notify( NotifyEvent& rNEvt )
{
// first call the base class due to Tab control
- bool nRet = SystemWindow::Notify( rNEvt );
- if ( !nRet )
+ bool bRet = SystemWindow::Notify( rNEvt );
+ if ( !bRet )
{
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -659,7 +659,7 @@ bool Dialog::Notify( NotifyEvent& rNEvt )
}
}
- return nRet;
+ return bRet;
}
//What we really want here is something that gives the available width and
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index fbbf24532ac7..ac950d6b8479 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -92,7 +92,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
bool Window::Notify( NotifyEvent& rNEvt )
{
- bool nRet = false;
+ bool bRet = false;
if (IsDisposed())
return false;
@@ -174,7 +174,7 @@ bool Window::Notify( NotifyEvent& rNEvt )
if ( ImplIsOverlapWindow() ||
((getNonLayoutRealParent(this)->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
{
- nRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT );
+ bRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT );
}
}
else if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) || (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) )
@@ -191,13 +191,13 @@ bool Window::Notify( NotifyEvent& rNEvt )
}
}
- if ( !nRet )
+ if ( !bRet )
{
if ( mpWindowImpl->mpParent && !ImplIsOverlapWindow() )
- nRet = mpWindowImpl->mpParent->CompatNotify( rNEvt );
+ bRet = mpWindowImpl->mpParent->CompatNotify( rNEvt );
}
- return nRet;
+ return bRet;
}
void Window::CallEventListeners( sal_uLong nEvent, void* pData )
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 46353c822b9d..80c8f0c971c0 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -551,8 +551,8 @@ IMPL_LINK_NOARG_TYPED(FloatingWindow, ImplEndPopupModeHdl, void*, void)
bool FloatingWindow::Notify( NotifyEvent& rNEvt )
{
// call Base Class first for tab control
- bool nRet = SystemWindow::Notify( rNEvt );
- if ( !nRet )
+ bool bRet = SystemWindow::Notify( rNEvt );
+ if ( !bRet )
{
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -568,7 +568,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
}
}
- return nRet;
+ return bRet;
}
void FloatingWindow::StateChanged( StateChangedType nType )
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 532a6817a4c2..a15bcbbe0cc9 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1823,7 +1823,7 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue)
bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
{
- bool nDone = false;
+ bool bDone = false;
if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -1832,12 +1832,12 @@ bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
const CommandWheelData* pData = rCEvt.GetWheelData();
if( !pData->GetModifier() && ( pData->GetMode() == CommandWheelMode::SCROLL ) )
{
- nDone = HandleScrollCommand(rCEvt, m_pHScroll, m_pVScroll);
+ bDone = HandleScrollCommand(rCEvt, m_pHScroll, m_pVScroll);
}
}
}
- return nDone || VclBin::Notify( rNEvt );
+ return bDone || VclBin::Notify( rNEvt );
}
void VclViewport::setAllocation(const Size &rAllocation)
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 519d13f74e89..033389d09c67 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1006,7 +1006,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
KeyEvent aKeyEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
NotifyEvent aNotifyEvt( nSVEvent, pChild, &aKeyEvt );
bool bKeyPreNotify = ImplCallPreNotify( aNotifyEvt );
- bool nRet = true;
+ bool bRet = true;
if ( !bKeyPreNotify && !aDelData.IsDead() )
{
@@ -1054,7 +1054,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
// ContextMenu
if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) )
- nRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL, false );
+ bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL, false );
else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) ||
// #101999# no active help when focus in toolbox, simulate BallonHelp instead
( (nCode == KEY_F1) && aKeyCode.IsShift() && bToolboxFocus ) )
@@ -1083,33 +1083,33 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
pChild->RequestHelp( aHelpEvent );
}
else
- nRet = false;
+ bRet = false;
}
else if ( aKeyCode.IsShift() )
{
if ( pSVData->maHelpData.mbExtHelp )
Help::StartExtHelp();
else
- nRet = false;
+ bRet = false;
}
}
else
{
if ( ImplCallHotKey( aKeyCode ) )
- nRet = true;
+ bRet = true;
else
- nRet = false;
+ bRet = false;
}
}
}
else
{
if ( !bKeyPreNotify && pChild->ImplGetWindowImpl()->mbKeyUp )
- nRet = false;
+ bRet = false;
}
// #105591# send keyinput to parent if we are a floating window and the key was not pocessed yet
- if( !nRet && pWindow->ImplGetWindowImpl()->mbFloatWin && pWindow->GetParent() && (pWindow->ImplGetWindowImpl()->mpFrame != pWindow->GetParent()->ImplGetWindowImpl()->mpFrame) )
+ if( !bRet && pWindow->ImplGetWindowImpl()->mbFloatWin && pWindow->GetParent() && (pWindow->ImplGetWindowImpl()->mpFrame != pWindow->GetParent()->ImplGetWindowImpl()->mpFrame) )
{
pChild = pWindow->GetParent();
@@ -1141,10 +1141,10 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
}
if( bPreNotify || !pChild->ImplGetWindowImpl()->mbKeyInput )
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
static bool ImplHandleExtTextInput( vcl::Window* pWindow,
@@ -2093,7 +2093,7 @@ inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent* pEv
static bool ImplHandleMenuEvent( vcl::Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent )
{
// Find SystemWindow and its Menubar and let it dispatch the command
- bool nRet = false;
+ bool bRet = false;
vcl::Window *pWin = pWindow->ImplGetWindowImpl()->mpFirstChild;
while ( pWin )
{
@@ -2109,26 +2109,26 @@ static bool ImplHandleMenuEvent( vcl::Window* pWindow, SalMenuEvent* pEvent, sal
switch( nEvent )
{
case SALEVENT_MENUACTIVATE:
- nRet = pMenuBar->HandleMenuActivateEvent( static_cast<Menu*>(pEvent->mpMenu) );
+ bRet = pMenuBar->HandleMenuActivateEvent( static_cast<Menu*>(pEvent->mpMenu) );
break;
case SALEVENT_MENUDEACTIVATE:
- nRet = pMenuBar->HandleMenuDeActivateEvent( static_cast<Menu*>(pEvent->mpMenu) );
+ bRet = pMenuBar->HandleMenuDeActivateEvent( static_cast<Menu*>(pEvent->mpMenu) );
break;
case SALEVENT_MENUHIGHLIGHT:
- nRet = pMenuBar->HandleMenuHighlightEvent( static_cast<Menu*>(pEvent->mpMenu), pEvent->mnId );
+ bRet = pMenuBar->HandleMenuHighlightEvent( static_cast<Menu*>(pEvent->mpMenu), pEvent->mnId );
break;
case SALEVENT_MENUBUTTONCOMMAND:
- nRet = pMenuBar->HandleMenuButtonEvent( static_cast<Menu*>(pEvent->mpMenu), pEvent->mnId );
+ bRet = pMenuBar->HandleMenuButtonEvent( static_cast<Menu*>(pEvent->mpMenu), pEvent->mnId );
break;
case SALEVENT_MENUCOMMAND:
- nRet = pMenuBar->HandleMenuCommandEvent( static_cast<Menu*>(pEvent->mpMenu), pEvent->mnId );
+ bRet = pMenuBar->HandleMenuCommandEvent( static_cast<Menu*>(pEvent->mpMenu), pEvent->mnId );
break;
default:
break;
}
}
}
- return nRet;
+ return bRet;
}
static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent* pEvent )
@@ -2374,7 +2374,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
// Ensure the window survives during this method.
VclPtr<vcl::Window> pWindow( _pWindow );
- bool nRet = false;
+ bool bRet = false;
// #119709# for some unknown reason it is possible to receive events (in this case key events)
// although the corresponding VCL window must have been destroyed already
@@ -2385,7 +2385,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
switch ( nEvent )
{
case SALEVENT_MOUSEMOVE:
- nRet = ImplHandleSalMouseMove( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
+ bRet = ImplHandleSalMouseMove( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
break;
case SALEVENT_EXTERNALMOUSEMOVE:
{
@@ -2398,14 +2398,14 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
aSalMouseEvent.mnButton = 0;
aSalMouseEvent.mnCode = pMouseEvt->GetButtons() | pMouseEvt->GetModifier();
- nRet = ImplHandleSalMouseMove( pWindow, &aSalMouseEvent );
+ bRet = ImplHandleSalMouseMove( pWindow, &aSalMouseEvent );
}
break;
case SALEVENT_MOUSELEAVE:
- nRet = ImplHandleSalMouseLeave( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
+ bRet = ImplHandleSalMouseLeave( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
break;
case SALEVENT_MOUSEBUTTONDOWN:
- nRet = ImplHandleSalMouseButtonDown( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
+ bRet = ImplHandleSalMouseButtonDown( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
break;
case SALEVENT_EXTERNALMOUSEBUTTONDOWN:
{
@@ -2418,11 +2418,11 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
aSalMouseEvent.mnButton = pMouseEvt->GetButtons();
aSalMouseEvent.mnCode = pMouseEvt->GetButtons() | pMouseEvt->GetModifier();
- nRet = ImplHandleSalMouseButtonDown( pWindow, &aSalMouseEvent );
+ bRet = ImplHandleSalMouseButtonDown( pWindow, &aSalMouseEvent );
}
break;
case SALEVENT_MOUSEBUTTONUP:
- nRet = ImplHandleSalMouseButtonUp( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
+ bRet = ImplHandleSalMouseButtonUp( pWindow, const_cast<SalMouseEvent *>(static_cast<SalMouseEvent const *>(pEvent)) );
break;
case SALEVENT_EXTERNALMOUSEBUTTONUP:
{
@@ -2435,37 +2435,37 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
aSalMouseEvent.mnButton = pMouseEvt->GetButtons();
aSalMouseEvent.mnCode = pMouseEvt->GetButtons() | pMouseEvt->GetModifier();
- nRet = ImplHandleSalMouseButtonUp( pWindow, &aSalMouseEvent );
+ bRet = ImplHandleSalMouseButtonUp( pWindow, &aSalMouseEvent );
}
break;
case SALEVENT_MOUSEACTIVATE:
- nRet = false;
+ bRet = false;
break;
case SALEVENT_KEYINPUT:
{
SalKeyEvent const * pKeyEvt = static_cast<SalKeyEvent const *>(pEvent);
- nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYINPUT,
+ bRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYINPUT,
pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, true );
}
break;
case SALEVENT_EXTERNALKEYINPUT:
{
KeyEvent const * pKeyEvt = static_cast<KeyEvent const *>(pEvent);
- nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYINPUT,
+ bRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYINPUT,
pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), false );
}
break;
case SALEVENT_KEYUP:
{
SalKeyEvent const * pKeyEvt = static_cast<SalKeyEvent const *>(pEvent);
- nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYUP,
+ bRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYUP,
pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, true );
}
break;
case SALEVENT_EXTERNALKEYUP:
{
KeyEvent const * pKeyEvt = static_cast<KeyEvent const *>(pEvent);
- nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYUP,
+ bRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYUP,
pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), false );
}
break;
@@ -2482,11 +2482,11 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
case SALEVENT_MENUHIGHLIGHT:
case SALEVENT_MENUCOMMAND:
case SALEVENT_MENUBUTTONCOMMAND:
- nRet = ImplHandleMenuEvent( pWindow, const_cast<SalMenuEvent *>(static_cast<SalMenuEvent const *>(pEvent)), nEvent );
+ bRet = ImplHandleMenuEvent( pWindow, const_cast<SalMenuEvent *>(static_cast<SalMenuEvent const *>(pEvent)), nEvent );
break;
case SALEVENT_WHEELMOUSE:
- nRet = ImplHandleWheelEvent( pWindow, *static_cast<const SalWheelMouseEvent*>(pEvent));
+ bRet = ImplHandleWheelEvent( pWindow, *static_cast<const SalWheelMouseEvent*>(pEvent));
break;
case SALEVENT_PAINT:
@@ -2578,24 +2578,24 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
case SALEVENT_EXTTEXTINPUT:
{
SalExtTextInputEvent const * pEvt = static_cast<SalExtTextInputEvent const *>(pEvent);
- nRet = ImplHandleExtTextInput( pWindow,
+ bRet = ImplHandleExtTextInput( pWindow,
pEvt->maText, pEvt->mpTextAttr,
pEvt->mnCursorPos, pEvt->mnCursorFlags );
}
break;
case SALEVENT_ENDEXTTEXTINPUT:
- nRet = ImplHandleEndExtTextInput( pWindow );
+ bRet = ImplHandleEndExtTextInput( pWindow );
break;
case SALEVENT_EXTTEXTINPUTPOS:
ImplHandleSalExtTextInputPos( pWindow, const_cast<SalExtTextInputPosEvent *>(static_cast<SalExtTextInputPosEvent const *>(pEvent)) );
break;
case SALEVENT_INPUTCONTEXTCHANGE:
- nRet = ImplHandleInputContextChange( pWindow, static_cast<SalInputContextChangeEvent const *>(pEvent)->meLanguage );
+ bRet = ImplHandleInputContextChange( pWindow, static_cast<SalInputContextChangeEvent const *>(pEvent)->meLanguage );
break;
case SALEVENT_SHOWDIALOG:
{
ShowDialogId nDialogID = static_cast<ShowDialogId>(reinterpret_cast<sal_IntPtr>(pEvent));
- nRet = ImplHandleShowDialog( pWindow, nDialogID );
+ bRet = ImplHandleShowDialog( pWindow, nDialogID );
}
break;
case SALEVENT_SURROUNDINGTEXTREQUEST:
@@ -2626,7 +2626,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
// Other SalWheelMouseEvent fields ignored when the
// scaleDirectly parameter to ImplHandleWheelEvent() is
// true.
- nRet = ImplHandleWheelEvent( pWindow, aSalWheelMouseEvent, true );
+ bRet = ImplHandleWheelEvent( pWindow, aSalWheelMouseEvent, true );
}
break;
case SALEVENT_EXTERNALSCROLL:
@@ -2641,7 +2641,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
aSalWheelMouseEvent.mnScrollLines = 0;
if (aSalWheelMouseEvent.mnX != 0 || aSalWheelMouseEvent.mnY != 0)
{
- nRet = ImplHandleWheelEvent( pWindow, aSalWheelMouseEvent );
+ bRet = ImplHandleWheelEvent( pWindow, aSalWheelMouseEvent );
}
}
break;
@@ -2650,11 +2650,11 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
break;
case SALEVENT_SWIPE:
- nRet = ImplHandleSwipe(pWindow, *static_cast<const SalSwipeEvent*>(pEvent));
+ bRet = ImplHandleSwipe(pWindow, *static_cast<const SalSwipeEvent*>(pEvent));
break;
case SALEVENT_LONGPRESS:
- nRet = ImplHandleLongPress(pWindow, *static_cast<const SalLongPressEvent*>(pEvent));
+ bRet = ImplHandleLongPress(pWindow, *static_cast<const SalLongPressEvent*>(pEvent));
break;
@@ -2665,7 +2665,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/,
#endif
}
- return nRet;
+ return bRet;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index 6f943832eed9..57d1ca22db81 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -109,10 +109,10 @@ struct XMLFontAutoStylePoolEntryCmp_Impl {
XMLFontAutoStylePoolEntry_Impl* const& r1,
XMLFontAutoStylePoolEntry_Impl* const& r2 ) const
{
- bool nEnc1(r1->GetEncoding() != RTL_TEXTENCODING_SYMBOL);
- bool nEnc2(r2->GetEncoding() != RTL_TEXTENCODING_SYMBOL);
- if( nEnc1 != nEnc2 )
- return nEnc1 < nEnc2;
+ bool bEnc1(r1->GetEncoding() != RTL_TEXTENCODING_SYMBOL);
+ bool bEnc2(r2->GetEncoding() != RTL_TEXTENCODING_SYMBOL);
+ if( bEnc1 != bEnc2 )
+ return bEnc1 < bEnc2;
else if( r1->GetPitch() != r2->GetPitch() )
return r1->GetPitch() < r2->GetPitch();
else if( r1->GetFamily() != r2->GetFamily() )