diff -urN oo_1.0.1_src.orig/sc/inc/compiler.hrc oo_1.0.1_src/sc/inc/compiler.hrc --- oo_1.0.1_src.orig/sc/inc/compiler.hrc Mon Sep 23 23:08:51 2002 +++ oo_1.0.1_src/sc/inc/compiler.hrc Mon Sep 23 23:24:48 2002 @@ -389,8 +389,9 @@ #define SC_OPCODE_LAST_OPCODE_ID 386 /* letzter OpCode */ -/*** Interna ***/ -#define SC_OPCODE_INTERNAL_BEGIN 9995 +/*** Internal ***/ +#define SC_OPCODE_INTERNAL_BEGIN 9994 +#define SC_OPCODE_CZTEAM 9994 #define SC_OPCODE_GAME 9995 #define SC_OPCODE_SPEW 9996 #define SC_OPCODE_TTT 9997 diff -urN oo_1.0.1_src.orig/sc/inc/opcode.hxx oo_1.0.1_src/sc/inc/opcode.hxx --- oo_1.0.1_src.orig/sc/inc/opcode.hxx Mon Sep 23 23:08:51 2002 +++ oo_1.0.1_src/sc/inc/opcode.hxx Mon Sep 23 23:24:48 2002 @@ -405,6 +405,7 @@ ocSpew = SC_OPCODE_SPEW, ocTTT = SC_OPCODE_TTT, ocTeam = SC_OPCODE_TEAM, + ocCzTeam = SC_OPCODE_CZTEAM, ocAnswer = SC_OPCODE_ANSWER, ocInternalEnd = SC_OPCODE_INTERNAL_END, // ab hier sind Extradaten drin diff -urN oo_1.0.1_src.orig/sc/inc/sc.hrc oo_1.0.1_src/sc/inc/sc.hrc --- oo_1.0.1_src.orig/sc/inc/sc.hrc Mon Sep 23 23:08:51 2002 +++ oo_1.0.1_src/sc/inc/sc.hrc Mon Sep 23 23:24:48 2002 @@ -1472,6 +1472,7 @@ #define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) #define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) +#define RID_SCDLG_CZTEAM (SC_DIALOGS_START + 133) #define SC_DIALOGS_END (SC_DIALOGS_START + 150) diff -urN oo_1.0.1_src.orig/sc/inc/scmod.hxx oo_1.0.1_src/sc/inc/scmod.hxx --- oo_1.0.1_src.orig/sc/inc/scmod.hxx Mon Sep 23 23:08:51 2002 +++ oo_1.0.1_src/sc/inc/scmod.hxx Mon Sep 23 23:24:48 2002 @@ -111,6 +111,7 @@ class ScFunctionDlg; class ScArgDlgBase; class ScTeamDlg; +class ScCzTeamDlg; class ScEditFunctionDlg; class ScMessagePool; class EditFieldInfo; @@ -160,6 +161,7 @@ // globalen InputHandler gibt's nicht mehr, jede View hat einen ScInputHandler* pRefInputHandler; ScTeamDlg* pTeamDlg; + ScCzTeamDlg* pCzTeamDlg; ScViewCfg* pViewCfg; ScDocCfg* pDocCfg; ScAppCfg* pAppCfg; @@ -282,7 +284,9 @@ BOOL IsRefDialogOpen(); BOOL IsTableLocked(); void OpenTeamDlg(); + void OpenCzTeamDlg(); void SetTeamDlg( ScTeamDlg* pDlg ) { pTeamDlg = pDlg; } + void SetCzTeamDlg( ScCzTeamDlg* pDlg ) { pCzTeamDlg = pDlg; } ScTeamDlg* GetTeamDlg() const { return pTeamDlg; } void SetReference( const ScRange& rRef, ScDocument* pDoc, const ScMarkData* pMarkData = NULL ); diff -urN oo_1.0.1_src.orig/sc/source/core/inc/interpre.hxx oo_1.0.1_src/sc/source/core/inc/interpre.hxx --- oo_1.0.1_src.orig/sc/source/core/inc/interpre.hxx Mon Sep 23 23:09:06 2002 +++ oo_1.0.1_src/sc/source/core/inc/interpre.hxx Mon Sep 23 23:24:48 2002 @@ -476,6 +476,7 @@ void ScDBArea(); void ScColRowNameAuto(); void ScCalcTeam(); +void ScCalcCzTeam(); void ScAnswer(); void ScTTT(); void ScSpewFunc(); diff -urN oo_1.0.1_src.orig/sc/source/core/tool/compiler.cxx oo_1.0.1_src/sc/source/core/tool/compiler.cxx --- oo_1.0.1_src.orig/sc/source/core/tool/compiler.cxx Mon Sep 23 23:09:07 2002 +++ oo_1.0.1_src/sc/source/core/tool/compiler.cxx Mon Sep 23 23:24:48 2002 @@ -124,7 +124,7 @@ BOOL bTemp; }; -static sal_Char* pInternal[ 5 ] = { "GAME", "SPEW", "TTT", "STARCALCTEAM", "ANTWORT" }; +static sal_Char* pInternal[ 6 ] = { "CZTEAM", "GAME", "SPEW", "TTT", "STARCALCTEAM", "ANTWORT" }; ///////////////////////////////////////////////////////////////////////// diff -urN oo_1.0.1_src.orig/sc/source/core/tool/interpr4.cxx oo_1.0.1_src/sc/source/core/tool/interpr4.cxx --- oo_1.0.1_src.orig/sc/source/core/tool/interpr4.cxx Mon Sep 23 23:09:07 2002 +++ oo_1.0.1_src/sc/source/core/tool/interpr4.cxx Mon Sep 23 23:24:48 2002 @@ -133,6 +133,7 @@ // Implementiert in ui\miscdlgs\teamdlg.cxx extern void ShowTheTeam(); +extern void ShowTheCzTeam(); extern BOOL bOderSo; // in GLOBAL.CXX @@ -2642,6 +2643,20 @@ PushInt( 42 ); } +void ScInterpreter::ScCalcCzTeam() +{ + static BOOL bShown = FALSE; + if( !bShown ) + { + ShowTheCzTeam(); + String aTeam( RTL_CONSTASCII_USTRINGPARAM( "Take care!" ) ); + PushString( aTeam ); + bShown = TRUE; + } + else + PushInt( 7 ); +} + void ScInterpreter::ScSpewFunc() { @@ -3332,6 +3347,7 @@ case ocArabic : ScArabic(); break; case ocAnswer : ScAnswer(); break; case ocTeam : ScCalcTeam(); break; + case ocCzTeam : ScCalcCzTeam(); break; case ocTTT : ScTTT(); break; case ocSpew : ScSpewFunc(); break; case ocGame : ScGame(); break; diff -urN oo_1.0.1_src.orig/sc/source/ui/app/scmod.cxx oo_1.0.1_src/sc/source/ui/app/scmod.cxx --- oo_1.0.1_src.orig/sc/source/ui/app/scmod.cxx Mon Sep 23 23:08:53 2002 +++ oo_1.0.1_src/sc/source/ui/app/scmod.cxx Mon Sep 23 23:24:48 2002 @@ -118,6 +118,7 @@ #include "scresid.hxx" #include "anyrefdg.hxx" #include "teamdlg.hxx" +#include "czteamdlg.hxx" #include "dwfunctr.hxx" #include "formdata.hxx" #include "tpview.hxx" @@ -162,6 +163,7 @@ pPrintCfg( NULL ), pNavipiCfg( NULL ), pTeamDlg( NULL ), + pCzTeamDlg( NULL ), nCurRefDlgId( 0 ), pErrorHdl( NULL ), pSvxErrorHdl( NULL ), @@ -1345,6 +1347,8 @@ // -> close it if any view is closed if (pTeamDlg) pTeamDlg->Close(); // resets variable pTeamDlg + if (pCzTeamDlg) + pCzTeamDlg->Close(); // resets variable pCzTeamDlg } void ScModule::SetRefInputHdl( ScInputHandler* pNew ) @@ -1483,6 +1487,21 @@ pTeamDlg->Center(); } +void ScModule::OpenCzTeamDlg() +{ + if ( !pCzTeamDlg ) + { + // team dialog needs an existing parent window + // -> use window from active view (dialog is closed in ViewShellGone) + + ScTabViewShell* pShell = ScTabViewShell::GetActiveViewShell(); + if (pShell) + pCzTeamDlg = new ScCzTeamDlg( pShell->GetActiveWin() ); + } + else + pCzTeamDlg->Center(); +} + SfxChildWindow* lcl_GetChildWinFromAnyView( USHORT nId ) { // first try the current view diff -urN oo_1.0.1_src.orig/sc/source/ui/inc/czteamdlg.hxx oo_1.0.1_src/sc/source/ui/inc/czteamdlg.hxx --- oo_1.0.1_src.orig/sc/source/ui/inc/czteamdlg.hxx Thu Jan 1 01:00:00 1970 +++ oo_1.0.1_src/sc/source/ui/inc/czteamdlg.hxx Mon Sep 23 23:24:48 2002 @@ -0,0 +1,31 @@ +#ifndef SC_CZTEAMDLG_HXX +#define SC_CZTEAMDLG_HXX + + +#ifndef _SV_FLOATWIN_HXX //autogen +#include +#endif + +#ifndef _SV_FIXED_HXX //autogen +#include +#endif + + +//======================================================================== + +class ScCzTeamDlg : public FloatingWindow +{ +public: + ScCzTeamDlg( Window* pParent ); + ~ScCzTeamDlg(); + + virtual BOOL Close(); + void Center(); + +private: + FixedBitmap aBmpTeam; +}; + + +#endif + diff -urN oo_1.0.1_src.orig/sc/source/ui/miscdlgs/czteamdlg.cxx oo_1.0.1_src/sc/source/ui/miscdlgs/czteamdlg.cxx --- oo_1.0.1_src.orig/sc/source/ui/miscdlgs/czteamdlg.cxx Thu Jan 1 01:00:00 1970 +++ oo_1.0.1_src/sc/source/ui/miscdlgs/czteamdlg.cxx Mon Sep 23 23:24:48 2002 @@ -0,0 +1,91 @@ +#ifdef PCH +#include "ui_pch.hxx" +#endif + +#pragma hdrstop + +//------------------------------------------------------------------ + +#include +#include + +#include "czteamdlg.hxx" +#include "scmod.hxx" +#include "scresid.hxx" +#include "sc.hrc" + + +//------------------------------------------------------------------ + +void ShowTheCzTeam() +{ + SC_MOD()->OpenCzTeamDlg(); +} + +//======================================================================== +// ScCzTeamDlg +//======================================================================== + +ScCzTeamDlg::ScCzTeamDlg( Window* pParent ) + : FloatingWindow( pParent, ScResId( RID_SCDLG_CZTEAM ) ), + aBmpTeam ( this, ScResId( 1 ) ) +{ + FreeResource(); + SC_MOD()->SetCzTeamDlg( this ); + + Bitmap aBmp( ScResId( RID_SCTEAMDLGBMP2 ) ); + + Size aSize = aBmp.GetSizePixel(); + USHORT nOff = (USHORT)aBmpTeam.GetPosPixel().X(); + + aBmpTeam.SetSizePixel( aSize ); + aBmpTeam.SetBitmap( aBmp ); + aSize.Width() += (2*nOff); + aSize.Height() += (2*nOff); + SetOutputSizePixel( aSize ); + Center(); + Point aPos = GetPosPixel(); + if (aPos.Y() < 0) + { + // #87164# title bar must be visible + aPos.Y() = 0; + SetPosPixel(aPos); + } + Show(); +} + +//------------------------------------------------------------------------ + +__EXPORT ScCzTeamDlg::~ScCzTeamDlg() +{ +} + +//------------------------------------------------------------------------ + +BOOL __EXPORT ScCzTeamDlg::Close() +{ + BOOL bReturn = FloatingWindow::Close(); + + SC_MOD()->SetCzTeamDlg( NULL ); + delete this; + + return bReturn; +} + +//------------------------------------------------------------------------ + +void ScCzTeamDlg::Center() +{ + if ( IsRollUp() ) RollDown(); + + Size aSizeDesktop = GetParent()->GetSizePixel(); + Size aSize = GetSizePixel(); + Point aNewPos; + + aNewPos.X() = (aSizeDesktop.Width() - aSize.Width()) / 2; + aNewPos.Y() = (aSizeDesktop.Height() - aSize.Height()) / 2; + SetPosPixel( aNewPos ); +} + + + diff -urN oo_1.0.1_src.orig/sc/source/ui/miscdlgs/makefile.mk oo_1.0.1_src/sc/source/ui/miscdlgs/makefile.mk --- oo_1.0.1_src.orig/sc/source/ui/miscdlgs/makefile.mk Mon Sep 23 23:09:05 2002 +++ oo_1.0.1_src/sc/source/ui/miscdlgs/makefile.mk Mon Sep 23 23:24:48 2002 @@ -90,7 +90,7 @@ mvtabdlg.cxx groupdlg.cxx \ tabopdlg.cxx crdlg.cxx \ namecrea.cxx namepast.cxx \ - teamdlg.cxx textdlgs.cxx \ + teamdlg.cxx czteamdlg.cxx textdlgs.cxx \ chartdlg.cxx anyrefdg.cxx \ crnrdlg.cxx shtabdlg.cxx \ instbdlg.cxx acredlin.cxx \ @@ -106,7 +106,7 @@ $(SLO)$/mvtabdlg.obj $(SLO)$/groupdlg.obj \ $(SLO)$/tabopdlg.obj $(SLO)$/crdlg.obj \ $(SLO)$/namecrea.obj $(SLO)$/namepast.obj \ - $(SLO)$/teamdlg.obj $(SLO)$/textdlgs.obj \ + $(SLO)$/teamdlg.obj $(SLO)$/czteamdlg.obj $(SLO)$/textdlgs.obj \ $(SLO)$/chartdlg.obj $(SLO)$/anyrefdg.obj \ $(SLO)$/crnrdlg.obj $(SLO)$/shtabdlg.obj \ $(SLO)$/instbdlg.obj $(SLO)$/acredlin.obj \ diff -urN oo_1.0.1_src.orig/sc/source/ui/src/miscdlgs.src oo_1.0.1_src/sc/source/ui/src/miscdlgs.src --- oo_1.0.1_src.orig/sc/source/ui/src/miscdlgs.src Mon Sep 23 23:08:53 2002 +++ oo_1.0.1_src/sc/source/ui/src/miscdlgs.src Tue Sep 24 00:01:34 2002 @@ -476,6 +476,11 @@ File = "calcteam.bmp"; }; +Bitmap RID_SCTEAMDLGBMP2 +{ + File = "czteammotto.bmp"; +}; + ModalDialog RID_SCDLG_DELCONT { OutputSize = TRUE ; @@ -3678,6 +3683,42 @@ Text[ finnish ] = "%PRODUCTNAME Calc -ryhm"; }; +FloatingWindow RID_SCDLG_CZTEAM +{ + Hide = TRUE ; + OutputSize = TRUE ; + SVLook = TRUE ; + Moveable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + FixedBitmap 1 { Pos = MAP_APPFONT ( 1 , 1 ) ; }; + Text = "Das %PRODUCTNAME Calc Team" ; + Text [ ENGLISH ] = "The %PRODUCTNAME Calc Team" ; + Text [ ENGLISH_US ] = "The %PRODUCTNAME Calc Team" ; + Text [ italian ] = "Il team %PRODUCTNAME Calc" ; + Text [ spanish ] = "El equipo de %PRODUCTNAME Calc" ; + Text [ french ] = "L'quipe de %PRODUCTNAME Calc" ; + Text [ dutch ] = "Het %PRODUCTNAME Calc Team" ; + Text [ swedish ] = "%PRODUCTNAME Calc-teamet" ; + Text [ danish ] = "%PRODUCTNAME Calc-teamet" ; + Text [ portuguese ] = "A equipa do %PRODUCTNAME Calc" ; + Text [ portuguese_brazilian ] = "Das %PRODUCTNAME Calc Team" ; + Text[ chinese_simplified ] = "%PRODUCTNAME Calc 工作组"; + Text[ russian ] = " %PRODUCTNAME Calc"; + Text[ polish ] = "Zesp %PRODUCTNAME Calc"; + Text[ japanese ] = "%PRODUCTNAME Calc チーム"; + Text[ chinese_traditional ] = "%PRODUCTNAME Calc 工作組"; + Text[ arabic ] = " %PRODUCTNAME Calc"; + Text[ greek ] = " %PRODUCTNAME Calc"; + Text[ korean ] = "%PRODUCTNAME Calc Team"; + Text[ turkish ] = "StarCalc Ekibi"; + Text[ language_user1 ] = " "; + Text[ catalan ] = "L'equip %PRODUCTNAME Calc"; + Text[ finnish ] = "%PRODUCTNAME Calc -ryhm"; + Text[ czech ] = "Motto českého týmu"; + Text[ slovak ] = "Motto"; +}; + ModalDialog RID_SCDLG_CHARTCOLROW { OutputSize = TRUE ;