diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-14 16:36:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-14 17:08:09 +0000 |
commit | 200cc2d20a21ceb5d176604f9c384f15c6a87570 (patch) | |
tree | 18302432f432942ea3ba5416d71bdcf732bb6bc8 /cui/source/inc | |
parent | 5918277a128307ad04704c0ac0898256e0bbffa1 (diff) |
SvxMultiFileDialog is never created
because the single caller of it is a hidden button
in the old mail merge dialog which was never completed
to allow attachments to emails (because it never was
able to send emails, the new one can FWIW)
all of which has logical knock on effects to shrink
things down substantially
Change-Id: I831cac8f670eaafc96b2ea4d78516f67b662fa7d
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/cuires.hrc | 10 | ||||
-rw-r--r-- | cui/source/inc/multifil.hxx | 50 | ||||
-rw-r--r-- | cui/source/inc/multipat.hxx | 10 |
3 files changed, 5 insertions, 65 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index b64d9a34be1c..d253a0cb5959 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -218,16 +218,12 @@ // icon choice #define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) -// SvxMultiFileDialog -#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) -#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) -#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) -#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) -#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) - // multi path dialog #define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) #define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) +#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) +#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) +#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) // script organizer #define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx deleted file mode 100644 index 116cc83813d5..000000000000 --- a/cui/source/inc/multifil.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_CUI_SOURCE_INC_MULTIFIL_HXX -#define INCLUDED_CUI_SOURCE_INC_MULTIFIL_HXX - -#include "multipat.hxx" - -// #97807# ---------------------------------------------------- -#include <ucbhelper/content.hxx> -#include <map> - -// class SvxMultiFileDialog ---------------------------------------------- - -class SvxMultiFileDialog : public SvxMultiPathDialog -{ -private: - // #97807# ------------------------------------- - std::map< OUString, ::ucbhelper::Content > aFileContentMap; - - DECL_LINK( AddHdl_Impl, PushButton * ); - DECL_LINK(DelHdl_Impl, void *); - -public: - SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); - ~SvxMultiFileDialog(); - - OUString GetFiles() const { return SvxMultiPathDialog::GetPath(); } - void SetFiles( const OUString& rPath ) { SvxMultiPathDialog::SetPath(rPath); aDelBtn.Enable(); } -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index a77057e6bcf9..cae34bdf355d 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -36,10 +36,6 @@ #define CLASSPATH_DELIMITER ';' #endif -// forward --------------------------------------------------------------- - -struct MultiPath_Impl; - // class SvxMultiPathDialog ---------------------------------------------- class SvxMultiPathDialog : public ModalDialog @@ -56,7 +52,7 @@ protected: CancelButton aCancelBtn; HelpButton aHelpButton; - MultiPath_Impl* pImpl; + bool bIsRadioButtonMode; DECL_LINK(AddHdl_Impl, void *); DECL_LINK(DelHdl_Impl, void *); @@ -64,13 +60,11 @@ protected: DECL_LINK( CheckHdl_Impl, svx::SvxRadioButtonListBox * ); public: - SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); + SvxMultiPathDialog(Window* pParent); ~SvxMultiPathDialog(); OUString GetPath() const; void SetPath( const OUString& rPath ); - void SetClassPathMode(); - sal_Bool IsClassPathMode() const; void EnableRadioButtonMode(); }; |