[Libreoffice-commits] core.git: 6 commits - accessibility/source svtools/source svx/source sw/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Feb 19 12:07:39 CET 2014
accessibility/source/standard/vclxaccessibleedit.cxx | 31 ++++++++-----------
svtools/source/uno/treecontrolpeer.cxx | 13 ++++---
svx/source/tbxctrls/extrusioncontrols.cxx | 1
svx/source/tbxctrls/itemwin.cxx | 9 +++--
sw/inc/ndgrf.hxx | 1
vcl/source/control/edit.cxx | 14 ++++----
6 files changed, 35 insertions(+), 34 deletions(-)
New commits:
commit 3d024d29fa7344240f6cf407d023ef3537b0a5a9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 11:04:02 2014 +0000
Related: fdo#74242 send selection change before caret change
because that's what I see gtk does
Change-Id: Ifa20f4d84fd31ea6fcc640589b72efd00c9665fd
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 2e8b3f9..f923c51 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2649,19 +2649,21 @@ void Edit::ImplSetSelection( const Selection& rSelection, sal_Bool bPaint )
bCaret = sal_True;
if (nGap != 0 || oGap != 0)
bSelection = sal_True;
- if (bCaret)
+
+ if (bSelection)
{
if ( mbIsSubEdit )
- ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
}
- if (bSelection)
+
+ if (bCaret)
{
if ( mbIsSubEdit )
- ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ ((Edit*)GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
}
// #103511# notify combobox listeners of deselection
commit da13dd9a3513fa003b5a3537f6d1fb4e8ce23262
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 10:58:04 2014 +0000
Related: fdo#74242 #i104470# we now have a seperate CARET_CHANGED event
so cursoring left and right in normal non-multiline edit widgets should
give a11y cursor-changed events
Change-Id: I91e86e43d049793912b3ffcc2802bb9aa4b3857c
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index 20e4c86..b7e5376 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -77,33 +77,30 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
SetText( implGetText() );
}
break;
- case VCLEVENT_EDIT_SELECTIONCHANGED:
+ case VCLEVENT_EDIT_CARETCHANGED:
{
sal_Int32 nOldCaretPosition = m_nCaretPosition;
- sal_Int32 nOldSelectionStart = m_nSelectionStart;
-
m_nCaretPosition = getCaretPosition();
- m_nSelectionStart = getSelectionStart();
Window* pWindow = GetWindow();
- if ( pWindow && pWindow->HasChildPathFocus() )
+ if (pWindow && pWindow->HasChildPathFocus())
{
- if ( m_nCaretPosition != nOldCaretPosition )
+ if (m_nCaretPosition != nOldCaretPosition)
{
Any aOldValue, aNewValue;
- aOldValue <<= (sal_Int32) nOldCaretPosition;
- aNewValue <<= (sal_Int32) m_nCaretPosition;
+ aOldValue <<= nOldCaretPosition;
+ aNewValue <<= m_nCaretPosition;
NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, aOldValue, aNewValue );
}
-
- // #i104470# VCL only has SELECTION_CHANGED, but UAA distinguishes between SELECTION_CHANGED and CARET_CHANGED
- sal_Bool bHasSelection = ( m_nSelectionStart != m_nCaretPosition );
- sal_Bool bHadSelection = ( nOldSelectionStart != nOldCaretPosition );
- if ( ( bHasSelection != bHadSelection ) || ( bHasSelection && ( ( m_nCaretPosition != nOldCaretPosition ) || ( m_nSelectionStart != nOldSelectionStart ) ) ) )
- {
- NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
- }
-
+ }
+ }
+ break;
+ case VCLEVENT_EDIT_SELECTIONCHANGED:
+ {
+ Window* pWindow = GetWindow();
+ if (pWindow && pWindow->HasChildPathFocus())
+ {
+ NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
}
}
break;
commit aeb607398052436681962346fc6879c50c78bcfa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 10:45:05 2014 +0000
coverity#738866 Uninitialized scalar field
Change-Id: I2ab29fb267055f70c0d42970abd4e4d944ab7006
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index d6e441f..12f2f20 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -138,12 +138,13 @@ public:
};
TreeControlPeer::TreeControlPeer()
-: maSelectionListeners( *this )
-, maTreeExpansionListeners( *this )
-, maTreeEditListeners( *this )
-, mpTreeImpl( 0 )
-, mnEditLock( 0 )
-, mpTreeNodeMap( 0 )
+ : maSelectionListeners( *this )
+ , maTreeExpansionListeners( *this )
+ , maTreeEditListeners( *this )
+ , mbIsRootDisplayed(false)
+ , mpTreeImpl( 0 )
+ , mnEditLock( 0 )
+ , mpTreeNodeMap( 0 )
{
}
commit d0e1a44092fe11650734f6fb9ad55dbd032dc23c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 10:43:55 2014 +0000
coverity#738876 Uninitialized scalar field
Change-Id: Ib782a03a66570deec494f2665640ed38e962862e
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 024d913..ae35c5c 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -326,6 +326,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
, maImgDepth3( SVX_RES( IMG_DEPTH_3 ) )
, maImgDepth4( SVX_RES( IMG_DEPTH_4 ) )
, maImgDepthInfinity( SVX_RES( IMG_DEPTH_INFINITY ) )
+ , meUnit(FUNIT_NONE)
, mfDepth( -1.0 )
, msExtrusionDepth( ".uno:ExtrusionDepth" )
, msMetricUnit( ".uno:MetricUnit" )
commit c333ab18b71c534174e0ab7202c233c04f77c6aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 10:41:03 2014 +0000
coverity#738877 Uninitialized scalar field
Change-Id: Ieec62701502ee18c3b19d9cc324059c2380184c0
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 90beb8e..001b646 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -453,10 +453,11 @@ void SvxColorBox::ReleaseFocus_Impl()
//========================================================================
SvxMetricField::SvxMetricField(
- Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) :
- MetricField( pParent, nBits ),
- aCurTxt(),
- mxFrame( rFrame )
+ Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits )
+ : MetricField(pParent, nBits)
+ , aCurTxt()
+ , ePoolUnit(SFX_MAPUNIT_CM)
+ , mxFrame(rFrame)
{
Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight());
aSize.Width() += 20;
commit 842ea9eeab801c011c5288279599f972e2ab0371
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 10:39:06 2014 +0000
coverity#738885 unused member variable
Change-Id: I2f12445df2a04b6afb91caa6854ead61950bfec1
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index ba1d528..e6980db 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -42,7 +42,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
::sfx2::SvBaseLinkRef refLink; ///< If graphics only as link then pointer is set.
Size nGrfSize;
OUString aLowResGrf; ///< HTML: LowRes graphics (substitute until regular HighRes graphics is loaded).
- sal_Bool bTransparentFlagValid :1;
sal_Bool bInSwapIn :1;
sal_Bool bGraphicArrived :1;
More information about the Libreoffice-commits
mailing list