summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-09 15:41:03 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-09 15:41:03 +0100
commit14fe0a66dac58c266a3327babe36c902075c4ac0 (patch)
tree4e0e3f1f6cc43a9277598c4c882a45e29cd335cc /sd
parent86dfe7724accd0e291570c9546d4ddc38974ba32 (diff)
New loplugin:externvar: sd
Change-Id: I753a49c35c0a459f110960c56ac345f8bfc79dee
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/EffectMigration.cxx12
-rw-r--r--sd/source/filter/eppt/pptx-text.cxx2
-rw-r--r--sd/source/filter/html/htmlex.cxx2
-rw-r--r--sd/source/filter/html/pubdlg.cxx2
-rw-r--r--sd/source/ui/dlg/headerfooterdlg.cxx2
-rw-r--r--sd/source/ui/sidebar/PanelFactory.cxx2
6 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 2348381bcb9d..6efe7124df66 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -52,7 +52,7 @@ struct deprecated_FadeEffect_conversion_table_entry
const sal_Char* mpPresetId;
}
-deprecated_FadeEffect_conversion_table[] =
+const deprecated_FadeEffect_conversion_table[] =
{
// OOo 1.x transitions
{ FadeEffect_FADE_FROM_LEFT, "wipe-right" },
@@ -160,7 +160,7 @@ wedge wedge
void EffectMigration::SetFadeEffect( SdPage* pPage, css::presentation::FadeEffect eNewEffect)
{
- deprecated_FadeEffect_conversion_table_entry* pEntry = deprecated_FadeEffect_conversion_table;
+ deprecated_FadeEffect_conversion_table_entry const * pEntry = deprecated_FadeEffect_conversion_table;
while( (pEntry->meFadeEffect != FadeEffect_NONE) && (pEntry->meFadeEffect != eNewEffect) )
pEntry++;
@@ -207,7 +207,7 @@ FadeEffect EffectMigration::GetFadeEffect( const SdPage* pPage )
{
const OUString& aPresetId = (*aIt)->getPresetId();
- deprecated_FadeEffect_conversion_table_entry* pEntry = deprecated_FadeEffect_conversion_table;
+ deprecated_FadeEffect_conversion_table_entry const * pEntry = deprecated_FadeEffect_conversion_table;
while( (pEntry->meFadeEffect != FadeEffect_NONE) && (!aPresetId.equalsAscii( pEntry->mpPresetId ) ) )
pEntry++;
@@ -223,7 +223,7 @@ struct deprecated_AnimationEffect_conversion_table_entry
const sal_Char* mpPresetId;
const sal_Char* mpPresetSubType;
}
-deprecated_AnimationEffect_conversion_table[] =
+const deprecated_AnimationEffect_conversion_table[] =
{
// OOo 1.x entrance effects
{ AnimationEffect_APPEAR, "ooo-entrance-appear",nullptr },
@@ -746,7 +746,7 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString*
if( !rPresetId.isEmpty() )
{
// first try a match for preset id and subtype
- deprecated_AnimationEffect_conversion_table_entry* p = deprecated_AnimationEffect_conversion_table;
+ deprecated_AnimationEffect_conversion_table_entry const * p = deprecated_AnimationEffect_conversion_table;
while( p->mpPresetId )
{
if( rPresetId.equalsAscii( p->mpPresetId ) &&
@@ -770,7 +770,7 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString*
bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType )
{
- deprecated_AnimationEffect_conversion_table_entry* p = deprecated_AnimationEffect_conversion_table;
+ deprecated_AnimationEffect_conversion_table_entry const * p = deprecated_AnimationEffect_conversion_table;
while( p->mpPresetId )
{
if( p->meEffect == rEffect )
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index a0e09ed8b55d..ad68f06dd98a 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -52,7 +52,7 @@
#include <vcl/virdev.hxx>
#include <o3tl/make_unique.hxx>
-css::uno::Reference< css::i18n::XBreakIterator > xPPTBreakIter;
+static css::uno::Reference< css::i18n::XBreakIterator > xPPTBreakIter;
PortionObj::PortionObj(const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
FontCollection& rFontCollection)
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index bd30e1f719d9..56fa1974d3c4 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -96,7 +96,7 @@ using namespace sdr::table;
// get parameter from Itemset
#define RESTOHTML( res ) StringToHTMLString(SD_RESSTR(res))
-const char *pButtonNames[] =
+const char * const pButtonNames[] =
{
"first-inactive.png",
"first.png",
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 7da385f1cab6..8b11448790e3 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -65,7 +65,7 @@ const sal_uInt16 nMagic = (sal_uInt16)0x1977;
#define KEY_QUALITY "JPG-EXPORT-QUALITY"
// The Help-IDs of the pages
-const char* aPageHelpIds[NOOFPAGES] =
+const char* const aPageHelpIds[NOOFPAGES] =
{
HID_SD_HTMLEXPORT_PAGE1,
HID_SD_HTMLEXPORT_PAGE2,
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index dc1c75859b77..4e618016ca3e 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -91,7 +91,7 @@ namespace sd
{
const int nDateTimeFormatsCount = 12;
-int nDateTimeFormats[nDateTimeFormatsCount] =
+int const nDateTimeFormats[nDateTimeFormatsCount] =
{
SVXDATEFORMAT_A,
SVXDATEFORMAT_B,
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 6c83d3bd8529..808686361d9b 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -45,7 +45,7 @@ using ::rtl::OUString;
namespace sd { namespace sidebar {
-Reference<lang::XEventListener> mxControllerDisposeListener;
+static Reference<lang::XEventListener> mxControllerDisposeListener;
//----- PanelFactory --------------------------------------------------------