Author: alg
Date: Wed Feb 20 19:55:19 2013
New Revision: 1448372
URL: http://svn.apache.org/r1448372
Log:
i121420 Added ShowMenu() capabilities to geometric panels
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
(original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx Wed
Feb 20 19:55:19 2013
@@ -140,7 +140,7 @@ Reference<ui::XUIElement> SAL_CALL Panel
rsResourceURL,
xFrame,
pPanel,
- ::boost::function<void(void)>());
+ ::boost::bind(&AreaPropertyPanel::ShowMenu, pPanel));
}
else if (rsResourceURL.endsWithAsciiL("/LinePropertyPanel",
strlen("/LinePropertyPanel")))
{
@@ -149,16 +149,16 @@ Reference<ui::XUIElement> SAL_CALL Panel
rsResourceURL,
xFrame,
pPanel,
- ::boost::function<void(void)>());
+ ::boost::bind(&LinePropertyPanel::ShowMenu, pPanel));
}
else if (rsResourceURL.endsWithAsciiL("/TransformationPropertyPanel",
strlen("/TransformationPropertyPanel")))
{
- LinePropertyPanel* pPanel = LinePropertyPanel::Create(pParentWindow,
xFrame, pBindings);
+ TransformationPropertyPanel* pPanel =
TransformationPropertyPanel::Create(pParentWindow, xFrame, pBindings);
xElement = sfx2::sidebar::SidebarPanelBase::Create(
rsResourceURL,
xFrame,
pPanel,
- ::boost::function<void(void)>());
+ ::boost::bind(&TransformationPropertyPanel::ShowMenu, pPanel));
}
return xElement;
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
Wed Feb 20 19:55:19 2013
@@ -703,6 +703,18 @@ AreaPropertyPanel::~AreaPropertyPanel()
//////////////////////////////////////////////////////////////////////////////
+void AreaPropertyPanel::ShowMenu (void)
+{
+ if (mpBindings != NULL)
+ {
+ SfxDispatcher* pDispatcher = mpBindings->GetDispatcher();
+ if (pDispatcher != NULL)
+ pDispatcher->Execute(SID_ATTRIBUTES_AREA, SFX_CALLMODE_ASYNCHRON);
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
void AreaPropertyPanel::Initialize()
{
maGradientLinear.SetXOffset(DEFAULT_CENTERX);
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
Wed Feb 20 19:55:19 2013
@@ -81,6 +81,7 @@ public:
const SfxPoolItem* pState);
SfxBindings* GetBindings();
+ void ShowMenu (void);
private:
sal_uInt16 meLastXFS;
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
Wed Feb 20 19:55:19 2013
@@ -1325,6 +1325,18 @@ LinePropertyPanel::~LinePropertyPanel()
//////////////////////////////////////////////////////////////////////////////
+void LinePropertyPanel::ShowMenu (void)
+{
+ if (mpBindings != NULL)
+ {
+ SfxDispatcher* pDispatcher = mpBindings->GetDispatcher();
+ if (pDispatcher != NULL)
+ pDispatcher->Execute(SID_ATTRIBUTES_LINE, SFX_CALLMODE_ASYNCHRON);
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
void LinePropertyPanel::Initialize()
{
mpIMGStyleIcon.get()[0] = Image(SVX_RES(IMG_LINE1_ICON));
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
Wed Feb 20 19:55:19 2013
@@ -77,6 +77,7 @@ public:
const SfxPoolItem* pState);
SfxBindings* GetBindings();
+ void ShowMenu (void);
private:
//ui controls
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
Wed Feb 20 19:55:19 2013
@@ -780,6 +780,18 @@ TransformationPropertyPanel::~Transforma
//////////////////////////////////////////////////////////////////////////////
+void TransformationPropertyPanel::ShowMenu (void)
+{
+ if (mpBindings != NULL)
+ {
+ SfxDispatcher* pDispatcher = mpBindings->GetDispatcher();
+ if (pDispatcher != NULL)
+ pDispatcher->Execute(SID_ATTR_TRANSFORM, SFX_CALLMODE_ASYNCHRON);
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
void TransformationPropertyPanel::Initialize()
{
//Position : Horizontal / Vertical
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx?rev=1448372&r1=1448371&r2=1448372&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
Wed Feb 20 19:55:19 2013
@@ -77,6 +77,7 @@ public:
const SfxPoolItem* pState);
SfxBindings* GetBindings();
+ void ShowMenu (void);
private:
//Position
