[ooo-build-commit] .: 3 commits - patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Mon Aug 9 07:41:41 PDT 2010
patches/dev300/apple-remote-update.diff | 67 --------------
patches/dev300/apply | 4
patches/dev300/cws-impressmedia01-slotparams-fix.diff | 85 ++++++++++++++++++
patches/dev300/transogl-crossplatform.diff | 54 ++---------
patches/dev300/writer-doc-comparison.diff | 35 +++++--
5 files changed, 126 insertions(+), 119 deletions(-)
New commits:
commit 2b5b618a90af2c6cc13b1ddf6b1f7e6b79bbf09d
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue May 18 14:20:51 2010 +0200
Moved rsid xml attributes to officeooo experimental NS
* patches/dev300/writer-doc-comparison.diff: the code adds two new
attributes to odf, rsid and paragraph-rsid. moved those to the
http://openoffice.org/2009/office experimental namespace, and
made the whole storing conditional to "odf next" mode (the
default). Checked that older versions don't barf on the unknown
attrs.
cherry-picked from git e6d597a421e39ab63624c07186715d26697e38b4
diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index f92827e..319e443 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -2223,6 +2223,25 @@ index 0b27f6d..4e6ac23 100644
/* RES_PARATR_LIST_ID */ 0, // new
/* RES_PARATR_LIST_LEVEL */ 0, // new
+diff --git sw/source/filter/xml/xmlexp.cxx sw/source/filter/xml/xmlexp.cxx
+index f2ec2a7..17010e2 100644
+--- sw/source/filter/xml/xmlexp.cxx
++++ sw/source/filter/xml/xmlexp.cxx
+@@ -240,6 +240,14 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
+ if( (getExportFlags() & (EXPORT_FONTDECLS|EXPORT_STYLES|
+ EXPORT_MASTERSTYLES|EXPORT_CONTENT)) != 0 )
+ {
++ if( getDefaultVersion() == SvtSaveOptions::ODFVER_LATEST )
++ {
++ _GetNamespaceMap().Add(
++ GetXMLToken(XML_NP_OFFICE_EXT),
++ GetXMLToken(XML_N_OFFICE_EXT),
++ XML_NAMESPACE_OFFICE_EXT);
++ }
++
+ GetTextParagraphExport()->SetBlockMode( bBlock );
+
+ const SfxPoolItem* pItem;
diff --git sw/source/ui/app/appopt.cxx sw/source/ui/app/appopt.cxx
index 9f3008c..23f9b14 100644
--- sw/source/ui/app/appopt.cxx
@@ -2977,10 +2996,10 @@ index 87e8bf1..422f82c 100644
MT_E( "CharUnderlineHasColor", STYLE, TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, CTF_UNDERLINE_HASCOLOR ),
// RES_CHRATR_WEIGHT
MT_E( "CharWeight", FO, FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
-+ // RES_CHRATR_RSID
-+ MT_E( "Rsid", TEXT, RSID, XML_TYPE_HEX, 0 ),
-+ // RES_PARATR_RSID
-+ MT_E( "ParRsid", TEXT, PARRSID, XML_TYPE_HEX, 0 ),
++ // RES_CHRATR_RSID
++ { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
++ // RES_PARATR_RSID
++ { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
// RES_CHRATR_WORDLINEMODE
MT_E( "CharWordMode", STYLE, TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
MT_E( "CharWordMode", STYLE, TEXT_OVERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
@@ -2988,10 +3007,10 @@ index 87e8bf1..422f82c 100644
MT_E( "CharUnderlineHasColor", STYLE, TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, CTF_UNDERLINE_HASCOLOR ),
// RES_CHRATR_WEIGHT
MT_E( "CharWeight", FO, FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
-+ // RES_CHRATR_RSID
-+ MT_E( "Rsid", TEXT, RSID, XML_TYPE_HEX, 0 ),
-+ // RES_PARATR_RSID
-+ MT_E( "ParRsid", TEXT, PARRSID, XML_TYPE_HEX, 0 ),
++ // RES_CHRATR_RSID
++ { "Rsid", sizeof("Rsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_RSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
++ // RES_PARATR_RSID
++ { "ParRsid", sizeof("ParRsid")-1, XML_NAMESPACE_OFFICE_EXT, XML_PARRSID, XML_TYPE_HEX|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_LATEST },
// RES_CHRATR_WORDLINEMODE
MT_E( "CharWordMode", STYLE, TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
MT_E( "CharWordMode", STYLE, TEXT_OVERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
commit ba5684b3365d6a536aaed9f0449125070949f0af
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Mon May 17 22:19:06 2010 +0200
Fix crash due to missing slot call parameter
* patches/dev300/apply: added below patch
* patches/dev300/cws-impressmedia01-slotparams-fix.diff: make sure
SID_INSERT_AVMEDIA is executed with two parameters given. This
patch also goes all the way to make gallery sounds to be embedded,
too - avoiding the nasty surprises of privately-added gallery items
suddenly missing on the target machine. Fixes n#597691.
cherry-picked from 3bbc9c350a306ff88146c3b9c0ce71ea4c8222a0
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fbe3cde..14abf2d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3542,7 +3542,7 @@ transogl-crossplatform.diff, ericb
# embed generic media files inside odf docs, 1st part
# FIXME: svx-sound.diff depends on this diff
# FIXME dev300-m77 cws-impressmedia01-backport.diff, i#83753, thorsten #grab the new version
-
+# FIXME dev300-m77 cws-impressmedia01-slotparams-fix.diff, n#597691, thorsten
# FIXME dev300-m77 cws-impressmedia01-crash-fix.diff, n#588570, thorsten #update
[ Fixes ]
diff --git a/patches/dev300/cws-impressmedia01-slotparams-fix.diff b/patches/dev300/cws-impressmedia01-slotparams-fix.diff
new file mode 100644
index 0000000..1a4f2df
--- /dev/null
+++ b/patches/dev300/cws-impressmedia01-slotparams-fix.diff
@@ -0,0 +1,85 @@
+Give additional slot call parameters for SID_INSERT_AVMEDIA
+
+From: Thorsten Behrens <tbehrens at novell.com>
+
+
+---
+
+ avmedia/source/framework/mediaplayer.cxx | 8 +++++++-
+ sc/source/ui/view/tabvwsh9.cxx | 4 +++-
+ sd/source/ui/view/drviews9.cxx | 4 +++-
+ sw/source/ui/shells/basesh.cxx | 4 +++-
+ 4 files changed, 16 insertions(+), 4 deletions(-)
+
+
+diff --git avmedia/source/framework/mediaplayer.cxx avmedia/source/framework/mediaplayer.cxx
+index 1042c8e..8f172ff 100644
+--- avmedia/source/framework/mediaplayer.cxx
++++ avmedia/source/framework/mediaplayer.cxx
+@@ -36,6 +36,7 @@
+ #include "helpids.hrc"
+
+ #include <svtools/stritem.hxx>
++#include <svtools/eitem.hxx>
+ #include <sfx2/app.hxx>
+ #include <sfx2/sfxsids.hrc>
+ #include <sfx2/bindings.hxx>
+@@ -162,7 +163,12 @@ void MediaFloater::dispatchCurrentURL()
+ if( pDispatcher )
+ {
+ const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, getURL() );
+- pDispatcher->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_RECORD, &aMediaURLItem, 0L );
++ const SfxBoolItem aLinkFlagItem( FN_PARAM_1, FALSE );
++ pDispatcher->Execute( SID_INSERT_AVMEDIA,
++ SFX_CALLMODE_RECORD,
++ &aMediaURLItem,
++ &aLinkFlagItem,
++ 0L );
+ }
+ }
+
+diff --git sc/source/ui/view/tabvwsh9.cxx sc/source/ui/view/tabvwsh9.cxx
+index 88ebdc9..8ea0417 100644
+--- sc/source/ui/view/tabvwsh9.cxx
++++ sc/source/ui/view/tabvwsh9.cxx
+@@ -154,7 +154,9 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq )
+ if ( pGal )
+ {
+ const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
+- GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
++ const SfxBoolItem aLinkFlagItem( FN_PARAM_1, FALSE );
++ GetViewFrame()->GetDispatcher()->Execute(
++ SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, &aLinkFlagItem, 0L );
+ }
+ }
+ }
+diff --git sd/source/ui/view/drviews9.cxx sd/source/ui/view/drviews9.cxx
+index 57064c6..0f8dd8c 100644
+--- sd/source/ui/view/drviews9.cxx
++++ sd/source/ui/view/drviews9.cxx
+@@ -220,7 +220,9 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
+ else if( nFormats & SGA_FORMAT_SOUND )
+ {
+ const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
+- GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
++ const SfxBoolItem aLinkFlagItem( FN_PARAM_1, FALSE );
++ GetViewFrame()->GetDispatcher()->Execute(
++ SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, &aLinkFlagItem, 0L );
+ }
+
+ GetDocSh()->SetWaitCursor( FALSE );
+diff --git sw/source/ui/shells/basesh.cxx sw/source/ui/shells/basesh.cxx
+index a32d3e1..c891e53 100644
+--- sw/source/ui/shells/basesh.cxx
++++ sw/source/ui/shells/basesh.cxx
+@@ -776,7 +776,9 @@ void SwBaseShell::Execute(SfxRequest &rReq)
+ else if(!rSh.IsSelFrmMode() && SGA_FORMAT_SOUND & ((SfxUInt32Item*)pItem)->GetValue())
+ {
+ const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
+- GetView().GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
++ const SfxBoolItem aLinkFlagItem( FN_PARAM_1, FALSE );
++ GetView().GetViewFrame()->GetDispatcher()->Execute(
++ SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, &aLinkFlagItem, 0L );
+ /*
+ String sURL( pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ) );
+ String sLabel( pGal->GetURL().getBase() );
commit dcc3849cd3b2a2f80d950173495156dd19422de2
Author: Thorsten <thb at thorstens-computer.local>
Date: Fri May 14 14:35:21 2010 +0200
Fix mac build
D patches/dev300/apple-remote-update.diff: patch is upstream
M patches/dev300/apply: removed apple-remote fix
M patches/dev300/transogl-crossplatform.diff: adapted to
copyright header changes
cherry-picked from 12071dc0341f24d661fd71c8a82df5ed7dbd8a3e
diff --git a/patches/dev300/apple-remote-update.diff b/patches/dev300/apple-remote-update.diff
deleted file mode 100644
index 2ab6146..0000000
--- a/patches/dev300/apple-remote-update.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -r 5c6b8c37653f apple_remote/AppleRemote.m
---- apple_remote/AppleRemote.m Tue Dec 15 14:27:37 2009 +0100
-+++ apple_remote/AppleRemote.m Tue Dec 15 19:18:56 2009 +0100
-@@ -43,6 +43,10 @@
- #define NSAppKitVersionNumber10_4 824
- #endif
-
-+#ifndef NSAppKitVersionNumber10_5
-+ #define NSAppKitVersionNumber10_5 949
-+#endif
-+
- @implementation AppleRemote
-
- + (const char*) remoteControlDeviceName {
-@@ -52,7 +56,12 @@
- - (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping {
-
- // TODO : avoid such magics
-- if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
-+ if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4)
-+ {
-+ #ifdef DEBUG
-+ NSLog( @"setting 10.4 cookies" );
-+ #endif
-+
- // 10.4.x Tiger
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"14_12_11_6_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"14_13_11_6_"];
-@@ -65,7 +74,12 @@
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"18_14_6_18_14_6_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
-- } else {
-+ }
-+ else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 )
-+ {
-+ #ifdef DEBUG
-+ NSLog( @"setting 10.5 cookies" );
-+ #endif
- // 10.5.x Leopard
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"31_29_28_19_18_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"31_30_28_19_18_"];
-@@ -78,6 +92,24 @@
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"31_19_18_31_19_18_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"35_31_19_18_35_31_19_18_"];
- [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
-+ }
-+ else
-+ {
-+ #ifdef DEBUG
-+ NSLog( @"setting 10.6 cookies" );
-+ #endif
-+ // 10.6.x Snow Leopard
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus] forKey:@"33_31_30_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus] forKey:@"33_32_30_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"33_22_21_20_2_33_22_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"33_23_21_20_2_33_23_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"33_24_21_20_2_33_24_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"33_25_21_20_2_33_25_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"33_21_20_13_12_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"33_21_20_2_33_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold] forKey:@"37_33_21_20_2_37_33_21_20_2_"];
-+ [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"];
- }
- }
-
diff --git a/patches/dev300/apply b/patches/dev300/apply
index bbcdd94..fbe3cde 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2310,8 +2310,6 @@ novell-win32-msi-patchability.diff, tml
[ MacOSXOnly ]
SectionOwner => thorsten
-# backport from 3.3, enables apple remote for newer systems
-apple-remote-update.diff, i#107648, thorsten
sfx2-global-scope-fix.diff, thorsten
cws-kohei03-sc-macfix.diff, thorsten
diff --git a/patches/dev300/transogl-crossplatform.diff b/patches/dev300/transogl-crossplatform.diff
index ee1ee11..44efb0f 100644
--- a/patches/dev300/transogl-crossplatform.diff
+++ b/patches/dev300/transogl-crossplatform.diff
@@ -98,17 +98,8 @@ index fbbb575..e2cb301 100644
mkdir: %_DEST%\inc%_EXT%\boost\mpl
mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_
mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config
-@@ -83,6 +90,8 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
- mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
- mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
- mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
-+mkdir: %_DEST%\inc%_EXT%\boost\range
-+mkdir: %_DEST%\inc%_EXT%\boost\range\detail
- mkdir: %_DEST%\inc%_EXT%\boost\spirit
- mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
- mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
@@ -306,8 +315,18 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
- ..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
+ ..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
+..\%__SRC%\misc\build\boost_1_39_0\boost\algorithm\string\* %_DEST%\inc%_EXT%\boost\algorithm\string\
@@ -266,18 +257,15 @@ deleted file mode 100644
index a144790..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
+++ /dev/null
-@@ -1,143 +0,0 @@
+@@ -1,140 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: $
-- * $Revision: $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -415,18 +403,15 @@ deleted file mode 100644
index 049c71f..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.hxx
+++ /dev/null
-@@ -1,71 +0,0 @@
+@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: $
-- * $Revision: $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -492,18 +477,15 @@ deleted file mode 100644
index de63a1b..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
+++ /dev/null
-@@ -1,1318 +0,0 @@
+@@ -1,1315 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: OGLTrans_TransitionImpl.cxx,v $
-- * $Revision: 1.5 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1816,18 +1798,15 @@ deleted file mode 100644
index 2aa0529..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.hxx
+++ /dev/null
-@@ -1,509 +0,0 @@
+@@ -1,506 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: OGLTrans_TransitionImpl.hxx,v $
-- * $Revision: 1.5 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2331,18 +2310,15 @@ deleted file mode 100644
index 01d513c..0000000
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl.cxx
+++ /dev/null
-@@ -1,1487 +0,0 @@
+@@ -1,1484 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
-- * Copyright 2008 by Sun Microsystems, Inc.
+- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
-- * $RCSfile: OGLTrans_TransitionerImpl.cxx,v $
-- * $Revision: 1.6 $
-- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -7487,19 +7463,15 @@ deleted file mode 100644
index 6353b2d..0000000
--- slideshow/source/engine/OGLTrans/makefile.mk
+++ /dev/null
-@@ -1,84 +0,0 @@
+@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
--# Copyright 2008 by Sun Microsystems, Inc.
+-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
--# $RCSfile: makefile.mk,v $
--#
--# $Revision: 1.5 $
--#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
More information about the ooo-build-commit
mailing list