[Libreoffice-commits] core.git: sc/source
Stephan Bergmann
sbergman at redhat.com
Tue May 12 05:38:14 PDT 2015
sc/source/ui/condformat/condformatdlg.cxx | 2 +-
sc/source/ui/inc/condformatdlg.hxx | 4 ++--
sc/source/ui/view/cellsh1.cxx | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 7f1004ba170df6e7085803c63d0839f85df70349
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue May 12 14:37:41 2015 +0200
loplugin:salbool etc.
Change-Id: I0cd65a88fba241725476a407143e2d4d03961dc5
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 5154830..e256f74 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -421,7 +421,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent, ScViewData* pViewData,
const ScConditionalFormat* pFormat, const ScRangeList& rRange,
const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType,
- sal_Bool bManaged)
+ bool bManaged)
: ScAnyRefDlg(pB, pCW, pParent, "ConditionalFormatDialog",
"modules/scalc/ui/conditionalformatdialog.ui")
, mbManaged(bManaged)
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 676dc4e..5d8391c 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -110,7 +110,7 @@ private:
VclPtr<ScCondFormatList> mpCondFormList;
sal_Int32 maKey;
- sal_Bool mbManaged;
+ bool mbManaged;
ScAddress maPos;
ScViewData* mpViewData;
@@ -127,7 +127,7 @@ public:
SC_DLLPUBLIC ScCondFormatDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pWindow,
ScViewData* pViewData, const ScConditionalFormat* pFormat,
const ScRangeList& rRange, const ScAddress& rPos,
- condformat::dialog::ScCondFormatDialogType eType, sal_Bool bManaged);
+ condformat::dialog::ScCondFormatDialogType eType, bool bManaged);
virtual ~ScCondFormatDlg();
virtual void dispose() SAL_OVERRIDE;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 237028e..32236d9 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1935,7 +1935,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
- pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
+ pScMod->SetRefDialog( nId, pWnd == nullptr );
break;
}
@@ -2057,7 +2057,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
- pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
+ pScMod->SetRefDialog( nId, pWnd == nullptr );
}
}
break;
More information about the Libreoffice-commits
mailing list