diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /sfx2/source/appl/childwin.cxx | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'sfx2/source/appl/childwin.cxx')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index b8e8a92da1b8..2af0e9c179e2 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -350,7 +350,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const aInfo.aSize = pWindow->GetSizePixel(); if ( pWindow->IsSystemWindow() ) { - ULONG nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE; + sal_uIntPtr nMask = WINDOWSTATE_MASK_POS | WINDOWSTATE_MASK_STATE; if ( pWindow->GetStyle() & WB_SIZEABLE ) nMask |= ( WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT ); aInfo.aWinState = ((SystemWindow*)pWindow)->GetWindowState( nMask ); @@ -381,7 +381,7 @@ sal_uInt16 SfxChildWindow::GetPosition() #if 0 static void ImplWindowStateFromStr( Point rPos, Size rSize, const ByteString& rStr ) { - ULONG nValidMask = 0; + sal_uIntPtr nValidMask = 0; xub_StrLen nIndex = 0; ByteString aTokenStr; @@ -463,7 +463,7 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin nPos = aWinData.Search( cToken ); if (nPos != STRING_NOTFOUND) { - USHORT nNextPos = aWinData.Search( cToken, 2 ); + sal_uInt16 nNextPos = aWinData.Search( cToken, 2 ); if ( nNextPos != STRING_NOTFOUND ) { // es gibt noch Extra-Information @@ -642,7 +642,7 @@ sal_Bool SfxChildWindow::IsHideAtToggle() const return pImp->bHideAtToggle; } -void SfxChildWindow::SetWantsFocus( BOOL bSet ) +void SfxChildWindow::SetWantsFocus( sal_Bool bSet ) { pImp->bWantsFocus = bSet; } @@ -749,18 +749,18 @@ void SfxChildWindow::Hide() -void SfxChildWindow::Show( USHORT nFlags ) +void SfxChildWindow::Show( sal_uInt16 nFlags ) { switch ( pWindow->GetType() ) { case RSC_DOCKINGWINDOW : - ((DockingWindow*)pWindow)->Show( TRUE, nFlags ); + ((DockingWindow*)pWindow)->Show( sal_True, nFlags ); break; case RSC_TOOLBOX : - ((ToolBox*)pWindow)->Show( TRUE, nFlags ); + ((ToolBox*)pWindow)->Show( sal_True, nFlags ); break; default: - pWindow->Show( TRUE, nFlags ); + pWindow->Show( sal_True, nFlags ); break; } } @@ -843,7 +843,7 @@ sal_Bool SfxChildWindow::CanGetFocus() const return !(pImp->pFact->aInfo.nFlags & SFX_CHILDWIN_CANTGETFOCUS); } -void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, USHORT nId, SfxChildWinContextFactory* pFact) +void SfxChildWindowContext::RegisterChildWindowContext(SfxModule* pMod, sal_uInt16 nId, SfxChildWinContextFactory* pFact) { SFX_APP()->RegisterChildWindowContext_Impl( pMod, nId, pFact ); } |