compilerplugins/clang/mergeclasses.results | 1
dbaccess/Library_dbu.mk | 1
dbaccess/source/ui/app/AppDetailView.hxx | 1
dbaccess/source/ui/control/VertSplitView.cxx | 180 ---------------------------
dbaccess/source/ui/inc/VertSplitView.hxx | 54 --------
solenv/clang-format/excludelist | 2
6 files changed, 239 deletions(-)
New commits:
commit 30da85c88f431c339ae4005f8c75504d3127ede1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Aug 28 14:53:12 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 28 20:14:16 2020 +0200
drop newly unused VertSplitView
Change-Id: Ib70905dd22ddd7a5f529501be10bdbfb9164a65f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101549
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index 594a37cb76df..c0fd80c1fb17 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -262,7 +262,6 @@ merge dbaui::IController with dbaui::OGenericUnoController
merge dbaui::IEntryFilter with dbaui::(anonymous
namespace)::FilterByEntryDataId
merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper
merge dbaui::OSQLNameEntry with dbaui::OPropColumnEditCtrl
-merge dbaui::OSplitterView with dbaui::OApplicationDetailView
merge dbaui::OTableRowView with dbaui::OTableEditorCtrl
merge dbaui::SbaGridListener with dbaui::SbaXDataBrowserController
merge dbp::OGridPage with dbp::OGridFieldsSelection
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 460ff181db5b..895343591bf4 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -110,7 +110,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/control/TableGrantCtrl \
dbaccess/source/ui/control/tabletree \
dbaccess/source/ui/control/undosqledit \
- dbaccess/source/ui/control/VertSplitView \
dbaccess/source/ui/dlg/admincontrols \
dbaccess/source/ui/dlg/adminpages \
dbaccess/source/ui/dlg/adtabdlg \
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx
b/dbaccess/source/ui/app/AppDetailView.hxx
index 592b6e3f344e..5a181bd8e433 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -27,7 +27,6 @@
#include <IClipBoardTest.hxx>
#include "AppTitleWindow.hxx"
#include <AppElementType.hxx>
-#include <VertSplitView.hxx>
#include <vector>
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx
b/dbaccess/source/ui/control/VertSplitView.cxx
deleted file mode 100644
index 35616d3302ed..000000000000
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ /dev/null
@@ -1,180 +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 <VertSplitView.hxx>
-
-#include <vcl/split.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/event.hxx>
-#include <osl/diagnose.h>
-
-#define SPLITTER_WIDTH 80
-
-using namespace ::dbaui;
-
-OSplitterView::OSplitterView(vcl::Window* _pParent) :
Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER
- ,m_pSplitter( nullptr )
- ,m_pLeft(nullptr)
- ,m_pRight(nullptr)
- ,m_pResizeId(nullptr)
-{
- ImplInitSettings();
-}
-
-OSplitterView::~OSplitterView()
-{
- disposeOnce();
-}
-
-void OSplitterView::dispose()
-{
- if (m_pResizeId)
- {
- RemoveUserEvent(m_pResizeId);
- m_pResizeId = nullptr;
- }
- m_pSplitter.clear();
- m_pLeft.clear();
- m_pRight.clear();
- vcl::Window::dispose();
-}
-
-IMPL_LINK_NOARG( OSplitterView, SplitHdl, Splitter*, void )
-{
- OSL_ENSURE(m_pSplitter, "Splitter is NULL!");
- m_pSplitter->SetPosPixel( Point(
m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) );
-
- Resize();
-}
-
-void OSplitterView::ImplInitSettings()
-{
- // FIXME RenderContext
- const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-
- vcl::Font aFont = rStyleSettings.GetAppFont();
- if ( IsControlFont() )
- aFont.Merge( GetControlFont() );
- SetPointFont(*this, aFont);
-// Set/*Zoomed*/PointFont( aFont );
-
- Color aTextColor = rStyleSettings.GetButtonTextColor();
- if ( IsControlForeground() )
- aTextColor = GetControlForeground();
- SetTextColor( aTextColor );
-
- if( IsControlBackground() )
- SetBackground( GetControlBackground() );
- else
- SetBackground( rStyleSettings.GetFaceColor() );
-}
-
-void OSplitterView::DataChanged( const DataChangedEvent& rDCEvt )
-{
- Window::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
- (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
- {
- ImplInitSettings();
- Invalidate();
- }
-}
-
-void OSplitterView::GetFocus()
-{
- Window::GetFocus();
-
- // forward the focus to the current cell of the editor control
- if ( m_pLeft )
- m_pLeft->GrabFocus();
- else if ( m_pRight )
- m_pRight->GrabFocus();
-}
-
-IMPL_LINK_NOARG(OSplitterView, ResizeHdl, void*, void)
-{
- m_pResizeId = nullptr;
-
- OSL_ENSURE( m_pRight, "No init called!");
-
- Point aSplitPos;
- Size aSplitSize;
- Point aPlaygroundPos( 0,0 );
- Size aPlaygroundSize( GetOutputSizePixel() );
-
- if ( m_pLeft && m_pLeft->IsVisible() && m_pSplitter )
- {
- aSplitPos = m_pSplitter->GetPosPixel();
- aSplitSize = m_pSplitter->GetOutputSizePixel();
- aSplitPos.setX( aPlaygroundPos.X() );
- aSplitSize.setWidth( aPlaygroundSize.Width() );
-
- if( ( aSplitPos.Y() + aSplitSize.Height() ) > (
aPlaygroundSize.Height() ))
- aSplitPos.setY( aPlaygroundSize.Height() - aSplitSize.Height() );
-
- if( aSplitPos.Y() <= aPlaygroundPos.Y() )
- aSplitPos.setY( aPlaygroundPos.Y() +
sal_Int32(aPlaygroundSize.Height() * 0.3) );
-
- // the tree pos and size
- Point aTreeViewPos( aPlaygroundPos );
- Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y());
-
- // set the size of treelistbox
- m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize );
-
- //set the size of the splitter
- m_pSplitter->SetPosSizePixel( aSplitPos, Size(
aPlaygroundSize.Width(), aSplitSize.Height() ) );
- m_pSplitter->SetDragRectPixel(
tools::Rectangle(aPlaygroundPos,aPlaygroundSize) );
- }
-
- if ( m_pRight )
- {
- m_pRight->setPosSizePixel( aSplitPos.X(), aPlaygroundPos.Y() +
aSplitPos.Y() + aSplitSize.Height(),
- aPlaygroundSize.Width() ,
aPlaygroundSize.Height() - aSplitSize.Height() - aSplitPos.Y());
- }
-}
-
-void OSplitterView::Resize()
-{
- Window::Resize();
- if (m_pResizeId)
- RemoveUserEvent(m_pResizeId);
- m_pResizeId = PostUserEvent(LINK(this, OSplitterView, ResizeHdl), this,
true);
-}
-
-void OSplitterView::set(vcl::Window* _pRight,Window* _pLeft)
-{
- m_pLeft = _pLeft;
- m_pRight = _pRight;
-}
-
-void OSplitterView::setSplitter(Splitter* _pSplitter)
-{
- m_pSplitter = _pSplitter;
- if ( m_pSplitter )
- {
- m_pSplitter->SetSplitPosPixel(LogicToPixel(Size(SPLITTER_WIDTH, 0),
MapMode(MapUnit::MapAppFont)).Width());
- m_pSplitter->SetSplitHdl( LINK(this, OSplitterView, SplitHdl) );
- m_pSplitter->Show();
- LINK( this, OSplitterView, SplitHdl ).Call(m_pSplitter);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx
b/dbaccess/source/ui/inc/VertSplitView.hxx
deleted file mode 100644
index 25a0a6442e81..000000000000
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ /dev/null
@@ -1,54 +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_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX
-
-#include <vcl/window.hxx>
-
-class Splitter;
-
-namespace dbaui
-{
- class OSplitterView : public vcl::Window
- {
- VclPtr<Splitter> m_pSplitter;
- VclPtr<vcl::Window> m_pLeft;
- VclPtr<vcl::Window> m_pRight;
- ImplSVEvent *m_pResizeId;
-
- void ImplInitSettings();
- DECL_LINK(SplitHdl, Splitter*, void);
- DECL_LINK(ResizeHdl, void*, void);
- protected:
- virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
- public:
- OSplitterView(vcl::Window* _pParent);
- virtual ~OSplitterView() override;
- // Window overrides
- virtual void dispose() override;
- virtual void GetFocus() override;
-
- void setSplitter(Splitter* _pSplitter);
- void set(vcl::Window* _pRight,Window* _pLeft = nullptr);
- virtual void Resize() override;
- };
-}
-#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 7f6d46a1276a..61eea12ba9ea 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3134,7 +3134,6 @@ dbaccess/source/ui/control/FieldDescControl.cxx
dbaccess/source/ui/control/RelationControl.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
-dbaccess/source/ui/control/VertSplitView.cxx
dbaccess/source/ui/control/charsetlistbox.cxx
dbaccess/source/ui/control/curledit.cxx
dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -3257,7 +3256,6 @@ dbaccess/source/ui/inc/TokenWriter.hxx
dbaccess/source/ui/inc/TypeInfo.hxx
dbaccess/source/ui/inc/UITools.hxx
dbaccess/source/ui/inc/UserAdminDlg.hxx
-dbaccess/source/ui/inc/VertSplitView.hxx
dbaccess/source/ui/inc/WCPage.hxx
dbaccess/source/ui/inc/WColumnSelect.hxx
dbaccess/source/ui/inc/WCopyTable.hxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
