From b9e6133705ac49d3299aae2d5d62ea04a015cd76 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Wed, 11 Aug 2010 11:50:49 +0200
Subject: oooimprovement6: #i99729# collecting ruler interaction

---
 svx/source/dialog/svxruler.cxx | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 mode change 100644 => 100755 svx/source/dialog/svxruler.cxx

(limited to 'svx')

diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
old mode 100644
new mode 100755
index 7705a2dd08df..8000de0d2103
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -59,6 +59,28 @@
 #define RULER_TAB_RTL           ((USHORT)0x0010)
 #endif
 
+#include <comphelper/uieventslogger.hxx>
+
+namespace
+{
+    void lcl_logRulerUse(const ::rtl::OUString& sURL) //#i99729#
+    {
+        using namespace ::com::sun::star;
+        util::URL aTargetURL;
+        aTargetURL.Complete = sURL;
+        aTargetURL.Main = sURL;
+        if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
+        {
+            ::rtl::OUString sAppName;
+            uno::Sequence<beans::PropertyValue> source;
+            ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxRuler"));
+            ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
+        }
+    }
+}
+
+
+
 // STATIC DATA -----------------------------------------------------------
 
 #define CTRL_ITEM_COUNT 14
@@ -2806,6 +2828,7 @@ void __EXPORT SvxRuler::Click()
 */
 
 {
+    lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/Click"));
     Ruler::Click();
     if( bActive )
     {
@@ -3440,6 +3463,7 @@ long __EXPORT SvxRuler::StartDrag()
 */
 
 {
+    lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag"));
     BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
     if(!bValid)
         return FALSE;
@@ -3559,6 +3583,7 @@ void __EXPORT SvxRuler::EndDrag()
 
 */
 {
+    lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag"));
     const BOOL bUndo = IsDragCanceled();
     const long lPos = GetDragPos();
     DrawLine_Impl(lTabPos, 6, bHorz);
-- 
cgit 


From 0cd40f9bffa9fa97bd44a7a2e43e40f11af1b2db Mon Sep 17 00:00:00 2001
From: Christian Lippka <christian.lippka@oracle.com>
Date: Thu, 26 Aug 2010 21:50:11 +0200
Subject: impress200: #i114089# clear user any after they are applied to the
 shape

---
 svx/source/unodraw/unoshape.cxx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'svx')

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index d860f4973fd2..9c5affc38f9b 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -708,6 +708,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
             // next entry
             ++aSrcIt;
         }
+        const_cast< SvxItemPropertySet& >(rPropSet).ClearAllUsrAny();
     }
 }
 
-- 
cgit 


From 23eb90b58cd29c102d4e6f6e940933b04d9a87a7 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Wed, 1 Sep 2010 21:56:16 +0200
Subject: dba33i: #i112694# care for mouse handlers which tamper with the tree:
 survive this

---
 svx/source/dialog/checklbx.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'svx')

diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index c54634017392..80096ce70f32 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -212,7 +212,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() )
     {
-        Point aPnt = rMEvt.GetPosPixel();
+        const Point aPnt = rMEvt.GetPosPixel();
         SvLBoxEntry* pEntry = GetEntry( aPnt );
 
         if ( pEntry )
@@ -230,6 +230,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
             {
                 ToggleCheckButton( pEntry );
                 SvTreeListBox::MouseButtonDown( rMEvt );
+
+                // check if the entry below the mouse changed during the base method call. This is possible if,
+                // for instance, a handler invoked by the base class tampers with the list entries.
+                const SvLBoxEntry* pNewEntry = GetEntry( aPnt );
+                if ( pNewEntry != pEntry )
+                    return;
+
                 if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
                     CheckButtonHdl();
                 return;
-- 
cgit