openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1459363 - in /openoffice/branches/sidebar/main: offapi/com/sun/star/ui/ sd/source/ui/sidebar/ sfx2/inc/sfx2/sidebar/ sfx2/source/sidebar/ svx/source/sidebar/ svx/source/sidebar/area/ svx/source/sidebar/line/ svx/source/sidebar/text/ sw/sou...
Date Thu, 21 Mar 2013 15:37:15 GMT
Author: af
Date: Thu Mar 21 15:37:14 2013
New Revision: 1459363

URL: http://svn.apache.org/r1459363
Log:
i121420: Removed obsolete support of detail dialogs from panels.

Modified:
    openoffice/branches/sidebar/main/offapi/com/sun/star/ui/XSidebarPanel.idl
    openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.cxx
    openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.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/SidebarPanelBase.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx
    openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx
    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/sidebar/PagePropertyPanel.cxx
    openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx
    openoffice/branches/sidebar/main/sw/source/ui/sidebar/SwPanelFactory.cxx

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=1459363&r1=1459362&r2=1459363&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 Thu Mar 21 15:37:14
2013
@@ -57,30 +57,6 @@ interface XSidebarPanel
         The height is set via the XWindow interface.
     */
     LayoutSize getHeightForWidth ( [in] long nWidth);
-
-    /** If the panel has a menu or dialog then show it now.
-    */
-    void showMenu ();
-
-    /** Return whether the panel supports (ie wants to be displayed
-        for) the given context.
-
-        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).
-    */
-    boolean isContextSupported (
-        [in] string sApplicationName,
-        [in] string sContextName);
 } ;
 
 } ; } ; } ; } ;

Modified: openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/sidebar/SidebarFactory.cxx Thu Mar 21 15:37:14
2013
@@ -205,7 +205,6 @@ Reference<ui::XUIElement> SAL_CALL Sideb
                 rsUIElementResourceURL,
                 xFrame,
                 pControl,
-                ::boost::function<void(void)>(),
                 ui::LayoutSize(-1,-1,-1)));
     }
     catch(Exception& rException)

Modified: openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx (original)
+++ openoffice/branches/sidebar/main/sfx2/inc/sfx2/sidebar/SidebarPanelBase.hxx Thu Mar 21
15:37:14 2013
@@ -68,7 +68,6 @@ public:
         const ::rtl::OUString& rsResourceURL,
         const cssu::Reference<css::frame::XFrame>& rxFrame,
         Window* mpWindow,
-        const ::boost::function<void(void)>& rMenuProvider,
         const css::ui::LayoutSize& rLayoutSize);
 
     // XContextChangeEventListener
@@ -101,17 +100,6 @@ public:
     // XSidebarPanel
     virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth)
         throw(cssu::RuntimeException);
-    virtual void SAL_CALL showMenu (void)
-        throw(cssu::RuntimeException);
-    /** Always return <TRUE/> in the assumption that the panel
-        descriptor in the registry has this covered.
-        If a panel needs finer control then it has to overload this
-        method.
-    */
-    virtual sal_Bool SAL_CALL isContextSupported (
-        const ::rtl::OUString& rsApplicationName,
-        const ::rtl::OUString& rsContextName)
-        throw(cssu::RuntimeException);
 
 protected:
     cssu::Reference<css::frame::XFrame> mxFrame;
@@ -120,7 +108,6 @@ protected:
         const ::rtl::OUString& rsResourceURL,
         const cssu::Reference<css::frame::XFrame>& rxFrame,
         Window* pWindow,
-        const ::boost::function<void(void)>& rMenuProvider,
         const css::ui::LayoutSize& rLayoutSize);
     virtual ~SidebarPanelBase (void);
 
@@ -133,7 +120,6 @@ protected:
 private:
     Window* mpControl;
     const ::rtl::OUString msResourceURL;
-    const ::boost::function<void(void)> maMenuProvider;
     const css::ui::LayoutSize maLayoutSize;
 };
 

Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.cxx Thu Mar 21 15:37:14 2013
@@ -239,15 +239,6 @@ Reference<ui::XSidebarPanel> Panel::GetP
 
 
 
-void Panel::ShowMenu (void)
-{
-    if (mxPanelComponent.is())
-        mxPanelComponent->showMenu();
-}
-
-
-
-
 void Panel::PrintWindowTree (void)
 {
 #ifdef DEBUG

Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.hxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.hxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/Panel.hxx Thu Mar 21 15:37:14 2013
@@ -80,7 +80,6 @@ private:
     const ::boost::function<void(void)> maDeckLayoutTrigger;
     Rectangle maBoundingBox;
 
-    void ShowMenu (void);
     cssu::Reference<css::awt::XWindow> GetElementWindow (void);
 };
 typedef ::boost::shared_ptr<Panel> SharedPanel;

Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarPanelBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarPanelBase.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarPanelBase.cxx (original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarPanelBase.cxx Thu Mar 21 15:37:14
2013
@@ -42,7 +42,6 @@ Reference<ui::XUIElement> SidebarPanelBa
     const ::rtl::OUString& rsResourceURL,
     const cssu::Reference<css::frame::XFrame>& rxFrame,
     Window* pWindow,
-    const ::boost::function<void(void)>& rMenuProvider,
     const css::ui::LayoutSize& rLayoutSize)
 {
     Reference<ui::XUIElement> xUIElement (
@@ -50,7 +49,6 @@ Reference<ui::XUIElement> SidebarPanelBa
             rsResourceURL,
             rxFrame,
             pWindow,
-            rMenuProvider,
             rLayoutSize));
     return xUIElement;
 }
