commit 9ce5cfff0af69bfff7512b806e0e5a39ab1566f8
author Markus Mohrhard <markus.mohrhard@googlemail.com> Thu Jul 16 01:17:33 2015 +0200
committer Markus Mohrhard <markus.mohrhard@googlemail.com> Thu Jul 16 08:15:20 2015 +0200
tree ce59a89041412ed267aa0f8afc225c0b607a8ccd
parent 4be80459e55f80816ecea2c7d8f24aea7660d0c9

enable the chart sidebar again

Change-Id: I0ad9d962436562aa1026c50e5ec16f844f889eef

chart2/source/controller/main/ChartController.cxx

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8da9ebc..a7a92f1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -348,22 +348,32 @@ uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static()
    return aSNS;
}

/*
namespace {

uno::Reference<ui::XSidebar> getSidebarFromModel(uno::Reference<frame::XModel> xModel)
{
    uno::Reference<container::XChild> xChild(xModel, uno::UNO_QUERY);
    uno::Reference<frame::XModel> xParent (xChild->getParent(), uno::UNO_QUERY_THROW);
    if (!xChild.is())
        return NULL;

    uno::Reference<frame::XModel> xParent (xChild->getParent(), uno::UNO_QUERY);
    if (!xParent.is())
        return NULL;

    uno::Reference<frame::XController2> xController(xParent->getCurrentController(), uno::UNO_QUERY);
    if (!xController.is())
        return NULL;

    uno::Reference<ui::XSidebarProvider> xSidebarProvider (xController->getSidebar(), uno::UNO_QUERY);
    if (!xSidebarProvider.is())
        return NULL;

    uno::Reference<ui::XSidebar> xSidebar(xSidebarProvider->getSidebar(), uno::UNO_QUERY);

    return xSidebar;
}

}
*/

// XController

@@ -378,11 +388,12 @@ void SAL_CALL ChartController::attachFrame(

    mpSelectionChangeHandler->Connect();

    /*
    uno::Reference<ui::XSidebar> xSidebar = getSidebarFromModel(getModel());
    sfx2::sidebar::SidebarController* pSidebar = dynamic_cast<sfx2::sidebar::SidebarController*>(xSidebar.get());
    sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, this);
    */
    if (xSidebar.is())
    {
        sfx2::sidebar::SidebarController* pSidebar = dynamic_cast<sfx2::sidebar::SidebarController*>(xSidebar.get());
        sfx2::sidebar::SidebarController::registerSidebarForFrame(pSidebar, this);
    }

    if(m_xFrame.is()) //what happens, if we do have a Frame already??
    {
@@ -750,14 +761,15 @@ void SAL_CALL ChartController::dispose()
{
    mpSelectionChangeHandler->Disconnect();

    /*
    if (getModel().is())
    {
        uno::Reference<ui::XSidebar> xSidebar = getSidebarFromModel(getModel());
        sfx2::sidebar::SidebarController* pSidebar = dynamic_cast<sfx2::sidebar::SidebarController*>(xSidebar.get());
        sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, this);
        if (xSidebar.is())
        {
            sfx2::sidebar::SidebarController* pSidebar = dynamic_cast<sfx2::sidebar::SidebarController*>(xSidebar.get());
            sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, this);
        }
    }
    */

    try
    {