rpms/openoffice.org/devel openoffice.org.spec, 1.1284, 1.1285 pseudoworkspace.valgrind1.patch, 1.20, 1.21

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6451

Modified Files:
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Log Message:
add ooo#81258 sw uninit fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1284
retrieving revision 1.1285
diff -u -r1.1284 -r1.1285
--- openoffice.org.spec	4 Sep 2007 11:55:50 -0000	1.1284
+++ openoffice.org.spec	4 Sep 2007 13:41:37 -0000	1.1285
@@ -2738,6 +2738,7 @@
 %changelog
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - add ooo#81253 connectivity uninit fix
+- add ooo#81258 sw uninit fix
 
 * Sat Sep 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.1
 - release candidate

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pseudoworkspace.valgrind1.patch	4 Sep 2007 11:55:50 -0000	1.20
+++ pseudoworkspace.valgrind1.patch	4 Sep 2007 13:41:37 -0000	1.21
@@ -44,3 +44,76 @@
          {
              if ( !_rxConnection.is() )
                  throw NullPointerException();
+Index: source/ui/config/usrpref.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/config/usrpref.cxx,v
+retrieving revision 1.32
+diff -u -r1.32 usrpref.cxx
+--- openoffice.org.orig/sw/source/ui/config/usrpref.cxx	27 Jun 2007 12:49:41 -0000	1.32
++++ openoffice.org/sw/source/ui/config/usrpref.cxx	4 Sep 2007 13:34:50 -0000
+@@ -79,16 +79,16 @@
+ }
+ 
+ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
+-	aContentConfig(bWeb, *this),
+-	aLayoutConfig(bWeb, *this),
+-	aGridConfig(bWeb, *this),
+-	aCursorConfig(*this),
+-	pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
+ 	nFldUpdateFlags(0),
+     nLinkUpdateMode(0),
+     bIsHScrollMetricSet(sal_False),
+     bIsVScrollMetricSet(sal_False),
+-    nDefTab( MM50 * 4 )
++    nDefTab( MM50 * 4 ),
++	aContentConfig(bWeb, *this),
++	aLayoutConfig(bWeb, *this),
++	aGridConfig(bWeb, *this),
++	aCursorConfig(*this),
++	pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
+ {
+     MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum();
+     eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+Index: source/ui/inc/usrpref.hxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/inc/usrpref.hxx,v
+retrieving revision 1.11
+diff -u -r1.11 usrpref.hxx
+--- openoffice.org.orig/sw/source/ui/inc/usrpref.hxx	27 Jun 2007 12:50:12 -0000	1.11
++++ openoffice.org/sw/source/ui/inc/usrpref.hxx	4 Sep 2007 13:34:54 -0000
+@@ -141,6 +141,17 @@
+  ---------------------------------------------------------------------------*/
+ class SwMasterUsrPref : public SwViewOption
+ {
++	sal_Int32	nFldUpdateFlags;	//udpate of fields and charts
++	sal_Int32	nLinkUpdateMode;
++	FieldUnit	eUserMetric;
++	FieldUnit   eHScrollMetric;
++	sal_Bool    bIsHScrollMetricSet;
++	FieldUnit   eVScrollMetric;
++	sal_Bool    bIsVScrollMetricSet;
++
++	sal_Int32	nDefTab;			//default tab stop distance
++
++
+ 	friend class SwContentViewConfig;
+ 	friend class SwLayoutViewConfig;
+ 	friend class SwGridConfig;
+@@ -153,17 +164,6 @@
+ 	SwCursorConfig		aCursorConfig;
+ 	SwWebColorConfig* 	pWebColorConfig;
+ 
+-	sal_Int32	nFldUpdateFlags;	//udpate of fields and charts
+-	sal_Int32	nLinkUpdateMode;
+-	FieldUnit	eUserMetric;
+-    FieldUnit   eHScrollMetric;
+-    sal_Bool    bIsHScrollMetricSet;
+-    FieldUnit   eVScrollMetric;
+-    sal_Bool    bIsVScrollMetricSet;
+-
+-
+-	sal_Int32	nDefTab;			//default tab stop distance
+-
+ public:
+ 	SwMasterUsrPref(BOOL bWeb);
+ 	~SwMasterUsrPref();