You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/06/15 14:28:23 UTC
svn commit: r1350597 -
/incubator/ooo/trunk/main/svx/source/svdraw/svdtrans.cxx
Author: hdu
Date: Fri Jun 15 12:28:22 2012
New Revision: 1350597
URL: http://svn.apache.org/viewvc?rev=1350597&view=rev
Log:
#c703906# #c703907# fix SdrFormatter::TakeUnitStr() strings
pointer-size rarely matches the string-length
Modified:
incubator/ooo/trunk/main/svx/source/svdraw/svdtrans.cxx
Modified: incubator/ooo/trunk/main/svx/source/svdraw/svdtrans.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/svdraw/svdtrans.cxx?rev=1350597&r1=1350596&r2=1350597&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/svdraw/svdtrans.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/svdraw/svdtrans.cxx Fri Jun 15 12:28:22 2012
@@ -1075,191 +1075,66 @@ void SdrFormatter::TakeStr(long nVal, Xu
void SdrFormatter::TakeUnitStr(MapUnit eUnit, XubString& rStr)
{
+ const sal_Char* pText;
+
switch(eUnit)
{
- // Metrisch
- case MAP_100TH_MM :
- {
- sal_Char aText[] = "/100mm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_10TH_MM :
- {
- sal_Char aText[] = "/10mm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_MM :
- {
- sal_Char aText[] = "mm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_CM :
- {
- sal_Char aText[] = "cm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
-
- // Inch
- case MAP_1000TH_INCH:
- {
- sal_Char aText[] = "/1000\"";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_100TH_INCH :
- {
- sal_Char aText[] = "/100\"";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_10TH_INCH :
- {
- sal_Char aText[] = "/10\"";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_INCH :
- {
- rStr = UniString();
- rStr += sal_Unicode('"');
- break;
- }
- case MAP_POINT :
- {
- sal_Char aText[] = "pt";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_TWIP :
- {
- sal_Char aText[] = "twip";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
-
- // Sonstiges
- case MAP_PIXEL :
- {
- sal_Char aText[] = "pixel";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_SYSFONT :
- {
- sal_Char aText[] = "sysfont";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_APPFONT :
- {
- sal_Char aText[] = "appfont";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case MAP_RELATIVE :
- {
- rStr = UniString();
- rStr += sal_Unicode('%');
- break;
- }
- default: break;
+ // metric units
+ case MAP_100TH_MM : pText = "/100mm"; break;
+ case MAP_10TH_MM : pText = "/10mm"; break;
+ case MAP_MM : pText = "mm"; break;
+ case MAP_CM : pText = "cm"; break;
+
+ // imperial units
+ case MAP_1000TH_INCH: pText = "/1000\""; break;
+ case MAP_100TH_INCH : pText = "/100\""; break;
+ case MAP_10TH_INCH : pText = "/10\""; break;
+ case MAP_INCH : pText = "\""; break;
+ case MAP_POINT : pText = "pt"; break;
+ case MAP_TWIP : pText = "twip"; break;
+
+ // other units
+ case MAP_PIXEL : pText = "pixel"; break;
+ case MAP_SYSFONT : pText = "sysfont"; break;
+ case MAP_APPFONT : pText = "appfont"; break;
+ case MAP_RELATIVE : pText = "\%"; break;
+
+ default : pText = ""; break;
}
+
+ rStr = XubString::CreateFromAscii( pText );
}
void SdrFormatter::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
{
+ const sal_Char* pText;
+
switch(eUnit)
{
- default :
- case FUNIT_NONE :
- case FUNIT_CUSTOM :
- {
- rStr = UniString();
- break;
- }
-
- // Metrisch
- case FUNIT_100TH_MM:
- {
- sal_Char aText[] = "/100mm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case FUNIT_MM :
- {
- sal_Char aText[] = "mm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case FUNIT_CM :
- {
- sal_Char aText[] = "cm";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case FUNIT_M :
- {
- rStr = UniString();
- rStr += sal_Unicode('m');
- break;
- }
- case FUNIT_KM :
- {
- sal_Char aText[] = "km";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
-
- // Inch
- case FUNIT_TWIP :
- {
- sal_Char aText[] = "twip";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case FUNIT_POINT :
- {
- sal_Char aText[] = "pt";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case FUNIT_PICA :
- {
- sal_Char aText[] = "pica";
- rStr = UniString(aText, sizeof(aText-1));
- break;
- }
- case FUNIT_INCH :
- {
- rStr = UniString();
- rStr += sal_Unicode('"');
- break;
- }
- case FUNIT_FOOT :
- {
- 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));
- break;
- }
-
- // sonstiges
- case FUNIT_PERCENT:
- {
- rStr = UniString();
- rStr += sal_Unicode('%');
- break;
- }
+ // metric units
+ case FUNIT_100TH_MM : pText = "/100mm"; break;
+ case FUNIT_MM : pText = "mm"; break;
+ case FUNIT_CM : pText = "cm"; break;
+ case FUNIT_M : pText = "m"; break;
+ case FUNIT_KM : pText = "km"; break;
+
+ // imperial units
+ case FUNIT_TWIP : pText = "twip"; break;
+ case FUNIT_POINT : pText = "pt"; break;
+ case FUNIT_PICA : pText = "pica"; break;
+ case FUNIT_INCH : pText = "\""; break;
+ case FUNIT_FOOT : pText = "ft"; break;
+ case FUNIT_MILE : pText = "mile(s)"; break;
+
+ // other units
+ case FUNIT_PERCENT: pText = "\%"; break;
+
+// case FUNIT_NONE :
+// case FUNIT_CUSTOM :
+ default : pText = ""; break;
}
+
+ rStr = XubString::CreateFromAscii( pText );
}
////////////////////////////////////////////////////////////////////////////////////////////////////