From 555d702903fb0857122024e1ab78a72d122d3f16 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Wed, 26 Mar 2003 17:07:02 +0000 Subject: MWS_SRX644: migrate branch mws_srx644 -> HEAD --- sc/inc/chgtrack.hxx | 6 ++- sc/inc/chgviset.hxx | 9 +++- sc/inc/compiler.hxx | 9 ++-- sc/inc/document.hxx | 18 ++++++- sc/inc/global.hxx | 5 +- sc/inc/refdata.hxx | 5 +- sc/inc/scdll.hxx | 16 ++---- sc/inc/scextopt.hxx | 5 +- sc/inc/scmod.hxx | 10 ++-- sc/inc/tabopparams.hxx | 136 +++++++++++++++++++++++++++++++++++++++++++++++++ sc/inc/unonames.hxx | 6 ++- 11 files changed, 189 insertions(+), 36 deletions(-) create mode 100644 sc/inc/tabopparams.hxx (limited to 'sc/inc') diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 18f228019e85..b936244bef31 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chgtrack.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: er $ $Date: 2002-04-15 11:06:58 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1255,6 +1255,8 @@ public: } ULONG GetLastSavedActionNumber() const { return nMarkLastSaved; } + void SetLastSavedActionNumber(ULONG nNew) + { nMarkLastSaved = nNew; } ScChangeAction* GetLastSaved() const { return aTable.Get( nMarkLastSaved ); } ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 87d595e5a508..1a6a87511e3a 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chgviset.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: nn $ $Date: 2000-11-20 10:26:42 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,8 @@ namespace utl { class TextSearch; } +class ScDocument; + class ScChangeViewSettings { private: @@ -173,6 +175,9 @@ public: ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); + /// Adjust dates according to selected DateMode + void AdjustDateMode( const ScDocument& rDoc ); + }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 8af0dd74017c..255fbfb400da 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: compiler.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: er $ $Date: 2002-11-21 16:10:18 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -337,6 +337,8 @@ class ScTokenArray // nVal kann auch kombinierte Bits enthalten, // aber nur ein exklusives Bit darf gesetzt sein! + BOOL ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const; + public: ScTokenArray(); ScTokenArray( const ScTokenArray& ); // Zuweisung mit Referenzen auf Tokens @@ -364,7 +366,8 @@ public: BOOL HasOpCodeRPN( OpCode ) const; BOOL HasName() const; // token of type svIndex BOOL HasNameOrColRowName() const; // token of type svIndex or opcode ocColRowName - BOOL IsReference( ScRange& rRange ) const; // exactly and only one range + BOOL IsReference( ScRange& rRange ) const; // exactly and only one range (valid or deleted) + BOOL IsValidReference( ScRange& rRange ) const; // exactly and only one valid range (no #REF!s) BOOL GetTableOpRefs( // exactly and only one multiple operation ScAddress& rFormula, ScAddress& rColFirstPos, ScAddress& rColRelPos, diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index d1792aa201e2..0ee37414279a 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2,9 +2,9 @@ * * $RCSfile: document.hxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: er $ $Date: 2002-12-05 16:00:12 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,10 @@ #include "brdcst.hxx" #endif +#ifndef SC_TABOPPARAMS_HXX +#include "tabopparams.hxx" +#endif + class KeyEvent; class OutputDevice; class SdrObject; @@ -407,6 +411,11 @@ private: Timer aTrackTimer; +public: + ScTabOpList aTableOpList; // list of ScInterpreterTableOpParams currently in use + ScInterpreterTableOpParams aLastTableOpParams; // remember last params +private: + LanguageType eLanguage; // default language LanguageType eCjkLanguage; // default language for asian text LanguageType eCtlLanguage; // default language for complex text @@ -479,6 +488,8 @@ private: BYTE nInDdeLinkUpdate; // originating DDE links (stacked bool) + BOOL bInUnoBroadcast; + mutable BOOL bStyleSheetUsageInvalid; @@ -1534,6 +1545,9 @@ public: if ( nInterpreterTableOpLevel ) nInterpreterTableOpLevel--; } + // add a formula to be remembered for TableOp broadcasts + void AddTableOpFormulaCell( ScFormulaCell* ); + void InvalidateLastTableOpParams() { aLastTableOpParams.bValid = FALSE; } BOOL IsInDtorClear() const { return bInDtorClear; } void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } BOOL IsExpandRefs() { return bExpandRefs; } diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index c5fb99ea5542..3d9e888470e7 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -2,9 +2,9 @@ * * $RCSfile: global.hxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: er $ $Date: 2002-11-12 18:28:04 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -296,6 +296,7 @@ inline BOOL ValidColRowTab(USHORT nCol, USHORT nRow, USHORT nTab) #define HASATTR_CONDITIONAL 512 #define HASATTR_ROTATE 1024 #define HASATTR_NOTOVERLAPPED 2048 +#define HASATTR_RTL 4096 #define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index 17c48522f810..a70bcea8b341 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: refdata.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: er $ $Date: 2001-02-21 18:22:13 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,6 +131,7 @@ struct SingleRefData // Single reference (one address) into the sheet inline BOOL IsRowDeleted() const { return Flags.bRowDeleted; } inline void SetTabDeleted( BOOL bVal ) { Flags.bTabDeleted = (bVal ? TRUE : FALSE ); } inline BOOL IsTabDeleted() const { return Flags.bTabDeleted; } + inline BOOL IsDeleted() const { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); } inline void SetFlag3D( BOOL bVal ) { Flags.bFlag3D = (bVal ? TRUE : FALSE ); } inline BOOL IsFlag3D() const { return Flags.bFlag3D; } diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 391f2b83ba89..e081f0dd8448 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scdll.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:44:50 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,13 +116,6 @@ public: //------------------------------------------------------------------------- -#ifdef WNT -typedef void ( __cdecl * ScSigCatchFunc )( int ); -#else -typedef void ( * ScSigCatchFunc )( int ); -#endif -typedef ScSigCatchFunc ( * ScLibSignalFunc )( int, ScSigCatchFunc ); - class ScModuleDummy: public SfxModule /* [Description] @@ -137,17 +130,14 @@ public: // SvFactory name convention: // 'p' + SfxObjectShell-subclass + 'Factory' SotFactory* pScDocShellFactory; - ScLibSignalFunc pSignalFunc; ScModuleDummy( ResMgr *pResMgr, BOOL bDummy, SfxObjectFactory* pFact ) : SfxModule(pResMgr, bDummy, pFact, NULL), - pScDocShellFactory(pFact), pSignalFunc(0) + pScDocShellFactory(pFact) {} virtual SfxModule* Load(); - ScLibSignalFunc GetSignalFunc() { return pSignalFunc; } - static SvGlobalName GetID(USHORT nFileFormat); static USHORT HasID(const SvGlobalName& rName); }; diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx index fcf708b02a5e..05b7a08c14eb 100644 --- a/sc/inc/scextopt.hxx +++ b/sc/inc/scextopt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scextopt.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jmarmion $ $Date: 2002-12-10 14:04:37 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,6 @@ public: // Cursor UINT16 nCurCol; // aktuelle Cursor-Position UINT16 nCurRow; - double fColScale; // <= 0 -> invalid // ------------------------------------------------------------------- ScExtDocOptions( void ); ~ScExtDocOptions(); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 8ca4e46d82d5..dc6d1f732058 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scmod.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2002-10-24 17:17:17 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ class SfxErrorHandler; class SvxErrorHandler; class SvtAccessibilityOptions; -namespace svx { class ColorConfig; } +namespace svtools { class ColorConfig; } class ScRange; class ScDocument; @@ -169,7 +169,7 @@ class ScModule: public ScModuleDummy, public SfxListener ScInputCfg* pInputCfg; ScPrintCfg* pPrintCfg; ScNavipiCfg* pNavipiCfg; - svx::ColorConfig* pColorConfig; + svtools::ColorConfig* pColorConfig; SvtAccessibilityOptions* pAccessOptions; SfxErrorHandler* pErrorHdl; SvxErrorHandler* pSvxErrorHdl; @@ -248,7 +248,7 @@ public: static BOOL HasThesaurusLanguage( USHORT nLang ); ScNavipiCfg& GetNavipiCfg(); - svx::ColorConfig& GetColorConfig(); + svtools::ColorConfig& GetColorConfig(); SvtAccessibilityOptions& GetAccessOptions(); void ModifyOptions( const SfxItemSet& rOptSet ); diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx new file mode 100644 index 000000000000..f6dd98bbfbaf --- /dev/null +++ b/sc/inc/tabopparams.hxx @@ -0,0 +1,136 @@ +/************************************************************************* + * + * $RCSfile: tabopparams.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $ $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef SC_TABOPPARAMS_HXX +#define SC_TABOPPARAMS_HXX + +#ifndef SC_SCGLOB_HXX +#include "global.hxx" +#endif +#include + +class ScFormulaCell; + +struct ScInterpreterTableOpParams +{ + ScAddress aOld1; + ScAddress aNew1; + ScAddress aOld2; + ScAddress aNew2; + ScAddress aFormulaPos; + ::std::vector< ScFormulaCell* > aNotifiedFormulaCells; + ::std::vector< ScAddress > aNotifiedFormulaPos; + BOOL bValid; + BOOL bRefresh; + BOOL bCollectNotifications; + + ScInterpreterTableOpParams() + : bValid( FALSE ) + , bRefresh( FALSE ) + , bCollectNotifications( TRUE ) + { + } + + ScInterpreterTableOpParams( const ScInterpreterTableOpParams& r ) + : aOld1( r.aOld1 ) + , aNew1( r.aNew1 ) + , aOld2( r.aOld2 ) + , aNew2( r.aNew2 ) + , aFormulaPos( r.aFormulaPos ) + , aNotifiedFormulaCells( r.aNotifiedFormulaCells ) + , aNotifiedFormulaPos( r.aNotifiedFormulaPos ) + , bValid( r.bValid ) + , bRefresh( r.bRefresh ) + , bCollectNotifications( r.bCollectNotifications ) + { + } + + ScInterpreterTableOpParams& operator =( const ScInterpreterTableOpParams& r ) + { + aOld1 = r.aOld1; + aNew1 = r.aNew1; + aOld2 = r.aOld2; + aNew2 = r.aNew2; + aFormulaPos = r.aFormulaPos; + aNotifiedFormulaCells = r.aNotifiedFormulaCells; + aNotifiedFormulaPos = r.aNotifiedFormulaPos; + bValid = r.bValid; + bRefresh = r.bRefresh; + bCollectNotifications = r.bCollectNotifications; + return *this; + } + + operator ==( const ScInterpreterTableOpParams& r ) + { + return + bValid && r.bValid && + aOld1 == r.aOld1 && + aOld2 == r.aOld2 && + aFormulaPos == r.aFormulaPos ; + // aNotifiedFormula(Cells|Pos), aNew1, aNew2, bRefresh, + // bCollectNotifications are not compared + } +}; + +DECLARE_LIST( ScTabOpList, ScInterpreterTableOpParams* ); + +#endif // SC_TABOPPARAMS_HXX + diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 5eb77e7e5066..7d4960896d73 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unonames.hxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: sab $ $Date: 2002-11-11 12:35:47 $ + * last change: $Author: hr $ $Date: 2003-03-26 18:03:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,6 +262,7 @@ #define SC_UNONAME_CONTHDR "ContainsHeader" #define SC_UNONAME_MAXFLD "MaxFieldCount" #define SC_UNONAME_ORIENT "Orientation" +#define SC_UNONAME_SORTCOLUMNS "SortColumns" #define SC_UNONAME_SORTFLD "SortFields" #define SC_UNONAME_SORTASC "SortAscending" #define SC_UNONAME_ENUSLIST "EnableUserSortList" @@ -271,6 +272,7 @@ #define SC_UNONAME_AUTOFLT "AutoFilter" #define SC_UNONAME_FLTCRT "FilterCriteriaSource" #define SC_UNONAME_USEFLTCRT "UseFilterCriteriaSource" +#define SC_UNONAME_ENABSORT "EnableSort" // text fields #define SC_UNONAME_ANCTYPE "AnchorType" -- cgit