@@ -62,16 +60,14 @@ SidebarPanelBase::SidebarPanelBase (
     const ::rtl::OUString& rsResourceURL,
     const cssu::Reference<css::frame::XFrame>& rxFrame,
     Window* pWindow,
-    const ::boost::function<void(void)>& rMenuProvider,
     const css::ui::LayoutSize& rLayoutSize)
     : SidebarPanelBaseInterfaceBase(m_aMutex),
       mxFrame(rxFrame),
       mpControl(pWindow),
       msResourceURL(rsResourceURL),
-      maMenuProvider(rMenuProvider),
       maLayoutSize(rLayoutSize)
 {
-    OSL_TRACE("SidebarPanelBase created at %x", this);
+    //    OSL_TRACE("SidebarPanelBase created at %x", this);
 
     if (mxFrame.is())
     {
@@ -90,7 +86,6 @@ SidebarPanelBase::SidebarPanelBase (
 
 SidebarPanelBase::~SidebarPanelBase (void)
 {
-    OSL_TRACE("SidebarPanelBase destroyed at %x", this);
 }
 
 
@@ -99,8 +94,6 @@ SidebarPanelBase::~SidebarPanelBase (voi
 void SAL_CALL SidebarPanelBase::disposing (void)
     throw (cssu::RuntimeException)
 {
-    OSL_TRACE("SidebarPanelBase disposing at %x", this);
-
     if (mpControl != NULL)
     {
         delete mpControl;
@@ -123,7 +116,6 @@ void SAL_CALL SidebarPanelBase::disposin
 
 void SidebarPanelBase::SetControl (::Window* pControl)
 {
-    OSL_TRACE("setting control of SidebarPanelBase at %x to %x", this, pControl);
     mpControl = pControl;
 }
 
@@ -143,8 +135,6 @@ void SAL_CALL SidebarPanelBase::notifyCo
     const ui::ContextChangeEventObject& rEvent)
     throw (cssu::RuntimeException)
 {
-    OSL_TRACE("SidebarPanelBase notified at %x with control at %x", this, mpControl);
-
     IContextChangeReceiver* pContextChangeReceiver
         = dynamic_cast<IContextChangeReceiver*>(mpControl);
     if (pContextChangeReceiver != NULL)
@@ -165,8 +155,6 @@ void SAL_CALL SidebarPanelBase::disposin
 {
     (void)rEvent;
 
-    OSL_TRACE("SidebarPanelBase disposing(e) at %x", this);
-    
     mxFrame = NULL;
     mpControl = NULL;
 }
@@ -260,26 +248,4 @@ ui::LayoutSize SAL_CALL SidebarPanelBase
 
 
 
-void SAL_CALL SidebarPanelBase::showMenu (void)
-    throw(cssu::RuntimeException)
-{
-    if (maMenuProvider)
-        maMenuProvider();
-}
-
-
-
-
-sal_Bool SAL_CALL SidebarPanelBase::isContextSupported (
-    const ::rtl::OUString& rsApplicationName,
-    const ::rtl::OUString& rsContextName)
-    throw(cssu::RuntimeException)
-{
-    (void)rsApplicationName;
-    (void)rsContextName;
-    
-    return sal_True;
-}
-
-
 } } // end of namespace sfx2::sidebar

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=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx Thu Mar 21 15:37:14
2013
@@ -139,7 +139,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::bind(&TextPropertyPanel::ShowMenu, pPanel),
             ui::LayoutSize(-1,-1,-1));
     }
     else if (DoesResourceEndWith("/AreaPropertyPanel"))
@@ -149,7 +148,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::bind(&AreaPropertyPanel::ShowMenu, pPanel),
             ui::LayoutSize(-1,-1,-1));
     }
     else if (DoesResourceEndWith("/GraphicPropertyPanel"))
@@ -159,7 +157,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::function<void(void)>(),
             ui::LayoutSize(-1,-1,-1));
     }
     else if (DoesResourceEndWith("/LinePropertyPanel"))
@@ -169,7 +166,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::bind(&LinePropertyPanel::ShowMenu, pPanel),
             ui::LayoutSize(-1,-1,-1));
     }
     else if (DoesResourceEndWith("/PosSizePropertyPanel"))
