diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-01 11:52:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-01 15:20:39 +0200 |
commit | b11195b416d2c4fbffa44da4049d6136055ba9d1 (patch) | |
tree | 343989ff183c42356d3f53ce22eefe1391f99519 | |
parent | 3f738d8f9e5c448ddf352a8e10e6c619dde7d87d (diff) |
drop newly unused OptHeaderTabListBox
Change-Id: I08926e91a61e7bdd4de4ac96083e970268801d6f
Reviewed-on: https://gerrit.libreoffice.org/76789
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | cui/Library_cui.mk | 1 | ||||
-rw-r--r-- | cui/source/inc/dbregister.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/optpath.hxx | 6 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optHeaderTabListbox.cxx | 80 | ||||
-rw-r--r-- | cui/source/options/optHeaderTabListbox.hxx | 38 | ||||
-rw-r--r-- | cui/source/options/optaboutconfig.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optaboutconfig.hxx | 1 | ||||
-rw-r--r-- | cui/source/options/optopencl.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/optpath.cxx | 1 |
10 files changed, 1 insertions, 137 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index df4a94126a63..1822dc311097 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -169,7 +169,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optfltr \ cui/source/options/optgdlg \ cui/source/options/optgenrl \ - cui/source/options/optHeaderTabListbox \ cui/source/options/opthtml \ cui/source/options/optinet2 \ cui/source/options/optjava \ diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 12fe0eff140a..b177fb3b0de2 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -24,12 +24,6 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -class SvTreeListEntry; -namespace svx -{ - class OptHeaderTabListBox; -} - namespace svx { diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index a3f82f3c0206..40ceb1156805 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -28,16 +28,10 @@ #include <svtools/dialogclosedlistener.hxx> // forward --------------------------------------------------------------- - -namespace svx -{ - class OptHeaderTabListBox; -} struct OptPath_Impl; class SvxPathTabPage; // class SvxPathTabPage -------------------------------------------------- - class SvxPathTabPage : public SfxTabPage { private: diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 4d409f14fdc5..f8680e3a53f2 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -22,6 +22,7 @@ #include "connpooloptions.hxx" #include <svl/filenotation.hxx> #include <helpids.h> +#include <tools/debug.hxx> #include <svtools/editbrowsebox.hxx> #include <strings.hrc> #include <bitmaps.hlst> @@ -36,7 +37,6 @@ #include <svl/itemset.hxx> #include "doclinkdialog.hxx" #include <unotools/localfilehelper.hxx> -#include "optHeaderTabListbox.hxx" #include <sfx2/docfilt.hxx> #include <dialmgr.hxx> #include "dbregisterednamesconfig.hxx" diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx deleted file mode 100644 index eb9205335b10..000000000000 --- a/cui/source/options/optHeaderTabListbox.cxx +++ /dev/null @@ -1,80 +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 "optHeaderTabListbox.hxx" -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <vcl/headbar.hxx> -#include <vcl/svlbitm.hxx> -#include <vcl/treelistentry.hxx> -namespace svx -{ -// class OptLBoxString_Impl ---------------------------------------------- - -class OptLBoxString_Impl : public SvLBoxString -{ -public: - explicit OptLBoxString_Impl(const OUString& rTxt) - : SvLBoxString(rTxt) - { - } - - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override; -}; - - -void OptLBoxString_Impl::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext, - const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) -{ - rRenderContext.Push(PushFlags::FONT); - vcl::Font aFont(rRenderContext.GetFont()); - //detect readonly state by asking for a valid Image - if (!(!SvTreeListBox::GetCollapsedEntryBmp(&rEntry))) - aFont.SetColor(Application::GetSettings().GetStyleSettings().GetDeactiveTextColor()); - rRenderContext.SetFont(aFont); - rRenderContext.DrawText(rPos, GetText()); - rRenderContext.Pop(); -} - - -OptHeaderTabListBox::OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nWinStyle) - : SvSimpleTable(rParent, nWinStyle) -{ -} - - -void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rTxt, - const Image& rImg1, const Image& rImg2, - SvLBoxButtonKind eButtonKind ) -{ - SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2, eButtonKind ); - sal_uInt16 _nTabCount = TabCount(); - - for ( sal_uInt16 nCol = 1; nCol < _nTabCount; ++nCol ) - { - // initialize all columns with own class (column 0 == Bitmap) - SvLBoxString& rCol = static_cast<SvLBoxString&>(pEntry->GetItem( nCol )); - pEntry->ReplaceItem(std::make_unique<OptLBoxString_Impl>(rCol.GetText()), nCol); - } -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx deleted file mode 100644 index 147bbde49fb7..000000000000 --- a/cui/source/options/optHeaderTabListbox.hxx +++ /dev/null @@ -1,38 +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_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX -#define INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX - -#include <svtools/simptabl.hxx> - -namespace svx -{ - // class OptHeaderTabListBox --------------------------------------------- - - class OptHeaderTabListBox : public SvSimpleTable - { - public: - OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nBits); - - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; - }; -} // svx -#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTHEADERTABLISTBOX_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index b1d156aab5c7..41d590a6953f 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -8,7 +8,6 @@ */ #include "optaboutconfig.hxx" -#include "optHeaderTabListbox.hxx" #include <vcl/button.hxx> #include <vcl/event.hxx> @@ -37,7 +36,6 @@ #include <vector> #include <iostream> -using namespace svx; using namespace ::com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::container; diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 5591f40e43db..c045ed42095e 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -19,7 +19,6 @@ #include <vector> -namespace svx { class OptHeaderTabListBox; } class CuiAboutConfigTabPage; class CuiAboutConfigValueDialog; struct Prop_Impl; diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 5131714e18c8..062d21be531f 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -25,7 +25,6 @@ #include <opencl/openclwrapper.hxx> #include <officecfg/Office/Common.hxx> #include <svtools/restartdialog.hxx> -#include "optHeaderTabListbox.hxx" #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 5f0dd831835f..46d930d1c346 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -50,7 +50,6 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/util/thePathSettings.hpp> #include <officecfg/Office/Common.hxx> -#include "optHeaderTabListbox.hxx" #include <vcl/help.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> |