DockingWindow LayerDialog appears unused

along with SID_LAYER_DIALOG_WIN

There is a seperate normal Layer Dialog, but no
apparent way to create this Docking Window

Change-Id: I57b6928c14586f48cdf5e3e7588b6aa8560ecec1

sd/AllLangResTarget_sd.mk

@@ -49,7 +49,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 
 $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sd/res,\
     sd/source/ui/slidesorter/view/SlsResource.src \
-    sd/source/ui/dlg/LayerDialog.src \
 ))
 
 $(eval $(call gb_SrsTarget_add_templates,sd/res,\

sd/Library_sd.mk

@@ -196,8 +196,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/app/tmplctrl \
 	sd/source/ui/controller/slidelayoutcontroller \
 	sd/source/ui/dlg/AnimationChildWindow \
-	sd/source/ui/dlg/LayerDialogChildWindow \
-	sd/source/ui/dlg/LayerDialogContent \
 	sd/source/ui/dlg/LayerTabBar \
 	sd/source/ui/dlg/NavigatorChildWindow \
 	sd/source/ui/dlg/PaneChildWindows \

sd/inc/app.hrc

@@ -417,7 +417,6 @@
     // FREE
 #define SID_NOTES_WINDOW                    (SID_SD_START+417)
 #define SID_SWITCH_SHELL_PANE               (SID_SD_START+418)
-#define SID_LAYER_DIALOG_WIN                (SID_SD_START+419)
 #define SID_NORMAL_MULTI_PANE_GUI           (SID_SD_START+420)
 #define SID_SLIDE_SORTER_MULTI_PANE_GUI     (SID_SD_START+421)
 

sd/sdi/drviewsh.sdi

@@ -173,11 +173,6 @@ interface ImpressEditView : DrawView
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-    SID_LAYER_DIALOG_WIN // ole : no, status : ?
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
     SID_SHOW_POSTIT
     [
         ExecMethod = ExecuteAnnotation;

sd/sdi/sdraw.sdi

@@ -6351,32 +6351,6 @@ SfxBoolItem DrawFontworkVertical SID_DRAW_FONTWORK_VERTICAL
     GroupId = GID_DRAWING;
 ]
 
-SfxBoolItem LayerDialogChildWindow SID_LAYER_DIALOG_WIN
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_OPTIONS;
-]
-
 SfxVoidItem InsertMasterPage SID_INSERT_MASTER_PAGE(
 SfxStringItem PageName ID_VAL_PAGENAME,
 SfxUInt32Item WhatLayout ID_VAL_WHATLAYOUT,

sd/source/ui/app/sddll.cxx

@@ -44,7 +44,6 @@
 #include "ImpressViewShellBase.hxx"
 #include "PresentationViewShell.hxx"
 #include "PresentationViewShellBase.hxx"
-#include "LayerDialogChildWindow.hxx"
 #include "MediaObjectBar.hxx"
 #include "NavigatorChildWindow.hxx"
 #include "OutlineViewShell.hxx"
@@ -191,7 +190,6 @@ void SdDLL::RegisterControllers()
     ::sd::AnimationChildWindow::RegisterChildWindow(false, pMod);
     ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::DrawViewShell::GetInterfaceId(), pMod );
     ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::GraphicViewShell::GetInterfaceId(), pMod );
-    ::sd::LayerDialogChildWindow::RegisterChildWindow(false, pMod);
 
     Svx3DChildWindow::RegisterChildWindow(false, pMod);
     SvxFontWorkChildWindow::RegisterChildWindow(false, pMod);

