[Libreoffice-commits] core.git: extras/source sd/Library_sd.mk sd/source
Caolán McNamara
caolanm at redhat.com
Tue May 9 08:19:30 UTC 2017
extras/source/glade/libreoffice-catalog.xml.in | 4 --
sd/Library_sd.mk | 1
sd/source/ui/dlg/dlgctrls.cxx | 48 -------------------------
sd/source/ui/inc/diactrl.hxx | 1
sd/source/ui/inc/dlgctrls.hxx | 39 --------------------
sd/source/ui/inc/strings.hrc | 5 --
6 files changed, 98 deletions(-)
New commits:
commit cb870839b87573c9a529ad087e6aca3ad6488e48
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue May 9 09:11:27 2017 +0100
drop unused FadeEffectLB
Change-Id: I9de95edc7f018fa9e7b11111e071d738f63e35b4
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index ec767c48f696..be8a2738e855 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -688,10 +688,6 @@
generic-name="Open Document ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
- <glade-widget-class title="Fade Effect ListBox" name="sdlo-FadeEffectLB"
- generic-name="Fade Effect ListBox" parent="GtkComboBox"
- icon-name="widget-gtk-combobox"/>
-
<glade-widget-class title="Fill Type ListBox" name="svxlo-SvxFillTypeBox"
generic-name="Fill Type ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 99bd496e0e3f..36ac7d7b5808 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -207,7 +207,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/dlg/animobjs \
sd/source/ui/dlg/assclass \
sd/source/ui/dlg/diactrl \
- sd/source/ui/dlg/dlgctrls \
sd/source/ui/dlg/docprev \
sd/source/ui/dlg/filedlg \
sd/source/ui/dlg/gluectrl \
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
deleted file mode 100644
index dc02a764c0fa..000000000000
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ /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 .
- */
-
-#include <vcl/builderfactory.hxx>
-
-#include "strings.hrc"
-#include "dlgctrls.hxx"
-#include "sdresid.hxx"
-#include "fadedef.h"
-#include "sdpage.hxx"
-
-using namespace ::sd;
-
-FadeEffectLB::FadeEffectLB(vcl::Window* pParent, WinBits nStyle)
- : ListBox(pParent, nStyle)
-{
-}
-
-VCL_BUILDER_DECL_FACTORY(FadeEffectLB)
-{
- WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
-
- bool bDropdown = VclBuilder::extractDropdown(rMap);
-
- if (bDropdown)
- nBits |= WB_DROPDOWN;
-
- rRet = VclPtr<FadeEffectLB>::Create(pParent, nBits);
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx
index 93ff077e4a4d..4723d5bac1d5 100644
--- a/sd/source/ui/inc/diactrl.hxx
+++ b/sd/source/ui/inc/diactrl.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX
#define INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX
-#include "dlgctrls.hxx"
#include <svl/intitem.hxx>
#include <sfx2/bindings.hxx>
#include <svx/itemwin.hxx>
diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx
deleted file mode 100644
index 554df3f860b0..000000000000
--- a/sd/source/ui/inc/dlgctrls.hxx
+++ /dev/null
@@ -1,39 +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_DLGCTRLS_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_DLGCTRLS_HXX
-
-#include "TransitionPreset.hxx"
-#include <vcl/lstbox.hxx>
-
-#include "sdresid.hxx"
-#include "fadedef.h"
-#include "sddllapi.h"
-#include <memory>
-
-class SD_DLLPUBLIC FadeEffectLB : public ListBox
-{
-public:
- FadeEffectLB(vcl::Window* pParent, WinBits nStyle);
-};
-
-#endif // INCLUDED_SD_SOURCE_UI_INC_DLGCTRLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index b7efeb248c64..7d0b1217af58 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -36,11 +36,6 @@
#define STR_UNDO_DRAGDROP (RID_APP_START+66)
#define STR_INSERTGRAPHIC (RID_APP_START+67)
-/*
- * Overlay effects: should remain open at the bottom,
- * as FadeEffectLB works with variable numbers
- * (Now via STR_EFFECT_...)
- */
#define STR_DRAGTYPE_URL (RID_APP_START+70)
#define STR_DRAGTYPE_EMBEDDED (RID_APP_START+71)
#define STR_DRAGTYPE_LINK (RID_APP_START+72)
More information about the Libreoffice-commits
mailing list