ooo-build r14540 - in trunk: . patches/dev300

[strba svn gnome org]

Author: strba
Date: Wed Nov 19 10:05:29 2008
New Revision: 14540
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14540&view=rev

Log:
fix calls of private and protected members in layout code

Added:
   trunk/patches/dev300/sfx2-privateprotectedpublic.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Nov 19 10:05:29 2008
@@ -2881,6 +2881,9 @@
 # openjdk contains rhino.jar. breaks the build...
 buildfix-openjdk-6-no-rhino.diff
 
+# fix problem with calling private and protected members in layout code
+sfx2-privateprotectedpublic.diff
+
 # stop font updatess crashing OO.o - to be merged up-stream
 # soon, hence < m28
 [ CairoFonts < dev300-m28 >= ooo300-m9 ]
@@ -2888,4 +2891,3 @@
 [ CairoFonts < dev300-m28 < ooo300-m9 ]
 psprint.defconfig_changes-m7.diff, n#436441, flr
 
-

Added: trunk/patches/dev300/sfx2-privateprotectedpublic.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/sfx2-privateprotectedpublic.diff	Wed Nov 19 10:05:29 2008
@@ -0,0 +1,35 @@
+--- sfx2/inc/sfx2/tabdlg.hxx	2008-11-19 10:51:30.000000000 +0100
++++ sfx2/inc/sfx2/tabdlg.hxx	2008-11-18 16:22:39.500000000 +0100
+@@ -95,8 +95,9 @@
+ friend class SfxTabDialogController;
+ 
+ 	SfxViewFrame*	pFrame;
+-
++public:
+ 	TabControl		aTabCtrl;
++private:
+ 	OKButton		aOKBtn;
+ 	PushButton*		pUserBtn;
+ 	CancelButton	aCancelBtn;
+@@ -104,7 +105,9 @@
+ 	PushButton		aResetBtn;
+ 	PushButton		aBaseFmtBtn;
+ 
++public:
+ 	const SfxItemSet*	pSet;
++private:
+ 	SfxItemSet*			pOutSet;
+ 	TabDlg_Impl*		pImpl;
+ 	USHORT*				pRanges;
+@@ -124,9 +127,10 @@
+ 	SAL_DLLPRIVATE void Init_Impl(BOOL, const String *);
+ //#endif
+ 
+-protected:
++public:
+ 	virtual short				Ok();
+ 	// wird im Sfx gel"oscht!
++protected:
+ 	virtual SfxItemSet*			CreateInputItemSet( USHORT nId );
+ 	// wird *nicht* im Sfx gel"oscht!
+ 	virtual const SfxItemSet*	GetRefreshedSet();