sd/qa/unit/export-tests-ooxml1.cxx | 2 +-
sd/qa/unit/export-tests-ooxml2.cxx | 2 +-
sd/qa/unit/export-tests.cxx | 2 +-
sd/qa/unit/import-tests.cxx | 2 +-
sd/qa/unit/misc-tests.cxx | 2 +-
sd/source/filter/eppt/epptbase.hxx | 4 ++--
sd/source/filter/eppt/pptx-epptbase.cxx | 6 +++---
sd/source/filter/xml/sdxmlwrp.cxx | 8 ++++----
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit d6da34186866aa5b373cb7ca6d22f67b36aea43c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 18 09:32:50 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Oct 18 11:40:14 2018 +0200
loplugin:staticvar in sd
Change-Id: I2a0b7e70db0d244627a462a5da5de7eeba8db940
Reviewed-on: https://gerrit.libreoffice.org/61907
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index 98e6dcc57335..f649d2723044 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -136,7 +136,7 @@ public:
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
{
- struct { char const * pPrefix; char const * pURI; } namespaces[] =
+ static const struct { char const * pPrefix; char const * pURI; }
namespaces[] =
{
// OOXML
{ "ContentType",
"http://schemas.openxmlformats.org/package/2006/content-types"; },
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 3fa01dd159e2..f1765c1f9d4e 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -278,7 +278,7 @@ public:
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
{
- struct { char const * pPrefix; char const * pURI; } namespaces[] =
+ static const struct { char const * pPrefix; char const * pURI; }
namespaces[] =
{
// OOXML
{ "ContentType",
"http://schemas.openxmlformats.org/package/2006/content-types"; },
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index e34de2d9d141..c5120a610c00 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -138,7 +138,7 @@ public:
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
{
- struct { char const * pPrefix; char const * pURI; } namespaces[] =
+ static const struct { char const * pPrefix; char const * pURI; }
namespaces[] =
{
// ODF
{ "anim", "urn:oasis:names:tc:opendocument:xmlns:animation:1.0" },
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index cff2292aaca0..9dc6226b36d5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -317,7 +317,7 @@ the test, and re-running; it should break.
*/
void SdImportTest::testDocumentLayout()
{
- struct { const char *pInput, *pDump; sal_Int32 nFormat; sal_Int32
nExportType; } aFilesToCompare[] =
+ static const struct { const char *pInput, *pDump; sal_Int32 nFormat;
sal_Int32 nExportType; } aFilesToCompare[] =
{
{ "odp/shapes-test.odp", "xml/shapes-test_page", ODP, -1 },
{ "fdo47434.pptx", "xml/fdo47434_", PPTX, -1 },
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 2bfd5789407a..a0e62f15788a 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -95,7 +95,7 @@ public:
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
{
- struct { char const * pPrefix; char const * pURI; } namespaces[] =
+ static const struct { char const * pPrefix; char const * pURI; }
namespaces[] =
{
// ODF
{ "config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"},
diff --git a/sd/source/filter/eppt/epptbase.hxx
b/sd/source/filter/eppt/epptbase.hxx
index d57ecfee00ed..8e4ec04a34e3 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -395,8 +395,8 @@ public:
bool GetPresObj() { return mbPresObj; }
- static PHLayout& GetLayout( const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet );
- static PHLayout& GetLayout( sal_Int32 nOffset );
+ static PHLayout const & GetLayout( const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet );
+ static PHLayout const & GetLayout( sal_Int32 nOffset );
static sal_Int32 GetLayoutOffset( const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet );
static sal_Int32 GetLayoutOffsetFixed( const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet );
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4940bf855754..3642629a936b 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -95,7 +95,7 @@ using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
-static PHLayout pPHLayout[] =
+static PHLayout const pPHLayout[] =
{
{ EppLayout::TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00 }, 0x00, 0x0d, 0x10, true, true, false },
{ EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, false },
@@ -452,12 +452,12 @@ sal_Int32 PPTWriterBase::GetLayoutOffsetFixed( const
css::uno::Reference< css::b
return nLayout;
}
-PHLayout& PPTWriterBase::GetLayout( const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet )
+PHLayout const & PPTWriterBase::GetLayout( const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet )
{
return pPHLayout[ GetLayoutOffsetFixed( rXPropSet ) ];
}
-PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset )
+PHLayout const & PPTWriterBase::GetLayout( sal_Int32 nOffset )
{
if( nOffset >= 0 && nOffset < EPP_LAYOUT_SIZE )
return pPHLayout[ nOffset ];
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index eb2a7d2f66db..91591779e4cf 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -147,9 +147,9 @@ struct XML_SERVICES
const sal_Char* mpSettings;
};
-static XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong
nStoreVer )
+static XML_SERVICES const * getServices( bool bImport, bool bDraw, sal_uLong
nStoreVer )
{
- static XML_SERVICES gServices[] =
+ static XML_SERVICES const gServices[] =
{
{ sXML_export_impress_meta_oasis_service,
sXML_export_impress_styles_oasis_service,
sXML_export_impress_content_oasis_service,
sXML_export_impress_settings_oasis_service },
{ sXML_export_draw_meta_oasis_service,
sXML_export_draw_styles_oasis_service, sXML_export_draw_content_oasis_service,
sXML_export_draw_settings_oasis_service },
@@ -622,7 +622,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
const OUString aName( mrMedium.GetName() );
- XML_SERVICES* pServices = getServices( true, IsDraw(), mnStoreVer );
+ XML_SERVICES const * pServices = getServices( true, IsDraw(),
mnStoreVer );
ErrCode nWarn = ERRCODE_NONE;
ErrCode nWarn2 = ERRCODE_NONE;
@@ -915,7 +915,7 @@ bool SdXMLFilter::Export()
uno::Reference< lang::XComponent > xComponent( mxModel,
uno::UNO_QUERY );
- XML_SERVICES* pServiceNames = getServices( false, IsDraw(),
mnStoreVer );
+ XML_SERVICES const * pServiceNames = getServices( false, IsDraw(),
mnStoreVer );
XML_SERVICEMAP aServices[5]; sal_uInt16 i = 0;
aServices[i ].mpService = pServiceNames->mpStyles;
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index dbb565de0ec9..273f5839c146 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -273,7 +273,7 @@ void DocumentSettings::AssignURL( XPropertyListType t,
const Any* pValue,
static struct {
const char *pName;
XPropertyListType t;
-} aURLPropertyNames[] = {
+} const aURLPropertyNames[] = {
{ "ColorTableURL", XPropertyListType::Color },
{ "DashTableURL", XPropertyListType::Dash },
{ "LineEndTableURL", XPropertyListType::LineEnd },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
