Kaydet (Commit) 6ab83f20 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:singlevalfields in vcl

Change-Id: I71367548ae15ef78f9860bab9bb05c96b82eb54a
Reviewed-on: https://gerrit.libreoffice.org/63275
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst bf8c1e27
...@@ -47,7 +47,6 @@ class VCL_DLLPUBLIC Cursor ...@@ -47,7 +47,6 @@ class VCL_DLLPUBLIC Cursor
private: private:
std::unique_ptr<ImplCursorData> mpData; std::unique_ptr<ImplCursorData> mpData;
VclPtr<vcl::Window> mpWindow; // only for shadow cursor VclPtr<vcl::Window> mpWindow; // only for shadow cursor
long mnSlant;
Size maSize; Size maSize;
Point maPos; Point maPos;
short mnOrientation; short mnOrientation;
......
...@@ -53,7 +53,6 @@ protected: ...@@ -53,7 +53,6 @@ protected:
std::unique_ptr<ImplTabCtrlData> mpTabCtrlData; std::unique_ptr<ImplTabCtrlData> mpTabCtrlData;
long mnLastWidth; long mnLastWidth;
long mnLastHeight; long mnLastHeight;
long mnMaxPageWidth;
sal_uInt16 mnActPageId; sal_uInt16 mnActPageId;
sal_uInt16 mnCurPageId; sal_uInt16 mnCurPageId;
bool mbFormat; bool mbFormat;
......
This diff is collapsed.
...@@ -93,7 +93,6 @@ void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle ) ...@@ -93,7 +93,6 @@ void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
mnLastWidth = 0; mnLastWidth = 0;
mnLastHeight = 0; mnLastHeight = 0;
mnMaxPageWidth = 0;
mnActPageId = 0; mnActPageId = 0;
mnCurPageId = 0; mnCurPageId = 0;
mbFormat = true; mbFormat = true;
...@@ -383,8 +382,6 @@ bool TabControl::ImplPlaceTabs( long nWidth ) ...@@ -383,8 +382,6 @@ bool TabControl::ImplPlaceTabs( long nWidth )
//aBreakIndexes will contain the indexes of the last tab on each row //aBreakIndexes will contain the indexes of the last tab on each row
std::deque<size_t> aBreakIndexes(MinimumRaggednessWrap::GetEndOfLineIndexes(aWidths, nMaxWidth - nOffsetX - 2)); std::deque<size_t> aBreakIndexes(MinimumRaggednessWrap::GetEndOfLineIndexes(aWidths, nMaxWidth - nOffsetX - 2));
if ( (mnMaxPageWidth > 0) && (mnMaxPageWidth < nMaxWidth) )
nMaxWidth = mnMaxPageWidth;
nMaxWidth -= GetItemsOffset().X(); nMaxWidth -= GetItemsOffset().X();
long nX = nOffsetX; long nX = nOffsetX;
...@@ -2373,8 +2370,6 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth ) ...@@ -2373,8 +2370,6 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
aWidths.push_back(0); aWidths.push_back(0);
} }
if ( (mnMaxPageWidth > 0) && (mnMaxPageWidth < nMaxWidth) )
nMaxWidth = mnMaxPageWidth;
nMaxWidth -= GetItemsOffset().X(); nMaxWidth -= GetItemsOffset().X();
long nX = nOffsetX; long nX = nOffsetX;
......
...@@ -139,7 +139,7 @@ void vcl::Cursor::ImplDraw() ...@@ -139,7 +139,7 @@ void vcl::Cursor::ImplDraw()
vcl::Window* pWindow = mpData->mpWindow; vcl::Window* pWindow = mpData->mpWindow;
mpData->maPixPos = pWindow->LogicToPixel( maPos ); mpData->maPixPos = pWindow->LogicToPixel( maPos );
mpData->maPixSize = pWindow->LogicToPixel( maSize ); mpData->maPixSize = pWindow->LogicToPixel( maSize );
mpData->mnPixSlant = pWindow->LogicToPixel( Size( mnSlant, 0 ) ).Width(); mpData->mnPixSlant = 0;
mpData->mnOrientation = mnOrientation; mpData->mnOrientation = mnOrientation;
mpData->mnDirection = mnDirection; mpData->mnDirection = mnDirection;
...@@ -309,7 +309,6 @@ vcl::Cursor::Cursor() ...@@ -309,7 +309,6 @@ vcl::Cursor::Cursor()
{ {
mpData = nullptr; mpData = nullptr;
mpWindow = nullptr; mpWindow = nullptr;
mnSlant = 0;
mnOrientation = 0; mnOrientation = 0;
mnDirection = CursorDirection::NONE; mnDirection = CursorDirection::NONE;
mnStyle = 0; mnStyle = 0;
...@@ -322,7 +321,6 @@ vcl::Cursor::Cursor( const Cursor& rCursor ) : ...@@ -322,7 +321,6 @@ vcl::Cursor::Cursor( const Cursor& rCursor ) :
{ {
mpData = nullptr; mpData = nullptr;
mpWindow = nullptr; mpWindow = nullptr;
mnSlant = rCursor.mnSlant;
mnOrientation = rCursor.mnOrientation; mnOrientation = rCursor.mnOrientation;
mnDirection = rCursor.mnDirection; mnDirection = rCursor.mnDirection;
mnStyle = 0; mnStyle = 0;
...@@ -420,7 +418,6 @@ vcl::Cursor& vcl::Cursor::operator=( const vcl::Cursor& rCursor ) ...@@ -420,7 +418,6 @@ vcl::Cursor& vcl::Cursor::operator=( const vcl::Cursor& rCursor )
{ {
maPos = rCursor.maPos; maPos = rCursor.maPos;
maSize = rCursor.maSize; maSize = rCursor.maSize;
mnSlant = rCursor.mnSlant;
mnOrientation = rCursor.mnOrientation; mnOrientation = rCursor.mnOrientation;
mnDirection = rCursor.mnDirection; mnDirection = rCursor.mnDirection;
mbVisible = rCursor.mbVisible; mbVisible = rCursor.mbVisible;
...@@ -434,7 +431,6 @@ bool vcl::Cursor::operator==( const vcl::Cursor& rCursor ) const ...@@ -434,7 +431,6 @@ bool vcl::Cursor::operator==( const vcl::Cursor& rCursor ) const
return return
((maPos == rCursor.maPos) && ((maPos == rCursor.maPos) &&
(maSize == rCursor.maSize) && (maSize == rCursor.maSize) &&
(mnSlant == rCursor.mnSlant) &&
(mnOrientation == rCursor.mnOrientation) && (mnOrientation == rCursor.mnOrientation) &&
(mnDirection == rCursor.mnDirection) && (mnDirection == rCursor.mnDirection) &&
(mbVisible == rCursor.mbVisible)) (mbVisible == rCursor.mbVisible))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment