summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/brdwin.cxx8
-rw-r--r--vcl/source/window/introwin.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx2
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/source/window/winproc.cxx2
-rw-r--r--vcl/source/window/wrkwin.cxx4
7 files changed, 10 insertions, 12 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 9967e9c5d9f2..adb0621ab66b 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -56,7 +56,7 @@ static void ImplGetPinImage( DrawButtonFlags nStyle, bool bPinIn, Image& rImage
Color aMaskColor( 0x00, 0x00, 0xFF );
pSVData->maCtrlData.mpPinImgList->InsertFromHorizontalBitmap
( ResId( SV_RESID_BITMAP_PIN, *pResMgr ), 4,
- &aMaskColor, NULL, NULL );
+ &aMaskColor );
}
}
@@ -1937,8 +1937,7 @@ void ImplBorderWindow::Resize()
}
mpMenuBarWindow->setPosSizePixel(
nLeftBorder, nTopBorder,
- aSize.Width()-nLeftBorder-nRightBorder, nMenuHeight,
- PosSizeFlags::Pos | PosSizeFlags::Width | PosSizeFlags::Height);
+ aSize.Width()-nLeftBorder-nRightBorder, nMenuHeight);
// shift the notebookbar down accordingly
nTopBorder += nMenuHeight;
@@ -1949,8 +1948,7 @@ void ImplBorderWindow::Resize()
long nNotebookBarHeight = mpNotebookBarWindow->GetSizePixel().Height();
mpNotebookBarWindow->setPosSizePixel(
nLeftBorder, nTopBorder,
- aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight,
- PosSizeFlags::Pos | PosSizeFlags::Width | PosSizeFlags::Height);
+ aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight);
}
GetBorder( pClientWindow->mpWindowImpl->mnLeftBorder, pClientWindow->mpWindowImpl->mnTopBorder,
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index d8b400135477..b7bd49bba6a9 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -35,7 +35,7 @@ IntroWindow::IntroWindow( ) :
WorkWindow( WINDOW_INTROWINDOW )
{
ImplInitIntroWindowData();
- WorkWindow::ImplInit( 0, WB_INTROWIN, NULL );
+ WorkWindow::ImplInit( 0, WB_INTROWIN );
}
IntroWindow::~IntroWindow()
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index ae6c6b83ae53..67eba4eed45f 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -148,7 +148,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) :
aCloseBtn->SetPaintTransparent(true);
aCloseBtn->SetParentClipMode(ParentClipMode::NoClip);
- aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage, ToolBoxItemBits::NONE);
+ aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage);
aCloseBtn->SetSelectHdl(LINK(this, MenuBarWindow, CloseHdl));
aCloseBtn->AddEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl));
aCloseBtn->SetQuickHelpText(IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr).toString());
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8b4308a9503a..cfcf37e8849b 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2972,7 +2972,7 @@ void ToolBox::ImplDrawButton(vcl::RenderContext& rRenderContext, const Rectangle
}
if (!bNativeOk)
- vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, NULL, 2, NULL);
+ vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, NULL, 2);
}
void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, bool bLayout)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e039c6d1396b..f770bda019a4 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2536,7 +2536,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
// Since #104887#, the notifications for the access bridge are done in Impl(Set|Reset)ReallyVisible. Here, we
// now only notify with a NULL data pointer, for all other clients except the access bridge.
if ( !bRealVisibilityChanged )
- CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE, NULL );
+ CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE );
if( aDogTag.IsDead() )
return;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 1ee1661aac0f..ae7272735451 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1054,7 +1054,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent,
// ContextMenu
if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) )
- bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL );
+ bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu );
else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) ||
// #101999# no active help when focus in toolbox, simulate BallonHelp instead
( (nCode == KEY_F1) && aKeyCode.IsShift() && bToolboxFocus ) )
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 3977eee0fbd4..3881f15009d5 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -79,7 +79,7 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::su
ImplInit( pParent, 0, pData );
}
else
- ImplInit( pParent, nStyle, NULL );
+ ImplInit( pParent, nStyle );
}
WorkWindow::WorkWindow( WindowType nType ) :
@@ -92,7 +92,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) :
SystemWindow( WINDOW_WORKWINDOW )
{
ImplInitWorkWindowData();
- ImplInit( pParent, nStyle, NULL );
+ ImplInit( pParent, nStyle );
}
WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 13:46:12 +0000