summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2013-07-14 08:15:57 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2013-07-14 08:17:20 +0900
commit542b45af44cae091735d9c2e11756a928e230261 (patch)
tree4cc217599019a29265ecbad9ab3df4aed95a5885 /slideshow/source
parent76488b00ed75bf7915d6d57af9875c6434e740d6 (diff)
Mark as const
Change-Id: I0bf93f1293fb08b8b558fcac0cb496ed99ad13d9
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx2
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm2
-rw-r--r--slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx2
-rw-r--r--slideshow/source/engine/attributemap.cxx4
4 files changed, 5 insertions, 5 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 2e1709e098e9..0450f1cbbf72 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -292,7 +292,7 @@ void Iris::display(double nTime, double SlideWidth, double SlideHeight, double D
void Iris::prepare()
{
- static GLubyte img[3] = { 80, 80, 80 };
+ static const GLubyte img[3] = { 80, 80, 80 };
glGenTextures(1, &maTexture);
glBindTexture(GL_TEXTURE_2D, maTexture);
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index a0c195b514ff..72c86ce88112 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
@@ -284,7 +284,7 @@ void Iris::display(double nTime, double SlideWidth, double SlideHeight, double D
void Iris::prepare()
{
- static GLubyte img[3] = { 80, 80, 80 };
+ static const GLubyte img[3] = { 80, 80, 80 };
glGenTextures(1, &maTexture);
glBindTexture(GL_TEXTURE_2D, maTexture);
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
index f9186bd8476e..08dc6db8465d 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx
@@ -288,7 +288,7 @@ void Iris::display(double nTime, double SlideWidth, double SlideHeight, double D
void Iris::prepare()
{
- static GLubyte img[3] = { 80, 80, 80 };
+ static const GLubyte img[3] = { 80, 80, 80 };
glGenTextures(1, &maTexture);
glBindTexture(GL_TEXTURE_2D, maTexture);
diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx
index 9bcf37d3d7ae..1185a89dbeff 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -41,7 +41,7 @@ namespace slideshow
String entries MUST BE SORTED in ascending order!
*/
- static AnimateAttributeMap::MapEntry lcl_attributeMap[] =
+ static const AnimateAttributeMap::MapEntry lcl_attributeMap[] =
{
{ "charcolor", ATTRIBUTE_CHAR_COLOR },
{ "charfontname", ATTRIBUTE_CHAR_FONT_NAME },
@@ -69,7 +69,7 @@ namespace slideshow
{ "y", ATTRIBUTE_POS_Y }
};
- static AnimateAttributeMap aMap( lcl_attributeMap,
+ static const AnimateAttributeMap aMap( lcl_attributeMap,
SAL_N_ELEMENTS(lcl_attributeMap),
false );