From e8a76aa83e156bd2c79aed655200c4d6d708d689 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 Apr 2017 21:19:06 +0100 Subject: remove fpicker bitmaps from .src files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ice75bf15e509869bb7e8344381595838918acd81 Reviewed-on: https://gerrit.libreoffice.org/36965 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- fpicker/Library_fps_office.mk | 5 +++++ fpicker/inc/bitmaps.hlst | 20 ++++++++++++++++++++ fpicker/source/office/PlacesListBox.cxx | 1 + fpicker/source/office/RemoteFilesDialog.cxx | 4 +++- fpicker/source/office/iodlg.cxx | 5 +++-- fpicker/source/office/iodlg.hrc | 4 ---- fpicker/source/office/iodlg.hxx | 2 +- fpicker/source/office/iodlg.src | 20 -------------------- fpicker/source/office/iodlgimp.cxx | 7 +++---- fpicker/source/office/iodlgimp.hxx | 2 +- postprocess/CustomTarget_images.mk | 1 + 11 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 fpicker/inc/bitmaps.hlst diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index cc869d906613..661332c0119b 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -12,6 +12,11 @@ $(eval $(call gb_Library_Library,fps_office)) $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office)) +$(eval $(call gb_Library_set_include,fps_office,\ + $$(INCLUDE) \ + -I$(SRCDIR)/fpicker/inc \ +)) + $(eval $(call gb_Library_use_external,fps_office,boost_headers)) $(eval $(call gb_Library_use_custom_headers,fps_office,\ diff --git a/fpicker/inc/bitmaps.hlst b/fpicker/inc/bitmaps.hlst new file mode 100644 index 000000000000..a0cdf0124d34 --- /dev/null +++ b/fpicker/inc/bitmaps.hlst @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#ifndef INCLUDED_FPICKER_INC_BITMAPS_HRC +#define INCLUDED_FPICKER_INC_BITMAPS_HRC + +#define BMP_FILEDLG_BTN_UP "fpicker/res/fp010.png" +#define BMP_FILEDLG_CREATEFOLDER "fpicker/res/fp014.png" +#define BMP_FILEDLG_PLACE_LOCAL "fpicker/res/fp015.png" +#define BMP_FILEDLG_PLACE_REMOTE "fpicker/res/fp016.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 5db9d9880317..f42a0440154a 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -14,6 +14,7 @@ #include #include #include +#include "bitmaps.hlst" #define COLUMN_NAME 1 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 6aa6dbc18fdb..8b2b267a7e7a 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -6,8 +6,10 @@ * 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/. */ + #include "RemoteFilesDialog.hxx" #include +#include "bitmaps.hlst" class FileViewContainer : public vcl::Window { @@ -214,7 +216,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits ) { get( m_pOk_btn, "save" ); - m_pNewFolder->SetModeImage(Image(BitmapEx(fpicker::SvtResId(BMP_FILEDLG_CREATEFOLDER)))); + m_pNewFolder->SetModeImage(Image(BitmapEx(BMP_FILEDLG_CREATEFOLDER))); m_pNewFolder->SetClickHdl( LINK( this, RemoteFilesDialog, NewFolderHdl ) ); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index b73d626e927d..ea78e08be205 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -46,6 +46,7 @@ #include #include "OfficeFilePicker.hrc" #include "iodlg.hrc" +#include "bitmaps.hlst" #include "asyncfilepicker.hxx" #include "iodlgimp.hxx" #include "svtools/inettbc.hxx" @@ -2732,9 +2733,9 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl, Splitter*, void ) _pSplitter->SetPosPixel( Point( placeSize.Width(), _pSplitter->GetPosPixel().Y() ) ); } -Image SvtFileDialog::GetButtonImage( sal_uInt16 _nButtonId ) +Image SvtFileDialog::GetButtonImage(const OUString& rButtonId) { - return Image(BitmapEx(SvtResId(_nButtonId))); + return Image(BitmapEx(rButtonId)); } QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent, diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index 9b0859212075..467114efb2f9 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -32,10 +32,6 @@ #define STR_PREVIEW (RID_FPICKER_START+38) #define STR_DEFAULT_DIRECTORY (RID_FPICKER_START+39) #define STR_PLACES_TITLE (RID_FPICKER_START+40) -#define BMP_FILEDLG_BTN_UP (RID_FPICKER_START+41) -#define BMP_FILEDLG_CREATEFOLDER (RID_FPICKER_START+42) -#define BMP_FILEDLG_PLACE_LOCAL (RID_FPICKER_START+43) -#define BMP_FILEDLG_PLACE_REMOTE (RID_FPICKER_START+44) #endif diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 535ac2ecab37..4b45f44da7f8 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -238,7 +238,7 @@ public: inline void EraseDefaultExt( sal_Int32 _nIndex = 0 ); inline const OUString& GetDefaultExt() const; - static Image GetButtonImage( sal_uInt16 _nButtonId ); + static Image GetButtonImage(const OUString& rButtonId); bool ContentIsFolder( const OUString& rURL ) override { return m_aContent.isFolder( rURL ) && m_aContent.isValid(); } bool ContentHasParentFolder( const OUString& rURL ); diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index 4c3140e9e0df..74408ad7aaac 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -22,26 +22,6 @@ #include "iodlg.hrc" #include "OfficeFilePicker.hrc" -Bitmap BMP_FILEDLG_BTN_UP -{ - File = "fp010.png"; -}; - -Bitmap BMP_FILEDLG_CREATEFOLDER -{ - File = "fp014.png"; -}; - -Bitmap BMP_FILEDLG_PLACE_LOCAL -{ - File = "fp015.png"; -}; - -Bitmap BMP_FILEDLG_PLACE_REMOTE -{ - File = "fp016.png"; -}; - // strings ******************************************************************* String STR_EXPLORERFILE_OPEN diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 53f0b040ee97..6dd1d396e7ab 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -32,6 +32,7 @@ #include "svtools/inettbc.hxx" #include "iodlg.hxx" #include "iodlg.hrc" +#include "bitmaps.hlst" #include "svtools/imagemgr.hxx" #include #include "unotools/useroptions.hxx" @@ -86,15 +87,13 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() //= SvtFileDialogURLSelector - - -SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ) +SvtFileDialogURLSelector::SvtFileDialogURLSelector(vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, const OUString& rButtonId) :MenuButton ( _pParent, nBits ) ,m_pDlg ( _pDlg ) ,m_pMenu ( VclPtr::Create() ) { SetStyle( GetStyle() | WB_NOPOINTERFOCUS | WB_RECTSTYLE | WB_SMALLSTYLE ); - SetModeImage( SvtFileDialog::GetButtonImage( _nButtonId ) ); + SetModeImage(SvtFileDialog::GetButtonImage(rButtonId)); SetDelayMenu(true); SetDropDown(PushButtonDropdownStyle::Toolbox); } diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 789f3d7c2ff5..e948c8885c15 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -91,7 +91,7 @@ protected: virtual void FillURLMenu( PopupMenu* _pMenu ) = 0; - SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ); + SvtFileDialogURLSelector(vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, const OUString& rButtonId); virtual void Activate() override; }; diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 982fd8e1c888..17d27b1a483b 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -58,6 +58,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(SRCDIR)/extensions/inc/bitmaps.hlst \ $(SRCDIR)/filter/inc/bitmaps.hlst \ $(SRCDIR)/formula/inc/bitmaps.hlst \ + $(SRCDIR)/fpicker/inc/bitmaps.hlst \ $(SRCDIR)/sfx2/inc/bitmaps.hlst \ $(SRCDIR)/vcl/inc/bitmaps.hlst grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ -- cgit