[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source sc/uiconfig sd/source sd/uiconfig sfx2/source sw/source sw/uiconfig
Andre Fischer
af at apache.org
Wed May 22 05:07:22 PDT 2013
sc/source/ui/view/tabvwsh.cxx | 1 -
sc/uiconfig/scalc/menubar/menubar.xml | 1 -
sd/source/ui/view/drvwshrg.cxx | 1 -
sd/uiconfig/sdraw/menubar/menubar.xml | 1 -
sd/uiconfig/simpress/menubar/menubar.xml | 1 -
sfx2/source/sidebar/MenuButton.cxx | 12 ------------
sfx2/source/sidebar/TabBar.cxx | 4 ++++
sfx2/source/sidebar/TabBar.hxx | 3 ++-
sw/source/ui/uiview/view0.cxx | 1 -
sw/uiconfig/sglobal/menubar/menubar.xml | 1 -
sw/uiconfig/sweb/menubar/menubar.xml | 1 -
sw/uiconfig/swform/menubar/menubar.xml | 1 -
sw/uiconfig/swreport/menubar/menubar.xml | 1 -
sw/uiconfig/swriter/menubar/menubar.xml | 1 -
sw/uiconfig/swxform/menubar/menubar.xml | 1 -
15 files changed, 6 insertions(+), 25 deletions(-)
New commits:
commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6
Author: Andre Fischer <af at apache.org>
Date: Wed May 22 11:48:44 2013 +0000
i122366: Uncheck sidebar menu button after menu is closed.
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index d29bad0..c1d0f59 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -109,18 +109,12 @@ void MenuButton::MouseMove (const MouseEvent& rEvent)
void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
{
-#if 0
- Hide();
- CheckBox::MouseButtonDown(rMouseEvent);
- Show();
-#else
if (rMouseEvent.IsLeft())
{
mbIsLeftButtonDown = true;
CaptureMouse();
Invalidate();
}
-#endif
}
@@ -128,11 +122,6 @@ void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
{
-#if 0
- Hide();
- CheckBox::MouseButtonUp(rMouseEvent);
- Show();
-#else
if (IsMouseCaptured())
ReleaseMouse();
@@ -150,7 +139,6 @@ void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
mbIsLeftButtonDown = false;
Invalidate();
}
-#endif
}
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 5b87856..2da81a5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -379,6 +379,9 @@ void TabBar::UpdateFocusManager (FocusManager& rFocusManager)
IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
{
+ if ( ! mpMenuButton)
+ return 0;
+
::std::vector<DeckMenuData> aMenuData;
for(ItemContainer::const_iterator iItem(maItems.begin()),iEnd(maItems.end());
@@ -404,6 +407,7 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
mpMenuButton->GetPosPixel(),
mpMenuButton->GetSizePixel()),
aMenuData);
+ mpMenuButton->Check(sal_False);
return 0;
}
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index f1ef6f2..399399a 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -34,6 +34,7 @@
#include <boost/scoped_ptr.hpp>
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -98,7 +99,7 @@ public:
private:
cssu::Reference<css::frame::XFrame> mxFrame;
- ::boost::scoped_ptr<Button> mpMenuButton;
+ ::boost::scoped_ptr<CheckBox> mpMenuButton;
class Item
{
public:
commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54
Author: Andre Fischer <af at apache.org>
Date: Wed May 22 11:32:13 2013 +0000
i122335: Disabling the old task pane.
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 2c3c6f1..eb81361 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -65,7 +65,6 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(FID_INPUTLINE_STATUS);
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
- SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 969cdef..9308ce8 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -143,7 +143,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index c48e958..3ba3119 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -104,7 +104,6 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH
{
SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
- SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE );
SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() );
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 3907ff9..efbee15 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -128,7 +128,6 @@
<menu:menuitem menu:id=".uno:ShowAnnotations"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Zoom"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index bfc927f..699fb6f 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -119,7 +119,6 @@
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuitem menu:id=".uno:LeftPaneImpress"/>
<menu:menuitem menu:id=".uno:AvailableToolbars"/>
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 1c0a1af..51027cf 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -109,7 +109,6 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
{
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
- SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId());
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index c141a07..cb64930 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -140,7 +140,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index ba542a8..1a79d6d 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -113,7 +113,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 5d68440..28c59d2 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -140,7 +140,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 04614cf..f958f18 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -140,7 +140,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 062e405..c5b90d3 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -143,7 +143,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 21e7870..e122fe8 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -141,7 +141,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
- <menu:menuitem menu:id=".uno:TaskPane"/>
<menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
More information about the Libreoffice-commits
mailing list