@@ -179,7 +175,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::bind(&PosSizePropertyPanel::ShowMenu, pPanel),
             ui::LayoutSize(-1,-1,-1));
     }
     else if (DoesResourceEndWith("/GalleryPanel"))
@@ -191,7 +186,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pGalleryControl,
-            ::boost::function<void(void)>(),
             ui::LayoutSize(300,-1,400));
     }
     else if (DoesResourceEndWith("/Debug_ColorPanel"))
@@ -201,7 +195,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::function<void(void)>(),
             ui::LayoutSize(300,-1,400));
     }
     else if (DoesResourceEndWith("/Debug_ContextPanel"))
@@ -211,7 +204,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::function<void(void)>(),
             ui::LayoutSize(45,45,45));
     }
     else if (DoesResourceEndWith("/Debug_NotYetImplementedPanel"))
@@ -221,7 +213,6 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::function<void(void)>(),
             ui::LayoutSize(20,25,25));
     }
     else if (DoesResourceEndWith("/EmptyPanel"))
@@ -231,8 +222,7 @@ Reference<ui::XUIElement> SAL_CALL Panel
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::function<void(void)>(),
-            ui::LayoutSize(20,25,25));
+            ui::LayoutSize(20,-1, 50));
     }
 #undef DoesResourceEndWith
 

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.cxx Thu Mar
21 15:37:14 2013
@@ -155,18 +155,6 @@ 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/area/AreaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx Thu Mar
21 15:37:14 2013
@@ -77,7 +77,6 @@ public:
         const SfxPoolItem* pState);
 
     SfxBindings* GetBindings();
-    void ShowMenu (void);
 
     const static sal_Int32 DEFAULT_CENTERX;
     const static sal_Int32 DEFAULT_CENTERY;

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx Thu Mar
21 15:37:14 2013
@@ -266,18 +266,6 @@ 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.reset(new Image[11]);

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.hxx Thu Mar
21 15:37:14 2013
@@ -121,7 +121,6 @@ public:
         const SfxPoolItem* pState);
 
     SfxBindings* GetBindings();
-    void ShowMenu (void);
 
     void SetLineDashItem(XLineDashItem* pDash);
     void SetLineStyleItem(XLineStyleItem* pStyle);

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.cxx Thu Mar
21 15:37:14 2013
@@ -1455,19 +1455,6 @@ void TextPropertyPanel::NotifyItemUpdate
 
 
 
-void TextPropertyPanel::ShowMenu (void)
-{
-    if (mpBindings != NULL)
-    {
-        SfxDispatcher* pDispatcher = mpBindings->GetDispatcher();
-        if (pDispatcher != NULL)
-            pDispatcher->Execute(SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON);
-    }
-}
-
-
-
-
 void TextPropertyPanel::TextStyleChanged()
 {
 	if( !mbWeightAvailable )

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/text/TextPropertyPanel.hxx Thu Mar
21 15:37:14 2013
@@ -95,8 +95,6 @@ public:
         const SfxItemState eState,
         const SfxPoolItem* pState);
 
-    void ShowMenu (void);
-
 private:
 	//ui controls
     ::boost::scoped_ptr<SvxSBFontNameBox> mpFontNameBox;

Modified: openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.cxx Thu Mar 21
15:37:14 2013
@@ -246,14 +246,6 @@ void PagePropertyPanel::Initialize()
 }
 
 
-void PagePropertyPanel::ShowPageStyleFormatDialog( void )
-{
-    mpBindings->GetDispatcher()->Execute( FN_FORMAT_PAGE_DLG, SFX_CALLMODE_ASYNCHRON
);
-}
-
-
-
-
 ::svx::sidebar::PopupControl* PagePropertyPanel::CreatePageOrientationControl( ::svx::sidebar::PopupContainer*
pParent )
 {
     return new PageOrientationControl( pParent, *this , mpPageItem->IsLandscape() );

Modified: openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/PagePropertyPanel.hxx Thu Mar 21
15:37:14 2013
@@ -67,9 +67,6 @@ namespace sw { namespace sidebar {
             const SfxItemState eState,
             const SfxPoolItem* pState );
 
-        // action on 'More Options' button in panel title
-        void ShowPageStyleFormatDialog( void );
-
         SfxBindings* GetBindings() const
         {
             return mpBindings;

Modified: openoffice/branches/sidebar/main/sw/source/ui/sidebar/SwPanelFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/sidebar/SwPanelFactory.cxx?rev=1459363&r1=1459362&r2=1459363&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/sidebar/SwPanelFactory.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/sidebar/SwPanelFactory.cxx Thu Mar 21 15:37:14
2013
@@ -120,7 +120,6 @@ Reference<ui::XUIElement> SAL_CALL SwPan
             rsResourceURL,
             xFrame,
             pPanel,
-            ::boost::bind(&PagePropertyPanel::ShowPageStyleFormatDialog, pPanel),
             ui::LayoutSize(-1,-1,-1));
     }
 #undef DoesResourceEndWith



Mime
View raw message