[Libreoffice-commits] .: 4 commits - chart2/source cui/source reportdesign/source sd/source svtools/inc svtools/source svx/inc svx/source
chart2/source/controller/dialogs/ChartTypeDialogController.cxx |1
chart2/source/controller/dialogs/ChartTypeDialogController.hxx |3
chart2/source/controller/inc/res_ErrorBar.hxx |1
cui/source/tabpages/numpages.cxx |1
reportdesign/source/ui/dlg/Condition.cxx |1
reportdesign/source/ui/dlg/Condition.hxx |2
sd/source/ui/animations/CustomAnimationCreateDialog.cxx|1
sd/source/ui/table/TableDesignPane.cxx |1
sd/source/ui/table/TableDesignPane.hxx |1
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx |1
svtools/inc/svtools/valueset.hxx |1
svtools/source/control/toolbarmenuimp.hxx |2
svtools/source/control/valueset.cxx| 218
--
svx/inc/svx/float3d.hxx|1
svx/source/gallery2/galbrws2.cxx |1
svx/source/tbxctrls/colorwindow.hxx|1
svx/source/tbxctrls/extrusioncontrols.hxx |2
17 files changed, 96 insertions(+), 143 deletions(-)
New commits:
commit d701d7b68344854b9a67583bbd38f40d061e6cb4
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Tue Apr 3 15:00:19 2012 +0200
ValueSet: reworked key navigation
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index e8aa9f5..95d5e6b 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1299,41 +1299,22 @@ void ValueSet::Tracking( const TrackingEvent rTEvt )
// ---
-namespace
-{
-
-size_t
-lcl_gotoLastLine(size_t const nLastPos, size_t const nCols, size_t const
nCurPos)
-{
-size_t nItemPos = nLastPos+1)/nCols)-1)*nCols)+(nCurPos%nCols);
-if ( nItemPos+nCols = nLastPos )
-nItemPos = nItemPos + nCols;
-return nItemPos;
-}
-
-}
-
void ValueSet::KeyInput( const KeyEvent rKEvt )
{
size_t nLastItem = mItemList.size();
-size_t nItemPos = VALUESET_ITEM_NOTFOUND;
-size_t nCurPos = VALUESET_ITEM_NONEITEM;
-size_t nCalcPos;
if ( !nLastItem || !ImplGetFirstItem() )
{
Control::KeyInput( rKEvt );
return;
}
-else
-nLastItem--;
-if ( mnSelItemId )
-nCurPos = GetItemPos( mnSelItemId );
-nCalcPos = nCurPos;
+--nLastItem;
+const size_t nCurPos = mnSelItemId ? GetItemPos( mnSelItemId )
+ : mpNoneItem ? VALUESET_ITEM_NONEITEM :
0;
+size_t nItemPos = VALUESET_ITEM_NOTFOUND;
+size_t nVStep = mnCols;
-//switch off selection mode if key travelling is used
-bool bDefault = false;
switch ( rKEvt.GetKeyCode().GetCode() )
{
case KEY_HOME:
@@ -1345,147 +1326,129 @@ void ValueSet::KeyInput( const KeyEvent rKEvt )
break;
case KEY_LEFT:
-case KEY_RIGHT:
-if ( rKEvt.GetKeyCode().GetCode()==KEY_LEFT )
+if (nCurPos != VALUESET_ITEM_NONEITEM)
{
-if ( nCalcPos == VALUESET_ITEM_NONEITEM )
-nItemPos = nLastItem;
-else if ( !nCalcPos )
+if (nCurPos)
{
-if ( mpNoneItem )
-nItemPos = VALUESET_ITEM_NONEITEM;
-else
-nItemPos = nLastItem;
+nItemPos = nCurPos-1;
+}
+else if (mpNoneItem)
+{
+nItemPos = VALUESET_ITEM_NONEITEM;
}
-else
-nItemPos = nCalcPos-1;
}
-else
+break;
+
+case KEY_RIGHT:
+if (nCurPos nLastItem)
{
-if ( nCalcPos == VALUESET_ITEM_NONEITEM )
-nItemPos = 0;
-else if ( nCalcPos == nLastItem )
+if (nCurPos == VALUESET_ITEM_NONEITEM)
{
-if ( mpNoneItem )
-nItemPos = VALUESET_ITEM_NONEITEM;
-else
-nItemPos = 0;
+nItemPos = 0;
}
else
-nItemPos = nCalcPos+1;
+{
+nItemPos = nCurPos+1;
+}
}
-nCalcPos = nItemPos;
break;
-case KEY_UP:
case KEY_PAGEUP:
-{
-if( rKEvt.GetKeyCode().GetCode() != KEY_PAGEUP ||
-( !rKEvt.GetKeyCode().IsShift()
!rKEvt.GetKeyCode().IsMod1() !rKEvt.GetKeyCode().IsMod2() ) )
+if (rKEvt.GetKeyCode().IsShift() || rKEvt.GetKeyCode().IsMod1
[Libreoffice-commits] .: 5 commits - svtools/inc svtools/source
svtools/inc/svtools/valueset.hxx|8
svtools/source/control/valueacc.cxx | 11 -
svtools/source/control/valueimp.hxx |6
svtools/source/control/valueset.cxx | 312
4 files changed, 193 insertions(+), 144 deletions(-)
New commits:
commit e336f41e50ea96880dd71a2b42aa37cf53256383
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Tue Feb 28 00:06:24 2012 +0100
ValueSet: simplified autoscroll logic
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 9db8f93..8cd032b 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -994,46 +994,35 @@ void ValueSet::ImplDraw()
bool ValueSet::ImplScroll( const Point rPos )
{
-Size aOutSize = GetOutputSizePixel();
-long nScrBarWidth;
-
-if ( mpScrBar )
-nScrBarWidth = mpScrBar-GetSizePixel().Width();
-else
-nScrBarWidth = 0;
-
-if ( !mbScroll || (rPos.X() 0) || (rPos.X()
aOutSize.Width()-nScrBarWidth) )
+if ( !mbScroll || !maItemListRect.IsInside(rPos) )
return false;
-long nScrollOffset;
-sal_uInt16 nOldLine = mnFirstLine;
-const Rectangle aTopRect = ImplGetItemRect( mnFirstLine*mnCols );
-if ( aTopRect.GetHeight() = 16 )
-nScrollOffset = SCROLL_OFFSET/2;
-else
-nScrollOffset = SCROLL_OFFSET;
-if ( (mnFirstLine 0) (rPos.Y() = 0) )
+const long nScrollOffset = (mnItemHeight = 16) ? SCROLL_OFFSET/2 :
SCROLL_OFFSET;
+bool bScroll = false;
+
+if ( rPos.Y() = maItemListRect.Top()+nScrollOffset )
{
-long nTopPos = aTopRect.Top();
-if ( (rPos.Y() = nTopPos) (rPos.Y() = nTopPos+nScrollOffset) )
-mnFirstLine--;
+if ( mnFirstLine 0 )
+{
+--mnFirstLine;
+bScroll = true;
+}
}
-if ( (mnFirstLine == nOldLine)
- (mnFirstLine (sal_uInt16)(mnLines-mnVisLines)) (rPos.Y()
aOutSize.Height()) )
+else if ( rPos.Y() = maItemListRect.Bottom()-nScrollOffset )
{
-const long nBottomPos =
ImplGetItemRect((mnFirstLine+mnVisLines-1)*mnCols).Bottom();
-if ( (rPos.Y() = nBottomPos-nScrollOffset) (rPos.Y() =
nBottomPos) )
-mnFirstLine++;
+if ( mnFirstLine static_castsal_uInt16(mnLines-mnVisLines) )
+{
+++mnFirstLine;
+bScroll = true;
+}
}
-if ( mnFirstLine != nOldLine )
-{
-mbFormat = true;
-ImplDraw();
-return true;
-}
-else
+if ( !bScroll )
return false;
+
+mbFormat = true;
+ImplDraw();
+return true;
}
// ---
commit 0809906906d7941ceb9ae170a41c482fdd1e6bfa
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Sun Feb 26 22:47:10 2012 +0100
ValueSet: reduce memory footprint by dynamically evaluating rectangles
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 7e0b7db..22271da 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -217,6 +217,10 @@ private:
ValueItemList mItemList;
ValueSetItem* mpNoneItem;
ScrollBar* mpScrBar;
+Rectangle maNoneItemRect;
+Rectangle maItemListRect;
+longmnItemWidth;
+longmnItemHeight;
longmnTextOffset;
longmnVisLines;
longmnLines;
@@ -241,6 +245,7 @@ private:
boolmbScroll : 1;
boolmbFullMode : 1;
boolmbIsTransientChildrenDisabled : 1;
+boolmbHasVisibleItems : 1;
Color maColor;
LinkmaDoubleClickHdl;
LinkmaSelectHdl;
@@ -255,7 +260,7 @@ private:
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
SVT_DLLPRIVATE void ImplInitScrollBar();
SVT_DLLPRIVATE void ImplDeleteItems();
-SVT_DLLPRIVATE void ImplFormatItem( ValueSetItem* pItem );
+SVT_DLLPRIVATE void ImplFormatItem( ValueSetItem* pItem, Rectangle
aRect );
SVT_DLLPRIVATE void ImplDrawItemText( const XubString rStr );
SVT_DLLPRIVATE void ImplDrawSelect( sal_uInt16 nItemId, const bool
bFocus, const bool bDrawSel );
SVT_DLLPRIVATE void ImplDrawSelect();
@@ -270,6 +275,7 @@ private:
SVT_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
SVT_DLLPRIVATE ValueSetItem*ImplGetVisibleItem( sal_uInt16 nVisiblePos
);
SVT_DLLPRIVATE void ImplInsertItem( ValueSetItem *const pItem,
const size_t nPos );
+SVT_DLLPRIVATE RectangleImplGetItemRect( size_t nPos ) const;
SVT_DLLPRIVATE voidImplFireAccessibleEvent( short nEventId,
const ::com::sun::star::uno::Any rOldValue, const ::com::sun::star::uno::Any
rNewValue
[Libreoffice-commits] .: svtools/source
svtools/source/control/valueset.cxx | 26 ++
1 file changed, 10 insertions(+), 16 deletions(-)
New commits:
commit a0e7d661e0d36e3069b77f6f4b1f55352efbee9a
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Sun Feb 5 12:23:31 2012 +0100
Removed unused variable
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index cc1d9e6..0c58242 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -339,7 +339,6 @@ void ValueSet::Format()
WinBits nStyle = GetStyle();
longnTxtHeight = GetTextHeight();
longnOff;
-longnSpace;
longnNoneHeight;
longnNoneSpace;
ScrollBar* pDelScrBar = NULL;
@@ -367,7 +366,6 @@ void ValueSet::Format()
}
else
nOff = 0;
-nSpace = mnSpacing;
// consider size, if NameField does exist
if ( nStyle WB_NAMEFIELD )
@@ -388,7 +386,7 @@ void ValueSet::Format()
if ( nStyle WB_NONEFIELD )
{
nNoneHeight = nTxtHeight+nOff;
-nNoneSpace = nSpace;
+nNoneSpace = mnSpacing;
if ( nStyle WB_RADIOSEL )
nNoneHeight += 8;
}
@@ -414,7 +412,7 @@ void ValueSet::Format()
{
if ( mnUserItemWidth )
{
-mnCols = (sal_uInt16)((aWinSize.Width()-nScrBarWidth+nSpace) /
(mnUserItemWidth+nSpace));
+mnCols = (sal_uInt16)((aWinSize.Width()-nScrBarWidth+mnSpacing) /
(mnUserItemWidth+mnSpacing));
if ( !mnCols )
mnCols = 1;
}
@@ -437,7 +435,7 @@ void ValueSet::Format()
mnVisLines = mnUserVisLines;
else if ( mnUserItemHeight )
{
-mnVisLines = (nCalcHeight-nNoneSpace+nSpace) /
(mnUserItemHeight+nSpace);
+mnVisLines = (nCalcHeight-nNoneSpace+mnSpacing) /
(mnUserItemHeight+mnSpacing);
if ( !mnVisLines )
mnVisLines = 1;
}
@@ -454,8 +452,8 @@ void ValueSet::Format()
}
// calculate item size
-long nColSpace = (mnCols-1)*nSpace;
-long nLineSpace = ((mnVisLines-1)*nSpace)+nNoneSpace;
+long nColSpace = (mnCols-1)*mnSpacing;
+long nLineSpace = ((mnVisLines-1)*mnSpacing)+nNoneSpace;
long nItemWidth;
long nItemHeight;
if ( mnUserItemWidth !mnUserCols )
@@ -583,7 +581,7 @@ void ValueSet::Format()
// If want also draw parts of items in the last line,
// then we add one more line if parts of these line are
// visible
-if ( y+(mnVisLines*(nItemHeight+nSpace)) aWinSize.Height() )
+if ( y+(mnVisLines*(nItemHeight+mnSpacing)) aWinSize.Height() )
nLastItem += mnCols;
}
for ( size_t i = 0; i nItemCount; i++ )
@@ -612,10 +610,10 @@ void ValueSet::Format()
if ( !((i+1) % mnCols) )
{
x = nStartX;
-y += nItemHeight+nSpace;
+y += nItemHeight+mnSpacing;
}
else
-x += nItemWidth+nSpace;
+x += nItemWidth+mnSpacing;
}
else
{
@@ -640,7 +638,7 @@ void ValueSet::Format()
if ( nStyle WB_NONEFIELD )
{
aPos.Y() = nStartY+nNoneHeight+1;
-aSize.Height() = ((nItemHeight+nSpace)*mnVisLines)-2-nSpace;
+aSize.Height() =
((nItemHeight+mnSpacing)*mnVisLines)-2-mnSpacing;
}
mpScrBar-SetPosSizePixel( aPos, aSize );
mpScrBar-SetRangeMax( mnLines );
@@ -2380,7 +2378,6 @@ Size ValueSet::CalcWindowSizePixel( const Size
rItemSize, sal_uInt16 nDesireCol
SizeaSize( rItemSize.Width()*nCalcCols,
rItemSize.Height()*nCalcLines );
WinBits nStyle = GetStyle();
longnTxtHeight = GetTextHeight();
-longnSpace;
longn;
if ( nStyle WB_ITEMBORDER )
@@ -2398,12 +2395,9 @@ Size ValueSet::CalcWindowSizePixel( const Size
rItemSize, sal_uInt16 nDesireCol
if ( mnSpacing )
{
-nSpace = mnSpacing;
aSize.Width() += mnSpacing*(nCalcCols-1);
aSize.Height() += mnSpacing*(nCalcLines-1);
}
-else
-nSpace = 0;
if ( nStyle WB_NAMEFIELD )
{
@@ -2414,7 +2408,7 @@ Size ValueSet::CalcWindowSizePixel( const Size
rItemSize, sal_uInt16 nDesireCol
if ( nStyle WB_NONEFIELD )
{
-aSize.Height() += nTxtHeight + n + nSpace;
+aSize.Height() += nTxtHeight + n + mnSpacing;
if ( nStyle WB_RADIOSEL )
aSize.Height() += 8;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source reportdesign/source
dbaccess/source/ui/control/VertSplitView.cxx |1 +
dbaccess/source/ui/inc/QueryTextView.hxx |1 -
dbaccess/source/ui/inc/VertSplitView.hxx |4 +++-
reportdesign/source/ui/inc/ReportWindow.hxx |2 --
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 648f6ac7c51656a21cd2df29eec21f9610b4657f
Author: Matteo Casalin matteo.casa...@poste.it
Date: Wed Jan 25 00:23:05 2012 +0100
Do not forward declare Splitter or include its header file if unneeded
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx
b/dbaccess/source/ui/control/VertSplitView.cxx
index e04aafe..c1f7384 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -29,6 +29,7 @@
#include VertSplitView.hxx
#include tools/debug.hxx
+#include vcl/split.hxx
#define SPLITTER_WIDTH 80
diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx
b/dbaccess/source/ui/inc/QueryTextView.hxx
index d541e97..03670be 100644
--- a/dbaccess/source/ui/inc/QueryTextView.hxx
+++ b/dbaccess/source/ui/inc/QueryTextView.hxx
@@ -31,7 +31,6 @@
#include queryview.hxx
#include querycontainerwindow.hxx
-class Splitter;
namespace dbaui
{
class OSqlEdit;
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx
b/dbaccess/source/ui/inc/VertSplitView.hxx
index b9d52b3..e25c6d4 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -28,7 +28,9 @@
#ifndef DBAUI_VERTSPLITVIEW_HXX
#define DBAUI_VERTSPLITVIEW_HXX
-#include vcl/split.hxx
+#include vcl/window.hxx
+
+class Splitter;
namespace dbaui
{
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx
b/reportdesign/source/ui/inc/ReportWindow.hxx
index 27200bd..87d549b 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -42,8 +42,6 @@
#include MarkedSection.hxx
#include ViewsWindow.hxx
-class Splitter;
-
namespace rptui
{
class ODesignView;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/control/valueacc.cxx |2
svtools/source/control/valueimp.hxx |3
svtools/source/control/valueset.cxx | 175 +---
3 files changed, 68 insertions(+), 112 deletions(-)
New commits:
commit e4938058e2cc21c705507c365c46f9bfb9ac828c
Author: Matteo Casalin matteo.casa...@poste.it
Date: Tue Jan 3 14:43:58 2012 +0100
VALUESETITEM_SPACE is never set: remove related code
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index a8a544b..73e2dea 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -444,7 +444,7 @@ uno::Reference accessibility::XAccessible SAL_CALL
ValueSetAcc::getAccessible
{
ValueSetItem* pItem = (*mpParent-mpImpl-mpItemList)[ nItemPos ];
-if( ( pItem-meType != VALUESETITEM_SPACE )
!pItem-maRect.IsEmpty() )
+if( !pItem-maRect.IsEmpty() )
xRet = pItem-GetAccessible( mbIsTransientChildrenDisabled );
}
}
diff --git a/svtools/source/control/valueimp.hxx
b/svtools/source/control/valueimp.hxx
index 0a5398d..e393208 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -67,8 +67,7 @@ enum ValueSetItemType
VALUESETITEM_NONE,
VALUESETITEM_IMAGE,
VALUESETITEM_COLOR,
-VALUESETITEM_USERDRAW,
-VALUESETITEM_SPACE
+VALUESETITEM_USERDRAW
};
//
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index a8fdbab..cc1d9e6 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -213,9 +213,6 @@ void ValueSet::ImplInitScrollBar()
void ValueSet::ImplFormatItem( ValueSetItem* pItem )
{
-if ( pItem-meType == VALUESETITEM_SPACE )
-return;
-
Rectangle aRect = pItem-maRect;
WinBits nStyle = GetStyle();
if ( nStyle WB_ITEMBORDER )
@@ -1078,14 +1075,7 @@ ValueSetItem* ValueSet::ImplGetItem( size_t nPos )
ValueSetItem* ValueSet::ImplGetFirstItem()
{
-for ( size_t i = 0, nItemCount = mpImpl-mpItemList-size(); i
nItemCount; ++i ) {
-ValueSetItem* pItem = (*mpImpl-mpItemList)[ i ];
-if ( pItem-meType != VALUESETITEM_SPACE ) {
-return pItem;
-}
-}
-
-return NULL;
+return mpImpl-mpItemList-size() ? (*mpImpl-mpItemList)[ 0 ] : NULL;
}
// ---
@@ -1098,7 +1088,7 @@ sal_uInt16 ValueSet::ImplGetVisibleItemCount() const
{
ValueSetItem* pItem = (*mpImpl-mpItemList)[ n ];
-if( pItem-meType != VALUESETITEM_SPACE !pItem-maRect.IsEmpty() )
+if( !pItem-maRect.IsEmpty() )
nRet++;
}
@@ -1116,7 +1106,7 @@ ValueSetItem* ValueSet::ImplGetVisibleItem( sal_uInt16
nVisiblePos )
{
ValueSetItem* pItem = (*mpImpl-mpItemList)[ n ];
-if( ( pItem-meType != VALUESETITEM_SPACE )
!pItem-maRect.IsEmpty() ( nVisiblePos == nFoundPos++ ) )
+if( !pItem-maRect.IsEmpty() ( nVisiblePos == nFoundPos++ ) )
pRet = pItem;
}
@@ -1181,7 +1171,7 @@ void ValueSet::ImplTracking( const Point rPos, sal_Bool
bRepeat )
}
ValueSetItem* pItem = ImplGetItem( ImplGetItem( rPos ) );
-if ( pItem (pItem-meType != VALUESETITEM_SPACE) )
+if ( pItem )
{
if( GetStyle() WB_MENUSTYLEVALUESET )
mbHighlight = sal_True;
@@ -1209,7 +1199,7 @@ void ValueSet::ImplEndTracking( const Point rPos,
sal_Bool bCancel )
else
pItem = ImplGetItem( ImplGetItem( rPos ) );
-if ( pItem (pItem-meType != VALUESETITEM_SPACE) )
+if ( pItem )
{
SelectItem( pItem-mnId );
if ( !mbSelection !(GetStyle() WB_NOPOINTERFOCUS) )
@@ -1236,7 +1226,7 @@ void ValueSet::MouseButtonDown( const MouseEvent rMEvt )
if ( mbSelection )
{
mbHighlight = sal_True;
-if ( pItem (pItem-meType != VALUESETITEM_SPACE) )
+if ( pItem )
{
mnOldItemId = mnSelItemId;
mnHighItemId = mnSelItemId;
@@ -1247,7 +1237,7 @@ void ValueSet::MouseButtonDown( const MouseEvent rMEvt )
}
else
{
-if ( pItem (pItem-meType != VALUESETITEM_SPACE)
!rMEvt.IsMod2() )
+if ( pItem !rMEvt.IsMod2() )
{
if ( rMEvt.GetClicks() == 1 )
{
@@ -1341,67 +1331,44 @@ void ValueSet::KeyInput( const KeyEvent rKEvt )
switch ( rKEvt.GetKeyCode().GetCode() )
{
case KEY_HOME:
-if ( mpNoneItem )
-nItemPos = VALUESET_ITEM_NONEITEM;
-else
-{
-nItemPos = 0;
-while ( ImplGetItem( nItemPos )-meType == VALUESETITEM_SPACE )
-nItemPos++;
-}
+nItemPos = mpNoneItem ? VALUESET_ITEM_NONEITEM : 0
[Libreoffice-commits] .: 2 commits - svtools/source
svtools/source/control/valueset.cxx | 49 +++-
1 file changed, 21 insertions(+), 28 deletions(-)
New commits:
commit ca343939c03551957433708836517eb37b62e523
Author: Matteo Casalin matteo.casa...@poste.it
Date: Mon Jan 2 19:46:49 2012 +0100
Group a common test to avoid unnecessary calculations
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 97ecc03..84f472f 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1033,35 +1033,34 @@ sal_Bool ValueSet::ImplScroll( const Point rPos )
size_t ValueSet::ImplGetItem( const Point rPos, sal_Bool bMove ) const
{
-if ( mpNoneItem )
+if ( mpNoneItem mpNoneItem-maRect.IsInside( rPos ) )
{
-if ( mpNoneItem-maRect.IsInside( rPos ) )
-return VALUESET_ITEM_NONEITEM;
+return VALUESET_ITEM_NONEITEM;
}
-Point aDefPos;
-Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() );
+const Rectangle aWinRect( Point(), maVirDev.GetOutputSizePixel() );
-size_t nItemCount = mpImpl-mpItemList-size();
-for ( size_t i = 0; i nItemCount; i++ )
+if ( aWinRect.IsInside( rPos ) )
{
-ValueSetItem* pItem = (*mpImpl-mpItemList)[ i ];
-if ( pItem-maRect.IsInside( rPos ) )
+// The point is inside the ValueSet window,
+// let's find the containing item.
+const size_t nItemCount = mpImpl-mpItemList-size();
+for ( size_t i = 0; i nItemCount; ++i )
{
-if ( aWinRect.IsInside( rPos ) )
+ValueSetItem *const pItem = (*mpImpl-mpItemList)[ i ];
+if ( pItem-maRect.IsInside( rPos ) )
+{
return i;
-else
-return VALUESET_ITEM_NOTFOUND;
+}
}
-}
-// Wenn Spacing gesetzt ist, wird der vorher selektierte
-// Eintrag zurueckgegeben, wenn die Maus noch nicht das Fenster
-// verlassen hat
-if ( bMove mnSpacing mnHighItemId )
-{
-if ( aWinRect.IsInside( rPos ) )
+// Wenn Spacing gesetzt ist, wird der vorher selektierte
+// Eintrag zurueckgegeben, wenn die Maus noch nicht das Fenster
+// verlassen hat
+if ( bMove mnSpacing mnHighItemId )
+{
return GetItemPos( mnHighItemId );
+}
}
return VALUESET_ITEM_NOTFOUND;
commit fe36838f9db5fef3c281b677c64b4db0519c9d4d
Author: Matteo Casalin matteo.casa...@poste.it
Date: Mon Dec 26 10:38:25 2011 +0100
Do not repeat the same test twice
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 576a091..97ecc03 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -700,16 +700,10 @@ void ValueSet::ImplDrawSelect()
if ( !IsReallyVisible() )
return;
-sal_Bool bFocus = HasFocus();
-sal_Bool bDrawSel;
+const bool bFocus = HasFocus();
+const bool bDrawSel = !( (mbNoSelection !mbHighlight) ||
(!mbDrawSelection mbHighlight) );
-if ( (mbNoSelection !mbHighlight) || (!mbDrawSelection mbHighlight) )
-bDrawSel = sal_False;
-else
-bDrawSel = sal_True;
-
-if ( !bFocus
- ((mbNoSelection !mbHighlight) || (!mbDrawSelection
mbHighlight)) )
+if ( !bFocus !bDrawSel )
{
XubString aEmptyStr;
ImplDrawItemText( aEmptyStr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - chart2/source svtools/source
chart2/source/controller/dialogs/res_Trendline.hxx |1 - svtools/source/control/valueset.cxx| 10 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) New commits: commit 7a11e6106bf3080357ea486500d786010b0b5693 Author: Matteo Casalin matteo.casa...@poste.it Date: Sun Dec 18 21:48:03 2011 +0100 Remove unneeded tests before delete Pointers deleted in destructor are modified in remaining code, and already set to NULL when necessary. diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index abf575b..576a091 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -118,11 +118,8 @@ ValueSet::~ValueSet() if (xComponent.is()) xComponent-dispose (); -if ( mpScrBar ) -delete mpScrBar; - -if ( mpNoneItem ) -delete mpNoneItem; +delete mpScrBar; +delete mpNoneItem; ImplDeleteItems(); delete mpImpl; @@ -665,8 +662,7 @@ void ValueSet::Format() mbFormat = sal_False; // ScrollBar loeschen -if ( pDelScrBar ) -delete pDelScrBar; +delete pDelScrBar; } // --- commit 791b1e941ecdbf176831857e85fcd48720ae45b4 Author: Matteo Casalin matteo.casa...@poste.it Date: Sun Dec 18 15:37:09 2011 +0100 Remove unused header diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 6e290f8..6f9c395 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -31,7 +31,6 @@ #include vcl/window.hxx #include vcl/button.hxx #include vcl/fixed.hxx -#include svtools/valueset.hxx #include svl/itemset.hxx #include svx/chrtitem.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
