[Libreoffice-commits] core.git: include/svx solenv/clang-format svx/Library_svx.mk svx/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 31 14:20:17 UTC 2019
include/svx/fontlb.hxx | 45 ------------------------------
solenv/clang-format/blacklist | 2 -
svx/Library_svx.mk | 1
svx/source/dialog/fontlb.cxx | 62 ------------------------------------------
4 files changed, 110 deletions(-)
New commits:
commit 5a7c684b03510b4b568b4f10b38d6c433e4a291e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 31 13:42:13 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 31 16:19:37 2019 +0200
drop unused SvLBoxFontString
Change-Id: Ieada5128d3a2072d5789de854baa8993a28dd182
Reviewed-on: https://gerrit.libreoffice.org/78348
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
deleted file mode 100644
index fe5bd8b583a4..000000000000
--- a/include/svx/fontlb.hxx
+++ /dev/null
@@ -1,45 +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_SVX_FONTLB_HXX
-#define INCLUDED_SVX_FONTLB_HXX
-
-#include <vcl/svlbitm.hxx>
-
-
-/** A list box string item which stores its text and font. */
-class SAL_WARN_UNUSED SvLBoxFontString : public SvLBoxString
-{
-public:
- SvLBoxFontString();
-
- virtual ~SvLBoxFontString() override;
-
- virtual std::unique_ptr<SvLBoxItem> Clone(SvLBoxItem const * pSource) const override;
-
- void InitViewData( SvTreeListBox*, SvTreeListEntry*, SvViewDataItem* = nullptr ) override;
-
- /** Paints this entry to the specified position, using the own font settings. */
- virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
- const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index bc936b6c5bd3..9a9845a74112 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7095,7 +7095,6 @@ include/svx/fmsrcimp.hxx
include/svx/fmtools.hxx
include/svx/fmview.hxx
include/svx/fntctrl.hxx
-include/svx/fontlb.hxx
include/svx/fontwork.hxx
include/svx/fontworkbar.hxx
include/svx/fontworkgallery.hxx
@@ -13986,7 +13985,6 @@ svx/source/dialog/dlgunit.hxx
svx/source/dialog/dlgutil.cxx
svx/source/dialog/docrecovery.cxx
svx/source/dialog/fntctrl.cxx
-svx/source/dialog/fontlb.cxx
svx/source/dialog/fontwork.cxx
svx/source/dialog/framelink.cxx
svx/source/dialog/framelinkarray.cxx
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index a3a2cec79a1d..82bc9183c6eb 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -125,7 +125,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/dlgctrl \
svx/source/dialog/docrecovery \
svx/source/dialog/fntctrl \
- svx/source/dialog/fontlb \
svx/source/dialog/fontwork \
svx/source/dialog/frmdirlbox \
svx/source/dialog/frmsel \
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
deleted file mode 100644
index 418e6981fa0c..000000000000
--- a/svx/source/dialog/fontlb.cxx
+++ /dev/null
@@ -1,62 +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 <svx/fontlb.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/treelistentry.hxx>
-#include <vcl/viewdataentry.hxx>
-
-SvLBoxFontString::SvLBoxFontString()
- : SvLBoxString()
-{
-}
-
-SvLBoxFontString::~SvLBoxFontString()
-{
-}
-
-std::unique_ptr<SvLBoxItem> SvLBoxFontString::Clone(SvLBoxItem const *) const
-{
- return std::unique_ptr<SvLBoxItem>(new SvLBoxFontString);
-}
-
-void SvLBoxFontString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
- const SvViewDataEntry* pView, const SvTreeListEntry& rEntry)
-{
- rRenderContext.Push(PushFlags::FONT);
- vcl::Font aNewFont;
- bool bSel = pView->IsSelected();
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- aNewFont.SetColor(bSel ? rStyleSettings.GetHighlightTextColor() : rStyleSettings.GetFieldTextColor());
-
- rRenderContext.SetFont(aNewFont);
- SvLBoxString::Paint(rPos, rDev, rRenderContext, pView, rEntry);
- rRenderContext.Pop();
-}
-
-void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
-{
- vcl::Font aOldFont( pView->GetFont() );
- pView->Control::SetFont( vcl::Font() );
- SvLBoxString::InitViewData( pView, pEntry, pViewData);
- pView->Control::SetFont( aOldFont );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list