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/05/03 15:01:13 UTC
svn commit: r1478763 - in /openoffice/trunk/main:
officecfg/registry/data/org/openoffice/Office/UI/ sd/source/ui/view/ sfx2/
sfx2/source/sidebar/ svx/ svx/inc/ svx/inc/svx/ svx/source/sidebar/
Author: af
Date: Fri May 3 13:01:13 2013
New Revision: 1478763
URL: http://svn.apache.org/r1478763
Log:
122218: Add new sidebar panel for inserting shapes into Draw documents.
Modified:
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
openoffice/trunk/main/sfx2/Package_inc.mk
openoffice/trunk/main/sfx2/source/sidebar/CommandInfoProvider.cxx
openoffice/trunk/main/sfx2/source/sidebar/ControllerItem.cxx
openoffice/trunk/main/sfx2/source/sidebar/CustomImageRadioButton.cxx
openoffice/trunk/main/sfx2/source/sidebar/Deck.cxx
openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx
openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
openoffice/trunk/main/sfx2/source/sidebar/MenuButton.cxx
openoffice/trunk/main/sfx2/source/sidebar/Paint.cxx
openoffice/trunk/main/sfx2/source/sidebar/Panel.cxx
openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx
openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx
openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx
openoffice/trunk/main/sfx2/source/sidebar/SidebarController.hxx
openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx
openoffice/trunk/main/sfx2/source/sidebar/TabBar.cxx
openoffice/trunk/main/sfx2/source/sidebar/TabItem.cxx
openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx
openoffice/trunk/main/sfx2/source/sidebar/ToolBoxBackground.cxx
openoffice/trunk/main/sfx2/source/sidebar/Tools.cxx
openoffice/trunk/main/svx/AllLangResTarget_svx.mk
openoffice/trunk/main/svx/Library_svx.mk
openoffice/trunk/main/svx/inc/helpid.hrc
openoffice/trunk/main/svx/inc/svx/dialogs.hrc
openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Fri May 3 13:01:13 2013
@@ -991,6 +991,29 @@
</prop>
</node>
+ <node oor:name="InsertPropertyPanel" oor:op="replace">
+ <prop oor:name="Title" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Shapes</value>
+ </prop>
+ <prop oor:name="Id" oor:type="xs:string">
+ <value>InsertPropertyPanel</value>
+ </prop>
+ <prop oor:name="DeckId" oor:type="xs:string">
+ <value>PropertyDeck</value>
+ </prop>
+ <prop oor:name="ContextList">
+ <value oor:separator=";">
+ Draw, any, visible ;
+ </value>
+ </prop>
+ <prop oor:name="ImplementationURL" oor:type="xs:string">
+ <value>private:resource/toolpanel/SvxPanelFactory/InsertPropertyPanel</value>
+ </prop>
+ <prop oor:name="OrderIndex" oor:type="xs:int">
+ <value>50</value>
+ </prop>
+ </node>
+
</node>
</node>
</oor:component-data>
Modified: openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/view/drviewsa.cxx Fri May 3 13:01:13 2013
@@ -155,6 +155,8 @@ DrawViewShell::DrawViewShell( SfxViewFra
Construct(GetDocSh(), ePageKind);
mpSelectionChangeHandler->Connect();
+
+ SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawPage));
}
/*************************************************************************
Modified: openoffice/trunk/main/sfx2/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/Package_inc.mk?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/Package_inc.mk (original)
+++ openoffice/trunk/main/sfx2/Package_inc.mk Fri May 3 13:01:13 2013
@@ -140,4 +140,6 @@ $(eval $(call gb_Package_add_file,sfx2_i
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Theme.hxx,sfx2/sidebar/Theme.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ILayoutableWindow.hxx,sfx2/sidebar/ILayoutableWindow.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/IContextChangeReceiver.hxx,sfx2/sidebar/IContextChangeReceiver.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/Tools.hxx,sfx2/sidebar/Tools.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/CommandInfoProvider.hxx,sfx2/sidebar/CommandInfoProvider.hxx))
Modified: openoffice/trunk/main/sfx2/source/sidebar/CommandInfoProvider.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/CommandInfoProvider.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/CommandInfoProvider.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/CommandInfoProvider.cxx Fri May 3 13:01:13 2013
@@ -21,7 +21,7 @@
#include "precompiled_sfx2.hxx"
-#include "CommandInfoProvider.hxx"
+#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <comphelper/processfactory.hxx>
#include <svtools/acceleratorexecute.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/ControllerItem.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/ControllerItem.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/ControllerItem.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/ControllerItem.cxx Fri May 3 13:01:13 2013
@@ -28,7 +28,7 @@
#include "sfx2/imagemgr.hxx"
#include "sfx2/bindings.hxx"
#include <unotools/cmdoptions.hxx>
-#include "CommandInfoProvider.hxx"
+#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/CustomImageRadioButton.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/CustomImageRadioButton.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/CustomImageRadioButton.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/CustomImageRadioButton.cxx Fri May 3 13:01:13 2013
@@ -25,7 +25,7 @@
#include "DrawHelper.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
Modified: openoffice/trunk/main/sfx2/source/sidebar/Deck.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Deck.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Deck.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Deck.cxx Fri May 3 13:01:13 2013
@@ -29,7 +29,7 @@
#include "Paint.hxx"
#include "Panel.hxx"
#include "ToolBoxBackground.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include <vcl/dockwin.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/DeckTitleBar.cxx Fri May 3 13:01:13 2013
@@ -27,7 +27,7 @@
#include <vcl/image.hxx>
#ifdef DEBUG
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#endif
Modified: openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/FocusManager.cxx Fri May 3 13:01:13 2013
@@ -23,7 +23,7 @@
#include "FocusManager.hxx"
#include "Panel.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "TitleBar.hxx"
#include <vcl/button.hxx>
#include <vcl/toolbox.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/MenuButton.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/MenuButton.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/MenuButton.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/MenuButton.cxx Fri May 3 13:01:13 2013
@@ -25,7 +25,7 @@
#include "DrawHelper.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
using namespace ::com::sun::star;
Modified: openoffice/trunk/main/sfx2/source/sidebar/Paint.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Paint.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Paint.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Paint.cxx Fri May 3 13:01:13 2013
@@ -22,7 +22,7 @@
#include "precompiled_sfx2.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <com/sun/star/awt/Gradient.hpp>
Modified: openoffice/trunk/main/sfx2/source/sidebar/Panel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Panel.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Panel.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Panel.cxx Fri May 3 13:01:13 2013
@@ -28,7 +28,7 @@
#include "Paint.hxx"
#ifdef DEBUG
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "Deck.hxx"
#endif
Modified: openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/PanelTitleBar.cxx Fri May 3 13:01:13 2013
@@ -32,7 +32,7 @@
#include <vcl/image.hxx>
#ifdef DEBUG
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#endif
Modified: openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/ResourceManager.cxx Fri May 3 13:01:13 2013
@@ -22,7 +22,7 @@
#include "precompiled_sfx2.hxx"
#include "ResourceManager.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <unotools/confignode.hxx>
#include <comphelper/componentcontext.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx Fri May 3 13:01:13 2013
@@ -30,9 +30,9 @@
#include "TabBar.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include "sfx2/sidebar/SidebarChildWindow.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "SidebarDockingWindow.hxx"
#include "Context.hxx"
-#include "Tools.hxx"
#include "sfxresid.hxx"
#include "sfx2/sfxsids.hrc"
@@ -146,8 +146,8 @@ SidebarController::SidebarController (
// Get the dispatch object as preparation to listen for changes of
// the read-only state.
- const util::URL aURL (GetURL(gsReadOnlyCommandName));
- mxReadOnlyModeDispatch = GetDispatch(aURL);
+ const util::URL aURL (Tools::GetURL(gsReadOnlyCommandName));
+ mxReadOnlyModeDispatch = Tools::GetDispatch(mxFrame, aURL);
if (mxReadOnlyModeDispatch.is())
mxReadOnlyModeDispatch->addStatusListener(this, aURL);
@@ -176,7 +176,7 @@ void SAL_CALL SidebarController::disposi
static_cast<css::ui::XContextChangeEventListener*>(this));
if (mxReadOnlyModeDispatch.is())
- mxReadOnlyModeDispatch->removeStatusListener(this, GetURL(gsReadOnlyCommandName));
+ mxReadOnlyModeDispatch->removeStatusListener(this, Tools::GetURL(gsReadOnlyCommandName));
if (mpSplitWindow != NULL)
{
mpSplitWindow->RemoveEventListener(LINK(this, SidebarController, WindowEventHandler));
@@ -811,8 +811,8 @@ void SidebarController::ShowDetailMenu (
{
try
{
- const util::URL aURL (GetURL(rsMenuCommand));
- Reference<frame::XDispatch> xDispatch (GetDispatch(aURL));
+ const util::URL aURL (Tools::GetURL(rsMenuCommand));
+ Reference<frame::XDispatch> xDispatch (Tools::GetDispatch(mxFrame, aURL));
if (xDispatch.is())
xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>());
}
@@ -826,33 +826,6 @@ void SidebarController::ShowDetailMenu (
-util::URL SidebarController::GetURL (const ::rtl::OUString& rsCommand) const
-{
- util::URL aURL;
- aURL.Complete = rsCommand;
-
- const ::comphelper::ComponentContext aComponentContext (::comphelper::getProcessServiceFactory());
- const Reference<util::XURLTransformer> xParser (
- aComponentContext.createComponent("com.sun.star.util.URLTransformer"),
- UNO_QUERY_THROW);
- xParser->parseStrict(aURL);
-
- return aURL;
-}
-
-
-
-
-Reference<frame::XDispatch> SidebarController::GetDispatch (const util::URL& rURL) const
-{
- Reference<frame::XDispatchProvider> xProvider (mxFrame, UNO_QUERY_THROW);
- Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, OUString(), 0));
- return xDispatch;
-}
-
-
-
-
::boost::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rDeckSelectionData,
const ::std::vector<TabBar::DeckMenuData>& rDeckShowData) const
Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarController.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarController.hxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/SidebarController.hxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/SidebarController.hxx Fri May 3 13:01:13 2013
@@ -181,8 +181,6 @@ private:
const ::std::vector<TabBar::DeckMenuData>& rDeckSelectionData,
const ::std::vector<TabBar::DeckMenuData>& rDeckShowData) const;
void ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) const;
- css::util::URL GetURL (const ::rtl::OUString& rsCommand) const;
- cssu::Reference<css::frame::XDispatch> GetDispatch (const css::util::URL& rURL) const;
::boost::shared_ptr<PopupMenu> CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rDeckSelectionData,
const ::std::vector<TabBar::DeckMenuData>& rDeckShowData) const;
Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/SidebarToolBox.cxx Fri May 3 13:01:13 2013
@@ -24,7 +24,7 @@
#include "SidebarToolBox.hxx"
#include "ToolBoxBackground.hxx"
#include "sfx2/sidebar/Theme.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <vcl/gradient.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/TabBar.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/TabBar.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/TabBar.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/TabBar.cxx Fri May 3 13:01:13 2013
@@ -27,7 +27,7 @@
#include "DeckDescriptor.hxx"
#include "Paint.hxx"
#include "sfx2/sidebar/Theme.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "FocusManager.hxx"
#include <vcl/gradient.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/TabItem.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/TabItem.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/TabItem.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/TabItem.cxx Fri May 3 13:01:13 2013
@@ -25,7 +25,7 @@
#include "DrawHelper.hxx"
#include "Paint.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
Modified: openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Theme.cxx Fri May 3 13:01:13 2013
@@ -24,7 +24,7 @@
#include "sfx2/sidebar/Theme.hxx"
#include "Paint.hxx"
#include "SidebarResource.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include <tools/svborder.hxx>
#include <tools/rc.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/ToolBoxBackground.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/ToolBoxBackground.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/ToolBoxBackground.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/ToolBoxBackground.cxx Fri May 3 13:01:13 2013
@@ -24,7 +24,7 @@
#include "ToolBoxBackground.hxx"
#include "Paint.hxx"
#include "DrawHelper.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
#include <vcl/toolbox.hxx>
Modified: openoffice/trunk/main/sfx2/source/sidebar/Tools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/Tools.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/Tools.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/Tools.cxx Fri May 3 13:01:13 2013
@@ -21,7 +21,7 @@
#include "precompiled_sfx2.hxx"
-#include "Tools.hxx"
+#include "sfx2/sidebar/Tools.hxx"
#include "sfx2/sidebar/Theme.hxx"
@@ -31,7 +31,9 @@
#include <comphelper/namedvaluecollection.hxx>
#include <vcl/gradient.hxx>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
#include <cstring>
@@ -153,4 +155,34 @@ SvBorder Tools::RectangleToSvBorder (con
aBox.Bottom());
}
+
+
+
+util::URL Tools::GetURL (const ::rtl::OUString& rsCommand)
+{
+ util::URL aURL;
+ aURL.Complete = rsCommand;
+
+ const ::comphelper::ComponentContext aComponentContext (::comphelper::getProcessServiceFactory());
+ const Reference<util::XURLTransformer> xParser (
+ aComponentContext.createComponent("com.sun.star.util.URLTransformer"),
+ UNO_QUERY_THROW);
+ xParser->parseStrict(aURL);
+
+ return aURL;
+}
+
+
+
+
+Reference<frame::XDispatch> Tools::GetDispatch (
+ const cssu::Reference<css::frame::XFrame>& rxFrame,
+ const util::URL& rURL)
+{
+ Reference<frame::XDispatchProvider> xProvider (rxFrame, UNO_QUERY_THROW);
+ Reference<frame::XDispatch> xDispatch (xProvider->queryDispatch(rURL, ::rtl::OUString(), 0));
+ return xDispatch;
+}
+
+
} } // end of namespace sfx2::sidebar
Modified: openoffice/trunk/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/AllLangResTarget_svx.mk?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/svx/AllLangResTarget_svx.mk (original)
+++ openoffice/trunk/main/svx/AllLangResTarget_svx.mk Fri May 3 13:01:13 2013
@@ -84,6 +84,7 @@ $(eval $(call gb_SrsTarget_add_files,svx
svx/source/sidebar/possize/PosSizePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
svx/source/sidebar/paragraph/ParaPropertyPanel.src \
+ svx/source/sidebar/insert/InsertPropertyPanel.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
svx/source/table/table.src \
Modified: openoffice/trunk/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svx.mk?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svx.mk (original)
+++ openoffice/trunk/main/svx/Library_svx.mk Fri May 3 13:01:13 2013
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
drawinglayer \
editeng \
+ fwe \
fwk \
i18nisolang1 \
icuuc \
@@ -211,6 +212,8 @@ $(eval $(call gb_Library_add_exception_o
svx/source/sidebar/tools/PopupContainer \
svx/source/sidebar/tools/Popup \
svx/source/sidebar/tools/ValueSetWithTextControl \
+ svx/source/sidebar/insert/InsertPropertyPanel \
+ svx/source/sidebar/insert/SimpleToolBoxController \
svx/source/stbctrls/pszctrl \
svx/source/stbctrls/insctrl \
svx/source/stbctrls/selctrl \
Modified: openoffice/trunk/main/svx/inc/helpid.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/helpid.hrc?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/helpid.hrc (original)
+++ openoffice/trunk/main/svx/inc/helpid.hrc Fri May 3 13:01:13 2013
@@ -368,6 +368,9 @@
#define HID_PROPERTYPANEL_POSIZE_SECTION "SVX_HID_PROPERTYPANEL_POSIZE_SECTION"
#define HID_PROPERTYPANEL_GRAPHIC_SECTION "SVX_HID_PROPERTYPANEL_GRAPHIC_SECTION"
+// Insert panel
+#define HID_SIDEBAR_INSERT_PANEL "HID_SIDEBAR_INSERT_PANEL"
+#define HID_SIDEBAR_INSERT_TOOLBOX "HID_SIDEBAR_INSERT_TOOLBOX"
#define HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET "SVX_HID_PPROPERTYPANEL_PARA_TBX_NUM_BULLET"
#define HID_PPROPERTYPANEL_PARA_TBI_NUM "SVX_HID_PPROPERTYPANEL_PARA_TBI_NUM"
Modified: openoffice/trunk/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/dialogs.hrc?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/trunk/main/svx/inc/svx/dialogs.hrc Fri May 3 13:01:13 2013
@@ -31,7 +31,7 @@
// Resource-Id's ------------------------------------------------------------
// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own)
-#define RID_SVX_FIRSTFREE 324
+#define RID_SVX_FIRSTFREE 325
// some strings also used in CUI
#define RID_SVXERRCTX (RID_SVX_START + 351)
@@ -376,6 +376,8 @@
#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 322)
#define RID_POPUPPANEL_PARAPAGE_BACK_COLOR (RID_SVX_START + 323)
+#define RID_SIDEBAR_INSERT_PANEL (RID_SVX_START + 324)
+
// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
Modified: openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx?rev=1478763&r1=1478762&r2=1478763&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/PanelFactory.cxx Fri May 3 13:01:13 2013
@@ -27,6 +27,7 @@
#include "graphic/GraphicPropertyPanel.hxx"
#include "line/LinePropertyPanel.hxx"
#include "possize/PosSizePropertyPanel.hxx"
+#include "insert/InsertPropertyPanel.hxx"
#include "GalleryControl.hxx"
#include "debug/ColorPanel.hxx"
#include "debug/ContextPanel.hxx"
@@ -160,6 +161,10 @@ Reference<ui::XUIElement> SAL_CALL Panel
{
pControl = PosSizePropertyPanel::Create(pParentWindow, xFrame, pBindings, xSidebar);
}
+ else if (DoesResourceEndWith("/InsertPropertyPanel"))
+ {
+ pControl = new InsertPropertyPanel(pParentWindow, xFrame);
+ }
else if (DoesResourceEndWith("/GalleryPanel"))
{
pControl = new GalleryControl(pBindings, pParentWindow);