[ooo-build-commit] patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Tue Aug 4 23:23:11 PDT 2009
patches/dev300/apply | 1
patches/dev300/sd-disable-layoutpane.diff | 214 ------------------------------
2 files changed, 215 deletions(-)
New commits:
commit 5dcd08674d0d8b6a311013f07052ac0940868b72
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Aug 5 08:21:11 2009 +0200
Removed due to unwanted side effects
* patches/dev300/apply: removed patch
* patches/dev300/sd-disable-layoutpane.diff: deleted. causes
disabling of the LayoutMenu also for handout mode
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ecfda6f..73bf193 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3317,7 +3317,6 @@ configmgr-validate-removedtree.diff, n#505704
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
vcl-gtk-fullscreen-fix.diff, n#480324, thorsten
vcl-startup-crash-fix.diff, i#103148, thorsten
-sd-disable-layoutpane.diff, i#73289, thorsten
# adds various color conversion functions to basegfx's BColor
basegfx-color-tools.diff, thorsten
diff --git a/patches/dev300/sd-disable-layoutpane.diff b/patches/dev300/sd-disable-layoutpane.diff
deleted file mode 100644
index 78a526b..0000000
--- a/patches/dev300/sd-disable-layoutpane.diff
+++ /dev/null
@@ -1,214 +0,0 @@
-Disable layout pane in Impress, when editing master pages
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- sd/source/ui/inc/taskpane/TitleBar.hxx | 1 +
- sd/source/ui/inc/taskpane/TitledControl.hxx | 2 ++
- sd/source/ui/toolpanel/LayoutMenu.cxx | 17 +++++++++++++++--
- sd/source/ui/toolpanel/LayoutMenu.hxx | 2 ++
- sd/source/ui/toolpanel/TitleBar.cxx | 24 +++++++++++++++++++-----
- sd/source/ui/toolpanel/TitledControl.cxx | 24 ++++++++++++++++++++++--
- sd/source/ui/tools/EventMultiplexer.cxx | 5 +++--
- 7 files changed, 64 insertions(+), 11 deletions(-)
-
-
-diff --git sd/source/ui/inc/taskpane/TitleBar.hxx sd/source/ui/inc/taskpane/TitleBar.hxx
-index 0ee436b..26b3e57 100644
---- sd/source/ui/inc/taskpane/TitleBar.hxx
-+++ sd/source/ui/inc/taskpane/TitleBar.hxx
-@@ -92,6 +92,7 @@ public:
- virtual void Paint (const Rectangle& rBoundingBox);
- virtual bool Expand (bool bFlag = true);
- virtual bool IsExpanded (void) const;
-+ virtual void SetEnabledState(bool bFlag);
-
- void SetFocus (bool bFlag);
-
-diff --git sd/source/ui/inc/taskpane/TitledControl.hxx sd/source/ui/inc/taskpane/TitledControl.hxx
-index da28ded..6dfd051 100644
---- sd/source/ui/inc/taskpane/TitledControl.hxx
-+++ sd/source/ui/inc/taskpane/TitledControl.hxx
-@@ -135,6 +135,8 @@ public:
- */
- virtual bool IsExpandable (void) const;
-
-+ virtual void SetEnabledState(bool bFlag);
-+
- /** Ownership of the given data remains with the caller. The data
- is thus not destroyed when the destructor of this class is
- called.
-diff --git sd/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
-index 3a5663f..c1d86c0 100644
---- sd/source/ui/toolpanel/LayoutMenu.cxx
-+++ sd/source/ui/toolpanel/LayoutMenu.cxx
-@@ -63,6 +63,7 @@
- #include <vcl/image.hxx>
- #include <svtools/languageoptions.hxx>
- #include <sfx2/app.hxx>
-+#include "taskpane/TitledControl.hxx"
- #include <sfx2/dispatch.hxx>
- #include <sfx2/request.hxx>
- #include <comphelper/processfactory.hxx>
-@@ -413,8 +414,12 @@ bool LayoutMenu::IsResizable (void)
- return true;
- }
-
--
--
-+void LayoutMenu::DetectEnabledState(bool bFlag)
-+{
-+ TreeNode* pParentNode = GetParentNode();
-+ TreeNode* pGrandparentNode = pParentNode->GetParentNode();
-+ dynamic_cast<TitledControl*>(pGrandparentNode)->SetEnabledState(bFlag);
-+}
-
- ::Window* LayoutMenu::GetWindow (void)
- {
-@@ -905,12 +910,20 @@ void LayoutMenu::UpdateSelection (void)
- // Find the entry of the menu for to the layout.
- USHORT nItemCount (GetItemCount());
- for (USHORT nId=1; nId<=nItemCount; nId++)
-+ {
- if (*static_cast<AutoLayout*>(GetItemData(nId)) == aLayout)
- {
- SelectItem(nId);
- bItemSelected = true;
- break;
- }
-+ }
-+
-+ DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(pViewShell);
-+ if (pDrawViewShell != NULL)
-+ {
-+ DetectEnabledState(pDrawViewShell->GetEditMode() != EM_MASTERPAGE);
-+ }
- }
- while (false);
-
-diff --git sd/source/ui/toolpanel/LayoutMenu.hxx sd/source/ui/toolpanel/LayoutMenu.hxx
-index 35280f2..9090296 100644
---- sd/source/ui/toolpanel/LayoutMenu.hxx
-+++ sd/source/ui/toolpanel/LayoutMenu.hxx
-@@ -131,6 +131,8 @@ public:
- void Execute (SfxRequest& rRequest);
- void GetState (SfxItemSet& rItemSet);
-
-+ void DetectEnabledState(bool bFlag);
-+
- /** Call this method when the set of displayed layouts is not up-to-date
- anymore. It will re-assemple this set according to the current
- settings.
-diff --git sd/source/ui/toolpanel/TitleBar.cxx sd/source/ui/toolpanel/TitleBar.cxx
-index f401371..6e25210 100644
---- sd/source/ui/toolpanel/TitleBar.cxx
-+++ sd/source/ui/toolpanel/TitleBar.cxx
-@@ -216,6 +216,14 @@ bool TitleBar::IsExpanded (void) const
- }
-
-
-+void TitleBar::SetEnabledState(bool bFlag)
-+{
-+ if(bFlag)
-+ Enable();
-+ else
-+ Disable();
-+ Invalidate ();
-+}
-
-
- void TitleBar::SetFocus (bool bFlag)
-@@ -454,15 +462,21 @@ void TitleBar::PaintText (const Rectangle& rTextBox)
-
- USHORT TitleBar::GetTextStyle (void)
- {
-- return TEXT_DRAW_LEFT
-- | TEXT_DRAW_TOP
-- | TEXT_DRAW_MULTILINE
-- | TEXT_DRAW_WORDBREAK;
-+ if(IsEnabled())
-+ {
-+ return TEXT_DRAW_LEFT
-+ | TEXT_DRAW_TOP
-+ | TEXT_DRAW_MULTILINE
-+ | TEXT_DRAW_WORDBREAK;
-+ }
-+ else
-+ {
-+ return TEXT_DRAW_DISABLE;
-+ }
- }
-
-
-
--
- void TitleBar::PaintBackground (const Rectangle& rTitleBarBox)
- {
- // Fill a slightly rounded rectangle.
-diff --git sd/source/ui/toolpanel/TitledControl.cxx sd/source/ui/toolpanel/TitledControl.cxx
-index 829c3be..495a5d3 100644
---- sd/source/ui/toolpanel/TitledControl.cxx
-+++ sd/source/ui/toolpanel/TitledControl.cxx
-@@ -292,7 +292,7 @@ bool TitledControl::Expand (bool bExpanded)
- {
- bool bExpansionStateChanged (false);
-
-- if (IsExpandable())
-+ if (IsExpandable() && IsEnabled())
- {
- if (GetTitleBar()->IsExpanded() != bExpanded)
- bExpansionStateChanged |= GetTitleBar()->Expand (bExpanded);
-@@ -338,6 +338,25 @@ bool TitledControl::IsExpanded (void) const
- return false;
- }
-
-+void TitledControl::SetEnabledState(bool bFlag)
-+{
-+ if (!bFlag)
-+ {
-+ GetParentNode()->GetControlContainer().SetExpansionState (
-+ this,
-+ ControlContainer::ES_COLLAPSE);
-+ Disable();
-+ }
-+ else
-+ {
-+ GetParentNode()->GetControlContainer().SetExpansionState (
-+ this,
-+ ControlContainer::ES_EXPAND);
-+ Enable();
-+ }
-+
-+ GetTitleBar()->SetEnabledState(bFlag);
-+}
-
-
-
-@@ -406,7 +425,8 @@ IMPL_LINK(TitledControl, WindowEventListener,
- switch (pWindowEvent->GetId())
- {
- case VCLEVENT_WINDOW_MOUSEBUTTONUP:
-- (*mpClickHandler)(*this);
-+ if (IsEnabled())
-+ (*mpClickHandler)(*this);
- break;
- }
- }
-diff --git sd/source/ui/tools/EventMultiplexer.cxx sd/source/ui/tools/EventMultiplexer.cxx
-index 786308a..afe88eb 100644
---- sd/source/ui/tools/EventMultiplexer.cxx
-+++ sd/source/ui/tools/EventMultiplexer.cxx
-@@ -783,8 +783,9 @@ void EventMultiplexer::Implementation::CallListeners (
-
- void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEvent)
- {
-- ListenerList::const_iterator iListener (maListeners.begin());
-- ListenerList::const_iterator iListenerEnd (maListeners.end());
-+ ListenerList aCopyListeners( maListeners );
-+ ListenerList::iterator iListener (aCopyListeners.begin());
-+ ListenerList::const_iterator iListenerEnd (aCopyListeners.end());
- for (; iListener!=iListenerEnd; ++iListener)
- {
- if ((iListener->second && rEvent.meEventId) != 0)
More information about the ooo-build-commit
mailing list