mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c110559268461dd3b7b8e28d24e36fdbcc25bb17
libreoffice/include/xmloff/xmlnumfi.hxx
Stephan Bergmann ad9498f8b8 More -Werror,-Wunused-private-field 
...detected with a modified trunk Clang with

> Index: lib/Sema/SemaDeclCXX.cpp
> ===================================================================
> --- lib/Sema/SemaDeclCXX.cpp	(revision 219190)
> +++ lib/Sema/SemaDeclCXX.cpp	(working copy)
> @@ -1917,9 +1917,10 @@
>    const Type *T = FD.getType()->getBaseElementTypeUnsafe();
>    // FIXME: Destruction of ObjC lifetime types has side-effects.
>    if (const CXXRecordDecl *RD = T->getAsCXXRecordDecl())
> -    return !RD->isCompleteDefinition() ||
> -           !RD->hasTrivialDefaultConstructor() ||
> -           !RD->hasTrivialDestructor();
> +    return !RD->hasAttr<WarnUnusedAttr>() &&
> +           (!RD->isCompleteDefinition() ||
> +            !RD->hasTrivialDefaultConstructor() ||
> +            !RD->hasTrivialDestructor());
>    return false;
>  }
>
> @@ -3517,9 +3518,11 @@
>    bool addFieldInitializer(CXXCtorInitializer *Init) {
>      AllToInit.push_back(Init);
>
> +#if 0
>      // Check whether this initializer makes the field "used".
>      if (Init->getInit()->HasSideEffects(S.Context))
>        S.UnusedPrivateFields.remove(Init->getAnyMember());
> +#endif
>
>      return false;
>    }

to warn about members of SAL_WARN_UNUSED-annotated class types, and warn about
initializations with side effects (cf.
<http://lists.cs.uiuc.edu/pipermail/cfe-dev/2014-October/039602.html>
"-Wunused-private-field distracted by side effects").

Change-Id: I3f3181c4eb8180ca28e1fa3dffc9dbe1002c6628
2014-10-15 15:58:56 +02:00

214 lines
7.8 KiB
C++
Raw Blame History