sd/source/ui/dlg/LayerDialog.src

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "app.hrc"
-#include "res_bmp.hrc"
-#include "helpids.h"
-#include "LayerDialog.hrc"
-
-#define WIDTH 150
-#define TAB_BAR_HEIGHT 17
-
-DockingWindow FLT_WIN_LAYER_DIALOG
-{
-    HelpID = HID_SD_TABBAR_LAYERS;
-    Border = TRUE ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Sizeable = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Zoomable = TRUE ;
-    Dockable = TRUE ;
-    EnableResizing = TRUE ;
-    Size = MAP_APPFONT ( WIDTH , TAB_BAR_HEIGHT ) ;
-    Window TB_LAYERS
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( WIDTH-2*6, TAB_BAR_HEIGHT );
-        HelpId = HID_SD_TABBAR_LAYERS;
-        Border = TRUE;
-        SvLook = TRUE;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/dlg/LayerDialogChildWindow.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "LayerDialogChildWindow.hxx"
-#include <sfx2/dockwin.hxx>
-#include "app.hrc"
-#include <sfx2/app.hxx>
-
-// Instantiate the implementation of the docking window before files
-// are included that define ::sd::Window.  The ... macros are not really
-// namespace proof.
-namespace sd {
-SFX_IMPL_DOCKINGWINDOW_WITHID(LayerDialogChildWindow, SID_LAYER_DIALOG_WIN)
-}
-
-#include "LayerDialog.hrc"
-#include "LayerDialogContent.hxx"
-
-#include "ViewShellBase.hxx"
-#include "DrawViewShell.hxx"
-#include <sfx2/dispatch.hxx>
-
-namespace sd {
-
-LayerDialogChildWindow::LayerDialogChildWindow (
-    ::Window* _pParent,
-    sal_uInt16 nId,
-    SfxBindings* pBindings,
-    SfxChildWinInfo* pInfo)
-    : SfxChildWindow (_pParent, nId)
-{
-    ViewShellBase& rBase (*ViewShellBase::GetViewShellBase(
-        pBindings->GetDispatcher()->GetFrame()));
-    LayerDialogContent* pContent = new LayerDialogContent (
-        pBindings,
-        this,
-        _pParent,
-        SdResId( FLT_WIN_LAYER_DIALOG),
-        rBase);
-    pWindow = pContent;
-
-    eChildAlignment = SFX_ALIGN_NOALIGNMENT;
-
-    pContent->Initialize(pInfo);
-}
-
-LayerDialogChildWindow::~LayerDialogChildWindow (void)
-{
-}
-
-} // end of namespace sd
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/dlg/LayerDialogContent.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "LayerDialogContent.hxx"
-#include <com/sun/star/presentation/AnimationEffect.hpp>
-#include <com/sun/star/presentation/AnimationSpeed.hpp>
-
-#include <svx/gallery.hxx>
-#include <editeng/colritem.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svl/aeitem.hxx>
-#include <vcl/msgbox.hxx>
-
-#include "sdattr.hxx"
-
-#include "LayerDialog.hrc"
-#include "app.hrc"
-#include "strings.hrc"
-#include "res_bmp.hrc"
-#include "sdresid.hxx"
-#include "View.hxx"
-#include "drawdoc.hxx"
-#include "ViewShellBase.hxx"
-#include "DrawViewShell.hxx"
-#include "framework/FrameworkHelper.hxx"
-
-using namespace ::com::sun::star;
-
-namespace sd {
-
-LayerDialogContent::LayerDialogContent (
-    SfxBindings* pInBindings,
-    SfxChildWindow *pCW,
-    Window* pParent,
-    const SdResId& rSdResId,
-    ViewShellBase& rBase)
-    : SfxDockingWindow (pInBindings, pCW, pParent, rSdResId),
-      maLayerTabBar(
-          dynamic_cast<DrawViewShell*>(
-              framework::FrameworkHelper::Instance(rBase)->GetViewShell(
-                  framework::FrameworkHelper::msCenterPaneURL).get()),
-          this,
-          SdResId(TB_LAYERS))
-{
-    FreeResource();
-
-    maLayerTabBar.Show();
-}
-
-LayerDialogContent::~LayerDialogContent (void)
-{
-}
-
-bool LayerDialogContent::Close (void)
-{
-    return SfxDockingWindow::Close();
-}
-
-void LayerDialogContent::Resize (void)
-{
-    maLayerTabBar.SetPosSizePixel (
-        Point(0,0),
-        Size(GetSizePixel().Width(), 17));
-    SfxDockingWindow::Resize();
-}
-
-} // end of namespace sd
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/LayerDialog.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define FLT_WIN_LAYER_DIALOG 791
-
-#define TB_LAYERS           1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/LayerDialogChildWindow.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SD_SOURCE_UI_INC_LAYERDIALOGCHILDWINDOW_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_LAYERDIALOGCHILDWINDOW_HXX
-
-#include <sfx2/childwin.hxx>
-
-namespace sd {
-
-/** Floating container for the layout dialog.
-    What is missing is a way to inform the layer dialog of changing views.
-*/
-class LayerDialogChildWindow
-    : public SfxChildWindow
-{
-public:
-    LayerDialogChildWindow (
-        ::Window*,
-        sal_uInt16,
-        SfxBindings*,
-        SfxChildWinInfo*);
-    virtual ~LayerDialogChildWindow (void);
-
-    SFX_DECL_CHILDWINDOW_WITHID(LayerDialogChildWindow);
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/LayerDialogContent.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SD_SOURCE_UI_INC_LAYERDIALOGCONTENT_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_LAYERDIALOGCONTENT_HXX
-
-#include <sfx2/dockwin.hxx>
-#include "LayerTabBar.hxx"
-#include "sdresid.hxx"
-
-namespace sd {
-
-class ViewShellBase;
-
-class LayerDialogContent
-    : public SfxDockingWindow
-{
-public:
-    LayerDialogContent (
-        SfxBindings* pBindings,
-        SfxChildWindow *pCW,
-        ::Window* pParent,
-        const SdResId& rSdResId,
-        ViewShellBase& rBase);
-    virtual ~LayerDialogContent (void);
-
-protected:
-    virtual bool Close (void) SAL_OVERRIDE;
-    virtual void Resize (void) SAL_OVERRIDE;
-
-private:
-    LayerTabBar maLayerTabBar;
-};
-
-} // end of namespace sd
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/view/drviews1.cxx

@@ -75,7 +75,6 @@
 #include "ToolBarManager.hxx"
 #include "FormShellManager.hxx"
 #include "ViewShellBase.hxx"
-#include "LayerDialogChildWindow.hxx"
 #include "LayerTabBar.hxx"
 #include "ViewShellManager.hxx"
 #include "ViewShellHint.hxx"

sd/source/ui/view/drviews2.cxx

@@ -118,7 +118,6 @@
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "GraphicViewShell.hxx"
-#include "LayerDialogChildWindow.hxx"
 #include "LayerTabBar.hxx"
 #include "Outliner.hxx"
 #include "ViewShellHint.hxx"
@@ -2880,27 +2879,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         }
         break;
 
-        case SID_LAYER_DIALOG_WIN:
-        {
-            if ( rReq.GetArgs() )
-            {
-                GetViewFrame()->SetChildWindow(
-                    LayerDialogChildWindow::GetChildWindowId(),
-                    ((const SfxBoolItem&) (rReq.GetArgs()->
-                        Get(SID_LAYER_DIALOG_WIN))).GetValue());
-            }
-            else
-            {
-                GetViewFrame()->ToggleChildWindow(
-                    LayerDialogChildWindow::GetChildWindowId());
-            }
-
-            GetViewFrame()->GetBindings().Invalidate(SID_LAYER_DIALOG_WIN);
-            Cancel();
-            rReq.Ignore ();
-        }
-        break;
-
         case SID_DISPLAY_MASTER_BACKGROUND:
         case SID_DISPLAY_MASTER_OBJECTS:
         {

sd/source/ui/view/drviews5.cxx

@@ -61,7 +61,6 @@
 #include "SdUnoDrawView.hxx"
 #include "ViewShellBase.hxx"
 #include "FormShellManager.hxx"
-#include "LayerDialogContent.hxx"
 #include "DrawController.hxx"
 #include <boost/scoped_ptr.hpp>
 

sd/source/ui/view/drviews6.cxx

@@ -43,7 +43,6 @@
 #include "animobjs.hxx"
 #include "AnimationChildWindow.hxx"
 #include "NavigatorChildWindow.hxx"
-#include "LayerDialogChildWindow.hxx"
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
 #include "drawview.hxx"
@@ -248,11 +247,6 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
         sal_uInt16 nId = SvxIMapDlgChildWindow::GetChildWindowId();
         rSet.Put( SfxBoolItem( SID_IMAP, GetViewFrame()->HasChildWindow( nId ) ) );
     }
-    if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LAYER_DIALOG_WIN ) )
-    {
-        sal_uInt16 nId = LayerDialogChildWindow::GetChildWindowId();
-        rSet.Put( SfxBoolItem( SID_LAYER_DIALOG_WIN, GetViewFrame()->HasChildWindow( nId ) ) );
-    }
     if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_3D_WIN ) )
     {
         sal_uInt16 nId = Svx3DChildWindow::GetChildWindowId();

sd/source/ui/view/drviewse.cxx

@@ -1650,11 +1650,6 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText,
 void DrawViewShell::ShowUIControls (bool bVisible)
 {
     ViewShell::ShowUIControls (bVisible);
-
-    //AF: The LayerDialogChildWindow is not used anymore (I hope).
-    //    GetViewFrame()->SetChildWindow(
-    //        LayerDialogChildWindow::GetChildWindowId(),
-    //        IsLayerModeActive() && bVisible);
     maTabControl.Show (bVisible);
 }
 

sd/source/ui/view/drvwshrg.cxx

@@ -46,7 +46,6 @@
 #include "GraphicViewShell.hxx"
 #include "AnimationChildWindow.hxx"
 #include "NavigatorChildWindow.hxx"
-#include "LayerDialogChildWindow.hxx"
 
 using namespace sd;
 #define DrawViewShell