[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/Library_sd.mk sd/sdi sd/source
Caolán McNamara
caolanm at redhat.com
Sat Sep 6 02:22:50 PDT 2014
sd/AllLangResTarget_sd.mk | 1
sd/Library_sd.mk | 2
sd/inc/app.hrc | 1
sd/sdi/drviewsh.sdi | 5 -
sd/sdi/sdraw.sdi | 26 --------
sd/source/ui/app/sddll.cxx | 2
sd/source/ui/dlg/LayerDialog.src | 51 ----------------
sd/source/ui/dlg/LayerDialogChildWindow.cxx | 69 ----------------------
sd/source/ui/dlg/LayerDialogContent.cxx | 85 ----------------------------
sd/source/ui/inc/LayerDialog.hrc | 23 -------
sd/source/ui/inc/LayerDialogChildWindow.hxx | 48 ---------------
sd/source/ui/inc/LayerDialogContent.hxx | 55 ------------------
sd/source/ui/view/drviews1.cxx | 1
sd/source/ui/view/drviews2.cxx | 22 -------
sd/source/ui/view/drviews5.cxx | 1
sd/source/ui/view/drviews6.cxx | 6 -
sd/source/ui/view/drviewse.cxx | 5 -
sd/source/ui/view/drvwshrg.cxx | 1
18 files changed, 404 deletions(-)
New commits:
commit 37f8ed8daf19bf536857640e4961a188fb1b723e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 6 10:14:08 2014 +0100
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
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 1c4ad6f..8982145 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/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,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index d6bb1be..2afcf9b 100644
--- a/sd/Library_sd.mk
+++ b/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 \
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index fae13da..aacb357 100644
--- a/sd/inc/app.hrc
+++ b/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)
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index f56f7a8..1d6a86d 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/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;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index de7f1a2..7b9f7ea 100644
--- a/sd/sdi/sdraw.sdi
+++ b/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,
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index ba6a6f7..a29b6f7 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/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);
diff --git a/sd/source/ui/dlg/LayerDialog.src b/sd/source/ui/dlg/LayerDialog.src
deleted file mode 100644
index 3703875..0000000
--- a/sd/source/ui/dlg/LayerDialog.src
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- 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: */
diff --git a/sd/source/ui/dlg/LayerDialogChildWindow.cxx b/sd/source/ui/dlg/LayerDialogChildWindow.cxx
deleted file mode 100644
index 2f4050b..0000000
--- a/sd/source/ui/dlg/LayerDialogChildWindow.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- 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: */
diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx
deleted file mode 100644
index 2a361ec..0000000
--- a/sd/source/ui/dlg/LayerDialogContent.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- 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: */
diff --git a/sd/source/ui/inc/LayerDialog.hrc b/sd/source/ui/inc/LayerDialog.hrc
deleted file mode 100644
index 1700373..0000000
--- a/sd/source/ui/inc/LayerDialog.hrc
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- 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: */
diff --git a/sd/source/ui/inc/LayerDialogChildWindow.hxx b/sd/source/ui/inc/LayerDialogChildWindow.hxx
deleted file mode 100644
index f5277ef..0000000
--- a/sd/source/ui/inc/LayerDialogChildWindow.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- 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: */
diff --git a/sd/source/ui/inc/LayerDialogContent.hxx b/sd/source/ui/inc/LayerDialogContent.hxx
deleted file mode 100644
index 71b7092..0000000
--- a/sd/source/ui/inc/LayerDialogContent.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- 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: */
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 30d5526..484bf2f 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/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"
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 61d0b86..ce61386 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/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:
{
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index febbade..118e2f5 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/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>
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index d9582c9..2f8aa8e 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/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();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 77ebf96..30109bd 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/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);
}
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 6a3f325..0e39e0a 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/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
More information about the Libreoffice-commits
mailing list