[Libreoffice-commits] core.git: cppuhelper/qa cppuhelper/source desktop/source include/cppuhelper include/i18nlangtag include/salhelper include/tools include/unoidl include/xmlreader sfx2/source svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jan 31 05:32:33 UTC 2017
cppuhelper/qa/unourl/cppu_unourl.cxx | 2 +
cppuhelper/source/defaultbootstrap.cxx | 1
desktop/source/app/app.cxx | 1
include/cppuhelper/access_control.hxx | 4 +--
include/cppuhelper/basemutex.hxx | 2 -
include/cppuhelper/component_context.hxx | 2 -
include/cppuhelper/implbase1.hxx | 2 -
include/cppuhelper/implbase10.hxx | 2 -
include/cppuhelper/implbase11.hxx | 2 -
include/cppuhelper/implbase12.hxx | 2 -
include/cppuhelper/implbase13.hxx | 2 -
include/cppuhelper/implbase2.hxx | 2 -
include/cppuhelper/implbase3.hxx | 2 -
include/cppuhelper/implbase4.hxx | 2 -
include/cppuhelper/implbase5.hxx | 2 -
include/cppuhelper/implbase6.hxx | 2 -
include/cppuhelper/implbase7.hxx | 2 -
include/cppuhelper/implbase8.hxx | 2 -
include/cppuhelper/implbase9.hxx | 2 -
include/cppuhelper/implbase_ex.hxx | 4 +--
include/cppuhelper/implementationentry.hxx | 2 -
include/cppuhelper/interfacecontainer.h | 4 +--
include/cppuhelper/propshlp.hxx | 7 +++--
include/cppuhelper/typeprovider.hxx | 4 +--
include/cppuhelper/unourl.hxx | 4 +--
include/i18nlangtag/languagetag.hxx | 2 -
include/i18nlangtag/languagetagicu.hxx | 2 -
include/i18nlangtag/mslangid.hxx | 2 -
include/salhelper/linkhelper.hxx | 2 -
include/salhelper/timer.hxx | 2 -
include/tools/b3dtrans.hxx | 6 ++---
include/tools/config.hxx | 2 -
include/tools/errinf.hxx | 12 +++++-----
include/tools/globname.hxx | 6 ++---
include/tools/inetmime.hxx | 2 -
include/tools/inetmsg.hxx | 4 +--
include/tools/line.hxx | 2 -
include/tools/mempool.hxx | 2 -
include/tools/multisel.hxx | 4 +--
include/tools/rc.hxx | 2 -
include/tools/resary.hxx | 2 -
include/tools/resid.hxx | 2 -
include/tools/resmgr.hxx | 2 -
include/tools/simplerm.hxx | 2 -
include/tools/svborder.hxx | 2 -
include/tools/unqidx.hxx | 2 -
include/tools/wldcrd.hxx | 2 -
include/tools/zcodec.hxx | 2 -
include/unoidl/unoidl.hxx | 34 ++++++++++++++---------------
include/xmlreader/pad.hxx | 2 -
include/xmlreader/span.hxx | 2 -
sfx2/source/appl/appmisc.cxx | 4 ---
svx/source/unodraw/unoshap4.cxx | 2 -
sw/source/uibase/app/docsh.cxx | 6 -----
54 files changed, 86 insertions(+), 95 deletions(-)
New commits:
commit 2670ca3fc597decae78499d1397539668eb84e5e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jan 27 14:41:46 2017 +0200
a whole bunch of SAL_WARN_UNUSED
Change-Id: Iea28debc7d3abc58cca21bd3856cb65b321dc1e6
Reviewed-on: https://gerrit.libreoffice.org/33693
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cppuhelper/qa/unourl/cppu_unourl.cxx b/cppuhelper/qa/unourl/cppu_unourl.cxx
index de229cc..c988399 100644
--- a/cppuhelper/qa/unourl/cppu_unourl.cxx
+++ b/cppuhelper/qa/unourl/cppu_unourl.cxx
@@ -77,6 +77,7 @@ namespace cppu_unourl
{
cppu::UnoUrlDescriptor aDescriptor(rtl::OUString::createFromAscii(
aTests[i].pInput));
+ (void)aDescriptor;
bValid = true;
}
catch (rtl::MalformedUriException &)
@@ -331,6 +332,7 @@ namespace cppu_unourl
try
{
cppu::UnoUrl aUrl(rtl::OUString::createFromAscii(aTests[i].pInput));
+ (void)aUrl;
bValid = true;
}
catch (rtl::MalformedUriException &)
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 037a589..f7c909f 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -58,7 +58,6 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
smgr->init(getBootstrapVariable(bs, "UNO_SERVICES"));
rtl::Reference< cppuhelper::TypeManager > tmgr(new cppuhelper::TypeManager);
tmgr->init(getBootstrapVariable(bs, "UNO_TYPES"));
- cppu::ContextEntry_Init entry;
std::vector< cppu::ContextEntry_Init > context_values;
context_values.push_back(
cppu::ContextEntry_Init(
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2048994..fde39b8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1474,7 +1474,6 @@ int Desktop::Main()
SetSplashScreenProgress(30);
// create title string
- LanguageTag aLocale( LANGUAGE_SYSTEM);
ResMgr* pLabelResMgr = GetDesktopResManager();
OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString();
diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx
index 464b95d..cf10806 100644
--- a/include/cppuhelper/access_control.hxx
+++ b/include/cppuhelper/access_control.hxx
@@ -27,9 +27,9 @@
namespace cppu
{
-/** Helper class retriving access controller singleton from component context.
+/** Helper class for retrieving access controller singleton from component context.
*/
-class CPPUHELPER_DLLPUBLIC AccessControl
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC AccessControl
{
css::uno::Reference< css::security::XAccessController > m_xController;
diff --git a/include/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx
index 48c4aa4..aaf1f6a 100644
--- a/include/cppuhelper/basemutex.hxx
+++ b/include/cppuhelper/basemutex.hxx
@@ -32,7 +32,7 @@ namespace cppu
initialized when the mutex is used to intialize the
cppu::WeakComponentImplHelperXX
*/
- class BaseMutex
+ class SAL_WARN_UNUSED BaseMutex
{
protected:
mutable ::osl::Mutex m_aMutex;
diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx
index fe71106..e6de21c 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.hxx
@@ -32,7 +32,7 @@ namespace cppu
/** Context entries init struct calling createComponentContext().
*/
-struct ContextEntry_Init
+struct SAL_WARN_UNUSED ContextEntry_Init
{
/** late init denotes a object that will be raised when first get() is calling for it
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 952387e..3f93735 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -35,7 +35,7 @@ namespace cppu
type_entry m_typeEntries[ 1 + 1 ];
};
- template< typename Ifc1, typename Impl > struct ImplClassData1
+ template< typename Ifc1, typename Impl > struct SAL_WARN_UNUSED ImplClassData1
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index a4657a6..7b1e592 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl >
- struct ImplClassData10
+ struct SAL_WARN_UNUSED ImplClassData10
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx
index 9cd24a8..2eccf40 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl >
- struct ImplClassData11
+ struct SAL_WARN_UNUSED ImplClassData11
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index 43a02cf..e63e1ba 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl >
- struct ImplClassData12
+ struct SAL_WARN_UNUSED ImplClassData12
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index 995f045..4f4aac6 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Ifc13, typename Impl >
- struct ImplClassData13
+ struct SAL_WARN_UNUSED ImplClassData13
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index 1d1b36f..de6c716 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.hxx
@@ -35,7 +35,7 @@ namespace cppu
type_entry m_typeEntries[ 2 + 1 ];
};
- template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2
+ template< typename Ifc1, typename Ifc2, typename Impl > struct SAL_WARN_UNUSED ImplClassData2
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index c9a0d35..47941db 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.hxx
@@ -35,7 +35,7 @@ namespace cppu
type_entry m_typeEntries[ 3 + 1 ];
};
- template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct SAL_WARN_UNUSED ImplClassData3
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index a487976..2a2e2cb 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl >
- struct ImplClassData4
+ struct SAL_WARN_UNUSED ImplClassData4
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index 6540bfc..fe6fa26 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl >
- struct ImplClassData5
+ struct SAL_WARN_UNUSED ImplClassData5
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index c4d50dd..1dbb481 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl >
- struct ImplClassData6
+ struct SAL_WARN_UNUSED ImplClassData6
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index 01f500b..e1ca124 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl >
- struct ImplClassData7
+ struct SAL_WARN_UNUSED ImplClassData7
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index a09d284..279b320 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl >
- struct ImplClassData8
+ struct SAL_WARN_UNUSED ImplClassData8
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index 6b82c27..09bb6c6 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.hxx
@@ -36,7 +36,7 @@ namespace cppu
};
template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl >
- struct ImplClassData9
+ struct SAL_WARN_UNUSED ImplClassData9
{
class_data* operator ()()
{
diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx
index ce8dfac..d8711f1 100644
--- a/include/cppuhelper/implbase_ex.hxx
+++ b/include/cppuhelper/implbase_ex.hxx
@@ -46,7 +46,7 @@ typedef css::uno::Type const & (SAL_CALL * fptr_getCppuType)( void * );
/** single type + object offset
*/
-struct type_entry
+struct SAL_WARN_UNUSED type_entry
{
/** the type_entry is initialized with function pointer to ::getCppuType() function first,
but holds an unacquired typelib_TypeDescriptionReference * after initialization,
@@ -69,7 +69,7 @@ struct type_entry
/** identical dummy struct for casting class_dataN to class_data
*/
-struct class_data
+struct SAL_WARN_UNUSED class_data
{
/** number of supported types in m_typeEntries
*/
diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx
index d2d4bd6a..e7bb34b 100644
--- a/include/cppuhelper/implementationentry.hxx
+++ b/include/cppuhelper/implementationentry.hxx
@@ -37,7 +37,7 @@ namespace cppu
/** One struct instance represents all data necessary for registering one service implementation.
*/
-struct ImplementationEntry
+struct SAL_WARN_UNUSED ImplementationEntry
{
/** Function that creates an instance of the implementation
*/
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 151ff6f..3daa656 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -124,7 +124,7 @@ private:
@see OInterfaceIteratorHelper
*/
-class CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OInterfaceContainerHelper
{
public:
// these are here to force memory de/allocation to sal lib.
@@ -432,7 +432,7 @@ private:
can't compile addListener( const container::keyType &key ).
*/
template < class container , class keyType >
-struct OBroadcastHelperVar
+struct SAL_WARN_UNUSED OBroadcastHelperVar
{
/** The shared mutex. */
::osl::Mutex & rMutex;
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index a546f5c..b1f2a50 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -43,7 +43,7 @@ namespace cppu
/**
This interface is used by the OPropertyHelper, to access the property description.
*/
-class CPPUHELPER_DLLPUBLIC IPropertyArrayHelper
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC IPropertyArrayHelper
{
public:
// these are here to force memory de/allocation to sal lib.
@@ -109,7 +109,7 @@ public:
You can use this helper class to map a XPropertySet-Interface to a XFast-
or a XMultiPropertySet interface.
*/
-class CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OPropertyArrayHelper : public IPropertyArrayHelper
{
public:
/**
@@ -215,10 +215,11 @@ struct hashInt32_Impl
size_t operator()(const sal_Int32 & i) const
{ return i; }
};
+
/** Specialized class for key type sal_Int32,
without explicit usage of STL symbols.
*/
-class CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OMultiTypeInterfaceContainerHelperInt32
{
public:
// these are here to force memory de/allocation to sal lib.
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index d1ff52d..e90ea3c 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -34,7 +34,7 @@ namespace cppu
/** Helper class to implement css::lang::XTypeProvider. Construct a static object
of this class with your UNO object's supported types.
*/
-class CPPUHELPER_DLLPUBLIC OTypeCollection
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OTypeCollection
{
css::uno::Sequence< css::uno::Type > _aTypes;
@@ -168,7 +168,7 @@ public:
/** Helper class to implement IDs for XUnoTunnel. Construct a static object
of this class for your UNO object's implementation id.
*/
-class CPPUHELPER_DLLPUBLIC OImplementationId
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OImplementationId
{
mutable css::uno::Sequence< sal_Int8 > * _pSeq;
sal_Bool _bUseEthernetAddress;
diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx
index 64608b1..e31ef6b 100644
--- a/include/cppuhelper/unourl.hxx
+++ b/include/cppuhelper/unourl.hxx
@@ -35,7 +35,7 @@ namespace cppu {
For example, some functions take a string representing a connection or
protocol descriptor as input, and can use this class to parse the string.
*/
-class CPPUHELPER_DLLPUBLIC UnoUrlDescriptor
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC UnoUrlDescriptor
{
public:
class Impl;
@@ -126,7 +126,7 @@ private:
invalid UTF-16 entities in the resulting output (e.g., a high surrogate not
followed by a low surrogate) are not detected.
*/
-class CPPUHELPER_DLLPUBLIC UnoUrl
+class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC UnoUrl
{
public:
/** Construct a UNO URL from a string representation.
diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index ea87f53..bc123db 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -49,7 +49,7 @@ class LanguageTagImpl;
For standalone conversions if no LanguageTag instance is at hand, static
convertTo...() methods exist.
*/
-class I18NLANGTAG_DLLPUBLIC LanguageTag
+class SAL_WARN_UNUSED I18NLANGTAG_DLLPUBLIC LanguageTag
{
friend class LanguageTagImpl;
diff --git a/include/i18nlangtag/languagetagicu.hxx b/include/i18nlangtag/languagetagicu.hxx
index 094f077..2d0aabd 100644
--- a/include/i18nlangtag/languagetagicu.hxx
+++ b/include/i18nlangtag/languagetagicu.hxx
@@ -24,7 +24,7 @@ class LanguageTag;
makefiles) with ICU header file inclusion, only the few code actually using
this needs to know about ICU, which it did anyway.
*/
-class I18NLANGTAG_DLLPUBLIC LanguageTagIcu
+class SAL_WARN_UNUSED I18NLANGTAG_DLLPUBLIC LanguageTagIcu
{
public:
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index d9d4ead..1db3616 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -32,7 +32,7 @@ struct IsoLanguageScriptCountryEntry;
/** Methods related to Microsoft language IDs. For details about MS-LANGIDs
please see lang.h */
-class I18NLANGTAG_DLLPUBLIC MsLangId
+class SAL_WARN_UNUSED I18NLANGTAG_DLLPUBLIC MsLangId
{
public:
diff --git a/include/salhelper/linkhelper.hxx b/include/salhelper/linkhelper.hxx
index 217373c..a646668 100644
--- a/include/salhelper/linkhelper.hxx
+++ b/include/salhelper/linkhelper.hxx
@@ -15,7 +15,7 @@
namespace salhelper
{
- class LinkResolver
+ class SAL_WARN_UNUSED LinkResolver
{
public:
osl::FileStatus m_aStatus;
diff --git a/include/salhelper/timer.hxx b/include/salhelper/timer.hxx
index b013c78..ab02090 100644
--- a/include/salhelper/timer.hxx
+++ b/include/salhelper/timer.hxx
@@ -32,7 +32,7 @@ namespace salhelper
*
* Times are seconds in UTC since 01.01.1970
*/
-struct TTimeValue : public TimeValue
+struct SAL_WARN_UNUSED TTimeValue : public TimeValue
{
TTimeValue()
{
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 9787cb7..ae50f45 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -30,7 +30,7 @@
#include <tools/toolsdllapi.h>
/// Transformation sets for 3D output
-class TOOLS_DLLPUBLIC B3dTransformationSet
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dTransformationSet
{
private:
// Object Matrix Object -> World
@@ -147,7 +147,7 @@ protected:
Uses a simplified model, in which a point is described using a View
Reference Point (VRP).
*/
-class TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet
{
private:
basegfx::B3DPoint aVRP; // View Reference Point
@@ -174,7 +174,7 @@ protected:
// B3D camera
-class TOOLS_DLLPUBLIC B3dCamera : public B3dViewport
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC B3dCamera : public B3dViewport
{
private:
basegfx::B3DPoint aPosition;
diff --git a/include/tools/config.hxx b/include/tools/config.hxx
index 845dd08..776799d 100644
--- a/include/tools/config.hxx
+++ b/include/tools/config.hxx
@@ -25,7 +25,7 @@
struct ImplConfigData;
struct ImplGroupData;
-class TOOLS_DLLPUBLIC Config
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Config
{
private:
OUString maFileName;
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 3a9af9a..9559eec 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -34,7 +34,7 @@ namespace vcl { class Window; }
class DynamicErrorInfo_Impl;
class ErrorHandler_Impl;
-class TOOLS_DLLPUBLIC ErrorInfo
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ErrorInfo
{
private:
sal_uIntPtr lUserId;
@@ -50,7 +50,7 @@ public:
static ErrorInfo* GetErrorInfo(sal_uIntPtr);
};
-class TOOLS_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
{
friend class DynamicErrorInfo_Impl;
@@ -66,7 +66,7 @@ public:
sal_uInt16 GetDialogMask() const;
};
-class TOOLS_DLLPUBLIC StringErrorInfo : public DynamicErrorInfo
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringErrorInfo : public DynamicErrorInfo
{
private:
OUString aString;
@@ -79,7 +79,7 @@ public:
const OUString& GetErrorString() const { return aString; }
};
-class TOOLS_DLLPUBLIC TwoStringErrorInfo: public DynamicErrorInfo
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC TwoStringErrorInfo: public DynamicErrorInfo
{
private:
OUString aArg1;
@@ -96,7 +96,7 @@ public:
};
struct ErrorContextImpl;
-class TOOLS_DLLPUBLIC ErrorContext
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ErrorContext
{
friend class ErrorHandler;
@@ -119,7 +119,7 @@ typedef sal_uInt16 WindowDisplayErrorFunc(
typedef void BasicDisplayErrorFunc(
const OUString &rErr, const OUString &rAction);
-class TOOLS_DLLPUBLIC ErrorHandler
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ErrorHandler
{
friend class ErrorHandler_Impl;
diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 76bcef1..b8d73d7 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <o3tl/cow_wrapper.hxx>
-struct SvGUID
+struct SAL_WARN_UNUSED SvGUID
{
sal_uInt32 Data1;
sal_uInt16 Data2;
@@ -33,7 +33,7 @@ struct SvGUID
sal_uInt8 Data4[8];
};
-struct ImpSvGlobalName
+struct SAL_WARN_UNUSED ImpSvGlobalName
{
struct SvGUID szData;
@@ -52,7 +52,7 @@ struct ImpSvGlobalName
class SvStream;
-class TOOLS_DLLPUBLIC SvGlobalName
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC SvGlobalName
{
::o3tl::cow_wrapper< ImpSvGlobalName > pImp;
diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx
index 3b737c8..69e9c1c 100644
--- a/include/tools/inetmime.hxx
+++ b/include/tools/inetmime.hxx
@@ -59,7 +59,7 @@ typedef std::unordered_map<OString, INetContentTypeParameter, OStringHash>
INetContentTypeParameterList;
-class TOOLS_DLLPUBLIC INetMIME
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIME
{
public:
/** Check for US-ASCII visible character.
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index b62b53e..6bfe6ba 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -31,7 +31,7 @@
class DateTime;
-class INetMessageHeader
+class SAL_WARN_UNUSED INetMessageHeader
{
OString m_aName;
OString m_aValue;
@@ -70,7 +70,7 @@ enum class InetMessageMime
NUMHDR = 4,
};
-class TOOLS_DLLPUBLIC INetMIMEMessage
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIMEMessage
{
::std::vector< INetMessageHeader* >
m_aHeaderList;
diff --git a/include/tools/line.hxx b/include/tools/line.hxx
index ec023ab..58b94e0 100644
--- a/include/tools/line.hxx
+++ b/include/tools/line.hxx
@@ -25,7 +25,7 @@
namespace tools
{
-class TOOLS_DLLPUBLIC Line
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Line
{
private:
Point maStart;
diff --git a/include/tools/mempool.hxx b/include/tools/mempool.hxx
index 4ff29d2..a3b13f2 100644
--- a/include/tools/mempool.hxx
+++ b/include/tools/mempool.hxx
@@ -26,7 +26,7 @@
struct FixedMemPool_Impl;
-class TOOLS_DLLPUBLIC FixedMemPool
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC FixedMemPool
{
FixedMemPool_Impl * m_pImpl;
char const * m_pTypeName;
diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx
index 7e54c4d..4671cfd 100644
--- a/include/tools/multisel.hxx
+++ b/include/tools/multisel.hxx
@@ -30,7 +30,7 @@ typedef ::std::vector< Range* > ImpSelList;
#define SFX_ENDOFSELECTION ULONG_MAX
-class TOOLS_DLLPUBLIC MultiSelection
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC MultiSelection
{
private:
ImpSelList aSels; // array of SV-selections
@@ -77,7 +77,7 @@ public:
const Range& GetRange( size_t nRange ) const { return *aSels[nRange]; }
};
-class TOOLS_DLLPUBLIC StringRangeEnumerator
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringRangeEnumerator
{
struct Range
{
diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx
index ebf946a..3636d60 100644
--- a/include/tools/rc.hxx
+++ b/include/tools/rc.hxx
@@ -22,7 +22,7 @@
#include <tools/toolsdllapi.h>
#include <tools/resmgr.hxx>
-class TOOLS_DLLPUBLIC Resource
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Resource
{
protected:
ResMgr* m_pResMgr;
diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx
index 0cec8eb..5a935c2 100644
--- a/include/tools/resary.hxx
+++ b/include/tools/resary.hxx
@@ -27,7 +27,7 @@
class ResId;
-class TOOLS_DLLPUBLIC ResStringArray
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResStringArray
{
struct Impl;
std::unique_ptr<Impl> mpImpl;
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 9dd7b22..c39dd67 100644
--- a/include/tools/resid.hxx
+++ b/include/tools/resid.hxx
@@ -32,7 +32,7 @@ typedef sal_uInt32 RESOURCE_TYPE;
class ResMgr;
-class ResId
+class SAL_WARN_UNUSED ResId
{
/*
Consider two cases:
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 024c745..eec8d1a 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -80,7 +80,7 @@ struct ImpRCStack
void Init( ResMgr * pMgr, const Resource * pObj, sal_uInt32 nId );
};
-class TOOLS_DLLPUBLIC ResMgr
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResMgr
{
private:
InternalResMgr* pImpRes;
diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx
index 79e267a..d82764f 100644
--- a/include/tools/simplerm.hxx
+++ b/include/tools/simplerm.hxx
@@ -31,7 +31,7 @@
class InternalResMgr;
-class TOOLS_DLLPUBLIC SimpleResMgr final
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC SimpleResMgr final
{
osl::Mutex m_aAccessSafety;
std::unique_ptr<InternalResMgr>
diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx
index 50ee581..95b1ff4 100644
--- a/include/tools/svborder.hxx
+++ b/include/tools/svborder.hxx
@@ -23,7 +23,7 @@
#include <tools/toolsdllapi.h>
#include <tools/gen.hxx>
-class TOOLS_DLLPUBLIC SvBorder
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC SvBorder
{
long nTop, nRight, nBottom, nLeft;
diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 2a83ed70..2c05432 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -49,7 +49,7 @@ public:
};
template<typename T>
-class UniqueIndex : private UniqueIndexImpl
+class SAL_WARN_UNUSED UniqueIndex : private UniqueIndexImpl
{
public:
using UniqueIndexImpl::Index;
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index 0e42b43..9ff2a5b 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -23,7 +23,7 @@
#include <osl/thread.h>
#include <rtl/ustring.hxx>
-class TOOLS_DLLPUBLIC WildCard
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC WildCard
{
private:
OString aWildString;
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index d3c1779..f12ee4a 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -33,7 +33,7 @@ class SvStream;
// * BeginCompression, Write*, EndCompression
// * BeginCompression, Read*, EndCompression
// * BeginCompression, ReadAsynchron*, EndCompression
-class TOOLS_DLLPUBLIC ZCodec
+class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ZCodec
{
enum State { STATE_INIT, STATE_DECOMPRESS, STATE_COMPRESS };
State meState;
diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 7d9af0a..fdd67f6 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -77,7 +77,7 @@ struct AnnotatedReference {
std::vector< rtl::OUString > annotations;
};
-class LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject {
public:
enum Sort {
SORT_MODULE, SORT_ENUM_TYPE, SORT_PLAIN_STRUCT_TYPE,
@@ -98,7 +98,7 @@ private:
Sort sort_;
};
-class LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject {
public:
// throws FileFormatException:
virtual rtl::Reference< Entity > getNext(rtl::OUString * name) = 0;
@@ -109,7 +109,7 @@ protected:
virtual SAL_DLLPRIVATE ~MapCursor() throw() override;
};
-class LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity {
public:
// throws FileFormatException:
virtual std::vector< rtl::OUString > getMemberNames() const = 0;
@@ -123,7 +123,7 @@ protected:
virtual SAL_DLLPRIVATE ~ModuleEntity() throw () override;
};
-class LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity {
public:
bool isPublished() const { return published_; }
@@ -145,7 +145,7 @@ private:
std::vector< rtl::OUString > annotations_;
};
-class LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity {
public:
struct Member {
Member(
@@ -176,7 +176,7 @@ private:
std::vector< Member > members_;
};
-class LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity {
public:
struct Member {
Member(rtl::OUString const & theName, rtl::OUString const & theType,
@@ -211,7 +211,7 @@ private:
std::vector< Member > directMembers_;
};
-class LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity:
public PublishableEntity
{
public:
@@ -254,7 +254,7 @@ private:
std::vector< Member > members_;
};
-class LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public PublishableEntity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public PublishableEntity {
public:
struct Member {
Member(
@@ -290,7 +290,7 @@ private:
std::vector< Member > directMembers_;
};
-class LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public PublishableEntity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public PublishableEntity {
public:
struct Attribute {
Attribute(
@@ -390,7 +390,7 @@ private:
std::vector< Method > directMethods_;
};
-class LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity {
public:
SAL_DLLPRIVATE TypedefEntity(
bool published, rtl::OUString const & type,
@@ -406,7 +406,7 @@ private:
rtl::OUString type_;
};
-struct LO_DLLPUBLIC_UNOIDL ConstantValue {
+struct SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantValue {
enum Type {
TYPE_BOOLEAN, TYPE_BYTE, TYPE_SHORT, TYPE_UNSIGNED_SHORT, TYPE_LONG,
TYPE_UNSIGNED_LONG, TYPE_HYPER, TYPE_UNSIGNED_HYPER, TYPE_FLOAT,
@@ -454,7 +454,7 @@ struct LO_DLLPUBLIC_UNOIDL ConstantValue {
};
};
-class LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public PublishableEntity {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public PublishableEntity {
public:
struct Member {
Member(
@@ -485,7 +485,7 @@ private:
std::vector< Member > members_;
};
-class LO_DLLPUBLIC_UNOIDL SingleInterfaceBasedServiceEntity:
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL SingleInterfaceBasedServiceEntity:
public PublishableEntity
{
public:
@@ -547,7 +547,7 @@ private:
std::vector< Constructor > constructors_;
};
-class LO_DLLPUBLIC_UNOIDL AccumulationBasedServiceEntity:
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL AccumulationBasedServiceEntity:
public PublishableEntity
{
public:
@@ -647,7 +647,7 @@ private:
rtl::OUString base_;
};
-class LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity
{
public:
SAL_DLLPRIVATE ServiceBasedSingletonEntity(
@@ -665,7 +665,7 @@ private:
rtl::OUString base_;
};
-class LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject {
public:
// throws FileFormatException:
virtual rtl::Reference< MapCursor > createRootCursor() const = 0;
@@ -680,7 +680,7 @@ protected:
virtual SAL_DLLPRIVATE ~Provider() throw () override;
};
-class LO_DLLPUBLIC_UNOIDL Manager: public salhelper::SimpleReferenceObject {
+class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Manager: public salhelper::SimpleReferenceObject {
public:
Manager() {}
diff --git a/include/xmlreader/pad.hxx b/include/xmlreader/pad.hxx
index 7d0ebee..433b204 100644
--- a/include/xmlreader/pad.hxx
+++ b/include/xmlreader/pad.hxx
@@ -31,7 +31,7 @@
namespace xmlreader {
-class OOO_DLLPUBLIC_XMLREADER Pad {
+class SAL_WARN_UNUSED OOO_DLLPUBLIC_XMLREADER Pad {
public:
void add(char const * begin, sal_Int32 length);
diff --git a/include/xmlreader/span.hxx b/include/xmlreader/span.hxx
index f89d7a9..1d8bc83 100644
--- a/include/xmlreader/span.hxx
+++ b/include/xmlreader/span.hxx
@@ -31,7 +31,7 @@ namespace rtl { class OUString; }
namespace xmlreader {
-struct OOO_DLLPUBLIC_XMLREADER Span {
+struct SAL_WARN_UNUSED OOO_DLLPUBLIC_XMLREADER Span {
char const * begin;
sal_Int32 length;
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index ea712f6..3cbe804 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -143,10 +143,6 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
OUString aBaseName = "/" + OUString::createFromAscii( pName );
- rtl_Locale *pLoc = nullptr;
- osl_getProcessLocale (&pLoc);
- LanguageTag aLanguageTag( *pLoc);
-
OUString uri = "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER + aBaseName + ".svg";
rtl::Bootstrap::expandMacros( uri );
INetURLObject aObj( uri );
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index d9c43b7..10e4ea8 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -205,7 +205,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro
case OWN_ATTR_CLSID:
{
OUString aCLSID;
- SvGlobalName aClassName = GetClassName_Impl(aCLSID);
+ GetClassName_Impl(aCLSID);
rValue <<= aCLSID;
break;
}
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 3077dec..42c2702 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -453,12 +453,6 @@ bool SwDocShell::SaveAs( SfxMedium& rMedium )
{
if( GetDoc()->getIDocumentSettingAccess().get(DocumentSettingId::GLOBAL_DOCUMENT) && dynamic_cast< const SwGlobalDocShell *>( this ) == nullptr )
{
- // This is to set the correct class id if SaveAs is
- // called from SwDoc::SplitDoc to save a normal doc as
- // global doc. In this case, SaveAs is called at a
- // normal doc shell, therefore, SfxInplaceObject::SaveAs
- // will set the wrong class id.
- SvGlobalName aClassName;
// The document is closed explicitly, but using SfxObjectShellLock is still more correct here
SfxObjectShellLock xDocSh =
new SwGlobalDocShell( SfxObjectCreateMode::INTERNAL );
More information about the Libreoffice-commits
mailing list