basctl/source/basicide/bastypes.cxx | 2 +-
include/tools/wintypes.hxx | 3 +--
reportdesign/source/ui/report/propbrw.cxx | 2 +-
sfx2/source/dialog/dockwin.cxx | 2 +-
sfx2/source/dialog/navigat.cxx | 2 +-
sfx2/source/sidebar/SidebarChildWindow.cxx | 2 +-
vcl/source/window/brdwin.cxx | 7 +------
vcl/source/window/dialog.cxx | 3 +--
vcl/source/window/dockmgr.cxx | 2 +-
vcl/source/window/dockwin.cxx | 2 +-
vcl/source/window/floatwin.cxx | 2 +-
11 files changed, 11 insertions(+), 18 deletions(-)
New commits:
commit f1512bb979245a22f07b7e34bd923d7ca6b52ac7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 25 11:31:49 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Feb 25 21:13:20 2021 +0100
drop WB_ROLLABLE
as far as I can see Rollable isn't a thing anymore
Change-Id: I274e9dc88c793a5833e26bce292b4e92617ae084
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111554
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index cc58ffa6c846..27b19fa4b3b5 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -257,7 +257,7 @@ bool BaseWindow::HasActiveEditor () const
// style bits for DockingWindow
WinBits const DockingWindow::StyleBits =
WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN |
- WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE;
+ WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE;
DockingWindow::DockingWindow(vcl::Window* pParent, const OUString&
rUIXMLDescription, const OString& rID)
: ResizableDockingWindow(pParent)
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 31d85c2ac0cc..fcccd9a0d0fa 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -120,7 +120,6 @@ WinBits const WB_ALLOWMENUBAR = 0x00000080;
// Window-Bits for SystemWindows
WinBits const WB_MOVEABLE = 0x00000100;
-WinBits const WB_ROLLABLE = 0x00000200;
WinBits const WB_CLOSEABLE = 0x00000400;
WinBits const WB_STANDALONE = 0x00000800;
WinBits const WB_APP = 0x00001000;
@@ -214,7 +213,7 @@ WinBits const WB_NOSPLITDRAW = 0x01000000;
// Standard-WinBits
WinBits const WB_STDWORK = WB_SIZEMOVE | WB_CLOSEABLE;
WinBits const WB_STDDOCKWIN = WB_DOCKABLE | WB_MOVEABLE |
WB_CLOSEABLE;
-WinBits const WB_STDFLOATWIN = WB_SIZEMOVE | WB_CLOSEABLE |
WB_ROLLABLE;
+WinBits const WB_STDFLOATWIN = WB_SIZEMOVE | WB_CLOSEABLE;
WinBits const WB_STDDIALOG = WB_MOVEABLE | WB_CLOSEABLE;
WinBits const WB_STDMODELESS = WB_STDDIALOG;
WinBits const WB_STDMODAL = WB_STDDIALOG;
diff --git a/reportdesign/source/ui/report/propbrw.cxx
b/reportdesign/source/ui/report/propbrw.cxx
index 3b0f4c869451..abe634fc223a 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -81,7 +81,7 @@ namespace
PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window*
pParent, ODesignView* _pDesignView)
- :
DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE))
+ : DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK))
, m_xContentArea(VclPtr<VclVBox>::Create(this))
, m_xORB(_xORB)
, m_pDesignView(_pDesignView)
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 7d0a09b60715..05217452d963 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -130,7 +130,7 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window*
pParentWnd ,
uno::Reference< uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
VclPtr<SfxTitleDockingWindow> pTitleDockWindow =
VclPtr<SfxTitleDockingWindow>::Create( pBindings, this, pParentWnd,
- WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK |
WB_ROLLABLE);
+ WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK);
SetWindow( pTitleDockWindow );
// Use factory manager to retrieve XWindow factory. That can be used to
instantiate
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 33456d7bd653..0d52109d5c86 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -36,7 +36,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window*
pParentWnd ,
: SfxChildWindow( pParentWnd , nId )
{
SetWindow( VclPtr<SfxNavigator>::Create( pBindings, this, pParentWnd,
- WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK |
WB_ROLLABLE) );
+ WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK ) );
GetWindow()->SetHelpId ( HID_NAVIGATOR_WINDOW );
GetWindow()->SetOutputSizePixel( Size( 270, 240 ) );
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index e75687dfea43..e8054b445325 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -35,7 +35,7 @@ SidebarChildWindow::SidebarChildWindow(vcl::Window*
pParentWindow, sal_uInt16 nI
{
auto pDockWin = VclPtr<SidebarDockingWindow>::Create(
pBindings, *this, pParentWindow, WB_STDDOCKWIN |
WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN
- | WB_SIZEABLE | WB_3DLOOK |
WB_ROLLABLE);
+ | WB_SIZEABLE | WB_3DLOOK);
SetWindow(pDockWin);
SetAlignment(SfxChildAlignment::RIGHT);
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 2604aa043114..976ee9b4fedc 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1356,11 +1356,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev,
tools::Long nWidth, tool
{
addSquareOnRight(pData->maHideRect, 0);
}
-
- if ( pBorderWindow->GetStyle() & WB_ROLLABLE )
- {
- addSquareOnRight(pData->maRollRect, 0);
- }
}
else
{
@@ -1574,7 +1569,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent,
{
// remove all unwanted WindowBits
WinBits nOrgStyle = nStyle;
- WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE |
WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL |
WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW |
WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP);
+ WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE |
WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN |
WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW |
WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP);
if ( nTypeStyle & BorderWindowStyle::App )
nTestStyle |= WB_APP;
nStyle &= nTestStyle;
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1a967be0a272..d65ac881aa30 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -446,7 +446,6 @@ void Dialog::ImplInitDialog( vcl::Window* pParent, WinBits
nStyle, InitFlag eFla
if ( !(nStyle & WB_NODIALOGCONTROL) )
nStyle |= WB_DIALOGCONTROL;
- nStyle |= WB_ROLLABLE;
// Now, all Dialogs are per default system windows !!!
nStyle |= WB_SYSTEMWINDOW;
@@ -473,7 +472,7 @@ void Dialog::ImplInitDialog( vcl::Window* pParent, WinBits
nStyle, InitFlag eFla
{
mpWindowImpl->mbFrame = true;
mpWindowImpl->mbOverlapWin = true;
- ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE |
WB_ROLLABLE | WB_STANDALONE)) | WB_CLOSEABLE, nullptr );
+ ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE |
WB_STANDALONE)) | WB_CLOSEABLE, nullptr );
// Now set all style bits
mpWindowImpl->mnStyle = nStyle;
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 8c2367e96736..a8a8aebcf70c 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -33,7 +33,7 @@
#include <vcl/timer.hxx>
#include <vcl/settings.hxx>
-#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE | WB_ROLLABLE )
+#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE)
namespace {
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 498ebdfbb9f4..b95e29ab502f 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -33,7 +33,7 @@
#include <window.h>
#include <brdwin.hxx>
-#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE | WB_ROLLABLE )
+#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE)
class DockingWindow::ImplData
{
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index b0f2dc51bb6b..221d34767ecf 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -82,7 +82,7 @@ void FloatingWindow::ImplInitFloating( vcl::Window* pParent,
WinBits nStyle )
if (!(nStyle & WB_NODIALOGCONTROL))
nStyle |= WB_DIALOGCONTROL;
- if (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE |
WB_STANDALONE)
+ if (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE | WB_STANDALONE)
&& !(nStyle & WB_OWNERDRAWDECORATION))
{
WinBits nFloatWinStyle = nStyle;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
