framework/source/uielement/addonstoolbarwrapper.cxx | 3 ++- framework/source/uielement/statusbarwrapper.cxx | 3 ++- framework/source/uielement/toolbarwrapper.cxx | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit a2cd681369061574974517b1aabf78613f5601b7 Author: t-aswath <[email protected]> AuthorDate: Fri Dec 8 09:46:29 2023 +0530 Commit: Hossein <[email protected]> CommitDate: Thu Dec 21 23:38:15 2023 +0100 tdf#114441 - Convert use of sal_uLong to better integer types Change-Id: Ia226ea485700a6864c9d5ca154267c5080555a82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160450 Tested-by: Jenkins Reviewed-by: Hossein <[email protected]> diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index f0bb99549fcf..740a120d63e7 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/wintypes.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -102,7 +103,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { - sal_uLong nStyles = WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE; + WinBits nStyles = WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE; pToolBar = VclPtr<ToolBox>::Create( pWindow, nStyles ); pToolBar->SetLineSpacing(true); diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 845a0b9269cf..58203d9f4db3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -28,6 +28,7 @@ #include <tools/solar.h> #include <utility> #include <vcl/svapp.hxx> +#include <vcl/wintypes.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -99,7 +100,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWindow ) { - sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK ); + WinBits nStyles = WinBits( WB_LEFT | WB_3DLOOK ); pStatusBar = VclPtr<FrameworkStatusBar>::Create( pWindow, nStyles ); pStatusBarManager = new StatusBarManager( m_xContext, xFrame, pStatusBar ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index ae988744c142..30d0e84e2b1a 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -29,6 +29,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/weldutils.hxx> +#include <vcl/wintypes.hxx> using namespace com::sun::star; using namespace com::sun::star::uno; @@ -145,7 +146,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow( xParentWindow ); if ( pWindow ) { - sal_uLong nStyles = WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE; + WinBits nStyles = WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE; pToolBar = VclPtr<ToolBox>::Create( pWindow, nStyles ); pToolBar->SetLineSpacing(true);
