summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-RC/files/patch-i84586
blob: 7b624c3f77f10005b73c12c310024b4cd509c48f (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
? sc/unxfbsdi.pro
Index: sc/source/ui/vba/vbaaxis.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
retrieving revision 1.2
diff -u -r1.2 vbaaxis.cxx
--- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
+++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
@@ -47,8 +47,8 @@
 
 const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
 const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
 ScVbaChart* 
 ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
 {
@@ -142,12 +142,12 @@
 				bCrossesAreCustomized = sal_False;
 				return;
 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
-				mxPropertySet->getPropertyValue(MIN) >>= fNum;
+				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
 				setCrossesAt( fNum );
 				bCrossesAreCustomized = sal_False;
 				break;
 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
-				mxPropertySet->getPropertyValue(MAX) >>= fNum;
+				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
 				setCrossesAt(fNum);
 				bCrossesAreCustomized = sal_False;
 				break;
@@ -182,7 +182,7 @@
 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
 //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
 				double fmin = 0.0;
-				mxPropertySet->getPropertyValue(MIN) >>= fmin;
+				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
 				if (forigin == fmin)
 					nCrosses = xlAxisCrossesMinimum;
 				else