svdmodel.cxx (97e8a929) | svdmodel.cxx (027cdf4a) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 1208 unchanged lines hidden (view full) --- 1217 case FUNIT_NONE : 1218 case FUNIT_CUSTOM : 1219 { 1220 rStr = String(); 1221 break; 1222 } 1223 case FUNIT_100TH_MM: 1224 { | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 1208 unchanged lines hidden (view full) --- 1217 case FUNIT_NONE : 1218 case FUNIT_CUSTOM : 1219 { 1220 rStr = String(); 1221 break; 1222 } 1223 case FUNIT_100TH_MM: 1224 { |
1225 sal_Char aText[] = "/100mm"; 1226 rStr = UniString(aText, sizeof(aText-1)); | 1225 const sal_Char aText[] = "/100mm"; 1226 rStr = UniString(aText, sizeof(aText)-1); |
1227 break; 1228 } 1229 case FUNIT_MM : 1230 { | 1227 break; 1228 } 1229 case FUNIT_MM : 1230 { |
1231 sal_Char aText[] = "mm"; 1232 rStr = UniString(aText, sizeof(aText-1)); | 1231 const sal_Char aText[] = "mm"; 1232 rStr = UniString(aText, sizeof(aText)-1); |
1233 break; 1234 } 1235 case FUNIT_CM : 1236 { | 1233 break; 1234 } 1235 case FUNIT_CM : 1236 { |
1237 sal_Char aText[] = "cm"; 1238 rStr = UniString(aText, sizeof(aText-1)); | 1237 const sal_Char aText[] = "cm"; 1238 rStr = UniString(aText, sizeof(aText)-1); |
1239 break; 1240 } 1241 case FUNIT_M : 1242 { 1243 rStr = String(); 1244 rStr += sal_Unicode('m'); 1245 break; 1246 } 1247 case FUNIT_KM : 1248 { | 1239 break; 1240 } 1241 case FUNIT_M : 1242 { 1243 rStr = String(); 1244 rStr += sal_Unicode('m'); 1245 break; 1246 } 1247 case FUNIT_KM : 1248 { |
1249 sal_Char aText[] = "km"; 1250 rStr = UniString(aText, sizeof(aText-1)); | 1249 const sal_Char aText[] = "km"; 1250 rStr = UniString(aText, sizeof(aText)-1); |
1251 break; 1252 } 1253 case FUNIT_TWIP : 1254 { | 1251 break; 1252 } 1253 case FUNIT_TWIP : 1254 { |
1255 sal_Char aText[] = "twip"; 1256 rStr = UniString(aText, sizeof(aText-1)); | 1255 const sal_Char aText[] = "twip"; 1256 rStr = UniString(aText, sizeof(aText)-1); |
1257 break; 1258 } 1259 case FUNIT_POINT : 1260 { | 1257 break; 1258 } 1259 case FUNIT_POINT : 1260 { |
1261 sal_Char aText[] = "pt"; 1262 rStr = UniString(aText, sizeof(aText-1)); | 1261 const sal_Char aText[] = "pt"; 1262 rStr = UniString(aText, sizeof(aText)-1); |
1263 break; 1264 } 1265 case FUNIT_PICA : 1266 { 1267 sal_Char aText[] = "pica"; | 1263 break; 1264 } 1265 case FUNIT_PICA : 1266 { 1267 sal_Char aText[] = "pica"; |
1268 rStr = UniString(aText, sizeof(aText-1)); | 1268 rStr = UniString(aText, sizeof(aText)-1); |
1269 break; 1270 } 1271 case FUNIT_INCH : 1272 { 1273 rStr = String(); 1274 rStr += sal_Unicode('"'); 1275 break; 1276 } 1277 case FUNIT_FOOT : 1278 { | 1269 break; 1270 } 1271 case FUNIT_INCH : 1272 { 1273 rStr = String(); 1274 rStr += sal_Unicode('"'); 1275 break; 1276 } 1277 case FUNIT_FOOT : 1278 { |
1279 sal_Char aText[] = "ft"; 1280 rStr = UniString(aText, sizeof(aText-1)); | 1279 const sal_Char aText[] = "ft"; 1280 rStr = UniString(aText, sizeof(aText)-1); |
1281 break; 1282 } 1283 case FUNIT_MILE : 1284 { | 1281 break; 1282 } 1283 case FUNIT_MILE : 1284 { |
1285 sal_Char aText[] = "mile(s)"; 1286 rStr = UniString(aText, sizeof(aText-1)); | 1285 const sal_Char aText[] = "mile(s)"; 1286 rStr = UniString(aText, sizeof(aText)-1); |
1287 break; 1288 } 1289 case FUNIT_PERCENT: 1290 { 1291 rStr = String(); 1292 rStr += sal_Unicode('%'); 1293 break; 1294 } --- 870 unchanged lines hidden (view full) --- 2165 static Sequence< sal_Int8 > aSeq( 16 ); 2166 rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); 2167 pSeq = &aSeq; 2168 } 2169 } 2170 return *pSeq; 2171} 2172 | 1287 break; 1288 } 1289 case FUNIT_PERCENT: 1290 { 1291 rStr = String(); 1292 rStr += sal_Unicode('%'); 1293 break; 1294 } --- 870 unchanged lines hidden (view full) --- 2165 static Sequence< sal_Int8 > aSeq( 16 ); 2166 rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True ); 2167 pSeq = &aSeq; 2168 } 2169 } 2170 return *pSeq; 2171} 2172 |
2173void SdrModel::SetDrawingLayerPoolDefaults() 2174{ 2175 const String aNullStr; 2176 const Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); 2177 const Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); 2178 const XHatch aNullHatch(aNullLineCol); 2179 2180 pItemPool->SetPoolDefaultItem( XFillColorItem(aNullStr,aNullFillCol) ); 2181 pItemPool->SetPoolDefaultItem( XFillHatchItem(pItemPool,aNullHatch) ); 2182 pItemPool->SetPoolDefaultItem( XLineColorItem(aNullStr,aNullLineCol) ); 2183} 2184 | |
2185// 2186// i120668, move from the header files, add delete action 2187// 2188void SdrModel::SetColorTable(XColorList* pTable) { delete pColorTable; pColorTable=pTable; } 2189void SdrModel::SetDashList(XDashList* pList) { delete pDashList; pDashList=pList; } 2190void SdrModel::SetLineEndList(XLineEndList* pList) { delete pLineEndList; pLineEndList=pList; } 2191void SdrModel::SetHatchList(XHatchList* pList) { delete pHatchList; pHatchList=pList; } 2192void SdrModel::SetGradientList(XGradientList* pList) { delete pGradientList; pGradientList=pList; } --- 91 unchanged lines hidden --- | 2173// 2174// i120668, move from the header files, add delete action 2175// 2176void SdrModel::SetColorTable(XColorList* pTable) { delete pColorTable; pColorTable=pTable; } 2177void SdrModel::SetDashList(XDashList* pList) { delete pDashList; pDashList=pList; } 2178void SdrModel::SetLineEndList(XLineEndList* pList) { delete pLineEndList; pLineEndList=pList; } 2179void SdrModel::SetHatchList(XHatchList* pList) { delete pHatchList; pHatchList=pList; } 2180void SdrModel::SetGradientList(XGradientList* pList) { delete pGradientList; pGradientList=pList; } --- 91 unchanged lines hidden --- |