You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/02/19 10:09:05 UTC
svn commit: r1447641 [1/9] - in /openoffice/branches/sidebar/main:
default_images/sfx2/res/symphony/ framework/inc/services/
framework/source/services/ offapi/com/sun/star/ui/
officecfg/registry/data/org/openoffice/Office/
officecfg/registry/data/org/o...
Author: af
Date: Tue Feb 19 09:09:02 2013
New Revision: 1447641
URL: http://svn.apache.org/r1447641
Log:
i121420: Added support for Impress panels. Modified sidebar configuration scheme.
Added:
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock01_sd.png (with props)
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock02_sd.png (with props)
openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock03_sd.png (with props)
openoffice/branches/sidebar/main/offapi/com/sun/star/ui/LayoutSize.idl
openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebar.idl
openoffice/branches/sidebar/main/sd/sdi/SidebarViewShell.sdi
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/TaskPanelResource.cxx
openoffice/branches/sidebar/main/sd/source/ui/inc/SidebarPanelId.hxx
openoffice/branches/sidebar/main/sd/source/ui/inc/SidebarViewShell.hxx
openoffice/branches/sidebar/main/sd/source/ui/inc/framework/TaskPanelResource.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/
openoffice/branches/sidebar/main/sd/source/ui/sidebar/IDisposable.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/ILayoutableWindow.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/ISidebarReceiver.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFocusManager.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarShellManager.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarShellManager.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarViewShell.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/UIElementWrapper.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/UIElementWrapper.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/makefile.mk
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/AllMasterPagesSelector.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/AllMasterPagesSelector.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/CurrentMasterPagesSelector.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/CurrentMasterPagesSelector.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/CustomAnimationPanel.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/CustomAnimationPanel.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/DocumentHelper.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/DocumentHelper.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/LayoutMenu.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/LayoutMenu.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainer.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainer.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainerFiller.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainerFiller.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainerProviders.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainerProviders.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainerQueue.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageContainerQueue.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageDescriptor.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageDescriptor.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPageObserver.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPagesSelector.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/MasterPagesSelector.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/PanelBase.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/PanelBase.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/PreviewValueSet.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/PreviewValueSet.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/RecentMasterPagesSelector.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/RecentMasterPagesSelector.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/RecentlyUsedMasterPages.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/RecentlyUsedMasterPages.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/SlideTransitionPanel.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/SlideTransitionPanel.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/TableDesignPanel.cxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/TableDesignPanel.hxx
openoffice/branches/sidebar/main/sd/source/ui/sidebar/panels/makefile.mk
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/PopupContainer.hxx (with props)
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextMatcher.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ContextMatcher.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckLayouter.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckLayouter.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/PopupContainer.cxx (with props)
openoffice/branches/sidebar/main/sfx2/source/sidebar/ToolBox.hxx (with props)
openoffice/branches/sidebar/main/sfx2/source/sidebar/ToolBoxBackground.hxx_ (with props)
Removed:
openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XVerticalStackLayoutElement.idl
openoffice/branches/sidebar/main/sd/sdi/ToolPanelViewShell.sdi
openoffice/branches/sidebar/main/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
openoffice/branches/sidebar/main/sd/source/ui/inc/taskpane/PanelId.hxx
openoffice/branches/sidebar/main/sd/source/ui/toolpanel/controls/
openoffice/branches/sidebar/main/sfx2/inc/sfx2/SidebarChildWindow.hxx
Modified:
openoffice/branches/sidebar/main/framework/inc/services/ContextChangeEventMultiplexer.hxx
openoffice/branches/sidebar/main/framework/source/services/ContextChangeEventMultiplexer.cxx
openoffice/branches/sidebar/main/offapi/com/sun/star/ui/ContextChangeEventObject.idl
openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebarPanel.idl
openoffice/branches/sidebar/main/offapi/com/sun/star/ui/makefile.mk
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu
openoffice/branches/sidebar/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
openoffice/branches/sidebar/main/sc/source/ui/app/scdll.cxx
openoffice/branches/sidebar/main/sc/source/ui/view/tabvwsh.cxx
openoffice/branches/sidebar/main/sd/inc/glob.hrc
openoffice/branches/sidebar/main/sd/inc/glob.hxx
openoffice/branches/sidebar/main/sd/prj/build.lst
openoffice/branches/sidebar/main/sd/sdi/makefile.mk
openoffice/branches/sidebar/main/sd/sdi/sdslots.sdi
openoffice/branches/sidebar/main/sd/source/ui/accessibility/makefile.mk
openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.cxx
openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.hxx
openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.cxx
openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.hxx
openoffice/branches/sidebar/main/sd/source/ui/app/sddll1.cxx
openoffice/branches/sidebar/main/sd/source/ui/app/sddll2.cxx
openoffice/branches/sidebar/main/sd/source/ui/app/sdmod1.cxx
openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneChildWindows.cxx
openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneShells.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/BasicPaneFactory.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/BasicPaneFactory.hxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/BasicViewFactory.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/Pane.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/TaskPanelFactory.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/ViewShellWrapper.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/factories/makefile.mk
openoffice/branches/sidebar/main/sd/source/ui/framework/module/ImpressModule.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/module/ToolPanelModule.cxx
openoffice/branches/sidebar/main/sd/source/ui/framework/tools/FrameworkHelper.cxx
openoffice/branches/sidebar/main/sd/source/ui/inc/PaneChildWindows.hxx
openoffice/branches/sidebar/main/sd/source/ui/inc/ViewShell.hxx
openoffice/branches/sidebar/main/sd/source/ui/inc/framework/FrameworkHelper.hxx
openoffice/branches/sidebar/main/sd/source/ui/inc/framework/Pane.hxx
openoffice/branches/sidebar/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
openoffice/branches/sidebar/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
openoffice/branches/sidebar/main/sd/source/ui/table/tablefunction.cxx
openoffice/branches/sidebar/main/sd/source/ui/unoidl/facreg.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/ToolBarManager.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/ViewShellBase.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/ViewShellImplementation.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/ViewShellManager.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviews6.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drvwshrg.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/outlnvsh.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/viewshel.cxx
openoffice/branches/sidebar/main/sd/util/makefile.mk
openoffice/branches/sidebar/main/sd/util/sd.component
openoffice/branches/sidebar/main/sfx2/Library_sfx.mk
openoffice/branches/sidebar/main/sfx2/Package_inc.mk
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sfxsids.hrc
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/ControlFactory.hxx
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/ControllerItem.hxx
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/EnumContext.hxx
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx
openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/Theme.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Context.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Context.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ControlFactory.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ControllerItem.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Deck.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Deck.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckConfiguration.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckDescriptor.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckDescriptor.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelDescriptor.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelDescriptor.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ResourceManager.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ResourceManager.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.hrc
openoffice/branches/sidebar/main/sfx2/source/sidebar/Sidebar.src
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarChildWindow.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarDockingWindow.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarDockingWindow.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarPanel.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarPanelBase.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarToolBox.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/TabBar.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/TabBar.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/TabItem.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/Theme.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/TitleBar.cxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/TitleBar.hxx
openoffice/branches/sidebar/main/sfx2/source/sidebar/ToolBoxBackground.cxx
openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx
openoffice/branches/sidebar/main/sw/source/ui/app/swmodule.cxx
openoffice/branches/sidebar/main/sw/source/ui/uiview/view0.cxx
Added: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock01_sd.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock01_sd.png?rev=1447641&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock01_sd.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock01_sd.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock02_sd.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock02_sd.png?rev=1447641&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock02_sd.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock02_sd.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock03_sd.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock03_sd.png?rev=1447641&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock03_sd.png
------------------------------------------------------------------------------
svn:executable = *
Propchange: openoffice/branches/sidebar/main/default_images/sfx2/res/symphony/hpaneldock03_sd.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: openoffice/branches/sidebar/main/framework/inc/services/ContextChangeEventMultiplexer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/framework/inc/services/ContextChangeEventMultiplexer.hxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/framework/inc/services/ContextChangeEventMultiplexer.hxx (original)
+++ openoffice/branches/sidebar/main/framework/inc/services/ContextChangeEventMultiplexer.hxx Tue Feb 19 09:09:02 2013
@@ -26,7 +26,7 @@
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/basemutex.hxx>
#include "macros/xserviceinfo.hxx"
@@ -37,10 +37,11 @@
namespace
{
- typedef ::cppu::WeakComponentImplHelper3 <
+ typedef ::cppu::WeakComponentImplHelper4 <
css::ui::XContextChangeEventMultiplexer,
css::lang::XSingleComponentFactory,
- css::lang::XServiceInfo
+ css::lang::XServiceInfo,
+ css::lang::XEventListener
> ContextChangeEventMultiplexerInterfaceBase;
}
@@ -97,6 +98,11 @@ public:
virtual cssu::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames (void)
throw (cssu::RuntimeException);
+ // XEventListener
+ virtual void SAL_CALL disposing (
+ const css::lang::EventObject& rEvent)
+ throw (cssu::RuntimeException);
+
static ::rtl::OUString SAL_CALL impl_getStaticImplementationName (void);
static cssu::Reference<cssu::XInterface> SAL_CALL impl_createFactory (
const cssu::Reference<cssl::XMultiServiceFactory>& xServiceManager);
@@ -122,7 +128,10 @@ private:
void BroadcastEventToSingleContainer (
const css::ui::ContextChangeEventObject& rEventObject,
const cssu::Reference<cssu::XInterface>& rxEventFocus);
-
+ FocusDescriptor* GetFocusDescriptor (
+ const cssu::Reference<cssu::XInterface>& rxEventFocus,
+ const bool bCreateWhenMissing);
+
static cssu::Sequence< ::rtl::OUString > SAL_CALL static_GetSupportedServiceNames (void);
static cssu::Reference<cssu::XInterface> SAL_CALL static_CreateInstance (
const cssu::Reference<cssu::XComponentContext>& rxComponentContext)
Modified: openoffice/branches/sidebar/main/framework/source/services/ContextChangeEventMultiplexer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/framework/source/services/ContextChangeEventMultiplexer.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/framework/source/services/ContextChangeEventMultiplexer.cxx (original)
+++ openoffice/branches/sidebar/main/framework/source/services/ContextChangeEventMultiplexer.cxx Tue Feb 19 09:09:02 2013
@@ -28,6 +28,9 @@ using ::rtl::OUString;
#define A2S(s) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+using namespace css;
+using namespace cssu;
+
namespace framework {
#define IMPLEMENTATION_NAME "org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer"
@@ -64,9 +67,16 @@ void SAL_CALL ContextChangeEventMultiple
iContainer!=iEnd;
++iContainer)
{
+ // Unregister from the focus object.
+ Reference<lang::XComponent> xComponent (iContainer->first, UNO_QUERY);
+ if (xComponent.is())
+ xComponent->removeEventListener(this);
+
+ // Tell all listeners that we are being disposed.
+ const FocusDescriptor& rFocusDescriptor (iContainer->second);
for (ListenerContainer::const_iterator
- iListener(iContainer->second.maListeners.begin()),
- iContainerEnd(iContainer->second.maListeners.end());
+ iListener(rFocusDescriptor.maListeners.begin()),
+ iContainerEnd(rFocusDescriptor.maListeners.end());
iListener!=iContainerEnd;
++iListener)
{
@@ -91,18 +101,10 @@ void SAL_CALL ContextChangeEventMultiple
static_cast<XWeak*>(this),
0);
- ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
- if (iDescriptor == maListeners.end())
- {
- // Create a new listener container for the event focus.
- iDescriptor = maListeners.insert(
- ListenerMap::value_type(
- rxEventFocus,
- FocusDescriptor())).first;
- }
- if (iDescriptor != maListeners.end())
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, true);
+ if (pFocusDescriptor != NULL)
{
- ListenerContainer& rContainer (iDescriptor->second.maListeners);
+ ListenerContainer& rContainer (pFocusDescriptor->maListeners);
if (::std::find(rContainer.begin(), rContainer.end(), rxListener) == rContainer.end())
rContainer.push_back(rxListener);
else
@@ -115,12 +117,12 @@ void SAL_CALL ContextChangeEventMultiple
// Send out an initial event that informs the new listener about
// the current context.
- if (rxEventFocus.is() && iDescriptor != maListeners.end())
+ if (rxEventFocus.is() && pFocusDescriptor!=NULL)
{
css::ui::ContextChangeEventObject aEvent (
NULL,
- iDescriptor->second.msCurrentApplicationName,
- iDescriptor->second.msCurrentContextName);
+ pFocusDescriptor->msCurrentApplicationName,
+ pFocusDescriptor->msCurrentContextName);
rxListener->notifyContextChangeEvent(aEvent);
}
}
@@ -138,21 +140,18 @@ void SAL_CALL ContextChangeEventMultiple
A2S("can not remove an empty reference"),
static_cast<XWeak*>(this), 0);
- ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
- if (iDescriptor != maListeners.end())
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false);
+ if (pFocusDescriptor != NULL)
{
- ListenerContainer& rContainer (iDescriptor->second.maListeners);
+ ListenerContainer& rContainer (pFocusDescriptor->maListeners);
const ListenerContainer::iterator iListener (
::std::find(rContainer.begin(), rContainer.end(), rxListener));
if (iListener != rContainer.end())
{
rContainer.erase(iListener);
- // Remove the listener container as well when its last
- // listener was just removed. This prevents us from
- // holding the focus alive.
- if (rContainer.empty())
- maListeners.erase(iDescriptor);
+ // We hold on to the focus descriptor even when the last listener has been removed.
+ // This allows us to keep track of the current context and send it to new listeners.
}
}
@@ -170,7 +169,6 @@ void SAL_CALL ContextChangeEventMultiple
A2S("can not remove an empty reference"),
static_cast<XWeak*>(this), 0);
- ::std::vector<cssu::Reference<cssu::XInterface> > aContainersToRemove;
for (ListenerMap::iterator
iContainer(maListeners.begin()),
iEnd(maListeners.end());
@@ -183,21 +181,10 @@ void SAL_CALL ContextChangeEventMultiple
{
iContainer->second.maListeners.erase(iListener);
- // When we just removed the last listener then mark the
- // container as to be removed.
- if (iContainer->second.maListeners.empty())
- aContainersToRemove.push_back(iContainer->first);
+ // We hold on to the focus descriptor even when the last listener has been removed.
+ // This allows us to keep track of the current context and send it to new listeners.
}
}
-
- for (::std::vector<cssu::Reference<cssu::XInterface> >::iterator
- iFocus(aContainersToRemove.begin()),
- iEnd(aContainersToRemove.end());
- iFocus!=iEnd;
- ++iFocus)
- {
- maListeners.erase(*iFocus);
- }
}
@@ -211,11 +198,11 @@ void SAL_CALL ContextChangeEventMultiple
// Remember the current context.
if (rxEventFocus.is())
{
- ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
- if (iDescriptor != maListeners.end())
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, true);
+ if (pFocusDescriptor != NULL)
{
- iDescriptor->second.msCurrentApplicationName = rEventObject.ApplicationName;
- iDescriptor->second.msCurrentContextName = rEventObject.ContextName;
+ pFocusDescriptor->msCurrentApplicationName = rEventObject.ApplicationName;
+ pFocusDescriptor->msCurrentContextName = rEventObject.ContextName;
}
}
@@ -231,12 +218,12 @@ void ContextChangeEventMultiplexer::Broa
const css::ui::ContextChangeEventObject& rEventObject,
const cssu::Reference<cssu::XInterface>& rxEventFocus)
{
- ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
- if (iDescriptor != maListeners.end())
+ FocusDescriptor* pFocusDescriptor = GetFocusDescriptor(rxEventFocus, false);
+ if (pFocusDescriptor != NULL)
{
// Create a copy of the listener container to avoid problems
// when one of the called listeners calls add... or remove...
- ListenerContainer aContainer (iDescriptor->second.maListeners);
+ ListenerContainer aContainer (pFocusDescriptor->maListeners);
for (ListenerContainer::const_iterator
iListener(aContainer.begin()),
iEnd(aContainer.end());
@@ -251,6 +238,33 @@ void ContextChangeEventMultiplexer::Broa
+ContextChangeEventMultiplexer::FocusDescriptor* ContextChangeEventMultiplexer::GetFocusDescriptor (
+ const cssu::Reference<cssu::XInterface>& rxEventFocus,
+ const bool bCreateWhenMissing)
+{
+ ListenerMap::iterator iDescriptor (maListeners.find(rxEventFocus));
+ if (iDescriptor == maListeners.end() && bCreateWhenMissing)
+ {
+ // Listen for the focus being disposed.
+ Reference<lang::XComponent> xComponent (rxEventFocus, UNO_QUERY);
+ if (xComponent.is())
+ xComponent->addEventListener(this);
+
+ // Create a new listener container for the event focus.
+ iDescriptor = maListeners.insert(
+ ListenerMap::value_type(
+ rxEventFocus,
+ FocusDescriptor())).first;
+ }
+ if (iDescriptor != maListeners.end())
+ return &iDescriptor->second;
+ else
+ return NULL;
+}
+
+
+
+
// XSingleComponentFactory
cssu::Reference<cssu::XInterface> SAL_CALL ContextChangeEventMultiplexer::createInstanceWithContext (
@@ -308,6 +322,26 @@ cssu::Sequence<OUString> SAL_CALL Contex
+void SAL_CALL ContextChangeEventMultiplexer::disposing (
+ const css::lang::EventObject& rEvent)
+ throw (cssu::RuntimeException)
+{
+ ListenerMap::iterator iDescriptor (maListeners.find(rEvent.Source));
+
+ if (iDescriptor == maListeners.end())
+ {
+ OSL_ASSERT(iDescriptor != maListeners.end());
+ return;
+ }
+
+ // Should we notify the remaining listeners?
+
+ maListeners.erase(iDescriptor);
+}
+
+
+
+
// Local and static methods.
OUString SAL_CALL ContextChangeEventMultiplexer::impl_getStaticImplementationName (void)
Modified: openoffice/branches/sidebar/main/offapi/com/sun/star/ui/ContextChangeEventObject.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/offapi/com/sun/star/ui/ContextChangeEventObject.idl?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/offapi/com/sun/star/ui/ContextChangeEventObject.idl (original)
+++ openoffice/branches/sidebar/main/offapi/com/sun/star/ui/ContextChangeEventObject.idl Tue Feb 19 09:09:02 2013
@@ -38,7 +38,6 @@ module com { module sun { module star {
struct ContextChangeEventObject : com::sun::star::lang::EventObject
{
/** Return the name of the application.
- Known names are: writer, calc, impress, draw, base.
*/
string ApplicationName;
Added: openoffice/branches/sidebar/main/offapi/com/sun/star/ui/LayoutSize.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/offapi/com/sun/star/ui/LayoutSize.idl?rev=1447641&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/offapi/com/sun/star/ui/LayoutSize.idl (added)
+++ openoffice/branches/sidebar/main/offapi/com/sun/star/ui/LayoutSize.idl Tue Feb 19 09:09:02 2013
@@ -0,0 +1,50 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef __com_sun_star_ui_LayoutSize_idl__
+#define __com_sun_star_ui_LayoutSize_idl__
+
+module com { module sun { module star { module ui {
+
+/** Size used for layouting windows.
+ It specifies a range of valid values and a preferred value.
+ The values must not violate the relation 0 <= Minimum <= Preferred <= Maximum.
+
+ @param Minimum
+ Zero or positive. The value itself is included in the valid
+ range.
+ @param Maximum
+ A value larger than or equal to Minimum.
+ The special value -1 means that there is no upper bound. Every value larger than or
+ equal to Minimum is valid.
+ @param Preferred
+ The preferred size inside the valid range.
+*/
+struct LayoutSize
+{
+ long Minimum;
+ long Maximum;
+ long Preferred;
+};
+
+}; }; }; };
+
+#endif
Added: openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebar.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebar.idl?rev=1447641&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebar.idl (added)
+++ openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebar.idl Tue Feb 19 09:09:02 2013
@@ -0,0 +1,46 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#ifndef __com_sun_star_ui_XSidebar_idl__
+#define __com_sun_star_ui_XSidebar_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+module com { module sun { module star { module ui {
+
+/** Interface of the sidebar that allows its elements like panels to eg request layouts.
+*/
+interface XSidebar
+{
+ /** Request layout of the sidebar.
+ Call this method when one of the panels wants to change its size due to
+ late initilization or different content after a context change.
+ */
+ void requestLayout ();
+} ;
+
+} ; } ; } ; } ;
+
+#endif
Modified: openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebarPanel.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebarPanel.idl?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebarPanel.idl (original)
+++ openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebarPanel.idl Tue Feb 19 09:09:02 2013
@@ -39,27 +39,48 @@
#ifndef __com_sun_star_beans_XPropertySet_idl__
#include <com/sun/star/beans/XPropertySet.idl>
#endif
+#ifndef __com_sun_star_ui_LayoutSize_idl__
+#include <com/sun/star/ui/LayoutSize.idl>
+#endif
module com { module sun { module star { module ui {
-/** Give access to data for one sidebar panel.
+/** Optional interface of sidebar panels.
*/
interface XSidebarPanel
{
- /** Return a canvas that will paint directly into the panel.
- It is created on the first call.
+ /** For a given width of the container the layouter asks every ui element for its
+ optimal height.
+
+ The height to which a ui element is set may differ from the returned value.
+
+ The height is set via the XWindow interface.
*/
- rendering::XCanvas getCanvas ();
+ LayoutSize getHeightForWidth ( [in] long nWidth);
- /** Return the position of the content area (without any border or decoration)
- in screen coordinates.
+ /** If the panel has a menu or dialog then show it now.
*/
- awt::Point getPositionOnScreen ();
+ void showMenu ();
+
+ /** Return whether the panel supports (ie wants to be displayed
+ for) the given context.
- /** Return a property set that represents the theme that is used to render the panel and its controls.
- Note that the same properties are shared by all panels and decks.
+ The decision of whether to display a panel for a given context
+ depends on two sources of information.
+ One is the configuration
+ (org.openoffice.Office.UI/Sidebar/Content/PanelList).
+ The other is this function.
+
+ @param sApplicationName
+ Name of an application (reference of valid values needed,
+ Wiki page?)
+ @param sContextName
+ Name of the context in the scope of the application
+ (reference needed).
*/
- beans::XPropertySet getThemeProperties ();
+ boolean isContextSupported (
+ [in] string sApplicationName,
+ [in] string sContextName);
} ;
} ; } ; } ; } ;
Modified: openoffice/branches/sidebar/main/offapi/com/sun/star/ui/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/offapi/com/sun/star/ui/makefile.mk?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/offapi/com/sun/star/ui/makefile.mk (original)
+++ openoffice/branches/sidebar/main/offapi/com/sun/star/ui/makefile.mk Tue Feb 19 09:09:02 2013
@@ -50,6 +50,7 @@ IDLFILES=\
ItemDescriptor.idl \
ItemStyle.idl \
ItemType.idl \
+ LayoutSize.idl \
ModuleUICategoryDescription.idl \
ModuleUICommandDescription.idl \
ModuleUIConfigurationManager.idl \
@@ -74,6 +75,7 @@ IDLFILES=\
XImageManager.idl \
XModuleUIConfigurationManager.idl \
XModuleUIConfigurationManagerSupplier.idl \
+ XSidebar.idl \
XSidebarPanel.idl \
XUIConfiguration.idl \
XUIConfigurationListener.idl \
@@ -86,7 +88,6 @@ IDLFILES=\
XUIElementFactoryRegistration.idl \
XUIElementSettings.idl \
XUIFunctionListener.idl \
- XVerticalStackLayoutElement.idl \
XToolPanel.idl
# ------------------------------------------------------------------
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Impress.xcu Tue Feb 19 09:09:02 2013
@@ -46,11 +46,6 @@
<value>private:resource/pane/LeftDrawPane</value>
</prop>
</node>
- <node oor:name="R3" oor:op="replace">
- <prop oor:name="URL">
- <value>private:resource/pane/RightPane</value>
- </prop>
- </node>
</node>
</node>
<node oor:name="F1" oor:op="replace">
@@ -90,7 +85,7 @@
</node>
<node oor:name="R6" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/view/TaskPane</value>
+ <value>private:resource/view/SidebarView</value>
</prop>
</node>
<node oor:name="R7" oor:op="replace">
@@ -114,43 +109,65 @@
</node>
<node oor:name="F3" oor:op="replace">
<prop oor:name="ServiceName">
- <value>com.sun.star.drawing.framework.TaskPanelFactory</value>
+ <value>com.sun.star.comp.Draw.framework.TaskPanelFactory</value>
</prop>
<node oor:name="ResourceList">
- <node oor:name="R0" oor:op="replace">
+ <node oor:name="R0a" oor:op="replace">
+ <prop oor:name="URL">
+ <value>private:resource/toolpanel/AllMasterPages</value>
+ </prop>
+ </node>
+ <node oor:name="R0b" oor:op="replace">
+ <prop oor:name="URL">
+ <value>private:resource/toolpanel/RecentMasterPages</value>
+ </prop>
+ </node>
+ <node oor:name="R0c" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/MasterPages</value>
+ <value>private:resource/toolpanel/UsedMasterPages</value>
</prop>
</node>
<node oor:name="R1" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/Layouts</value>
+ <value>private:resource/toolpanel/Layouts</value>
</prop>
</node>
<node oor:name="R2" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/TableDesign</value>
+ <value>private:resource/toolpanel/TableDesign</value>
</prop>
</node>
<node oor:name="R3" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/CustomAnimations</value>
+ <value>private:resource/toolpanel/CustomAnimations</value>
</prop>
</node>
<node oor:name="R4" oor:op="replace">
<prop oor:name="URL">
- <value>private:resource/toolpanel/DrawingFramework/SlideTransitions</value>
+ <value>private:resource/toolpanel/SlideTransitions</value>
</prop>
</node>
</node>
</node>
- </node>
- <node oor:name="StartupServices">
- <node oor:name="S0" oor:op="replace">
+ <node oor:name="F4" oor:op="replace">
<prop oor:name="ServiceName">
- <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
+ <value>org.openoffice.comp.Draw.framework.SidebarFactory</value>
</prop>
+ <node oor:name="ResourceList">
+ <node oor:name="P0" oor:op="replace">
+ <prop oor:name="URL">
+ <value>private:resource/pane/SidebarPane</value>
+ </prop>
+ </node>
+ </node>
</node>
+ </node>
+ <node oor:name="StartupServices">
+ <node oor:name="S0" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.drawing.framework.PresentationFactoryProvider</value>
+ </prop>
+ </node>
</node>
</node>
</node>
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Factories.xcu Tue Feb 19 09:09:02 2013
@@ -81,32 +81,32 @@
<value>com.sun.star.comp.framework.StatusBarFactory</value>
</prop>
</node>
- <node oor:name="org.openoffice.Office.Impress.ImpressToolPanelFactory" oor:op="replace">
+ <node oor:name="SvxPanelFactory" oor:op="replace">
<prop oor:name="Type">
<value>toolpanel</value>
</prop>
<prop oor:name="Name">
- <value>DrawingFramework</value>
+ <value>SvxPanelFactory</value>
</prop>
<prop oor:name="Module">
- <value>com.sun.star.presentation.PresentationDocument</value>
+ <value/>
</prop>
<prop oor:name="FactoryImplementation">
- <value>com.sun.star.drawing.DefaultToolPanelFactory</value>
+ <value>org.apache.openoffice.comp.svx.sidebar.PanelFactory</value>
</prop>
</node>
- <node oor:name="SvxPanelFactory" oor:op="replace">
+ <node oor:name="SdPanelFactory" oor:op="replace">
<prop oor:name="Type">
<value>toolpanel</value>
</prop>
<prop oor:name="Name">
- <value>SvxPanelFactory</value>
+ <value>SdPanelFactory</value>
</prop>
<prop oor:name="Module">
- <value/>
+ <value></value>
</prop>
<prop oor:name="FactoryImplementation">
- <value>org.apache.openoffice.comp.svx.sidebar.PanelFactory</value>
+ <value>org.openoffice.comp.Draw.framework.SidebarFactory</value>
</prop>
</node>
</node>
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu Tue Feb 19 09:09:02 2013
@@ -797,61 +797,6 @@
<value>true</value>
</prop>
</node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/MasterPages" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Master Pages</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/PresentationLayout</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/Layouts" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Layouts</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/ModifyPage</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/TableDesign" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Table Design</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/InsertTable</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/CustomAnimations" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Custom Animation</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/CustomAnimation</value>
- </prop>
- </node>
- <node oor:name="private:resource/toolpanel/DrawingFramework/SlideTransitions" oor:op="replace">
- <prop oor:name="Visible" oor:type="xs:boolean">
- <value>false</value>
- </prop>
- <prop oor:name="UIName" oor:type="xs:string">
- <value xml:lang="en-US">Slide Transition</value>
- </prop>
- <prop oor:name="ImageURL" oor:type="xs:string">
- <value>private:commandimage/RehearseTimings</value>
- </prop>
- </node>
<node oor:name="private:resource/toolbar/optimizetablebar" oor:op="replace">
<prop oor:name="Docked" oor:type="xs:boolean">
<value>false</value>
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu Tue Feb 19 09:09:02 2013
@@ -29,5 +29,11 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="10414" oor:op="replace">
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>true</value>
+ </prop>
+ </node>
</node>
+
</oor:component-data>
Modified: openoffice/branches/sidebar/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs Tue Feb 19 09:09:02 2013
@@ -34,10 +34,10 @@
<desc>Specification of decks and content panels of the sidebar.</desc>
</info>
<templates>
- <group oor:name="Context">
+ <group oor:name="ContextMatcherType">
<info>
- <desc>A context specifies the combination of application and application
- context (curor in table, selection active, text editing active).</desc>
+ <desc>A context specifies the combination of one application name and one or more
+ context names (eg cursor in table, selection active, text editing active).</desc>
</info>
<prop oor:name="Application" oor:type="xs:string" oor:localized="false">
<info>
@@ -48,13 +48,18 @@
com.sun.star.presentation.PresentationDocument (Impress),
com.sun.star.drawing.DrawingDocument (Draw)</desc>
</info>
- <value></value>
</prop>
- <prop oor:name="ApplicationContext" oor:type="xs:string" oor:localized="false">
+ <prop oor:name="IsContextListNegated" oor:type="xs:boolean">
<info>
- <desc>Name of an application specific context. The special name "any" matches any context name.</desc>
+ <desc>Use this to match the complement of the listed contexts. The application match is not negated.
+ Defaults to false (ie match the contexts as listed).</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ <prop oor:name="ContextList" oor:type="oor:string-list" oor:localized="false">
+ <info>
+ <desc>Names of application specific contexts. The special name "any" matches any context name.</desc>
</info>
- <value></value>
</prop>
</group>
<group oor:name="Deck">
@@ -93,11 +98,17 @@
</info>
<value></value>
</prop>
- <set oor:name="ContextList" oor:node-type="Context">
+ <set oor:name="ContextMatchers" oor:node-type="ContextMatcherType">
<info>
- <desc>List of contexts for which to show the deck.</desc>
+ <desc>One or more context matchers that define when to show the deck.</desc>
</info>
</set>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <info>
+ <desc>Index used for ordering decks in the tab bar. Smaller values correspond to positions nearer to the top of the tab bar.</desc>
+ </info>
+ <value>10000</value>
+ </prop>
</group>
<group oor:name="Panel">
<info>
@@ -133,25 +144,17 @@
</info>
<value></value>
</prop>
- <set oor:name="ContextList" oor:node-type="Context">
+ <set oor:name="ContextMatchers" oor:node-type="ContextMatcherType">
<info>
- <desc>List of contexts for which to show the panel.</desc>
+ <desc>One or more context matchers that define when to show the panel.</desc>
</info>
</set>
- <prop oor:name="Layout" oor:type="xs:string">
+ <prop oor:name="AskPanelForContextMatcher" oor:type="xs:boolean">
<info>
- <desc>Name of the layout to use to calculate the height of the panel.
- Known values are:
- full Use as much of the visible area as possible.
- When more than one panel use "full" then the available space is
- distributed equally.
- This is the fallback when the panel does not support the layout
- interface required by other layout names.
- vertical-stack Panel has to implement com::sun::star::ui::XVerticalStackLayoutElement.
- Use this layout if possible.
- </desc>
+ <desc>Sometimes the context matcher in the registry is too simple. In that case the panel can implement the XSidebarPanel interface and provide a more complex matcher in its isContextSupported() method. That method is only called when the value of this AsPanel property is set to true.
+ Defaults to false.</desc>
</info>
- <value></value>
+ <value>false</value>
</prop>
<prop oor:name="ImplementationURL" oor:type="xs:string">
<info>
@@ -171,6 +174,18 @@
</info>
<value>10000</value>
</prop>
+ <prop oor:name="HasMenu" oor:type="xs:boolean">
+ <info>
+ <desc>When true then the panel title bar displays a menu button. When clicked the ui::XSidebarPanel::showmenu() method is called.</desc>
+ </info>
+ <value>false</value>
+ </prop>
+ <prop oor:name="WantsCanvas" oor:type="xs:boolean">
+ <info>
+ <desc>Experimental: Set to true when panel wants to paint its content via a XCanvas.</desc>
+ </info>
+ <value>false</value>
+ </prop>
</group>
</templates>
<component>
Modified: openoffice/branches/sidebar/main/sc/source/ui/app/scdll.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/app/scdll.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/app/scdll.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/app/scdll.cxx Tue Feb 19 09:09:02 2013
@@ -37,7 +37,7 @@
#include <sot/clsids.hxx>
#include <sfx2/taskpane.hxx>
-#include <sfx2/SidebarChildWindow.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfile.hxx>
@@ -263,7 +263,7 @@ void ScDLL::Init()
// common SFX controller
::sfx2::TaskPaneWrapper::RegisterChildWindow( sal_False, pMod );
- ::sfx2::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
// Svx-StatusBar-Controller
SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
Modified: openoffice/branches/sidebar/main/sc/source/ui/view/tabvwsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/view/tabvwsh.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/view/tabvwsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/view/tabvwsh.cxx Tue Feb 19 09:09:02 2013
@@ -38,7 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/app.hxx>
-#include <sfx2/SidebarChildWindow.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <avmedia/mediaplayer.hxx>
#include "tabvwsh.hxx"
@@ -66,7 +66,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxVie
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
- SFX_CHILDWINDOW_REGISTRATION(::sfx2::SidebarChildWindow::GetChildWindowId());
+ SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId());
Modified: openoffice/branches/sidebar/main/sd/inc/glob.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/inc/glob.hrc?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/inc/glob.hrc (original)
+++ openoffice/branches/sidebar/main/sd/inc/glob.hrc Tue Feb 19 09:09:02 2013
@@ -127,15 +127,14 @@
#define STR_3DOBJECTBARSHELL RID_GLOB_START+104
#define STR_FONTWORKOBJECTBARSHELL RID_GLOB_START+105
#define STR_SLIDESORTERVIEWSHELL RID_GLOB_START+106
-#define STR_TASKPANEVIEWSHELL RID_GLOB_START+107
+#define STR_SIDEBARVIEWSHELL RID_GLOB_START+107
#define STR_MASTERPAGESSELECTOR RID_GLOB_START+108
-#define STR_TASKPANELAYOUTMENU RID_GLOB_START+109
+#define STR_SIDEBAR_LAYOUTMENU RID_GLOB_START+109
#define STR_MEDIAOBJECTBARSHELL RID_GLOB_START+110
#define STR_PAGE_NAME RID_GLOB_START+111
#define STR_SLIDE_NAME RID_GLOB_START+112
#define STR_LEFT_IMPRESS_PANE_SHELL RID_GLOB_START+113
#define STR_LEFT_DRAW_PANE_SHELL RID_GLOB_START+114
-#define STR_RIGHT_PANE_SHELL RID_GLOB_START+115
#define STR_TOOL_PANEL_SHELL RID_GLOB_START+116
#define RID_CUSTOMANIMATION_START RID_GLOB_START+120
Modified: openoffice/branches/sidebar/main/sd/inc/glob.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/inc/glob.hxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/inc/glob.hxx (original)
+++ openoffice/branches/sidebar/main/sd/inc/glob.hxx Tue Feb 19 09:09:02 2013
@@ -53,7 +53,7 @@
#define SD_IF_SD3DOBJECTBAR SFX_INTERFACE_SD_START + 17
#define SD_IF_SDFONTWORKOBJECTBAR SFX_INTERFACE_SD_START + 18
#define SD_IF_SDSLIDESORTERVIEWSHELL SFX_INTERFACE_SD_START + 19
-#define SD_IF_SDTASKPANEVIEWSHELL SFX_INTERFACE_SD_START + 20
+#define SD_IF_SDSIDEBARVIEWSHELL SFX_INTERFACE_SD_START + 20
#define SD_IF_SDMASTERPAGESSELECTOR SFX_INTERFACE_SD_START + 21
#define SD_IF_SDLAYOUTMENU SFX_INTERFACE_SD_START + 22
#define SD_IF_SDDRAWMEDIAOBJECTBAR SFX_INTERFACE_SD_START + 23
Modified: openoffice/branches/sidebar/main/sd/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/prj/build.lst?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/prj/build.lst (original)
+++ openoffice/branches/sidebar/main/sd/prj/build.lst Tue Feb 19 09:09:02 2013
@@ -18,9 +18,9 @@ sd sd\source\core\annotations nmake -
sd sd\source\ui\docshell nmake - all sd_docsh sd_sdi sd_inc NULL
sd sd\source\ui\unoidl nmake - all sd_unid sd_sdi sd_inc NULL
sd sd\source\ui\accessibility nmake - all sd_accessibility sd_inc NULL
-sd sd\source\ui\toolpanel nmake - all sd_toolpanel sd_sdi sd_inc NULL
-sd sd\source\ui\toolpanel\controls nmake - all sd_toolpanel_controls sd_sdi sd_inc NULL
sd sd\source\ui\tools nmake - all sd_tools sd_inc NULL
+sd sd\source\ui\sidebar nmake - all sd_sidebar sd_sdi sd_inc NULL
+sd sd\source\ui\sidebar\panels nmake - all sd_sidebar_panels sd_sdi sd_inc NULL
sd sd\source\ui\slidesorter\shell nmake - all sd_slsshell sd_sdi sd_inc NULL
sd sd\source\ui\slidesorter\model nmake - all sd_slsmodel sd_inc NULL
sd sd\source\ui\slidesorter\view nmake - all sd_slsview sd_inc NULL
@@ -44,5 +44,5 @@ sd sd\source\ui\framework\module
sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL
-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
+sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations sd_sidebar sd_sidebar_panels NULL
sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
Added: openoffice/branches/sidebar/main/sd/sdi/SidebarViewShell.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/SidebarViewShell.sdi?rev=1447641&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/SidebarViewShell.sdi (added)
+++ openoffice/branches/sidebar/main/sd/sdi/SidebarViewShell.sdi Tue Feb 19 09:09:02 2013
@@ -0,0 +1,127 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+interface MasterPagesSelectorInterface
+{
+ SID_TP_APPLY_TO_ALL_SLIDES
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_TP_APPLY_TO_SELECTED_SLIDES
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_TP_USE_FOR_NEW_PRESENTATIONS
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_TP_SHOW_SMALL_PREVIEW
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_TP_SHOW_LARGE_PREVIEW
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
+ SID_TP_EDIT_MASTER
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
+ // The copy and paste slots are included here so that they later can be
+ // disabled in order to remove them from context menus.
+ SID_CUT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_COPY
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_PASTE
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_DELETE_MASTER_PAGE
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+}
+
+interface TaskPaneLayoutMenuInterface
+{
+ SID_TP_APPLY_TO_SELECTED_SLIDES
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_INSERTPAGE_LAYOUT_MENU
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
+ // The copy and paste slots are included here so that they later can be
+ // disabled in order to remove them from context menus.
+ SID_CUT
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_COPY
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+ SID_PASTE
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+}
+
+shell MasterPagesSelector
+{
+ import MasterPagesSelectorInterface[Automation];
+}
+
+shell LayoutMenu
+{
+ import TaskPaneLayoutMenuInterface[Automation];
+}
+
+shell SidebarViewShell
+{
+}
+
Modified: openoffice/branches/sidebar/main/sd/sdi/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/makefile.mk?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/makefile.mk (original)
+++ openoffice/branches/sidebar/main/sd/sdi/makefile.mk Tue Feb 19 09:09:02 2013
@@ -61,8 +61,8 @@ SVSDI1DEPEND= \
tables.sdi\
outlnvsh.sdi \
SlideSorterController.sdi \
+ SidebarViewShell.sdi \
ViewShellBase.sdi \
- ToolPanelViewShell.sdi \
sdslots.hrc \
$(PRJ)$/inc$/app.hrc
@@ -84,7 +84,7 @@ SVSDI2DEPEND= \
mediaob.sdi \
outlnvsh.sdi \
ViewShellBase.sdi \
- ToolPanelViewShell.sdi \
+ SidebarViewShell.sdi \
sdslots.hrc \
$(PRJ)$/inc$/app.hrc
Modified: openoffice/branches/sidebar/main/sd/sdi/sdslots.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/sdslots.sdi?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/sdslots.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/sdslots.sdi Tue Feb 19 09:09:02 2013
@@ -100,5 +100,5 @@ ModulePrefix( "Sd" )
include "ViewShellBase.sdi"
include "mediaob.sdi"
include "tables.sdi"
- include "ToolPanelViewShell.sdi"
+ include "SidebarViewShell.sdi"
}
Modified: openoffice/branches/sidebar/main/sd/source/ui/accessibility/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/accessibility/makefile.mk?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/accessibility/makefile.mk (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/accessibility/makefile.mk Tue Feb 19 09:09:02 2013
@@ -49,12 +49,13 @@ SLOFILES = \
$(SLO)$/AccessibleViewForwarder.obj \
$(SLO)$/AccessibleOutlineEditSource.obj \
$(SLO)$/AccessiblePageShape.obj \
- $(SLO)$/AccessibleScrollPanel.obj \
$(SLO)$/AccessibleSlideSorterView.obj \
$(SLO)$/AccessibleSlideSorterObject.obj \
- $(SLO)$/AccessibleTreeNode.obj \
$(SLO)$/SdShapeTypes.obj
+#SIDEBAR_TO_BE_REMOVED
+# $(SLO)$/AccessibleScrollPanel.obj \
+# $(SLO)$/AccessibleTreeNode.obj \
EXCEPTIONSFILES=
Modified: openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.cxx Tue Feb 19 09:09:02 2013
@@ -59,6 +59,7 @@
#include <comphelper/sequence.hxx>
#include <sfx2/frame.hxx>
+#include <sfx2/sidebar/Theme.hxx>
#include <svx/unoapi.hxx>
#include <svx/svxids.hrc>
@@ -246,6 +247,8 @@ CustomAnimationPane::CustomAnimationPane
maLateInitTimer.SetTimeout(100);
maLateInitTimer.SetTimeoutHdl(LINK(this, CustomAnimationPane, lateInitCallback));
maLateInitTimer.Start();
+
+ UpdateLook();
}
CustomAnimationPane::~CustomAnimationPane()
@@ -1073,6 +1076,42 @@ void CustomAnimationPane::onContextMenu(
updateControls();
}
+
+
+
+void CustomAnimationPane::DataChanged (const DataChangedEvent& rEvent)
+{
+ (void)rEvent;
+ UpdateLook();
+}
+
+
+
+
+void CustomAnimationPane::UpdateLook (void)
+{
+ SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
+ if (mpFLModify != NULL)
+ mpFLModify->SetBackground(Wallpaper());
+ if (mpFLEffect != NULL)
+ mpFLEffect->SetBackground(Wallpaper());
+ if (mpFTStart != NULL)
+ mpFTStart->SetBackground(Wallpaper());
+ if (mpFTProperty != NULL)
+ mpFTProperty->SetBackground(Wallpaper());
+ if (mpFTSpeed != NULL)
+ mpFTSpeed->SetBackground(Wallpaper());
+ if (mpFTChangeOrder != NULL)
+ mpFTChangeOrder->SetBackground(Wallpaper());
+ if (mpFLSeperator1 != NULL)
+ mpFLSeperator1->SetBackground(Wallpaper());
+ if (mpFLSeperator2 != NULL)
+ mpFLSeperator2->SetBackground(Wallpaper());
+}
+
+
+
+
void addValue( STLPropertySet* pSet, sal_Int32 nHandle, const Any& rValue )
{
switch( pSet->getPropertyState( nHandle ) )
@@ -2540,8 +2579,10 @@ void CustomAnimationPane::updatePathFrom
if( pDocSh )
{
pWindow = new DialogListBox( pParent, WB_CLIPCHILDREN|WB_TABSTOP|WB_AUTOHSCROLL );
+ const Size aMinSize( pWindow->LogicToPixel( Size( 80, 256 ), MAP_APPFONT ) );
+ pWindow->SetSizePixel(aMinSize);
+ pWindow->SetBackground(Wallpaper(Color(COL_BLUE)));
- Size aMinSize( pWindow->LogicToPixel( Size( 80, 256 ), MAP_APPFONT ) );
::Window* pPaneWindow = new CustomAnimationPane( pWindow, rBase, aMinSize );
pWindow->SetChildWindow( pPaneWindow, aMinSize );
pWindow->SetText( pPaneWindow->GetText() );
@@ -2552,4 +2593,13 @@ void CustomAnimationPane::updatePathFrom
+
+sal_Int32 getCustomAnimationPanelMinimumHeight (::Window* pDialog)
+{
+ if (pDialog != NULL)
+ return pDialog->LogicToPixel(Size( 80, 256 ), MAP_APPFONT).Height();
+ else
+ return 0;
+}
+
}
Modified: openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.hxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.hxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/animations/CustomAnimationPane.hxx Tue Feb 19 09:09:02 2013
@@ -93,6 +93,9 @@ public:
virtual void onDoubleClick();
virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry );
+ // Window
+ virtual void DataChanged (const DataChangedEvent& rEvent);
+
void addUndo();
void updatePathFromMotionPathTag( const rtl::Reference< MotionPathTag >& xTag );
@@ -116,6 +119,7 @@ private:
::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect );
bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue );
+ void UpdateLook (void);
DECL_LINK( implControlHdl, Control* );
DECL_LINK( implPropertyHdl, Control* );
Modified: openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.cxx Tue Feb 19 09:09:02 2013
@@ -57,6 +57,7 @@
#include "framework/FrameworkHelper.hxx"
#include "DialogListBox.hxx"
+#include <sfx2/sidebar/Theme.hxx>
#include <algorithm>
#include <memory>
@@ -515,6 +516,8 @@ SlideTransitionPane::SlideTransitionPane
maLateInitTimer.SetTimeout(200);
maLateInitTimer.SetTimeoutHdl(LINK(this, SlideTransitionPane, LateInitCallback));
maLateInitTimer.Start();
+
+ UpdateLook();
}
SlideTransitionPane::~SlideTransitionPane()
@@ -528,6 +531,33 @@ void SlideTransitionPane::Resize()
updateLayout();
}
+
+
+
+void SlideTransitionPane::DataChanged (const DataChangedEvent& rEvent)
+{
+ (void)rEvent;
+ UpdateLook();
+}
+
+
+
+
+void SlideTransitionPane::UpdateLook (void)
+{
+ SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground));
+ maFL_APPLY_TRANSITION.SetBackground(Wallpaper());
+ maFL_MODIFY_TRANSITION.SetBackground(Wallpaper());;
+ maFT_SPEED.SetBackground(Wallpaper());
+ maFT_SOUND.SetBackground(Wallpaper());
+ maFL_ADVANCE_SLIDE.SetBackground(Wallpaper());
+ maFL_EMPTY1.SetBackground(Wallpaper());
+ maFL_EMPTY2.SetBackground(Wallpaper());
+}
+
+
+
+
void SlideTransitionPane::onSelectionChanged()
{
updateControls();
@@ -1314,4 +1344,15 @@ IMPL_LINK( SlideTransitionPane, LateInit
}
+
+
+sal_Int32 getSlideTransitionPanelMinimumHeight (::Window* pDialog)
+{
+ if (pDialog != NULL)
+ return pDialog->LogicToPixel(Size( 72, 216 ), MAP_APPFONT).Height();
+ else
+ return 0;
+}
+
+
} // namespace sd
Modified: openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.hxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.hxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/animations/SlideTransitionPane.hxx Tue Feb 19 09:09:02 2013
@@ -61,7 +61,9 @@ public:
SdDrawDocument* pDoc );
virtual ~SlideTransitionPane();
+ // Window
virtual void Resize();
+ virtual void DataChanged (const DataChangedEvent& rEvent);
void onSelectionChanged();
void onChangeCurrentPage();
@@ -84,6 +86,8 @@ private:
::sd::slidesorter::SharedPageSelection getSelectedPages (void) const;
+ void UpdateLook (void);
+
DECL_LINK( ApplyToAllButtonClicked, void * );
DECL_LINK( PlayButtonClicked, void * );
DECL_LINK( SlideShowButtonClicked, void * );
@@ -98,7 +102,6 @@ private:
DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
DECL_LINK(LateInitCallback, Timer*);
-private:
ViewShellBase & mrBase;
SdDrawDocument * mpDrawDoc;
Size maMinSize;
Modified: openoffice/branches/sidebar/main/sd/source/ui/app/sddll1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/app/sddll1.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/app/sddll1.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/app/sddll1.cxx Tue Feb 19 09:09:02 2013
@@ -45,7 +45,7 @@
#include "DrawDocShell.hxx"
#include "GraphicDocShell.hxx"
#include "SlideSorterViewShell.hxx"
-#include "taskpane/ToolPanelViewShell.hxx"
+#include "SidebarViewShell.hxx"
#include "FactoryIds.hxx"
#include "sdmod.hxx"
#include "app.hrc"
@@ -123,8 +123,8 @@ void SdDLL::RegisterInterfaces()
// View shells for the side panes.
::sd::slidesorter::SlideSorterViewShell::RegisterInterface (pMod);
- ::sd::toolpanel::ToolPanelViewShell::RegisterInterface(pMod);
+ ::sd::sidebar::SidebarViewShell::RegisterInterface(pMod);
// Tell the tool panel view shell to register the interfaces of its
// controls.
- ::sd::toolpanel::ToolPanelViewShell::RegisterControls();
+ ::sd::sidebar::SidebarViewShell::RegisterControls();
}
Modified: openoffice/branches/sidebar/main/sd/source/ui/app/sddll2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/app/sddll2.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/app/sddll2.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/app/sddll2.cxx Tue Feb 19 09:09:02 2013
@@ -63,7 +63,7 @@
#include <svx/layctrl.hxx>
#include <svx/subtoolboxcontrol.hxx>
-#include <sfx2/SidebarChildWindow.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include "sddll.hxx"
#define _SD_DIACTRL_CXX
@@ -137,8 +137,7 @@ void SdDLL::RegisterControllers()
::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
- ::sd::ToolPanelChildWindow::RegisterChildWindow(0, pMod);
- ::sfx2::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(NULL, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
SvxLineStyleToolBoxControl::RegisterControl(0, pMod);
Modified: openoffice/branches/sidebar/main/sd/source/ui/app/sdmod1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/app/sdmod1.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/app/sdmod1.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/app/sdmod1.cxx Tue Feb 19 09:09:02 2013
@@ -753,7 +753,7 @@ SfxFrame* SdModule::ExecuteNewDocument(
::sd::ViewShellBase* pBase = ::sd::ViewShellBase::GetViewShellBase(pViewFrame);
if (pBase != NULL)
{
- FrameworkHelper::Instance(*pBase)->RequestTaskPanel(
+ FrameworkHelper::Instance(*pBase)->RequestSidebarPanel(
FrameworkHelper::msLayoutTaskPanelURL);
}
}
Modified: openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneChildWindows.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneChildWindows.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneChildWindows.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneChildWindows.cxx Tue Feb 19 09:09:02 2013
@@ -28,7 +28,6 @@
#include "PaneDockingWindow.hxx"
#include "ViewShellBase.hxx"
#include "framework/FrameworkHelper.hxx"
-#include "taskpane/ToolPanelViewShell.hxx"
#include "app.hrc"
#include "strings.hrc"
#include "sdresid.hxx"
@@ -52,7 +51,6 @@ using ::com::sun::star::drawing::framewo
SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
-SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE)
//===== PaneChildWindow =======================================================
@@ -142,89 +140,4 @@ LeftPaneDrawChildWindow::LeftPaneDrawChi
}
-
-
-//======================================================================================================================
-//= ToolPanelChildWindow
-//======================================================================================================================
-//----------------------------------------------------------------------------------------------------------------------
-ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt16 i_nId, SfxBindings* i_pBindings,
- SfxChildWinInfo* i_pChildWindowInfo )
- :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo,
- FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT )
-{
- // just in case this window has been created by SFX, instead our resource framework: Ensure that the resource framework
- // activates the task pane, so it is really filled with content (in opposite to the other SFX applications, the
- // child window registered for SID_TASKPANE is not responsible for its content, but here in SD, it's the ToolPanelViewShell
- // which has this responsibility. And this view shell is created implicitly via the resource framework.)
- // #i113788# / 2010-09-03 / frank.schoenheit@oracle.com
- SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() );
- ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() );
- ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ToolPanelChildWindow: no view shell access!" );
-
- const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) );
- ENSURE_OR_RETURN_VOID( pFrameworkHelper.get(), "ToolPanelChildWindow::ToolPanelChildWindow: no framework helper for the view shell!" );
- Reference<XConfigurationController> xConfigController( pFrameworkHelper->GetConfigurationController() );
- ENSURE_OR_RETURN_VOID( xConfigController.is(), "ToolPanelChildWindow::ToolPanelChildWindow: no config controller!" );
- xConfigController->requestResourceActivation(
- framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msRightPaneURL ),
- ResourceActivationMode_ADD );
- xConfigController->requestResourceActivation(
- framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL ),
- ResourceActivationMode_REPLACE
- );
-}
-
-//----------------------------------------------------------------------------------------------------------------------
-struct DelayedToolPanelActivation
-{
- DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const ::rtl::OUString& i_rPanelURL )
- :m_rToolPanelWindow( i_rToolPanelWindow )
- ,m_sPanelURL( i_rPanelURL )
- {
- }
-
- void operator() (bool)
- {
- m_rToolPanelWindow.ActivateToolPanel( m_sPanelURL );
- }
-
-private:
- ToolPanelChildWindow& m_rToolPanelWindow;
- const ::rtl::OUString m_sPanelURL;
-};
-
-//----------------------------------------------------------------------------------------------------------------------
-void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL )
-{
- SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() );
- ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() );
- ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ActivateToolPanel: no view shell access!" );
-
- const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) );
-
- if ( i_rPanelURL.indexOf( framework::FrameworkHelper::msTaskPanelURLPrefix ) == 0 )
- {
- // it's one of our standard panels known to the drawing framework
- pFrameworkHelper->RequestTaskPanel( i_rPanelURL );
- }
- else
- {
- // TODO: it would be nice if the drawing framework were able to handle non-standard panels, installed by
- // extensions, too. As long as this is not the case, we need to take the direct way ...
- ::boost::shared_ptr< ViewShell > pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL );
- toolpanel::ToolPanelViewShell* pToolPanelViewShell = dynamic_cast< toolpanel::ToolPanelViewShell* >( pViewShell.get() );
- if ( pToolPanelViewShell )
- {
- pToolPanelViewShell->ActivatePanel( i_rPanelURL );
- }
- else
- {
- Reference< XResourceId > xTaskPaneResource = pFrameworkHelper->RequestView(
- framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL );
- pFrameworkHelper->RunOnResourceActivation( xTaskPaneResource, DelayedToolPanelActivation( *this, i_rPanelURL ) );
- }
- }
-}
-
} // end of namespace ::sd
Modified: openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneShells.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneShells.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneShells.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/dlg/PaneShells.cxx Tue Feb 19 09:09:02 2013
@@ -103,33 +103,4 @@ LeftDrawPaneShell::~LeftDrawPaneShell (v
}
-
-
-//===== ToolPanelPaneShell ========================================================
-
-#undef ShellClass
-#define ShellClass ToolPanelPaneShell
-
-SFX_SLOTMAP( ToolPanelPaneShell )
-{
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-};
-
-SFX_IMPL_INTERFACE( ToolPanelPaneShell, SfxShell, SdResId( STR_TOOL_PANEL_SHELL ) )
-{
- SFX_CHILDWINDOW_REGISTRATION( ::sd::ToolPanelChildWindow::GetChildWindowId() );
-}
-
-TYPEINIT1( ToolPanelPaneShell, SfxShell );
-
-ToolPanelPaneShell::ToolPanelPaneShell()
- :SfxShell()
-{
- SetName( ::rtl::OUString::createFromAscii( "ToolPanel" ) );
-}
-
-ToolPanelPaneShell::~ToolPanelPaneShell(void)
-{
-}
-
} // end of namespace ::sd
Modified: openoffice/branches/sidebar/main/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx?rev=1447641&r1=1447640&r2=1447641&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx Tue Feb 19 09:09:02 2013
@@ -143,7 +143,7 @@ void ConfigurationControllerResourceMana
if ( ! xFactory.is())
{
#if defined VERBOSE && VERBOSE>=1
- OSL_TRACE(" no factory found fo %s\n",
+ OSL_TRACE(" no factory found for %s\n",
OUStringToOString(sResourceURL, RTL_TEXTENCODING_UTF8).getStr());
#endif
return;
@@ -163,9 +163,9 @@ void ConfigurationControllerResourceMana
// of registered factories.
mpResourceFactoryContainer->RemoveFactoryForReference(xFactory);
}
- catch(Exception&)
+ catch (Exception& e)
{
- DBG_UNHANDLED_EXCEPTION();
+ (void)e;
}
if (xResource.is())
@@ -204,9 +204,10 @@ void ConfigurationControllerResourceMana
/* In this method we do following steps.
1. Remove the resource from the URL->Object map of the configuration
controller.
- 2. Notify listeners.
+ 2. Notify listeners that deactivation has started.
3. Remove the resource id from the current configuration.
4. Release the resource.
+ 5. Notify listeners about that deactivation is completed.
*/
void ConfigurationControllerResourceManager::DeactivateResource (
const Reference<XResourceId>& rxResourceId,
@@ -256,6 +257,12 @@ void ConfigurationControllerResourceMana
{
DBG_UNHANDLED_EXCEPTION();
}
+
+ // 5. Notifiy listeners that the resource is being deactivated.
+ mpBroadcaster->NotifyListeners(
+ FrameworkHelper::msResourceDeactivationEndEvent,
+ rxResourceId,
+ NULL);
#if defined VERBOSE && VERBOSE>=1
if (bSuccess)