include/svx/insctrl.hxx | 1 -
include/svx/modctrl.hxx | 2 +-
sfx2/source/statbar/stbitem.cxx | 8 ++++----
svx/source/stbctrls/insctrl.cxx | 29 -----------------------------
svx/source/stbctrls/modctrl.cxx | 2 +-
sw/sdi/swriter.sdi | 2 +-
sw/source/uibase/inc/wordcountctrl.hxx | 4 ++++
sw/source/uibase/utlui/wordcountctrl.cxx | 6 ++++++
8 files changed, 17 insertions(+), 37 deletions(-)
New commits:
commit 0280a35b20448b7f678b6e150cbc2564da4910ce
Author: Samuel Mehrbrodt <s.mehrbr...@gmail.com>
Date: Sun Nov 9 17:15:33 2014 +0100
fdo#82707 Unify click behavior in Statusbar (Writer)
Use single click for primary action, right click for context menu
Change-Id: Ia707a88b48f4af144588c45d37acea547e77773e
diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx
index d9ec00d..291deab 100644
--- a/include/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
@@ -29,7 +29,6 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl : public
SfxStatusBarControl
public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
- virtual void Click() SAL_OVERRIDE;
virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE;
SFX_DECL_STATUSBAR_CONTROL();
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index ca11291..1febdbd 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -36,7 +36,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
virtual void Paint( const UserDrawEvent& rUsrEvt ) SAL_OVERRIDE;
- virtual void DoubleClick() SAL_OVERRIDE;
+ virtual void Click() SAL_OVERRIDE;
SFX_DECL_STATUSBAR_CONTROL();
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 27ba304..275a61b 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -560,11 +560,11 @@ void SfxStatusBarControl::Click()
This virtual method is called when the user clicks on the
field in the status row that belongs to this control.
-
- The default implementation is empty.
*/
{
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aArgs;
+ execute( aArgs );
}
@@ -575,11 +575,11 @@ void SfxStatusBarControl::DoubleClick()
This virtual method is called when the user double-clicks on the
field in the status row that belongs to this control.
+
+ The default implementation is empty.
*/
{
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aArgs;
- execute( aArgs );
}
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 4d477ec..422c12b 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -38,14 +38,10 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl(
sal_uInt16 _nSlotId,
{
}
-
-
SvxInsertStatusBarControl::~SvxInsertStatusBarControl()
{
}
-
-
void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
const SfxPoolItem* pState )
{
@@ -66,36 +62,11 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 ,
SfxItemState eState,
}
}
-
-
-void SvxInsertStatusBarControl::Click()
-{
- if ( GetStatusBar().GetItemText( GetId() ).isEmpty() )
- return;
- bInsert = !bInsert;
- SfxBoolItem aIns( GetSlotId(), bInsert );
-
- ::com::sun::star::uno::Any a;
- bool bHasValue = aIns.QueryValue( a );
- if (!bHasValue)
- return;
-
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
aArgs( 1 );
- aArgs[0].Name = "InsertMode";
- aArgs[0].Value = a;
-
- execute( aArgs );
-}
-
-
-
void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
{
DrawItemText_Impl();
}
-
-
void SvxInsertStatusBarControl::DrawItemText_Impl()
{
OUString aText;
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 84da501..cfbaede 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -165,7 +165,7 @@ void SvxModifyControl::Paint( const UserDrawEvent& rUsrEvt )
pDev->DrawImage(aPt, mpImpl->maImages[state]);
}
-void SvxModifyControl::DoubleClick()
+void SvxModifyControl::Click()
{
if (mpImpl->mnModState != ImplData::MODIFICATION_STATE_YES)
// document not modified. nothing to do here.
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 2d60dff..2ca2c08 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7588,7 +7588,7 @@ SfxStringItem StateZoom FN_STAT_ZOOM
]
SfxStringItem StateWordCount FN_STAT_WORDCOUNT
-()
+
[
/* flags: */
AutoUpdate = FALSE,
diff --git a/sw/source/uibase/inc/wordcountctrl.hxx
b/sw/source/uibase/inc/wordcountctrl.hxx
index 9feee89..8d2aeeb 100644
--- a/sw/source/uibase/inc/wordcountctrl.hxx
+++ b/sw/source/uibase/inc/wordcountctrl.hxx
@@ -26,6 +26,10 @@ public:
SwWordCountStatusBarControl(sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar&
rStb);
virtual ~SwWordCountStatusBarControl();
+
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
+ const SfxPoolItem* pState ) SAL_OVERRIDE;
+
};
#endif
diff --git a/sw/source/uibase/utlui/wordcountctrl.cxx
b/sw/source/uibase/utlui/wordcountctrl.cxx
index 498de51..c43c345 100644
--- a/sw/source/uibase/utlui/wordcountctrl.cxx
+++ b/sw/source/uibase/utlui/wordcountctrl.cxx
@@ -24,4 +24,10 @@ SwWordCountStatusBarControl::~SwWordCountStatusBarControl()
{
}
+void SwWordCountStatusBarControl::StateChanged(
+ sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pState )
+{
+ GetStatusBar().SetItemText( GetId(), ((SfxStringItem*)pState)->GetValue()
);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
