[ooo-build-commit] .: 2 commits - patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 15 04:57:45 PDT 2010
patches/dev300/apply | 12 -
patches/dev300/default-no-registration-menu-sd.diff | 32 --
patches/dev300/default-no-registration-menu.diff | 225 --------------------
patches/dev300/default-no-registration.diff | 26 --
patches/dev300/sw-auto-scrollbars-1.diff | 22 -
patches/dev300/sw-auto-scrollbars-2.diff | 42 ---
patches/dev300/sw-auto-scrollbars.diff | 97 --------
7 files changed, 456 deletions(-)
New commits:
commit fefb3745acf307a7e4cbdb483b93aa6940d5011e
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 15 11:05:00 2010 +0200
Auto scrollbars in Writer migrated.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0de87b1..89c02bd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3169,9 +3169,6 @@ framework-netbook.diff, rodo
vcl-netbook-export-small-screen-mode.diff, rodo
framework-netbook-use-small-screen-mode.diff, rodo
-sw-auto-scrollbars.diff, rodo
-sw-auto-scrollbars-1.diff, rodo
-sw-auto-scrollbars-2.diff, rodo
[ MacOSXOnly ]
SectionOwner => thorsten
diff --git a/patches/dev300/sw-auto-scrollbars-1.diff b/patches/dev300/sw-auto-scrollbars-1.diff
deleted file mode 100644
index 791d3cb..0000000
--- a/patches/dev300/sw-auto-scrollbars-1.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- sw/source/ui/uiview/view.cxx | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
-index 496e683..3320da3 100644
---- sw/source/ui/uiview/view.cxx
-+++ sw/source/ui/uiview/view.cxx
-@@ -1108,6 +1108,10 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
- pDocSh->EnableSetModified( sal_True );
- InvalidateBorder();
-
-+ if( !pHScrollbar->IsVisible( TRUE ) )
-+ ShowHScrollbar( FALSE );
-+ if( !pVScrollbar->IsVisible( TRUE ) )
-+ ShowVScrollbar( FALSE );
- }
-
- /*--------------------------------------------------------------------
---
-1.7.0.1
-
diff --git a/patches/dev300/sw-auto-scrollbars-2.diff b/patches/dev300/sw-auto-scrollbars-2.diff
deleted file mode 100644
index 4ebe0a1..0000000
--- a/patches/dev300/sw-auto-scrollbars-2.diff
+++ /dev/null
@@ -1,42 +0,0 @@
----
- sw/source/ui/uiview/view.cxx | 3 +++
- sw/source/ui/uiview/viewmdi.cxx | 2 --
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
-index 3320da3..0e3d55e 100644
---- sw/source/ui/uiview/view.cxx
-+++ sw/source/ui/uiview/view.cxx
-@@ -1112,6 +1112,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
- ShowHScrollbar( FALSE );
- if( !pVScrollbar->IsVisible( TRUE ) )
- ShowVScrollbar( FALSE );
-+
-+ GetViewFrame()->GetWindow().AddChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
- }
-
- /*--------------------------------------------------------------------
-@@ -1121,6 +1123,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
-
- SwView::~SwView()
- {
-+ GetViewFrame()->GetWindow().RemoveChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
- delete mpPostItMgr;
- // --> OD 2009-03-10 #i100035#
- mpPostItMgr = 0;
-diff --git sw/source/ui/uiview/viewmdi.cxx sw/source/ui/uiview/viewmdi.cxx
-index 2394c11..1ff98dd 100644
---- sw/source/ui/uiview/viewmdi.cxx
-+++ sw/source/ui/uiview/viewmdi.cxx
-@@ -359,8 +359,6 @@ int SwView::_CreateScrollbar( BOOL bHori )
-
- (*ppScrollbar)->SetAuto( TRUE );
-
-- pMDI->AddChildEventListener( LINK( this, SwView, WindowChildEventListener ));
--
- if(GetWindow())
- InvalidateBorder();
-
---
-1.7.0.1
-
diff --git a/patches/dev300/sw-auto-scrollbars.diff b/patches/dev300/sw-auto-scrollbars.diff
deleted file mode 100644
index ba470e0..0000000
--- a/patches/dev300/sw-auto-scrollbars.diff
+++ /dev/null
@@ -1,97 +0,0 @@
----
- sw/source/ui/inc/view.hxx | 1 +
- sw/source/ui/uiview/viewmdi.cxx | 33 +++++++++++++++++++++++++++++++++
- sw/source/ui/uiview/viewport.cxx | 5 +++--
- 3 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git sw/source/ui/inc/view.hxx sw/source/ui/inc/view.hxx
-index 039f9ff..08e27ac 100644
---- sw/source/ui/inc/view.hxx
-+++ sw/source/ui/inc/view.hxx
-@@ -330,6 +330,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
- SW_DLLPRIVATE int _CreateScrollbar( BOOL bHori );
- SW_DLLPRIVATE DECL_LINK( ScrollHdl, SwScrollbar * );
- SW_DLLPRIVATE DECL_LINK( EndScrollHdl, SwScrollbar * );
-+ SW_DLLPRIVATE DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
- SW_DLLPRIVATE BOOL UpdateScrollbars();
- SW_DLLPRIVATE void CalcVisArea( const Size &rPixelSz );
-
-diff --git sw/source/ui/uiview/viewmdi.cxx sw/source/ui/uiview/viewmdi.cxx
-index f8212d8..2394c11 100644
---- sw/source/ui/uiview/viewmdi.cxx
-+++ sw/source/ui/uiview/viewmdi.cxx
-@@ -308,6 +308,35 @@ void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly )
- * Scrollbar - Handler
- */
-
-+IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent )
-+{
-+ DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
-+ if ( pEvent && pEvent->ISA( VclWindowEvent ) )
-+ {
-+ VclWindowEvent *pVclEvent = static_cast< VclWindowEvent * >( pEvent );
-+ DBG_ASSERT( pVclEvent->GetWindow(), "Window???" );
-+ Window* pChildWin = static_cast< Window* >( pVclEvent->GetData() );
-+
-+ switch ( pVclEvent->GetId() )
-+ {
-+ case VCLEVENT_WINDOW_HIDE:
-+ if( pChildWin == pHScrollbar )
-+ ShowHScrollbar( FALSE );
-+ else if( pChildWin == pVScrollbar )
-+ ShowVScrollbar( FALSE );
-+ break;
-+ case VCLEVENT_WINDOW_SHOW:
-+ if( pChildWin == pHScrollbar )
-+ ShowHScrollbar( TRUE );
-+ else if( pChildWin == pVScrollbar )
-+ ShowVScrollbar( TRUE );
-+ break;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
- int SwView::_CreateScrollbar( BOOL bHori )
- {
- Window *pMDI = &GetViewFrame()->GetWindow();
-@@ -328,6 +357,10 @@ int SwView::_CreateScrollbar( BOOL bHori )
-
- (*ppScrollbar)->EnableDrag( TRUE );
-
-+ (*ppScrollbar)->SetAuto( TRUE );
-+
-+ pMDI->AddChildEventListener( LINK( this, SwView, WindowChildEventListener ));
-+
- if(GetWindow())
- InvalidateBorder();
-
-diff --git sw/source/ui/uiview/viewport.cxx sw/source/ui/uiview/viewport.cxx
-index 579aea6..06cc49b 100644
---- sw/source/ui/uiview/viewport.cxx
-+++ sw/source/ui/uiview/viewport.cxx
-@@ -1136,6 +1136,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
- {
- bShowH = pVOpt->IsViewHScrollBar();
- bShowV = pVOpt->IsViewVScrollBar();
-+ bAuto = bHAuto = TRUE;
- break;
- }
- }
-@@ -1157,10 +1158,10 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
- {
- bShowH = bShowV = bHAuto = bAuto = FALSE;
- }
-- if(pHScrollbar->IsVisible(FALSE) != bShowH)
-+ if(pHScrollbar->IsVisible(FALSE) != bShowH && !bHAuto)
- ShowHScrollbar(bShowH);
- pHScrollbar->SetAuto( bHAuto );
-- if(pVScrollbar->IsVisible(FALSE) != bShowV)
-+ if(pVScrollbar->IsVisible(FALSE) != bShowV && !bAuto)
- ShowVScrollbar(bShowV);
- pVScrollbar->SetAuto(bAuto);
-
---
-1.7.0.1
-
commit 42c21086ca1ef85f6bfc52a780d35ea758c297e0
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 15 10:54:54 2010 +0200
Migrate the 'no registration' patches.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ed0ca7f..0de87b1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1062,15 +1062,6 @@ recovery-report.diff, i#53531, martink
# don't throw up the style dialog on 1st run
default-no-style-dialog.diff, michael
-# pestering people serves no useful purpose
-default-no-registration.diff, michael
-
-# no Help->registration dialog by default
-default-no-registration-menu.diff, michael
-
-# CR line endings again...
-default-no-registration-menu-sd.diff, michael/kohei
-
# disable checkdeliver, no point in doing that, especially when we
# hardlink to solver instead of copying :-)
disable-checkdeliver.diff, jholesov
diff --git a/patches/dev300/default-no-registration-menu-sd.diff b/patches/dev300/default-no-registration-menu-sd.diff
deleted file mode 100644
index 792ad8a..0000000
--- a/patches/dev300/default-no-registration-menu-sd.diff
+++ /dev/null
@@ -1,32 +0,0 @@
----
- sd/uiconfig/sdraw/menubar/menubar.xml | 1 -
- sd/uiconfig/simpress/menubar/menubar.xml | 1 -
- 2 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml
-index c03c6ce..da9c2df 100644
---- sd/uiconfig/sdraw/menubar/menubar.xml
-+++ sd/uiconfig/sdraw/menubar/menubar.xml
-@@ -324,7 +324,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
-index bf66999..4fb01e3 100755
---- sd/uiconfig/simpress/menubar/menubar.xml
-+++ sd/uiconfig/simpress/menubar/menubar.xml
-@@ -298,7 +298,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
---
-1.7.0.1
-
diff --git a/patches/dev300/default-no-registration-menu.diff b/patches/dev300/default-no-registration-menu.diff
deleted file mode 100644
index 329fa14..0000000
--- a/patches/dev300/default-no-registration-menu.diff
+++ /dev/null
@@ -1,225 +0,0 @@
----
- basctl/uiconfig/basicide/menubar/menubar.xml | 1 -
- chart2/uiconfig/menubar/menubar.xml | 1 -
- dbaccess/uiconfig/dbapp/menubar/menubar.xml | 1 -
- dbaccess/uiconfig/dbquery/menubar/menubar.xml | 1 -
- dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 1 -
- dbaccess/uiconfig/dbtable/menubar/menubar.xml | 1 -
- framework/source/services/backingwindow.cxx | 8 --------
- framework/uiconfig/startmodule/menubar/menubar.xml | 1 -
- reportdesign/uiconfig/dbreport/menubar/menubar.xml | 1 -
- sc/uiconfig/scalc/menubar/menubar.xml | 1 -
- starmath/uiconfig/smath/menubar/menubar.xml | 1 -
- svx/inc/globlmn_tmpl.hrc | 4 ----
- sw/uiconfig/sglobal/menubar/menubar.xml | 1 -
- sw/uiconfig/sweb/menubar/menubar.xml | 1 -
- sw/uiconfig/swriter/menubar/menubar.xml | 1 -
- 15 files changed, 0 insertions(+), 25 deletions(-)
-
-diff --git basctl/uiconfig/basicide/menubar/menubar.xml basctl/uiconfig/basicide/menubar/menubar.xml
-index 2079c29..9a40215 100644
---- basctl/uiconfig/basicide/menubar/menubar.xml
-+++ basctl/uiconfig/basicide/menubar/menubar.xml
-@@ -82,7 +82,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git chart2/uiconfig/menubar/menubar.xml chart2/uiconfig/menubar/menubar.xml
-index c609d2d..4c3c12c 100644
---- chart2/uiconfig/menubar/menubar.xml
-+++ chart2/uiconfig/menubar/menubar.xml
-@@ -148,7 +148,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git dbaccess/uiconfig/dbapp/menubar/menubar.xml dbaccess/uiconfig/dbapp/menubar/menubar.xml
-index baafddc..e0e15ed 100644
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
-@@ -134,7 +134,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git dbaccess/uiconfig/dbquery/menubar/menubar.xml dbaccess/uiconfig/dbquery/menubar/menubar.xml
-index a3a9652..715b043 100644
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
-@@ -75,7 +75,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-index 542395e..0bb81c0 100644
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-@@ -58,7 +58,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git dbaccess/uiconfig/dbtable/menubar/menubar.xml dbaccess/uiconfig/dbtable/menubar/menubar.xml
-index 18bdde9..d132309 100644
---- dbaccess/uiconfig/dbtable/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
-@@ -59,7 +59,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git framework/source/services/backingwindow.cxx framework/source/services/backingwindow.cxx
-index 0252a06..d9247c7 100644
---- framework/source/services/backingwindow.cxx
-+++ framework/source/services/backingwindow.cxx
-@@ -185,7 +185,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
- }
-
- String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
-- String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
- String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
- String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
-
-@@ -214,12 +213,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
- maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) );
- maToolbox.ShowItem( nItemId_Extensions );
-
-- maToolbox.InsertItem( nItemId_Reg, Image() );
-- maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText );
-- maToolbox.SetItemText( nItemId_Reg, aRegHelpText );
-- maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) );
-- maToolbox.ShowItem( nItemId_Reg );
--
- maToolbox.InsertItem( nItemId_Info, Image() );
- maToolbox.SetItemText( nItemId_Info, aInfoHelpText );
- maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText );
-@@ -431,7 +424,6 @@ void BackingWindow::initBackground()
- maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT ) );
- }
- maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId( BMP_BACKING_EXT ) ) );
-- maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId( BMP_BACKING_REG ) ) );
- maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO ) ) );
- maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId( BMP_BACKING_TPLREP ) ) );
-
-diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
-index b5e52e7..e9a0f33 100644
---- framework/uiconfig/startmodule/menubar/menubar.xml
-+++ framework/uiconfig/startmodule/menubar/menubar.xml
-@@ -75,7 +75,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
-index 8fa04f4..a0de35e 100644
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
-@@ -414,7 +414,6 @@
- <menu:menuitem menu:id=".uno:HelperDialog"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
-index 09b3502..67ef111 100644
---- sc/uiconfig/scalc/menubar/menubar.xml
-+++ sc/uiconfig/scalc/menubar/menubar.xml
-@@ -446,7 +446,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
-index 63bf72c..dc3af92 100644
---- starmath/uiconfig/smath/menubar/menubar.xml
-+++ starmath/uiconfig/smath/menubar/menubar.xml
-@@ -113,7 +113,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git svx/inc/globlmn_tmpl.hrc svx/inc/globlmn_tmpl.hrc
-index 22dc0b1..2a3c5c4 100644
---- svx/inc/globlmn_tmpl.hrc
-+++ svx/inc/globlmn_tmpl.hrc
-@@ -1110,10 +1110,6 @@
- };\
- MenuItem\
- {\
-- ITEM_HELP_ONLINE_REGISTRATION\
-- };\
-- MenuItem\
-- {\
- Separator = TRUE ; \
- };\
- MenuItem\
-diff --git sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
-index c3bef67..8945195 100644
---- sw/uiconfig/sglobal/menubar/menubar.xml
-+++ sw/uiconfig/sglobal/menubar/menubar.xml
-@@ -453,7 +453,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
-index 4b482e3..a99cdee 100644
---- sw/uiconfig/sweb/menubar/menubar.xml
-+++ sw/uiconfig/sweb/menubar/menubar.xml
-@@ -382,7 +382,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
-diff --git sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
-index fb10ca6..98eeddd 100644
---- sw/uiconfig/swriter/menubar/menubar.xml
-+++ sw/uiconfig/swriter/menubar/menubar.xml
-@@ -456,7 +456,6 @@
- <menu:menuitem menu:id=".uno:ExtendedHelp"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:HelpSupport"/>
-- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:About"/>
- </menu:menupopup>
---
-1.7.0.1
-
diff --git a/patches/dev300/default-no-registration.diff b/patches/dev300/default-no-registration.diff
deleted file mode 100644
index 6ccb5d6..0000000
--- a/patches/dev300/default-no-registration.diff
+++ /dev/null
@@ -1,26 +0,0 @@
----
- .../registry/data/org/openoffice/Office/Jobs.xcu | 9 ---------
- 1 files changed, 0 insertions(+), 9 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/Office/Jobs.xcu officecfg/registry/data/org/openoffice/Office/Jobs.xcu
-index 4a9c56c..2e2fdc4 100644
---- officecfg/registry/data/org/openoffice/Office/Jobs.xcu
-+++ officecfg/registry/data/org/openoffice/Office/Jobs.xcu
-@@ -35,14 +35,5 @@
- </node>
- </node>
- <node oor:name="Events">
-- <node oor:name="onFirstVisibleTask" oor:op="fuse">
-- <node oor:name="JobList">
-- <node oor:name="RegistrationRequest" oor:op="replace">
-- <prop oor:name="UserTime">
-- <value>2003-01-01T00:00:00+00:01</value>
-- </prop>
-- </node>
-- </node>
-- </node>
- </node>
- </oor:component-data>
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list