rpms/openoffice.org/FC-6 openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, NONE, 1.1 workspace.sixtyfour11.patch, NONE, 1.1 .cvsignore, 1.117, 1.118 openoffice.org.spec, 1.931, 1.932 openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 6 15:48:53 UTC 2007
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, NONE, 1.1 openoffice.org.spec, 1.1090, 1.1091
- Next message (by thread): rpms/libXdamage/devel .cvsignore, 1.7, 1.8 libXdamage.spec, 1.15, 1.16 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv21298
Modified Files:
.cvsignore openoffice.org.spec
Added Files:
openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
workspace.sixtyfour11.patch
Removed Files:
openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch
Log Message:
rhbz#206268/ooo#75167 session restoration
openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch:
Source/vcl/unx/source/app/sm.cxx | 0
framework/source/services/autorecovery.cxx | 47 +++++++++++++++++++++++++++++
source/services/autorecovery.cxx | 0
vcl/unx/source/app/sm.cxx | 17 ++++++----
4 files changed, 57 insertions(+), 7 deletions(-)
--- NEW FILE openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch ---
Index: Source/vcl/unx/source/app/sm.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/sm.cxx,v
retrieving revision 1.29
diff -u -r1.29 sm.cxx
--- openoffice.org.orig/vcl/unx/source/app/sm.cxx 6 Oct 2006 10:04:48 -0000 1.29
+++ openoffice.org/vcl/unx/source/app/sm.cxx 28 Feb 2007 14:16:07 -0000
@@ -239,14 +239,17 @@
pSmProps[ 2 ].name = const_cast<char*>(SmRestartCommand);
pSmProps[ 2 ].type = const_cast<char*>(SmLISTofARRAY8);
- pSmProps[ 2 ].num_vals = 2;
- pSmProps[ 2 ].vals = new SmPropValue[2];
+ pSmProps[ 2 ].num_vals = 3;
+ pSmProps[ 2 ].vals = new SmPropValue[3];
pSmProps[ 2 ].vals[0].length = aExec.Len()+1;
- pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() );
- ByteString aRestartOption( "-session=" );
- aRestartOption.Append( SessionManagerClient::getSessionID() );
- pSmProps[ 2 ].vals[1].length = aRestartOption.Len()+1;
- pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() );
+ pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() );
+ ByteString aRestartOption( "-session=" );
+ aRestartOption.Append( SessionManagerClient::getSessionID() );
+ pSmProps[ 2 ].vals[1].length = aRestartOption.Len()+1;
+ pSmProps[ 2 ].vals[1].value = strdup( aRestartOption.GetBuffer() );
+ ByteString aRestartOptionNoLogo( "-nologo" );
+ pSmProps[ 2 ].vals[2].length = aRestartOptionNoLogo.Len()+1;
+ pSmProps[ 2 ].vals[2].value = strdup( aRestartOptionNoLogo.GetBuffer() );
rtl::OUString aUserName;
rtl::OString aUser;
Index: source/services/autorecovery.cxx
===================================================================
RCS file: /cvs/framework/framework/source/services/autorecovery.cxx,v
retrieving revision 1.19.64.2
diff -u -r1.19.64.2 autorecovery.cxx
--- openoffice.org.orig/framework/source/services/autorecovery.cxx 29 Jan 2007 13:48:43 -0000 1.19.64.2
+++ openoffice.org/framework/source/services/autorecovery.cxx 6 Mar 2007 15:26:04 -0000
@@ -2489,6 +2491,42 @@
AutoRecovery::st_impl_removeFile(sRemoveFile);
}
+class PseudoStatusIndicator : public css::lang::XTypeProvider
+ , public css::task::XStatusIndicator
+ , public ::cppu::OWeakObject
+{
+ public:
+ FWK_DECLARE_XINTERFACE
+ FWK_DECLARE_XTYPEPROVIDER
+
+ virtual void SAL_CALL start(const ::rtl::OUString& sText ,
+ sal_Int32 nRange)
+ throw(css::uno::RuntimeException) {}
+
+ virtual void SAL_CALL end()
+ throw(css::uno::RuntimeException) {}
+
+ virtual void SAL_CALL reset()
+ throw(css::uno::RuntimeException) {}
+
+ virtual void SAL_CALL setText(const ::rtl::OUString& sText)
+ throw(css::uno::RuntimeException) {}
+
+ virtual void SAL_CALL setValue(sal_Int32 nValue)
+ throw(css::uno::RuntimeException) {}
+};
+
+DEFINE_XINTERFACE_2(PseudoStatusIndicator ,
+ OWeakObject ,
+ DIRECT_INTERFACE(css::lang::XTypeProvider ),
+ DIRECT_INTERFACE(css::task::XStatusIndicator))
+
+//***********************************************
+// XInterface
+DEFINE_XTYPEPROVIDER_2(PseudoStatusIndicator ,
+ css::lang::XTypeProvider ,
+ css::task::XStatusIndicator)
+
//-----------------------------------------------
AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams)
{
@@ -2537,7 +2575,18 @@
lDescriptor[::comphelper::MediaDescriptor::PROP_SALVAGEDFILE()] <<= ::rtl::OUString();
if (aParams.m_xProgress.is())
+ {
lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= aParams.m_xProgress;
+ }
+ else if ((eJob & AutoRecovery::E_SESSION_RESTORE) == AutoRecovery::E_SESSION_RESTORE)
+ {
+ //If we are restoring a session we want to leave it up to the window manager as to
+ //where to position the windows. If we allow the normal progress bar to be used
+ //then ToTop will be called, which will automatically reposition the window
+ //into the user's current workspace.
+ css::uno::Reference< css::task::XStatusIndicator > xNONE = new PseudoStatusIndicator;
+ lDescriptor[::comphelper::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xNONE;
+ }
sal_Bool bBackupWasTried = (
((rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_BACKUP ) == AutoRecovery::E_TRY_LOAD_BACKUP) || // temp. state!
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(-)
--- NEW FILE workspace.sixtyfour11.patch ---
--- openoffice.org.orig/svtools/source/numbers/numhead.cxx 2006-09-17 17:20:40.000000000 +0200
+++ openoffice.org/svtools/source/numbers/numhead.cxx 2007-02-22 13:05:26.000000000 +0100
@@ -236,7 +236,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMu
{
nDataSize = nDataEnd - nDataPos;
ULONG nPos = rStream.Tell();
- rStream.Seek(nDataPos-sizeof(ULONG));
+ rStream.Seek(nDataPos-sizeof(sal_uInt32));
rStream << nDataSize; // Groesse am Anfang eintragen
rStream.Seek(nPos);
}
--- openoffice.org.orig/extensions/source/packer/packer2.hxx 2006-03-16 14:00:21.000000000 +0100
+++ openoffice.org/extensions/source/packer/packer2.hxx 2007-02-22 19:04:50.000000000 +0100
@@ -93,7 +93,7 @@ class INetURLObject;
\* ******************************************************************/
const sal_uInt32 PACK_ID = ((('S' << 8 | 'Z' ) << 8 | 'I' ) << 8 | 'P' );
-const USHORT HEADER_SIZE = 2*sizeof( ULONG ) + 3*sizeof( USHORT );
+const USHORT HEADER_SIZE = 2*sizeof( sal_uInt32 ) + 3*sizeof( USHORT );
class LocalFileHeader
{
--- openoffice.org.orig/svx/source/items/flditem.cxx 2006-10-12 14:53:54.000000000 +0200
+++ openoffice.org/svx/source/items/flditem.cxx 2007-02-22 19:06:03.000000000 +0100
@@ -402,7 +402,7 @@ void SvxURLField::Load( SvPersistStream
{
USHORT nFormat;
sal_uInt32 nFrameMarker, nCharSetMarker;
- long nUlongSize = (long)sizeof(ULONG);
+ long nUlongSize = (long)sizeof(sal_uInt32);
String aTmpURL;
rStm >> nFormat;
--- openoffice.org.orig/svtools/source/items1/poolio.cxx 2006-10-12 17:22:39.000000000 +0200
+++ openoffice.org/svtools/source/items1/poolio.cxx 2007-02-22 19:09:40.000000000 +0100
@@ -788,7 +788,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStre
if ( pImp->nMajorVer > 1 || pImp->nMinorVer >= 3 )
{
// Version-Map finden (letztes ULONG der Size-Table gibt Pos an)
- rStream.Seek( nEndOfSizes - sizeof(ULONG) );
+ rStream.Seek( nEndOfSizes - sizeof(sal_uInt32) );
sal_uInt32 nVersionMapPos;
rStream >> nVersionMapPos;
rStream.Seek( nVersionMapPos );
--- openoffice.org.orig/svtools/source/numbers/numhead.cxx 2007-02-22 13:59:11.000000000 +0100
+++ openoffice.org/svtools/source/numbers/numhead.cxx 2007-02-22 19:09:23.000000000 +0100
@@ -106,7 +106,7 @@ SvNumWriteHeader::~SvNumWriteHeader()
if ( nPos - nDataPos != nDataSize ) // Default getroffen?
{
nDataSize = nPos - nDataPos;
- rStream.Seek(nDataPos - sizeof(ULONG));
+ rStream.Seek(nDataPos - sizeof(sal_uInt32));
rStream << nDataSize; // Groesse am Anfang eintragen
rStream.Seek(nPos);
}
--- openoffice.org.orig/binfilter/bf_sc/source/core/tool/sc_rechead.cxx 2006-10-27 16:37:48.000000000 +0200
+++ openoffice.org/binfilter/bf_sc/source/core/tool/sc_rechead.cxx 2007-02-22 19:07:47.000000000 +0100
@@ -98,7 +98,7 @@ namespace binfilter {
/*N*/ if ( nPos - nDataPos != nDataSize ) // Default getroffen?
/*N*/ {
/*N*/ nDataSize = nPos - nDataPos;
-/*N*/ rStream.Seek(nDataPos - sizeof(ULONG));
+/*N*/ rStream.Seek(nDataPos - sizeof(sal_uInt32));
/*N*/ rStream << nDataSize; // Groesse am Anfang eintragen
/*N*/ rStream.Seek(nPos);
/*N*/ }
@@ -214,7 +214,7 @@ namespace binfilter {
/*N*/ {
/*N*/ nDataSize = nDataEnd - nDataPos;
/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ rStream.Seek(nDataPos-sizeof(ULONG));
+/*N*/ rStream.Seek(nDataPos-sizeof(sal_uInt32));
/*N*/ rStream << nDataSize; // Groesse am Anfang eintragen
/*N*/ rStream.Seek(nPos);
/*N*/ }
--- openoffice.org.orig/binfilter/bf_svx/source/items/svx_flditem.cxx 2006-10-27 23:15:22.000000000 +0200
+++ openoffice.org/binfilter/bf_svx/source/items/svx_flditem.cxx 2007-02-22 19:06:25.000000000 +0100
@@ -403,7 +403,7 @@ namespace binfilter {
/*N*/ {
/*N*/ USHORT nFormat;
/*N*/ sal_uInt32 nFrameMarker, nCharSetMarker;
-/*N*/ long nUlongSize = (long)sizeof(ULONG);
+/*N*/ long nUlongSize = (long)sizeof(sal_uInt32);
/*N*/ String aTmpURL;
/*N*/
/*N*/ rStm >> nFormat;
--- openoffice.org.orig/connectivity/source/inc/dbase/DTable.hxx 2007-02-23 15:02:12.000000000 +0100
+++ openoffice.org/connectivity/source/inc/dbase/DTable.hxx 2007-02-23 15:02:38.000000000 +0100
@@ -92,7 +92,7 @@ namespace connectivity
struct DBFColumn { /* Feldbezeichner */
BYTE db_fnm[11]; /* Feldname */
BYTE db_typ; /* Feldtyp */
- ULONG db_adr; /* Feldadresse */
+ UINT32 db_adr; /* Feldadresse */
BYTE db_flng; /* Feldlaenge */
BYTE db_dez; /* Dezimalstellen fuer N */
BYTE db_frei2[14]; /* reserviert */
--- openoffice.org.orig/basctl/inc/basidesh.hxx 2007-01-24 18:24:39.000000000 +0100
+++ openoffice.org/basctl/inc/basidesh.hxx 2007-02-19 18:12:19.000000000 +0100
@@ -200,7 +200,7 @@ public:
void ExecuteBasic( SfxRequest& rReq );
void ExecuteDialog( SfxRequest& rReq );
- virtual BOOL HasUIFeature( ULONG nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
long CallBasicErrorHdl( StarBASIC* pBasic );
long CallBasicBreakHdl( StarBASIC* pBasic );
--- openoffice.org.orig/basctl/source/basicide/basides1.cxx 2007-01-02 16:49:14.000000000 +0100
+++ openoffice.org/basctl/source/basicide/basides1.cxx 2007-02-19 18:12:44.000000000 +0100
@@ -1113,15 +1113,15 @@ void __EXPORT BasicIDEShell::GetState(Sf
pCurWin->GetState( rSet );
}
-BOOL BasicIDEShell::HasUIFeature( ULONG nFeature )
+sal_Bool BasicIDEShell::HasUIFeature( sal_uInt32 nFeature )
{
- BOOL bResult = FALSE;
+ sal_Bool bResult = sal_False;
if ( (nFeature & BASICIDE_UI_FEATURE_SHOW_BROWSER) == BASICIDE_UI_FEATURE_SHOW_BROWSER )
{
// fade out (in) property browser in module (dialog) windows
if ( pCurWin && pCurWin->IsA( TYPE( DialogWindow ) ) && !pCurWin->IsReadOnly() )
- bResult = TRUE;
+ bResult = sal_True;
}
return bResult;
--- openoffice.org.orig/binfilter/bf_sfx2/source/control/sfx2_shell.cxx 2006-10-27 21:10:22.000000000 +0200
+++ openoffice.org/binfilter/bf_sfx2/source/control/sfx2_shell.cxx 2007-02-19 18:26:16.000000000 +0100
@@ -1383,9 +1383,9 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 (
/*N*/ return SFX_APP()->GetSlotPool( GetFrame() );
/*N*/ }
-/*N*/ BOOL SfxShell::HasUIFeature( ULONG )
+/*N*/ sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
/*N*/ {
-/*N*/ return FALSE;
+/*N*/ return sal_False;
/*N*/ }
/*N*/ long DispatcherUpdate_Impl( void* pObj, void* pArg )
--- openoffice.org.orig/binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx 2006-10-27 20:00:56.000000000 +0200
+++ openoffice.org/binfilter/bf_sch/source/ui/view/sch_viewshe4.cxx 2007-02-19 18:27:49.000000000 +0100
@@ -442,28 +442,28 @@ namespace binfilter {
-/** Returns TRUE if the corresponding feature is available,
+/** Returns sal_True if the corresponding feature is available,
eg it returns only true if the chart is three dimensional
and the 3d effect flyer is to be displayed
*/
-/*N*/ BOOL SchViewShell::HasUIFeature( ULONG nFeature )
+/*N*/ sal_Bool SchViewShell::HasUIFeature( sal_uInt32 nFeature )
/*N*/ {
/*N*/ switch( nFeature )
/*N*/ {
/*N*/ case SCH_UI_FEATURE_THREE_D:
/*N*/ if( pDocSh )
/*N*/ return pDocSh->GetDoc().IsReal3D();
-/*?*/ return FALSE;
+/*?*/ return sal_False;
/*N*/
/*N*/ case SCH_UI_FEATURE_OWN_DATA:
/*N*/ // ToDo: If chart is inside Calc/Writer using external data, FALSE
/*N*/ // should be returned. It currently works in a different way (hack)
-/*N*/ return TRUE;
+/*N*/ return sal_True;
/*N*/
/*?*/ default:
/*?*/ DBG_ERRORFILE( "Unknown UI Feature requested!" );
-/*?*/ return FALSE;
/*N*/ }
+/*?*/ return sal_False;
/*N*/ }
--- 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:
SfxDispatcher &GetDispatcher();
- virtual BOOL HasUIFeature( sal_uInt32 nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
virtual void ShowCursor( FASTBOOL bOn = TRUE );
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:
SfxDispatcher* GetDispatcher() const;
SfxViewFrame* GetFrame() const;
ResMgr* GetResMgr() const;
- virtual BOOL HasUIFeature( ULONG nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
void UIFeatureChanged();
// Items
--- openoffice.org.orig/binfilter/inc/bf_sch/viewshel.hxx 2006-10-28 04:50:58.000000000 +0200
+++ openoffice.org/binfilter/inc/bf_sch/viewshel.hxx 2007-02-19 18:23:41.000000000 +0100
@@ -174,7 +174,7 @@ public:
// drag and drop
- virtual BOOL HasUIFeature( ULONG nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
// SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
--- openoffice.org.orig/sfx2/inc/objface.hxx 2006-10-12 17:44:51.000000000 +0200
+++ openoffice.org/sfx2/inc/objface.hxx 2007-02-19 17:48:55.000000000 +0100
@@ -107,19 +107,19 @@ public:
const SfxInterface* GetRealInterfaceForSlot( const SfxSlot* ) const;
void RegisterObjectBar( USHORT, const ResId&, const String* pST=0 );
- void RegisterObjectBar( USHORT, const ResId&, ULONG nFeature, const String* pST=0 );
+ void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
void RegisterChildWindow( USHORT, BOOL bContext, const String* pST=0 );
- void RegisterChildWindow( USHORT, BOOL bContext, ULONG nFeature, const String* pST=0 );
+ void RegisterChildWindow( USHORT, BOOL bContext, sal_uInt32 nFeature, const String* pST=0 );
void RegisterStatusBar( const ResId& );
const ResId& GetObjectBarResId( USHORT nNo ) const;
USHORT GetObjectBarPos( USHORT nNo ) const;
- ULONG GetObjectBarFeature( USHORT nNo ) const;
+ sal_uInt32 GetObjectBarFeature( USHORT nNo ) const;
USHORT GetObjectBarCount() const;
void SetObjectBarPos( USHORT nPos, USHORT nId );
const String* GetObjectBarName( USHORT nNo ) const;
BOOL IsObjectBarVisible( USHORT nNo) const;
- ULONG GetChildWindowFeature( USHORT nNo ) const;
- ULONG GetChildWindowId( USHORT nNo ) const;
+ sal_uInt32 GetChildWindowFeature( USHORT nNo ) const;
+ sal_uInt32 GetChildWindowId( USHORT nNo ) const;
USHORT GetChildWindowCount() const;
void RegisterPopupMenu( const ResId& );
const ResId& GetPopupMenuResId() const;
@@ -164,7 +164,7 @@ public:
SfxIFConfig_Impl();
~SfxIFConfig_Impl();
BOOL Store(SvStream&);
- void RegisterObjectBar( USHORT, const ResId&, ULONG nFeature, const String* pST=0 );
+ void RegisterObjectBar( USHORT, const ResId&, sal_uInt32 nFeature, const String* pST=0 );
USHORT GetType();
};
#endif
--- openoffice.org.orig/sfx2/inc/shell.hxx 2006-06-20 00:04:31.000000000 +0200
+++ openoffice.org/sfx2/inc/shell.hxx 2007-02-19 18:34:07.000000000 +0100
@@ -255,7 +255,7 @@ public:
SfxDispatcher* GetDispatcher() const;
SfxViewFrame* GetFrame() const;
ResMgr* GetResMgr() const;
- virtual BOOL HasUIFeature( ULONG nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
void UIFeatureChanged();
// Items
--- openoffice.org.orig/sfx2/source/appl/workwin.cxx 2007-02-16 15:29:45.000000000 +0100
+++ openoffice.org/sfx2/source/appl/workwin.cxx 2007-02-19 12:23:40.000000000 +0100
@@ -2142,7 +2142,7 @@ void SfxWorkWindow::ConfigChild_Impl(Sfx
//--------------------------------------------------------------------
-void SfxWorkWindow::SetChildWindowVisible_Impl( ULONG lId, BOOL bEnabled, USHORT nMode )
+void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, BOOL bEnabled, USHORT nMode )
{
USHORT nInter = (USHORT) ( lId >> 16 );
USHORT nId = (USHORT) ( lId & 0xFFFF );
--- openoffice.org.orig/sfx2/source/control/dispatch.cxx 2006-11-01 19:26:15.000000000 +0100
+++ openoffice.org/sfx2/source/control/dispatch.cxx 2007-02-19 17:12:02.000000000 +0100
@@ -1829,7 +1829,7 @@ long SfxDispatcher::Update_Impl( sal_Boo
sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin )
{
- sal_uInt32 nHelpId = 0L;
+ sal_uInt32 nHelpId = 0;
SFX_APP();
SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame()->GetWorkWindow_Impl();
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
BOOL bVisible;
BOOL bContext;
String* pName;
- ULONG 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) :
nPos(n),
aResId(rResId.GetId(), rResId.GetResMgr()),
bVisible(bVis),
@@ -140,7 +140,7 @@ struct SfxInterface_Impl
}
};
-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 );
//====================================================================
@@ -432,14 +432,14 @@ void SfxInterface::RegisterObjectBar( US
}
-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 );
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 )
{
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
@@ -524,7 +524,7 @@ void SfxInterface::RegisterChildWindow(U
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);
pUI->bContext = bContext;
@@ -537,7 +537,7 @@ void SfxInterface::RegisterStatusBar(con
}
-ULONG SfxInterface::GetChildWindowId (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
{
if ( pGenoType )
{
@@ -554,13 +554,13 @@ ULONG SfxInterface::GetChildWindowId (US
USHORT nCWCount = pImpData->pChildWindows->Count();
DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
#endif
- ULONG nRet = (ULONG) (*pImpData->pChildWindows)[nNo]->aResId.GetId();
+ sal_uInt32 nRet = (*pImpData->pChildWindows)[nNo]->aResId.GetId();
if ( (*pImpData->pChildWindows)[nNo]->bContext )
- nRet += ( (ULONG) nClassId ) << 16;
+ nRet += sal_uInt32( nClassId ) << 16;
return nRet;
}
-ULONG SfxInterface::GetChildWindowFeature (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
{
if ( pGenoType )
{
@@ -577,8 +577,7 @@ ULONG SfxInterface::GetChildWindowFeatur
USHORT nCWCount = pImpData->pChildWindows->Count();
DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
#endif
- ULONG nRet = (ULONG) (*pImpData->pChildWindows)[nNo]->nFeature;
- return nRet;
+ return (*pImpData->pChildWindows)[nNo]->nFeature;
}
//--------------------------------------------------------------------
@@ -630,7 +629,7 @@ const String* SfxInterface::GetObjectBar
return (*pImpData->pObjectBars)[nNo]->pName;
}
-ULONG SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
+sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
{
BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
--- openoffice.org.orig/sfx2/source/control/shell.cxx 2006-10-12 17:51:54.000000000 +0200
+++ openoffice.org/sfx2/source/control/shell.cxx 2007-02-19 18:14:36.000000000 +0100
@@ -1293,9 +1294,9 @@ SfxObjectShell* SfxShell::GetObjectShell
//--------------------------------------------------------------------
-BOOL SfxShell::HasUIFeature( ULONG )
+sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
{
- return FALSE;
+ return sal_False;
}
long DispatcherUpdate_Impl( void*, void* pArg )
--- openoffice.org.orig/sfx2/source/inc/workwin.hxx 2007-02-16 15:29:39.000000000 +0100
+++ openoffice.org/sfx2/source/inc/workwin.hxx 2007-02-16 15:30:39.000000000 +0100
@@ -171,7 +171,7 @@ struct SfxChildWin_Impl
BOOL bEnable;
BOOL bDisabled;
- SfxChildWin_Impl( ULONG nID ) :
+ SfxChildWin_Impl( sal_uInt32 nID ) :
nSaveId((USHORT) (nID & 0xFFFF) ),
nInterfaceId((USHORT) (nID >> 16)),
nId(nSaveId),
@@ -375,7 +375,7 @@ public:
// Methoden f"ur ChildWindows
void UpdateChildWindows_Impl();
void ResetChildWindows_Impl();
- void SetChildWindowVisible_Impl( ULONG, BOOL, USHORT );
+ void SetChildWindowVisible_Impl( sal_uInt32, BOOL, USHORT );
void ToggleChildWindow_Impl(USHORT,BOOL);
BOOL HasChildWindow_Impl(USHORT);
BOOL KnowsChildWindow_Impl(USHORT);
--- openoffice.org.orig/sch/inc/viewshel.hxx 2007-01-24 18:14:14.000000000 +0100
+++ openoffice.org/sch/inc/viewshel.hxx 2007-02-19 18:22:46.000000000 +0100
@@ -199,7 +199,7 @@ public:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt, SchWindow* pWin );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, SchWindow* pWin );
- virtual BOOL HasUIFeature( ULONG nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
// SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
--- openoffice.org.orig/sch/source/ui/view/viewshe4.cxx 2007-01-24 18:14:41.000000000 +0100
+++ openoffice.org/sch/source/ui/view/viewshe4.cxx 2007-02-19 18:23:17.000000000 +0100
@@ -673,24 +673,24 @@ USHORT SchViewShell::PrepareClose(BOOL b
eg it returns only true if the chart is three dimensional
and the 3d effect flyer is to be displayed
*/
-BOOL SchViewShell::HasUIFeature( ULONG nFeature )
+sal_Bool SchViewShell::HasUIFeature( sal_uInt32 nFeature )
{
switch( nFeature )
{
case SCH_UI_FEATURE_THREE_D:
if( pDocSh )
return pDocSh->GetDoc().IsReal3D();
- return FALSE;
+ return sal_False;
case SCH_UI_FEATURE_OWN_DATA:
// ToDo: If chart is inside Calc/Writer using external data, FALSE
// should be returned. It currently works in a different way (hack)
- return TRUE;
+ return sal_True;
default:
DBG_ERRORFILE( "Unknown UI Feature requested!" );
- return FALSE;
}
+ return sal_False;
}
void SchViewShell::AllowSelectionChangeBroadcasts( sal_Bool bAllow )
--- openoffice.org.orig/sw/source/ui/inc/view.hxx 2007-01-24 18:20:23.000000000 +0100
+++ openoffice.org/sw/source/ui/inc/view.hxx 2007-02-19 18:35:01.000000000 +0100
@@ -435,7 +435,7 @@ public:
void GotFocus() const;
virtual SdrView* GetDrawView() const;
- virtual BOOL HasUIFeature( sal_uInt32 nFeature );
+ virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
virtual void ShowCursor( FASTBOOL bOn = TRUE );
virtual ErrCode DoVerb( long nVerb );
--- openoffice.org/tools/inc/gen.hxx 2005-09-09 15:41:09.000000000 +0200
+++ openoffice.org.orig/tools/inc/gen.hxx 2007-02-26 17:08:21.000000000 +0100
@@ -254,8 +254,9 @@ inline Size::Size( long nWidth, long nHe
// - Range -
// ---------
-#define RANGE_MIN ((long)0x80000000L)
-#define RANGE_MAX 0x7FFFFFFFL
+#include <limits.h>
+#define RANGE_MIN LONG_MIN
+#define RANGE_MAX LONG_MAX
class Range : public Pair
{
@@ -302,8 +302,8 @@ inline void Range::Justify()
// - Selection -
// -------------
-#define SELECTION_MIN ((long)0x80000000L)
-#define SELECTION_MAX 0x7FFFFFFFL
+#define SELECTION_MIN LONG_MIN
+#define SELECTION_MAX LONG_MAX
class Selection : public Pair
{
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- .cvsignore 15 Sep 2006 09:16:15 -0000 1.117
+++ .cvsignore 6 Mar 2007 15:48:46 -0000 1.118
@@ -184,3 +184,4 @@
OOD680_m2.tar.bz2
OOD680_m3.tar.bz2
OOD680_m4.tar.bz2
+OOD680_m5.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.931
retrieving revision 1.932
diff -u -r1.931 -r1.932
--- openoffice.org.spec 23 Feb 2007 09:03:28 -0000 1.931
+++ openoffice.org.spec 6 Mar 2007 15:48:46 -0000 1.932
@@ -1,6 +1,6 @@
%define oootag OOD680
%define ooomilestone 5
-%define rh_rpm_release 5.14
+%define rh_rpm_release 5.15
# gcc#19664#
%define stlvisibilityfcked 1
@@ -160,7 +160,8 @@
Patch92: workspace.fwk55.patch
Patch93: openoffice.org-2.2.0.rh228002.escape.shell.patch
Patch94: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch95: openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch
+Patch95: workspace.sixtyfour11.patch
+Patch96: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -1055,7 +1056,8 @@
%patch92 -p1 -b .workspace.fwk55.patch
%patch93 -p1 -b .rh228002.escape.shell.patch
%patch94 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch95 -p1 -b .ooo74771.svtools.binfilter.patch
+%patch95 -p1 -b .workspace.sixtyfour11.patch
+%patch96 -p1 -b .ooo75167.framework.workspacerestore.patch
tar xzf %{SOURCE1}
@@ -2581,8 +2583,11 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Thu Mar 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.15
+- rhbz#206268/ooo#75167 session restore back to correct workspace
+
* Thu Feb 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.14
-- add openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch
+- add workspace.sixtyfour11.patch
* Fri Feb 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.11
- Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
--- openoffice.org-2.2.0.ooo74771.svtools.binfilter.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch, NONE, 1.1 openoffice.org.spec, 1.1090, 1.1091
- Next message (by thread): rpms/libXdamage/devel .cvsignore, 1.7, 1.8 libXdamage.spec, 1.15, 1.16 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list