[Libreoffice-commits] core.git: include/sfx2 sc/source sd/source sfx2/source svx/source sw/source
Noel Grandin
noel at peralex.com
Wed Feb 25 02:40:35 PST 2015
include/sfx2/childwin.hxx | 36 +++++++++++++-------
sc/source/ui/app/scdll.cxx | 4 +-
sc/source/ui/inc/ChildWindowWrapper.hxx | 2 -
sc/source/ui/view/reffact.cxx | 2 -
sd/source/ui/app/sddll.cxx | 2 -
sfx2/source/appl/appreg.cxx | 4 +-
sfx2/source/appl/childwin.cxx | 8 ++--
sfx2/source/appl/workwin.cxx | 56 ++++++++++++++++----------------
sfx2/source/dialog/basedlgs.cxx | 4 +-
sfx2/source/dialog/dockwin.cxx | 4 +-
sfx2/source/dialog/partwnd.cxx | 2 -
svx/source/dialog/_contdlg.cxx | 2 -
svx/source/dialog/imapdlg.cxx | 2 -
svx/source/dialog/rubydialog.cxx | 2 -
sw/source/ui/fldui/fldtdlg.cxx | 2 -
sw/source/uibase/app/swmodule.cxx | 2 -
16 files changed, 73 insertions(+), 61 deletions(-)
New commits:
commit 15b406f0736ad953aa79102bfa5949871c8c0213
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 25 12:39:24 2015 +0200
convert SFX_CHILDWIN constants to enum class
Change-Id: I8eb0c9bda0883bc08aed3acd7eaa72480848c6f3
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index a768e82..8137027 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -23,6 +23,7 @@
#include <sfx2/dllapi.h>
#include <sal/types.h>
+#include <o3tl/typed_flags_set.hxx>
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
@@ -39,13 +40,24 @@ class SfxShell;
class SfxChildWindow;
class SfxChildWindowContext;
-#define SFX_CHILDWIN_ZOOMIN 0x01 // Fully retracted Float
-#define SFX_CHILDWIN_FORCEDOCK 0x04 // Float forbidden
-#define SFX_CHILDWIN_TASK 0x10 // ChildWindow inside the Task
-#define SFX_CHILDWIN_CANTGETFOCUS 0x20 // ChildWindow can not get focus
-#define SFX_CHILDWIN_ALWAYSAVAILABLE 0x40 // ChildWindow is never disabled
-#define SFX_CHILDWIN_NEVERHIDE 0x80 // ChildWindow is can always made
- // visible/is visible
+enum class SfxChildWindowFlags
+{
+ NONE = 0x00,
+ ZOOMIN = 0x01, // Fully retracted Float
+ FORCEDOCK = 0x04, // Float forbidden
+ TASK = 0x10, // ChildWindow inside the Task
+ CANTGETFOCUS = 0x20, // ChildWindow can not get focus
+ ALWAYSAVAILABLE = 0x40, // ChildWindow is never disabled
+ NEVERHIDE = 0x80 // ChildWindow is can always made
+ // visible/is visible
+};
+
+namespace o3tl
+{
+ template<> struct typed_flags<SfxChildWindowFlags> : is_typed_flags<SfxChildWindowFlags, 0xf5> {};
+}
+
+
#define CHILDWIN_NOPOS USHRT_MAX
// ChildWindow Configuration
@@ -54,7 +66,7 @@ struct SAL_DLLPUBLIC_RTTI SfxChildWinInfo
bool bVisible;
Point aPos;
Size aSize;
- sal_uInt16 nFlags;
+ SfxChildWindowFlags nFlags;
OUString aExtraString;
OUString aModule;
OString aWinState;
@@ -62,7 +74,7 @@ struct SAL_DLLPUBLIC_RTTI SfxChildWinInfo
SfxChildWinInfo()
{
bVisible = false;
- nFlags = 0;
+ nFlags = SfxChildWindowFlags::NONE;
}
bool GetExtraData_Impl( SfxChildAlignment *pAlign,
SfxChildAlignment *pLastAlign = 0,
@@ -173,7 +185,7 @@ public:
{ return pWindow->GetPosPixel(); }
virtual void Hide();
virtual void Show( sal_uInt16 nFlags );
- sal_uInt16 GetFlags() const
+ SfxChildWindowFlags GetFlags() const
{ return GetInfo().nFlags; }
bool CanGetFocus() const;
sal_uInt16 GetPosition();
@@ -271,7 +283,7 @@ public:
public : \
static SfxChildWindow* CreateImpl(vcl::Window *pParent, sal_uInt16 nId, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
- static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \
+ static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, SfxChildWindowFlags nFlags=SfxChildWindowFlags::NONE); \
virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE
#define SFX_DECL_CHILDWINDOW_WITHID(Class) \
@@ -291,7 +303,7 @@ public:
SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
return pWin; \
} \
- void Class::RegisterChildWindow (bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \
+ void Class::RegisterChildWindow (bool bVis, SfxModule *pMod, SfxChildWindowFlags nFlags) \
{ \
SfxChildWinFactory *pFact = new SfxChildWinFactory( \
Class::CreateImpl, MyID, Pos ); \
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 2bccd1d..52a98d4 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -232,7 +232,7 @@ void ScDLL::Init()
// Child Windows
- ScInputWindowWrapper ::RegisterChildWindow(true, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK);
+ ScInputWindowWrapper ::RegisterChildWindow(true, pMod, SfxChildWindowFlags::TASK|SfxChildWindowFlags::FORCEDOCK);
ScNavigatorDialogWrapper ::RegisterChildWindowContext(static_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod);
ScSolverDlgWrapper ::RegisterChildWindow(false, pMod);
ScOptSolverDlgWrapper ::RegisterChildWindow(false, pMod);
@@ -267,7 +267,7 @@ void ScDLL::Init()
// Redlining Window
ScAcceptChgDlgWrapper ::RegisterChildWindow(false, pMod);
- ScSimpleRefDlgWrapper ::RegisterChildWindow(false, pMod, SFX_CHILDWIN_ALWAYSAVAILABLE|SFX_CHILDWIN_NEVERHIDE );
+ ScSimpleRefDlgWrapper ::RegisterChildWindow(false, pMod, SfxChildWindowFlags::ALWAYSAVAILABLE|SfxChildWindowFlags::NEVERHIDE );
ScHighlightChgDlgWrapper ::RegisterChildWindow(false, pMod);
SvxSearchDialogWrapper ::RegisterChildWindow(false, pMod);
diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx
index 6e50bf9..3d52f96 100644
--- a/sc/source/ui/inc/ChildWindowWrapper.hxx
+++ b/sc/source/ui/inc/ChildWindowWrapper.hxx
@@ -51,7 +51,7 @@ public:
static void RegisterChildWindow (
bool bVisible = false,
SfxModule* pModule = NULL,
- sal_uInt16 nFlags = 0)
+ SfxChildWindowFlags nFlags = SfxChildWindowFlags::NONE)
{
SfxChildWinFactory* pFactory = new SfxChildWinFactory(ChildWindowWrapper::CreateImpl, WindowID, CHILDWIN_NOPOS );
pFactory->aInfo.nFlags |= nFlags;
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 55697e2..d6a1258 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -61,7 +61,7 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
if( pWnd->IsDialog() )
if ( static_cast<Dialog*>(pWnd)->IsRollUp() )
- anInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
+ anInfo.nFlags |= SfxChildWindowFlags::ZOOMIN;
}
return anInfo;
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index e86735b..6485138 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -193,7 +193,7 @@ void SdDLL::RegisterControllers()
Svx3DChildWindow::RegisterChildWindow(false, pMod);
SvxFontWorkChildWindow::RegisterChildWindow(false, pMod);
- SvxColorChildWindow::RegisterChildWindow(false, pMod, SFX_CHILDWIN_TASK);
+ SvxColorChildWindow::RegisterChildWindow(false, pMod, SfxChildWindowFlags::TASK);
SvxSearchDialogWrapper::RegisterChildWindow(false, pMod);
SvxBmpMaskChildWindow::RegisterChildWindow(false, pMod);
SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod);
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 923016d..dc25cc2 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -53,10 +53,10 @@ void SfxApplication::Registrations_Impl()
// ChildWindows
SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
- SfxNavigatorWrapper::RegisterChildWindow( false, NULL, SFX_CHILDWIN_NEVERHIDE );
+ SfxNavigatorWrapper::RegisterChildWindow( false, NULL, SfxChildWindowFlags::NEVERHIDE );
SfxPartChildWnd_Impl::RegisterChildWindow();
SfxDockingWrapper::RegisterChildWindow();
- SfxInfoBarContainerChild::RegisterChildWindow( true, NULL, SFX_CHILDWIN_NEVERHIDE );
+ SfxInfoBarContainerChild::RegisterChildWindow( true, NULL, SfxChildWindowFlags::NEVERHIDE );
// Controller
SfxToolBoxControl::RegisterControl(SID_REPEAT);
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 1e870c8..90f5e42 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -351,7 +351,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
}
aInfo.bVisible = pImp->bVisible;
- aInfo.nFlags = 0;
+ aInfo.nFlags = SfxChildWindowFlags::NONE;
return aInfo;
}
@@ -416,12 +416,12 @@ void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI
if ( nNextPos != -1 )
{
// there is extra information
- rInfo.nFlags = (sal_uInt16)aWinData.copy( nPos+1, nNextPos - nPos - 1 ).toInt32();
+ rInfo.nFlags = static_cast<SfxChildWindowFlags>((sal_uInt16)aWinData.copy( nPos+1, nNextPos - nPos - 1 ).toInt32());
aWinData = aWinData.replaceAt( nPos, nNextPos-nPos+1, "" );
rInfo.aExtraString = aWinData;
}
else
- rInfo.nFlags = (sal_uInt16)aWinData.copy( nPos+1 ).toInt32();
+ rInfo.nFlags = static_cast<SfxChildWindowFlags>((sal_uInt16)aWinData.copy( nPos+1 ).toInt32());
}
}
}
@@ -755,7 +755,7 @@ void SfxChildWindow::SetFrame( const ::com::sun::star::uno::Reference< ::com::su
bool SfxChildWindow::CanGetFocus() const
{
- return !(pImp->pFact->aInfo.nFlags & SFX_CHILDWIN_CANTGETFOCUS);
+ return !(pImp->pFact->aInfo.nFlags & SfxChildWindowFlags::CANTGETFOCUS);
}
void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, sal_uInt16 nId, SfxChildWinContextFactory* pFact)
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index db5d7da..53c4b75 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1061,8 +1061,8 @@ void SfxWorkWindow::ShowChildren_Impl()
// Check flag SFX_CHILDWIN_NEVERHIDE that forces us to show
// the child window even in situations where no child window is
// visible.
- sal_uInt16 nFlags = pCW->aInfo.nFlags;
- bVisible = !bInvisible || (( nFlags & SFX_CHILDWIN_NEVERHIDE ) != 0 );
+ SfxChildWindowFlags nFlags = pCW->aInfo.nFlags;
+ bVisible = !bInvisible || ( nFlags & SfxChildWindowFlags::NEVERHIDE );
}
if ( CHILD_VISIBLE == (pCli->nVisible & CHILD_VISIBLE) && bVisible )
@@ -1419,7 +1419,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
SfxChildWin_Impl *pCW = aChildWins[n];
SfxChildWindow *pChildWin = pCW->pWin;
bool bCreate = false;
- if ( pCW->nId && !pCW->bDisabled && (pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) )
+ if ( pCW->nId && !pCW->bDisabled && (pCW->aInfo.nFlags & SfxChildWindowFlags::ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) )
{
// In the context is an appropriate ChildWindow allowed;
// it is also turned on?
@@ -1432,7 +1432,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
{
// Special case for all non-floatable child windows. We have
// to prevent the creation here!
- bCreate = !( pCW->aInfo.nFlags & SFX_CHILDWIN_FORCEDOCK );
+ bCreate = !( pCW->aInfo.nFlags & SfxChildWindowFlags::FORCEDOCK );
}
else if ( !IsDockingAllowed() || bIsFullScreen ) // || !bInternalDocking )
{
@@ -1573,7 +1573,7 @@ void SfxWorkWindow::RemoveChildWin_Impl( SfxChildWin_Impl *pCW )
SfxChildWindow *pChildWin = pCW->pWin;
// Save the information in the INI file
- sal_uInt16 nFlags = pCW->aInfo.nFlags;
+ SfxChildWindowFlags nFlags = pCW->aInfo.nFlags;
pCW->aInfo = pChildWin->GetInfo();
pCW->aInfo.nFlags |= nFlags;
SaveStatus_Impl(pChildWin, pCW->aInfo);
@@ -1901,7 +1901,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
if ( pCW && pCW->pWin )
{
// store changed configuration
- sal_uInt16 nFlags = pCW->aInfo.nFlags;
+ SfxChildWindowFlags nFlags = pCW->aInfo.nFlags;
pCW->aInfo = pCW->pWin->GetInfo();
pCW->aInfo.nFlags |= nFlags;
if ( eConfig != SFX_MOVEDOCKINGWINDOW )
@@ -1959,7 +1959,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, bool bEnabled, s
pCW = new SfxChildWin_Impl( lId );
pCW->nId = nId;
InitializeChild_Impl( pCW );
- if ( pWork && !( pCW->aInfo.nFlags & SFX_CHILDWIN_TASK ) )
+ if ( pWork && !( pCW->aInfo.nFlags & SfxChildWindowFlags::TASK ) )
pWork->aChildWins.push_back( pCW );
else
aChildWins.push_back( pCW );
@@ -1995,7 +1995,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, bool bSetFocus)
{
// Special case for all non-floatable child windows. We have
// to prevent the creation here!
- bCreationAllowed = !( pCW->aInfo.nFlags & SFX_CHILDWIN_FORCEDOCK );
+ bCreationAllowed = !( pCW->aInfo.nFlags & SfxChildWindowFlags::FORCEDOCK );
}
if ( bCreationAllowed )
@@ -2151,7 +2151,7 @@ bool SfxWorkWindow::IsFloating( sal_uInt16 nId )
pCW->nId = 0;
pCW->nVisibility = 0;
InitializeChild_Impl( pCW );
- if ( pWork && !( pCW->aInfo.nFlags & SFX_CHILDWIN_TASK ) )
+ if ( pWork && !( pCW->aInfo.nFlags & SfxChildWindowFlags::TASK ) )
pWork->aChildWins.push_back( pCW );
else
aChildWins.push_back( pCW );
@@ -2180,7 +2180,7 @@ bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
if (n<nCount)
{
- if ( !(pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE) && !IsVisible_Impl( pCW->nVisibility ) )
+ if ( !(pCW->aInfo.nFlags & SfxChildWindowFlags::ALWAYSAVAILABLE) && !IsVisible_Impl( pCW->nVisibility ) )
return false;
return pCW->bEnable;
}
@@ -2233,7 +2233,7 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus
// the Parent
pCW = new SfxChildWin_Impl( nId );
InitializeChild_Impl( pCW );
- if ( !pWork || pCW->aInfo.nFlags & SFX_CHILDWIN_TASK )
+ if ( !pWork || pCW->aInfo.nFlags & SfxChildWindowFlags::TASK )
pWork = this;
pWork->aChildWins.push_back( pCW );
}
@@ -2297,7 +2297,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSe
if ( pChildWin )
{
pChildWin->SetVisible_Impl( bVisible );
- sal_uInt16 nFlags = pCW->aInfo.nFlags;
+ SfxChildWindowFlags nFlags = pCW->aInfo.nFlags;
pCW->aInfo = pChildWin->GetInfo();
pCW->aInfo.nFlags |= nFlags;
if ( !pCW->bCreate )
@@ -2434,13 +2434,13 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
SfxChildWindow::InitializeChildWinFactory_Impl(
pCW->nSaveId, pCW->aInfo);
pCW->bCreate = pCW->aInfo.bVisible;
- sal_uInt16 nFlags = pFact->aInfo.nFlags;
- if ( nFlags & SFX_CHILDWIN_TASK )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_TASK;
- if ( nFlags & SFX_CHILDWIN_CANTGETFOCUS )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_CANTGETFOCUS;
- if ( nFlags & SFX_CHILDWIN_FORCEDOCK )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_FORCEDOCK;
+ SfxChildWindowFlags nFlags = pFact->aInfo.nFlags;
+ if ( nFlags & SfxChildWindowFlags::TASK )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::TASK;
+ if ( nFlags & SfxChildWindowFlags::CANTGETFOCUS )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::CANTGETFOCUS;
+ if ( nFlags & SfxChildWindowFlags::FORCEDOCK )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::FORCEDOCK;
pFact->aInfo = pCW->aInfo;
return;
}
@@ -2463,15 +2463,15 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW)
SfxChildWindow::InitializeChildWinFactory_Impl(
pCW->nSaveId, pCW->aInfo);
pCW->bCreate = pCW->aInfo.bVisible;
- sal_uInt16 nFlags = pFact->aInfo.nFlags;
- if ( nFlags & SFX_CHILDWIN_TASK )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_TASK;
- if ( nFlags & SFX_CHILDWIN_CANTGETFOCUS )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_CANTGETFOCUS;
- if ( nFlags & SFX_CHILDWIN_FORCEDOCK )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_FORCEDOCK;
- if ( nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE )
- pCW->aInfo.nFlags |= SFX_CHILDWIN_ALWAYSAVAILABLE;
+ SfxChildWindowFlags nFlags = pFact->aInfo.nFlags;
+ if ( nFlags & SfxChildWindowFlags::TASK )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::TASK;
+ if ( nFlags & SfxChildWindowFlags::CANTGETFOCUS )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::CANTGETFOCUS;
+ if ( nFlags & SfxChildWindowFlags::FORCEDOCK )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::FORCEDOCK;
+ if ( nFlags & SfxChildWindowFlags::ALWAYSAVAILABLE )
+ pCW->aInfo.nFlags |= SfxChildWindowFlags::ALWAYSAVAILABLE;
pFact->aInfo = pCW->aInfo;
return;
}
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 8be4a17..be56e6c 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -403,7 +403,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const
{
rInfo.aSize = aSize;
if ( IsRollUp() )
- rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
+ rInfo.nFlags |= SfxChildWindowFlags::ZOOMIN;
}
@@ -611,7 +611,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
{
rInfo.aSize = aSize;
if ( IsRollUp() )
- rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
+ rInfo.nFlags |= SfxChildWindowFlags::ZOOMIN;
}
// SfxSingleTabDialog ----------------------------------------------------
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index e0d7363..f7367ed 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -217,7 +217,7 @@ vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* p
return pWin;
}
-void SfxDockingWrapper::RegisterChildWindow (bool bVis, SfxModule *pMod, sal_uInt16 nFlags)
+void SfxDockingWrapper::RegisterChildWindow (bool bVis, SfxModule *pMod, SfxChildWindowFlags nFlags)
{
// pre-register a couple of docking windows
for (int i=0; i < NUM_OF_DOCKINGWINDOWS; i++ )
@@ -1007,7 +1007,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
return;
}
- if (pInfo && (pInfo->nFlags & SFX_CHILDWIN_FORCEDOCK))
+ if (pInfo && (pInfo->nFlags & SfxChildWindowFlags::FORCEDOCK))
pImp->bDockingPrevented = true;
pImp->aSplitSize = GetOutputSizePixel();
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index 6420558..beddb33 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -63,7 +63,7 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
eChildAlignment = SFX_ALIGN_TOP;
assert(pInfo);
- pInfo->nFlags |= SFX_CHILDWIN_FORCEDOCK;
+ pInfo->nFlags |= SfxChildWindowFlags::FORCEDOCK;
static_cast<SfxDockingWindow*>(pWindow)->SetFloatingSize( Size( 175, 175 ) );
pWindow->SetSizePixel( Size( 175, 175 ) );
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index a2e3df8..69094cd 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -70,7 +70,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, sal_u
SvxSuperContourDlg* pDlg = new SvxSuperContourDlg(pBindings, this, _pParent);
pWindow = pDlg;
- if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
+ if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
pDlg->RollUp();
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 657e469..dbb665f 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -98,7 +98,7 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16
pWindow = new SvxIMapDlg( pBindings, this, _pParent );
SvxIMapDlg* pDlg = static_cast<SvxIMapDlg*>(pWindow);
- if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
+ if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
pDlg->RollUp();
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 0b91a63..3ab3ff4 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -67,7 +67,7 @@ SvxRubyChildWindow::SvxRubyChildWindow( vcl::Window* _pParent, sal_uInt16 nId,
SvxRubyDialog* pDlg = new SvxRubyDialog(pBindings, this, _pParent);
pWindow = pDlg;
- if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
+ if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
pDlg->RollUp();
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index b73dc00..00cb076 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -127,7 +127,7 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo)
aSize = GetSizePixel();
// should the FloatingWindow get zoomed?
- if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
+ if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
RollUp();
}
else
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index ce4339a..4a8038c 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -362,7 +362,7 @@ void SwDLL::RegisterControls()
SwFldDataOnlyDlgWrapper::RegisterChildWindow( false, pMod );
SvxContourDlgChildWindow::RegisterChildWindow( false, pMod );
SwNavigationChild::RegisterChildWindowContext( pMod );
- SwInputChild::RegisterChildWindow( false, pMod, SFX_CHILDWIN_FORCEDOCK );
+ SwInputChild::RegisterChildWindow( false, pMod, SfxChildWindowFlags::FORCEDOCK );
SwRedlineAcceptChild::RegisterChildWindow( false, pMod );
SwSyncChildWin::RegisterChildWindow( true, pMod );
SwMailMergeChildWindow::RegisterChildWindow( false, pMod );
More information about the Libreoffice-commits
mailing list