[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply           |    6 --
 patches/dev300/go-oo-team.diff |   84 -----------------------------------------
 2 files changed, 1 insertion(+), 89 deletions(-)

New commits:
commit 65554ca475cb5bbe644fb29d0a6c46bdfe29e357
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 13 17:50:36 2011 +0300

    Kill the go-oo-team.diff "Easter Egg", outdated

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1386369..9af4366 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -12,7 +12,7 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 # -------- Functional sub-sets --------
 Common : BuildBits, TemporaryHacks, \
 	 Fixes, DefaultSettings, Features, VCL, Misc, \
-	 CalcFixes, WriterFixes, EasterEgg, \
+	 CalcFixes, WriterFixes, \
 	 Cleanups, GnomeVFS, \
 	 VBABits, VBAObjects, CalcErrors, \
 	 OOXML, OOXMLExportDevel, OOXMLExport, \
@@ -274,10 +274,6 @@ svtools-default-new-document.diff, rodo
 # Grouping items in the templates dialog n#106603
 svtools-unsort-template-dialogentries.diff, rodo
 
-[ EasterEgg ]
-# go-oo.org people active in this release
-go-oo-team.diff, michael
-
 [ NovellOnly ]
 # Some Novell colors ...
 novell-palette.diff, michael
diff --git a/patches/dev300/go-oo-team.diff b/patches/dev300/go-oo-team.diff
deleted file mode 100644
index b3335ec..0000000
--- a/patches/dev300/go-oo-team.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- sw/inc/dochdl.hrc
-+++ sw/inc/dochdl.hrc
-@@ -43,8 +43,10 @@
- #define STR_PRIVATEOLE 	   			(RC_DOCHDL_BEGIN + 10)
- #define STR_DDEFORMAT               (RC_DOCHDL_BEGIN + 11)
- 
-+#define BMP_GO_OO_TEAM_MUGSHOT      (RC_DOCHDL_BEGIN + 12)
-+#define STR_GO_OO_TEAM_NAMES        (RC_DOCHDL_BEGIN + 13)
- 
--#define DOCHDL_ACT_END              STR_DDEFORMAT
-+#define DOCHDL_ACT_END              STR_GO_OO_TEAM_NAMES
- 
- #if DOCHDL_ACT_END > RC_DOCHDL_END
- #error Resource-Id Ueberlauf in #file, #line
---- sw/source/ui/dochdl/dochdl.src
-+++ sw/source/ui/dochdl/dochdl.src
-@@ -74,3 +74,12 @@ String STR_DDEFORMAT
-     Text [ en-US ] = "DDE link" ;
- };
- 
-+Bitmap BMP_GO_OO_TEAM_MUGSHOT
-+{
-+    File ="go-oo-team.bmp";
-+};
-+
-+String STR_GO_OO_TEAM_NAMES
-+{
-+    TEXT = "From top left: Andreas, Bernhard, Cedric, David, Dhananjay, Donna\nEric, Federico, Fong, Fridrich, Giuseppe, Hubert\nJakub, Jan, Jan, Jiao, Jody, Kai\nKalman, Kohei, Martin, Matthias, Michael, Mike\nMiklos, Noel, Petr, Radek, Rene, Silvan\nThorsten, Tor, Volker, Wei, Yin, ZhangYun.\n";
-+};
---- sw/source/ui/dochdl/gloshdl.cxx
-+++ sw/source/ui/dochdl/gloshdl.cxx
-@@ -607,9 +607,49 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName,
-                 aShortName.Erase(nMaxLen);
-                 aShortName.AppendAscii(" ...");
-             }
--            String aTmp( SW_RES(STR_NOGLOS));
--            aTmp.SearchAndReplaceAscii("%1", aShortName);
--            InfoBox( pWrtShell->GetView().GetWindow(), aTmp ).Execute();
-+
-+            if ( aShortName.EqualsAscii ( "GoOOTeam", 0, 14 ) )
-+            {
-+                String sGraphicName ( RTL_CONSTASCII_USTRINGPARAM ( "Go-oo Team photo" ) );
-+                String sTeamCredits ( RTL_CONSTASCII_USTRINGPARAM ( "go-oo team credits" ) );
-+                pWrtShell->StartUndo ( UNDO_INSGLOSSARY );
-+                pWrtShell->StartAllAction();
-+                if(pWrtShell->HasSelection())
-+                    pWrtShell->DelLeft();
-+                Bitmap aBitmap ( SW_RES ( BMP_GO_OO_TEAM_MUGSHOT ) );
-+                pWrtShell->Insert ( aEmptyStr, aEmptyStr, aBitmap);
-+                pWrtShell->SetFlyName ( sGraphicName );
-+                SwTxtFmtColl* pColl = pWrtShell->GetTxtCollFromPool ( RES_POOLCOLL_LABEL_ABB );
-+                const IDocumentFieldsAccess* pIDFA = pWrtShell->getIDocumentFieldsAccess();
-+                SwFieldType* pType = pIDFA->GetFldType( RES_SETEXPFLD, pColl->GetName(), false );
-+                sal_uInt16 nId = pIDFA->GetFldTypes()->GetPos( pType );
-+                pWrtShell->InsertLabel( LTYPE_OBJECT, aEmptyStr, aEmptyStr, aEmptyStr, FALSE, nId, aEmptyStr );
-+                pWrtShell->SwFEShell::SetFlyName( sTeamCredits );
-+                pWrtShell->SwFEShell::SelectObj ( Point ( ULONG_MAX, ULONG_MAX ) );
-+                pWrtShell->EnterStdMode();
-+                pWrtShell->EndPara ( TRUE );
-+                String aTmp ( SW_RES ( STR_GO_OO_TEAM_NAMES ) );
-+                pWrtShell->Insert ( aTmp );
-+                SvxAdjustItem aAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST );
-+                pWrtShell->SetAttr( aAdjustItem );
-+                pWrtShell->SttPara ();
-+                pWrtShell->SplitNode();
-+                pWrtShell->Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE );
-+                SvxWeightItem aWeightItem ( WEIGHT_BOLD, RES_CHRATR_WEIGHT );
-+                pWrtShell->Insert ( String ( RTL_CONSTASCII_USTRINGPARAM ( "The go-oo.org team!" ) ) );
-+                pWrtShell->SttPara ( TRUE );
-+                pWrtShell->SetAttr( aWeightItem);
-+                pWrtShell->GotoFly ( sTeamCredits);
-+                pWrtShell->EndAllAction();
-+                pWrtShell->EndUndo( UNDO_INSGLOSSARY );
-+            }
-+            else
-+            {
-+                String aTmp( SW_RES(STR_NOGLOS));
-+                aTmp.SearchAndReplaceAscii("%1", aShortName);
-+                InfoBox( pWrtShell->GetView().GetWindow(), aTmp ).Execute();
-+
-+            }
-         }
- 
-         return sal_False;