include/sfx2/childwin.hxx | 2 +-
sc/source/ui/app/scdll.cxx | 3 +--
sfx2/source/appl/workwin.cxx | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit ca479763afc33824abc7afeaf41a5de1010ac777
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 4 14:01:43 2014 +0100
I can't see that the bVisible as 42 is any difference from 'true'
...in practise. If I'm wrong then this needs to be a TriState
Change-Id: I4aa499c89ce2f1a46edf443db053b264f285b0d5
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 03fa2c6..8e2827b 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -50,7 +50,7 @@ class SfxChildWindowContext;
// ChildWindow Configuration
struct SfxChildWinInfo
{
- sal_Bool bVisible; // this can be sal_True, or sal_False, or 42
+ bool bVisible;
Point aPos;
Size aSize;
sal_uInt16 nFlags;
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 755839a..4a7f182 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -248,8 +248,7 @@ void ScDLL::Init()
// Child-Windows
- // Hack: register input line with 42 so it is always visible in the PlugIn
- ScInputWindowWrapper ::RegisterChildWindow(42, pMod,
SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
+ ScInputWindowWrapper ::RegisterChildWindow(true, pMod,
SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
ScNavigatorDialogWrapper
::RegisterChildWindowContext(static_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()),
pMod);
ScSolverDlgWrapper ::RegisterChildWindow(false, pMod);
ScOptSolverDlgWrapper ::RegisterChildWindow(false, pMod);
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 8eec8bcb..a8b8973 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1514,8 +1514,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool
bSetFocus )
{
- if ( pCW->aInfo.bVisible != 42 )
- pCW->aInfo.bVisible = sal_True;
+ pCW->aInfo.bVisible = true;
SfxChildWindow *pChildWin = SfxChildWindow::CreateChildWindow( pCW->nId,
pWorkWin, &GetBindings(), pCW->aInfo);
if (pChildWin)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
