diff options
Diffstat (limited to 'sw/source/ui/fldui/fldmgr.cxx')
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 6f226ad3d484..9604fa5c00e6 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.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 <cmdid.h> @@ -1610,9 +1601,7 @@ sal_uInt16 SwFldMgr::GetCurrLanguage() const void SwFieldType::_GetFldName() { - static const sal_uInt16 coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; - - static sal_uInt16 coFldNms[ coFldCnt ] = { + static sal_uInt16 coFldNms[] = { FLD_DATE_STD, FLD_TIME_STD, STR_FILENAMEFLD, @@ -1661,8 +1650,8 @@ void SwFieldType::_GetFldName() // insert infos for fields SwFieldType::pFldNames = new std::vector<String>; - SwFieldType::pFldNames->reserve(coFldCnt); - for( sal_uInt16 nIdx = 0; nIdx < coFldCnt; ++nIdx ) + SwFieldType::pFldNames->reserve(SAL_N_ELEMENTS(coFldNms)); + for( sal_uInt16 nIdx = 0; nIdx < SAL_N_ELEMENTS(coFldNms); ++nIdx ) { String aTmp(SW_RESSTR( coFldNms[ nIdx ] )); aTmp.Assign( MnemonicGenerator::EraseAllMnemonicChars( aTmp ) ); |