[Libreoffice-commits] core.git: 11 commits - include/svx sc/source svtools/source svx/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Sun Mar 1 20:34:24 PST 2015
include/svx/svdhdl.hxx | 3 -
sc/source/ui/view/tabcont.cxx | 17 +++----
svtools/source/control/tabbar.cxx | 88 +++++++++++++++++++++++---------------
svx/source/svdraw/svdcrtv.cxx | 3 -
svx/source/svdraw/svdhdl.cxx | 30 +++++++-----
svx/source/table/tablehandles.cxx | 62 ++++++++++++--------------
6 files changed, 115 insertions(+), 88 deletions(-)
New commits:
commit ddfde577731439ce647429c3ab8d8ae47402148e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Mar 2 11:35:47 2015 +0900
HiDPI: increase connection markers
Change-Id: I93f1c758a7fdca3f04ccaf0b09ca7b9018067b51
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index b86a31a..24bbb8b 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -70,7 +70,8 @@ ImplConnectMarkerOverlay::ImplConnectMarkerOverlay(const SdrCreateView& rView, S
if(xTargetOverlay.is())
{
- Size aHalfLogicSize(xTargetOverlay->getOutputDevice().PixelToLogic(Size(4, 4)));
+ sal_Int32 nScalingFactor = xTargetOverlay->getOutputDevice().GetDPIScaleFactor();
+ Size aHalfLogicSize(xTargetOverlay->getOutputDevice().PixelToLogic(Size(4 * nScalingFactor, 4 * nScalingFactor)));
// object
::sdr::overlay::OverlayPolyPolygonStripedAndFilled* pNew = new ::sdr::overlay::OverlayPolyPolygonStripedAndFilled(
commit 929bcc404f2d4050ab2e2cbb2a5fdb41e7be5276
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Mar 2 11:33:05 2015 +0900
HiDPI: increase size of handles including anchor
Change-Id: I9692c0674d8cb56dab6dd65e48a868aaf7b38e38
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 0c69d06..9d839b7 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -181,7 +181,8 @@ private:
protected:
::sdr::overlay::OverlayObject* CreateOverlayObject(
const basegfx::B2DPoint& rPos,
- BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset = Point());
+ BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker,
+ OutputDevice& rOutDev, Point aMoveOutsideOffset = Point());
BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd) const;
public:
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index dd0ad36..b7e4316 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -556,11 +556,11 @@ void SdrHdl::CreateB2dIAObject()
if(rPageWindow.GetPaintWindow().OutputToWindow())
{
Point aMoveOutsideOffset(0, 0);
+ OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
// add offset if necessary
if(pHdlList->IsMoveOutside() || mbMoveOutside)
{
- OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
Size aOffset = rOutDev.PixelToLogic(Size(4, 4));
if(eKind == HDL_UPLFT || eKind == HDL_UPPER || eKind == HDL_UPRGT)
@@ -577,14 +577,15 @@ void SdrHdl::CreateB2dIAObject()
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
- ::sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
+ sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
aPosition,
eColIndex,
eKindOfMarker,
+ rOutDev,
aMoveOutsideOffset);
// OVERLAYMANAGER
- if(pNewOverlayObject)
+ if (pNewOverlayObject)
{
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(*pNewOverlayObject);
@@ -640,7 +641,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
const basegfx::B2DPoint& rPos,
- BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset)
+ BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, OutputDevice& rOutDev, Point aMoveOutsideOffset)
{
::sdr::overlay::OverlayObject* pRetval = 0L;
@@ -743,7 +744,10 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
else
{
// create normal handle: use ImpGetBitmapEx(...) now
+
+ sal_Int32 nScaleFactor = rOutDev.GetDPIScaleFactor();
BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex);
+ aBmpEx.Scale(nScaleFactor, nScaleFactor);
if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
{
@@ -1472,14 +1476,15 @@ void ImpEdgeHdl::CreateB2dIAObject()
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
-
- ::sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
+ OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
+ sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
aPosition,
eColIndex,
- eKindOfMarker);
+ eKindOfMarker,
+ rOutDev);
// OVERLAYMANAGER
- if(pNewOverlayObject)
+ if (pNewOverlayObject)
{
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(*pNewOverlayObject);
@@ -1593,14 +1598,15 @@ void ImpMeasureHdl::CreateB2dIAObject()
if (xManager.is())
{
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
-
- ::sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
+ OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
+ sdr::overlay::OverlayObject* pNewOverlayObject = CreateOverlayObject(
aPosition,
eColIndex,
- eKindOfMarker);
+ eKindOfMarker,
+ rOutDev);
// OVERLAYMANAGER
- if(pNewOverlayObject)
+ if (pNewOverlayObject)
{
xManager->add(*pNewOverlayObject);
maOverlayGroup.append(*pNewOverlayObject);
commit ea951c868256a26f68f001a2dcdc67bb3be8d7c7
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Mar 2 11:17:08 2015 +0900
HiDPI: increase table selection border depending on scale factor
Change-Id: I78d5d7c83be9ec136341d202a73cf3194a301e32
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 761fb57..2b16ff2 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -293,10 +293,14 @@ void TableBorderHdl::CreateB2dIAObject()
// text edit is not yet on the overlay)
const bool bAnimate = getAnimate();
+ OutputDevice& rOutDev = rPageWindow.GetPaintWindow().GetOutputDevice();
+ sal_Int32 nScaleFactor = rOutDev.GetDPIScaleFactor();
+ double fWidth = nScaleFactor * 6.0;
+
sdr::overlay::OverlayObject* pOverlayObject =
new sdr::overlay::OverlayRectangle(aRange.getMinimum(), aRange.getMaximum(),
aHilightColor, fTransparence,
- 6.0, 0.0, 0.0, 500, bAnimate);
+ fWidth, 0.0, 0.0, 500, bAnimate);
xManager->add(*pOverlayObject);
maOverlayGroup.append(*pOverlayObject);
}
commit 2098f14ad3bd3637979aad66f5a66d6f10702a02
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Mar 2 11:14:20 2015 +0900
cleanup tableBorderHdl::CreateB2dIAObject
Change-Id: I1cdcf23fd64c3a445a3c8dddea8684013113a04e
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 4eac136..761fb57 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -265,45 +265,40 @@ void TableBorderHdl::CreateB2dIAObject()
{
GetRidOfIAObject();
- if(pHdlList && pHdlList->GetView() && !pHdlList->GetView()->areMarkHandlesHidden())
+ if (pHdlList && pHdlList->GetView() && !pHdlList->GetView()->areMarkHandlesHidden())
{
SdrMarkView* pView = pHdlList->GetView();
SdrPageView* pPageView = pView->GetSdrPageView();
- if(pPageView)
+ if (!pPageView)
+ return;
+
+ for(sal_uInt32 nWindow = 0; nWindow < pPageView->PageWindowCount(); nWindow++)
{
- for(sal_uInt32 nWindow = 0; nWindow < pPageView->PageWindowCount(); nWindow++)
+ const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(nWindow);
+
+ if (rPageWindow.GetPaintWindow().OutputToWindow())
{
- const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(nWindow);
+ rtl::Reference<sdr::overlay::OverlayManager> xManager = rPageWindow.GetOverlayManager();
- if(rPageWindow.GetPaintWindow().OutputToWindow())
+ if (xManager.is())
{
- rtl::Reference< ::sdr::overlay::OverlayManager > xManager = rPageWindow.GetOverlayManager();
- if (xManager.is())
- {
- const basegfx::B2DRange aRange(vcl::unotools::b2DRectangleFromRectangle(maRectangle));
- const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
- const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor());
- const double fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01);
-
- sdr::overlay::OverlayObject* pOverlayObject = new sdr::overlay::OverlayRectangle(
- aRange.getMinimum(),
- aRange.getMaximum(),
- aHilightColor,
- fTransparence,
- 6.0,
- 0.0,
- 0.0,
- 500,
- // make animation dependent from text edit active, because for tables
- // this handle is also used when text edit *is* active for it. This
- // interferes too much concerning repaint stuff (at least as long as
- // text edit is not yet on the overlay)
- getAnimate());
-
- xManager->add(*pOverlayObject);
- maOverlayGroup.append(*pOverlayObject);
- }
+ const basegfx::B2DRange aRange(vcl::unotools::b2DRectangleFromRectangle(maRectangle));
+ const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+ const Color aHilightColor(aSvtOptionsDrawinglayer.getHilightColor());
+ const double fTransparence(aSvtOptionsDrawinglayer.GetTransparentSelectionPercent() * 0.01);
+ // make animation dependent from text edit active, because for tables
+ // this handle is also used when text edit *is* active for it. This
+ // interferes too much concerning repaint stuff (at least as long as
+ // text edit is not yet on the overlay)
+ const bool bAnimate = getAnimate();
+
+ sdr::overlay::OverlayObject* pOverlayObject =
+ new sdr::overlay::OverlayRectangle(aRange.getMinimum(), aRange.getMaximum(),
+ aHilightColor, fTransparence,
+ 6.0, 0.0, 0.0, 500, bAnimate);
+ xManager->add(*pOverlayObject);
+ maOverlayGroup.append(*pOverlayObject);
}
}
}
@@ -311,7 +306,6 @@ void TableBorderHdl::CreateB2dIAObject()
}
-
} // end of namespace table
} // end of namespace sdr
commit ec4fce4b23baeb899a8fc1ddf5e1ef5866bf6746
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Fri Feb 27 15:20:13 2015 +0900
in tabbar - don't show tab background on tab add (plus icon)
Change-Id: Ibe6ff1164382474ff120078bacf28344bc1b1985
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index d09675f..2477d8c 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1337,7 +1337,6 @@ void TabBar::Paint( const Rectangle& rect )
// Draw the insert tab at the right end.
Rectangle aRect = ImplGetInsertTabRect(pItem);
aDrawer.setRect(aRect);
- aDrawer.drawTab();
aDrawer.drawPlusImage();
}
commit e70007a55574ecffba4be96a7e081f7cc0539ba2
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 25 14:44:52 2015 +0900
disable last / first button for calc tabbar
Change-Id: Ic9df3dff17677da61eeff79211ae56b87aad8abe
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 54bd7d0..9d5e3af 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -38,7 +38,7 @@
// STATIC DATA -----------------------------------------------------------
ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
- : TabBar(pParent, WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
+ : TabBar(pParent, WB_3DLOOK | WB_MINSCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
, DropTargetHelper(this)
, DragSourceHelper(this)
, pViewData(pData)
commit 8127b06fa4661bb743bfc432bcae4c089c72c76a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 25 14:39:42 2015 +0900
tabbar buttons next/previous act as last/first if MOD1 is pressed
If user presses MOD1 (ctrl) key, the next / previous will act
as last / first button. This support removes the need for last /
first button.
Change-Id: I53c9cf0b4963ed4f4c99eb47c21e643e1c6f9110
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index e80af1e..d09675f 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -93,9 +93,12 @@ struct ImplTabBarItem
class ImplTabButton : public PushButton
{
+ bool mbModKey : 1;
+
public:
ImplTabButton(TabBar* pParent, WinBits nWinStyle = 0)
: PushButton(pParent, nWinStyle | WB_FLATBUTTON | WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOLIGHTBORDER | WB_NOPOINTERFOCUS)
+ , mbModKey(false)
{}
TabBar* GetParent() const
@@ -103,16 +106,28 @@ public:
return static_cast<TabBar*>(Window::GetParent());
}
+ bool isModKeyPressed()
+ {
+ return mbModKey;
+ }
+
virtual bool PreNotify(NotifyEvent& rNotifyEvent) SAL_OVERRIDE;
virtual void MouseButtonDown(const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+ virtual void MouseButtonUp(const MouseEvent& rMouseEvent) SAL_OVERRIDE;
virtual void Command(const CommandEvent& rCommandEvent) SAL_OVERRIDE;
};
void ImplTabButton::MouseButtonDown(const MouseEvent& rMouseEvent)
{
+ mbModKey = rMouseEvent.IsMod1();
PushButton::MouseButtonDown(rMouseEvent);
}
+void ImplTabButton::MouseButtonUp(const MouseEvent& rMouseEvent)
+{
+ mbModKey = false;
+ PushButton::MouseButtonUp(rMouseEvent);
+}
void ImplTabButton::Command(const CommandEvent& rCommandEvent)
{
@@ -818,28 +833,35 @@ IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn )
sal_uInt16 nNewPos = mnFirstPos;
- if ( pBtn == mpFirstBtn )
+ if (pBtn == mpFirstBtn || (pBtn == mpPrevBtn && pBtn->isModKeyPressed()))
+ {
nNewPos = 0;
- else if ( pBtn == mpPrevBtn )
+ }
+ else if (pBtn == mpLastBtn || (pBtn == mpNextBtn && pBtn->isModKeyPressed()))
{
- if ( mnFirstPos )
- nNewPos = mnFirstPos-1;
+ sal_uInt16 nCount = GetPageCount();
+ if (nCount)
+ nNewPos = nCount - 1;
+ }
+ else if (pBtn == mpPrevBtn)
+ {
+ if (mnFirstPos)
+ nNewPos = mnFirstPos - 1;
}
- else if ( pBtn == mpNextBtn )
+ else if (pBtn == mpNextBtn)
{
sal_uInt16 nCount = GetPageCount();
- if ( mnFirstPos < nCount )
+ if (mnFirstPos < nCount)
nNewPos = mnFirstPos+1;
}
else
{
- sal_uInt16 nCount = GetPageCount();
- if ( nCount )
- nNewPos = nCount-1;
+ return 0;
}
- if ( nNewPos != mnFirstPos )
- SetFirstPageId( GetPageId( nNewPos ) );
+ if (nNewPos != mnFirstPos)
+ SetFirstPageId(GetPageId(nNewPos));
+
return 0;
}
commit 05de5c9bf3bc989c72f081d8415c079f4b2ecf36
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 25 14:36:37 2015 +0900
make tabbar buttons flat by default
Change-Id: I31066defc8d3c645b2cd809f1e445178c95fc50e
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index bc8c542..e80af1e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -95,7 +95,7 @@ class ImplTabButton : public PushButton
{
public:
ImplTabButton(TabBar* pParent, WinBits nWinStyle = 0)
- : PushButton(pParent, nWinStyle | WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOLIGHTBORDER | WB_NOPOINTERFOCUS)
+ : PushButton(pParent, nWinStyle | WB_FLATBUTTON | WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOLIGHTBORDER | WB_NOPOINTERFOCUS)
{}
TabBar* GetParent() const
commit 108cd7a38b55dc60deb1ac62372c06562f58b050
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 25 14:34:11 2015 +0900
cleanup TabBar's ImplTabButton
Change-Id: Ic77f322cce00885896343ce21e35db4e286aafda
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index b098471..bc8c542 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -94,48 +94,49 @@ struct ImplTabBarItem
class ImplTabButton : public PushButton
{
public:
- ImplTabButton( TabBar* pParent, WinBits nWinStyle = 0 ) :
- PushButton( pParent, nWinStyle | WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOLIGHTBORDER | WB_NOPOINTERFOCUS ) {}
+ ImplTabButton(TabBar* pParent, WinBits nWinStyle = 0)
+ : PushButton(pParent, nWinStyle | WB_RECTSTYLE | WB_SMALLSTYLE | WB_NOLIGHTBORDER | WB_NOPOINTERFOCUS)
+ {}
- TabBar* GetParent() const { return static_cast<TabBar*>(Window::GetParent()); }
-
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
-
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ TabBar* GetParent() const
+ {
+ return static_cast<TabBar*>(Window::GetParent());
+ }
- virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
+ virtual bool PreNotify(NotifyEvent& rNotifyEvent) SAL_OVERRIDE;
+ virtual void MouseButtonDown(const MouseEvent& rMouseEvent) SAL_OVERRIDE;
+ virtual void Command(const CommandEvent& rCommandEvent) SAL_OVERRIDE;
};
-void ImplTabButton::MouseButtonDown( const MouseEvent& rMEvt )
+void ImplTabButton::MouseButtonDown(const MouseEvent& rMouseEvent)
{
- PushButton::MouseButtonDown(rMEvt);
+ PushButton::MouseButtonDown(rMouseEvent);
}
-void ImplTabButton::Command( const CommandEvent& rCEvt )
+
+void ImplTabButton::Command(const CommandEvent& rCommandEvent)
{
- sal_uInt16 nCmd = rCEvt.GetCommand();
- if ( nCmd == COMMAND_CONTEXTMENU )
+ sal_uInt16 nCommand = rCommandEvent.GetCommand();
+ if (nCommand == COMMAND_CONTEXTMENU)
{
- TabBar *pParent = GetParent();
- pParent->maScrollAreaContextHdl.Call((void*)&rCEvt);
+ TabBar* pParent = GetParent();
+ pParent->maScrollAreaContextHdl.Call((void*)&rCommandEvent);
}
- PushButton::Command(rCEvt);
+ PushButton::Command(rCommandEvent);
}
-
-
-bool ImplTabButton::PreNotify( NotifyEvent& rNEvt )
+bool ImplTabButton::PreNotify(NotifyEvent& rNotifyEvent)
{
- if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
+ if (rNotifyEvent.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN)
{
- if ( GetParent()->IsInEditMode() )
+ if (GetParent()->IsInEditMode())
{
GetParent()->EndEditMode();
return true;
}
}
- return PushButton::PreNotify( rNEvt );
+ return PushButton::PreNotify(rNotifyEvent);
}
commit ef9c71b106862b253380256b762f96991c257a26
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 25 14:22:57 2015 +0900
disable borders for tabbar in Calc (ScTabControl)
Change-Id: Idc364ba9658143c4ddb17f118a73bdfde3c51ed1
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 1a2e60c..54bd7d0 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -38,7 +38,7 @@
// STATIC DATA -----------------------------------------------------------
ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
- : TabBar(pParent, WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
+ : TabBar(pParent, WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
, DropTargetHelper(this)
, DragSourceHelper(this)
, pViewData(pData)
commit 336ac1e7eef88087a70b53387dd3065ed86764f4
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Feb 25 14:22:21 2015 +0900
cleanup ScTabControl constructor
Change-Id: Ie3d44a241104c37d11daceff6fe1e72e04ca0d8d
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 69793e0..1a2e60c 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -37,15 +37,14 @@
// STATIC DATA -----------------------------------------------------------
-ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData ) :
- TabBar( pParent,
- WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG ) ),
- DropTargetHelper( this ),
- DragSourceHelper( this ),
- pViewData( pData ),
- nMouseClickPageId( TabBar::PAGE_NOT_FOUND ),
- nSelPageIdByMouse( TabBar::PAGE_NOT_FOUND ),
- bErrorShown( false )
+ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData )
+ : TabBar(pParent, WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG)
+ , DropTargetHelper(this)
+ , DragSourceHelper(this)
+ , pViewData(pData)
+ , nMouseClickPageId(TabBar::PAGE_NOT_FOUND)
+ , nSelPageIdByMouse(TabBar::PAGE_NOT_FOUND)
+ , bErrorShown(false)
{
ScDocument* pDoc = pViewData->GetDocument();
More information about the Libreoffice-commits
mailing list