summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-31 12:20:41 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-08-31 15:07:57 +0200
commit8d3f4245555f5fbaba8be7b318f80dd79532099d (patch)
tree39c95e50b57601e3f4e82bf189882386c320a0e4
parent0e944350e92810adfcf080ae1d98ad7bc4bd578d (diff)
drop newly unused OFileURLControl
Change-Id: I8a043df9a90f363f0b6a1c470ac74c02c52db9a9 Reviewed-on: https://gerrit.libreoffice.org/78342 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx2
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx2
-rw-r--r--extras/source/glade/libreoffice-catalog.xml.in4
-rw-r--r--include/svtools/urlcontrol.hxx50
-rw-r--r--include/svx/databaselocationinput.hxx3
-rwxr-xr-xsolenv/bin/native-code.py1
-rw-r--r--solenv/clang-format/blacklist2
-rw-r--r--svtools/Library_svt.mk1
-rw-r--r--svtools/source/control/urlcontrol.cxx78
-rw-r--r--svx/source/form/databaselocationinput.cxx2
10 files changed, 3 insertions, 142 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 730b669e4062..b94331e6da11 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -22,13 +22,13 @@
#include "abspilot.hxx"
#include <osl/diagnose.h>
#include <tools/urlobj.hxx>
+#include <svtools/inettbc.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/filenotation.hxx>
#include <sfx2/docfilt.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-
namespace abp
{
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index c44f6659e3ca..915ec6abc932 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -23,12 +23,10 @@
#include "abspage.hxx"
#include "abptypes.hxx"
-#include <svtools/urlcontrol.hxx>
#include <svx/databaselocationinput.hxx>
#include <vcl/edit.hxx>
#include <vcl/vclptr.hxx>
-
namespace abp
{
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index a86845bd17d1..ab106329f9a2 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -203,10 +203,6 @@
generic-name="URLBox" parent="VclComboBoxText"
icon-name="widget-gtk-comboboxtext"/>
- <glade-widget-class title="OFileURLControl" name="svtlo-OFileURLControl"
- generic-name="URLBox" parent="svtlo-SvtURLBox"
- icon-name="widget-gtk-comboboxtext"/>
-
<glade-widget-class title="PropertyControl" name="sdlo-PropertyControl"
generic-name="PropertyControl" parent="VclComboBoxText"
icon-name="widget-gtk-comboboxtext"/>
diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx
deleted file mode 100644
index 6f001d3cbb71..000000000000
--- a/include/svtools/urlcontrol.hxx
+++ /dev/null
@@ -1,50 +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_SVTOOLS_URLCONTROL_HXX
-#define INCLUDED_SVTOOLS_URLCONTROL_HXX
-
-#include <svtools/svtdllapi.h>
-#include <svtools/inettbc.hxx>
-
-
-namespace svt
-{
-
- //= OFileURLControl
-
- class SVT_DLLPUBLIC OFileURLControl : public SvtURLBox
- {
- private:
- OUString m_sPreservedText;
-
- public:
- OFileURLControl(vcl::Window* _pParent, WinBits nStyle);
-
- protected:
- virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- virtual bool EventNotify( NotifyEvent& rNEvt ) override;
- };
-
-} // namespace svt
-
-
-#endif // INCLUDED_SVTOOLS_URLCONTROL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index 22bb6e5d7bd1..ae0cd05e0484 100644
--- a/include/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
@@ -26,7 +26,6 @@
#include <memory>
class PushButton;
-namespace svt { class OFileURLControl; }
class URLBox;
namespace weld { class Button; class Window; }
@@ -40,7 +39,7 @@ namespace svx
/** helper class to control controls needed to input a database location
If you allow, in your dialog, to save a database document, then you usually
- have a OFileURLControl for inputting the actual location, and a push button
+ have an URLBox for inputting the actual location, and a push button
to browse for a location.
This helper class controls such two UI elements.
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index cff16c954cd6..aeb73892d64d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -476,7 +476,6 @@ custom_widgets = [
'IndexBox',
'ManagedMenuButton',
'MultiLineEditSyntaxHighlight',
- 'OFileURLControl',
'OptionalBox',
'PageNumberListBox',
'PaperSizeListBox',
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 258c5c15d851..a4c01d637fce 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6993,7 +6993,6 @@ include/svtools/toolboxcontroller.hxx
include/svtools/unitconv.hxx
include/svtools/unoevent.hxx
include/svtools/unoimap.hxx
-include/svtools/urlcontrol.hxx
include/svtools/valueset.hxx
include/svx/AccessibleControlShape.hxx
include/svx/AccessibleGraphicShape.hxx
@@ -13717,7 +13716,6 @@ svtools/source/control/tabbar.cxx
svtools/source/control/toolbarmenu.cxx
svtools/source/control/toolbarmenuacc.cxx
svtools/source/control/toolbarmenuimp.hxx
-svtools/source/control/urlcontrol.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueimp.hxx
svtools/source/control/valueset.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 83815d191487..ecffada72bb7 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/tabbar \
svtools/source/control/toolbarmenu \
svtools/source/control/toolbarmenuacc \
- svtools/source/control/urlcontrol \
svtools/source/control/valueacc \
svtools/source/control/valueset \
svtools/source/dialogs/addresstemplate \
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
deleted file mode 100644
index dcf22fbdab78..000000000000
--- a/svtools/source/control/urlcontrol.cxx
+++ /dev/null
@@ -1,78 +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 <svl/filenotation.hxx>
-#include <svtools/urlcontrol.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/builderfactory.hxx>
-
-namespace svt
-{
- //= OFileURLControl
- OFileURLControl::OFileURLControl(vcl::Window* _pParent, WinBits nStyle)
- : SvtURLBox(_pParent, nStyle, INetProtocol::File)
- {
- DisableHistory();
- }
-
- extern "C" SAL_DLLPUBLIC_EXPORT void makeOFileURLControl(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
- {
- WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP|
- WB_DROPDOWN|WB_AUTOHSCROLL;
- VclPtrInstance<OFileURLControl> pListBox(pParent, nWinBits);
- pListBox->EnableAutoSize(true);
- rRet = pListBox;
- }
-
- bool OFileURLControl::PreNotify( NotifyEvent& _rNEvt )
- {
- if (GetSubEdit() == _rNEvt.GetWindow())
- if (MouseNotifyEvent::KEYINPUT == _rNEvt.GetType())
- if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode())
- if (IsInDropDown())
- m_sPreservedText = GetURL();
-
- return SvtURLBox::PreNotify(_rNEvt);
- }
-
- bool OFileURLControl::EventNotify( NotifyEvent& _rNEvt )
- {
- if (GetSubEdit() == _rNEvt.GetWindow())
- if (MouseNotifyEvent::KEYINPUT == _rNEvt.GetType())
- if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode())
- if (IsInDropDown())
- {
- bool bReturn = SvtURLBox::EventNotify(_rNEvt);
-
- // build a system dependent (thus more user readable) file name
- OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL);
- SetText(aTransformer.get(OFileNotation::N_SYSTEM));
- Modify();
-
- // Update the pick list
- UpdatePickList();
-
- return bReturn;
- }
-
- return SvtURLBox::EventNotify(_rNEvt);
- }
-} // namespace svt
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index a7af41882767..ab13de1444a2 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -30,8 +30,8 @@
#include <comphelper/namedvaluecollection.hxx>
#include <rtl/ustrbuf.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svtools/urlcontrol.hxx>
#include <svl/filenotation.hxx>
+#include <svtools/inettbc.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/confignode.hxx>
#include <unotools/ucbhelper.hxx>