Author: hdu
Date: Thu Apr 18 12:54:17 2013
New Revision: 1469300
URL: http://svn.apache.org/r1469300
Log:
WaE: fix wrong use of sizeof operation
sizeof(ARRAY-1)==sizeof(&ARRAY[0]) but obviously sizeof(ARRAY)-1 was meant
Modified:
openoffice/trunk/main/svx/source/svdraw/svdattr.cxx
openoffice/trunk/main/svx/source/svdraw/svdlayer.cxx
openoffice/trunk/main/svx/source/svdraw/svdmodel.cxx
Modified: openoffice/trunk/main/svx/source/svdraw/svdattr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdattr.cxx?rev=1469300&r1=1469299&r2=1469300&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdattr.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdattr.cxx Thu Apr 18 12:54:17 2013
@@ -1410,10 +1410,10 @@ SfxItemPresentation __EXPORT SdrTextAniA
if(nValue < 0)
{
- sal_Char aText[] = "pixel";
+ const sal_Char aText[] = "pixel";
rText = UniString::CreateFromInt32(-nValue);
- rText += UniString(aText, sizeof(aText-1));
+ rText += UniString(aText, sizeof(aText)-1);
}
else
{
@@ -2041,8 +2041,8 @@ XubString __EXPORT SdrMeasureUnitItem::G
if((FieldUnit)nPos == FUNIT_NONE)
{
- sal_Char aText[] = "default";
- aRetval += UniString(aText, sizeof(aText-1));
+ cont sal_Char aText[] = "default";
+ aRetval += UniString(aText, sizeof(aText)-1);
}
else
{
@@ -2354,26 +2354,26 @@ XubString __EXPORT SdrGrafModeItem::GetV
{
case 1:
{
- sal_Char aTextGreys[] = "Greys";
- aStr += UniString(aTextGreys, sizeof(aTextGreys-1));
+ const sal_Char aTextGreys[] = "Greys";
+ aStr += UniString(aTextGreys, sizeof(aTextGreys)-1);
break;
}
case 2:
{
- sal_Char aTextBlackWhite[] = "Black/White";
- aStr += UniString(aTextBlackWhite,
sizeof(aTextBlackWhite-1));
+ const sal_Char aTextBlackWhite[] = "Black/White";
+ aStr += UniString(aTextBlackWhite,
sizeof(aTextBlackWhite)-1);
break;
}
case 3:
{
- sal_Char aTextWatermark[] = "Watermark";
- aStr += UniString(aTextWatermark,
sizeof(aTextWatermark-1));
+ const sal_Char aTextWatermark[] = "Watermark";
+ aStr += UniString(aTextWatermark,
sizeof(aTextWatermark)-1);
break;
}
default:
{
- sal_Char aTextStandard[] = "Standard";
- aStr += UniString(aTextStandard,
sizeof(aTextStandard-1));
+ const sal_Char aTextStandard[] = "Standard";
+ aStr += UniString(aTextStandard,
sizeof(aTextStandard)-1);
break;
}
}
Modified: openoffice/trunk/main/svx/source/svdraw/svdlayer.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdlayer.cxx?rev=1469300&r1=1469299&r2=1469300&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdlayer.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdlayer.cxx Thu Apr 18 12:54:17
2013
@@ -238,8 +238,8 @@ SdrLayerAdmin::SdrLayerAdmin(SdrLayerAdm
aLSets(1024,16,16),
pModel(NULL)
{
- sal_Char aTextControls[] = "Controls";
- aControlLayerName = String(aTextControls, sizeof(aTextControls-1));
+ const sal_Char aTextControls[] = "Controls";
+ aControlLayerName = String(aTextControls, sizeof(aTextControls)-1);
pParent=pNewParent;
}
@@ -249,8 +249,8 @@ SdrLayerAdmin::SdrLayerAdmin(const SdrLa
pParent(NULL),
pModel(NULL)
{
- sal_Char aTextControls[] = "Controls";
- aControlLayerName = String(aTextControls, sizeof(aTextControls-1));
+ const sal_Char aTextControls[] = "Controls";
+ aControlLayerName = String(aTextControls, sizeof(aTextControls)-1);
*this = rSrcLayerAdmin;
}
Modified: openoffice/trunk/main/svx/source/svdraw/svdmodel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/svdraw/svdmodel.cxx?rev=1469300&r1=1469299&r2=1469300&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/svdraw/svdmodel.cxx (original)
+++ openoffice/trunk/main/svx/source/svdraw/svdmodel.cxx Thu Apr 18 12:54:17
2013
@@ -1222,20 +1222,20 @@ void SdrModel::TakeUnitStr(FieldUnit eUn
}
case FUNIT_100TH_MM:
{
- sal_Char aText[] = "/100mm";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "/100mm";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_MM :
{
- sal_Char aText[] = "mm";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "mm";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_CM :
{
- sal_Char aText[] = "cm";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "cm";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_M :
@@ -1246,26 +1246,26 @@ void SdrModel::TakeUnitStr(FieldUnit eUn
}
case FUNIT_KM :
{
- sal_Char aText[] = "km";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "km";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_TWIP :
{
- sal_Char aText[] = "twip";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "twip";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_POINT :
{
- sal_Char aText[] = "pt";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "pt";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_PICA :
{
sal_Char aText[] = "pica";
- rStr = UniString(aText, sizeof(aText-1));
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_INCH :
@@ -1276,14 +1276,14 @@ void SdrModel::TakeUnitStr(FieldUnit eUn
}
case FUNIT_FOOT :
{
- sal_Char aText[] = "ft";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "ft";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_MILE :
{
- sal_Char aText[] = "mile(s)";
- rStr = UniString(aText, sizeof(aText-1));
+ const sal_Char aText[] = "mile(s)";
+ rStr = UniString(aText, sizeof(aText)-1);
break;
}
case FUNIT_PERCENT:
