summaryrefslogtreecommitdiff
path: root/sd/source
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 /sd/source
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>
Diffstat (limited to 'sd/source')
-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
5 files changed, 22 insertions, 22 deletions
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 )