/* -*- 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_XMLOFF_XMLNUMFI_HXX
#define INCLUDED_XMLOFF_XMLNUMFI_HXX
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <xmloff/xmlstyle.hxx>
#include <rtl/ustrbuf.hxx>
#include <i18nlangtag/lang.h>
#include <vector>
#include <unotools/localedatawrapper.hxx>
#define XML_NUMBERSTYLES "NumberStyles"
enum SvXMLStylesTokens
{
XML_TOK_STYLES_NUMBER_STYLE,
XML_TOK_STYLES_CURRENCY_STYLE,
XML_TOK_STYLES_PERCENTAGE_STYLE,
XML_TOK_STYLES_DATE_STYLE,
XML_TOK_STYLES_TIME_STYLE,
XML_TOK_STYLES_BOOLEAN_STYLE,
XML_TOK_STYLES_TEXT_STYLE
};
enum SvXMLDateElementAttributes
{
XML_DEA_NONE,
XML_DEA_ANY,
XML_DEA_SHORT,
XML_DEA_LONG,
XML_DEA_TEXTSHORT,
XML_DEA_TEXTLONG
};
class Color;
class SvXMLNumImpData;
class SvXMLImport;
class SvXMLStyleContext;
class SvXMLStylesContext;
struct SvXMLNumberInfo;
class SvNumberFormatter;
class SvtSysLocale;
namespace com { namespace sun { namespace star { namespace lang {
class XMultiServiceFactory;
}}}}
// use SvXMLNumFmtHelper in the context for <office:styles> to create
// child contexts for data styles
class SvXMLNumFmtHelper
{
SvXMLNumImpData* pData;
public:
SvXMLNumFmtHelper(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& rSupp,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
SvXMLNumFmtHelper(
SvNumberFormatter* pNumberFormatter,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~SvXMLNumFmtHelper();
SvXMLStyleContext* CreateChildContext( SvXMLImport& rImport,
sal_uInt16 nPrefix, const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles);
SvXMLNumImpData* getData() { return pData; }
const SvXMLTokenMap& GetStylesElemTokenMap();
// sal_uInt32 GetKeyForName( const OUString& rName );
};
// SvXMLNumFmtDefaults is used in import and export
class SvXMLNumFmtDefaults
{
public:
// return value is NfIndexTableOffset
static sal_uInt16 GetDefaultDateFormat( SvXMLDateElementAttributes eDOW,
SvXMLDateElementAttributes eDay, SvXMLDateElementAttributes eMonth,
SvXMLDateElementAttributes eYear, SvXMLDateElementAttributes eHours,
SvXMLDateElementAttributes eMins, SvXMLDateElementAttributes eSecs,
bool bSystem );
};
struct MyCondition
{
OUString sCondition;
OUString sMapName;
};
class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
{
SvXMLNumImpData* pData;
SvXMLStylesContext* pStyles;
std::vector <MyCondition> aMyConditions;
sal_uInt16 nType;
sal_Int32 nKey;
// OUString sFormatName;
OUString sFormatTitle;
// OUString sMapName;
OUString sCalendar;
LanguageType nFormatLang;
com::sun::star::lang::Locale aLocale;
bool bAutoOrder;
bool bFromSystem;
bool bTruncate;
bool bAutoDec; // set in AddNumber
bool bAutoInt; // set in AddNumber
bool bHasExtraText;
OUStringBuffer aFormatCode;
OUStringBuffer aConditions;
bool bHasLongDoW;
bool bHasEra;
bool bHasDateTime;
bool bRemoveAfterUse;
// contained date elements, used to recognize default date formats
SvXMLDateElementAttributes eDateDOW;
SvXMLDateElementAttributes eDateDay;
SvXMLDateElementAttributes eDateMonth;
SvXMLDateElementAttributes eDateYear;
SvXMLDateElementAttributes eDateHours;
SvXMLDateElementAttributes eDateMins;
SvXMLDateElementAttributes eDateSecs;
bool bDateNoDefault;
SAL_DLLPRIVATE sal_Int32 PrivateGetKey();
public:
SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
SvXMLNumImpData* pNewData, sal_uInt16 nNewType,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
SvXMLStylesContext& rStyles );
SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList,
const sal_Int32 nKey,
SvXMLStylesContext& rStyles );
virtual ~SvXMLNumFormatContext();
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
virtual void CreateAndInsert(bool bOverwrite) SAL_OVERRIDE;
virtual void Finish(bool bOverwrite) SAL_OVERRIDE;
SvXMLNumImpData* GetData() const { return pData; }
sal_Int32 GetKey();
sal_Int32 CreateAndInsert( SvNumberFormatter* pFormatter );
sal_Int32 CreateAndInsert( com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xFormatsSupplier );
sal_uInt16 GetType() const { return nType; } // SvXMLStylesTokens
bool IsFromSystem() const { return bFromSystem; }
bool HasLongDoW() const { return bHasLongDoW; }
void SetHasLongDoW(bool bSet) { bHasLongDoW = bSet; }
bool HasEra() const { return bHasEra; }
void SetHasEra(bool bSet) { bHasEra = bSet; }
void UpdateCalendar( const OUString& rNewCalendar );
const LocaleDataWrapper& GetLocaleData() const;
void AddToCode( const OUString& rString );
void AddToCode( sal_Unicode c );
void AddNumber( const SvXMLNumberInfo& rInfo );
void AddCurrency( const OUString& rContent, LanguageType nLang );
void AddNfKeyword( sal_uInt16 nIndex );
bool ReplaceNfKeyword( sal_uInt16 nOld, sal_uInt16 nNew );
void AddCondition( const sal_Int32 nIndex );
void AddCondition( const OUString& rCondition, const OUString& rApplyName );
void AddColor( sal_uInt32 const nColor );
/// determine whether number format uses the system language
bool IsSystemLanguage();
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue View Git Blame Copy Permalink