[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 3 commits - sc/source sc/uiconfig sd/source sd/uiconfig sfx2/source sw/source sw/uiconfig
Andre Fischer
af at apache.org
Wed May 22 12:23:23 PDT 2013
sc/source/ui/view/tabvwsh.cxx | 1
sc/uiconfig/scalc/menubar/menubar.xml | 1
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 1
sd/source/ui/view/drvwshrg.cxx | 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, 7 insertions(+), 24 deletions(-)
New commits:
commit 12da94075c58d7dac7f9a9080107a879de805e89
Author: Andre Fischer <af at apache.org>
Date: Wed May 22 12:22:32 2013 +0000
Resolves: #i122354# Fix notification of slide change when...
caused by slide sorter key event
(cherry picked from commit a3d234a12b037327688d4743c82f76da732ec70e)
Change-Id: I6ac1667d10b5ecd8cc3f96b7657d7ffe49a7ac3f
(cherry picked from commit 0314533d3ba5a2601bc18037c4a1fbc6a54910d3)
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 2decfcb..ca0ff0b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -417,6 +417,7 @@ void SelectionFunction::NotifyDragFinished (void)
sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
{
view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter);
+ PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter);
PageSelector::UpdateLock aLock (mrSlideSorter);
FocusManager& rFocusManager (mrController.GetFocusManager());
sal_Bool bResult = sal_False;
commit f7b9c4e38733863da8e434157ff7061e6b110309
Author: Andre Fischer <af at apache.org>
Date: Wed May 22 11:48:44 2013 +0000
Resolves: #i122366# Uncheck sidebar menu button after menu is closed
(cherry picked from commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6)
Change-Id: I4eef19a3b4ad9ea3ff7fd40b22c2854f569b69b6
(cherry picked from commit ff7bbe528aebedd41229e8d351a8c595e3627905)
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 0a5180e..fc573ce 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -102,18 +102,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
}
@@ -121,11 +115,6 @@ void MenuButton::MouseButtonDown (const MouseEvent& rMouseEvent)
void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
{
-#if 0
- Hide();
- CheckBox::MouseButtonUp(rMouseEvent);
- Show();
-#else
if (IsMouseCaptured())
ReleaseMouse();
@@ -143,7 +132,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 21beb0f..1cbd18b 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -363,6 +363,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());
@@ -388,6 +391,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 7cecc42..cafd3e8 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -30,6 +30,7 @@
#include <boost/scoped_ptr.hpp>
class Button;
+class CheckBox;
class RadioButton;
namespace css = ::com::sun::star;
@@ -94,7 +95,7 @@ public:
private:
cssu::Reference<css::frame::XFrame> mxFrame;
- ::boost::scoped_ptr<Button> mpMenuButton;
+ ::boost::scoped_ptr<CheckBox> mpMenuButton;
class Item
{
public:
commit 95ae39c0c34c9a5e6fa6e72bf3a631a9a799b872
Author: Andre Fischer <af at apache.org>
Date: Wed May 22 11:32:13 2013 +0000
Resolves: #ii122335# Disabling the old task pane
(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54)
Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468
(cherry picked from commit 94b868141e5ad43f8e2affb77563ec0f999a2d60)
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 537499b..7949e17 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,7 +54,6 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::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(ScNameDefDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index ca8d8ba..777c324 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -139,7 +139,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 c71959c..bb20370 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -94,7 +94,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/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 9a5b874..9ad2019 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -113,7 +113,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 e5f7b3b..73555a8 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -90,7 +90,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(SfxInfoBarContainerChild::GetChildWindowId());
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index f79d0ec..3c310f2 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -137,7 +137,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 3cb3b76..30229a7 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -108,7 +108,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 806da2d..4f22cf1 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -136,7 +136,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 bc90989..39284e8 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -137,7 +137,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 9506ab9..618e757 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/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"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 84b1fc3..e1d2c83 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -138,7 +138,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