diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-29 10:51:03 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-29 17:27:23 +0100 |
commit | 2cd6ff8a54b0db76b2f4c5f75988367cfb0feaf0 (patch) | |
tree | dd828b1b677f78db2da39e0e5ad2b6db6bb5c432 /fpicker/source | |
parent | 93bf9aee23706a36cabbe51c2677752f93d57812 (diff) |
remove unnecessary includes
Change-Id: Ia4a622b34ff3f71963cff7a1aa8658a4df12f04f
Reviewed-on: https://gerrit.libreoffice.org/81676
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker/source')
-rw-r--r-- | fpicker/source/office/OfficeControlAccess.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/OfficeControlAccess.hxx | 1 | ||||
-rw-r--r-- | fpicker/source/office/PlacesListBox.cxx | 1 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 3 | ||||
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.hxx | 6 | ||||
-rw-r--r-- | fpicker/source/office/autocmpledit.cxx | 29 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.cxx | 1 | ||||
-rw-r--r-- | fpicker/source/office/contentenumeration.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/fileview.cxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/fileview.hxx | 3 | ||||
-rw-r--r-- | fpicker/source/office/foldertree.cxx | 1 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 5 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hxx | 9 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 1 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 5 |
15 files changed, 6 insertions, 65 deletions
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 256839897f83..f4251bc03fd0 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <vcl/button.hxx> -#include <vcl/lstbox.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index e66baae3d37c..565afb9d2f4d 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX #define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX -#include <vcl/lstbox.hxx> #include "fileview.hxx" #include "pickercallbacks.hxx" #include <o3tl/typed_flags_set.hxx> diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index f500e9a608cc..da03c0f704fb 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -10,7 +10,6 @@ #include "PlacesListBox.hxx" #include <svtools/PlaceEditDialog.hxx> -#include <vcl/headbar.hxx> #include <vcl/event.hxx> #include <bitmaps.hlst> diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 3adf45987975..02a3ef2bec2b 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -23,10 +23,7 @@ #include <tools/debug.hxx> #include <ucbhelper/commandenvironment.hxx> #include <vcl/errinf.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/treelistentry.hxx> #include <bitmaps.hlst> -#include <vcl/ptrstyle.hxx> #include <officecfg/Office/Common.hxx> RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits ) diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index aae53a121ddf..b22fb1fd55ac 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -15,10 +15,6 @@ #include <unotools/viewoptions.hxx> -#include <vcl/button.hxx> -#include <vcl/menubtn.hxx> -#include <vcl/vclptr.hxx> -#include <vcl/split.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/beans/StringPair.hpp> @@ -175,8 +171,6 @@ private: DECL_LINK( FileNameGetFocusHdl, weld::Widget&, void ); DECL_LINK( FileNameModifyHdl, weld::Entry&, void ); - DECL_LINK( SplitHdl, Splitter*, void ); - DECL_LINK( SelectFilterHdl, weld::ComboBox&, void ); DECL_LINK( TreeSelectHdl, weld::TreeView&, void ); diff --git a/fpicker/source/office/autocmpledit.cxx b/fpicker/source/office/autocmpledit.cxx index f6dddd0e57fd..57da4f4e5444 100644 --- a/fpicker/source/office/autocmpledit.cxx +++ b/fpicker/source/office/autocmpledit.cxx @@ -82,33 +82,4 @@ bool AutocompleteEdit::Match( const OUString& rText ) return bRet; } -#if 0 -bool AutocompleteEdit::PreNotify( NotifyEvent& rNEvt ) -{ - if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) - { - const KeyEvent& rEvent = *rNEvt.GetKeyEvent(); - const vcl::KeyCode& rKey = rEvent.GetKeyCode(); - vcl::KeyCode aCode( rKey.GetCode() ); - - if( ( aCode == KEY_UP || aCode == KEY_DOWN ) && !rKey.IsMod2() ) - { - Selection aSelection( GetSelection() ); - sal_uInt16 nLen = static_cast<sal_uInt16>(aSelection.Min()); - - if( !m_aMatching.empty() && - ( ( aCode == KEY_DOWN && m_nCurrent + 1 < m_aMatching.size() ) - || ( aCode == KEY_UP && m_nCurrent > 0 ) ) ) - { - SetText( m_aMatching[ aCode == KEY_DOWN ? ++m_nCurrent : --m_nCurrent ] ); - SetSelection( Selection( nLen, GetText().getLength() ) ); - return true; - } - } - } - - return Edit::PreNotify( rNEvt ); -} -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 2b2413bdc024..29ae5d08b6c9 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include <osl/mutex.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index bb906ce44514..920a6d8f2b08 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -25,8 +25,6 @@ #include <ucbhelper/content.hxx> #include <rtl/ustring.hxx> #include <tools/datetime.hxx> -#include <vcl/image.hxx> - namespace svt { diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 442e83276b41..1964bf789785 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -985,7 +985,7 @@ void SvtFileView::SetDoubleClickHdl(const Link<SvtFileView*,bool>& rHdl) mpImpl->SetDoubleClickHandler(rHdl); } -sal_uLong SvtFileView::GetSelectionCount() const +sal_uInt32 SvtFileView::GetSelectionCount() const { if (mpImpl->mxView->get_visible()) return mpImpl->mxView->count_selected_rows(); diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index 89b16ec64267..f994d7a1f4d0 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -21,7 +21,6 @@ #include <memory> #include <com/sun/star/uno/Sequence.h> -#include <vcl/ctrl.hxx> #include <vcl/errinf.hxx> #include <vcl/weld.hxx> #include <rtl/ustring.hxx> @@ -157,7 +156,7 @@ public: void SetDoubleClickHdl( const Link<SvtFileView*,bool>& rHdl ); void SetOpenDoneHdl( const Link<SvtFileView*,void>& rHdl ); - sal_uLong GetSelectionCount() const; + sal_uInt32 GetSelectionCount() const; SvtContentEntry* FirstSelected() const; void selected_foreach(const std::function<bool(weld::TreeIter&)>& func); diff --git a/fpicker/source/office/foldertree.cxx b/fpicker/source/office/foldertree.cxx index e97411c61fd1..78cccf52787c 100644 --- a/fpicker/source/office/foldertree.cxx +++ b/fpicker/source/office/foldertree.cxx @@ -11,7 +11,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/urlobj.hxx> #include <ucbhelper/commandenvironment.hxx> -#include <vcl/treelistentry.hxx> #include <com/sun/star/task/InteractionHandler.hpp> #include "contentenumeration.hxx" #include "foldertree.hxx" diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 61e5b2ce0d55..db90c2f7f0f5 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -26,19 +26,16 @@ #include "OfficeControlAccess.hxx" #include "PlacesListBox.hxx" #include <fpsofficeResMgr.hxx> +#include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <vcl/graph.hxx> -#include <vcl/layout.hxx> -#include <vcl/lstbox.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <svtools/sfxecode.hxx> -#include <vcl/svtabbx.hxx> -#include <vcl/treelistentry.hxx> #include <fpicker/strings.hrc> #include <svtools/helpids.h> diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index bd5d9225b676..2dc3df9ec9e5 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -20,13 +20,6 @@ #define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX #include <memory> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> -#include <vcl/combobox.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/split.hxx> -#include <vcl/treelistbox.hxx> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -37,11 +30,11 @@ #include "fpsmartcontent.hxx" #include "fpdialogbase.hxx" #include <o3tl/typed_flags_set.hxx> +#include <vcl/timer.hxx> #include <set> -class SvTabListBox; class SvtFileView; class SvtFileDialogFilter_Impl; class SvtExpFileDlg_Impl; diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index fef6a72513f4..1ed153a7b248 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -21,7 +21,6 @@ #include "iodlgimp.hxx" #include <tools/debug.hxx> #include <tools/urlobj.hxx> -#include <vcl/menu.hxx> #include <svtools/inettbc.hxx> #include "iodlg.hxx" #include <bitmaps.hlst> diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 68af8a3cd36a..122bde91dc76 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -21,10 +21,7 @@ #include "PlacesListBox.hxx" -#include <vcl/fixed.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/menubtn.hxx> -#include <vcl/timer.hxx> +#include <vcl/idle.hxx> #include <deque> #include <memory> |