[Libreoffice-commits] .: svx/inc svx/source

[Caolán McNamara]

 svx/inc/float3d.hrc             |    3 ---
 svx/inc/svx/dialogs.hrc         |    3 ++-
 svx/source/engine3d/float3d.cxx |    2 +-
 svx/source/engine3d/float3d.src |    4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 73c4d338ef3fda99a8a4e726c0f5508c2501cdf9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 21 10:06:36 2011 +0000

    rename this to avoid resource warning

diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc
index 1ca50e0..1885678 100755
--- a/svx/inc/float3d.hrc
+++ b/svx/inc/float3d.hrc
@@ -141,6 +141,3 @@
 #define FL_MAT_SPECULAR             123
 #define FT_MAT_FAVORITES   			124
 #define LB_MAT_FAVORITES   			125
-
-// IAccessibility2 implementation
-#define STR_COLOR_LIGHT_PRE				162
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 4383af5..3fcc531 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -198,6 +198,7 @@
 #define RID_SVXIMAGE_LIGHT_OFF  			(RID_SVX_START + 211)
 #define RID_SVXIMAGE_COLORDLG			    (RID_SVX_START + 214)
 
+#define	RID_SVXFLOAT3D_COLOR_LIGHT_PRE		(RID_SVX_START + 72)
 #define	RID_SVXFLOAT3D_FAVORITE				(RID_SVX_START + 73)
 #define	RID_SVXFLOAT3D_FIX_X				(RID_SVX_START + 74)
 #define	RID_SVXFLOAT3D_FIX_Y				(RID_SVX_START + 75)
@@ -206,7 +207,7 @@
 #define	RID_SVXFLOAT3D_FIX_G				(RID_SVX_START + 78)
 #define	RID_SVXFLOAT3D_FIX_B				(RID_SVX_START + 84)
 
-// 67 to 72 free
+// 67 to 71 free
 
 // ResId for the grid dialog
 #define RID_SVXDLG_GRID                     (RID_SVX_START +  79)
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 589f035..bd2dd5f 100755
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -245,7 +245,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         mpRemember2DAttributes(NULL),
         bOnly3DChanged		( sal_False )
 {
-    String accname(SVX_RES(STR_COLOR_LIGHT_PRE));
+    String accname(SVX_RES(RID_SVXFLOAT3D_COLOR_LIGHT_PRE));
     aCtlLightPreview.SetAccessibleName(accname);
     aCtlPreview.SetAccessibleName(accname);
     aLbAmbientlight.SetAccessibleName(aFTAmbientlight.GetDisplayText());
diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src
index c272a37..dfb14ec 100755
--- a/svx/source/engine3d/float3d.src
+++ b/svx/source/engine3d/float3d.src
@@ -1233,8 +1233,8 @@ String RID_SVXFLOAT3D_FIX_B
 {
     Text [ en-US ] = "B:";
 };
-String STR_COLOR_LIGHT_PRE
+
+String RID_SVXFLOAT3D_COLOR_LIGHT_PRE
 {
     Text [ en-US ] = "Color Light Preview";
 };
-