rpms/openoffice.org/FC-6 workspace.sixtyfour11.patch,1.1,1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Mar 6 16:19:22 UTC 2007 

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8455

Modified Files:
	workspace.sixtyfour11.patch 
Log Message:
adjust patch

workspace.sixtyfour11.patch:
 basctl/inc/basidesh.hxx                          |    2 -
 basctl/source/basicide/basides1.cxx              |    6 ++---
 binfilter/bf_sc/source/core/tool/sc_rechead.cxx  |    4 +--
 binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx |   10 ++++-----
 binfilter/bf_sfx2/source/control/sfx2_shell.cxx  |    4 +--
 binfilter/bf_svx/source/items/svx_flditem.cxx    |    2 -
 binfilter/bf_sw/source/ui/inc/view.hxx           |    2 -
 binfilter/inc/bf_sch/viewshel.hxx                |    2 -
 binfilter/inc/bf_sfx2/shell.hxx                  |    2 -
 connectivity/source/inc/dbase/DTable.hxx         |    2 -
 extensions/source/packer/packer2.hxx             |    2 -
 sch/inc/viewshel.hxx                             |    2 -
 sch/source/ui/view/viewshe4.cxx                  |    8 +++----
 sfx2/inc/objface.hxx                             |   12 +++++------
 sfx2/inc/shell.hxx                               |    2 -
 sfx2/source/appl/workwin.cxx                     |    2 -
 sfx2/source/control/dispatch.cxx                 |    2 -
 sfx2/source/control/objface.cxx                  |   25 +++++++++++------------
 sfx2/source/control/shell.cxx                    |    4 +--
 sfx2/source/inc/workwin.hxx                      |    4 +--
 svtools/source/items1/poolio.cxx                 |    2 -
 svtools/source/numbers/numhead.cxx               |    4 +--
 svx/source/items/flditem.cxx                     |    2 -
 sw/source/ui/inc/view.hxx                        |    2 -
 tools/inc/gen.hxx                                |    9 ++++----
 25 files changed, 59 insertions(+), 59 deletions(-)

Index: workspace.sixtyfour11.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/workspace.sixtyfour11.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.sixtyfour11.patch	6 Mar 2007 15:48:46 -0000	1.1
+++ workspace.sixtyfour11.patch	6 Mar 2007 16:19:20 -0000	1.2
@@ -179,15 +179,15 @@
  
 --- openoffice.org.orig/binfilter/bf_sw/source/ui/inc/view.hxx	2006-10-28 03:00:02.000000000 +0200
 +++ openoffice.org/binfilter/bf_sw/source/ui/inc/view.hxx	2007-02-19 18:31:21.000000000 +0100
-@@ -365,7 +365,7 @@ public:
- 
+@@ -408,7 +408,7 @@
  	SfxDispatcher 	&GetDispatcher();
  
+ //STRIP001 	virtual SdrView*		GetDrawView() const;
 -	virtual	BOOL			HasUIFeature( sal_uInt32 nFeature );
-+	virtual	sal_Bool		HasUIFeature( sal_uInt32 nFeature );
++        virtual sal_Bool                HasUIFeature( sal_uInt32 nFeature );
  	virtual	void			ShowCursor( FASTBOOL bOn = TRUE );
+ //STRIP001 	virtual ErrCode			DoVerb( long nVerb );
  
- 	ShellModes				GetShellMode();
 --- openoffice.org.orig/binfilter/inc/bf_sfx2/shell.hxx	2006-10-28 05:09:03.000000000 +0200
 +++ openoffice.org/binfilter/inc/bf_sfx2/shell.hxx	2007-02-19 18:23:50.000000000 +0100
 @@ -235,7 +235,7 @@ public:
@@ -281,54 +281,54 @@
  	sal_Bool bIsActive = sal_False;
 --- openoffice.org.orig/sfx2/source/control/objface.cxx	2006-10-12 17:51:28.000000000 +0200
 +++ openoffice.org/sfx2/source/control/objface.cxx	2007-02-19 17:51:36.000000000 +0100
-@@ -88,9 +88,9 @@ struct SfxObjectUI_Impl
+@@ -87,9 +87,9 @@
  	BOOL	bVisible;
  	BOOL	bContext;
  	String* pName;
 -	ULONG	nFeature;
-+	sal_uInt32	nFeature;
++	sal_uInt32 nFeature;
  
--	SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, ULONG nFeat) :
-+	SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) :
+-	SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, ULONG nFeat,
++	SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat,
+ 				USHORT nClassId=0xFFFF) :
  		nPos(n),
- 		aResId(rResId.GetId(), rResId.GetResMgr()),
- 		bVisible(bVis),
-@@ -140,7 +140,7 @@ struct SfxInterface_Impl
+ 		nInterfaceId(nClassId),
+@@ -141,7 +141,7 @@
  	}
  };
  
--static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr );
-+static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
+-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr, USHORT nInterface );
++static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr, USHORT nInterface );
  
  //====================================================================
  
-@@ -432,14 +432,14 @@ void SfxInterface::RegisterObjectBar( US
+@@ -433,14 +433,14 @@
  }
  
  
 -void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr )
 +void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
  {
-     SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
+     SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr, nClassId );
      if ( pUI )
          pImpData->pObjectBars->Append(pUI);
  }
  
--SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr )
-+SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+-SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, ULONG nFeature, const String *pStr, USHORT nClassId )
++SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr, USHORT nClassId )
  {
  	if ((nPos & SFX_VISIBILITY_MASK) == 0)
          nPos |= SFX_VISIBILITY_STANDARD;
-@@ -524,7 +524,7 @@ void SfxInterface::RegisterChildWindow(U
+@@ -525,7 +525,7 @@
  	RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
  }
  
 -void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, ULONG nFeature, const String*)
 +void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*)
  {
- 	SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, TRUE, nFeature);
+ 	SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, TRUE, nFeature, 0);
  	pUI->bContext = bContext;
-@@ -537,7 +537,7 @@ void SfxInterface::RegisterStatusBar(con
+@@ -538,7 +538,7 @@
  }
  
  
@@ -337,7 +337,7 @@
  {
  	if ( pGenoType )
  	{
-@@ -554,13 +554,13 @@ ULONG SfxInterface::GetChildWindowId (US
+@@ -555,13 +555,13 @@
  	USHORT nCWCount = pImpData->pChildWindows->Count();
  	DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
  #endif
@@ -354,7 +354,7 @@
  {
  	if ( pGenoType )
  	{
-@@ -577,8 +577,7 @@ ULONG SfxInterface::GetChildWindowFeatur
+@@ -578,8 +578,7 @@
  	USHORT nCWCount = pImpData->pChildWindows->Count();
  	DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
  #endif
@@ -364,7 +364,7 @@
  }
  
  //--------------------------------------------------------------------
-@@ -630,7 +629,7 @@ const String* SfxInterface::GetObjectBar
+@@ -631,7 +630,7 @@
  	return (*pImpData->pObjectBars)[nNo]->pName;
  }

More information about the fedora-cvs-commits mailing list