[Libreoffice-commits] core.git: framework/inc include/vcl vcl/source
Stephan Bergmann
sbergman at redhat.com
Mon Mar 13 21:07:41 UTC 2017
framework/inc/uielement/uielement.hxx | 2 -
include/vcl/toolbox.hxx | 53 +++++++++++++--------------
vcl/source/window/toolbox.cxx | 66 +++++++++++++++++-----------------
vcl/source/window/toolbox2.cxx | 2 -
4 files changed, 61 insertions(+), 62 deletions(-)
New commits:
commit 6376d23c51056284b55f486569433953ec36e7d2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 13 22:07:01 2017 +0100
More ToolBox sal_uInt16 -> ImplToolItems::size_type clean-up
Change-Id: I6ec50033a452493852729dc8efe78da2708cbd96
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
index 092417d..265e0db 100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -50,7 +50,7 @@ struct FloatingData
css::awt::Point m_aPos;
css::awt::Size m_aSize;
- sal_Int16 m_nLines;
+ ToolBox::ImplToolItems::size_type m_nLines;
bool m_bIsHorizontal;
};
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 9c60c0e..93a8a47 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -36,7 +36,6 @@
class Timer;
class UserDrawEvent;
struct ImplToolItem;
-struct ImplToolSize;
struct ImplToolBoxPrivateData;
class ImplTrackRect;
class PopupMenu;
@@ -76,13 +75,6 @@ enum class ToolBoxLayoutMode { Normal, LockVert };
// Position of the text when icon and text are painted
enum class ToolBoxTextPosition { Right, Bottom };
-struct ImplToolSize
-{
- long mnWidth;
- long mnHeight;
- sal_uInt16 mnLines;
-};
-
class Idle;
class VCL_DLLPUBLIC ToolBox : public DockingWindow
{
@@ -99,6 +91,13 @@ public:
= std::numeric_limits<ImplToolItems::size_type>::max();
private:
+ struct ImplToolSize
+ {
+ long mnWidth;
+ long mnHeight;
+ ImplToolItems::size_type mnLines;
+ };
+
ImplToolBoxPrivateData* mpData;
std::vector<ImplToolSize> maFloatSizes;
Idle *mpIdle;
@@ -127,12 +126,12 @@ private:
sal_uInt16 mnCurItemId;
sal_uInt16 mnDownItemId;
ImplToolItems::size_type mnCurPos;
- sal_uInt16 mnLines; // total number of toolbox lines
- sal_uInt16 mnCurLine; // the currently visible line
- sal_uInt16 mnCurLines; // number of lines due to line breaking
- sal_uInt16 mnVisLines; // number of visible lines (for scrolling)
- sal_uInt16 mnFloatLines; // number of lines during floating mode
- sal_uInt16 mnDockLines;
+ ImplToolItems::size_type mnLines; // total number of toolbox lines
+ ImplToolItems::size_type mnCurLine; // the currently visible line
+ ImplToolItems::size_type mnCurLines; // number of lines due to line breaking
+ ImplToolItems::size_type mnVisLines; // number of visible lines (for scrolling)
+ ImplToolItems::size_type mnFloatLines; // number of lines during floating mode
+ ImplToolItems::size_type mnDockLines;
sal_uInt16 mnConfigItem;
sal_uInt16 mnMouseClicks;
sal_uInt16 mnMouseModifier;
@@ -187,7 +186,7 @@ private:
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const;
SAL_DLLPRIVATE bool ImplCalcItem();
- SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) const;
+ SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) const;
SAL_DLLPRIVATE void ImplFormat( bool bResize = false );
SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, ImplToolItems::size_type nPos, const Rectangle& rRect);
@@ -199,8 +198,8 @@ private:
SAL_DLLPRIVATE bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel = false );
SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus = false );
SAL_DLLPRIVATE bool ImplChangeHighlightUpDn( bool bUp, bool bNoCycle = false );
- SAL_DLLPRIVATE sal_uInt16 ImplGetItemLine( ImplToolItem* pCurrentItem );
- SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( sal_uInt16 nLine );
+ SAL_DLLPRIVATE ImplToolItems::size_type ImplGetItemLine( ImplToolItem* pCurrentItem );
+ SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( ImplToolItems::size_type nLine );
SAL_DLLPRIVATE bool ImplOpenItem( vcl::KeyCode aKeyCode );
SAL_DLLPRIVATE bool ImplActivateItem( vcl::KeyCode aKeyCode );
SAL_DLLPRIVATE void ImplShowFocus();
@@ -250,19 +249,19 @@ public:
SAL_DLLPRIVATE void ImplDrawBorder(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE const ImplToolItem *ImplGetFirstClippedItem() const;
- SAL_DLLPRIVATE Size ImplCalcSize( sal_uInt16 nCalcLines, sal_uInt16 nCalcMode = 0 );
+ SAL_DLLPRIVATE Size ImplCalcSize( ImplToolItems::size_type nCalcLines, sal_uInt16 nCalcMode = 0 );
SAL_DLLPRIVATE void ImplCalcFloatSizes();
- SAL_DLLPRIVATE Size ImplCalcFloatSize( sal_uInt16& rLines );
+ SAL_DLLPRIVATE Size ImplCalcFloatSize( ImplToolItems::size_type& rLines );
SAL_DLLPRIVATE void ImplCalcMinMaxFloatSize( Size& rMinSize, Size& rMaxSize );
SAL_DLLPRIVATE void ImplSetMinMaxFloatSize();
- SAL_DLLPRIVATE sal_uInt16 ImplCalcLines( long nToolSize ) const;
+ SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcLines( long nToolSize ) const;
SAL_DLLPRIVATE sal_uInt16 ImplTestLineSize( const Point& rPos ) const;
SAL_DLLPRIVATE void ImplLineSizing( const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode );
SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( const Point& rPos ) const;
static SAL_DLLPRIVATE ImplToolItems::size_type ImplFindItemPos( const ImplToolItem* pItem, const ImplToolItems& rList );
SAL_DLLPRIVATE void ImplDrawMenuButton(vcl::RenderContext& rRenderContext, bool bHighlight);
SAL_DLLPRIVATE void ImplDrawButton(vcl::RenderContext& rRenderContext, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow);
- SAL_DLLPRIVATE sal_uInt16 ImplCountLineBreaks() const;
+ SAL_DLLPRIVATE ImplToolItems::size_type ImplCountLineBreaks() const;
SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; }
protected:
@@ -346,7 +345,7 @@ public:
WindowAlign GetAlign() const { return meAlign; }
bool IsHorizontal() const { return mbHorz; }
- void SetLineCount( sal_uInt16 nNewLines );
+ void SetLineCount( ImplToolItems::size_type nNewLines );
void ShowLine( bool bNext );
// Used to enable/disable scrolling one page at a time for toolbar
@@ -432,20 +431,20 @@ public:
// window size according to current alignment, floating state and number of lines
Size CalcWindowSizePixel();
// window size according to current alignment, floating state and a given number of lines
- Size CalcWindowSizePixel( sal_uInt16 nCalcLines );
+ Size CalcWindowSizePixel( ImplToolItems::size_type nCalcLines );
// window size according to current floating state and a given number of lines and a given alignment
- Size CalcWindowSizePixel( sal_uInt16 nCalcLines, WindowAlign eAlign );
+ Size CalcWindowSizePixel( ImplToolItems::size_type nCalcLines, WindowAlign eAlign );
// floating window size according to number of lines (uses the number of line breaks)
Size CalcFloatingWindowSizePixel();
// floating window size with a given number of lines
- Size CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines );
+ Size CalcFloatingWindowSizePixel( ImplToolItems::size_type nCalcLines );
// automatic window size for popup mode
Size CalcPopupWindowSizePixel();
// computes the smallest useful size when docked, ie with the first item visible only (+drag area and menu button)
Size CalcMinimumWindowSizePixel();
- sal_uInt16 GetFloatingLines() const;
+ ImplToolItems::size_type GetFloatingLines() const;
void SetStyle( WinBits nNewStyle );
WinBits GetStyle() const { return mnWinStyle; }
@@ -538,7 +537,7 @@ inline Size ToolBox::CalcWindowSizePixel()
return CalcWindowSizePixel( mnLines );
}
-inline sal_uInt16 ToolBox::GetFloatingLines() const
+inline ToolBox::ImplToolItems::size_type ToolBox::GetFloatingLines() const
{
return mnFloatLines;
}
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 5ac3e1e..f4f1b6c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -104,7 +104,7 @@ private:
long mnMinWidth;
long mnMaxWidth;
sal_uInt16 mnLineMode;
- sal_uInt16 mnStartLines;
+ ToolBox::ImplToolItems::size_type mnStartLines;
void* mpCustomizeData;
bool mbResizeMode;
bool mbShowDragRect;
@@ -665,7 +665,7 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem() const
return nullptr;
}
-Size ToolBox::ImplCalcSize( sal_uInt16 nCalcLines, sal_uInt16 nCalcMode )
+Size ToolBox::ImplCalcSize( ImplToolItems::size_type nCalcLines, sal_uInt16 nCalcMode )
{
long nMax;
long nLeft = 0;
@@ -813,9 +813,9 @@ void ToolBox::ImplCalcFloatSizes()
// calc an upper bound for ImplCalcBreaks below
long upperBoundWidth = nCalcSize * mpData->m_aItems.size();
- sal_uInt16 nLines;
- sal_uInt16 nCalcLines;
- sal_uInt16 nTempLines;
+ ImplToolItems::size_type nLines;
+ ImplToolItems::size_type nCalcLines;
+ ImplToolItems::size_type nTempLines;
long nMaxLineWidth;
nCalcLines = ImplCalcBreaks( nCalcSize, &nMaxLineWidth, true );
@@ -846,7 +846,7 @@ void ToolBox::ImplCalcFloatSizes()
}
}
-Size ToolBox::ImplCalcFloatSize( sal_uInt16& rLines )
+Size ToolBox::ImplCalcFloatSize( ImplToolItems::size_type& rLines )
{
ImplCalcFloatSizes();
@@ -909,7 +909,7 @@ void ToolBox::ImplSetMinMaxFloatSize()
}
}
-sal_uInt16 ToolBox::ImplCalcLines( long nToolSize ) const
+ToolBox::ImplToolItems::size_type ToolBox::ImplCalcLines( long nToolSize ) const
{
long nLineHeight;
@@ -937,7 +937,7 @@ sal_uInt16 ToolBox::ImplCalcLines( long nToolSize ) const
if( nLines < 1 )
nLines = 1;
- return static_cast<sal_uInt16>(nLines);
+ return nLines;
}
sal_uInt16 ToolBox::ImplTestLineSize( const Point& rPos ) const
@@ -1008,7 +1008,7 @@ void ToolBox::ImplLineSizing( const Point& rPos, Rectangle& rRect, sal_uInt16 nL
}
Size aWinSize = GetSizePixel();
- sal_uInt16 nMaxLines = (mnLines > mnCurLines) ? mnLines : mnCurLines;
+ ImplToolItems::size_type nMaxLines = (mnLines > mnCurLines) ? mnLines : mnCurLines;
if ( nMaxLines > TB_MAXLINES )
nMaxLines = TB_MAXLINES;
if ( bHorz )
@@ -1026,7 +1026,7 @@ void ToolBox::ImplLineSizing( const Point& rPos, Rectangle& rRect, sal_uInt16 nL
nMaxSize = aWinSize.Width();
}
- sal_uInt16 i = 1;
+ ImplToolItems::size_type i = 1;
if ( nCurSize <= nOneLineSize )
nSize = nOneLineSize;
else
@@ -1972,7 +1972,7 @@ bool ToolBox::ImplCalcItem()
return false;
}
-sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) const
+ToolBox::ImplToolItems::size_type ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) const
{
sal_uLong nLineStart = 0;
sal_uLong nGroupStart = 0;
@@ -1980,7 +1980,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc
long nCurWidth;
long nLastGroupLineWidth = 0;
long nMaxLineWidth = 0;
- sal_uInt16 nLines = 1;
+ ImplToolItems::size_type nLines = 1;
bool bWindow;
bool bBreak = false;
long nWidthTotal = nWidth;
@@ -2132,7 +2132,7 @@ Size ToolBox::ImplGetOptimalFloatingSize()
// try to preserve current height
// calc number of floating lines for current window height
- sal_uInt16 nFloatLinesHeight = ImplCalcLines( mnDY );
+ ImplToolItems::size_type nFloatLinesHeight = ImplCalcLines( mnDY );
// calc window size according to this number
aSize1 = ImplCalcFloatSize( nFloatLinesHeight );
@@ -2146,9 +2146,9 @@ Size ToolBox::ImplGetOptimalFloatingSize()
int nBorderY = 2*TB_BORDER_OFFSET2 + mnTopBorder + mnBottomBorder;
Size aSz( aCurrentSize );
long maxX;
- sal_uInt16 nLines = ImplCalcBreaks( aSz.Width()-nBorderX, &maxX, mbHorz );
+ ImplToolItems::size_type nLines = ImplCalcBreaks( aSz.Width()-nBorderX, &maxX, mbHorz );
- sal_uInt16 manyLines = 1000;
+ ImplToolItems::size_type manyLines = 1000;
Size aMinimalFloatSize = ImplCalcFloatSize( manyLines );
aSz.Height() = nBorderY + nLineHeight * nLines;
@@ -2229,7 +2229,7 @@ void ToolBox::ImplFormat( bool bResize )
long nLeft;
long nTop;
long nMax; // width of layoutarea in pixels
- sal_uInt16 nFormatLine;
+ ImplToolItems::size_type nFormatLine;
bool bMustFullPaint;
ImplToolItems::iterator it;
@@ -3369,7 +3369,7 @@ void ToolBox::ShowLine( bool bNext )
if ( mpData->mbPageScroll )
{
- sal_uInt16 delta = mnVisLines;
+ ImplToolItems::size_type delta = mnVisLines;
if ( bNext )
{
mnCurLine = mnCurLine + delta;
@@ -4636,7 +4636,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
// to get a floating mode as result - switch to floating size
// so the calculation only depends on the position of the rectangle, not the current
// docking state of the window
- sal_uInt16 nTemp = 0;
+ ImplToolItems::size_type nTemp = 0;
aDockingRect.SetSize( ImplCalcFloatSize( nTemp ) );
// in this mode docking is never done by keyboard, so it's OK to use the mouse position
@@ -4731,7 +4731,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
meDockAlign = meAlign;
if ( !mbLastFloatMode )
{
- sal_uInt16 nTemp = 0;
+ ImplToolItems::size_type nTemp = 0;
aDockingRect.SetSize( ImplCalcFloatSize( nTemp ) );
}
}
@@ -4757,8 +4757,8 @@ void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode )
void ToolBox::Resizing( Size& rSize )
{
- sal_uInt16 nCalcLines;
- sal_uInt16 nTemp;
+ ImplToolItems::size_type nCalcLines;
+ ImplToolItems::size_type nTemp;
// Alle Floatinggroessen berechnen
ImplCalcFloatSizes();
@@ -4825,20 +4825,20 @@ Size ToolBox::GetOptimalSize() const
return aSize;
}
-Size ToolBox::CalcWindowSizePixel( sal_uInt16 nCalcLines )
+Size ToolBox::CalcWindowSizePixel( ImplToolItems::size_type nCalcLines )
{
return ImplCalcSize( nCalcLines );
}
-Size ToolBox::CalcWindowSizePixel( sal_uInt16 nCalcLines, WindowAlign eAlign )
+Size ToolBox::CalcWindowSizePixel( ImplToolItems::size_type nCalcLines, WindowAlign eAlign )
{
return ImplCalcSize( nCalcLines,
(eAlign == WindowAlign::Top || eAlign == WindowAlign::Bottom) ? TB_CALCMODE_HORZ : TB_CALCMODE_VERT );
}
-sal_uInt16 ToolBox::ImplCountLineBreaks() const
+ToolBox::ImplToolItems::size_type ToolBox::ImplCountLineBreaks() const
{
- sal_uInt16 nLines = 0;
+ ImplToolItems::size_type nLines = 0;
ImplToolItems::const_iterator it = mpData->m_aItems.begin();
while ( it != mpData->m_aItems.end() )
@@ -4853,14 +4853,14 @@ sal_uInt16 ToolBox::ImplCountLineBreaks() const
Size ToolBox::CalcPopupWindowSizePixel()
{
// count number of breaks and calc corresponding floating window size
- sal_uInt16 nLines = ImplCountLineBreaks();
+ ImplToolItems::size_type nLines = ImplCountLineBreaks();
if( nLines )
++nLines; // add the first line
else
{
// no breaks found: use quadratic layout
- nLines = (sal_uInt16) ceil( sqrt( (double) GetItemCount() ) );
+ nLines = (ImplToolItems::size_type) ceil( sqrt( (double) GetItemCount() ) );
}
bool bPopup = mpData->mbAssumePopupMode;
@@ -4874,12 +4874,12 @@ Size ToolBox::CalcPopupWindowSizePixel()
Size ToolBox::CalcFloatingWindowSizePixel()
{
- sal_uInt16 nLines = ImplCountLineBreaks();
+ ImplToolItems::size_type nLines = ImplCountLineBreaks();
++nLines; // add the first line
return CalcFloatingWindowSizePixel( nLines );
}
-Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines )
+Size ToolBox::CalcFloatingWindowSizePixel( ImplToolItems::size_type nCalcLines )
{
bool bFloat = mpData->mbAssumeFloating;
bool bDocking = mpData->mbAssumeDocked;
@@ -5287,10 +5287,10 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
}
// returns the current toolbox line of the item
-sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem )
+ToolBox::ImplToolItems::size_type ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem )
{
ImplToolItems::const_iterator it = mpData->m_aItems.begin();
- sal_uInt16 nLine = 1;
+ ImplToolItems::size_type nLine = 1;
while( it != mpData->m_aItems.end() )
{
if ( it->mbBreak )
@@ -5303,7 +5303,7 @@ sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem )
}
// returns the first displayable item in the given line
-ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine )
+ImplToolItem* ToolBox::ImplGetFirstValidItem( ImplToolItems::size_type nLine )
{
if( !nLine || nLine > mnCurLines )
return nullptr;
@@ -5388,7 +5388,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus )
if( aPos != ITEM_NOTFOUND)
{
// check for line breaks
- sal_uInt16 nLine = ImplGetItemLine( pItem );
+ ImplToolItems::size_type nLine = ImplGetItemLine( pItem );
if( nLine >= mnCurLine + mnVisLines )
{
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index b642add..c3245b7 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -685,7 +685,7 @@ void ToolBox::SetAlign( WindowAlign eNewAlign )
}
}
-void ToolBox::SetLineCount( sal_uInt16 nNewLines )
+void ToolBox::SetLineCount( ImplToolItems::size_type nNewLines )
{
if ( !nNewLines )
nNewLines = 1;
More information about the Libreoffice-commits
mailing list