[Libreoffice-commits] core.git: sfx2/source

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/SidebarChildWindow.cxx |   68 ++++++++++++++---------------
 1 file changed, 33 insertions(+), 35 deletions(-)

New commits:
commit d13e036ddc56bfdc9decccfa58e2e2b57eac765b
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Fri Feb 1 10:55:05 2019 -0500
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 26 20:26:00 2019 +0200

    sfx2: avoid unnecessary dynamic_cast
    
    And reformat.
    
    Change-Id: If8a3dd4d16dfd51f8006d2d5d47951db30390fd8
    Reviewed-on: https://gerrit.libreoffice.org/73522
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index ac0a68852ea9..678c5538aa0b 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -30,50 +30,48 @@ namespace sfx2 { namespace sidebar {
 
 SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
 
-SidebarChildWindow::SidebarChildWindow (vcl::Window* pParentWindow, sal_uInt16 nId,
-                                        SfxBindings* pBindings, SfxChildWinInfo* pInfo)
-    : SfxChildWindow(pParentWindow, nId),
-      mbSidebarVisibleInLOK(pInfo && pInfo->aModule == "simpress")
+SidebarChildWindow::SidebarChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId,
+                                       SfxBindings* pBindings, SfxChildWinInfo* pInfo)
+    : SfxChildWindow(pParentWindow, nId)
+    , mbSidebarVisibleInLOK(pInfo && pInfo->aModule == "simpress")
 {
-    SetWindow(VclPtr<SidebarDockingWindow>::Create(pBindings, *this, pParentWindow,
-                                                       WB_STDDOCKWIN | WB_OWNERDRAWDECORATION |
-                                                       WB_CLIPCHILDREN | WB_SIZEABLE |
-                                                       WB_3DLOOK | WB_ROLLABLE));
+    auto pDockWin = VclPtr<SidebarDockingWindow>::Create(
+        pBindings, *this, pParentWindow, WB_STDDOCKWIN | WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN
+                                             | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE);
+    SetWindow(pDockWin);
     SetAlignment(SfxChildAlignment::RIGHT);
 
-    GetWindow()->SetHelpId(HID_SIDEBAR_WINDOW);
-    GetWindow()->SetOutputSizePixel(Size(GetDefaultWidth(GetWindow()), 450));
+    pDockWin->SetHelpId(HID_SIDEBAR_WINDOW);
+    pDockWin->SetOutputSizePixel(Size(GetDefaultWidth(pDockWin), 450));
 
-    SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(GetWindow());
-    if (pDockingParent != nullptr)
+    if (pInfo && pInfo->aExtraString.isEmpty() && pInfo->aModule != "sdraw"
+        && pInfo->aModule != "simpress")
     {
-        if (pInfo && pInfo->aExtraString.isEmpty() && pInfo->aModule != "sdraw" && pInfo->aModule != "simpress")
-        {
-            // When this is the first start (never had the sidebar open yet),
-            // default to non-expanded sidebars in Writer and Calc.
-            //
-            // HACK: unfortunately I haven't found a clean solution to do
-            // this, so do it this way:
-            //
-            pDockingParent->SetSizePixel(Size(TabBar::GetDefaultWidth() * GetWindow()->GetDPIScaleFactor(),
-                        pDockingParent->GetSizePixel().Height()));
-        }
-        pDockingParent->Initialize(pInfo);
+        // When this is the first start (never had the sidebar open yet),
+        // default to non-expanded sidebars in Writer and Calc.
+        //
+        // HACK: unfortunately I haven't found a clean solution to do
+        // this, so do it this way:
+        //
+        pDockWin->SetSizePixel(Size(TabBar::GetDefaultWidth() * GetWindow()->GetDPIScaleFactor(),
+                                    pDockWin->GetSizePixel().Height()));
+    }
+
+    pDockWin->Initialize(pInfo);
 
-        if (comphelper::LibreOfficeKit::isActive())
-        {
-            // Undock sidebar in LOK to allow for resizing freely
-            // (i.e. when the client window is resized) and collapse
-            // it so the client can open it on demand.
-            pDockingParent->SetFloatingSize(
-                Size(TabBar::GetDefaultWidth() * GetWindow()->GetDPIScaleFactor(),
-                     pDockingParent->GetSizePixel().Height()));
-            pDockingParent->SetFloatingMode(true);
-        }
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        // Undock sidebar in LOK to allow for resizing freely
+        // (i.e. when the client window is resized) and collapse
+        // it so the client can open it on demand.
+        pDockWin->SetFloatingSize(Size(TabBar::GetDefaultWidth() * GetWindow()->GetDPIScaleFactor(),
+                                       pDockWin->GetSizePixel().Height()));
+        pDockWin->SetFloatingMode(true);
     }
+
     SetHideNotDelete(true);
 
-    GetWindow()->Show();
+    pDockWin->Show();
 }
 
 sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)