[Libreoffice-commits] core.git: extras/source sd/Library_sd.mk sd/source solenv/clang-format
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 23 08:52:40 UTC 2020
extras/source/glade/libreoffice-catalog.xml.in | 3
sd/Library_sd.mk | 1
sd/source/ui/dlg/docprev.cxx | 116 -------------------------
sd/source/ui/inc/docprev.hxx | 61 -------------
solenv/clang-format/blacklist | 2
5 files changed, 183 deletions(-)
New commits:
commit a8b5f7d4a40c6cd3eb93506d936c5cbedf327fbd
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 22 20:14:21 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 23 09:52:07 2020 +0100
SdDocPreviewWin is unused
since...
commit bb8040595c9b6f0ccde39e6833f27a50abb891d8
Date: Mon May 30 01:57:00 2016 +0530
Impress: Replace Presentation Wizard with Template Manager
Change-Id: Ibe610beb8ae98aca9bf29554528127ed1518179d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87219
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 81caff707572..13c12a2e1aed 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -71,9 +71,6 @@
</properties>
</glade-widget-class>
- <glade-widget-class title="Document Preview Window" name="sdlo-SdDocPreviewWin"
- generic-name="Document Preview Window" parent="GtkDrawingArea"
- icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Svx 3D Light Control" name="svxlo-SvxLightCtl3D"
generic-name="3D Light Control" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 4b7eefa86669..048a0c4f1edc 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -214,7 +214,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/docprev \
sd/source/ui/dlg/filedlg \
sd/source/ui/dlg/gluectrl \
sd/source/ui/dlg/ins_paste \
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
deleted file mode 100644
index dca7a4798402..000000000000
--- a/sd/source/ui/dlg/docprev.cxx
+++ /dev/null
@@ -1,116 +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 <slideshow.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/settings.hxx>
-
-#include <docprev.hxx>
-#include <ViewShell.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/builderfactory.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-const int SdDocPreviewWin::FRAME = 4;
-
-VCL_BUILDER_FACTORY_CONSTRUCTOR(SdDocPreviewWin, 0)
-
-SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle )
-: Control(pParent, nStyle)
-{
- SetBorderStyle( WindowBorderStyle::MONO );
- svtools::ColorConfig aColorConfig;
- Wallpaper aEmpty;
- SetBackground( aEmpty );
-}
-
-SdDocPreviewWin::~SdDocPreviewWin()
-{
- disposeOnce();
-}
-
-void SdDocPreviewWin::dispose()
-{
- if (mxSlideShow.is())
- {
- mxSlideShow->end();
- mxSlideShow.clear();
- }
- Control::dispose();
-}
-
-Size SdDocPreviewWin::GetOptimalSize() const
-{
- return LogicToPixel(Size(122, 96), MapMode(MapUnit::MapAppFont));
-}
-
-void SdDocPreviewWin::Resize()
-{
- Invalidate();
- if( mxSlideShow.is() )
- mxSlideShow->resize( GetSizePixel() );
-}
-
-void SdDocPreviewWin::ImpPaint( OutputDevice* pVDev )
-{
- svtools::ColorConfig aColorConfig;
-
- pVDev->SetLineColor();
- pVDev->SetFillColor( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor );
- pVDev->DrawRect(::tools::Rectangle( Point(0,0 ), pVDev->GetOutputSize()));
-}
-
-void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& /*rRect*/ )
-{
- if( (!mxSlideShow.is()) || (!mxSlideShow->isRunning() ) )
- {
- SvtAccessibilityOptions aAccOptions;
- bool bUseContrast = aAccOptions.GetIsForPagePreviews() && Application::GetSettings().GetStyleSettings().GetHighContrastMode();
- SetDrawMode( bUseContrast
- ? ::sd::OUTPUT_DRAWMODE_CONTRAST
- : ::sd::OUTPUT_DRAWMODE_COLOR );
-
- ImpPaint( this );
- }
- else
- {
- mxSlideShow->paint();
- }
-}
-
-void SdDocPreviewWin::Notify(SfxBroadcaster&, const SfxHint& rHint)
-{
- if( rHint.GetId() == SfxHintId::ColorsChanged )
- {
- Invalidate();
- }
-}
-void SdDocPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
-{
- Control::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
- {
- Invalidate();
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
deleted file mode 100644
index b8bd942474fa..000000000000
--- a/sd/source/ui/inc/docprev.hxx
+++ /dev/null
@@ -1,61 +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_DOCPREV_HXX
-#define INCLUDED_SD_SOURCE_UI_INC_DOCPREV_HXX
-
-#include <tools/gen.hxx>
-#include <tools/wintypes.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/window.hxx>
-
-#include <rtl/ref.hxx>
-
-#include <svl/lstner.hxx>
-#include <sddllapi.h>
-
-namespace sd {
- class SlideShow;
-}
-
-class SdDocPreviewWin final : public Control, public SfxListener
-{
- rtl::Reference< sd::SlideShow > mxSlideShow;
-
- virtual void Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect ) override;
- virtual Size GetOptimalSize() const override;
- static void ImpPaint( OutputDevice* pVDev );
-
- static const int FRAME;
-
- virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
-
-public:
- SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle );
- virtual ~SdDocPreviewWin() override;
- virtual void dispose() override;
- virtual void Resize() override;
-
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 4cb6e4feec2d..890cdc7f8a3c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -11733,7 +11733,6 @@ sd/source/ui/dlg/dlgfield.cxx
sd/source/ui/dlg/dlgolbul.cxx
sd/source/ui/dlg/dlgpage.cxx
sd/source/ui/dlg/dlgsnap.cxx
-sd/source/ui/dlg/docprev.cxx
sd/source/ui/dlg/filedlg.cxx
sd/source/ui/dlg/gluectrl.cxx
sd/source/ui/dlg/headerfooterdlg.cxx
@@ -11961,7 +11960,6 @@ sd/source/ui/inc/dlg_char.hxx
sd/source/ui/inc/dlgfield.hxx
sd/source/ui/inc/dlgpage.hxx
sd/source/ui/inc/dlgsnap.hxx
-sd/source/ui/inc/docprev.hxx
sd/source/ui/inc/drawview.hxx
sd/source/ui/inc/facreg.hxx
sd/source/ui/inc/filedlg.hxx
More information about the Libreoffice-commits
mailing list