diff options
Diffstat (limited to 'sw/source/ui/dbui/mmoutputtypepage.cxx')
-rw-r--r-- | sw/source/ui/dbui/mmoutputtypepage.cxx | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 8f7d9e4caca3..d9c7017379c4 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * 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 <mmoutputtypepage.hxx> #include <mailmergewizard.hxx> @@ -45,7 +36,6 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen m_aMailRB( this, SW_RES( RB_MAIL )), m_aHintHeaderFI(this, SW_RES( FI_HINTHEADER)), m_aHintFI( this, SW_RES( FI_HINT)), - m_aNoMailHintFI(this, SW_RES( FT_NOMAILHINT)), #ifdef MSC #pragma warning (default : 4355) #endif @@ -61,19 +51,10 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen m_aMailRB.SetClickHdl(aLink); SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); - m_pWizard->EnterWait(); - bool bMailAvailable = rConfigItem.IsMailAvailable(); - m_pWizard->LeaveWait(); if(rConfigItem.IsOutputToLetter()) m_aLetterRB.Check(); else m_aMailRB.Check(); - if(!bMailAvailable) - { - m_aNoMailHintFI.Show(); - m_aMailRB.Enable(sal_False); - m_aLetterRB.Check(); - } TypeHdl_Impl(&m_aLetterRB); } |