diff options
Diffstat (limited to 'sc/inc')
175 files changed, 8764 insertions, 8792 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx index 25405a58a369..2345208ae24b 100644 --- a/sc/inc/AccessibleFilterMenu.hxx +++ b/sc/inc/AccessibleFilterMenu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ public: ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException); - // Remove an existing event listener. + // Remove an existing event listener. virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx index fbdcfbb6b36e..b689a5af6805 100644 --- a/sc/inc/AccessibleFilterMenuItem.hxx +++ b/sc/inc/AccessibleFilterMenuItem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class ScMenuFloatingWindow; typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessibleAction > ScAccessibleFilterMenuItem_BASE; -class ScAccessibleFilterMenuItem : +class ScAccessibleFilterMenuItem : public ScAccessibleContextBase, public ScAccessibleFilterMenuItem_BASE { @@ -55,12 +55,12 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); - virtual ::com::sun::star::uno::Reference< + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException); @@ -70,24 +70,24 @@ public: // XAccessibleAction - virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() + virtual ::sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) + virtual ::sal_Bool SAL_CALL doAccessibleAction(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL - getAccessibleActionKeyBinding(sal_Int32 nIndex) + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL + getAccessibleActionKeyBinding(sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( - ::com::sun::star::uno::Type const & rType ) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( + ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw (); diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index d45a90a2cd0c..a399fd1ce722 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ public: LISTBOX, TOGGLE_ALL, SINGLE_ON_BTN, SINGLE_OFF_BTN, OK_BTN, CANCEL_BTN }; void setAccessibleChild( - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rAccessible, ChildControlType eType); diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx index 5c06ed29edaf..d9e01c58613d 100644 --- a/sc/inc/AccessibleGlobal.hxx +++ b/sc/inc/AccessibleGlobal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <set> -/** +/** * Generic XAccessibleStateSet implementation. */ class ScAccessibleStateSet : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet > @@ -45,17 +45,17 @@ public: // XAccessibleStateSet - virtual ::sal_Bool SAL_CALL isEmpty() + virtual ::sal_Bool SAL_CALL isEmpty() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL contains(sal_Int16 nState) + virtual ::sal_Bool SAL_CALL contains(sal_Int16 nState) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL containsAll( - const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet) + const ::com::sun::star::uno::Sequence<sal_Int16>& aStateSet) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() + virtual ::com::sun::star::uno::Sequence<sal_Int16> SAL_CALL getStates() throw (::com::sun::star::uno::RuntimeException); // Non-UNO Methods diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx index a0167898607d..685fa11a803e 100644 --- a/sc/inc/ViewSettingsSequenceDefines.hxx +++ b/sc/inc/ViewSettingsSequenceDefines.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,31 +32,31 @@ // this are the defines for the position of the settings in the // ViewSettingsSequence -#define SC_VIEWSETTINGS_COUNT 23 +#define SC_VIEWSETTINGS_COUNT 23 -#define SC_VIEW_ID 0 -#define SC_TABLE_VIEWSETTINGS 1 -#define SC_ACTIVE_TABLE 2 -#define SC_HORIZONTAL_SCROLL_BAR_WIDTH 3 -#define SC_ZOOM_TYPE 4 -#define SC_ZOOM_VALUE 5 -#define SC_PAGE_VIEW_ZOOM_VALUE 6 -#define SC_PAGE_BREAK_PREVIEW 7 -#define SC_SHOWZERO 8 -#define SC_SHOWNOTES 9 -#define SC_SHOWGRID 10 -#define SC_GRIDCOLOR 11 -#define SC_SHOWPAGEBR 12 -#define SC_COLROWHDR 13 -#define SC_SHEETTABS 14 -#define SC_OUTLSYMB 15 -#define SC_SNAPTORASTER 16 -#define SC_RASTERVIS 17 -#define SC_RASTERRESX 18 -#define SC_RASTERRESY 19 -#define SC_RASTERSUBX 20 -#define SC_RASTERSUBY 21 -#define SC_RASTERSYNC 22 +#define SC_VIEW_ID 0 +#define SC_TABLE_VIEWSETTINGS 1 +#define SC_ACTIVE_TABLE 2 +#define SC_HORIZONTAL_SCROLL_BAR_WIDTH 3 +#define SC_ZOOM_TYPE 4 +#define SC_ZOOM_VALUE 5 +#define SC_PAGE_VIEW_ZOOM_VALUE 6 +#define SC_PAGE_BREAK_PREVIEW 7 +#define SC_SHOWZERO 8 +#define SC_SHOWNOTES 9 +#define SC_SHOWGRID 10 +#define SC_GRIDCOLOR 11 +#define SC_SHOWPAGEBR 12 +#define SC_COLROWHDR 13 +#define SC_SHEETTABS 14 +#define SC_OUTLSYMB 15 +#define SC_SNAPTORASTER 16 +#define SC_RASTERVIS 17 +#define SC_RASTERRESX 18 +#define SC_RASTERRESY 19 +#define SC_RASTERSUBX 20 +#define SC_RASTERSUBY 21 +#define SC_RASTERSYNC 22 // this are the defines for the position of the settings in the @@ -64,48 +64,48 @@ #define SC_TABLE_VIEWSETTINGS_COUNT 16 -#define SC_CURSOR_X 0 -#define SC_CURSOR_Y 1 -#define SC_HORIZONTAL_SPLIT_MODE 2 -#define SC_VERTICAL_SPLIT_MODE 3 -#define SC_HORIZONTAL_SPLIT_POSITION 4 -#define SC_VERTICAL_SPLIT_POSITION 5 -#define SC_ACTIVE_SPLIT_RANGE 6 -#define SC_POSITION_LEFT 7 -#define SC_POSITION_RIGHT 8 -#define SC_POSITION_TOP 9 -#define SC_POSITION_BOTTOM 10 +#define SC_CURSOR_X 0 +#define SC_CURSOR_Y 1 +#define SC_HORIZONTAL_SPLIT_MODE 2 +#define SC_VERTICAL_SPLIT_MODE 3 +#define SC_HORIZONTAL_SPLIT_POSITION 4 +#define SC_VERTICAL_SPLIT_POSITION 5 +#define SC_ACTIVE_SPLIT_RANGE 6 +#define SC_POSITION_LEFT 7 +#define SC_POSITION_RIGHT 8 +#define SC_POSITION_TOP 9 +#define SC_POSITION_BOTTOM 10 #define SC_TABLE_ZOOM_TYPE 11 #define SC_TABLE_ZOOM_VALUE 12 #define SC_TABLE_PAGE_VIEW_ZOOM_VALUE 13 #define SC_TABLE_TAB_BG_COLOR 14 #define SC_TABLE_SHOWGRID 15 -#define SC_CURSORPOSITIONX "CursorPositionX" -#define SC_CURSORPOSITIONY "CursorPositionY" -#define SC_HORIZONTALSPLITMODE "HorizontalSplitMode" -#define SC_VERTICALSPLITMODE "VerticalSplitMode" -#define SC_HORIZONTALSPLITPOSITION "HorizontalSplitPosition" -#define SC_VERTICALSPLITPOSITION "VerticalSplitPosition" +#define SC_CURSORPOSITIONX "CursorPositionX" +#define SC_CURSORPOSITIONY "CursorPositionY" +#define SC_HORIZONTALSPLITMODE "HorizontalSplitMode" +#define SC_VERTICALSPLITMODE "VerticalSplitMode" +#define SC_HORIZONTALSPLITPOSITION "HorizontalSplitPosition" +#define SC_VERTICALSPLITPOSITION "VerticalSplitPosition" #define SC_HORIZONTALSPLITPOSITION_TWIPS "HorizontalSplitPositionTwips" #define SC_VERTICALSPLITPOSITION_TWIPS "VerticalSplitPositionTwips" -#define SC_ACTIVESPLITRANGE "ActiveSplitRange" -#define SC_POSITIONLEFT "PositionLeft" -#define SC_POSITIONRIGHT "PositionRight" -#define SC_POSITIONTOP "PositionTop" -#define SC_POSITIONBOTTOM "PositionBottom" +#define SC_ACTIVESPLITRANGE "ActiveSplitRange" +#define SC_POSITIONLEFT "PositionLeft" +#define SC_POSITIONRIGHT "PositionRight" +#define SC_POSITIONTOP "PositionTop" +#define SC_POSITIONBOTTOM "PositionBottom" #define SC_TABLESELECTED "TableSelected" -#define SC_TABLES "Tables" -#define SC_ACTIVETABLE "ActiveTable" -#define SC_HORIZONTALSCROLLBARWIDTH "HorizontalScrollbarWidth" +#define SC_TABLES "Tables" +#define SC_ACTIVETABLE "ActiveTable" +#define SC_HORIZONTALSCROLLBARWIDTH "HorizontalScrollbarWidth" #define SC_RELHORIZONTALTABBARWIDTH "RelativeHorizontalTabbarWidth" -#define SC_ZOOMTYPE "ZoomType" -#define SC_ZOOMVALUE "ZoomValue" -#define SC_PAGEVIEWZOOMVALUE "PageViewZoomValue" +#define SC_ZOOMTYPE "ZoomType" +#define SC_ZOOMVALUE "ZoomValue" +#define SC_PAGEVIEWZOOMVALUE "PageViewZoomValue" #define SC_SHOWPAGEBREAKPREVIEW "ShowPageBreakPreview" -#define SC_VIEWID "ViewId" -#define SC_VIEW "view" +#define SC_VIEWID "ViewId" +#define SC_VIEW "view" #endif diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index 02756974c17d..30bc58eeb1d1 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ class ScAddInCfg : public utl::ConfigItem public: ScAddInCfg(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Commit(); com::sun::star::uno::Sequence< com::sun::star::uno::Any> GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) @@ -47,8 +47,8 @@ public: using ConfigItem::GetNodeNames; -// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) -// { return ConfigItem::GetNodeNames( rNode ); } +// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) +// { return ConfigItem::GetNodeNames( rNode ); } }; diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index e59d076a7c10..7055f700286f 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,18 +59,18 @@ typedef ::std::hash_map< String, const ScUnoAddInFuncData*, ScStringHashCode, :: enum ScAddInArgumentType { - SC_ADDINARG_NONE, // - - SC_ADDINARG_INTEGER, // long - SC_ADDINARG_DOUBLE, // double - SC_ADDINARG_STRING, // string - SC_ADDINARG_INTEGER_ARRAY, // sequence<sequence<long>> - SC_ADDINARG_DOUBLE_ARRAY, // sequence<sequence<double>> - SC_ADDINARG_STRING_ARRAY, // sequence<sequence<string>> - SC_ADDINARG_MIXED_ARRAY, // sequence<sequence<any>> - SC_ADDINARG_VALUE_OR_ARRAY, // any - SC_ADDINARG_CELLRANGE, // XCellRange - SC_ADDINARG_CALLER, // XPropertySet - SC_ADDINARG_VARARGS // sequence<any> + SC_ADDINARG_NONE, // - + SC_ADDINARG_INTEGER, // long + SC_ADDINARG_DOUBLE, // double + SC_ADDINARG_STRING, // string + SC_ADDINARG_INTEGER_ARRAY, // sequence<sequence<long>> + SC_ADDINARG_DOUBLE_ARRAY, // sequence<sequence<double>> + SC_ADDINARG_STRING_ARRAY, // sequence<sequence<string>> + SC_ADDINARG_MIXED_ARRAY, // sequence<sequence<any>> + SC_ADDINARG_VALUE_OR_ARRAY, // any + SC_ADDINARG_CELLRANGE, // XCellRange + SC_ADDINARG_CALLER, // XPropertySet + SC_ADDINARG_VARARGS // sequence<any> }; //------------------------------------------------------------------------ @@ -142,16 +142,16 @@ public: class SC_DLLPUBLIC ScUnoAddInCollection { private: - long nFuncCount; - ScUnoAddInFuncData** ppFuncData; + long nFuncCount; + ScUnoAddInFuncData** ppFuncData; ScAddInHashMap* pExactHashMap; // exact internal name ScAddInHashMap* pNameHashMap; // internal name upper ScAddInHashMap* pLocalHashMap; // localized name upper - BOOL bInitialized; + BOOL bInitialized; - void Initialize(); + void Initialize(); void ReadConfiguration(); - void ReadFromAddIn( const com::sun::star::uno::Reference< + void ReadFromAddIn( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xInterface ); void UpdateFromAddIn( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xInterface, @@ -163,7 +163,7 @@ public: ~ScUnoAddInCollection(); /// User enetered name. rUpperName MUST already be upper case! - String FindFunction( const String& rUpperName, BOOL bLocalFirst ); + String FindFunction( const String& rUpperName, BOOL bLocalFirst ); // rName is the exact Name. // Only if bComplete is set, the function reference and argument types @@ -178,15 +178,15 @@ public: void Clear(); - void LocalizeString( String& rName ); // modify rName - input: exact name + void LocalizeString( String& rName ); // modify rName - input: exact name - long GetFuncCount(); - BOOL FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); + long GetFuncCount(); + BOOL FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ); static BOOL FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ); - BOOL GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName ); - BOOL GetCalcName( const String& rExcelName, String& rRetCalcName ); + BOOL GetExcelName( const String& rCalcName, LanguageType eDestLang, String& rRetExcelName ); + BOOL GetCalcName( const String& rExcelName, String& rRetCalcName ); // both leave rRet... unchanged, if no matching name is found }; @@ -194,20 +194,20 @@ public: class ScUnoAddInCall { private: - const ScUnoAddInFuncData* pFuncData; - com::sun::star::uno::Sequence<com::sun::star::uno::Any> aArgs; - com::sun::star::uno::Sequence<com::sun::star::uno::Any> aVarArg; - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xCaller; - BOOL bValidCount; + const ScUnoAddInFuncData* pFuncData; + com::sun::star::uno::Sequence<com::sun::star::uno::Any> aArgs; + com::sun::star::uno::Sequence<com::sun::star::uno::Any> aVarArg; + com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xCaller; + BOOL bValidCount; // result: - USHORT nErrCode; - BOOL bHasString; - double fValue; - String aString; - ScMatrixRef xMatrix; + USHORT nErrCode; + BOOL bHasString; + double fValue; + String aString; + ScMatrixRef xMatrix; com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVarRes; - void ExecuteCallWithArgs( + void ExecuteCallWithArgs( com::sun::star::uno::Sequence<com::sun::star::uno::Any>& rCallArgs); public: @@ -216,28 +216,28 @@ public: long nParamCount ); ~ScUnoAddInCall(); - BOOL NeedsCaller() const; - void SetCaller( const com::sun::star::uno::Reference< + BOOL NeedsCaller() const; + void SetCaller( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& rInterface ); - void SetCallerFromObjectShell( SfxObjectShell* pSh ); + void SetCallerFromObjectShell( SfxObjectShell* pSh ); - BOOL ValidParamCount(); - ScAddInArgumentType GetArgType( long nPos ); - void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); + BOOL ValidParamCount(); + ScAddInArgumentType GetArgType( long nPos ); + void SetParam( long nPos, const com::sun::star::uno::Any& rValue ); - void ExecuteCall(); + void ExecuteCall(); - void SetResult( const com::sun::star::uno::Any& rNewRes ); + void SetResult( const com::sun::star::uno::Any& rNewRes ); - USHORT GetErrCode() const { return nErrCode; } - BOOL HasString() const { return bHasString; } - BOOL HasMatrix() const { return ( xMatrix.Is() ); } - BOOL HasVarRes() const { return ( xVarRes.is() ); } - double GetValue() const { return fValue; } - const String& GetString() const { return aString; } - ScMatrixRef GetMatrix() const { return xMatrix; } + USHORT GetErrCode() const { return nErrCode; } + BOOL HasString() const { return bHasString; } + BOOL HasMatrix() const { return ( xMatrix.Is() ); } + BOOL HasVarRes() const { return ( xVarRes.is() ); } + double GetValue() const { return fValue; } + const String& GetString() const { return aString; } + ScMatrixRef GetMatrix() const { return xMatrix; } com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> - GetVarRes() const { return xVarRes; } + GetVarRes() const { return xVarRes; } }; diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index c5bf78960c65..bd8c23ac626f 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,7 +26,7 @@ * ************************************************************************/ -#ifndef SC_ADDRESS_HXX +#ifndef SC_ADDRESS_HXX #define SC_ADDRESS_HXX #include <tools/stream.hxx> @@ -83,7 +83,7 @@ const SCSIZE SCSIZE_MAX = ::std::numeric_limits<SCSIZE>::max(); // A define to handle critical sections we hopefully don't need very often. #define SC_ROWLIMIT_MORE_THAN_32K 1 /* set to 1 if we throw the switch */ -// The maximum values. Defines are needed for preprocessor checks, for example +// The maximum values. Defines are needed for preprocessor checks, for example // in bcaslot.cxx, otherwise type safe constants are preferred. //#define MAXROWCOUNT_DEFINE 65536 #define MAXROWCOUNT_DEFINE 1048576 @@ -266,7 +266,7 @@ public: enum Uninitialized { UNINITIALIZED }; enum InitializeInvalid { INITIALIZE_INVALID }; - + struct Details { formula::FormulaGrammar::AddressConvention eConv; SCROW nRow; @@ -324,7 +324,7 @@ public: inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, + SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL, const Details& rDetails = detailsOOOa1, ExternalInfo* pExtInfo = NULL, const ::com::sun::star::uno::Sequence< @@ -499,24 +499,24 @@ public: SC_DLLPUBLIC USHORT ParseRows( const String&, ScDocument* = NULL, const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ); - /** Parse an Excel style reference up to and including the sheet name - separator '!', including detection of external documents and sheet - names, and in case of MOOXML import the bracketed index is used to - determine the actual document name passed in pExternalLinks. For - internal references (resulting rExternDocName empty), aStart.nTab and + /** Parse an Excel style reference up to and including the sheet name + separator '!', including detection of external documents and sheet + names, and in case of MOOXML import the bracketed index is used to + determine the actual document name passed in pExternalLinks. For + internal references (resulting rExternDocName empty), aStart.nTab and aEnd.nTab are set, or -1 if sheet name not found. - @param bOnlyAcceptSingle If <TRUE/>, a 3D reference (Sheet1:Sheet2) + @param bOnlyAcceptSingle If <TRUE/>, a 3D reference (Sheet1:Sheet2) encountered results in an error (NULL returned). - @param pExternalLinks pointer to ExternalLinkInfo sequence, may be - NULL for non-filter usage, in which case indices such as [1] are + @param pExternalLinks pointer to ExternalLinkInfo sequence, may be + NULL for non-filter usage, in which case indices such as [1] are not resolved. @returns - Pointer to the position after '!' if successfully parsed, and - rExternDocName, rStartTabName and/or rEndTabName filled if + Pointer to the position after '!' if successfully parsed, and + rExternDocName, rStartTabName and/or rEndTabName filled if applicable. SCA_... flags set in nFlags. - Or if no valid document and/or sheet header could be parsed the start + Or if no valid document and/or sheet header could be parsed the start position passed with pString. - Or NULL if a 3D sheet header could be parsed but + Or NULL if a 3D sheet header could be parsed but bOnlyAcceptSingle==true was given. */ const sal_Unicode* Parse_XL_Header( const sal_Unicode* pString, const ScDocument* pDoc, diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index ee059463e807..a60b8bc7c663 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 983f3cf130d9..7a98ea73bcf7 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ class ScAutoFormatFieldObj; class ScAutoFormatObj; -#define SC_AFMTOBJ_INVALID USHRT_MAX +#define SC_AFMTOBJ_INVALID USHRT_MAX ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL @@ -68,30 +68,30 @@ class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo > { private: - ScAutoFormatObj* GetObjectByIndex_Impl(USHORT nIndex); - ScAutoFormatObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScAutoFormatObj* GetObjectByIndex_Impl(USHORT nIndex); + ScAutoFormatObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScAutoFormatsObj(); - virtual ~ScAutoFormatsObj(); + virtual ~ScAutoFormatsObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -144,20 +144,20 @@ class ScAutoFormatObj : public ::cppu::WeakImplHelper6< public SfxListener { private: - SfxItemPropertySet aPropSet; - USHORT nFormatIndex; + SfxItemPropertySet aPropSet; + USHORT nFormatIndex; - ScAutoFormatFieldObj* GetObjectByIndex_Impl(USHORT nIndex); + ScAutoFormatFieldObj* GetObjectByIndex_Impl(USHORT nIndex); public: ScAutoFormatObj(USHORT nIndex); - virtual ~ScAutoFormatObj(); + virtual ~ScAutoFormatObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // per getImplementation gerufen: - sal_Bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } - void InitFormat( USHORT nNewIndex ); + sal_Bool IsInserted() const { return nFormatIndex != SC_AFMTOBJ_INVALID; } + void InitFormat( USHORT nNewIndex ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -177,14 +177,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -196,25 +196,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -246,21 +246,21 @@ class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2< public SfxListener { private: - SfxItemPropertySet aPropSet; - USHORT nFormatIndex; - USHORT nFieldIndex; + SfxItemPropertySet aPropSet; + USHORT nFormatIndex; + USHORT nFieldIndex; public: ScAutoFormatFieldObj(USHORT nFormat, USHORT nField); - virtual ~ScAutoFormatFieldObj(); + virtual ~ScAutoFormatFieldObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -272,25 +272,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index e7c017f0785d..681dd8de6e18 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,20 +62,20 @@ class ScSpreadsheetSettings : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo> { private: - SfxItemPropertySet aPropSet; + SfxItemPropertySet aPropSet; public: ScSpreadsheetSettings(); - virtual ~ScSpreadsheetSettings(); + virtual ~ScSpreadsheetSettings(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -87,25 +87,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -128,9 +128,9 @@ class ScRecentFunctionsObj : public cppu::WeakImplHelper2< { public: ScRecentFunctionsObj(); - virtual ~ScRecentFunctionsObj(); + virtual ~ScRecentFunctionsObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); // XRecentFunctions @@ -160,9 +160,9 @@ class ScFunctionListObj : public cppu::WeakImplHelper4< { public: ScFunctionListObj(); - virtual ~ScFunctionListObj(); + virtual ~ScFunctionListObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); // XFunctionDescriptions diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 673e332a5b96..86b7cf6407c4 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,91 +43,91 @@ public: ScAppOptions( const ScAppOptions& rCpy ); ~ScAppOptions(); - void SetDefaults(); + void SetDefaults(); // Set or get the initial tab count for new spreadsheet, it is used by VBA API currently. - void SetTabCountInNewSpreadsheet( sal_Int16 nCount ) { nTabCountInNewSpreadsheet = nCount; } - sal_Int16 GetTabCountInNewSpreadsheet() const { return nTabCountInNewSpreadsheet; } - - void SetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; } - FieldUnit GetAppMetric() const { return eMetric; } - void SetZoom( USHORT nNew ) { nZoom = nNew; } - USHORT GetZoom() const { return nZoom; } - void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; } - SvxZoomType GetZoomType() const { return eZoomType; } + void SetTabCountInNewSpreadsheet( sal_Int16 nCount ) { nTabCountInNewSpreadsheet = nCount; } + sal_Int16 GetTabCountInNewSpreadsheet() const { return nTabCountInNewSpreadsheet; } + + void SetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; } + FieldUnit GetAppMetric() const { return eMetric; } + void SetZoom( USHORT nNew ) { nZoom = nNew; } + USHORT GetZoom() const { return nZoom; } + void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; } + SvxZoomType GetZoomType() const { return eZoomType; } void SetSynchronizeZoom( BOOL bNew ) { bSynchronizeZoom = bNew; } BOOL GetSynchronizeZoom() const { return bSynchronizeZoom; } - USHORT GetLRUFuncListCount() const { return nLRUFuncCount; } - USHORT* GetLRUFuncList() const { return pLRUList; } - void SetLRUFuncList( const USHORT* pList, + USHORT GetLRUFuncListCount() const { return nLRUFuncCount; } + USHORT* GetLRUFuncList() const { return pLRUList; } + void SetLRUFuncList( const USHORT* pList, const USHORT nCount ); - void SetStatusFunc( USHORT nNew ) { nStatusFunc = nNew; } - USHORT GetStatusFunc() const { return nStatusFunc; } - void SetAutoComplete( BOOL bNew ) { bAutoComplete = bNew; } - BOOL GetAutoComplete() const { return bAutoComplete; } - void SetDetectiveAuto( BOOL bNew ) { bDetectiveAuto = bNew; } - BOOL GetDetectiveAuto() const { return bDetectiveAuto; } - - void SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; } - sal_uInt32 GetTrackContentColor() const { return nTrackContentColor; } - void SetTrackInsertColor(sal_uInt32 nNew) { nTrackInsertColor = nNew; } - sal_uInt32 GetTrackInsertColor() const { return nTrackInsertColor; } - void SetTrackDeleteColor(sal_uInt32 nNew) { nTrackDeleteColor = nNew; } - sal_uInt32 GetTrackDeleteColor() const { return nTrackDeleteColor; } - void SetTrackMoveColor(sal_uInt32 nNew) { nTrackMoveColor = nNew; } - sal_uInt32 GetTrackMoveColor() const { return nTrackMoveColor; } - - ScLkUpdMode GetLinkMode() const { return eLinkMode ;} - void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} - - void SetDefaultObjectSizeWidth(INT32 nNew) { nDefaultObjectSizeWidth = nNew; } - INT32 GetDefaultObjectSizeWidth() const { return nDefaultObjectSizeWidth; } - void SetDefaultObjectSizeHeight(INT32 nNew) { nDefaultObjectSizeHeight = nNew; } - INT32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; } + void SetStatusFunc( USHORT nNew ) { nStatusFunc = nNew; } + USHORT GetStatusFunc() const { return nStatusFunc; } + void SetAutoComplete( BOOL bNew ) { bAutoComplete = bNew; } + BOOL GetAutoComplete() const { return bAutoComplete; } + void SetDetectiveAuto( BOOL bNew ) { bDetectiveAuto = bNew; } + BOOL GetDetectiveAuto() const { return bDetectiveAuto; } + + void SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; } + sal_uInt32 GetTrackContentColor() const { return nTrackContentColor; } + void SetTrackInsertColor(sal_uInt32 nNew) { nTrackInsertColor = nNew; } + sal_uInt32 GetTrackInsertColor() const { return nTrackInsertColor; } + void SetTrackDeleteColor(sal_uInt32 nNew) { nTrackDeleteColor = nNew; } + sal_uInt32 GetTrackDeleteColor() const { return nTrackDeleteColor; } + void SetTrackMoveColor(sal_uInt32 nNew) { nTrackMoveColor = nNew; } + sal_uInt32 GetTrackMoveColor() const { return nTrackMoveColor; } + + ScLkUpdMode GetLinkMode() const { return eLinkMode ;} + void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} + + void SetDefaultObjectSizeWidth(INT32 nNew) { nDefaultObjectSizeWidth = nNew; } + INT32 GetDefaultObjectSizeWidth() const { return nDefaultObjectSizeWidth; } + void SetDefaultObjectSizeHeight(INT32 nNew) { nDefaultObjectSizeHeight = nNew; } + INT32 GetDefaultObjectSizeHeight() const { return nDefaultObjectSizeHeight; } void SetShowSharedDocumentWarning( BOOL bNew ) { mbShowSharedDocumentWarning = bNew; } BOOL GetShowSharedDocumentWarning() const { return mbShowSharedDocumentWarning; } - const ScAppOptions& operator= ( const ScAppOptions& rOpt ); + const ScAppOptions& operator= ( const ScAppOptions& rOpt ); private: - sal_Int16 nTabCountInNewSpreadsheet; - FieldUnit eMetric; - USHORT nLRUFuncCount; - USHORT* pLRUList; + sal_Int16 nTabCountInNewSpreadsheet; + FieldUnit eMetric; + USHORT nLRUFuncCount; + USHORT* pLRUList; SvxZoomType eZoomType; - USHORT nZoom; + USHORT nZoom; BOOL bSynchronizeZoom; - USHORT nStatusFunc; - BOOL bAutoComplete; - BOOL bDetectiveAuto; - sal_uInt32 nTrackContentColor; - sal_uInt32 nTrackInsertColor; - sal_uInt32 nTrackDeleteColor; - sal_uInt32 nTrackMoveColor; + USHORT nStatusFunc; + BOOL bAutoComplete; + BOOL bDetectiveAuto; + sal_uInt32 nTrackContentColor; + sal_uInt32 nTrackInsertColor; + sal_uInt32 nTrackDeleteColor; + sal_uInt32 nTrackMoveColor; ScLkUpdMode eLinkMode; - INT32 nDefaultObjectSizeWidth; - INT32 nDefaultObjectSizeHeight; + INT32 nDefaultObjectSizeWidth; + INT32 nDefaultObjectSizeHeight; BOOL mbShowSharedDocumentWarning; }; //================================================================== -// Config Item containing app options +// Config Item containing app options //================================================================== class ScAppCfg : public ScAppOptions { - // spread about 5 config paths - //! split ScAppOptions into different classes + // spread about 5 config paths + //! split ScAppOptions into different classes - ScLinkConfigItem aLayoutItem; - ScLinkConfigItem aInputItem; - ScLinkConfigItem aRevisionItem; - ScLinkConfigItem aContentItem; - ScLinkConfigItem aSortListItem; - ScLinkConfigItem aMiscItem; + ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aInputItem; + ScLinkConfigItem aRevisionItem; + ScLinkConfigItem aContentItem; + ScLinkConfigItem aSortListItem; + ScLinkConfigItem aMiscItem; DECL_LINK( LayoutCommitHdl, void* ); DECL_LINK( InputCommitHdl, void* ); @@ -146,8 +146,8 @@ class ScAppCfg : public ScAppOptions public: ScAppCfg(); - void SetOptions( const ScAppOptions& rNew ); - void OptionsChanged(); // after direct access to ScAppOptions base class + void SetOptions( const ScAppOptions& rNew ); + void OptionsChanged(); // after direct access to ScAppOptions base class }; diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 832bc61cb332..ac4675429f5e 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ private: BOOL bInCreate; BOOL bDoInsert; // wird fuer das erste Update auf FALSE gesetzt - BOOL FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); + BOOL FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const String& rAreaName ); public: TYPEINFO(); @@ -68,23 +68,23 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - BOOL Refresh( const String& rNewFile, const String& rNewFilter, + BOOL Refresh( const String& rNewFile, const String& rNewFilter, const String& rNewArea, ULONG nNewRefresh ); - void SetInCreate(BOOL bSet) { bInCreate = bSet; } - void SetDoInsert(BOOL bSet) { bDoInsert = bSet; } - void SetDestArea(const ScRange& rNew); - void SetSource(const String& rDoc, const String& rFlt, const String& rOpt, + void SetInCreate(BOOL bSet) { bInCreate = bSet; } + void SetDoInsert(BOOL bSet) { bDoInsert = bSet; } + void SetDestArea(const ScRange& rNew); + void SetSource(const String& rDoc, const String& rFlt, const String& rOpt, const String& rArea); - BOOL IsEqual( const String& rFile, const String& rFilter, const String& rOpt, + BOOL IsEqual( const String& rFile, const String& rFilter, const String& rOpt, const String& rSource, const ScRange& rDest ) const; - const String& GetFile() const { return aFileName; } - const String& GetFilter() const { return aFilterName; } - const String& GetOptions() const { return aOptions; } - const String& GetSource() const { return aSourceArea; } - const ScRange& GetDestArea() const { return aDestArea; } + const String& GetFile() const { return aFileName; } + const String& GetFilter() const { return aFilterName; } + const String& GetOptions() const { return aOptions; } + const String& GetSource() const { return aSourceArea; } + const ScRange& GetDestArea() const { return aDestArea; } DECL_LINK( RefreshHdl, ScAreaLink* ); DECL_LINK( AreaEndEditHdl, void* ); diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 3ea416fabada..fab7e0ff5d0f 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,20 +46,20 @@ class SvxBorderLine; class SvxBoxItem; class SvxBoxInfoItem; -#define SC_LINE_EMPTY 0 -#define SC_LINE_SET 1 -#define SC_LINE_DONTCARE 2 +#define SC_LINE_EMPTY 0 +#define SC_LINE_SET 1 +#define SC_LINE_DONTCARE 2 #define SC_ATTRARRAY_DELTA 4 struct ScLineFlags { - BYTE nLeft; - BYTE nRight; - BYTE nTop; - BYTE nBottom; - BYTE nHori; - BYTE nVert; + BYTE nLeft; + BYTE nRight; + BYTE nTop; + BYTE nBottom; + BYTE nHori; + BYTE nVert; ScLineFlags() : nLeft(SC_LINE_EMPTY),nRight(SC_LINE_EMPTY),nTop(SC_LINE_EMPTY), nBottom(SC_LINE_EMPTY),nHori(SC_LINE_EMPTY),nVert(SC_LINE_EMPTY) {} @@ -76,23 +76,23 @@ struct ScMergePatternState struct ScAttrEntry { - SCROW nRow; - const ScPatternAttr* pPattern; + SCROW nRow; + const ScPatternAttr* pPattern; }; class ScAttrArray { private: - SCCOL nCol; - SCTAB nTab; - ScDocument* pDocument; + SCCOL nCol; + SCTAB nTab; + ScDocument* pDocument; - SCSIZE nCount; + SCSIZE nCount; SCSIZE nLimit; - ScAttrEntry* pData; + ScAttrEntry* pData; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScAttrIterator; friend class ScHorizontalAttrIterator; @@ -100,7 +100,7 @@ friend void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr, SCROW& nAttrEndRow, const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc ); - BOOL ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + BOOL ApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ); @@ -111,103 +111,103 @@ public: ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ); ~ScAttrArray(); - void SetTab(SCTAB nNewTab) { nTab = nNewTab; } - void SetCol(SCCOL nNewCol) { nCol = nNewCol; } + void SetTab(SCTAB nNewTab) { nTab = nNewTab; } + void SetCol(SCCOL nNewCol) { nCol = nNewCol; } #ifdef DBG_UTIL - void TestData() const; + void TestData() const; #endif - void Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE ); - BOOL Concat(SCSIZE nPos); + void Reset( const ScPatternAttr* pPattern, BOOL bAlloc = TRUE ); + BOOL Concat(SCSIZE nPos); const ScPatternAttr* GetPattern( SCROW nRow ) const; const ScPatternAttr* GetPatternRange( SCROW& rStartRow, SCROW& rEndRow, SCROW nRow ) const; - void MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, BOOL bDeep ) const; + void MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, BOOL bDeep ) const; - void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, + void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const; - void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); - void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); - void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, + void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE ); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern, BOOL bPutToPool = FALSE, ScEditDataArray* pDataArray = NULL ); - void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); - void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, + void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ); + void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, ScEditDataArray* pDataArray = NULL ); bool SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize); - void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, + void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, const SvxBorderLine* pLine, BOOL bColorOnly ); - void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); - void ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); + void ChangeIndent( SCROW nStartRow, SCROW nEndRow, BOOL bIncrement ); /// Including current, may return -1 - SCsROW GetNextUnprotected( SCsROW nRow, BOOL bUp ) const; + SCsROW GetNextUnprotected( SCsROW nRow, BOOL bUp ) const; /// May return -1 if not found - SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, + SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, BOOL bUp, ScMarkArray* pMarkArray = NULL ); - BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, + BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, BOOL bUp, ScMarkArray* pMarkArray = NULL ); - BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; - BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, + BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, BOOL bLeft, BOOL bRight ) const; bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, + BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, BOOL bRefresh, BOOL bAttrs ); - BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); + BOOL RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow ); - void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); - void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, + void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow); + void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pWantedPattern, BOOL bDefault ); - void CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ); + void CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray ); - BOOL IsEmpty() const; + BOOL IsEmpty() const; BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const; - BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsVisibleEqual( const ScAttrArray& rOther, + BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; + BOOL IsVisibleEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; - - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; - BOOL TestInsertRow( SCSIZE nSize ) const; - void InsertRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ); - void DeleteArea( SCROW nStartRow, SCROW nEndRow ); - void MoveTo( SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray ); - void CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, + BOOL IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const; + + BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; + BOOL TestInsertRow( SCSIZE nSize ) const; + void InsertRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ); + void DeleteArea( SCROW nStartRow, SCROW nEndRow ); + void MoveTo( SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray ); + void CopyArea( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttrArray& rAttrArray, INT16 nStripFlags = 0 ); - void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); + void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); }; -// ------------------------------------------------------------------------------ -// Iterator fuer Attribute -// ------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------ +// Iterator fuer Attribute +// ------------------------------------------------------------------------------ class ScAttrIterator { - const ScAttrArray* pArray; - SCSIZE nPos; - SCROW nRow; - SCROW nEndRow; + const ScAttrArray* pArray; + SCSIZE nPos; + SCROW nRow; + SCROW nEndRow; public: - inline ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStart, SCROW nEnd ); - inline const ScPatternAttr* Next( SCROW& rTop, SCROW& rBottom ); - SCROW GetNextRow() const { return nRow; } + inline ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStart, SCROW nEnd ); + inline const ScPatternAttr* Next( SCROW& rTop, SCROW& rBottom ); + SCROW GetNextRow() const { return nRow; } }; @@ -222,7 +222,7 @@ inline ScAttrIterator::ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStar nPos = 0; } -inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom ) +inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom ) { const ScPatternAttr* pRet; if ( nPos < pArray->nCount && nRow <= nEndRow ) diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 784638e64956..7ab362f63752 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #define SC_MF_BUTTON 0x0008 /// field button for datapilot #define SC_MF_SCENARIO 0x0010 #define SC_MF_BUTTON_POPUP 0x0020 /// dp button with popup arrow -#define SC_MF_HIDDEN_MEMBER 0x0040 /// dp field button with presence of hidden member +#define SC_MF_HIDDEN_MEMBER 0x0040 /// dp field button with presence of hidden member #define SC_MF_DP_TABLE 0x0080 /// dp table output #define SC_MF_ALL 0x00FF @@ -70,7 +70,7 @@ public: ScMergeAttr( const ScMergeAttr& ); ~ScMergeAttr(); - virtual String GetValueText() const; + virtual String GetValueText() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -79,7 +79,7 @@ public: SCsCOL GetColMerge() const {return nColMerge; } SCsROW GetRowMerge() const {return nRowMerge; } - BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; } + BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; } inline ScMergeAttr& operator=(const ScMergeAttr& rMerge) { @@ -98,15 +98,15 @@ public: ScMergeFlagAttr(INT16 nFlags); ~ScMergeFlagAttr(); - BOOL IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } - BOOL IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } - BOOL IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; } + BOOL IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; } + BOOL IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; } + BOOL IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; } - BOOL HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; } - BOOL HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; } + BOOL HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; } + BOOL HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; } bool HasDPTable() const { return ( GetValue() & SC_MF_DP_TABLE ) != 0; } - BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; } + BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; } }; //------------------------------------------------------------------------ @@ -126,7 +126,7 @@ public: ScProtectionAttr( const ScProtectionAttr& ); ~ScProtectionAttr(); - virtual String GetValueText() const; + virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -138,8 +138,8 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); BOOL GetProtection() const { return bProtection; } BOOL SetProtection( BOOL bProtect); @@ -163,41 +163,41 @@ public: //---------------------------------------------------------------------------- // ScRangeItem: verwaltet einen Tabellenbereich -#define SCR_INVALID 0x01 -#define SCR_ALLTABS 0x02 -#define SCR_TONEWTAB 0x04 +#define SCR_INVALID 0x01 +#define SCR_ALLTABS 0x02 +#define SCR_TONEWTAB 0x04 class ScRangeItem : public SfxPoolItem { public: TYPEINFO(); - inline ScRangeItem( const USHORT nWhich ); - inline ScRangeItem( const USHORT nWhich, + inline ScRangeItem( const USHORT nWhich ); + inline ScRangeItem( const USHORT nWhich, const ScRange& rRange, - const USHORT nNewFlags = 0 ); - inline ScRangeItem( const ScRangeItem& rCpy ); + const USHORT nNewFlags = 0 ); + inline ScRangeItem( const ScRangeItem& rCpy ); inline ScRangeItem& operator=( const ScRangeItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScRange& GetRange() const { return aRange; } - void SetRange( const ScRange& rNew ) { aRange = rNew; } + const ScRange& GetRange() const { return aRange; } + void SetRange( const ScRange& rNew ) { aRange = rNew; } - USHORT GetFlags() const { return nFlags; } - void SetFlags( USHORT nNew ) { nFlags = nNew; } + USHORT GetFlags() const { return nFlags; } + void SetFlags( USHORT nNew ) { nFlags = nNew; } private: ScRange aRange; - USHORT nFlags; + USHORT nFlags; }; inline ScRangeItem::ScRangeItem( const USHORT nWhichP ) @@ -207,7 +207,7 @@ inline ScRangeItem::ScRangeItem( const USHORT nWhichP ) inline ScRangeItem::ScRangeItem( const USHORT nWhichP, const ScRange& rRange, - const USHORT nNew ) + const USHORT nNew ) : SfxPoolItem( nWhichP ), aRange( rRange ), nFlags( nNew ) { } @@ -230,20 +230,20 @@ class ScTableListItem : public SfxPoolItem public: TYPEINFO(); - inline ScTableListItem( const USHORT nWhich ); + inline ScTableListItem( const USHORT nWhich ); ScTableListItem( const ScTableListItem& rCpy ); ~ScTableListItem(); ScTableListItem& operator=( const ScTableListItem &rCpy ); // "pure virtual Methoden" vom SfxPoolItem - virtual int operator==( const SfxPoolItem& ) const; + virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; public: USHORT nCount; @@ -279,12 +279,12 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - const EditTextObject* GetLeftArea() const { return pLeftArea; } - const EditTextObject* GetCenterArea() const { return pCenterArea; } - const EditTextObject* GetRightArea() const { return pRightArea; } + const EditTextObject* GetLeftArea() const { return pLeftArea; } + const EditTextObject* GetCenterArea() const { return pCenterArea; } + const EditTextObject* GetRightArea() const { return pRightArea; } void SetLeftArea( const EditTextObject& rNew ); void SetCenterArea( const EditTextObject& rNew ); @@ -307,11 +307,11 @@ public: ScViewObjectModeItem( USHORT nWhich, ScVObjMode eMode ); ~ScViewObjectModeItem(); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual USHORT GetValueCount() const; + virtual String GetValueText( USHORT nVal ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Create(SvStream &, USHORT) const; + virtual USHORT GetVersion( USHORT nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -336,12 +336,12 @@ public: virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - double GetValue() const { return nValue; } + double GetValue() const { return nValue; } void SetValue( const double nVal ) { nValue = nVal;} private: - double nValue; + double nValue; }; diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index 3fb6d197717f..027b0466441d 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx index 3fbbe8d3fe78..3f1180c934c4 100644 --- a/sc/inc/autonamecache.hxx +++ b/sc/inc/autonamecache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ typedef ::std::hash_map< String, ScAutoNameAddresses, ScStringHashCode, ::std::e // Cache for faster lookup of automatic names during CompileXML // (during CompileXML, no document content is changed) // - + class ScAutoNameCache { ScAutoNameHashMap aNames; diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index ac92d30a27cf..c74f765af0f6 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ static const INT32 nInt32Max = 0x7fffffff; class ScBigAddress { - INT32 nRow; - INT32 nCol; - INT32 nTab; + INT32 nRow; + INT32 nCol; + INT32 nTab; public: ScBigAddress() : nRow(0), nCol(0), nTab(0) {} @@ -53,33 +53,33 @@ public: ScBigAddress( const ScAddress& r ) : nRow( r.Row() ), nCol( r.Col() ), nTab( r.Tab() ) {} - INT32 Col() const { return nCol; } - INT32 Row() const { return nRow; } - INT32 Tab() const { return nTab; } + INT32 Col() const { return nCol; } + INT32 Row() const { return nRow; } + INT32 Tab() const { return nTab; } - void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) + void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) { nCol = nColP; nRow = nRowP; nTab = nTabP; } - void SetCol( INT32 nColP ) { nCol = nColP; } - void SetRow( INT32 nRowP ) { nRow = nRowP; } - void SetTab( INT32 nTabP ) { nTab = nTabP; } - void IncCol( INT32 n = 1 ) { nCol += n; } - void IncRow( INT32 n = 1 ) { nRow += n; } - void IncTab( INT32 n = 1 ) { nTab += n; } - - void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const + void SetCol( INT32 nColP ) { nCol = nColP; } + void SetRow( INT32 nRowP ) { nRow = nRowP; } + void SetTab( INT32 nTabP ) { nTab = nTabP; } + void IncCol( INT32 n = 1 ) { nCol += n; } + void IncRow( INT32 n = 1 ) { nRow += n; } + void IncTab( INT32 n = 1 ) { nTab += n; } + + void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - inline void PutInOrder( ScBigAddress& r ); - inline BOOL IsValid( const ScDocument* ) const; - inline ScAddress MakeAddress() const; + inline void PutInOrder( ScBigAddress& r ); + inline BOOL IsValid( const ScDocument* ) const; + inline ScAddress MakeAddress() const; - ScBigAddress& operator=( const ScBigAddress& r ) + ScBigAddress& operator=( const ScBigAddress& r ) { nCol = r.nCol; nRow = r.nRow; nTab = r.nTab; return *this; } - ScBigAddress& operator=( const ScAddress& r ) + ScBigAddress& operator=( const ScAddress& r ) { nCol = r.Col(); nRow = r.Row(); nTab = r.Tab(); return *this; } - int operator==( const ScBigAddress& r ) const + int operator==( const ScBigAddress& r ) const { return nCol == r.nCol && nRow == r.nRow && nTab == r.nTab; } - int operator!=( const ScBigAddress& r ) const + int operator!=( const ScBigAddress& r ) const { return !operator==( r ); } friend inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr ); @@ -112,7 +112,7 @@ inline void ScBigAddress::PutInOrder( ScBigAddress& r ) inline BOOL ScBigAddress::IsValid( const ScDocument* pDoc ) const -{ //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab +{ //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab return ((0 <= nCol && nCol <= MAXCOL) || nCol == nInt32Min || nCol == nInt32Max) && @@ -173,8 +173,8 @@ class ScBigRange { public: - ScBigAddress aStart; - ScBigAddress aEnd; + ScBigAddress aStart; + ScBigAddress aEnd; ScBigRange() : aStart(), aEnd() {} ScBigRange( const ScBigAddress& s, const ScBigAddress& e ) @@ -194,31 +194,31 @@ public: : aStart( nCol1, nRow1, nTab1 ), aEnd( nCol2, nRow2, nTab2 ) {} - void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, + void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, INT32 nCol2, INT32 nRow2, INT32 nTab2 ) { aStart.Set( nCol1, nRow1, nTab1 ); aEnd.Set( nCol2, nRow2, nTab2 ); } - void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, + void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, INT32& nCol2, INT32& nRow2, INT32& nTab2 ) const { aStart.GetVars( nCol1, nRow1, nTab1 ); aEnd.GetVars( nCol2, nRow2, nTab2 ); } - BOOL IsValid( const ScDocument* pDoc ) const + BOOL IsValid( const ScDocument* pDoc ) const { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); } - inline ScRange MakeRange() const + inline ScRange MakeRange() const { return ScRange( aStart.MakeAddress(), aEnd.MakeAddress() ); } - inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? - inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? - inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? + inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? + inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? + inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? - ScBigRange& operator=( const ScBigRange& r ) + ScBigRange& operator=( const ScBigRange& r ) { aStart = r.aStart; aEnd = r.aEnd; return *this; } - int operator==( const ScBigRange& r ) const + int operator==( const ScBigRange& r ) const { return (aStart == r.aStart) && (aEnd == r.aEnd); } - int operator!=( const ScBigRange& r ) const + int operator!=( const ScBigRange& r ) const { return !operator==( r ); } friend inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange ); diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index a050a935b31c..aba3079ed3f7 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,24 +35,24 @@ #include <svl/smplhint.hxx> class ScBaseCell; -#define SC_HINT_DYING SFX_HINT_DYING -#define SC_HINT_DATACHANGED SFX_HINT_DATACHANGED -#define SC_HINT_TABLEOPDIRTY SFX_HINT_USER00 +#define SC_HINT_DYING SFX_HINT_DYING +#define SC_HINT_DATACHANGED SFX_HINT_DATACHANGED +#define SC_HINT_TABLEOPDIRTY SFX_HINT_USER00 #define SC_HINT_CALCALL SFX_HINT_USER01 class ScHint : public SfxSimpleHint { private: - ScAddress aAddress; + ScAddress aAddress; ScBaseCell* pCell; public: TYPEINFO(); ScHint( ULONG n, const ScAddress& a, ScBaseCell* p ) : SfxSimpleHint( n ), aAddress( a ), pCell( p ) {} - ScBaseCell* GetCell() const { return pCell; } + ScBaseCell* GetCell() const { return pCell; } void SetCell( ScBaseCell* p ) { pCell = p; } - const ScAddress& GetAddress() const { return aAddress; } + const ScAddress& GetAddress() const { return aAddress; } ScAddress& GetAddress() { return aAddress; } void SetAddress( const ScAddress& rAdr ) { aAddress = rAdr; } }; @@ -60,11 +60,11 @@ public: class ScAreaChangedHint : public SfxHint { private: - ScRange aNewRange; + ScRange aNewRange; public: TYPEINFO(); ScAreaChangedHint(const ScRange& rRange) : aNewRange(rRange) {} - const ScRange& GetRange() const { return aNewRange; } + const ScRange& GetRange() const { return aNewRange; } }; diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index dd6f13057d76..163499b637be 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,20 +32,20 @@ #include "collect.hxx" //------------------------------------------------------------------------ -#define MAXFUNCPARAM 16 -#define MAXARRSIZE 0xfffe +#define MAXFUNCPARAM 16 +#define MAXARRSIZE 0xfffe //------------------------------------------------------------------------ #ifndef WIN #ifndef WNT #define CALLTYPE #else -#define CALLTYPE __cdecl +#define CALLTYPE __cdecl #endif #else -#define PASCAL _pascal -#define FAR _far -#define CALLTYPE FAR PASCAL +#define PASCAL _pascal +#define FAR _far +#define CALLTYPE FAR PASCAL #endif extern "C" { @@ -69,12 +69,12 @@ class FuncData : public ScDataObject { friend class FuncCollection; const ModuleData* pModuleData; - String aInternalName; - String aFuncName; + String aInternalName; + String aFuncName; USHORT nNumber; - USHORT nParamCount; - ParamType eAsyncType; - ParamType eParamType[MAXFUNCPARAM]; + USHORT nParamCount; + ParamType eAsyncType; + ParamType eParamType[MAXFUNCPARAM]; private: FuncData(const String& rIName); public: @@ -86,22 +86,22 @@ public: const ParamType* peType, ParamType eType); FuncData(const FuncData& rData); - virtual ScDataObject* Clone() const { return new FuncData(*this); } - - const String& GetModuleName() const; - const String& GetInternalName() const { return aInternalName; } - const String& GetFuncName() const { return aFuncName; } - USHORT GetParamCount() const { return nParamCount; } - ParamType GetParamType(USHORT nIndex) const { return eParamType[nIndex]; } - ParamType GetReturnType() const { return eParamType[0]; } - ParamType GetAsyncType() const { return eAsyncType; } + virtual ScDataObject* Clone() const { return new FuncData(*this); } + + const String& GetModuleName() const; + const String& GetInternalName() const { return aInternalName; } + const String& GetFuncName() const { return aFuncName; } + USHORT GetParamCount() const { return nParamCount; } + ParamType GetParamType(USHORT nIndex) const { return eParamType[nIndex]; } + ParamType GetReturnType() const { return eParamType[0]; } + ParamType GetAsyncType() const { return eAsyncType; } BOOL Call(void** ppParam); - BOOL Unadvice(double nHandle); + BOOL Unadvice(double nHandle); // Name und Beschreibung des Parameters nParam. // nParam==0 => Desc := Funktions-Beschreibung, // Name := n/a - BOOL GetParamDesc( String& aName, String& aDesc, USHORT nParam ); + BOOL GetParamDesc( String& aName, String& aDesc, USHORT nParam ); }; @@ -112,10 +112,10 @@ public: FuncCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {} FuncCollection(const FuncCollection& rFuncCollection) : ScSortedCollection ( rFuncCollection ) {} - virtual ScDataObject* Clone() const { return new FuncCollection(*this); } - FuncData* operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - BOOL SearchFunc( const String& rName, USHORT& rIndex ) const; + virtual ScDataObject* Clone() const { return new FuncCollection(*this); } + FuncData* operator[]( const USHORT nIndex) const {return (FuncData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + BOOL SearchFunc( const String& rName, USHORT& rIndex ) const; }; diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index ba480b83cf58..1f2693bd4c2f 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,11 +47,11 @@ #include "scdllapi.h" #define USE_MEMPOOL -#define TEXTWIDTH_DIRTY 0xffff +#define TEXTWIDTH_DIRTY 0xffff // in addition to SCRIPTTYPE_... flags from scripttypeitem.hxx: // set (in nScriptType) if type has not been determined yet -#define SC_SCRIPTTYPE_UNKNOWN 0x08 +#define SC_SCRIPTTYPE_UNKNOWN 0x08 class ScDocument; class EditTextObject; @@ -84,7 +84,7 @@ const int SC_CLONECELL_NOCAPTION = 0x0004; class SC_DLLPUBLIC ScBaseCell { protected: - ~ScBaseCell(); // nicht virtuell -> darf nicht direkt aufgerufen werden + ~ScBaseCell(); // nicht virtuell -> darf nicht direkt aufgerufen werden public: explicit ScBaseCell( CellType eNewType ); @@ -108,7 +108,7 @@ public: deletes the cell by calling the appropriate d'tor of the derived class. */ void Delete(); - inline CellType GetCellType() const { return (CellType)eCellType; } + inline CellType GetCellType() const { return (CellType)eCellType; } /** Returns true, if the cell is empty (neither value nor formula nor cell note). Returns false for formula cells returning nothing, use HasEmptyData() for that. */ @@ -149,8 +149,8 @@ public: static ScBaseCell* CreateTextCell( const String& rString, ScDocument* ); // nOnlyNames may be one or more of SC_LISTENING_NAMES_* - void StartListeningTo( ScDocument* pDoc ); - void EndListeningTo( ScDocument* pDoc, + void StartListeningTo( ScDocument* pDoc ); + void EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr = NULL, ScAddress aPos = ScAddress() ); @@ -158,12 +158,12 @@ public: USHORT GetErrorCode() const; /** ScFormulaCell with formula::svEmptyCell result, or ScNoteCell (may have been created due to reference to empty cell). */ - BOOL HasEmptyData() const; - BOOL HasValueData() const; - BOOL HasStringData() const; - String GetStringData() const; // nur echte Strings + BOOL HasEmptyData() const; + BOOL HasValueData() const; + BOOL HasStringData() const; + String GetStringData() const; // nur echte Strings - static BOOL CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ); + static BOOL CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ); private: ScBaseCell& operator=( const ScBaseCell& ); @@ -209,7 +209,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScValueCell ) #endif ScValueCell(); - explicit ScValueCell( double fValue ); + explicit ScValueCell( double fValue ); #ifdef DBG_UTIL ~ScValueCell(); @@ -219,7 +219,7 @@ public: inline double GetValue() const { return mfValue; } private: - double mfValue; + double mfValue; }; // ============================================================================ @@ -232,18 +232,18 @@ public: #endif ScStringCell(); - explicit ScStringCell( const String& rString ); + explicit ScStringCell( const String& rString ); #ifdef DBG_UTIL ~ScStringCell(); #endif - inline void SetString( const String& rString ) { maString = rString; } - inline void GetString( String& rString ) const { rString = maString; } + inline void SetString( const String& rString ) { maString = rString; } + inline void GetString( String& rString ) const { rString = maString; } inline const String& GetString() const { return maString; } private: - String maString; + String maString; }; // ============================================================================ @@ -251,11 +251,11 @@ private: class SC_DLLPUBLIC ScEditCell : public ScBaseCell { private: - EditTextObject* pData; - String* pString; // fuer schnelleren Zugriff von Formeln - ScDocument* pDoc; // fuer EditEngine Zugriff mit Pool + EditTextObject* pData; + String* pString; // fuer schnelleren Zugriff von Formeln + ScDocument* pDoc; // fuer EditEngine Zugriff mit Pool - void SetTextObject( const EditTextObject* pObject, + void SetTextObject( const EditTextObject* pObject, const SfxItemPool* pFromPool ); // not implemented @@ -267,7 +267,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScEditCell ) #endif - ~ScEditCell(); // wegen pData immer! + ~ScEditCell(); // wegen pData immer! ScEditCell( const EditTextObject* pObject, ScDocument*, const SfxItemPool* pFromPool /* = NULL */ ); @@ -275,12 +275,12 @@ public: // fuer Zeilenumbrueche ScEditCell( const String& rString, ScDocument* ); - void SetData( const EditTextObject* pObject, + void SetData( const EditTextObject* pObject, const SfxItemPool* pFromPool /* = NULL */ ); - void GetData( const EditTextObject*& rpObject ) const; - void GetString( String& rString ) const; + void GetData( const EditTextObject*& rpObject ) const; + void GetString( String& rString ) const; - const EditTextObject* GetData() const { return pData; } + const EditTextObject* GetData() const { return pData; } /** Removes character attribute based on new pattern attributes. */ void RemoveCharAttribs( const ScPatternAttr& rAttr ); @@ -370,7 +370,7 @@ private: SCITP_FROM_ITERATION, SCITP_CLOSE_ITERATION_CIRCLE }; - void InterpretTail( ScInterpretTailParameter ); + void InterpretTail( ScInterpretTailParameter ); ScFormulaCell( const ScFormulaCell& ); @@ -380,7 +380,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell ) #endif - ScAddress aPos; + ScAddress aPos; ~ScFormulaCell(); ScFormulaCell(); @@ -401,33 +401,33 @@ public: ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, const ScAddress& rPos, int nCloneFlags = SC_CLONECELL_DEFAULT ); - void GetFormula( String& rFormula, + void GetFormula( String& rFormula, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void GetFormula( rtl::OUStringBuffer& rBuffer, + void GetFormula( rtl::OUStringBuffer& rBuffer, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void SetDirty(); - void SetDirtyVar(); + void SetDirty(); + void SetDirtyVar(); // If setting entire document dirty after load, no broadcasts but still append to FormulaTree. void SetDirtyAfterLoad(); - inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; } - void SetTableOpDirty(); - BOOL IsDirtyOrInTableOpDirty() const; - BOOL GetDirty() const { return bDirty; } + inline void ResetTableOpDirtyVar() { bTableOpDirty = FALSE; } + void SetTableOpDirty(); + BOOL IsDirtyOrInTableOpDirty() const; + BOOL GetDirty() const { return bDirty; } BOOL NeedsListening() const { return bNeedListening; } void SetNeedsListening( BOOL bVar ) { bNeedListening = bVar; } - void Compile(const String& rFormula, + void Compile(const String& rFormula, BOOL bNoListening = FALSE, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); - void CompileTokenArray( BOOL bNoListening = FALSE ); - void CompileXML( ScProgress& rProgress ); // compile temporary string tokens - void CalcAfterLoad(); + void CompileTokenArray( BOOL bNoListening = FALSE ); + void CompileXML( ScProgress& rProgress ); // compile temporary string tokens + void CalcAfterLoad(); bool MarkUsedExternalReferences(); - void Interpret(); + void Interpret(); inline BOOL IsIterCell() const { return bIsIterCell; } inline USHORT GetSeenInIteration() const { return nSeenInIteration; } - BOOL HasOneReference( ScRange& r ) const; + BOOL HasOneReference( ScRange& r ) const; /* Checks if the formula contains reference list that can be expressed by one reference (like A1;A2;A3:A5 -> A1:A5). The reference list is not required to be sorted (i.e. A3;A1;A2 is @@ -437,88 +437,88 @@ public: It is similar to HasOneReference(), but more general. */ bool HasRefListExpressibleAsOneReference(ScRange& rRange) const; - BOOL HasRelNameReference() const; - BOOL HasColRowName() const; + BOOL HasRelNameReference() const; + BOOL HasColRowName() const; - void UpdateReference(UpdateRefMode eUpdateRefMode, + void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL, const ScAddress* pUndoCellPos = NULL ); - void TransposeReference(); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, + void TransposeReference(); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void UpdateInsertTab(SCTAB nTable); - void UpdateInsertTabAbs(SCTAB nTable); - BOOL UpdateDeleteTab(SCTAB nTable, BOOL bIsMove = FALSE); - void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateRenameTab(SCTAB nTable, const String& rName); - BOOL TestTabRefAbs(SCTAB nTable); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - BOOL IsRangeNameInUse(USHORT nIndex) const; + void UpdateInsertTab(SCTAB nTable); + void UpdateInsertTabAbs(SCTAB nTable); + BOOL UpdateDeleteTab(SCTAB nTable, BOOL bIsMove = FALSE); + void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); + void UpdateRenameTab(SCTAB nTable, const String& rName); + BOOL TestTabRefAbs(SCTAB nTable); + void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + BOOL IsRangeNameInUse(USHORT nIndex) const; void FindRangeNamesInUse(std::set<USHORT>& rIndexes) const; - void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ); - BOOL IsSubTotal() const { return bSubTotal; } - BOOL IsChanged() const { return bChanged; } - void ResetChanged() { bChanged = FALSE; } - BOOL IsEmpty(); // formula::svEmptyCell result + void ReplaceRangeNamesInUse( const ScRangeData::IndexMap& rMap ); + BOOL IsSubTotal() const { return bSubTotal; } + BOOL IsChanged() const { return bChanged; } + void ResetChanged() { bChanged = FALSE; } + BOOL IsEmpty(); // formula::svEmptyCell result // display as empty string if formula::svEmptyCell result - BOOL IsEmptyDisplayedAsString(); - BOOL IsValue(); // also TRUE if formula::svEmptyCell - double GetValue(); - double GetValueAlways(); // ignore errors - void GetString( String& rString ); + BOOL IsEmptyDisplayedAsString(); + BOOL IsValue(); // also TRUE if formula::svEmptyCell + double GetValue(); + double GetValueAlways(); // ignore errors + void GetString( String& rString ); const ScMatrix* GetMatrix(); - BOOL GetMatrixOrigin( ScAddress& rPos ) const; - void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); - USHORT GetMatrixEdge( ScAddress& rOrgPos ); - USHORT GetErrCode(); // interpret first if necessary - USHORT GetRawError(); // don't interpret, just return code or result error - short GetFormatType() const { return nFormatType; } - ULONG GetFormatIndex() const { return nFormatIndex; } - void GetFormatInfo( short& nType, ULONG& nIndex ) const + BOOL GetMatrixOrigin( ScAddress& rPos ) const; + void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows ); + USHORT GetMatrixEdge( ScAddress& rOrgPos ); + USHORT GetErrCode(); // interpret first if necessary + USHORT GetRawError(); // don't interpret, just return code or result error + short GetFormatType() const { return nFormatType; } + ULONG GetFormatIndex() const { return nFormatIndex; } + void GetFormatInfo( short& nType, ULONG& nIndex ) const { nType = nFormatType; nIndex = nFormatIndex; } - BYTE GetMatrixFlag() const { return cMatrixFlag; } + BYTE GetMatrixFlag() const { return cMatrixFlag; } ScTokenArray* GetCode() const { return pCode; } - BOOL IsRunning() const { return bRunning; } - void SetRunning( BOOL bVal ) { bRunning = bVal; } - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); - ScFormulaCell* GetPrevious() const { return pPrevious; } - ScFormulaCell* GetNext() const { return pNext; } - void SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; } - void SetNext( ScFormulaCell* pF ) { pNext = pF; } - ScFormulaCell* GetPreviousTrack() const { return pPreviousTrack; } - ScFormulaCell* GetNextTrack() const { return pNextTrack; } - void SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack = pF; } - void SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } + BOOL IsRunning() const { return bRunning; } + void SetRunning( BOOL bVal ) { bRunning = bVal; } + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); + ScFormulaCell* GetPrevious() const { return pPrevious; } + ScFormulaCell* GetNext() const { return pNext; } + void SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; } + void SetNext( ScFormulaCell* pF ) { pNext = pF; } + ScFormulaCell* GetPreviousTrack() const { return pPreviousTrack; } + ScFormulaCell* GetNextTrack() const { return pNextTrack; } + void SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack = pF; } + void SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF; } virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint); - void SetCompile( BOOL bVal ) { bCompile = bVal; } - ScDocument* GetDocument() const { return pDocument; } - void SetMatColsRows( SCCOL nCols, SCROW nRows ); - void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; + void SetCompile( BOOL bVal ) { bCompile = bVal; } + ScDocument* GetDocument() const { return pDocument; } + void SetMatColsRows( SCCOL nCols, SCROW nRows ); + void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const; // ob Zelle im ChangeTrack und nicht im echten Dokument ist - void SetInChangeTrack( BOOL bVal ) { bInChangeTrack = bVal; } - BOOL IsInChangeTrack() const { return bInChangeTrack; } + void SetInChangeTrack( BOOL bVal ) { bInChangeTrack = bVal; } + BOOL IsInChangeTrack() const { return bInChangeTrack; } // Zu Typ und Format das entsprechende Standardformat. // Bei Format "Standard" evtl. das in die Formelzelle // uebernommene Format. - ULONG GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const; + ULONG GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFormat ) const; // For import filters! - void AddRecalcMode( formula::ScRecalcMode ); + void AddRecalcMode( formula::ScRecalcMode ); /** For import only: set a double result. */ - void SetHybridDouble( double n ) { aResult.SetHybridDouble( n); } + void SetHybridDouble( double n ) { aResult.SetHybridDouble( n); } /** For import only: set a string result. If for whatever reason you have to use both, SetHybridDouble() and SetHybridString() or SetHybridFormula(), use SetHybridDouble() first @@ -532,9 +532,9 @@ public: void SetHybridFormula( const String& r, const formula::FormulaGrammar::Grammar eGrammar ) { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; } - void SetErrCode( USHORT n ); - inline BOOL IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); } - EditTextObject* CreateURLObject() ; + void SetErrCode( USHORT n ); + inline BOOL IsHyperLinkCell() const { return pCode && pCode->IsHyperLink(); } + EditTextObject* CreateURLObject() ; void GetURLResult( String& rURL, String& rCellText ); /** Determines whether or not the result string contains more than one paragraph */ @@ -543,7 +543,7 @@ public: void MaybeInterpret(); }; -// Iterator fuer Referenzen in einer Formelzelle +// Iterator fuer Referenzen in einer Formelzelle class ScDetectiveRefIter { private: @@ -551,7 +551,7 @@ private: ScAddress aPos; public: ScDetectiveRefIter( ScFormulaCell* pCell ); - BOOL GetNextRef( ScRange& rRange ); + BOOL GetNextRef( ScRange& rRange ); ScToken* GetNextRefToken(); }; diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index 9b7bc5236ae0..927402072e5a 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,9 +39,9 @@ class SvNumberFormatter; class Color; enum ScForceTextFmt { - ftDontForce, // Zahlen als Zahlen - ftForce, // Zahlen als Text - ftCheck // ist das Zahlenformat ein Textformat? + ftDontForce, // Zahlen als Zahlen + ftForce, // Zahlen als Text + ftCheck // ist das Zahlenformat ein Textformat? }; //------------------------------------------------------------------------ @@ -49,13 +49,13 @@ enum ScForceTextFmt { class SC_DLLPUBLIC ScCellFormat { public: - static void GetString( ScBaseCell* pCell, ULONG nFormat, String& rString, + static void GetString( ScBaseCell* pCell, ULONG nFormat, String& rString, Color** ppColor, SvNumberFormatter& rFormatter, BOOL bNullVals = TRUE, BOOL bFormula = FALSE, ScForceTextFmt eForceTextFmt = ftDontForce ); - static void GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString, + static void GetInputString( ScBaseCell* pCell, ULONG nFormat, String& rString, SvNumberFormatter& rFormatter ); }; diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 10bc1b4bddcc..2a34511dcdbc 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,8 +29,8 @@ #ifndef SC_CELLSUNO_HXX #define SC_CELLSUNO_HXX -#include "global.hxx" // ScRange, ScAddress -#include "rangelst.hxx" // ScRangeList +#include "global.hxx" // ScRange, ScAddress +#include "rangelst.hxx" // ScRangeList #include "formula/grammar.hxx" #include <svl/lstner.hxx> @@ -115,11 +115,11 @@ class SvxItemPropertySet; class ScLinkListener : public SvtListener { - Link aLink; + Link aLink; public: ScLinkListener(const Link& rL) : aLink(rL) {} - virtual ~ScLinkListener(); - virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); + virtual ~ScLinkListener(); + virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); }; typedef ::com::sun::star::uno::Reference< @@ -131,10 +131,10 @@ typedef ScNamedEntry* ScNamedEntryPtr; SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4, 4 ) -// ScCellRangesBase - Basisklasse fuer ScCellRangesObj (mit Index-Access) -// und ScCellRangeObj (ohne Index-Access) +// ScCellRangesBase - Basisklasse fuer ScCellRangesObj (mit Index-Access) +// und ScCellRangeObj (ohne Index-Access) -// XServiceInfo ist in den Ableitungen implementiert +// XServiceInfo ist in den Ableitungen implementiert class ScHelperFunctions { @@ -174,41 +174,41 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet public cppu::OWeakObject, public SfxListener { - friend class ScTabViewObj; // fuer select() - friend class ScTableSheetObj; // fuer createCursorByRange() + friend class ScTabViewObj; // fuer select() + friend class ScTableSheetObj; // fuer createCursorByRange() friend class ooo::vba::excel::ScVbaCellRangeAccess; private: const SfxItemPropertySet* pPropSet; - ScDocShell* pDocShell; - ScLinkListener* pValueListener; - ScPatternAttr* pCurrentFlat; - ScPatternAttr* pCurrentDeep; - SfxItemSet* pCurrentDataSet; - SfxItemSet* pNoDfltCurrentDataSet; - ScMarkData* pMarkData; - ScRangeList aRanges; + ScDocShell* pDocShell; + ScLinkListener* pValueListener; + ScPatternAttr* pCurrentFlat; + ScPatternAttr* pCurrentDeep; + SfxItemSet* pCurrentDataSet; + SfxItemSet* pNoDfltCurrentDataSet; + ScMarkData* pMarkData; + ScRangeList aRanges; sal_Int64 nObjectId; - BOOL bChartColAsHdr; - BOOL bChartRowAsHdr; - BOOL bCursorOnly; - BOOL bGotDataChangedHint; + BOOL bChartColAsHdr; + BOOL bChartRowAsHdr; + BOOL bCursorOnly; + BOOL bGotDataChangedHint; XModifyListenerArr_Impl aValueListeners; DECL_LINK( ValueListenerHdl, SfxHint* ); private: - void PaintRanges_Impl( USHORT nPart ); - ScRangeListRef GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const; - void ForceChartListener_Impl(); + void PaintRanges_Impl( USHORT nPart ); + ScRangeListRef GetLimitedChartRanges_Impl( long nDataColumns, long nDataRows ) const; + void ForceChartListener_Impl(); ScMemChart* CreateMemChart_Impl() const; - const ScPatternAttr* GetCurrentAttrsFlat(); - const ScPatternAttr* GetCurrentAttrsDeep(); - SfxItemSet* GetCurrentDataSet(bool bNoDflt = false); - const ScMarkData* GetMarkData(); + const ScPatternAttr* GetCurrentAttrsFlat(); + const ScPatternAttr* GetCurrentAttrsDeep(); + SfxItemSet* GetCurrentDataSet(bool bNoDflt = false); + const ScMarkData* GetMarkData(); void ForgetMarkData(); - void ForgetCurrentAttrs(); + void ForgetCurrentAttrs(); com::sun::star::uno::Reference<com::sun::star::sheet::XSheetCellRanges> QueryDifferences_Impl(const com::sun::star::table::CellAddress& aCompare, @@ -232,47 +232,47 @@ protected: ::com::sun::star::uno::RuntimeException); public: - ScCellRangesBase(); // fuer SMART_REFLECTION Krempel + ScCellRangesBase(); // fuer SMART_REFLECTION Krempel ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR); ScCellRangesBase(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellRangesBase(); + virtual ~ScCellRangesBase(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual void RefChanged(); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void RefChanged(); // aus Ableitungen, aber auch per getImplementation - ScDocShell* GetDocShell() const { return pDocShell; } - ScDocument* GetDocument() const; - const ScRangeList& GetRangeList() const { return aRanges; } - void AddRange(const ScRange& rRange, const sal_Bool bMergeRanges); + ScDocShell* GetDocShell() const { return pDocShell; } + ScDocument* GetDocument() const; + const ScRangeList& GetRangeList() const { return aRanges; } + void AddRange(const ScRange& rRange, const sal_Bool bMergeRanges); // per Service erzeugtes Objekt zum Leben erwecken: - void InitInsertRange(ScDocShell* pDocSh, const ScRange& rR); + void InitInsertRange(ScDocShell* pDocSh, const ScRange& rR); - void SetNewRange(const ScRange& rNew); // fuer Cursor - void SetNewRanges(const ScRangeList& rNew); + void SetNewRange(const ScRange& rNew); // fuer Cursor + void SetNewRanges(const ScRangeList& rNew); - void SetCursorOnly(BOOL bSet); - BOOL IsCursorOnly() const { return bCursorOnly; } + void SetCursorOnly(BOOL bSet); + BOOL IsCursorOnly() const { return bCursorOnly; } // XSheetOperation - virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) + virtual double SAL_CALL computeFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) + virtual void SAL_CALL clearContents( sal_Int32 nContentFlags ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -284,25 +284,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -310,7 +310,7 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, @@ -350,7 +350,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( @@ -360,25 +360,25 @@ public: ::com::sun::star::uno::RuntimeException); // XIndent - virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL decrementIndent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL incrementIndent() throw(::com::sun::star::uno::RuntimeException); // XChartData - virtual void SAL_CALL addChartDataChangeEventListener( + virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException); + virtual double SAL_CALL getNotANumber() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) throw(::com::sun::star::uno::RuntimeException); // XChartDataArray virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() @@ -388,7 +388,7 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw(::com::sun::star::uno::RuntimeException); @@ -451,10 +451,10 @@ public: throw(::com::sun::star::uno::RuntimeException); // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -489,21 +489,21 @@ class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, public com::sun::star::container::XEnumerationAccess { private: - ScNamedEntryArr_Impl aNamedEntries; + ScNamedEntryArr_Impl aNamedEntries; ScCellRangeObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; public: ScCellRangesObj(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellRangesObj(); + virtual ~ScCellRangesObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void RefChanged(); + virtual void RefChanged(); // XSheetCellRanges virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL @@ -514,35 +514,35 @@ public: getRangeAddresses() throw(::com::sun::star::uno::RuntimeException); // XSheetCellRangeContainer - virtual void SAL_CALL addRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange, + virtual void SAL_CALL addRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange ) + virtual void SAL_CALL removeRangeAddress( const ::com::sun::star::table::CellRangeAddress& rRange ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRangeAddresses( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addRangeAddresses( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeAddresses( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL removeRangeAddresses( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRanges ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -611,11 +611,11 @@ class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase, public com::sun::star::table::XColumnRowRange { private: - const SfxItemPropertySet* pRangePropSet; - ScRange aRange; + const SfxItemPropertySet* pRangePropSet; + ScRange aRange; protected: - const ScRange& GetRange() const { return aRange; } + const ScRange& GetRange() const { return aRange; } virtual const SfxItemPropertyMap* GetItemPropertyMap(); virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, ::com::sun::star::uno::Any& ) @@ -637,7 +637,7 @@ protected: public: ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellRangeObj(); + virtual ~ScCellRangeObj(); // uses ObjectShell from document, if set (returns NULL otherwise) static com::sun::star::uno::Reference<com::sun::star::table::XCellRange> @@ -646,10 +646,10 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void RefChanged(); + virtual void RefChanged(); // via getImplementation() virtual void SetArrayFormulaWithGrammar( const ::rtl::OUString& rFormula, @@ -658,7 +658,7 @@ public: throw(::com::sun::star::uno::RuntimeException); // XCellRange ist Basisklasse von XSheetCellRange und XSheetOperation -// operator XCellRangeRef() const { return (XSheetCellRange*)this; } +// operator XCellRangeRef() const { return (XSheetCellRange*)this; } // XCellRangeAddressable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getRangeAddress() @@ -670,7 +670,7 @@ public: // XArrayFormulaRange virtual ::rtl::OUString SAL_CALL getArrayFormula() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArrayFormula( const ::rtl::OUString& aFormula ) + virtual void SAL_CALL setArrayFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); // XArrayFormulaTokens @@ -684,7 +684,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL getDataArray() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setDataArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aArray ) throw(::com::sun::star::uno::RuntimeException); @@ -693,12 +693,12 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getFormulaArray() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setFormulaArray( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aArray ) throw (::com::sun::star::uno::RuntimeException); // XMultipleOperation - virtual void SAL_CALL setTableOperation( + virtual void SAL_CALL setTableOperation( const ::com::sun::star::table::CellRangeAddress& aFormulaRange, ::com::sun::star::sheet::TableOperationMode nMode, const ::com::sun::star::table::CellAddress& aColumnCell, @@ -706,28 +706,28 @@ public: throw(::com::sun::star::uno::RuntimeException); // XMergeable - virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL merge( sal_Bool bMerge ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getIsMerged() throw(::com::sun::star::uno::RuntimeException); // XCellSeries - virtual void SAL_CALL fillSeries( ::com::sun::star::sheet::FillDirection nFillDirection, + virtual void SAL_CALL fillSeries( ::com::sun::star::sheet::FillDirection nFillDirection, ::com::sun::star::sheet::FillMode nFillMode, ::com::sun::star::sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL fillAuto( ::com::sun::star::sheet::FillDirection nFillDirection, + virtual void SAL_CALL fillAuto( ::com::sun::star::sheet::FillDirection nFillDirection, sal_Int32 nSourceCount ) throw(::com::sun::star::uno::RuntimeException); // XAutoFormattable - virtual void SAL_CALL autoFormat( const ::rtl::OUString& aName ) + virtual void SAL_CALL autoFormat( const ::rtl::OUString& aName ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XSortable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL sort( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); @@ -741,7 +741,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor > SAL_CALL createFilterDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL filter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL filter( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetFilterDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); @@ -749,16 +749,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor > SAL_CALL createSubTotalDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL applySubTotals( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL applySubTotals( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSubTotalDescriptor >& xDescriptor, sal_Bool bReplace ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeSubTotals() throw(::com::sun::star::uno::RuntimeException); // XImportable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createImportDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doImport( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL doImport( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException); @@ -814,7 +814,7 @@ public: }; -//! really derive cell from range? +//! really derive cell from range? class ScCellObj : public ScCellRangeObj, public com::sun::star::text::XText, @@ -827,17 +827,17 @@ class ScCellObj : public ScCellRangeObj, public com::sun::star::document::XActionLockable { private: - SvxUnoText* pUnoText; - const SfxItemPropertySet* pCellPropSet; - ScAddress aCellPos; - sal_Int16 nActionLockCount; + SvxUnoText* pUnoText; + const SfxItemPropertySet* pCellPropSet; + ScAddress aCellPos; + sal_Int16 nActionLockCount; private: - String GetInputString_Impl(BOOL bEnglish) const; - String GetOutputString_Impl() const; - void SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish); - double GetValue_Impl() const; - void SetValue_Impl(double fValue); + String GetInputString_Impl(BOOL bEnglish) const; + String GetOutputString_Impl() const; + void SetString_Impl(const String& rString, BOOL bInterpret, BOOL bEnglish); + double GetValue_Impl() const; + void SetValue_Impl(double fValue); com::sun::star::table::CellContentType GetResultType_Impl(); protected: @@ -855,35 +855,35 @@ public: static const SfxItemPropertyMap* GetCellPropertyMap(); ScCellObj(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellObj(); + virtual ~ScCellObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void RefChanged(); + virtual void RefChanged(); - SvxUnoText& GetUnoText(); + SvxUnoText& GetUnoText(); // XML import needs to set results at formula cells, // not meant for any other purpose. - void SetFormulaResultString( const ::rtl::OUString& rResult ); - void SetFormulaResultDouble( double fResult ); + void SetFormulaResultString( const ::rtl::OUString& rResult ); + void SetFormulaResultDouble( double fResult ); void SetFormulaWithGrammar( const ::rtl::OUString& rFormula, const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar ); - const ScAddress& GetPosition() const { return aCellPos; } + const ScAddress& GetPosition() const { return aCellPos; } // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -895,11 +895,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -913,7 +913,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess @@ -927,10 +927,10 @@ public: // XCell virtual ::rtl::OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) + virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getError() throw(::com::sun::star::uno::RuntimeException); @@ -977,13 +977,13 @@ public: // XActionLockable virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException); - static String GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos); + static String GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos); }; @@ -1007,13 +1007,13 @@ class ScTableSheetObj : public ScCellRangeObj, public com::sun::star::sheet::XExternalSheetName, public com::sun::star::document::XEventsSupplier { - friend class ScTableSheetsObj; // fuer insertByName() + friend class ScTableSheetsObj; // fuer insertByName() private: - const SfxItemPropertySet* pSheetPropSet; + const SfxItemPropertySet* pSheetPropSet; - SCTAB GetTab_Impl() const; - void PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ); + SCTAB GetTab_Impl() const; + void PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ); protected: virtual const SfxItemPropertyMap* GetItemPropertyMap(); @@ -1027,15 +1027,15 @@ protected: public: ScTableSheetObj(ScDocShell* pDocSh, SCTAB nTab); - virtual ~ScTableSheetObj(); + virtual ~ScTableSheetObj(); - void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); + void InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XSpreadsheet virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellCursor > @@ -1066,7 +1066,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XSheetPageBreak @@ -1074,19 +1074,19 @@ public: getColumnPageBreaks() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TablePageBreakData > SAL_CALL getRowPageBreaks() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeAllManualPageBreaks() throw(::com::sun::star::uno::RuntimeException); // XCellRangeMovement - virtual void SAL_CALL insertCells( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL insertCells( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::sheet::CellInsertMode nMode ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRange( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL removeRange( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::sheet::CellDeleteMode nMode ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveRange( const ::com::sun::star::table::CellAddress& aDestination, + virtual void SAL_CALL moveRange( const ::com::sun::star::table::CellAddress& aDestination, const ::com::sun::star::table::CellRangeAddress& aSource ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL copyRange( const ::com::sun::star::table::CellAddress& aDestination, + virtual void SAL_CALL copyRange( const ::com::sun::star::table::CellAddress& aDestination, const ::com::sun::star::table::CellRangeAddress& aSource ) throw(::com::sun::star::uno::RuntimeException); @@ -1117,34 +1117,34 @@ public: ::com::sun::star::table::CellRangeAddress >& aPrintAreas ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintTitleColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) + virtual void SAL_CALL setPrintTitleColumns( sal_Bool bPrintTitleColumns ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitleColumns( + virtual void SAL_CALL setTitleColumns( const ::com::sun::star::table::CellRangeAddress& aTitleColumns ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintTitleRows() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) + virtual void SAL_CALL setPrintTitleRows( sal_Bool bPrintTitleRows ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getTitleRows() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitleRows( + virtual void SAL_CALL setTitleRows( const ::com::sun::star::table::CellRangeAddress& aTitleRows ) throw(::com::sun::star::uno::RuntimeException); // XSheetLinkable virtual ::com::sun::star::sheet::SheetLinkMode SAL_CALL getLinkMode() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) + virtual void SAL_CALL setLinkMode( ::com::sun::star::sheet::SheetLinkMode nLinkMode ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getLinkUrl() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkUrl( const ::rtl::OUString& aLinkUrl ) + virtual void SAL_CALL setLinkUrl( const ::rtl::OUString& aLinkUrl ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getLinkSheetName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkSheetName( const ::rtl::OUString& aLinkSheetName ) + virtual void SAL_CALL setLinkSheetName( const ::rtl::OUString& aLinkSheetName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL link( const ::rtl::OUString& aUrl, + virtual void SAL_CALL link( const ::rtl::OUString& aUrl, const ::rtl::OUString& aSheetName, const ::rtl::OUString& aFilterName, const ::rtl::OUString& aFilterOptions, @@ -1163,30 +1163,30 @@ public: virtual sal_Bool SAL_CALL showErrors( const ::com::sun::star::table::CellAddress& aPosition ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL showInvalid() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL clearArrows() throw(::com::sun::star::uno::RuntimeException); // XSheetOutline - virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL group( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange, + virtual void SAL_CALL ungroup( const ::com::sun::star::table::CellRangeAddress& aRange, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange ) + virtual void SAL_CALL autoOutline( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) + virtual void SAL_CALL clearOutline() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL hideDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) + virtual void SAL_CALL showDetail( const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL showLevel( sal_Int16 nLevel, + virtual void SAL_CALL showLevel( sal_Int16 nLevel, ::com::sun::star::table::TableOrientation nOrientation ) throw(::com::sun::star::uno::RuntimeException); // XProtectable - virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException); @@ -1194,12 +1194,12 @@ public: // XScenario virtual sal_Bool SAL_CALL getIsScenario() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getScenarioComment() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScenarioComment( const ::rtl::OUString& aScenarioComment ) + virtual void SAL_CALL setScenarioComment( const ::rtl::OUString& aScenarioComment ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL apply() throw(::com::sun::star::uno::RuntimeException); // XScenarioEnhanced virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getRanges( ) @@ -1248,7 +1248,7 @@ class ScTableColumnObj : public ScCellRangeObj, public com::sun::star::container::XNamed { private: - const SfxItemPropertySet* pColPropSet; + const SfxItemPropertySet* pColPropSet; protected: virtual const SfxItemPropertyMap* GetItemPropertyMap(); @@ -1262,17 +1262,17 @@ protected: public: ScTableColumnObj(ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab); - virtual ~ScTableColumnObj(); + virtual ~ScTableColumnObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet ueberladen wegen Spalten-Properties @@ -1299,7 +1299,7 @@ public: class ScTableRowObj : public ScCellRangeObj { private: - const SfxItemPropertySet* pRowPropSet; + const SfxItemPropertySet* pRowPropSet; protected: virtual const SfxItemPropertyMap* GetItemPropertyMap(); @@ -1313,7 +1313,7 @@ protected: public: ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab); - virtual ~ScTableRowObj(); + virtual ~ScTableRowObj(); // XPropertySet ueberladen wegen Zeilen-Properties virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > @@ -1336,14 +1336,14 @@ class ScCellsObj : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - ScRangeList aRanges; + ScDocShell* pDocShell; + ScRangeList aRanges; public: ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellsObj(); + virtual ~ScCellsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL @@ -1370,21 +1370,21 @@ class ScCellsEnumeration : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - ScRangeList aRanges; - ScAddress aPos; - ScMarkData* pMark; - BOOL bAtEnd; + ScDocShell* pDocShell; + ScRangeList aRanges; + ScAddress aPos; + ScMarkData* pMark; + BOOL bAtEnd; private: - void Advance_Impl(); - void CheckPos_Impl(); + void Advance_Impl(); + void CheckPos_Impl(); public: ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR); - virtual ~ScCellsEnumeration(); + virtual ~ScCellsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); @@ -1409,17 +1409,17 @@ class ScCellFormatsObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - ScRange aTotalRange; + ScDocShell* pDocShell; + ScRange aTotalRange; private: - ScCellRangeObj* GetObjectByIndex_Impl(long nIndex) const; + ScCellRangeObj* GetObjectByIndex_Impl(long nIndex) const; public: ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellFormatsObj(); + virtual ~ScCellFormatsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -1453,22 +1453,22 @@ class ScCellFormatsEnumeration : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; - ScAttrRectIterator* pIter; - ScRange aNext; - BOOL bAtEnd; - BOOL bDirty; + ScDocShell* pDocShell; + SCTAB nTab; + ScAttrRectIterator* pIter; + ScRange aNext; + BOOL bAtEnd; + BOOL bDirty; private: - void Advance_Impl(); - ScCellRangeObj* NextObject_Impl(); + void Advance_Impl(); + ScCellRangeObj* NextObject_Impl(); public: ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellFormatsEnumeration(); + virtual ~ScCellFormatsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); @@ -1495,18 +1495,18 @@ class ScUniqueCellFormatsObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - ScRange aTotalRange; - ScMyRangeLists aRangeLists; + ScDocShell* pDocShell; + ScRange aTotalRange; + ScMyRangeLists aRangeLists; private: - void GetObjects_Impl(); + void GetObjects_Impl(); public: ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScUniqueCellFormatsObj(); + virtual ~ScUniqueCellFormatsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -1539,15 +1539,15 @@ class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper2< public SfxListener { private: - ScMyRangeLists aRangeLists; - ScDocShell* pDocShell; - sal_Int32 nCurrentPosition; + ScMyRangeLists aRangeLists; + ScDocShell* pDocShell; + sal_Int32 nCurrentPosition; public: ScUniqueCellFormatsEnumeration(ScDocShell* pDocShell, const ScMyRangeLists& rRangeLists); - virtual ~ScUniqueCellFormatsEnumeration(); + virtual ~ScUniqueCellFormatsEnumeration(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx index d428f03f456e..0e901fc6ddce 100644 --- a/sc/inc/cfgids.hxx +++ b/sc/inc/cfgids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ #define SCCFG_APP (SFX_ITEMTYPE_SC_BEGIN + 2) #define SCCFG_SPELLCHECK (SFX_ITEMTYPE_SC_BEGIN + 3) #define SCCFG_PRINT (SFX_ITEMTYPE_SC_BEGIN + 4) -#define SCCFG_STATUSBAR (SFX_ITEMTYPE_SC_BEGIN + 5) -#define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8) -#define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9) +#define SCCFG_STATUSBAR (SFX_ITEMTYPE_SC_BEGIN + 5) +#define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8) +#define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9) #endif diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index c2a54bdfa745..dc9c75810182 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -429,13 +429,13 @@ public: // XUnoTunnel ------------------------------------------------------------ -// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< -// sal_Int8 >& aIdentifier ) -// throw(::com::sun::star::uno::RuntimeException); +// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< +// sal_Int8 >& aIdentifier ) +// throw(::com::sun::star::uno::RuntimeException); -// static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); -// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< -// com::sun::star::uno::XInterface> xObj ); +// static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); +// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< +// com::sun::star::uno::XInterface> xObj ); private: void setDataChangedHint(bool b); @@ -453,7 +453,7 @@ private: { public: ExternalRefListener(ScChart2DataSequence& rParent, ScDocument* pDoc); - virtual ~ExternalRefListener(); + virtual ~ExternalRefListener(); virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType); void addFileId(sal_uInt16 nFileId); void removeFileId(sal_uInt16 nFileId); @@ -468,9 +468,9 @@ private: ScDocument* mpDoc; }; - /** - * Build an internal data array to cache the data ranges, and other - * information such as hidden values. + /** + * Build an internal data array to cache the data ranges, and other + * information such as hidden values. */ void BuildDataCache(); @@ -511,11 +511,11 @@ private: ::std::list<Item> m_aDataArray; - /** - * Cached data for getData. We may also need to cache data for the - * numerical and textural data series if they turn out to be bottlenecks + /** + * Cached data for getData. We may also need to cache data for the + * numerical and textural data series if they turn out to be bottlenecks * under certain scenarios. - */ + */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_aMixedDataCache; ::com::sun::star::uno::Sequence<sal_Int32> m_aHiddenValues; @@ -535,7 +535,7 @@ private: RangeIndexMapPtr m_pRangeIndices; ExtRefListenerPtr m_pExtRefListener; com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; - SfxItemPropertySet m_aPropSet; + SfxItemPropertySet m_aPropSet; ::std::auto_ptr<HiddenRangeListener> m_pHiddenListener; ScLinkListener* m_pValueListener; @@ -666,13 +666,13 @@ public: // XUnoTunnel ------------------------------------------------------------ -// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< -// sal_Int8 >& aIdentifier ) -// throw(::com::sun::star::uno::RuntimeException); +// virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< +// sal_Int8 >& aIdentifier ) +// throw(::com::sun::star::uno::RuntimeException); -// static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); -// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< -// com::sun::star::uno::XInterface> xObj ); +// static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); +// static ScChart2DataSequence* getImplementation( const com::sun::star::uno::Reference< +// com::sun::star::uno::XInterface> xObj ); // Implementation -------------------------------------------------------- @@ -687,7 +687,7 @@ private: ScRangeListRef m_xRanges; ScDocument* m_pDocument; com::sun::star::uno::Reference < com::sun::star::chart2::data::XDataProvider > m_xDataProvider; - SfxItemPropertySet m_aPropSet; + SfxItemPropertySet m_aPropSet; sal_Bool m_bColumn; // defines the orientation to create the right labels }; diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index f3604756eab8..32d3876a58e3 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,8 +58,8 @@ public: ScMemChart(short nCols, short nRows); ~ScMemChart(); - short GetColCount() const { return nColCnt; } - short GetRowCount() const { return nRowCnt; } + short GetColCount() const { return nColCnt; } + short GetRowCount() const { return nRowCnt; } const String& GetColText(short nCol) const { return pColText[nCol]; } const String& GetRowText(short nRow) const { return pRowText[nRow]; } double GetData(short nCol, short nRow) const { return pData[nCol * nRowCnt + nRow]; } @@ -69,12 +69,12 @@ public: }; -class SC_DLLPUBLIC ScChartArray : public ScDataObject // nur noch Parameter-Struct +class SC_DLLPUBLIC ScChartArray : public ScDataObject // nur noch Parameter-Struct { - String aName; - ScDocument* pDocument; + String aName; + ScDocument* pDocument; ScChartPositioner aPositioner; - BOOL bValid; // fuer Erzeugung aus SchMemChart + BOOL bValid; // fuer Erzeugung aus SchMemChart private: ScMemChart* CreateMemChartSingle(); @@ -88,22 +88,22 @@ public: const String& rChartName ); ScChartArray( const ScChartArray& rArr ); - virtual ~ScChartArray(); - virtual ScDataObject* Clone() const; + virtual ~ScChartArray(); + virtual ScDataObject* Clone() const; - const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } - void SetRangeList( const ScRangeListRef& rNew ) { aPositioner.SetRangeList(rNew); } - void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } + const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } + void SetRangeList( const ScRangeListRef& rNew ) { aPositioner.SetRangeList(rNew); } + void SetRangeList( const ScRange& rNew ) { aPositioner.SetRangeList(rNew); } const ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); } - void SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); } - BOOL HasColHeaders() const { return aPositioner.HasColHeaders(); } - BOOL HasRowHeaders() const { return aPositioner.HasRowHeaders(); } - BOOL IsValid() const { return bValid; } - void SetName(const String& rNew) { aName = rNew; } - const String& GetName() const { return aName; } + void SetHeaders(BOOL bCol, BOOL bRow) { aPositioner.SetHeaders(bCol, bRow); } + BOOL HasColHeaders() const { return aPositioner.HasColHeaders(); } + BOOL HasRowHeaders() const { return aPositioner.HasRowHeaders(); } + BOOL IsValid() const { return bValid; } + void SetName(const String& rNew) { aName = rNew; } + const String& GetName() const { return aName; } - BOOL operator==(const ScChartArray& rCmp) const; + BOOL operator==(const ScChartArray& rCmp) const; ScMemChart* CreateMemChart(); }; @@ -115,11 +115,11 @@ public: ScChartCollection( const ScChartCollection& rColl ): ScCollection( rColl ) {} - virtual ScDataObject* Clone() const; - ScChartArray* operator[](USHORT nIndex) const + virtual ScDataObject* Clone() const; + ScChartArray* operator[](USHORT nIndex) const { return (ScChartArray*)At(nIndex); } - BOOL operator==(const ScChartCollection& rCmp) const; + BOOL operator==(const ScChartCollection& rCmp) const; }; diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx index 97dcb197dc6a..0f8b4c65c6ec 100644 --- a/sc/inc/charthelper.hxx +++ b/sc/inc/charthelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index c2b86a7b29f7..c6a60454ff15 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,11 +74,11 @@ private: ::std::auto_ptr<ExternalRefListener> mpExtRefListener; ::std::auto_ptr< ::std::vector<ScSharedTokenRef> > mpTokens; - ScChartUnoData* pUnoData; - ScDocument* pDoc; - BOOL bUsed; // fuer ScChartListenerCollection::FreeUnused - BOOL bDirty; - BOOL bSeriesRangesScheduled; + ScChartUnoData* pUnoData; + ScDocument* pDoc; + BOOL bUsed; // fuer ScChartListenerCollection::FreeUnused + BOOL bDirty; + BOOL bSeriesRangesScheduled; // not implemented ScChartListener& operator=( const ScChartListener& ); @@ -91,42 +91,42 @@ public: ScChartListener( const String& rName, ScDocument* pDoc, ::std::vector<ScSharedTokenRef>* pTokens ); ScChartListener( const ScChartListener& ); - virtual ~ScChartListener(); - virtual ScDataObject* Clone() const; + virtual ~ScChartListener(); + virtual ScDataObject* Clone() const; - void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, + void SetUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); - com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener > GetUnoListener() const; - com::sun::star::uno::Reference< com::sun::star::chart::XChartData > GetUnoSource() const; + com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener > GetUnoListener() const; + com::sun::star::uno::Reference< com::sun::star::chart::XChartData > GetUnoSource() const; - BOOL IsUno() const { return (pUnoData != NULL); } + BOOL IsUno() const { return (pUnoData != NULL); } - virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); - void StartListeningTo(); - void EndListeningTo(); - void ChangeListening( const ScRangeListRef& rRangeListRef, + virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); + void StartListeningTo(); + void EndListeningTo(); + void ChangeListening( const ScRangeListRef& rRangeListRef, BOOL bDirty = FALSE ); - void Update(); - ScRangeListRef GetRangeList() const; - void SetRangeList( const ScRangeListRef& rNew ); - void SetRangeList( const ScRange& rNew ); - BOOL IsUsed() const { return bUsed; } - void SetUsed( BOOL bFlg ) { bUsed = bFlg; } - BOOL IsDirty() const { return bDirty; } - void SetDirty( BOOL bFlg ) { bDirty = bFlg; } + void Update(); + ScRangeListRef GetRangeList() const; + void SetRangeList( const ScRangeListRef& rNew ); + void SetRangeList( const ScRange& rNew ); + BOOL IsUsed() const { return bUsed; } + void SetUsed( BOOL bFlg ) { bUsed = bFlg; } + BOOL IsDirty() const { return bDirty; } + void SetDirty( BOOL bFlg ) { bDirty = bFlg; } void UpdateChartIntersecting( const ScRange& rRange ); // if chart series ranges are to be updated later on (e.g. DeleteTab, InsertTab) - void ScheduleSeriesRanges() { bSeriesRangesScheduled = TRUE; } - void UpdateScheduledSeriesRanges(); - void UpdateSeriesRanges(); + void ScheduleSeriesRanges() { bSeriesRangesScheduled = TRUE; } + void UpdateScheduledSeriesRanges(); + void UpdateSeriesRanges(); ExternalRefListener* GetExtRefListener(); void SetUpdateQueue(); - BOOL operator==( const ScChartListener& ); - BOOL operator!=( const ScChartListener& r ) + BOOL operator==( const ScChartListener& ); + BOOL operator!=( const ScChartListener& r ) { return !operator==( r ); } }; @@ -155,8 +155,8 @@ public: private: ::std::list<RangeListenerItem> maHiddenListeners; - Timer aTimer; - ScDocument* pDoc; + Timer aTimer; + ScDocument* pDoc; DECL_LINK( TimerHdl, Timer* ); @@ -168,48 +168,48 @@ private: public: ScChartListenerCollection( ScDocument* pDoc ); ScChartListenerCollection( const ScChartListenerCollection& ); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - virtual ~ScChartListenerCollection(); + virtual ~ScChartListenerCollection(); // nur nach copy-ctor noetig, wenn neu ins Dok gehaengt - void StartAllListeners(); + void StartAllListeners(); - void ChangeListening( const String& rName, + void ChangeListening( const String& rName, const ScRangeListRef& rRangeListRef, BOOL bDirty = FALSE ); // FreeUnused nur wie in ScDocument::UpdateChartListenerCollection verwenden! - void FreeUnused(); - void FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, + void FreeUnused(); + void FreeUno( const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataChangeEventListener >& rListener, const com::sun::star::uno::Reference< com::sun::star::chart::XChartData >& rSource ); - void StartTimer(); - void UpdateDirtyCharts(); + void StartTimer(); + void UpdateDirtyCharts(); void SC_DLLPUBLIC SetDirty(); - void SetDiffDirty( const ScChartListenerCollection&, + void SetDiffDirty( const ScChartListenerCollection&, BOOL bSetChartRangeLists = FALSE ); - void SetRangeDirty( const ScRange& rRange ); // z.B. Zeilen/Spalten + void SetRangeDirty( const ScRange& rRange ); // z.B. Zeilen/Spalten - void UpdateScheduledSeriesRanges(); + void UpdateScheduledSeriesRanges(); void UpdateChartsContainingTab( SCTAB nTab ); - BOOL operator==( const ScChartListenerCollection& ); + BOOL operator==( const ScChartListenerCollection& ); - /** - * Start listening on hide/show change within specified cell range. A - * single listener may listen on multiple ranges when the caller passes - * the same pointer multiple times with different ranges. - * - * Note that the caller is responsible for managing the life-cycle of the - * listener instance. + /** + * Start listening on hide/show change within specified cell range. A + * single listener may listen on multiple ranges when the caller passes + * the same pointer multiple times with different ranges. + * + * Note that the caller is responsible for managing the life-cycle of the + * listener instance. */ - void StartListeningHiddenRange( const ScRange& rRange, + void StartListeningHiddenRange( const ScRange& rRange, ScChartHiddenRangeListener* pListener ); - /** - * Remove all ranges associated with passed listener instance from the - * list of hidden range listeners. This does not delete the passed - * listener instance. + /** + * Remove all ranges associated with passed listener instance from the + * list of hidden range listeners. This does not delete the passed + * listener instance. */ void EndListeningHiddenRange( ScChartHiddenRangeListener* pListener ); }; diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index 16afcc78ced0..aa441212aa8f 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ class ScChartLockGuard { public: ScChartLockGuard( ScDocument* pDoc ); - virtual ~ScChartLockGuard(); + virtual ~ScChartLockGuard(); void AlsoLockThisChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); @@ -65,18 +65,18 @@ class ScTemporaryChartLock { public: ScTemporaryChartLock( ScDocument* pDoc ); - virtual ~ScTemporaryChartLock(); - - void StartOrContinueLocking(); - void StopLocking(); + virtual ~ScTemporaryChartLock(); + + void StartOrContinueLocking(); + void StopLocking(); void AlsoLockThisChart( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); private: - ScDocument* mpDoc; - Timer maTimer; + ScDocument* mpDoc; + Timer maTimer; std::auto_ptr< ScChartLockGuard > mapScChartLockGuard; - + DECL_LINK( TimeoutHdl, Timer* ); ScTemporaryChartLock(); diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 9542ef104e50..e85eeaefa19c 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,37 +42,37 @@ class ScChartPositionMap { friend class ScChartPositioner; - ScAddress** ppData; - ScAddress** ppColHeader; - ScAddress** ppRowHeader; - ULONG nCount; - SCCOL nColCount; - SCROW nRowCount; + ScAddress** ppData; + ScAddress** ppColHeader; + ScAddress** ppRowHeader; + ULONG nCount; + SCCOL nColCount; + SCROW nRowCount; ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, - SCCOL nColAdd, // Header-Spalten - SCROW nRowAdd, // Header-Zeilen - Table& rCols // Table mit Col-Tables mit Address* + SCCOL nColAdd, // Header-Spalten + SCROW nRowAdd, // Header-Zeilen + Table& rCols // Table mit Col-Tables mit Address* ); - ~ScChartPositionMap(); //! deletes all ScAddress* + ~ScChartPositionMap(); //! deletes all ScAddress* // not implemented ScChartPositionMap( const ScChartPositionMap& ); - ScChartPositionMap& operator=( const ScChartPositionMap& ); + ScChartPositionMap& operator=( const ScChartPositionMap& ); public: - ULONG GetCount() const { return nCount; } - SCCOL GetColCount() const { return nColCount; } - SCROW GetRowCount() const { return nRowCount; } + ULONG GetCount() const { return nCount; } + SCCOL GetColCount() const { return nColCount; } + SCROW GetRowCount() const { return nRowCount; } - BOOL IsValid( SCCOL nCol, SCROW nRow ) const + BOOL IsValid( SCCOL nCol, SCROW nRow ) const { return nCol < nColCount && nRow < nRowCount; } // Daten spaltenweise - ULONG GetIndex( SCCOL nCol, SCROW nRow ) const + ULONG GetIndex( SCCOL nCol, SCROW nRow ) const { return (ULONG) nCol * nRowCount + nRow; } - const ScAddress* GetPosition( ULONG nIndex ) const + const ScAddress* GetPosition( ULONG nIndex ) const { if ( nIndex < nCount ) return ppData[ nIndex ]; @@ -80,19 +80,19 @@ public: } //! kann NULL sein und damit "kein Wert" - const ScAddress* GetPosition( SCCOL nChartCol, SCROW nChartRow ) const + const ScAddress* GetPosition( SCCOL nChartCol, SCROW nChartRow ) const { if ( IsValid( nChartCol, nChartRow ) ) return ppData[ GetIndex( nChartCol, nChartRow ) ]; return NULL; } - const ScAddress* GetColHeaderPosition( SCCOL nChartCol ) const + const ScAddress* GetColHeaderPosition( SCCOL nChartCol ) const { if ( nChartCol < nColCount ) return ppColHeader[ nChartCol ]; return NULL; } - const ScAddress* GetRowHeaderPosition( SCROW nChartRow ) const + const ScAddress* GetRowHeaderPosition( SCROW nChartRow ) const { if ( nChartRow < nRowCount ) return ppRowHeader[ nChartRow ]; @@ -104,30 +104,30 @@ public: enum ScChartGlue { SC_CHARTGLUE_NA, SC_CHARTGLUE_NONE, // alte Mimik - SC_CHARTGLUE_COLS, // alte Mimik + SC_CHARTGLUE_COLS, // alte Mimik SC_CHARTGLUE_ROWS, SC_CHARTGLUE_BOTH }; class ScDocument; -class ScChartPositioner // nur noch Parameter-Struct +class ScChartPositioner // nur noch Parameter-Struct { - ScRangeListRef aRangeListRef; - ScDocument* pDocument; + ScRangeListRef aRangeListRef; + ScDocument* pDocument; ScChartPositionMap* pPositionMap; - ScChartGlue eGlue; - SCCOL nStartCol; - SCROW nStartRow; - BOOL bColHeaders; - BOOL bRowHeaders; - BOOL bDummyUpperLeft; + ScChartGlue eGlue; + SCCOL nStartCol; + SCROW nStartRow; + BOOL bColHeaders; + BOOL bRowHeaders; + BOOL bDummyUpperLeft; private: - void CheckColRowHeaders(); + void CheckColRowHeaders(); - void GlueState(); // zusammengefasste Bereiche - void CreatePositionMap(); + void GlueState(); // zusammengefasste Bereiche + void CreatePositionMap(); public: ScChartPositioner( ScDocument* pDoc, SCTAB nTab, @@ -136,23 +136,23 @@ public: ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rRangeList ); ScChartPositioner( const ScChartPositioner& rPositioner ); - virtual ~ScChartPositioner(); + virtual ~ScChartPositioner(); - const ScRangeListRef& GetRangeList() const { return aRangeListRef; } - void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } - void SetRangeList( const ScRange& rNew ); + const ScRangeListRef& GetRangeList() const { return aRangeListRef; } + void SetRangeList( const ScRangeListRef& rNew ) { aRangeListRef = rNew; } + void SetRangeList( const ScRange& rNew ); - void SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; } - BOOL HasColHeaders() const { return bColHeaders; } - BOOL HasRowHeaders() const { return bRowHeaders; } + void SetHeaders(BOOL bCol, BOOL bRow) { bColHeaders=bCol; bRowHeaders=bRow; } + BOOL HasColHeaders() const { return bColHeaders; } + BOOL HasRowHeaders() const { return bRowHeaders; } void SetDummyUpperLeft(BOOL bNew) { bDummyUpperLeft = bNew; } void SeteGlue(ScChartGlue eNew) { eGlue = eNew; } void SetStartCol(SCCOL nNew) { nStartCol = nNew; } void SetStartRow(SCROW nNew) { nStartRow = nNew; } - BOOL operator==(const ScChartPositioner& rCmp) const; + BOOL operator==(const ScChartPositioner& rCmp) const; - void InvalidateGlue() + void InvalidateGlue() { eGlue = SC_CHARTGLUE_NA; if ( pPositionMap ) @@ -161,7 +161,7 @@ public: pPositionMap = NULL; } } - const ScChartPositionMap* GetPositionMap(); + const ScChartPositionMap* GetPositionMap(); }; diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index ce778ad62423..93f02a164cfd 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,26 +59,26 @@ class ScChartsObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; // Charts sind pro Sheet + ScDocShell* pDocShell; + SCTAB nTab; // Charts sind pro Sheet - ScChartObj* GetObjectByIndex_Impl(long nIndex) const; - ScChartObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScChartObj* GetObjectByIndex_Impl(long nIndex) const; + ScChartObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; public: ScChartsObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScChartsObj(); + virtual ~ScChartsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableCharts - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::com::sun::star::awt::Rectangle& aRect, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -133,12 +133,12 @@ class ScChartObj : public ::comphelper::OBaseMutex ,public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; // Charts sind pro Sheet - String aChartName; + ScDocShell* pDocShell; + SCTAB nTab; // Charts sind pro Sheet + String aChartName; - void Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, bool bRowHeaders ); - void GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& rRowHeaders ) const; + void Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, bool bRowHeaders ); + void GetData_Impl( ScRangeListRef& rRanges, bool& rColHeaders, bool& rRowHeaders ) const; protected: // ::comphelper::OPropertySetHelper @@ -153,9 +153,9 @@ protected: public: ScChartObj(ScDocShell* pDocSh, SCTAB nT, const String& rN); - virtual ~ScChartObj(); + virtual ~ScChartObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XInterface DECLARE_XINTERFACE() @@ -168,14 +168,14 @@ public: // XTableChart virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) + virtual void SAL_CALL setHasColumnHeaders( sal_Bool bHasColumnHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getHasRowHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) + virtual void SAL_CALL setHasRowHeaders( sal_Bool bHasRowHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getRanges( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setRanges( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges ) throw(::com::sun::star::uno::RuntimeException); @@ -185,7 +185,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index f3142969d97a..e733509dcfc2 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,14 +102,14 @@ class ScChangeActionLinkEntry // not implemented, prevent usage ScChangeActionLinkEntry( const ScChangeActionLinkEntry& ); - ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ); + ScChangeActionLinkEntry& operator=( const ScChangeActionLinkEntry& ); protected: - ScChangeActionLinkEntry* pNext; - ScChangeActionLinkEntry** ppPrev; - ScChangeAction* pAction; - ScChangeActionLinkEntry* pLink; + ScChangeActionLinkEntry* pNext; + ScChangeActionLinkEntry** ppPrev; + ScChangeAction* pAction; + ScChangeActionLinkEntry* pLink; public: @@ -118,7 +118,7 @@ public: ScChangeActionLinkEntry( ScChangeActionLinkEntry** ppPrevP, ScChangeAction* pActionP ) - : pNext( *ppPrevP ), + : pNext( *ppPrevP ), ppPrev( ppPrevP ), pAction( pActionP ), pLink( NULL ) @@ -128,7 +128,7 @@ public: *ppPrevP = this; } - virtual ~ScChangeActionLinkEntry() + virtual ~ScChangeActionLinkEntry() { ScChangeActionLinkEntry* p = pLink; UnLink(); @@ -137,7 +137,7 @@ public: delete p; } - void SetLink( ScChangeActionLinkEntry* pLinkP ) + void SetLink( ScChangeActionLinkEntry* pLinkP ) { UnLink(); if ( pLinkP ) @@ -147,7 +147,7 @@ public: } } - void UnLink() + void UnLink() { if ( pLink ) { @@ -156,17 +156,17 @@ public: } } - void Remove() + void Remove() { if ( ppPrev ) { if ( ( *ppPrev = pNext ) != NULL ) pNext->ppPrev = ppPrev; - ppPrev = NULL; // not inserted + ppPrev = NULL; // not inserted } } - void Insert( ScChangeActionLinkEntry** ppPrevP ) + void Insert( ScChangeActionLinkEntry** ppPrevP ) { if ( !ppPrev ) { @@ -177,12 +177,12 @@ public: } } - const ScChangeActionLinkEntry* GetLink() const { return pLink; } - ScChangeActionLinkEntry* GetLink() { return pLink; } - const ScChangeActionLinkEntry* GetNext() const { return pNext; } - ScChangeActionLinkEntry* GetNext() { return pNext; } - const ScChangeAction* GetAction() const { return pAction; } - ScChangeAction* GetAction() { return pAction; } + const ScChangeActionLinkEntry* GetLink() const { return pLink; } + ScChangeActionLinkEntry* GetLink() { return pLink; } + const ScChangeActionLinkEntry* GetNext() const { return pNext; } + ScChangeActionLinkEntry* GetNext() { return pNext; } + const ScChangeAction* GetAction() const { return pAction; } + ScChangeAction* GetAction() { return pAction; } #if DEBUG_CHANGETRACK String ToString() const; #endif // DEBUG_CHANGETRACK @@ -199,13 +199,13 @@ class ScChangeActionCellListEntry friend class ScChangeActionMove; friend class ScChangeTrack; - ScChangeActionCellListEntry* pNext; - ScChangeActionContent* pContent; + ScChangeActionCellListEntry* pNext; + ScChangeActionContent* pContent; ScChangeActionCellListEntry( ScChangeActionContent* pContentP, ScChangeActionCellListEntry* pNextP ) - : pNext( pNextP ), + : pNext( pNextP ), pContent( pContentP ) {} @@ -233,28 +233,28 @@ class ScChangeAction // not implemented, prevent usage ScChangeAction( const ScChangeAction& ); - ScChangeAction& operator=( const ScChangeAction& ); + ScChangeAction& operator=( const ScChangeAction& ); protected: - ScBigRange aBigRange; // Ins/Del/MoveTo/ContentPos - DateTime aDateTime; //! UTC - String aUser; // wer war's - String aComment; // Benutzerkommentar - ScChangeAction* pNext; // naechster in Kette - ScChangeAction* pPrev; // vorheriger in Kette - ScChangeActionLinkEntry* pLinkAny; // irgendwelche Links - ScChangeActionLinkEntry* pLinkDeletedIn; // Zuordnung zu + ScBigRange aBigRange; // Ins/Del/MoveTo/ContentPos + DateTime aDateTime; //! UTC + String aUser; // wer war's + String aComment; // Benutzerkommentar + ScChangeAction* pNext; // naechster in Kette + ScChangeAction* pPrev; // vorheriger in Kette + ScChangeActionLinkEntry* pLinkAny; // irgendwelche Links + ScChangeActionLinkEntry* pLinkDeletedIn; // Zuordnung zu // geloeschten oder // druebergemoveten oder // rejecteten Insert // Bereichen - ScChangeActionLinkEntry* pLinkDeleted; // Links zu geloeschten - ScChangeActionLinkEntry* pLinkDependent; // Links zu abhaengigen - ULONG nAction; - ULONG nRejectAction; - ScChangeActionType eType; - ScChangeActionState eState; + ScChangeActionLinkEntry* pLinkDeleted; // Links zu geloeschten + ScChangeActionLinkEntry* pLinkDependent; // Links zu abhaengigen + ULONG nAction; + ULONG nRejectAction; + ScChangeActionType eType; + ScChangeActionState eState; ScChangeAction( ScChangeActionType, @@ -274,21 +274,21 @@ protected: const ScBigRange&, const ULONG nAction); - virtual ~ScChangeAction(); + virtual ~ScChangeAction(); - String GetRefString( const ScBigRange&, + String GetRefString( const ScBigRange&, ScDocument*, BOOL bFlag3D = FALSE ) const; - void SetActionNumber( ULONG n ) { nAction = n; } - void SetRejectAction( ULONG n ) { nRejectAction = n; } - void SetUser( const String& r ) { aUser = r; } - void SetType( ScChangeActionType e ) { eType = e; } - void SetState( ScChangeActionState e ) { eState = e; } - void SetRejected(); + void SetActionNumber( ULONG n ) { nAction = n; } + void SetRejectAction( ULONG n ) { nRejectAction = n; } + void SetUser( const String& r ) { aUser = r; } + void SetType( ScChangeActionType e ) { eType = e; } + void SetState( ScChangeActionState e ) { eState = e; } + void SetRejected(); - ScBigRange& GetBigRange() { return aBigRange; } + ScBigRange& GetBigRange() { return aBigRange; } - ScChangeActionLinkEntry* AddLink( ScChangeAction* p, + ScChangeActionLinkEntry* AddLink( ScChangeAction* p, ScChangeActionLinkEntry* pL ) { ScChangeActionLinkEntry* pLnk = @@ -297,50 +297,50 @@ protected: pLnk->SetLink( pL ); return pLnk; } - void RemoveAllAnyLinks(); + void RemoveAllAnyLinks(); - virtual ScChangeActionLinkEntry* GetDeletedIn() const + virtual ScChangeActionLinkEntry* GetDeletedIn() const { return pLinkDeletedIn; } - virtual ScChangeActionLinkEntry** GetDeletedInAddress() + virtual ScChangeActionLinkEntry** GetDeletedInAddress() { return &pLinkDeletedIn; } - ScChangeActionLinkEntry* AddDeletedIn( ScChangeAction* p ) + ScChangeActionLinkEntry* AddDeletedIn( ScChangeAction* p ) { return new ScChangeActionLinkEntry( GetDeletedInAddress(), p ); } - BOOL RemoveDeletedIn( const ScChangeAction* ); - void SetDeletedIn( ScChangeAction* ); + BOOL RemoveDeletedIn( const ScChangeAction* ); + void SetDeletedIn( ScChangeAction* ); - ScChangeActionLinkEntry* AddDeleted( ScChangeAction* p ) + ScChangeActionLinkEntry* AddDeleted( ScChangeAction* p ) { return new ScChangeActionLinkEntry( &pLinkDeleted, p ); } - void RemoveAllDeleted(); + void RemoveAllDeleted(); - ScChangeActionLinkEntry* AddDependent( ScChangeAction* p ) + ScChangeActionLinkEntry* AddDependent( ScChangeAction* p ) { return new ScChangeActionLinkEntry( &pLinkDependent, p ); } - void RemoveAllDependent(); + void RemoveAllDependent(); - void RemoveAllLinks(); + void RemoveAllLinks(); - virtual void AddContent( ScChangeActionContent* ) = 0; - virtual void DeleteCellEntries() = 0; + virtual void AddContent( ScChangeActionContent* ) = 0; + virtual void DeleteCellEntries() = 0; - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - void Accept(); - virtual BOOL Reject( ScDocument* ) = 0; - void RejectRestoreContents( ScChangeTrack*, + void Accept(); + virtual BOOL Reject( ScDocument* ) = 0; + void RejectRestoreContents( ScChangeTrack*, SCsCOL nDx, SCsROW nDy ); // used in Reject() instead of IsRejectable() - BOOL IsInternalRejectable() const; + BOOL IsInternalRejectable() const; // Derived classes that hold a pointer to the // ChangeTrack must return that. Otherwise NULL. @@ -348,107 +348,107 @@ protected: public: - BOOL IsInsertType() const + BOOL IsInsertType() const { return eType == SC_CAT_INSERT_COLS || eType == SC_CAT_INSERT_ROWS || eType == SC_CAT_INSERT_TABS; } - BOOL IsDeleteType() const + BOOL IsDeleteType() const { return eType == SC_CAT_DELETE_COLS || eType == SC_CAT_DELETE_ROWS || eType == SC_CAT_DELETE_TABS; } - BOOL IsVirgin() const + BOOL IsVirgin() const { return eState == SC_CAS_VIRGIN; } - BOOL IsAccepted() const + BOOL IsAccepted() const { return eState == SC_CAS_ACCEPTED; } - BOOL IsRejected() const + BOOL IsRejected() const { return eState == SC_CAS_REJECTED; } // Action rejects another Action - BOOL IsRejecting() const + BOOL IsRejecting() const { return nRejectAction != 0; } // ob Action im Dokument sichtbar ist - BOOL IsVisible() const; + BOOL IsVisible() const; // ob Action anfassbar ist - BOOL IsTouchable() const; + BOOL IsTouchable() const; // ob Action ein Eintrag in Dialog-Root ist - BOOL IsDialogRoot() const; + BOOL IsDialogRoot() const; // ob ein Eintrag im Dialog aufklappbar sein soll - BOOL IsDialogParent() const; + BOOL IsDialogParent() const; // ob Action ein Delete ist, unter dem // aufgeklappt mehrere einzelne Deletes sind - BOOL IsMasterDelete() const; + BOOL IsMasterDelete() const; // ob Action akzeptiert/selektiert/abgelehnt // werden kann - BOOL IsClickable() const; + BOOL IsClickable() const; // ob Action abgelehnt werden kann - BOOL IsRejectable() const; + BOOL IsRejectable() const; - const ScBigRange& GetBigRange() const { return aBigRange; } - SC_DLLPUBLIC DateTime GetDateTime() const; // local time - const DateTime& GetDateTimeUTC() const // UTC time + const ScBigRange& GetBigRange() const { return aBigRange; } + SC_DLLPUBLIC DateTime GetDateTime() const; // local time + const DateTime& GetDateTimeUTC() const // UTC time { return aDateTime; } - const String& GetUser() const { return aUser; } - const String& GetComment() const { return aComment; } - ScChangeActionType GetType() const { return eType; } - ScChangeActionState GetState() const { return eState; } - ULONG GetActionNumber() const { return nAction; } - ULONG GetRejectAction() const { return nRejectAction; } + const String& GetUser() const { return aUser; } + const String& GetComment() const { return aComment; } + ScChangeActionType GetType() const { return eType; } + ScChangeActionState GetState() const { return eState; } + ULONG GetActionNumber() const { return nAction; } + ULONG GetRejectAction() const { return nRejectAction; } - ScChangeAction* GetNext() const { return pNext; } - ScChangeAction* GetPrev() const { return pPrev; } + ScChangeAction* GetNext() const { return pNext; } + ScChangeAction* GetPrev() const { return pPrev; } - BOOL IsDeletedIn() const + BOOL IsDeletedIn() const { return GetDeletedIn() != NULL; } - BOOL IsDeleted() const + BOOL IsDeleted() const { return IsDeleteType() || IsDeletedIn(); } - BOOL IsDeletedIn( const ScChangeAction* ) const; - BOOL IsDeletedInDelType( ScChangeActionType ) const; + BOOL IsDeletedIn( const ScChangeAction* ) const; + BOOL IsDeletedInDelType( ScChangeActionType ) const; void RemoveAllDeletedIn(); const ScChangeActionLinkEntry* GetFirstDeletedEntry() const { return pLinkDeleted; } const ScChangeActionLinkEntry* GetFirstDependentEntry() const { return pLinkDependent; } - BOOL HasDependent() const + BOOL HasDependent() const { return pLinkDependent != NULL; } - BOOL HasDeleted() const + BOOL HasDeleted() const { return pLinkDeleted != NULL; } // Description wird an String angehaengt. // Mit bSplitRange wird bei Delete nur // eine Spalte/Zeile beruecksichtigt (fuer // Auflistung der einzelnen Eintraege). - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - virtual void GetRefString( String&, ScDocument*, + virtual void GetRefString( String&, ScDocument*, BOOL bFlag3D = FALSE ) const; // fuer DocumentMerge altes Datum einer anderen // Action setzen, mit GetDateTimeUTC geholt - void SetDateTimeUTC( const DateTime& rDT ) + void SetDateTimeUTC( const DateTime& rDT ) { aDateTime = rDT; } // Benutzerkommentar setzen - void SetComment( const String& rStr ) + void SetComment( const String& rStr ) { aComment = rStr; } // only to be used in the XML import - void SetDeletedInThis( ULONG nActionNumber, + void SetDeletedInThis( ULONG nActionNumber, const ScChangeTrack* pTrack ); // only to be used in the XML import - void AddDependent( ULONG nActionNumber, + void AddDependent( ULONG nActionNumber, const ScChangeTrack* pTrack ); #if DEBUG_CHANGETRACK String ToString( ScDocument* pDoc ) const; @@ -463,12 +463,12 @@ class ScChangeActionIns : public ScChangeAction friend class ScChangeTrack; ScChangeActionIns( const ScRange& rRange ); - virtual ~ScChangeActionIns(); + virtual ~ScChangeActionIns(); - virtual void AddContent( ScChangeActionContent* ) {} - virtual void DeleteCellEntries() {} + virtual void AddContent( ScChangeActionContent* ) {} + virtual void DeleteCellEntries() {} - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return 0; } @@ -482,7 +482,7 @@ public: const String &sComment, const ScChangeActionType eType); // only to use in the XML import - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; }; @@ -496,15 +496,15 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry friend class ScChangeActionDel; friend class ScChangeTrack; - short nCutOffFrom; - short nCutOffTo; + short nCutOffFrom; + short nCutOffTo; ScChangeActionDelMoveEntry( ScChangeActionDelMoveEntry** ppPrevP, ScChangeActionMove* pMove, short nFrom, short nTo ) - : ScChangeActionLinkEntry( + : ScChangeActionLinkEntry( (ScChangeActionLinkEntry**) ppPrevP, (ScChangeAction*) pMove ), @@ -512,30 +512,30 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry nCutOffTo( nTo ) {} - ScChangeActionDelMoveEntry* GetNext() + ScChangeActionDelMoveEntry* GetNext() { return (ScChangeActionDelMoveEntry*) ScChangeActionLinkEntry::GetNext(); } - ScChangeActionMove* GetMove() + ScChangeActionMove* GetMove() { return (ScChangeActionMove*) ScChangeActionLinkEntry::GetAction(); } public: - const ScChangeActionDelMoveEntry* GetNext() const + const ScChangeActionDelMoveEntry* GetNext() const { return (const ScChangeActionDelMoveEntry*) ScChangeActionLinkEntry::GetNext(); } - const ScChangeActionMove* GetMove() const + const ScChangeActionMove* GetMove() const { return (const ScChangeActionMove*) ScChangeActionLinkEntry::GetAction(); } - short GetCutOffFrom() const { return nCutOffFrom; } - short GetCutOffTo() const { return nCutOffTo; } + short GetCutOffFrom() const { return nCutOffFrom; } + short GetCutOffTo() const { return nCutOffTo; } }; @@ -544,31 +544,31 @@ class ScChangeActionDel : public ScChangeAction friend class ScChangeTrack; friend void ScChangeAction::Accept(); - ScChangeTrack* pTrack; + ScChangeTrack* pTrack; ScChangeActionCellListEntry* pFirstCell; - ScChangeActionIns* pCutOff; // abgeschnittener Insert - short nCutOff; // +: Start -: End + ScChangeActionIns* pCutOff; // abgeschnittener Insert + short nCutOff; // +: Start -: End ScChangeActionDelMoveEntry* pLinkMove; - SCsCOL nDx; - SCsROW nDy; + SCsCOL nDx; + SCsROW nDy; ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* ); - virtual ~ScChangeActionDel(); + virtual ~ScChangeActionDel(); - ScChangeActionIns* GetCutOffInsert() { return pCutOff; } + ScChangeActionIns* GetCutOffInsert() { return pCutOff; } - virtual void AddContent( ScChangeActionContent* ); - virtual void DeleteCellEntries(); + virtual void AddContent( ScChangeActionContent* ); + virtual void DeleteCellEntries(); - void UndoCutOffMoves(); - void UndoCutOffInsert(); + void UndoCutOffMoves(); + void UndoCutOffInsert(); - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } @@ -587,37 +587,37 @@ public: // ob dieses das unterste einer Reihe (oder // auch einzeln) ist - BOOL IsBaseDelete() const; + BOOL IsBaseDelete() const; // ob dieses das oberste einer Reihe (oder // auch einzeln) ist - BOOL IsTopDelete() const; + BOOL IsTopDelete() const; // ob dieses ein Teil einer Reihe ist - BOOL IsMultiDelete() const; + BOOL IsMultiDelete() const; // ob es eine Col ist, die zu einem TabDelete gehoert - BOOL IsTabDeleteCol() const; + BOOL IsTabDeleteCol() const; - SCsCOL GetDx() const { return nDx; } - SCsROW GetDy() const { return nDy; } - ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) + SCsCOL GetDx() const { return nDx; } + SCsROW GetDy() const { return nDy; } + ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy) const ScChangeActionCellListEntry* GetFirstCellEntry() const { return pFirstCell; } const ScChangeActionDelMoveEntry* GetFirstMoveEntry() const { return pLinkMove; } - const ScChangeActionIns* GetCutOffInsert() const { return pCutOff; } - short GetCutOffCount() const { return nCutOff; } + const ScChangeActionIns* GetCutOffInsert() const { return pCutOff; } + short GetCutOffCount() const { return nCutOff; } - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - void SetCutOffInsert( ScChangeActionIns* p, short n ) - { pCutOff = p; nCutOff = n; } // only to use in the XML import + void SetCutOffInsert( ScChangeActionIns* p, short n ) + { pCutOff = p; nCutOff = n; } // only to use in the XML import // this should be protected, but for the XML import it is public // only to use in the XML import // this should be protected, but for the XML import it is public - ScChangeActionDelMoveEntry* AddCutOffMove( ScChangeActionMove* pMove, + ScChangeActionDelMoveEntry* AddCutOffMove( ScChangeActionMove* pMove, short nFrom, short nTo ) { return new ScChangeActionDelMoveEntry( @@ -633,11 +633,11 @@ class ScChangeActionMove : public ScChangeAction friend class ScChangeTrack; friend class ScChangeActionDel; - ScBigRange aFromRange; - ScChangeTrack* pTrack; + ScBigRange aFromRange; + ScChangeTrack* pTrack; ScChangeActionCellListEntry* pFirstCell; - ULONG nStartLastCut; // fuer PasteCut Undo - ULONG nEndLastCut; + ULONG nStartLastCut; // fuer PasteCut Undo + ULONG nEndLastCut; ScChangeActionMove( const ScRange& rFromRange, const ScRange& rToRange, @@ -649,23 +649,23 @@ class ScChangeActionMove : public ScChangeAction nStartLastCut(0), nEndLastCut(0) {} - virtual ~ScChangeActionMove(); + virtual ~ScChangeActionMove(); - virtual void AddContent( ScChangeActionContent* ); - virtual void DeleteCellEntries(); + virtual void AddContent( ScChangeActionContent* ); + virtual void DeleteCellEntries(); - ScBigRange& GetFromRange() { return aFromRange; } + ScBigRange& GetFromRange() { return aFromRange; } - void SetStartLastCut( ULONG nVal ) { nStartLastCut = nVal; } - ULONG GetStartLastCut() const { return nStartLastCut; } - void SetEndLastCut( ULONG nVal ) { nEndLastCut = nVal; } - ULONG GetEndLastCut() const { return nEndLastCut; } + void SetStartLastCut( ULONG nVal ) { nStartLastCut = nVal; } + ULONG GetStartLastCut() const { return nStartLastCut; } + void SetEndLastCut( ULONG nVal ) { nEndLastCut = nVal; } + ULONG GetEndLastCut() const { return nEndLastCut; } - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return pTrack; } @@ -685,13 +685,13 @@ public: const ScChangeActionCellListEntry* GetFirstCellEntry() const { return pFirstCell; } // only to use in the XML export - const ScBigRange& GetFromRange() const { return aFromRange; } - SC_DLLPUBLIC void GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const; + const ScBigRange& GetFromRange() const { return aFromRange; } + SC_DLLPUBLIC void GetDelta( INT32& nDx, INT32& nDy, INT32& nDz ) const; - virtual void GetDescription( String&, ScDocument*, + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - virtual void GetRefString( String&, ScDocument*, + virtual void GetRefString( String&, ScDocument*, BOOL bFlag3D = FALSE ) const; }; @@ -712,16 +712,16 @@ class ScChangeActionContent : public ScChangeAction { friend class ScChangeTrack; - String aOldValue; - String aNewValue; - ScBaseCell* pOldCell; - ScBaseCell* pNewCell; - ScChangeActionContent* pNextContent; // an gleicher Position - ScChangeActionContent* pPrevContent; - ScChangeActionContent* pNextInSlot; // in gleichem Slot - ScChangeActionContent** ppPrevInSlot; + String aOldValue; + String aNewValue; + ScBaseCell* pOldCell; + ScBaseCell* pNewCell; + ScChangeActionContent* pNextContent; // an gleicher Position + ScChangeActionContent* pPrevContent; + ScChangeActionContent* pNextInSlot; // in gleichem Slot + ScChangeActionContent** ppPrevInSlot; - void InsertInSlot( ScChangeActionContent** pp ) + void InsertInSlot( ScChangeActionContent** pp ) { if ( !ppPrevInSlot ) { @@ -731,74 +731,74 @@ class ScChangeActionContent : public ScChangeAction *pp = this; } } - void RemoveFromSlot() + void RemoveFromSlot() { if ( ppPrevInSlot ) { if ( ( *ppPrevInSlot = pNextInSlot ) != NULL ) pNextInSlot->ppPrevInSlot = ppPrevInSlot; - ppPrevInSlot = NULL; // not inserted + ppPrevInSlot = NULL; // not inserted } } - ScChangeActionContent* GetNextInSlot() { return pNextInSlot; } + ScChangeActionContent* GetNextInSlot() { return pNextInSlot; } - void ClearTrack(); + void ClearTrack(); - static void GetStringOfCell( String& rStr, + static void GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, const ScAddress& rPos ); - static void GetStringOfCell( String& rStr, + static void GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, ULONG nFormat ); - static void SetValue( String& rStr, ScBaseCell*& pCell, + static void SetValue( String& rStr, ScBaseCell*& pCell, const ScAddress& rPos, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ); - static void SetValue( String& rStr, ScBaseCell*& pCell, + static void SetValue( String& rStr, ScBaseCell*& pCell, ULONG nFormat, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ); - static void SetCell( String& rStr, ScBaseCell* pCell, + static void SetCell( String& rStr, ScBaseCell* pCell, ULONG nFormat, const ScDocument* pDoc ); - static BOOL NeedsNumberFormat( const ScBaseCell* ); + static BOOL NeedsNumberFormat( const ScBaseCell* ); - void SetValueString( String& rValue, - ScBaseCell*& pCell, const String& rStr, + void SetValueString( String& rValue, + ScBaseCell*& pCell, const String& rStr, ScDocument* pDoc ); - void GetValueString( String& rStr, + void GetValueString( String& rStr, const String& rValue, const ScBaseCell* pCell ) const; - void GetFormulaString( String& rStr, + void GetFormulaString( String& rStr, const ScFormulaCell* pCell ) const; - virtual void AddContent( ScChangeActionContent* ) {} - virtual void DeleteCellEntries() {} + virtual void AddContent( ScChangeActionContent* ) {} + virtual void DeleteCellEntries() {} - virtual void UpdateReference( const ScChangeTrack*, + virtual void UpdateReference( const ScChangeTrack*, UpdateRefMode, const ScBigRange&, INT32 nDx, INT32 nDy, INT32 nDz ); - virtual BOOL Reject( ScDocument* ); + virtual BOOL Reject( ScDocument* ); virtual const ScChangeTrack* GetChangeTrack() const { return 0; } // pRejectActions!=NULL: reject actions get // stacked, no SetNewValue, no Append - BOOL Select( ScDocument*, ScChangeTrack*, + BOOL Select( ScDocument*, ScChangeTrack*, BOOL bOldest, Stack* pRejectActions ); - void PutValueToDoc( ScBaseCell*, const String&, + void PutValueToDoc( ScBaseCell*, const String&, ScDocument*, SCsCOL nDx, SCsROW nDy ) const; protected: @@ -832,82 +832,82 @@ public: const ScBigRange& aBigRange, ScDocument* pDoc, const String& sNewValue); // to use for XML Import of Generated Actions - virtual ~ScChangeActionContent(); + virtual ~ScChangeActionContent(); - ScChangeActionContent* GetNextContent() const { return pNextContent; } - ScChangeActionContent* GetPrevContent() const { return pPrevContent; } - ScChangeActionContent* GetTopContent() const; - BOOL IsTopContent() const + ScChangeActionContent* GetNextContent() const { return pNextContent; } + ScChangeActionContent* GetPrevContent() const { return pPrevContent; } + ScChangeActionContent* GetTopContent() const; + BOOL IsTopContent() const { return pNextContent == NULL; } - virtual ScChangeActionLinkEntry* GetDeletedIn() const; - virtual ScChangeActionLinkEntry** GetDeletedInAddress(); + virtual ScChangeActionLinkEntry* GetDeletedIn() const; + virtual ScChangeActionLinkEntry** GetDeletedInAddress(); - void PutOldValueToDoc( ScDocument*, + void PutOldValueToDoc( ScDocument*, SCsCOL nDx, SCsROW nDy ) const; - void PutNewValueToDoc( ScDocument*, + void PutNewValueToDoc( ScDocument*, SCsCOL nDx, SCsROW nDy ) const; - void SetOldValue( const ScBaseCell*, + void SetOldValue( const ScBaseCell*, const ScDocument* pFromDoc, ScDocument* pToDoc, ULONG nFormat ); - void SetOldValue( const ScBaseCell*, + void SetOldValue( const ScBaseCell*, const ScDocument* pFromDoc, ScDocument* pToDoc ); - void SetNewValue( const ScBaseCell*, ScDocument* ); + void SetNewValue( const ScBaseCell*, ScDocument* ); // Used in import filter AppendContentOnTheFly, // takes ownership of cells. - void SetOldNewCells( ScBaseCell* pOldCell, + void SetOldNewCells( ScBaseCell* pOldCell, ULONG nOldFormat, ScBaseCell* pNewCell, ULONG nNewFormat, ScDocument* pDoc ); // Use this only in the XML import, // takes ownership of cell. - void SetNewCell( ScBaseCell* pCell, ScDocument* pDoc, const String& rFormatted ); + void SetNewCell( ScBaseCell* pCell, ScDocument* pDoc, const String& rFormatted ); // These functions should be protected but for // the XML import they are public. - void SetNextContent( ScChangeActionContent* p ) + void SetNextContent( ScChangeActionContent* p ) { pNextContent = p; } - void SetPrevContent( ScChangeActionContent* p ) + void SetPrevContent( ScChangeActionContent* p ) { pPrevContent = p; } // moeglichst nicht verwenden, // setzt nur String bzw. generiert Formelzelle - void SetOldValue( const String& rOld, ScDocument* ); - void SetNewValue( const String& rNew, ScDocument* ); - - void GetOldString( String& ) const; - void GetNewString( String& ) const; - const ScBaseCell* GetOldCell() const { return pOldCell; } - const ScBaseCell* GetNewCell() const { return pNewCell; } - virtual void GetDescription( String&, ScDocument*, + void SetOldValue( const String& rOld, ScDocument* ); + void SetNewValue( const String& rNew, ScDocument* ); + + void GetOldString( String& ) const; + void GetNewString( String& ) const; + const ScBaseCell* GetOldCell() const { return pOldCell; } + const ScBaseCell* GetNewCell() const { return pNewCell; } + virtual void GetDescription( String&, ScDocument*, BOOL bSplitRange = FALSE, bool bWarning = true ) const; - virtual void GetRefString( String&, ScDocument*, + virtual void GetRefString( String&, ScDocument*, BOOL bFlag3D = FALSE ) const; - static ScChangeActionContentCellType GetContentCellType( const ScBaseCell* ); + static ScChangeActionContentCellType GetContentCellType( const ScBaseCell* ); // NewCell - BOOL IsMatrixOrigin() const + BOOL IsMatrixOrigin() const { return GetContentCellType( GetNewCell() ) == SC_CACCT_MATORG; } - BOOL IsMatrixReference() const + BOOL IsMatrixReference() const { return GetContentCellType( GetNewCell() ) == SC_CACCT_MATREF; } // OldCell - BOOL IsOldMatrixOrigin() const + BOOL IsOldMatrixOrigin() const { return GetContentCellType( GetOldCell() ) == SC_CACCT_MATORG; } - BOOL IsOldMatrixReference() const + BOOL IsOldMatrixReference() const { return GetContentCellType( GetOldCell() ) == SC_CACCT_MATREF; @@ -932,10 +932,10 @@ class ScChangeActionReject : public ScChangeAction SetState( SC_CAS_ACCEPTED ); } - virtual void AddContent( ScChangeActionContent* ) {} - virtual void DeleteCellEntries() {} + virtual void AddContent( ScChangeActionContent* ) {} + virtual void DeleteCellEntries() {} - virtual BOOL Reject( ScDocument* ) { return FALSE; } + virtual BOOL Reject( ScDocument* ) { return FALSE; } virtual const ScChangeTrack* GetChangeTrack() const { return 0; } @@ -955,19 +955,19 @@ public: enum ScChangeTrackMsgType { SC_CTM_NONE, - SC_CTM_APPEND, // Actions angehaengt - SC_CTM_REMOVE, // Actions weggenommen - SC_CTM_CHANGE, // Actions geaendert - SC_CTM_PARENT // war kein Parent und ist jetzt einer + SC_CTM_APPEND, // Actions angehaengt + SC_CTM_REMOVE, // Actions weggenommen + SC_CTM_CHANGE, // Actions geaendert + SC_CTM_PARENT // war kein Parent und ist jetzt einer }; struct ScChangeTrackMsgInfo { DECL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo ) - ScChangeTrackMsgType eMsgType; - ULONG nStartAction; - ULONG nEndAction; + ScChangeTrackMsgType eMsgType; + ULONG nStartAction; + ULONG nEndAction; }; // MsgQueue fuer Benachrichtigung via ModifiedLink @@ -990,7 +990,7 @@ DECLARE_TABLE( ScChangeActionTable, ScChangeAction* ) // Intern generierte Actions beginnen bei diesem Wert (fast alle Bits gesetzt) // und werden runtergezaehlt, um sich in einer Table wertemaessig nicht mit den // "normalen" Actions in die Quere zu kommen. -#define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0) +#define SC_CHGTRACK_GENERATED_START ((UINT32) 0xfffffff0) class ScChangeTrack : public utl::ConfigurationListener { @@ -1000,117 +1000,117 @@ class ScChangeTrack : public utl::ConfigurationListener friend void ScChangeActionMove::DeleteCellEntries(); friend BOOL ScChangeActionMove::Reject( ScDocument* pDoc ); - static const SCROW nContentRowsPerSlot; - static const SCSIZE nContentSlots; - - com::sun::star::uno::Sequence< sal_Int8 > aProtectPass; - ScChangeActionTable aTable; - ScChangeActionTable aGeneratedTable; - ScChangeActionTable aPasteCutTable; - ScChangeTrackMsgQueue aMsgQueue; - ScChangeTrackMsgStack aMsgStackTmp; - ScChangeTrackMsgStack aMsgStackFinal; - ScStrCollection aUserCollection; - String aUser; - Link aModifiedLink; - ScRange aInDeleteRange; - DateTime aFixDateTime; - ScChangeAction* pFirst; - ScChangeAction* pLast; - ScChangeActionContent* pFirstGeneratedDelContent; - ScChangeActionContent** ppContentSlots; - ScChangeActionMove* pLastCutMove; - ScChangeActionLinkEntry* pLinkInsertCol; - ScChangeActionLinkEntry* pLinkInsertRow; - ScChangeActionLinkEntry* pLinkInsertTab; - ScChangeActionLinkEntry* pLinkMove; - ScChangeTrackMsgInfo* pBlockModifyMsg; - ScDocument* pDoc; - ULONG nActionMax; - ULONG nGeneratedMin; - ULONG nMarkLastSaved; - ULONG nStartLastCut; - ULONG nEndLastCut; - ULONG nLastMerge; - ScChangeTrackMergeState eMergeState; - USHORT nLoadedFileFormatVersion; - BOOL bLoadSave; - BOOL bInDelete; - BOOL bInDeleteUndo; - BOOL bInDeleteTop; - BOOL bInPasteCut; - BOOL bUseFixDateTime; + static const SCROW nContentRowsPerSlot; + static const SCSIZE nContentSlots; + + com::sun::star::uno::Sequence< sal_Int8 > aProtectPass; + ScChangeActionTable aTable; + ScChangeActionTable aGeneratedTable; + ScChangeActionTable aPasteCutTable; + ScChangeTrackMsgQueue aMsgQueue; + ScChangeTrackMsgStack aMsgStackTmp; + ScChangeTrackMsgStack aMsgStackFinal; + ScStrCollection aUserCollection; + String aUser; + Link aModifiedLink; + ScRange aInDeleteRange; + DateTime aFixDateTime; + ScChangeAction* pFirst; + ScChangeAction* pLast; + ScChangeActionContent* pFirstGeneratedDelContent; + ScChangeActionContent** ppContentSlots; + ScChangeActionMove* pLastCutMove; + ScChangeActionLinkEntry* pLinkInsertCol; + ScChangeActionLinkEntry* pLinkInsertRow; + ScChangeActionLinkEntry* pLinkInsertTab; + ScChangeActionLinkEntry* pLinkMove; + ScChangeTrackMsgInfo* pBlockModifyMsg; + ScDocument* pDoc; + ULONG nActionMax; + ULONG nGeneratedMin; + ULONG nMarkLastSaved; + ULONG nStartLastCut; + ULONG nEndLastCut; + ULONG nLastMerge; + ScChangeTrackMergeState eMergeState; + USHORT nLoadedFileFormatVersion; + BOOL bLoadSave; + BOOL bInDelete; + BOOL bInDeleteUndo; + BOOL bInDeleteTop; + BOOL bInPasteCut; + BOOL bUseFixDateTime; BOOL bTime100thSeconds; // not implemented, prevent usage ScChangeTrack( const ScChangeTrack& ); - ScChangeTrack& operator=( const ScChangeTrack& ); + ScChangeTrack& operator=( const ScChangeTrack& ); #ifdef SC_CHGTRACK_CXX - static SCROW InitContentRowsPerSlot(); + static SCROW InitContentRowsPerSlot(); // TRUE if one is MM_FORMULA and the other is // not, or if both are and range differs - static BOOL IsMatrixFormulaRangeDifferent( + static BOOL IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell, const ScBaseCell* pNewCell ); - void Init(); - void DtorClear(); - void SetLoadSave( BOOL bVal ) { bLoadSave = bVal; } - void SetInDeleteRange( const ScRange& rRange ) + void Init(); + void DtorClear(); + void SetLoadSave( BOOL bVal ) { bLoadSave = bVal; } + void SetInDeleteRange( const ScRange& rRange ) { aInDeleteRange = rRange; } - void SetInDelete( BOOL bVal ) + void SetInDelete( BOOL bVal ) { bInDelete = bVal; } - void SetInDeleteTop( BOOL bVal ) + void SetInDeleteTop( BOOL bVal ) { bInDeleteTop = bVal; } - void SetInDeleteUndo( BOOL bVal ) + void SetInDeleteUndo( BOOL bVal ) { bInDeleteUndo = bVal; } - void SetInPasteCut( BOOL bVal ) + void SetInPasteCut( BOOL bVal ) { bInPasteCut = bVal; } - void SetMergeState( ScChangeTrackMergeState eState ) + void SetMergeState( ScChangeTrackMergeState eState ) { eMergeState = eState; } - ScChangeTrackMergeState GetMergeState() const { return eMergeState; } - void SetLastMerge( ULONG nVal ) { nLastMerge = nVal; } - ULONG GetLastMerge() const { return nLastMerge; } + ScChangeTrackMergeState GetMergeState() const { return eMergeState; } + void SetLastMerge( ULONG nVal ) { nLastMerge = nVal; } + ULONG GetLastMerge() const { return nLastMerge; } - void SetLastCutMoveRange( const ScRange&, ScDocument* ); + void SetLastCutMoveRange( const ScRange&, ScDocument* ); // ModifyMsg blockweise und nicht einzeln erzeugen - void StartBlockModify( ScChangeTrackMsgType, + void StartBlockModify( ScChangeTrackMsgType, ULONG nStartAction ); - void EndBlockModify( ULONG nEndAction ); + void EndBlockModify( ULONG nEndAction ); - void AddDependentWithNotify( ScChangeAction* pParent, + void AddDependentWithNotify( ScChangeAction* pParent, ScChangeAction* pDependent ); - void Dependencies( ScChangeAction* ); - void UpdateReference( ScChangeAction*, BOOL bUndo ); - void UpdateReference( ScChangeAction** ppFirstAction, + void Dependencies( ScChangeAction* ); + void UpdateReference( ScChangeAction*, BOOL bUndo ); + void UpdateReference( ScChangeAction** ppFirstAction, ScChangeAction* pAct, BOOL bUndo ); - void Append( ScChangeAction* pAppend, ULONG nAction ); - SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, + void Append( ScChangeAction* pAppend, ULONG nAction ); + SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, ScDocument* pRefDoc, SCsTAB nDz, ULONG nRejectingInsert ); - void AppendOneDeleteRange( const ScRange& rOrgRange, + void AppendOneDeleteRange( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ULONG nRejectingInsert ); - void LookUpContents( const ScRange& rOrgRange, + void LookUpContents( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void Remove( ScChangeAction* ); - void MasterLinks( ScChangeAction* ); + void Remove( ScChangeAction* ); + void MasterLinks( ScChangeAction* ); // Content on top an Position - ScChangeActionContent* SearchContentAt( const ScBigAddress&, + ScChangeActionContent* SearchContentAt( const ScBigAddress&, ScChangeAction* pButNotThis ) const; - void DeleteGeneratedDelContent( + void DeleteGeneratedDelContent( ScChangeActionContent* ); - ScChangeActionContent* GenerateDelContent( const ScAddress&, + ScChangeActionContent* GenerateDelContent( const ScAddress&, const ScBaseCell*, const ScDocument* pFromDoc ); - void DeleteCellEntries( + void DeleteCellEntries( ScChangeActionCellListEntry*&, ScChangeAction* pDeletor ); @@ -1119,17 +1119,17 @@ class ScChangeTrack : public utl::ConfigurationListener // ist nur bei Insert und Move (MasterType) // noetig, kann ansonsten NULL sein. // bRecursion == Aufruf aus Reject mit Table - BOOL Reject( ScChangeAction*, + BOOL Reject( ScChangeAction*, ScChangeActionTable*, BOOL bRecursion ); -#endif // SC_CHGTRACK_CXX +#endif // SC_CHGTRACK_CXX - void ClearMsgQueue(); + void ClearMsgQueue(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); public: - static SCSIZE ComputeContentSlot( INT32 nRow ) + static SCSIZE ComputeContentSlot( INT32 nRow ) { if ( nRow < 0 || nRow > MAXROW ) return nContentSlots - 1; @@ -1140,64 +1140,64 @@ public: ScChangeTrack( ScDocument*, const ScStrCollection& ); // only to use in the XML import SC_DLLPUBLIC virtual ~ScChangeTrack(); - void Clear(); + void Clear(); - ScChangeActionContent* GetFirstGenerated() const { return pFirstGeneratedDelContent; } - ScChangeAction* GetFirst() const { return pFirst; } - ScChangeAction* GetLast() const { return pLast; } - ULONG GetActionMax() const { return nActionMax; } - BOOL IsGenerated( ULONG nAction ) const + ScChangeActionContent* GetFirstGenerated() const { return pFirstGeneratedDelContent; } + ScChangeAction* GetFirst() const { return pFirst; } + ScChangeAction* GetLast() const { return pLast; } + ULONG GetActionMax() const { return nActionMax; } + BOOL IsGenerated( ULONG nAction ) const { return nAction >= nGeneratedMin; } - ScChangeAction* GetAction( ULONG nAction ) const + ScChangeAction* GetAction( ULONG nAction ) const { return aTable.Get( nAction ); } - ScChangeAction* GetGenerated( ULONG nGenerated ) const + ScChangeAction* GetGenerated( ULONG nGenerated ) const { return aGeneratedTable.Get( nGenerated ); } - ScChangeAction* GetActionOrGenerated( ULONG nAction ) const + ScChangeAction* GetActionOrGenerated( ULONG nAction ) const { return IsGenerated( nAction ) ? GetGenerated( nAction ) : GetAction( nAction ); } - ULONG GetLastSavedActionNumber() const + ULONG GetLastSavedActionNumber() const { return nMarkLastSaved; } void SetLastSavedActionNumber(ULONG nNew) { nMarkLastSaved = nNew; } - ScChangeAction* GetLastSaved() const + ScChangeAction* GetLastSaved() const { return aTable.Get( nMarkLastSaved ); } - ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } + ScChangeActionContent** GetContentSlots() const { return ppContentSlots; } - BOOL IsLoadSave() const { return bLoadSave; } - const ScRange& GetInDeleteRange() const + BOOL IsLoadSave() const { return bLoadSave; } + const ScRange& GetInDeleteRange() const { return aInDeleteRange; } - BOOL IsInDelete() const { return bInDelete; } - BOOL IsInDeleteTop() const { return bInDeleteTop; } - BOOL IsInDeleteUndo() const { return bInDeleteUndo; } - BOOL IsInPasteCut() const { return bInPasteCut; } - SC_DLLPUBLIC void SetUser( const String& ); - const String& GetUser() const { return aUser; } - const ScStrCollection& GetUserCollection() const + BOOL IsInDelete() const { return bInDelete; } + BOOL IsInDeleteTop() const { return bInDeleteTop; } + BOOL IsInDeleteUndo() const { return bInDeleteUndo; } + BOOL IsInPasteCut() const { return bInPasteCut; } + SC_DLLPUBLIC void SetUser( const String& ); + const String& GetUser() const { return aUser; } + const ScStrCollection& GetUserCollection() const { return aUserCollection; } - ScDocument* GetDocument() const { return pDoc; } + ScDocument* GetDocument() const { return pDoc; } // for import filter - const DateTime& GetFixDateTime() const { return aFixDateTime; } + const DateTime& GetFixDateTime() const { return aFixDateTime; } // set this if the date/time set with // SetFixDateTime...() shall be applied to // appended actions - void SetUseFixDateTime( BOOL bVal ) + void SetUseFixDateTime( BOOL bVal ) { bUseFixDateTime = bVal; } // for MergeDocument, apply original date/time as UTC - void SetFixDateTimeUTC( const DateTime& rDT ) + void SetFixDateTimeUTC( const DateTime& rDT ) { aFixDateTime = rDT; } // for import filter, apply original date/time as local time - void SetFixDateTimeLocal( const DateTime& rDT ) + void SetFixDateTimeLocal( const DateTime& rDT ) { aFixDateTime = rDT; aFixDateTime.ConvertToUTC(); } - void Append( ScChangeAction* ); + void Append( ScChangeAction* ); // pRefDoc may be NULL => no lookup of contents // => no generation of deleted contents - SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, + SC_DLLPUBLIC void AppendDeleteRange( const ScRange&, ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction, SCsTAB nDz = 0 ); @@ -1206,28 +1206,28 @@ public: // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus RefDoc/UndoDoc - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, ScDocument* pRefDoc ); // nachdem neue Werte im Dokument gesetzt wurden, // alte Werte aus RefDoc/UndoDoc - void AppendContentRange( const ScRange& rRange, + void AppendContentRange( const ScRange& rRange, ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction, ScChangeActionClipMode eMode = SC_CACM_NONE ); // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus pOldCell, nOldFormat, // RefDoc==NULL => Doc - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, const ScBaseCell* pOldCell, ULONG nOldFormat, ScDocument* pRefDoc = NULL ); // nachdem neuer Wert im Dokument gesetzt wurde, // alter Wert aus pOldCell, Format aus Doc - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, const ScBaseCell* pOldCell ); // nachdem neue Werte im Dokument gesetzt wurden, // alte Werte aus RefDoc/UndoDoc. // Alle Contents, wo im RefDoc eine Zelle steht. - void AppendContentsIfInRefDoc( ScDocument* pRefDoc, + void AppendContentsIfInRefDoc( ScDocument* pRefDoc, ULONG& nStartAction, ULONG& nEndAction ); // Meant for import filter, creates and inserts @@ -1238,7 +1238,7 @@ public: // The action is returned and may be used to // set user name, description, date/time et al. // Takes ownership of the cells! - SC_DLLPUBLIC ScChangeActionContent* AppendContentOnTheFly( const ScAddress& rPos, + SC_DLLPUBLIC ScChangeActionContent* AppendContentOnTheFly( const ScAddress& rPos, ScBaseCell* pOldCell, ScBaseCell* pNewCell, ULONG nOldFormat = 0, @@ -1249,20 +1249,20 @@ public: // NewValue bzw. Formelerzeugung) // bevor neuer Wert im Dokument gesetzt wird - void AppendContent( const ScAddress& rPos, + void AppendContent( const ScAddress& rPos, const String& rNewValue, ScBaseCell* pOldCell ); - SC_DLLPUBLIC void AppendInsert( const ScRange& ); + SC_DLLPUBLIC void AppendInsert( const ScRange& ); // pRefDoc may be NULL => no lookup of contents // => no generation of deleted contents - SC_DLLPUBLIC void AppendMove( const ScRange& rFromRange, + SC_DLLPUBLIC void AppendMove( const ScRange& rFromRange, const ScRange& rToRange, ScDocument* pRefDoc ); // Cut to Clipboard - void ResetLastCut() + void ResetLastCut() { nStartLastCut = nEndLastCut = 0; if ( pLastCutMove ) @@ -1271,22 +1271,22 @@ public: pLastCutMove = NULL; } } - BOOL HasLastCut() const + BOOL HasLastCut() const { return nEndLastCut > 0 && nStartLastCut <= nEndLastCut && pLastCutMove; } - SC_DLLPUBLIC void Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false ); + SC_DLLPUBLIC void Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge = false ); // fuer MergeDocument, Referenzen anpassen, //! darf nur in einem temporaer geoeffneten //! Dokument verwendet werden, der Track //! ist danach verhunzt - void MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false ); - void MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false ); - static BOOL MergeIgnore( const ScChangeAction&, ULONG nFirstMerge ); + void MergePrepare( ScChangeAction* pFirstMerge, bool bShared = false ); + void MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bShared = false ); + static BOOL MergeIgnore( const ScChangeAction&, ULONG nFirstMerge ); // Abhaengige in Table einfuegen. // Bei Insert sind es echte Abhaengige, @@ -1301,7 +1301,7 @@ public: // Deletes einer Reihe gelistet. // Mit bAllFlat werden auch alle Abhaengigen // der Abhaengigen flach eingefuegt. - SC_DLLPUBLIC void GetDependents( ScChangeAction*, + SC_DLLPUBLIC void GetDependents( ScChangeAction*, ScChangeActionTable&, BOOL bListMasterDelete = FALSE, BOOL bAllFlat = FALSE ) const; @@ -1310,36 +1310,36 @@ public: BOOL Reject( ScChangeAction*, bool bShared = false ); // Accept visible Action (und abhaengige) - SC_DLLPUBLIC BOOL Accept( ScChangeAction* ); + SC_DLLPUBLIC BOOL Accept( ScChangeAction* ); - void AcceptAll(); // alle Virgins - BOOL RejectAll(); // alle Virgins + void AcceptAll(); // alle Virgins + BOOL RejectAll(); // alle Virgins // Selektiert einen Content von mehreren an // gleicher Position und akzeptiert diesen und // die aelteren, rejected die neueren. // Mit bOldest==TRUE wird der erste OldValue // einer Virgin-Content-Kette restauriert. - BOOL SelectContent( ScChangeAction*, + BOOL SelectContent( ScChangeAction*, BOOL bOldest = FALSE ); // wenn ModifiedLink gesetzt, landen // Aenderungen in ScChangeTrackMsgQueue - void SetModifiedLink( const Link& r ) + void SetModifiedLink( const Link& r ) { aModifiedLink = r; ClearMsgQueue(); } - const Link& GetModifiedLink() const { return aModifiedLink; } + const Link& GetModifiedLink() const { return aModifiedLink; } ScChangeTrackMsgQueue& GetMsgQueue() { return aMsgQueue; } - void NotifyModified( ScChangeTrackMsgType eMsgType, + void NotifyModified( ScChangeTrackMsgType eMsgType, ULONG nStartAction, ULONG nEndAction ); - USHORT GetLoadedFileFormatVersion() const + USHORT GetLoadedFileFormatVersion() const { return nLoadedFileFormatVersion; } - ULONG AddLoadedGenerated(ScBaseCell* pOldCell, + ULONG AddLoadedGenerated(ScBaseCell* pOldCell, const ScBigRange& aBigRange, const String& sNewValue ); // only to use in the XML import - void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected - void SetActionMax(ULONG nTempActionMax) + void AppendLoaded( ScChangeAction* pAppend ); // this is only for the XML import public, it should be protected + void SetActionMax(ULONG nTempActionMax) { nActionMax = nTempActionMax; } // only to use in the XML import void SetProtection( const com::sun::star::uno::Sequence< sal_Int8 >& rPass ) diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index b4ad990afbaf..77c80532129f 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include "rangelst.hxx" #include "scdllapi.h" -enum ScChgsDateMode{ SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2, +enum ScChgsDateMode{ SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2, SCDM_DATE_NOTEQUAL=3,SCDM_DATE_BETWEEN=4, SCDM_DATE_SAVE=5, SCDM_NO_DATEMODE=6}; @@ -47,21 +47,21 @@ class SC_DLLPUBLIC ScChangeViewSettings { private: - utl::TextSearch* pCommentSearcher; - DateTime aFirstDateTime; - DateTime aLastDateTime; - String aAuthorToShow; - String aComment; - ScRangeList aRangeList; - ScChgsDateMode eDateMode; - BOOL bShowIt; - BOOL bIsDate; - BOOL bIsAuthor; - BOOL bIsComment; - BOOL bIsRange; - BOOL bEveryoneButMe; - BOOL bShowAccepted; - BOOL bShowRejected; + utl::TextSearch* pCommentSearcher; + DateTime aFirstDateTime; + DateTime aLastDateTime; + String aAuthorToShow; + String aComment; + ScRangeList aRangeList; + ScChgsDateMode eDateMode; + BOOL bShowIt; + BOOL bIsDate; + BOOL bIsAuthor; + BOOL bIsComment; + BOOL bIsRange; + BOOL bEveryoneButMe; + BOOL bShowAccepted; + BOOL bShowRejected; bool mbIsActionRange; ULONG mnFirstAction; ULONG mnLastAction; @@ -87,53 +87,53 @@ public: ~ScChangeViewSettings(); - BOOL ShowChanges() const {return bShowIt;} - void SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;} + BOOL ShowChanges() const {return bShowIt;} + void SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;} - BOOL HasDate() const {return bIsDate;} - void SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;} + BOOL HasDate() const {return bIsDate;} + void SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;} - void SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; } - ScChgsDateMode GetTheDateMode() const { return eDateMode; } + void SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; } + ScChgsDateMode GetTheDateMode() const { return eDateMode; } - void SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;} - const DateTime& GetTheFirstDateTime()const {return aFirstDateTime;} + void SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;} + const DateTime& GetTheFirstDateTime()const {return aFirstDateTime;} - void SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;} - const DateTime& GetTheLastDateTime()const {return aLastDateTime;} + void SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;} + const DateTime& GetTheLastDateTime()const {return aLastDateTime;} - BOOL HasAuthor() const {return bIsAuthor;} - void SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;} + BOOL HasAuthor() const {return bIsAuthor;} + void SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;} - String GetTheAuthorToShow()const {return aAuthorToShow;} - void SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;} + String GetTheAuthorToShow()const {return aAuthorToShow;} + void SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;} - BOOL HasComment() const {return bIsComment;} - void SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;} + BOOL HasComment() const {return bIsComment;} + void SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;} - String GetTheComment()const {return aComment;} - void SetTheComment(const String& aString); + String GetTheComment()const {return aComment;} + void SetTheComment(const String& aString); - BOOL IsValidComment(const String* pCommentStr) const; + BOOL IsValidComment(const String* pCommentStr) const; - BOOL IsEveryoneButMe() const {return bEveryoneButMe;} - void SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;} + BOOL IsEveryoneButMe() const {return bEveryoneButMe;} + void SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;} - BOOL HasRange() const {return bIsRange;} - void SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;} + BOOL HasRange() const {return bIsRange;} + void SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;} - const ScRangeList& GetTheRangeList()const {return aRangeList;} - void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;} + const ScRangeList& GetTheRangeList()const {return aRangeList;} + void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;} - BOOL IsShowAccepted() const { return bShowAccepted; } - void SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; } + BOOL IsShowAccepted() const { return bShowAccepted; } + void SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; } - BOOL IsShowRejected() const { return bShowRejected; } - void SetShowRejected( BOOL bVal ) { bShowRejected = bVal; } + BOOL IsShowRejected() const { return bShowRejected; } + void SetShowRejected( BOOL bVal ) { bShowRejected = bVal; } - ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); + ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); /// Adjust dates according to selected DateMode void AdjustDateMode( const ScDocument& rDoc ); diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx index 915a4fb7333a..883f17b5b17a 100644 --- a/sc/inc/clipparam.hxx +++ b/sc/inc/clipparam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,8 +34,8 @@ #include <vector> -/** - * This struct stores general clipboard parameters associated with a +/** + * This struct stores general clipboard parameters associated with a * ScDocument instance created in clipboard mode. */ struct ScClipParam @@ -52,20 +52,20 @@ struct ScClipParam bool isMultiRange() const; - /** + /** * Get the column size of a pasted range. Note that when the range is - * non-contiguous, we first compress all individual ranges into a single + * non-contiguous, we first compress all individual ranges into a single * range, and the size of that compressed range is returned. */ SCCOL getPasteColSize(); - /** - * Same as the above method, but returns the row size of the compressed - * range. + /** + * Same as the above method, but returns the row size of the compressed + * range. */ SCROW getPasteRowSize(); - /** + /** * Return a single range that encompasses all individual ranges. */ ScRange getWholeRange() const; diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx index 9e0b1a66c1bd..eefecd33126d 100644 --- a/sc/inc/collect.hxx +++ b/sc/inc/collect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,12 +38,12 @@ #endif #include "scdllapi.h" -#define MAXCOLLECTIONSIZE 16384 -#define MAXDELTA 1024 -#define SCPOS_INVALID USHRT_MAX +#define MAXCOLLECTIONSIZE 16384 +#define MAXDELTA 1024 +#define SCPOS_INVALID USHRT_MAX -#define SC_STRTYPE_VALUE 0 -#define SC_STRTYPE_STANDARD 1 +#define SC_STRTYPE_VALUE 0 +#define SC_STRTYPE_STANDARD 1 class ScDocument; @@ -58,10 +58,10 @@ public: class SC_DLLPUBLIC ScCollection : public ScDataObject { protected: - USHORT nCount; - USHORT nLimit; - USHORT nDelta; - ScDataObject** pItems; + USHORT nCount; + USHORT nLimit; + USHORT nDelta; + ScDataObject** pItems; public: ScCollection(USHORT nLim = 4, USHORT nDel = 4); ScCollection(const ScCollection& rCollection); @@ -88,11 +88,11 @@ public: class SC_DLLPUBLIC ScSortedCollection : public ScCollection { private: - BOOL bDuplicates; + BOOL bDuplicates; protected: // fuer ScStrCollection Load/Store - void SetDups( BOOL bVal ) { bDuplicates = bVal; } - BOOL IsDups() const { return bDuplicates; } + void SetDups( BOOL bVal ) { bDuplicates = bVal; } + BOOL IsDups() const { return bDuplicates; } public: ScSortedCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE); ScSortedCollection(const ScSortedCollection& rScSortedCollection) : @@ -119,11 +119,11 @@ friend class ScStrCollection; public: StrData(const String& rStr) : aStr(rStr) {} StrData(const StrData& rData) : ScDataObject(), aStr(rData.aStr) {} - virtual ScDataObject* Clone() const; - const String& GetString() const { return aStr; } + virtual ScDataObject* Clone() const; + const String& GetString() const { return aStr; } // SetString nur, wenn StrData nicht in ScStrCollection ist! !!! // z.B. fuer Searcher - void SetString( const String& rNew ) { aStr = rNew; } + void SetString( const String& rNew ) { aStr = rNew; } }; //------------------------------------------------------------------------ @@ -134,23 +134,23 @@ class SC_DLLPUBLIC ScStrCollection : public ScSortedCollection { public: ScStrCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : - ScSortedCollection ( nLim, nDel, bDup ) {} + ScSortedCollection ( nLim, nDel, bDup ) {} ScStrCollection(const ScStrCollection& rScStrCollection) : - ScSortedCollection ( rScStrCollection ) {} + ScSortedCollection ( rScStrCollection ) {} - virtual ScDataObject* Clone() const; - StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual ScDataObject* Clone() const; + StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; }; //------------------------------------------------------------------------ // TypedScStrCollection: wie ScStrCollection, nur, dass Zahlen vor Strings -// sortiert werden +// sortiert werden class TypedStrData : public ScDataObject { public: - TypedStrData( const String& rStr, double nVal = 0.0, + TypedStrData( const String& rStr, double nVal = 0.0, USHORT nType = SC_STRTYPE_STANDARD ) : aStrValue(rStr), nValue(nVal), @@ -162,24 +162,24 @@ public: nValue(rCpy.nValue), nStrType(rCpy.nStrType) {} - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - BOOL IsStrData() const { return nStrType != 0; } - const String& GetString() const { return aStrValue; } - double GetValue () const { return nValue; } + BOOL IsStrData() const { return nStrType != 0; } + const String& GetString() const { return aStrValue; } + double GetValue () const { return nValue; } private: friend class TypedScStrCollection; - String aStrValue; - double nValue; - USHORT nStrType; // 0 = Value + String aStrValue; + double nValue; + USHORT nStrType; // 0 = Value }; class SC_DLLPUBLIC TypedScStrCollection : public ScSortedCollection { private: - BOOL bCaseSensitive; + BOOL bCaseSensitive; public: TypedScStrCollection( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE ); @@ -191,9 +191,9 @@ public: virtual ScDataObject* Clone() const; virtual short Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const; - TypedStrData* operator[]( const USHORT nIndex) const; + TypedStrData* operator[]( const USHORT nIndex) const; - void SetCaseSensitive( BOOL bSet ); + void SetCaseSensitive( BOOL bSet ); BOOL FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const; BOOL GetExactMatch( String& rString ) const; diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 2600ee149d3f..cf193de1f1e9 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,16 +71,16 @@ class ScFlatBoolRowSegments; struct ScSetStringParam; struct ScColWidthParam; -#define COLUMN_DELTA 4 +#define COLUMN_DELTA 4 struct ScNeededSizeOptions { - const ScPatternAttr* pPattern; - BOOL bFormula; - BOOL bSkipMerged; - BOOL bGetFont; - BOOL bTotalSize; + const ScPatternAttr* pPattern; + BOOL bFormula; + BOOL bSkipMerged; + BOOL bGetFont; + BOOL bTotalSize; ScNeededSizeOptions() { @@ -94,25 +94,25 @@ struct ScNeededSizeOptions struct ColEntry { - SCROW nRow; - ScBaseCell* pCell; + SCROW nRow; + ScBaseCell* pCell; }; class ScColumn { private: - SCCOL nCol; - SCTAB nTab; + SCCOL nCol; + SCTAB nTab; - SCSIZE nCount; - SCSIZE nLimit; - ColEntry* pItems; + SCSIZE nCount; + SCSIZE nLimit; + ColEntry* pItems; - ScAttrArray* pAttrArray; - ScDocument* pDocument; + ScAttrArray* pAttrArray; + ScDocument* pDocument; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator; friend class ScDBQueryDataIterator; @@ -124,7 +124,7 @@ friend class ScHorizontalCellIterator; friend class ScHorizontalAttrIterator; public: - static bool bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln + static bool bDoubleAlloc; // fuer Import: Groesse beim Allozieren verdoppeln class DoubleAllocSwitch { @@ -138,132 +138,132 @@ public: ScColumn(); ~ScColumn(); - void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc); + void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc); - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; - ScBaseCell* GetCell( SCROW nRow ) const; - void Insert( SCROW nRow, ScBaseCell* pCell ); - void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell ); - void Append( SCROW nRow, ScBaseCell* pCell ); - void Delete( SCROW nRow ); - void DeleteAtIndex( SCSIZE nIndex ); - void FreeAll(); - void Resize( SCSIZE nSize ); - void SwapRow( SCROW nRow1, SCROW nRow2 ); - void SwapCell( SCROW nRow, ScColumn& rCol); + BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + ScBaseCell* GetCell( SCROW nRow ) const; + void Insert( SCROW nRow, ScBaseCell* pCell ); + void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell ); + void Append( SCROW nRow, ScBaseCell* pCell ); + void Delete( SCROW nRow ); + void DeleteAtIndex( SCSIZE nIndex ); + void FreeAll(); + void Resize( SCSIZE nSize ); + void SwapRow( SCROW nRow1, SCROW nRow2 ); + void SwapCell( SCROW nRow, ScColumn& rCol); bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, + BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; + BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, BOOL bRefresh, BOOL bAttrs ); - BOOL IsEmptyVisData(BOOL bNotes) const; // ohne Broadcaster - BOOL IsEmptyData() const; - BOOL IsEmptyAttr() const; - BOOL IsEmpty() const; + BOOL IsEmptyVisData(BOOL bNotes) const; // ohne Broadcaster + BOOL IsEmptyData() const; + BOOL IsEmptyAttr() const; + BOOL IsEmpty() const; // nur Daten: - BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const; - SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const; - BOOL HasDataAt(SCROW nRow) const; - BOOL HasVisibleDataAt(SCROW nRow) const; - SCROW GetFirstDataPos() const; - SCROW GetLastDataPos() const; - SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster - SCROW GetFirstVisDataPos(BOOL bNotes) const; - BOOL GetPrevDataPos(SCROW& rRow) const; - BOOL GetNextDataPos(SCROW& rRow) const; - void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster) - void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const; - - SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const; - - USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; - BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const; + BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const; + SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const; + BOOL HasDataAt(SCROW nRow) const; + BOOL HasVisibleDataAt(SCROW nRow) const; + SCROW GetFirstDataPos() const; + SCROW GetLastDataPos() const; + SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne Broadcaster + SCROW GetFirstVisDataPos(BOOL bNotes) const; + BOOL GetPrevDataPos(SCROW& rRow) const; + BOOL GetNextDataPos(SCROW& rRow) const; + void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster) + void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const; + + SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const; + + USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; + BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const; BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const; BOOL GetLastVisibleAttr( SCROW& rLastRow ) const; - BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; - BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, + BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const; + BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0, SCROW nEndRow = MAXROW ) const; - BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const; + BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const; - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; - BOOL TestInsertRow( SCSIZE nSize ) const; - void InsertRow( SCROW nStartRow, SCSIZE nSize ); - void DeleteRow( SCROW nStartRow, SCSIZE nSize ); + BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const; + BOOL TestInsertRow( SCSIZE nSize ) const; + void InsertRow( SCROW nStartRow, SCSIZE nSize ); + void DeleteRow( SCROW nStartRow, SCSIZE nSize ); void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag ); void DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag ); void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions); - void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, + void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn& rColumn); - void StartListeningInArea( SCROW nRow1, SCROW nRow2 ); - void BroadcastInArea( SCROW nRow1, SCROW nRow2 ); + void StartListeningInArea( SCROW nRow1, SCROW nRow2 ); + void BroadcastInArea( SCROW nRow1, SCROW nRow2 ); - void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ); + void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ); - // Markierung von diesem Dokument - void MixMarked( const ScMarkData& rMark, USHORT nFunction, + // Markierung von diesem Dokument + void MixMarked( const ScMarkData& rMark, USHORT nFunction, BOOL bSkipEmpty, ScColumn& rSrcCol ); - void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, + void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, ScColumn& rSrcCol ); - ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos, + ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos, SCSIZE nIndex, USHORT nFlags ) const; ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const; - SCCOL GetCol() const { return nCol; } + SCCOL GetCol() const { return nCol; } - // UpdateSelectionFunction: Mehrfachselektion - void UpdateSelectionFunction( const ScMarkData& rMark, + // UpdateSelectionFunction: Mehrfachselektion + void UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow ); - void UpdateAreaFunction( ScFunctionData& rData, + void UpdateAreaFunction( ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW nStartRow, SCROW nEndRow ); - void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, + void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScColumn& rColumn, const ScMarkData* pMarkData = NULL, BOOL bAsLink = FALSE ); - void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, + void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScColumn& rColumn, const ScMarkData* pMarkData = NULL ); - void CopyScenarioFrom( const ScColumn& rSrcCol ); - void CopyScenarioTo( ScColumn& rDestCol ) const; - BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const; - void MarkScenarioIn( ScMarkData& rDestMark ) const; + void CopyScenarioFrom( const ScColumn& rSrcCol ); + void CopyScenarioTo( ScColumn& rDestCol ) const; + BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const; + void MarkScenarioIn( ScMarkData& rDestMark ) const; - void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const; + void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const; - void SwapCol(ScColumn& rCol); - void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol); + void SwapCol(ScColumn& rCol); + void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol); - BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const; + BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const; - // TRUE = Zahlformat gesetzt - BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, + // TRUE = Zahlformat gesetzt + BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO, ScSetStringParam* pParam = NULL ); - void SetValue( SCROW nRow, const double& rVal); - void SetError( SCROW nRow, const USHORT nError); + void SetValue( SCROW nRow, const double& rVal); + void SetError( SCROW nRow, const USHORT nError); - void GetString( SCROW nRow, String& rString ) const; - void GetInputString( SCROW nRow, String& rString ) const; - double GetValue( SCROW nRow ) const; - void GetFormula( SCROW nRow, String& rFormula, + void GetString( SCROW nRow, String& rString ) const; + void GetInputString( SCROW nRow, String& rString ) const; + double GetValue( SCROW nRow ) const; + void GetFormula( SCROW nRow, String& rFormula, BOOL bAsciiExport = FALSE ) const; - CellType GetCellType( SCROW nRow ) const; - SCSIZE GetCellCount() const { return nCount; } - ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln - USHORT GetErrCode( SCROW nRow ) const; + CellType GetCellType( SCROW nRow ) const; + SCSIZE GetCellCount() const { return nCount; } + ULONG GetWeightedCount() const; + ULONG GetCodeCount() const; // RPN-Code in Formeln + USHORT GetErrCode( SCROW nRow ) const; - BOOL HasStringData( SCROW nRow ) const; - BOOL HasValueData( SCROW nRow ) const; - BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; + BOOL HasStringData( SCROW nRow ) const; + BOOL HasValueData( SCROW nRow ) const; + BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const; /** Returns the pointer to a cell note object at the passed row. */ ScPostIt* GetNote( SCROW nRow ); @@ -274,137 +274,137 @@ public: /** Deletes the note at the passed row. */ void DeleteNote( SCROW nRow ); - void SetDirty(); - void SetDirty( const ScRange& ); - void SetDirtyVar(); - void SetDirtyAfterLoad(); - void SetTableOpDirty( const ScRange& ); - void CalcAll(); - void CalcAfterLoad(); - void CompileAll(); - void CompileXML( ScProgress& rProgress ); + void SetDirty(); + void SetDirty( const ScRange& ); + void SetDirtyVar(); + void SetDirtyAfterLoad(); + void SetTableOpDirty( const ScRange& ); + void CalcAll(); + void CalcAfterLoad(); + void CompileAll(); + void CompileXML( ScProgress& rProgress ); - void ResetChanged( SCROW nStartRow, SCROW nEndRow ); + void ResetChanged( SCROW nStartRow, SCROW nEndRow ); - void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL ); - void UpdateInsertTab( SCTAB nTable); - void UpdateInsertTabOnlyCells( SCTAB nTable); - void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL ); - void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, + void UpdateInsertTab( SCTAB nTable); + void UpdateInsertTabOnlyCells( SCTAB nTable); + void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL ); + void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo); + void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void SetTabNo(SCTAB nNewTab); - BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const; + void SetTabNo(SCTAB nNewTab); + BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const; void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const; - void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap ); + void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const ScRangeData::IndexMap& rMap ); - const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const; - const ScPatternAttr* GetPattern( SCROW nRow ) const; + const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const; + const ScPatternAttr* GetPattern( SCROW nRow ) const; const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( SCROW nRow ) const; + ULONG GetNumberFormat( SCROW nRow ) const; sal_uInt32 GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; - void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, + void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; + void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep ) const; + void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const; - void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, + void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ); - void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); - void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); - void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, + void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ); + void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ); + void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, ScEditDataArray* pDataArray = NULL ); bool SetAttrEntries(ScAttrEntry* pData, SCSIZE nSize); - void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); - void SetPatternArea( SCROW nStartRow, SCROW nEndRow, + void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); + void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE ); - void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, + void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); - void ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ); - void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ); - void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); - void ApplySelectionLineStyle( const ScMarkData& rMark, + void ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ); + void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ); + void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); + void ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, BOOL bColorOnly ); - const ScStyleSheet* GetStyle( SCROW nRow ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; + const ScStyleSheet* GetStyle( SCROW nRow ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; + const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const; - void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset ); + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; /// May return -1 if not found - SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, + SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, BOOL bUp, BOOL bInSelection, const ScMarkData& rMark ); - BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, + BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, BOOL bUp, BOOL bInSelection, const ScMarkData& rMark ); - BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); - void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); + BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ); + void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich ); - void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); + void RemoveProtected( SCROW nStartRow, SCROW nEndRow ); - SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL ); + SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL ); void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); - long GetNeededSize( SCROW nRow, OutputDevice* pDev, + long GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bWidth, const ScNeededSizeOptions& rOptions ); - USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, + USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bFormula, USHORT nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam ); - void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, + void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bShrink, USHORT nMinHeight, SCROW nMinStart ); private: - long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, + long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev, BOOL bWidth ); public: /// Including current, may return -1 - SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const; - void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates); - BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); + void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection& rStrings, bool& rHasDates); + BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); - void UpdateInsertTabAbs(SCTAB nNewPos); - BOOL TestTabRefAbs(SCTAB nTable); - BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; + void UpdateInsertTabAbs(SCTAB nNewPos); + BOOL TestTabRefAbs(SCTAB nTable); + BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const; - void RemoveAutoSpellObj(); + void RemoveAutoSpellObj(); - void StartListening( SvtListener& rLst, SCROW nRow ); - void EndListening( SvtListener& rLst, SCROW nRow ); - void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow ); - void StartAllListeners(); + void StartListening( SvtListener& rLst, SCROW nRow ); + void EndListening( SvtListener& rLst, SCROW nRow ); + void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow ); + void StartAllListeners(); void StartNeededListeners(); // only for cells where NeedsListening()==TRUE - void SetRelNameDirty(); + void SetRelNameDirty(); - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); - sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; + sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision, SCROW nRowStart, SCROW nRowEnd ) const; @@ -413,37 +413,37 @@ private: }; -class ScColumnIterator // alle Daten eines Bereichs durchgehen +class ScColumnIterator // alle Daten eines Bereichs durchgehen { - const ScColumn* pColumn; - SCSIZE nPos; - SCROW nTop; - SCROW nBottom; + const ScColumn* pColumn; + SCSIZE nPos; + SCROW nTop; + SCROW nBottom; public: ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW ); ~ScColumnIterator(); - BOOL Next( SCROW& rRow, ScBaseCell*& rpCell ); - SCSIZE GetIndex() const; + BOOL Next( SCROW& rRow, ScBaseCell*& rpCell ); + SCSIZE GetIndex() const; }; -class ScMarkedDataIter // Daten in selektierten Bereichen durchgehen +class ScMarkedDataIter // Daten in selektierten Bereichen durchgehen { - const ScColumn* pColumn; - SCSIZE nPos; - ScMarkArrayIter* pMarkIter; - SCROW nTop; - SCROW nBottom; - BOOL bNext; - BOOL bAll; + const ScColumn* pColumn; + SCSIZE nPos; + ScMarkArrayIter* pMarkIter; + SCROW nTop; + SCROW nBottom; + BOOL bNext; + BOOL bAll; public: ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData, BOOL bAllIfNone = FALSE ); ~ScMarkedDataIter(); - BOOL Next( SCSIZE& rIndex ); + BOOL Next( SCSIZE& rIndex ); }; diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 1229042f5ff0..c492f2ff01e3 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -416,7 +416,7 @@ public: const ScAddress& GetPos() const { return aPos; } void MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow ); - static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, + static void MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow ); BOOL UpdateNameReference( UpdateRefMode eUpdateRefMode, @@ -441,7 +441,7 @@ public: BOOL HasModifiedRange(); - /** If the character is allowed as first character in sheet names or + /** If the character is allowed as first character in sheet names or references, includes '$' and '?'. */ static inline BOOL IsCharWordChar( String const & rStr, xub_StrLen nPos, @@ -459,7 +459,7 @@ public: return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } - /** If the character is allowed in sheet names, thus may be part of a + /** If the character is allowed in sheet names, thus may be part of a reference, includes '$' and '?' and such. */ static inline BOOL IsWordChar( String const & rStr, xub_StrLen nPos, @@ -477,11 +477,11 @@ public: return ScGlobal::pCharClass->isLetterNumeric( rStr, nPos ); } - /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... - bits) for all known address conventions. If more than one bit is given - in nFlags, all bits must match. If bTestLetterNumeric is FALSE and + /** If the character is allowed as tested by nFlags (SC_COMPILER_C_... + bits) for all known address conventions. If more than one bit is given + in nFlags, all bits must match. If bTestLetterNumeric is FALSE and char>=128, no LetterNumeric test is done and FALSE is returned. */ - static inline bool IsCharFlagAllConventions( String const & rStr, + static inline bool IsCharFlagAllConventions( String const & rStr, xub_StrLen nPos, ULONG nFlags, bool bTestLetterNumeric = true ) @@ -493,7 +493,7 @@ public: for ( int nConv = formula::FormulaGrammar::CONV_UNSPECIFIED; ++nConv < formula::FormulaGrammar::CONV_LAST; ) { - if (pConventions[nConv] && + if (pConventions[nConv] && ((pConventions[nConv]->getCharTableFlags(c, cLast) & nFlags) != nFlags)) return false; // convention not known => assume valid @@ -525,7 +525,7 @@ private: virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); - virtual void LocalizeString( String& rName ); // modify rName - input: exact name + virtual void LocalizeString( String& rName ); // modify rName - input: exact name virtual BOOL IsImportingXML() const; /// Access the CharTable flags diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index 61d331e21210..c0f86381237a 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -307,7 +307,7 @@ A ScCompressedArrayIterator<A,D>::GetIterEnd() const return nIterEnd; } - + template< typename A, typename D > bool ScCompressedArrayIterator<A,D>::operator++() { diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index 99f2025be6a5..87e2eaccdb01 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ class ScRangeList; #define SC_COND_GROW 16 -// nOptions Flags -#define SC_COND_NOBLANKS 1 +// nOptions Flags +#define SC_COND_NOBLANKS 1 // Reihenfolge von ScConditionMode wie ScQueryOp, @@ -74,40 +74,40 @@ enum ScConditionValType class SC_DLLPUBLIC ScConditionEntry { // gespeicherte Daten: - ScConditionMode eOp; - USHORT nOptions; - double nVal1; // eingegeben oder berechnet - double nVal2; - String aStrVal1; // eingegeben oder berechnet - String aStrVal2; + ScConditionMode eOp; + USHORT nOptions; + double nVal1; // eingegeben oder berechnet + double nVal2; + String aStrVal1; // eingegeben oder berechnet + String aStrVal2; String aStrNmsp1; // namespace to be used on (re)compilation, e.g. in XML import String aStrNmsp2; // namespace to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar1; // grammar to be used on (re)compilation, e.g. in XML import formula::FormulaGrammar::Grammar eTempGrammar2; // grammar to be used on (re)compilation, e.g. in XML import - BOOL bIsStr1; // um auch leere Strings zu erkennen - BOOL bIsStr2; - ScTokenArray* pFormula1; // eingegebene Formel - ScTokenArray* pFormula2; + BOOL bIsStr1; // um auch leere Strings zu erkennen + BOOL bIsStr2; + ScTokenArray* pFormula1; // eingegebene Formel + ScTokenArray* pFormula2; ScAddress aSrcPos; // source position for formulas // temporary data: String aSrcString; // formula source position as text during XML import - ScFormulaCell* pFCell1; - ScFormulaCell* pFCell2; - ScDocument* pDoc; - BOOL bRelRef1; - BOOL bRelRef2; - BOOL bFirstRun; - - void MakeCells( const ScAddress& rPos ); - void Compile( const String& rExpr1, const String& rExpr2, + ScFormulaCell* pFCell1; + ScFormulaCell* pFCell2; + ScDocument* pDoc; + BOOL bRelRef1; + BOOL bRelRef2; + BOOL bFirstRun; + + void MakeCells( const ScAddress& rPos ); + void Compile( const String& rExpr1, const String& rExpr2, const String& rExprNmsp1, const String& rExprNmsp2, formula::FormulaGrammar::Grammar eGrammar1, formula::FormulaGrammar::Grammar eGrammar2, BOOL bTextToReal ); - void Interpret( const ScAddress& rPos ); + void Interpret( const ScAddress& rPos ); - BOOL IsValid( double nArg ) const; - BOOL IsValidStr( const String& rArg ) const; + BOOL IsValid( double nArg ) const; + BOOL IsValidStr( const String& rArg ) const; public: ScConditionEntry( ScConditionMode eOper, @@ -119,19 +119,19 @@ public: ScConditionEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos ); - ScConditionEntry( const ScConditionEntry& r ); // flache Kopie der Formeln + ScConditionEntry( const ScConditionEntry& r ); // flache Kopie der Formeln // echte Kopie der Formeln (fuer Ref-Undo): ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r ); virtual ~ScConditionEntry(); - int operator== ( const ScConditionEntry& r ) const; + int operator== ( const ScConditionEntry& r ) const; - BOOL IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + BOOL IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const; - ScConditionMode GetOperation() const { return eOp; } - BOOL IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } - void SetIgnoreBlank(BOOL bSet); - ScAddress GetSrcPos() const { return aSrcPos; } + ScConditionMode GetOperation() const { return eOp; } + BOOL IsIgnoreBlank() const { return ( nOptions & SC_COND_NOBLANKS ) == 0; } + void SetIgnoreBlank(BOOL bSet); + ScAddress GetSrcPos() const { return aSrcPos; } ScAddress GetValidSrcPos() const; // adjusted to allow textual representation of expressions @@ -140,36 +140,36 @@ public: void SetFormula1( const ScTokenArray& rArray ); void SetFormula2( const ScTokenArray& rArray ); - String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, + String GetExpression( const ScAddress& rCursor, USHORT nPos, ULONG nNumFmt = 0, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - ScTokenArray* CreateTokenArry( USHORT nPos ) const; + ScTokenArray* CreateTokenArry( USHORT nPos ) const; - void CompileAll(); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileAll(); + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void SourceChanged( const ScAddress& rChanged ); + void SourceChanged( const ScAddress& rChanged ); bool MarkUsedExternalReferences() const; protected: - virtual void DataChanged( const ScRange* pModified ) const; - ScDocument* GetDocument() const { return pDoc; } + virtual void DataChanged( const ScRange* pModified ) const; + ScDocument* GetDocument() const { return pDoc; } }; // -// einzelner Eintrag fuer bedingte Formatierung +// einzelner Eintrag fuer bedingte Formatierung // class ScConditionalFormat; class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry { - String aStyleName; - ScConditionalFormat* pParent; + String aStyleName; + ScConditionalFormat* pParent; using ScConditionEntry::operator==; @@ -188,31 +188,31 @@ public: const String& rStyle ); ScCondFormatEntry( const ScCondFormatEntry& r ); ScCondFormatEntry( ScDocument* pDocument, const ScCondFormatEntry& r ); - virtual ~ScCondFormatEntry(); + virtual ~ScCondFormatEntry(); - void SetParent( ScConditionalFormat* pNew ) { pParent = pNew; } + void SetParent( ScConditionalFormat* pNew ) { pParent = pNew; } - int operator== ( const ScCondFormatEntry& r ) const; + int operator== ( const ScCondFormatEntry& r ) const; - const String& GetStyle() const { return aStyleName; } - void UpdateStyleName(const String& rNew) { aStyleName=rNew; } + const String& GetStyle() const { return aStyleName; } + void UpdateStyleName(const String& rNew) { aStyleName=rNew; } protected: - virtual void DataChanged( const ScRange* pModified ) const; + virtual void DataChanged( const ScRange* pModified ) const; }; // -// komplette bedingte Formatierung +// komplette bedingte Formatierung // class SC_DLLPUBLIC ScConditionalFormat { - ScDocument* pDoc; - ScRangeList* pAreas; // Bereiche fuer Paint - sal_uInt32 nKey; // Index in Attributen - ScCondFormatEntry** ppEntries; - USHORT nEntryCount; - BOOL bIsUsed; // temporaer beim Speichern + ScDocument* pDoc; + ScRangeList* pAreas; // Bereiche fuer Paint + sal_uInt32 nKey; // Index in Attributen + ScCondFormatEntry** ppEntries; + USHORT nEntryCount; + BOOL bIsUsed; // temporaer beim Speichern public: ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument); @@ -222,45 +222,45 @@ public: // echte Kopie der Formeln (fuer Ref-Undo / zwischen Dokumenten) ScConditionalFormat* Clone(ScDocument* pNewDoc = NULL) const; - void AddEntry( const ScCondFormatEntry& rNew ); + void AddEntry( const ScCondFormatEntry& rNew ); - BOOL IsEmpty() const { return (nEntryCount == 0); } - USHORT Count() const { return nEntryCount; } + BOOL IsEmpty() const { return (nEntryCount == 0); } + USHORT Count() const { return nEntryCount; } - void CompileAll(); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileAll(); + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void RenameCellStyle( const String& rOld, const String& rNew ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void RenameCellStyle( const String& rOld, const String& rNew ); - void SourceChanged( const ScAddress& rAddr ); + void SourceChanged( const ScAddress& rAddr ); const ScCondFormatEntry* GetEntry( USHORT nPos ) const; - const String& GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const; + const String& GetCellStyle( ScBaseCell* pCell, const ScAddress& rPos ) const; - BOOL EqualEntries( const ScConditionalFormat& r ) const; + BOOL EqualEntries( const ScConditionalFormat& r ) const; - void DoRepaint( const ScRange* pModified ); - void InvalidateArea(); + void DoRepaint( const ScRange* pModified ); + void InvalidateArea(); - sal_uInt32 GetKey() const { return nKey; } - void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! + sal_uInt32 GetKey() const { return nKey; } + void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(BOOL bSet) { bIsUsed = bSet; } + BOOL IsUsed() const { return bIsUsed; } bool MarkUsedExternalReferences() const; - // sortiert (per PTRARR) nach Index - // operator== nur fuer die Sortierung - BOOL operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } + // sortiert (per PTRARR) nach Index + // operator== nur fuer die Sortierung + BOOL operator ==( const ScConditionalFormat& r ) const { return nKey == r.nKey; } + BOOL operator < ( const ScConditionalFormat& r ) const { return nKey < r.nKey; } }; // -// Liste der Bereiche und Formate: +// Liste der Bereiche und Formate: // typedef ScConditionalFormat* ScConditionalFormatPtr; @@ -276,25 +276,25 @@ public: ScConditionalFormatList(ScDocument* pNewDoc, const ScConditionalFormatList& rList); ~ScConditionalFormatList() {} - void InsertNew( ScConditionalFormat* pNew ) + void InsertNew( ScConditionalFormat* pNew ) { if (!Insert(pNew)) delete pNew; } ScConditionalFormat* GetFormat( sal_uInt32 nKey ); - void CompileAll(); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileAll(); + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void RenameCellStyle( const String& rOld, const String& rNew ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void RenameCellStyle( const String& rOld, const String& rNew ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - void SourceChanged( const ScAddress& rAddr ); + void SourceChanged( const ScAddress& rAddr ); /** Temporarily during save, returns RefManager's decision whether ALL * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScConditionalFormatList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScConditionalFormatList& r ) const; // fuer Ref-Undo }; #endif diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index 2fa22ad4dcf2..52a40e731a5c 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,21 +43,21 @@ class ScDocumentConfiguration : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + SfxItemPropertySet aPropSet; public: ScDocumentConfiguration(ScDocShell* pDocShell); - virtual ~ScDocumentConfiguration(); + virtual ~ScDocumentConfiguration(); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -69,25 +69,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index 70de0f8f3dd8..a9edc481d27c 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,97 +36,97 @@ class ScDocument; // ----------------------------------------------------------------------- -struct ScReferenceEntry // ohne Constructor ! +struct ScReferenceEntry // ohne Constructor ! { - SCCOL nCol; - SCROW nRow; - SCTAB nTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; }; -//! Delta-Wert fuer Daten benutzen? +//! Delta-Wert fuer Daten benutzen? -class ScReferenceList // ohne Constructor ! +class ScReferenceList // ohne Constructor ! { private: - SCSIZE nCount; - SCSIZE nFullSize; // inkl. Fuell-Eintraege - ScReferenceEntry* pData; + SCSIZE nCount; + SCSIZE nFullSize; // inkl. Fuell-Eintraege + ScReferenceEntry* pData; public: - void Init() { nCount=0; nFullSize=0; pData=NULL; } - void Clear() { delete[] pData; } + void Init() { nCount=0; nFullSize=0; pData=NULL; } + void Clear() { delete[] pData; } - SCSIZE GetCount() { return nCount; } - const ScReferenceEntry& GetEntry( SCSIZE nPos ) { return pData[nPos]; } - void SetFullSize( SCSIZE nNew ) { nFullSize = nNew; } + SCSIZE GetCount() { return nCount; } + const ScReferenceEntry& GetEntry( SCSIZE nPos ) { return pData[nPos]; } + void SetFullSize( SCSIZE nNew ) { nFullSize = nNew; } - void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ); }; // ----------------------------------------------------------------------- // -// Reihenfolge: -// 1) ScConsData anlegen -// 2) Parameter (Size/Flags) -// 3) AddFields fuer alle Bereiche (nur noetig bei bColByName oder bRowByName) -// 4) DoneFields ( " " ) -// 5) AddData fuer alle Bereiche -// evtl. AddName nach jedem Bereich -// 6) OutputToDocument +// Reihenfolge: +// 1) ScConsData anlegen +// 2) Parameter (Size/Flags) +// 3) AddFields fuer alle Bereiche (nur noetig bei bColByName oder bRowByName) +// 4) DoneFields ( " " ) +// 5) AddData fuer alle Bereiche +// evtl. AddName nach jedem Bereich +// 6) OutputToDocument // -//! ab bestimmter Groesse ScDocument Struktur benutzen? +//! ab bestimmter Groesse ScDocument Struktur benutzen? class ScConsData { private: - ScSubTotalFunc eFunction; - BOOL bReference; - BOOL bColByName; - BOOL bRowByName; - BOOL bSubTitles; - SCSIZE nColCount; - SCSIZE nRowCount; - BOOL** ppUsed; - double** ppSum; - double** ppCount; - double** ppSumSqr; - ScReferenceList** ppRefs; - String** ppColHeaders; - String** ppRowHeaders; - SCSIZE nDataCount; - SCSIZE nTitleCount; - String** ppTitles; - SCSIZE** ppTitlePos; - BOOL bCornerUsed; - String aCornerText; // nur bei bColByName && bRowByName + ScSubTotalFunc eFunction; + BOOL bReference; + BOOL bColByName; + BOOL bRowByName; + BOOL bSubTitles; + SCSIZE nColCount; + SCSIZE nRowCount; + BOOL** ppUsed; + double** ppSum; + double** ppCount; + double** ppSumSqr; + ScReferenceList** ppRefs; + String** ppColHeaders; + String** ppRowHeaders; + SCSIZE nDataCount; + SCSIZE nTitleCount; + String** ppTitles; + SCSIZE** ppTitlePos; + BOOL bCornerUsed; + String aCornerText; // nur bei bColByName && bRowByName public: ScConsData(); ~ScConsData(); - void SetSize( SCCOL nCols, SCROW nRows ); - void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef ); + void SetSize( SCCOL nCols, SCROW nRows ); + void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef ); - void InitData(BOOL bDelete=TRUE); - void DeleteData(); + void InitData(BOOL bDelete=TRUE); + void DeleteData(); - void AddFields( ScDocument* pSrcDoc, SCTAB nTab, + void AddFields( ScDocument* pSrcDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void DoneFields(); + void DoneFields(); - void AddData( ScDocument* pSrcDoc, SCTAB nTab, + void AddData( ScDocument* pSrcDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void AddName( const String& rName ); + void AddName( const String& rName ); - void OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ); + void OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ); - void GetSize( SCCOL& rCols, SCROW& rRows ) const; - SCROW GetInsertCount() const; + void GetSize( SCCOL& rCols, SCROW& rRows ) const; + SCROW GetInsertCount() const; }; diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx index 87c36aa95c82..03ba01fb2bde 100644 --- a/sc/inc/convuno.hxx +++ b/sc/inc/convuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,31 +45,31 @@ public: static void FillLocale( com::sun::star::lang::Locale& rLocale, LanguageType eLang ); // CellAddress -> ScAddress - static inline void FillScAddress( + static inline void FillScAddress( ScAddress& rScAddress, const ::com::sun::star::table::CellAddress& rApiAddress ); // ScAddress -> CellAddress - static inline void FillApiAddress( + static inline void FillApiAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ScAddress& rScAddress ); // CellRangeAddress -> ScRange - static inline void FillScRange( + static inline void FillScRange( ScRange& rScRange, const ::com::sun::star::table::CellRangeAddress& rApiRange ); // ScRange -> CellRangeAddress - static inline void FillApiRange( + static inline void FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ScRange& rScRange ); // CellAddress -> CellRangeAddress - static inline void FillApiRange( + static inline void FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ::com::sun::star::table::CellAddress& rApiAddress ); // CellRangeAddress-Start -> CellAddress - static inline void FillApiStartAddress( + static inline void FillApiStartAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ); // CellRangeAddress-End -> CellAddress - static inline void FillApiEndAddress( + static inline void FillApiEndAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ); @@ -88,14 +88,14 @@ public: }; -inline void ScUnoConversion::FillScAddress( +inline void ScUnoConversion::FillScAddress( ScAddress& rScAddress, const ::com::sun::star::table::CellAddress& rApiAddress ) { rScAddress.Set( (SCCOL)rApiAddress.Column, (SCROW)rApiAddress.Row, (SCTAB)rApiAddress.Sheet ); } -inline void ScUnoConversion::FillApiAddress( +inline void ScUnoConversion::FillApiAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ScAddress& rScAddress ) { @@ -104,7 +104,7 @@ inline void ScUnoConversion::FillApiAddress( rApiAddress.Sheet = rScAddress.Tab(); } -inline void ScUnoConversion::FillScRange( +inline void ScUnoConversion::FillScRange( ScRange& rScRange, const ::com::sun::star::table::CellRangeAddress& rApiRange ) { @@ -112,7 +112,7 @@ inline void ScUnoConversion::FillScRange( rScRange.aEnd.Set( (SCCOL)rApiRange.EndColumn, (SCROW)rApiRange.EndRow, (SCTAB)rApiRange.Sheet ); } -inline void ScUnoConversion::FillApiRange( +inline void ScUnoConversion::FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ScRange& rScRange ) { @@ -123,7 +123,7 @@ inline void ScUnoConversion::FillApiRange( rApiRange.EndRow = rScRange.aEnd.Row(); } -inline void ScUnoConversion::FillApiRange( +inline void ScUnoConversion::FillApiRange( ::com::sun::star::table::CellRangeAddress& rApiRange, const ::com::sun::star::table::CellAddress& rApiAddress ) { @@ -132,7 +132,7 @@ inline void ScUnoConversion::FillApiRange( rApiRange.Sheet = rApiAddress.Sheet; } -inline void ScUnoConversion::FillApiStartAddress( +inline void ScUnoConversion::FillApiStartAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ) { @@ -141,7 +141,7 @@ inline void ScUnoConversion::FillApiStartAddress( rApiAddress.Sheet = rApiRange.Sheet; } -inline void ScUnoConversion::FillApiEndAddress( +inline void ScUnoConversion::FillApiEndAddress( ::com::sun::star::table::CellAddress& rApiAddress, const ::com::sun::star::table::CellRangeAddress& rApiRange ) { diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index e4602a1da4f9..292dcad9d41e 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,35 +41,35 @@ class ScCellCursorObj : public ScCellRangeObj, { public: ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR); - virtual ~ScCellCursorObj(); + virtual ~ScCellCursorObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XSheetCellCursor - virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToCurrentArray() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) + virtual void SAL_CALL collapseToCurrentRegion() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL collapseToCurrentArray() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL collapseToMergedArea() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL expandToEntireColumns() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL expandToEntireRows() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) throw(::com::sun::star::uno::RuntimeException); // XUsedAreaCursor - virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) + virtual void SAL_CALL gotoStartOfUsedArea( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) + virtual void SAL_CALL gotoEndOfUsedArea( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); // XCellCursor - virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) + virtual void SAL_CALL gotoStart() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoEnd() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoNext() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoPrevious() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) throw(::com::sun::star::uno::RuntimeException); // XSheetCellRange diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index c4612f6a571c..0e2e632727e4 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "global.hxx" #include "dpobject.hxx" -#include "rangeutl.hxx" // ScArea +#include "rangeutl.hxx" // ScArea #include "cellsuno.hxx" // for XModifyListenerArr_Impl #include <svl/lstner.hxx> @@ -86,8 +86,8 @@ class ScDataPilotItemObj; class ScDataPilotConversion { public: - static com::sun::star::sheet::GeneralFunction FirstFunc( USHORT nBits ); - static USHORT FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); + static com::sun::star::sheet::GeneralFunction FirstFunc( USHORT nBits ); + static USHORT FunctionBit( com::sun::star::sheet::GeneralFunction eFunc ); static void FillGroupInfo( ::com::sun::star::sheet::DataPilotFieldGroupInfo& rInfo, @@ -105,27 +105,27 @@ class ScDataPilotTablesObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; + ScDocShell* pDocShell; + SCTAB nTab; ScDataPilotTableObj* GetObjectByIndex_Impl( sal_Int32 nIndex ); - ScDataPilotTableObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDataPilotTableObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScDataPilotTablesObj(); + virtual ~ScDataPilotTablesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDataPilotTables virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor > SAL_CALL createDataPilotDescriptor() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, const ::com::sun::star::table::CellAddress& aOutputAddress, const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -165,7 +165,7 @@ public: // ============================================================================ -// ScDataPilotDescriptorBase is never instantiated directly +// ScDataPilotDescriptorBase is never instantiated directly class ScDataPilotDescriptorBase : public com::sun::star::sheet::XDataPilotDescriptor, public com::sun::star::beans::XPropertySet, public com::sun::star::sheet::XDataPilotDataLayoutFieldSupplier, @@ -181,24 +181,24 @@ private: public: ScDataPilotDescriptorBase(ScDocShell* pDocSh); - virtual ~ScDataPilotDescriptorBase(); + virtual ~ScDataPilotDescriptorBase(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - ScDocShell* GetDocShell() const { return pDocShell; } + ScDocShell* GetDocShell() const { return pDocShell; } // in den Ableitungen: virtual ScDPObject* GetDPObject() const = 0; virtual void SetDPObject(ScDPObject* pDPObj) = 0; // XDataPilotDescriptor - // getName, setName, getTag, setTag in derived classes + // getName, setName, getTag, setTag in derived classes virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getSourceRange() throw(::com::sun::star::uno::RuntimeException); @@ -223,7 +223,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -235,25 +235,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -292,17 +292,17 @@ private: public: ScDataPilotDescriptor(ScDocShell* pDocSh); - virtual ~ScDataPilotDescriptor(); + virtual ~ScDataPilotDescriptor(); virtual ScDPObject* GetDPObject() const; virtual void SetDPObject(ScDPObject* pDPObj); // rest of XDataPilotDescriptor (incl. XNamed) virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) + virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -321,21 +321,21 @@ class ScDataPilotTableObj : public ScDataPilotDescriptorBase, public com::sun::star::util::XModifyBroadcaster { private: - SCTAB nTab; - String aName; + SCTAB nTab; + String aName; XModifyListenerArr_Impl aModifyListeners; void Refreshed_Impl(); public: ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const String& rN); - virtual ~ScDataPilotTableObj(); + virtual ~ScDataPilotTableObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -344,16 +344,16 @@ public: // rest of XDataPilotDescriptor (incl. XNamed) virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getTag() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) + virtual void SAL_CALL setTag( const ::rtl::OUString& aTag ) throw(::com::sun::star::uno::RuntimeException); // XDataPilotTable virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getOutputRange() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); // XDataPilotTable2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > @@ -537,14 +537,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -556,25 +556,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -836,7 +836,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -929,14 +929,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -948,25 +948,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 6dd25b6ce0d1..9089c24d005d 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,43 +73,43 @@ SV_DECL_PTRARR_DEL( XDBRefreshListenerArr_Impl, XDBRefreshListenerPtr, 4, 4 ) class ScDataUnoConversion { public: - static ScSubTotalFunc GeneralToSubTotal( com::sun::star::sheet::GeneralFunction eSummary ); + static ScSubTotalFunc GeneralToSubTotal( com::sun::star::sheet::GeneralFunction eSummary ); static com::sun::star::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal ); }; -// ImportDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence +// ImportDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence class ScImportDescriptor { public: - static void FillImportParam( + static void FillImportParam( ScImportParam& rParam, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq ); - static void FillProperties( + static void FillProperties( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq, const ScImportParam& rParam ); static long GetPropertyCount(); }; -// SortDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence +// SortDescriptor gibt's nicht mehr als Uno-Objekt, nur noch Property-Sequence class ScSortDescriptor { public: - static void FillSortParam( + static void FillSortParam( ScSortParam& rParam, const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq ); - static void FillProperties( + static void FillProperties( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rSeq, const ScSortParam& rParam ); static long GetPropertyCount(); }; -// ScSubTotalDescriptorBase - Basisklasse fuer SubTotalDescriptor alleine und im DB-Bereich +// ScSubTotalDescriptorBase - Basisklasse fuer SubTotalDescriptor alleine und im DB-Bereich -// to uno, both look the same +// to uno, both look the same class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6< com::sun::star::sheet::XSubTotalDescriptor, @@ -120,25 +120,25 @@ class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6< com::sun::star::lang::XServiceInfo > { private: - SfxItemPropertySet aPropSet; + SfxItemPropertySet aPropSet; - ScSubTotalFieldObj* GetObjectByIndex_Impl(USHORT nIndex); + ScSubTotalFieldObj* GetObjectByIndex_Impl(USHORT nIndex); public: ScSubTotalDescriptorBase(); - virtual ~ScSubTotalDescriptorBase(); + virtual ~ScSubTotalDescriptorBase(); // in derived classes: // (Fields are within the range) - virtual void GetData( ScSubTotalParam& rParam ) const = 0; - virtual void PutData( const ScSubTotalParam& rParam ) = 0; + virtual void GetData( ScSubTotalParam& rParam ) const = 0; + virtual void PutData( const ScSubTotalParam& rParam ) = 0; // XSubTotalDescriptor - virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns, sal_Int32 nGroupColumn ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -160,7 +160,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -172,25 +172,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -216,41 +216,41 @@ public: }; -// ScSubTotalDescriptor - dummer Container zur Benutzung mit XImportTarget +// ScSubTotalDescriptor - dummer Container zur Benutzung mit XImportTarget class ScSubTotalDescriptor : public ScSubTotalDescriptorBase { private: - ScSubTotalParam aStoredParam; + ScSubTotalParam aStoredParam; public: ScSubTotalDescriptor(); - virtual ~ScSubTotalDescriptor(); + virtual ~ScSubTotalDescriptor(); // von ScSubTotalDescriptorBase: - virtual void GetData( ScSubTotalParam& rParam ) const; - virtual void PutData( const ScSubTotalParam& rParam ); + virtual void GetData( ScSubTotalParam& rParam ) const; + virtual void PutData( const ScSubTotalParam& rParam ); // Zugriff von aussen: - void SetParam( const ScSubTotalParam& rNew ); -// const ScSubTotalParam& GetParam() const { return aStoredParam; } + void SetParam( const ScSubTotalParam& rNew ); +// const ScSubTotalParam& GetParam() const { return aStoredParam; } }; -// ScRangeSubTotalDescriptor - SubTotalDescriptor eines Datenbank-Bereichs +// ScRangeSubTotalDescriptor - SubTotalDescriptor eines Datenbank-Bereichs class ScRangeSubTotalDescriptor : public ScSubTotalDescriptorBase { private: - ScDatabaseRangeObj* pParent; + ScDatabaseRangeObj* pParent; public: ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar); - virtual ~ScRangeSubTotalDescriptor(); + virtual ~ScRangeSubTotalDescriptor(); // von ScSubTotalDescriptorBase: - virtual void GetData( ScSubTotalParam& rParam ) const; - virtual void PutData( const ScSubTotalParam& rParam ); + virtual void GetData( ScSubTotalParam& rParam ) const; + virtual void PutData( const ScSubTotalParam& rParam ); }; @@ -260,20 +260,20 @@ class ScSubTotalFieldObj : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor> xRef; - ScSubTotalDescriptorBase& rParent; - USHORT nPos; + ScSubTotalDescriptorBase& rParent; + USHORT nPos; public: ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ); - virtual ~ScSubTotalFieldObj(); + virtual ~ScSubTotalFieldObj(); // XSubTotalField virtual sal_Int32 SAL_CALL getGroupColumn() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) + virtual void SAL_CALL setGroupColumn( sal_Int32 nGroupColumn ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn > SAL_CALL getSubTotalColumns() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSubTotalColumns( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setSubTotalColumns( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::SubTotalColumn >& aSubTotalColumns ) throw(::com::sun::star::uno::RuntimeException); @@ -292,38 +292,38 @@ class ScConsolidationDescriptor : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScConsolidateParam aParam; + ScConsolidateParam aParam; public: ScConsolidationDescriptor(); - virtual ~ScConsolidationDescriptor(); + virtual ~ScConsolidationDescriptor(); - void SetParam( const ScConsolidateParam& rNew ); - const ScConsolidateParam& GetParam() const { return aParam; } + void SetParam( const ScConsolidateParam& rNew ); + const ScConsolidateParam& GetParam() const { return aParam; } // XConsolidationDescriptor virtual ::com::sun::star::sheet::GeneralFunction SAL_CALL getFunction() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) + virtual void SAL_CALL setFunction( ::com::sun::star::sheet::GeneralFunction nFunction ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress > SAL_CALL getSources( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSources( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setSources( const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aSources ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getStartOutputPosition() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStartOutputPosition( + virtual void SAL_CALL setStartOutputPosition( const ::com::sun::star::table::CellAddress& aStartOutputPosition ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getUseColumnHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) + virtual void SAL_CALL setUseColumnHeaders( sal_Bool bUseColumnHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getUseRowHeaders() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) + virtual void SAL_CALL setUseRowHeaders( sal_Bool bUseRowHeaders ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getInsertLinks() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) + virtual void SAL_CALL setInsertLinks( sal_Bool bInsertLinks ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -336,10 +336,10 @@ public: }; -// ScFilterDescriptorBase - Basisklasse fuer FilterDescriptor -// alleine, im DB-Bereich und im DataPilot +// ScFilterDescriptorBase - Basisklasse fuer FilterDescriptor +// alleine, im DB-Bereich und im DataPilot -// to uno, all three look the same +// to uno, all three look the same class ScFilterDescriptorBase : public cppu::WeakImplHelper4< com::sun::star::sheet::XSheetFilterDescriptor, @@ -349,31 +349,31 @@ class ScFilterDescriptorBase : public cppu::WeakImplHelper4< public SfxListener { private: - SfxItemPropertySet aPropSet; + SfxItemPropertySet aPropSet; ScDocShell* pDocSh; public: ScFilterDescriptorBase(ScDocShell* pDocShell); - virtual ~ScFilterDescriptorBase(); + virtual ~ScFilterDescriptorBase(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // in den Ableitungen: // (nField[] hier innerhalb des Bereichs) - virtual void GetData( ScQueryParam& rParam ) const = 0; - virtual void PutData( const ScQueryParam& rParam ) = 0; + virtual void GetData( ScQueryParam& rParam ) const = 0; + virtual void PutData( const ScQueryParam& rParam ) = 0; // XSheetFilterDescriptor virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField > SAL_CALL getFilterFields() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilterFields( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setFilterFields( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField >& aFilterFields ) throw(::com::sun::star::uno::RuntimeException); // XSheetFilterDescriptor2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 > SAL_CALL getFilterFields2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilterFields2( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setFilterFields2( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2 >& aFilterFields ) throw(::com::sun::star::uno::RuntimeException); @@ -381,7 +381,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -393,25 +393,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -428,58 +428,58 @@ public: }; -// ScFilterDescriptor - dummer Container zur Benutzung mit XFilterable +// ScFilterDescriptor - dummer Container zur Benutzung mit XFilterable class ScFilterDescriptor : public ScFilterDescriptorBase { private: - ScQueryParam aStoredParam; // nField[] hier innerhalb des Bereichs + ScQueryParam aStoredParam; // nField[] hier innerhalb des Bereichs public: ScFilterDescriptor(ScDocShell* pDocSh); - virtual ~ScFilterDescriptor(); + virtual ~ScFilterDescriptor(); // von ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const; - virtual void PutData( const ScQueryParam& rParam ); + virtual void GetData( ScQueryParam& rParam ) const; + virtual void PutData( const ScQueryParam& rParam ); // Zugriff von aussen: - void SetParam( const ScQueryParam& rNew ); - const ScQueryParam& GetParam() const { return aStoredParam; } + void SetParam( const ScQueryParam& rNew ); + const ScQueryParam& GetParam() const { return aStoredParam; } }; -// ScRangeFilterDescriptor - FilterDescriptor eines Datenbank-Bereichs +// ScRangeFilterDescriptor - FilterDescriptor eines Datenbank-Bereichs class ScRangeFilterDescriptor : public ScFilterDescriptorBase { private: - ScDatabaseRangeObj* pParent; + ScDatabaseRangeObj* pParent; public: ScRangeFilterDescriptor(ScDocShell* pDocSh, ScDatabaseRangeObj* pPar); - virtual ~ScRangeFilterDescriptor(); + virtual ~ScRangeFilterDescriptor(); // von ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const; - virtual void PutData( const ScQueryParam& rParam ); + virtual void GetData( ScQueryParam& rParam ) const; + virtual void PutData( const ScQueryParam& rParam ); }; -// ScDataPilotFilterDescriptor - FilterDescriptor eines DataPilotDescriptors +// ScDataPilotFilterDescriptor - FilterDescriptor eines DataPilotDescriptors class ScDataPilotFilterDescriptor : public ScFilterDescriptorBase { private: - ScDataPilotDescriptorBase* pParent; + ScDataPilotDescriptorBase* pParent; public: ScDataPilotFilterDescriptor(ScDocShell* pDocSh, ScDataPilotDescriptorBase* pPar); - virtual ~ScDataPilotFilterDescriptor(); + virtual ~ScDataPilotFilterDescriptor(); // von ScFilterDescriptorBase: - virtual void GetData( ScQueryParam& rParam ) const; - virtual void PutData( const ScQueryParam& rParam ); + virtual void GetData( ScQueryParam& rParam ) const; + virtual void PutData( const ScQueryParam& rParam ); }; @@ -493,36 +493,36 @@ class ScDatabaseRangeObj : public cppu::WeakImplHelper6< public SfxListener { private: - ScDocShell* pDocShell; - String aName; - SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + String aName; + SfxItemPropertySet aPropSet; XDBRefreshListenerArr_Impl aRefreshListeners; private: - ScDBData* GetDBData_Impl() const; - void Refreshed_Impl(); + ScDBData* GetDBData_Impl() const; + void Refreshed_Impl(); public: ScDatabaseRangeObj(ScDocShell* pDocSh, const String& rNm); - virtual ~ScDatabaseRangeObj(); + virtual ~ScDatabaseRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // nField[] hier innerhalb des Bereichs: - void GetQueryParam(ScQueryParam& rQueryParam) const; - void SetQueryParam(const ScQueryParam& rQueryParam); - void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; - void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); + void GetQueryParam(ScQueryParam& rQueryParam) const; + void SetQueryParam(const ScQueryParam& rQueryParam); + void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; + void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDatabaseRange virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) + virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getSortDescriptor() throw(::com::sun::star::uno::RuntimeException); @@ -533,14 +533,14 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getImportDescriptor() throw(::com::sun::star::uno::RuntimeException); // implemented for the XRefreshable Interface -// virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); +// virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -552,7 +552,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -564,25 +564,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -607,22 +607,22 @@ class ScDatabaseRangesObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScDatabaseRangeObj* GetObjectByIndex_Impl(USHORT nIndex); - ScDatabaseRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDatabaseRangeObj* GetObjectByIndex_Impl(USHORT nIndex); + ScDatabaseRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScDatabaseRangesObj(ScDocShell* pDocSh); - virtual ~ScDatabaseRangesObj(); + virtual ~ScDatabaseRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDatabaseRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::com::sun::star::table::CellRangeAddress& aRange ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XEnumerationAccess diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 4a94ee81fdf6..95d2649daf3f 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,8 +31,8 @@ #include "scdllapi.h" #include "collect.hxx" -#include "global.hxx" // MAXQUERY -#include "sortparam.hxx" // MAXSORT +#include "global.hxx" // MAXQUERY +#include "sortparam.hxx" // MAXSORT #include "refreshtimer.hxx" #include "address.hxx" #include "scdllapi.h" @@ -48,78 +48,78 @@ class ScDBData : public ScDataObject, public ScRefreshTimer private: // DBParam - String aName; - SCTAB nTable; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - BOOL bByRow; - BOOL bHasHeader; - BOOL bDoSize; - BOOL bKeepFmt; - BOOL bStripData; + String aName; + SCTAB nTable; + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + BOOL bByRow; + BOOL bHasHeader; + BOOL bDoSize; + BOOL bKeepFmt; + BOOL bStripData; // SortParam - BOOL bSortCaseSens; - BOOL bSortNaturalSort; - BOOL bIncludePattern; - BOOL bSortInplace; - BOOL bSortUserDef; - USHORT nSortUserIndex; - SCTAB nSortDestTab; - SCCOL nSortDestCol; - SCROW nSortDestRow; - BOOL bDoSort[MAXSORT]; - SCCOLROW nSortField[MAXSORT]; - BOOL bAscending[MAXSORT]; + BOOL bSortCaseSens; + BOOL bSortNaturalSort; + BOOL bIncludePattern; + BOOL bSortInplace; + BOOL bSortUserDef; + USHORT nSortUserIndex; + SCTAB nSortDestTab; + SCCOL nSortDestCol; + SCROW nSortDestRow; + BOOL bDoSort[MAXSORT]; + SCCOLROW nSortField[MAXSORT]; + BOOL bAscending[MAXSORT]; ::com::sun::star::lang::Locale aSortLocale; - String aSortAlgorithm; + String aSortAlgorithm; // QueryParam - BOOL bQueryInplace; - BOOL bQueryCaseSens; - BOOL bQueryRegExp; - BOOL bQueryDuplicate; - SCTAB nQueryDestTab; - SCCOL nQueryDestCol; - SCROW nQueryDestRow; - BOOL bDoQuery[MAXQUERY]; - SCCOLROW nQueryField[MAXQUERY]; - ScQueryOp eQueryOp[MAXQUERY]; - BOOL bQueryByString[MAXQUERY]; + BOOL bQueryInplace; + BOOL bQueryCaseSens; + BOOL bQueryRegExp; + BOOL bQueryDuplicate; + SCTAB nQueryDestTab; + SCCOL nQueryDestCol; + SCROW nQueryDestRow; + BOOL bDoQuery[MAXQUERY]; + SCCOLROW nQueryField[MAXQUERY]; + ScQueryOp eQueryOp[MAXQUERY]; + BOOL bQueryByString[MAXQUERY]; bool bQueryByDate[MAXQUERY]; - String* pQueryStr[MAXQUERY]; - double nQueryVal[MAXQUERY]; + String* pQueryStr[MAXQUERY]; + double nQueryVal[MAXQUERY]; ScQueryConnect eQueryConnect[MAXQUERY]; - BOOL bIsAdvanced; // TRUE if created by advanced filter - ScRange aAdvSource; // source range + BOOL bIsAdvanced; // TRUE if created by advanced filter + ScRange aAdvSource; // source range SCROW nDynamicEndRow; // SubTotalParam - BOOL bSubRemoveOnly; - BOOL bSubReplace; - BOOL bSubPagebreak; - BOOL bSubCaseSens; - BOOL bSubDoSort; - BOOL bSubAscending; - BOOL bSubIncludePattern; - BOOL bSubUserDef; - USHORT nSubUserIndex; - BOOL bDoSubTotal[MAXSUBTOTAL]; - SCCOL nSubField[MAXSUBTOTAL]; - SCCOL nSubTotals[MAXSUBTOTAL]; - SCCOL* pSubTotals[MAXSUBTOTAL]; - ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; + BOOL bSubRemoveOnly; + BOOL bSubReplace; + BOOL bSubPagebreak; + BOOL bSubCaseSens; + BOOL bSubDoSort; + BOOL bSubAscending; + BOOL bSubIncludePattern; + BOOL bSubUserDef; + USHORT nSubUserIndex; + BOOL bDoSubTotal[MAXSUBTOTAL]; + SCCOL nSubField[MAXSUBTOTAL]; + SCCOL nSubTotals[MAXSUBTOTAL]; + SCCOL* pSubTotals[MAXSUBTOTAL]; + ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Datenbank-Import - BOOL bDBImport; - String aDBName; - String aDBStatement; - BOOL bDBNative; - BOOL bDBSelection; // nicht im Param: Wenn Selektion, Update sperren - BOOL bDBSql; // aDBStatement ist SQL und kein Name - BYTE nDBType; // enum DBObject (bisher nur dbTable, dbQuery) - - USHORT nIndex; // eindeutiger Index fuer Formeln - BOOL bAutoFilter; // AutoFilter? (nicht gespeichert) - BOOL bModified; // wird bei UpdateReference gesetzt/geloescht + BOOL bDBImport; + String aDBName; + String aDBStatement; + BOOL bDBNative; + BOOL bDBSelection; // nicht im Param: Wenn Selektion, Update sperren + BOOL bDBSql; // aDBStatement ist SQL und kein Name + BYTE nDBType; // enum DBObject (bisher nur dbTable, dbQuery) + + USHORT nIndex; // eindeutiger Index fuer Formeln + BOOL bAutoFilter; // AutoFilter? (nicht gespeichert) + BOOL bModified; // wird bei UpdateReference gesetzt/geloescht using ScRefreshTimer::operator==; @@ -131,66 +131,66 @@ public: ScDBData(const ScDBData& rData); ~ScDBData(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScDBData& operator= (const ScDBData& rData); + ScDBData& operator= (const ScDBData& rData); - BOOL operator== (const ScDBData& rData) const; + BOOL operator== (const ScDBData& rData) const; - const String& GetName() const { return aName; } - void GetName(String& rName) const { rName = aName; } - void SetName(const String& rName) { aName = rName; } - void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, bool bUseDynamicRange = false) const; - SC_DLLPUBLIC void GetArea(ScRange& rRange, bool bUseDynamicRange = false) const; - void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); + const String& GetName() const { return aName; } + void GetName(String& rName) const { rName = aName; } + void SetName(const String& rName) { aName = rName; } + void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, bool bUseDynamicRange = false) const; + SC_DLLPUBLIC void GetArea(ScRange& rRange, bool bUseDynamicRange = false) const; + void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); void SetDynamicEndRow(SCROW nRow); - void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - BOOL IsByRow() const { return bByRow; } - void SetByRow(BOOL bByR) { bByRow = bByR; } - BOOL HasHeader() const { return bHasHeader; } - void SetHeader(BOOL bHasH) { bHasHeader = bHasH; } + void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); + BOOL IsByRow() const { return bByRow; } + void SetByRow(BOOL bByR) { bByRow = bByR; } + BOOL HasHeader() const { return bHasHeader; } + void SetHeader(BOOL bHasH) { bHasHeader = bHasH; } void SetIndex(USHORT nInd) { nIndex = nInd; } - USHORT GetIndex() const { return nIndex; } - BOOL IsDoSize() const { return bDoSize; } - void SetDoSize(BOOL bSet) { bDoSize = bSet; } - BOOL IsKeepFmt() const { return bKeepFmt; } - void SetKeepFmt(BOOL bSet) { bKeepFmt = bSet; } - BOOL IsStripData() const { return bStripData; } - void SetStripData(BOOL bSet) { bStripData = bSet; } + USHORT GetIndex() const { return nIndex; } + BOOL IsDoSize() const { return bDoSize; } + void SetDoSize(BOOL bSet) { bDoSize = bSet; } + BOOL IsKeepFmt() const { return bKeepFmt; } + void SetKeepFmt(BOOL bSet) { bKeepFmt = bSet; } + BOOL IsStripData() const { return bStripData; } + void SetStripData(BOOL bSet) { bStripData = bSet; } - String GetSourceString() const; - String GetOperations() const; + String GetSourceString() const; + String GetOperations() const; - void GetSortParam(ScSortParam& rSortParam) const; - void SetSortParam(const ScSortParam& rSortParam); + void GetSortParam(ScSortParam& rSortParam) const; + void SetSortParam(const ScSortParam& rSortParam); - SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const; - SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam); - SC_DLLPUBLIC BOOL GetAdvancedQuerySource(ScRange& rSource) const; - SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource); + SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const; + SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam); + SC_DLLPUBLIC BOOL GetAdvancedQuerySource(ScRange& rSource) const; + SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource); - void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; - void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); + void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const; + void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam); - void GetImportParam(ScImportParam& rImportParam) const; - void SetImportParam(const ScImportParam& rImportParam); + void GetImportParam(ScImportParam& rImportParam) const; + void SetImportParam(const ScImportParam& rImportParam); - BOOL IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; - BOOL IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + BOOL IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; + BOOL IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL HasImportParam() const { return bDBImport; } - BOOL HasQueryParam() const { return bDoQuery[0]; } - BOOL HasSortParam() const { return bDoSort[0]; } - BOOL HasSubTotalParam() const { return bDoSubTotal[0]; } + BOOL HasImportParam() const { return bDBImport; } + BOOL HasQueryParam() const { return bDoQuery[0]; } + BOOL HasSortParam() const { return bDoSort[0]; } + BOOL HasSubTotalParam() const { return bDoSubTotal[0]; } - BOOL HasImportSelection() const { return bDBSelection; } - void SetImportSelection(BOOL bSet) { bDBSelection = bSet; } + BOOL HasImportSelection() const { return bDBSelection; } + void SetImportSelection(BOOL bSet) { bDBSelection = bSet; } - BOOL HasAutoFilter() const { return bAutoFilter; } - void SetAutoFilter(BOOL bSet) { bAutoFilter = bSet; } + BOOL HasAutoFilter() const { return bAutoFilter; } + void SetAutoFilter(BOOL bSet) { bAutoFilter = bSet; } - BOOL IsModified() const { return bModified; } - void SetModified(BOOL bMod) { bModified = bMod; } + BOOL IsModified() const { return bModified; } + void SetModified(BOOL bMod) { bModified = bMod; } }; @@ -199,46 +199,46 @@ class SC_DLLPUBLIC ScDBCollection : public ScSortedCollection { private: - Link aRefreshHandler; + Link aRefreshHandler; ScDocument* pDoc; - USHORT nEntryIndex; // Zaehler fuer die eindeutigen Indizes + USHORT nEntryIndex; // Zaehler fuer die eindeutigen Indizes public: ScDBCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) : - ScSortedCollection ( nLim, nDel, bDup ), - pDoc ( pDocument ), - nEntryIndex ( SC_START_INDEX_DB_COLL ) // oberhalb der Namen + ScSortedCollection ( nLim, nDel, bDup ), + pDoc ( pDocument ), + nEntryIndex ( SC_START_INDEX_DB_COLL ) // oberhalb der Namen {} ScDBCollection(const ScDBCollection& rScDBCollection) : - ScSortedCollection ( rScDBCollection ), - pDoc ( rScDBCollection.pDoc ), - nEntryIndex ( rScDBCollection.nEntryIndex) + ScSortedCollection ( rScDBCollection ), + pDoc ( rScDBCollection.pDoc ), + nEntryIndex ( rScDBCollection.nEntryIndex) {} - virtual ScDataObject* Clone() const { return new ScDBCollection(*this); } - ScDBData* operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; - ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; - ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + virtual ScDataObject* Clone() const { return new ScDBCollection(*this); } + ScDBData* operator[]( const USHORT nIndex) const {return (ScDBData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const; + ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - BOOL SearchName( const String& rName, USHORT& rIndex ) const; + BOOL SearchName( const String& rName, USHORT& rIndex ) const; void DeleteOnTab( SCTAB nTab ); - void UpdateReference(UpdateRefMode eUpdateRefMode, + void UpdateReference(UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); + void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); ScDBData* FindIndex(USHORT nIndex); - USHORT GetEntryIndex() { return nEntryIndex; } - void SetEntryIndex(USHORT nInd) { nEntryIndex = nInd; } + USHORT GetEntryIndex() { return nEntryIndex; } + void SetEntryIndex(USHORT nInd) { nEntryIndex = nInd; } virtual BOOL Insert(ScDataObject* pScDataObject); - void SetRefreshHandler( const Link& rLink ) + void SetRefreshHandler( const Link& rLink ) { aRefreshHandler = rLink; } - const Link& GetRefreshHandler() const { return aRefreshHandler; } + const Link& GetRefreshHandler() const { return aRefreshHandler; } }; #endif diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx index bb08c56d0f67..7d1d14aeef64 100644 --- a/sc/inc/dbdocutl.hxx +++ b/sc/inc/dbdocutl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/dbtoken.hxx b/sc/inc/dbtoken.hxx index 7650813452d9..d994e54de70a 100644 --- a/sc/inc/dbtoken.hxx +++ b/sc/inc/dbtoken.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 697180bbfaa1..d7965b989023 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,22 +46,22 @@ class ScDocDefaultsObj : public ::cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; SfxItemPropertyMap aPropertyMap; - void ItemsChanged(); + void ItemsChanged(); public: ScDocDefaultsObj(ScDocShell* pDocSh); - virtual ~ScDocDefaultsObj(); + virtual ~ScDocDefaultsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -73,25 +73,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -108,7 +108,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index cc8b52afbb4e..6c1ba4f87048 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ //------------------------------------------------------------------------ -#define SC_DETOP_GROW 4 +#define SC_DETOP_GROW 4 //------------------------------------------------------------------------ enum ScDetOpType @@ -52,8 +52,8 @@ enum ScDetOpType class ScDetOpData { - ScAddress aPos; - ScDetOpType eOperation; + ScAddress aPos; + ScDetOpType eOperation; public: ScDetOpData( const ScAddress& rP, ScDetOpType eOp ) : @@ -62,20 +62,20 @@ public: ScDetOpData( const ScDetOpData& rData ) : aPos(rData.aPos), eOperation(rData.eOperation) {} - const ScAddress& GetPos() const { return aPos; } - ScDetOpType GetOperation() const { return eOperation; } + const ScAddress& GetPos() const { return aPos; } + ScDetOpType GetOperation() const { return eOperation; } // fuer UpdateRef: - void SetPos(const ScAddress& rNew) { aPos=rNew; } + void SetPos(const ScAddress& rNew) { aPos=rNew; } - int operator== ( const ScDetOpData& r ) const + int operator== ( const ScDetOpData& r ) const { return eOperation == r.eOperation && aPos == r.aPos; } }; //------------------------------------------------------------------------ // -// Liste der Operationen +// Liste der Operationen // typedef ScDetOpData* ScDetOpDataPtr; @@ -84,7 +84,7 @@ SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW, SC_DETOP_GROW class ScDetOpList : public ScDetOpArr_Impl { - BOOL bHasAddError; // updated in Append + BOOL bHasAddError; // updated in Append public: ScDetOpList() : bHasAddError(FALSE) {} @@ -92,14 +92,14 @@ public: ~ScDetOpList() {} void DeleteOnTab( SCTAB nTab ); - void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, + void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL operator==( const ScDetOpList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScDetOpList& r ) const; // fuer Ref-Undo - void Append( ScDetOpData* pData ); + void Append( ScDetOpData* pData ); - BOOL HasAddError() const { return bHasAddError; } + BOOL HasAddError() const { return bHasAddError; } }; diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index f99601e69180..52ba59ec9573 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ class ScAddress; class ScRange; class ScRangeList; -#define SC_DET_MAXCIRCLE 1000 +#define SC_DET_MAXCIRCLE 1000 enum ScDetectiveDelete { SC_DET_ALL, SC_DET_DETECTIVE, SC_DET_CIRCLES, SC_DET_ARROWS }; @@ -67,10 +67,10 @@ class SC_DLLPUBLIC ScDetectiveFunc static ColorData nArrowColor; static ColorData nErrorColor; static ColorData nCommentColor; - static BOOL bColorsInitialized; + static BOOL bColorsInitialized; - ScDocument* pDoc; - SCTAB nTab; + ScDocument* pDoc; + SCTAB nTab; enum DrawPosMode { @@ -90,83 +90,83 @@ class SC_DLLPUBLIC ScDetectiveFunc /** Returns the drawing layer rectangle for the passed cell address. */ Rectangle GetDrawRect( SCCOL nCol, SCROW nRow ) const; - BOOL HasArrow( const ScAddress& rStart, + BOOL HasArrow( const ScAddress& rStart, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab ); - void DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ); - void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); + void DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ); + void DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - BOOL HasError( const ScRange& rRange, ScAddress& rErrPos ); + BOOL HasError( const ScRange& rRange, ScAddress& rErrPos ); - void FillAttributes( ScDetectiveData& rData ); + void FillAttributes( ScDetectiveData& rData ); // called from DrawEntry/DrawAlienEntry and InsertObject - BOOL InsertArrow( SCCOL nCol, SCROW nRow, + BOOL InsertArrow( SCCOL nCol, SCROW nRow, SCCOL nRefStartCol, SCROW nRefStartRow, SCCOL nRefEndCol, SCROW nRefEndRow, BOOL bFromOtherTab, BOOL bRed, ScDetectiveData& rData ); - BOOL InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, + BOOL InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bRed, ScDetectiveData& rData ); // DrawEntry / DrawAlienEntry check for existing arrows and errors - BOOL DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, + BOOL DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, ScDetectiveData& rData ); - BOOL DrawAlienEntry( const ScRange& rRef, + BOOL DrawAlienEntry( const ScRange& rRef, ScDetectiveData& rData ); - void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData ); + void DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData ); - USHORT InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); - USHORT InsertPredLevelArea( const ScRange& rRef, + USHORT InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); + USHORT InsertPredLevelArea( const ScRange& rRef, ScDetectiveData& rData, USHORT nLevel ); - USHORT FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel ); - USHORT FindPredLevelArea( const ScRange& rRef, + USHORT FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel ); + USHORT FindPredLevelArea( const ScRange& rRef, USHORT nLevel, USHORT nDeleteLevel ); - USHORT InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); + USHORT InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, USHORT nLevel ); - USHORT InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + USHORT InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScDetectiveData& rData, USHORT nLevel ); - USHORT FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + USHORT FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nLevel, USHORT nDeleteLevel ); - BOOL FindFrameForObject( SdrObject* pObject, ScRange& rRange ); + BOOL FindFrameForObject( SdrObject* pObject, ScRange& rRange ); void Modified(); public: ScDetectiveFunc(ScDocument* pDocument, SCTAB nTable) : pDoc(pDocument),nTab(nTable) {} - BOOL ShowSucc( SCCOL nCol, SCROW nRow ); - BOOL ShowPred( SCCOL nCol, SCROW nRow ); - BOOL ShowError( SCCOL nCol, SCROW nRow ); + BOOL ShowSucc( SCCOL nCol, SCROW nRow ); + BOOL ShowPred( SCCOL nCol, SCROW nRow ); + BOOL ShowError( SCCOL nCol, SCROW nRow ); - BOOL DeleteSucc( SCCOL nCol, SCROW nRow ); - BOOL DeletePred( SCCOL nCol, SCROW nRow ); - BOOL DeleteAll( ScDetectiveDelete eWhat ); + BOOL DeleteSucc( SCCOL nCol, SCROW nRow ); + BOOL DeletePred( SCCOL nCol, SCROW nRow ); + BOOL DeleteAll( ScDetectiveDelete eWhat ); - BOOL MarkInvalid(BOOL& rOverflow); + BOOL MarkInvalid(BOOL& rOverflow); void GetAllPreds(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScSharedTokenRef>& rRefTokens); void GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ::std::vector<ScSharedTokenRef>& rRefTokens); static void UpdateAllComments( ScDocument& rDoc ); // on all tables - void UpdateAllArrowColors(); // on all tables + void UpdateAllArrowColors(); // on all tables - static BOOL IsNonAlienArrow( SdrObject* pObject ); + static BOOL IsNonAlienArrow( SdrObject* pObject ); ScDetectiveObjType GetDetectiveObjectType( SdrObject* pObject, SCTAB nObjTab, ScAddress& rPosition, ScRange& rSource, BOOL& rRedLine ); - void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, + void InsertObject( ScDetectiveObjType eType, const ScAddress& rPosition, const ScRange& rSource, BOOL bRedLine ); static ColorData GetArrowColor(); static ColorData GetErrorColor(); static ColorData GetCommentColor(); static void InitializeColors(); - static BOOL IsColorsInitialized(); + static BOOL IsColorsInitialized(); }; diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 4b29605cfc3f..38353dcf2237 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <cppuhelper/implbase2.hxx> #include <svl/lstner.hxx> #include <svl/svarray.hxx> -#include "global.hxx" // ScImportParam +#include "global.hxx" // ScImportParam namespace com { namespace sun { namespace star { namespace frame { @@ -54,7 +54,7 @@ class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< com::sun::star::lang::XEventListener>, public SfxListener { - ScTabViewShell* pViewShell; + ScTabViewShell* pViewShell; // the component which's dispatches we're intercepting ::com::sun::star::uno::Reference< @@ -73,9 +73,9 @@ class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< public: ScDispatchProviderInterceptor(ScTabViewShell* pViewSh); - virtual ~ScDispatchProviderInterceptor(); + virtual ~ScDispatchProviderInterceptor(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL @@ -92,17 +92,17 @@ public: // XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); }; @@ -112,28 +112,28 @@ class ScDispatch : public cppu::WeakImplHelper2< com::sun::star::view::XSelectionChangeListener >, public SfxListener { - ScTabViewShell* pViewShell; - XStatusListenerArr_Impl aDataSourceListeners; - ScImportParam aLastImport; - sal_Bool bListeningToView; + ScTabViewShell* pViewShell; + XStatusListenerArr_Impl aDataSourceListeners; + ScImportParam aLastImport; + sal_Bool bListeningToView; public: ScDispatch(ScTabViewShell* pViewSh); - virtual ~ScDispatch(); + virtual ~ScDispatch(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index ac382889fb71..6bf06641c2a9 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,78 +49,78 @@ class ScAttrIterator; class ScRange; class ScFlatBoolRowSegments; -class ScDocumentIterator // alle nichtleeren Zellen durchgehen +class ScDocumentIterator // alle nichtleeren Zellen durchgehen { private: - ScDocument* pDoc; - SCTAB nStartTab; - SCTAB nEndTab; + ScDocument* pDoc; + SCTAB nStartTab; + SCTAB nEndTab; - const ScPatternAttr* pDefPattern; + const ScPatternAttr* pDefPattern; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - ScBaseCell* pCell; - const ScPatternAttr* pPattern; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + ScBaseCell* pCell; + const ScPatternAttr* pPattern; - SCSIZE nColPos; - SCSIZE nAttrPos; + SCSIZE nColPos; + SCSIZE nAttrPos; - BOOL GetThis(); - BOOL GetThisCol(); + BOOL GetThis(); + BOOL GetThisCol(); public: ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable ); ~ScDocumentIterator(); - BOOL GetFirst(); - BOOL GetNext(); + BOOL GetFirst(); + BOOL GetNext(); - ScBaseCell* GetCell(); - const ScPatternAttr* GetPattern(); - void GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ); + ScBaseCell* GetCell(); + const ScPatternAttr* GetPattern(); + void GetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ); }; class ScValueIterator // alle Zahlenwerte in einem Bereich durchgehen { private: - double fNextValue; - ScDocument* pDoc; - const ScAttrArray* pAttrArray; - ULONG nNumFormat; // fuer CalcAsShown - ULONG nNumFmtIndex; - SCCOL nStartCol; - SCROW nStartRow; - SCTAB nStartTab; - SCCOL nEndCol; - SCROW nEndRow; - SCTAB nEndTab; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - SCSIZE nColRow; - SCROW nNextRow; - SCROW nAttrEndRow; - short nNumFmtType; - BOOL bNumValid; - BOOL bSubTotal; - BOOL bNextValid; - BOOL bCalcAsShown; - BOOL bTextAsZero; - - BOOL GetThis(double& rValue, USHORT& rErr); + double fNextValue; + ScDocument* pDoc; + const ScAttrArray* pAttrArray; + ULONG nNumFormat; // fuer CalcAsShown + ULONG nNumFmtIndex; + SCCOL nStartCol; + SCROW nStartRow; + SCTAB nStartTab; + SCCOL nEndCol; + SCROW nEndRow; + SCTAB nEndTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + SCSIZE nColRow; + SCROW nNextRow; + SCROW nAttrEndRow; + short nNumFmtType; + BOOL bNumValid; + BOOL bSubTotal; + BOOL bNextValid; + BOOL bCalcAsShown; + BOOL bTextAsZero; + + BOOL GetThis(double& rValue, USHORT& rErr); public: ScValueIterator(ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal = FALSE, BOOL bTextAsZero = FALSE ); - void GetCurNumFmtInfo( short& nType, ULONG& nIndex ); + void GetCurNumFmtInfo( short& nType, ULONG& nIndex ); /// Does NOT reset rValue if no value found! - BOOL GetFirst(double& rValue, USHORT& rErr); + BOOL GetFirst(double& rValue, USHORT& rErr); /// Does NOT reset rValue if no value found! - BOOL GetNext(double& rValue, USHORT& rErr) + BOOL GetNext(double& rValue, USHORT& rErr) { return bNextValid ? ( bNextValid = FALSE, rValue = fNextValue, rErr = 0, nRow = nNextRow, @@ -219,22 +219,22 @@ public: // ============================================================================ class ScCellIterator // alle Zellen in einem Bereich durchgehen -{ // bei SubTotal aber keine ausgeblendeten und -private: // SubTotalZeilen - ScDocument* pDoc; - SCCOL nStartCol; - SCROW nStartRow; - SCTAB nStartTab; - SCCOL nEndCol; - SCROW nEndRow; - SCTAB nEndTab; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - SCSIZE nColRow; - BOOL bSubTotal; - - ScBaseCell* GetThis(); +{ // bei SubTotal aber keine ausgeblendeten und +private: // SubTotalZeilen + ScDocument* pDoc; + SCCOL nStartCol; + SCROW nStartRow; + SCTAB nStartTab; + SCCOL nEndCol; + SCROW nEndRow; + SCTAB nEndTab; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + SCSIZE nColRow; + BOOL bSubTotal; + + ScBaseCell* GetThis(); public: ScCellIterator(ScDocument* pDocument, SCCOL nSCol, SCROW nSRow, SCTAB nSTab, @@ -242,8 +242,8 @@ public: BOOL bSTotal = FALSE); ScCellIterator(ScDocument* pDocument, const ScRange& rRange, BOOL bSTotal = FALSE); - ScBaseCell* GetFirst(); - ScBaseCell* GetNext(); + ScBaseCell* GetFirst(); + ScBaseCell* GetNext(); SCCOL GetCol() const { return nCol; } SCROW GetRow() const { return nRow; } SCTAB GetTab() const { return nTab; } @@ -251,7 +251,7 @@ public: }; class ScQueryCellIterator // alle nichtleeren Zellen in einem Bereich -{ // durchgehen +{ // durchgehen enum StopOnMismatchBits { nStopOnMismatchDisabled = 0x00, @@ -269,21 +269,21 @@ class ScQueryCellIterator // alle nichtleeren Zellen in einem Bereich }; private: - ScQueryParam aParam; - ScDocument* pDoc; - const ScAttrArray* pAttrArray; - ULONG nNumFormat; - SCTAB nTab; - SCCOL nCol; - SCROW nRow; - SCSIZE nColRow; - SCROW nAttrEndRow; + ScQueryParam aParam; + ScDocument* pDoc; + const ScAttrArray* pAttrArray; + ULONG nNumFormat; + SCTAB nTab; + SCCOL nCol; + SCROW nRow; + SCSIZE nColRow; + SCROW nAttrEndRow; BYTE nStopOnMismatch; BYTE nTestEqualCondition; - BOOL bAdvanceQuery; + BOOL bAdvanceQuery; BOOL bIgnoreMismatchOnLeadingStrings; - ScBaseCell* GetThis(); + ScBaseCell* GetThis(); /* Only works if no regular expression is involved, only searches for rows in one column, and only the first @@ -301,16 +301,16 @@ public: const ScQueryParam& aParam, BOOL bMod = TRUE); // fuer bMod = FALSE muss der QueryParam // weiter aufgefuellt sein (bIsString) - ScBaseCell* GetFirst(); - ScBaseCell* GetNext(); + ScBaseCell* GetFirst(); + ScBaseCell* GetNext(); SCCOL GetCol() { return nCol; } SCROW GetRow() { return nRow; } // setzt alle Entry.nField einen weiter, wenn Spalte // wechselt, fuer ScInterpreter ScHLookup() - void SetAdvanceQueryParamEntryField( BOOL bVal ) + void SetAdvanceQueryParamEntryField( BOOL bVal ) { bAdvanceQuery = bVal; } - void AdvanceQueryParamEntryField(); + void AdvanceQueryParamEntryField(); /** If set, iterator stops on first non-matching cell content. May be used in SC_LESS_EQUAL queries where a @@ -376,141 +376,141 @@ public: BOOL bIgnoreMismatchOnLeadingStrings = TRUE ); }; -class ScDocAttrIterator // alle Attribut-Bereiche +class ScDocAttrIterator // alle Attribut-Bereiche { private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nEndCol; - SCROW nStartRow; - SCROW nEndRow; - SCCOL nCol; - ScAttrIterator* pColIter; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nEndCol; + SCROW nStartRow; + SCROW nEndRow; + SCCOL nCol; + ScAttrIterator* pColIter; public: ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ~ScDocAttrIterator(); - const ScPatternAttr* GetNext( SCCOL& rCol, SCROW& rRow1, SCROW& rRow2 ); + const ScPatternAttr* GetNext( SCCOL& rCol, SCROW& rRow1, SCROW& rRow2 ); }; -class ScAttrRectIterator // alle Attribut-Bereiche, auch Bereiche ueber mehrere Spalten +class ScAttrRectIterator // alle Attribut-Bereiche, auch Bereiche ueber mehrere Spalten { private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nEndCol; - SCROW nStartRow; - SCROW nEndRow; - SCCOL nIterStartCol; - SCCOL nIterEndCol; - ScAttrIterator* pColIter; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nEndCol; + SCROW nStartRow; + SCROW nEndRow; + SCCOL nIterStartCol; + SCCOL nIterEndCol; + ScAttrIterator* pColIter; public: ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ~ScAttrRectIterator(); - void DataChanged(); - const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow1, SCROW& rRow2 ); + void DataChanged(); + const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow1, SCROW& rRow2 ); }; -class ScHorizontalCellIterator // alle nichtleeren Zellen in einem Bereich -{ // zeilenweise durchgehen +class ScHorizontalCellIterator // alle nichtleeren Zellen in einem Bereich +{ // zeilenweise durchgehen private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nStartCol; - SCCOL nEndCol; - SCROW nEndRow; - SCROW* pNextRows; - SCSIZE* pNextIndices; - SCCOL nCol; - SCROW nRow; - BOOL bMore; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nStartCol; + SCCOL nEndCol; + SCROW nEndRow; + SCROW* pNextRows; + SCSIZE* pNextIndices; + SCCOL nCol; + SCROW nRow; + BOOL bMore; public: ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); ~ScHorizontalCellIterator(); - ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow ); - BOOL ReturnNext( SCCOL& rCol, SCROW& rRow ); + ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow ); + BOOL ReturnNext( SCCOL& rCol, SCROW& rRow ); private: - void Advance(); + void Advance(); }; // -// gibt alle Bereiche mit nicht-Default-Formatierung zurueck (horizontal) +// gibt alle Bereiche mit nicht-Default-Formatierung zurueck (horizontal) // class ScHorizontalAttrIterator { private: - ScDocument* pDoc; - SCTAB nTab; - SCCOL nStartCol; - SCROW nStartRow; - SCCOL nEndCol; - SCROW nEndRow; - - SCROW* pNextEnd; - SCSIZE* pIndices; - const ScPatternAttr** ppPatterns; - SCCOL nCol; - SCROW nRow; - BOOL bRowEmpty; + ScDocument* pDoc; + SCTAB nTab; + SCCOL nStartCol; + SCROW nStartRow; + SCCOL nEndCol; + SCROW nEndRow; + + SCROW* pNextEnd; + SCSIZE* pIndices; + const ScPatternAttr** ppPatterns; + SCCOL nCol; + SCROW nRow; + BOOL bRowEmpty; public: ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); ~ScHorizontalAttrIterator(); - const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow ); + const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow ); }; // -// gibt nichtleere Zellen und Bereiche mit Formatierung zurueck (horizontal) +// gibt nichtleere Zellen und Bereiche mit Formatierung zurueck (horizontal) // class SC_DLLPUBLIC ScUsedAreaIterator { private: - ScHorizontalCellIterator aCellIter; - ScHorizontalAttrIterator aAttrIter; - - SCCOL nNextCol; - SCROW nNextRow; - - SCCOL nCellCol; - SCROW nCellRow; - const ScBaseCell* pCell; - SCCOL nAttrCol1; - SCCOL nAttrCol2; - SCROW nAttrRow; - const ScPatternAttr* pPattern; - - SCCOL nFoundStartCol; // Ergebnisse nach GetNext - SCCOL nFoundEndCol; - SCROW nFoundRow; - const ScPatternAttr* pFoundPattern; - const ScBaseCell* pFoundCell; + ScHorizontalCellIterator aCellIter; + ScHorizontalAttrIterator aAttrIter; + + SCCOL nNextCol; + SCROW nNextRow; + + SCCOL nCellCol; + SCROW nCellRow; + const ScBaseCell* pCell; + SCCOL nAttrCol1; + SCCOL nAttrCol2; + SCROW nAttrRow; + const ScPatternAttr* pPattern; + + SCCOL nFoundStartCol; // Ergebnisse nach GetNext + SCCOL nFoundEndCol; + SCROW nFoundRow; + const ScPatternAttr* pFoundPattern; + const ScBaseCell* pFoundCell; public: ScUsedAreaIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); ~ScUsedAreaIterator(); - BOOL GetNext(); + BOOL GetNext(); - SCCOL GetStartCol() const { return nFoundStartCol; } - SCCOL GetEndCol() const { return nFoundEndCol; } - SCROW GetRow() const { return nFoundRow; } - const ScPatternAttr* GetPattern() const { return pFoundPattern; } - const ScBaseCell* GetCell() const { return pFoundCell; } + SCCOL GetStartCol() const { return nFoundStartCol; } + SCCOL GetEndCol() const { return nFoundEndCol; } + SCROW GetRow() const { return nFoundRow; } + const ScPatternAttr* GetPattern() const { return pFoundPattern; } + const ScBaseCell* GetCell() const { return pFoundCell; } }; // ============================================================================ @@ -523,7 +523,7 @@ public: explicit ScRowBreakIterator(::std::set<SCROW>& rBreaks); SCROW first(); SCROW next(); - + private: ::std::set<SCROW>& mrBreaks; ::std::set<SCROW>::const_iterator maItr; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 2733e968bbd4..5458b8f108f2 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,21 +39,21 @@ class SC_DLLPUBLIC ScDocOptions { - double fIterEps; // Epsilon-Wert dazu - USHORT nIterCount; // Anzahl + double fIterEps; // Epsilon-Wert dazu + USHORT nIterCount; // Anzahl sal_uInt16 nPrecStandardFormat; // precision for standard format ScOptionsUtil::KeyBindingType eKeyBindingType; - USHORT nDay; // Nulldatum: + USHORT nDay; // Nulldatum: USHORT nMonth; USHORT nYear; - USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird - USHORT nTabDistance; // Abstand Standardtabulatoren - BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen - BOOL bIsIter; // Iteration bei cirk. Ref - BOOL bCalcAsShown; // berechnen wie angezeigt (Precision) - BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen - BOOL bDoAutoSpell; // Auto-Spelling - BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen + USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird + USHORT nTabDistance; // Abstand Standardtabulatoren + BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen + BOOL bIsIter; // Iteration bei cirk. Ref + BOOL bCalcAsShown; // berechnen wie angezeigt (Precision) + BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen + BOOL bDoAutoSpell; // Auto-Spelling + BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled bool bUseEnglishFuncName; // use English function name even if the locale is not English. ::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax @@ -67,20 +67,20 @@ public: ScDocOptions( const ScDocOptions& rCpy ); ~ScDocOptions(); - BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; } + BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; } void SetLookUpColRowNames( BOOL bVal ) { bLookUpColRowNames = bVal; } - BOOL IsAutoSpell() const { return bDoAutoSpell; } - void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; } - BOOL IsMatchWholeCell() const { return bMatchWholeCell; } + BOOL IsAutoSpell() const { return bDoAutoSpell; } + void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; } + BOOL IsMatchWholeCell() const { return bMatchWholeCell; } void SetMatchWholeCell( BOOL bVal ){ bMatchWholeCell = bVal; } - BOOL IsIgnoreCase() const { return bIsIgnoreCase; } - void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; } - BOOL IsIter() const { return bIsIter; } - void SetIter( BOOL bVal ) { bIsIter = bVal; } - USHORT GetIterCount() const { return nIterCount; } + BOOL IsIgnoreCase() const { return bIsIgnoreCase; } + void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; } + BOOL IsIter() const { return bIsIter; } + void SetIter( BOOL bVal ) { bIsIter = bVal; } + USHORT GetIterCount() const { return nIterCount; } void SetIterCount( USHORT nCount) { nIterCount = nCount; } - double GetIterEps() const { return fIterEps; } - void SetIterEps( double fEps ) { fIterEps = fEps; } + double GetIterEps() const { return fIterEps; } + void SetIterEps( double fEps ) { fIterEps = fEps; } void GetDate( USHORT& rD, USHORT& rM, USHORT& rY ) const { rD = nDay; rM = nMonth; rY = nYear;} @@ -89,11 +89,11 @@ public: USHORT GetTabDistance() const { return nTabDistance;} void SetTabDistance( USHORT nTabDist ) {nTabDistance = nTabDist;} - void ResetDocOptions(); + void ResetDocOptions(); - inline const ScDocOptions& operator=( const ScDocOptions& rOpt ); - inline int operator==( const ScDocOptions& rOpt ) const; - inline int operator!=( const ScDocOptions& rOpt ) const; + inline const ScDocOptions& operator=( const ScDocOptions& rOpt ); + inline int operator==( const ScDocOptions& rOpt ) const; + inline int operator!=( const ScDocOptions& rOpt ) const; sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; } void SetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; } @@ -101,11 +101,11 @@ public: ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return eKeyBindingType; } void SetKeyBindingType( ScOptionsUtil::KeyBindingType e ) { eKeyBindingType = e; } - BOOL IsCalcAsShown() const { return bCalcAsShown; } - void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; } + BOOL IsCalcAsShown() const { return bCalcAsShown; } + void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; } - void SetYear2000( USHORT nVal ) { nYear2000 = nVal; } - USHORT GetYear2000() const { return nYear2000; } + void SetYear2000( USHORT nVal ) { nYear2000 = nVal; } + USHORT GetYear2000() const { return nYear2000; } void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; } BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; } @@ -131,21 +131,21 @@ public: inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) { - bIsIgnoreCase = rCpy.bIsIgnoreCase; - bIsIter = rCpy.bIsIter; - nIterCount = rCpy.nIterCount; - fIterEps = rCpy.fIterEps; + bIsIgnoreCase = rCpy.bIsIgnoreCase; + bIsIter = rCpy.bIsIter; + nIterCount = rCpy.nIterCount; + fIterEps = rCpy.fIterEps; nPrecStandardFormat = rCpy.nPrecStandardFormat; eKeyBindingType = rCpy.eKeyBindingType; - nDay = rCpy.nDay; - nMonth = rCpy.nMonth; - nYear = rCpy.nYear; - nYear2000 = rCpy.nYear2000; - nTabDistance = rCpy.nTabDistance; - bCalcAsShown = rCpy.bCalcAsShown; - bMatchWholeCell = rCpy.bMatchWholeCell; - bDoAutoSpell = rCpy.bDoAutoSpell; - bLookUpColRowNames = rCpy.bLookUpColRowNames; + nDay = rCpy.nDay; + nMonth = rCpy.nMonth; + nYear = rCpy.nYear; + nYear2000 = rCpy.nYear2000; + nTabDistance = rCpy.nTabDistance; + bCalcAsShown = rCpy.bCalcAsShown; + bMatchWholeCell = rCpy.bMatchWholeCell; + bDoAutoSpell = rCpy.bDoAutoSpell; + bLookUpColRowNames = rCpy.bLookUpColRowNames; bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled; bUseEnglishFuncName = rCpy.bUseEnglishFuncName; eFormulaGrammar = rCpy.eFormulaGrammar; @@ -159,21 +159,21 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy ) inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const { return ( - rOpt.bIsIgnoreCase == bIsIgnoreCase - && rOpt.bIsIter == bIsIter - && rOpt.nIterCount == nIterCount - && rOpt.fIterEps == fIterEps - && rOpt.nPrecStandardFormat == nPrecStandardFormat + rOpt.bIsIgnoreCase == bIsIgnoreCase + && rOpt.bIsIter == bIsIter + && rOpt.nIterCount == nIterCount + && rOpt.fIterEps == fIterEps + && rOpt.nPrecStandardFormat == nPrecStandardFormat && rOpt.eKeyBindingType == eKeyBindingType - && rOpt.nDay == nDay - && rOpt.nMonth == nMonth - && rOpt.nYear == nYear - && rOpt.nYear2000 == nYear2000 - && rOpt.nTabDistance == nTabDistance - && rOpt.bCalcAsShown == bCalcAsShown - && rOpt.bMatchWholeCell == bMatchWholeCell - && rOpt.bDoAutoSpell == bDoAutoSpell - && rOpt.bLookUpColRowNames == bLookUpColRowNames + && rOpt.nDay == nDay + && rOpt.nMonth == nMonth + && rOpt.nYear == nYear + && rOpt.nYear2000 == nYear2000 + && rOpt.nTabDistance == nTabDistance + && rOpt.bCalcAsShown == bCalcAsShown + && rOpt.bMatchWholeCell == bMatchWholeCell + && rOpt.bDoAutoSpell == bDoAutoSpell + && rOpt.bLookUpColRowNames == bLookUpColRowNames && rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled && rOpt.bUseEnglishFuncName == bUseEnglishFuncName && rOpt.eFormulaGrammar == eFormulaGrammar @@ -205,21 +205,21 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScDocOptions& GetDocOptions() const { return theOptions; } + const ScDocOptions& GetDocOptions() const { return theOptions; } private: ScDocOptions theOptions; }; //================================================================== -// Config Item containing document options +// Config Item containing document options //================================================================== class ScDocCfg : public ScDocOptions { - ScLinkConfigItem aCalcItem; + ScLinkConfigItem aCalcItem; ScLinkConfigItem aFormulaItem; - ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aLayoutItem; ScLinkConfigItem aCompatItem; DECL_LINK( CalcCommitHdl, void* ); @@ -235,7 +235,7 @@ class ScDocCfg : public ScDocOptions public: ScDocCfg(); - void SetOptions( const ScDocOptions& rNew ); + void SetOptions( const ScDocOptions& rNew ); }; diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 7d6be24c425c..934702d1f524 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,17 +38,17 @@ class ScStyleSheet; class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool { - SfxPoolItem** ppPoolDefaults; - SfxItemPool* pSecondary; - static USHORT* pVersionMap1; - static USHORT* pVersionMap2; - static USHORT* pVersionMap3; - static USHORT* pVersionMap4; - static USHORT* pVersionMap5; - static USHORT* pVersionMap6; - static USHORT* pVersionMap7; - static USHORT* pVersionMap8; - static USHORT* pVersionMap9; + SfxPoolItem** ppPoolDefaults; + SfxItemPool* pSecondary; + static USHORT* pVersionMap1; + static USHORT* pVersionMap2; + static USHORT* pVersionMap3; + static USHORT* pVersionMap4; + static USHORT* pVersionMap5; + static USHORT* pVersionMap6; + static USHORT* pVersionMap7; + static USHORT* pVersionMap8; + static USHORT* pVersionMap9; static USHORT* pVersionMap10; static USHORT* pVersionMap11; @@ -58,24 +58,24 @@ protected: virtual ~ScDocumentPool(); public: - virtual SfxItemPool* Clone() const; - virtual SfxMapUnit GetMetric( USHORT nWhich ) const; + virtual SfxItemPool* Clone() const; + virtual SfxMapUnit GetMetric( USHORT nWhich ) const; - virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); - virtual void Remove( const SfxPoolItem& ); - static void CheckRef( const SfxPoolItem& ); + virtual const SfxPoolItem& Put( const SfxPoolItem&, USHORT nWhich = 0 ); + virtual void Remove( const SfxPoolItem& ); + static void CheckRef( const SfxPoolItem& ); - void StyleDeleted( ScStyleSheet* pStyle ); // Loeschen von Vorlagen im Organizer + void StyleDeleted( ScStyleSheet* pStyle ); // Loeschen von Vorlagen im Organizer void CellStyleCreated( const String& rName ); - virtual SfxItemPresentation GetPresentation( - const SfxPoolItem& rItem, + virtual SfxItemPresentation GetPresentation( + const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit ePresentationMetric, - String& rText, + SfxMapUnit ePresentationMetric, + String& rText, const IntlWrapper* pIntl = 0 ) const; - static void InitVersionMaps(); - static void DeleteVersionMaps(); + static void InitVersionMaps(); + static void DeleteVersionMaps(); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index b3c0cd205352..3dc346c7fd69 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> #include "scdllapi.h" -#include "table.hxx" // FastGetRowHeight (inline) +#include "table.hxx" // FastGetRowHeight (inline) #include "rangelst.hxx" #include "brdcst.hxx" #include "tabopparams.hxx" @@ -146,7 +146,7 @@ class ScLookupCache; struct ScLookupCacheMapImpl; class SfxUndoManager; class ScFormulaParserPool; -struct ScClipParam; +struct ScClipParam; struct ScClipRangeNameData; class ScRowBreakIterator; struct ScSetStringParam; @@ -185,14 +185,14 @@ typedef Table SvNumberFormatterIndexTable; #endif */ -#define SC_DOC_NEW 0xFFFF +#define SC_DOC_NEW 0xFFFF -#define SC_MACROCALL_ALLOWED 0 -#define SC_MACROCALL_NOTALLOWED 1 -#define SC_MACROCALL_ASK 2 +#define SC_MACROCALL_ALLOWED 0 +#define SC_MACROCALL_NOTALLOWED 1 +#define SC_MACROCALL_ASK 2 -#define SC_ASIANCOMPRESSION_INVALID 0xff -#define SC_ASIANKERNING_INVALID 0xff +#define SC_ASIANCOMPRESSION_INVALID 0xff +#define SC_ASIANKERNING_INVALID 0xff enum ScDocumentMode @@ -205,22 +205,22 @@ enum ScDocumentMode struct ScDocStat { - String aDocName; - SCTAB nTableCount; - ULONG nCellCount; - USHORT nPageCount; + String aDocName; + SCTAB nTableCount; + ULONG nCellCount; + USHORT nPageCount; }; // The constant parameters to CopyBlockFromClip struct ScCopyBlockFromClipParams { - ScDocument* pRefUndoDoc; - ScDocument* pClipDoc; - USHORT nInsFlag; - SCTAB nTabStart; - SCTAB nTabEnd; - BOOL bAsLink; - BOOL bSkipAttrForEmpty; + ScDocument* pRefUndoDoc; + ScDocument* pClipDoc; + USHORT nInsFlag; + SCTAB nTabStart; + SCTAB nTabEnd; + BOOL bAsLink; + BOOL bSkipAttrForEmpty; }; @@ -262,50 +262,50 @@ private: rtl::Reference<ScPoolHelper> xPoolHelper; - SfxUndoManager* mpUndoManager; - ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper - ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper - SfxItemPool* pNoteItemPool; // SfxItemPool to be used if pDrawLayer not created. - SfxObjectShell* pShell; - SfxPrinter* pPrinter; - VirtualDevice* pVirtualDevice_100th_mm; - ScDrawLayer* pDrawLayer; // SdrModel - XColorTable* pColorTable; - ScConditionalFormatList* pCondFormList; // bedingte Formate - ScValidationDataList* pValidationList; // Gueltigkeit - SvNumberFormatterIndexTable* pFormatExchangeList; // zum Umsetzen von Zahlenformaten - ScTable* pTab[MAXTABCOUNT]; - ScRangeName* pRangeName; - ScDBCollection* pDBCollection; - ScDPCollection* pDPCollection; + SfxUndoManager* mpUndoManager; + ScFieldEditEngine* pEditEngine; // uses pEditPool from xPoolHelper + ScNoteEditEngine* pNoteEngine; // uses pEditPool from xPoolHelper + SfxItemPool* pNoteItemPool; // SfxItemPool to be used if pDrawLayer not created. + SfxObjectShell* pShell; + SfxPrinter* pPrinter; + VirtualDevice* pVirtualDevice_100th_mm; + ScDrawLayer* pDrawLayer; // SdrModel + XColorTable* pColorTable; + ScConditionalFormatList* pCondFormList; // bedingte Formate + ScValidationDataList* pValidationList; // Gueltigkeit + SvNumberFormatterIndexTable* pFormatExchangeList; // zum Umsetzen von Zahlenformaten + ScTable* pTab[MAXTABCOUNT]; + ScRangeName* pRangeName; + ScDBCollection* pDBCollection; + ScDPCollection* pDPCollection; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - std::list<ScDPObject> m_listDPObjectsInClip; + std::list<ScDPObject> m_listDPObjectsInClip; std::list<ScDPTableDataCache*> m_listDPObjectsCaches; // End Comments - ScChartCollection* pChartCollection; + ScChartCollection* pChartCollection; std::auto_ptr< ScTemporaryChartLock > apTemporaryChartLock; - ScPatternAttr* pSelectionAttr; // Attribute eines Blocks - mutable sfx2::LinkManager* pLinkManager; - ScFormulaCell* pFormulaTree; // Berechnungsbaum Start - ScFormulaCell* pEOFormulaTree; // Berechnungsbaum Ende, letzte Zelle - ScFormulaCell* pFormulaTrack; // BroadcastTrack Start - ScFormulaCell* pEOFormulaTrack; // BrodcastTrack Ende, letzte Zelle - ScBroadcastAreaSlotMachine* pBASM; // BroadcastAreas + ScPatternAttr* pSelectionAttr; // Attribute eines Blocks + mutable sfx2::LinkManager* pLinkManager; + ScFormulaCell* pFormulaTree; // Berechnungsbaum Start + ScFormulaCell* pEOFormulaTree; // Berechnungsbaum Ende, letzte Zelle + ScFormulaCell* pFormulaTrack; // BroadcastTrack Start + ScFormulaCell* pEOFormulaTrack; // BrodcastTrack Ende, letzte Zelle + ScBroadcastAreaSlotMachine* pBASM; // BroadcastAreas ScChartListenerCollection* pChartListenerCollection; - ScStrCollection* pOtherObjects; // non-chart OLE objects - SvMemoryStream* pClipData; - ScDetOpList* pDetOpList; - ScChangeTrack* pChangeTrack; - SfxBroadcaster* pUnoBroadcaster; - ScUnoListenerCalls* pUnoListenerCalls; + ScStrCollection* pOtherObjects; // non-chart OLE objects + SvMemoryStream* pClipData; + ScDetOpList* pDetOpList; + ScChangeTrack* pChangeTrack; + SfxBroadcaster* pUnoBroadcaster; + ScUnoListenerCalls* pUnoListenerCalls; ScUnoRefList* pUnoRefUndoList; ScChangeViewSettings* pChangeViewSettings; - ScScriptTypeData* pScriptTypeData; + ScScriptTypeData* pScriptTypeData; ScRefreshTimerControl* pRefreshTimerControl; rtl::Reference<SvxForbiddenCharactersTable> xForbiddenCharacters; - ScFieldEditEngine* pCacheFieldEditEngine; + ScFieldEditEngine* pCacheFieldEditEngine; ::std::auto_ptr<ScDocProtection> pDocProtection; ::std::auto_ptr<ScClipParam> mpClipParam; @@ -320,13 +320,13 @@ private: String aDocName; // opt: Dokumentname String aDocCodeName; // opt: Dokumentname - ScRangePairListRef xColNameRanges; - ScRangePairListRef xRowNameRanges; + ScRangePairListRef xColNameRanges; + ScRangePairListRef xRowNameRanges; - ScViewOptions* pViewOptions; // View-Optionen - ScDocOptions* pDocOptions; // Dokument-Optionen - ScExtDocOptions* pExtDocOptions; // fuer Import etc. - ScConsolidateParam* pConsolidateDlgData; + ScViewOptions* pViewOptions; // View-Optionen + ScDocOptions* pDocOptions; // Dokument-Optionen + ScExtDocOptions* pExtDocOptions; // fuer Import etc. + ScConsolidateParam* pConsolidateDlgData; ScRecursionHelper* pRecursionHelper; // information for recursive and iterative cell formulas @@ -338,26 +338,26 @@ private: sal_uInt32 nRangeOverflowType; // used in (xml) loading for overflow warnings - ScRange aEmbedRange; - ScAddress aCurTextWidthCalcPos; - ScAddress aOnlineSpellPos; // within whole document - ScRange aVisSpellRange; - ScAddress aVisSpellPos; // within aVisSpellRange (see nVisSpellState) + ScRange aEmbedRange; + ScAddress aCurTextWidthCalcPos; + ScAddress aOnlineSpellPos; // within whole document + ScRange aVisSpellRange; + ScAddress aVisSpellPos; // within aVisSpellRange (see nVisSpellState) - Timer aTrackTimer; + Timer aTrackTimer; com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents; public: - ScTabOpList aTableOpList; // list of ScInterpreterTableOpParams currently in use + 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 - CharSet eSrcSet; // Einlesen: Quell-Zeichensatz + LanguageType eLanguage; // default language + LanguageType eCjkLanguage; // default language for asian text + LanguageType eCtlLanguage; // default language for complex text + CharSet eSrcSet; // Einlesen: Quell-Zeichensatz /** The compiler grammar used in document storage. GRAM_PODF for ODF 1.1 documents, GRAM_ODFF for ODF 1.2 documents. */ @@ -368,74 +368,74 @@ private: importer. */ formula::FormulaGrammar::Grammar eXmlImportGrammar; - ULONG nFormulaCodeInTree; // FormelRPN im Formelbaum + ULONG nFormulaCodeInTree; // FormelRPN im Formelbaum ULONG nXMLImportedFormulaCount; // progress count during XML import - USHORT nInterpretLevel; // >0 wenn im Interpreter - USHORT nMacroInterpretLevel; // >0 wenn Macro im Interpreter - USHORT nInterpreterTableOpLevel; // >0 if in Interpreter TableOp - SCTAB nMaxTableNumber; - USHORT nSrcVer; // Dateiversion (Laden/Speichern) - SCROW nSrcMaxRow; // Zeilenzahl zum Laden/Speichern - USHORT nFormulaTrackCount; - USHORT nHardRecalcState; // 0: soft, 1: hard-warn, 2: hard - SCTAB nVisibleTab; // fuer OLE etc. - - ScLkUpdMode eLinkMode; - - BOOL bAutoCalc; // Automatisch Berechnen - BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled + USHORT nInterpretLevel; // >0 wenn im Interpreter + USHORT nMacroInterpretLevel; // >0 wenn Macro im Interpreter + USHORT nInterpreterTableOpLevel; // >0 if in Interpreter TableOp + SCTAB nMaxTableNumber; + USHORT nSrcVer; // Dateiversion (Laden/Speichern) + SCROW nSrcMaxRow; // Zeilenzahl zum Laden/Speichern + USHORT nFormulaTrackCount; + USHORT nHardRecalcState; // 0: soft, 1: hard-warn, 2: hard + SCTAB nVisibleTab; // fuer OLE etc. + + ScLkUpdMode eLinkMode; + + BOOL bAutoCalc; // Automatisch Berechnen + BOOL bAutoCalcShellDisabled; // in/von/fuer ScDocShell disabled // ob noch ForcedFormulas berechnet werden muessen, // im Zusammenspiel mit ScDocShell SetDocumentModified, // AutoCalcShellDisabled und TrackFormulas - BOOL bForcedFormulaPending; - BOOL bCalculatingFormulaTree; - BOOL bIsClip; - BOOL bIsUndo; - BOOL bIsVisible; // set from view ctor + BOOL bForcedFormulaPending; + BOOL bCalculatingFormulaTree; + BOOL bIsClip; + BOOL bIsUndo; + BOOL bIsVisible; // set from view ctor - BOOL bIsEmbedded; // Embedded-Bereich anzeigen/anpassen ? + BOOL bIsEmbedded; // Embedded-Bereich anzeigen/anpassen ? // kein SetDirty bei ScFormulaCell::CompileTokenArray sondern am Ende // von ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip - BOOL bNoSetDirty; + BOOL bNoSetDirty; // kein Broadcast, keine Listener aufbauen waehrend aus einem anderen // Doc (per Filter o.ae.) inserted wird, erst bei CompileAll / CalcAfterLoad - BOOL bInsertingFromOtherDoc; + BOOL bInsertingFromOtherDoc; bool bLoadingMedium; bool bImportingXML; // special handling of formula text BOOL bXMLFromWrapper; // distinguish ScXMLImportWrapper from external component - BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE + BOOL bCalcingAfterLoad; // in CalcAfterLoad TRUE // wenn temporaer keine Listener auf/abgebaut werden sollen - BOOL bNoListening; - BOOL bIdleDisabled; - BOOL bInLinkUpdate; // TableLink or AreaLink - BOOL bChartListenerCollectionNeedsUpdate; + BOOL bNoListening; + BOOL bIdleDisabled; + BOOL bInLinkUpdate; // TableLink or AreaLink + BOOL bChartListenerCollectionNeedsUpdate; // ob RC_FORCED Formelzellen im Dokument sind/waren (einmal an immer an) - BOOL bHasForcedFormulas; + BOOL bHasForcedFormulas; // ob das Doc gerade zerstoert wird (kein Notify-Tracking etc. mehr) - BOOL bInDtorClear; + BOOL bInDtorClear; // ob bei Spalte/Zeile einfuegen am Rand einer Referenz die Referenz // erweitert wird, wird in jedem UpdateReference aus InputOptions geholt, // gesetzt und am Ende von UpdateReference zurueckgesetzt - BOOL bExpandRefs; + BOOL bExpandRefs; // fuer Detektiv-Update, wird bei jeder Aenderung an Formeln gesetzt - BOOL bDetectiveDirty; + BOOL bDetectiveDirty; - BYTE nMacroCallMode; // Makros per Warnung-Dialog disabled? - BOOL bHasMacroFunc; // valid only after loading + BYTE nMacroCallMode; // Makros per Warnung-Dialog disabled? + BOOL bHasMacroFunc; // valid only after loading - BYTE nVisSpellState; + BYTE nVisSpellState; - BYTE nAsianCompression; - BYTE nAsianKerning; + BYTE nAsianCompression; + BYTE nAsianKerning; BOOL bSetDrawDefaults; BOOL bPastingDrawFromOtherDoc; BYTE nInDdeLinkUpdate; // originating DDE links (stacked bool) - BOOL bInUnoBroadcast; - BOOL bInUnoListenerCall; + BOOL bInUnoBroadcast; + BOOL bInUnoListenerCall; formula::FormulaGrammar::Grammar eGrammar; mutable BOOL bStyleSheetUsageInvalid; @@ -451,83 +451,83 @@ private: ::std::set<ScFormulaCell*> maSubTotalCells; public: - SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen + SC_DLLPUBLIC ULONG GetCellCount() const; // alle Zellen SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const; - ULONG GetWeightedCount() const; // Formeln und Edit staerker gewichtet - ULONG GetCodeCount() const; // RPN-Code in Formeln + ULONG GetWeightedCount() const; // Formeln und Edit staerker gewichtet + ULONG GetCodeCount() const; // RPN-Code in Formeln DECL_LINK( GetUserDefinedColor, USHORT * ); // Numberformatter public: - SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, + SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT, SfxObjectShell* pDocShell = NULL ); - SC_DLLPUBLIC ~ScDocument(); + SC_DLLPUBLIC ~ScDocument(); inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > GetServiceManager() const { return xServiceManager; } - SC_DLLPUBLIC const String& GetName() const { return aDocName; } - void SetName( const String& r ) { aDocName = r; } - const String& GetCodeName() const { return aDocCodeName; } - void SetCodeName( const String& r ) { aDocCodeName = r; } + SC_DLLPUBLIC const String& GetName() const { return aDocName; } + void SetName( const String& r ) { aDocName = r; } + const String& GetCodeName() const { return aDocCodeName; } + void SetCodeName( const String& r ) { aDocCodeName = r; } SC_DLLPUBLIC NameToNameMap* GetLocalNameMap( SCTAB& rTab ); - void GetDocStat( ScDocStat& rDocStat ); + void GetDocStat( ScDocStat& rDocStat ); - SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL ); - XColorTable* GetColorTable(); + SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL ); + XColorTable* GetColorTable(); - SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const; + SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const; - SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const; - SC_DLLPUBLIC void SetDocOptions( const ScDocOptions& rOpt ); - SC_DLLPUBLIC const ScViewOptions& GetViewOptions() const; - SC_DLLPUBLIC void SetViewOptions( const ScViewOptions& rOpt ); - void SetPrintOptions(); + SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const; + SC_DLLPUBLIC void SetDocOptions( const ScDocOptions& rOpt ); + SC_DLLPUBLIC const ScViewOptions& GetViewOptions() const; + SC_DLLPUBLIC void SetViewOptions( const ScViewOptions& rOpt ); + void SetPrintOptions(); - ScExtDocOptions* GetExtDocOptions() { return pExtDocOptions; } - SC_DLLPUBLIC void SetExtDocOptions( ScExtDocOptions* pNewOptions ); + ScExtDocOptions* GetExtDocOptions() { return pExtDocOptions; } + SC_DLLPUBLIC void SetExtDocOptions( ScExtDocOptions* pNewOptions ); - void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const; - void SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl ); + void GetLanguage( LanguageType& rLatin, LanguageType& rCjk, LanguageType& rCtl ) const; + void SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageType eCtl ); void SetDrawDefaults(); - void SetConsolidateDlgData( const ScConsolidateParam* pData ); - const ScConsolidateParam* GetConsolidateDlgData() const { return pConsolidateDlgData; } + void SetConsolidateDlgData( const ScConsolidateParam* pData ); + const ScConsolidateParam* GetConsolidateDlgData() const { return pConsolidateDlgData; } - void Clear( sal_Bool bFromDestructor = sal_False ); + void Clear( sal_Bool bFromDestructor = sal_False ); - ScFieldEditEngine* CreateFieldEditEngine(); - void DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine); + ScFieldEditEngine* CreateFieldEditEngine(); + void DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine); - SC_DLLPUBLIC ScRangeName* GetRangeName() const; - void SetRangeName( ScRangeName* pNewRangeName ); - SCTAB GetMaxTableNumber() { return nMaxTableNumber; } - void SetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber = nNumber; } + SC_DLLPUBLIC ScRangeName* GetRangeName() const; + void SetRangeName( ScRangeName* pNewRangeName ); + SCTAB GetMaxTableNumber() { return nMaxTableNumber; } + void SetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber = nNumber; } - ScRangePairList* GetColNameRanges() { return &xColNameRanges; } - ScRangePairList* GetRowNameRanges() { return &xRowNameRanges; } - ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; } - ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; } + ScRangePairList* GetColNameRanges() { return &xColNameRanges; } + ScRangePairList* GetRowNameRanges() { return &xRowNameRanges; } + ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; } + ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; } - SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; - void SetDBCollection( ScDBCollection* pNewDBCollection, + SC_DLLPUBLIC ScDBCollection* GetDBCollection() const; + void SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemoveAutoFilter = FALSE ); - ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, + ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly = FALSE) const; - ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; - SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; + SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; - SC_DLLPUBLIC ScDPCollection* GetDPCollection(); - ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; + SC_DLLPUBLIC ScDPCollection* GetDPCollection(); + ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; ScDPObject* GetDPAtBlock( const ScRange& rBlock ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance SC_DLLPUBLIC ScDPTableDataCache* GetDPObjectCache( long nID ); - SC_DLLPUBLIC ScDPTableDataCache* GetUsedDPObjectCache ( ScRange rRange ); + SC_DLLPUBLIC ScDPTableDataCache* GetUsedDPObjectCache ( ScRange rRange ); SC_DLLPUBLIC long AddDPObjectCache( ScDPTableDataCache* pData ); SC_DLLPUBLIC void RemoveDPObjectCache( long nID ); SC_DLLPUBLIC void RemoveUnusedDPObjectCaches(); @@ -535,22 +535,22 @@ public: SC_DLLPUBLIC long GetNewDPObjectCacheId (); // End Comments - SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; + SC_DLLPUBLIC ScChartCollection* GetChartCollection() const; - void StopTemporaryChartLock(); + void StopTemporaryChartLock(); - void EnsureGraphicNames(); + void EnsureGraphicNames(); - SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); - BOOL HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL ); + SdrObject* GetObjectAtPoint( SCTAB nTab, const Point& rPos ); + BOOL HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName = NULL ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const String& rChartName ); SC_DLLPUBLIC void GetChartRanges( const String& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); void SetChartRanges( const String& rChartName, const ::std::vector< ScRangeList >& rRanges ); - void UpdateChartArea( const String& rChartName, const ScRange& rNewArea, + void UpdateChartArea( const String& rChartName, const ScRange& rNewArea, BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd ); - void UpdateChartArea( const String& rChartName, + void UpdateChartArea( const String& rChartName, const ScRangeListRef& rNewList, BOOL bColHeaders, BOOL bRowHeaders, BOOL bAdd ); void GetOldChartParameters( const String& rName, @@ -559,106 +559,106 @@ public: ::com::sun::star::embed::XEmbeddedObject > FindOleObjectByName( const String& rName ); - SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); + SC_DLLPUBLIC void MakeTable( SCTAB nTab,bool _bNeedsNameCheck = true ); - SCTAB GetVisibleTab() const { return nVisibleTab; } - SC_DLLPUBLIC void SetVisibleTab(SCTAB nTab) { nVisibleTab = nTab; } + SCTAB GetVisibleTab() const { return nVisibleTab; } + SC_DLLPUBLIC void SetVisibleTab(SCTAB nTab) { nVisibleTab = nTab; } - SC_DLLPUBLIC BOOL HasTable( SCTAB nTab ) const; - SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const; - SC_DLLPUBLIC BOOL GetCodeName( SCTAB nTab, String& rName ) const; - SC_DLLPUBLIC BOOL SetCodeName( SCTAB nTab, String& rName ); - SC_DLLPUBLIC BOOL GetTable( const String& rName, SCTAB& rTab ) const; - SC_DLLPUBLIC inline SCTAB GetTableCount() const { return nMaxTableNumber; } + SC_DLLPUBLIC BOOL HasTable( SCTAB nTab ) const; + SC_DLLPUBLIC BOOL GetName( SCTAB nTab, String& rName ) const; + SC_DLLPUBLIC BOOL GetCodeName( SCTAB nTab, String& rName ) const; + SC_DLLPUBLIC BOOL SetCodeName( SCTAB nTab, String& rName ); + SC_DLLPUBLIC BOOL GetTable( const String& rName, SCTAB& rTab ) const; + SC_DLLPUBLIC inline SCTAB GetTableCount() const { return nMaxTableNumber; } SvNumberFormatterIndexTable* GetFormatExchangeList() const { return pFormatExchangeList; } SC_DLLPUBLIC ScDocProtection* GetDocProtection() const; SC_DLLPUBLIC void SetDocProtection(const ScDocProtection* pProtect); - SC_DLLPUBLIC BOOL IsDocProtected() const; - BOOL IsDocEditable() const; - SC_DLLPUBLIC BOOL IsTabProtected( SCTAB nTab ) const; + SC_DLLPUBLIC BOOL IsDocProtected() const; + BOOL IsDocEditable() const; + SC_DLLPUBLIC BOOL IsTabProtected( SCTAB nTab ) const; SC_DLLPUBLIC ScTableProtection* GetTabProtection( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabProtection(SCTAB nTab, const ScTableProtection* pProtect); void CopyTabProtection(SCTAB nTabSrc, SCTAB nTabDest); - void LockTable(SCTAB nTab); - void UnlockTable(SCTAB nTab); + void LockTable(SCTAB nTab); + void UnlockTable(SCTAB nTab); - BOOL IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + BOOL IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionEditable( const ScMarkData& rMark, + BOOL IsSelectionEditable( const ScMarkData& rMark, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, + BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) const; - BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTAB ) const; - - BOOL GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); - - BOOL IsEmbedded() const; - void GetEmbedded( ScRange& rRange ) const; - void SetEmbedded( const ScRange& rRange ); - void ResetEmbedded(); - Rectangle GetEmbeddedRect() const; // 1/100 mm - void SetEmbedded( const Rectangle& rRect ); // aus VisArea (1/100 mm) - void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm - - SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const; - SC_DLLPUBLIC BOOL ValidNewTabName( const String& rName ) const; - SC_DLLPUBLIC void CreateValidTabName(String& rName) const; - SC_DLLPUBLIC BOOL InsertTab( SCTAB nPos, const String& rName, + BOOL HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTAB ) const; + + BOOL GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ); + + BOOL IsEmbedded() const; + void GetEmbedded( ScRange& rRange ) const; + void SetEmbedded( const ScRange& rRange ); + void ResetEmbedded(); + Rectangle GetEmbeddedRect() const; // 1/100 mm + void SetEmbedded( const Rectangle& rRect ); // aus VisArea (1/100 mm) + void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm + + SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const; + SC_DLLPUBLIC BOOL ValidNewTabName( const String& rName ) const; + SC_DLLPUBLIC void CreateValidTabName(String& rName) const; + SC_DLLPUBLIC BOOL InsertTab( SCTAB nPos, const String& rName, BOOL bExternalDocument = FALSE ); SC_DLLPUBLIC BOOL DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc = NULL ); - SC_DLLPUBLIC BOOL RenameTab( SCTAB nTab, const String& rName, + SC_DLLPUBLIC BOOL RenameTab( SCTAB nTab, const String& rName, BOOL bUpdateRef = TRUE, BOOL bExternalDocument = FALSE ); - BOOL MoveTab( SCTAB nOldPos, SCTAB nNewPos ); - BOOL CopyTab( SCTAB nOldPos, SCTAB nNewPos, + BOOL MoveTab( SCTAB nOldPos, SCTAB nNewPos ); + BOOL CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked = NULL ); - SC_DLLPUBLIC ULONG TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, + SC_DLLPUBLIC ULONG TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, BOOL bInsertNew = TRUE, BOOL bResultsOnly = FALSE ); - SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); - SC_DLLPUBLIC void SetVisible( SCTAB nTab, BOOL bVisible ); - SC_DLLPUBLIC BOOL IsVisible( SCTAB nTab ) const; + SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); + SC_DLLPUBLIC void SetVisible( SCTAB nTab, BOOL bVisible ); + SC_DLLPUBLIC BOOL IsVisible( SCTAB nTab ) const; BOOL IsStreamValid( SCTAB nTab ) const; void SetStreamValid( SCTAB nTab, BOOL bSet, BOOL bIgnoreLock = FALSE ); void LockStreamValid( bool bLock ); bool IsStreamValidLocked() const { return mbStreamValidLocked; } BOOL IsPendingRowHeights( SCTAB nTab ) const; void SetPendingRowHeights( SCTAB nTab, BOOL bSet ); - SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, BOOL bRTL ); - SC_DLLPUBLIC BOOL IsLayoutRTL( SCTAB nTab ) const; - BOOL IsNegativePage( SCTAB nTab ) const; - SC_DLLPUBLIC void SetScenario( SCTAB nTab, BOOL bFlag ); - SC_DLLPUBLIC BOOL IsScenario( SCTAB nTab ) const; - SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, String& rComment, + SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, BOOL bRTL ); + SC_DLLPUBLIC BOOL IsLayoutRTL( SCTAB nTab ) const; + BOOL IsNegativePage( SCTAB nTab ) const; + SC_DLLPUBLIC void SetScenario( SCTAB nTab, BOOL bFlag ); + SC_DLLPUBLIC BOOL IsScenario( SCTAB nTab ) const; + SC_DLLPUBLIC void GetScenarioData( SCTAB nTab, String& rComment, Color& rColor, USHORT& rFlags ) const; - SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const String& rComment, + SC_DLLPUBLIC void SetScenarioData( SCTAB nTab, const String& rComment, const Color& rColor, USHORT nFlags ); SC_DLLPUBLIC Color GetTabBgColor( SCTAB nTab ) const; SC_DLLPUBLIC void SetTabBgColor( SCTAB nTab, const Color& rColor ); SC_DLLPUBLIC bool IsDefaultTabBgColor( SCTAB nTab ) const; - void GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const; - SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const; - SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc. + void GetScenarioFlags( SCTAB nTab, USHORT& rFlags ) const; + SC_DLLPUBLIC BOOL IsActiveScenario( SCTAB nTab ) const; + SC_DLLPUBLIC void SetActiveScenario( SCTAB nTab, BOOL bActive ); // nur fuer Undo etc. SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention GetAddressConvention() const; SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const; void SetGrammar( formula::FormulaGrammar::Grammar eGram ); - SC_DLLPUBLIC BYTE GetLinkMode( SCTAB nTab ) const; - BOOL IsLinked( SCTAB nTab ) const; - SC_DLLPUBLIC const String& GetLinkDoc( SCTAB nTab ) const; - const String& GetLinkFlt( SCTAB nTab ) const; - const String& GetLinkOpt( SCTAB nTab ) const; - SC_DLLPUBLIC const String& GetLinkTab( SCTAB nTab ) const; - ULONG GetLinkRefreshDelay( SCTAB nTab ) const; - void SetLink( SCTAB nTab, BYTE nMode, const String& rDoc, + SC_DLLPUBLIC BYTE GetLinkMode( SCTAB nTab ) const; + BOOL IsLinked( SCTAB nTab ) const; + SC_DLLPUBLIC const String& GetLinkDoc( SCTAB nTab ) const; + const String& GetLinkFlt( SCTAB nTab ) const; + const String& GetLinkOpt( SCTAB nTab ) const; + SC_DLLPUBLIC const String& GetLinkTab( SCTAB nTab ) const; + ULONG GetLinkRefreshDelay( SCTAB nTab ) const; + void SetLink( SCTAB nTab, BYTE nMode, const String& rDoc, const String& rFilter, const String& rOptions, const String& rTabName, ULONG nRefreshDelay ); - BOOL HasLink( const String& rDoc, + BOOL HasLink( const String& rDoc, const String& rFilter, const String& rOptions ) const; - SC_DLLPUBLIC BOOL LinkExternalTab( SCTAB& nTab, const String& aDocTab, + SC_DLLPUBLIC BOOL LinkExternalTab( SCTAB& nTab, const String& aDocTab, const String& aFileName, const String& aTabName ); @@ -672,23 +672,23 @@ public: on first call. */ ScFormulaParserPool& GetFormulaParserPool() const; - BOOL HasDdeLinks() const; - BOOL HasAreaLinks() const; + BOOL HasDdeLinks() const; + BOOL HasAreaLinks() const; void UpdateExternalRefLinks(); - void UpdateDdeLinks(); - void UpdateAreaLinks(); + void UpdateDdeLinks(); + void UpdateAreaLinks(); // originating DDE links void IncInDdeLinkUpdate() { if ( nInDdeLinkUpdate < 255 ) ++nInDdeLinkUpdate; } void DecInDdeLinkUpdate() { if ( nInDdeLinkUpdate ) --nInDdeLinkUpdate; } BOOL IsInDdeLinkUpdate() const { return nInDdeLinkUpdate != 0; } - SC_DLLPUBLIC void CopyDdeLinks( ScDocument* pDestDoc ) const; - void DisconnectDdeLinks(); + SC_DLLPUBLIC void CopyDdeLinks( ScDocument* pDestDoc ) const; + void DisconnectDdeLinks(); // Fuer StarOne Api: - USHORT GetDdeLinkCount() const; - BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); + USHORT GetDdeLinkCount() const; + BOOL UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ); /** Tries to find a DDE link with the specified connection data. @param rnDdePos (out-param) Returns the index of the DDE link (does not include other links from link manager). @@ -723,11 +723,11 @@ public: bool SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults ); - SfxBindings* GetViewBindings(); - SfxObjectShell* GetDocumentShell() const { return pShell; } - ScDrawLayer* GetDrawLayer() { return pDrawLayer; } - SfxBroadcaster* GetDrawBroadcaster(); // zwecks Header-Vermeidung - void BeginDrawUndo(); + SfxBindings* GetViewBindings(); + SfxObjectShell* GetDocumentShell() const { return pShell; } + ScDrawLayer* GetDrawLayer() { return pDrawLayer; } + SfxBroadcaster* GetDrawBroadcaster(); // zwecks Header-Vermeidung + void BeginDrawUndo(); void BeginUnoRefUndo(); bool HasUnoRefUndo() const { return ( pUnoRefUndoList != NULL ); } @@ -738,22 +738,22 @@ public: // #109985# sal_Bool IsChart( const SdrObject* pObject ); - SC_DLLPUBLIC void UpdateAllCharts(); - void UpdateChartRef( UpdateRefMode eUpdateRefMode, + SC_DLLPUBLIC void UpdateAllCharts(); + void UpdateChartRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); //! setzt nur die neue RangeList, keine ChartListener o.ae. - void SetChartRangeList( const String& rChartName, + void SetChartRangeList( const String& rChartName, const ScRangeListRef& rNewRangeListRef ); - BOOL HasControl( SCTAB nTab, const Rectangle& rMMRect ); - void InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect ); + BOOL HasControl( SCTAB nTab, const Rectangle& rMMRect ); + void InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& rMMRect ); - void StartAnimations( SCTAB nTab, Window* pWin ); + void StartAnimations( SCTAB nTab, Window* pWin ); - BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); - BOOL HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ); + BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ); + BOOL HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ); const ScSheetEvents* GetSheetEvents( SCTAB nTab ) const; void SetSheetEvents( SCTAB nTab, const ScSheetEvents* pNew ); @@ -764,65 +764,65 @@ public: void SetCalcNotification( SCTAB nTab ); void ResetCalcNotifications(); - SC_DLLPUBLIC ScOutlineTable* GetOutlineTable( SCTAB nTab, BOOL bCreate = FALSE ); - BOOL SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline ); + SC_DLLPUBLIC ScOutlineTable* GetOutlineTable( SCTAB nTab, BOOL bCreate = FALSE ); + BOOL SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline ); - void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, + void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - BOOL DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); - void RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); - BOOL TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam ); - BOOL HasSubTotalCells( const ScRange& rRange ); + BOOL DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); + void RemoveSubTotals( SCTAB nTab, ScSubTotalParam& rParam ); + BOOL TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam ); + BOOL HasSubTotalCells( const ScRange& rRange ); - SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); - SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, + SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, BOOL bForceTab = FALSE ); + SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, BOOL bForceTab = FALSE ); - SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, + SC_DLLPUBLIC void PutCell(SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, ULONG nFormatIndex, BOOL bForceTab = FALSE); - // return TRUE = Zahlformat gesetzt + // return TRUE = Zahlformat gesetzt SC_DLLPUBLIC BOOL SetString( - SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, ScSetStringParam* pParam = NULL ); SC_DLLPUBLIC void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError); + void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError); - SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, + SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, const String& rFormula, const ScTokenArray* p = NULL, const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ); - SC_DLLPUBLIC void InsertTableOp(const ScTabOpParam& rParam, // Mehrfachoperation + SC_DLLPUBLIC void InsertTableOp(const ScTabOpParam& rParam, // Mehrfachoperation SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark); - SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); - SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); - SC_DLLPUBLIC double GetValue( const ScAddress& ); - SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ); - SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); - SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, + SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); + SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString ); + SC_DLLPUBLIC double GetValue( const ScAddress& ); + SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ); + SC_DLLPUBLIC double RoundValueAsShown( double fVal, ULONG nFormat ); + SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt32& rFormat ) const; sal_uInt32 GetNumberFormat( const ScRange& rRange ) const; - SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; + SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const; /** If no number format attribute is set and the cell pointer passed is of type formula cell, the calculated number format of the formula cell is returned. pCell may be NULL. */ - SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, ULONG& nIndex, + SC_DLLPUBLIC void GetNumberFormatInfo( short& nType, ULONG& nIndex, const ScAddress& rPos, const ScBaseCell* pCell ) const; - void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula, + void GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rFormula, BOOL bAsciiExport = FALSE ) const; - SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const; - SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const; - SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; - SC_DLLPUBLIC ScBaseCell* GetCell( const ScAddress& rPos ) const; + SC_DLLPUBLIC void GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const; + SC_DLLPUBLIC CellType GetCellType( const ScAddress& rPos ) const; + SC_DLLPUBLIC void GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ) const; + SC_DLLPUBLIC ScBaseCell* GetCell( const ScAddress& rPos ) const; - SC_DLLPUBLIC BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - BOOL HasStringCells( const ScRange& rRange ) const; + SC_DLLPUBLIC BOOL HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ); + SC_DLLPUBLIC BOOL HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC BOOL HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL HasStringCells( const ScRange& rRange ) const; /** Returns true, if there is any data to create a selection list for rPos. */ BOOL HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; @@ -849,57 +849,57 @@ public: BOOL ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, + BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendMerge( ScRange& rRange, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); - BOOL ExtendTotalMerge( ScRange& rRange ); - SC_DLLPUBLIC BOOL ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, + BOOL ExtendMerge( ScRange& rRange, BOOL bRefresh = FALSE, BOOL bAttrs = FALSE ); + BOOL ExtendTotalMerge( ScRange& rRange ); + SC_DLLPUBLIC BOOL ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL ExtendOverlapped( ScRange& rRange ); + SC_DLLPUBLIC BOOL ExtendOverlapped( ScRange& rRange ); - BOOL RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, + BOOL RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC void DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void DoMergeContents( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - // ohne Ueberpruefung: - SC_DLLPUBLIC void DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + // ohne Ueberpruefung: + SC_DLLPUBLIC void DoMerge( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true ); - void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); - BOOL IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + BOOL IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const; - BOOL IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + BOOL IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bLeftIsEmpty = FALSE, ScRange* pLastRange = NULL, Rectangle* pLastMM = NULL ) const; void SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const; - BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + BOOL IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nMask ); SC_DLLPUBLIC bool HasAttrib( const ScRange& rRange, USHORT nMask ); - void GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, + void GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; - void ResetChanged( const ScRange& rRange ); + void ResetChanged( const ScRange& rRange ); - void SetDirty(); - void SetDirty( const ScRange& ); - void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp + void SetDirty(); + void SetDirty( const ScRange& ); + void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp void InterpretDirtyCells( const ScRangeList& rRanges ); - void CalcAll(); - SC_DLLPUBLIC void CalcAfterLoad(); - void CompileAll(); - void CompileXML(); + void CalcAll(); + SC_DLLPUBLIC void CalcAfterLoad(); + void CompileAll(); + void CompileXML(); ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; } @@ -916,117 +916,101 @@ public: void ClearLookupCaches(); // Automatisch Berechnen - void SetAutoCalc( BOOL bNewAutoCalc ); - BOOL GetAutoCalc() const { return bAutoCalc; } + void SetAutoCalc( BOOL bNewAutoCalc ); + BOOL GetAutoCalc() const { return bAutoCalc; } // Automatisch Berechnen in/von/fuer ScDocShell disabled - void SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; } - BOOL IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; } + void SetAutoCalcShellDisabled( BOOL bNew ) { bAutoCalcShellDisabled = bNew; } + BOOL IsAutoCalcShellDisabled() const { return bAutoCalcShellDisabled; } // ForcedFormulas zu berechnen - void SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; } - BOOL IsForcedFormulaPending() const { return bForcedFormulaPending; } + void SetForcedFormulaPending( BOOL bNew ) { bForcedFormulaPending = bNew; } + BOOL IsForcedFormulaPending() const { return bForcedFormulaPending; } // if CalcFormulaTree() is currently running - BOOL IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } - - USHORT GetErrCode( const ScAddress& ) const; + BOOL IsCalculatingFormulaTree() { return bCalculatingFormulaTree; } + + USHORT GetErrCode( const ScAddress& ) const; /** Shrink a range to only include data area. - - This is not the actually used area within the - selection, but the bounds of the sheet's data area - instead. - - @returns TRUE if the area passed intersected the data - area, FALSE if not, in which case the values - obtained may be out of bounds, not in order or - unmodified. TRUE does not mean that there - actually is any data within the selection. - */ + This is not the actually used area within the + selection, but the bounds of the sheet's data area + instead. */ bool ShrinkToDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const; - /** Shrink a range to only include used data area. - - @param o_bShrunk - Out parameter, TRUE if area was shrunk, FALSE if not. - - @returns TRUE if there is any data, FALSE if not. - */ - bool ShrinkToUsedDataArea( bool& o_bShrunk, - SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, - SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; + /** Shrink a range to only include used data area. */ + bool ShrinkToUsedDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; void GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const; - SC_DLLPUBLIC BOOL GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; - SC_DLLPUBLIC BOOL GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; - SC_DLLPUBLIC BOOL GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, + SC_DLLPUBLIC BOOL GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; + SC_DLLPUBLIC BOOL GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const; + SC_DLLPUBLIC BOOL GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes = TRUE ) const; - SC_DLLPUBLIC BOOL GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, + SC_DLLPUBLIC BOOL GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, SCCOL& rEndCol, BOOL bNotes = TRUE ) const; - SC_DLLPUBLIC BOOL GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, + SC_DLLPUBLIC BOOL GetPrintAreaVer( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW& rEndRow, BOOL bNotes = TRUE ) const; - void InvalidateTableArea(); + void InvalidateTableArea(); - SC_DLLPUBLIC BOOL GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; + SC_DLLPUBLIC BOOL GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; - /** - * Find the maximum column position that contains printable data for the - * specified row range. The final column position must be equal or less - * than the initial value of rEndCol. + /** + * Find the maximum column position that contains printable data for the + * specified row range. The final column position must be equal or less + * than the initial value of rEndCol. */ - void ExtendPrintArea( OutputDevice* pDev, SCTAB nTab, + void ExtendPrintArea( OutputDevice* pDev, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow ); - SC_DLLPUBLIC SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, + SC_DLLPUBLIC SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, ScDirection eDir ); - SC_DLLPUBLIC void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY ); - SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, + SC_DLLPUBLIC void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY ); + SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ); - BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab, + BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab, const ScMarkData& rMark ); - void LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, + void LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - void LimitChartIfAll( ScRangeListRef& rRangeList ); + void LimitChartIfAll( ScRangeListRef& rRangeList ); - BOOL InsertRow( SCCOL nStartCol, SCTAB nStartTab, + BOOL InsertRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC BOOL InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); - void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, + SC_DLLPUBLIC BOOL InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); + void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC void DeleteRow( const ScRange& rRange, + SC_DLLPUBLIC void DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL ); - BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab, + BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); - SC_DLLPUBLIC BOOL InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); - void DeleteCol( SCROW nStartRow, SCTAB nStartTab, + SC_DLLPUBLIC BOOL InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); + void DeleteCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); - void DeleteCol( const ScRange& rRange, + void DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL ); - BOOL CanInsertRow( const ScRange& rRange ) const; - BOOL CanInsertCol( const ScRange& rRange ) const; + BOOL CanInsertRow( const ScRange& rRange ) const; + BOOL CanInsertCol( const ScRange& rRange ) const; - void FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE ); - BOOL CanFitBlock( const ScRange& rOld, const ScRange& rNew ); + void FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear = TRUE ); + BOOL CanFitBlock( const ScRange& rOld, const ScRange& rNew ); - BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; } - BOOL IsUndo() const { return bIsUndo; } - BOOL IsClipboard() const { return bIsClip; } - bool IsUndoEnabled() const { return mbUndoEnabled; } + BOOL IsClipOrUndo() const { return bIsClip || bIsUndo; } + BOOL IsUndo() const { return bIsUndo; } + BOOL IsClipboard() const { return bIsClip; } + bool IsUndoEnabled() const { return mbUndoEnabled; } void EnableUndo( bool bVal ); bool IsAdjustHeightEnabled() const { return mbAdjustHeightEnabled; } @@ -1037,52 +1021,52 @@ public: void EnableChangeReadOnly( bool bVal ) { mbChangeReadOnlyEnabled = bVal; } SC_DLLPUBLIC sal_Int16 GetNamedRangesLockCount() const { return mnNamedRangesLockCount; } void SetNamedRangesLockCount( sal_Int16 nCount ) { mnNamedRangesLockCount = nCount; } - SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ); - SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, SCTAB nTab ); - void SetCutMode( BOOL bCut ); - SC_DLLPUBLIC BOOL IsCutMode(); - void SetClipArea( const ScRange& rArea, BOOL bCut = FALSE ); + SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ); + SC_DLLPUBLIC void ResetClip( ScDocument* pSourceDoc, SCTAB nTab ); + void SetCutMode( BOOL bCut ); + SC_DLLPUBLIC BOOL IsCutMode(); + void SetClipArea( const ScRange& rArea, BOOL bCut = FALSE ); - SC_DLLPUBLIC BOOL IsDocVisible() const { return bIsVisible; } - void SetDocVisible( BOOL bSet ); + SC_DLLPUBLIC BOOL IsDocVisible() const { return bIsVisible; } + void SetDocVisible( BOOL bSet ); - BOOL HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL ); + BOOL HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL ); - void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark ); - void DeleteObjectsInSelection( const ScMarkData& rMark ); + void DeleteObjectsInSelection( const ScMarkData& rMark ); - void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nDelFlag); - void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, USHORT nDelFlag); - void DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag); + void DeleteAreaTab(const ScRange& rRange, USHORT nDelFlag); - void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, + void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false, bool bIncludeObjects = false, bool bCloneNoteCaptions = true); - void CopyToClip4VBA(const ScClipParam& rClipParam, ScDocument* pClipDoc, bool bKeepScenarioFlags = false, + void CopyToClip4VBA(const ScClipParam& rClipParam, ScDocument* pClipDoc, bool bKeepScenarioFlags = false, bool bIncludeObjects = false, bool bCloneNoteCaptions = true); - void CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScDocument* pClipDoc = NULL); - void CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const ScCopyBlockFromClipParams* pCBFCP ); - void CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy, const ScCopyBlockFromClipParams* pCBFCP, SCROW & rClipStartRow ); - void StartListeningFromClip( SCCOL nCol1, SCROW nRow1, + void StartListeningFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nInsFlag ); - void BroadcastFromClip( SCCOL nCol1, SCROW nRow1, + void BroadcastFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, USHORT nInsFlag ); /** If pDestRanges is given it overrides rDestRange, rDestRange in this case is the overall encompassing range. */ - void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, + void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, USHORT nInsFlag, ScDocument* pRefUndoDoc = NULL, ScDocument* pClipDoc = NULL, @@ -1092,224 +1076,224 @@ public: BOOL bSkipAttrForEmpty = FALSE, const ScRangeList * pDestRanges = NULL ); - void CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, - sal_uInt16 nInsFlag, ScDocument* pClipDoc, + void CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark, + sal_uInt16 nInsFlag, ScDocument* pClipDoc, bool bResetCut = true, bool bAsLink = false, bool bIncludeFiltered = true, bool bSkipAttrForEmpty = false); - void GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered); - void GetClipStart(SCCOL& nClipX, SCROW& nClipY); + void GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered); + void GetClipStart(SCCOL& nClipX, SCROW& nClipY); - BOOL HasClipFilteredRows(); + BOOL HasClipFilteredRows(); - BOOL IsClipboardSource() const; + BOOL IsClipboardSource() const; - SC_DLLPUBLIC void TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink ); + SC_DLLPUBLIC void TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsLink ); ScClipParam& GetClipParam(); void SetClipParam(const ScClipParam& rParam); - void MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty, + void MixDocument( const ScRange& rRange, USHORT nFunction, BOOL bSkipEmpty, ScDocument* pSrcDoc ); - void FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, + void FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); - void FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, + void FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL bAsLink ); - void TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ); + void TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ); - SC_DLLPUBLIC void InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, + SC_DLLPUBLIC void InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); - void AddUndoTab( SCTAB nTab1, SCTAB nTab2, + void AddUndoTab( SCTAB nTab1, SCTAB nTab2, BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); - SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, + SC_DLLPUBLIC void InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, BOOL bColInfo = FALSE, BOOL bRowInfo = FALSE ); - // nicht mehr benutzen: - void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + // nicht mehr benutzen: + void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE); - void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL); - void CopyToDocument(const ScRange& rRange, + void CopyToDocument(const ScRange& rRange, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL, BOOL bColRowFlags = TRUE); - void UndoToDocument(const ScRange& rRange, + void UndoToDocument(const ScRange& rRange, USHORT nFlags, BOOL bMarked, ScDocument* pDestDoc, const ScMarkData* pMarks = NULL); - void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario = FALSE ); - BOOL TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; - void MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, + void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario = FALSE ); + BOOL TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const; + void MarkScenario( SCTAB nSrcTab, SCTAB nDestTab, ScMarkData& rDestMark, BOOL bResetMark = TRUE, USHORT nNeededBits = 0 ) const; - BOOL HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const; + BOOL HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const; SC_DLLPUBLIC const ScRangeList* GetScenarioRanges( SCTAB nTab ) const; - SC_DLLPUBLIC void CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ); + SC_DLLPUBLIC void CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ); - void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, bool bUpdateNoteCaptionPos = true ); - SC_DLLPUBLIC void UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc, + SC_DLLPUBLIC void UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc, const ScMarkData& rMark, ScDocument* pUndoDoc = NULL ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, ULONG nFillCount, FillDir eFillDir = FILL_TO_BOTTOM, FillCmd eFillCmd = FILL_LINEAR, FillDateCmd eFillDateCmd = FILL_DAY, double nStepValue = 1.0, double nMaxValue = 1E307); - String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); + String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); - BOOL GetSelectionFunction( ScSubTotalFunc eFunc, + BOOL GetSelectionFunction( ScSubTotalFunc eFunc, const ScAddress& rCursor, const ScMarkData& rMark, double& rResult ); - SC_DLLPUBLIC const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; - SC_DLLPUBLIC const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; + SC_DLLPUBLIC const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const; - const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); - ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); + const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); + ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, BOOL bDeep = TRUE ); const ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; + SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const; SC_DLLPUBLIC const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator(); - BOOL HasStringWeakCharacters( const String& rString ); - SC_DLLPUBLIC BYTE GetStringScriptType( const String& rString ); - SC_DLLPUBLIC BYTE GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ); - SC_DLLPUBLIC BYTE GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL ); - - BOOL HasDetectiveOperations() const; - void AddDetectiveOperation( const ScDetOpData& rData ); - void ClearDetectiveOperations(); - ScDetOpList* GetDetOpList() const { return pDetOpList; } - void SetDetOpList(ScDetOpList* pNew); - - BOOL HasDetectiveObjects(SCTAB nTab) const; - - void GetSelectionFrame( const ScMarkData& rMark, - SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ); - void ApplySelectionFrame( const ScMarkData& rMark, + BOOL HasStringWeakCharacters( const String& rString ); + SC_DLLPUBLIC BYTE GetStringScriptType( const String& rString ); + SC_DLLPUBLIC BYTE GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ); + SC_DLLPUBLIC BYTE GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell = NULL ); + + BOOL HasDetectiveOperations() const; + void AddDetectiveOperation( const ScDetOpData& rData ); + void ClearDetectiveOperations(); + ScDetOpList* GetDetOpList() const { return pDetOpList; } + void SetDetOpList(ScDetOpList* pNew); + + BOOL HasDetectiveObjects(SCTAB nTab) const; + + void GetSelectionFrame( const ScMarkData& rMark, + SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ); + void ApplySelectionFrame( const ScMarkData& rMark, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ); - void ApplyFrameAreaTab( const ScRange& rRange, + void ApplyFrameAreaTab( const ScRange& rRange, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); - SC_DLLPUBLIC ULONG AddCondFormat( const ScConditionalFormat& rNew ); - SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); - SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab ); - void ConditionalChanged( ULONG nKey ); + SC_DLLPUBLIC ULONG AddCondFormat( const ScConditionalFormat& rNew ); + SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); + SC_DLLPUBLIC void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB nTab ); + void ConditionalChanged( ULONG nKey ); - SC_DLLPUBLIC ULONG AddValidationEntry( const ScValidationData& rNew ); + SC_DLLPUBLIC ULONG AddValidationEntry( const ScValidationData& rNew ); - SC_DLLPUBLIC const ScValidationData* GetValidationEntry( ULONG nIndex ) const; + SC_DLLPUBLIC const ScValidationData* GetValidationEntry( ULONG nIndex ) const; - ScConditionalFormatList* GetCondFormList() const // Ref-Undo + ScConditionalFormatList* GetCondFormList() const // Ref-Undo { return pCondFormList; } - void SetCondFormList(ScConditionalFormatList* pNew); + void SetCondFormList(ScConditionalFormatList* pNew); ScValidationDataList* GetValidationList() const { return pValidationList; } - SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, + SC_DLLPUBLIC void ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ); - SC_DLLPUBLIC void ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, + SC_DLLPUBLIC void ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr ); - SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, const ScPatternAttr& rAttr, ScEditDataArray* pDataArray = NULL ); - SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScPatternAttr& rAttr ); SC_DLLPUBLIC bool SetAttrEntries(SCCOL nCol, SCTAB nTab, ScAttrEntry* pData, SCSIZE nSize); - SC_DLLPUBLIC void ApplyPatternIfNumberformatIncompatible( + SC_DLLPUBLIC void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScMarkData& rMark, const ScPatternAttr& rPattern, short nNewType ); - void ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, + void ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSheet& rStyle); - void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, + void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, const ScStyleSheet& rStyle); - SC_DLLPUBLIC void ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC void ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScStyleSheet& rStyle); - void ApplySelectionStyle( const ScStyleSheet& rStyle, const ScMarkData& rMark ); - void ApplySelectionLineStyle( const ScMarkData& rMark, + void ApplySelectionStyle( const ScStyleSheet& rStyle, const ScMarkData& rMark ); + void ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, BOOL bColorOnly ); - const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark ) const; + const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark ) const; - void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, + void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - SC_DLLPUBLIC BOOL ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC BOOL ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags ); - BOOL RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, + BOOL RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, INT16 nFlags ); - SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr, + SC_DLLPUBLIC void SetPattern( const ScAddress&, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); - SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, + SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); void DeleteNumberFormat( const sal_uInt32* pDelKeys, sal_uInt32 nCount ); - void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, USHORT nFormatNo, const ScMarkData& rMark ); - void GetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void GetAutoFormatData( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData ); - BOOL SearchAndReplace( const SvxSearchItem& rSearchItem, + BOOL SearchAndReplace( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, SCTAB& rTab, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc = NULL ); // Col/Row von Folgeaufrufen bestimmen // (z.B. nicht gefunden von Anfang, oder folgende Tabellen) - static void GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem, + static void GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow ); - BOOL Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, + BOOL Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, SCCOL nVCol, SCROW nVRow, SCTAB nVTab, const String& sValStr, double& nX); - void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, + void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL ); void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); + void DeleteSelectionTab( SCTAB nTab, USHORT nDelFlag, const ScMarkData& rMark ); SC_DLLPUBLIC void SetColWidth( SCCOL nCol, SCTAB nTab, USHORT nNewWidth ); - SC_DLLPUBLIC void SetColWidthOnly( SCCOL nCol, SCTAB nTab, USHORT nNewWidth ); + SC_DLLPUBLIC void SetColWidthOnly( SCCOL nCol, SCTAB nTab, USHORT nNewWidth ); SC_DLLPUBLIC void SetRowHeight( SCROW nRow, SCTAB nTab, USHORT nNewHeight ); SC_DLLPUBLIC void SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nNewHeight ); @@ -1330,17 +1314,17 @@ public: SC_DLLPUBLIC USHORT GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const; SC_DLLPUBLIC USHORT GetOriginalHeight( SCROW nRow, SCTAB nTab ) const; - USHORT GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const; + USHORT GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const; - SCROW GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const; + SCROW GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const; - USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, + USHORT GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bFormula, const ScMarkData* pMarkData = NULL, const ScColWidthParam* pParam = NULL ); - SC_DLLPUBLIC BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra, + SC_DLLPUBLIC BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, USHORT nExtra, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, @@ -1349,21 +1333,21 @@ public: double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, const ScMarkData* pTabMark = NULL ); - long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, + long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bWidth, BOOL bTotalSize = FALSE ); - SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow); - SC_DLLPUBLIC void SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC void SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC void SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow); + SC_DLLPUBLIC void ShowRow(SCROW nRow, SCTAB nTab, BOOL bShow); + SC_DLLPUBLIC void ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, BOOL bShow); + SC_DLLPUBLIC void SetColFlags( SCCOL nCol, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void SetRowFlags( SCROW nRow, SCTAB nTab, BYTE nNewFlags ); + SC_DLLPUBLIC void SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BYTE nNewFlags ); - SC_DLLPUBLIC BYTE GetColFlags( SCCOL nCol, SCTAB nTab ) const; - SC_DLLPUBLIC BYTE GetRowFlags( SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC BYTE GetColFlags( SCCOL nCol, SCTAB nTab ) const; + SC_DLLPUBLIC BYTE GetRowFlags( SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArray( SCTAB nTab ) const; SC_DLLPUBLIC ScBitMaskCompressedArray< SCROW, BYTE> & GetRowFlagsArrayModifiable( SCTAB nTab ); @@ -1399,15 +1383,15 @@ public: SCROW LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab); SCROW CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab); - /** - * Write all column row flags to table's flag data, because not all column - * row attributes are stored in the flag data members. This is necessary - * for ods export. + /** + * Write all column row flags to table's flag data, because not all column + * row attributes are stored in the flag data members. This is necessary + * for ods export. */ void SyncColRowFlags(); /// @return the index of the last row with any set flags (auto-pagebreak is ignored). - SC_DLLPUBLIC SCROW GetLastFlaggedRow( SCTAB nTab ) const; + SC_DLLPUBLIC SCROW GetLastFlaggedRow( SCTAB nTab ) const; /// @return the index of the last changed column (flags and column width, auto pagebreak is ignored). SCCOL GetLastChangedCol( SCTAB nTab ) const; @@ -1424,46 +1408,46 @@ public: // returns whether to export a Default style for this col/row or not // nDefault is setted to one possition in the current row/col where the Default style is - BOOL GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); - BOOL GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); + BOOL GetColDefault( SCTAB nTab, SCCOL nCol, SCROW nLastRow, SCROW& nDefault); + BOOL GetRowDefault( SCTAB nTab, SCROW nRow, SCCOL nLastCol, SCCOL& nDefault); - BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ); - BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow ); + BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ); + BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, BOOL bShow ); - void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); - void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); + void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); + void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ); - SC_DLLPUBLIC ScPatternAttr* GetDefPattern() const; - SC_DLLPUBLIC ScDocumentPool* GetPool(); - SC_DLLPUBLIC ScStyleSheetPool* GetStyleSheetPool() const; + SC_DLLPUBLIC ScPatternAttr* GetDefPattern() const; + SC_DLLPUBLIC ScDocumentPool* GetPool(); + SC_DLLPUBLIC ScStyleSheetPool* GetStyleSheetPool() const; // PageStyle: - SC_DLLPUBLIC const String& GetPageStyle( SCTAB nTab ) const; - SC_DLLPUBLIC void SetPageStyle( SCTAB nTab, const String& rName ); - Size GetPageSize( SCTAB nTab ) const; - void SetPageSize( SCTAB nTab, const Size& rSize ); - void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); + SC_DLLPUBLIC const String& GetPageStyle( SCTAB nTab ) const; + SC_DLLPUBLIC void SetPageStyle( SCTAB nTab, const String& rName ); + Size GetPageSize( SCTAB nTab ) const; + void SetPageSize( SCTAB nTab, const Size& rSize ); + void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); void InvalidatePageBreaks(SCTAB nTab); - void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); - void RemoveManualBreaks( SCTAB nTab ); - BOOL HasManualBreaks( SCTAB nTab ) const; + void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL ); + void RemoveManualBreaks( SCTAB nTab ); + BOOL HasManualBreaks( SCTAB nTab ) const; - BOOL IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL ); - BOOL RemovePageStyleInUse( const String& rStrPageStyle ); - BOOL RenamePageStyleInUse( const String& rOld, const String& rNew ); - void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, - const SfxItemSet& rChanges ); + BOOL IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab = NULL ); + BOOL RemovePageStyleInUse( const String& rStrPageStyle ); + BOOL RenamePageStyleInUse( const String& rOld, const String& rNew ); + void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle, + const SfxItemSet& rChanges ); - void PageStyleModified( SCTAB nTab, const String& rNewName ); + void PageStyleModified( SCTAB nTab, const String& rNewName ); - SC_DLLPUBLIC BOOL NeedPageResetAfterTab( SCTAB nTab ) const; + SC_DLLPUBLIC BOOL NeedPageResetAfterTab( SCTAB nTab ) const; // war vorher im PageStyle untergracht. Jetzt an jeder Tabelle: - SC_DLLPUBLIC BOOL HasPrintRange(); - SC_DLLPUBLIC USHORT GetPrintRangeCount( SCTAB nTab ); - SC_DLLPUBLIC const ScRange* GetPrintRange( SCTAB nTab, USHORT nPos ); - SC_DLLPUBLIC const ScRange* GetRepeatColRange( SCTAB nTab ); - SC_DLLPUBLIC const ScRange* GetRepeatRowRange( SCTAB nTab ); + SC_DLLPUBLIC BOOL HasPrintRange(); + SC_DLLPUBLIC USHORT GetPrintRangeCount( SCTAB nTab ); + SC_DLLPUBLIC const ScRange* GetPrintRange( SCTAB nTab, USHORT nPos ); + SC_DLLPUBLIC const ScRange* GetRepeatColRange( SCTAB nTab ); + SC_DLLPUBLIC const ScRange* GetRepeatRowRange( SCTAB nTab ); /** Returns true, if the specified sheet is always printed. */ BOOL IsPrintEntireSheet( SCTAB nTab ) const; @@ -1473,176 +1457,176 @@ public: SC_DLLPUBLIC void AddPrintRange( SCTAB nTab, const ScRange& rNew ); /** Marks the specified sheet to be printed completely. Deletes old print ranges on the sheet! */ SC_DLLPUBLIC void SetPrintEntireSheet( SCTAB nTab ); - SC_DLLPUBLIC void SetRepeatColRange( SCTAB nTab, const ScRange* pNew ); - SC_DLLPUBLIC void SetRepeatRowRange( SCTAB nTab, const ScRange* pNew ); + SC_DLLPUBLIC void SetRepeatColRange( SCTAB nTab, const ScRange* pNew ); + SC_DLLPUBLIC void SetRepeatRowRange( SCTAB nTab, const ScRange* pNew ); ScPrintRangeSaver* CreatePrintRangeSaver() const; - void RestorePrintRanges( const ScPrintRangeSaver& rSaver ); + void RestorePrintRanges( const ScPrintRangeSaver& rSaver ); - SC_DLLPUBLIC Rectangle GetMMRect( SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC Rectangle GetMMRect( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC ScRange GetRange( SCTAB nTab, const Rectangle& rMMRect ); + SC_DLLPUBLIC ScRange GetRange( SCTAB nTab, const Rectangle& rMMRect ); - void UpdStlShtPtrsFrmNms(); - void StylesToNames(); + void UpdStlShtPtrsFrmNms(); + void StylesToNames(); - SC_DLLPUBLIC void CopyStdStylesFrom( ScDocument* pSrcDoc ); + SC_DLLPUBLIC void CopyStdStylesFrom( ScDocument* pSrcDoc ); - CharSet GetSrcCharSet() const { return eSrcSet; } - ULONG GetSrcVersion() const { return nSrcVer; } - SCROW GetSrcMaxRow() const { return nSrcMaxRow; } + CharSet GetSrcCharSet() const { return eSrcSet; } + ULONG GetSrcVersion() const { return nSrcVer; } + SCROW GetSrcMaxRow() const { return nSrcMaxRow; } - void SetSrcCharSet( CharSet eNew ) { eSrcSet = eNew; } - void UpdateFontCharSet(); + void SetSrcCharSet( CharSet eNew ) { eSrcSet = eNew; } + void UpdateFontCharSet(); void FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, SCTAB nTab, double nScaleX, double nScaleY, BOOL bPageMode, BOOL bFormulaMode, const ScMarkData* pMarkData = NULL ); - SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; + SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; - void Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery ); - SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub ); - BOOL ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL ); - SC_DLLPUBLIC BOOL CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Sort( SCTAB nTab, const ScSortParam& rSortParam, BOOL bKeepQuery ); + SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub ); + BOOL ValidQuery( SCROW nRow, SCTAB nTab, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL ); + SC_DLLPUBLIC BOOL CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam ); - void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); + void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); /** Update the dynamic end row position of a current data area. */ void UpdateDynamicEndRow(ScDBData& rDBData) const; - BOOL GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, + BOOL GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates); - SC_DLLPUBLIC BOOL GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, + SC_DLLPUBLIC BOOL GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, TypedScStrCollection& rStrings, bool& rHasDates ); - BOOL GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, + BOOL GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, BOOL bLimit = FALSE ); - BOOL GetFormulaEntries( TypedScStrCollection& rStrings ); + BOOL GetFormulaEntries( TypedScStrCollection& rStrings ); - BOOL HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); + BOOL HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + SC_DLLPUBLIC BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SC_DLLPUBLIC BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + SC_DLLPUBLIC BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); - SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); - void SetPrinter( SfxPrinter* pNewPrinter ); - VirtualDevice* GetVirtualDevice_100th_mm(); - SC_DLLPUBLIC OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... + SfxPrinter* GetPrinter( BOOL bCreateIfNotExist = TRUE ); + void SetPrinter( SfxPrinter* pNewPrinter ); + VirtualDevice* GetVirtualDevice_100th_mm(); + SC_DLLPUBLIC OutputDevice* GetRefDevice(); // WYSIWYG: Printer, otherwise VirtualDevice... - void EraseNonUsedSharedNames(USHORT nLevel); - BOOL GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, + void EraseNonUsedSharedNames(USHORT nLevel); + BOOL GetNextSpellingCell(SCCOL& nCol, SCROW& nRow, SCTAB nTab, BOOL bInSel, const ScMarkData& rMark) const; - BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, + BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, SCTAB nTab, ScMarkData& rMark, BOOL bIsUndo); - void DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); + void DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); - void InvalidateTextWidth( const String& rStyleName ); - void InvalidateTextWidth( SCTAB nTab ); + void InvalidateTextWidth( const String& rStyleName ); + void InvalidateTextWidth( SCTAB nTab ); void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo, BOOL bNumFormatChanged ); - BOOL IdleCalcTextWidth(); - BOOL IdleCheckLinks(); + BOOL IdleCalcTextWidth(); + BOOL IdleCheckLinks(); - BOOL ContinueOnlineSpelling(); // TRUE = etwas gefunden + BOOL ContinueOnlineSpelling(); // TRUE = etwas gefunden - BOOL IsIdleDisabled() const { return bIdleDisabled; } - void DisableIdle(BOOL bDo) { bIdleDisabled = bDo; } + BOOL IsIdleDisabled() const { return bIdleDisabled; } + void DisableIdle(BOOL bDo) { bIdleDisabled = bDo; } - BOOL IsDetectiveDirty() const { return bDetectiveDirty; } - void SetDetectiveDirty(BOOL bSet) { bDetectiveDirty = bSet; } + BOOL IsDetectiveDirty() const { return bDetectiveDirty; } + void SetDetectiveDirty(BOOL bSet) { bDetectiveDirty = bSet; } - void RemoveAutoSpellObj(); - void SetOnlineSpellPos( const ScAddress& rPos ); - SC_DLLPUBLIC BOOL SetVisibleSpellRange( const ScRange& rRange ); // TRUE = changed + void RemoveAutoSpellObj(); + void SetOnlineSpellPos( const ScAddress& rPos ); + SC_DLLPUBLIC BOOL SetVisibleSpellRange( const ScRange& rRange ); // TRUE = changed - BYTE GetMacroCallMode() const { return nMacroCallMode; } - void SetMacroCallMode(BYTE nNew) { nMacroCallMode = nNew; } + BYTE GetMacroCallMode() const { return nMacroCallMode; } + void SetMacroCallMode(BYTE nNew) { nMacroCallMode = nNew; } - BOOL GetHasMacroFunc() const { return bHasMacroFunc; } - void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; } + BOOL GetHasMacroFunc() const { return bHasMacroFunc; } + void SetHasMacroFunc(BOOL bSet) { bHasMacroFunc = bSet; } - BOOL CheckMacroWarn(); + BOOL CheckMacroWarn(); void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; } sal_Bool HasRangeOverflow() const { return nRangeOverflowType != 0; } SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; } // fuer Broadcasting/Listening - void SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; } - BOOL GetNoSetDirty() const { return bNoSetDirty; } - void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } - BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } + void SetNoSetDirty( BOOL bVal ) { bNoSetDirty = bVal; } + BOOL GetNoSetDirty() const { return bNoSetDirty; } + void SetInsertingFromOtherDoc( BOOL bVal ) { bInsertingFromOtherDoc = bVal; } + BOOL IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; } bool IsLoadingMedium() const; void SetLoadingMedium( bool bVal ); void SetImportingXML( bool bVal ); bool IsImportingXML() const { return bImportingXML; } - void SetXMLFromWrapper( BOOL bVal ); - BOOL IsXMLFromWrapper() const { return bXMLFromWrapper; } - void SetCalcingAfterLoad( BOOL bVal ) { bCalcingAfterLoad = bVal; } - BOOL IsCalcingAfterLoad() const { return bCalcingAfterLoad; } - void SetNoListening( BOOL bVal ) { bNoListening = bVal; } - BOOL GetNoListening() const { return bNoListening; } - ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } + void SetXMLFromWrapper( BOOL bVal ); + BOOL IsXMLFromWrapper() const { return bXMLFromWrapper; } + void SetCalcingAfterLoad( BOOL bVal ) { bCalcingAfterLoad = bVal; } + BOOL IsCalcingAfterLoad() const { return bCalcingAfterLoad; } + void SetNoListening( BOOL bVal ) { bNoListening = bVal; } + BOOL GetNoListening() const { return bNoListening; } + ScBroadcastAreaSlotMachine* GetBASM() const { return pBASM; } ScChartListenerCollection* GetChartListenerCollection() const { return pChartListenerCollection; } - void SetChartListenerCollection( ScChartListenerCollection*, + void SetChartListenerCollection( ScChartListenerCollection*, BOOL bSetChartRangeLists = FALSE ); - void UpdateChart( const String& rName ); + void UpdateChart( const String& rName ); void RestoreChartListener( const String& rName ); - SC_DLLPUBLIC void UpdateChartListenerCollection(); - BOOL IsChartListenerCollectionNeedsUpdate() const + SC_DLLPUBLIC void UpdateChartListenerCollection(); + BOOL IsChartListenerCollectionNeedsUpdate() const { return bChartListenerCollectionNeedsUpdate; } - void SetChartListenerCollectionNeedsUpdate( BOOL bFlg ) + void SetChartListenerCollectionNeedsUpdate( BOOL bFlg ) { bChartListenerCollectionNeedsUpdate = bFlg; } - void AddOLEObjectToCollection(const String& rName); + void AddOLEObjectToCollection(const String& rName); - ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } - SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); + ScChangeViewSettings* GetChangeViewSettings() const { return pChangeViewSettings; } + SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharacters(); - void SetForbiddenCharacters( const rtl::Reference<SvxForbiddenCharactersTable> xNew ); + void SetForbiddenCharacters( const rtl::Reference<SvxForbiddenCharactersTable> xNew ); - BYTE GetAsianCompression() const; // CharacterCompressionType values - BOOL IsValidAsianCompression() const; - void SetAsianCompression(BYTE nNew); + BYTE GetAsianCompression() const; // CharacterCompressionType values + BOOL IsValidAsianCompression() const; + void SetAsianCompression(BYTE nNew); - BOOL GetAsianKerning() const; - BOOL IsValidAsianKerning() const; - void SetAsianKerning(BOOL bNew); + BOOL GetAsianKerning() const; + BOOL IsValidAsianKerning() const; + void SetAsianKerning(BOOL bNew); - BYTE GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values + BYTE GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values - SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;} - void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} + SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;} + void SetLinkMode( ScLkUpdMode nSet ) { eLinkMode = nSet;} SC_DLLPUBLIC ScMacroManager* GetMacroManager(); private: ScDocument(const ScDocument& r); // disabled with no definition - void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, + void FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ) const; - USHORT RowDifferences( SCROW nThisRow, SCTAB nThisTab, + USHORT RowDifferences( SCROW nThisRow, SCTAB nThisTab, ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab, SCCOL nMaxCol, SCCOLROW* pOtherCols ); - USHORT ColDifferences( SCCOL nThisCol, SCTAB nThisTab, + USHORT ColDifferences( SCCOL nThisCol, SCTAB nThisTab, ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab, SCROW nMaxRow, SCCOLROW* pOtherRows ); - void FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow, + void FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW nOtherEndRow, BOOL bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab, SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, ULONG nProAdd ); - BOOL OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, + BOOL OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, USHORT nMaxTest ); DECL_LINK( TrackTimeHdl, Timer* ); @@ -1650,9 +1634,9 @@ private: static ScRecursionHelper* CreateRecursionHelperInstance(); public: - void StartListeningArea( const ScRange& rRange, + void StartListeningArea( const ScRange& rRange, SvtListener* pListener ); - void EndListeningArea( const ScRange& rRange, + void EndListeningArea( const ScRange& rRange, SvtListener* pListener ); /** Broadcast wrapper, calls SC_DLLPUBLIC rHint.GetCell()->Broadcast() and AreaBroadcast() @@ -1662,73 +1646,73 @@ public: */ void Broadcast( const ScHint& rHint ); /// deprecated - void Broadcast( ULONG nHint, const ScAddress& rAddr, + void Broadcast( ULONG nHint, const ScAddress& rAddr, ScBaseCell* pCell ); /// only area, no cell broadcast void AreaBroadcast( const ScHint& rHint ); /// only areas in range, no cell broadcasts void AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ); - void DelBroadcastAreasInRange( const ScRange& rRange ); - void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, + void DelBroadcastAreasInRange( const ScRange& rRange ); + void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void StartListeningCell( const ScAddress& rAddress, + void StartListeningCell( const ScAddress& rAddress, SvtListener* pListener ); - void EndListeningCell( const ScAddress& rAddress, + void EndListeningCell( const ScAddress& rAddress, SvtListener* pListener ); - void PutInFormulaTree( ScFormulaCell* pCell ); - void RemoveFromFormulaTree( ScFormulaCell* pCell ); - void CalcFormulaTree( BOOL bOnlyForced = FALSE, + void PutInFormulaTree( ScFormulaCell* pCell ); + void RemoveFromFormulaTree( ScFormulaCell* pCell ); + void CalcFormulaTree( BOOL bOnlyForced = FALSE, BOOL bNoProgressBar = FALSE ); - void ClearFormulaTree(); - void AppendToFormulaTrack( ScFormulaCell* pCell ); - void RemoveFromFormulaTrack( ScFormulaCell* pCell ); - void TrackFormulas( ULONG nHintId = SC_HINT_DATACHANGED ); - USHORT GetFormulaTrackCount() const { return nFormulaTrackCount; } - BOOL IsInFormulaTree( ScFormulaCell* pCell ) const; - BOOL IsInFormulaTrack( ScFormulaCell* pCell ) const; - USHORT GetHardRecalcState() { return nHardRecalcState; } - void SetHardRecalcState( USHORT nVal ) { nHardRecalcState = nVal; } - void StartAllListeners(); - const ScFormulaCell* GetFormulaTree() const { return pFormulaTree; } - BOOL HasForcedFormulas() const { return bHasForcedFormulas; } - void SetForcedFormulas( BOOL bVal ) { bHasForcedFormulas = bVal; } - ULONG GetFormulaCodeInTree() const { return nFormulaCodeInTree; } - BOOL IsInInterpreter() const { return nInterpretLevel != 0; } - USHORT GetInterpretLevel() { return nInterpretLevel; } - void IncInterpretLevel() + void ClearFormulaTree(); + void AppendToFormulaTrack( ScFormulaCell* pCell ); + void RemoveFromFormulaTrack( ScFormulaCell* pCell ); + void TrackFormulas( ULONG nHintId = SC_HINT_DATACHANGED ); + USHORT GetFormulaTrackCount() const { return nFormulaTrackCount; } + BOOL IsInFormulaTree( ScFormulaCell* pCell ) const; + BOOL IsInFormulaTrack( ScFormulaCell* pCell ) const; + USHORT GetHardRecalcState() { return nHardRecalcState; } + void SetHardRecalcState( USHORT nVal ) { nHardRecalcState = nVal; } + void StartAllListeners(); + const ScFormulaCell* GetFormulaTree() const { return pFormulaTree; } + BOOL HasForcedFormulas() const { return bHasForcedFormulas; } + void SetForcedFormulas( BOOL bVal ) { bHasForcedFormulas = bVal; } + ULONG GetFormulaCodeInTree() const { return nFormulaCodeInTree; } + BOOL IsInInterpreter() const { return nInterpretLevel != 0; } + USHORT GetInterpretLevel() { return nInterpretLevel; } + void IncInterpretLevel() { if ( nInterpretLevel < USHRT_MAX ) nInterpretLevel++; } - void DecInterpretLevel() + void DecInterpretLevel() { if ( nInterpretLevel ) nInterpretLevel--; } - BOOL IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } - USHORT GetMacroInterpretLevel() { return nMacroInterpretLevel; } - void IncMacroInterpretLevel() + BOOL IsInMacroInterpreter() const { return nMacroInterpretLevel != 0; } + USHORT GetMacroInterpretLevel() { return nMacroInterpretLevel; } + void IncMacroInterpretLevel() { if ( nMacroInterpretLevel < USHRT_MAX ) nMacroInterpretLevel++; } - void DecMacroInterpretLevel() + void DecMacroInterpretLevel() { if ( nMacroInterpretLevel ) nMacroInterpretLevel--; } - BOOL IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } - USHORT GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } - void IncInterpreterTableOpLevel() + BOOL IsInInterpreterTableOp() const { return nInterpreterTableOpLevel != 0; } + USHORT GetInterpreterTableOpLevel() { return nInterpreterTableOpLevel; } + void IncInterpreterTableOpLevel() { if ( nInterpreterTableOpLevel < USHRT_MAX ) nInterpreterTableOpLevel++; } - void DecInterpreterTableOpLevel() + void DecInterpreterTableOpLevel() { if ( nInterpreterTableOpLevel ) nInterpreterTableOpLevel--; @@ -1742,12 +1726,12 @@ public: pRecursionHelper = CreateRecursionHelperInstance(); return *pRecursionHelper; } - BOOL IsInDtorClear() const { return bInDtorClear; } - void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } - BOOL IsExpandRefs() { return bExpandRefs; } + BOOL IsInDtorClear() const { return bInDtorClear; } + void SetExpandRefs( BOOL bVal ) { bExpandRefs = bVal; } + BOOL IsExpandRefs() { return bExpandRefs; } - SC_DLLPUBLIC void IncSizeRecalcLevel( SCTAB nTab ); - SC_DLLPUBLIC void DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos = true ); + SC_DLLPUBLIC void IncSizeRecalcLevel( SCTAB nTab ); + SC_DLLPUBLIC void DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos = true ); ULONG GetXMLImportedFormulaCount() const { return nXMLImportedFormulaCount; } void IncXMLImportedFormulaCount( ULONG nVal ) @@ -1763,12 +1747,12 @@ public: nXMLImportedFormulaCount = 0; } - void StartTrackTimer(); + void StartTrackTimer(); - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); /** Maximum string length of a column, e.g. for dBase export. @return String length in octets (!) of the destination encoding. In @@ -1784,35 +1768,35 @@ public: SCTAB nTab, SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const; - void KeyInput( const KeyEvent& rKEvt ); // TimerDelays etc. + void KeyInput( const KeyEvent& rKEvt ); // TimerDelays etc. - ScChangeTrack* GetChangeTrack() const { return pChangeTrack; } + ScChangeTrack* GetChangeTrack() const { return pChangeTrack; } //! only for import filter, deletes any existing ChangeTrack via //! EndChangeTracking() and takes ownership of new ChangeTrack pTrack - SC_DLLPUBLIC void SetChangeTrack( ScChangeTrack* pTrack ); + SC_DLLPUBLIC void SetChangeTrack( ScChangeTrack* pTrack ); - void StartChangeTracking(); - void EndChangeTracking(); + void StartChangeTracking(); + void EndChangeTracking(); - SC_DLLPUBLIC void CompareDocument( ScDocument& rOtherDoc ); + SC_DLLPUBLIC void CompareDocument( ScDocument& rOtherDoc ); - void AddUnoObject( SfxListener& rObject ); - void RemoveUnoObject( SfxListener& rObject ); - void BroadcastUno( const SfxHint &rHint ); - void AddUnoListenerCall( const ::com::sun::star::uno::Reference< + void AddUnoObject( SfxListener& rObject ); + void RemoveUnoObject( SfxListener& rObject ); + void BroadcastUno( const SfxHint &rHint ); + void AddUnoListenerCall( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& rListener, const ::com::sun::star::lang::EventObject& rEvent ); - void SetInLinkUpdate(BOOL bSet); // TableLink or AreaLink - BOOL IsInLinkUpdate() const; // including DdeLink + void SetInLinkUpdate(BOOL bSet); // TableLink or AreaLink + BOOL IsInLinkUpdate() const; // including DdeLink - SC_DLLPUBLIC SfxItemPool* GetEditPool() const; - SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; - SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); - SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); + SC_DLLPUBLIC SfxItemPool* GetEditPool() const; + SC_DLLPUBLIC SfxItemPool* GetEnginePool() const; + SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine(); + SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine(); - ScRefreshTimerControl* GetRefreshTimerControl() const + ScRefreshTimerControl* GetRefreshTimerControl() const { return pRefreshTimerControl; } ScRefreshTimerControl * const * GetRefreshTimerControlAddress() const { return &pRefreshTimerControl; } @@ -1850,9 +1834,9 @@ public: private: // CLOOK-Impl-Methoden - /** - * Use this class as a locale variable to merge number formatter from - * another document, and set NULL pointer to pFormatExchangeList when + /** + * Use this class as a locale variable to merge number formatter from + * another document, and set NULL pointer to pFormatExchangeList when * done. */ class NumFmtMergeHandler @@ -1867,25 +1851,25 @@ private: // CLOOK-Impl-Methoden void MergeNumberFormatter(ScDocument* pSrcDoc); - void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen? - void ImplDeleteOptions(); + void ImplCreateOptions(); // bei Gelegenheit auf on-demand umstellen? + void ImplDeleteOptions(); - void DeleteDrawLayer(); - void DeleteColorTable(); - SC_DLLPUBLIC BOOL DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; - void DrawMovePage( USHORT nOldPos, USHORT nNewPos ); - void DrawCopyPage( USHORT nOldPos, USHORT nNewPos ); + void DeleteDrawLayer(); + void DeleteColorTable(); + SC_DLLPUBLIC BOOL DrawGetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; + void DrawMovePage( USHORT nOldPos, USHORT nNewPos ); + void DrawCopyPage( USHORT nOldPos, USHORT nNewPos ); - void UpdateDrawPrinter(); - void UpdateDrawLanguages(); + void UpdateDrawPrinter(); + void UpdateDrawLanguages(); void UpdateDrawDefaults(); - SC_DLLPUBLIC void InitClipPtrs( ScDocument* pSourceDoc ); + SC_DLLPUBLIC void InitClipPtrs( ScDocument* pSourceDoc ); - void LoadDdeLinks(SvStream& rStream); - void SaveDdeLinks(SvStream& rStream) const; + void LoadDdeLinks(SvStream& rStream); + void SaveDdeLinks(SvStream& rStream) const; void DeleteAreaLinksOnTab( SCTAB nTab ); - void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, + void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks, bool bAllTabs); @@ -1895,7 +1879,7 @@ private: // CLOOK-Impl-Methoden ScClipRangeNameData& rRangeNames, const ScRangeList& rDestRanges, const ScMarkData& rMark, SCCOL nXw, SCROW nYw); - BOOL HasPartOfMerged( const ScRange& rRange ); + BOOL HasPartOfMerged( const ScRange& rRange ); std::map< SCTAB, ScSortParam > mSheetSortParams; diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 421c40a53256..eb2a81240f37 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,14 +89,14 @@ class SC_DLLPUBLIC ScModelObj : public SfxBaseModel, public com::sun::star::view::XRenderable, public com::sun::star::document::XLinkTargetSupplier, public com::sun::star::beans::XPropertySet, - public SvxFmMSFactory, // derived from XMultiServiceFactory + public SvxFmMSFactory, // derived from XMultiServiceFactory public com::sun::star::lang::XServiceInfo, public ::com::sun::star::util::XChangesNotifier { private: - SfxItemPropertySet aPropSet; - ScDocShell* pDocShell; - ScPrintFuncCache* pPrintFuncCache; + SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + ScPrintFuncCache* pPrintFuncCache; ScPrintUIOptions* pPrinterOptions; com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> xNumberAgg; com::sun::star::uno::Reference<com::sun::star::uno::XInterface> xDrawGradTab; @@ -109,24 +109,24 @@ private: ::cppu::OInterfaceContainerHelper maChangesListeners; - BOOL FillRenderMarkData( const com::sun::star::uno::Any& aSelection, + BOOL FillRenderMarkData( const com::sun::star::uno::Any& aSelection, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptions, ScMarkData& rMark, ScPrintSelectionStatus& rStatus, String& rPagesStr ) const; com::sun::star::uno::Reference<com::sun::star::uno::XAggregation> GetFormatter(); void HandleCalculateEvents(); - rtl::OUString maBuildId; + rtl::OUString maBuildId; protected: const SfxItemPropertySet& GetPropertySet() const { return aPropSet; } public: ScModelObj(ScDocShell* pDocSh); - virtual ~ScModelObj(); + virtual ~ScModelObj(); - // create ScModelObj and set at pDocSh (SetBaseModel) - static void CreateAndSet(ScDocShell* pDocSh); + // create ScModelObj and set at pDocSh (SetBaseModel) + static void CreateAndSet(ScDocShell* pDocSh); - ScDocument* GetDocument() const; + ScDocument* GetDocument() const; SfxObjectShell* GetEmbeddedObject() const; void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL ); @@ -144,12 +144,12 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); -//? virtual UString getClassName(void); +//? virtual UString getClassName(void); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSpreadsheetDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheets > SAL_CALL @@ -171,7 +171,7 @@ public: ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, + virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, @@ -183,9 +183,9 @@ public: // XActionLockable virtual sal_Bool SAL_CALL isActionLocked() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) + virtual void SAL_CALL addActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeActionLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException); @@ -193,35 +193,35 @@ public: virtual void SAL_CALL unlockControllers() throw (::com::sun::star::uno::RuntimeException); // XCalculatable - virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL calculate() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL calculateAll() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutomaticCalculationEnabled() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) + virtual void SAL_CALL enableAutomaticCalculation( sal_Bool bEnabled ) throw(::com::sun::star::uno::RuntimeException); // XProtectable - virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL protect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) + virtual void SAL_CALL unprotect( const ::rtl::OUString& aPassword ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isProtected() throw(::com::sun::star::uno::RuntimeException); - // XDrawPagesSupplier + // XDrawPagesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages() throw(::com::sun::star::uno::RuntimeException); - //! XPrintable?? + //! XPrintable?? - // XGoalSeek + // XGoalSeek virtual ::com::sun::star::sheet::GoalResult SAL_CALL seekGoal( const ::com::sun::star::table::CellAddress& aFormulaPosition, const ::com::sun::star::table::CellAddress& aVariablePosition, const ::rtl::OUString& aGoalValue ) throw(::com::sun::star::uno::RuntimeException); - // XConsolidatable + // XConsolidatable virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XConsolidationDescriptor > SAL_CALL createConsolidationDescriptor( sal_Bool bEmpty ) throw(::com::sun::star::uno::RuntimeException); @@ -229,8 +229,8 @@ public: ::com::sun::star::sheet::XConsolidationDescriptor >& xDescriptor ) throw(::com::sun::star::uno::RuntimeException); - // XDocumentAuditing - virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException); + // XDocumentAuditing + virtual void SAL_CALL refreshArrows() throw(::com::sun::star::uno::RuntimeException); // XViewDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getViewData( ) @@ -240,7 +240,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -252,25 +252,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -330,22 +330,22 @@ class ScDrawPagesObj : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > GetObjectByIndex_Impl(INT32 nIndex) const; public: ScDrawPagesObj(ScDocShell* pDocSh); - virtual ~ScDrawPagesObj(); + virtual ~ScDrawPagesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XDrawPages virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException); @@ -380,23 +380,23 @@ class ScTableSheetsObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; - ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; public: ScTableSheetsObj(ScDocShell* pDocSh); - virtual ~ScTableSheetsObj(); + virtual ~ScTableSheetsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSpreadsheets - virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, sal_Int16 nPosition ) + virtual void SAL_CALL insertNewByName( const ::rtl::OUString& aName, sal_Int16 nPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveByName( const ::rtl::OUString& aName, sal_Int16 nDestination ) + virtual void SAL_CALL moveByName( const ::rtl::OUString& aName, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL copyByName( const ::rtl::OUString& aName, + virtual void SAL_CALL copyByName( const ::rtl::OUString& aName, const ::rtl::OUString& aCopy, sal_Int16 nDestination ) throw(::com::sun::star::uno::RuntimeException); @@ -415,19 +415,19 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -479,25 +479,25 @@ class ScTableColumnsObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; - SCCOL nStartCol; - SCCOL nEndCol; + ScDocShell* pDocShell; + SCTAB nTab; + SCCOL nStartCol; + SCCOL nEndCol; - ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; - ScTableColumnObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; + ScTableColumnObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + ScTableColumnObj* GetObjectByName_Impl(const ::rtl::OUString& aName) const; public: ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC); - virtual ~ScTableColumnsObj(); + virtual ~ScTableColumnsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableColumns - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -530,7 +530,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -542,25 +542,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -585,24 +585,24 @@ class ScTableRowsObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; - SCROW nStartRow; - SCROW nEndRow; + ScDocShell* pDocShell; + SCTAB nTab; + SCROW nStartRow; + SCROW nEndRow; - ScTableRowObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + ScTableRowObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; public: ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER); - virtual ~ScTableRowsObj(); + virtual ~ScTableRowsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XTableRows - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -625,7 +625,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -637,25 +637,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -678,18 +678,18 @@ class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; public: - virtual ~ScSpreadsheetSettingsObj(); + virtual ~ScSpreadsheetSettingsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -701,25 +701,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -743,23 +743,23 @@ class ScAnnotationsObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; // Collection haengt am Sheet + ScDocShell* pDocShell; + SCTAB nTab; // Collection haengt am Sheet - bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const; - ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; + bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const; + ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; public: ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScAnnotationsObj(); + virtual ~ScAnnotationsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XSheetAnnotations - virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, + virtual void SAL_CALL insertNew( const ::com::sun::star::table::CellAddress& aPosition, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -796,26 +796,26 @@ class ScScenariosObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SCTAB nTab; + ScDocShell* pDocShell; + SCTAB nTab; - BOOL GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); - ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); - ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + BOOL GetScenarioIndex_Impl( const ::rtl::OUString& rName, SCTAB& rIndex ); + ScTableSheetObj* GetObjectByIndex_Impl(sal_Int32 nIndex); + ScTableSheetObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScScenariosObj(ScDocShell* pDocSh, SCTAB nT); - virtual ~ScScenariosObj(); + virtual ~ScScenariosObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XScenarios - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& aRanges, const ::rtl::OUString& aComment ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx index 98ead38d114d..5e7312cf2692 100644 --- a/sc/inc/dpcachetable.hxx +++ b/sc/inc/dpcachetable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -169,7 +169,7 @@ public: ScDPTableDataCache* GetCache() const; /** Fill the internal table from the cell range provided. This function assumes that the first row is the column header. */ - void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, + void fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, bool bIgnoreEmptyRows, bool bRepeatIfEmpty ); /** Fill the internal table from database connection object. This function assumes that the first row is the column header. */ @@ -189,7 +189,7 @@ public: that the data grid doesn't include the header row. Don't delete the returned object! */ const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; - void getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; + void getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const; String getFieldName( SCCOL nIndex) const; //End Comments @@ -220,7 +220,7 @@ private: ScDPCacheTable(); ScDPCacheTable(const ScDPCacheTable&); - /** + /** * Check if a given row meets all specified criteria. * * @param nRow index of row to be tested. diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index 382c72b7a189..77efa00d3af5 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx index 73da14d17642..b714f1f47eaf 100644 --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -31,7 +31,7 @@ ************************************************************************/ // Wang Xu Ming - DataPilot migration // Buffer&&Performance -// +// #ifndef _SC_DPGLOBAL_HXX #define _SC_DPGLOBAL_HXX @@ -65,38 +65,38 @@ #define MAX_PAGEFIELDS 10 // maximum count of fields for page area -#define PIVOT_MAXFUNC 11 -#define PIVOT_FUNC_NONE 0x0000 -#define PIVOT_FUNC_SUM 0x0001 -#define PIVOT_FUNC_COUNT 0x0002 -#define PIVOT_FUNC_AVERAGE 0x0004 -#define PIVOT_FUNC_MAX 0x0008 -#define PIVOT_FUNC_MIN 0x0010 -#define PIVOT_FUNC_PRODUCT 0x0020 -#define PIVOT_FUNC_COUNT_NUM 0x0040 -#define PIVOT_FUNC_STD_DEV 0x0080 -#define PIVOT_FUNC_STD_DEVP 0x0100 -#define PIVOT_FUNC_STD_VAR 0x0200 -#define PIVOT_FUNC_STD_VARP 0x0400 -#define PIVOT_FUNC_AUTO 0x1000 - -#define DATA_RENAME_SEPARATOR "_" +#define PIVOT_MAXFUNC 11 +#define PIVOT_FUNC_NONE 0x0000 +#define PIVOT_FUNC_SUM 0x0001 +#define PIVOT_FUNC_COUNT 0x0002 +#define PIVOT_FUNC_AVERAGE 0x0004 +#define PIVOT_FUNC_MAX 0x0008 +#define PIVOT_FUNC_MIN 0x0010 +#define PIVOT_FUNC_PRODUCT 0x0020 +#define PIVOT_FUNC_COUNT_NUM 0x0040 +#define PIVOT_FUNC_STD_DEV 0x0080 +#define PIVOT_FUNC_STD_DEVP 0x0100 +#define PIVOT_FUNC_STD_VAR 0x0200 +#define PIVOT_FUNC_STD_VARP 0x0400 +#define PIVOT_FUNC_AUTO 0x1000 + +#define DATA_RENAME_SEPARATOR "_" #define __MAX_NUM_LEN 64 -#define __DECIMALPLACE 18 - -#define DP_PROP_COLUMNGRAND "ColumnGrand" -#define DP_PROP_FUNCTION "Function" -#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" -#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" -#define DP_PROP_ISVISIBLE "IsVisible" -#define DP_PROP_ORIENTATION "Orientation" -#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" -#define DP_PROP_ROWGRAND "RowGrand" -#define DP_PROP_SHOWDETAILS "ShowDetails" -#define DP_PROP_SHOWEMPTY "ShowEmpty" -#define DP_PROP_SUBTOTALS "SubTotals" -#define DP_PROP_USEDHIERARCHY "UsedHierarchy" -#define DP_PROP_FILTER "Filter" +#define __DECIMALPLACE 18 + +#define DP_PROP_COLUMNGRAND "ColumnGrand" +#define DP_PROP_FUNCTION "Function" +#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" +#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" +#define DP_PROP_ISVISIBLE "IsVisible" +#define DP_PROP_ORIENTATION "Orientation" +#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" +#define DP_PROP_ROWGRAND "RowGrand" +#define DP_PROP_SHOWDETAILS "ShowDetails" +#define DP_PROP_SHOWEMPTY "ShowEmpty" +#define DP_PROP_SUBTOTALS "SubTotals" +#define DP_PROP_USEDHIERARCHY "UsedHierarchy" +#define DP_PROP_FILTER "Filter" #define DP_PROP_POSITION "Position" #define DBG_TRACESTR( x ) \ @@ -115,53 +115,53 @@ public: private: union { - ULONG nNumFormat; + ULONG nNumFormat; sal_Int32 mnDatePart; }; - String aString; - double fValue; - BYTE mbFlag; - //BOOL bHasValue: 1 ; - //BOOL bHasData: 1; - //BOOL bErr: 1; + String aString; + double fValue; + BYTE mbFlag; + //BOOL bHasValue: 1 ; + //BOOL bHasData: 1; + //BOOL bErr: 1; friend class ScDPTableDataCache; public: ScDPItemData() : nNumFormat( 0 ), fValue(0.0), mbFlag( 0 ){} ScDPItemData( ULONG nNF, const String & rS, double fV, BYTE bF ):nNumFormat(nNF), aString(rS), fValue(fV), mbFlag( bF ){} - ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ; + ScDPItemData( const String& rS, double fV = 0.0, BOOL bHV = FALSE, const ULONG nNumFormat = 0 , BOOL bData = TRUE) ; ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab ); - void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } -// void SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;} - BOOL IsCaseInsEqual( const ScDPItemData& r ) const; - - size_t Hash() const; + void SetString( const String& rS ) { aString = rS; mbFlag &= ~(MK_VAL|MK_DATE); nNumFormat = 0; mbFlag |= MK_DATA; } +// void SetValue ( double value , ULONG nNumFormat = 0 ) { bHasValue = TRUE; nNumFormat = 0;bHasData = TRUE; bDate = FALSE; fValue = value ;} + BOOL IsCaseInsEqual( const ScDPItemData& r ) const; + size_t Hash() const; + // exact equality - BOOL operator==( const ScDPItemData& r ) const; + BOOL operator==( const ScDPItemData& r ) const; // case insensitive equality - static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); + static sal_Int32 Compare( const ScDPItemData& rA, const ScDPItemData& rB ); #ifdef DEBUG - void dump() const; + void dump() const; #endif public: BOOL IsHasData() const ; BOOL IsHasErr() const ; BOOL IsValue() const; - String GetString() const ; - double GetValue() const ; + String GetString() const ; + double GetValue() const ; ULONG GetNumFormat() const ; BOOL HasStringData() const ; BOOL IsDate() const; BOOL HasDatePart() const; void SetDate( BOOL b ) ; - + TypedStrData* CreateTypeString( ); - sal_uInt8 GetType() const; + sal_uInt8 GetType() const; BYTE & GetFlag() throw() { return mbFlag; } const BYTE & GetFlag() const throw() { return const_cast<ScDPItemData*>(this)->GetFlag(); } }; @@ -172,7 +172,7 @@ public: // construct ScDPItemDataPool(void); ScDPItemDataPool(const ScDPItemDataPool& r); - + virtual ~ScDPItemDataPool(void); virtual const ScDPItemData* getData( sal_Int32 nId ); virtual sal_Int32 getDataId( const ScDPItemData& aData ); @@ -195,18 +195,18 @@ class ScTabViewShell; namespace ScDPGlobal { // used for core data - String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue ); + String GetFieldFuncString( const String& rSourceName, USHORT &rFuncMask, BOOL bIsValue ); String GetFuncString( const String &rString, const USHORT nIndex ); com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> DP_GetMembers( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>&rSrc, long nField ); // common operation String operator + ( const String & rL, const String &rR ); Rectangle operator *( const Rectangle &rLeft, const std::pair<double,double> & rRight ); -// used for DataPilot Panel +// used for DataPilot Panel ScDPInfoWnd* GetDPInfoWnd( ScTabViewShell *pViewShell ); bool ChkDPTableOverlap( ScDocument *pDestDoc, std::list<ScDPObject> & rClipboard, SCCOL nClipStartCol, SCROW nClipStartRow, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, USHORT nEndTab, BOOL bExcludeClip = FALSE ); } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index a47b78719531..e59f86920f3f 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ public: // Wang Xu Ming -- 2009-9-8 // DataPilot Migration - Cache&&Performance - void FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCache* pCahe , std::vector< SCROW >& rEntries, + void FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCache* pCahe , std::vector< SCROW >& rEntries, const std::vector< SCROW >& rOriginal ) const; // End Comments }; @@ -124,7 +124,7 @@ public: ScDPGroupDimension( const ScDPGroupDimension& rOther ); ~ScDPGroupDimension(); - ScDPGroupDimension& operator=( const ScDPGroupDimension& rOther ); + ScDPGroupDimension& operator=( const ScDPGroupDimension& rOther ); void AddItem( const ScDPGroupItem& rItem ); void SetGroupDim( long nDim ); // called from AddGroupDimension @@ -171,14 +171,14 @@ public: ScDPNumGroupDimension( const ScDPNumGroupDimension& rOther ); ~ScDPNumGroupDimension(); - ScDPNumGroupDimension& operator=( const ScDPNumGroupDimension& rOther ); + ScDPNumGroupDimension& operator=( const ScDPNumGroupDimension& rOther ); const ScDPNumGroupInfo& GetInfo() const { return aGroupInfo; } bool HasNonInteger() const { return bHasNonInteger; } sal_Unicode GetDecSeparator() const { return cDecSeparator; } const ScDPDateGroupHelper* GetDateHelper() const { return pDateHelper; } - + const std::vector< SCROW >& GetNumEntries( SCCOL nSourceDim, ScDPTableDataCache* pCache, const std::vector< SCROW >& rOriginal ) const; @@ -205,8 +205,8 @@ class ScDPGroupTableData : public ScDPTableData // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void FillGroupValues( SCROW* pItemDataIndex, long nCount, const long* pDims ); - virtual long GetSourceDim( long nDim ); + void FillGroupValues( SCROW* pItemDataIndex, long nCount, const long* pDims ); + virtual long GetSourceDim( long nDim ); // End Comments bool IsNumGroupDimension( long nDimension ) const; @@ -229,7 +229,7 @@ public: virtual long GetColumnCount(); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - virtual long GetMembersCount( long nDim ); + virtual long GetMembersCount( long nDim ); virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ; virtual const ScDPItemData* GetMemberById( long nDim, long nId); virtual long Compare( long nDim, long nDataId1, long nDataId2); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 8fa972f1f01e..13a975d36dfd 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,18 +69,18 @@ class ScDPTableData; struct ScDPServiceDesc { - String aServiceName; - String aParSource; - String aParName; - String aParUser; - String aParPass; + String aServiceName; + String aParSource; + String aParName; + String aParUser; + String aParPass; ScDPServiceDesc( const String& rServ, const String& rSrc, const String& rNam, const String& rUser, const String& rPass ) : aServiceName( rServ ), aParSource( rSrc ), aParName( rNam ), - aParUser( rUser ), aParPass( rPass ) { } + aParUser( rUser ), aParPass( rPass ) { } - BOOL operator== ( const ScDPServiceDesc& rOther ) const + BOOL operator== ( const ScDPServiceDesc& rOther ) const { return aServiceName == rOther.aServiceName && aParSource == rOther.aParSource && aParName == rOther.aParName && @@ -92,32 +92,32 @@ struct ScDPServiceDesc class SC_DLLPUBLIC ScDPObject : public ScDataObject { private: - ScDocument* pDoc; + ScDocument* pDoc; // settings - ScDPSaveData* pSaveData; - String aTableName; - String aTableTag; - ScRange aOutRange; - ScSheetSourceDesc* pSheetDesc; // for sheet data - ScImportSourceDesc* pImpDesc; // for database data - ScDPServiceDesc* pServDesc; // for external service + ScDPSaveData* pSaveData; + String aTableName; + String aTableTag; + ScRange aOutRange; + ScSheetSourceDesc* pSheetDesc; // for sheet data + ScImportSourceDesc* pImpDesc; // for database data + ScDPServiceDesc* pServDesc; // for external service ::boost::shared_ptr<ScDPTableData> mpTableData; // cached data com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource; - ScDPOutput* pOutput; - BOOL bSettingsChanged; - BOOL bAlive; // FALSE if only used to hold settings + ScDPOutput* pOutput; + BOOL bSettingsChanged; + BOOL bAlive; // FALSE if only used to hold settings sal_uInt16 mnAutoFormatIndex; - BOOL bAllowMove; - long nHeaderRows; // page fields plus filter button + BOOL bAllowMove; + long nHeaderRows; // page fields plus filter button bool mbHeaderLayout; // TRUE : grid, FALSE : standard SC_DLLPRIVATE ScDPTableData* GetTableData(); - SC_DLLPRIVATE void CreateObjects(); - SC_DLLPRIVATE void CreateOutput(); - BOOL bRefresh; - long mnCacheId; + SC_DLLPRIVATE void CreateObjects(); + SC_DLLPRIVATE void CreateOutput(); + BOOL bRefresh; + long mnCacheId; public: // Wang Xu Ming -- 2009-8-17 @@ -130,56 +130,56 @@ public: // End Comments ScDPObject( ScDocument* pD ); ScDPObject(const ScDPObject& r); - virtual ~ScDPObject(); + virtual ~ScDPObject(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - void SetAlive(BOOL bSet); - void SetAllowMove(BOOL bSet); + void SetAlive(BOOL bSet); + void SetAllowMove(BOOL bSet); - void InvalidateData(); - void InvalidateSource(); + void InvalidateData(); + void InvalidateSource(); - void Output( const ScAddress& rPos ); - ScRange GetNewOutputRange( BOOL& rOverflow ); + void Output( const ScAddress& rPos ); + ScRange GetNewOutputRange( BOOL& rOverflow ); const ScRange GetOutputRangeByType( sal_Int32 nType ); - void SetSaveData(const ScDPSaveData& rData); - ScDPSaveData* GetSaveData() const { return pSaveData; } + void SetSaveData(const ScDPSaveData& rData); + ScDPSaveData* GetSaveData() const { return pSaveData; } - void SetOutRange(const ScRange& rRange); - const ScRange& GetOutRange() const { return aOutRange; } + void SetOutRange(const ScRange& rRange); + const ScRange& GetOutRange() const { return aOutRange; } void SetAutoFormatIndex (const sal_uInt16 nIndex); - sal_uInt16 GetAutoFormatIndex() const; + sal_uInt16 GetAutoFormatIndex() const; void SetHeaderLayout(bool bUseGrid); bool GetHeaderLayout() const; - void SetSheetDesc(const ScSheetSourceDesc& rDesc); - void SetImportDesc(const ScImportSourceDesc& rDesc); - void SetServiceData(const ScDPServiceDesc& rDesc); + void SetSheetDesc(const ScSheetSourceDesc& rDesc); + void SetImportDesc(const ScImportSourceDesc& rDesc); + void SetServiceData(const ScDPServiceDesc& rDesc); - void WriteSourceDataTo( ScDPObject& rDest ) const; - void WriteTempDataTo( ScDPObject& rDest ) const; + void WriteSourceDataTo( ScDPObject& rDest ) const; + void WriteTempDataTo( ScDPObject& rDest ) const; - const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc; } - const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } - const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } + const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc; } + const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } + const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> GetSource(); - BOOL IsSheetData() const; - BOOL IsImportData() const { return(pImpDesc != NULL); } - BOOL IsServiceData() const { return(pServDesc != NULL); } + BOOL IsSheetData() const; + BOOL IsImportData() const { return(pImpDesc != NULL); } + BOOL IsServiceData() const { return(pServDesc != NULL); } - void SetName(const String& rNew); - const String& GetName() const { return aTableName; } - void SetTag(const String& rNew); - const String& GetTag() const { return aTableTag; } + void SetName(const String& rNew); + const String& GetName() const { return aTableName; } + void SetTag(const String& rNew); + const String& GetTag() const { return aTableTag; } - /** + /** * Data description cell displays the description of a data dimension if * and only if there is only one data dimension. It's usually located at * the upper-left corner of the table output. @@ -191,11 +191,11 @@ public: BOOL IsDuplicated( long nDim ); long GetDimCount(); void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData); - long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); - BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, + long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); + BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ); - BOOL IsFilterButton( const ScAddress& rPos ); + BOOL IsFilterButton( const ScAddress& rPos ); BOOL GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ const std::vector< ScDPGetPivotDataField >& rFilters ); @@ -205,13 +205,13 @@ public: void GetMemberResultNames( ScStrCollection& rNames, long nDimension ); - void FillPageList( TypedScStrCollection& rStrings, long nField ); + void FillPageList( TypedScStrCollection& rStrings, long nField ); void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); - BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; - BOOL FillLabelData(ScPivotParam& rParam); - void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); + BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; + BOOL FillLabelData(ScPivotParam& rParam); + void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); BOOL GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers ); BOOL GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers ); @@ -224,34 +224,34 @@ public: bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers ); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL RefsEqual( const ScDPObject& r ) const; - void WriteRefsTo( ScDPObject& r ) const; + BOOL RefsEqual( const ScDPObject& r ) const; + void WriteRefsTo( ScDPObject& r ) const; void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); - bool GetDataFieldPositionData(const ScAddress& rPos, - ::com::sun::star::uno::Sequence< + bool GetDataFieldPositionData(const ScAddress& rPos, + ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters); - void GetDrillDownData(const ScAddress& rPos, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Sequence< + void GetDrillDownData(const ScAddress& rPos, + ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTableData); // apply drop-down attribute, initialize nHeaderRows, without accessing the source // (button attribute must be present) - void RefreshAfterLoad(); + void RefreshAfterLoad(); void BuildAllDimensionMembers(); - static BOOL HasRegisteredSources(); + static BOOL HasRegisteredSources(); static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources(); static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> CreateSource( const ScDPServiceDesc& rDesc ); - static void ConvertOrientation( ScDPSaveData& rSaveData, + static void ConvertOrientation( ScDPSaveData& rSaveData, PivotField* pFields, SCSIZE nCount, USHORT nOrient, ScDocument* pDoc, SCROW nRow, SCTAB nTab, const com::sun::star::uno::Reference< @@ -270,25 +270,25 @@ public: class ScDPCollection : public ScCollection { private: - ScDocument* pDoc; + ScDocument* pDoc; public: ScDPCollection(ScDocument* pDocument); ScDPCollection(const ScDPCollection& r); - virtual ~ScDPCollection(); + virtual ~ScDPCollection(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} - ScDPObject* GetByName(const String& rName) const; + ScDPObject* operator[](USHORT nIndex) const {return (ScDPObject*)At(nIndex);} + ScDPObject* GetByName(const String& rName) const; void DeleteOnTab( SCTAB nTab ); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL RefsEqual( const ScDPCollection& r ) const; - void WriteRefsTo( ScDPCollection& r ) const; + BOOL RefsEqual( const ScDPCollection& r ) const; + void WriteRefsTo( ScDPCollection& r ) const; - String CreateNewName( USHORT nMin = 1 ) const; + String CreateNewName( USHORT nMin = 1 ) const; void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index 77c552ec7026..523146d08592 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,59 +73,59 @@ struct ScDPGetPivotDataField -class ScDPOutput //! name??? +class ScDPOutput //! name??? { private: - //! use impl-object? - ScDocument* pDoc; + //! use impl-object? + ScDocument* pDoc; com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier> xSource; - ScAddress aStartPos; - BOOL bDoFilter; - ScDPOutLevelData* pColFields; - ScDPOutLevelData* pRowFields; - ScDPOutLevelData* pPageFields; - long nColFieldCount; - long nRowFieldCount; - long nPageFieldCount; + ScAddress aStartPos; + BOOL bDoFilter; + ScDPOutLevelData* pColFields; + ScDPOutLevelData* pRowFields; + ScDPOutLevelData* pPageFields; + long nColFieldCount; + long nRowFieldCount; + long nPageFieldCount; com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> > aData; - BOOL bResultsError; + BOOL bResultsError; bool mbHasDataLayout; - String aDataDescription; + String aDataDescription; // Number format related parameters - UINT32* pColNumFmt; - UINT32* pRowNumFmt; - long nColFmtCount; - long nRowFmtCount; + UINT32* pColNumFmt; + UINT32* pRowNumFmt; + long nColFmtCount; + long nRowFmtCount; UINT32 nSingleNumFmt; // Output geometry related parameters - BOOL bSizesValid; - BOOL bSizeOverflow; - long nColCount; - long nRowCount; - long nHeaderSize; + BOOL bSizesValid; + BOOL bSizeOverflow; + long nColCount; + long nRowCount; + long nHeaderSize; bool mbHeaderLayout; // TRUE : grid, FALSE : standard - SCCOL nTabStartCol; - SCROW nTabStartRow; - SCCOL nMemberStartCol; - SCROW nMemberStartRow; - SCCOL nDataStartCol; - SCROW nDataStartRow; - SCCOL nTabEndCol; - SCROW nTabEndRow; - - void DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, + SCCOL nTabStartCol; + SCROW nTabStartRow; + SCCOL nMemberStartCol; + SCROW nMemberStartRow; + SCCOL nDataStartCol; + SCROW nDataStartRow; + SCCOL nTabEndCol; + SCROW nTabEndRow; + + void DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const com::sun::star::sheet::DataResult& rData ); - void HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, + void HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const com::sun::star::sheet::MemberResult& rData, BOOL bColHeader, long nLevel ); - void FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, + void FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, bool bInTable, bool bPopup, bool bHasHiddenMember ); - void CalcSizes(); + void CalcSizes(); /** Query which sub-area of the table the cell is in. See css.sheet.DataPilotTablePositionType for the interpretation of the @@ -139,12 +139,12 @@ public: const ScAddress& rPos, BOOL bFilter ); ~ScDPOutput(); - void SetPosition( const ScAddress& rPos ); + void SetPosition( const ScAddress& rPos ); - void Output(); //! Refresh? - ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ); - long GetHeaderRows(); - BOOL HasError(); // range overflow or exception from source + void Output(); //! Refresh? + ScRange GetOutputRange( sal_Int32 nRegionType = ::com::sun::star::sheet::DataPilotOutputRangeType::WHOLE ); + long GetHeaderRows(); + BOOL HasError(); // range overflow or exception from source void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData); @@ -154,11 +154,11 @@ public: BOOL GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */ const std::vector< ScDPGetPivotDataField >& rFilters ); - long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); - BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, + long GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ); + BOOL GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ); - BOOL IsFilterButton( const ScAddress& rPos ); + BOOL IsFilterButton( const ScAddress& rPos ); void GetMemberResultNames( ScStrCollection& rNames, long nDimension ); diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx index c5c65195eff0..5dcb7f47fc89 100644 --- a/sc/inc/dpoutputgeometry.hxx +++ b/sc/inc/dpoutputgeometry.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ public: ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType); ~ScDPOutputGeometry(); - /** - * @param nCount number of row fields, <b>excluding the data layout + /** + * @param nCount number of row fields, <b>excluding the data layout * field if exists</b>. */ void setRowFieldCount(sal_uInt32 nCount); diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 9ecb1c598bba..30d4ee30bd94 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,31 +50,31 @@ class ScDPTableData; // -------------------------------------------------------------------- // -// classes to save Data Pilot settings +// classes to save Data Pilot settings // class ScDPSaveMember { private: - String aName; + String aName; ::std::auto_ptr<rtl::OUString> mpLayoutName; // custom name to be displayed in the table. - USHORT nVisibleMode; - USHORT nShowDetailsMode; + USHORT nVisibleMode; + USHORT nShowDetailsMode; public: ScDPSaveMember(const String& rName); ScDPSaveMember(const ScDPSaveMember& r); ~ScDPSaveMember(); - BOOL operator== ( const ScDPSaveMember& r ) const; + BOOL operator== ( const ScDPSaveMember& r ) const; const String& GetName() const { return aName; } BOOL HasIsVisible() const; - SC_DLLPUBLIC void SetIsVisible(BOOL bSet); + SC_DLLPUBLIC void SetIsVisible(BOOL bSet); BOOL GetIsVisible() const { return BOOL(nVisibleMode); } BOOL HasShowDetails() const; - SC_DLLPUBLIC void SetShowDetails(BOOL bSet); + SC_DLLPUBLIC void SetShowDetails(BOOL bSet); BOOL GetShowDetails() const { return BOOL(nShowDetailsMode); } void SetName( const String& rNew ); // used if the source member was renamed (groups) @@ -83,7 +83,7 @@ public: SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; void RemoveLayoutName(); - void WriteToSource( const com::sun::star::uno::Reference< + void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xMember, sal_Int32 nPosition ); }; @@ -95,27 +95,27 @@ bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, con class SC_DLLPUBLIC ScDPSaveDimension { private: - String aName; - String* pSelectedPage; + String aName; + String* pSelectedPage; ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; - BOOL bIsDataLayout; - BOOL bDupFlag; - USHORT nOrientation; - USHORT nFunction; // enum GeneralFunction, for data dimensions - long nUsedHierarchy; - USHORT nShowEmptyMode; //! at level - BOOL bSubTotalDefault; //! at level - long nSubTotalCount; - USHORT* pSubTotalFuncs; // enum GeneralFunction + BOOL bIsDataLayout; + BOOL bDupFlag; + USHORT nOrientation; + USHORT nFunction; // enum GeneralFunction, for data dimensions + long nUsedHierarchy; + USHORT nShowEmptyMode; //! at level + BOOL bSubTotalDefault; //! at level + long nSubTotalCount; + USHORT* pSubTotalFuncs; // enum GeneralFunction ::com::sun::star::sheet::DataPilotFieldReference* pReferenceValue; ::com::sun::star::sheet::DataPilotFieldSortInfo* pSortInfo; // (level) ::com::sun::star::sheet::DataPilotFieldAutoShowInfo* pAutoShowInfo; // (level) ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pLayoutInfo; // (level) public: - typedef std::hash_map <String, ScDPSaveMember*, rtl::OUStringHash> MemberHash; - typedef std::list <ScDPSaveMember*> MemberList; + typedef std::hash_map <String, ScDPSaveMember*, rtl::OUStringHash> MemberHash; + typedef std::list <ScDPSaveMember*> MemberList; private: MemberHash maMemberHash; MemberList maMemberList; @@ -124,29 +124,29 @@ public: ScDPSaveDimension(const ScDPSaveDimension& r); ~ScDPSaveDimension(); - BOOL operator== ( const ScDPSaveDimension& r ) const; + BOOL operator== ( const ScDPSaveDimension& r ) const; const MemberList& GetMembers() const { return maMemberList; } - void AddMember(ScDPSaveMember* pMember); + void AddMember(ScDPSaveMember* pMember); - void SetDupFlag(BOOL bSet) { bDupFlag = bSet; } - BOOL GetDupFlag() const { return bDupFlag; } + void SetDupFlag(BOOL bSet) { bDupFlag = bSet; } + BOOL GetDupFlag() const { return bDupFlag; } - const String& GetName() const { return aName; } - BOOL IsDataLayout() const { return bIsDataLayout; } + const String& GetName() const { return aName; } + BOOL IsDataLayout() const { return bIsDataLayout; } void SetName( const String& rNew ); // used if the source dim was renamed (groups) - void SetOrientation(USHORT nNew); - void SetSubTotals(long nCount, const USHORT* pFuncs); + void SetOrientation(USHORT nNew); + void SetSubTotals(long nCount, const USHORT* pFuncs); long GetSubTotalsCount() const { return nSubTotalCount; } USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; } bool HasShowEmpty() const; - void SetShowEmpty(BOOL bSet); + void SetShowEmpty(BOOL bSet); BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); } - void SetFunction(USHORT nNew); // enum GeneralFunction + void SetFunction(USHORT nNew); // enum GeneralFunction USHORT GetFunction() const { return nFunction; } - void SetUsedHierarchy(long nNew); + void SetUsedHierarchy(long nNew); long GetUsedHierarchy() const { return nUsedHierarchy; } void SetLayoutName(const ::rtl::OUString& rName); @@ -157,8 +157,8 @@ public: bool IsMemberNameInUse(const ::rtl::OUString& rName) const; - const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } - void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew); + const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const { return pReferenceValue; } + void SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew); const ::com::sun::star::sheet::DataPilotFieldSortInfo* GetSortInfo() const { return pSortInfo; } void SetSortInfo(const ::com::sun::star::sheet::DataPilotFieldSortInfo* pNew); @@ -167,22 +167,22 @@ public: const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* GetLayoutInfo() const { return pLayoutInfo; } void SetLayoutInfo(const ::com::sun::star::sheet::DataPilotFieldLayoutInfo* pNew); - void SetCurrentPage( const String* pPage ); // NULL = no selection (all) - BOOL HasCurrentPage() const; - const String& GetCurrentPage() const; + void SetCurrentPage( const String* pPage ); // NULL = no selection (all) + BOOL HasCurrentPage() const; + const String& GetCurrentPage() const; - USHORT GetOrientation() const { return nOrientation; } + USHORT GetOrientation() const { return nOrientation; } - ScDPSaveMember* GetExistingMemberByName(const String& rName); - ScDPSaveMember* GetMemberByName(const String& rName); + ScDPSaveMember* GetExistingMemberByName(const String& rName); + ScDPSaveMember* GetMemberByName(const String& rName); void SetMemberPosition( const String& rName, sal_Int32 nNewPos ); - void WriteToSource( const com::sun::star::uno::Reference< + void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface>& xDim ); - void Refresh( const com::sun::star::uno::Reference< + void Refresh( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource , - const std::list<String> & deletedDims); + const std::list<String> & deletedDims); void UpdateMemberVisibility(const ::std::hash_map< ::rtl::OUString, bool, ::rtl::OUStringHash>& rData); @@ -193,12 +193,12 @@ public: class ScDPSaveData { private: - List aDimList; + List aDimList; ScDPDimensionSaveData* pDimensionData; // settings that create new dimensions - USHORT nColumnGrandMode; - USHORT nRowGrandMode; - USHORT nIgnoreEmptyMode; - USHORT nRepeatEmptyMode; + USHORT nColumnGrandMode; + USHORT nRowGrandMode; + USHORT nIgnoreEmptyMode; + USHORT nRepeatEmptyMode; BOOL bFilterButton; // not passed to DataPilotSource BOOL bDrillDown; // not passed to DataPilotSource // Wang Xu Ming -- 2009-8-17 @@ -208,34 +208,34 @@ private: /** if true, all dimensions already have all of their member instances * created. */ - bool mbDimensionMembersBuilt; + bool mbDimensionMembersBuilt; ::std::auto_ptr<rtl::OUString> mpGrandTotalName; public: - SC_DLLPUBLIC ScDPSaveData(); + SC_DLLPUBLIC ScDPSaveData(); ScDPSaveData(const ScDPSaveData& r); - SC_DLLPUBLIC ~ScDPSaveData(); + SC_DLLPUBLIC ~ScDPSaveData(); - ScDPSaveData& operator= ( const ScDPSaveData& r ); + ScDPSaveData& operator= ( const ScDPSaveData& r ); - BOOL operator== ( const ScDPSaveData& r ) const; + BOOL operator== ( const ScDPSaveData& r ) const; SC_DLLPUBLIC void SetGrandTotalName(const ::rtl::OUString& rName); SC_DLLPUBLIC const ::rtl::OUString* GetGrandTotalName() const; - const List& GetDimensions() const { return aDimList; } - void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); } + const List& GetDimensions() const { return aDimList; } + void AddDimension(ScDPSaveDimension* pDim) { aDimList.Insert(pDim, LIST_APPEND); } - ScDPSaveDimension* GetDimensionByName(const String& rName); - SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); + ScDPSaveDimension* GetDimensionByName(const String& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); SC_DLLPUBLIC ScDPSaveDimension* GetExistingDataLayoutDimension() const; - ScDPSaveDimension* DuplicateDimension(const String& rName); + ScDPSaveDimension* DuplicateDimension(const String& rName); SC_DLLPUBLIC ScDPSaveDimension& DuplicateDimension(const ScDPSaveDimension& rDim); - SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const String& rName) const; - SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const String& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetExistingDimensionByName(const String& rName) const; + SC_DLLPUBLIC ScDPSaveDimension* GetNewDimensionByName(const String& rName); void RemoveDimensionByName(const String& rName); @@ -244,28 +244,28 @@ public: long GetDataDimensionCount() const; - void SetPosition( ScDPSaveDimension* pDim, long nNew ); - SC_DLLPUBLIC void SetColumnGrand( BOOL bSet ); - BOOL GetColumnGrand() const { return BOOL(nColumnGrandMode); } - SC_DLLPUBLIC void SetRowGrand( BOOL bSet ); - BOOL GetRowGrand() const { return BOOL(nRowGrandMode); } - void SetIgnoreEmptyRows( BOOL bSet ); - BOOL GetIgnoreEmptyRows() const { return BOOL(nIgnoreEmptyMode); } - void SetRepeatIfEmpty( BOOL bSet ); - BOOL GetRepeatIfEmpty() const { return BOOL(nRepeatEmptyMode); } + void SetPosition( ScDPSaveDimension* pDim, long nNew ); + SC_DLLPUBLIC void SetColumnGrand( BOOL bSet ); + BOOL GetColumnGrand() const { return BOOL(nColumnGrandMode); } + SC_DLLPUBLIC void SetRowGrand( BOOL bSet ); + BOOL GetRowGrand() const { return BOOL(nRowGrandMode); } + void SetIgnoreEmptyRows( BOOL bSet ); + BOOL GetIgnoreEmptyRows() const { return BOOL(nIgnoreEmptyMode); } + void SetRepeatIfEmpty( BOOL bSet ); + BOOL GetRepeatIfEmpty() const { return BOOL(nRepeatEmptyMode); } SC_DLLPUBLIC void SetFilterButton( BOOL bSet ); BOOL GetFilterButton() const { return bFilterButton; } SC_DLLPUBLIC void SetDrillDown( BOOL bSet ); BOOL GetDrillDown() const { return bDrillDown; } - void WriteToSource( const com::sun::star::uno::Reference< + void WriteToSource( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void Refresh( const com::sun::star::uno::Reference< + void Refresh( const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource ); - BOOL IsEmpty() const; + BOOL IsEmpty() const; inline long GetCacheId() const{ return mnCacheId; } inline void SetCacheId( long nCacheId ){ mnCacheId = nCacheId; } // End Comments @@ -274,7 +274,7 @@ public: void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied void BuildAllDimensionMembers(ScDPTableData* pData); - /** + /** * Check whether a dimension has one or more invisible members. * * @param rDimName dimension name diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 9863e332058e..9baf4b182a73 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,19 +41,19 @@ class ScDocument; // -------------------------------------------------------------------- // -// implementation of ScDPTableData with database data +// implementation of ScDPTableData with database data // struct ScImportSourceDesc { - String aDBName; - String aObject; - USHORT nType; // enum DataImportMode - BOOL bNative; + String aDBName; + String aObject; + USHORT nType; // enum DataImportMode + BOOL bNative; ScImportSourceDesc() : nType(0), bNative(FALSE) {} - BOOL operator== ( const ScImportSourceDesc& rOther ) const + BOOL operator== ( const ScImportSourceDesc& rOther ) const { return aDBName == rOther.aDBName && aObject == rOther.aObject && nType == rOther.nType && @@ -64,7 +64,7 @@ struct ScImportSourceDesc ScDPTableDataCache* GetExistDPObjectCache( ScDocument* pDoc ) const; ScDPTableDataCache* CreateCache( ScDocument* pDoc , long nID ) const; ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const; - long GetCacheId( ScDocument* pDoc, long nID ) const; + long GetCacheId( ScDocument* pDoc, long nID ) const; // End Comments }; @@ -74,14 +74,14 @@ private: ScDPCacheTable aCacheTable; public: ScDatabaseDPData(ScDocument* pDoc, const ScImportSourceDesc& rImport, long nCacheId = -1); - virtual ~ScDatabaseDPData(); - - virtual long GetColumnCount(); - virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual ~ScDatabaseDPData(); + + virtual long GetColumnCount(); + virtual String getDimensionName(long nColumn); + virtual BOOL getIsDataLayoutDimension(long nColumn); + virtual BOOL IsDateDimension(long nDim); + virtual void DisposeData(); + virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); virtual void CreateCacheTable(); virtual void FilterCacheTable(const ::std::vector<ScDPCacheTable::Criterion>& rCriteria, const ::std::hash_set<sal_Int32>& rDataDims); diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index 13a201c0020e..b2c618c7f1b6 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,15 +48,15 @@ class ScDPItemData; // End Comments // -------------------------------------------------------------------- // -// implementation of ScDPTableData with sheet data +// implementation of ScDPTableData with sheet data // struct ScSheetSourceDesc { - ScRange aSourceRange; - ScQueryParam aQueryParam; + ScRange aSourceRange; + ScQueryParam aQueryParam; - BOOL operator== ( const ScSheetSourceDesc& rOther ) const + BOOL operator== ( const ScSheetSourceDesc& rOther ) const { return aSourceRange == rOther.aSourceRange && aQueryParam == rOther.aQueryParam; } // Wang Xu Ming - DataPilot migration @@ -65,34 +65,34 @@ struct ScSheetSourceDesc ULONG CheckValidate( ScDocument* pDoc ) const; ScDPTableDataCache* GetCache( ScDocument* pDoc, long nID ) const; ScDPTableDataCache* GetExistDPObjectCache ( ScDocument* pDoc ) const; - long GetCacheId( ScDocument* pDoc, long nID ) const; - + long GetCacheId( ScDocument* pDoc, long nID ) const; + // End Comments }; class SC_DLLPUBLIC ScSheetDPData : public ScDPTableData { private: - ScQueryParam aQuery; - BOOL* pSpecial; - BOOL bIgnoreEmptyRows; - BOOL bRepeatIfEmpty; + ScQueryParam aQuery; + BOOL* pSpecial; + BOOL bIgnoreEmptyRows; + BOOL bRepeatIfEmpty; - ScDPCacheTable aCacheTable; + ScDPCacheTable aCacheTable; public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance ScSheetDPData( ScDocument* pD, const ScSheetSourceDesc& rDesc, long nCacheId = -1 ); - virtual ~ScSheetDPData(); + virtual ~ScSheetDPData(); // End Comments - virtual long GetColumnCount(); - virtual String getDimensionName(long nColumn); - virtual BOOL getIsDataLayoutDimension(long nColumn); - virtual BOOL IsDateDimension(long nDim); - virtual ULONG GetNumberFormat(long nDim); - virtual void DisposeData(); - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); + virtual long GetColumnCount(); + virtual String getDimensionName(long nColumn); + virtual BOOL getIsDataLayoutDimension(long nColumn); + virtual BOOL IsDateDimension(long nDim); + virtual ULONG GetNumberFormat(long nDim); + virtual void DisposeData(); + virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ); virtual bool IsRepeatIfEmpty(); diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 89a9deb8efd3..a8324a3490fb 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,40 +50,40 @@ namespace com { namespace sun { namespace star { namespace sheet { // ----------------------------------------------------------------------- -#define SC_DAPI_DATE_HIERARCHIES 3 +#define SC_DAPI_DATE_HIERARCHIES 3 -#define SC_DAPI_HIERARCHY_FLAT 0 -#define SC_DAPI_HIERARCHY_QUARTER 1 -#define SC_DAPI_HIERARCHY_WEEK 2 +#define SC_DAPI_HIERARCHY_FLAT 0 +#define SC_DAPI_HIERARCHY_QUARTER 1 +#define SC_DAPI_HIERARCHY_WEEK 2 -#define SC_DAPI_FLAT_LEVELS 1 // single level for flat dates -#define SC_DAPI_QUARTER_LEVELS 4 // levels in year/quarter/month/day hierarchy -#define SC_DAPI_WEEK_LEVELS 3 // levels in year/week/day hierarchy +#define SC_DAPI_FLAT_LEVELS 1 // single level for flat dates +#define SC_DAPI_QUARTER_LEVELS 4 // levels in year/quarter/month/day hierarchy +#define SC_DAPI_WEEK_LEVELS 3 // levels in year/week/day hierarchy -#define SC_DAPI_LEVEL_YEAR 0 -#define SC_DAPI_LEVEL_QUARTER 1 -#define SC_DAPI_LEVEL_MONTH 2 -#define SC_DAPI_LEVEL_DAY 3 -#define SC_DAPI_LEVEL_WEEK 1 -#define SC_DAPI_LEVEL_WEEKDAY 2 +#define SC_DAPI_LEVEL_YEAR 0 +#define SC_DAPI_LEVEL_QUARTER 1 +#define SC_DAPI_LEVEL_MONTH 2 +#define SC_DAPI_LEVEL_DAY 3 +#define SC_DAPI_LEVEL_WEEK 1 +#define SC_DAPI_LEVEL_WEEKDAY 2 // -------------------------------------------------------------------- // -// base class ScDPTableData to allow implementation with tabular data -// by deriving only of this +// base class ScDPTableData to allow implementation with tabular data +// by deriving only of this // -#define SC_VALTYPE_EMPTY 0 -#define SC_VALTYPE_VALUE 1 -#define SC_VALTYPE_STRING 2 -#define SC_VALTYPE_ERROR 3 +#define SC_VALTYPE_EMPTY 0 +#define SC_VALTYPE_VALUE 1 +#define SC_VALTYPE_STRING 2 +#define SC_VALTYPE_ERROR 3 struct ScDPValueData { - double fValue; - BYTE nType; + double fValue; + BYTE nType; - void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; } + void Set( double fV, BYTE nT ) { fValue = fV; nType = nT; } }; class ScDPResultMember; @@ -95,11 +95,11 @@ class ScDocument; class SC_DLLPUBLIC ScDPTableData { - // cached data for GetDatePart - long nLastDateVal; - long nLastHier; - long nLastLevel; - long nLastRet; + // cached data for GetDatePart + long nLastDateVal; + long nLastHier; + long nLastLevel; + long nLastRet; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance long mnCacheId; @@ -134,26 +134,26 @@ public: // DataPilot Migration - Cache&&Performance ScDPTableData(ScDocument* pDoc, long nCacheId ); // End Comments - virtual ~ScDPTableData(); + virtual ~ScDPTableData(); - long GetDatePart( long nDateVal, long nHierarchy, long nLevel ); + long GetDatePart( long nDateVal, long nHierarchy, long nLevel ); - //! use (new) typed collection instead of ScStrCollection - //! or separate Str and ValueCollection + //! use (new) typed collection instead of ScStrCollection + //! or separate Str and ValueCollection - virtual long GetColumnCount() = 0; + virtual long GetColumnCount() = 0; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance virtual const std::vector< SCROW >& GetColumnEntries( long nColumn ) ; long GetCacheId() const; // End Comments - virtual String getDimensionName(long nColumn) = 0; - virtual BOOL getIsDataLayoutDimension(long nColumn) = 0; - virtual BOOL IsDateDimension(long nDim) = 0; - virtual ULONG GetNumberFormat(long nDim); - virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset ); - virtual void DisposeData() = 0; - virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0; + virtual String getDimensionName(long nColumn) = 0; + virtual BOOL getIsDataLayoutDimension(long nColumn) = 0; + virtual BOOL IsDateDimension(long nDim) = 0; + virtual ULONG GetNumberFormat(long nDim); + virtual UINT32 GetNumberFormatByIdx( NfIndexTableOffset ); + virtual void DisposeData() = 0; + virtual void SetEmptyFlags( BOOL bIgnoreEmptyRows, BOOL bRepeatIfEmpty ) = 0; virtual bool IsRepeatIfEmpty(); @@ -180,8 +180,8 @@ public: virtual const ScDPItemData* GetMemberByIndex( long nDim, long nIndex ); virtual const ScDPItemData* GetMemberById( long nDim, long nId); virtual SCROW GetIdOfItemData( long nDim, const ScDPItemData& rData ); - virtual long GetSourceDim( long nDim ); - virtual long Compare( long nDim, long nDataId1, long nDataId2); + virtual long GetSourceDim( long nDim ); + virtual long Compare( long nDim, long nDataId1, long nDataId2); // End Comments protected: /** This structure stores vector arrays that hold intermediate data for @@ -193,7 +193,7 @@ protected: ::std::vector< SCROW > aColData; ::std::vector< SCROW > aRowData; ::std::vector< SCROW > aPageData; - // End Comments + // End Comments ::std::vector<ScDPValueData> aValues; }; @@ -204,7 +204,7 @@ protected: private: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, + void GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, const ::std::vector<long>& rDims, ::std::vector< SCROW >& rItemData); // End Comments }; diff --git a/sc/inc/dptablecache.hxx b/sc/inc/dptablecache.hxx index a662795809f4..1c1d71d1af20 100644 --- a/sc/inc/dptablecache.hxx +++ b/sc/inc/dptablecache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -50,32 +50,32 @@ struct ScQueryParam; // -------------------------------------------------------------------- // -// base class ScDPTableData to allow implementation with tabular data -// by deriving only of this +// base class ScDPTableData to allow implementation with tabular data +// by deriving only of this // class SC_DLLPUBLIC ScDPTableDataCache { - long mnID; + long mnID; ScDocument* mpDoc; - long mnColumnCount; // Column count + long mnColumnCount; // Column count - std::vector<ScDPItemData*>* mpTableDataValues; //Data Pilot Table's index - value map - std::vector<SCROW>* mpSourceData; //Data Pilot Table's Source data - std::vector<SCROW>* mpGlobalOrder; //Sorted members index - std::vector<SCROW>* mpIndexOrder; //Index the sorted number - std::vector<ScDPItemData*> mrLabelNames; //Source Label data - std::vector<BOOL> mbEmptyRow; //If empty row? - mutable ScDPItemDataPool maAdditionalDatas; + std::vector<ScDPItemData*>* mpTableDataValues; //Data Pilot Table's index - value map + std::vector<SCROW>* mpSourceData; //Data Pilot Table's Source data + std::vector<SCROW>* mpGlobalOrder; //Sorted members index + std::vector<SCROW>* mpIndexOrder; //Index the sorted number + std::vector<ScDPItemData*> mrLabelNames; //Source Label data + std::vector<BOOL> mbEmptyRow; //If empty row? + mutable ScDPItemDataPool maAdditionalDatas; public: SCROW GetOrder( long nDim, SCROW nIndex ) const; SCROW GetIdByItemData( long nDim, String sItemData ) const; SCROW GetIdByItemData( long nDim, const ScDPItemData& rData ) const; - + SCROW GetAdditionalItemID ( String sItemData ); - SCROW GetAdditionalItemID( const ScDPItemData& rData ); - + SCROW GetAdditionalItemID( const ScDPItemData& rData ); + SCCOL GetDimensionIndex( String sName) const; const ScDPItemData* GetSortedItemData( SCCOL nDim, SCROW nOrder ) const; ULONG GetNumType ( ULONG nFormat ) const; @@ -86,22 +86,22 @@ public: SCROW GetSortedItemDataId( SCCOL nDim, SCROW nOrder ) const; const std::vector<ScDPItemData*>& GetDimMemberValues( SCCOL nDim )const; - void SetId( long nId ){ mnID = nId;} - void AddRow( ScDPItemData* pRow, USHORT nCount ); - bool InitFromDoc( ScDocument* pDoc, const ScRange& rRange ); + void SetId( long nId ){ mnID = nId;} + void AddRow( ScDPItemData* pRow, USHORT nCount ); + bool InitFromDoc( ScDocument* pDoc, const ScRange& rRange ); bool InitFromDataBase (const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xRowSet, const Date& rNullDate); - SCROW GetRowCount() const; - SCROW GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const; - String GetDimensionName( USHORT nColumn ) const; - bool IsEmptyMember( SCROW nRow, USHORT nColumn ) const; - bool IsRowEmpty( SCROW nRow ) const; - bool IsValid() const; - bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial ); + SCROW GetRowCount() const; + SCROW GetItemDataId( USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty ) const; + String GetDimensionName( USHORT nColumn ) const; + bool IsEmptyMember( SCROW nRow, USHORT nColumn ) const; + bool IsRowEmpty( SCROW nRow ) const; + bool IsValid() const; + bool ValidQuery( SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial ); ScDocument* GetDoc() const;//ms-cache-core long GetColumnCount() const; - long GetId() const; + long GetId() const; const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const; @@ -114,8 +114,8 @@ public: protected: private: - void AddLabel( ScDPItemData* pData); - BOOL AddData( long nDim, ScDPItemData* itemData ); + void AddLabel( ScDPItemData* pData); + BOOL AddData( long nDim, ScDPItemData* itemData ); }; #endif //DPTABLECACHE_HXX diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index f92725371353..4c2bfb126a94 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <com/sun/star/sheet/MemberResult.hpp> #include <com/sun/star/sheet/DataResult.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include "global.hxx" // enum ScSubTotalFunc +#include "global.hxx" // enum ScSubTotalFunc #include "dpcachetable.hxx" #include <hash_map> #include <hash_set> @@ -95,7 +95,7 @@ public: typedef ::std::vector<sal_Int32> ScMemberSortOrder; // -// selected subtotal information, passed down the dimensions +// selected subtotal information, passed down the dimensions // struct ScDPSubTotalState @@ -159,8 +159,8 @@ struct ScDPRelativePos }; // -// aggregated data -//! separate header file? +// aggregated data +//! separate header file? // // Possible values for the nCount member: @@ -174,34 +174,34 @@ const long SC_DPAGG_RESULT_ERROR = -4; // error in calculated result class ScDPAggData { private: - double fVal; - double fAux; - long nCount; - ScDPAggData* pChild; + double fVal; + double fAux; + long nCount; + ScDPAggData* pChild; public: ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(NULL) {} ~ScDPAggData() { delete pChild; } - void Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); - void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); - BOOL IsCalculated() const; + void Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); + void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ); + BOOL IsCalculated() const; - double GetResult() const; - BOOL HasError() const; - BOOL HasData() const; + double GetResult() const; + BOOL HasError() const; + BOOL HasData() const; - void SetResult( double fNew ); - void SetEmpty( BOOL bSet ); - void SetError(); + void SetResult( double fNew ); + void SetEmpty( BOOL bSet ); + void SetError(); - double GetAuxiliary() const; - void SetAuxiliary( double fNew ); + double GetAuxiliary() const; + void SetAuxiliary( double fNew ); void Reset(); // also deletes children - const ScDPAggData* GetExistingChild() const { return pChild; } - ScDPAggData* GetChild(); + const ScDPAggData* GetExistingChild() const { return pChild; } + ScDPAggData* GetChild(); }; // @@ -227,17 +227,17 @@ public: // -------------------------------------------------------------------- // -// results for a hierarchy dimension +// results for a hierarchy dimension // -#define SC_DP_RES_GROW 16 +#define SC_DP_RES_GROW 16 class ScDPResultDimension; class ScDPDataDimension; class ScDPDataMember; -#define SC_DPMEASURE_ALL -1 -#define SC_DPMEASURE_ANY -2 +#define SC_DPMEASURE_ALL -1 +#define SC_DPMEASURE_ANY -2 // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -249,10 +249,10 @@ struct MemberHashIndexFunc : public std::unary_function< const SCROW &, size_t > class ScDPParentDimData { public: - const SCROW mnOrder; //! Ref - const ScDPDimension* mpParentDim; //! Ref - const ScDPLevel* mpParentLevel; //! Ref - const ScDPMember* mpMemberDesc; //! Ref + const SCROW mnOrder; //! Ref + const ScDPDimension* mpParentDim; //! Ref + const ScDPLevel* mpParentLevel; //! Ref + const ScDPMember* mpMemberDesc; //! Ref ScDPParentDimData():mnOrder(-1), mpParentDim( NULL), mpParentLevel( NULL ), mpMemberDesc( NULL ){} ScDPParentDimData( const SCROW nIndex, ScDPDimension* pDim, const ScDPLevel* pLev, const ScDPMember* pMember ): mnOrder( nIndex ), mpParentDim( pDim), mpParentLevel( pLev ), mpMemberDesc( pMember ){} @@ -264,12 +264,12 @@ typedef std::hash_map < SCROW, ScDPParentDimData *, MemberHashIndexFunc> DimMem class ResultMembers { DimMemberHash maMemberHash; - BOOL mbHasHideDetailsMember; + BOOL mbHasHideDetailsMember; public: ScDPParentDimData* FindMember( const SCROW& nIndex ) const; void InsertMember( ScDPParentDimData* pNew ); - BOOL IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } - void SetHasHideDetailsMembers( BOOL b ) { mbHasHideDetailsMember=b; } + BOOL IsHasHideDetailsMembers() const { return mbHasHideDetailsMember; } + void SetHasHideDetailsMembers( BOOL b ) { mbHasHideDetailsMember=b; } ResultMembers(); virtual ~ResultMembers(); }; @@ -284,7 +284,7 @@ private: BOOL mbInitChild; BOOL mbAllChildren; public: - LateInitParams( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev, + LateInitParams( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev, BOOL bRow, BOOL bInitChild = TRUE , BOOL bAllChildren = FALSE); ~LateInitParams(); @@ -304,45 +304,45 @@ public: class ScDPResultData { private: - ScDPSource* pSource; //! Ref - //! keep things like measure lists here + ScDPSource* pSource; //! Ref + //! keep things like measure lists here - long nMeasCount; - ScSubTotalFunc* pMeasFuncs; + long nMeasCount; + ScSubTotalFunc* pMeasFuncs; ::com::sun::star::sheet::DataPilotFieldReference* pMeasRefs; - USHORT* pMeasRefOrient; - String* pMeasNames; - BOOL bLateInit; - BOOL bDataAtCol; - BOOL bDataAtRow; + USHORT* pMeasRefOrient; + String* pMeasNames; + BOOL bLateInit; + BOOL bDataAtCol; + BOOL bDataAtRow; //! add "displayed values" settings mutable std::vector< ResultMembers* > mpDimMembers; public: - ScDPResultData( ScDPSource* pSrc ); //! Ref + ScDPResultData( ScDPSource* pSrc ); //! Ref ~ScDPResultData(); - void SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions, + void SetMeasureData( long nCount, const ScSubTotalFunc* pFunctions, const ::com::sun::star::sheet::DataPilotFieldReference* pRefs, const USHORT* pRefOrient, const String* pNames ); - void SetDataLayoutOrientation( USHORT nOrient ); - void SetLateInit( BOOL bSet ); + void SetDataLayoutOrientation( USHORT nOrient ); + void SetLateInit( BOOL bSet ); - long GetMeasureCount() const { return nMeasCount; } - ScSubTotalFunc GetMeasureFunction(long nMeasure) const; + long GetMeasureCount() const { return nMeasCount; } + ScSubTotalFunc GetMeasureFunction(long nMeasure) const; String GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const; - String GetMeasureDimensionName(long nMeasure) const; + String GetMeasureDimensionName(long nMeasure) const; const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const; - USHORT GetMeasureRefOrient(long nMeasure) const; + USHORT GetMeasureRefOrient(long nMeasure) const; - BOOL IsDataAtCol() const { return bDataAtCol; } - BOOL IsDataAtRow() const { return bDataAtRow; } - BOOL IsLateInit() const { return bLateInit; } + BOOL IsDataAtCol() const { return bDataAtCol; } + BOOL IsDataAtRow() const { return bDataAtRow; } + BOOL IsLateInit() const { return bLateInit; } - long GetColStartMeasure() const; - long GetRowStartMeasure() const; + long GetColStartMeasure() const; + long GetRowStartMeasure() const; - long GetCountForMeasure( long nMeas ) const + long GetCountForMeasure( long nMeas ) const { return ( nMeas == SC_DPMEASURE_ALL ) ? nMeasCount : 1; } BOOL IsBaseForGroup( long nDim ) const; // any group @@ -372,16 +372,16 @@ private: // DataPilot Migration - Cache&&Performance ScDPParentDimData aParentDimData; // End Comments - ScDPResultDimension* pChildDimension; - ScDPDataMember* pDataRoot; - BOOL bHasElements; - BOOL bForceSubTotal; - BOOL bHasHiddenDetails; - BOOL bInitialized; + ScDPResultDimension* pChildDimension; + ScDPDataMember* pDataRoot; + BOOL bHasElements; + BOOL bForceSubTotal; + BOOL bHasHiddenDetails; + BOOL bInitialized; BOOL bAutoHidden; - ScDPAggData aColTotal; // to store column totals + ScDPAggData aColTotal; // to store column totals - USHORT nMemberStep; // step to show details + USHORT nMemberStep; // step to show details public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -393,28 +393,28 @@ public: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void InitFrom( const ::std::vector<ScDPDimension*>& ppDim, + void InitFrom( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev, - size_t nPos, - ScDPInitState& rInitState, + size_t nPos, + ScDPInitState& rInitState, BOOL bInitChild = TRUE ); - void LateInitFrom( - LateInitParams& rParams, + void LateInitFrom( + LateInitParams& rParams, const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState); void CheckShowEmpty( BOOL bShow = FALSE ); // End Comments - String GetName() const; + String GetName() const; void FillItemData( ScDPItemData& rData ) const; - BOOL IsValid() const; - BOOL IsVisible() const; - long GetSize(long nMeasure) const; - BOOL HasHiddenDetails() const; + BOOL IsValid() const; + BOOL IsVisible() const; + long GetSize(long nMeasure) const; + BOOL HasHiddenDetails() const; BOOL IsSubTotalInTitle(long nMeasure) const; -// BOOL SubTotalEnabled() const; - long GetSubTotalCount( long* pUserSubStart = NULL ) const; +// BOOL SubTotalEnabled() const; + long GetSubTotalCount( long* pUserSubStart = NULL ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -422,7 +422,7 @@ public: bool IsValidEntry( const ::std::vector< SCROW >& aMembers ) const; // End Comments - void SetHasElements() { bHasElements = TRUE; } + void SetHasElements() { bHasElements = TRUE; } void SetAutoHidden() { bAutoHidden = TRUE; } // Wang Xu Ming -- 2009-8-17 @@ -432,20 +432,20 @@ public: const ::std::vector<SCROW>& aDataMembers, const ::std::vector<ScDPValueData>& aValues ); // End Comments - void FillMemberResults( com::sun::star::uno::Sequence< + void FillMemberResults( com::sun::star::uno::Sequence< com::sun::star::sheet::MemberResult>* pSequences, long& rPos, long nMeasure, BOOL bRoot, const String* pMemberName, const String* pMemberCaption ); - void FillDataResults( const ScDPResultMember* pRefMember, + void FillDataResults( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> >& rSequence, long& rRow, long nMeasure ) const; - void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, + void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals ) const; void SortMembers( ScDPResultMember* pRefMember ); @@ -453,13 +453,13 @@ public: void ResetResults( BOOL bRoot ); - void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; - //! this will be removed! - const ScDPResultDimension* GetChildDimension() const { return pChildDimension; } - ScDPResultDimension* GetChildDimension() { return pChildDimension; } + //! this will be removed! + const ScDPResultDimension* GetChildDimension() const { return pChildDimension; } + ScDPResultDimension* GetChildDimension() { return pChildDimension; } - ScDPDataMember* GetDataRoot() const { return pDataRoot; } + ScDPDataMember* GetDataRoot() const { return pDataRoot; } // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -470,7 +470,7 @@ public: inline BOOL IsRoot() const { return GetParentLevel() == NULL; } SCROW GetDataId( ) const ; // End Comments - ScDPAggData* GetColTotal( long nMeasure ) const; + ScDPAggData* GetColTotal( long nMeasure ) const; void FillVisibilityData(ScDPResultVisibilityData& rData) const; }; @@ -479,9 +479,9 @@ class ScDPDataMember { private: const ScDPResultData* pResultData; - const ScDPResultMember* pResultMember; //! Ref? - ScDPDataDimension* pChildDimension; - ScDPAggData aAggregate; + const ScDPResultMember* pResultMember; //! Ref? + ScDPDataDimension* pChildDimension; + ScDPAggData aAggregate; void UpdateValues( const ::std::vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState ); @@ -489,36 +489,36 @@ public: ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ); ~ScDPDataMember(); - void InitFrom( const ScDPResultDimension* pDim ); + void InitFrom( const ScDPResultDimension* pDim ); - String GetName() const; - BOOL IsVisible() const; - BOOL HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const; + String GetName() const; + BOOL IsVisible() const; + BOOL HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance BOOL IsNamedItem( SCROW r ) const; // End Comments - BOOL HasHiddenDetails() const; + BOOL HasHiddenDetails() const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance void ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState ); // End Comments - BOOL HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const; - double GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const; - const ScDPAggData* GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const; - ScDPAggData* GetAggData( long nMeasure, const ScDPSubTotalState& rSubState ); + BOOL HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const; + double GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const; + const ScDPAggData* GetConstAggData( long nMeasure, const ScDPSubTotalState& rSubState ) const; + ScDPAggData* GetAggData( long nMeasure, const ScDPSubTotalState& rSubState ); - void FillDataRow( const ScDPResultMember* pRefMember, + void FillDataRow( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence, long& rCol, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, + void UpdateDataRow( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ); - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ); @@ -527,20 +527,20 @@ public: void ResetResults(); - void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; - //! this will be removed! - const ScDPDataDimension* GetChildDimension() const { return pChildDimension; } - ScDPDataDimension* GetChildDimension() { return pChildDimension; } + //! this will be removed! + const ScDPDataDimension* GetChildDimension() const { return pChildDimension; } + ScDPDataDimension* GetChildDimension() { return pChildDimension; } }; -//! replace PtrArr with 32-bit array ???? +//! replace PtrArr with 32-bit array ???? typedef ScDPDataMember* ScDPDataMemberPtr; SV_DECL_PTRARR_DEL(ScDPDataMembers, ScDPDataMemberPtr, SC_DP_RES_GROW, SC_DP_RES_GROW) -// result dimension contains only members +// result dimension contains only members class ScDPResultDimension { @@ -552,11 +552,11 @@ public : // End Comments private: const ScDPResultData* pResultData; - MemberArray maMemberArray; - MemberHash maMemberHash; + MemberArray maMemberArray; + MemberHash maMemberHash; BOOL bInitialized; - String aDimensionName; //! or ptr to IntDimension? - BOOL bIsDataLayout; //! or ptr to IntDimension? + String aDimensionName; //! or ptr to IntDimension? + BOOL bIsDataLayout; //! or ptr to IntDimension? BOOL bSortByData; BOOL bSortAscending; long nSortMeasure; @@ -573,7 +573,7 @@ private: ScDPResultMember* InsertMember( ScDPParentDimData* pMemberData ); ResultMembers* GetResultMember( ScDPDimension* pDim, ScDPLevel* pLevel ); void InitWithMembers( LateInitParams& rParams, - const ::std::vector< SCROW >& pItemData, + const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ); // End Comments @@ -581,44 +581,44 @@ public: ScDPResultDimension( const ScDPResultData* pData ); ~ScDPResultDimension(); - // allocates new members + // allocates new members // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - void InitFrom( const ::std::vector<ScDPDimension*>& ppDim, + void InitFrom( const ::std::vector<ScDPDimension*>& ppDim, const ::std::vector<ScDPLevel*>& ppLev, size_t nPos, ScDPInitState& rInitState , BOOL bInitChild = TRUE ); - void LateInitFrom( LateInitParams& rParams, + void LateInitFrom( LateInitParams& rParams, const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ); void CheckShowEmpty( BOOL bShow = FALSE ); // End Comments - long GetSize(long nMeasure) const; + long GetSize(long nMeasure) const; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance bool IsValidEntry( const ::std::vector<SCROW>& aMembers ) const; - - // modifies existing members, allocates data dimensions - void ProcessData( const ::std::vector<SCROW>& aMembers, + + // modifies existing members, allocates data dimensions + void ProcessData( const ::std::vector<SCROW>& aMembers, const ScDPResultDimension* pDataDim, const ::std::vector<SCROW>& aDataMembers, - const ::std::vector<ScDPValueData>& aValues ) const; //! Test + const ::std::vector<ScDPValueData>& aValues ) const; //! Test // End Comments - void FillMemberResults( com::sun::star::uno::Sequence< + void FillMemberResults( com::sun::star::uno::Sequence< com::sun::star::sheet::MemberResult>* pSequences, long nStart, long nMeasure ); - void FillDataResults( const ScDPResultMember* pRefMember, + void FillDataResults( const ScDPResultMember* pRefMember, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::sheet::DataResult> >& rSequence, long nRow, long nMeasure ) const; - void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; - void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, + void UpdateDataResults( const ScDPResultMember* pRefMember, long nMeasure ) const; + void UpdateRunningTotals( const ScDPResultMember* pRefMember, long nMeasure, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals ) const; void SortMembers( ScDPResultMember* pRefMember ); @@ -628,26 +628,26 @@ public: void ResetResults(); - // called for the reference dimension - ScDPDataMember* GetRowReferenceMember( const ScDPRelativePos* pMemberPos, const String* pName, + // called for the reference dimension + ScDPDataMember* GetRowReferenceMember( const ScDPRelativePos* pMemberPos, const String* pName, const long* pRowIndexes, const long* pColIndexes ) const; - // uses row root member from ScDPRunningTotalState + // uses row root member from ScDPRunningTotalState static ScDPDataMember* GetColReferenceMember( const ScDPRelativePos* pMemberPos, const String* pName, long nRefDimPos, const ScDPRunningTotalState& rRunning ); - void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultMember* pRefMember, ScDocument* pDoc, ScAddress& rPos ) const; - // for ScDPDataDimension::InitFrom - long GetMemberCount() const; - const ScDPResultMember* GetMember(long n) const; - ScDPResultMember* GetMember(long n); + // for ScDPDataDimension::InitFrom + long GetMemberCount() const; + const ScDPResultMember* GetMember(long n) const; + ScDPResultMember* GetMember(long n); const ScMemberSortOrder& GetMemberOrder() const { return aMemberOrder; } ScMemberSortOrder& GetMemberOrder() { return aMemberOrder; } - BOOL IsDataLayout() const { return bIsDataLayout; } - String GetName() const { return aDimensionName; } + BOOL IsDataLayout() const { return bIsDataLayout; } + String GetName() const { return aDimensionName; } BOOL IsSortByData() const { return bSortByData; } BOOL IsSortAscending() const { return bSortAscending; } @@ -666,29 +666,29 @@ public: class ScDPDataDimension { private: - const ScDPResultData* pResultData; + const ScDPResultData* pResultData; const ScDPResultDimension* pResultDimension; // column - ScDPDataMembers aMembers; - BOOL bIsDataLayout; //! or ptr to IntDimension? + ScDPDataMembers aMembers; + BOOL bIsDataLayout; //! or ptr to IntDimension? public: ScDPDataDimension( const ScDPResultData* pData ); ~ScDPDataDimension(); - void InitFrom( const ScDPResultDimension* pDim ); // recursive + void InitFrom( const ScDPResultDimension* pDim ); // recursive // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance void ProcessData( const ::std::vector< SCROW >& aDataMembers, const ::std::vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState ); // End Comments - void FillDataRow( const ScDPResultDimension* pRefDim, + void FillDataRow( const ScDPResultDimension* pRefDim, com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence, long nCol, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, + void UpdateDataRow( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState ) const; - void UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, + void UpdateRunningTotals( const ScDPResultDimension* pRefDim, long nMeasure, BOOL bIsSubTotalRow, const ScDPSubTotalState& rSubState, ScDPRunningTotalState& rRunning, ScDPRowTotals& rTotals, const ScDPResultMember& rRowParent ) const; @@ -699,15 +699,15 @@ public: void ResetResults(); - void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const; + void DumpState( const ScDPResultDimension* pRefDim, ScDocument* pDoc, ScAddress& rPos ) const; - long GetMemberCount() const; - ScDPDataMember* GetMember(long n) const; + long GetMemberCount() const; + ScDPDataMember* GetMember(long n) const; }; // ---------------------------------------------------------------------------- -/** +/** * This class collects visible members of each dimension and uses that * information to create filtering criteria (e.g. for drill-down data). */ diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 34c51469caad..f67f26aaf030 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <memory> #include <tools/string.hxx> #include <tools/list.hxx> -#include "global.hxx" // enum ScSubTotalFunc +#include "global.hxx" // enum ScSubTotalFunc #include <com/sun/star/sheet/XDimensionsSupplier.hpp> #include <com/sun/star/sheet/XHierarchiesSupplier.hpp> #include <com/sun/star/sheet/XLevelsSupplier.hpp> @@ -68,7 +68,7 @@ // End Comments #include "dptabdat.hxx" -namespace com { namespace sun { namespace star { +namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldFilter; } @@ -88,13 +88,13 @@ class ScDPTableData; // ------------------------------------------------------------------------ -// should be dynamic! -#define SC_DAPI_MAXFIELDS 256 +// should be dynamic! +#define SC_DAPI_MAXFIELDS 256 // -------------------------------------------------------------------- // -// implementation of DataPilotSource using ScDPTableData +// implementation of DataPilotSource using ScDPTableData // @@ -117,72 +117,72 @@ class ScDPSource : public cppu::WeakImplHelper6< com::sun::star::lang::XServiceInfo > { private: - ScDPTableData* pData; // data source (ScDPObject manages its life time) - ScDPDimensions* pDimensions; // api objects + ScDPTableData* pData; // data source (ScDPObject manages its life time) + ScDPDimensions* pDimensions; // api objects // settings: - long nColDims[SC_DAPI_MAXFIELDS]; - long nRowDims[SC_DAPI_MAXFIELDS]; - long nDataDims[SC_DAPI_MAXFIELDS]; - long nPageDims[SC_DAPI_MAXFIELDS]; - long nColDimCount; - long nRowDimCount; - long nDataDimCount; - long nPageDimCount; - BOOL bColumnGrand; - BOOL bRowGrand; - BOOL bIgnoreEmptyRows; - BOOL bRepeatIfEmpty; - - long nDupCount; + long nColDims[SC_DAPI_MAXFIELDS]; + long nRowDims[SC_DAPI_MAXFIELDS]; + long nDataDims[SC_DAPI_MAXFIELDS]; + long nPageDims[SC_DAPI_MAXFIELDS]; + long nColDimCount; + long nRowDimCount; + long nDataDimCount; + long nPageDimCount; + BOOL bColumnGrand; + BOOL bRowGrand; + BOOL bIgnoreEmptyRows; + BOOL bRepeatIfEmpty; + + long nDupCount; // results: - ScDPResultData* pResData; // keep the rest in this! - ScDPResultMember* pColResRoot; - ScDPResultMember* pRowResRoot; + ScDPResultData* pResData; // keep the rest in this! + ScDPResultMember* pColResRoot; + ScDPResultMember* pRowResRoot; com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pColResults; com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* pRowResults; - List aColLevelList; - List aRowLevelList; - BOOL bResultOverflow; + List aColLevelList; + List aRowLevelList; + BOOL bResultOverflow; ::std::auto_ptr<rtl::OUString> mpGrandTotalName; - void CreateRes_Impl(); - void FillMemberResults(); - void FillLevelList( USHORT nOrientation, List& rList ); + void CreateRes_Impl(); + void FillMemberResults(); + void FillLevelList( USHORT nOrientation, List& rList ); void FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool &bHasAutoShow); - /** - * Compile a list of dimension indices that are either, column, row or - * page dimensions (i.e. all but data dimensions). + /** + * Compile a list of dimension indices that are either, column, row or + * page dimensions (i.e. all but data dimensions). */ void GetCategoryDimensionIndices(::std::hash_set<sal_Int32>& rCatDims); - /** - * Set visibilities of individual rows in the cache table based on the - * page field data. + /** + * Set visibilities of individual rows in the cache table based on the + * page field data. */ void FilterCacheTableByPageDimensions(); - void SetDupCount( long nNew ); + void SetDupCount( long nNew ); public: - ScDPSource( ScDPTableData* pD ); // TableData is deleted by Source - virtual ~ScDPSource(); + ScDPSource( ScDPTableData* pD ); // TableData is deleted by Source + virtual ~ScDPSource(); - ScDPTableData* GetData() { return pData; } - const ScDPTableData* GetData() const { return pData; } + ScDPTableData* GetData() { return pData; } + const ScDPTableData* GetData() const { return pData; } void SetGrandTotalName(const ::rtl::OUString& rName); const ::rtl::OUString* GetGrandTotalName() const; - USHORT GetOrientation(long nColumn); - void SetOrientation(long nColumn, USHORT nNew); - long GetPosition(long nColumn); + USHORT GetOrientation(long nColumn); + void SetOrientation(long nColumn, USHORT nNew); + long GetPosition(long nColumn); - long GetDataDimensionCount(); + long GetDataDimensionCount(); ScDPDimension* GetDataDimension(long nIndex); - String GetDataDimName(long nIndex); + String GetDataDimName(long nIndex); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance ScDPTableDataCache* GetCache(); @@ -190,23 +190,23 @@ public: long GetDataLayoutDim(){ return pData->GetColumnCount(); } SCROW GetMemberId( long nDim, const ScDPItemData& rData ); // End Comments - BOOL IsDataLayoutDimension(long nDim); - USHORT GetDataLayoutOrientation(); + BOOL IsDataLayoutDimension(long nDim); + USHORT GetDataLayoutOrientation(); - BOOL IsDateDimension(long nDim); - UINT32 GetNumberFormat(long nDim); + BOOL IsDateDimension(long nDim); + UINT32 GetNumberFormat(long nDim); - BOOL SubTotalAllowed(long nColumn); //! move to ScDPResultData + BOOL SubTotalAllowed(long nColumn); //! move to ScDPResultData - ScDPDimension* AddDuplicated(long nSource, const String& rNewName); - long GetDupCount() const { return nDupCount; } + ScDPDimension* AddDuplicated(long nSource, const String& rNewName); + long GetDupCount() const { return nDupCount; } - long GetSourceDim(long nDim); + long GetSourceDim(long nDim); const com::sun::star::uno::Sequence<com::sun::star::sheet::MemberResult>* GetMemberResults( ScDPLevel* pLevel ); - ScDPDimensions* GetDimensionsObject(); + ScDPDimensions* GetDimensionsObject(); // XDimensionsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > @@ -219,17 +219,17 @@ public: throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); // XDrillDownDataSupplier - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > - SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence< + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > + SAL_CALL getDrillDownData(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& aFilters ) throw(::com::sun::star::uno::RuntimeException); @@ -237,7 +237,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -249,25 +249,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -282,20 +282,20 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual String getDataDescription(); //! ??? + virtual String getDataDescription(); //! ??? - virtual BOOL getColumnGrand() const; - virtual void setColumnGrand(BOOL bSet); - virtual BOOL getRowGrand() const; - virtual void setRowGrand(BOOL bSet); + virtual BOOL getColumnGrand() const; + virtual void setColumnGrand(BOOL bSet); + virtual BOOL getRowGrand() const; + virtual void setRowGrand(BOOL bSet); - virtual BOOL getIgnoreEmptyRows() const; - virtual void setIgnoreEmptyRows(BOOL bSet); - virtual BOOL getRepeatIfEmpty() const; - virtual void setRepeatIfEmpty(BOOL bSet); + virtual BOOL getIgnoreEmptyRows() const; + virtual void setIgnoreEmptyRows(BOOL bSet); + virtual BOOL getRepeatIfEmpty() const; + virtual void setRepeatIfEmpty(BOOL bSet); - virtual void validate(); //! ??? - virtual void disposeData(); + virtual void validate(); //! ??? + virtual void disposeData(); }; class ScDPDimensions : public cppu::WeakImplHelper2< @@ -303,15 +303,15 @@ class ScDPDimensions : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDimCount; - ScDPDimension** ppDims; + ScDPSource* pSource; + long nDimCount; + ScDPDimension** ppDims; public: ScDPDimensions( ScDPSource* pSrc ); - virtual ~ScDPDimensions(); + virtual ~ScDPDimensions(); - void CountChanged(); + void CountChanged(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -336,8 +336,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPDimension* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPDimension* getByIndex(long nIndex) const; }; class ScDPDimension : public cppu::WeakImplHelper5< @@ -348,38 +348,38 @@ class ScDPDimension : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; // dimension index (== column ID) - ScDPHierarchies* pHierarchies; - long nUsedHier; - USHORT nFunction; // enum GeneralFunction - String aName; // if empty, take from source + ScDPSource* pSource; + long nDim; // dimension index (== column ID) + ScDPHierarchies* pHierarchies; + long nUsedHier; + USHORT nFunction; // enum GeneralFunction + String aName; // if empty, take from source ::std::auto_ptr<rtl::OUString> mpLayoutName; ::std::auto_ptr<rtl::OUString> mpSubtotalName; - long nSourceDim; // >=0 if dup'ed + long nSourceDim; // >=0 if dup'ed ::com::sun::star::sheet::DataPilotFieldReference aReferenceValue; // settings for "show data as" / "displayed value" - BOOL bHasSelectedPage; - String aSelectedPage; - ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage + BOOL bHasSelectedPage; + String aSelectedPage; + ScDPItemData* pSelectedData; // internal, temporary, created from aSelectedPage sal_Bool mbHasHiddenMember; public: ScDPDimension( ScDPSource* pSrc, long nD ); - virtual ~ScDPDimension(); + virtual ~ScDPDimension(); long GetDimension() const { return nDim; } // dimension index in source - long GetSourceDim() const { return nSourceDim; } // >=0 if dup'ed + long GetSourceDim() const { return nSourceDim; } // >=0 if dup'ed - ScDPDimension* CreateCloneObject(); - ScDPHierarchies* GetHierarchiesObject(); + ScDPDimension* CreateCloneObject(); + ScDPHierarchies* GetHierarchiesObject(); SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const; const ::rtl::OUString* GetSubtotalName() const; // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XHierarchiesSupplier @@ -394,7 +394,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -406,25 +406,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -439,16 +439,16 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual USHORT getOrientation() const; - virtual void setOrientation(USHORT nNew); - virtual long getPosition() const; - virtual void setPosition(long nNew); - virtual BOOL getIsDataLayoutDimension() const; - virtual USHORT getFunction() const; - virtual void setFunction(USHORT nNew); // for data dimension - virtual long getUsedHierarchy() const; - virtual void setUsedHierarchy(long nNew); - virtual BOOL isDuplicated() const; + virtual USHORT getOrientation() const; + virtual void setOrientation(USHORT nNew); + virtual long getPosition() const; + virtual void setPosition(long nNew); + virtual BOOL getIsDataLayoutDimension() const; + virtual USHORT getFunction() const; + virtual void setFunction(USHORT nNew); // for data dimension + virtual long getUsedHierarchy() const; + virtual void setUsedHierarchy(long nNew); + virtual BOOL isDuplicated() const; BOOL HasSelectedPage() const { return bHasSelectedPage; } const ScDPItemData& GetSelectedData(); @@ -466,14 +466,14 @@ class ScDPHierarchies : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHierCount; - ScDPHierarchy** ppHiers; + ScDPSource* pSource; + long nDim; + long nHierCount; + ScDPHierarchy** ppHiers; public: ScDPHierarchies( ScDPSource* pSrc, long nD ); - virtual ~ScDPHierarchies(); + virtual ~ScDPHierarchies(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -498,8 +498,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPHierarchy* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPHierarchy* getByIndex(long nIndex) const; }; class ScDPHierarchy : public cppu::WeakImplHelper3< @@ -508,20 +508,20 @@ class ScDPHierarchy : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - ScDPLevels* pLevels; + ScDPSource* pSource; + long nDim; + long nHier; + ScDPLevels* pLevels; public: ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ); - virtual ~ScDPHierarchy(); + virtual ~ScDPHierarchy(); - ScDPLevels* GetLevelsObject(); + ScDPLevels* GetLevelsObject(); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XLevelsSupplier @@ -542,15 +542,15 @@ class ScDPLevels : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLevCount; - ScDPLevel** ppLevs; + ScDPSource* pSource; + long nDim; + long nHier; + long nLevCount; + ScDPLevel** ppLevs; public: ScDPLevels( ScDPSource* pSrc, long nD, long nH ); - virtual ~ScDPLevels(); + virtual ~ScDPLevels(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -575,8 +575,8 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPLevel* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPLevel* getByIndex(long nIndex) const; }; class ScDPLevel : public cppu::WeakImplHelper5< @@ -587,13 +587,13 @@ class ScDPLevel : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLev; - ScDPMembers* pMembers; + ScDPSource* pSource; + long nDim; + long nHier; + long nLev; + ScDPMembers* pMembers; com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> aSubTotals; - BOOL bShowEmpty; + BOOL bShowEmpty; ::com::sun::star::sheet::DataPilotFieldSortInfo aSortInfo; // stored user settings ::com::sun::star::sheet::DataPilotFieldAutoShowInfo aAutoShowInfo; // stored user settings ::com::sun::star::sheet::DataPilotFieldLayoutInfo aLayoutInfo; // stored user settings @@ -605,13 +605,13 @@ private: public: ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ); - virtual ~ScDPLevel(); + virtual ~ScDPLevel(); - ScDPMembers* GetMembersObject(); + ScDPMembers* GetMembersObject(); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XMembersSupplier @@ -626,7 +626,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -638,25 +638,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -672,10 +672,10 @@ public: throw(::com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence<com::sun::star::sheet::GeneralFunction> getSubTotals() const; - virtual void setSubTotals(const com::sun::star::uno::Sequence< + virtual void setSubTotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction>& rNew); - virtual BOOL getShowEmpty() const; - virtual void setShowEmpty(BOOL bSet); + virtual BOOL getShowEmpty() const; + virtual void setShowEmpty(BOOL bSet); const ::com::sun::star::sheet::DataPilotFieldSortInfo& GetSortInfo() const { return aSortInfo; } const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo& GetAutoShow() const { return aAutoShowInfo; } @@ -700,7 +700,7 @@ public: BOOL IsAddEmpty() const { return bEnableLayout && aLayoutInfo.AddEmptyLines; } - //! number format (for data fields and date fields) + //! number format (for data fields and date fields) }; // hash map from name to index in the member array, for fast name access @@ -711,17 +711,17 @@ class ScDPMembers : public cppu::WeakImplHelper2< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLev; - long nMbrCount; - ScDPMember** ppMbrs; + ScDPSource* pSource; + long nDim; + long nHier; + long nLev; + long nMbrCount; + ScDPMember** ppMbrs; mutable ScDPMembersHashMap aHashMap; public: ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ); - virtual ~ScDPMembers(); + virtual ~ScDPMembers(); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -746,10 +746,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual long getCount() const; - virtual ScDPMember* getByIndex(long nIndex) const; + virtual long getCount() const; + virtual ScDPMember* getByIndex(long nIndex) const; - long getMinMembers() const; + long getMinMembers() const; sal_Int32 GetIndexFromName( const ::rtl::OUString& rName ) const; // <0 if not found // Wang Xu Ming -- 2009-8-17 @@ -766,21 +766,21 @@ class ScDPMember : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScDPSource* pSource; - long nDim; - long nHier; - long nLev; + ScDPSource* pSource; + long nDim; + long nHier; + long nLev; // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance SCROW mnDataId; // End Comments -// String aCaption; // visible name (changeable by user) +// String aCaption; // visible name (changeable by user) ::std::auto_ptr<rtl::OUString> mpLayoutName; sal_Int32 nPosition; // manual sorting - BOOL bVisible; - BOOL bShowDet; + BOOL bVisible; + BOOL bShowDet; public: // Wang Xu Ming -- 2009-8-17 @@ -788,13 +788,13 @@ public: ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex /*const String& rN, double fV, BOOL bHV */); // End Comments - virtual ~ScDPMember(); + virtual ~ScDPMember(); - BOOL IsNamedItem( const ScDPItemData& r ) const; - String GetNameStr() const; - void FillItemData( ScDPItemData& rData ) const; + BOOL IsNamedItem( const ScDPItemData& r ) const; + String GetNameStr() const; + void FillItemData( ScDPItemData& rData ) const; // Wang Xu Ming -- 2009-8-17 - // DataPilot Migration - Cache&&Performance + // DataPilot Migration - Cache&&Performance // const ScDPItemData& GetItemData() const{ return maData; } const ScDPItemData& GetItemData() const; inline SCROW GetItemDataId() const { return mnDataId; } @@ -807,14 +807,14 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -826,25 +826,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -859,10 +859,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual BOOL getIsVisible() const; - virtual void setIsVisible(BOOL bSet); - virtual BOOL getShowDetails() const; - virtual void setShowDetails(BOOL bSet); + virtual BOOL getIsVisible() const; + virtual void setIsVisible(BOOL bSet); + virtual BOOL getShowDetails() const; + virtual void setShowDetails(BOOL bSet); sal_Int32 getPosition() const; void setPosition(sal_Int32 nNew); diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index 4fd444c7c531..8792d38a6bcb 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,16 +42,16 @@ public: SvxDrawToolItem(USHORT nWhichP) : SfxEnumItem(nWhichP){} - virtual String GetValueText() const; + virtual String GetValueText() const; - virtual String GetValueText(USHORT nVal) const; - virtual USHORT GetValueCount() const + virtual String GetValueText(USHORT nVal) const; + virtual USHORT GetValueCount() const {return((USHORT)SVX_SNAP_DRAW_TEXT);} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; inline SvxDrawToolItem& operator=(const SvxDrawToolItem& rDrawTool) diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 68365e9847f4..faa43fa5d7e9 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx index dd79fbbf2b1b..cdce5a85af62 100644 --- a/sc/inc/drdefuno.hxx +++ b/sc/inc/drdefuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ class ScDocShell; class ScDrawDefaultsObj : public SvxUnoDrawPool, public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; public: ScDrawDefaultsObj(ScDocShell* pDocSh); - virtual ~ScDrawDefaultsObj() throw (); + virtual ~ScDrawDefaultsObj() throw (); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // from SvxUnoDrawPool - virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); + virtual SfxItemPool* getModelPool( sal_Bool bReadOnly ) throw(); }; #endif diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index e59e836be501..c6025ffacf8a 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,25 +51,25 @@ class ScAddress; class ScTabDeletedHint : public SfxHint { private: - SCTAB nTab; + SCTAB nTab; public: TYPEINFO(); ScTabDeletedHint( SCTAB nTabNo = SCTAB_MAX ); - virtual ~ScTabDeletedHint(); + virtual ~ScTabDeletedHint(); - SCTAB GetTab() { return nTab; } + SCTAB GetTab() { return nTab; } }; class ScTabSizeChangedHint : public SfxHint { private: - SCTAB nTab; + SCTAB nTab; public: TYPEINFO(); ScTabSizeChangedHint( SCTAB nTabNo = SCTAB_MAX ); - virtual ~ScTabSizeChangedHint(); + virtual ~ScTabSizeChangedHint(); - SCTAB GetTab() { return nTab; } + SCTAB GetTab() { return nTab; } }; // ----------------------------------------------------------------------- @@ -99,101 +99,101 @@ public: class SC_DLLPUBLIC ScDrawLayer : public FmFormModel { private: -//REMOVE SotStorageRef xPictureStorage; - String aName; - ScDocument* pDoc; - SdrUndoGroup* pUndoGroup; - BOOL bRecording; - BOOL bAdjustEnabled; - BOOL bHyphenatorSet; +//REMOVE SotStorageRef xPictureStorage; + String aName; + ScDocument* pDoc; + SdrUndoGroup* pUndoGroup; + BOOL bRecording; + BOOL bAdjustEnabled; + BOOL bHyphenatorSet; private: - void MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove, + void MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove, const Point& rTopLeft ); - void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, + void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos ); void RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos ); public: ScDrawLayer( ScDocument* pDocument, const String& rName ); - virtual ~ScDrawLayer(); + virtual ~ScDrawLayer(); virtual SdrPage* AllocPage(bool bMasterPage); virtual SdrModel* AllocModel() const; - virtual void SetChanged( sal_Bool bFlg = sal_True ); + virtual void SetChanged( sal_Bool bFlg = sal_True ); virtual Window* GetCurDocViewWin(); virtual SvStream* GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const; virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const; -//REMOVE void ReleasePictureStorage(); +//REMOVE void ReleasePictureStorage(); - BOOL HasObjects() const; + BOOL HasObjects() const; BOOL ScAddPage( SCTAB nTab ); - void ScRemovePage( SCTAB nTab ); - void ScRenamePage( SCTAB nTab, const String& rNewName ); - void ScMovePage( USHORT nOldPos, USHORT nNewPos ); + void ScRemovePage( SCTAB nTab ); + void ScRenamePage( SCTAB nTab, const String& rNewName ); + void ScMovePage( USHORT nOldPos, USHORT nNewPos ); // inkl. Inhalt, bAlloc=FALSE -> nur Inhalt - void ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ); + void ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ); - ScDocument* GetDocument() const { return pDoc; } + ScDocument* GetDocument() const { return pDoc; } - void UpdateBasic(); // DocShell-Basic in DrawPages setzen - void UseHyphenator(); + void UpdateBasic(); // DocShell-Basic in DrawPages setzen + void UseHyphenator(); - BOOL GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; + BOOL GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const; - // automatische Anpassungen + // automatische Anpassungen - void EnableAdjust( BOOL bSet = TRUE ) { bAdjustEnabled = bSet; } + void EnableAdjust( BOOL bSet = TRUE ) { bAdjustEnabled = bSet; } - void BeginCalcUndo(); - SdrUndoGroup* GetCalcUndo(); - BOOL IsRecording() const { return bRecording; } - void AddCalcUndo( SdrUndoAction* pUndo ); + void BeginCalcUndo(); + SdrUndoGroup* GetCalcUndo(); + BOOL IsRecording() const { return bRecording; } + void AddCalcUndo( SdrUndoAction* pUndo ); - void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, + void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2, SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos = true ); - void WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ); - void HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ); + void WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ); + void HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ); - BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true ); + BOOL HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow ); - void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, + void DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2 ); - void DeleteObjectsInSelection( const ScMarkData& rMark ); + void DeleteObjectsInSelection( const ScMarkData& rMark ); - void CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange ); - void CopyFromClip( ScDrawLayer* pClipModel, + void CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange ); + void CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const Rectangle& rSourceRange, const ScAddress& rDestPos, const Rectangle& rDestRange ); - void SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true ); + void SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true ); - // mirror or move between positive and negative positions for RTL - void MirrorRTL( SdrObject* pObj ); - static void MirrorRectRTL( Rectangle& rRect ); // for bounding rectangles etc. + // mirror or move between positive and negative positions for RTL + void MirrorRTL( SdrObject* pObj ); + static void MirrorRectRTL( Rectangle& rRect ); // for bounding rectangles etc. /** Returns the rectangle for the passed cell address in 1/100 mm. @param bMergedCell True = regards merged cells. False = use single column/row size. */ static Rectangle GetCellRect( ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell ); - // GetVisibleName: name for navigator etc: GetPersistName or GetName - // (ChartListenerCollection etc. must use GetPersistName directly) - static String GetVisibleName( SdrObject* pObj ); + // GetVisibleName: name for navigator etc: GetPersistName or GetName + // (ChartListenerCollection etc. must use GetPersistName directly) + static String GetVisibleName( SdrObject* pObj ); - SdrObject* GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const; + SdrObject* GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const; // if pnCounter != NULL, the search for a name starts with this index + 1, // and the index really used is returned. String GetNewGraphicName( long* pnCounter = NULL ) const; - void EnsureGraphicNames(); + void EnsureGraphicNames(); // Verankerung setzen und ermitteln - static void SetAnchor( SdrObject*, ScAnchorType ); - static ScAnchorType GetAnchor( const SdrObject* ); + static void SetAnchor( SdrObject*, ScAnchorType ); + static ScAnchorType GetAnchor( const SdrObject* ); // Positionen fuer Detektivlinien static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE ); @@ -218,9 +218,9 @@ public: static ScMacroInfo* GetMacroInfo( SdrObject* pObj, BOOL bCreate = FALSE ); private: - static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel + static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel public: - static void SetGlobalDrawPersist(SfxObjectShell* pPersist); + static void SetGlobalDrawPersist(SfxObjectShell* pPersist); protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); }; diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index 1e94cf2679dc..03302d61d548 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,121 +55,121 @@ public: ScHeaderFooterChangedHint(USHORT nP); ~ScHeaderFooterChangedHint(); - USHORT GetPart() const { return nPart; } + USHORT GetPart() const { return nPart; } }; -// all ScSharedHeaderFooterEditSource objects for a single text share the same data +// all ScSharedHeaderFooterEditSource objects for a single text share the same data class ScSharedHeaderFooterEditSource : public SvxEditSource { private: - ScHeaderFooterTextData* pTextData; + ScHeaderFooterTextData* pTextData; protected: - ScHeaderFooterTextData* GetTextData() const { return pTextData; } // for ScHeaderFooterEditSource + ScHeaderFooterTextData* GetTextData() const { return pTextData; } // for ScHeaderFooterEditSource public: ScSharedHeaderFooterEditSource( ScHeaderFooterTextData* pData ); - virtual ~ScSharedHeaderFooterEditSource(); + virtual ~ScSharedHeaderFooterEditSource(); - // GetEditEngine is needed because the forwarder doesn't have field functions - ScEditEngineDefaulter* GetEditEngine(); + // GetEditEngine is needed because the forwarder doesn't have field functions + ScEditEngineDefaulter* GetEditEngine(); - virtual SvxEditSource* Clone() const ; - virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxEditSource* Clone() const ; + virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual void UpdateData(); }; -// ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is used by field objects +// ScHeaderFooterEditSource with local copy of ScHeaderFooterTextData is used by field objects class ScHeaderFooterEditSource : public ScSharedHeaderFooterEditSource { public: ScHeaderFooterEditSource( ScHeaderFooterContentObj* pContent, USHORT nP ); ScHeaderFooterEditSource( ScHeaderFooterContentObj& rContent, USHORT nP ); - virtual ~ScHeaderFooterEditSource(); + virtual ~ScHeaderFooterEditSource(); - virtual SvxEditSource* Clone() const; + virtual SvxEditSource* Clone() const; }; -// Data (incl. EditEngine) for cell EditSource is now shared in ScCellTextData +// Data (incl. EditEngine) for cell EditSource is now shared in ScCellTextData class ScSharedCellEditSource : public SvxEditSource { private: - ScCellTextData* pCellTextData; + ScCellTextData* pCellTextData; protected: - ScCellTextData* GetCellTextData() const { return pCellTextData; } // for ScCellEditSource + ScCellTextData* GetCellTextData() const { return pCellTextData; } // for ScCellEditSource public: ScSharedCellEditSource( ScCellTextData* pData ); - virtual ~ScSharedCellEditSource(); + virtual ~ScSharedCellEditSource(); - // GetEditEngine is needed because the forwarder doesn't have field functions - ScEditEngineDefaulter* GetEditEngine(); + // GetEditEngine is needed because the forwarder doesn't have field functions + ScEditEngineDefaulter* GetEditEngine(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual void UpdateData(); - void SetDoUpdateData(sal_Bool bValue); - sal_Bool IsDirty() const; + void SetDoUpdateData(sal_Bool bValue); + sal_Bool IsDirty() const; }; -// ScCellEditSource with local copy of ScCellTextData is used by ScCellFieldsObj, ScCellFieldObj +// ScCellEditSource with local copy of ScCellTextData is used by ScCellFieldsObj, ScCellFieldObj class ScCellEditSource : public ScSharedCellEditSource { public: ScCellEditSource( ScDocShell* pDocSh, const ScAddress& rP ); - virtual ~ScCellEditSource(); + virtual ~ScCellEditSource(); - virtual SvxEditSource* Clone() const; + virtual SvxEditSource* Clone() const; }; class ScAnnotationEditSource : public SvxEditSource, public SfxListener { private: - ScDocShell* pDocShell; - ScAddress aCellPos; + ScDocShell* pDocShell; + ScAddress aCellPos; ScEditEngineDefaulter* pEditEngine; - SvxEditEngineForwarder* pForwarder; - BOOL bDataValid; + SvxEditEngineForwarder* pForwarder; + BOOL bDataValid; SdrObject* GetCaptionObj(); public: ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScAnnotationEditSource(); + virtual ~ScAnnotationEditSource(); - virtual SvxEditSource* Clone() const ; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const ; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -// EditSource with a shared forwarder for all children of one text object +// EditSource with a shared forwarder for all children of one text object class ScSimpleEditSource : public SvxEditSource { private: - SvxTextForwarder* pForwarder; + SvxTextForwarder* pForwarder; public: ScSimpleEditSource( SvxTextForwarder* pForw ); - virtual ~ScSimpleEditSource(); + virtual ~ScSimpleEditSource(); - virtual SvxEditSource* Clone() const ; - virtual SvxTextForwarder* GetTextForwarder(); - virtual void UpdateData(); + virtual SvxEditSource* Clone() const ; + virtual SvxTextForwarder* GetTextForwarder(); + virtual void UpdateData(); }; @@ -180,14 +180,14 @@ private: public: ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ); - virtual ~ScAccessibilityEditSource(); - - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); - virtual void UpdateData(); - virtual SfxBroadcaster& GetBroadcaster() const; + virtual ~ScAccessibilityEditSource(); + + virtual SvxEditSource* Clone() const; + virtual SvxTextForwarder* GetTextForwarder(); + virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool bCreate = sal_False ); + virtual void UpdateData(); + virtual SfxBroadcaster& GetBroadcaster() const; }; #endif diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 52f42d0f2670..b9af426504db 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,16 +46,16 @@ class ScEditEngineDefaulter; class ScEditUtil { - ScDocument* pDoc; - SCCOL nCol; - SCROW nRow; - SCTAB nTab; - Point aScrPos; - OutputDevice* pDev; // MapMode muss eingestellt sein - double nPPTX; - double nPPTY; - Fraction aZoomX; - Fraction aZoomY; + ScDocument* pDoc; + SCCOL nCol; + SCROW nRow; + SCTAB nTab; + Point aScrPos; + OutputDevice* pDev; // MapMode muss eingestellt sein + double nPPTX; + double nPPTY; + Fraction aZoomX; + Fraction aZoomY; static const char __FAR_DATA pCalcDelimiters[]; @@ -77,24 +77,24 @@ public: aScrPos(rScrPosPixel),pDev(pDevice), nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {} - Rectangle GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop ); + Rectangle GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToTop ); }; class ScEditAttrTester { ScEditEngineDefaulter* pEngine; - SfxItemSet* pEditAttrs; - BOOL bNeedsObject; - BOOL bNeedsCellAttr; + SfxItemSet* pEditAttrs; + BOOL bNeedsObject; + BOOL bNeedsCellAttr; public: ScEditAttrTester( ScEditEngineDefaulter* pEng ); ~ScEditAttrTester(); - BOOL NeedsObject() const { return bNeedsObject; } - BOOL NeedsCellAttr() const { return bNeedsCellAttr; } - const SfxItemSet& GetAttribs() const { return *pEditAttrs; } + BOOL NeedsObject() const { return bNeedsObject; } + BOOL NeedsCellAttr() const { return bNeedsCellAttr; } + const SfxItemSet& GetAttribs() const { return *pEditAttrs; } }; @@ -102,15 +102,15 @@ public: class ScEnginePoolHelper { protected: - SfxItemPool* pEnginePool; - SfxItemSet* pDefaults; - BOOL bDeleteEnginePool; - BOOL bDeleteDefaults; + SfxItemPool* pEnginePool; + SfxItemSet* pDefaults; + BOOL bDeleteEnginePool; + BOOL bDeleteDefaults; ScEnginePoolHelper( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool = FALSE ); ScEnginePoolHelper( const ScEnginePoolHelper& rOrg ); - virtual ~ScEnginePoolHelper(); + virtual ~ScEnginePoolHelper(); }; @@ -127,47 +127,47 @@ public: /// If rOrg.bDeleteEnginePool: pool gets cloned and will be /// deleted on destruction. Defaults are not set. ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg ); - virtual ~ScEditEngineDefaulter(); + virtual ~ScEditEngineDefaulter(); /// Creates a copy of SfxItemSet if bRememberCopy set - void SetDefaults( const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); + void SetDefaults( const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); /// Becomes the owner of the SfxItemSet if bTakeOwnership set - void SetDefaults( SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); + void SetDefaults( SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); /// Set the item in the default ItemSet which is created /// if it doesn't exist yet. /// The default ItemSet is then applied to each paragraph. - void SetDefaultItem( const SfxPoolItem& rItem ); + void SetDefaultItem( const SfxPoolItem& rItem ); /// Returns the stored defaults, used to find non-default character attributes const SfxItemSet& GetDefaults(); /// Overwritten method to be able to apply defaults already set - void SetText( const EditTextObject& rTextObject ); + void SetText( const EditTextObject& rTextObject ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const EditTextObject& rTextObject, + void SetTextNewDefaults( const EditTextObject& rTextObject, const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const EditTextObject& rTextObject, + void SetTextNewDefaults( const EditTextObject& rTextObject, SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); /// Overwritten method to be able to apply defaults already set - void SetText( const String& rText ); + void SetText( const String& rText ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const String& rText, + void SetTextNewDefaults( const String& rText, const SfxItemSet& rDefaults, BOOL bRememberCopy = TRUE ); /// Current defaults are not applied, new defaults are applied - void SetTextNewDefaults( const String& rText, + void SetTextNewDefaults( const String& rText, SfxItemSet* pDefaults, BOOL bTakeOwnership = TRUE ); /// Paragraph attributes that are not defaults are copied to /// character attributes and all paragraph attributes reset - void RemoveParaAttribs(); + void RemoveParaAttribs(); /// Re-apply existing defaults if set, same as in SetText, /// but without EnableUndo/SetUpdateMode. - void RepeatDefaults(); + void RepeatDefaults(); }; @@ -175,9 +175,9 @@ public: class SC_DLLPUBLIC ScTabEditEngine : public ScEditEngineDefaulter { private: - void Init(const ScPatternAttr& rPattern); + void Init(const ScPatternAttr& rPattern); public: - ScTabEditEngine( ScDocument* pDoc ); // Default + ScTabEditEngine( ScDocument* pDoc ); // Default // pEnginePool = ScDocument.GetEnginePool() // pTextObjectPool = ScDocument.GetEditPool() ScTabEditEngine( const ScPatternAttr& rPattern, @@ -188,15 +188,15 @@ public: struct ScHeaderFieldData { - String aTitle; // Titel oder Dateiname wenn kein Titel - String aLongDocName; // Pfad und Dateiname - String aShortDocName; // nur Dateiname - String aTabName; - Date aDate; - Time aTime; - long nPageNo; - long nTotalPages; - SvxNumType eNumType; + String aTitle; // Titel oder Dateiname wenn kein Titel + String aLongDocName; // Pfad und Dateiname + String aShortDocName; // nur Dateiname + String aTabName; + Date aDate; + Time aTime; + long nPageNo; + long nTotalPages; + SvxNumType eNumType; ScHeaderFieldData(); }; @@ -206,7 +206,7 @@ struct ScHeaderFieldData class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter { private: - BOOL bExecuteURL; + BOOL bExecuteURL; public: // pEnginePool = ScDocument.GetEnginePool() @@ -215,10 +215,10 @@ public: SfxItemPool* pTextObjectPool = NULL, BOOL bDeleteEnginePool = FALSE ); - void SetExecuteURL(BOOL bSet) { bExecuteURL = bSet; } + void SetExecuteURL(BOOL bSet) { bExecuteURL = bSet; } - virtual void FieldClicked( const SvxFieldItem& rField, USHORT, USHORT ); - virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT, USHORT ); + virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); }; @@ -226,22 +226,22 @@ public: class SC_DLLPUBLIC ScHeaderEditEngine : public ScEditEngineDefaulter { private: - ScHeaderFieldData aData; + ScHeaderFieldData aData; public: ScHeaderEditEngine( SfxItemPool* pEnginePool, BOOL bDeleteEnginePool = FALSE ); virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); - void SetTitle(const String& rNew) { aData.aTitle = rNew; } - void SetLongDocName(const String& rNew) { aData.aLongDocName = rNew; } - void SetShortDocName(const String& rNew) { aData.aShortDocName = rNew; } - void SetTabName(const String& rNew) { aData.aTabName = rNew; } - void SetDate(const Date& rNew) { aData.aDate = rNew; } - void SetTime(const Time& rNew) { aData.aTime = rNew; } - void SetPageNo(long nNew) { aData.nPageNo = nNew; } - void SetTotalPages(long nNew) { aData.nTotalPages = nNew; } - void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } - void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } + void SetTitle(const String& rNew) { aData.aTitle = rNew; } + void SetLongDocName(const String& rNew) { aData.aLongDocName = rNew; } + void SetShortDocName(const String& rNew) { aData.aShortDocName = rNew; } + void SetTabName(const String& rNew) { aData.aTabName = rNew; } + void SetDate(const Date& rNew) { aData.aDate = rNew; } + void SetTime(const Time& rNew) { aData.aTime = rNew; } + void SetPageNo(long nNew) { aData.nPageNo = nNew; } + void SetTotalPages(long nNew) { aData.nTotalPages = nNew; } + void SetNumType(SvxNumType eNew) { aData.eNumType = eNew; } + void SetData(const ScHeaderFieldData& rNew) { aData = rNew; } }; // for Note text objects. @@ -257,7 +257,7 @@ public: }; -// SvxFieldData-Ableitungen sind nach Svx verschoben +// SvxFieldData-Ableitungen sind nach Svx verschoben #endif diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index 602b650d8f06..1077caf22b38 100644 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index ae4aec33979d..5f85ef3a09fc 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "address.hxx" #include "mutexhlp.hxx" - + #include <svl/lstner.hxx> #include <svl/itemprop.hxx> #include <editeng/editdata.hxx> @@ -67,21 +67,21 @@ class ScCellFieldsObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxEditSource* pEditSource; - /// List of refresh listeners. + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxEditSource* pEditSource; + /// List of refresh listeners. cppu::OInterfaceContainerHelper* mpRefreshListeners; /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - ScCellFieldObj* GetObjectByIndex_Impl(INT32 Index) const; + ScCellFieldObj* GetObjectByIndex_Impl(INT32 Index) const; public: ScCellFieldsObj(ScDocShell* pDocSh, const ScAddress& rPos); - virtual ~ScCellFieldsObj(); + virtual ~ScCellFieldsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -100,17 +100,17 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh( ) + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< @@ -136,29 +136,29 @@ class ScCellFieldObj : public ScMutexHelper, public SfxListener { private: - const SfxItemPropertySet* pPropSet; - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxEditSource* pEditSource; - ESelection aSelection; + const SfxItemPropertySet* pPropSet; + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxEditSource* pEditSource; + ESelection aSelection; - String aUrl; // Inhalt, wenn noch nicht eingefuegt (nur dann!) - String aRepresentation; - String aTarget; + String aUrl; // Inhalt, wenn noch nicht eingefuegt (nur dann!) + String aRepresentation; + String aTarget; ScCellFieldObj(); // disabled public: ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel); - virtual ~ScCellFieldObj(); + virtual ~ScCellFieldObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // per getImplementation gerufen: - void DeleteField(); - BOOL IsInserted() const { return pEditSource != NULL; } - SvxFieldItem CreateFieldItem(); - void InitDoc( ScDocShell* pDocSh, const ScAddress& rPos, + void DeleteField(); + BOOL IsInserted() const { return pEditSource != NULL; } + SvxFieldItem CreateFieldItem(); + void InitDoc( ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel ); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( @@ -167,15 +167,15 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTextField virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -183,11 +183,11 @@ public: getAnchor() throw(::com::sun::star::uno::RuntimeException); // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); @@ -195,7 +195,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -207,25 +207,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -266,22 +266,22 @@ class ScHeaderFieldsObj : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScHeaderFooterContentObj* pContentObj; - USHORT nPart; - UINT16 nType; - SvxEditSource* pEditSource; + ScHeaderFooterContentObj* pContentObj; + USHORT nPart; + UINT16 nType; + SvxEditSource* pEditSource; - /// List of refresh listeners. + /// List of refresh listeners. cppu::OInterfaceContainerHelper* mpRefreshListeners; /// mutex to lock the InterfaceContainerHelper osl::Mutex aMutex; - ScHeaderFieldObj* GetObjectByIndex_Impl(INT32 Index) const; + ScHeaderFieldObj* GetObjectByIndex_Impl(INT32 Index) const; public: ScHeaderFieldsObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT); - virtual ~ScHeaderFieldsObj(); + virtual ~ScHeaderFieldsObj(); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -300,17 +300,17 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XContainer - virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh( ) + virtual void SAL_CALL refresh( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< @@ -336,24 +336,24 @@ class ScHeaderFieldObj : public ScMutexHelper, { private: const SfxItemPropertySet* pPropSet; - ScHeaderFooterContentObj* pContentObj; - USHORT nPart; - UINT16 nType; - SvxEditSource* pEditSource; - ESelection aSelection; - sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted - - ScHeaderFieldObj(); // disabled + ScHeaderFooterContentObj* pContentObj; + USHORT nPart; + UINT16 nType; + SvxEditSource* pEditSource; + ESelection aSelection; + sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted + + ScHeaderFieldObj(); // disabled public: ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT, const ESelection& rSel); - virtual ~ScHeaderFieldObj(); + virtual ~ScHeaderFieldObj(); // per getImplementation gerufen: - void DeleteField(); - BOOL IsInserted() const { return pEditSource != NULL; } - SvxFieldItem CreateFieldItem(); - void InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP, + void DeleteField(); + BOOL IsInserted() const { return pEditSource != NULL; } + SvxFieldItem CreateFieldItem(); + void InitDoc( ScHeaderFooterContentObj* pContent, USHORT nP, const ESelection& rSel ); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( @@ -362,15 +362,15 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XTextField virtual ::rtl::OUString SAL_CALL getPresentation( sal_Bool bShowCommand ) throw(::com::sun::star::uno::RuntimeException); // XTextContent - virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -378,11 +378,11 @@ public: getAnchor() throw(::com::sun::star::uno::RuntimeException); // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); @@ -390,7 +390,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -402,25 +402,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx index ead88f29053c..b59f5f0efcbe 100644 --- a/sc/inc/fillinfo.hxx +++ b/sc/inc/fillinfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 2f00b29e7651..1ded2aac61fb 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,27 +42,27 @@ class ScDocument; class ScRange; class SvNumberFormatter; -// Return-Werte Im-/Exportfilter (ULONG) +// Return-Werte Im-/Exportfilter (ULONG) typedef ULONG FltError; //enum FltError { -#define eERR_OK ERRCODE_NONE // kein Fehler, alles OK -#define eERR_OPEN SCERR_IMPORT_OPEN // ... -#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unbekannter Fehler, auch historische Bedeutung -#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // nicht mehr genuegend Speicher zur Verfuegung -#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unbekanntes WK?-Format (Lotus 1-2-3) -#define eERR_FORMAT SCERR_IMPORT_FORMAT // Formatfehler beim Lesen (kein Formel-Fehler!) -#define eERR_NI SCERR_IMPORT_NI // Nicht implementierter Filter -#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unbekanntes BIFF-Format (Excel) -#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // nicht implementiertes BIFF-Format -#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // File Passwordgeschuetzt -#define eERR_INTERN SCERR_IMPORT_INTERNAL // interner Fehler -#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// ueberlauf der Zellkoordinaten: - // Tabelle abgschnitten auf erlaubtem Bereich +#define eERR_OK ERRCODE_NONE // kein Fehler, alles OK +#define eERR_OPEN SCERR_IMPORT_OPEN // ... +#define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unbekannter Fehler, auch historische Bedeutung +#define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // nicht mehr genuegend Speicher zur Verfuegung +#define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unbekanntes WK?-Format (Lotus 1-2-3) +#define eERR_FORMAT SCERR_IMPORT_FORMAT // Formatfehler beim Lesen (kein Formel-Fehler!) +#define eERR_NI SCERR_IMPORT_NI // Nicht implementierter Filter +#define eERR_UNKN_BIFF SCERR_IMPORT_UNKNOWN_BIFF // unbekanntes BIFF-Format (Excel) +#define eERR_NI_BIFF SCERR_IMPORT_NI_BIFF // nicht implementiertes BIFF-Format +#define eERR_FILEPASSWD SCERR_IMPORT_FILEPASSWD // File Passwordgeschuetzt +#define eERR_INTERN SCERR_IMPORT_INTERNAL // interner Fehler +#define eERR_RNGOVRFLW SCWARN_IMPORT_RANGE_OVERFLOW// ueberlauf der Zellkoordinaten: + // Tabelle abgschnitten auf erlaubtem Bereich // mehr Fehlercodes siehe scerrors.hxx -// }; +// }; // fuer Import @@ -74,12 +74,12 @@ enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, ExpB // Optionen fuer DIF-Im-/Export (Kombination ueber '|') -#define SC_DIFOPT_PLAIN 0x00000000 -#define SC_DIFOPT_DATE 0x00000001 -#define SC_DIFOPT_TIME 0x00000002 -#define SC_DIFOPT_CURRENCY 0x00000004 +#define SC_DIFOPT_PLAIN 0x00000000 +#define SC_DIFOPT_DATE 0x00000001 +#define SC_DIFOPT_TIME 0x00000002 +#define SC_DIFOPT_CURRENCY 0x00000004 -#define SC_DIFOPT_EXCEL (SC_DIFOPT_DATE|SC_DIFOPT_TIME|SC_DIFOPT_CURRENCY) +#define SC_DIFOPT_EXCEL (SC_DIFOPT_DATE|SC_DIFOPT_TIME|SC_DIFOPT_CURRENCY) // These are implemented inside the scfilt library and lazy loaded @@ -91,8 +91,8 @@ class ScEEAbsImport { virtual ~ScEEAbsImport() {} virtual ULONG Read( SvStream& rStream, const String& rBaseURL ) = 0; virtual ScRange GetRange() = 0; - virtual void WriteToDocument( - BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, + virtual void WriteToDocument( + BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; }; @@ -102,15 +102,15 @@ class ScFormatFilterPlugin { virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ) = 0; virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) = 0; virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) = 0; - // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet - // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) - // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) + // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet + // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) + // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ) = 0; virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ) = 0; - virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, + virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0; // various import helpers diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index 62ac5a893cc7..7ba47662e7f9 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,23 +39,23 @@ class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem { - BOOL bWK3Flag; - double fExcelColScale; - double fExcelRowScale; + BOOL bWK3Flag; + double fExcelColScale; + double fExcelRowScale; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: ScFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Commit(); - BOOL GetWK3Flag() const { return bWK3Flag; } - double GetExcelColScale() const { return fExcelColScale; } - double GetExcelRowScale() const { return fExcelRowScale; } + BOOL GetWK3Flag() const { return bWK3Flag; } + double GetExcelColScale() const { return fExcelColScale; } + double GetExcelRowScale() const { return fExcelRowScale; } - // values are never modified by office + // values are never modified by office }; diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index e42bfc19b386..6f7c841681e0 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,24 +56,24 @@ class ScFilterOptionsObj : public ::cppu::WeakImplHelper5< ::com::sun::star::lang::XServiceInfo > { private: - ::rtl::OUString aFileName; - ::rtl::OUString aFilterName; - ::rtl::OUString aFilterOptions; + ::rtl::OUString aFileName; + ::rtl::OUString aFilterName; + ::rtl::OUString aFilterOptions; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream; - sal_Bool bExport; + sal_Bool bExport; public: ScFilterOptionsObj(); - virtual ~ScFilterOptionsObj(); + virtual ~ScFilterOptionsObj(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString> getSupportedServiceNames_Static(); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -82,18 +82,18 @@ public: ::com::sun::star::uno::RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index cded07b92349..cd4aaca41fdf 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,28 +83,28 @@ class ScTableConditionalFormat : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - List aEntries; + List aEntries; - ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; + ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; void AddEntry_Impl(const ScCondFormatEntryItem& aEntry); ScTableConditionalFormat(); // disable public: ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey, formula::FormulaGrammar::Grammar eGrammar); - virtual ~ScTableConditionalFormat(); + virtual ~ScTableConditionalFormat(); void FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar) const; - void DataChanged(); + void DataChanged(); // XSheetConditionalEntries - virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aConditionalEntry ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL clear() throw(::com::sun::star::uno::RuntimeException); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -158,27 +158,27 @@ class ScTableConditionalEntry : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScTableConditionalFormat* pParent; + ScTableConditionalFormat* pParent; ScCondFormatEntryItem aData; ScTableConditionalEntry(); // disabled public: ScTableConditionalEntry(ScTableConditionalFormat* pPar, const ScCondFormatEntryItem& aItem); - virtual ~ScTableConditionalEntry(); + virtual ~ScTableConditionalEntry(); void GetData(ScCondFormatEntryItem& rData) const; // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) + virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -186,8 +186,8 @@ public: throw(::com::sun::star::uno::RuntimeException); // XSheetConditionalEntry - virtual ::rtl::OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStyleName( const ::rtl::OUString& aStyleName ) + virtual ::rtl::OUString SAL_CALL getStyleName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setStyleName( const ::rtl::OUString& aStyleName ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -209,51 +209,51 @@ class ScTableValidationObj : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - SfxItemPropertySet aPropSet; - USHORT nMode; // enum ScConditionMode - String aExpr1; - String aExpr2; + SfxItemPropertySet aPropSet; + USHORT nMode; // enum ScConditionMode + String aExpr1; + String aExpr2; String maExprNmsp1; String maExprNmsp2; formula::FormulaGrammar::Grammar meGrammar1; // grammar used with aExpr1 and aExpr2 formula::FormulaGrammar::Grammar meGrammar2; // grammar used with aExpr1 and aExpr2 ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens1; ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2; - ScAddress aSrcPos; + ScAddress aSrcPos; String aPosString; // formula position as text - USHORT nValMode; // enum ScValidationMode - BOOL bIgnoreBlank; + USHORT nValMode; // enum ScValidationMode + BOOL bIgnoreBlank; sal_Int16 nShowList; - BOOL bShowInput; - String aInputTitle; - String aInputMessage; - BOOL bShowError; - USHORT nErrorStyle; // enum ScValidErrorStyle - String aErrorTitle; - String aErrorMessage; + BOOL bShowInput; + String aInputTitle; + String aInputMessage; + BOOL bShowError; + USHORT nErrorStyle; // enum ScValidErrorStyle + String aErrorTitle; + String aErrorMessage; - void ClearData_Impl(); + void ClearData_Impl(); ScTableValidationObj(); // disabled public: ScTableValidationObj(ScDocument* pDoc, ULONG nKey, const formula::FormulaGrammar::Grammar eGrammar); - virtual ~ScTableValidationObj(); + virtual ~ScTableValidationObj(); - ScValidationData* CreateValidationData( ScDocument* pDoc, + ScValidationData* CreateValidationData( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const; - void DataChanged(); + void DataChanged(); // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) + virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) + virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 ) throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getFormula2() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) + virtual void SAL_CALL setFormula2( const ::rtl::OUString& aFormula2 ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getSourcePosition() throw(::com::sun::star::uno::RuntimeException); @@ -273,7 +273,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -285,25 +285,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx index f092401801e9..4d17ab256fca 100644 --- a/sc/inc/forbiuno.hxx +++ b/sc/inc/forbiuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,20 +36,20 @@ class ScDocShell; //------------------------------------------------------------------------ -// object to set forbidden charaters to document +// object to set forbidden charaters to document class ScForbiddenCharsObj : public SvxUnoForbiddenCharsTable, public SfxListener { - ScDocShell* pDocShell; + ScDocShell* pDocShell; protected: - virtual void onChange(); + virtual void onChange(); public: ScForbiddenCharsObj( ScDocShell* pDocSh ); - virtual ~ScForbiddenCharsObj(); + virtual ~ScForbiddenCharsObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; #endif diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index 3d5b96fbecaf..2d65f429fd27 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index c490b69ec949..4c940348116d 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -160,7 +160,7 @@ public: details instead. */ inline bool IsValue() const; - /** Determines whether or not the result is a string containing more than + /** Determines whether or not the result is a string containing more than one paragraph */ inline bool IsMultiline() const; @@ -320,7 +320,7 @@ inline void ScFormulaResult::SetToken( const formula::FormulaToken* p ) dynamic_cast<const ScMatrixCellResultToken*>(p) : NULL); if (pMatResult) { - const ScMatrixFormulaCellToken* pNewMatFormula = + const ScMatrixFormulaCellToken* pNewMatFormula = dynamic_cast<const ScMatrixFormulaCellToken*>(pMatResult); if (pNewMatFormula) { diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 9f5e4d08c341..3640bfc044cb 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ public: ParameterFlags() : bOptional(false), bSuppress(false) {} }; - + ScFuncDesc(); virtual ~ScFuncDesc(); @@ -84,8 +84,8 @@ public: String GetParamList () const; /** Returns the full function signature: "FUNCTIONNAME( parameter list )". */ String GetSignature () const; - - + + /** Returns the number of non-suppressed arguments. In case there are variable arguments the number of fixed non-suppressed arguments plus @@ -170,7 +170,7 @@ public: virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; - virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const; + virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const; private: ScFunctionList* pFuncList; List* aCatLists[MAX_FUNCCAT]; diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 53510f55d600..fd48efbeb238 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,19 +48,19 @@ class ScDocOptions; class ScTempDocCache { private: - ScDocument* pDoc; - BOOL bInUse; + ScDocument* pDoc; + BOOL bInUse; public: ScTempDocCache(); ~ScTempDocCache(); - ScDocument* GetDocument() const { return pDoc; } - BOOL IsInUse() const { return bInUse; } - void SetInUse( BOOL bSet ) { bInUse = bSet; } + ScDocument* GetDocument() const { return pDoc; } + BOOL IsInUse() const { return bInUse; } + void SetInUse( BOOL bSet ) { bInUse = bSet; } - void SetDocument( ScDocument* pNew ); - void Clear(); + void SetDocument( ScDocument* pNew ); + void Clear(); }; class ScFunctionAccess : public cppu::WeakImplHelper3< @@ -70,20 +70,20 @@ class ScFunctionAccess : public cppu::WeakImplHelper3< public SfxListener { private: - ScTempDocCache aDocCache; - ScDocOptions* pOptions; + ScTempDocCache aDocCache; + ScDocOptions* pOptions; SfxItemPropertyMap aPropertyMap; bool mbArray; bool mbValid; public: ScFunctionAccess(); - virtual ~ScFunctionAccess(); + virtual ~ScFunctionAccess(); - static ::rtl::OUString getImplementationName_Static(); + static ::rtl::OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XFunctionAccess virtual ::com::sun::star::uno::Any SAL_CALL callFunction( @@ -98,7 +98,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -110,25 +110,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 49ab758b7d0b..bf364a9119cf 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ extern "C" { void DumpCAP(); }; -#define S_CAP StartCAP(); -#define E_CAP StopCAP(); DumpCAP(); +#define S_CAP StartCAP(); +#define E_CAP StopCAP(); DumpCAP(); #endif @@ -86,19 +86,19 @@ extern "C" { //------------------------------------------------------------------------ -// die 1000 Namen des Calc... -// Clipboard-Namen sind jetzt in so3/soapp.hxx -// STRING_SCAPP war "scalc3", "scalc4", jetzt nur noch "scalc" +// die 1000 Namen des Calc... +// Clipboard-Namen sind jetzt in so3/soapp.hxx +// STRING_SCAPP war "scalc3", "scalc4", jetzt nur noch "scalc" -#define STRING_SCAPP "scalc" -#define STRING_SCSTREAM "StarCalcDocument" +#define STRING_SCAPP "scalc" +#define STRING_SCSTREAM "StarCalcDocument" -#define STRING_STANDARD "Standard" +#define STRING_STANDARD "Standard" // characters ----------------------------------------------------------------- -// '\r' geht auf'm Mac nicht... -#define CHAR_CR char(13) +// '\r' geht auf'm Mac nicht... +#define CHAR_CR char(13) const sal_Unicode CHAR_NBSP = 0x00A0; const sal_Unicode CHAR_SHY = 0x00AD; @@ -110,11 +110,11 @@ const sal_Unicode CHAR_ZWNBSP = 0x2060; // ---------------------------------------------------------------------------- -#define MINDOUBLE 1.7e-307 -#define MAXDOUBLE 1.7e307 +#define MINDOUBLE 1.7e-307 +#define MAXDOUBLE 1.7e307 -#define MINZOOM 20 -#define MAXZOOM 400 +#define MINZOOM 20 +#define MAXZOOM 400 #ifdef SC_ROWLIMIT_TYPECONVERSION_NOCONVPASS const size_t MAXSUBTOTAL = 3; @@ -143,60 +143,60 @@ const SCSIZE PIVOT_MAXPAGEFIELD = 10; #define PIXEL_PER_INCH 96.0 #define CM_PER_INCH 2.54 -#define POINTS_PER_INCH 72.27 -#define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH) -#define INCHT_PER_CM (1.0 / CM_PER_INCH) -#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH) -#define TWIPS_PER_POINT 20.0 -#define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH) -#define TWIPS_PER_CM (TWIPS_PER_INCH / CM_PER_INCH) -#define CM_PER_TWIPS (CM_PER_INCH / TWIPS_PER_INCH) -#define TWIPS_PER_PIXEL (TWIPS_PER_INCH / PIXEL_PER_INCH) -#define TWIPS_PER_CHAR (TWIPS_PER_INCH / 13.6) -#define PIXEL_PER_TWIPS (PIXEL_PER_INCH / TWIPS_PER_INCH) -#define HMM_PER_TWIPS (CM_PER_TWIPS * 1000.0) - -#define STD_COL_WIDTH 1285 -#define STD_EXTRA_WIDTH 113 // 2mm Extra fuer optimale Breite +#define POINTS_PER_INCH 72.27 +#define PIXEL_PER_POINT (PIXEL_PER_INCH / POINTS_PER_INCH) +#define INCHT_PER_CM (1.0 / CM_PER_INCH) +#define POINTS_PER_CM (POINTS_PER_INCH / CM_PER_INCH) +#define TWIPS_PER_POINT 20.0 +#define TWIPS_PER_INCH (TWIPS_PER_POINT * POINTS_PER_INCH) +#define TWIPS_PER_CM (TWIPS_PER_INCH / CM_PER_INCH) +#define CM_PER_TWIPS (CM_PER_INCH / TWIPS_PER_INCH) +#define TWIPS_PER_PIXEL (TWIPS_PER_INCH / PIXEL_PER_INCH) +#define TWIPS_PER_CHAR (TWIPS_PER_INCH / 13.6) +#define PIXEL_PER_TWIPS (PIXEL_PER_INCH / TWIPS_PER_INCH) +#define HMM_PER_TWIPS (CM_PER_TWIPS * 1000.0) + +#define STD_COL_WIDTH 1285 +#define STD_EXTRA_WIDTH 113 // 2mm Extra fuer optimale Breite // Standard Zeilenhoehe: Text + Rand - STD_ROWHEIGHT_DIFF -#define MAX_EXTRA_WIDTH 23811 // 42cm in TWIPS -#define MAX_EXTRA_HEIGHT 23811 -#define MAX_COL_WIDTH 56693 // 1m in TWIPS -#define MAX_COL_HEIGHT 56693 +#define MAX_EXTRA_WIDTH 23811 // 42cm in TWIPS +#define MAX_EXTRA_HEIGHT 23811 +#define MAX_COL_WIDTH 56693 // 1m in TWIPS +#define MAX_COL_HEIGHT 56693 -#define STD_ROWHEIGHT_DIFF 23 -#define STD_FONT_HEIGHT 200 // entspricht 10 Punkt +#define STD_ROWHEIGHT_DIFF 23 +#define STD_FONT_HEIGHT 200 // entspricht 10 Punkt -//! statt STD_ROW_HEIGHT ScGlobal::nStdRowHeight benutzen ! +//! statt STD_ROW_HEIGHT ScGlobal::nStdRowHeight benutzen ! -#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT) // 256 Twips, 0.45 cm +#define STD_ROW_HEIGHT (12.8 * TWIPS_PER_POINT) // 256 Twips, 0.45 cm // Standardgroesse als Ole-Server (Zellen) -#define OLE_STD_CELLS_X 4 -#define OLE_STD_CELLS_Y 5 +#define OLE_STD_CELLS_X 4 +#define OLE_STD_CELLS_Y 5 -#define SC_SIZE_OPTIMUM 0xFFFF +#define SC_SIZE_OPTIMUM 0xFFFF // Update-Flags -#define UF_SCROLL_LEFT 1 -#define UF_SCROLL_RIGHT 2 -#define UF_SCROLL_UP 4 -#define UF_SCROLL_DOWN 8 -#define UF_ROW 16 -#define UF_VIEW 32 +#define UF_SCROLL_LEFT 1 +#define UF_SCROLL_RIGHT 2 +#define UF_SCROLL_UP 4 +#define UF_SCROLL_DOWN 8 +#define UF_ROW 16 +#define UF_VIEW 32 // Repaint-Flags (fuer Messages) -#define PAINT_GRID 1 -#define PAINT_TOP 2 -#define PAINT_LEFT 4 -#define PAINT_EXTRAS 8 -#define PAINT_INVERT 16 -#define PAINT_MARKS 32 -#define PAINT_OBJECTS 64 -#define PAINT_SIZE 128 -#define PAINT_ALL ( PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_OBJECTS | PAINT_SIZE ) +#define PAINT_GRID 1 +#define PAINT_TOP 2 +#define PAINT_LEFT 4 +#define PAINT_EXTRAS 8 +#define PAINT_INVERT 16 +#define PAINT_MARKS 32 +#define PAINT_OBJECTS 64 +#define PAINT_SIZE 128 +#define PAINT_ALL ( PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_OBJECTS | PAINT_SIZE ) // Flags fuer Spalten / Zeilen @@ -236,64 +236,64 @@ const USHORT IDF_ADDNOTES = 0x0400; /// Internal use only (copy from clip): /// Copy flags for auto/series fill functions: do not touch notes and drawing objects. const USHORT IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); -#define PASTE_NOFUNC 0 -#define PASTE_ADD 1 -#define PASTE_SUB 2 -#define PASTE_MUL 3 -#define PASTE_DIV 4 +#define PASTE_NOFUNC 0 +#define PASTE_ADD 1 +#define PASTE_SUB 2 +#define PASTE_MUL 3 +#define PASTE_DIV 4 -#define PASTE_NONEMPTY 5 +#define PASTE_NONEMPTY 5 // Bits fuer HasAttr -#define HASATTR_LINES 1 -#define HASATTR_MERGED 2 -#define HASATTR_OVERLAPPED 4 -#define HASATTR_PROTECTED 8 -#define HASATTR_SHADOW 16 -#define HASATTR_NEEDHEIGHT 32 -#define HASATTR_SHADOW_RIGHT 64 -#define HASATTR_SHADOW_DOWN 128 -#define HASATTR_AUTOFILTER 256 -#define HASATTR_CONDITIONAL 512 -#define HASATTR_ROTATE 1024 -#define HASATTR_NOTOVERLAPPED 2048 -#define HASATTR_RTL 4096 +#define HASATTR_LINES 1 +#define HASATTR_MERGED 2 +#define HASATTR_OVERLAPPED 4 +#define HASATTR_PROTECTED 8 +#define HASATTR_SHADOW 16 +#define HASATTR_NEEDHEIGHT 32 +#define HASATTR_SHADOW_RIGHT 64 +#define HASATTR_SHADOW_DOWN 128 +#define HASATTR_AUTOFILTER 256 +#define HASATTR_CONDITIONAL 512 +#define HASATTR_ROTATE 1024 +#define HASATTR_NOTOVERLAPPED 2048 +#define HASATTR_RTL 4096 #define HASATTR_RIGHTORCENTER 8192 // right or centered logical alignment -#define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) +#define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) #define EMPTY_STRING ScGlobal::GetEmptyString() - // Layer-ID's fuer Drawing -#define SC_LAYER_FRONT 0 -#define SC_LAYER_BACK 1 -#define SC_LAYER_INTERN 2 -#define SC_LAYER_CONTROLS 3 + // Layer-ID's fuer Drawing +#define SC_LAYER_FRONT 0 +#define SC_LAYER_BACK 1 +#define SC_LAYER_INTERN 2 +#define SC_LAYER_CONTROLS 3 #define SC_LAYER_HIDDEN 4 - // Tabellen linken -#define SC_LINK_NONE 0 -#define SC_LINK_NORMAL 1 -#define SC_LINK_VALUE 2 + // Tabellen linken +#define SC_LINK_NONE 0 +#define SC_LINK_NORMAL 1 +#define SC_LINK_VALUE 2 - // Eingabe -#define SC_ENTER_NORMAL 0 -#define SC_ENTER_BLOCK 1 -#define SC_ENTER_MATRIX 2 + // Eingabe +#define SC_ENTER_NORMAL 0 +#define SC_ENTER_BLOCK 1 +#define SC_ENTER_MATRIX 2 - // Step = 10pt, max. Einzug = 100 Schritte -#define SC_INDENT_STEP 200 -#define SC_MAX_INDENT 20000 + // Step = 10pt, max. Einzug = 100 Schritte +#define SC_INDENT_STEP 200 +#define SC_MAX_INDENT 20000 - // Szenario-Flags -#define SC_SCENARIO_COPYALL 1 -#define SC_SCENARIO_SHOWFRAME 2 -#define SC_SCENARIO_PRINTFRAME 4 -#define SC_SCENARIO_TWOWAY 8 -#define SC_SCENARIO_ATTRIB 16 -#define SC_SCENARIO_VALUE 32 -#define SC_SCENARIO_PROTECT 64 + // Szenario-Flags +#define SC_SCENARIO_COPYALL 1 +#define SC_SCENARIO_SHOWFRAME 2 +#define SC_SCENARIO_PRINTFRAME 4 +#define SC_SCENARIO_TWOWAY 8 +#define SC_SCENARIO_ATTRIB 16 +#define SC_SCENARIO_VALUE 32 +#define SC_SCENARIO_PROTECT 64 #ifndef DELETEZ @@ -303,10 +303,10 @@ const USHORT IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); // Ist Bit in Set gesetzt? #define IS_SET(bit,set)(((set)&(bit))==(bit)) -#define SEL_ALL -1 // Eingabezeile: alles Selektieren -#define RES_CANCEL 0 // Resultate der Funk.AutoPilot-Seiten -#define RES_BACKWARD 1 -#define RES_END 2 +#define SEL_ALL -1 // Eingabezeile: alles Selektieren +#define RES_CANCEL 0 // Resultate der Funk.AutoPilot-Seiten +#define RES_BACKWARD 1 +#define RES_END 2 enum CellType { @@ -316,7 +316,7 @@ enum CellType CELLTYPE_FORMULA, CELLTYPE_NOTE, CELLTYPE_EDIT, - CELLTYPE_SYMBOLS // fuer Laden/Speichern + CELLTYPE_SYMBOLS // fuer Laden/Speichern #if DBG_UTIL ,CELLTYPE_DESTROYED #endif @@ -383,39 +383,39 @@ enum ScDirection enum ScSizeMode { - SC_SIZE_DIRECT, // set size or hide if value is 0 - SC_SIZE_OPTIMAL, // set optimal size for everything - SC_SIZE_SHOW, // show with original size - SC_SIZE_VISOPT, // set optimal size only if visible - SC_SIZE_ORIGINAL // only set size, don't change visible flag + SC_SIZE_DIRECT, // set size or hide if value is 0 + SC_SIZE_OPTIMAL, // set optimal size for everything + SC_SIZE_SHOW, // show with original size + SC_SIZE_VISOPT, // set optimal size only if visible + SC_SIZE_ORIGINAL // only set size, don't change visible flag }; enum ScInputMode { SC_INPUT_NONE, - SC_INPUT_TYPE, // Eingabe, ohne im Inplace-Modus zu sein - SC_INPUT_TABLE, // Textcursor in der Tabelle - SC_INPUT_TOP // Textcursor in der Eingabezeile + SC_INPUT_TYPE, // Eingabe, ohne im Inplace-Modus zu sein + SC_INPUT_TABLE, // Textcursor in der Tabelle + SC_INPUT_TOP // Textcursor in der Eingabezeile }; -enum ScVObjMode // Ausgabemodi von Objekten auf einer Seite +enum ScVObjMode // Ausgabemodi von Objekten auf einer Seite { VOBJ_MODE_SHOW, VOBJ_MODE_HIDE }; -enum ScAnchorType // Verankerung eines Zeichenobjekts +enum ScAnchorType // Verankerung eines Zeichenobjekts { SCA_CELL, SCA_PAGE, - SCA_DONTKNOW // bei Mehrfachselektion + SCA_DONTKNOW // bei Mehrfachselektion }; enum ScGetDBMode { - SC_DB_MAKE, // wenn noetig, "unbenannt" anlegen - SC_DB_IMPORT, // wenn noetig, "Importx" anlegen - SC_DB_OLD // nicht neu anlegen + SC_DB_MAKE, // wenn noetig, "unbenannt" anlegen + SC_DB_IMPORT, // wenn noetig, "Importx" anlegen + SC_DB_OLD // nicht neu anlegen }; /// For ScDBFunc::GetDBData() @@ -430,23 +430,23 @@ enum ScGetDBSelection /** Shrink selection to actually used data area within the selection. */ SC_DBSEL_SHRINK_TO_USED_DATA, - /** If only one row or portion thereof is selected, shrink row to used data - columns and select further rows down until end of data. If an area is - selected, shrink rows to actually used columns. Else, no selection, + /** If only one row or portion thereof is selected, shrink row to used data + columns and select further rows down until end of data. If an area is + selected, shrink rows to actually used columns. Else, no selection, expand to used data area. */ SC_DBSEL_ROW_DOWN, - /** Behave as if the range corresponding to a ScDBData area was selected, + /** Behave as if the range corresponding to a ScDBData area was selected, for API use. */ SC_DBSEL_FORCE_MARK }; enum ScLkUpdMode -{ //Verknuepfungen - LM_ALWAYS, //immer aktualisieren - LM_NEVER, //niemals - LM_ON_DEMAND, //auf nachfrage - LM_UNKNOWN //Shit happens +{ //Verknuepfungen + LM_ALWAYS, //immer aktualisieren + LM_NEVER, //niemals + LM_ON_DEMAND, //auf nachfrage + LM_UNKNOWN //Shit happens }; @@ -465,23 +465,23 @@ enum ScDBObject struct ScImportParam { - SCCOL nCol1; - SCROW nRow1; - SCCOL nCol2; - SCROW nRow2; - BOOL bImport; - String aDBName; // Alias der Datenbank - String aStatement; - BOOL bNative; - BOOL bSql; // Statement oder Name? - BYTE nType; // enum DBObject + SCCOL nCol1; + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; + BOOL bImport; + String aDBName; // Alias der Datenbank + String aStatement; + BOOL bNative; + BOOL bSql; // Statement oder Name? + BYTE nType; // enum DBObject ScImportParam(); ScImportParam( const ScImportParam& r ); ~ScImportParam(); - ScImportParam& operator= ( const ScImportParam& r ); - BOOL operator== ( const ScImportParam& r ) const; + ScImportParam& operator= ( const ScImportParam& r ); + BOOL operator== ( const ScImportParam& r ) const; }; struct ScStringHashCode @@ -534,43 +534,43 @@ namespace utl { #ifndef _SCALC_EXE class ScGlobal { - static SvxSearchItem* pSearchItem; - static ScAutoFormat* pAutoFormat; - static FuncCollection* pFuncCollection; + static SvxSearchItem* pSearchItem; + static ScAutoFormat* pAutoFormat; + static FuncCollection* pFuncCollection; static ScUnoAddInCollection* pAddInCollection; - static ScUserList* pUserList; - static String** ppRscString; - static String* pStrScDoc; + static ScUserList* pUserList; + static String** ppRscString; + static String* pStrScDoc; static String* pEmptyString; - static String* pStrClipDocName; + static String* pStrClipDocName; static SvxBrushItem* pEmptyBrushItem; - static SvxBrushItem* pButtonBrushItem; - static SvxBrushItem* pEmbeddedBrushItem; - static SvxBrushItem* pProtectedBrushItem; + static SvxBrushItem* pButtonBrushItem; + static SvxBrushItem* pEmbeddedBrushItem; + static SvxBrushItem* pProtectedBrushItem; static ImageList* pOutlineBitmaps; static ImageList* pOutlineBitmapsHC; -// static Bitmap* pAnchorBitmap; -// static Bitmap* pGrayAnchorBitmap; +// static Bitmap* pAnchorBitmap; +// static Bitmap* pGrayAnchorBitmap; - static ScFunctionList* pStarCalcFunctionList; - static ScFunctionMgr* pStarCalcFunctionMgr; + static ScFunctionList* pStarCalcFunctionList; + static ScFunctionMgr* pStarCalcFunctionMgr; - static ScUnitConverter* pUnitConverter; + static ScUnitConverter* pUnitConverter; static SvNumberFormatter* pEnglishFormatter; // for UNO / XML export static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> xOrdinalSuffix; - static CalendarWrapper* pCalendar; - static CollatorWrapper* pCaseCollator; - static CollatorWrapper* pCollator; + static CalendarWrapper* pCalendar; + static CollatorWrapper* pCaseCollator; + static CollatorWrapper* pCollator; static ::utl::TransliterationWrapper* pTransliteration; static ::utl::TransliterationWrapper* pCaseTransliteration; static IntlWrapper* pScIntlWrapper; - static ::com::sun::star::lang::Locale* pLocale; + static ::com::sun::star::lang::Locale* pLocale; -public: +public: static SvtSysLocale* pSysLocale; // for faster access a pointer to the single instance provided by SvtSysLocale SC_DLLPUBLIC static const CharClass* pCharClass; @@ -579,87 +579,87 @@ public: SC_DLLPUBLIC static const LocaleDataWrapper* GetpLocaleData(); static CalendarWrapper* GetCalendar(); - SC_DLLPUBLIC static CollatorWrapper* GetCollator(); - static CollatorWrapper* GetCaseCollator(); + SC_DLLPUBLIC static CollatorWrapper* GetCollator(); + static CollatorWrapper* GetCaseCollator(); static IntlWrapper* GetScIntlWrapper(); - static ::com::sun::star::lang::Locale* GetLocale(); - + static ::com::sun::star::lang::Locale* GetLocale(); + SC_DLLPUBLIC static ::utl::TransliterationWrapper* GetpTransliteration(); //CHINA001 static ::utl::TransliterationWrapper* GetCaseTransliteration(); - - SC_DLLPUBLIC static LanguageType eLnge; - static sal_Unicode cListDelimiter; - - static const String& GetClipDocName(); - static void SetClipDocName( const String& rNew ); - SC_DLLPUBLIC static const SvxSearchItem& GetSearchItem(); - SC_DLLPUBLIC static void SetSearchItem( const SvxSearchItem& rNew ); - SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat(); - static void ClearAutoFormat(); //BugId 54209 - static FuncCollection* GetFuncCollection(); + + SC_DLLPUBLIC static LanguageType eLnge; + static sal_Unicode cListDelimiter; + + static const String& GetClipDocName(); + static void SetClipDocName( const String& rNew ); + SC_DLLPUBLIC static const SvxSearchItem& GetSearchItem(); + SC_DLLPUBLIC static void SetSearchItem( const SvxSearchItem& rNew ); + SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat(); + static void ClearAutoFormat(); //BugId 54209 + static FuncCollection* GetFuncCollection(); SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection(); - SC_DLLPUBLIC static ScUserList* GetUserList(); - static void SetUserList( const ScUserList* pNewList ); - SC_DLLPUBLIC static const String& GetRscString( USHORT nIndex ); - static void OpenURL( const String& rURL, const String& rTarget ); - SC_DLLPUBLIC static String GetAbsDocName( const String& rFileName, + SC_DLLPUBLIC static ScUserList* GetUserList(); + static void SetUserList( const ScUserList* pNewList ); + SC_DLLPUBLIC static const String& GetRscString( USHORT nIndex ); + static void OpenURL( const String& rURL, const String& rTarget ); + SC_DLLPUBLIC static String GetAbsDocName( const String& rFileName, SfxObjectShell* pShell ); - SC_DLLPUBLIC static String GetDocTabName( const String& rFileName, + SC_DLLPUBLIC static String GetDocTabName( const String& rFileName, const String& rTabName ); - SC_DLLPUBLIC static ULONG GetStandardFormat( SvNumberFormatter&, + SC_DLLPUBLIC static ULONG GetStandardFormat( SvNumberFormatter&, ULONG nFormat, short nType ); - SC_DLLPUBLIC static ULONG GetStandardFormat( double, SvNumberFormatter&, + SC_DLLPUBLIC static ULONG GetStandardFormat( double, SvNumberFormatter&, ULONG nFormat, short nType ); - SC_DLLPUBLIC static double nScreenPPTX; - SC_DLLPUBLIC static double nScreenPPTY; + SC_DLLPUBLIC static double nScreenPPTX; + SC_DLLPUBLIC static double nScreenPPTY; - static ScDocShellRef* pDrawClipDocShellRef; + static ScDocShellRef* pDrawClipDocShellRef; - static USHORT nDefFontHeight; - static USHORT nStdRowHeight; + static USHORT nDefFontHeight; + static USHORT nStdRowHeight; - SC_DLLPUBLIC static long nLastRowHeightExtra; - static long nLastColWidthExtra; + SC_DLLPUBLIC static long nLastRowHeightExtra; + static long nLastColWidthExtra; - static void Init(); // am Anfang + static void Init(); // am Anfang static void InitAddIns(); - static void Clear(); // bei Programmende + static void Clear(); // bei Programmende - static void UpdatePPT(OutputDevice* pDev); + static void UpdatePPT(OutputDevice* pDev); static void InitTextHeight(SfxItemPool* pPool); - static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; } + static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; } static SvxBrushItem* GetButtonBrushItem(); - static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } - static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } - SC_DLLPUBLIC static const String& GetEmptyString(); - static const String& GetScDocString(); + static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; } + static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; } + SC_DLLPUBLIC static const String& GetEmptyString(); + static const String& GetScDocString(); /** Returns the specified image list with outline symbols. @param bHC false = standard symbols; true = high contrast symbols. */ static ImageList* GetOutlineSymbols( bool bHC ); -// static const Bitmap& GetAnchorBitmap(); -// static const Bitmap& GetGrayAnchorBitmap(); +// static const Bitmap& GetAnchorBitmap(); +// static const Bitmap& GetGrayAnchorBitmap(); static bool HasStarCalcFunctionList(); - static ScFunctionList* GetStarCalcFunctionList(); - static ScFunctionMgr* GetStarCalcFunctionMgr(); + static ScFunctionList* GetStarCalcFunctionList(); + static ScFunctionMgr* GetStarCalcFunctionMgr(); static void ResetFunctionList(); - static String GetErrorString(USHORT nErrNumber); - static String GetLongErrorString(USHORT nErrNumber); - static BOOL EETextObjEqual( const EditTextObject* pObj1, + static String GetErrorString(USHORT nErrNumber); + static String GetLongErrorString(USHORT nErrNumber); + static BOOL EETextObjEqual( const EditTextObject* pObj1, const EditTextObject* pObj2 ); - static BOOL CheckWidthInvalidate( BOOL& bNumFormatChanged, + static BOOL CheckWidthInvalidate( BOOL& bNumFormatChanged, const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs ); - static BOOL HasAttrChanged( const SfxItemSet& rNewAttrs, + static BOOL HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs, - const USHORT nWhich ); + const USHORT nWhich ); - static ScUnitConverter* GetUnitConverter(); + static ScUnitConverter* GetUnitConverter(); /// strchr() functionality on unicode, as long as we need it for ScToken etc. static const sal_Unicode* UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ); @@ -711,15 +711,15 @@ SC_DLLPUBLIC static xub_StrLen FindUnquoted( const String& rString, sal SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' ); - static CharSet GetCharsetValue( const String& rCharSet ); - static String GetCharsetString( CharSet eVal ); + static CharSet GetCharsetValue( const String& rCharSet ); + static String GetCharsetString( CharSet eVal ); /// a "ReadOnly" formatter for UNO/XML export static SvNumberFormatter* GetEnglishFormatter(); - static BOOL IsSystemRTL(); // depending on system language - static LanguageType GetEditDefaultLanguage(); // for EditEngine::SetDefaultLanguage - SC_DLLPUBLIC static BYTE GetDefaultScriptType(); // for all WEAK characters + static BOOL IsSystemRTL(); // depending on system language + static LanguageType GetEditDefaultLanguage(); // for EditEngine::SetDefaultLanguage + SC_DLLPUBLIC static BYTE GetDefaultScriptType(); // for all WEAK characters /** Map ATTR_((CJK|CTL)_)?FONT_... to proper WhichIDs. If more than one SCRIPTTYPE_... values are or'ed together, prefers first COMPLEX, then ASIAN */ @@ -769,18 +769,18 @@ enum ScQueryConnect enum ScSubTotalFunc { - SUBTOTAL_FUNC_NONE = 0, - SUBTOTAL_FUNC_AVE = 1, - SUBTOTAL_FUNC_CNT = 2, - SUBTOTAL_FUNC_CNT2 = 3, - SUBTOTAL_FUNC_MAX = 4, - SUBTOTAL_FUNC_MIN = 5, - SUBTOTAL_FUNC_PROD = 6, - SUBTOTAL_FUNC_STD = 7, - SUBTOTAL_FUNC_STDP = 8, - SUBTOTAL_FUNC_SUM = 9, - SUBTOTAL_FUNC_VAR = 10, - SUBTOTAL_FUNC_VARP = 11 + SUBTOTAL_FUNC_NONE = 0, + SUBTOTAL_FUNC_AVE = 1, + SUBTOTAL_FUNC_CNT = 2, + SUBTOTAL_FUNC_CNT2 = 3, + SUBTOTAL_FUNC_MAX = 4, + SUBTOTAL_FUNC_MIN = 5, + SUBTOTAL_FUNC_PROD = 6, + SUBTOTAL_FUNC_STD = 7, + SUBTOTAL_FUNC_STDP = 8, + SUBTOTAL_FUNC_SUM = 9, + SUBTOTAL_FUNC_VAR = 10, + SUBTOTAL_FUNC_VARP = 11 }; @@ -792,8 +792,8 @@ enum ScSubTotalFunc * Verbindung mit dem Schalter bQueryByString auf FALSE. */ -#define SC_EMPTYFIELDS ((double)0x0042) -#define SC_NONEMPTYFIELDS ((double)0x0043) +#define SC_EMPTYFIELDS ((double)0x0042) +#define SC_NONEMPTYFIELDS ((double)0x0043) namespace utl { @@ -803,62 +803,62 @@ namespace utl struct ScQueryEntry { - BOOL bDoQuery; - BOOL bQueryByString; + BOOL bDoQuery; + BOOL bQueryByString; bool bQueryByDate; - SCCOLROW nField; - ScQueryOp eOp; + SCCOLROW nField; + ScQueryOp eOp; ScQueryConnect eConnect; - String* pStr; - double nVal; - utl::SearchParam* pSearchParam; // falls RegExp, nicht gespeichert - utl::TextSearch* pSearchText; // falls RegExp, nicht gespeichert + String* pStr; + double nVal; + utl::SearchParam* pSearchParam; // falls RegExp, nicht gespeichert + utl::TextSearch* pSearchText; // falls RegExp, nicht gespeichert ScQueryEntry(); ScQueryEntry(const ScQueryEntry& r); ~ScQueryEntry(); // legt ggbf. pSearchParam und pSearchText an, immer RegExp! - utl::TextSearch* GetSearchTextPtr( BOOL bCaseSens ); + utl::TextSearch* GetSearchTextPtr( BOOL bCaseSens ); - void Clear(); - ScQueryEntry& operator=( const ScQueryEntry& r ); - BOOL operator==( const ScQueryEntry& r ) const; + void Clear(); + ScQueryEntry& operator=( const ScQueryEntry& r ); + BOOL operator==( const ScQueryEntry& r ) const; }; // ----------------------------------------------------------------------- struct SC_DLLPUBLIC ScSubTotalParam { - SCCOL nCol1; // Selektierter Bereich - SCROW nRow1; - SCCOL nCol2; - SCROW nRow2; - BOOL bRemoveOnly; - BOOL bReplace; // vorhandene Ergebnisse ersetzen - BOOL bPagebreak; // Seitenumbruch bei Gruppenwechsel - BOOL bCaseSens; // Gross-/Kleinschreibung - BOOL bDoSort; // vorher sortieren - BOOL bAscending; // aufsteigend sortieren - BOOL bUserDef; // Benutzer-def. Sort.Reihenfolge - USHORT nUserIndex; // Index auf Liste - BOOL bIncludePattern; // Formate mit sortieren - BOOL bGroupActive[MAXSUBTOTAL]; // aktive Gruppen - SCCOL nField[MAXSUBTOTAL]; // zugehoeriges Feld - SCCOL nSubTotals[MAXSUBTOTAL]; // Anzahl der SubTotals - SCCOL* pSubTotals[MAXSUBTOTAL]; // Array der zu berechnenden Spalten - ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Array der zugehoerige Funktionen + SCCOL nCol1; // Selektierter Bereich + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; + BOOL bRemoveOnly; + BOOL bReplace; // vorhandene Ergebnisse ersetzen + BOOL bPagebreak; // Seitenumbruch bei Gruppenwechsel + BOOL bCaseSens; // Gross-/Kleinschreibung + BOOL bDoSort; // vorher sortieren + BOOL bAscending; // aufsteigend sortieren + BOOL bUserDef; // Benutzer-def. Sort.Reihenfolge + USHORT nUserIndex; // Index auf Liste + BOOL bIncludePattern; // Formate mit sortieren + BOOL bGroupActive[MAXSUBTOTAL]; // aktive Gruppen + SCCOL nField[MAXSUBTOTAL]; // zugehoeriges Feld + SCCOL nSubTotals[MAXSUBTOTAL]; // Anzahl der SubTotals + SCCOL* pSubTotals[MAXSUBTOTAL]; // Array der zu berechnenden Spalten + ScSubTotalFunc* pFunctions[MAXSUBTOTAL]; // Array der zugehoerige Funktionen ScSubTotalParam(); ScSubTotalParam( const ScSubTotalParam& r ); - ScSubTotalParam& operator= ( const ScSubTotalParam& r ); - BOOL operator== ( const ScSubTotalParam& r ) const; - void Clear (); - void SetSubTotals ( USHORT nGroup, - const SCCOL* ptrSubTotals, - const ScSubTotalFunc* ptrFuncions, - USHORT nCount ); + ScSubTotalParam& operator= ( const ScSubTotalParam& r ); + BOOL operator== ( const ScSubTotalParam& r ) const; + void Clear (); + void SetSubTotals ( USHORT nGroup, + const SCCOL* ptrSubTotals, + const ScSubTotalFunc* ptrFuncions, + USHORT nCount ); }; // ----------------------------------------------------------------------- @@ -866,25 +866,25 @@ class ScArea; struct ScConsolidateParam { - SCCOL nCol; // Cursor Position / - SCROW nRow; // bzw. Anfang des Zielbereiches - SCTAB nTab; - ScSubTotalFunc eFunction; // Berechnungsvorschrift - USHORT nDataAreaCount; // Anzahl der Datenbereiche - ScArea** ppDataAreas; // Zeiger-Array auf Datenbereiche - BOOL bByCol; // nach Spalten - BOOL bByRow; // nach Zeilen - BOOL bReferenceData; // Quelldaten referenzieren + SCCOL nCol; // Cursor Position / + SCROW nRow; // bzw. Anfang des Zielbereiches + SCTAB nTab; + ScSubTotalFunc eFunction; // Berechnungsvorschrift + USHORT nDataAreaCount; // Anzahl der Datenbereiche + ScArea** ppDataAreas; // Zeiger-Array auf Datenbereiche + BOOL bByCol; // nach Spalten + BOOL bByRow; // nach Zeilen + BOOL bReferenceData; // Quelldaten referenzieren ScConsolidateParam(); ScConsolidateParam( const ScConsolidateParam& r ); ~ScConsolidateParam(); - ScConsolidateParam& operator= ( const ScConsolidateParam& r ); - BOOL operator== ( const ScConsolidateParam& r ) const; - void Clear (); // = ClearDataAreas()+Members - void ClearDataAreas (); - void SetAreas ( ScArea* const* ppAreas, USHORT nCount ); + ScConsolidateParam& operator= ( const ScConsolidateParam& r ); + BOOL operator== ( const ScConsolidateParam& r ) const; + void Clear (); // = ClearDataAreas()+Members + void ClearDataAreas (); + void SetAreas ( ScArea* const* ppAreas, USHORT nCount ); }; // ----------------------------------------------------------------------- diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 3182be9d4e21..70f1c9a0bd1a 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,84 +29,84 @@ #define __GLOBSTR_HRC_ -#define STR_UNDO_DELETECELLS 1 -#define STR_UNDO_CUT 2 -#define STR_UNDO_PASTE 3 -#define STR_UNDO_MOVE 4 -#define STR_UNDO_COPY 5 -#define STR_UNDO_DELETECONTENTS 6 -#define STR_UNDO_SELATTR 7 -#define STR_UNDO_SELATTRLINES 8 -#define STR_UNDO_COLWIDTH 9 -#define STR_UNDO_OPTCOLWIDTH 10 -#define STR_UNDO_ROWHEIGHT 11 -#define STR_UNDO_OPTROWHEIGHT 12 -#define STR_UNDO_AUTOFILL 13 -#define STR_UNDO_MERGE 14 -#define STR_UNDO_REMERGE 15 -#define STR_UNDO_AUTOFORMAT 16 -#define STR_UNDO_REPLACE 17 -#define STR_UNDO_CURSORATTR 18 -#define STR_UNDO_ENTERDATA 19 -#define STR_UNDO_INSCOLBREAK 20 -#define STR_UNDO_DELCOLBREAK 21 -#define STR_UNDO_INSROWBREAK 22 -#define STR_UNDO_DELROWBREAK 23 -#define STR_UNDO_DOOUTLINE 24 -#define STR_UNDO_REDOOUTLINE 25 -#define STR_UNDO_MAKEOUTLINE 26 -#define STR_UNDO_REMAKEOUTLINE 27 -#define STR_UNDO_OUTLINELEVEL 28 -#define STR_UNDO_DOOUTLINEBLK 29 -#define STR_UNDO_REDOOUTLINEBLK 30 -#define STR_UNDO_REMOVEALLOTLNS 31 -#define STR_UNDO_AUTOOUTLINE 32 -#define STR_UNDO_SUBTOTALS 33 -#define STR_UNDO_SORT 34 -#define STR_UNDO_QUERY 35 -#define STR_UNDO_DBDATA 36 -#define STR_UNDO_IMPORTDATA 37 -#define STR_UNDO_REPEATDB 38 - -#define STR_DB_NONAME 39 - -#define STR_MSSG_DOSUBTOTALS_0 40 -#define STR_MSSG_DOSUBTOTALS_1 41 -#define STR_MSSG_DOSUBTOTALS_2 42 -#define STR_MSSG_REPEATDB_0 43 -#define STR_MSSG_MAKEAUTOFILTER_0 44 -#define STR_MSSG_IMPORTDATA_0 45 -#define STR_MSSG_MAKEOUTLINE_0 46 -#define STR_MSSG_REMOVEOUTLINE_0 47 -#define STR_MSSG_PASTEFROMCLIP_0 48 -#define STR_MSSG_PASTEFROMCLIP_1 49 -#define STR_MSSG_MOVEBLOCKTO_0 50 -#define STR_MSSG_INSERTCELLS_0 52 -#define STR_MSSG_DELETECELLS_0 53 -#define STR_MSSG_MERGECELLS_0 54 -#define STR_MSSG_SEARCHANDREPLACE_0 55 -#define STR_MSSG_SOLVE_0 56 -#define STR_MSSG_SOLVE_1 57 -#define STR_MSSG_SOLVE_2 58 -#define STR_MSSG_SOLVE_3 59 -#define STR_MSSG_SOLVE_4 60 -#define STR_MSSG_SOLVE_5 61 -#define STR_MSSG_SOLVE_6 62 +#define STR_UNDO_DELETECELLS 1 +#define STR_UNDO_CUT 2 +#define STR_UNDO_PASTE 3 +#define STR_UNDO_MOVE 4 +#define STR_UNDO_COPY 5 +#define STR_UNDO_DELETECONTENTS 6 +#define STR_UNDO_SELATTR 7 +#define STR_UNDO_SELATTRLINES 8 +#define STR_UNDO_COLWIDTH 9 +#define STR_UNDO_OPTCOLWIDTH 10 +#define STR_UNDO_ROWHEIGHT 11 +#define STR_UNDO_OPTROWHEIGHT 12 +#define STR_UNDO_AUTOFILL 13 +#define STR_UNDO_MERGE 14 +#define STR_UNDO_REMERGE 15 +#define STR_UNDO_AUTOFORMAT 16 +#define STR_UNDO_REPLACE 17 +#define STR_UNDO_CURSORATTR 18 +#define STR_UNDO_ENTERDATA 19 +#define STR_UNDO_INSCOLBREAK 20 +#define STR_UNDO_DELCOLBREAK 21 +#define STR_UNDO_INSROWBREAK 22 +#define STR_UNDO_DELROWBREAK 23 +#define STR_UNDO_DOOUTLINE 24 +#define STR_UNDO_REDOOUTLINE 25 +#define STR_UNDO_MAKEOUTLINE 26 +#define STR_UNDO_REMAKEOUTLINE 27 +#define STR_UNDO_OUTLINELEVEL 28 +#define STR_UNDO_DOOUTLINEBLK 29 +#define STR_UNDO_REDOOUTLINEBLK 30 +#define STR_UNDO_REMOVEALLOTLNS 31 +#define STR_UNDO_AUTOOUTLINE 32 +#define STR_UNDO_SUBTOTALS 33 +#define STR_UNDO_SORT 34 +#define STR_UNDO_QUERY 35 +#define STR_UNDO_DBDATA 36 +#define STR_UNDO_IMPORTDATA 37 +#define STR_UNDO_REPEATDB 38 + +#define STR_DB_NONAME 39 + +#define STR_MSSG_DOSUBTOTALS_0 40 +#define STR_MSSG_DOSUBTOTALS_1 41 +#define STR_MSSG_DOSUBTOTALS_2 42 +#define STR_MSSG_REPEATDB_0 43 +#define STR_MSSG_MAKEAUTOFILTER_0 44 +#define STR_MSSG_IMPORTDATA_0 45 +#define STR_MSSG_MAKEOUTLINE_0 46 +#define STR_MSSG_REMOVEOUTLINE_0 47 +#define STR_MSSG_PASTEFROMCLIP_0 48 +#define STR_MSSG_PASTEFROMCLIP_1 49 +#define STR_MSSG_MOVEBLOCKTO_0 50 +#define STR_MSSG_INSERTCELLS_0 52 +#define STR_MSSG_DELETECELLS_0 53 +#define STR_MSSG_MERGECELLS_0 54 +#define STR_MSSG_SEARCHANDREPLACE_0 55 +#define STR_MSSG_SOLVE_0 56 +#define STR_MSSG_SOLVE_1 57 +#define STR_MSSG_SOLVE_2 58 +#define STR_MSSG_SOLVE_3 59 +#define STR_MSSG_SOLVE_4 60 +#define STR_MSSG_SOLVE_5 61 +#define STR_MSSG_SOLVE_6 62 // unused: 63 -#define STR_TABLE_GESAMTERGEBNIS 64 -#define STR_TABLE_ERGEBNIS 65 -#define STR_UNDO_SPELLING 66 -#define STR_TABLE_UND 67 -#define STR_TABLE_ODER 68 -#define STR_UNDO_INSERTCELLS 69 +#define STR_TABLE_GESAMTERGEBNIS 64 +#define STR_TABLE_ERGEBNIS 65 +#define STR_UNDO_SPELLING 66 +#define STR_TABLE_UND 67 +#define STR_TABLE_ODER 68 +#define STR_UNDO_INSERTCELLS 69 #define STR_TABLE_DEF 70 //#define STR_STYLENAME_STANDARD 71 s.u. #define STR_MOVE_TO_END 72 -#define STR_BOX_YNI 73 -#define STR_NO_REF_TABLE 74 +#define STR_BOX_YNI 73 +#define STR_NO_REF_TABLE 74 -#define STR_PIVOTFUNC_SUM 75 // pivot.cxx +#define STR_PIVOTFUNC_SUM 75 // pivot.cxx #define STR_PIVOTFUNC_COUNT 76 #define STR_PIVOTFUNC_AVG 77 #define STR_PIVOTFUNC_MAX 78 @@ -117,71 +117,71 @@ #define STR_PIVOTFUNC_STDDEV2 92 #define STR_PIVOTFUNC_VAR 93 #define STR_PIVOTFUNC_VAR2 94 -#define STR_PIVOT_TOTAL 95 -#define STR_PIVOT_DATA 96 +#define STR_PIVOT_TOTAL 95 +#define STR_PIVOT_DATA 96 -#define STR_PIVOT_INVALID_DBAREA 97 // tabvwsh3.cxx +#define STR_PIVOT_INVALID_DBAREA 97 // tabvwsh3.cxx -#define STR_TABLE 98 -#define STR_COLUMN 99 +#define STR_TABLE 98 +#define STR_COLUMN 99 #define STR_ROW 100 #define STR_LOAD_DOC 101 #define STR_SAVE_DOC 102 -#define STR_ERR_INVALID_TABREF 103 -#define STR_AREA_ALREADY_INSERTED 104 -#define STR_INVALID_TABREF 105 -#define STR_INVALID_QUERYAREA 106 +#define STR_ERR_INVALID_TABREF 103 +#define STR_AREA_ALREADY_INSERTED 104 +#define STR_INVALID_TABREF 105 +#define STR_INVALID_QUERYAREA 106 -#define STR_REIMPORT_EMPTY 107 -#define STR_NOMULTISELECT 108 -#define STR_FILL_SERIES_PROGRESS 109 // documen3.cxx +#define STR_REIMPORT_EMPTY 107 +#define STR_NOMULTISELECT 108 +#define STR_FILL_SERIES_PROGRESS 109 // documen3.cxx #define STR_UNKNOWN_FILTER 110 -#define STR_DATABASE_NOTFOUND 111 -#define STR_DATABASE_ABORTED 112 +#define STR_DATABASE_NOTFOUND 111 +#define STR_DATABASE_ABORTED 112 -#define STR_UNDO_PRINTRANGES 113 +#define STR_UNDO_PRINTRANGES 113 -#define STR_UNDO_DEC_INDENT 114 -#define STR_UNDO_INC_INDENT 115 -#define STR_UNDO_THESAURUS 116 +#define STR_UNDO_DEC_INDENT 114 +#define STR_UNDO_INC_INDENT 115 +#define STR_UNDO_THESAURUS 116 #define STR_FILL_TAB 117 -#define STR_NO_VALUE 118 /* moved to compiler.src, keep define! */ +#define STR_NO_VALUE 118 /* moved to compiler.src, keep define! */ #define STR_UPDATE_SCENARIO 119 #define STR_ERR_NEWSCENARIO 120 #define STR_SCENARIO 121 #define STR_PIVOT_TABLE 122 #define STR_NEWTABNAMENOTUNIQUE 123 -#define STR_FUN_TEXT_SUM 124 -#define STR_FUN_TEXT_COUNT 125 -#define STR_FUN_TEXT_AVG 126 -#define STR_FUN_TEXT_MAX 127 -#define STR_FUN_TEXT_MIN 128 -#define STR_FUN_TEXT_PRODUCT 129 -#define STR_FUN_TEXT_STDDEV 130 -#define STR_FUN_TEXT_VAR 131 -#define STR_DOC_STAT 132 +#define STR_FUN_TEXT_SUM 124 +#define STR_FUN_TEXT_COUNT 125 +#define STR_FUN_TEXT_AVG 126 +#define STR_FUN_TEXT_MAX 127 +#define STR_FUN_TEXT_MIN 128 +#define STR_FUN_TEXT_PRODUCT 129 +#define STR_FUN_TEXT_STDDEV 130 +#define STR_FUN_TEXT_VAR 131 +#define STR_DOC_STAT 132 //#define STR_STYLENAME_RESULT 133 s.u. -#define STR_DBNAME_IMPORT 134 +#define STR_DBNAME_IMPORT 134 -#define STR_NOCHARTATCURSOR 135 +#define STR_NOCHARTATCURSOR 135 #define STR_NOAREASELECTED 136 #define STR_INVALIDTABNAME 137 -#define STR_PIVOT_NOTFOUND 138 -#define STR_ERROR_STR 139 -#define STR_NV_STR 140 /* moved to compiler.src, keep define! */ -#define STR_EMPTYDATA 141 -#define STR_PIVOT_NODATA 142 -#define STR_PIVOT_MOVENOTALLOWED 143 +#define STR_PIVOT_NOTFOUND 138 +#define STR_ERROR_STR 139 +#define STR_NV_STR 140 /* moved to compiler.src, keep define! */ +#define STR_EMPTYDATA 141 +#define STR_PIVOT_NODATA 142 +#define STR_PIVOT_MOVENOTALLOWED 143 -#define STR_PRINT_INVALID_AREA 144 +#define STR_PRINT_INVALID_AREA 144 #define STR_PAGESTYLE 145 #define STR_HEADER 146 @@ -199,39 +199,39 @@ #define STR_HFCMD_TABLE 155 #define HFCMD_END 155 -#define STR_PROTECTIONERR 156 +#define STR_PROTECTIONERR 156 #define STR_PAGEHEADER 157 #define STR_PAGEFOOTER 158 #define STR_PAGE 159 -#define STR_LONG_ERR_ILL_ARG 160 -#define STR_LONG_ERR_ILL_PAR 161 -#define STR_LONG_ERR_ILL_FPO 162 -#define STR_LONG_ERR_ILL_CHAR 163 -#define STR_LONG_ERR_ILL_SEP 164 -#define STR_LONG_ERR_PAIR 165 -#define STR_LONG_ERR_OP_EXP 166 -#define STR_LONG_ERR_VAR_EXP 167 -#define STR_LONG_ERR_CODE_OVF 168 -#define STR_LONG_ERR_STR_OVF 169 -#define STR_LONG_ERR_STACK_OVF 170 -#define STR_LONG_ERR_SYNTAX 171 -#define STR_LONG_ERR_CIRC_REF 172 -#define STR_LONG_ERR_NO_NAME 173 -#define STR_LONG_ERR_NO_REF 174 -#define STR_LONG_ERR_NO_CONV 175 -#define STR_LONG_ERR_NO_VALUE 176 -#define STR_LONG_ERR_NV 177 +#define STR_LONG_ERR_ILL_ARG 160 +#define STR_LONG_ERR_ILL_PAR 161 +#define STR_LONG_ERR_ILL_FPO 162 +#define STR_LONG_ERR_ILL_CHAR 163 +#define STR_LONG_ERR_ILL_SEP 164 +#define STR_LONG_ERR_PAIR 165 +#define STR_LONG_ERR_OP_EXP 166 +#define STR_LONG_ERR_VAR_EXP 167 +#define STR_LONG_ERR_CODE_OVF 168 +#define STR_LONG_ERR_STR_OVF 169 +#define STR_LONG_ERR_STACK_OVF 170 +#define STR_LONG_ERR_SYNTAX 171 +#define STR_LONG_ERR_CIRC_REF 172 +#define STR_LONG_ERR_NO_NAME 173 +#define STR_LONG_ERR_NO_REF 174 +#define STR_LONG_ERR_NO_CONV 175 +#define STR_LONG_ERR_NO_VALUE 176 +#define STR_LONG_ERR_NV 177 #define STR_GRIDCOLOR 178 -#define STR_MERGE_NOTEMPTY 179 -#define STR_CELL_FILTER 180 +#define STR_MERGE_NOTEMPTY 179 +#define STR_CELL_FILTER 180 -#define STR_TARGETNOTFOUND 181 +#define STR_TARGETNOTFOUND 181 #define STR_INVALID_EPS 182 -#define STR_TABLE_OP 183 // documen4.cxx -#define STR_UNDO_TABOP 184 +#define STR_TABLE_OP 183 // documen4.cxx +#define STR_UNDO_TABOP 184 #define STR_INVALID_AFNAME 185 @@ -245,45 +245,45 @@ #define STR_INVALID_AFAREA 193 -#define STR_CASCADE 194 // Funktionsautopilot -#define STR_OPTIONAL 195 -#define STR_REQUIRED 196 -#define STR_EDITFUNCTION 197 -#define STR_INVALID 198 +#define STR_CASCADE 194 // Funktionsautopilot +#define STR_OPTIONAL 195 +#define STR_REQUIRED 196 +#define STR_EDITFUNCTION 197 +#define STR_INVALID 198 -#define STR_NOTES 199 +#define STR_NOTES 199 #define STR_QUERY_DELTAB 200 -#define STR_UNDO_DETREFRESH 201 +#define STR_UNDO_DETREFRESH 201 -#define STR_UNDO_SHOWNOTE 202 -#define STR_UNDO_HIDENOTE 203 -#define STR_UNDO_DRAGDROP 204 +#define STR_UNDO_SHOWNOTE 202 +#define STR_UNDO_HIDENOTE 203 +#define STR_UNDO_DRAGDROP 204 -#define STR_EXPORT_ASCII_WARNING 205 -#define STR_IMPORT_ERROR 206 -#define STR_IMPORT_ASCII 207 -#define STR_IMPORT_LOTUS 208 -#define STR_IMPORT_DBF 209 -#define STR_EXPORT_ASCII 210 +#define STR_EXPORT_ASCII_WARNING 205 +#define STR_IMPORT_ERROR 206 +#define STR_IMPORT_ASCII 207 +#define STR_IMPORT_LOTUS 208 +#define STR_IMPORT_DBF 209 +#define STR_EXPORT_ASCII 210 -#define STR_STYLENAME_STANDARD 71 +#define STR_STYLENAME_STANDARD 71 #define STR_STYLENAME_RESULT 133 -#define STR_STYLENAME_RESULT1 211 -#define STR_STYLENAME_HEADLINE 212 -#define STR_STYLENAME_HEADLINE1 213 -#define STR_STYLENAME_REPORT 214 -#define STR_STYLENAME_REPORT1 215 - -#define STR_PIVOT_ERROR 216 -#define STR_PIVOT_PROGRESS 217 +#define STR_STYLENAME_RESULT1 211 +#define STR_STYLENAME_HEADLINE 212 +#define STR_STYLENAME_HEADLINE1 213 +#define STR_STYLENAME_REPORT 214 +#define STR_STYLENAME_REPORT1 215 + +#define STR_PIVOT_ERROR 216 +#define STR_PIVOT_PROGRESS 217 #define STR_IMPORT_EXCEL_WARNING 218 #define STR_SPELLING_STOP_OK 219 -#define STR_THESAURUS_NO_STRING 220 +#define STR_THESAURUS_NO_STRING 220 #define STR_SPELLING_BEGIN_TAB 221 -#define STR_SPELLING_NO_LANG 222 // kann spaeter wieder raus +#define STR_SPELLING_NO_LANG 222 // kann spaeter wieder raus -#define STR_UNDO_GRAFEDIT 223 +#define STR_UNDO_GRAFEDIT 223 #define STR_NOLANGERR 224 @@ -294,214 +294,214 @@ #define STR_UNDO_COPY_TAB 229 #define STR_UNDO_APPEND_TAB 230 -#define STR_CHART_MAINTITLE 231 -#define STR_CHART_SUBTITLE 232 -#define STR_CHART_XTITLE 233 -#define STR_CHART_YTITLE 234 -#define STR_CHART_ZTITLE 235 +#define STR_CHART_MAINTITLE 231 +#define STR_CHART_SUBTITLE 232 +#define STR_CHART_XTITLE 233 +#define STR_CHART_YTITLE 234 +#define STR_CHART_ZTITLE 235 -#define STR_ABSREFLOST 236 -#define STR_NAMECONFLICT 237 +#define STR_ABSREFLOST 236 +#define STR_NAMECONFLICT 237 #define STR_ERR_AUTOFILTER 238 -#define STR_MSSG_SEARCHANDREPLACE_1 239 -#define STR_MSSG_SEARCHANDREPLACE_2 240 -#define STR_MSSG_SEARCHANDREPLACE_3 241 - -#define STR_CREATENAME_REPLACE 242 -#define STR_CREATENAME_MARKERR 243 - -#define STR_UNDO_LISTNAMES 244 -#define STR_UNDO_PIVOT_NEW 245 -#define STR_UNDO_PIVOT_MODIFY 246 -#define STR_UNDO_PIVOT_DELETE 247 -#define STR_UNDO_CONSOLIDATE 248 -#define STR_UNDO_USESCENARIO 249 -#define STR_UNDO_MAKESCENARIO 250 - -#define STR_CONSOLIDATE_ERR1 251 -#define STR_SCENARIO_NOTFOUND 252 - -#define STR_UNDO_APPLYCELLSTYLE 253 - -#define STR_UNDO_DETADDPRED 254 -#define STR_UNDO_DETDELPRED 255 -#define STR_UNDO_DETADDSUCC 256 -#define STR_UNDO_DETDELSUCC 257 -#define STR_UNDO_DETADDERROR 258 -#define STR_UNDO_DETDELALL 259 - -#define STR_QUERY_DELENTRY 260 - -#define STR_VOBJ_OBJECT 261 -#define STR_VOBJ_CHART 262 -#define STR_VOBJ_DRAWINGS 263 -#define STR_VOBJ_MODE_SHOW 264 -#define STR_VOBJ_MODE_HIDE 265 - -#define STR_SCATTR_PAGE_TOPDOWN 267 -#define STR_SCATTR_PAGE_LEFTRIGHT 268 -#define STR_SCATTR_PAGE_NOTES 269 -#define STR_SCATTR_PAGE_GRID 270 -#define STR_SCATTR_PAGE_HEADERS 271 -#define STR_SCATTR_PAGE_FORMULAS 272 -#define STR_SCATTR_PAGE_NULLVALS 273 -#define STR_SCATTR_PAGE_PRINTDIR 274 -#define STR_SCATTR_PAGE_FIRSTPAGENO 275 -#define STR_SCATTR_PAGE_SCALE 276 +#define STR_MSSG_SEARCHANDREPLACE_1 239 +#define STR_MSSG_SEARCHANDREPLACE_2 240 +#define STR_MSSG_SEARCHANDREPLACE_3 241 + +#define STR_CREATENAME_REPLACE 242 +#define STR_CREATENAME_MARKERR 243 + +#define STR_UNDO_LISTNAMES 244 +#define STR_UNDO_PIVOT_NEW 245 +#define STR_UNDO_PIVOT_MODIFY 246 +#define STR_UNDO_PIVOT_DELETE 247 +#define STR_UNDO_CONSOLIDATE 248 +#define STR_UNDO_USESCENARIO 249 +#define STR_UNDO_MAKESCENARIO 250 + +#define STR_CONSOLIDATE_ERR1 251 +#define STR_SCENARIO_NOTFOUND 252 + +#define STR_UNDO_APPLYCELLSTYLE 253 + +#define STR_UNDO_DETADDPRED 254 +#define STR_UNDO_DETDELPRED 255 +#define STR_UNDO_DETADDSUCC 256 +#define STR_UNDO_DETDELSUCC 257 +#define STR_UNDO_DETADDERROR 258 +#define STR_UNDO_DETDELALL 259 + +#define STR_QUERY_DELENTRY 260 + +#define STR_VOBJ_OBJECT 261 +#define STR_VOBJ_CHART 262 +#define STR_VOBJ_DRAWINGS 263 +#define STR_VOBJ_MODE_SHOW 264 +#define STR_VOBJ_MODE_HIDE 265 + +#define STR_SCATTR_PAGE_TOPDOWN 267 +#define STR_SCATTR_PAGE_LEFTRIGHT 268 +#define STR_SCATTR_PAGE_NOTES 269 +#define STR_SCATTR_PAGE_GRID 270 +#define STR_SCATTR_PAGE_HEADERS 271 +#define STR_SCATTR_PAGE_FORMULAS 272 +#define STR_SCATTR_PAGE_NULLVALS 273 +#define STR_SCATTR_PAGE_PRINTDIR 274 +#define STR_SCATTR_PAGE_FIRSTPAGENO 275 +#define STR_SCATTR_PAGE_SCALE 276 #define STR_SCATTR_PAGE_SCALETOPAGES 277 -#define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */ +#define STR_NOREF_STR 278 /* moved to compiler.src, keep define! */ // unused: 279 -#define STR_UNDO_CHARTDATA 280 -#define STR_UNDO_ORIGINALSIZE 281 +#define STR_UNDO_CHARTDATA 280 +#define STR_UNDO_ORIGINALSIZE 281 -#define STR_LINKERROR 282 -#define STR_LINKERRORFILE 283 -#define STR_LINKERRORTAB 284 -#define STR_UNDO_UPDATELINK 285 +#define STR_LINKERROR 282 +#define STR_LINKERRORFILE 283 +#define STR_LINKERRORTAB 284 +#define STR_UNDO_UPDATELINK 285 -#define STR_IMPORT_REPLACE 286 +#define STR_IMPORT_REPLACE 286 -#define STR_UNDO_REMOVELINK 287 +#define STR_UNDO_REMOVELINK 287 -#define STR_OVERVIEW 288 -#define STR_DOC_INFO 289 -#define STR_DOC_CREATED 290 -#define STR_DOC_MODIFIED 291 -#define STR_DOC_PRINTED 292 -#define STR_DOC_THEME 293 -#define STR_DOC_KEYWORDS 318 -#define STR_DOC_COMMENT 294 -#define STR_BY 295 -#define STR_ON 296 +#define STR_OVERVIEW 288 +#define STR_DOC_INFO 289 +#define STR_DOC_CREATED 290 +#define STR_DOC_MODIFIED 291 +#define STR_DOC_PRINTED 292 +#define STR_DOC_THEME 293 +#define STR_DOC_KEYWORDS 318 +#define STR_DOC_COMMENT 294 +#define STR_BY 295 +#define STR_ON 296 -#define STR_RELOAD_TABLES 297 +#define STR_RELOAD_TABLES 297 -#define STR_FILTER_TOOMANY 298 +#define STR_FILTER_TOOMANY 298 -#define STR_UNDO_ENTERMATRIX 299 +#define STR_UNDO_ENTERMATRIX 299 -#define STR_INSERT_FULL 300 -#define STR_TABINSERT_ERROR 301 -#define STR_PASTE_ERROR 302 -#define STR_PASTE_FULL 303 +#define STR_INSERT_FULL 300 +#define STR_TABINSERT_ERROR 301 +#define STR_PASTE_ERROR 302 +#define STR_PASTE_FULL 303 -#define STR_ERR_INVALID_AREA 304 +#define STR_ERR_INVALID_AREA 304 -#define STR_IMPORT_DIF 305 -#define STR_EXPORT_DIF 306 +#define STR_IMPORT_DIF 305 +#define STR_EXPORT_DIF 306 -#define STR_ERR_NOREF 307 -#define STR_FUN_TEXT_COUNT2 308 -#define STR_NO_NAME_REF 309 /* moved to compiler.src, keep define! */ +#define STR_ERR_NOREF 307 +#define STR_FUN_TEXT_COUNT2 308 +#define STR_NO_NAME_REF 309 /* moved to compiler.src, keep define! */ -#define STR_MATRIXFRAGMENTERR 310 +#define STR_MATRIXFRAGMENTERR 310 -#define STR_UNDO_SHOWTAB 311 -#define STR_UNDO_HIDETAB 312 -#define STR_UNDO_INSERTAREALINK 313 +#define STR_UNDO_SHOWTAB 311 +#define STR_UNDO_HIDETAB 312 +#define STR_UNDO_INSERTAREALINK 313 -#define STR_REIMPORT_AFTER_LOAD 314 +#define STR_REIMPORT_AFTER_LOAD 314 -#define STR_DETINVALID_OVERFLOW 315 -#define STR_GRAPHICNAME 316 -#define STR_INVALIDNAME 317 -// 318 ist oben -#define STR_ERR_LINKOVERLAP 319 +#define STR_DETINVALID_OVERFLOW 315 +#define STR_GRAPHICNAME 316 +#define STR_INVALIDNAME 317 +// 318 ist oben +#define STR_ERR_LINKOVERLAP 319 -#define STR_VALID_MACRONOTFOUND 320 -#define STR_VALID_DEFERROR 321 +#define STR_VALID_MACRONOTFOUND 320 +#define STR_VALID_DEFERROR 321 -#define STR_UNDO_DETINVALID 322 +#define STR_UNDO_DETINVALID 322 -#define STR_PROGRESS_CALCULATING 323 -#define STR_PROGRESS_SORTING 324 -#define STR_PROGRESS_HEIGHTING 325 +#define STR_PROGRESS_CALCULATING 323 +#define STR_PROGRESS_SORTING 324 +#define STR_PROGRESS_HEIGHTING 325 -#define STR_QUICKHELP_DELETE 326 +#define STR_QUICKHELP_DELETE 326 -#define STR_FUNCTIONLIST_MORE 327 +#define STR_FUNCTIONLIST_MORE 327 -#define STR_PIVOT_STYLE_INNER 328 -#define STR_PIVOT_STYLE_RESULT 329 -#define STR_PIVOT_STYLE_CATEGORY 330 -#define STR_PIVOT_STYLE_TITLE 331 -#define STR_PIVOT_STYLE_FIELDNAME 332 -#define STR_PIVOT_STYLE_TOP 333 +#define STR_PIVOT_STYLE_INNER 328 +#define STR_PIVOT_STYLE_RESULT 329 +#define STR_PIVOT_STYLE_CATEGORY 330 +#define STR_PIVOT_STYLE_TITLE 331 +#define STR_PIVOT_STYLE_FIELDNAME 332 +#define STR_PIVOT_STYLE_TOP 333 -#define STR_OPERATION_FILTER 334 -#define STR_OPERATION_SORT 335 -#define STR_OPERATION_SUBTOTAL 336 -#define STR_OPERATION_NONE 337 +#define STR_OPERATION_FILTER 334 +#define STR_OPERATION_SORT 335 +#define STR_OPERATION_SUBTOTAL 336 +#define STR_OPERATION_NONE 337 -#define STR_UNDO_PROTECT_TAB 338 -#define STR_UNDO_UNPROTECT_TAB 339 -#define STR_UNDO_PROTECT_DOC 340 -#define STR_UNDO_UNPROTECT_DOC 341 +#define STR_UNDO_PROTECT_TAB 338 +#define STR_UNDO_UNPROTECT_TAB 339 +#define STR_UNDO_PROTECT_DOC 340 +#define STR_UNDO_UNPROTECT_DOC 341 -#define STR_PROGRESS_IMPORT 342 +#define STR_PROGRESS_IMPORT 342 -#define STR_SORT_ERR_MERGED 343 +#define STR_SORT_ERR_MERGED 343 -#define STR_TIP_WIDTH 344 -#define STR_TIP_HEIGHT 345 -#define STR_TIP_HIDE 346 +#define STR_TIP_WIDTH 344 +#define STR_TIP_HEIGHT 345 +#define STR_TIP_HIDE 346 -#define STR_UNDO_REMOVEBREAKS 347 -#define STR_UNDO_PRINTSCALE 348 -#define STR_UNDO_DRAG_BREAK 349 +#define STR_UNDO_REMOVEBREAKS 347 +#define STR_UNDO_PRINTSCALE 348 +#define STR_UNDO_DRAG_BREAK 349 -#define STR_QUICKHELP_REF 350 +#define STR_QUICKHELP_REF 350 -#define STR_PIVOT_OVERLAP 351 -#define STR_PIVOT_NOTEMPTY 352 +#define STR_PIVOT_OVERLAP 351 +#define STR_PIVOT_NOTEMPTY 352 -#define STR_QUERY_NOTFOUND 353 +#define STR_QUERY_NOTFOUND 353 -#define STR_ERR_INSERTOBJ 354 +#define STR_ERR_INSERTOBJ 354 -#define STR_PROGRESS_COMPARING 355 +#define STR_PROGRESS_COMPARING 355 -#define STR_CHANGED_BLANK 356 -#define STR_CHANGED_CELL 357 -#define STR_CHANGED_INSERT 358 -#define STR_CHANGED_DELETE 359 -#define STR_CHANGED_MOVE 360 +#define STR_CHANGED_BLANK 356 +#define STR_CHANGED_CELL 357 +#define STR_CHANGED_INSERT 358 +#define STR_CHANGED_DELETE 359 +#define STR_CHANGED_MOVE 360 -#define STR_QUERY_DELSCENARIO 361 -#define STR_UNDO_EDITSCENARIO 362 +#define STR_QUERY_DELSCENARIO 361 +#define STR_UNDO_EDITSCENARIO 362 -#define STR_END_REDLINING_TITLE 363 -#define STR_END_REDLINING 364 +#define STR_END_REDLINING_TITLE 363 +#define STR_END_REDLINING 364 -#define STR_UNDO_EDITNOTE 365 -#define STR_TABREMOVE_ERROR 366 -#define STR_CLOSE_ERROR_LINK 367 -#define STR_UNDO_RANGENAMES 368 +#define STR_UNDO_EDITNOTE 365 +#define STR_TABREMOVE_ERROR 366 +#define STR_CLOSE_ERROR_LINK 367 +#define STR_UNDO_RANGENAMES 368 -#define STR_MSSG_SEARCHANDREPLACE_4 369 -#define STR_MSSG_SEARCHANDREPLACE_5 370 +#define STR_MSSG_SEARCHANDREPLACE_4 369 +#define STR_MSSG_SEARCHANDREPLACE_5 370 -#define STR_UNDO_RESIZEMATRIX 371 -#define STR_TIP_RESIZEMATRIX 372 +#define STR_UNDO_RESIZEMATRIX 371 +#define STR_TIP_RESIZEMATRIX 372 -#define STR_READONLYERR 373 +#define STR_READONLYERR 373 -#define STR_PASTE_BIGGER 374 +#define STR_PASTE_BIGGER 374 -#define STR_MACRO_WARNING 375 +#define STR_MACRO_WARNING 375 -#define STR_EXPORT_DBF 376 +#define STR_EXPORT_DBF 376 -#define STR_UNDO_APPLYPAGESTYLE 377 -#define STR_UNDO_EDITCELLSTYLE 378 -#define STR_UNDO_EDITPAGESTYLE 379 +#define STR_UNDO_APPLYPAGESTYLE 377 +#define STR_UNDO_EDITCELLSTYLE 378 +#define STR_UNDO_EDITPAGESTYLE 379 -#define STR_DATAPILOT_SUBTOTAL 380 +#define STR_DATAPILOT_SUBTOTAL 380 -#define STR_UNDO_TRANSLITERATE 381 +#define STR_UNDO_TRANSLITERATE 381 #define STR_NO_ADDIN 382 #define STR_LONG_ERR_NO_ADDIN 383 @@ -564,14 +564,14 @@ #define STR_UNKNOWN_USER 429 #define STR_LONG_ERR_NULL 430 -#define STR_UNDO_INSERTNOTE 431 -#define STR_UNDO_DELETENOTE 432 +#define STR_UNDO_INSERTNOTE 431 +#define STR_UNDO_DELETENOTE 432 #define STR_STYLE_FAMILY_CELL 433 #define STR_STYLE_FAMILY_PAGE 434 -#define STR_ERR_DATAPILOTSOURCE 435 +#define STR_ERR_DATAPILOTSOURCE 435 #define STR_PIVOT_FIRSTROWEMPTYERR 436 -#define STR_PIVOT_ONLYONEROWERR 437 +#define STR_PIVOT_ONLYONEROWERR 437 #define STR_UNDO_SET_TAB_BG_COLOR 438 #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439 diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index 708d37a9b4bd..906210330b5b 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,9 +37,9 @@ class ScPaintHint : public SfxHint { - ScRange aRange; - USHORT nParts; - BOOL bPrint; // Flag, ob auch Druck/Vorschau betroffen ist + ScRange aRange; + USHORT nParts; + BOOL bPrint; // Flag, ob auch Druck/Vorschau betroffen ist ScPaintHint(); // disabled @@ -48,9 +48,9 @@ public: ScPaintHint( const ScRange& rRng, USHORT nPaint = PAINT_ALL ); ~ScPaintHint(); - void SetPrintFlag(BOOL bSet) { bPrint = bSet; } + void SetPrintFlag(BOOL bSet) { bPrint = bSet; } - const ScRange& GetRange() const { return aRange; } + const ScRange& GetRange() const { return aRange; } SCCOL GetStartCol() const { return aRange.aStart.Col(); } SCROW GetStartRow() const { return aRange.aStart.Row(); } SCTAB GetStartTab() const { return aRange.aStart.Tab(); } @@ -58,17 +58,17 @@ public: SCROW GetEndRow() const { return aRange.aEnd.Row(); } SCTAB GetEndTab() const { return aRange.aEnd.Tab(); } USHORT GetParts() const { return nParts; } - BOOL GetPrintFlag() const { return bPrint; } + BOOL GetPrintFlag() const { return bPrint; } }; class ScUpdateRefHint : public SfxHint { - UpdateRefMode eUpdateRefMode; - ScRange aRange; - SCsCOL nDx; - SCsROW nDy; - SCsTAB nDz; + UpdateRefMode eUpdateRefMode; + ScRange aRange; + SCsCOL nDx; + SCsROW nDy; + SCsTAB nDz; public: TYPEINFO(); @@ -77,74 +77,74 @@ public: SCsCOL nX, SCsROW nY, SCsTAB nZ ); ~ScUpdateRefHint(); - UpdateRefMode GetMode() const { return eUpdateRefMode; } - const ScRange& GetRange() const { return aRange; } - SCsCOL GetDx() const { return nDx; } - SCsROW GetDy() const { return nDy; } - SCsTAB GetDz() const { return nDz; } + UpdateRefMode GetMode() const { return eUpdateRefMode; } + const ScRange& GetRange() const { return aRange; } + SCsCOL GetDx() const { return nDx; } + SCsROW GetDy() const { return nDy; } + SCsTAB GetDz() const { return nDz; } }; -#define SC_POINTERCHANGED_NUMFMT 1 +#define SC_POINTERCHANGED_NUMFMT 1 class ScPointerChangedHint : public SfxHint { - USHORT nFlags; + USHORT nFlags; public: TYPEINFO(); ~ScPointerChangedHint(); - USHORT GetFlags() const { return nFlags; } + USHORT GetFlags() const { return nFlags; } }; -//! move ScLinkRefreshedHint to a different file? +//! move ScLinkRefreshedHint to a different file? -#define SC_LINKREFTYPE_NONE 0 -#define SC_LINKREFTYPE_SHEET 1 -#define SC_LINKREFTYPE_AREA 2 -#define SC_LINKREFTYPE_DDE 3 +#define SC_LINKREFTYPE_NONE 0 +#define SC_LINKREFTYPE_SHEET 1 +#define SC_LINKREFTYPE_AREA 2 +#define SC_LINKREFTYPE_DDE 3 class ScLinkRefreshedHint : public SfxHint { - USHORT nLinkType; // SC_LINKREFTYPE_... - String aUrl; // used for sheet links - String aDdeAppl; // used for dde links: - String aDdeTopic; - String aDdeItem; - BYTE nDdeMode; - ScAddress aDestPos; // used to identify area links - //! also use source data for area links? + USHORT nLinkType; // SC_LINKREFTYPE_... + String aUrl; // used for sheet links + String aDdeAppl; // used for dde links: + String aDdeTopic; + String aDdeItem; + BYTE nDdeMode; + ScAddress aDestPos; // used to identify area links + //! also use source data for area links? public: TYPEINFO(); ScLinkRefreshedHint(); ~ScLinkRefreshedHint(); - void SetSheetLink( const String& rSourceUrl ); - void SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM ); - void SetAreaLink( const ScAddress& rPos ); - - USHORT GetLinkType() const { return nLinkType; } - const String& GetUrl() const { return aUrl; } - const String& GetDdeAppl() const { return aDdeAppl; } - const String& GetDdeTopic() const { return aDdeTopic; } - const String& GetDdeItem() const { return aDdeItem; } - BYTE GetDdeMode() const { return nDdeMode; } - const ScAddress& GetDestPos() const { return aDestPos; } + void SetSheetLink( const String& rSourceUrl ); + void SetDdeLink( const String& rA, const String& rT, const String& rI, BYTE nM ); + void SetAreaLink( const ScAddress& rPos ); + + USHORT GetLinkType() const { return nLinkType; } + const String& GetUrl() const { return aUrl; } + const String& GetDdeAppl() const { return aDdeAppl; } + const String& GetDdeTopic() const { return aDdeTopic; } + const String& GetDdeItem() const { return aDdeItem; } + BYTE GetDdeMode() const { return nDdeMode; } + const ScAddress& GetDestPos() const { return aDestPos; } }; -//! move ScAutoStyleHint to a different file? +//! move ScAutoStyleHint to a different file? class ScAutoStyleHint : public SfxHint { - ScRange aRange; - String aStyle1; - String aStyle2; - ULONG nTimeout; + ScRange aRange; + String aStyle1; + String aStyle2; + ULONG nTimeout; public: TYPEINFO(); @@ -152,10 +152,10 @@ public: ULONG nT, const String& rSt2 ); ~ScAutoStyleHint(); - const ScRange& GetRange() const { return aRange; } - const String& GetStyle1() const { return aStyle1; } - UINT32 GetTimeout() const { return nTimeout; } - const String& GetStyle2() const { return aStyle2; } + const ScRange& GetRange() const { return aRange; } + const String& GetStyle1() const { return aStyle1; } + UINT32 GetTimeout() const { return nTimeout; } + const String& GetStyle2() const { return aStyle2; } }; class ScDBRangeRefreshedHint : public SfxHint @@ -167,7 +167,7 @@ public: ScDBRangeRefreshedHint( const ScImportParam& rP ); ~ScDBRangeRefreshedHint(); - const ScImportParam& GetImportParam() const { return aParam; } + const ScImportParam& GetImportParam() const { return aParam; } }; class ScDataPilotModifiedHint : public SfxHint diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 0b1b922fc1c7..075885961c74 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,15 +39,15 @@ class SvStream; class ScInputOptions { private: - USHORT nMoveDir; // enum ScDirection - BOOL bMoveSelection; - BOOL bEnterEdit; - BOOL bExtendFormat; - BOOL bRangeFinder; - BOOL bExpandRefs; - BOOL bMarkHeader; - BOOL bUseTabCol; - BOOL bTextWysiwyg; + USHORT nMoveDir; // enum ScDirection + BOOL bMoveSelection; + BOOL bEnterEdit; + BOOL bExtendFormat; + BOOL bRangeFinder; + BOOL bExpandRefs; + BOOL bMarkHeader; + BOOL bUseTabCol; + BOOL bTextWysiwyg; BOOL bReplCellsWarn; public: @@ -55,7 +55,7 @@ public: ScInputOptions( const ScInputOptions& rCpy ); ~ScInputOptions(); - void SetDefaults(); + void SetDefaults(); void SetMoveDir(USHORT nNew) { nMoveDir = nNew; } USHORT GetMoveDir() const { return nMoveDir; } @@ -78,7 +78,7 @@ public: void SetReplaceCellsWarn(BOOL bSet) { bReplCellsWarn = bSet; } BOOL GetReplaceCellsWarn() const { return bReplCellsWarn; } - const ScInputOptions& operator= ( const ScInputOptions& rOpt ); + const ScInputOptions& operator= ( const ScInputOptions& rOpt ); }; @@ -94,11 +94,11 @@ class ScInputCfg : public ScInputOptions, public: ScInputCfg(); - void SetOptions( const ScInputOptions& rNew ); - void OptionsChanged(); // after direct access to SetOptions base class + void SetOptions( const ScInputOptions& rNew ); + void OptionsChanged(); // after direct access to SetOptions base class - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Commit(); }; diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index a64d64b48c5e..9a4c08215885 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,32 +74,32 @@ class ScSheetLinkObj : public cppu::WeakImplHelper4< public SfxListener { private: - SfxItemPropertySet aPropSet; - ScDocShell* pDocShell; - String aFileName; + SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + String aFileName; XRefreshListenerArr_Impl aRefreshListeners; - ScTableLink* GetLink_Impl() const; - void Refreshed_Impl(); - void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); + ScTableLink* GetLink_Impl() const; + void Refreshed_Impl(); + void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); public: ScSheetLinkObj(ScDocShell* pDocSh, const String& rName); - virtual ~ScSheetLinkObj(); + virtual ~ScSheetLinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -107,7 +107,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -119,25 +119,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -145,14 +145,14 @@ public: ::com::sun::star::uno::RuntimeException); // aus get/setPropertyValue gerufen: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; - void setRefreshDelay(sal_Int32 nRefreshDelay); + ::rtl::OUString getFileName(void) const; + void setFileName(const ::rtl::OUString& FileName); + ::rtl::OUString getFilter(void) const; + void setFilter(const ::rtl::OUString& Filter); + ::rtl::OUString getFilterOptions(void) const; + void setFilterOptions(const ::rtl::OUString& FilterOptions); + sal_Int32 getRefreshDelay(void) const; + void setRefreshDelay(sal_Int32 nRefreshDelay); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() @@ -172,16 +172,16 @@ class ScSheetLinksObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScSheetLinkObj* GetObjectByIndex_Impl(INT32 nIndex); - ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScSheetLinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScSheetLinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScSheetLinksObj(ScDocShell* pDocSh); - virtual ~ScSheetLinksObj(); + virtual ~ScSheetLinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) @@ -227,29 +227,29 @@ class ScAreaLinkObj : public cppu::WeakImplHelper4< public SfxListener { private: - SfxItemPropertySet aPropSet; - ScDocShell* pDocShell; - USHORT nPos; + SfxItemPropertySet aPropSet; + ScDocShell* pDocShell; + USHORT nPos; XRefreshListenerArr_Impl aRefreshListeners; - void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, + void Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::OUString* pNewFilter, const ::rtl::OUString* pNewOptions, const ::rtl::OUString* pNewSource, const com::sun::star::table::CellRangeAddress* pNewDest ); - void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); - void Refreshed_Impl(); + void ModifyRefreshDelay_Impl( sal_Int32 nRefresh ); + void Refreshed_Impl(); public: ScAreaLinkObj(ScDocShell* pDocSh, USHORT nP); - virtual ~ScAreaLinkObj(); + virtual ~ScAreaLinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -257,7 +257,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -269,25 +269,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -295,18 +295,18 @@ public: ::com::sun::star::uno::RuntimeException); // aus get/setPropertyValue gerufen: - ::rtl::OUString getFileName(void) const; - void setFileName(const ::rtl::OUString& FileName); - ::rtl::OUString getFilter(void) const; - void setFilter(const ::rtl::OUString& Filter); - ::rtl::OUString getFilterOptions(void) const; - void setFilterOptions(const ::rtl::OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; - void setRefreshDelay(sal_Int32 nRefreshDelay); + ::rtl::OUString getFileName(void) const; + void setFileName(const ::rtl::OUString& FileName); + ::rtl::OUString getFilter(void) const; + void setFilter(const ::rtl::OUString& Filter); + ::rtl::OUString getFilterOptions(void) const; + void setFilterOptions(const ::rtl::OUString& FilterOptions); + sal_Int32 getRefreshDelay(void) const; + void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink virtual ::rtl::OUString SAL_CALL getSourceArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSourceArea( const ::rtl::OUString& aSourceArea ) + virtual void SAL_CALL setSourceArea( const ::rtl::OUString& aSourceArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDestArea() throw(::com::sun::star::uno::RuntimeException); @@ -330,24 +330,24 @@ class ScAreaLinksObj : public cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScAreaLinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScAreaLinkObj* GetObjectByIndex_Impl(INT32 nIndex); public: ScAreaLinksObj(ScDocShell* pDocSh); - virtual ~ScAreaLinksObj(); + virtual ~ScAreaLinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XAreaLinks - virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, + virtual void SAL_CALL insertAtPosition( const ::com::sun::star::table::CellAddress& aDestPos, const ::rtl::OUString& aFileName, const ::rtl::OUString& aSourceArea, const ::rtl::OUString& aFilter, const ::rtl::OUString& aFilterOptions ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess @@ -376,7 +376,7 @@ public: }; -//! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols +//! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols class ScDDELinkObj : public cppu::WeakImplHelper5< com::sun::star::sheet::XDDELink, @@ -387,24 +387,24 @@ class ScDDELinkObj : public cppu::WeakImplHelper5< public SfxListener { private: - ScDocShell* pDocShell; - String aAppl; - String aTopic; - String aItem; + ScDocShell* pDocShell; + String aAppl; + String aTopic; + String aItem; XRefreshListenerArr_Impl aRefreshListeners; - void Refreshed_Impl(); + void Refreshed_Impl(); public: ScDDELinkObj(ScDocShell* pDocSh, const String& rA, const String& rT, const String& rI); - virtual ~ScDDELinkObj(); + virtual ~ScDDELinkObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XDDELink @@ -413,11 +413,11 @@ public: virtual ::rtl::OUString SAL_CALL getItem() throw(::com::sun::star::uno::RuntimeException); // XRefreshable - virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL refresh() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRefreshListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -447,16 +447,16 @@ class ScDDELinksObj : public cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScDDELinkObj* GetObjectByIndex_Impl(INT32 nIndex); - ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScDDELinkObj* GetObjectByIndex_Impl(INT32 nIndex); + ScDDELinkObj* GetObjectByName_Impl(const ::rtl::OUString& aName); public: ScDDELinksObj(ScDocShell* pDocSh); - virtual ~ScDDELinksObj(); + virtual ~ScDDELinksObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx index d5167c96e174..956b00e64ea8 100644 --- a/sc/inc/listenercalls.hxx +++ b/sc/inc/listenercalls.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 1cf5bc2797b1..eef03958b3e3 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index a41197a49d68..658e77040e45 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,49 +36,49 @@ struct ScMarkEntry { - SCROW nRow; - BOOL bMarked; + SCROW nRow; + BOOL bMarked; }; class ScMarkArray { - SCSIZE nCount; + SCSIZE nCount; SCSIZE nLimit; - ScMarkEntry* pData; + ScMarkEntry* pData; friend class ScMarkArrayIter; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo public: ScMarkArray(); ~ScMarkArray(); - void Reset( BOOL bMarked = FALSE ); - BOOL GetMark( SCROW nRow ) const; - void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); - BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; - BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; + void Reset( BOOL bMarked = FALSE ); + BOOL GetMark( SCROW nRow ) const; + void SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ); + BOOL IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const; + BOOL HasOneMark( SCROW& rStartRow, SCROW& rEndRow ) const; - BOOL HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } + BOOL HasMarks() const { return ( nCount > 1 || ( nCount == 1 && pData[0].bMarked ) ); } - void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; + void CopyMarksTo( ScMarkArray& rDestMarkArray ) const; - BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; + BOOL Search( SCROW nRow, SCSIZE& nIndex ) const; /// Including current row, may return -1 if bUp and not found - SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; - SCROW GetMarkEnd( SCROW nRow, BOOL bUp ) const; + SCsROW GetNextMarked( SCsROW nRow, BOOL bUp ) const; + SCROW GetMarkEnd( SCROW nRow, BOOL bUp ) const; }; -class ScMarkArrayIter // selektierte Bereiche durchgehen +class ScMarkArrayIter // selektierte Bereiche durchgehen { - const ScMarkArray* pArray; - SCSIZE nPos; + const ScMarkArray* pArray; + SCSIZE nPos; public: ScMarkArrayIter( const ScMarkArray* pNewArray ); ~ScMarkArrayIter(); - BOOL Next( SCROW& rTop, SCROW& rBottom ); + BOOL Next( SCROW& rTop, SCROW& rBottom ); }; diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx index abab6086f99f..5b593d5691ed 100644 --- a/sc/inc/markdata.hxx +++ b/sc/inc/markdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,83 +36,83 @@ class ScMarkArray; class ScRangeList; -//! todo: -//! Es muss auch die Moeglichkeit geben, MarkArrays pro Tabelle zu halten, -//! damit "alle suchen" ueber mehrere Tabellen wieder funktioniert! +//! todo: +//! Es muss auch die Moeglichkeit geben, MarkArrays pro Tabelle zu halten, +//! damit "alle suchen" ueber mehrere Tabellen wieder funktioniert! class SC_DLLPUBLIC ScMarkData { private: - ScRange aMarkRange; // Bereich - ScRange aMultiRange; // maximaler Bereich insgesamt - ScMarkArray* pMultiSel; // Mehrfachselektion - BOOL bTabMarked[MAXTABCOUNT];// Tabelle selektiert - BOOL bMarked; // Rechteck markiert - BOOL bMultiMarked; // mehrfach markiert + ScRange aMarkRange; // Bereich + ScRange aMultiRange; // maximaler Bereich insgesamt + ScMarkArray* pMultiSel; // Mehrfachselektion + BOOL bTabMarked[MAXTABCOUNT];// Tabelle selektiert + BOOL bMarked; // Rechteck markiert + BOOL bMultiMarked; // mehrfach markiert - BOOL bMarking; // Bereich wird aufgezogen -> kein MarkToMulti - BOOL bMarkIsNeg; // Aufheben bei Mehrfachselektion + BOOL bMarking; // Bereich wird aufgezogen -> kein MarkToMulti + BOOL bMarkIsNeg; // Aufheben bei Mehrfachselektion public: ScMarkData(); ScMarkData(const ScMarkData& rData); ~ScMarkData(); - ScMarkData& operator=(const ScMarkData& rData); + ScMarkData& operator=(const ScMarkData& rData); - void ResetMark(); - void SetMarkArea( const ScRange& rRange ); + void ResetMark(); + void SetMarkArea( const ScRange& rRange ); - void SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE ); + void SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE ); - void MarkToMulti(); - void MarkToSimple(); + void MarkToMulti(); + void MarkToSimple(); - BOOL IsMarked() const { return bMarked; } - BOOL IsMultiMarked() const { return bMultiMarked; } + BOOL IsMarked() const { return bMarked; } + BOOL IsMultiMarked() const { return bMultiMarked; } - void GetMarkArea( ScRange& rRange ) const; - void GetMultiMarkArea( ScRange& rRange ) const; + void GetMarkArea( ScRange& rRange ) const; + void GetMultiMarkArea( ScRange& rRange ) const; - void SetAreaTab( SCTAB nTab ); + void SetAreaTab( SCTAB nTab ); - void SelectTable( SCTAB nTab, BOOL bNew ) { bTabMarked[nTab] = bNew; } - BOOL GetTableSelect( SCTAB nTab ) const { return bTabMarked[nTab]; } + void SelectTable( SCTAB nTab, BOOL bNew ) { bTabMarked[nTab] = bNew; } + BOOL GetTableSelect( SCTAB nTab ) const { return bTabMarked[nTab]; } - void SelectOneTable( SCTAB nTab ); - SCTAB GetSelectCount() const; - SCTAB GetFirstSelected() const; + void SelectOneTable( SCTAB nTab ); + SCTAB GetSelectCount() const; + SCTAB GetFirstSelected() const; - void SetMarkNegative( BOOL bFlag ) { bMarkIsNeg = bFlag; } - BOOL IsMarkNegative() const { return bMarkIsNeg; } - void SetMarking( BOOL bFlag ) { bMarking = bFlag; } - BOOL GetMarkingFlag() const { return bMarking; } + void SetMarkNegative( BOOL bFlag ) { bMarkIsNeg = bFlag; } + BOOL IsMarkNegative() const { return bMarkIsNeg; } + void SetMarking( BOOL bFlag ) { bMarking = bFlag; } + BOOL GetMarkingFlag() const { return bMarking; } - // fuer FillInfo / Document etc. - const ScMarkArray* GetArray() const { return pMultiSel; } + // fuer FillInfo / Document etc. + const ScMarkArray* GetArray() const { return pMultiSel; } - BOOL IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const; - void FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const; - void ExtendRangeListTables( ScRangeList* pList ) const; + BOOL IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const; + void FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const; + void ExtendRangeListTables( ScRangeList* pList ) const; - void MarkFromRangeList( const ScRangeList& rList, BOOL bReset ); + void MarkFromRangeList( const ScRangeList& rList, BOOL bReset ); - SCCOLROW GetMarkColumnRanges( SCCOLROW* pRanges ); - SCCOLROW GetMarkRowRanges( SCCOLROW* pRanges ); + SCCOLROW GetMarkColumnRanges( SCCOLROW* pRanges ); + SCCOLROW GetMarkRowRanges( SCCOLROW* pRanges ); - BOOL IsColumnMarked( SCCOL nCol ) const; - BOOL IsRowMarked( SCROW nRow ) const; - BOOL IsAllMarked( const ScRange& rRange ) const; // Multi + BOOL IsColumnMarked( SCCOL nCol ) const; + BOOL IsRowMarked( SCROW nRow ) const; + BOOL IsAllMarked( const ScRange& rRange ) const; // Multi /// May return -1 - SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const; - BOOL HasMultiMarks( SCCOL nCol ) const; - BOOL HasAnyMultiMarks() const; + SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const; + BOOL HasMultiMarks( SCCOL nCol ) const; + BOOL HasAnyMultiMarks() const; - // Tabellen-Markierungen anpassen: - void InsertTab( SCTAB nTab ); - void DeleteTab( SCTAB nTab ); + // Tabellen-Markierungen anpassen: + void InsertTab( SCTAB nTab ); + void DeleteTab( SCTAB nTab ); }; diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index e845e3c466ff..0f5c0fde42f4 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,59 +38,59 @@ #include <cppuhelper/implbase2.hxx> #include "scdllapi.h" -#define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ -::rtl::OUString SAL_CALL ClassName::getImplementationName() \ - throw(::com::sun::star::uno::RuntimeException) \ -{ \ - return ::rtl::OUString::createFromAscii(ClassNameAscii); \ -} \ +#define SC_SIMPLE_SERVICE_INFO( ClassName, ClassNameAscii, ServiceAscii ) \ +::rtl::OUString SAL_CALL ClassName::getImplementationName() \ + throw(::com::sun::star::uno::RuntimeException) \ +{ \ + return ::rtl::OUString::createFromAscii(ClassNameAscii); \ +} \ sal_Bool SAL_CALL ClassName::supportsService( const ::rtl::OUString& ServiceName ) \ - throw(::com::sun::star::uno::RuntimeException) \ -{ \ - return !ServiceName.compareToAscii(ServiceAscii); \ -} \ -::com::sun::star::uno::Sequence< ::rtl::OUString > \ - SAL_CALL ClassName::getSupportedServiceNames(void) \ - throw(::com::sun::star::uno::RuntimeException) \ -{ \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ - ::rtl::OUString* pArray = aRet.getArray(); \ - pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ - return aRet; \ + throw(::com::sun::star::uno::RuntimeException) \ +{ \ + return !ServiceName.compareToAscii(ServiceAscii); \ +} \ +::com::sun::star::uno::Sequence< ::rtl::OUString > \ + SAL_CALL ClassName::getSupportedServiceNames(void) \ + throw(::com::sun::star::uno::RuntimeException) \ +{ \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aRet(1); \ + ::rtl::OUString* pArray = aRet.getArray(); \ + pArray[0] = ::rtl::OUString::createFromAscii(ServiceAscii); \ + return aRet; \ } -#define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ - void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ - const uno::Reference<beans::XPropertyChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ - { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ - const uno::Reference<beans::XPropertyChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ - { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ - const uno::Reference<beans::XVetoableChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ - { DBG_ERROR("not implemented"); } \ - void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ - const uno::Reference<beans::XVetoableChangeListener>&) \ - throw(beans::UnknownPropertyException, \ - lang::WrappedTargetException, uno::RuntimeException) \ +#define SC_IMPL_DUMMY_PROPERTY_LISTENER( ClassName ) \ + void SAL_CALL ClassName::addPropertyChangeListener( const rtl::OUString&, \ + const uno::Reference<beans::XPropertyChangeListener>&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ + { DBG_ERROR("not implemented"); } \ + void SAL_CALL ClassName::removePropertyChangeListener( const rtl::OUString&, \ + const uno::Reference<beans::XPropertyChangeListener>&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ + { DBG_ERROR("not implemented"); } \ + void SAL_CALL ClassName::addVetoableChangeListener( const rtl::OUString&, \ + const uno::Reference<beans::XVetoableChangeListener>&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ + { DBG_ERROR("not implemented"); } \ + void SAL_CALL ClassName::removeVetoableChangeListener( const rtl::OUString&, \ + const uno::Reference<beans::XVetoableChangeListener>&) \ + throw(beans::UnknownPropertyException, \ + lang::WrappedTargetException, uno::RuntimeException) \ { DBG_ERROR("not implemented"); } -#define SC_QUERYINTERFACE(x) \ - if (rType == getCppuType((const uno::Reference<x>*)0)) \ +#define SC_QUERYINTERFACE(x) \ + if (rType == getCppuType((const uno::Reference<x>*)0)) \ { return uno::makeAny(uno::Reference<x>(this)); } // SC_QUERY_MULTIPLE( XElementAccess, XIndexAccess ): -// use if interface is used several times in one class +// use if interface is used several times in one class -#define SC_QUERY_MULTIPLE(x,y) \ - if (rType == getCppuType((const uno::Reference<x>*)0)) \ +#define SC_QUERY_MULTIPLE(x,y) \ + if (rType == getCppuType((const uno::Reference<x>*)0)) \ { uno::Any aR; aR <<= uno::Reference<x>(static_cast<y*>(this)); return aR; } @@ -101,12 +101,12 @@ class ScIndexEnumeration : public cppu::WeakImplHelper2< private: com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> xIndex; rtl::OUString sServiceName; - sal_Int32 nPos; + sal_Int32 nPos; public: ScIndexEnumeration(const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess>& rInd, const rtl::OUString& rServiceName); - virtual ~ScIndexEnumeration(); + virtual ~ScIndexEnumeration(); // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); @@ -124,7 +124,7 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -// new (uno 3) variant +// new (uno 3) variant class ScNameToIndexAccess : public cppu::WeakImplHelper2< com::sun::star::container::XIndexAccess, com::sun::star::lang::XServiceInfo > @@ -137,7 +137,7 @@ public: ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ); - virtual ~ScNameToIndexAccess(); + virtual ~ScNameToIndexAccess(); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); @@ -165,24 +165,24 @@ class SC_DLLPUBLIC ScUnoHelpFunctions public: static com::sun::star::uno::Reference<com::sun::star::uno::XInterface> AnyToInterface( const com::sun::star::uno::Any& rAny ); - static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< + static sal_Bool GetBoolProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, sal_Bool bDefault = sal_False ); - static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< + static sal_Int32 GetLongProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, long nDefault = 0 ); - static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< + static sal_Int32 GetEnumProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, long nDefault ); static ::rtl::OUString GetStringProperty( const com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>& xProp, const ::rtl::OUString& rName, const ::rtl::OUString& rDefault ); - static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny ); - static sal_Int32 GetEnumFromAny( const com::sun::star::uno::Any& aAny ); - static void SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue ); + static sal_Bool GetBoolFromAny( const com::sun::star::uno::Any& aAny ); + static sal_Int16 GetInt16FromAny( const com::sun::star::uno::Any& aAny ); + static sal_Int32 GetInt32FromAny( const com::sun::star::uno::Any& aAny ); + static sal_Int32 GetEnumFromAny( const com::sun::star::uno::Any& aAny ); + static void SetBoolInAny( com::sun::star::uno::Any& rAny, sal_Bool bValue ); static void SetOptionalPropertyValue( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rPropSet, diff --git a/sc/inc/mutexhlp.hxx b/sc/inc/mutexhlp.hxx index ebe9176799c4..4763a902b4d7 100644 --- a/sc/inc/mutexhlp.hxx +++ b/sc/inc/mutexhlp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,8 +31,8 @@ #include <osl/mutex.hxx> -// used in XComponent implementations to construct a Mutex before the -// OComponentHelper base class +// used in XComponent implementations to construct a Mutex before the +// OComponentHelper base class class ScMutexHelper { diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 2583546e463e..f691c9f67c72 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,33 +65,33 @@ class ScNamedRangeObj : public ::cppu::WeakImplHelper6< { private: ScNamedRangesObj* mpParent; - ScDocShell* pDocShell; - String aName; + ScDocShell* pDocShell; + String aName; private: - ScRangeData* GetRangeData_Impl(); - void Modify_Impl( const String* pNewName, + ScRangeData* GetRangeData_Impl(); + void Modify_Impl( const String* pNewName, const ScTokenArray* pNewTokens, const String* pNewContent, const ScAddress* pNewPos, const sal_uInt16* pNewType, const formula::FormulaGrammar::Grammar eGrammar ); public: ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* pDocSh, const String& rNm); - virtual ~ScNamedRangeObj(); + virtual ~ScNamedRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNamedRange virtual ::rtl::OUString SAL_CALL getContent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setContent( const ::rtl::OUString& aContent ) + virtual void SAL_CALL setContent( const ::rtl::OUString& aContent ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellAddress SAL_CALL getReferencePosition() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReferencePosition( + virtual void SAL_CALL setReferencePosition( const ::com::sun::star::table::CellAddress& aReferencePosition ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getType() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setType( sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); // XFormulaTokens virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getTokens() @@ -102,7 +102,7 @@ public: // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XCellRangeReferrer @@ -113,7 +113,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -125,25 +125,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -184,15 +184,15 @@ class ScNamedRangesObj : public ::cppu::WeakImplHelper6< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; // if true, adding new name or modifying existing one will set the // document 'modified' and broadcast the change. We turn this off during // import. sal_Bool mbModifyAndBroadcast; - ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); + ScNamedRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); + ScNamedRangeObj* GetObjectByName_Impl(const ::rtl::OUString& aName); protected: /** called from the XActionLockable interface methods on initial locking */ @@ -203,22 +203,22 @@ protected: public: ScNamedRangesObj(ScDocShell* pDocSh); - virtual ~ScNamedRangesObj(); + virtual ~ScNamedRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); bool IsModifyAndBroadcast() const; // XNamedRanges - virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent, + virtual void SAL_CALL addNewByName( const ::rtl::OUString& aName, const ::rtl::OUString& aContent, const ::com::sun::star::table::CellAddress& aPosition, sal_Int32 nType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, + virtual void SAL_CALL addNewFromTitles( const ::com::sun::star::table::CellRangeAddress& aSource, ::com::sun::star::sheet::Border aBorder ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) + virtual void SAL_CALL outputList( const ::com::sun::star::table::CellAddress& aOutputPosition ) throw(::com::sun::star::uno::RuntimeException); // XNameAccess @@ -251,7 +251,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -263,25 +263,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -311,28 +311,28 @@ class ScLabelRangeObj : public ::cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - sal_Bool bColumn; - ScRange aRange; // Kriterium um Bereich zu finden + ScDocShell* pDocShell; + sal_Bool bColumn; + ScRange aRange; // Kriterium um Bereich zu finden private: - ScRangePair* GetData_Impl(); - void Modify_Impl( const ScRange* pLabel, const ScRange* pData ); + ScRangePair* GetData_Impl(); + void Modify_Impl( const ScRange* pLabel, const ScRange* pData ); public: ScLabelRangeObj(ScDocShell* pDocSh, sal_Bool bCol, const ScRange& rR); - virtual ~ScLabelRangeObj(); + virtual ~ScLabelRangeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XLabelRange virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getLabelArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabelArea( const ::com::sun::star::table::CellRangeAddress& aLabelArea ) + virtual void SAL_CALL setLabelArea( const ::com::sun::star::table::CellRangeAddress& aLabelArea ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getDataArea() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) + virtual void SAL_CALL setDataArea( const ::com::sun::star::table::CellRangeAddress& aDataArea ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo @@ -352,22 +352,22 @@ class ScLabelRangesObj : public ::cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - sal_Bool bColumn; + ScDocShell* pDocShell; + sal_Bool bColumn; - ScLabelRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); + ScLabelRangeObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); public: ScLabelRangesObj(ScDocShell* pDocSh, sal_Bool bCol); - virtual ~ScLabelRangesObj(); + virtual ~ScLabelRangesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XLabelRanges - virtual void SAL_CALL addNew( const ::com::sun::star::table::CellRangeAddress& aLabelArea, + virtual void SAL_CALL addNew( const ::com::sun::star::table::CellRangeAddress& aLabelArea, const ::com::sun::star::table::CellRangeAddress& aDataArea ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException); // XIndexAccess diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx index 939ddff5d778..d13eb2e02dc2 100644 --- a/sc/inc/navicfg.hxx +++ b/sc/inc/navicfg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,19 +39,19 @@ class ScNavipiCfg { private: - USHORT nListMode; - USHORT nDragMode; - USHORT nRootType; + USHORT nListMode; + USHORT nDragMode; + USHORT nRootType; public: ScNavipiCfg(); - void SetListMode(USHORT nNew); - USHORT GetListMode() const { return nListMode; } - void SetDragMode(USHORT nNew); - USHORT GetDragMode() const { return nDragMode; } - void SetRootType(USHORT nNew); - USHORT GetRootType() const { return nRootType; } + void SetListMode(USHORT nNew); + USHORT GetListMode() const { return nListMode; } + void SetDragMode(USHORT nNew); + USHORT GetDragMode() const { return nDragMode; } + void SetRootType(USHORT nNew); + USHORT GetRootType() const { return nRootType; } }; diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index 42e79d5bcee7..7947eebf08ef 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,14 +57,14 @@ class ScAnnotationObj : public cppu::WeakImplHelper5< { public: ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos); - virtual ~ScAnnotationObj(); + virtual ~ScAnnotationObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); @@ -76,11 +76,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -94,7 +94,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XSheetAnnotation @@ -125,9 +125,9 @@ private: const ScPostIt* ImplGetNote() const; private: - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxUnoText* pUnoText; + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxUnoText* pUnoText; }; class ScAnnotationShapeObj : public cppu::WeakImplHelper10< @@ -144,25 +144,25 @@ class ScAnnotationShapeObj : public cppu::WeakImplHelper10< public SfxListener { private: - ScDocShell* pDocShell; - ScAddress aCellPos; - SvxUnoText* pUnoText; + ScDocShell* pDocShell; + ScAddress aCellPos; + SvxUnoText* pUnoText; com::sun::star::uno::Reference < com::sun::star::drawing::XShape > xShape; private: - SvxUnoText& GetUnoText(); + SvxUnoText& GetUnoText(); com::sun::star::uno::Reference < com::sun::star::drawing::XShape > GetXShape(); public: ScAnnotationShapeObj(ScDocShell* pDocSh, const ScAddress& rPos); - virtual ~ScAnnotationShapeObj(); + virtual ~ScAnnotationShapeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); @@ -201,11 +201,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -219,94 +219,94 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XShapeDescriptor - virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException); // XShape virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) - throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) + throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); // XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( + const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) + throw (::com::sun::star::beans::UnknownPropertyException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) - throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) + throw (::com::sun::star::beans::PropertyVetoException, + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( + const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< + ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); // XComponent virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) + throw (::com::sun::star::uno::RuntimeException); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index dca32db3932f..a69202524f7d 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index 53dae3500fe8..c51d2c024ae4 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,30 +52,30 @@ public: static const SfxItemPropertyMapEntry* GetPropertyMap(); static sal_Bool setPropertyValue( ScDocOptions& rOptions, - const SfxItemPropertyMap& rPropMap, + const SfxItemPropertyMap& rPropMap, const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ); static ::com::sun::star::uno::Any getPropertyValue( const ScDocOptions& rOptions, - const SfxItemPropertyMap& rPropMap, + const SfxItemPropertyMap& rPropMap, const ::rtl::OUString& PropertyName ); }; -// empty doc object to supply only doc options +// empty doc object to supply only doc options class ScDocOptionsObj : public ScModelObj { private: - ScDocOptions aOptions; + ScDocOptions aOptions; public: ScDocOptionsObj( const ScDocOptions& rOpt ); - virtual ~ScDocOptionsObj(); + virtual ~ScDocOptionsObj(); // get/setPropertyValue overloaded to used stored options instead of document - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 7526d91b57d5..cfc7d4eca366 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,25 +40,25 @@ public: // values must correspond with integer values stored in the configuration enum KeyBindingType { KEY_DEFAULT = 0, KEY_OOO_LEGACY = 1 }; - static BOOL IsMetricSystem(); + static BOOL IsMetricSystem(); }; -// ConfigItem for classes that use items from several sub trees +// ConfigItem for classes that use items from several sub trees class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem { - Link aCommitLink; + Link aCommitLink; public: ScLinkConfigItem( const rtl::OUString& rSubTree ); ScLinkConfigItem( const rtl::OUString& rSubTree, sal_Int16 nMode ); - void SetCommitLink( const Link& rLink ); + void SetCommitLink( const Link& rLink ); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames ); + virtual void Commit(); - void SetModified() { ConfigItem::SetModified(); } + void SetModified() { ConfigItem::SetModified(); } com::sun::star::uno::Sequence< com::sun::star::uno::Any> GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } @@ -69,11 +69,11 @@ public: using ConfigItem::EnableNotification; using ConfigItem::GetNodeNames; -// sal_Bool EnableNotification(com::sun::star::uno::Sequence< rtl::OUString >& rNames) -// { return ConfigItem::EnableNotification( rNames ); } +// sal_Bool EnableNotification(com::sun::star::uno::Sequence< rtl::OUString >& rNames) +// { return ConfigItem::EnableNotification( rNames ); } -// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) -// { return ConfigItem::GetNodeNames( rNode ); } +// com::sun::star::uno::Sequence< rtl::OUString > GetNodeNames(rtl::OUString& rNode) +// { return ConfigItem::GetNodeNames( rNode ); } }; #endif diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx index a3c2c4f3b77b..e13eaed0f499 100644 --- a/sc/inc/pagepar.hxx +++ b/sc/inc/pagepar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,49 +36,49 @@ struct ScPageTableParam { - BOOL bCellContent; - BOOL bNotes; - BOOL bGrid; - BOOL bHeaders; - BOOL bCharts; - BOOL bObjects; - BOOL bDrawings; - BOOL bFormulas; - BOOL bNullVals; - BOOL bTopDown; - BOOL bLeftRight; - BOOL bSkipEmpty; - BOOL bScaleNone; - BOOL bScaleAll; + BOOL bCellContent; + BOOL bNotes; + BOOL bGrid; + BOOL bHeaders; + BOOL bCharts; + BOOL bObjects; + BOOL bDrawings; + BOOL bFormulas; + BOOL bNullVals; + BOOL bTopDown; + BOOL bLeftRight; + BOOL bSkipEmpty; + BOOL bScaleNone; + BOOL bScaleAll; BOOL bScaleTo; - BOOL bScalePageNum; - USHORT nScaleAll; + BOOL bScalePageNum; + USHORT nScaleAll; USHORT nScaleWidth; USHORT nScaleHeight; - USHORT nScalePageNum; - USHORT nFirstPageNo; + USHORT nScalePageNum; + USHORT nFirstPageNo; ScPageTableParam(); ~ScPageTableParam(); - BOOL operator== ( const ScPageTableParam& r ) const; - void Reset (); + BOOL operator== ( const ScPageTableParam& r ) const; + void Reset (); }; struct ScPageAreaParam { - BOOL bPrintArea; - BOOL bRepeatRow; - BOOL bRepeatCol; - ScRange aPrintArea; - ScRange aRepeatRow; - ScRange aRepeatCol; + BOOL bPrintArea; + BOOL bRepeatRow; + BOOL bRepeatCol; + ScRange aPrintArea; + ScRange aRepeatRow; + ScRange aRepeatCol; ScPageAreaParam(); ~ScPageAreaParam(); - BOOL operator== ( const ScPageAreaParam& r ) const; - void Reset (); + BOOL operator== ( const ScPageAreaParam& r ) const; + void Reset (); }; diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index 778986101d27..250065a0d3ad 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ //------------------------------------------------------------------------ -// SvxFmDrawPage subclass to create ScShapeObj for shapes +// SvxFmDrawPage subclass to create ScShapeObj for shapes class ScPageObj : public SvxFmDrawPage { diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx index 549328e24b67..7c1817b81e41 100644 --- a/sc/inc/paramisc.hxx +++ b/sc/inc/paramisc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,30 +36,30 @@ class String; struct ScSolveParam { - ScAddress aRefFormulaCell; - ScAddress aRefVariableCell; - String* pStrTargetVal; + ScAddress aRefFormulaCell; + ScAddress aRefVariableCell; + String* pStrTargetVal; ScSolveParam(); ScSolveParam( const ScSolveParam& r ); - ScSolveParam( const ScAddress& rFormulaCell, - const ScAddress& rVariableCell, + ScSolveParam( const ScAddress& rFormulaCell, + const ScAddress& rVariableCell, const String& rTargetValStr ); ~ScSolveParam(); - ScSolveParam& operator= ( const ScSolveParam& r ); - BOOL operator== ( const ScSolveParam& r ) const; + ScSolveParam& operator= ( const ScSolveParam& r ); + BOOL operator== ( const ScSolveParam& r ) const; }; //----------------------------------------------------------------------- struct ScTabOpParam { - ScRefAddress aRefFormulaCell; - ScRefAddress aRefFormulaEnd; - ScRefAddress aRefRowCell; - ScRefAddress aRefColCell; - BYTE nMode; + ScRefAddress aRefFormulaCell; + ScRefAddress aRefFormulaEnd; + ScRefAddress aRefRowCell; + ScRefAddress aRefColCell; + BYTE nMode; ScTabOpParam() {}; ScTabOpParam( const ScTabOpParam& r ); @@ -67,11 +67,11 @@ struct ScTabOpParam const ScRefAddress& rFormulaEnd, const ScRefAddress& rRowCell, const ScRefAddress& rColCell, - BYTE nMd); + BYTE nMd); ~ScTabOpParam() {}; - ScTabOpParam& operator= ( const ScTabOpParam& r ); - BOOL operator== ( const ScTabOpParam& r ) const; + ScTabOpParam& operator= ( const ScTabOpParam& r ); + BOOL operator== ( const ScTabOpParam& r ) const; }; #endif // SC_PARAMISC_HXX diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 6368eaa9b7f1..6b49ad8d3b42 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,24 +43,24 @@ class SvNumberFormatter; class ScDocument; -// how to treat COL_AUTO in GetFont: +// how to treat COL_AUTO in GetFont: enum ScAutoFontColorMode { - SC_AUTOCOL_RAW, // COL_AUTO is returned - SC_AUTOCOL_BLACK, // always use black - SC_AUTOCOL_PRINT, // black or white, depending on background - SC_AUTOCOL_DISPLAY, // from style settings, or black/white if needed - SC_AUTOCOL_IGNOREFONT, // like DISPLAY, but ignore stored font color (assume COL_AUTO) - SC_AUTOCOL_IGNOREBACK, // like DISPLAY, but ignore stored background color (use configured color) - SC_AUTOCOL_IGNOREALL // like DISPLAY, but ignore stored font and background colors + SC_AUTOCOL_RAW, // COL_AUTO is returned + SC_AUTOCOL_BLACK, // always use black + SC_AUTOCOL_PRINT, // black or white, depending on background + SC_AUTOCOL_DISPLAY, // from style settings, or black/white if needed + SC_AUTOCOL_IGNOREFONT, // like DISPLAY, but ignore stored font color (assume COL_AUTO) + SC_AUTOCOL_IGNOREBACK, // like DISPLAY, but ignore stored background color (use configured color) + SC_AUTOCOL_IGNOREALL // like DISPLAY, but ignore stored font and background colors }; class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem { - String* pName; - ScStyleSheet* pStyle; + String* pName; + ScStyleSheet* pStyle; public: static ScDocument* pDoc; ScPatternAttr(SfxItemSet* pItemSet, const String& rStyleName); @@ -74,17 +74,17 @@ public: virtual SfxPoolItem* Create(SvStream& rStream, USHORT nVersion) const; virtual SvStream& Store(SvStream& rStream, USHORT nItemVersion) const; - virtual int operator==(const SfxPoolItem& rCmp) const; + virtual int operator==(const SfxPoolItem& rCmp) const; const SfxPoolItem& GetItem( USHORT nWhichP ) const { return GetItemSet().Get(nWhichP); } static const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet& rItemSet, const SfxItemSet* pCondSet ); - const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet* pCondSet ) const; + const SfxPoolItem& GetItem( USHORT nWhich, const SfxItemSet* pCondSet ) const; // pWhich sind keine Ranges, sondern einzelne IDs, 0-terminiert - BOOL HasItemsSet( const USHORT* pWhich ) const; - void ClearItems( const USHORT* pWhich ); + BOOL HasItemsSet( const USHORT* pWhich ) const; + void ClearItems( const USHORT* pWhich ); void DeleteUnchanged( const ScPatternAttr* pOldAttrs ); @@ -117,29 +117,29 @@ public: /** Converts all edit engine items contained in pEditSet to Calc items and puts them into the own item set. */ void GetFromEditItemSet( const SfxItemSet* pEditSet ); - void FillEditParaItems( SfxItemSet* pSet ) const; + void FillEditParaItems( SfxItemSet* pSet ) const; ScPatternAttr* PutInPool( ScDocument* pDestDoc, ScDocument* pSrcDoc ) const; - void SetStyleSheet(ScStyleSheet* pNewStyle); - const ScStyleSheet* GetStyleSheet() const { return pStyle; } - const String* GetStyleName() const; - void UpdateStyleSheet(); - void StyleToName(); + void SetStyleSheet(ScStyleSheet* pNewStyle); + const ScStyleSheet* GetStyleSheet() const { return pStyle; } + const String* GetStyleName() const; + void UpdateStyleSheet(); + void StyleToName(); - BOOL IsVisible() const; - BOOL IsVisibleEqual( const ScPatternAttr& rOther ) const; + BOOL IsVisible() const; + BOOL IsVisibleEqual( const ScPatternAttr& rOther ) const; /** If font is an old symbol font StarBats/StarMath with text encoding RTL_TEXTENC_SYMBOL */ - BOOL IsSymbolFont() const; + BOOL IsSymbolFont() const; - ULONG GetNumberFormat( SvNumberFormatter* ) const; - ULONG GetNumberFormat( SvNumberFormatter* pFormatter, + ULONG GetNumberFormat( SvNumberFormatter* ) const; + ULONG GetNumberFormat( SvNumberFormatter* pFormatter, const SfxItemSet* pCondSet ) const; - long GetRotateVal( const SfxItemSet* pCondSet ) const; - BYTE GetRotateDir( const SfxItemSet* pCondSet ) const; + long GetRotateVal( const SfxItemSet* pCondSet ) const; + BYTE GetRotateDir( const SfxItemSet* pCondSet ) const; }; diff --git a/sc/inc/pch/precompiled_sc.cxx b/sc/inc/pch/precompiled_sc.cxx index 705088caeddb..ceb929a49bf3 100644 --- a/sc/inc/pch/precompiled_sc.cxx +++ b/sc/inc/pch/precompiled_sc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index e915273ce098..a5c626fa3040 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index a844b3d3ecbe..bc1cc288d947 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,8 +57,8 @@ class SubTotal; #include "collect.hxx" -#define PIVOT_DATA_FIELD (MAXCOLCOUNT) -#define PIVOT_FUNC_REF (MAXCOLCOUNT) +#define PIVOT_DATA_FIELD (MAXCOLCOUNT) +#define PIVOT_FUNC_REF (MAXCOLCOUNT) #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/sheet/DataPilotFieldReference.hpp> #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp> @@ -129,7 +129,7 @@ struct ScPivotParam // ----------------------------------------------------------------------- -typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; +typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; typedef PivotField PivotPageFieldArr[PIVOT_MAXPAGEFIELD]; //------------------------------------------------------------------------ @@ -164,11 +164,11 @@ struct ScDPLabelData Member(); - /** - * return the name that should be displayed in the dp dialogs i.e. - * when the layout name is present, use it, or else use the original - * name. - */ + /** + * return the name that should be displayed in the dp dialogs i.e. + * when the layout name is present, use it, or else use the original + * name. + */ ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; }; ::std::vector<Member> maMembers; @@ -179,10 +179,10 @@ struct ScDPLabelData explicit ScDPLabelData( const String& rName, short nCol, bool bIsValue ); - /** - * return the name that should be displayed in the dp dialogs i.e. when + /** + * return the name that should be displayed in the dp dialogs i.e. when * the layout name is present, use it, or else use the original name. - */ + */ ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; }; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 444f672ddcfe..0e7affc4a6f6 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index cf9e55e50c26..15c01efe1192 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,24 +36,24 @@ class SC_DLLPUBLIC ScPrintOptions { private: - BOOL bSkipEmpty; - BOOL bAllSheets; + BOOL bSkipEmpty; + BOOL bAllSheets; public: ScPrintOptions(); ScPrintOptions( const ScPrintOptions& rCpy ); ~ScPrintOptions(); - BOOL GetSkipEmpty() const { return bSkipEmpty; } - void SetSkipEmpty( BOOL bVal ) { bSkipEmpty = bVal; } - BOOL GetAllSheets() const { return bAllSheets; } - void SetAllSheets( BOOL bVal ) { bAllSheets = bVal; } + BOOL GetSkipEmpty() const { return bSkipEmpty; } + void SetSkipEmpty( BOOL bVal ) { bSkipEmpty = bVal; } + BOOL GetAllSheets() const { return bAllSheets; } + void SetAllSheets( BOOL bVal ) { bAllSheets = bVal; } - void SetDefaults(); + void SetDefaults(); - const ScPrintOptions& operator= ( const ScPrintOptions& rCpy ); - int operator== ( const ScPrintOptions& rOpt ) const; - int operator!= ( const ScPrintOptions& rOpt ) const; + const ScPrintOptions& operator= ( const ScPrintOptions& rCpy ); + int operator== ( const ScPrintOptions& rOpt ) const; + int operator!= ( const ScPrintOptions& rOpt ) const; }; //================================================================== @@ -73,7 +73,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScPrintOptions& GetPrintOptions() const { return theOptions; } + const ScPrintOptions& GetPrintOptions() const { return theOptions; } private: ScPrintOptions theOptions; @@ -90,9 +90,9 @@ class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem public: ScPrintCfg(); - void SetOptions( const ScPrintOptions& rNew ); + void SetOptions( const ScPrintOptions& rNew ); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); }; diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx index 7dacefdd943a..b352d5356183 100644 --- a/sc/inc/prnsave.hxx +++ b/sc/inc/prnsave.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,23 +57,23 @@ public: const ScRange* GetRepeatCol() const { return mpRepeatCol; } const ScRange* GetRepeatRow() const { return mpRepeatRow; } - BOOL operator==( const ScPrintSaverTab& rCmp ) const; + BOOL operator==( const ScPrintSaverTab& rCmp ) const; }; class ScPrintRangeSaver { - SCTAB nTabCount; - ScPrintSaverTab* pData; // Array + SCTAB nTabCount; + ScPrintSaverTab* pData; // Array public: ScPrintRangeSaver( SCTAB nCount ); ~ScPrintRangeSaver(); - SCTAB GetTabCount() const { return nTabCount; } - ScPrintSaverTab& GetTabData(SCTAB nTab); - const ScPrintSaverTab& GetTabData(SCTAB nTab) const; + SCTAB GetTabCount() const { return nTabCount; } + ScPrintSaverTab& GetTabData(SCTAB nTab); + const ScPrintSaverTab& GetTabData(SCTAB nTab) const; - BOOL operator==( const ScPrintRangeSaver& rCmp ) const; + BOOL operator==( const ScPrintRangeSaver& rCmp ) const; }; diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index d6c2bd3f4529..ba5f12471850 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,39 +48,39 @@ class ScDocument; class SC_DLLPUBLIC ScProgress { private: - static SfxProgress* pGlobalProgress; - static ULONG nGlobalRange; - static ULONG nGlobalPercent; - static BOOL bGlobalNoUserBreak; - static ScProgress* pInterpretProgress; - static ScProgress* pOldInterpretProgress; - static ULONG nInterpretProgress; - static BOOL bAllowInterpretProgress; - static ScDocument* pInterpretDoc; - static BOOL bIdleWasDisabled; - - SfxProgress* pProgress; + static SfxProgress* pGlobalProgress; + static ULONG nGlobalRange; + static ULONG nGlobalPercent; + static BOOL bGlobalNoUserBreak; + static ScProgress* pInterpretProgress; + static ScProgress* pOldInterpretProgress; + static ULONG nInterpretProgress; + static BOOL bAllowInterpretProgress; + static ScDocument* pInterpretDoc; + static BOOL bIdleWasDisabled; + + SfxProgress* pProgress; // not implemented ScProgress( const ScProgress& ); - ScProgress& operator=( const ScProgress& ); + ScProgress& operator=( const ScProgress& ); - static void CalcGlobalPercent( ULONG nVal ) + static void CalcGlobalPercent( ULONG nVal ) { nGlobalPercent = nGlobalRange ? nVal * 100 / nGlobalRange : 0; } public: - static SfxProgress* GetGlobalSfxProgress() { return pGlobalProgress; } - static BOOL IsUserBreak() { return !bGlobalNoUserBreak; } - static void CreateInterpretProgress( ScDocument* pDoc, + static SfxProgress* GetGlobalSfxProgress() { return pGlobalProgress; } + static BOOL IsUserBreak() { return !bGlobalNoUserBreak; } + static void CreateInterpretProgress( ScDocument* pDoc, BOOL bWait = TRUE ); - static ScProgress* GetInterpretProgress() { return pInterpretProgress; } - static void DeleteInterpretProgress(); - static ULONG GetInterpretCount() { return nInterpretProgress; } - static ULONG GetGlobalRange() { return nGlobalRange; } - static ULONG GetGlobalPercent() { return nGlobalPercent; } + static ScProgress* GetInterpretProgress() { return pInterpretProgress; } + static void DeleteInterpretProgress(); + static ULONG GetInterpretCount() { return nInterpretProgress; } + static ULONG GetGlobalRange() { return nGlobalRange; } + static ULONG GetGlobalPercent() { return nGlobalPercent; } ScProgress( SfxObjectShell* pObjSh, const String& rText, @@ -93,9 +93,9 @@ public: ScProgress(); #endif // kann NULL sein! - SfxProgress* GetSfxProgress() const { return pProgress; } + SfxProgress* GetSfxProgress() const { return pProgress; } - BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ) + BOOL SetStateText( ULONG nVal, const String &rVal, ULONG nNewRange = 0 ) { if ( pProgress ) { @@ -108,7 +108,7 @@ public: } return TRUE; } - BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ) + BOOL SetState( ULONG nVal, ULONG nNewRange = 0 ) { if ( pProgress ) { @@ -121,7 +121,7 @@ public: } return TRUE; } - BOOL SetStateCountDown( ULONG nVal ) + BOOL SetStateCountDown( ULONG nVal ) { if ( pProgress ) { @@ -132,22 +132,22 @@ public: } return TRUE; } - BOOL SetStateOnPercent( ULONG nVal ) - { // nur wenn Prozent mehr als vorher + BOOL SetStateOnPercent( ULONG nVal ) + { // nur wenn Prozent mehr als vorher if ( nGlobalRange && (nVal * 100 / nGlobalRange) > nGlobalPercent ) return SetState( nVal ); return TRUE; } - BOOL SetStateCountDownOnPercent( ULONG nVal ) - { // nur wenn Prozent mehr als vorher + BOOL SetStateCountDownOnPercent( ULONG nVal ) + { // nur wenn Prozent mehr als vorher if ( nGlobalRange && ((nGlobalRange - nVal) * 100 / nGlobalRange) > nGlobalPercent ) return SetStateCountDown( nVal ); return TRUE; } - ULONG GetState() + ULONG GetState() { if ( pProgress ) return pProgress->GetState(); diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 93302bd3c284..62a4a6efdc97 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 3584a9d2b2a7..912f9af019ad 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,31 +46,31 @@ private: public: ScRangeList() {} ScRangeList( const ScRangeList& rList ); - virtual ~ScRangeList(); - ScRangeList& operator=(const ScRangeList& rList); - void RemoveAll(); - void Append( const ScRange& rRange ) + virtual ~ScRangeList(); + ScRangeList& operator=(const ScRangeList& rList); + void RemoveAll(); + void Append( const ScRange& rRange ) { ScRangePtr pR = new ScRange( rRange ); Insert( pR, LIST_APPEND ); } - USHORT Parse( const String&, ScDocument* = NULL, + USHORT Parse( const String&, ScDocument* = NULL, USHORT nMask = SCA_VALID, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ); - void Format( String&, USHORT nFlags = 0, ScDocument* = NULL, + void Format( String&, USHORT nFlags = 0, ScDocument* = NULL, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO, sal_Unicode cDelimiter = 0 ) const; - void Join( const ScRange&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, + void Join( const ScRange&, BOOL bIsInList = FALSE ); + BOOL UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - ScRange* Find( const ScAddress& ) const; - BOOL operator==( const ScRangeList& ) const; + ScRange* Find( const ScAddress& ) const; + BOOL operator==( const ScRangeList& ) const; BOOL operator!=( const ScRangeList& r ) const; - BOOL Intersects( const ScRange& ) const; - BOOL In( const ScRange& ) const; - ULONG GetCellCount() const; + BOOL Intersects( const ScRange& ) const; + BOOL In( const ScRange& ) const; + ULONG GetCellCount() const; }; SV_DECL_IMPL_REF( ScRangeList ); @@ -84,22 +84,22 @@ private: using ScRangePairListBase::operator==; public: - virtual ~ScRangePairList(); - ScRangePairList* Clone() const; - void Append( const ScRangePair& rRangePair ) + virtual ~ScRangePairList(); + ScRangePairList* Clone() const; + void Append( const ScRangePair& rRangePair ) { ScRangePair* pR = new ScRangePair( rRangePair ); Insert( pR, LIST_APPEND ); } - void Join( const ScRangePair&, BOOL bIsInList = FALSE ); - BOOL UpdateReference( UpdateRefMode, ScDocument*, + void Join( const ScRangePair&, BOOL bIsInList = FALSE ); + BOOL UpdateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void DeleteOnTab( SCTAB nTab ); - ScRangePair* Find( const ScAddress& ) const; - ScRangePair* Find( const ScRange& ) const; - ScRangePair** CreateNameSortedArray( ULONG& nCount, ScDocument* ) const; - BOOL operator==( const ScRangePairList& ) const; + ScRangePair* Find( const ScAddress& ) const; + ScRangePair* Find( const ScRange& ) const; + ScRangePair** CreateNameSortedArray( ULONG& nCount, ScDocument* ) const; + BOOL operator==( const ScRangePairList& ) const; }; SV_DECL_IMPL_REF( ScRangePairList ); diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 5d9256becab2..261c23535dd2 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,17 +50,17 @@ namespace rtl { typedef USHORT RangeType; -#define RT_NAME ((RangeType)0x0000) -#define RT_DATABASE ((RangeType)0x0001) -#define RT_CRITERIA ((RangeType)0x0002) -#define RT_PRINTAREA ((RangeType)0x0004) -#define RT_COLHEADER ((RangeType)0x0008) -#define RT_ROWHEADER ((RangeType)0x0010) -#define RT_ABSAREA ((RangeType)0x0020) -#define RT_REFAREA ((RangeType)0x0040) -#define RT_ABSPOS ((RangeType)0x0080) -#define RT_SHARED ((RangeType)0x0100) -#define RT_SHAREDMOD ((RangeType)0x0200) +#define RT_NAME ((RangeType)0x0000) +#define RT_DATABASE ((RangeType)0x0001) +#define RT_CRITERIA ((RangeType)0x0002) +#define RT_PRINTAREA ((RangeType)0x0004) +#define RT_COLHEADER ((RangeType)0x0008) +#define RT_ROWHEADER ((RangeType)0x0010) +#define RT_ABSAREA ((RangeType)0x0020) +#define RT_REFAREA ((RangeType)0x0040) +#define RT_ABSPOS ((RangeType)0x0080) +#define RT_SHARED ((RangeType)0x0100) +#define RT_SHAREDMOD ((RangeType)0x0200) //------------------------------------------------------------------------ @@ -69,16 +69,16 @@ class ScTokenArray; class ScRangeData : public ScDataObject { private: - String aName; + String aName; String aUpperName; // #i62977# for faster searching (aName is never modified after ctor) - ScTokenArray* pCode; - ScAddress aPos; - RangeType eType; - ScDocument* pDoc; - USHORT nIndex; - BOOL bModified; // wird bei UpdateReference gesetzt/geloescht - - // max row and column to use for wrapping of references. If -1 use the + ScTokenArray* pCode; + ScAddress aPos; + RangeType eType; + ScDocument* pDoc; + USHORT nIndex; + BOOL bModified; // wird bei UpdateReference gesetzt/geloescht + + // max row and column to use for wrapping of references. If -1 use the // application's default. SCROW mnMaxRow; SCCOL mnMaxCol; @@ -88,18 +88,18 @@ private: public: typedef ::std::map<sal_uInt16, sal_uInt16> IndexMap; - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, const String& rName, const String& rSymbol, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, const String& rName, const ScTokenArray& rArr, const ScAddress& rAdr = ScAddress(), RangeType nType = RT_NAME ); - SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, + SC_DLLPUBLIC ScRangeData( ScDocument* pDoc, const String& rName, const ScAddress& rTarget ); // rTarget ist ABSPOS Sprungmarke @@ -108,53 +108,53 @@ public: SC_DLLPUBLIC virtual ~ScRangeData(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - BOOL operator== (const ScRangeData& rData) const; + BOOL operator== (const ScRangeData& rData) const; - void GetName( String& rName ) const { rName = aName; } - const String& GetName( void ) const { return aName; } + void GetName( String& rName ) const { rName = aName; } + const String& GetName( void ) const { return aName; } const String& GetUpperName( void ) const { return aUpperName; } - ScAddress GetPos() const { return aPos; } + ScAddress GetPos() const { return aPos; } // Der Index muss eindeutig sein. Ist er 0, wird ein neuer Index vergeben void SetIndex( USHORT nInd ) { nIndex = nInd; } USHORT GetIndex() const { return nIndex; } - ScTokenArray* GetCode() { return pCode; } - USHORT GetErrCode(); - BOOL HasReferences() const; - void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } - ScDocument* GetDocument() const { return pDoc; } - void SetType( RangeType nType ) { eType = nType; } - void AddType( RangeType nType ) { eType = eType|nType; } - RangeType GetType() const { return eType; } - BOOL HasType( RangeType nType ) const; - SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; - void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, + ScTokenArray* GetCode() { return pCode; } + USHORT GetErrCode(); + BOOL HasReferences() const; + void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } + ScDocument* GetDocument() const { return pDoc; } + void SetType( RangeType nType ) { eType = nType; } + void AddType( RangeType nType ) { eType = eType|nType; } + RangeType GetType() const { return eType; } + BOOL HasType( RangeType nType ) const; + SC_DLLPUBLIC void GetSymbol( String& rSymbol, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + void UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress&, const formula::FormulaGrammar::Grammar eGrammar = formula::FormulaGrammar::GRAM_DEFAULT ); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - BOOL IsModified() const { return bModified; } + BOOL IsModified() const { return bModified; } - SC_DLLPUBLIC void GuessPosition(); + SC_DLLPUBLIC void GuessPosition(); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; - BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; - SC_DLLPUBLIC BOOL IsValidReference( ScRange& rRef ) const; - BOOL IsRangeAtBlock( const ScRange& ) const; + SC_DLLPUBLIC BOOL IsReference( ScRange& rRef ) const; + BOOL IsReference( ScRange& rRef, const ScAddress& rPos ) const; + SC_DLLPUBLIC BOOL IsValidReference( ScRange& rRef ) const; + BOOL IsRangeAtBlock( const ScRange& ) const; - void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); - void TransferTabRef( SCTAB nOldTab, SCTAB nNewTab ); + void UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable); + void TransferTabRef( SCTAB nOldTab, SCTAB nNewTab ); - void ValidateTabRefs(); + void ValidateTabRefs(); void ReplaceRangeNamesInUse( const IndexMap& rMap ); - static void MakeValidName( String& rName ); - SC_DLLPUBLIC static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); + static void MakeValidName( String& rName ); + SC_DLLPUBLIC static BOOL IsNameValid( const String& rName, ScDocument* pDoc ); SC_DLLPUBLIC void SetMaxRow(SCROW nRow); SCROW GetMaxRow() const; @@ -170,7 +170,7 @@ inline BOOL ScRangeData::HasType( RangeType nType ) const extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void*, const void* ); #if defined( ICC ) && defined( OS2 ) - static int _Optlink ICCQsortNameCompare( const void* a, const void* b) + static int _Optlink ICCQsortNameCompare( const void* a, const void* b) { return ScRangeData_QsortNameCompare(a,b); } #endif @@ -187,35 +187,35 @@ private: public: ScRangeName(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE, ScDocument* pDocument = NULL) : - ScSortedCollection ( nLim, nDel, bDup ), - pDoc ( pDocument ), - nSharedMaxIndex ( 1 ) {} // darf nicht 0 sein!! + ScSortedCollection ( nLim, nDel, bDup ), + pDoc ( pDocument ), + nSharedMaxIndex ( 1 ) {} // darf nicht 0 sein!! ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument); - virtual ScDataObject* Clone(ScDocument* pDocP) const + virtual ScDataObject* Clone(ScDocument* pDocP) const { return new ScRangeName(*this, pDocP); } - ScRangeData* operator[]( const USHORT nIndex) const + ScRangeData* operator[]( const USHORT nIndex) const { return (ScRangeData*)At(nIndex); } - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; - SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; + SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& ) const; - SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; + SC_DLLPUBLIC BOOL SearchName( const String& rName, USHORT& rPos ) const; // SearchNameUpper must be called with an upper-case search string - BOOL SearchNameUpper( const String& rUpperName, USHORT& rPos ) const; - void UpdateReference(UpdateRefMode eUpdateRefMode, + BOOL SearchNameUpper( const String& rUpperName, USHORT& rPos ) const; + void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void UpdateTabRef(SCTAB nTable, USHORT nFlag, SCTAB nNewTable = 0); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - virtual BOOL Insert(ScDataObject* pScDataObject); - SC_DLLPUBLIC ScRangeData* FindIndex(USHORT nIndex); - USHORT GetSharedMaxIndex() { return nSharedMaxIndex; } - void SetSharedMaxIndex(USHORT nInd) { nSharedMaxIndex = nInd; } - USHORT GetEntryIndex(); + void UpdateTabRef(SCTAB nTable, USHORT nFlag, SCTAB nNewTable = 0); + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + virtual BOOL Insert(ScDataObject* pScDataObject); + SC_DLLPUBLIC ScRangeData* FindIndex(USHORT nIndex); + USHORT GetSharedMaxIndex() { return nSharedMaxIndex; } + void SetSharedMaxIndex(USHORT nInd) { nSharedMaxIndex = nInd; } + USHORT GetEntryIndex(); }; #endif diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx index 3923958b969d..1573e6ab8e9d 100644 --- a/sc/inc/rangeseq.hxx +++ b/sc/inc/rangeseq.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,19 +40,19 @@ class ScRange; class ScRangeToSequence { public: - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static BOOL FillLongArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillLongArray( com::sun::star::uno::Any& rAny, + static BOOL FillLongArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, + static BOOL FillDoubleArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static BOOL FillStringArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ); - static BOOL FillStringArray( com::sun::star::uno::Any& rAny, + static BOOL FillStringArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, SvNumberFormatter* pFormatter ); - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange, BOOL bAllowNV = FALSE ); @@ -62,7 +62,7 @@ public: implementation of XFormulaParser. If <FALSE/>, boolean values are treated as ordinary double values 1 (true) and 0 (false). */ - static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, + static BOOL FillMixedArray( com::sun::star::uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes = false ); }; @@ -105,8 +105,8 @@ public: class ScByteSequenceToString { public: - // rAny must contain Sequence<sal_Int8>, - // may or may not contain 0-bytes at the end + // rAny must contain Sequence<sal_Int8>, + // may or may not contain 0-bytes at the end static BOOL GetString( String& rString, const com::sun::star::uno::Any& rAny, sal_uInt16 nEncoding ); }; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index f9695f9dfe21..12640dc626c0 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,28 +62,28 @@ public: ScRangeUtil() {} ~ScRangeUtil() {} - BOOL MakeArea ( const String& rAreaStr, - ScArea& rArea, - ScDocument* pDoc, - SCTAB nTab, + BOOL MakeArea ( const String& rAreaStr, + ScArea& rArea, + ScDocument* pDoc, + SCTAB nTab, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - void CutPosString ( const String& theAreaStr, - String& thePosStr ) const; + void CutPosString ( const String& theAreaStr, + String& thePosStr ) const; - BOOL IsAbsTabArea ( const String& rAreaStr, - ScDocument* pDoc, - ScArea*** pppAreas = 0, - USHORT* pAreaCount = 0, - BOOL bAcceptCellRef = FALSE, + BOOL IsAbsTabArea ( const String& rAreaStr, + ScDocument* pDoc, + ScArea*** pppAreas = 0, + USHORT* pAreaCount = 0, + BOOL bAcceptCellRef = FALSE, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL IsAbsArea ( const String& rAreaStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr = 0, - ScRefAddress* pStartPos = 0, - ScRefAddress* pEndPos = 0, + BOOL IsAbsArea ( const String& rAreaStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr = 0, + ScRefAddress* pStartPos = 0, + ScRefAddress* pEndPos = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; BOOL IsRefArea ( const String&, @@ -93,17 +93,17 @@ public: ScRefAddress* = 0 ) const { return FALSE; } - BOOL IsAbsPos ( const String& rPosStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr = 0, - ScRefAddress* pPosTripel = 0, + BOOL IsAbsPos ( const String& rPosStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr = 0, + ScRefAddress* pPosTripel = 0, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; - BOOL MakeRangeFromName ( const String& rName, - ScDocument* pDoc, - SCTAB nCurTab, - ScRange& rRange, + BOOL MakeRangeFromName ( const String& rName, + ScDocument* pDoc, + SCTAB nCurTab, + ScRange& rRange, RutlNameScope eScope=RUTL_NAMES, ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; }; @@ -115,29 +115,29 @@ class SC_DLLPUBLIC ScRangeStringConverter public: // helper methods - static void AssignString( + static void AssignString( ::rtl::OUString& rString, const ::rtl::OUString& rNewStr, sal_Bool bAppendStr, sal_Unicode cSeperator = ' '); - static sal_Int32 IndexOf( + static sal_Int32 IndexOf( const ::rtl::OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset, sal_Unicode cQuote = '\''); - static sal_Int32 IndexOfDifferent( + static sal_Int32 IndexOfDifferent( const ::rtl::OUString& rString, sal_Unicode cSearchChar, sal_Int32 nOffset ); - static sal_Int32 GetTokenCount( + static sal_Int32 GetTokenCount( const ::rtl::OUString& rString, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static void GetTokenByOffset( + static void GetTokenByOffset( ::rtl::OUString& rToken, const ::rtl::OUString& rString, sal_Int32& nOffset, @@ -145,12 +145,12 @@ public: sal_Unicode cQuote = '\''); static void AppendTableName( - ::rtl::OUStringBuffer& rBuf, + ::rtl::OUStringBuffer& rBuf, const ::rtl::OUString& rTabName, sal_Unicode cQuote = '\''); // String to Range core - static sal_Bool GetAddressFromString( + static sal_Bool GetAddressFromString( ScAddress& rAddress, const ::rtl::OUString& rAddressStr, const ScDocument* pDocument, @@ -158,7 +158,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeFromString( + static sal_Bool GetRangeFromString( ScRange& rRange, const ::rtl::OUString& rRangeStr, const ScDocument* pDocument, @@ -166,7 +166,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeListFromString( + static sal_Bool GetRangeListFromString( ScRangeList& rRangeList, const ::rtl::OUString& rRangeListStr, const ScDocument* pDocument, @@ -174,7 +174,7 @@ public: sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetAreaFromString( + static sal_Bool GetAreaFromString( ScArea& rArea, const ::rtl::OUString& rRangeStr, const ScDocument* pDocument, @@ -184,7 +184,7 @@ public: sal_Unicode cQuote = '\''); // String to Range API - static sal_Bool GetAddressFromString( + static sal_Bool GetAddressFromString( ::com::sun::star::table::CellAddress& rAddress, const ::rtl::OUString& rAddressStr, const ScDocument* pDocument, @@ -192,7 +192,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeFromString( + static sal_Bool GetRangeFromString( ::com::sun::star::table::CellRangeAddress& rRange, const ::rtl::OUString& rRangeStr, const ScDocument* pDocument, @@ -200,7 +200,7 @@ public: sal_Int32& nOffset, sal_Unicode cSeperator = ' ', sal_Unicode cQuote = '\''); - static sal_Bool GetRangeListFromString( + static sal_Bool GetRangeListFromString( ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ::rtl::OUString& rRangeListStr, const ScDocument* pDocument, @@ -209,7 +209,7 @@ public: sal_Unicode cQuote = '\''); // Range to String core - static void GetStringFromAddress( + static void GetStringFromAddress( ::rtl::OUString& rString, const ScAddress& rAddress, const ScDocument* pDocument, @@ -217,7 +217,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRange( + static void GetStringFromRange( ::rtl::OUString& rString, const ScRange& rRange, const ScDocument* pDocument, @@ -225,7 +225,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRangeList( + static void GetStringFromRangeList( ::rtl::OUString& rString, const ScRangeList* pRangeList, const ScDocument* pDocument, @@ -233,7 +233,7 @@ public: sal_Unicode cSeperator = ' ', sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D)); - static void GetStringFromArea( + static void GetStringFromArea( ::rtl::OUString& rString, const ScArea& rArea, const ScDocument* pDocument, @@ -243,7 +243,7 @@ public: sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); // Range to String API - static void GetStringFromAddress( + static void GetStringFromAddress( ::rtl::OUString& rString, const ::com::sun::star::table::CellAddress& rAddress, const ScDocument* pDocument, @@ -251,7 +251,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRange( + static void GetStringFromRange( ::rtl::OUString& rString, const ::com::sun::star::table::CellRangeAddress& rRange, const ScDocument* pDocument, @@ -259,7 +259,7 @@ public: sal_Unicode cSeperator = ' ', sal_Bool bAppendStr = sal_False, sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) ); - static void GetStringFromRangeList( + static void GetStringFromRangeList( ::rtl::OUString& rString, const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq, const ScDocument* pDocument, @@ -270,7 +270,7 @@ public: // XML Range to Calc Range static void GetStringFromXMLRangeString( ::rtl::OUString& rString, - const ::rtl::OUString& rXMLRange, + const ::rtl::OUString& rXMLRange, ScDocument* pDoc ); }; @@ -287,9 +287,9 @@ public: ScArea( const ScArea& r ); - ScArea& operator= ( const ScArea& r ); - BOOL operator== ( const ScArea& r ) const; - BOOL operator!= ( const ScArea& r ) const { return !( operator==(r) ); } + ScArea& operator= ( const ScArea& r ); + BOOL operator== ( const ScArea& r ) const; + BOOL operator!= ( const ScArea& r ) const { return !( operator==(r) ); } public: SCTAB nTab; @@ -302,24 +302,24 @@ public: //------------------------------------------------------------------------ // -// gibt Bereiche mit Referenz und alle DB-Bereiche zurueck +// gibt Bereiche mit Referenz und alle DB-Bereiche zurueck // class SC_DLLPUBLIC ScAreaNameIterator { private: - ScRangeName* pRangeName; - ScDBCollection* pDBCollection; - BOOL bFirstPass; - USHORT nPos; - String aStrNoName; + ScRangeName* pRangeName; + ScDBCollection* pDBCollection; + BOOL bFirstPass; + USHORT nPos; + String aStrNoName; public: ScAreaNameIterator( ScDocument* pDoc ); ~ScAreaNameIterator() {} - BOOL Next( String& rName, ScRange& rRange ); - BOOL WasDBName() const { return !bFirstPass; } + BOOL Next( String& rName, ScRange& rRange ); + BOOL WasDBName() const { return !bFirstPass; } }; diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 06503f892fce..575fb30e71db 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,95 +31,95 @@ #include <tools/stream.hxx> -// ID's fuer Dateien: - -#define SCID_SIZES 0x4200 - -#define SCID_POOLS 0x4210 -#define SCID_DOCPOOL 0x4211 -#define SCID_STYLEPOOL 0x4212 -#define SCID_NEWPOOLS 0x4213 // ID fuer SC 3.0a -#define SCID_EDITPOOL 0x4214 - -#define SCID_DOCUMENT 0x4220 -#define SCID_DOCFLAGS 0x4221 -#define SCID_TABLE 0x4222 -#define SCID_DRAWING 0x4223 -#define SCID_RANGENAME 0x4224 -#define SCID_DBAREAS 0x4225 -#define SCID_PIVOT 0x4226 -#define SCID_CHARTS 0x4227 -#define SCID_NUMFORMAT 0x4228 -#define SCID_DOCOPTIONS 0x4229 -#define SCID_VIEWOPTIONS 0x422a -#define SCID_PRINTSETUP 0x422b -#define SCID_CHARSET 0x422c -#define SCID_NEWDOCUMENT 0x422d // ID fuer SC 3.0a -#define SCID_DDELINKS 0x422e -#define SCID_AREALINKS 0x422f -#define SCID_CONDFORMATS 0x4230 -#define SCID_VALIDATION 0x4231 -#define SCID_COLNAMERANGES 0x4232 -#define SCID_ROWNAMERANGES 0x4233 -#define SCID_DETOPLIST 0x4234 -#define SCID_CONSOLIDATA 0x4235 -#define SCID_CHANGETRACK 0x4236 -#define SCID_CHGVIEWSET 0x4237 -#define SCID_LINKUPMODE 0x4238 -#define SCID_DATAPILOT 0x4239 - -#define SCID_COLUMNS 0x4240 -#define SCID_COLROWFLAGS 0x4241 -#define SCID_TABOPTIONS 0x4242 -#define SCID_TABLINK 0x4243 - -#define SCID_COLDATA 0x4250 -#define SCID_COLNOTES 0x4251 -#define SCID_COLATTRIB 0x4252 - -#define SCID_DRAWPOOL 0x4260 -#define SCID_DRAWMODEL 0x4261 - - - -// Dateiversion -// Falls das obere Byte inkrementiert wird, wird das Doc von -// aelteren SCs nicht mehr geladen! - -#define SC_INITIAL_VERSION 0x0001 -#define SC_FORMULA_LCLVER 0x0002 // Formalen mit lokaler VerNr +// ID's fuer Dateien: + +#define SCID_SIZES 0x4200 + +#define SCID_POOLS 0x4210 +#define SCID_DOCPOOL 0x4211 +#define SCID_STYLEPOOL 0x4212 +#define SCID_NEWPOOLS 0x4213 // ID fuer SC 3.0a +#define SCID_EDITPOOL 0x4214 + +#define SCID_DOCUMENT 0x4220 +#define SCID_DOCFLAGS 0x4221 +#define SCID_TABLE 0x4222 +#define SCID_DRAWING 0x4223 +#define SCID_RANGENAME 0x4224 +#define SCID_DBAREAS 0x4225 +#define SCID_PIVOT 0x4226 +#define SCID_CHARTS 0x4227 +#define SCID_NUMFORMAT 0x4228 +#define SCID_DOCOPTIONS 0x4229 +#define SCID_VIEWOPTIONS 0x422a +#define SCID_PRINTSETUP 0x422b +#define SCID_CHARSET 0x422c +#define SCID_NEWDOCUMENT 0x422d // ID fuer SC 3.0a +#define SCID_DDELINKS 0x422e +#define SCID_AREALINKS 0x422f +#define SCID_CONDFORMATS 0x4230 +#define SCID_VALIDATION 0x4231 +#define SCID_COLNAMERANGES 0x4232 +#define SCID_ROWNAMERANGES 0x4233 +#define SCID_DETOPLIST 0x4234 +#define SCID_CONSOLIDATA 0x4235 +#define SCID_CHANGETRACK 0x4236 +#define SCID_CHGVIEWSET 0x4237 +#define SCID_LINKUPMODE 0x4238 +#define SCID_DATAPILOT 0x4239 + +#define SCID_COLUMNS 0x4240 +#define SCID_COLROWFLAGS 0x4241 +#define SCID_TABOPTIONS 0x4242 +#define SCID_TABLINK 0x4243 + +#define SCID_COLDATA 0x4250 +#define SCID_COLNOTES 0x4251 +#define SCID_COLATTRIB 0x4252 + +#define SCID_DRAWPOOL 0x4260 +#define SCID_DRAWMODEL 0x4261 + + + +// Dateiversion +// Falls das obere Byte inkrementiert wird, wird das Doc von +// aelteren SCs nicht mehr geladen! + +#define SC_INITIAL_VERSION 0x0001 +#define SC_FORMULA_LCLVER 0x0002 // Formalen mit lokaler VerNr //-------------------------------- -#define SC_NEW_TOKEN_ARRAYS 0x0003 // neues TokenArray-Format -#define SC_FORMULA_VALUES 0x0004 // Werte in Formelzellen -#define SC_FORMULA_VALUES2 0x0005 // Werte in Formelzellen -#define SC_DATABYTES 0x0006 // Datenbytes, kleine Tables -#define SC_DATABYTES2 0x0007 // Datenbytes, kleine Tables -#define SC_NUMFMT 0x0008 // Zahlenformat an Formelzelle -#define SC_NEWIF 0x0009 // neue Codierung von ocIf (komp.) +#define SC_NEW_TOKEN_ARRAYS 0x0003 // neues TokenArray-Format +#define SC_FORMULA_VALUES 0x0004 // Werte in Formelzellen +#define SC_FORMULA_VALUES2 0x0005 // Werte in Formelzellen +#define SC_DATABYTES 0x0006 // Datenbytes, kleine Tables +#define SC_DATABYTES2 0x0007 // Datenbytes, kleine Tables +#define SC_NUMFMT 0x0008 // Zahlenformat an Formelzelle +#define SC_NEWIF 0x0009 // neue Codierung von ocIf (komp.) //-------------------------------- -#define SC_RELATIVE_REFS 0x0010 // relative Referenzen -#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal der Formelzelle -#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges als ScRangePair +#define SC_RELATIVE_REFS 0x0010 // relative Referenzen +#define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal der Formelzelle +#define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges als ScRangePair //-------------------------------- -#define SC_31_EXPORT_VER 0x0012 // Version bei 3.1-Export +#define SC_31_EXPORT_VER 0x0012 // Version bei 3.1-Export //-------------------------------- ab 4.0 -#define SC_32K_ROWS 0x0100 // 32000 Zeilen - inkompatibel -#define SC_FONTCHARSET 0x0101 // Font-CharSets muessen stimmen +#define SC_32K_ROWS 0x0100 // 32000 Zeilen - inkompatibel +#define SC_FONTCHARSET 0x0101 // Font-CharSets muessen stimmen //-------------------------------- -#define SC_40_EXPORT_VER 0x0101 // Version bei 4.0-Export +#define SC_40_EXPORT_VER 0x0101 // Version bei 4.0-Export //-------------------------------- ab 5.0 -#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode -#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implizite Schnittmenge -#define SC_VERSION_EDITPOOL 0x0203 // EditCells mit EditPool -#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal der Formelzelle wirklich +#define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode +#define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implizite Schnittmenge +#define SC_VERSION_EDITPOOL 0x0203 // EditCells mit EditPool +#define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal der Formelzelle wirklich //-------------------------------- ab 5.2 -#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // #73616# CONVERT function recalculated on each load +#define SC_CONVERT_RECALC_ON_LOAD 0x0205 // #73616# CONVERT function recalculated on each load //-------------------------------- -#define SC_CURRENT_VERSION 0x0205 +#define SC_CURRENT_VERSION 0x0205 -// alles ueber SC_31_EXPORT_VER muss auch beim Speichern abgefragt werden, -// weil 3.1-Export diese Versionsnummer schreibt. +// alles ueber SC_31_EXPORT_VER muss auch beim Speichern abgefragt werden, +// weil 3.1-Export diese Versionsnummer schreibt. // btw: 10 nach 09 ist kein Zaehlfehler sondern eine absichtliche Luecke, // weil nicht klar war, wie lange die RelRefs Entwicklung dauern wuerde.. :) @@ -128,42 +128,42 @@ class SvStream; // ----------------------------------------------------------------------- - // Header mit Groessenangaben fuer mehrere Objekte + // Header mit Groessenangaben fuer mehrere Objekte class ScMultipleReadHeader { private: - SvStream& rStream; - BYTE* pBuf; - SvMemoryStream* pMemStream; - ULONG nEndPos; - ULONG nEntryEnd; - ULONG nTotalEnd; + SvStream& rStream; + BYTE* pBuf; + SvMemoryStream* pMemStream; + ULONG nEndPos; + ULONG nEntryEnd; + ULONG nTotalEnd; public: ScMultipleReadHeader(SvStream& rNewStream); ~ScMultipleReadHeader(); - void StartEntry(); - void EndEntry(); - ULONG BytesLeft() const; + void StartEntry(); + void EndEntry(); + ULONG BytesLeft() const; }; class ScMultipleWriteHeader { private: - SvStream& rStream; - SvMemoryStream aMemStream; - ULONG nDataPos; - sal_uInt32 nDataSize; - ULONG nEntryStart; + SvStream& rStream; + SvMemoryStream aMemStream; + ULONG nDataPos; + sal_uInt32 nDataSize; + ULONG nEntryStart; public: ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0); ~ScMultipleWriteHeader(); - void StartEntry(); - void EndEntry(); + void StartEntry(); + void EndEntry(); }; #endif diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx index 7881addf248f..75f2a8cc2a0f 100644 --- a/sc/inc/recursionhelper.hxx +++ b/sc/inc/recursionhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,7 +124,7 @@ class ScRecursionHelper void StartIteration() { SetInIterationReturn( false); - nIteration = 1; + nIteration = 1; bConverging = false; aLastIterationStart = GetIterationStart(); } diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx index ed0a34982416..2258b9c7095f 100644 --- a/sc/inc/refdata.hxx +++ b/sc/inc/refdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -188,7 +188,7 @@ struct ScComplexRefData // Complex reference (a range) into the sheet { return Ref1.IsDeleted() || Ref2.IsDeleted(); } inline BOOL Valid() const { return Ref1.Valid() && Ref2.Valid(); } - /** In external references nTab is -1 for the start tab and -1 for the end + /** In external references nTab is -1 for the start tab and -1 for the end tab if one sheet, or >=0 if more than one sheets. */ inline bool ValidExternal() const; diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx index 7c638b27a33b..007d0938f26d 100644 --- a/sc/inc/reffind.hxx +++ b/sc/inc/reffind.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,12 +39,12 @@ class ScDocument; class ScRefFinder { private: - String aFormula; + String aFormula; formula::FormulaGrammar::AddressConvention eConv; - ScDocument* pDoc; - xub_StrLen nFound; - xub_StrLen nSelStart; - xub_StrLen nSelEnd; + ScDocument* pDoc; + xub_StrLen nFound; + xub_StrLen nSelStart; + xub_StrLen nSelEnd; public: static const sal_Unicode __FAR_DATA pDelimiters[]; @@ -54,12 +54,12 @@ public: formula::FormulaGrammar::AddressConvention eConvP = formula::FormulaGrammar::CONV_OOO ); ~ScRefFinder(); - const String& GetText() const { return aFormula; } - xub_StrLen GetFound() const { return nFound; } - xub_StrLen GetSelStart() const { return nSelStart; } - xub_StrLen GetSelEnd() const { return nSelEnd; } + const String& GetText() const { return aFormula; } + xub_StrLen GetFound() const { return nFound; } + xub_StrLen GetSelStart() const { return nSelStart; } + xub_StrLen GetSelEnd() const { return nSelEnd; } - void ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ); + void ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ); }; diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index b9964300ab85..6b735f8fdb21 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,29 +48,29 @@ private: public: #if SC_REFRESHTIMER_CONTROL_LIST - ScRefreshTimerList aList; + ScRefreshTimerList aList; #endif ScRefreshTimerControl() : nBlockRefresh(0) {} - void SetAllowRefresh( BOOL b ) + void SetAllowRefresh( BOOL b ) { if ( b && nBlockRefresh ) --nBlockRefresh; else if ( !b && nBlockRefresh < (USHORT)(~0) ) ++nBlockRefresh; } - BOOL IsRefreshAllowed() const { return !nBlockRefresh; } - ::osl::Mutex& GetMutex() { return aMutex; } + BOOL IsRefreshAllowed() const { return !nBlockRefresh; } + ::osl::Mutex& GetMutex() { return aMutex; } }; class ScRefreshTimerProtector { private: - ScRefreshTimerControl * const * ppControl; + ScRefreshTimerControl * const * ppControl; public: - ScRefreshTimerProtector( ScRefreshTimerControl * const * pp ); + ScRefreshTimerProtector( ScRefreshTimerControl * const * pp ); ~ScRefreshTimerProtector() { if ( ppControl && *ppControl ) @@ -82,16 +82,16 @@ public: class ScRefreshTimer : public AutoTimer { private: - ScRefreshTimerControl * const * ppControl; + ScRefreshTimerControl * const * ppControl; - void AppendToControl() + void AppendToControl() { #if SC_REFRESHTIMER_CONTROL_LIST if ( ppControl && *ppControl ) (*ppControl)->aList.Insert( this, LIST_APPEND ); #endif } - void RemoveFromControl() + void RemoveFromControl() { #if SC_REFRESHTIMER_CONTROL_LIST if ( ppControl && *ppControl ) @@ -99,7 +99,7 @@ private: #endif } - void Start() + void Start() { if ( GetTimeout() ) AutoTimer::Start(); @@ -116,42 +116,42 @@ public: ScRefreshTimer( const ScRefreshTimer& r ) : AutoTimer( r ), ppControl(0) {} - virtual ~ScRefreshTimer(); + virtual ~ScRefreshTimer(); - ScRefreshTimer& operator=( const ScRefreshTimer& r ) + ScRefreshTimer& operator=( const ScRefreshTimer& r ) { SetRefreshControl(0); AutoTimer::operator=( r ); return *this; } - BOOL operator==( const ScRefreshTimer& r ) const + BOOL operator==( const ScRefreshTimer& r ) const { return GetTimeout() == r.GetTimeout(); } - BOOL operator!=( const ScRefreshTimer& r ) const + BOOL operator!=( const ScRefreshTimer& r ) const { return !ScRefreshTimer::operator==( r ); } - void StartRefreshTimer() + void StartRefreshTimer() { Start(); } - void SetRefreshControl( ScRefreshTimerControl * const * pp ) + void SetRefreshControl( ScRefreshTimerControl * const * pp ) { RemoveFromControl(); ppControl = pp; AppendToControl(); } - void SetRefreshHandler( const Link& rLink ) + void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); } - ULONG GetRefreshDelay() const + ULONG GetRefreshDelay() const { return GetTimeout() / 1000; } - void StopRefreshTimer() + void StopRefreshTimer() { Stop(); } - SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds ); - SC_DLLPUBLIC virtual void Timeout(); + SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds ); + SC_DLLPUBLIC virtual void Timeout(); }; diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx index 90c7fb695ca1..9f9ac017b967 100644 --- a/sc/inc/reftokenhelper.hxx +++ b/sc/inc/reftokenhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ private: ~ScRefTokenHelper(); public: - /** - * Compile an array of reference tokens from a data source range string. - * The source range may consist of multiple ranges separated by ';'s. + /** + * Compile an array of reference tokens from a data source range string. + * The source range may consist of multiple ranges separated by ';'s. */ static void compileRangeRepresentation( ::std::vector<ScSharedTokenRef>& rRefTokens, const ::rtl::OUString& rRangeStr, ScDocument* pDoc, @@ -61,7 +61,7 @@ public: static void getRangeListFromTokens(ScRangeList& rRangeList, const ::std::vector<ScSharedTokenRef>& pTokens); - /** + /** * Create a double reference token from a range object. */ static void getTokenFromRange(ScSharedTokenRef& pToken, const ScRange& rRange); diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 0720ca056309..49d14a21af0f 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,289 +35,289 @@ #include <svx/dialogs.hrc> // ->Svx-IDs #endif -#define VAR_ARGS 30 // variable Parameter in scfuncs.src +#define VAR_ARGS 30 // variable Parameter in scfuncs.src -#define RID_HANDLEBITMAP 10005 +#define RID_HANDLEBITMAP 10005 // Bereiche ------------------------------------------------------------------ -#define SC_VIEW_START (SID_SC_START) -#define SC_VIEW_END (SID_SC_START + 99) -#define SC_MESSAGE_START (SID_SC_START + 100) -#define SC_MESSAGE_END (SID_SC_START + 199) -#define SC_FUNCTION_START (SID_SC_START + 200) -#define SC_FUNCTION_END (SID_SC_START + 299) -#define SC_PARAM_START (SID_SC_START + 300) -#define SC_PARAM_END (SID_SC_START + 399) +#define SC_VIEW_START (SID_SC_START) +#define SC_VIEW_END (SID_SC_START + 99) +#define SC_MESSAGE_START (SID_SC_START + 100) +#define SC_MESSAGE_END (SID_SC_START + 199) +#define SC_FUNCTION_START (SID_SC_START + 200) +#define SC_FUNCTION_END (SID_SC_START + 299) +#define SC_PARAM_START (SID_SC_START + 300) +#define SC_PARAM_END (SID_SC_START + 399) -// kompatibel zu frueher bleiben: -#define SC_RESOURCE_START (RID_APP_START+5000) -#define SC_RESOURCE_END (RID_APP_END) +// kompatibel zu frueher bleiben: +#define SC_RESOURCE_START (RID_APP_START+5000) +#define SC_RESOURCE_END (RID_APP_END) // --------------------------------------------------------------------------- // Hilfe IDs ----------------------------------------------------------------- -// Calc hat einen Bereich von 2000 IDs -// Die Funktionen brauchen 11*90 = 990 IDs - -#define HID_SC_FUNC_START (HID_SC_START + 0) -#define HID_INSWIN_START (HID_SC_START + 1000) -#define HID_SC_SHEET_START (HID_SC_START + 1010) -#define HID_SC_SHELL_START (HID_SC_START + 1030) -#define HID_SC_WIN_START (HID_SC_START + 1050) -#define HID_SC_CONTROL_START (HID_SC_START + 1070) -#define HID_SC_DLG_START (HID_SC_START + 1100) -#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) -#define HID_SC_MENU_START (HID_SC_START + 1180) -#define HID_SC_OTHER_START (HID_SC_START + 1230) -#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions +// Calc hat einen Bereich von 2000 IDs +// Die Funktionen brauchen 11*90 = 990 IDs + +#define HID_SC_FUNC_START (HID_SC_START + 0) +#define HID_INSWIN_START (HID_SC_START + 1000) +#define HID_SC_SHEET_START (HID_SC_START + 1010) +#define HID_SC_SHELL_START (HID_SC_START + 1030) +#define HID_SC_WIN_START (HID_SC_START + 1050) +#define HID_SC_CONTROL_START (HID_SC_START + 1070) +#define HID_SC_DLG_START (HID_SC_START + 1100) +#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) +#define HID_SC_MENU_START (HID_SC_START + 1180) +#define HID_SC_OTHER_START (HID_SC_START + 1230) +#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions #define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions // --------------------------------------------------------------------------- -#define HID_INSWIN_POS (HID_INSWIN_START + 0 ) -#define HID_INSWIN_CALC (HID_INSWIN_START + 1 ) -#define HID_INSWIN_CANCEL (HID_INSWIN_START + 2 ) -#define HID_INSWIN_OK (HID_INSWIN_START + 3 ) -#define HID_INSWIN_SUMME (HID_INSWIN_START + 4 ) -#define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) -#define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) +#define HID_INSWIN_POS (HID_INSWIN_START + 0 ) +#define HID_INSWIN_CALC (HID_INSWIN_START + 1 ) +#define HID_INSWIN_CANCEL (HID_INSWIN_START + 2 ) +#define HID_INSWIN_OK (HID_INSWIN_START + 3 ) +#define HID_INSWIN_SUMME (HID_INSWIN_START + 4 ) +#define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) +#define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) // Hilfe IDs fuer Vorlagen --------------------------------------------------- -#define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) -#define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 ) -#define HID_SC_SHEET_CELL_ERG1 (HID_SC_SHEET_START +2 ) -#define HID_SC_SHEET_CELL_UEB (HID_SC_SHEET_START +3 ) -#define HID_SC_SHEET_CELL_UEB1 (HID_SC_SHEET_START +4 ) -#define HID_SC_SHEET_PAGE_STD (HID_SC_SHEET_START +10 ) -#define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 ) +#define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) +#define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 ) +#define HID_SC_SHEET_CELL_ERG1 (HID_SC_SHEET_START +2 ) +#define HID_SC_SHEET_CELL_UEB (HID_SC_SHEET_START +3 ) +#define HID_SC_SHEET_CELL_UEB1 (HID_SC_SHEET_START +4 ) +#define HID_SC_SHEET_PAGE_STD (HID_SC_SHEET_START +10 ) +#define HID_SC_SHEET_PAGE_REP (HID_SC_SHEET_START +11 ) // Hilfe IDs fuer Shells (Helferlein) (max.20) ------------------------------- -#define HID_SCSHELL_APP (HID_SC_SHELL_START +0 ) -#define HID_SCSHELL_DOCSH (HID_SC_SHELL_START +1 ) -#define HID_SCSHELL_DRAWSH (HID_SC_SHELL_START +2 ) -#define HID_SCSHELL_DRTXTOB (HID_SC_SHELL_START +3 ) -#define HID_SCSHELL_PIVOTSH (HID_SC_SHELL_START +4 ) -#define HID_SCSHELL_PREVWSH (HID_SC_SHELL_START +5 ) -#define HID_SCSHELL_TABVWSH (HID_SC_SHELL_START +6 ) -#define HID_SCSHELL_AUDIT (HID_SC_SHELL_START +7 ) -#define HID_SCSHELL_DRAWFORMSH (HID_SC_SHELL_START +8 ) -#define HID_SCSHELL_CELLSH (HID_SC_SHELL_START +9 ) -#define HID_SCSHELL_FORMATSH (HID_SC_SHELL_START +10) -#define HID_SCSHELL_OLEOBEJCTSH (HID_SC_SHELL_START +11) -#define HID_SCSHELL_CHARTSH (HID_SC_SHELL_START +12) -#define HID_SCSHELL_GRAPHIC (HID_SC_SHELL_START +13) -#define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) -#define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) +#define HID_SCSHELL_APP (HID_SC_SHELL_START +0 ) +#define HID_SCSHELL_DOCSH (HID_SC_SHELL_START +1 ) +#define HID_SCSHELL_DRAWSH (HID_SC_SHELL_START +2 ) +#define HID_SCSHELL_DRTXTOB (HID_SC_SHELL_START +3 ) +#define HID_SCSHELL_PIVOTSH (HID_SC_SHELL_START +4 ) +#define HID_SCSHELL_PREVWSH (HID_SC_SHELL_START +5 ) +#define HID_SCSHELL_TABVWSH (HID_SC_SHELL_START +6 ) +#define HID_SCSHELL_AUDIT (HID_SC_SHELL_START +7 ) +#define HID_SCSHELL_DRAWFORMSH (HID_SC_SHELL_START +8 ) +#define HID_SCSHELL_CELLSH (HID_SC_SHELL_START +9 ) +#define HID_SCSHELL_FORMATSH (HID_SC_SHELL_START +10) +#define HID_SCSHELL_OLEOBEJCTSH (HID_SC_SHELL_START +11) +#define HID_SCSHELL_CHARTSH (HID_SC_SHELL_START +12) +#define HID_SCSHELL_GRAPHIC (HID_SC_SHELL_START +13) +#define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) +#define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) // Hilfe IDs fuer Dokumentfenster -------------------------------------------- -#define HID_SC_WIN_GRIDWIN ( HID_SC_WIN_START ) -#define HID_SC_WIN_PREVIEW ( HID_SC_WIN_START + 1 ) +#define HID_SC_WIN_GRIDWIN ( HID_SC_WIN_START ) +#define HID_SC_WIN_PREVIEW ( HID_SC_WIN_START + 1 ) // Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- -// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts -#define HID_SC_HF_HLL ( HID_SC_CONTROL_START + 0 ) -#define HID_SC_HF_HLC ( HID_SC_CONTROL_START + 1 ) -#define HID_SC_HF_HLR ( HID_SC_CONTROL_START + 2 ) -#define HID_SC_HF_HRL ( HID_SC_CONTROL_START + 3 ) -#define HID_SC_HF_HRC ( HID_SC_CONTROL_START + 4 ) -#define HID_SC_HF_HRR ( HID_SC_CONTROL_START + 5 ) -#define HID_SC_HF_FLL ( HID_SC_CONTROL_START + 6 ) -#define HID_SC_HF_FLC ( HID_SC_CONTROL_START + 7 ) -#define HID_SC_HF_FLR ( HID_SC_CONTROL_START + 8 ) -#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 ) -#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 ) -#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 ) -// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! -//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 ) -//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 ) -//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 ) -// Eintraege im Navigator -#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 ) -#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 ) -#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 ) -#define HID_SC_NAVIPI_DOC ( HID_SC_CONTROL_START + 18 ) -#define HID_SC_NAVIPI_DATA ( HID_SC_CONTROL_START + 19 ) -#define HID_SC_NAVIPI_UP ( HID_SC_CONTROL_START + 20 ) -#define HID_SC_NAVIPI_DOWN ( HID_SC_CONTROL_START + 21 ) -#define HID_SC_NAVIPI_ZOOM ( HID_SC_CONTROL_START + 22 ) -#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 ) -#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) -#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) -// Teilergebnisse -#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 ) -#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 ) -#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 ) +// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts +#define HID_SC_HF_HLL ( HID_SC_CONTROL_START + 0 ) +#define HID_SC_HF_HLC ( HID_SC_CONTROL_START + 1 ) +#define HID_SC_HF_HLR ( HID_SC_CONTROL_START + 2 ) +#define HID_SC_HF_HRL ( HID_SC_CONTROL_START + 3 ) +#define HID_SC_HF_HRC ( HID_SC_CONTROL_START + 4 ) +#define HID_SC_HF_HRR ( HID_SC_CONTROL_START + 5 ) +#define HID_SC_HF_FLL ( HID_SC_CONTROL_START + 6 ) +#define HID_SC_HF_FLC ( HID_SC_CONTROL_START + 7 ) +#define HID_SC_HF_FLR ( HID_SC_CONTROL_START + 8 ) +#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 ) +#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 ) +#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 ) +// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! +//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 ) +//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 ) +//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 ) +// Eintraege im Navigator +#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 ) +#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 ) +#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 ) +#define HID_SC_NAVIPI_DOC ( HID_SC_CONTROL_START + 18 ) +#define HID_SC_NAVIPI_DATA ( HID_SC_CONTROL_START + 19 ) +#define HID_SC_NAVIPI_UP ( HID_SC_CONTROL_START + 20 ) +#define HID_SC_NAVIPI_DOWN ( HID_SC_CONTROL_START + 21 ) +#define HID_SC_NAVIPI_ZOOM ( HID_SC_CONTROL_START + 22 ) +#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 ) +#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) +#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) +// Teilergebnisse +#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 ) +#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 ) +#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 ) // -#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 ) -// Bereich ist voll! +#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 ) +// Bereich ist voll! // Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- -#define HID_SC_AUTOFORMAT (HID_SC_DLG_START ) -#define HID_SC_PIVOTFILTER (HID_SC_DLG_START +1 ) -#define HID_SC_INPORTOPT (HID_SC_DLG_START +2 ) -#define HID_SC_PIVOTSUBT (HID_SC_DLG_START +3 ) -#define HID_SC_FORM_ARGS (HID_SC_DLG_START +4 ) -#define HID_SCPAGE_SORT_FIELDS (HID_SC_DLG_START +5 ) -#define HID_SCPAGE_SORT_OPTIONS (HID_SC_DLG_START +6 ) -#define HID_SCPAGE_SUBT_OPTIONS (HID_SC_DLG_START +7 ) -#define HID_SCPAGE_SUBT_GROUP (HID_SC_DLG_START +8 ) -#define HID_SCPAGE_PROTECTION (HID_SC_DLG_START +9 ) -#define HID_SCPAGE_VIEW (HID_SC_DLG_START +10 ) -#define HID_SCPAGE_CALC (HID_SC_DLG_START +11 ) -#define HID_SCPAGE_USERLISTS (HID_SC_DLG_START +12 ) -#define HID_SCPAGE_HFEDIT (HID_SC_DLG_START +13 ) -#define HID_SCPAGE_AREAS (HID_SC_DLG_START +14 ) -#define HID_SCPAGE_TABLE (HID_SC_DLG_START +15 ) -#define HID_SCPAGE_PRINT (HID_SC_DLG_START +16 ) - -#define HID_SCPAGE_SUBT_GROUP1 (HID_SC_DLG_START +17 ) -#define HID_SCPAGE_SUBT_GROUP2 (HID_SC_DLG_START +18 ) -#define HID_SCPAGE_SUBT_GROUP3 (HID_SC_DLG_START +19 ) - -#define HID_SCPAGE_HFED_HL (HID_SC_DLG_START +20 ) -#define HID_SCPAGE_HFED_HR (HID_SC_DLG_START +21 ) -#define HID_SCPAGE_HFED_FL (HID_SC_DLG_START +22 ) -#define HID_SCPAGE_HFED_FR (HID_SC_DLG_START +23 ) - -#define HID_SCPAGE_CONTENT (HID_SC_DLG_START +24 ) -#define HID_SCPAGE_LAYOUT (HID_SC_DLG_START +25 ) -#define HID_SCPAGE_INPUT (HID_SC_DLG_START +26 ) - -#define HID_SC_NAVIGATOR (HID_SC_DLG_START +27 ) - -#define HID_SC_MTRIN_VAL (HID_SC_DLG_START +28 ) -#define HID_SC_MTRIN_DEF (HID_SC_DLG_START +29 ) -#define HID_SC_SELENTRY_LIST (HID_SC_DLG_START +30 ) -#define HID_SC_GROUP_COLS (HID_SC_DLG_START +31 ) -#define HID_SC_GROUP_ROWS (HID_SC_DLG_START +32 ) - -#define HID_SC_HF_TEXT (HID_SC_DLG_START +33 ) -#define HID_SC_HF_FILE (HID_SC_DLG_START +34 ) -#define HID_SC_HF_TABLE (HID_SC_DLG_START +35 ) -#define HID_SC_HF_PAGE (HID_SC_DLG_START +36 ) -#define HID_SC_HF_PAGES (HID_SC_DLG_START +37 ) -#define HID_SC_HF_DATE (HID_SC_DLG_START +38 ) -#define HID_SC_HF_TIME (HID_SC_DLG_START +39 ) - -#define HID_SC_HEADER_EDIT (HID_SC_DLG_START +40 ) -#define HID_SC_FOOTER_EDIT (HID_SC_DLG_START +41 ) - -#define HID_SC_SCENWIN_TOP (HID_SC_DLG_START +42 ) -#define HID_SC_SCENWIN_BOTTOM (HID_SC_DLG_START +43 ) - -#define HID_SC_INPUTWIN (HID_SC_DLG_START +44 ) - -#define HID_SC_RENAME_NAME (HID_SC_DLG_START +45 ) -#define HID_SC_APPEND_NAME (HID_SC_DLG_START +46 ) - -// Funktionsautopilot: nur als Unique-IDs -#define HID_SC_FAP_PAGE (HID_SC_DLG_START +47 ) -#define HID_SC_FAP_EDIT1 (HID_SC_DLG_START +48 ) -#define HID_SC_FAP_EDIT2 (HID_SC_DLG_START +49 ) -#define HID_SC_FAP_EDIT3 (HID_SC_DLG_START +50 ) -#define HID_SC_FAP_EDIT4 (HID_SC_DLG_START +51 ) - -#define HID_SC_ADD_AUTOFMT (HID_SC_DLG_START +52 ) -#define HID_SC_AUTOFMT_NAME (HID_SC_DLG_START +53 ) - -#define HID_SC_DROPMODE_URL (HID_SC_DLG_START +54 ) -#define HID_SC_DROPMODE_LINK (HID_SC_DLG_START +55 ) -#define HID_SC_DROPMODE_COPY (HID_SC_DLG_START +56 ) - -#define HID_SC_FAP_STRUCT (HID_SC_DLG_START +57 ) -#define HID_SC_ASCII_TABCTR (HID_SC_DLG_START +58 ) - -#define HID_SC_SCENARIO_DELETE (HID_SC_DLG_START +59 ) -#define HID_SC_SCENARIO_EDIT (HID_SC_DLG_START +60 ) - -#define HID_SCDLG_FORMULA (HID_SC_DLG_START +61 ) -#define HID_SCDLG_CONDFORMAT (HID_SC_DLG_START +62 ) -#define HID_COLROWNAMERANGES (HID_SC_DLG_START +63 ) - -#define HID_FUNCTION_BOX (HID_SC_DLG_START +64 ) -#define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) -#define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) +#define HID_SC_AUTOFORMAT (HID_SC_DLG_START ) +#define HID_SC_PIVOTFILTER (HID_SC_DLG_START +1 ) +#define HID_SC_INPORTOPT (HID_SC_DLG_START +2 ) +#define HID_SC_PIVOTSUBT (HID_SC_DLG_START +3 ) +#define HID_SC_FORM_ARGS (HID_SC_DLG_START +4 ) +#define HID_SCPAGE_SORT_FIELDS (HID_SC_DLG_START +5 ) +#define HID_SCPAGE_SORT_OPTIONS (HID_SC_DLG_START +6 ) +#define HID_SCPAGE_SUBT_OPTIONS (HID_SC_DLG_START +7 ) +#define HID_SCPAGE_SUBT_GROUP (HID_SC_DLG_START +8 ) +#define HID_SCPAGE_PROTECTION (HID_SC_DLG_START +9 ) +#define HID_SCPAGE_VIEW (HID_SC_DLG_START +10 ) +#define HID_SCPAGE_CALC (HID_SC_DLG_START +11 ) +#define HID_SCPAGE_USERLISTS (HID_SC_DLG_START +12 ) +#define HID_SCPAGE_HFEDIT (HID_SC_DLG_START +13 ) +#define HID_SCPAGE_AREAS (HID_SC_DLG_START +14 ) +#define HID_SCPAGE_TABLE (HID_SC_DLG_START +15 ) +#define HID_SCPAGE_PRINT (HID_SC_DLG_START +16 ) + +#define HID_SCPAGE_SUBT_GROUP1 (HID_SC_DLG_START +17 ) +#define HID_SCPAGE_SUBT_GROUP2 (HID_SC_DLG_START +18 ) +#define HID_SCPAGE_SUBT_GROUP3 (HID_SC_DLG_START +19 ) + +#define HID_SCPAGE_HFED_HL (HID_SC_DLG_START +20 ) +#define HID_SCPAGE_HFED_HR (HID_SC_DLG_START +21 ) +#define HID_SCPAGE_HFED_FL (HID_SC_DLG_START +22 ) +#define HID_SCPAGE_HFED_FR (HID_SC_DLG_START +23 ) + +#define HID_SCPAGE_CONTENT (HID_SC_DLG_START +24 ) +#define HID_SCPAGE_LAYOUT (HID_SC_DLG_START +25 ) +#define HID_SCPAGE_INPUT (HID_SC_DLG_START +26 ) + +#define HID_SC_NAVIGATOR (HID_SC_DLG_START +27 ) + +#define HID_SC_MTRIN_VAL (HID_SC_DLG_START +28 ) +#define HID_SC_MTRIN_DEF (HID_SC_DLG_START +29 ) +#define HID_SC_SELENTRY_LIST (HID_SC_DLG_START +30 ) +#define HID_SC_GROUP_COLS (HID_SC_DLG_START +31 ) +#define HID_SC_GROUP_ROWS (HID_SC_DLG_START +32 ) + +#define HID_SC_HF_TEXT (HID_SC_DLG_START +33 ) +#define HID_SC_HF_FILE (HID_SC_DLG_START +34 ) +#define HID_SC_HF_TABLE (HID_SC_DLG_START +35 ) +#define HID_SC_HF_PAGE (HID_SC_DLG_START +36 ) +#define HID_SC_HF_PAGES (HID_SC_DLG_START +37 ) +#define HID_SC_HF_DATE (HID_SC_DLG_START +38 ) +#define HID_SC_HF_TIME (HID_SC_DLG_START +39 ) + +#define HID_SC_HEADER_EDIT (HID_SC_DLG_START +40 ) +#define HID_SC_FOOTER_EDIT (HID_SC_DLG_START +41 ) + +#define HID_SC_SCENWIN_TOP (HID_SC_DLG_START +42 ) +#define HID_SC_SCENWIN_BOTTOM (HID_SC_DLG_START +43 ) + +#define HID_SC_INPUTWIN (HID_SC_DLG_START +44 ) + +#define HID_SC_RENAME_NAME (HID_SC_DLG_START +45 ) +#define HID_SC_APPEND_NAME (HID_SC_DLG_START +46 ) + +// Funktionsautopilot: nur als Unique-IDs +#define HID_SC_FAP_PAGE (HID_SC_DLG_START +47 ) +#define HID_SC_FAP_EDIT1 (HID_SC_DLG_START +48 ) +#define HID_SC_FAP_EDIT2 (HID_SC_DLG_START +49 ) +#define HID_SC_FAP_EDIT3 (HID_SC_DLG_START +50 ) +#define HID_SC_FAP_EDIT4 (HID_SC_DLG_START +51 ) + +#define HID_SC_ADD_AUTOFMT (HID_SC_DLG_START +52 ) +#define HID_SC_AUTOFMT_NAME (HID_SC_DLG_START +53 ) + +#define HID_SC_DROPMODE_URL (HID_SC_DLG_START +54 ) +#define HID_SC_DROPMODE_LINK (HID_SC_DLG_START +55 ) +#define HID_SC_DROPMODE_COPY (HID_SC_DLG_START +56 ) + +#define HID_SC_FAP_STRUCT (HID_SC_DLG_START +57 ) +#define HID_SC_ASCII_TABCTR (HID_SC_DLG_START +58 ) + +#define HID_SC_SCENARIO_DELETE (HID_SC_DLG_START +59 ) +#define HID_SC_SCENARIO_EDIT (HID_SC_DLG_START +60 ) + +#define HID_SCDLG_FORMULA (HID_SC_DLG_START +61 ) +#define HID_SCDLG_CONDFORMAT (HID_SC_DLG_START +62 ) +#define HID_COLROWNAMERANGES (HID_SC_DLG_START +63 ) + +#define HID_FUNCTION_BOX (HID_SC_DLG_START +64 ) +#define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) +#define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) //Kopf/FusszeilenDlg: Contextmenue fuer Dateiname -#define HID_FCOMMAND_TITEL (HID_SC_DLG_START +67 ) -#define HID_FCOMMAND_FILENAME (HID_SC_DLG_START +68 ) -#define HID_FCOMMAND_PATH (HID_SC_DLG_START +69 ) +#define HID_FCOMMAND_TITEL (HID_SC_DLG_START +67 ) +#define HID_FCOMMAND_FILENAME (HID_SC_DLG_START +68 ) +#define HID_FCOMMAND_PATH (HID_SC_DLG_START +69 ) // Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- -#define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) -#define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) -#define HID_SC_TOOLBOX_DRAW ( HID_SC_TOOLBOX_START + 2 ) -#define HID_SC_TOOLBOX_DRTEXT ( HID_SC_TOOLBOX_START + 3 ) -#define HID_SC_TOOLBOX_PREVIEW ( HID_SC_TOOLBOX_START + 4 ) +#define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) +#define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) +#define HID_SC_TOOLBOX_DRAW ( HID_SC_TOOLBOX_START + 2 ) +#define HID_SC_TOOLBOX_DRTEXT ( HID_SC_TOOLBOX_START + 3 ) +#define HID_SC_TOOLBOX_PREVIEW ( HID_SC_TOOLBOX_START + 4 ) -// wrong group - HID_SC_DLG_START is full -#define HID_SC_RENAME_AUTOFMT ( HID_SC_TOOLBOX_START + 5 ) -#define HID_SC_REN_AFMT_NAME ( HID_SC_TOOLBOX_START + 6 ) +// wrong group - HID_SC_DLG_START is full +#define HID_SC_RENAME_AUTOFMT ( HID_SC_TOOLBOX_START + 5 ) +#define HID_SC_REN_AFMT_NAME ( HID_SC_TOOLBOX_START + 6 ) -#define HID_SC_TOOLBOX_GRAPHIC ( HID_SC_TOOLBOX_START + 7 ) +#define HID_SC_TOOLBOX_GRAPHIC ( HID_SC_TOOLBOX_START + 7 ) #define HID_CHG_PROTECT ( HID_SC_TOOLBOX_START + 8 ) -#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) +#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) #define HID_SC_REN_AFMT_DLG ( HID_SC_TOOLBOX_START + 10 ) // Hilfe IDs fuer Submenus (max.50) ------------------------------------------ -#define HID_SCMENU_EDIT ( HID_SC_MENU_START ) -#define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) -#define HID_SCMENU_DELBREAK ( HID_SC_MENU_START + 2 ) -#define HID_SCMENU_VIEW ( HID_SC_MENU_START + 3 ) -#define HID_SCMENU_TOOLBARS ( HID_SC_MENU_START + 4 ) -#define HID_SCMENU_INSERT ( HID_SC_MENU_START + 5 ) -#define HID_SCMENU_INSBREAK ( HID_SC_MENU_START + 6 ) -#define HID_SCMENU_NAME ( HID_SC_MENU_START + 7 ) -#define HID_SCMENU_GRAPHIC ( HID_SC_MENU_START + 8 ) -#define HID_SCMENU_DATA ( HID_SC_MENU_START + 9 ) -#define HID_SCMENU_FILTER ( HID_SC_MENU_START + 10 ) -#define HID_SCMENU_OUTLINE ( HID_SC_MENU_START + 11 ) -#define HID_SCMENU_PIVOT ( HID_SC_MENU_START + 12 ) -#define HID_SCMENU_EXTRA ( HID_SC_MENU_START + 13 ) -#define HID_SCMENU_SPELLING ( HID_SC_MENU_START + 14 ) -#define HID_SCMENU_AUDIT ( HID_SC_MENU_START + 15 ) -#define HID_SCMENU_PROTECT ( HID_SC_MENU_START + 16 ) -#define HID_SCMENU_CELLCONT ( HID_SC_MENU_START + 17 ) -#define HID_SCMENU_ROW ( HID_SC_MENU_START + 18 ) -#define HID_SCMENU_COL ( HID_SC_MENU_START + 19 ) -#define HID_SCMENU_TAB ( HID_SC_MENU_START + 20 ) -#define HID_SCMENU_MERGE ( HID_SC_MENU_START + 21 ) -#define HID_SCMENU_AREA ( HID_SC_MENU_START + 22 ) -#define HID_SCMENU_OBJMIRROR ( HID_SC_MENU_START + 23 ) -#define HID_SCMENU_OBJARRANGE ( HID_SC_MENU_START + 24 ) -#define HID_SCMENU_ANCHOR ( HID_SC_MENU_START + 25 ) -#define HID_SCMENU_SENDTO ( HID_SC_MENU_START + 26 ) -#define HID_SCMENU_CHANGES ( HID_SC_MENU_START + 27 ) - -#define HID_SC_FAP_BTN_FX1 ( HID_SC_MENU_START + 28 ) -#define HID_SC_FAP_BTN_FX2 ( HID_SC_MENU_START + 29 ) -#define HID_SC_FAP_BTN_FX3 ( HID_SC_MENU_START + 30 ) -#define HID_SC_FAP_BTN_FX4 ( HID_SC_MENU_START + 31 ) -#define HID_SC_FAP_BTN_REF1 ( HID_SC_MENU_START + 32 ) -#define HID_SC_FAP_BTN_REF2 ( HID_SC_MENU_START + 33 ) -#define HID_SC_FAP_BTN_REF3 ( HID_SC_MENU_START + 34 ) -#define HID_SC_FAP_BTN_REF4 ( HID_SC_MENU_START + 35 ) -#define HID_SC_FAP_FORMULA ( HID_SC_MENU_START + 36 ) - -#define HID_SC_SORT_ACTION ( HID_SC_MENU_START + 37 ) -#define HID_SC_SORT_AUTHOR ( HID_SC_MENU_START + 38 ) -#define HID_SC_SORT_DATE ( HID_SC_MENU_START + 39 ) -#define HID_SC_SORT_COMMENT ( HID_SC_MENU_START + 40 ) -#define HID_SORT_POSITION ( HID_SC_MENU_START + 41 ) +#define HID_SCMENU_EDIT ( HID_SC_MENU_START ) +#define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) +#define HID_SCMENU_DELBREAK ( HID_SC_MENU_START + 2 ) +#define HID_SCMENU_VIEW ( HID_SC_MENU_START + 3 ) +#define HID_SCMENU_TOOLBARS ( HID_SC_MENU_START + 4 ) +#define HID_SCMENU_INSERT ( HID_SC_MENU_START + 5 ) +#define HID_SCMENU_INSBREAK ( HID_SC_MENU_START + 6 ) +#define HID_SCMENU_NAME ( HID_SC_MENU_START + 7 ) +#define HID_SCMENU_GRAPHIC ( HID_SC_MENU_START + 8 ) +#define HID_SCMENU_DATA ( HID_SC_MENU_START + 9 ) +#define HID_SCMENU_FILTER ( HID_SC_MENU_START + 10 ) +#define HID_SCMENU_OUTLINE ( HID_SC_MENU_START + 11 ) +#define HID_SCMENU_PIVOT ( HID_SC_MENU_START + 12 ) +#define HID_SCMENU_EXTRA ( HID_SC_MENU_START + 13 ) +#define HID_SCMENU_SPELLING ( HID_SC_MENU_START + 14 ) +#define HID_SCMENU_AUDIT ( HID_SC_MENU_START + 15 ) +#define HID_SCMENU_PROTECT ( HID_SC_MENU_START + 16 ) +#define HID_SCMENU_CELLCONT ( HID_SC_MENU_START + 17 ) +#define HID_SCMENU_ROW ( HID_SC_MENU_START + 18 ) +#define HID_SCMENU_COL ( HID_SC_MENU_START + 19 ) +#define HID_SCMENU_TAB ( HID_SC_MENU_START + 20 ) +#define HID_SCMENU_MERGE ( HID_SC_MENU_START + 21 ) +#define HID_SCMENU_AREA ( HID_SC_MENU_START + 22 ) +#define HID_SCMENU_OBJMIRROR ( HID_SC_MENU_START + 23 ) +#define HID_SCMENU_OBJARRANGE ( HID_SC_MENU_START + 24 ) +#define HID_SCMENU_ANCHOR ( HID_SC_MENU_START + 25 ) +#define HID_SCMENU_SENDTO ( HID_SC_MENU_START + 26 ) +#define HID_SCMENU_CHANGES ( HID_SC_MENU_START + 27 ) + +#define HID_SC_FAP_BTN_FX1 ( HID_SC_MENU_START + 28 ) +#define HID_SC_FAP_BTN_FX2 ( HID_SC_MENU_START + 29 ) +#define HID_SC_FAP_BTN_FX3 ( HID_SC_MENU_START + 30 ) +#define HID_SC_FAP_BTN_FX4 ( HID_SC_MENU_START + 31 ) +#define HID_SC_FAP_BTN_REF1 ( HID_SC_MENU_START + 32 ) +#define HID_SC_FAP_BTN_REF2 ( HID_SC_MENU_START + 33 ) +#define HID_SC_FAP_BTN_REF3 ( HID_SC_MENU_START + 34 ) +#define HID_SC_FAP_BTN_REF4 ( HID_SC_MENU_START + 35 ) +#define HID_SC_FAP_FORMULA ( HID_SC_MENU_START + 36 ) + +#define HID_SC_SORT_ACTION ( HID_SC_MENU_START + 37 ) +#define HID_SC_SORT_AUTHOR ( HID_SC_MENU_START + 38 ) +#define HID_SC_SORT_DATE ( HID_SC_MENU_START + 39 ) +#define HID_SC_SORT_COMMENT ( HID_SC_MENU_START + 40 ) +#define HID_SORT_POSITION ( HID_SC_MENU_START + 41 ) #define HID_SC_CHANGES_COMMENT ( HID_SC_MENU_START + 42 ) -#define HID_SC_FUNCTIONLIST ( HID_SC_MENU_START + 43 ) -#define HID_SCPAGE_OPTLOAD ( HID_SC_MENU_START + 44 ) -#define HID_PASSWD_TABLE ( HID_SC_MENU_START + 45 ) -#define HID_PASSWD_DOC ( HID_SC_MENU_START + 46 ) +#define HID_SC_FUNCTIONLIST ( HID_SC_MENU_START + 43 ) +#define HID_SCPAGE_OPTLOAD ( HID_SC_MENU_START + 44 ) +#define HID_PASSWD_TABLE ( HID_SC_MENU_START + 45 ) +#define HID_PASSWD_DOC ( HID_SC_MENU_START + 46 ) -#define HID_DATAPILOT_TYPE ( HID_SC_MENU_START + 47 ) -#define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) -#define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) +#define HID_DATAPILOT_TYPE ( HID_SC_MENU_START + 47 ) +#define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) +#define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) // Other help IDs (max.70) --------------------------------------------------- #define HID_SCDLG_LINKAREAURL ( HID_SC_OTHER_START ) @@ -344,7 +344,7 @@ #define HID_SC_DPSHOWDETAIL ( HID_SC_OTHER_START + 16 ) // #i68101# -#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 ) +#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 ) #define HID_SC_SOLVEROPTIONS ( HID_SC_OTHER_START + 18 ) #define HID_SC_SOLVEROPTIONS_LB ( HID_SC_OTHER_START + 19 ) @@ -362,99 +362,99 @@ #define HID_SC_HF_FR_DEFINED ( HID_SC_OTHER_START + 29 ) // Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY ( HID_SC_AAI_FUNCS_START ) -#define HID_AAI_FUNC_YEARFRAC ( HID_SC_AAI_FUNCS_START + 1 ) -#define HID_AAI_FUNC_EDATE ( HID_SC_AAI_FUNCS_START + 2 ) -#define HID_AAI_FUNC_WEEKNUM ( HID_SC_AAI_FUNCS_START + 3 ) -#define HID_AAI_FUNC_EOMONTH ( HID_SC_AAI_FUNCS_START + 4 ) -#define HID_AAI_FUNC_NETWORKDAYS ( HID_SC_AAI_FUNCS_START + 5 ) -#define HID_AAI_FUNC_AMORDEGRC ( HID_SC_AAI_FUNCS_START + 6 ) -#define HID_AAI_FUNC_AMORLINC ( HID_SC_AAI_FUNCS_START + 7 ) -#define HID_AAI_FUNC_ACCRINT ( HID_SC_AAI_FUNCS_START + 8 ) -#define HID_AAI_FUNC_ACCRINTM ( HID_SC_AAI_FUNCS_START + 9 ) -#define HID_AAI_FUNC_RECEIVED ( HID_SC_AAI_FUNCS_START + 10 ) -#define HID_AAI_FUNC_DISC ( HID_SC_AAI_FUNCS_START + 11 ) -#define HID_AAI_FUNC_DURATION ( HID_SC_AAI_FUNCS_START + 12 ) -#define HID_AAI_FUNC_EFFECT ( HID_SC_AAI_FUNCS_START + 13 ) -#define HID_AAI_FUNC_CUMPRINC ( HID_SC_AAI_FUNCS_START + 14 ) -#define HID_AAI_FUNC_CUMIPMT ( HID_SC_AAI_FUNCS_START + 15 ) -#define HID_AAI_FUNC_PRICE ( HID_SC_AAI_FUNCS_START + 16 ) -#define HID_AAI_FUNC_PRICEDISC ( HID_SC_AAI_FUNCS_START + 17 ) -#define HID_AAI_FUNC_PRICEMAT ( HID_SC_AAI_FUNCS_START + 18 ) -#define HID_AAI_FUNC_MDURATION ( HID_SC_AAI_FUNCS_START + 19 ) -#define HID_AAI_FUNC_NOMINAL ( HID_SC_AAI_FUNCS_START + 20 ) -#define HID_AAI_FUNC_DOLLARFR ( HID_SC_AAI_FUNCS_START + 21 ) -#define HID_AAI_FUNC_DOLLARDE ( HID_SC_AAI_FUNCS_START + 22 ) -#define HID_AAI_FUNC_YIELD ( HID_SC_AAI_FUNCS_START + 23 ) -#define HID_AAI_FUNC_YIELDDISC ( HID_SC_AAI_FUNCS_START + 24 ) -#define HID_AAI_FUNC_YIELDMAT ( HID_SC_AAI_FUNCS_START + 25 ) -#define HID_AAI_FUNC_TBILLEQ ( HID_SC_AAI_FUNCS_START + 26 ) -#define HID_AAI_FUNC_TBILLPRICE ( HID_SC_AAI_FUNCS_START + 27 ) -#define HID_AAI_FUNC_TBILLYIELD ( HID_SC_AAI_FUNCS_START + 28 ) -#define HID_AAI_FUNC_ODDFPRICE ( HID_SC_AAI_FUNCS_START + 29 ) -#define HID_AAI_FUNC_ODDFYIELD ( HID_SC_AAI_FUNCS_START + 30 ) -#define HID_AAI_FUNC_ODDLPRICE ( HID_SC_AAI_FUNCS_START + 31 ) -#define HID_AAI_FUNC_ODDLYIELD ( HID_SC_AAI_FUNCS_START + 32 ) -#define HID_AAI_FUNC_XIRR ( HID_SC_AAI_FUNCS_START + 33 ) -#define HID_AAI_FUNC_XNPV ( HID_SC_AAI_FUNCS_START + 34 ) -#define HID_AAI_FUNC_INTRATE ( HID_SC_AAI_FUNCS_START + 35 ) -#define HID_AAI_FUNC_COUPNCD ( HID_SC_AAI_FUNCS_START + 36 ) -#define HID_AAI_FUNC_COUPDAYS ( HID_SC_AAI_FUNCS_START + 37 ) -#define HID_AAI_FUNC_COUPDAYSNC ( HID_SC_AAI_FUNCS_START + 38 ) -#define HID_AAI_FUNC_COUPDAYBS ( HID_SC_AAI_FUNCS_START + 39 ) -#define HID_AAI_FUNC_COUPPCD ( HID_SC_AAI_FUNCS_START + 40 ) -#define HID_AAI_FUNC_COUPNUM ( HID_SC_AAI_FUNCS_START + 41 ) -#define HID_AAI_FUNC_FVSCHEDULE ( HID_SC_AAI_FUNCS_START + 42 ) -#define HID_AAI_FUNC_ISEVEN ( HID_SC_AAI_FUNCS_START + 43 ) -#define HID_AAI_FUNC_ISODD ( HID_SC_AAI_FUNCS_START + 44 ) -#define HID_AAI_FUNC_GCD ( HID_SC_AAI_FUNCS_START + 45 ) -#define HID_AAI_FUNC_LCM ( HID_SC_AAI_FUNCS_START + 46 ) -#define HID_AAI_FUNC_MULTINOMIAL ( HID_SC_AAI_FUNCS_START + 47 ) -#define HID_AAI_FUNC_SERIESSUM ( HID_SC_AAI_FUNCS_START + 48 ) -#define HID_AAI_FUNC_QUOTIENT ( HID_SC_AAI_FUNCS_START + 49 ) -#define HID_AAI_FUNC_MROUND ( HID_SC_AAI_FUNCS_START + 50 ) -#define HID_AAI_FUNC_SQRTPI ( HID_SC_AAI_FUNCS_START + 51 ) -#define HID_AAI_FUNC_RANDBETWEEN ( HID_SC_AAI_FUNCS_START + 52 ) -#define HID_AAI_FUNC_BESSELI ( HID_SC_AAI_FUNCS_START + 53 ) -#define HID_AAI_FUNC_BESSELJ ( HID_SC_AAI_FUNCS_START + 54 ) -#define HID_AAI_FUNC_BESSELK ( HID_SC_AAI_FUNCS_START + 55 ) -#define HID_AAI_FUNC_BESSELY ( HID_SC_AAI_FUNCS_START + 56 ) -#define HID_AAI_FUNC_BIN2DEC ( HID_SC_AAI_FUNCS_START + 57 ) -#define HID_AAI_FUNC_BIN2HEX ( HID_SC_AAI_FUNCS_START + 58 ) -#define HID_AAI_FUNC_BIN2OCT ( HID_SC_AAI_FUNCS_START + 59 ) -#define HID_AAI_FUNC_DELTA ( HID_SC_AAI_FUNCS_START + 60 ) -#define HID_AAI_FUNC_DEC2BIN ( HID_SC_AAI_FUNCS_START + 61 ) -#define HID_AAI_FUNC_DEC2HEX ( HID_SC_AAI_FUNCS_START + 62 ) -#define HID_AAI_FUNC_DEC2OCT ( HID_SC_AAI_FUNCS_START + 63 ) -#define HID_AAI_FUNC_ERF ( HID_SC_AAI_FUNCS_START + 64 ) -#define HID_AAI_FUNC_ERFC ( HID_SC_AAI_FUNCS_START + 65 ) -#define HID_AAI_FUNC_GESTEP ( HID_SC_AAI_FUNCS_START + 66 ) -#define HID_AAI_FUNC_HEX2BIN ( HID_SC_AAI_FUNCS_START + 67 ) -#define HID_AAI_FUNC_HEX2DEC ( HID_SC_AAI_FUNCS_START + 68 ) -#define HID_AAI_FUNC_HEX2OCT ( HID_SC_AAI_FUNCS_START + 69 ) -#define HID_AAI_FUNC_IMABS ( HID_SC_AAI_FUNCS_START + 70 ) -#define HID_AAI_FUNC_IMAGINARY ( HID_SC_AAI_FUNCS_START + 71 ) -#define HID_AAI_FUNC_IMPOWER ( HID_SC_AAI_FUNCS_START + 72 ) -#define HID_AAI_FUNC_IMARGUMENT ( HID_SC_AAI_FUNCS_START + 73 ) -#define HID_AAI_FUNC_IMCOS ( HID_SC_AAI_FUNCS_START + 74 ) -#define HID_AAI_FUNC_IMDIV ( HID_SC_AAI_FUNCS_START + 75 ) -#define HID_AAI_FUNC_IMEXP ( HID_SC_AAI_FUNCS_START + 76 ) -#define HID_AAI_FUNC_IMCONJUGATE ( HID_SC_AAI_FUNCS_START + 77 ) -#define HID_AAI_FUNC_IMLN ( HID_SC_AAI_FUNCS_START + 78 ) -#define HID_AAI_FUNC_IMLOG10 ( HID_SC_AAI_FUNCS_START + 79 ) -#define HID_AAI_FUNC_IMLOG2 ( HID_SC_AAI_FUNCS_START + 80 ) -#define HID_AAI_FUNC_IMPRODUCT ( HID_SC_AAI_FUNCS_START + 81 ) -#define HID_AAI_FUNC_IMREAL ( HID_SC_AAI_FUNCS_START + 82 ) -#define HID_AAI_FUNC_IMSIN ( HID_SC_AAI_FUNCS_START + 83 ) -#define HID_AAI_FUNC_IMSUB ( HID_SC_AAI_FUNCS_START + 84 ) -#define HID_AAI_FUNC_IMSUM ( HID_SC_AAI_FUNCS_START + 85 ) -#define HID_AAI_FUNC_IMSQRT ( HID_SC_AAI_FUNCS_START + 86 ) -#define HID_AAI_FUNC_COMPLEX ( HID_SC_AAI_FUNCS_START + 87 ) -#define HID_AAI_FUNC_OCT2BIN ( HID_SC_AAI_FUNCS_START + 88 ) -#define HID_AAI_FUNC_OCT2DEZ ( HID_SC_AAI_FUNCS_START + 89 ) -#define HID_AAI_FUNC_OCT2HEX ( HID_SC_AAI_FUNCS_START + 90 ) -#define HID_AAI_FUNC_CONVERT ( HID_SC_AAI_FUNCS_START + 91 ) -#define HID_AAI_FUNC_FACTDOUBLE ( HID_SC_AAI_FUNCS_START + 92 ) +#define HID_AAI_FUNC_WORKDAY ( HID_SC_AAI_FUNCS_START ) +#define HID_AAI_FUNC_YEARFRAC ( HID_SC_AAI_FUNCS_START + 1 ) +#define HID_AAI_FUNC_EDATE ( HID_SC_AAI_FUNCS_START + 2 ) +#define HID_AAI_FUNC_WEEKNUM ( HID_SC_AAI_FUNCS_START + 3 ) +#define HID_AAI_FUNC_EOMONTH ( HID_SC_AAI_FUNCS_START + 4 ) +#define HID_AAI_FUNC_NETWORKDAYS ( HID_SC_AAI_FUNCS_START + 5 ) +#define HID_AAI_FUNC_AMORDEGRC ( HID_SC_AAI_FUNCS_START + 6 ) +#define HID_AAI_FUNC_AMORLINC ( HID_SC_AAI_FUNCS_START + 7 ) +#define HID_AAI_FUNC_ACCRINT ( HID_SC_AAI_FUNCS_START + 8 ) +#define HID_AAI_FUNC_ACCRINTM ( HID_SC_AAI_FUNCS_START + 9 ) +#define HID_AAI_FUNC_RECEIVED ( HID_SC_AAI_FUNCS_START + 10 ) +#define HID_AAI_FUNC_DISC ( HID_SC_AAI_FUNCS_START + 11 ) +#define HID_AAI_FUNC_DURATION ( HID_SC_AAI_FUNCS_START + 12 ) +#define HID_AAI_FUNC_EFFECT ( HID_SC_AAI_FUNCS_START + 13 ) +#define HID_AAI_FUNC_CUMPRINC ( HID_SC_AAI_FUNCS_START + 14 ) +#define HID_AAI_FUNC_CUMIPMT ( HID_SC_AAI_FUNCS_START + 15 ) +#define HID_AAI_FUNC_PRICE ( HID_SC_AAI_FUNCS_START + 16 ) +#define HID_AAI_FUNC_PRICEDISC ( HID_SC_AAI_FUNCS_START + 17 ) +#define HID_AAI_FUNC_PRICEMAT ( HID_SC_AAI_FUNCS_START + 18 ) +#define HID_AAI_FUNC_MDURATION ( HID_SC_AAI_FUNCS_START + 19 ) +#define HID_AAI_FUNC_NOMINAL ( HID_SC_AAI_FUNCS_START + 20 ) +#define HID_AAI_FUNC_DOLLARFR ( HID_SC_AAI_FUNCS_START + 21 ) +#define HID_AAI_FUNC_DOLLARDE ( HID_SC_AAI_FUNCS_START + 22 ) +#define HID_AAI_FUNC_YIELD ( HID_SC_AAI_FUNCS_START + 23 ) +#define HID_AAI_FUNC_YIELDDISC ( HID_SC_AAI_FUNCS_START + 24 ) +#define HID_AAI_FUNC_YIELDMAT ( HID_SC_AAI_FUNCS_START + 25 ) +#define HID_AAI_FUNC_TBILLEQ ( HID_SC_AAI_FUNCS_START + 26 ) +#define HID_AAI_FUNC_TBILLPRICE ( HID_SC_AAI_FUNCS_START + 27 ) +#define HID_AAI_FUNC_TBILLYIELD ( HID_SC_AAI_FUNCS_START + 28 ) +#define HID_AAI_FUNC_ODDFPRICE ( HID_SC_AAI_FUNCS_START + 29 ) +#define HID_AAI_FUNC_ODDFYIELD ( HID_SC_AAI_FUNCS_START + 30 ) +#define HID_AAI_FUNC_ODDLPRICE ( HID_SC_AAI_FUNCS_START + 31 ) +#define HID_AAI_FUNC_ODDLYIELD ( HID_SC_AAI_FUNCS_START + 32 ) +#define HID_AAI_FUNC_XIRR ( HID_SC_AAI_FUNCS_START + 33 ) +#define HID_AAI_FUNC_XNPV ( HID_SC_AAI_FUNCS_START + 34 ) +#define HID_AAI_FUNC_INTRATE ( HID_SC_AAI_FUNCS_START + 35 ) +#define HID_AAI_FUNC_COUPNCD ( HID_SC_AAI_FUNCS_START + 36 ) +#define HID_AAI_FUNC_COUPDAYS ( HID_SC_AAI_FUNCS_START + 37 ) +#define HID_AAI_FUNC_COUPDAYSNC ( HID_SC_AAI_FUNCS_START + 38 ) +#define HID_AAI_FUNC_COUPDAYBS ( HID_SC_AAI_FUNCS_START + 39 ) +#define HID_AAI_FUNC_COUPPCD ( HID_SC_AAI_FUNCS_START + 40 ) +#define HID_AAI_FUNC_COUPNUM ( HID_SC_AAI_FUNCS_START + 41 ) +#define HID_AAI_FUNC_FVSCHEDULE ( HID_SC_AAI_FUNCS_START + 42 ) +#define HID_AAI_FUNC_ISEVEN ( HID_SC_AAI_FUNCS_START + 43 ) +#define HID_AAI_FUNC_ISODD ( HID_SC_AAI_FUNCS_START + 44 ) +#define HID_AAI_FUNC_GCD ( HID_SC_AAI_FUNCS_START + 45 ) +#define HID_AAI_FUNC_LCM ( HID_SC_AAI_FUNCS_START + 46 ) +#define HID_AAI_FUNC_MULTINOMIAL ( HID_SC_AAI_FUNCS_START + 47 ) +#define HID_AAI_FUNC_SERIESSUM ( HID_SC_AAI_FUNCS_START + 48 ) +#define HID_AAI_FUNC_QUOTIENT ( HID_SC_AAI_FUNCS_START + 49 ) +#define HID_AAI_FUNC_MROUND ( HID_SC_AAI_FUNCS_START + 50 ) +#define HID_AAI_FUNC_SQRTPI ( HID_SC_AAI_FUNCS_START + 51 ) +#define HID_AAI_FUNC_RANDBETWEEN ( HID_SC_AAI_FUNCS_START + 52 ) +#define HID_AAI_FUNC_BESSELI ( HID_SC_AAI_FUNCS_START + 53 ) +#define HID_AAI_FUNC_BESSELJ ( HID_SC_AAI_FUNCS_START + 54 ) +#define HID_AAI_FUNC_BESSELK ( HID_SC_AAI_FUNCS_START + 55 ) +#define HID_AAI_FUNC_BESSELY ( HID_SC_AAI_FUNCS_START + 56 ) +#define HID_AAI_FUNC_BIN2DEC ( HID_SC_AAI_FUNCS_START + 57 ) +#define HID_AAI_FUNC_BIN2HEX ( HID_SC_AAI_FUNCS_START + 58 ) +#define HID_AAI_FUNC_BIN2OCT ( HID_SC_AAI_FUNCS_START + 59 ) +#define HID_AAI_FUNC_DELTA ( HID_SC_AAI_FUNCS_START + 60 ) +#define HID_AAI_FUNC_DEC2BIN ( HID_SC_AAI_FUNCS_START + 61 ) +#define HID_AAI_FUNC_DEC2HEX ( HID_SC_AAI_FUNCS_START + 62 ) +#define HID_AAI_FUNC_DEC2OCT ( HID_SC_AAI_FUNCS_START + 63 ) +#define HID_AAI_FUNC_ERF ( HID_SC_AAI_FUNCS_START + 64 ) +#define HID_AAI_FUNC_ERFC ( HID_SC_AAI_FUNCS_START + 65 ) +#define HID_AAI_FUNC_GESTEP ( HID_SC_AAI_FUNCS_START + 66 ) +#define HID_AAI_FUNC_HEX2BIN ( HID_SC_AAI_FUNCS_START + 67 ) +#define HID_AAI_FUNC_HEX2DEC ( HID_SC_AAI_FUNCS_START + 68 ) +#define HID_AAI_FUNC_HEX2OCT ( HID_SC_AAI_FUNCS_START + 69 ) +#define HID_AAI_FUNC_IMABS ( HID_SC_AAI_FUNCS_START + 70 ) +#define HID_AAI_FUNC_IMAGINARY ( HID_SC_AAI_FUNCS_START + 71 ) +#define HID_AAI_FUNC_IMPOWER ( HID_SC_AAI_FUNCS_START + 72 ) +#define HID_AAI_FUNC_IMARGUMENT ( HID_SC_AAI_FUNCS_START + 73 ) +#define HID_AAI_FUNC_IMCOS ( HID_SC_AAI_FUNCS_START + 74 ) +#define HID_AAI_FUNC_IMDIV ( HID_SC_AAI_FUNCS_START + 75 ) +#define HID_AAI_FUNC_IMEXP ( HID_SC_AAI_FUNCS_START + 76 ) +#define HID_AAI_FUNC_IMCONJUGATE ( HID_SC_AAI_FUNCS_START + 77 ) +#define HID_AAI_FUNC_IMLN ( HID_SC_AAI_FUNCS_START + 78 ) +#define HID_AAI_FUNC_IMLOG10 ( HID_SC_AAI_FUNCS_START + 79 ) +#define HID_AAI_FUNC_IMLOG2 ( HID_SC_AAI_FUNCS_START + 80 ) +#define HID_AAI_FUNC_IMPRODUCT ( HID_SC_AAI_FUNCS_START + 81 ) +#define HID_AAI_FUNC_IMREAL ( HID_SC_AAI_FUNCS_START + 82 ) +#define HID_AAI_FUNC_IMSIN ( HID_SC_AAI_FUNCS_START + 83 ) +#define HID_AAI_FUNC_IMSUB ( HID_SC_AAI_FUNCS_START + 84 ) +#define HID_AAI_FUNC_IMSUM ( HID_SC_AAI_FUNCS_START + 85 ) +#define HID_AAI_FUNC_IMSQRT ( HID_SC_AAI_FUNCS_START + 86 ) +#define HID_AAI_FUNC_COMPLEX ( HID_SC_AAI_FUNCS_START + 87 ) +#define HID_AAI_FUNC_OCT2BIN ( HID_SC_AAI_FUNCS_START + 88 ) +#define HID_AAI_FUNC_OCT2DEZ ( HID_SC_AAI_FUNCS_START + 89 ) +#define HID_AAI_FUNC_OCT2HEX ( HID_SC_AAI_FUNCS_START + 90 ) +#define HID_AAI_FUNC_CONVERT ( HID_SC_AAI_FUNCS_START + 91 ) +#define HID_AAI_FUNC_FACTDOUBLE ( HID_SC_AAI_FUNCS_START + 92 ) // DateFunc Addin Functions (max.20) ----------------------------------------- #define HID_DAI_FUNC_DAYSINMONTH ( HID_SC_DAI_FUNCS_START ) @@ -470,87 +470,87 @@ // View-Funktionen (max. 100) ------------------------------------------------ -#define FID_TESTFUNC0 (SC_VIEW_START) -#define FID_TESTFUNC1 (SC_VIEW_START + 1) -#define FID_TESTFUNC2 (SC_VIEW_START + 2) -#define FID_TESTFUNC3 (SC_VIEW_START + 3) -#define FID_TESTFUNC4 (SC_VIEW_START + 4) -#define FID_TESTFUNC5 (SC_VIEW_START + 5) -#define FID_TESTFUNC6 (SC_VIEW_START + 6) -#define FID_TESTFUNC7 (SC_VIEW_START + 7) -#define FID_TESTFUNC8 (SC_VIEW_START + 8) -#define FID_TESTFUNC9 (SC_VIEW_START + 9) -#define FID_SCALESTATUS (SC_VIEW_START + 10) -#define FID_COLOR (SC_VIEW_START + 11) -//aus sfx: #define SID_REPAINT (SC_VIEW_START + 12) -#define SID_UPDATECHART (SC_VIEW_START + 13) -#define FID_MARKLEFT (SC_VIEW_START + 14) -#define FID_MARKRIGHT (SC_VIEW_START + 15) -#define FID_MARKUP (SC_VIEW_START + 16) -#define FID_MARKDOWN (SC_VIEW_START + 17) -#define FID_MARKPAGEUP (SC_VIEW_START + 18) -#define FID_MARKPAGEDOWN (SC_VIEW_START + 19) +#define FID_TESTFUNC0 (SC_VIEW_START) +#define FID_TESTFUNC1 (SC_VIEW_START + 1) +#define FID_TESTFUNC2 (SC_VIEW_START + 2) +#define FID_TESTFUNC3 (SC_VIEW_START + 3) +#define FID_TESTFUNC4 (SC_VIEW_START + 4) +#define FID_TESTFUNC5 (SC_VIEW_START + 5) +#define FID_TESTFUNC6 (SC_VIEW_START + 6) +#define FID_TESTFUNC7 (SC_VIEW_START + 7) +#define FID_TESTFUNC8 (SC_VIEW_START + 8) +#define FID_TESTFUNC9 (SC_VIEW_START + 9) +#define FID_SCALESTATUS (SC_VIEW_START + 10) +#define FID_COLOR (SC_VIEW_START + 11) +//aus sfx: #define SID_REPAINT (SC_VIEW_START + 12) +#define SID_UPDATECHART (SC_VIEW_START + 13) +#define FID_MARKLEFT (SC_VIEW_START + 14) +#define FID_MARKRIGHT (SC_VIEW_START + 15) +#define FID_MARKUP (SC_VIEW_START + 16) +#define FID_MARKDOWN (SC_VIEW_START + 17) +#define FID_MARKPAGEUP (SC_VIEW_START + 18) +#define FID_MARKPAGEDOWN (SC_VIEW_START + 19) // Slot-IDs fuer Attribute: -#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page -#define SID_SCATTR_VER_JUSTIFY (SC_VIEW_START + 31) -#define SID_SCATTR_MARGIN (SC_VIEW_START + 32) +#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page +#define SID_SCATTR_VER_JUSTIFY (SC_VIEW_START + 31) +#define SID_SCATTR_MARGIN (SC_VIEW_START + 32) #define SID_SCATTR_STACKED (SC_VIEW_START + 33) -#define SID_SCATTR_LINEBREAK (SC_VIEW_START + 35) -#define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // Protection-Page +#define SID_SCATTR_LINEBREAK (SC_VIEW_START + 35) +#define SID_SCATTR_PROTECTION (SC_VIEW_START + 36) // Protection-Page // sonstige Slot-IDs: #define SID_SCUSERLISTS (SC_VIEW_START + 37) // Benutzerdef.Listen -#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item +#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item #define SID_SCVIEWOPTIONS (SC_VIEW_START + 39) #define SID_SCDOCOPTIONS (SC_VIEW_START + 40) // Cursorbewegungen als Properties: -#define SID_CURRENTCELL (SC_VIEW_START + 41) -#define SID_CURRENTTAB (SC_VIEW_START + 42) -#define SID_CURRENTDOC (SC_VIEW_START + 43) -#define SID_CURRENTOBJECT (SC_VIEW_START + 44) +#define SID_CURRENTCELL (SC_VIEW_START + 41) +#define SID_CURRENTTAB (SC_VIEW_START + 42) +#define SID_CURRENTDOC (SC_VIEW_START + 43) +#define SID_CURRENTOBJECT (SC_VIEW_START + 44) // Slot-IDs fuer spez. ToolBox-Funktionen: -#define SID_NUMBER_CURRENCY (SC_VIEW_START + 45) -#define SID_NUMBER_PERCENT (SC_VIEW_START + 46) +#define SID_NUMBER_CURRENCY (SC_VIEW_START + 45) +#define SID_NUMBER_PERCENT (SC_VIEW_START + 46) // "Slot" Ids fuer Eingabezeilen Images: -#define SID_INPUT_FUNCTION (SC_VIEW_START + 47) -#define SID_INPUT_SUM (SC_VIEW_START + 48) -#define SID_INPUT_EQUAL (SC_VIEW_START + 49) -#define SID_INPUT_CANCEL (SC_VIEW_START + 50) -#define SID_INPUT_OK (SC_VIEW_START + 51) - -#define SID_NUMBER_STANDARD (SC_VIEW_START + 52) -#define SID_NUMBER_DATE (SC_VIEW_START + 53) -#define SID_NUMBER_TWODEC (SC_VIEW_START + 54) -#define SID_NUMBER_SCIENTIFIC (SC_VIEW_START + 55) -#define SID_NUMBER_TIME (SC_VIEW_START + 56) -#define SID_NUMBER_INCDEC (SC_VIEW_START + 57) -#define SID_NUMBER_DECDEC (SC_VIEW_START + 58) +#define SID_INPUT_FUNCTION (SC_VIEW_START + 47) +#define SID_INPUT_SUM (SC_VIEW_START + 48) +#define SID_INPUT_EQUAL (SC_VIEW_START + 49) +#define SID_INPUT_CANCEL (SC_VIEW_START + 50) +#define SID_INPUT_OK (SC_VIEW_START + 51) + +#define SID_NUMBER_STANDARD (SC_VIEW_START + 52) +#define SID_NUMBER_DATE (SC_VIEW_START + 53) +#define SID_NUMBER_TWODEC (SC_VIEW_START + 54) +#define SID_NUMBER_SCIENTIFIC (SC_VIEW_START + 55) +#define SID_NUMBER_TIME (SC_VIEW_START + 56) +#define SID_NUMBER_INCDEC (SC_VIEW_START + 57) +#define SID_NUMBER_DECDEC (SC_VIEW_START + 58) // Sonstiges: -#define SID_LINKS (SC_VIEW_START + 60) -#define SID_INSERT_SIMAGE (SC_VIEW_START + 61) -#define SID_INSERT_SCHART (SC_VIEW_START + 62) +#define SID_LINKS (SC_VIEW_START + 60) +#define SID_INSERT_SIMAGE (SC_VIEW_START + 61) +#define SID_INSERT_SCHART (SC_VIEW_START + 62) #define SID_INSERT_SMATH (SC_VIEW_START + 63) -#define SID_STANDARD_FONTS (SC_VIEW_START + 64) -#define SID_MIRROR_VERTICAL (SC_VIEW_START + 65) -#define SID_MIRROR_HORIZONTAL (SC_VIEW_START + 66) -#define SID_CELL_FORMAT_RESET (SC_VIEW_START + 67) +#define SID_STANDARD_FONTS (SC_VIEW_START + 64) +#define SID_MIRROR_VERTICAL (SC_VIEW_START + 65) +#define SID_MIRROR_HORIZONTAL (SC_VIEW_START + 66) +#define SID_CELL_FORMAT_RESET (SC_VIEW_START + 67) #define SID_SCPRINTOPTIONS (SC_VIEW_START + 68) -#define SID_WINDOW_SPLIT (SC_VIEW_START + 69) -#define SID_WINDOW_FIX (SC_VIEW_START + 70) +#define SID_WINDOW_SPLIT (SC_VIEW_START + 69) +#define SID_WINDOW_FIX (SC_VIEW_START + 70) #ifdef SID_DRAW_CHART #undef SID_DRAW_CHART #endif -#define SID_DRAW_CHART (SC_VIEW_START + 71) -#define SID_UPDATETABLINKS (SC_VIEW_START + 72) +#define SID_DRAW_CHART (SC_VIEW_START + 71) +#define SID_UPDATETABLINKS (SC_VIEW_START + 72) //TabPage Eingabe #define SID_SC_INPUT_SELECTION (SC_VIEW_START + 73) @@ -558,23 +558,23 @@ #define SID_SC_INPUT_EDITMODE (SC_VIEW_START + 75) #define SID_SC_INPUT_FMT_EXPAND (SC_VIEW_START + 76) #define SID_SC_INPUT_RANGEFINDER (SC_VIEW_START + 77) -#define SID_SC_INPUT_REF_EXPAND (SC_VIEW_START + 78) -#define SID_SC_INPUT_MARK_HEADER (SC_VIEW_START + 79) +#define SID_SC_INPUT_REF_EXPAND (SC_VIEW_START + 78) +#define SID_SC_INPUT_MARK_HEADER (SC_VIEW_START + 79) -#define SID_REIMPORT_AFTER_LOAD (SC_VIEW_START + 80) -#define SID_DRAW_NOTEEDIT (SC_VIEW_START + 81) +#define SID_REIMPORT_AFTER_LOAD (SC_VIEW_START + 80) +#define SID_DRAW_NOTEEDIT (SC_VIEW_START + 81) -#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) -#define SID_EURO_CONVERTER (SC_VIEW_START + 83) -//#define SID_CHG_PROTECT (SC_VIEW_START + 84) -> moved to SVX +#define SID_CHOOSE_DESIGN (SC_VIEW_START + 82) +#define SID_EURO_CONVERTER (SC_VIEW_START + 83) +//#define SID_CHG_PROTECT (SC_VIEW_START + 84) -> moved to SVX #define SID_EXTERNAL_SOURCE (SC_VIEW_START + 85) -#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86) +#define SID_SC_INPUT_TEXTWYSIWYG (SC_VIEW_START + 86) #define SID_ENABLE_HYPHENATION (SC_VIEW_START + 87) -#define SID_RENAME_OBJECT (SC_VIEW_START + 88) -#define SID_FOCUS_INPUTLINE (SC_VIEW_START + 89) +#define SID_RENAME_OBJECT (SC_VIEW_START + 88) +#define SID_FOCUS_INPUTLINE (SC_VIEW_START + 89) #define SID_SELECT_TABLES (SC_VIEW_START + 90) // #97776# new entry "Filter..." in DP popup menu @@ -587,7 +587,7 @@ #define FID_VALID_LISTTYPE (SC_VIEW_START + 93) // #i68101# ID for changing Title & Descriptopn of an Object -#define SID_TITLE_DESCRIPTION_OBJECT (SC_VIEW_START + 94) +#define SID_TITLE_DESCRIPTION_OBJECT (SC_VIEW_START + 94) // #i59082# assign macro to shape #define SID_ASSIGNMACRO (SC_VIEW_START + 95) @@ -603,23 +603,23 @@ // Nachrichten ------------------------------------------------------------- -#define FID_INPUTLINE_STATUS (SC_MESSAGE_START) -#define FID_INPUTLINE_ENTER (SC_MESSAGE_START + 1) -#define FID_REPAINT (SC_MESSAGE_START + 2) -#define FID_DATACHANGED (SC_MESSAGE_START + 3) -#define FID_REFMODECHANGED (SC_MESSAGE_START + 4) -#define FID_KILLEDITVIEW (SC_MESSAGE_START + 5) +#define FID_INPUTLINE_STATUS (SC_MESSAGE_START) +#define FID_INPUTLINE_ENTER (SC_MESSAGE_START + 1) +#define FID_REPAINT (SC_MESSAGE_START + 2) +#define FID_DATACHANGED (SC_MESSAGE_START + 3) +#define FID_REFMODECHANGED (SC_MESSAGE_START + 4) +#define FID_KILLEDITVIEW (SC_MESSAGE_START + 5) #define SID_SOLVE (SC_MESSAGE_START + 6) #define FID_FONT_SELECTED (SC_MESSAGE_START + 7) #define FID_FILTER_OK (SC_MESSAGE_START + 8) -#define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9) -#define SID_TABDELETED (SC_MESSAGE_START + 10) -#define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11) +#define SC_HINT_DRWLAYER_NEW (SC_MESSAGE_START + 9) +#define SID_TABDELETED (SC_MESSAGE_START + 10) +#define FID_INPUTLINE_MATRIX (SC_MESSAGE_START + 11) #define SID_DLG_RETOK (SC_MESSAGE_START + 12) -#define FID_ANYDATACHANGED (SC_MESSAGE_START + 13) +#define FID_ANYDATACHANGED (SC_MESSAGE_START + 13) #define SID_STATUS_DOCPOS (SC_MESSAGE_START + 14) #define SID_STATUS_PAGESTYLE (SC_MESSAGE_START + 15) -#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16) +#define SID_STATUS_SELMODE (SC_MESSAGE_START + 16) #define FID_KILLEDITVIEW_NOPAINT (SC_MESSAGE_START + 17) #define SID_DLG_MATRIX (SC_MESSAGE_START + 18) #define SC_HINT_DBAREAS_CHANGED (SC_MESSAGE_START + 19) @@ -630,256 +630,256 @@ #define SID_STATUS_SELMODE_ERW (SC_MESSAGE_START + 23) #define SID_STATUS_SELMODE_NORM (SC_MESSAGE_START + 24) -#define SID_CHART_SOURCE (SC_MESSAGE_START + 25) -#define SID_CHART_NAME (SC_MESSAGE_START + 26) -#define SID_CHART_ADDSOURCE (SC_MESSAGE_START + 27) +#define SID_CHART_SOURCE (SC_MESSAGE_START + 25) +#define SID_CHART_NAME (SC_MESSAGE_START + 26) +#define SID_CHART_ADDSOURCE (SC_MESSAGE_START + 27) -#define SID_AUTO_STYLE (SC_MESSAGE_START + 28) +#define SID_AUTO_STYLE (SC_MESSAGE_START + 28) -#define FID_INPUTLINE_BLOCK (SC_MESSAGE_START + 29) +#define FID_INPUTLINE_BLOCK (SC_MESSAGE_START + 29) -#define SID_STATUS_SUM (SC_MESSAGE_START + 30) +#define SID_STATUS_SUM (SC_MESSAGE_START + 30) -#define SC_HINT_DRAW_CHANGED (SC_MESSAGE_START + 31) -#define SC_HINT_DOCNAME_CHANGED (SC_MESSAGE_START + 32) +#define SC_HINT_DRAW_CHANGED (SC_MESSAGE_START + 31) +#define SC_HINT_DOCNAME_CHANGED (SC_MESSAGE_START + 32) #define SC_HINT_AREALINKS_CHANGED (SC_MESSAGE_START + 33) -#define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) -#define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) -#define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) +#define SC_HINT_SHOWRANGEFINDER (SC_MESSAGE_START + 34) +#define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) +#define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) // Nachricht zum Oeffnen von Dialogen: -#define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) -#define SID_OPENDLG_PIVOTTABLE (SC_MESSAGE_START + 51) -#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52) -#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53) -#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54) -//#define SID_OPENDLG_CHART (SC_MESSAGE_START + 55) -#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56) -#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57) -//#define SID_OPENDLG_MODCHART (SC_MESSAGE_START + 58) -#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59) +#define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) +#define SID_OPENDLG_PIVOTTABLE (SC_MESSAGE_START + 51) +#define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52) +#define SID_OPENDLG_SOLVE (SC_MESSAGE_START + 53) +#define SID_OPENDLG_TABOP (SC_MESSAGE_START + 54) +//#define SID_OPENDLG_CHART (SC_MESSAGE_START + 55) +#define SID_OPENDLG_EDITFUNCTION (SC_MESSAGE_START + 56) +#define SID_OPENDLG_ARGUMENT (SC_MESSAGE_START + 57) +//#define SID_OPENDLG_MODCHART (SC_MESSAGE_START + 58) +#define SID_OPENDLG_CONDFRMT (SC_MESSAGE_START + 59) #define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60) //<!--Added by PengYunQuan for Validity Cell Range Picker -#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61) +#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61) //-->Added by PengYunQuan for Validity Cell Range Picker #define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65) // Funktionen ------------------------------------------------------------ -//#define FID_PRINT_PREVIEW (SC_FUNCTION_START) -#define FID_DOC_MANAGER (SC_FUNCTION_START + 1) -#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2) +//#define FID_PRINT_PREVIEW (SC_FUNCTION_START) +#define FID_DOC_MANAGER (SC_FUNCTION_START + 1) +#define FID_CURSOR_ENTER (SC_FUNCTION_START + 2) #define SID_MAIL (SC_FUNCTION_START + 3) -#define FILE_MENU_END (SC_FUNCTION_START + 20) - -#define EDIT_MENU_START (FILE_MENU_END) -#define FID_DELETE_CELLCONTENTS (EDIT_MENU_START + 1) -#define FID_DELETE_CELL (EDIT_MENU_START + 2) -#define FID_DELETE_TABLE (EDIT_MENU_START + 3) -#define FID_FILL_TO_BOTTOM (EDIT_MENU_START + 4) -#define FID_FILL_TO_RIGHT (EDIT_MENU_START + 5) -#define FID_FILL_TO_TOP (EDIT_MENU_START + 6) -#define FID_FILL_TO_LEFT (EDIT_MENU_START + 7) -#define FID_FILL_TAB (EDIT_MENU_START + 8) -#define FID_FILL_SERIES (EDIT_MENU_START + 9) -#define FID_SEARCH_REPLACE_DLG (EDIT_MENU_START + 10) -#define FID_EDIT_OBJECT (EDIT_MENU_START + 11) -#define SID_SC_NAVIGATOR (EDIT_MENU_START + 12) -#define SID_SC_WIZARD (EDIT_MENU_START + 13) -#define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14) +#define FILE_MENU_END (SC_FUNCTION_START + 20) + +#define EDIT_MENU_START (FILE_MENU_END) +#define FID_DELETE_CELLCONTENTS (EDIT_MENU_START + 1) +#define FID_DELETE_CELL (EDIT_MENU_START + 2) +#define FID_DELETE_TABLE (EDIT_MENU_START + 3) +#define FID_FILL_TO_BOTTOM (EDIT_MENU_START + 4) +#define FID_FILL_TO_RIGHT (EDIT_MENU_START + 5) +#define FID_FILL_TO_TOP (EDIT_MENU_START + 6) +#define FID_FILL_TO_LEFT (EDIT_MENU_START + 7) +#define FID_FILL_TAB (EDIT_MENU_START + 8) +#define FID_FILL_SERIES (EDIT_MENU_START + 9) +#define FID_SEARCH_REPLACE_DLG (EDIT_MENU_START + 10) +#define FID_EDIT_OBJECT (EDIT_MENU_START + 11) +#define SID_SC_NAVIGATOR (EDIT_MENU_START + 12) +#define SID_SC_WIZARD (EDIT_MENU_START + 13) +#define SID_SC_EDIT_OBJECT (EDIT_MENU_START + 14) #define SID_HFEDIT (EDIT_MENU_START + 15) #define SID_DEL_ROWS (EDIT_MENU_START + 16)//JN #define SID_DEL_COLS (EDIT_MENU_START + 17)//JN -//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -> moved to SVX -#define FID_CHG_SHOW (EDIT_MENU_START + 19) +//#define FID_CHG_RECORD (EDIT_MENU_START + 18) -> moved to SVX +#define FID_CHG_SHOW (EDIT_MENU_START + 19) -#define EDIT_MENU_END (EDIT_MENU_START + 20) -#define VIEW_MENU_START (EDIT_MENU_END) +#define EDIT_MENU_END (EDIT_MENU_START + 20) +#define VIEW_MENU_START (EDIT_MENU_END) -#define FID_TOGGLEOBJECT (VIEW_MENU_START) -#define FID_TOGGLEINPUTLINE (VIEW_MENU_START + 1) -#define FID_TOGGLEHEADERS (VIEW_MENU_START + 2) -#define FID_SCALE (VIEW_MENU_START + 4) -#define FID_TOGGLESYNTAX (VIEW_MENU_START + 5) -#define FID_SCREEN_OPTIONS (VIEW_MENU_START + 6) -#define FID_PAGEBREAKMODE (VIEW_MENU_START + 7) -#define FID_FUNCTION_BOX (VIEW_MENU_START + 8) +#define FID_TOGGLEOBJECT (VIEW_MENU_START) +#define FID_TOGGLEINPUTLINE (VIEW_MENU_START + 1) +#define FID_TOGGLEHEADERS (VIEW_MENU_START + 2) +#define FID_SCALE (VIEW_MENU_START + 4) +#define FID_TOGGLESYNTAX (VIEW_MENU_START + 5) +#define FID_SCREEN_OPTIONS (VIEW_MENU_START + 6) +#define FID_PAGEBREAKMODE (VIEW_MENU_START + 7) +#define FID_FUNCTION_BOX (VIEW_MENU_START + 8) #define FID_NORMALVIEWMODE (VIEW_MENU_START + 9) -#define FID_TOGGLEFORMULA (VIEW_MENU_START + 10) +#define FID_TOGGLEFORMULA (VIEW_MENU_START + 10) // Compare/Merge jetzt aus Sfx -//#define FID_CHG_COMPARE (VIEW_MENU_START + 16)// DANGER DIRTY ID -//#define FID_CHG_MERGE (VIEW_MENU_START + 17)// DANGER DIRTY ID -#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER DIRTY ID -#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER DIRTY ID -#define VIEW_MENU_END (VIEW_MENU_START + 20) - -#define INSERT_MENU_START (VIEW_MENU_END) -#define FID_PAGEBREAK (INSERT_MENU_START) -#define FID_INS_ROWBRK (INSERT_MENU_START + 1) -#define FID_INS_COLBRK (INSERT_MENU_START + 2) -#define FID_DEL_ROWBRK (INSERT_MENU_START + 3) -#define FID_DEL_COLBRK (INSERT_MENU_START + 4) -#define FID_INS_CELL_CONTENTS (INSERT_MENU_START + 5) -#define FID_INS_CELL (INSERT_MENU_START + 6) -#define FID_INS_ROW (INSERT_MENU_START + 7) -#define FID_INS_COLUMN (INSERT_MENU_START + 8) -#define FID_INS_TABLE (INSERT_MENU_START + 9) -#define SID_INS_FUNCTION (INSERT_MENU_START + 10) -#define FID_DEFINE_NAME (INSERT_MENU_START + 11) -#define FID_INSERT_NAME (INSERT_MENU_START + 12) -#define FID_USE_NAME (INSERT_MENU_START + 13) -#define FID_APPLY_NAME (INSERT_MENU_START + 14) +//#define FID_CHG_COMPARE (VIEW_MENU_START + 16)// DANGER DIRTY ID +//#define FID_CHG_MERGE (VIEW_MENU_START + 17)// DANGER DIRTY ID +#define FID_CHG_ACCEPT (VIEW_MENU_START + 18)// DANGER DIRTY ID +#define FID_CHG_COMMENT (VIEW_MENU_START + 19)// DANGER DIRTY ID +#define VIEW_MENU_END (VIEW_MENU_START + 20) + +#define INSERT_MENU_START (VIEW_MENU_END) +#define FID_PAGEBREAK (INSERT_MENU_START) +#define FID_INS_ROWBRK (INSERT_MENU_START + 1) +#define FID_INS_COLBRK (INSERT_MENU_START + 2) +#define FID_DEL_ROWBRK (INSERT_MENU_START + 3) +#define FID_DEL_COLBRK (INSERT_MENU_START + 4) +#define FID_INS_CELL_CONTENTS (INSERT_MENU_START + 5) +#define FID_INS_CELL (INSERT_MENU_START + 6) +#define FID_INS_ROW (INSERT_MENU_START + 7) +#define FID_INS_COLUMN (INSERT_MENU_START + 8) +#define FID_INS_TABLE (INSERT_MENU_START + 9) +#define SID_INS_FUNCTION (INSERT_MENU_START + 10) +#define FID_DEFINE_NAME (INSERT_MENU_START + 11) +#define FID_INSERT_NAME (INSERT_MENU_START + 12) +#define FID_USE_NAME (INSERT_MENU_START + 13) +#define FID_APPLY_NAME (INSERT_MENU_START + 14) #define FID_INS_TABLE_EXT (INSERT_MENU_START + 15) -//#define SID_CHARMAP (INSERT_MENU_START + 15)//!!! kommt von sfx +//#define SID_CHARMAP (INSERT_MENU_START + 15)//!!! kommt von sfx //aus sfx: #define SID_INSERT_POSTIT (INSERT_MENU_START + 16) #define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen -#define FID_INS_CELLSDOWN (INSERT_MENU_START + 18) -#define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19) -#define INSERT_MENU_END (INSERT_MENU_START + 20) - -#define FORMAT_MENU_START (INSERT_MENU_END) -#define FID_CELL_FORMAT (FORMAT_MENU_START) -#define FID_ROW_HEIGHT (FORMAT_MENU_START + 1) -#define FID_ROW_OPT_HEIGHT (FORMAT_MENU_START + 2) -#define FID_ROW_HIDE (FORMAT_MENU_START + 3) -#define FID_ROW_SHOW (FORMAT_MENU_START + 4) -#define FID_COL_WIDTH (FORMAT_MENU_START + 5) -#define FID_COL_OPT_WIDTH (FORMAT_MENU_START + 6) -#define FID_COL_HIDE (FORMAT_MENU_START + 7) -#define FID_COL_SHOW (FORMAT_MENU_START + 8) -#define FID_TABLE_HIDE (FORMAT_MENU_START + 9) -#define FID_TABLE_SHOW (FORMAT_MENU_START + 10) -#define FID_CONDITIONAL_FORMAT (FORMAT_MENU_START + 11) -#define SID_SCSTYLES (FORMAT_MENU_START + 12) -#define FID_MERGE_ON (FORMAT_MENU_START + 13) -#define FID_MERGE_OFF (FORMAT_MENU_START + 14) +#define FID_INS_CELLSDOWN (INSERT_MENU_START + 18) +#define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19) +#define INSERT_MENU_END (INSERT_MENU_START + 20) + +#define FORMAT_MENU_START (INSERT_MENU_END) +#define FID_CELL_FORMAT (FORMAT_MENU_START) +#define FID_ROW_HEIGHT (FORMAT_MENU_START + 1) +#define FID_ROW_OPT_HEIGHT (FORMAT_MENU_START + 2) +#define FID_ROW_HIDE (FORMAT_MENU_START + 3) +#define FID_ROW_SHOW (FORMAT_MENU_START + 4) +#define FID_COL_WIDTH (FORMAT_MENU_START + 5) +#define FID_COL_OPT_WIDTH (FORMAT_MENU_START + 6) +#define FID_COL_HIDE (FORMAT_MENU_START + 7) +#define FID_COL_SHOW (FORMAT_MENU_START + 8) +#define FID_TABLE_HIDE (FORMAT_MENU_START + 9) +#define FID_TABLE_SHOW (FORMAT_MENU_START + 10) +#define FID_CONDITIONAL_FORMAT (FORMAT_MENU_START + 11) +#define SID_SCSTYLES (FORMAT_MENU_START + 12) +#define FID_MERGE_ON (FORMAT_MENU_START + 13) +#define FID_MERGE_OFF (FORMAT_MENU_START + 14) #define SID_FORMATPAGE (FORMAT_MENU_START + 15) #define SID_TEXT_STANDARD (FORMAT_MENU_START + 16) -#define SID_DRAWTEXT_ATTR_DLG (FORMAT_MENU_START + 17) -#define FID_TABLE_VISIBLE (FORMAT_MENU_START + 18) -#define FID_COL_OPT_DIRECT (FORMAT_MENU_START + 19) -#define FORMAT_MENU_END (FORMAT_MENU_START + 20) +#define SID_DRAWTEXT_ATTR_DLG (FORMAT_MENU_START + 17) +#define FID_TABLE_VISIBLE (FORMAT_MENU_START + 18) +#define FID_COL_OPT_DIRECT (FORMAT_MENU_START + 19) +#define FORMAT_MENU_END (FORMAT_MENU_START + 20) -#define EXTRA_MENU_START (FORMAT_MENU_END) -#define FID_VOICE_CONTROL (EXTRA_MENU_START + 1) +#define EXTRA_MENU_START (FORMAT_MENU_END) +#define FID_VOICE_CONTROL (EXTRA_MENU_START + 1) #define SID_RECALC_TITLE (EXTRA_MENU_START + 2) -#define FID_AUTO_CALC (EXTRA_MENU_START + 3) -#define FID_RECALC (EXTRA_MENU_START + 4) -#define FID_UPDATE_DIAGRAMS (EXTRA_MENU_START + 5) -#define FID_PROTECT_TABLE (EXTRA_MENU_START + 6) -#define FID_PROTECT_DOC (EXTRA_MENU_START + 7) -#define SID_EDIT_MACRO (EXTRA_MENU_START + 8) -#define SID_SCOPTIONS (EXTRA_MENU_START + 9) -#define SID_MACRO_CHOOSER (EXTRA_MENU_START + 10) +#define FID_AUTO_CALC (EXTRA_MENU_START + 3) +#define FID_RECALC (EXTRA_MENU_START + 4) +#define FID_UPDATE_DIAGRAMS (EXTRA_MENU_START + 5) +#define FID_PROTECT_TABLE (EXTRA_MENU_START + 6) +#define FID_PROTECT_DOC (EXTRA_MENU_START + 7) +#define SID_EDIT_MACRO (EXTRA_MENU_START + 8) +#define SID_SCOPTIONS (EXTRA_MENU_START + 9) +#define SID_MACRO_CHOOSER (EXTRA_MENU_START + 10) #define SID_SHARE_DOC (EXTRA_MENU_START + 11) -#define SID_SCENARIOS (EXTRA_MENU_START + 12) -#define SID_ADD_IN_MANAGER (EXTRA_MENU_START + 13) +#define SID_SCENARIOS (EXTRA_MENU_START + 12) +#define SID_ADD_IN_MANAGER (EXTRA_MENU_START + 13) #define SID_PIVOT_RECALC (EXTRA_MENU_START + 14) #define SID_PIVOT_KILL (EXTRA_MENU_START + 15) // hier falsch, aber erstmal -#define SID_SC_HELP_PI (EXTRA_MENU_START + 16) +#define SID_SC_HELP_PI (EXTRA_MENU_START + 16) #define SID_SC_SHOW_KEYBOARD_HELP (EXTRA_MENU_START + 17) -#define FID_HARD_RECALC (EXTRA_MENU_START + 18) -#define FID_AUTOCOMPLETE (EXTRA_MENU_START + 19) +#define FID_HARD_RECALC (EXTRA_MENU_START + 18) +#define FID_AUTOCOMPLETE (EXTRA_MENU_START + 19) -#define EXTRA_MENU_END (EXTRA_MENU_START + 20) +#define EXTRA_MENU_END (EXTRA_MENU_START + 20) -#define DATA_MENU_START (EXTRA_MENU_END) -#define SID_DEFINE_DBNAME (DATA_MENU_START) -#define SID_SELECT_DB (DATA_MENU_START + 1) +#define DATA_MENU_START (EXTRA_MENU_END) +#define SID_DEFINE_DBNAME (DATA_MENU_START) +#define SID_SELECT_DB (DATA_MENU_START + 1) #define SID_SORT (DATA_MENU_START + 2) #define SID_FILTER (DATA_MENU_START + 3) #define SID_SPECIAL_FILTER (DATA_MENU_START + 4) #define SID_AUTO_FILTER (DATA_MENU_START + 5) -#define SID_UNFILTER (DATA_MENU_START + 6) +#define SID_UNFILTER (DATA_MENU_START + 6) #define SID_QUERY (DATA_MENU_START + 7) #define SID_SUBTOTALS (DATA_MENU_START + 8) //aus sfx: #define SID_OUTLINE_HIDE (DATA_MENU_START + 9) //aus sfx: #define SID_OUTLINE_SHOW (DATA_MENU_START + 10) //aus sfx: #define SID_OUTLINE_MAKE (DATA_MENU_START + 11) //aus sfx: #define SID_OUTLINE_REMOVE (DATA_MENU_START + 12) -#define SID_AUTO_OUTLINE (DATA_MENU_START + 13) +#define SID_AUTO_OUTLINE (DATA_MENU_START + 13) //aus sfx: #define SID_OUTLINE_DELETEALL (DATA_MENU_START + 14) #define SID_IMPORT_DATA (DATA_MENU_START + 15) #define SID_REIMPORT_DATA (DATA_MENU_START + 16) -#define SID_PIVOT_TABLE (DATA_MENU_START + 17) -#define SID_TABOP (DATA_MENU_START + 18) -#define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) -#define SID_CONSOLIDATE (DATA_MENU_START + 20) -#define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) +#define SID_PIVOT_TABLE (DATA_MENU_START + 17) +#define SID_TABOP (DATA_MENU_START + 18) +#define SID_TEXT_TO_COLUMNS (DATA_MENU_START + 19) +#define SID_CONSOLIDATE (DATA_MENU_START + 20) +#define SID_AUTOFILTER_HIDE (DATA_MENU_START + 21) -#define SID_SBA_IMPORT (DATA_MENU_START + 22) +#define SID_SBA_IMPORT (DATA_MENU_START + 22) -#define SID_SORT_DESCENDING (DATA_MENU_START + 23) -#define SID_SORT_ASCENDING (DATA_MENU_START + 24) +#define SID_SORT_DESCENDING (DATA_MENU_START + 23) +#define SID_SORT_ASCENDING (DATA_MENU_START + 24) // // #define DATA_MENU_END (DATA_MENU_START + 25) -#define TAB_POPUP_START (DATA_MENU_END) -#define RID_POPUP_TAB (TAB_POPUP_START) -#define FID_TAB_MENU_RENAME (TAB_POPUP_START+1) -#define FID_TAB_RENAME (TAB_POPUP_START+2) -#define FID_TAB_MOVE (TAB_POPUP_START+3) -#define FID_TAB_SELECTALL (TAB_POPUP_START+4) -#define FID_TAB_APPEND (TAB_POPUP_START+5) -#define FID_TAB_INDEX (TAB_POPUP_START+6) -#define FID_TAB_RTL (TAB_POPUP_START+7) +#define TAB_POPUP_START (DATA_MENU_END) +#define RID_POPUP_TAB (TAB_POPUP_START) +#define FID_TAB_MENU_RENAME (TAB_POPUP_START+1) +#define FID_TAB_RENAME (TAB_POPUP_START+2) +#define FID_TAB_MOVE (TAB_POPUP_START+3) +#define FID_TAB_SELECTALL (TAB_POPUP_START+4) +#define FID_TAB_APPEND (TAB_POPUP_START+5) +#define FID_TAB_INDEX (TAB_POPUP_START+6) +#define FID_TAB_RTL (TAB_POPUP_START+7) #define FID_TAB_DESELECTALL (TAB_POPUP_START+8) #define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9) #define FID_TAB_SET_TAB_BG_COLOR (TAB_POPUP_START + 10) #define FID_TAB_EVENTS (TAB_POPUP_START+11) -#define TAB_POPUP_END (TAB_POPUP_START + 20) - -#define OBJBAR_FORMAT_START (TAB_POPUP_END) -#define SID_ALIGNLEFT (OBJBAR_FORMAT_START+6) -#define SID_ALIGNRIGHT (OBJBAR_FORMAT_START+7) -#define SID_ALIGNCENTERHOR (OBJBAR_FORMAT_START+8) -#define SID_ALIGNBLOCK (OBJBAR_FORMAT_START+9) -#define SID_ALIGNTOP (OBJBAR_FORMAT_START+10) -#define SID_ALIGNBOTTOM (OBJBAR_FORMAT_START+11) -#define SID_ALIGNCENTERVER (OBJBAR_FORMAT_START+12) -#define SID_SELECT_SCENARIO (OBJBAR_FORMAT_START+13) - -#define SID_V_ALIGNCELL (OBJBAR_FORMAT_START+14) -#define SID_H_ALIGNCELL (OBJBAR_FORMAT_START+15) - -#define OBJBAR_FORMAT_END (OBJBAR_FORMAT_START+20) - -#define RID_INPUTBAR_START (OBJBAR_FORMAT_END) -#define SID_INPUT_WINDOW (RID_INPUTBAR_START) -#define RID_INPUTBAR_END (RID_INPUTBAR_START+1) - -#define DRAW_BAR_START (RID_INPUTBAR_END) -#define SID_DRAWTOABOVE (DRAW_BAR_START+15) -#define SID_DRAWTOBELOW (DRAW_BAR_START+16) -//#define SID_GROUP (DRAW_BAR_START+17) -//#define SID_UNGROUP (DRAW_BAR_START+18) -#define SID_FRAMETOTOP (DRAW_BAR_START+19) -#define SID_FRAMETOBOTTOM (DRAW_BAR_START+20) -//aus sfx: #define SID_FRAME_UP (DRAW_BAR_START+21) -//aus sfx: #define SID_FRAME_DOWN (DRAW_BAR_START+22) +#define TAB_POPUP_END (TAB_POPUP_START + 20) + +#define OBJBAR_FORMAT_START (TAB_POPUP_END) +#define SID_ALIGNLEFT (OBJBAR_FORMAT_START+6) +#define SID_ALIGNRIGHT (OBJBAR_FORMAT_START+7) +#define SID_ALIGNCENTERHOR (OBJBAR_FORMAT_START+8) +#define SID_ALIGNBLOCK (OBJBAR_FORMAT_START+9) +#define SID_ALIGNTOP (OBJBAR_FORMAT_START+10) +#define SID_ALIGNBOTTOM (OBJBAR_FORMAT_START+11) +#define SID_ALIGNCENTERVER (OBJBAR_FORMAT_START+12) +#define SID_SELECT_SCENARIO (OBJBAR_FORMAT_START+13) + +#define SID_V_ALIGNCELL (OBJBAR_FORMAT_START+14) +#define SID_H_ALIGNCELL (OBJBAR_FORMAT_START+15) + +#define OBJBAR_FORMAT_END (OBJBAR_FORMAT_START+20) + +#define RID_INPUTBAR_START (OBJBAR_FORMAT_END) +#define SID_INPUT_WINDOW (RID_INPUTBAR_START) +#define RID_INPUTBAR_END (RID_INPUTBAR_START+1) + +#define DRAW_BAR_START (RID_INPUTBAR_END) +#define SID_DRAWTOABOVE (DRAW_BAR_START+15) +#define SID_DRAWTOBELOW (DRAW_BAR_START+16) +//#define SID_GROUP (DRAW_BAR_START+17) +//#define SID_UNGROUP (DRAW_BAR_START+18) +#define SID_FRAMETOTOP (DRAW_BAR_START+19) +#define SID_FRAMETOBOTTOM (DRAW_BAR_START+20) +//aus sfx: #define SID_FRAME_UP (DRAW_BAR_START+21) +//aus sfx: #define SID_FRAME_DOWN (DRAW_BAR_START+22) #define SID_TOOL_TEXT (DRAW_BAR_START+23) #define SID_ANCHOR_PAGE (DRAW_BAR_START+24) #define SID_ANCHOR_CELL (DRAW_BAR_START+25) #define SID_ANCHOR_TOGGLE (DRAW_BAR_START+26) -#define SID_ORIGINALSIZE (DRAW_BAR_START+27) +#define SID_ORIGINALSIZE (DRAW_BAR_START+27) -#define DRAW_BAR_END (DRAW_BAR_START+50) +#define DRAW_BAR_END (DRAW_BAR_START+50) -#define DRAWTEXTBAR_START (DRAW_BAR_END) -#define SID_TEXT_LINESPACING_1 (DRAWTEXTBAR_START) -#define SID_TEXT_LINESPACING_2 (DRAWTEXTBAR_START+1) -#define SID_TEXT_LINESPACING_3 (DRAWTEXTBAR_START+2) -#define DRAWTEXTBAR_END (DRAWTEXTBAR_START+20) +#define DRAWTEXTBAR_START (DRAW_BAR_END) +#define SID_TEXT_LINESPACING_1 (DRAWTEXTBAR_START) +#define SID_TEXT_LINESPACING_2 (DRAWTEXTBAR_START+1) +#define SID_TEXT_LINESPACING_3 (DRAWTEXTBAR_START+2) +#define DRAWTEXTBAR_END (DRAWTEXTBAR_START+20) -#define DETECTIVE_START (DRAWTEXTBAR_END) +#define DETECTIVE_START (DRAWTEXTBAR_END) #define SID_DETECTIVE_ADD_PRED (DETECTIVE_START) #define SID_DETECTIVE_DEL_PRED (DETECTIVE_START+1) #define SID_DETECTIVE_ADD_SUCC (DETECTIVE_START+2) @@ -887,13 +887,13 @@ #define SID_DETECTIVE_ADD_ERR (DETECTIVE_START+4) #define SID_DETECTIVE_DEL_ALL (DETECTIVE_START+5) -#define SID_DETECTIVE_FILLMODE (DETECTIVE_START+6) -#define SID_FILL_ADD_PRED (DETECTIVE_START+7) -#define SID_FILL_DEL_PRED (DETECTIVE_START+8) -#define SID_FILL_ADD_SUCC (DETECTIVE_START+9) -#define SID_FILL_DEL_SUCC (DETECTIVE_START+10) -#define SID_FILL_NONE (DETECTIVE_START+11) -#define SID_FILL_SELECT (DETECTIVE_START+12) +#define SID_DETECTIVE_FILLMODE (DETECTIVE_START+6) +#define SID_FILL_ADD_PRED (DETECTIVE_START+7) +#define SID_FILL_DEL_PRED (DETECTIVE_START+8) +#define SID_FILL_ADD_SUCC (DETECTIVE_START+9) +#define SID_FILL_DEL_SUCC (DETECTIVE_START+10) +#define SID_FILL_NONE (DETECTIVE_START+11) +#define SID_FILL_SELECT (DETECTIVE_START+12) #define SID_DETECTIVE_INVALID (DETECTIVE_START+13) @@ -903,301 +903,301 @@ #define SID_DETECTIVE_MARK_PRED (DETECTIVE_START+16) #define SID_DETECTIVE_MARK_SUCC (DETECTIVE_START+17) -#define DETECTIVE_END (DETECTIVE_START+20) +#define DETECTIVE_END (DETECTIVE_START+20) -#define SID_API_SLOTS (DETECTIVE_END) -//aus sfx: #define SID_ENTER_STRING (SID_API_SLOTS) -#define SID_INSERT_MATRIX (SID_API_SLOTS+1) +#define SID_API_SLOTS (DETECTIVE_END) +//aus sfx: #define SID_ENTER_STRING (SID_API_SLOTS) +#define SID_INSERT_MATRIX (SID_API_SLOTS+1) #define SID_DELETE_NOTE (SID_API_SLOTS+2) -#define SID_PREVIEW_START (SID_API_SLOTS+20) -#define SID_PREVIEW_NEXT (SID_PREVIEW_START) -#define SID_PREVIEW_PREVIOUS (SID_PREVIEW_START+1) -#define SID_PREVIEW_FIRST (SID_PREVIEW_START+2) -#define SID_PREVIEW_LAST (SID_PREVIEW_START+3) -#define SID_PREVIEW_GOTO (SID_PREVIEW_START+4) -#define SID_PREVIEW_ZOOMIN (SID_PREVIEW_START+5) -#define SID_PREVIEW_ZOOMOUT (SID_PREVIEW_START+6) -#define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7) +#define SID_PREVIEW_START (SID_API_SLOTS+20) +#define SID_PREVIEW_NEXT (SID_PREVIEW_START) +#define SID_PREVIEW_PREVIOUS (SID_PREVIEW_START+1) +#define SID_PREVIEW_FIRST (SID_PREVIEW_START+2) +#define SID_PREVIEW_LAST (SID_PREVIEW_START+3) +#define SID_PREVIEW_GOTO (SID_PREVIEW_START+4) +#define SID_PREVIEW_ZOOMIN (SID_PREVIEW_START+5) +#define SID_PREVIEW_ZOOMOUT (SID_PREVIEW_START+6) +#define SID_PREVIEW_CLOSE (SID_PREVIEW_START+7) #define SID_PREVIEW_MARGIN (SID_PREVIEW_START+8) #define SID_PREVIEW_SCALINGFACTOR (SID_PREVIEW_START+9) -#define SID_PREVIEW_END (SID_PREVIEW_START+20) - -//aus sfx: #define SID_KEYFUNC_START (SID_PREVIEW_END+5) -#define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0) -#define SID_CURSORUP_SEL (SID_KEYFUNC_START + 1) -#define SID_CURSORLEFT_SEL (SID_KEYFUNC_START + 2) -#define SID_CURSORRIGHT_SEL (SID_KEYFUNC_START + 3) -#define SID_CURSORPAGEDOWN_SEL (SID_KEYFUNC_START + 4) -#define SID_CURSORPAGEUP_SEL (SID_KEYFUNC_START + 5) - -#define SID_CURSORPAGELEFT_ (SID_KEYFUNC_START + 6) -#define SID_CURSORPAGELEFT_SEL (SID_KEYFUNC_START + 7) -#define SID_CURSORPAGERIGHT_ (SID_KEYFUNC_START + 8) -#define SID_CURSORPAGERIGHT_SEL (SID_KEYFUNC_START + 9) - -#define SID_CURSORTOPOFFILE_SEL (SID_KEYFUNC_START + 10) -#define SID_CURSORENDOFFILE_SEL (SID_KEYFUNC_START + 11) -#define SID_CURSORHOME_SEL (SID_KEYFUNC_START + 12) -#define SID_CURSOREND_SEL (SID_KEYFUNC_START + 13) -#define SID_CURSORBLKUP (SID_KEYFUNC_START + 14) -#define SID_CURSORBLKDOWN (SID_KEYFUNC_START + 15) -#define SID_CURSORBLKLEFT (SID_KEYFUNC_START + 16) -#define SID_CURSORBLKRIGHT (SID_KEYFUNC_START + 17) -#define SID_CURSORBLKUP_SEL (SID_KEYFUNC_START + 18) -#define SID_CURSORBLKDOWN_SEL (SID_KEYFUNC_START + 19) -#define SID_CURSORBLKLEFT_SEL (SID_KEYFUNC_START + 20) -#define SID_CURSORBLKRIGHT_SEL (SID_KEYFUNC_START + 21) - -#define SID_NEXT_TABLE (SID_KEYFUNC_START + 22) -#define SID_PREV_TABLE (SID_KEYFUNC_START + 23) - -#define SID_NEXT_UNPROTECT (SID_KEYFUNC_START + 24) -#define SID_PREV_UNPROTECT (SID_KEYFUNC_START + 25) - -#define SID_SELECT_COL (SID_KEYFUNC_START + 26) -#define SID_SELECT_ROW (SID_KEYFUNC_START + 27) -#define SID_SELECT_NONE (SID_KEYFUNC_START + 28) -#define SID_ALIGNCURSOR (SID_KEYFUNC_START + 29) -#define SID_MARKDATAAREA (SID_KEYFUNC_START + 30) -#define SID_SETINPUTMODE (SID_KEYFUNC_START + 31) -#define SID_DELETE_CONTENTS (SID_KEYFUNC_START + 32) - -#define SID_MARKAREA (SID_KEYFUNC_START + 33) - -#define SID_AUTOFILL (SID_KEYFUNC_START + 34) -#define FID_FILL_AUTO (SID_KEYFUNC_START + 35) -#define SID_CANCEL (SID_KEYFUNC_START + 36) - -#define SID_CURSORENTERUP (SID_KEYFUNC_START + 37) -#define SID_CURSORENTERDOWN (SID_KEYFUNC_START + 38) +#define SID_PREVIEW_END (SID_PREVIEW_START+20) + +//aus sfx: #define SID_KEYFUNC_START (SID_PREVIEW_END+5) +#define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0) +#define SID_CURSORUP_SEL (SID_KEYFUNC_START + 1) +#define SID_CURSORLEFT_SEL (SID_KEYFUNC_START + 2) +#define SID_CURSORRIGHT_SEL (SID_KEYFUNC_START + 3) +#define SID_CURSORPAGEDOWN_SEL (SID_KEYFUNC_START + 4) +#define SID_CURSORPAGEUP_SEL (SID_KEYFUNC_START + 5) + +#define SID_CURSORPAGELEFT_ (SID_KEYFUNC_START + 6) +#define SID_CURSORPAGELEFT_SEL (SID_KEYFUNC_START + 7) +#define SID_CURSORPAGERIGHT_ (SID_KEYFUNC_START + 8) +#define SID_CURSORPAGERIGHT_SEL (SID_KEYFUNC_START + 9) + +#define SID_CURSORTOPOFFILE_SEL (SID_KEYFUNC_START + 10) +#define SID_CURSORENDOFFILE_SEL (SID_KEYFUNC_START + 11) +#define SID_CURSORHOME_SEL (SID_KEYFUNC_START + 12) +#define SID_CURSOREND_SEL (SID_KEYFUNC_START + 13) +#define SID_CURSORBLKUP (SID_KEYFUNC_START + 14) +#define SID_CURSORBLKDOWN (SID_KEYFUNC_START + 15) +#define SID_CURSORBLKLEFT (SID_KEYFUNC_START + 16) +#define SID_CURSORBLKRIGHT (SID_KEYFUNC_START + 17) +#define SID_CURSORBLKUP_SEL (SID_KEYFUNC_START + 18) +#define SID_CURSORBLKDOWN_SEL (SID_KEYFUNC_START + 19) +#define SID_CURSORBLKLEFT_SEL (SID_KEYFUNC_START + 20) +#define SID_CURSORBLKRIGHT_SEL (SID_KEYFUNC_START + 21) + +#define SID_NEXT_TABLE (SID_KEYFUNC_START + 22) +#define SID_PREV_TABLE (SID_KEYFUNC_START + 23) + +#define SID_NEXT_UNPROTECT (SID_KEYFUNC_START + 24) +#define SID_PREV_UNPROTECT (SID_KEYFUNC_START + 25) + +#define SID_SELECT_COL (SID_KEYFUNC_START + 26) +#define SID_SELECT_ROW (SID_KEYFUNC_START + 27) +#define SID_SELECT_NONE (SID_KEYFUNC_START + 28) +#define SID_ALIGNCURSOR (SID_KEYFUNC_START + 29) +#define SID_MARKDATAAREA (SID_KEYFUNC_START + 30) +#define SID_SETINPUTMODE (SID_KEYFUNC_START + 31) +#define SID_DELETE_CONTENTS (SID_KEYFUNC_START + 32) + +#define SID_MARKAREA (SID_KEYFUNC_START + 33) + +#define SID_AUTOFILL (SID_KEYFUNC_START + 34) +#define FID_FILL_AUTO (SID_KEYFUNC_START + 35) +#define SID_CANCEL (SID_KEYFUNC_START + 36) + +#define SID_CURSORENTERUP (SID_KEYFUNC_START + 37) +#define SID_CURSORENTERDOWN (SID_KEYFUNC_START + 38) #define SID_MARKARRAYFORMULA (SID_KEYFUNC_START + 39) #define SID_NEXT_TABLE_SEL (SID_KEYFUNC_START + 40) #define SID_PREV_TABLE_SEL (SID_KEYFUNC_START + 41) -#define SID_KEYFUNC_END (SID_KEYFUNC_START + 50) +#define SID_KEYFUNC_END (SID_KEYFUNC_START + 50) -#define SID_NEW_SLOTS (SID_KEYFUNC_END) -#define SID_NEW_SLOTS_END (SID_NEW_SLOTS+100) +#define SID_NEW_SLOTS (SID_KEYFUNC_END) +#define SID_NEW_SLOTS_END (SID_NEW_SLOTS+100) -#define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) -#define SID_COL_START (SID_NEW_SLOTS+2) -#define SID_ROW_START (SID_NEW_SLOTS+3) -#define SID_COL_END (SID_NEW_SLOTS+4) -#define SID_ROW_END (SID_NEW_SLOTS+5) -#define SID_KEEP_MARK (SID_NEW_SLOTS+6) -#define SID_FILL_DIR (SID_NEW_SLOTS+7) -#define SID_FILL_COUNT (SID_NEW_SLOTS+8) -#define SID_WITH_UNDO (SID_NEW_SLOTS+9) +#define SID_NEW_TABLENAME (SID_NEW_SLOTS+1) +#define SID_COL_START (SID_NEW_SLOTS+2) +#define SID_ROW_START (SID_NEW_SLOTS+3) +#define SID_COL_END (SID_NEW_SLOTS+4) +#define SID_ROW_END (SID_NEW_SLOTS+5) +#define SID_KEEP_MARK (SID_NEW_SLOTS+6) +#define SID_FILL_DIR (SID_NEW_SLOTS+7) +#define SID_FILL_COUNT (SID_NEW_SLOTS+8) +#define SID_WITH_UNDO (SID_NEW_SLOTS+9) #define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10) -//aus sfx: #define SID_ATTR_SECIALCHAR (SID_NEW_SLOTS+10) -#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) -#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) - -#define SID_SC_CELLS (SID_NEW_SLOTS+13) -#define SID_SC_RANGE (SID_NEW_SLOTS+14) -#define SID_SC_SELECTION (SID_NEW_SLOTS+15) -#define SID_SC_CELLTEXT (SID_NEW_SLOTS+16) - -#define SID_SC_NAME_TITLE (SID_NEW_SLOTS+17) - -#define SID_SC_ACTIVECELL (SID_NEW_SLOTS+18) -#define SID_SC_ACTIVETAB (SID_NEW_SLOTS+19) -#define SID_RANGE_ROW (SID_NEW_SLOTS+20) -#define SID_RANGE_COL (SID_NEW_SLOTS+21) -#define SID_RANGE_TABLE (SID_NEW_SLOTS+22) -#define SID_RANGE_VALUE (SID_NEW_SLOTS+23) -#define SID_RANGE_FORMULA (SID_NEW_SLOTS+24) -#define SID_RANGE_TEXT (SID_NEW_SLOTS+25) -#define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26) -#define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27) -#define SID_TABLES_GET (SID_NEW_SLOTS+28) -#define SID_PROP_INTERIOR (SID_NEW_SLOTS+29) -#define SID_PROP_FONT (SID_NEW_SLOTS+30) - -#define SID_DEFINE_PRINTAREA (SID_NEW_SLOTS+31) -#define SID_DELETE_PRINTAREA (SID_NEW_SLOTS+32) +//aus sfx: #define SID_ATTR_SECIALCHAR (SID_NEW_SLOTS+10) +#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11) +#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12) + +#define SID_SC_CELLS (SID_NEW_SLOTS+13) +#define SID_SC_RANGE (SID_NEW_SLOTS+14) +#define SID_SC_SELECTION (SID_NEW_SLOTS+15) +#define SID_SC_CELLTEXT (SID_NEW_SLOTS+16) + +#define SID_SC_NAME_TITLE (SID_NEW_SLOTS+17) + +#define SID_SC_ACTIVECELL (SID_NEW_SLOTS+18) +#define SID_SC_ACTIVETAB (SID_NEW_SLOTS+19) +#define SID_RANGE_ROW (SID_NEW_SLOTS+20) +#define SID_RANGE_COL (SID_NEW_SLOTS+21) +#define SID_RANGE_TABLE (SID_NEW_SLOTS+22) +#define SID_RANGE_VALUE (SID_NEW_SLOTS+23) +#define SID_RANGE_FORMULA (SID_NEW_SLOTS+24) +#define SID_RANGE_TEXT (SID_NEW_SLOTS+25) +#define SID_RANGE_TEXTVALUE (SID_NEW_SLOTS+26) +#define SID_TABLE_ACTIVATE (SID_NEW_SLOTS+27) +#define SID_TABLES_GET (SID_NEW_SLOTS+28) +#define SID_PROP_INTERIOR (SID_NEW_SLOTS+29) +#define SID_PROP_FONT (SID_NEW_SLOTS+30) + +#define SID_DEFINE_PRINTAREA (SID_NEW_SLOTS+31) +#define SID_DELETE_PRINTAREA (SID_NEW_SLOTS+32) #define SID_CHANGE_PRINTAREA (SID_NEW_SLOTS+33) -#define SID_OPENDLG_EDIT_PRINTAREA (SID_NEW_SLOTS+34) +#define SID_OPENDLG_EDIT_PRINTAREA (SID_NEW_SLOTS+34) -#define SID_OLE_OBJECT (SID_NEW_SLOTS+35) -#define SID_OLE_ACTIVATE (SID_NEW_SLOTS+36) -#define SID_OLE_DEACTIVATE (SID_NEW_SLOTS+37) +#define SID_OLE_OBJECT (SID_NEW_SLOTS+35) +#define SID_OLE_ACTIVATE (SID_NEW_SLOTS+36) +#define SID_OLE_DEACTIVATE (SID_NEW_SLOTS+37) -#define SID_TOGGLE_REL (SID_NEW_SLOTS+38) -#define SID_DATA_SELECT (SID_NEW_SLOTS+39) +#define SID_TOGGLE_REL (SID_NEW_SLOTS+38) +#define SID_DATA_SELECT (SID_NEW_SLOTS+39) -// Suchen & Ersetzen -#define FID_SEARCH (SID_NEW_SLOTS+40) -#define FID_REPEAT_SEARCH (SID_NEW_SLOTS+41) -#define FID_REPLACE (SID_NEW_SLOTS+42) -#define FID_SEARCH_ALL (SID_NEW_SLOTS+43) -#define FID_REPLACE_ALL (SID_NEW_SLOTS+44) -#define FID_SEARCH_COUNT (SID_NEW_SLOTS+45) +// Suchen & Ersetzen +#define FID_SEARCH (SID_NEW_SLOTS+40) +#define FID_REPEAT_SEARCH (SID_NEW_SLOTS+41) +#define FID_REPLACE (SID_NEW_SLOTS+42) +#define FID_SEARCH_ALL (SID_NEW_SLOTS+43) +#define FID_REPLACE_ALL (SID_NEW_SLOTS+44) +#define FID_SEARCH_COUNT (SID_NEW_SLOTS+45) -#define SID_SC_SETTEXT (SID_NEW_SLOTS+46) -#define SID_RANGE_ADDRESS (SID_NEW_SLOTS+47) -#define SID_RANGE_OFFSET (SID_NEW_SLOTS+48) -#define SID_NUMBER_FORMAT (SID_NEW_SLOTS+49) +#define SID_SC_SETTEXT (SID_NEW_SLOTS+46) +#define SID_RANGE_ADDRESS (SID_NEW_SLOTS+47) +#define SID_RANGE_OFFSET (SID_NEW_SLOTS+48) +#define SID_NUMBER_FORMAT (SID_NEW_SLOTS+49) -#define SID_OLE_SELECT (SID_NEW_SLOTS+50) -#define SID_SC_ACTIVEOBJECT (SID_NEW_SLOTS+51) +#define SID_OLE_SELECT (SID_NEW_SLOTS+50) +#define SID_SC_ACTIVEOBJECT (SID_NEW_SLOTS+51) -#define SID_RANGE_NOTETEXT (SID_NEW_SLOTS+52) -#define FID_INSERT_FILE (SID_NEW_SLOTS+53) +#define SID_RANGE_NOTETEXT (SID_NEW_SLOTS+52) +#define FID_INSERT_FILE (SID_NEW_SLOTS+53) -#define FID_VALIDATION (SID_NEW_SLOTS+54) +#define FID_VALIDATION (SID_NEW_SLOTS+54) -// Slots fuer Toolbox Controller in der Werkzeugleiste -#define SID_TBXCTL_INSERT (SID_NEW_SLOTS+55) -#define SID_TBXCTL_INSCELLS (SID_NEW_SLOTS+56) -#define SID_TBXCTL_INSOBJ (SID_NEW_SLOTS+57) +// Slots fuer Toolbox Controller in der Werkzeugleiste +#define SID_TBXCTL_INSERT (SID_NEW_SLOTS+55) +#define SID_TBXCTL_INSCELLS (SID_NEW_SLOTS+56) +#define SID_TBXCTL_INSOBJ (SID_NEW_SLOTS+57) #define SID_DEFINE_COLROWNAMERANGES (SID_NEW_SLOTS+58) -#define FID_NOTE_VISIBLE (SID_NEW_SLOTS+59) - -// Items fuer Gueltigkeit -#define FID_VALID_MODE (SID_NEW_SLOTS+60) -#define FID_VALID_CONDMODE (SID_NEW_SLOTS+61) -#define FID_VALID_VALUE1 (SID_NEW_SLOTS+62) -#define FID_VALID_VALUE2 (SID_NEW_SLOTS+63) -#define FID_VALID_BLANK (SID_NEW_SLOTS+64) -#define FID_VALID_SHOWHELP (SID_NEW_SLOTS+65) -#define FID_VALID_HELPTITLE (SID_NEW_SLOTS+66) -#define FID_VALID_HELPTEXT (SID_NEW_SLOTS+67) -#define FID_VALID_SHOWERR (SID_NEW_SLOTS+68) -#define FID_VALID_ERRSTYLE (SID_NEW_SLOTS+69) -#define FID_VALID_ERRTITLE (SID_NEW_SLOTS+70) -#define FID_VALID_ERRTEXT (SID_NEW_SLOTS+71) - -#define SID_REFRESH_DBAREA (SID_NEW_SLOTS+72) -#define SID_RANGE_REGION (SID_NEW_SLOTS+73) - -#define FID_FOCUS_POSWND (SID_NEW_SLOTS+74) - -// einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu) -#define SID_ULINE_VAL_NONE (SID_NEW_SLOTS+75) -#define SID_ULINE_VAL_SINGLE (SID_NEW_SLOTS+76) -#define SID_ULINE_VAL_DOUBLE (SID_NEW_SLOTS+77) -#define SID_ULINE_VAL_DOTTED (SID_NEW_SLOTS+78) - -#define FID_DEL_MANUALBREAKS (SID_NEW_SLOTS+79) -#define SID_ADD_PRINTAREA (SID_NEW_SLOTS+80) -#define FID_ADJUST_PRINTZOOM (SID_NEW_SLOTS+81) -#define FID_RESET_PRINTZOOM (SID_NEW_SLOTS+82) - -#define SID_TABLES_COUNT (SID_NEW_SLOTS+83) -#define SID_ACTIVE_OBJ_NAME (SID_NEW_SLOTS+84) -#define SID_OBJECT_LEFT (SID_NEW_SLOTS+85) -#define SID_OBJECT_TOP (SID_NEW_SLOTS+86) -#define SID_OBJECT_WIDTH (SID_NEW_SLOTS+87) -#define SID_OBJECT_HEIGHT (SID_NEW_SLOTS+88) - -#define SID_PIVOT_CREATE (SID_NEW_SLOTS+89) -#define SID_PIVOT_FIELDS (SID_NEW_SLOTS+90) -#define SID_PFIELD_NAME (SID_NEW_SLOTS+91) -#define SID_PFIELD_ORIENTATION (SID_NEW_SLOTS+92) -#define SID_PFIELD_FUNCTION (SID_NEW_SLOTS+93) -#define SID_PIVOT_GET (SID_NEW_SLOTS+94) - -#define SID_DELETE_SCENARIO (SID_NEW_SLOTS+95) -#define SID_EDIT_SCENARIO (SID_NEW_SLOTS+96) +#define FID_NOTE_VISIBLE (SID_NEW_SLOTS+59) + +// Items fuer Gueltigkeit +#define FID_VALID_MODE (SID_NEW_SLOTS+60) +#define FID_VALID_CONDMODE (SID_NEW_SLOTS+61) +#define FID_VALID_VALUE1 (SID_NEW_SLOTS+62) +#define FID_VALID_VALUE2 (SID_NEW_SLOTS+63) +#define FID_VALID_BLANK (SID_NEW_SLOTS+64) +#define FID_VALID_SHOWHELP (SID_NEW_SLOTS+65) +#define FID_VALID_HELPTITLE (SID_NEW_SLOTS+66) +#define FID_VALID_HELPTEXT (SID_NEW_SLOTS+67) +#define FID_VALID_SHOWERR (SID_NEW_SLOTS+68) +#define FID_VALID_ERRSTYLE (SID_NEW_SLOTS+69) +#define FID_VALID_ERRTITLE (SID_NEW_SLOTS+70) +#define FID_VALID_ERRTEXT (SID_NEW_SLOTS+71) + +#define SID_REFRESH_DBAREA (SID_NEW_SLOTS+72) +#define SID_RANGE_REGION (SID_NEW_SLOTS+73) + +#define FID_FOCUS_POSWND (SID_NEW_SLOTS+74) + +// einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu) +#define SID_ULINE_VAL_NONE (SID_NEW_SLOTS+75) +#define SID_ULINE_VAL_SINGLE (SID_NEW_SLOTS+76) +#define SID_ULINE_VAL_DOUBLE (SID_NEW_SLOTS+77) +#define SID_ULINE_VAL_DOTTED (SID_NEW_SLOTS+78) + +#define FID_DEL_MANUALBREAKS (SID_NEW_SLOTS+79) +#define SID_ADD_PRINTAREA (SID_NEW_SLOTS+80) +#define FID_ADJUST_PRINTZOOM (SID_NEW_SLOTS+81) +#define FID_RESET_PRINTZOOM (SID_NEW_SLOTS+82) + +#define SID_TABLES_COUNT (SID_NEW_SLOTS+83) +#define SID_ACTIVE_OBJ_NAME (SID_NEW_SLOTS+84) +#define SID_OBJECT_LEFT (SID_NEW_SLOTS+85) +#define SID_OBJECT_TOP (SID_NEW_SLOTS+86) +#define SID_OBJECT_WIDTH (SID_NEW_SLOTS+87) +#define SID_OBJECT_HEIGHT (SID_NEW_SLOTS+88) + +#define SID_PIVOT_CREATE (SID_NEW_SLOTS+89) +#define SID_PIVOT_FIELDS (SID_NEW_SLOTS+90) +#define SID_PFIELD_NAME (SID_NEW_SLOTS+91) +#define SID_PFIELD_ORIENTATION (SID_NEW_SLOTS+92) +#define SID_PFIELD_FUNCTION (SID_NEW_SLOTS+93) +#define SID_PIVOT_GET (SID_NEW_SLOTS+94) + +#define SID_DELETE_SCENARIO (SID_NEW_SLOTS+95) +#define SID_EDIT_SCENARIO (SID_NEW_SLOTS+96) // idl Parameter --------------------------------------------------------- -//aus sfx: #define FN_PARAM_1 (SC_PARAM_START) -//aus sfx: #define FN_PARAM_2 (SC_PARAM_START+1) -//aus sfx: #define FN_PARAM_3 (SC_PARAM_START+2) -//aus sfx: #define FN_PARAM_4 (SC_PARAM_START+3) -//aus sfx: #define FN_PARAM_5 (SC_PARAM_START+4) -//aus sfx: #define FN_PARAM_6 (SC_PARAM_START+5) -//aus sfx: #define FN_PARAM_7 (SC_PARAM_START+6) -//aus sfx: #define FN_PARAM_8 (SC_PARAM_START+7) -#define FN_PARAM_9 (FN_PARAM_8+1) - -#define SID_SORT_BYROW (SC_PARAM_START) -#define SID_SORT_HASHEADER (SC_PARAM_START+1) -#define SID_SORT_CASESENS (SC_PARAM_START+2) -#define SID_SORT_ATTRIBS (SC_PARAM_START+3) -#define SID_SORT_USERDEF (SC_PARAM_START+4) -#define SID_SORT_NATURALSORT (SC_PARAM_START+5) +//aus sfx: #define FN_PARAM_1 (SC_PARAM_START) +//aus sfx: #define FN_PARAM_2 (SC_PARAM_START+1) +//aus sfx: #define FN_PARAM_3 (SC_PARAM_START+2) +//aus sfx: #define FN_PARAM_4 (SC_PARAM_START+3) +//aus sfx: #define FN_PARAM_5 (SC_PARAM_START+4) +//aus sfx: #define FN_PARAM_6 (SC_PARAM_START+5) +//aus sfx: #define FN_PARAM_7 (SC_PARAM_START+6) +//aus sfx: #define FN_PARAM_8 (SC_PARAM_START+7) +#define FN_PARAM_9 (FN_PARAM_8+1) + +#define SID_SORT_BYROW (SC_PARAM_START) +#define SID_SORT_HASHEADER (SC_PARAM_START+1) +#define SID_SORT_CASESENS (SC_PARAM_START+2) +#define SID_SORT_ATTRIBS (SC_PARAM_START+3) +#define SID_SORT_USERDEF (SC_PARAM_START+4) +#define SID_SORT_NATURALSORT (SC_PARAM_START+5) // Resourcen ------------------------------------------------------------- -#define RID_OBJECTBAR_APP (SC_RESOURCE_START) -#define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) -#define RID_OBJECTBAR_INPUT (SC_RESOURCE_START+2) -#define RID_POPUP_CELLS (SC_RESOURCE_START+3) -#define RID_POPUP_DRAW (SC_RESOURCE_START+4) -#define RID_TEXT_TOOLBOX (SC_RESOURCE_START+5) -#define RID_OBJECTBAR_PREVIEW (SC_RESOURCE_START+6) -#define RID_POPUP_PREVIEW (SC_RESOURCE_START+7) -#define RID_POPUP_OLE (SC_RESOURCE_START+8) -#define RID_POPUP_CHART (SC_RESOURCE_START+9) -//#define RID_ANCHORBITMAP (SC_RESOURCE_START+10) -//#define RID_GRAYANCHORBITMAP (SC_RESOURCE_START+11) -#define RID_OUTLINEBITMAPS (SC_RESOURCE_START+12) -#define RID_DRAW_WIN (SC_RESOURCE_START+13) -#define RID_CNTRLR_WIN (SC_RESOURCE_START+14) +#define RID_OBJECTBAR_APP (SC_RESOURCE_START) +#define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) +#define RID_OBJECTBAR_INPUT (SC_RESOURCE_START+2) +#define RID_POPUP_CELLS (SC_RESOURCE_START+3) +#define RID_POPUP_DRAW (SC_RESOURCE_START+4) +#define RID_TEXT_TOOLBOX (SC_RESOURCE_START+5) +#define RID_OBJECTBAR_PREVIEW (SC_RESOURCE_START+6) +#define RID_POPUP_PREVIEW (SC_RESOURCE_START+7) +#define RID_POPUP_OLE (SC_RESOURCE_START+8) +#define RID_POPUP_CHART (SC_RESOURCE_START+9) +//#define RID_ANCHORBITMAP (SC_RESOURCE_START+10) +//#define RID_GRAYANCHORBITMAP (SC_RESOURCE_START+11) +#define RID_OUTLINEBITMAPS (SC_RESOURCE_START+12) +#define RID_DRAW_WIN (SC_RESOURCE_START+13) +#define RID_CNTRLR_WIN (SC_RESOURCE_START+14) #define RID_GLOBSTR (SC_RESOURCE_START+15) -#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19) -#define RID_SCFUNCTIONS (SC_RESOURCE_START+20) -#define RID_POPUP_PIVOT (SC_RESOURCE_START+21) +#define RID_ALIGNMENT_WIN (SC_RESOURCE_START+19) +#define RID_SCFUNCTIONS (SC_RESOURCE_START+20) +#define RID_POPUP_PIVOT (SC_RESOURCE_START+21) #define RID_IMGLIST_INPUTWIN (SC_RESOURCE_START+22) -#define RID_ERRHDLSC (SC_RESOURCE_START+23) -#define RID_POPUP_GRAPHIC (SC_RESOURCE_START+24) -#define RID_POPUP_DRAWTEXT (SC_RESOURCE_START+29) -#define RID_MN_FORMAT_ALGN (SC_RESOURCE_START+30) -#define RID_MN_FORMAT_STYLE (SC_RESOURCE_START+31) -#define RID_MN_FORMAT_LINESPACE (SC_RESOURCE_START+32) -#define RID_POPUP_EDIT (SC_RESOURCE_START+33) -#define RID_POPUP_AUDIT (SC_RESOURCE_START+34) -#define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35) +#define RID_ERRHDLSC (SC_RESOURCE_START+23) +#define RID_POPUP_GRAPHIC (SC_RESOURCE_START+24) +#define RID_POPUP_DRAWTEXT (SC_RESOURCE_START+29) +#define RID_MN_FORMAT_ALGN (SC_RESOURCE_START+30) +#define RID_MN_FORMAT_STYLE (SC_RESOURCE_START+31) +#define RID_MN_FORMAT_LINESPACE (SC_RESOURCE_START+32) +#define RID_POPUP_EDIT (SC_RESOURCE_START+33) +#define RID_POPUP_AUDIT (SC_RESOURCE_START+34) +#define RID_OBJECTBAR_TOOLS (SC_RESOURCE_START+35) // free // free -#define RID_TBXCTL_INSERT (SC_RESOURCE_START+38) -#define RID_TBXCTL_INSCELLS (SC_RESOURCE_START+39) -#define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) +#define RID_TBXCTL_INSERT (SC_RESOURCE_START+38) +#define RID_TBXCTL_INSCELLS (SC_RESOURCE_START+39) +#define RID_TBXCTL_INSOBJ (SC_RESOURCE_START+40) // free // free -#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) -#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) -#define RID_POPUP_CONTROL (SC_RESOURCE_START+45) -#define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) +#define RID_SC_FUNCTION_DESCRIPTIONS1 (SC_RESOURCE_START+43) +#define RID_SC_FUNCTION_DESCRIPTIONS2 (SC_RESOURCE_START+44) +#define RID_POPUP_CONTROL (SC_RESOURCE_START+45) +#define RID_POPUP_PAGEBREAK (SC_RESOURCE_START+46) // free -#define RID_POPUP_DRAWFORM (SC_RESOURCE_START+48) -#define RID_SC_ADDIN_ROT13 (SC_RESOURCE_START+50) -#define RID_SC_ADDIN_DFA (SC_RESOURCE_START+51) -#define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52) -#define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53) -#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54) +#define RID_POPUP_DRAWFORM (SC_RESOURCE_START+48) +#define RID_SC_ADDIN_ROT13 (SC_RESOURCE_START+50) +#define RID_SC_ADDIN_DFA (SC_RESOURCE_START+51) +#define RID_IMAGELIST_NAVCONT (SC_RESOURCE_START+52) +#define RID_DRAW_OBJECTBAR (SC_RESOURCE_START+53) +#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54) // free // free -#define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) +#define RID_IMAGELIST_H_NAVCONT (SC_RESOURCE_START+57) #define RID_OUTLINEBITMAPS_H (SC_RESOURCE_START+58) -#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60) -#define RID_POPUP_MEDIA (SC_RESOURCE_START+61) -#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62) +#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60) +#define RID_POPUP_MEDIA (SC_RESOURCE_START+61) +#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62) #define STR_START (SC_RESOURCE_START+100) -#define STR_ROWHEIGHT (STR_START) -#define STR_ROWHEIGHT_TITLE (STR_START + 1) -#define STR_OPT_ROWHEIGHT (STR_START + 2) -#define STR_OPT_ROWHEIGHT_TITLE (STR_START + 3) -#define STR_COLWIDTH (STR_START + 4) -#define STR_COLWIDTH_TITLE (STR_START + 5) -#define STR_OPT_COLWIDTH (STR_START + 6) -#define STR_OPT_COLWIDTH_TITLE (STR_START + 7) -#define SCSTR_UNDEFINED (STR_START + 8) -#define SCSTR_NONAME (STR_START + 9) -#define SCSTR_NONE (STR_START + 10) -#define SCSTR_EMPTY (STR_START + 11) -#define SCSTR_NOTEMPTY (STR_START + 12) +#define STR_ROWHEIGHT (STR_START) +#define STR_ROWHEIGHT_TITLE (STR_START + 1) +#define STR_OPT_ROWHEIGHT (STR_START + 2) +#define STR_OPT_ROWHEIGHT_TITLE (STR_START + 3) +#define STR_COLWIDTH (STR_START + 4) +#define STR_COLWIDTH_TITLE (STR_START + 5) +#define STR_OPT_COLWIDTH (STR_START + 6) +#define STR_OPT_COLWIDTH_TITLE (STR_START + 7) +#define SCSTR_UNDEFINED (STR_START + 8) +#define SCSTR_NONAME (STR_START + 9) +#define SCSTR_NONE (STR_START + 10) +#define SCSTR_EMPTY (STR_START + 11) +#define SCSTR_NOTEMPTY (STR_START + 12) #define SCSTR_COLUMN (STR_START + 13) #define SCSTR_ROW (STR_START + 14) #define SCSTR_NEW (STR_START + 15) @@ -1205,76 +1205,76 @@ #define SCSTR_REMOVE (STR_START + 17) #define SCSTR_CANCEL (STR_START + 18) #define SCSTR_MODIFY (STR_START + 19) -#define SCSTR_SHOWTABLE (STR_START + 20) -#define SCSTR_HIDDENTABLES (STR_START + 21) -#define SCSTR_SELECTDB (STR_START + 22) -#define SCSTR_AREAS (STR_START + 23) -#define SCSTR_TABLE (STR_START + 24) -#define SCSTR_NAME (STR_START + 25) -#define SCSTR_INSTABLE (STR_START + 26) -#define SCSTR_APDTABLE (STR_START + 27) -#define SCSTR_RENAMETAB (STR_START + 28) -#define STR_INSERTGRAPHIC (STR_START + 29) +#define SCSTR_SHOWTABLE (STR_START + 20) +#define SCSTR_HIDDENTABLES (STR_START + 21) +#define SCSTR_SELECTDB (STR_START + 22) +#define SCSTR_AREAS (STR_START + 23) +#define SCSTR_TABLE (STR_START + 24) +#define SCSTR_NAME (STR_START + 25) +#define SCSTR_INSTABLE (STR_START + 26) +#define SCSTR_APDTABLE (STR_START + 27) +#define SCSTR_RENAMETAB (STR_START + 28) +#define STR_INSERTGRAPHIC (STR_START + 29) //#define STR_BASIC_IDE (STR_START + 30) -#define SCSTR_APPLICATION (STR_START + 31) -#define SCSTR_DOCSHELL (STR_START + 32) -#define SCSTR_TABVIEWSHELL (STR_START + 33) -#define SCSTR_EDITSHELL (STR_START + 34) -#define SCSTR_DRAWSHELL (STR_START + 35) -#define SCSTR_DRAWTEXTSHELL (STR_START + 36) +#define SCSTR_APPLICATION (STR_START + 31) +#define SCSTR_DOCSHELL (STR_START + 32) +#define SCSTR_TABVIEWSHELL (STR_START + 33) +#define SCSTR_EDITSHELL (STR_START + 34) +#define SCSTR_DRAWSHELL (STR_START + 35) +#define SCSTR_DRAWTEXTSHELL (STR_START + 36) #define SCSTR_NEWTABLE (STR_START + 37) -#define SCSTR_PREVIEWSHELL (STR_START + 38) +#define SCSTR_PREVIEWSHELL (STR_START + 38) -#define SCSTR_PROTECTDOC (STR_START + 39) -#define SCSTR_UNPROTECTDOC (STR_START + 40) -#define SCSTR_PROTECTTAB (STR_START + 41) -#define SCSTR_UNPROTECTTAB (STR_START + 42) -#define SCSTR_PASSWORD (STR_START + 43) -#define SCSTR_PASSWORDOPT (STR_START + 44) -#define SCSTR_WRONGPASSWORD (STR_START + 45) +#define SCSTR_PROTECTDOC (STR_START + 39) +#define SCSTR_UNPROTECTDOC (STR_START + 40) +#define SCSTR_PROTECTTAB (STR_START + 41) +#define SCSTR_UNPROTECTTAB (STR_START + 42) +#define SCSTR_PASSWORD (STR_START + 43) +#define SCSTR_PASSWORDOPT (STR_START + 44) +#define SCSTR_WRONGPASSWORD (STR_START + 45) -#define SCSTR_PIVOTSHELL (STR_START + 46) -#define SCSTR_END (STR_START + 47) -#define SCSTR_STAT_PRINT (STR_START + 48) +#define SCSTR_PIVOTSHELL (STR_START + 46) +#define SCSTR_END (STR_START + 47) +#define SCSTR_STAT_PRINT (STR_START + 48) #define SCSTR_UNKNOWN (STR_START + 49) #define SCSTR_CHAR_ATTRS (STR_START + 50) -#define SCSTR_ALL (STR_START + 51) -#define SCSTR_STDFILTER (STR_START + 52) +#define SCSTR_ALL (STR_START + 51) +#define SCSTR_STDFILTER (STR_START + 52) // Cfg-Item-Namen #define SCSTR_CFG_APP (STR_START + 53) #define SCSTR_CFG_DOC (STR_START + 54) #define SCSTR_CFG_VIEW (STR_START + 55) #define SCSTR_CFG_SPELLCHECK (STR_START + 56) -#define SCSTR_CFG_PRINT (STR_START + 57) +#define SCSTR_CFG_PRINT (STR_START + 57) -#define SCSTR_AUDITSHELL (STR_START + 58) +#define SCSTR_AUDITSHELL (STR_START + 58) -#define SCSTR_CHARSET_USER (STR_START + 59) -#define SCSTR_COLUMN_USER (STR_START + 60) -#define SCSTR_FIELDSEP (STR_START + 61) -#define SCSTR_TEXTSEP (STR_START + 62) +#define SCSTR_CHARSET_USER (STR_START + 59) +#define SCSTR_COLUMN_USER (STR_START + 60) +#define SCSTR_FIELDSEP (STR_START + 61) +#define SCSTR_TEXTSEP (STR_START + 62) -#define SCSTR_30_APPLICATION (STR_START + 63) -#define SCSTR_30_LONG_DOCNAME (STR_START + 64) +#define SCSTR_30_APPLICATION (STR_START + 63) +#define SCSTR_30_LONG_DOCNAME (STR_START + 64) -#define SCSTR_CFG_INPUT (STR_START + 65) +#define SCSTR_CFG_INPUT (STR_START + 65) -#define SCSTR_TOP10FILTER (STR_START + 66) +#define SCSTR_TOP10FILTER (STR_START + 66) #define SCSTR_CFG_NAVIPI (STR_START + 67) -#define SCSTR_40_APPLICATION (STR_START + 68) -#define SCSTR_40_LONG_DOCNAME (STR_START + 69) +#define SCSTR_40_APPLICATION (STR_START + 68) +#define SCSTR_40_LONG_DOCNAME (STR_START + 69) -#define SCSTR_DRAWFORMSHELL (STR_START + 70) -#define SCSTR_CELLSHELL (STR_START + 71) -#define SCSTR_FORMATSHELL (STR_START + 72) -#define SCSTR_OLEOBJECTSHELL (STR_START + 73) -#define SCSTR_CHARTSHELL (STR_START + 74) -#define SCSTR_GRAPHICSHELL (STR_START + 75) -#define SCSTR_PAGEBREAKSHELL (STR_START + 76) +#define SCSTR_DRAWFORMSHELL (STR_START + 70) +#define SCSTR_CELLSHELL (STR_START + 71) +#define SCSTR_FORMATSHELL (STR_START + 72) +#define SCSTR_OLEOBJECTSHELL (STR_START + 73) +#define SCSTR_CHARTSHELL (STR_START + 74) +#define SCSTR_GRAPHICSHELL (STR_START + 75) +#define SCSTR_PAGEBREAKSHELL (STR_START + 76) #define SCSTR_GRFILTER_OPENERROR (STR_START + 77) #define SCSTR_GRFILTER_IOERROR (STR_START + 78) @@ -1284,13 +1284,13 @@ #define SCSTR_GRFILTER_TOOBIG (STR_START + 82) #define SCSTR_UNDO_GRAFFILTER (STR_START + 83) -#define SCSTR_50_APPLICATION (STR_START + 84) -#define SCSTR_50_LONG_DOCNAME (STR_START + 85) +#define SCSTR_50_APPLICATION (STR_START + 84) +#define SCSTR_50_LONG_DOCNAME (STR_START + 85) #define SCSTR_CHG_PROTECT (STR_START + 86) #define SCSTR_CHG_UNPROTECT (STR_START + 87) // #98185# -#define STR_CAPTION_DEFAULT_TEXT (STR_START + 88) +#define STR_CAPTION_DEFAULT_TEXT (STR_START + 88) // dialog: Select Sheets #define STR_DLG_SELECTTABLES_TITLE (STR_START + 89) @@ -1307,19 +1307,19 @@ // Items -#define SCSTR_HOR_JUSTIFY_LEFT (STR_START + 100) -#define SCSTR_HOR_JUSTIFY_CENTER (STR_START + 101) -#define SCSTR_HOR_JUSTIFY_RIGHT (STR_START + 102) -#define SCSTR_HOR_JUSTIFY_BLOCK (STR_START + 103) -#define SCSTR_HOR_JUSTIFY_REPEAT (STR_START + 104) -#define SCSTR_HOR_JUSTIFY_STANDARD (STR_START + 105) -#define SCSTR_VER_JUSTIFY_TOP (STR_START + 106) -#define SCSTR_VER_JUSTIFY_CENTER (STR_START + 107) -#define SCSTR_VER_JUSTIFY_BOTTOM (STR_START + 108) -#define SCSTR_VER_JUSTIFY_STANDARD (STR_START + 109) -#define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110) -#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111) -#define SCSTR_ORIENTATION_STANDARD (STR_START + 112) +#define SCSTR_HOR_JUSTIFY_LEFT (STR_START + 100) +#define SCSTR_HOR_JUSTIFY_CENTER (STR_START + 101) +#define SCSTR_HOR_JUSTIFY_RIGHT (STR_START + 102) +#define SCSTR_HOR_JUSTIFY_BLOCK (STR_START + 103) +#define SCSTR_HOR_JUSTIFY_REPEAT (STR_START + 104) +#define SCSTR_HOR_JUSTIFY_STANDARD (STR_START + 105) +#define SCSTR_VER_JUSTIFY_TOP (STR_START + 106) +#define SCSTR_VER_JUSTIFY_CENTER (STR_START + 107) +#define SCSTR_VER_JUSTIFY_BOTTOM (STR_START + 108) +#define SCSTR_VER_JUSTIFY_STANDARD (STR_START + 109) +#define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110) +#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111) +#define SCSTR_ORIENTATION_STANDARD (STR_START + 112) // Accessibility ------------------------------------ @@ -1372,34 +1372,34 @@ #define SCSTR_SHORT_SCDOC_NAME (STR_START + 211) #define SCSTR_LONG_SCDOC_NAME (STR_START + 212) -#define SCSTR_CLPBRD_CLEAR (STR_START + 213) +#define SCSTR_CLPBRD_CLEAR (STR_START + 213) -#define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214) +#define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214) -#define SCSTR_RENAMEOBJECT (STR_START + 215) +#define SCSTR_RENAMEOBJECT (STR_START + 215) #define SCSTR_PRINT_OPTIONS (STR_START+216) // Navigator - in der Reihenfolge wie SC_CONTENT_... -#define SCSTR_CONTENT_ROOT (STR_START + 250) -#define SCSTR_CONTENT_TABLE (STR_START + 251) -#define SCSTR_CONTENT_RANGENAME (STR_START + 252) -#define SCSTR_CONTENT_DBAREA (STR_START + 253) -#define SCSTR_CONTENT_GRAPHIC (STR_START + 254) -#define SCSTR_CONTENT_OLEOBJECT (STR_START + 255) -#define SCSTR_CONTENT_NOTE (STR_START + 256) -#define SCSTR_CONTENT_AREALINK (STR_START + 257) -#define SCSTR_CONTENT_DRAWING (STR_START + 258) -// hier ein wenig Platz fuer Erweiterungen +#define SCSTR_CONTENT_ROOT (STR_START + 250) +#define SCSTR_CONTENT_TABLE (STR_START + 251) +#define SCSTR_CONTENT_RANGENAME (STR_START + 252) +#define SCSTR_CONTENT_DBAREA (STR_START + 253) +#define SCSTR_CONTENT_GRAPHIC (STR_START + 254) +#define SCSTR_CONTENT_OLEOBJECT (STR_START + 255) +#define SCSTR_CONTENT_NOTE (STR_START + 256) +#define SCSTR_CONTENT_AREALINK (STR_START + 257) +#define SCSTR_CONTENT_DRAWING (STR_START + 258) +// hier ein wenig Platz fuer Erweiterungen // Eingabezeile, Quickhelp-Strings (HelpText jetzt per HelpId aus Hilfe) -#define SCSTR_QHELP_INPUTWND (STR_START + 307) -#define SCSTR_QHELP_POSWND (STR_START + 308) -#define SCSTR_QHELP_BTNCALC (STR_START + 309) -#define SCSTR_QHELP_BTNOK (STR_START + 310) -#define SCSTR_QHELP_BTNCANCEL (STR_START + 311) -#define SCSTR_QHELP_BTNSUM (STR_START + 312) -#define SCSTR_QHELP_BTNEQUAL (STR_START + 313) +#define SCSTR_QHELP_INPUTWND (STR_START + 307) +#define SCSTR_QHELP_POSWND (STR_START + 308) +#define SCSTR_QHELP_BTNCALC (STR_START + 309) +#define SCSTR_QHELP_BTNOK (STR_START + 310) +#define SCSTR_QHELP_BTNCANCEL (STR_START + 311) +#define SCSTR_QHELP_BTNSUM (STR_START + 312) +#define SCSTR_QHELP_BTNEQUAL (STR_START + 313) // Validator #define SCSTR_VALID_MINIMUM (STR_START + 314) @@ -1409,22 +1409,22 @@ #define SCSTR_VALID_LIST (STR_START + 318) // Formulator -#define SCSTR_FUDB (STR_START + 389) -#define SCSTR_FUDATE (STR_START + 390) -#define SCSTR_FUFIN (STR_START + 391) -#define SCSTR_FUINFO (STR_START + 392) -#define SCSTR_FULOG (STR_START + 393) -#define SCSTR_FUMATHS (STR_START + 394) -#define SCSTR_FUSTAT (STR_START + 395) -#define SCSTR_FUTAB (STR_START + 396) -#define SCSTR_FUTEXT (STR_START + 397) +#define SCSTR_FUDB (STR_START + 389) +#define SCSTR_FUDATE (STR_START + 390) +#define SCSTR_FUFIN (STR_START + 391) +#define SCSTR_FUINFO (STR_START + 392) +#define SCSTR_FULOG (STR_START + 393) +#define SCSTR_FUMATHS (STR_START + 394) +#define SCSTR_FUSTAT (STR_START + 395) +#define SCSTR_FUTAB (STR_START + 396) +#define SCSTR_FUTEXT (STR_START + 397) // #define SCSTR_COMPILER_STRINGS (STR_START + 398) #define SCSTR_FILTER_STRINGS (STR_START + 399) #define SCSTR_COMPILER_INTL_STR (STR_START + 400) // Media shell -#define SCSTR_MEDIASHELL (STR_START + 401) +#define SCSTR_MEDIASHELL (STR_START + 401) #define RID_SCSTR_ONCLICK (STR_START + 402) @@ -1433,25 +1433,25 @@ #define STR_END (SCSTR_NO_TAB_BG_COLOR) -#define BMP_START (STR_END) +#define BMP_START (STR_END) // Navigator // not used anymore: RID_BMP_EXPAND, RID_BMP_COLLAPSE //#define RID_BMP_EXPAND (BMP_START) //#define RID_BMP_COLLAPSE (BMP_START + 1) -#define RID_IMG_DROP_URL (BMP_START + 2) -#define RID_IMG_DROP_LINK (BMP_START + 3) -#define RID_IMG_DROP_COPY (BMP_START + 4) -#define RID_IMG_H_DROP_URL (BMP_START + 5) -#define RID_IMG_H_DROP_LINK (BMP_START + 6) -#define RID_IMG_H_DROP_COPY (BMP_START + 7) +#define RID_IMG_DROP_URL (BMP_START + 2) +#define RID_IMG_DROP_LINK (BMP_START + 3) +#define RID_IMG_DROP_COPY (BMP_START + 4) +#define RID_IMG_H_DROP_URL (BMP_START + 5) +#define RID_IMG_H_DROP_LINK (BMP_START + 6) +#define RID_IMG_H_DROP_COPY (BMP_START + 7) #define RID_IMG_SELECT_CURRENT (BMP_START + 8) #define RID_IMG_UNSELECT_CURRENT (BMP_START + 9) #define RID_SCPTR_PIVOTCOL (BMP_START + 81) #define RID_SCPTR_PIVOTROW (BMP_START + 82) #define RID_SCPTR_DETECTIVE (BMP_START + 83) -#define RID_SCPTR_CHART (BMP_START + 84) +#define RID_SCPTR_CHART (BMP_START + 84) #define RID_SCICN_DOCUMENT (BMP_START + 95) #define RID_SCICN_TEMPLATE (BMP_START + 96) @@ -1459,26 +1459,26 @@ #define BMP_END (BMP_START + 100) -#define SC_DIALOGS_START (BMP_END) -#define RID_SCDLG_ATTR (SC_DIALOGS_START) -#define RID_SCPAGE_NUMBER (SC_DIALOGS_START + 1) -#define RID_SCPAGE_ALIGNMENT (SC_DIALOGS_START + 2) -#define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3) -#define RID_SCDLG_SORT (SC_DIALOGS_START + 5) -#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6) -#define RID_SCPAGE_SORT_OPTIONS (SC_DIALOGS_START + 7) -#define RID_SCDLG_FILTER (SC_DIALOGS_START + 8) -#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9) -#define RID_SCMISCDLGS (SC_DIALOGS_START + 10) -#define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11) -#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) -#define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13) -#define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14) -#define RID_SCDLG_MOVETAB (SC_DIALOGS_START + 15) -#define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16) -#define RID_SCDLG_MTRINPUT (SC_DIALOGS_START + 17) -#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18) -#define RID_SCDLG_FILLSERIES (SC_DIALOGS_START + 19) +#define SC_DIALOGS_START (BMP_END) +#define RID_SCDLG_ATTR (SC_DIALOGS_START) +#define RID_SCPAGE_NUMBER (SC_DIALOGS_START + 1) +#define RID_SCPAGE_ALIGNMENT (SC_DIALOGS_START + 2) +#define RID_SCPAGE_PROTECTION (SC_DIALOGS_START + 3) +#define RID_SCDLG_SORT (SC_DIALOGS_START + 5) +#define RID_SCPAGE_SORT_FIELDS (SC_DIALOGS_START + 6) +#define RID_SCPAGE_SORT_OPTIONS (SC_DIALOGS_START + 7) +#define RID_SCDLG_FILTER (SC_DIALOGS_START + 8) +#define RID_SCDLG_SPEC_FILTER (SC_DIALOGS_START + 9) +#define RID_SCMISCDLGS (SC_DIALOGS_START + 10) +#define RID_SCDLG_DELCELL (SC_DIALOGS_START + 11) +#define RID_SCDLG_INSCELL (SC_DIALOGS_START + 12) +#define RID_SCDLG_DELCONT (SC_DIALOGS_START + 13) +#define RID_SCDLG_INSCONT (SC_DIALOGS_START + 14) +#define RID_SCDLG_MOVETAB (SC_DIALOGS_START + 15) +#define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16) +#define RID_SCDLG_MTRINPUT (SC_DIALOGS_START + 17) +#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18) +#define RID_SCDLG_FILLSERIES (SC_DIALOGS_START + 19) #define RID_SCDLG_AUTOFORMAT (SC_DIALOGS_START + 20) #define RID_SCDLG_GROUP (SC_DIALOGS_START + 21) #define RID_SCDLG_NAMES (SC_DIALOGS_START + 22) @@ -1486,137 +1486,137 @@ #define RID_SCDLG_PRINTOPTIONS (SC_DIALOGS_START + 24) #define RID_SCPAGE_PRINTOPTIONS (SC_DIALOGS_START + 25) #define RID_SCDLG_SOLVER (SC_DIALOGS_START + 26) -#define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27) -#define RID_SUBTBASE (SC_DIALOGS_START + 28) -#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29) +#define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27) +#define RID_SUBTBASE (SC_DIALOGS_START + 28) +#define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29) #define RID_SCDLG_OPTIONS (SC_DIALOGS_START + 30) #define RID_SCPAGE_USERLISTS (SC_DIALOGS_START + 31) #define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33) #define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34) #define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35) #define RID_SCTBXWND_SCENARIO (SC_DIALOGS_START + 36) -#define RID_SCDLG_FORMULATOR (SC_DIALOGS_START + 37) +#define RID_SCDLG_FORMULATOR (SC_DIALOGS_START + 37) #define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38) #define RID_SCDLG_NEWSCENARIO (SC_DIALOGS_START + 39) -#define RID_SCDLG_FORMULA (SC_DIALOGS_START + 40) +#define RID_SCDLG_FORMULA (SC_DIALOGS_START + 40) #define RID_SCDLG_ARGUMENTS (SC_DIALOGS_START + 41) #define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42) #define RID_SCPAGE_TABLE (SC_DIALOGS_START + 43) #define RID_SCPAGE_AREAS (SC_DIALOGS_START + 44) -#define RID_SCDLG_STYLES_START (SC_DIALOGS_START + 45) -#define RID_SCDLG_STYLES_CHAR (SC_DIALOGS_START + 45) -#define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46) -#define RID_SCDLG_STYLES_FRAME (SC_DIALOGS_START + 47) -#define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48) -#define RID_SCDLG_STYLES_END (SC_DIALOGS_START + 48) -#define RID_HFBASE (SC_DIALOGS_START + 49) -#define RID_SCDLG_HFEDIT (SC_DIALOGS_START + 50) +#define RID_SCDLG_STYLES_START (SC_DIALOGS_START + 45) +#define RID_SCDLG_STYLES_CHAR (SC_DIALOGS_START + 45) +#define RID_SCDLG_STYLES_PAR (SC_DIALOGS_START + 46) +#define RID_SCDLG_STYLES_FRAME (SC_DIALOGS_START + 47) +#define RID_SCDLG_STYLES_PAGE (SC_DIALOGS_START + 48) +#define RID_SCDLG_STYLES_END (SC_DIALOGS_START + 48) +#define RID_HFBASE (SC_DIALOGS_START + 49) +#define RID_SCDLG_HFEDIT (SC_DIALOGS_START + 50) #define RID_SCDLG_HFEDIT_ALL (SC_DIALOGS_START + 51) #define RID_SCDLG_HFED_HEADER (SC_DIALOGS_START + 52) -#define RID_SCDLG_HFED_FOOTER (SC_DIALOGS_START + 53) +#define RID_SCDLG_HFED_FOOTER (SC_DIALOGS_START + 53) #define RID_SCBTN_HFEDIT (SC_DIALOGS_START + 54) -#define RID_SCPAGE_VIEW (SC_DIALOGS_START + 55) -#define RID_SCPAGE_CALC (SC_DIALOGS_START + 56) -#define RID_SCDLG_NAVIGATOR (SC_DIALOGS_START + 57) -#define RID_SCDLG_TABOP (SC_DIALOGS_START + 58) -#define RID_SCDLG_IMPORTOPT (SC_DIALOGS_START + 59) +#define RID_SCPAGE_VIEW (SC_DIALOGS_START + 55) +#define RID_SCPAGE_CALC (SC_DIALOGS_START + 56) +#define RID_SCDLG_NAVIGATOR (SC_DIALOGS_START + 57) +#define RID_SCDLG_TABOP (SC_DIALOGS_START + 58) +#define RID_SCDLG_IMPORTOPT (SC_DIALOGS_START + 59) #define RID_POPUP_ROWHEADER (SC_DIALOGS_START + 60) #define RID_POPUP_COLHEADER (SC_DIALOGS_START + 61) #define RID_SCDLG_HFEDIT_SHDR (SC_DIALOGS_START + 62) #define RID_SCDLG_HFEDIT_SFTR (SC_DIALOGS_START + 63) -#define RID_SCDLG_HFEDIT_LEFTHEADER (SC_DIALOGS_START + 64) +#define RID_SCDLG_HFEDIT_LEFTHEADER (SC_DIALOGS_START + 64) #define RID_SCDLG_HFEDIT_RIGHTHEADER (SC_DIALOGS_START + 65) -#define RID_SCDLG_HFEDIT_LEFTFOOTER (SC_DIALOGS_START + 66) -#define RID_SCDLG_HFEDIT_RIGHTFOOTER (SC_DIALOGS_START + 67) -#define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68) -#define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69) -#define RID_SCPAGE_PRINT (SC_DIALOGS_START + 70) +#define RID_SCDLG_HFEDIT_LEFTFOOTER (SC_DIALOGS_START + 66) +#define RID_SCDLG_HFEDIT_RIGHTFOOTER (SC_DIALOGS_START + 67) +#define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68) +#define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69) +#define RID_SCPAGE_PRINT (SC_DIALOGS_START + 70) #define RID_SCDLG_COLORROW (SC_DIALOGS_START + 71) #define RID_SCDLG_NAMES_PASTE (SC_DIALOGS_START + 72) #define RID_SCDLG_NAMES_CREATE (SC_DIALOGS_START + 73) #define RID_SCDLG_NAMES_APPLY (SC_DIALOGS_START + 74) //NYI -#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76) -#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77) -//#define RID_SCDLG_CHARTRANGE (SC_DIALOGS_START + 78) +#define RID_SCDLG_CHAR (SC_DIALOGS_START + 76) +#define RID_SCDLG_PARAGRAPH (SC_DIALOGS_START + 77) +//#define RID_SCDLG_CHARTRANGE (SC_DIALOGS_START + 78) -#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79) -#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80) -#define RID_SCDLG_AREAS (SC_DIALOGS_START + 81) +#define RID_SCPAGE_STAT (SC_DIALOGS_START + 79) +#define RID_SCDLG_CHARTCOLROW (SC_DIALOGS_START + 80) +#define RID_SCDLG_AREAS (SC_DIALOGS_START + 81) -#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82) +#define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82) - // Popup fuer Statusbar-Controller -#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83) -#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84) -#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85) -#define RID_SUMCTL_MAX (SC_DIALOGS_START + 86) -#define RID_SUMCTL_COUNT (SC_DIALOGS_START + 87) -#define RID_SUMCTL_COUNT2 (SC_DIALOGS_START + 88) -#define RID_SUMCTL_AVG (SC_DIALOGS_START + 89) -#define RID_SUMCTL_NONE (SC_DIALOGS_START + 90) + // Popup fuer Statusbar-Controller +#define RID_POPUP_SUMCTL (SC_DIALOGS_START + 83) +#define RID_SUMCTL_SUM (SC_DIALOGS_START + 84) +#define RID_SUMCTL_MIN (SC_DIALOGS_START + 85) +#define RID_SUMCTL_MAX (SC_DIALOGS_START + 86) +#define RID_SUMCTL_COUNT (SC_DIALOGS_START + 87) +#define RID_SUMCTL_COUNT2 (SC_DIALOGS_START + 88) +#define RID_SUMCTL_AVG (SC_DIALOGS_START + 89) +#define RID_SUMCTL_NONE (SC_DIALOGS_START + 90) -#define RID_SCDLG_ASCII (SC_DIALOGS_START + 91) +#define RID_SCDLG_ASCII (SC_DIALOGS_START + 91) - // Popup fuer Drop-Modus im Navigator -#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92) -#define RID_DROPMODE_URL (SC_DIALOGS_START + 93) -#define RID_DROPMODE_LINK (SC_DIALOGS_START + 94) -#define RID_DROPMODE_COPY (SC_DIALOGS_START + 95) -#define RID_SCDLG_CONDFORMAT (SC_DIALOGS_START + 96) + // Popup fuer Drop-Modus im Navigator +#define RID_POPUP_DROPMODE (SC_DIALOGS_START + 92) +#define RID_DROPMODE_URL (SC_DIALOGS_START + 93) +#define RID_DROPMODE_LINK (SC_DIALOGS_START + 94) +#define RID_DROPMODE_COPY (SC_DIALOGS_START + 95) +#define RID_SCDLG_CONDFORMAT (SC_DIALOGS_START + 96) -#define RID_SCPAGE_SUBT_GROUP1 (SC_DIALOGS_START + 97) -#define RID_SCPAGE_SUBT_GROUP2 (SC_DIALOGS_START + 98) -#define RID_SCPAGE_SUBT_GROUP3 (SC_DIALOGS_START + 99) +#define RID_SCPAGE_SUBT_GROUP1 (SC_DIALOGS_START + 97) +#define RID_SCPAGE_SUBT_GROUP2 (SC_DIALOGS_START + 98) +#define RID_SCPAGE_SUBT_GROUP3 (SC_DIALOGS_START + 99) -#define RID_SCPAGE_HFED_HL (SC_DIALOGS_START + 100) -#define RID_SCPAGE_HFED_HR (SC_DIALOGS_START + 101) -#define RID_SCPAGE_HFED_FL (SC_DIALOGS_START + 102) -#define RID_SCPAGE_HFED_FR (SC_DIALOGS_START + 103) +#define RID_SCPAGE_HFED_HL (SC_DIALOGS_START + 100) +#define RID_SCPAGE_HFED_HR (SC_DIALOGS_START + 101) +#define RID_SCPAGE_HFED_FL (SC_DIALOGS_START + 102) +#define RID_SCPAGE_HFED_FR (SC_DIALOGS_START + 103) // Ableitungen von RID_SCDLG_MTRINPUT -#define RID_SCDLG_COL_MAN (SC_DIALOGS_START + 104) -#define RID_SCDLG_COL_OPT (SC_DIALOGS_START + 105) -#define RID_SCDLG_ROW_MAN (SC_DIALOGS_START + 106) -#define RID_SCDLG_ROW_OPT (SC_DIALOGS_START + 107) +#define RID_SCDLG_COL_MAN (SC_DIALOGS_START + 104) +#define RID_SCDLG_COL_OPT (SC_DIALOGS_START + 105) +#define RID_SCDLG_ROW_MAN (SC_DIALOGS_START + 106) +#define RID_SCDLG_ROW_OPT (SC_DIALOGS_START + 107) // Ableitungen von RID_SCDLG_SELENTRY -#define RID_SCDLG_SELECTDB (SC_DIALOGS_START + 108) -#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) +#define RID_SCDLG_SELECTDB (SC_DIALOGS_START + 108) +#define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) // Ableitungen von RID_SCDLG_GROUP -#define RID_SCDLG_GRP_MAKE (SC_DIALOGS_START + 110) -#define RID_SCDLG_GRP_KILL (SC_DIALOGS_START + 111) +#define RID_SCDLG_GRP_MAKE (SC_DIALOGS_START + 110) +#define RID_SCDLG_GRP_KILL (SC_DIALOGS_START + 111) -#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112) +#define RID_SCDLG_COLROWNAMERANGES (SC_DIALOGS_START + 112) -#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113) +#define RID_SCPAGE_CONTENT (SC_DIALOGS_START + 113) #define RID_SCPAGE_LAYOUT (SC_DIALOGS_START + 114) -#define RID_SCPAGE_INPUT (SC_DIALOGS_START + 115) +#define RID_SCPAGE_INPUT (SC_DIALOGS_START + 115) -#define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116) -#define RID_SCTAB_FUNCTION (SC_DIALOGS_START + 117) -#define RID_SCTAB_STRUCT (SC_DIALOGS_START + 118) +#define RID_SCTAB_PARAMETER (SC_DIALOGS_START + 116) +#define RID_SCTAB_FUNCTION (SC_DIALOGS_START + 117) +#define RID_SCTAB_STRUCT (SC_DIALOGS_START + 118) -#define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119) +#define RID_SCDLG_CHANGES (SC_DIALOGS_START + 119) -#define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120) -#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121) -#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122) +#define RID_POPUP_NAVIPI_SCENARIO (SC_DIALOGS_START + 120) +#define RID_NAVIPI_SCENARIO_DELETE (SC_DIALOGS_START + 121) +#define RID_NAVIPI_SCENARIO_EDIT (SC_DIALOGS_START + 122) -#define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123) -#define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124) +#define RID_SCDLG_HIGHLIGHT_CHANGES (SC_DIALOGS_START + 123) +#define RID_SCPAGE_OPREDLINE (SC_DIALOGS_START + 124) -#define RID_SCDLG_SIMPLEREF (SC_DIALOGS_START + 125) -#define WID_SIMPLE_REF (SC_DIALOGS_START + 126) -#define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) -#define RID_SCPAGE_OPTLOAD (SC_DIALOGS_START + 128) +#define RID_SCDLG_SIMPLEREF (SC_DIALOGS_START + 125) +#define WID_SIMPLE_REF (SC_DIALOGS_START + 126) +#define RID_POPUP_CHANGES (SC_DIALOGS_START + 127) +#define RID_SCPAGE_OPTLOAD (SC_DIALOGS_START + 128) -#define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129) -#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) -#define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) +#define RID_SCDLG_DAPITYPE (SC_DIALOGS_START + 129) +#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) +#define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) -#define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) +#define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) #define RID_SCDLG_DPDATAFIELD (SC_DIALOGS_START + 133) #define RID_SCDLG_DPSUBTOTAL_OPT (SC_DIALOGS_START + 134) #define RID_SCDLG_DPNUMGROUP (SC_DIALOGS_START + 135) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 57d0fd43f179..e880df8b5402 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,24 +90,24 @@ public: class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg { public: - virtual void GetValues( ScImportSourceDesc& rDesc ) = 0; + virtual void GetValues( ScImportSourceDesc& rDesc ) = 0; }; class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog //add for ScDataPilotSourceTypeDlg { public: - virtual BOOL IsDatabase() const = 0; - virtual BOOL IsExternal() const = 0; + virtual BOOL IsDatabase() const = 0; + virtual BOOL IsExternal() const = 0; }; class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg { public: - virtual String GetServiceName() const = 0; - virtual String GetParSource() const = 0 ; - virtual String GetParName() const = 0 ; - virtual String GetParUser() const = 0; - virtual String GetParPass() const = 0; + virtual String GetServiceName() const = 0; + virtual String GetParSource() const = 0 ; + virtual String GetParName() const = 0 ; + virtual String GetParUser() const = 0; + virtual String GetParPass() const = 0; }; class AbstractScDeleteCellDlg : public VclAbstractDialog //add for ScDeleteCellDlg @@ -125,21 +125,21 @@ class AbstractScDataFormDlg : public VclAbstractDialog //add for ScDeleteCellDl class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg { public: - virtual void DisableObjects() = 0 ; - virtual USHORT GetDelContentsCmdBits() const = 0; + virtual void DisableObjects() = 0 ; + virtual USHORT GetDelContentsCmdBits() const = 0; }; class AbstractScFillSeriesDlg: public VclAbstractDialog //add for ScFillSeriesDlg { public: - virtual FillDir GetFillDir() const = 0; - virtual FillCmd GetFillCmd() const = 0; - virtual FillDateCmd GetFillDateCmd() const = 0; - virtual double GetStart() const = 0; - virtual double GetStep() const = 0; - virtual double GetMax() const = 0; - virtual String GetStartStr() const = 0; - virtual void SetEdStartValEnabled(BOOL bFlag=FALSE) = 0; + virtual FillDir GetFillDir() const = 0; + virtual FillCmd GetFillCmd() const = 0; + virtual FillDateCmd GetFillDateCmd() const = 0; + virtual double GetStart() const = 0; + virtual double GetStep() const = 0; + virtual double GetMax() const = 0; + virtual String GetStartStr() const = 0; + virtual void SetEdStartValEnabled(BOOL bFlag=FALSE) = 0; }; class AbstractScGroupDlg : public VclAbstractDialog //add for ScGroupDlg @@ -157,28 +157,28 @@ public: class AbstractScInsertContentsDlg : public VclAbstractDialog //add for ScInsertContentsDlg { public: - virtual USHORT GetInsContentsCmdBits() const = 0; - virtual USHORT GetFormulaCmdBits() const = 0 ; - virtual BOOL IsSkipEmptyCells() const = 0; - virtual BOOL IsLink() const = 0; - virtual void SetFillMode( BOOL bSet ) = 0; - virtual void SetOtherDoc( BOOL bSet ) = 0; - virtual BOOL IsTranspose() const = 0; - virtual void SetChangeTrack( BOOL bSet ) = 0; - virtual void SetCellShiftDisabled( int nDisable ) = 0; - virtual InsCellCmd GetMoveMode() = 0; + virtual USHORT GetInsContentsCmdBits() const = 0; + virtual USHORT GetFormulaCmdBits() const = 0 ; + virtual BOOL IsSkipEmptyCells() const = 0; + virtual BOOL IsLink() const = 0; + virtual void SetFillMode( BOOL bSet ) = 0; + virtual void SetOtherDoc( BOOL bSet ) = 0; + virtual BOOL IsTranspose() const = 0; + virtual void SetChangeTrack( BOOL bSet ) = 0; + virtual void SetCellShiftDisabled( int nDisable ) = 0; + virtual InsCellCmd GetMoveMode() = 0; }; class AbstractScInsertTableDlg : public VclAbstractDialog //add for ScInsertTableDlg { public: - virtual BOOL GetTablesFromFile() = 0; - virtual BOOL GetTablesAsLink() = 0; - virtual const String* GetFirstTable( USHORT* pN = NULL ) = 0; - virtual ScDocShell* GetDocShellTables() = 0; - virtual BOOL IsTableBefore() = 0; - virtual USHORT GetTableCount() = 0; - virtual const String* GetNextTable( USHORT* pN = NULL ) = 0; + virtual BOOL GetTablesFromFile() = 0; + virtual BOOL GetTablesAsLink() = 0; + virtual const String* GetFirstTable( USHORT* pN = NULL ) = 0; + virtual ScDocShell* GetDocShellTables() = 0; + virtual BOOL IsTableBefore() = 0; + virtual USHORT GetTableCount() = 0; + virtual const String* GetNextTable( USHORT* pN = NULL ) = 0; }; @@ -191,14 +191,14 @@ public: class AbstractScLinkedAreaDlg : public VclAbstractDialog2 //add for ScLinkedAreaDlg { public: - virtual void InitFromOldLink( const String& rFile, const String& rFilter, + virtual void InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, ULONG nRefresh ) = 0; - virtual String GetURL() = 0; - virtual String GetFilter() = 0; // may be empty - virtual String GetOptions() = 0; // filter options - virtual String GetSource() = 0; // separated by ";" - virtual ULONG GetRefresh() = 0; // 0 if disabled + virtual String GetURL() = 0; + virtual String GetFilter() = 0; // may be empty + virtual String GetOptions() = 0; // filter options + virtual String GetSource() = 0; // separated by ";" + virtual ULONG GetRefresh() = 0; // 0 if disabled }; class AbstractScMetricInputDlg : public VclAbstractDialog //add for ScMetricInputDlg @@ -210,29 +210,29 @@ public: class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDlg { public: - virtual USHORT GetSelectedDocument () const = 0; - virtual USHORT GetSelectedTable () const = 0; - virtual BOOL GetCopyTable () const = 0; - virtual void SetCopyTable (BOOL bFlag=TRUE) = 0; - virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0; + virtual USHORT GetSelectedDocument () const = 0; + virtual USHORT GetSelectedTable () const = 0; + virtual BOOL GetCopyTable () const = 0; + virtual void SetCopyTable (BOOL bFlag=TRUE) = 0; + virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0; }; class AbstractScNameCreateDlg : public VclAbstractDialog //add for ScNameCreateDlg { public: - virtual USHORT GetFlags() const = 0; + virtual USHORT GetFlags() const = 0; }; class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg { public: - virtual String GetSelectedName() const = 0; + virtual String GetSelectedName() const = 0; }; class AbstractScPivotFilterDlg : public VclAbstractDialog //add for ScPivotFilterDlg { public: - virtual const ScQueryItem& GetOutputItem() = 0; + virtual const ScQueryItem& GetOutputItem() = 0; }; class AbstractScDPFunctionDlg : public VclAbstractDialog //add for ScDPFunctionDlg @@ -283,9 +283,9 @@ class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg { public: virtual void Insert( const String& rString, BOOL bSelected ) = 0; - virtual USHORT GetSelectEntryCount() const = 0; + virtual USHORT GetSelectEntryCount() const = 0; virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ) = 0; - virtual String GetSelectEntry(USHORT nPos) const = 0; + virtual String GetSelectEntry(USHORT nPos) const = 0; virtual USHORT GetSelectEntryPos(USHORT nPos) const = 0; }; @@ -318,16 +318,16 @@ public: class ScAbstractDialogFactory { public: - SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); + SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg SvStream* pInStream, int nId, sal_Unicode cSep = '\t') = 0; virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ) = 0; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg - ScAutoFormat* pAutoFormat, + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc, int nId) = 0; @@ -336,11 +336,11 @@ public: BOOL bCol = FALSE, BOOL bRow = FALSE) = 0; - virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg - const String& rStrTitle, - const String& rStrLabel, + virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg + const String& rStrTitle, + const String& rStrLabel, int nId, - BOOL bColDefault = TRUE ) = 0; + BOOL bColDefault = TRUE ) = 0; virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg @@ -357,53 +357,53 @@ public: virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg USHORT nCheckDefaults = 0 ) = 0; - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg - ScDocument& rDocument, - FillDir eFillDir, - FillCmd eFillCmd, - FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir, + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg + ScDocument& rDocument, + FillDir eFillDir, + FillCmd eFillCmd, + FillDateCmd eFillDateCmd, + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir, int nId) = 0; virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg - USHORT nResId, + USHORT nResId, int nId, - BOOL bUnGroup = FALSE, - BOOL bRows = TRUE ) = 0; + BOOL bUnGroup = FALSE, + BOOL bRows = TRUE ) = 0; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg int nId, BOOL bDisallowCellMove = FALSE ) = 0; - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg int nId, - USHORT nCheckDefaults = 0, - const String* pStrTitle = NULL ) = 0; + USHORT nCheckDefaults = 0, + const String* pStrTitle = NULL ) = 0; virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData, //add for ScInsertTableDlg SCTAB nTabCount, bool bFromFile, int nId) = 0; virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg - USHORT nResId, + USHORT nResId, const String& aTitle, const String& aLbTitle, - List& aEntryList, + List& aEntryList, int nId ) = 0; virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg - USHORT nResId, // Ableitung fuer jeden Dialog! - long nCurrent, - long nDefault, + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg + USHORT nResId, // Ableitung fuer jeden Dialog! + long nCurrent, + long nDefault, int nId , - FieldUnit eFUnit = FUNIT_MM, - USHORT nDecimals = 2, - long nMaximum = 1000, - long nMinimum = 0, - long nFirst = 1, + FieldUnit eFUnit = FUNIT_MM, + USHORT nDecimals = 2, + long nMaximum = 1000, + long nMinimum = 0, + long nFirst = 1, long nLast = 100 ) = 0; virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ) = 0; //add for ScMoveTableDlg @@ -414,7 +414,7 @@ public: int nId , BOOL bInsList=TRUE ) = 0; virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg - const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) = 0; + const SfxItemSet& rArgSet, USHORT nSourceTab , int nId ) = 0; virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, const ScDPLabelDataVec& rLabelVec, @@ -461,34 +461,34 @@ public: ULONG nHelpId , int nId ) = 0; - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, BOOL bAscii = TRUE, - const ScImportOptions* pOptions = NULL, - const String* pStrTitle = NULL, + const ScImportOptions* pOptions = NULL, + const String* pStrTitle = NULL, BOOL bMultiByte = FALSE, BOOL bOnlyDbtoolsEncodings = FALSE, BOOL bImport = TRUE ) = 0; - virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg - Window* pParent, + virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg + Window* pParent, const SfxItemSet* pCellAttrs, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg - Window* pParent, - const SfxItemSet& rCoreSet, - const String& rPageStyle, + virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg + Window* pParent, + const SfxItemSet& rCoreSet, + const String& rPageStyle, int nId, - USHORT nResId = RID_SCDLG_HFEDIT ) = 0; + USHORT nResId = RID_SCDLG_HFEDIT ) = 0; - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg - SfxStyleSheetBase& rStyleBase, - USHORT nRscId, + virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg + SfxStyleSheetBase& rStyleBase, + USHORT nRscId, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg - const SfxItemSet* pArgSet, + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg + const SfxItemSet* pArgSet, int nId) = 0; virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg @@ -499,16 +499,16 @@ public: //<!--Modified by PengYunQuan for Validity Cell Range Picker //virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg - // const SfxItemSet* pArgSet,int nId ) = 0; + // const SfxItemSet* pArgSet,int nId ) = 0; virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0; //-->Modified by PengYunQuan for Validity Cell Range Picker - virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg + virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg const SfxItemSet* pArgSet,int nId ) = 0; // for tabpage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; + virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; + virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; }; #endif diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 5691dc0b8fb9..6423815b2520 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ class SfxFilter; class ScDLL -/* [Description] +/* [Description] This class is a wrapper for a Load-On-Demand-DLL. One instance per SfxApplication will be created for the runtime of @@ -60,15 +60,15 @@ public: ~ScDLL(); // static-init/exit-code must be linked to the application - static void LibInit(); // called from SfxApplication-subclass::Init() - static void LibExit(); // called from SfxApplication-subclass::Exit() - static void PreExit(); // muss vor LibExit gerufen werden + static void LibInit(); // called from SfxApplication-subclass::Init() + static void LibExit(); // called from SfxApplication-subclass::Exit() + static void PreExit(); // muss vor LibExit gerufen werden // DLL-init/exit-code must be linked to the DLL only - static void Init(); // called directly after loading the DLL - static void Exit(); // called directly befor unloading the DLL + static void Init(); // called directly after loading the DLL + static void Exit(); // called directly befor unloading the DLL - static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, + static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx index 735f7ba12970..b85868c06ea8 100644 --- a/sc/inc/scerrors.hxx +++ b/sc/inc/scerrors.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx index 9319b7da71fc..e54537d82c75 100644 --- a/sc/inc/scextopt.hxx +++ b/sc/inc/scextopt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 8188deca5f40..e32c0e3181ed 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,304 +26,304 @@ ************************************************************************/ #include "sc.hrc" -#define ID_FUNCTION_GRP_DATABASE 1 -#define ID_FUNCTION_GRP_DATETIME 2 -#define ID_FUNCTION_GRP_FINANZ 3 -#define ID_FUNCTION_GRP_INFO 4 -#define ID_FUNCTION_GRP_LOGIC 5 -#define ID_FUNCTION_GRP_MATH 6 -#define ID_FUNCTION_GRP_MATRIX 7 -#define ID_FUNCTION_GRP_STATISTIC 8 -#define ID_FUNCTION_GRP_TABLE 9 -#define ID_FUNCTION_GRP_TEXT 10 -#define ID_FUNCTION_GRP_ADDINS 11 +#define ID_FUNCTION_GRP_DATABASE 1 +#define ID_FUNCTION_GRP_DATETIME 2 +#define ID_FUNCTION_GRP_FINANZ 3 +#define ID_FUNCTION_GRP_INFO 4 +#define ID_FUNCTION_GRP_LOGIC 5 +#define ID_FUNCTION_GRP_MATH 6 +#define ID_FUNCTION_GRP_MATRIX 7 +#define ID_FUNCTION_GRP_STATISTIC 8 +#define ID_FUNCTION_GRP_TABLE 9 +#define ID_FUNCTION_GRP_TEXT 10 +#define ID_FUNCTION_GRP_ADDINS 11 -#define ID_FUNCTION_OFFSET 90 +#define ID_FUNCTION_OFFSET 90 -// ID zaehlt ab 1, Hilfe-IDs muessen aber bei HID_SC_FUNC_START anfangen -#define HID_SC_FUNC_DUMMY (HID_SC_FUNC_START-ID_FUNCTION_OFFSET) +// ID zaehlt ab 1, Hilfe-IDs muessen aber bei HID_SC_FUNC_START anfangen +#define HID_SC_FUNC_DUMMY (HID_SC_FUNC_START-ID_FUNCTION_OFFSET) -#define HID_FUNC_DBANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DBANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_DBMITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_DBAUSZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_DBMAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_DBMIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_DBPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_DBSTDABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_DBSTDABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DBSUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_DBVARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_DBVARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_DBANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_DBANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_DBMITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_DBAUSZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_DBMAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_DBMIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_DBPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_DBSTDABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_DBSTDABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_DBSUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_DBVARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_DBVARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_DATUM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DATWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_TAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_TAGE360 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_STUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_MINUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_MONAT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_JETZT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SEKUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZEITWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_HEUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WOCHENTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_JAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_TAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_KALENDERWOCHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_OSTERSONNTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_DATUM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_DATWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_TAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_TAGE360 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_STUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_MINUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_MONAT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_JETZT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_SEKUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_ZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_ZEITWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_HEUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_WOCHENTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_JAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_TAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_KALENDERWOCHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_OSTERSONNTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_BW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ZW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZZR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_RMZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZINS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_KAPZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_KUMKAPITAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_KUMZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_LIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_GDA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_GDA2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VDB (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_EFFEKTIV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_NOMINAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_NBW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_IKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LAUFZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ZGZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_QIKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ISPMT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_BW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_ZW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ZZR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_RMZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ZINS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_ZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_KAPZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_KUMKAPITAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_KUMZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_DIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_LIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_GDA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_GDA2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_VDB (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_EFFEKTIV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_NOMINAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_NBW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_IKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_LAUFZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_ZGZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_QIKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_ISPMT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_ISTBEZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ISTFEHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ISTFEHLER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_ISTLEER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ISTLOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ISTNV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ISTKTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_ISTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ISTZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ISTFORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_N (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_NV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_AKTUELL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ZELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_INFO (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_ISTBEZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_ISTFEHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ISTFEHLER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_ISTLEER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ISTLOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_ISTNV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_ISTKTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_ISTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_ISTZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_ISTFORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_N (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_NV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_TYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_AKTUELL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_FORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_ZELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_INFO (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_FALSCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_NICHT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_WENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ODER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_UND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_FALSCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_NICHT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_WAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_WENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ODER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_UND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ABS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_POTENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ANZAHLLEEREZELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_PI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_SUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_QUADRATESUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_PRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ZAEHLENWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_WURZEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZUFALLSZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_ISTGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_ISTUNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_KOMBINATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_KOMBINATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ARCCOS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_ARCSIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_ARCOSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_ARSINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ARCCOT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_ARCTAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ARCOTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_ARTANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_COS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_SIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_COT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_TAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_COSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_SINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_COTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_TANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_ARCTAN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_DEG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_RAD (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_EXP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_LOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_LN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_LOG10 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_FAKULTAET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_REST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_VORZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_TEILERGEBNIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GANZZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_KUERZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_RUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_AUFRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_ABRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_GERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_UNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_OBERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_UNTERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_GGT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_KGV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_UMRECHNEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+54) +#define HID_FUNC_ABS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_POTENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ANZAHLLEEREZELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_PI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_SUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_QUADRATESUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_PRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_SUMMEWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_ZAEHLENWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_WURZEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_ZUFALLSZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_ISTGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_ISTUNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_KOMBINATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_KOMBINATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_ARCCOS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_ARCSIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_ARCOSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_ARSINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_ARCCOT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_ARCTAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_ARCOTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_ARTANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+23) +#define HID_FUNC_COS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+24) +#define HID_FUNC_SIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+25) +#define HID_FUNC_COT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+26) +#define HID_FUNC_TAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+27) +#define HID_FUNC_COSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+28) +#define HID_FUNC_SINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+29) +#define HID_FUNC_COTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+30) +#define HID_FUNC_TANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+31) +#define HID_FUNC_ARCTAN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+32) +#define HID_FUNC_DEG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+33) +#define HID_FUNC_RAD (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+34) +#define HID_FUNC_EXP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+35) +#define HID_FUNC_LOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+36) +#define HID_FUNC_LN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+37) +#define HID_FUNC_LOG10 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+38) +#define HID_FUNC_FAKULTAET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+39) +#define HID_FUNC_REST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+40) +#define HID_FUNC_VORZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+41) +#define HID_FUNC_TEILERGEBNIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+42) +#define HID_FUNC_GANZZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+43) +#define HID_FUNC_KUERZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+44) +#define HID_FUNC_RUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+45) +#define HID_FUNC_AUFRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+46) +#define HID_FUNC_ABRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+47) +#define HID_FUNC_GERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+48) +#define HID_FUNC_UNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+49) +#define HID_FUNC_OBERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+50) +#define HID_FUNC_UNTERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+51) +#define HID_FUNC_GGT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+52) +#define HID_FUNC_KGV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+53) +#define HID_FUNC_UMRECHNEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+54) #define HID_FUNC_EUROCONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+55) -#define HID_FUNC_MTRANS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_MMULT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MDET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_EINHEITSMATRIX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SUMMENPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_SUMMEX2MY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEX2PY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SUMMEXMY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_HAEUFIGKEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_RGP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_RKP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TREND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VARIATION (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_MTRANS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_MMULT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_MDET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_MINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_EINHEITSMATRIX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_SUMMENPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_SUMMEX2MY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_SUMMEX2PY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_SUMMEXMY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_HAEUFIGKEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_RGP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_RKP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_TREND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_VARIATION (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_ANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_VARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_STABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_STABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_MITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_SUMQUADABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_MITTELABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_SCHIEFE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_KURT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_GEOMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_HARMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_MODALWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_MEDIAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_QUANTIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_QUARTILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_KGROESSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_KKLEINSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_QUANTILSRANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_RANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_GESTUTZTMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_WAHRSCHBEREICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_B (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_PHI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_GAUSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_FISHER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_FISHERINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_BINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_NEGBINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_KRITBINOM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_POISSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_NORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_NORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_STANDNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_STANDNORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_LOGNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_LOGINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_EXPONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_GAMMAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GAMMAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_GAMMALN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_BETAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_BETAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_WEIBULL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_HYPGEOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_TVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_TINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_FVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_FINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_CHIVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_CHIINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+54) -#define HID_FUNC_STANDARDISIERUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+55) -#define HID_FUNC_VARIATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+56) -#define HID_FUNC_VARIATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+57) -#define HID_FUNC_KONFIDENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+58) -#define HID_FUNC_GTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+59) -#define HID_FUNC_CHITEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+60) -#define HID_FUNC_FTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+61) -#define HID_FUNC_TTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+62) -#define HID_FUNC_BESTIMMTHEITSMASS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+63) -#define HID_FUNC_ACHSENABSCHNITT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+64) -#define HID_FUNC_STEIGUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+65) -#define HID_FUNC_STFEHLERYX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+66) -#define HID_FUNC_PEARSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+67) -#define HID_FUNC_KORREL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+68) -#define HID_FUNC_KOVAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+69) -#define HID_FUNC_SCHAETZER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+70) -#define HID_FUNC_MINA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+71) -#define HID_FUNC_MAXA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+72) -#define HID_FUNC_MITTELWERTA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+73) -#define HID_FUNC_STABWA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+74) -#define HID_FUNC_STABWNA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+75) -#define HID_FUNC_VARIANZA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+76) -#define HID_FUNC_VARIANZENA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+77) +#define HID_FUNC_ANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_ANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_MAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_MIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_VARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_VARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_STABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_STABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_MITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_SUMQUADABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_MITTELABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_SCHIEFE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_KURT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_GEOMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_HARMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_MODALWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_MEDIAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_QUANTIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_QUARTILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_KGROESSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_KKLEINSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_QUANTILSRANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_RANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+23) +#define HID_FUNC_GESTUTZTMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+24) +#define HID_FUNC_WAHRSCHBEREICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+25) +#define HID_FUNC_B (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+26) +#define HID_FUNC_PHI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+27) +#define HID_FUNC_GAUSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+28) +#define HID_FUNC_FISHER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+29) +#define HID_FUNC_FISHERINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+30) +#define HID_FUNC_BINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+31) +#define HID_FUNC_NEGBINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+32) +#define HID_FUNC_KRITBINOM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+33) +#define HID_FUNC_POISSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+34) +#define HID_FUNC_NORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+35) +#define HID_FUNC_NORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+36) +#define HID_FUNC_STANDNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+37) +#define HID_FUNC_STANDNORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+38) +#define HID_FUNC_LOGNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+39) +#define HID_FUNC_LOGINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+40) +#define HID_FUNC_EXPONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+41) +#define HID_FUNC_GAMMAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+42) +#define HID_FUNC_GAMMAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+43) +#define HID_FUNC_GAMMALN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+44) +#define HID_FUNC_BETAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+45) +#define HID_FUNC_BETAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+46) +#define HID_FUNC_WEIBULL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+47) +#define HID_FUNC_HYPGEOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+48) +#define HID_FUNC_TVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+49) +#define HID_FUNC_TINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+50) +#define HID_FUNC_FVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+51) +#define HID_FUNC_FINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+52) +#define HID_FUNC_CHIVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+53) +#define HID_FUNC_CHIINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+54) +#define HID_FUNC_STANDARDISIERUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+55) +#define HID_FUNC_VARIATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+56) +#define HID_FUNC_VARIATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+57) +#define HID_FUNC_KONFIDENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+58) +#define HID_FUNC_GTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+59) +#define HID_FUNC_CHITEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+60) +#define HID_FUNC_FTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+61) +#define HID_FUNC_TTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+62) +#define HID_FUNC_BESTIMMTHEITSMASS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+63) +#define HID_FUNC_ACHSENABSCHNITT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+64) +#define HID_FUNC_STEIGUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+65) +#define HID_FUNC_STFEHLERYX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+66) +#define HID_FUNC_PEARSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+67) +#define HID_FUNC_KORREL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+68) +#define HID_FUNC_KOVAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+69) +#define HID_FUNC_SCHAETZER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+70) +#define HID_FUNC_MINA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+71) +#define HID_FUNC_MAXA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+72) +#define HID_FUNC_MITTELWERTA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+73) +#define HID_FUNC_STABWA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+74) +#define HID_FUNC_STABWNA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+75) +#define HID_FUNC_VARIANZA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+76) +#define HID_FUNC_VARIANZENA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+77) #define HID_FUNC_CHISQDIST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+78) #define HID_FUNC_CHISQINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+79) #define HID_FUNC_GAMMA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+80) -#define HID_FUNC_ADRESSE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_BEREICHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SPALTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZEILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SPALTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ZEILEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_WVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_INDEX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_INDIREKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_VERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_VERGLEICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VERSCHIEBUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FEHLERTYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_VORLAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_DDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_TABELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_ADRESSE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_BEREICHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_WAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_SPALTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_ZEILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_SPALTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_ZEILEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_WVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_SVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_INDEX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_INDIREKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_VERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_VERGLEICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_VERSCHIEBUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_FEHLERTYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_VORLAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_DDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_TABELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) #define HID_FUNC_GETPIVOTDATA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SAEUBERN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VERKETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_IDENTISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_FINDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUCHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_GLAETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_GROSS2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_GROSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_KLEIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_TEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_T (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ERSETZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_FEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_LAENGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LINKS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_RECHTS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_TEIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_WIEDERHOLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_WECHSELN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_BASIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_DEZIMAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_ROEMISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_ARABISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+27) +#define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) +#define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) +#define HID_FUNC_ZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+3) +#define HID_FUNC_SAEUBERN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+4) +#define HID_FUNC_VERKETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+5) +#define HID_FUNC_IDENTISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_FINDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+7) +#define HID_FUNC_SUCHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+8) +#define HID_FUNC_GLAETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+9) +#define HID_FUNC_GROSS2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+10) +#define HID_FUNC_GROSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+11) +#define HID_FUNC_KLEIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_WERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+13) +#define HID_FUNC_TEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_T (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+15) +#define HID_FUNC_ERSETZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+16) +#define HID_FUNC_FEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_LAENGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+18) +#define HID_FUNC_LINKS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+19) +#define HID_FUNC_RECHTS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+20) +#define HID_FUNC_TEIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_WIEDERHOLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_WECHSELN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+23) +#define HID_FUNC_BASIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+24) +#define HID_FUNC_DEZIMAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+25) +#define HID_FUNC_ROEMISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+26) +#define HID_FUNC_ARABISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+27) #define HID_FUNC_BAHTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+28) #define HID_FUNC_JIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+29) #define HID_FUNC_ASC (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+30) diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index aad354ac3475..846da3358325 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,24 +31,24 @@ #include <svx/svxids.hrc> -// EditEngine darf nicht ihre eigenen ITEMID's definieren +// EditEngine darf nicht ihre eigenen ITEMID's definieren #define _EEITEMID_HXX //-------------------------- // Item-IDs fuer UI-MsgPool: //-------------------------- -//! sollten auch nach unter 1000 verschoben werden! +//! sollten auch nach unter 1000 verschoben werden! -#define MSGPOOL_START 1100 +#define MSGPOOL_START 1100 //-------------------------------------- -#define SCITEM_STRING 1100 -#define SCITEM_SEARCHDATA 1101 -#define SCITEM_SORTDATA 1102 -#define SCITEM_QUERYDATA 1103 -#define SCITEM_SUBTDATA 1104 +#define SCITEM_STRING 1100 +#define SCITEM_SEARCHDATA 1101 +#define SCITEM_SORTDATA 1102 +#define SCITEM_QUERYDATA 1103 +#define SCITEM_SUBTDATA 1104 #define SCITEM_CONSOLIDATEDATA 1105 -#define SCITEM_PIVOTDATA 1106 +#define SCITEM_PIVOTDATA 1106 #define SCITEM_SOLVEDATA 1107 #define SCITEM_USERLIST 1108 #define SCITEM_PRINTWARN 1109 @@ -58,50 +58,50 @@ //------------------------- // Item-IDs fuer Attribute: //------------------------- -#define ATTR_STARTINDEX 100 // Anfang Attribute - -#define ATTR_PATTERN_START 100 // Anfang Zellattribut-Pattern - -#define ATTR_FONT 100 // Anfang Zellattribute -#define ATTR_FONT_HEIGHT 101 -#define ATTR_FONT_WEIGHT 102 -#define ATTR_FONT_POSTURE 103 -#define ATTR_FONT_UNDERLINE 104 -#define ATTR_FONT_OVERLINE 105 -#define ATTR_FONT_CROSSEDOUT 106 -#define ATTR_FONT_CONTOUR 107 -#define ATTR_FONT_SHADOWED 108 -#define ATTR_FONT_COLOR 109 -#define ATTR_FONT_LANGUAGE 110 -#define ATTR_CJK_FONT 111 -#define ATTR_CJK_FONT_HEIGHT 112 -#define ATTR_CJK_FONT_WEIGHT 113 -#define ATTR_CJK_FONT_POSTURE 114 -#define ATTR_CJK_FONT_LANGUAGE 115 -#define ATTR_CTL_FONT 116 -#define ATTR_CTL_FONT_HEIGHT 117 -#define ATTR_CTL_FONT_WEIGHT 118 -#define ATTR_CTL_FONT_POSTURE 119 -#define ATTR_CTL_FONT_LANGUAGE 120 -#define ATTR_FONT_EMPHASISMARK 121 -#define ATTR_USERDEF 122 // not saved in binary files -#define ATTR_FONT_WORDLINE 123 -#define ATTR_FONT_RELIEF 124 -#define ATTR_HYPHENATE 125 -#define ATTR_SCRIPTSPACE 126 -#define ATTR_HANGPUNCTUATION 127 -#define ATTR_FORBIDDEN_RULES 128 -#define ATTR_HOR_JUSTIFY 129 +#define ATTR_STARTINDEX 100 // Anfang Attribute + +#define ATTR_PATTERN_START 100 // Anfang Zellattribut-Pattern + +#define ATTR_FONT 100 // Anfang Zellattribute +#define ATTR_FONT_HEIGHT 101 +#define ATTR_FONT_WEIGHT 102 +#define ATTR_FONT_POSTURE 103 +#define ATTR_FONT_UNDERLINE 104 +#define ATTR_FONT_OVERLINE 105 +#define ATTR_FONT_CROSSEDOUT 106 +#define ATTR_FONT_CONTOUR 107 +#define ATTR_FONT_SHADOWED 108 +#define ATTR_FONT_COLOR 109 +#define ATTR_FONT_LANGUAGE 110 +#define ATTR_CJK_FONT 111 +#define ATTR_CJK_FONT_HEIGHT 112 +#define ATTR_CJK_FONT_WEIGHT 113 +#define ATTR_CJK_FONT_POSTURE 114 +#define ATTR_CJK_FONT_LANGUAGE 115 +#define ATTR_CTL_FONT 116 +#define ATTR_CTL_FONT_HEIGHT 117 +#define ATTR_CTL_FONT_WEIGHT 118 +#define ATTR_CTL_FONT_POSTURE 119 +#define ATTR_CTL_FONT_LANGUAGE 120 +#define ATTR_FONT_EMPHASISMARK 121 +#define ATTR_USERDEF 122 // not saved in binary files +#define ATTR_FONT_WORDLINE 123 +#define ATTR_FONT_RELIEF 124 +#define ATTR_HYPHENATE 125 +#define ATTR_SCRIPTSPACE 126 +#define ATTR_HANGPUNCTUATION 127 +#define ATTR_FORBIDDEN_RULES 128 +#define ATTR_HOR_JUSTIFY 129 #define ATTR_HOR_JUSTIFY_METHOD 130 -#define ATTR_INDENT 131 -#define ATTR_VER_JUSTIFY 132 +#define ATTR_INDENT 131 +#define ATTR_VER_JUSTIFY 132 #define ATTR_VER_JUSTIFY_METHOD 133 #define ATTR_STACKED 134 -#define ATTR_ROTATE_VALUE 135 -#define ATTR_ROTATE_MODE 136 -#define ATTR_VERTICAL_ASIAN 137 -#define ATTR_WRITINGDIR 138 -#define ATTR_LINEBREAK 139 +#define ATTR_ROTATE_VALUE 135 +#define ATTR_ROTATE_MODE 136 +#define ATTR_VERTICAL_ASIAN 137 +#define ATTR_WRITINGDIR 138 +#define ATTR_LINEBREAK 139 #define ATTR_SHRINKTOFIT 140 #define ATTR_BORDER_TLBR 141 #define ATTR_BORDER_BLTR 142 @@ -169,26 +169,26 @@ //-------------------------------- // Dummy Slot-IDs fuer Dialoge //-------------------------------- -#define SID_SCATTR_PAGE_NOTES ATTR_PAGE_NOTES -#define SID_SCATTR_PAGE_GRID ATTR_PAGE_GRID -#define SID_SCATTR_PAGE_HEADERS ATTR_PAGE_HEADERS -#define SID_SCATTR_PAGE_CHARTS ATTR_PAGE_CHARTS -#define SID_SCATTR_PAGE_OBJECTS ATTR_PAGE_OBJECTS -#define SID_SCATTR_PAGE_DRAWINGS ATTR_PAGE_DRAWINGS -#define SID_SCATTR_PAGE_TOPDOWN ATTR_PAGE_TOPDOWN -#define SID_SCATTR_PAGE_SCALE ATTR_PAGE_SCALE -#define SID_SCATTR_PAGE_SCALETOPAGES ATTR_PAGE_SCALETOPAGES -#define SID_SCATTR_PAGE_FIRSTPAGENO ATTR_PAGE_FIRSTPAGENO -#define SID_SCATTR_PAGE_PRINTAREA ATTR_PAGE_PRINTAREA -#define SID_SCATTR_PAGE_REPEATROW ATTR_PAGE_REPEATROW -#define SID_SCATTR_PAGE_REPEATCOL ATTR_PAGE_REPEATCOL -#define SID_SCATTR_PAGE_PRINTTABLES ATTR_PAGE_PRINTTABLES -#define SID_SCATTR_PAGE_HEADERLEFT ATTR_PAGE_HEADERLEFT -#define SID_SCATTR_PAGE_FOOTERLEFT ATTR_PAGE_FOOTERLEFT -#define SID_SCATTR_PAGE_HEADERRIGHT ATTR_PAGE_HEADERRIGHT -#define SID_SCATTR_PAGE_FOOTERRIGHT ATTR_PAGE_FOOTERRIGHT -#define SID_SCATTR_PAGE_FORMULAS ATTR_PAGE_FORMULAS -#define SID_SCATTR_PAGE_NULLVALS ATTR_PAGE_NULLVALS +#define SID_SCATTR_PAGE_NOTES ATTR_PAGE_NOTES +#define SID_SCATTR_PAGE_GRID ATTR_PAGE_GRID +#define SID_SCATTR_PAGE_HEADERS ATTR_PAGE_HEADERS +#define SID_SCATTR_PAGE_CHARTS ATTR_PAGE_CHARTS +#define SID_SCATTR_PAGE_OBJECTS ATTR_PAGE_OBJECTS +#define SID_SCATTR_PAGE_DRAWINGS ATTR_PAGE_DRAWINGS +#define SID_SCATTR_PAGE_TOPDOWN ATTR_PAGE_TOPDOWN +#define SID_SCATTR_PAGE_SCALE ATTR_PAGE_SCALE +#define SID_SCATTR_PAGE_SCALETOPAGES ATTR_PAGE_SCALETOPAGES +#define SID_SCATTR_PAGE_FIRSTPAGENO ATTR_PAGE_FIRSTPAGENO +#define SID_SCATTR_PAGE_PRINTAREA ATTR_PAGE_PRINTAREA +#define SID_SCATTR_PAGE_REPEATROW ATTR_PAGE_REPEATROW +#define SID_SCATTR_PAGE_REPEATCOL ATTR_PAGE_REPEATCOL +#define SID_SCATTR_PAGE_PRINTTABLES ATTR_PAGE_PRINTTABLES +#define SID_SCATTR_PAGE_HEADERLEFT ATTR_PAGE_HEADERLEFT +#define SID_SCATTR_PAGE_FOOTERLEFT ATTR_PAGE_FOOTERLEFT +#define SID_SCATTR_PAGE_HEADERRIGHT ATTR_PAGE_HEADERRIGHT +#define SID_SCATTR_PAGE_FOOTERRIGHT ATTR_PAGE_FOOTERRIGHT +#define SID_SCATTR_PAGE_FORMULAS ATTR_PAGE_FORMULAS +#define SID_SCATTR_PAGE_NULLVALS ATTR_PAGE_NULLVALS #define SID_SCATTR_PAGE_SCALETO ATTR_PAGE_SCALETO #endif diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index aed97c697cf8..c3e8a956a6cb 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -178,17 +178,17 @@ public: /** Clone the matrix. */ ScMatrix* Clone() const; - /** Clone the matrix if mbCloneIfConst (immutable) is set, otherwise + /** Clone the matrix if mbCloneIfConst (immutable) is set, otherwise return _this_ matrix, to be assigned to a ScMatrixRef. */ ScMatrix* CloneIfConst(); - /** Set the matrix to (im)mutable for CloneIfConst(), only the interpreter + /** Set the matrix to (im)mutable for CloneIfConst(), only the interpreter should do this and know the consequences. */ inline void SetImmutable( bool bVal ) { mbCloneIfConst = bVal; } - /** + /** * Resize the matrix to specified new dimension. Note that this operation - * clears all stored values. + * clears all stored values. */ void Resize( SCSIZE nC, SCSIZE nR); @@ -345,7 +345,7 @@ public: /// @return <TRUE/> if string or empty or empty path, in fact non-value. BOOL IsString( SCSIZE nC, SCSIZE nR ) const - { + { ValidColRowReplicated( nC, nR ); return mnValType && IsNonValueType( mnValType[ nC * nRowCount + nR ]); } diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index e8f9f2b27bda..179c4a556b97 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include "scdll.hxx" #include <vcl/timer.hxx> #include <svl/lstner.hxx> -#include "global.hxx" // ScInputMode -#include "markdata.hxx" //ScMarkData +#include "global.hxx" // ScInputMode +#include "markdata.hxx" //ScMarkData #include "shellids.hxx" #include <unotools/options.hxx> #include <tools/shl.hxx> @@ -89,28 +89,28 @@ class ScFormEditData; //================================================================== -// for internal Drag&Drop: +// for internal Drag&Drop: -#define SC_DROP_NAVIGATOR 1 -#define SC_DROP_TABLE 2 +#define SC_DROP_NAVIGATOR 1 +#define SC_DROP_TABLE 2 struct ScDragData { - ScTransferObj* pCellTransfer; - ScDrawTransferObj* pDrawTransfer; - - String aLinkDoc; - String aLinkTable; - String aLinkArea; - ScDocument* pJumpLocalDoc; - String aJumpTarget; - String aJumpText; + ScTransferObj* pCellTransfer; + ScDrawTransferObj* pDrawTransfer; + + String aLinkDoc; + String aLinkTable; + String aLinkArea; + ScDocument* pJumpLocalDoc; + String aJumpTarget; + String aJumpText; }; struct ScClipData { - ScTransferObj* pCellClipboard; - ScDrawTransferObj* pDrawClipboard; + ScTransferObj* pCellClipboard; + ScDrawTransferObj* pDrawClipboard; }; //================================================================== @@ -118,31 +118,31 @@ struct ScClipData class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener { - Timer aIdleTimer; - Timer aSpellTimer; - ScDragData aDragData; - ScClipData aClipData; + Timer aIdleTimer; + Timer aSpellTimer; + ScDragData aDragData; + ScClipData aClipData; ScSelectionTransferObj* pSelTransfer; ScMessagePool* pMessagePool; - // globalen InputHandler gibt's nicht mehr, jede View hat einen + // globalen InputHandler gibt's nicht mehr, jede View hat einen ScInputHandler* pRefInputHandler; - ScViewCfg* pViewCfg; - ScDocCfg* pDocCfg; + ScViewCfg* pViewCfg; + ScDocCfg* pDocCfg; ScAppCfg* pAppCfg; - ScInputCfg* pInputCfg; - ScPrintCfg* pPrintCfg; - ScNavipiCfg* pNavipiCfg; + ScInputCfg* pInputCfg; + ScPrintCfg* pPrintCfg; + ScNavipiCfg* pNavipiCfg; ScAddInCfg* pAddInCfg; svtools::ColorConfig* pColorConfig; SvtAccessibilityOptions* pAccessOptions; - SvtCTLOptions* pCTLOptions; + SvtCTLOptions* pCTLOptions; SvtUserOptions* pUserOptions; - SfxErrorHandler* pErrorHdl; - SvxErrorHandler* pSvxErrorHdl; - ScFormEditData* pFormEditData; - USHORT nCurRefDlgId; - BOOL bIsWaterCan; - BOOL bIsInEditCommand; + SfxErrorHandler* pErrorHdl; + SvxErrorHandler* pSvxErrorHdl; + ScFormEditData* pFormEditData; + USHORT nCurRefDlgId; + BOOL bIsWaterCan; + BOOL bIsInEditCommand; BOOL bIsInExecuteDrop; bool mbIsInSharedDocLoading; bool mbIsInSharedDocSaving; @@ -154,129 +154,129 @@ public: SFX_DECL_INTERFACE(SCID_APP) ScModule( SfxObjectFactory* pFact ); - virtual ~ScModule(); + virtual ~ScModule(); - virtual void FillStatusBar(StatusBar &rBar); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); - void DeleteCfg(); + virtual void FillStatusBar(StatusBar &rBar); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + void DeleteCfg(); // von der Applikation verschoben: - DECL_LINK( IdleHandler, Timer* ); // Timer statt idle - DECL_LINK( SpellTimerHdl, Timer* ); + DECL_LINK( IdleHandler, Timer* ); // Timer statt idle + DECL_LINK( SpellTimerHdl, Timer* ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); - void Execute( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ); + void Execute( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ); void HideDisabledSlots( SfxItemSet& rSet ); - void AnythingChanged(); + void AnythingChanged(); - // Drag & Drop: - const ScDragData& GetDragData() const { return aDragData; } - void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); - void ResetDragObject(); - void SetDragLink( const String& rDoc, const String& rTab, const String& rArea ); - void SetDragJump( ScDocument* pLocalDoc, + // Drag & Drop: + const ScDragData& GetDragData() const { return aDragData; } + void SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); + void ResetDragObject(); + void SetDragLink( const String& rDoc, const String& rTab, const String& rArea ); + void SetDragJump( ScDocument* pLocalDoc, const String& rTarget, const String& rText ); - // clipboard: - const ScClipData& GetClipData() const { return aClipData; } - void SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); + // clipboard: + const ScClipData& GetClipData() const { return aClipData; } + void SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); - ScDocument* GetClipDoc(); // called from document - should be removed later + ScDocument* GetClipDoc(); // called from document - should be removed later - // X selection: - ScSelectionTransferObj* GetSelectionTransfer() const { return pSelTransfer; } - void SetSelectionTransfer( ScSelectionTransferObj* pNew ); + // X selection: + ScSelectionTransferObj* GetSelectionTransfer() const { return pSelTransfer; } + void SetSelectionTransfer( ScSelectionTransferObj* pNew ); - void SetWaterCan( BOOL bNew ) { bIsWaterCan = bNew; } - BOOL GetIsWaterCan() const { return bIsWaterCan; } + void SetWaterCan( BOOL bNew ) { bIsWaterCan = bNew; } + BOOL GetIsWaterCan() const { return bIsWaterCan; } - void SetInEditCommand( BOOL bNew ) { bIsInEditCommand = bNew; } - BOOL IsInEditCommand() const { return bIsInEditCommand; } + void SetInEditCommand( BOOL bNew ) { bIsInEditCommand = bNew; } + BOOL IsInEditCommand() const { return bIsInEditCommand; } void SetInExecuteDrop( BOOL bNew ) { bIsInExecuteDrop = bNew; } BOOL IsInExecuteDrop() const { return bIsInExecuteDrop; } // Options: - const ScViewOptions& GetViewOptions (); -SC_DLLPUBLIC const ScDocOptions& GetDocOptions (); -SC_DLLPUBLIC const ScAppOptions& GetAppOptions (); - const ScInputOptions& GetInputOptions (); -SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); - void SetViewOptions ( const ScViewOptions& rOpt ); -SC_DLLPUBLIC void SetDocOptions ( const ScDocOptions& rOpt ); -SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); - void SetInputOptions ( const ScInputOptions& rOpt ); - void SetPrintOptions ( const ScPrintOptions& rOpt ); - void InsertEntryToLRUList(USHORT nFIndex); - void RecentFunctionsChanged(); - - static void GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, + const ScViewOptions& GetViewOptions (); +SC_DLLPUBLIC const ScDocOptions& GetDocOptions (); +SC_DLLPUBLIC const ScAppOptions& GetAppOptions (); + const ScInputOptions& GetInputOptions (); +SC_DLLPUBLIC const ScPrintOptions& GetPrintOptions (); + void SetViewOptions ( const ScViewOptions& rOpt ); +SC_DLLPUBLIC void SetDocOptions ( const ScDocOptions& rOpt ); +SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rOpt ); + void SetInputOptions ( const ScInputOptions& rOpt ); + void SetPrintOptions ( const ScPrintOptions& rOpt ); + void InsertEntryToLRUList(USHORT nFIndex); + void RecentFunctionsChanged(); + + static void GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, BOOL& rAutoSpell ); - static void SetAutoSpellProperty( BOOL bSet ); - static BOOL HasThesaurusLanguage( USHORT nLang ); + static void SetAutoSpellProperty( BOOL bSet ); + static BOOL HasThesaurusLanguage( USHORT nLang ); - USHORT GetOptDigitLanguage(); // from CTL options + USHORT GetOptDigitLanguage(); // from CTL options - ScNavipiCfg& GetNavipiCfg(); + ScNavipiCfg& GetNavipiCfg(); ScAddInCfg& GetAddInCfg(); svtools::ColorConfig& GetColorConfig(); SvtAccessibilityOptions& GetAccessOptions(); - SvtCTLOptions& GetCTLOptions(); + SvtCTLOptions& GetCTLOptions(); SvtUserOptions& GetUserOptions(); - void ModifyOptions( const SfxItemSet& rOptSet ); + void ModifyOptions( const SfxItemSet& rOptSet ); - // InputHandler: - BOOL IsEditMode(); // nicht bei SC_INPUT_TYPE - BOOL IsInputMode(); // auch bei SC_INPUT_TYPE + // InputHandler: + BOOL IsEditMode(); // nicht bei SC_INPUT_TYPE + BOOL IsInputMode(); // auch bei SC_INPUT_TYPE void SetInputMode( ScInputMode eMode ); BOOL InputKeyEvent( const KeyEvent& rKEvt, BOOL bStartEdit = FALSE ); SC_DLLPUBLIC void InputEnterHandler( BYTE nBlockMode = 0 ); void InputCancelHandler(); void InputSelection( EditView* pView ); void InputChanged( EditView* pView ); - ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, BOOL bUseRef = TRUE ); + ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, BOOL bUseRef = TRUE ); - void SetRefInputHdl( ScInputHandler* pNew ); - ScInputHandler* GetRefInputHdl(); + void SetRefInputHdl( ScInputHandler* pNew ); + ScInputHandler* GetRefInputHdl(); - void ViewShellGone(ScTabViewShell* pViewSh); - void ViewShellChanged(); + void ViewShellGone(ScTabViewShell* pViewSh); + void ViewShellChanged(); // Kommunikation mit Funktionsautopilot - void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ); - void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ); - void InputReplaceSelection( const String& rStr ); - String InputGetFormulaStr(); - void ActivateInputWindow( const String* pStr = NULL, + void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ); + void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ); + void InputReplaceSelection( const String& rStr ); + String InputGetFormulaStr(); + void ActivateInputWindow( const String* pStr = NULL, BOOL bMatrix = FALSE ); - void InitFormEditData(); - void ClearFormEditData(); - ScFormEditData* GetFormEditData() { return pFormEditData; } + void InitFormEditData(); + void ClearFormEditData(); + ScFormEditData* GetFormEditData() { return pFormEditData; } - // Referenzeingabe: + // Referenzeingabe: //<!--Added by PengYunQuan for Validity Cell Range Picker - //void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL ); - SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL ); + //void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL ); + SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm = NULL ); //-->Added by PengYunQuan for Validity Cell Range Picker BOOL IsModalMode(SfxObjectShell* pDocSh = NULL); BOOL IsFormulaMode(); BOOL IsRefDialogOpen(); - BOOL IsTableLocked(); - void SetReference( const ScRange& rRef, ScDocument* pDoc, + BOOL IsTableLocked(); + void SetReference( const ScRange& rRef, ScDocument* pDoc, const ScMarkData* pMarkData = NULL ); - void AddRefEntry(); + void AddRefEntry(); void EndReference(); - USHORT GetCurRefDlgId() const { return nCurRefDlgId; } + USHORT GetCurRefDlgId() const { return nCurRefDlgId; } //virtuelle Methoden fuer den Optionendialog - virtual SfxItemSet* CreateItemSet( USHORT nId ); - virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); - virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); + virtual SfxItemSet* CreateItemSet( USHORT nId ); + virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet ); + virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ); void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } bool IsInSharedDocLoading() const { return mbIsInSharedDocLoading; } diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx index 4468d0c07654..bca22886e9ac 100644 --- a/sc/inc/scresid.hxx +++ b/sc/inc/scresid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ class SC_DLLPUBLIC ScResId : public ResId { public: - ScResId( USHORT nId ); // in scdll.cxx + ScResId( USHORT nId ); // in scdll.cxx }; diff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxx index e8c6ff568830..612e52c4bd54 100644 --- a/sc/inc/scwarngs.hxx +++ b/sc/inc/scwarngs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ #define __SCWARNGS_HXX_ #define ERRCODE_SC_EXPORT_WRN_ASCII (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_WRITE | 1) -#define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_READ | 1) +#define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_READ | 1) #endif diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index ef694b83a86b..f3f202a58d73 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index eac87f4cc914..0db3cac6c1a5 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,50 +36,50 @@ class String; class ScDocShell; -//! AutoFormat wirklich hier oder besser global?????? - -#define SC_SERVICE_SHEET 0 -#define SC_SERVICE_URLFIELD 1 -#define SC_SERVICE_PAGEFIELD 2 -#define SC_SERVICE_PAGESFIELD 3 -#define SC_SERVICE_DATEFIELD 4 -#define SC_SERVICE_TIMEFIELD 5 -#define SC_SERVICE_TITLEFIELD 6 -#define SC_SERVICE_FILEFIELD 7 -#define SC_SERVICE_SHEETFIELD 8 -#define SC_SERVICE_CELLSTYLE 9 -#define SC_SERVICE_PAGESTYLE 10 -#define SC_SERVICE_AUTOFORMAT 11 -#define SC_SERVICE_CELLRANGES 12 - -// drawing layer tables -#define SC_SERVICE_GRADTAB 13 -#define SC_SERVICE_HATCHTAB 14 -#define SC_SERVICE_BITMAPTAB 15 -#define SC_SERVICE_TRGRADTAB 16 -#define SC_SERVICE_MARKERTAB 17 -#define SC_SERVICE_DASHTAB 18 -#define SC_SERVICE_NUMRULES 19 - -#define SC_SERVICE_DOCDEFLTS 20 -#define SC_SERVICE_DRAWDEFLTS 21 - -#define SC_SERVICE_DOCSPRSETT 22 -#define SC_SERVICE_DOCCONF 23 - -#define SC_SERVICE_IMAP_RECT 24 -#define SC_SERVICE_IMAP_CIRC 25 -#define SC_SERVICE_IMAP_POLY 26 +//! AutoFormat wirklich hier oder besser global?????? + +#define SC_SERVICE_SHEET 0 +#define SC_SERVICE_URLFIELD 1 +#define SC_SERVICE_PAGEFIELD 2 +#define SC_SERVICE_PAGESFIELD 3 +#define SC_SERVICE_DATEFIELD 4 +#define SC_SERVICE_TIMEFIELD 5 +#define SC_SERVICE_TITLEFIELD 6 +#define SC_SERVICE_FILEFIELD 7 +#define SC_SERVICE_SHEETFIELD 8 +#define SC_SERVICE_CELLSTYLE 9 +#define SC_SERVICE_PAGESTYLE 10 +#define SC_SERVICE_AUTOFORMAT 11 +#define SC_SERVICE_CELLRANGES 12 + +// drawing layer tables +#define SC_SERVICE_GRADTAB 13 +#define SC_SERVICE_HATCHTAB 14 +#define SC_SERVICE_BITMAPTAB 15 +#define SC_SERVICE_TRGRADTAB 16 +#define SC_SERVICE_MARKERTAB 17 +#define SC_SERVICE_DASHTAB 18 +#define SC_SERVICE_NUMRULES 19 + +#define SC_SERVICE_DOCDEFLTS 20 +#define SC_SERVICE_DRAWDEFLTS 21 + +#define SC_SERVICE_DOCSPRSETT 22 +#define SC_SERVICE_DOCCONF 23 + +#define SC_SERVICE_IMAP_RECT 24 +#define SC_SERVICE_IMAP_CIRC 25 +#define SC_SERVICE_IMAP_POLY 26 // #100263# Support creation of GraphicObjectResolver and EmbeddedObjectResolver -#define SC_SERVICE_EXPORT_GOR 27 -#define SC_SERVICE_IMPORT_GOR 28 -#define SC_SERVICE_EXPORT_EOR 29 -#define SC_SERVICE_IMPORT_EOR 30 +#define SC_SERVICE_EXPORT_GOR 27 +#define SC_SERVICE_IMPORT_GOR 28 +#define SC_SERVICE_EXPORT_EOR 29 +#define SC_SERVICE_IMPORT_EOR 30 -#define SC_SERVICE_VALBIND 31 -#define SC_SERVICE_LISTCELLBIND 32 -#define SC_SERVICE_LISTSOURCE 33 +#define SC_SERVICE_VALBIND 31 +#define SC_SERVICE_LISTCELLBIND 32 +#define SC_SERVICE_LISTSOURCE 33 #define SC_SERVICE_CELLADDRESS 34 #define SC_SERVICE_RANGEADDRESS 35 @@ -96,10 +96,10 @@ class ScDocShell; // VBA specific #define SC_SERVICE_VBAOBJECTPROVIDER 40 #define SC_SERVICE_VBACODENAMEPROVIDER 41 -#define SC_SERVICE_VBAGLOBALS 42 +#define SC_SERVICE_VBAGLOBALS 42 #define SC_SERVICE_COUNT 43 -#define SC_SERVICE_INVALID USHRT_MAX +#define SC_SERVICE_INVALID USHRT_MAX class ScServiceProvider @@ -109,7 +109,7 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > MakeInstance( sal_uInt16 nType, ScDocShell* pDocShell ); static ::com::sun::star::uno::Sequence<rtl::OUString> GetAllServiceNames(); - static sal_uInt16 GetProviderType(const String& rServiceName); + static sal_uInt16 GetProviderType(const String& rServiceName); }; diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index e3acc30ceaef..a8739aac3f10 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,8 +57,8 @@ class ScMacroInfo; //------------------------------------------------------------------------ -// object which aggregates all svx shape objects, -// to add own properties +// object which aggregates all svx shape objects, +// to add own properties typedef ::cppu::WeakImplHelper5 < ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XPropertyState @@ -79,7 +79,7 @@ friend ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, BOOL bCreat ::com::sun::star::beans::XPropertyState* pShapePropertyState; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo; com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId; - BOOL bIsTextShape; + BOOL bIsTextShape; bool bInitializedNotifier; SdrObject* GetSdrObject() const throw(); @@ -95,20 +95,20 @@ public: // ctor modifies xShape parameter ScShapeObj( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ); - virtual ~ScShapeObj(); + virtual ~ScShapeObj(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -120,25 +120,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -155,7 +155,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( @@ -165,7 +165,7 @@ public: ::com::sun::star::uno::RuntimeException); // XTextContent - virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< + virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -173,23 +173,23 @@ public: getAnchor(void) throw( ::com::sun::star::uno::RuntimeException ); // XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< + virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -201,11 +201,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -219,7 +219,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 5d305462146e..3669c8bf4de4 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx index 0e0901e8b360..7cce120eb59d 100644 --- a/sc/inc/sheetevents.hxx +++ b/sc/inc/sheetevents.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ public: ScSheetEvents(const ScSheetEvents& rOther); ~ScSheetEvents(); - const ScSheetEvents& operator= (const ScSheetEvents& rOther); + const ScSheetEvents& operator= (const ScSheetEvents& rOther); const rtl::OUString* GetScript(sal_Int32 nEvent) const; void SetScript(sal_Int32 nEvent, const rtl::OUString* pNew); diff --git a/sc/inc/shellids.hxx b/sc/inc/shellids.hxx index b479d4960e9d..5caabed17f6f 100644 --- a/sc/inc/shellids.hxx +++ b/sc/inc/shellids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,25 +30,25 @@ #define SC_SHELLIDS_HXX // Sfx Interface-IDs -#define SCID_APP (SFX_INTERFACE_SC_START+0) -#define SCID_DOC_SHELL (SFX_INTERFACE_SC_START+1) -#define SCID_TABVIEW_SHELL (SFX_INTERFACE_SC_START+2) -#define SCID_TABPOP_SHELL (SFX_INTERFACE_SC_START+3) -#define SCID_EDIT_SHELL (SFX_INTERFACE_SC_START+4) -#define SCID_DRAW_SHELL (SFX_INTERFACE_SC_START+5) -#define SCID_DRAW_TEXT_SHELL (SFX_INTERFACE_SC_START+6) +#define SCID_APP (SFX_INTERFACE_SC_START+0) +#define SCID_DOC_SHELL (SFX_INTERFACE_SC_START+1) +#define SCID_TABVIEW_SHELL (SFX_INTERFACE_SC_START+2) +#define SCID_TABPOP_SHELL (SFX_INTERFACE_SC_START+3) +#define SCID_EDIT_SHELL (SFX_INTERFACE_SC_START+4) +#define SCID_DRAW_SHELL (SFX_INTERFACE_SC_START+5) +#define SCID_DRAW_TEXT_SHELL (SFX_INTERFACE_SC_START+6) #define SCID_PREVIEW_SHELL (SFX_INTERFACE_SC_START+7) #define SCID_PIVOT_SHELL (SFX_INTERFACE_SC_START+8) #define SCID_AUDITING_SHELL (SFX_INTERFACE_SC_START+9) -#define SCID_FORM_SHELL (SFX_INTERFACE_SC_START+10) +#define SCID_FORM_SHELL (SFX_INTERFACE_SC_START+10) -#define SCID_FORMAT_SHELL (SFX_INTERFACE_SC_START+11) -#define SCID_CELL_SHELL (SFX_INTERFACE_SC_START+12) -#define SCID_OLEOBJECT_SHELL (SFX_INTERFACE_SC_START+13) -#define SCID_CHART_SHELL (SFX_INTERFACE_SC_START+14) -#define SCID_GRAPHIC_SHELL (SFX_INTERFACE_SC_START+15) -#define SCID_PAGEBREAK_SHELL (SFX_INTERFACE_SC_START+16) -#define SCID_MEDIA_SHELL (SFX_INTERFACE_SC_START+17) +#define SCID_FORMAT_SHELL (SFX_INTERFACE_SC_START+11) +#define SCID_CELL_SHELL (SFX_INTERFACE_SC_START+12) +#define SCID_OLEOBJECT_SHELL (SFX_INTERFACE_SC_START+13) +#define SCID_CHART_SHELL (SFX_INTERFACE_SC_START+14) +#define SCID_GRAPHIC_SHELL (SFX_INTERFACE_SC_START+15) +#define SCID_PAGEBREAK_SHELL (SFX_INTERFACE_SC_START+16) +#define SCID_MEDIA_SHELL (SFX_INTERFACE_SC_START+17) #endif diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index fc18a1fb2c37..37e88fd43ac0 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <com/sun/star/lang/Locale.hpp> #include "scdllapi.h" -#define MAXSORT 3 +#define MAXSORT 3 struct ScSubTotalParam; @@ -43,27 +43,27 @@ struct ScQueryParam; struct SC_DLLPUBLIC ScSortParam { - SCCOL nCol1; - SCROW nRow1; - SCCOL nCol2; - SCROW nRow2; - BOOL bHasHeader; - BOOL bByRow; - BOOL bCaseSens; - BOOL bNaturalSort; - BOOL bUserDef; - USHORT nUserIndex; - BOOL bIncludePattern; - BOOL bInplace; - SCTAB nDestTab; - SCCOL nDestCol; - SCROW nDestRow; - BOOL bDoSort[MAXSORT]; - SCCOLROW nField[MAXSORT]; - BOOL bAscending[MAXSORT]; - ::com::sun::star::lang::Locale aCollatorLocale; - String aCollatorAlgorithm; - USHORT nCompatHeader; + SCCOL nCol1; + SCROW nRow1; + SCCOL nCol2; + SCROW nRow2; + BOOL bHasHeader; + BOOL bByRow; + BOOL bCaseSens; + BOOL bNaturalSort; + BOOL bUserDef; + USHORT nUserIndex; + BOOL bIncludePattern; + BOOL bInplace; + SCTAB nDestTab; + SCCOL nDestCol; + SCROW nDestRow; + BOOL bDoSort[MAXSORT]; + SCCOLROW nField[MAXSORT]; + BOOL bAscending[MAXSORT]; + ::com::sun::star::lang::Locale aCollatorLocale; + String aCollatorAlgorithm; + USHORT nCompatHeader; ScSortParam(); ScSortParam( const ScSortParam& r ); @@ -72,11 +72,11 @@ struct SC_DLLPUBLIC ScSortParam /// TopTen sort ScSortParam( const ScQueryParam&, SCCOL nCol ); - ScSortParam& operator= ( const ScSortParam& r ); - BOOL operator== ( const ScSortParam& rOther ) const; - void Clear (); + ScSortParam& operator= ( const ScSortParam& r ); + BOOL operator== ( const ScSortParam& rOther ) const; + void Clear (); - void MoveToDest(); + void MoveToDest(); }; diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index 9c306f29a0cc..9e9342a7cb5a 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,23 +45,23 @@ class ScCellSearchObj : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - SfxItemPropertySet aPropSet; - SvxSearchItem* pSearchItem; + SfxItemPropertySet aPropSet; + SvxSearchItem* pSearchItem; public: ScCellSearchObj(); - virtual ~ScCellSearchObj(); + virtual ~ScCellSearchObj(); - SvxSearchItem* GetSearchItem() const { return pSearchItem; } + SvxSearchItem* GetSearchItem() const { return pSearchItem; } // XReplaceDescriptor virtual ::rtl::OUString SAL_CALL getReplaceString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) + virtual void SAL_CALL setReplaceString( const ::rtl::OUString& aReplaceString ) throw(::com::sun::star::uno::RuntimeException); // XSearchDescriptor virtual ::rtl::OUString SAL_CALL getSearchString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // Search/Replace muss von aussen (vom XSearchable) gerufen werden... @@ -70,7 +70,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -82,25 +82,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx index 3da0a25351ce..fdb24bc2a4ba 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,49 +38,49 @@ class ScDocument; class ScStyleSheetPool : public SfxStyleSheetPool { public: - ScStyleSheetPool( SfxItemPool& rPool, - ScDocument* pDocument ); + ScStyleSheetPool( SfxItemPool& rPool, + ScDocument* pDocument ); - void SetDocument( ScDocument* pDocument ); - ScDocument* GetDocument() const { return pDoc; } + void SetDocument( ScDocument* pDocument ); + ScDocument* GetDocument() const { return pDoc; } - virtual void Remove( SfxStyleSheetBase* pStyle ); + virtual void Remove( SfxStyleSheetBase* pStyle ); - void SetActualStyleSheet ( SfxStyleSheetBase* pActStyleSheet ) + void SetActualStyleSheet ( SfxStyleSheetBase* pActStyleSheet ) { pActualStyleSheet = pActStyleSheet; } - SfxStyleSheetBase* GetActualStyleSheet () + SfxStyleSheetBase* GetActualStyleSheet () { return pActualStyleSheet; } - void CreateStandardStyles(); - void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); + void CreateStandardStyles(); + void CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ); - void CopyStyleFrom( ScStyleSheetPool* pSrcPool, + void CopyStyleFrom( ScStyleSheetPool* pSrcPool, const String& rName, SfxStyleFamily eFamily ); - ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); + ScStyleSheet* FindCaseIns( const String& rName, SfxStyleFamily eFam ); - const String* GetForceStdName() const { return pForceStdName; } + const String* GetForceStdName() const { return pForceStdName; } virtual SfxStyleSheetBase& Make( const String&, SfxStyleFamily eFam, USHORT nMask = 0xffff, USHORT nPos = 0xffff ); protected: - virtual ~ScStyleSheetPool(); + virtual ~ScStyleSheetPool(); using SfxStyleSheetPool::Create; // calcwarnings: Create(const SfxStyleSheet&) - ever used? - virtual SfxStyleSheetBase* Create( const String& rName, - SfxStyleFamily eFamily, - USHORT nMask); + virtual SfxStyleSheetBase* Create( const String& rName, + SfxStyleFamily eFamily, + USHORT nMask); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& rStyle ); private: - SfxStyleSheetBase* pActualStyleSheet; - ScDocument* pDoc; - const String* pForceStdName; + SfxStyleSheetBase* pActualStyleSheet; + ScDocument* pDoc; + const String* pForceStdName; }; -#endif // SC_STLPOOL_HXX +#endif // SC_STLPOOL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 6ae79cf89d4e..ea4ba643e1fb 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ //------------------------------------------------------------------------ -#define SCSTYLEBIT_STANDARD 0x0001 +#define SCSTYLEBIT_STANDARD 0x0001 //------------------------------------------------------------------------ @@ -60,11 +60,11 @@ public: ScStyleSheet( const ScStyleSheet& rStyle ); - virtual BOOL SetParent ( const String& rParentName ); - virtual SfxItemSet& GetItemSet (); - virtual BOOL IsUsed () const; - virtual BOOL HasFollowSupport () const; - virtual BOOL HasParentSupport () const; + virtual BOOL SetParent ( const String& rParentName ); + virtual SfxItemSet& GetItemSet (); + virtual BOOL IsUsed () const; + virtual BOOL HasFollowSupport () const; + virtual BOOL HasParentSupport () const; virtual const String& GetName() const; virtual const String& GetParent() const; @@ -78,16 +78,16 @@ public: { return eUsage; } protected: - virtual ~ScStyleSheet(); + virtual ~ScStyleSheet(); - ScStyleSheet( const String& rName, - ScStyleSheetPool& rPool, - SfxStyleFamily eFamily, - USHORT nMask ); + ScStyleSheet( const String& rName, + ScStyleSheetPool& rPool, + SfxStyleFamily eFamily, + USHORT nMask ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); }; -#endif // SC_STLSHEET_HXX +#endif // SC_STLSHEET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 6ddb6a75aa03..e9a60a567415 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,10 +72,10 @@ struct SC_DLLPUBLIC ScSetStringParam class ScStringUtil { public: - /** - * Check if a given string is a simple decimal number (e.g. 12.345). We - * don't do any elaborate parsing here; we only check for the simplest - * case of decimal number format. + /** + * Check if a given string is a simple decimal number (e.g. 12.345). We + * don't do any elaborate parsing here; we only check for the simplest + * case of decimal number format. * * Note that preceding and trailing spaces are ignored during parsing. * @@ -83,7 +83,7 @@ public: * @param dsep decimal separator * @param gsep group separator (aka thousands separator) * @param rVal value of successfully parsed number - * + * * @return true if the string is a valid number, false otherwise. */ static bool parseSimpleNumber( diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx index 20367fc5c5e0..4acab5f90556 100644 --- a/sc/inc/strload.hxx +++ b/sc/inc/strload.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index a4735d596422..0308382c8abd 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,17 +69,17 @@ class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; - ScStyleFamilyObj* GetObjectByType_Impl(UINT16 Type) const; - ScStyleFamilyObj* GetObjectByIndex_Impl(UINT32 nIndex) const; - ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; + ScStyleFamilyObj* GetObjectByType_Impl(UINT16 Type) const; + ScStyleFamilyObj* GetObjectByIndex_Impl(UINT32 nIndex) const; + ScStyleFamilyObj* GetObjectByName_Impl(const rtl::OUString& aName) const; public: ScStyleFamiliesObj(ScDocShell* pDocSh); - virtual ~ScStyleFamiliesObj(); + virtual ~ScStyleFamiliesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -104,7 +104,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); // XStyleLoader - virtual void SAL_CALL loadStylesFromURL( const ::rtl::OUString& URL, + virtual void SAL_CALL loadStylesFromURL( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions ) throw(::com::sun::star::io::IOException, @@ -130,32 +130,32 @@ class ScStyleFamilyObj : public ::cppu::WeakImplHelper4< public SfxListener { private: - ScDocShell* pDocShell; - SfxStyleFamily eFamily; // Family + ScDocShell* pDocShell; + SfxStyleFamily eFamily; // Family - ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); - ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); + ScStyleObj* GetObjectByIndex_Impl(UINT32 nIndex); + ScStyleObj* GetObjectByName_Impl(const rtl::OUString& Name); public: ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam); - virtual ~ScStyleFamilyObj(); + virtual ~ScStyleFamilyObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, @@ -222,13 +222,13 @@ class ScStyleObj : public ::cppu::WeakImplHelper7< { private: const SfxItemPropertySet* pPropSet; - ScDocShell* pDocShell; - SfxStyleFamily eFamily; // Family - String aStyleName; + ScDocShell* pDocShell; + SfxStyleFamily eFamily; // Family + String aStyleName; - SfxStyleSheetBase* GetStyle_Impl(); + SfxStyleSheetBase* GetStyle_Impl(); const SfxItemSet* GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); - void SetOnePropertyValue( const ::rtl::OUString& rPropertyName, + void SetOnePropertyValue( const ::rtl::OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -237,14 +237,14 @@ private: ScStyleObj(); // disabled public: ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName); - virtual ~ScStyleObj(); + virtual ~ScStyleObj(); // created by getImplementation: - sal_Bool IsInserted() const { return pDocShell != NULL; } - SfxStyleFamily GetFamily() const { return eFamily; } - void InitDoc( ScDocShell* pNewDocSh, const String& rNewName ); + sal_Bool IsInserted() const { return pDocShell != NULL; } + SfxStyleFamily GetFamily() const { return eFamily; } + void InitDoc( ScDocShell* pNewDocSh, const String& rNewName ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > CreateEmptyNumberingRules(); @@ -252,21 +252,21 @@ public: // XStyle virtual sal_Bool SAL_CALL isUserDefined() throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isInUse() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) + virtual ::rtl::OUString SAL_CALL getParentStyle() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParentStyle( const ::rtl::OUString& aParentStyle ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) + virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -278,25 +278,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -304,7 +304,7 @@ public: ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, @@ -332,7 +332,7 @@ public: ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) + virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( @@ -343,8 +343,8 @@ public: // XMultiPropertyStates // getPropertyStates already defined for XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL setAllPropertiesToDefault() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index 9ff089270fde..65648731b491 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ public: }; -struct ScFunctionData // zum Berechnen von einzelnen Funktionen +struct ScFunctionData // zum Berechnen von einzelnen Funktionen { - ScSubTotalFunc eFunc; - double nVal; - long nCount; - BOOL bError; + ScSubTotalFunc eFunc; + double nVal; + long nCount; + BOOL bError; ScFunctionData( ScSubTotalFunc eFn ) : eFunc(eFn), nVal(0.0), nCount(0), bError(FALSE) {} diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 63b860660bc0..8edec9f6e06a 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,17 +92,6 @@ struct ScColWidthParam; typedef std::hash_map< ::rtl::OUString, rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap; -struct ScShowRowsEntry -{ - SCROW mnRow1; - SCROW mnRow2; - bool mbShow; - - ScShowRowsEntry( SCROW nR1, SCROW nR2, bool bS ) : - mnRow1(nR1), mnRow2(nR2), mbShow(bS) {} -}; - - class ScTable { private: @@ -111,38 +100,38 @@ private: typedef ::std::vector< ScAddress2D > ScAddress2DVec; typedef ::std::auto_ptr< ScAddress2DVec > ScAddress2DVecPtr; - // Daten pro Tabelle ------------------ - ScColumn aCol[MAXCOLCOUNT]; + // Daten pro Tabelle ------------------ + ScColumn aCol[MAXCOLCOUNT]; - String aName; - String aCodeName; - String aComment; - BOOL bScenario; - BOOL bLayoutRTL; + String aName; + String aCodeName; + String aComment; + BOOL bScenario; + BOOL bLayoutRTL; BOOL bLoadingRTL; - String aLinkDoc; - String aLinkFlt; - String aLinkOpt; - String aLinkTab; - ULONG nLinkRefreshDelay; - BYTE nLinkMode; + String aLinkDoc; + String aLinkFlt; + String aLinkOpt; + String aLinkTab; + ULONG nLinkRefreshDelay; + BYTE nLinkMode; // Seitenformatvorlage - String aPageStyle; - BOOL bPageSizeValid; - Size aPageSizeTwips; // Groesse der Druck-Seite - SCCOL nRepeatStartX; // Wiederholungszeilen/Spalten - SCCOL nRepeatEndX; // REPEAT_NONE, wenn nicht benutzt - SCROW nRepeatStartY; - SCROW nRepeatEndY; + String aPageStyle; + BOOL bPageSizeValid; + Size aPageSizeTwips; // Groesse der Druck-Seite + SCCOL nRepeatStartX; // Wiederholungszeilen/Spalten + SCCOL nRepeatEndX; // REPEAT_NONE, wenn nicht benutzt + SCROW nRepeatStartY; + SCROW nRepeatEndY; ::std::auto_ptr<ScTableProtection> pTabProtection; - USHORT* pColWidth; + USHORT* pColWidth; ::boost::shared_ptr<ScFlatUInt16RowSegments> mpRowHeights; - BYTE* pColFlags; + BYTE* pColFlags; ScBitMaskCompressedArray< SCROW, BYTE>* pRowFlags; ::boost::shared_ptr<ScFlatBoolColSegments> mpHiddenCols; ::boost::shared_ptr<ScFlatBoolRowSegments> mpHiddenRows; @@ -154,53 +143,53 @@ private: ::std::set<SCCOL> maColPageBreaks; ::std::set<SCCOL> maColManualBreaks; - ScOutlineTable* pOutlineTable; + ScOutlineTable* pOutlineTable; ScSheetEvents* pSheetEvents; - SCCOL nTableAreaX; - SCROW nTableAreaY; - BOOL bTableAreaValid; + SCCOL nTableAreaX; + SCROW nTableAreaY; + BOOL bTableAreaValid; - // interne Verwaltung ------------------ - BOOL bVisible; + // interne Verwaltung ------------------ + BOOL bVisible; BOOL bStreamValid; BOOL bPendingRowHeights; BOOL bCalcNotification; - SCTAB nTab; - USHORT nRecalcLvl; // Rekursionslevel Size-Recalc - ScDocument* pDocument; - utl::SearchParam* pSearchParam; - utl::TextSearch* pSearchText; + SCTAB nTab; + USHORT nRecalcLvl; // Rekursionslevel Size-Recalc + ScDocument* pDocument; + utl::SearchParam* pSearchParam; + utl::TextSearch* pSearchText; mutable String aUpperName; // #i62977# filled only on demand, reset in SetName ScAddress2DVecPtr mxUninitNotes; // SortierParameter um den Stackbedarf von Quicksort zu Minimieren - ScSortParam aSortParam; - CollatorWrapper* pSortCollator; - BOOL bGlobalKeepQuery; - BOOL bSharedNameInserted; + ScSortParam aSortParam; + CollatorWrapper* pSortCollator; + BOOL bGlobalKeepQuery; + BOOL bSharedNameInserted; ScRangeVec aPrintRanges; BOOL bPrintEntireSheet; - ScRange* pRepeatColRange; - ScRange* pRepeatRowRange; + ScRange* pRepeatColRange; + ScRange* pRepeatRowRange; - USHORT nLockCount; + USHORT nLockCount; - ScRangeList* pScenarioRanges; - Color aScenarioColor; + ScRangeList* pScenarioRanges; + Color aScenarioColor; Color aTabBgColor; - USHORT nScenarioFlags; - BOOL bActiveScenario; + USHORT nScenarioFlags; + BOOL bActiveScenario; NameToNameMap localNameToGlobalName; bool mbPageBreaksValid; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // fuer FillInfo friend class ScDocumentIterator; friend class ScValueIterator; friend class ScDBQueryDataIterator; @@ -217,27 +206,27 @@ public: BOOL bColInfo = TRUE, BOOL bRowInfo = TRUE ); ~ScTable(); - ScOutlineTable* GetOutlineTable() { return pOutlineTable; } + ScOutlineTable* GetOutlineTable() { return pOutlineTable; } SCSIZE GetCellCount(SCCOL nCol) const; - ULONG GetCellCount() const; - ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln + ULONG GetCellCount() const; + ULONG GetWeightedCount() const; + ULONG GetCodeCount() const; // RPN-Code in Formeln - BOOL SetOutlineTable( const ScOutlineTable* pNewOutline ); - void StartOutlineTable(); + BOOL SetOutlineTable( const ScOutlineTable* pNewOutline ); + void StartOutlineTable(); - void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - BOOL TestRemoveSubTotals( const ScSubTotalParam& rParam ); - void RemoveSubTotals( ScSubTotalParam& rParam ); - BOOL DoSubTotals( ScSubTotalParam& rParam ); + BOOL TestRemoveSubTotals( const ScSubTotalParam& rParam ); + void RemoveSubTotals( ScSubTotalParam& rParam ); + BOOL DoSubTotals( ScSubTotalParam& rParam ); const ScSheetEvents* GetSheetEvents() const { return pSheetEvents; } void SetSheetEvents( const ScSheetEvents* pNew ); - BOOL IsVisible() const { return bVisible; } - void SetVisible( BOOL bVis ); + BOOL IsVisible() const { return bVisible; } + void SetVisible( BOOL bVis ); BOOL IsStreamValid() const { return bStreamValid; } void SetStreamValid( BOOL bSet, BOOL bIgnoreLock = FALSE ); @@ -253,103 +242,103 @@ public: void SetLayoutRTL( BOOL bSet ); void SetLoadingRTL( BOOL bSet ); - BOOL IsScenario() const { return bScenario; } - void SetScenario( BOOL bFlag ); - void GetScenarioComment( String& rComment) const { rComment = aComment; } - void SetScenarioComment( const String& rComment ) { aComment = rComment; } - const Color& GetScenarioColor() const { return aScenarioColor; } - void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } + BOOL IsScenario() const { return bScenario; } + void SetScenario( BOOL bFlag ); + void GetScenarioComment( String& rComment) const { rComment = aComment; } + void SetScenarioComment( const String& rComment ) { aComment = rComment; } + const Color& GetScenarioColor() const { return aScenarioColor; } + void SetScenarioColor(const Color& rNew) { aScenarioColor = rNew; } const Color& GetTabBgColor() const; void SetTabBgColor(const Color& rColor); - USHORT GetScenarioFlags() const { return nScenarioFlags; } - void SetScenarioFlags(USHORT nNew) { nScenarioFlags = nNew; } - void SetActiveScenario(BOOL bSet) { bActiveScenario = bSet; } - BOOL IsActiveScenario() const { return bActiveScenario; } - - BYTE GetLinkMode() const { return nLinkMode; } - BOOL IsLinked() const { return nLinkMode != SC_LINK_NONE; } - const String& GetLinkDoc() const { return aLinkDoc; } - const String& GetLinkFlt() const { return aLinkFlt; } - const String& GetLinkOpt() const { return aLinkOpt; } - const String& GetLinkTab() const { return aLinkTab; } - ULONG GetLinkRefreshDelay() const { return nLinkRefreshDelay; } - - void SetLink( BYTE nMode, const String& rDoc, const String& rFlt, + USHORT GetScenarioFlags() const { return nScenarioFlags; } + void SetScenarioFlags(USHORT nNew) { nScenarioFlags = nNew; } + void SetActiveScenario(BOOL bSet) { bActiveScenario = bSet; } + BOOL IsActiveScenario() const { return bActiveScenario; } + + BYTE GetLinkMode() const { return nLinkMode; } + BOOL IsLinked() const { return nLinkMode != SC_LINK_NONE; } + const String& GetLinkDoc() const { return aLinkDoc; } + const String& GetLinkFlt() const { return aLinkFlt; } + const String& GetLinkOpt() const { return aLinkOpt; } + const String& GetLinkTab() const { return aLinkTab; } + ULONG GetLinkRefreshDelay() const { return nLinkRefreshDelay; } + + void SetLink( BYTE nMode, const String& rDoc, const String& rFlt, const String& rOpt, const String& rTab, ULONG nRefreshDelay ); - void GetName( String& rName ) const; - void SetName( const String& rNewName ); + void GetName( String& rName ) const; + void SetName( const String& rNewName ); - void GetCodeName( String& rName ) const { rName = aCodeName; } - void SetCodeName( const String& rNewName ) { aCodeName = rNewName; } + void GetCodeName( String& rName ) const { rName = aCodeName; } + void SetCodeName( const String& rNewName ) { aCodeName = rNewName; } const String& GetUpperName() const; - const String& GetPageStyle() const { return aPageStyle; } - void SetPageStyle( const String& rName ); - void PageStyleModified( const String& rNewName ); + const String& GetPageStyle() const { return aPageStyle; } + void SetPageStyle( const String& rName ); + void PageStyleModified( const String& rNewName ); BOOL IsProtected() const; void SetProtection(const ScTableProtection* pProtect); ScTableProtection* GetProtection(); - Size GetPageSize() const; - void SetPageSize( const Size& rSize ); - void SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); + Size GetPageSize() const; + void SetPageSize( const Size& rSize ); + void SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ); - void RemoveAutoSpellObj(); + void RemoveAutoSpellObj(); - void LockTable(); - void UnlockTable(); + void LockTable(); + void UnlockTable(); - BOOL IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, + BOOL IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL IsSelectionEditable( const ScMarkData& rMark, + BOOL IsSelectionEditable( const ScMarkData& rMark, BOOL* pOnlyNotBecauseOfMatrix = NULL ) const; - BOOL HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; - BOOL HasSelectionMatrixFragment( const ScMarkData& rMark ) const; + BOOL HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; + BOOL HasSelectionMatrixFragment( const ScMarkData& rMark ) const; - BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; + BOOL IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const; - void PutCell( const ScAddress&, ScBaseCell* pCell ); - void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); - void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); - // TRUE = Zahlformat gesetzt - BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, + void PutCell( const ScAddress&, ScBaseCell* pCell ); + void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell ); + void PutCell(SCCOL nCol, SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell); + // TRUE = Zahlformat gesetzt + BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, ScSetStringParam* pParam = NULL ); - void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, USHORT nError); + void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); + void SetError( SCCOL nCol, SCROW nRow, USHORT nError); - void GetString( SCCOL nCol, SCROW nRow, String& rString ); - void GetInputString( SCCOL nCol, SCROW nRow, String& rString ); - double GetValue( const ScAddress& rPos ) const + void GetString( SCCOL nCol, SCROW nRow, String& rString ); + void GetInputString( SCCOL nCol, SCROW nRow, String& rString ); + double GetValue( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetValue( rPos.Row() ) : 0.0; } - double GetValue( SCCOL nCol, SCROW nRow ); - void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula, + double GetValue( SCCOL nCol, SCROW nRow ); + void GetFormula( SCCOL nCol, SCROW nRow, String& rFormula, BOOL bAsciiExport = FALSE ); - CellType GetCellType( const ScAddress& rPos ) const + CellType GetCellType( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? - aCol[rPos.Col()].GetCellType( rPos.Row() ) : + return ValidColRow(rPos.Col(),rPos.Row()) ? + aCol[rPos.Col()].GetCellType( rPos.Row() ) : CELLTYPE_NONE; } - CellType GetCellType( SCCOL nCol, SCROW nRow ) const; - ScBaseCell* GetCell( const ScAddress& rPos ) const + CellType GetCellType( SCCOL nCol, SCROW nRow ) const; + ScBaseCell* GetCell( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetCell( rPos.Row() ) : NULL; } - ScBaseCell* GetCell( SCCOL nCol, SCROW nRow ) const; + ScBaseCell* GetCell( SCCOL nCol, SCROW nRow ) const; void GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const; - void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const; + void GetLastDataPos(SCCOL& rCol, SCROW& rRow) const; /** Returns the pointer to a cell note object at the passed cell address. */ ScPostIt* GetNote( SCCOL nCol, SCROW nRow ); @@ -363,241 +352,240 @@ public: @param bForced True = always create all captions, false = skip when Undo is disabled. */ void InitializeNoteCaptions( bool bForced = false ); - BOOL TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ); - void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ); - void DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, + BOOL TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize ); + void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ); + void DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, BOOL* pUndoOutline = NULL ); - BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); - void InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); - void DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, + BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); + void InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ); + void DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, BOOL* pUndoOutline = NULL ); - void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag); - void CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable, + void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nDelFlag); + void CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions); - void CopyToClip(const ScRangeList& rRanges, ScTable* pTable, + void CopyToClip(const ScRangeList& rRanges, ScTable* pTable, bool bKeepScenarioFlags, bool bCloneNoteCaptions); - void CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, + void CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy, USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScTable* pTable); - void StartListeningInArea( SCCOL nCol1, SCROW nRow1, + void StartListeningInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void BroadcastInArea( SCCOL nCol1, SCROW nRow1, + void BroadcastInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); - void CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL, BOOL bAsLink = FALSE, BOOL bColRowFlags = TRUE); - void UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nFlags, BOOL bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL); - void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTransClip, USHORT nFlags, BOOL bAsLink ); - // Markierung von diesem Dokument - void MixMarked( const ScMarkData& rMark, USHORT nFunction, + // Markierung von diesem Dokument + void MixMarked( const ScMarkData& rMark, USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ); - void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ); - void CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab ); - void CopyScenarioFrom( const ScTable* pSrcTab ); - void CopyScenarioTo( ScTable* pDestTab ) const; - BOOL TestCopyScenarioTo( const ScTable* pDestTab ) const; - void MarkScenarioIn( ScMarkData& rMark, USHORT nNeededBits ) const; - BOOL HasScenarioRange( const ScRange& rRange ) const; - void InvalidateScenarioRanges(); + void CopyScenarioFrom( const ScTable* pSrcTab ); + void CopyScenarioTo( ScTable* pDestTab ) const; + BOOL TestCopyScenarioTo( const ScTable* pDestTab ) const; + void MarkScenarioIn( ScMarkData& rMark, USHORT nNeededBits ) const; + BOOL HasScenarioRange( const ScRange& rRange ) const; + void InvalidateScenarioRanges(); const ScRangeList* GetScenarioRanges() const; - void CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const; + void CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const; void InvalidateTableArea(); void InvalidatePageBreaks(); - BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer - BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; - BOOL GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const; - BOOL GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, + BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer + BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; + BOOL GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const; + BOOL GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, SCCOL& rEndCol, BOOL bNotes ) const; - BOOL GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, + BOOL GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, SCROW& rEndRow, BOOL bNotes ) const; - BOOL GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const; + BOOL GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const; - void ExtendPrintArea( OutputDevice* pDev, + void ExtendPrintArea( OutputDevice* pDev, SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow ); void GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bIncludeOld, bool bOnlyDown ) const; - bool ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow, - SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; + bool ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const; - SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, + SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScDirection eDir ); - void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY ); - void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, + void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY ); + void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ); - void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); + void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); - BOOL HasData( SCCOL nCol, SCROW nRow ); - BOOL HasStringData( SCCOL nCol, SCROW nRow ); - BOOL HasValueData( SCCOL nCol, SCROW nRow ); - BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, + BOOL HasData( SCCOL nCol, SCROW nRow ); + BOOL HasStringData( SCCOL nCol, SCROW nRow ); + BOOL HasValueData( SCCOL nCol, SCROW nRow ); + BOOL HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; - USHORT GetErrCode( const ScAddress& rPos ) const + USHORT GetErrCode( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetErrCode( rPos.Row() ) : 0; } - void ResetChanged( const ScRange& rRange ); + void ResetChanged( const ScRange& rRange ); - void SetDirty(); - void SetDirty( const ScRange& ); - void SetDirtyAfterLoad(); - void SetDirtyVar(); - void SetTableOpDirty( const ScRange& ); - void CalcAll(); - void CalcAfterLoad(); - void CompileAll(); - void CompileXML( ScProgress& rProgress ); + void SetDirty(); + void SetDirty( const ScRange& ); + void SetDirtyAfterLoad(); + void SetDirtyVar(); + void SetTableOpDirty( const ScRange& ); + void CalcAll(); + void CalcAfterLoad(); + void CompileAll(); + void CompileXML( ScProgress& rProgress ); - void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE, bool bUpdateNoteCaptionPos = true ); - void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, + void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bUpdateNoteCaptionPos = true ); - void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, + void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, ScDocument* pUndoDoc ); - void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); + void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ); - void UpdateInsertTab(SCTAB nTable); - void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); - void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); - void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); - void SetTabNo(SCTAB nNewTab); - BOOL IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void UpdateInsertTab(SCTAB nTable); + void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScTable* pRefUndo = NULL ); + void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress& ); + void UpdateCompile( BOOL bForceIfNameInUse = FALSE ); + void SetTabNo(SCTAB nNewTab); + BOOL IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nIndex) const; void FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, std::set<USHORT>& rIndexes) const; - void ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void ReplaceRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScRangeData::IndexMap& rMap ); - void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, double nStepValue, double nMaxValue); - String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); + String GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW nEndY ); - void UpdateSelectionFunction( ScFunctionData& rData, + void UpdateSelectionFunction( ScFunctionData& rData, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); - void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, USHORT nFormatNo ); - void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData); - void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // aus sw - BOOL SearchAndReplace(const SvxSearchItem& rSearchItem, + void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData); + void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // aus sw + BOOL SearchAndReplace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); + void FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2 ); - void GetBorderLines( SCCOL nCol, SCROW nRow, + void GetBorderLines( SCCOL nCol, SCROW nRow, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const; bool HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nMask ) const; - BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; - BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, + BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; + BOOL ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, BOOL bRefresh, BOOL bAttrs ); - const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const; - const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const; + const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const; + const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const; const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetNumberFormat( const ScAddress& rPos ) const + ULONG GetNumberFormat( const ScAddress& rPos ) const { - return ValidColRow(rPos.Col(),rPos.Row()) ? + return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetNumberFormat( rPos.Row() ) : 0; } - ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; + ULONG GetNumberFormat( SCCOL nCol, SCROW nRow ) const; sal_uInt32 GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const; - void MergeSelectionPattern( ScMergePatternState& rState, + void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL bDeep ) const; - void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, + void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL bDeep ) const; - void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, + void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; - void ApplyBlockFrame( const SvxBoxItem* pLineOuter, + void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); - void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); - void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ); + void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ); + void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, ScEditDataArray* pDataArray = NULL ); bool SetAttrEntries(SCCOL nCol, ScAttrEntry* pData, SCSIZE nSize); - void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) + void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ) { if (ValidColRow(rPos.Col(),rPos.Row())) aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool ); } - void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); - void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, + void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, BOOL bPutToPool = FALSE ); + void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange, const ScPatternAttr& rPattern, short nNewType ); - void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ); - void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); - void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); - void ApplySelectionLineStyle( const ScMarkData& rMark, + void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ); + void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ); + void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark); + void ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, BOOL bColorOnly ); - const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow ) const; - const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; - const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, + const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow ) const; + const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const; + const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const; - void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, + void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY ); - BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; + BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const; - BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + BOOL ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); + BOOL RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, INT16 nFlags ); - void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL ); + void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL ); void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ); - void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); - void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); + void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ); + void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ); - const ScRange* GetRepeatColRange() const { return pRepeatColRange; } - const ScRange* GetRepeatRowRange() const { return pRepeatRowRange; } - void SetRepeatColRange( const ScRange* pNew ); - void SetRepeatRowRange( const ScRange* pNew ); + const ScRange* GetRepeatColRange() const { return pRepeatColRange; } + const ScRange* GetRepeatRowRange() const { return pRepeatRowRange; } + void SetRepeatColRange( const ScRange* pNew ); + void SetRepeatRowRange( const ScRange* pNew ); USHORT GetPrintRangeCount() const { return static_cast< USHORT >( aPrintRanges.size() ); } - const ScRange* GetPrintRange(USHORT nPos) const; + const ScRange* GetPrintRange(USHORT nPos) const; /** Returns true, if the sheet is always printed. */ BOOL IsPrintEntireSheet() const { return bPrintEntireSheet; } @@ -608,15 +596,15 @@ public: /** Marks the specified sheet to be printed completely. Deletes old print ranges! */ void SetPrintEntireSheet(); - void FillPrintSaver( ScPrintSaverTab& rSaveTab ) const; - void RestorePrintRanges( const ScPrintSaverTab& rSaveTab ); + void FillPrintSaver( ScPrintSaverTab& rSaveTab ) const; + void RestorePrintRanges( const ScPrintSaverTab& rSaveTab ); - USHORT GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, + USHORT GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bFormula, const ScMarkData* pMarkData, const ScColWidthParam* pParam ); - BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra, + BOOL SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT nExtra, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, @@ -630,63 +618,63 @@ public: BOOL bForce, ScProgress* pOuterProgress = NULL, ULONG nProgressStart = 0 ); - long GetNeededSize( SCCOL nCol, SCROW nRow, + long GetNeededSize( SCCOL nCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, BOOL bWidth, BOOL bTotalSize ); - void SetColWidth( SCCOL nCol, USHORT nNewWidth ); + void SetColWidth( SCCOL nCol, USHORT nNewWidth ); void SetColWidthOnly( SCCOL nCol, USHORT nNewWidth ); - void SetRowHeight( SCROW nRow, USHORT nNewHeight ); - BOOL SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight, + void SetRowHeight( SCROW nRow, USHORT nNewHeight ); + BOOL SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight, double nPPTX, double nPPTY ); - /** - * Set specified row height to specified ranges. Don't check for drawing - * objects etc. Just set the row height. Nothing else. - * - * Note that setting a new row height via this function will not - * invalidate page breaks. + /** + * Set specified row height to specified ranges. Don't check for drawing + * objects etc. Just set the row height. Nothing else. + * + * Note that setting a new row height via this function will not + * invalidate page breaks. */ void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight ); // nPPT fuer Test auf Veraenderung - void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); + void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); - USHORT GetColWidth( SCCOL nCol ) const; + USHORT GetColWidth( SCCOL nCol ) const; SC_DLLPUBLIC USHORT GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const; - ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const; - ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; - ULONG GetColOffset( SCCOL nCol ) const; - ULONG GetRowOffset( SCROW nRow ) const; + ULONG GetRowHeight( SCROW nStartRow, SCROW nEndRow ) const; + ULONG GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const; + ULONG GetColOffset( SCCOL nCol ) const; + ULONG GetRowOffset( SCROW nRow ) const; - /** - * Get the last row such that the height of row 0 to the end row is as + /** + * Get the last row such that the height of row 0 to the end row is as * high as possible without exceeding the specified height value. * * @param nHeight maximum desired height - * + * * @return SCROW last row of the range within specified height. */ SCROW GetRowForHeight(ULONG nHeight) const; - USHORT GetOriginalWidth( SCCOL nCol ) const; - USHORT GetOriginalHeight( SCROW nRow ) const; + USHORT GetOriginalWidth( SCCOL nCol ) const; + USHORT GetOriginalHeight( SCROW nRow ) const; - USHORT GetCommonWidth( SCCOL nEndCol ); + USHORT GetCommonWidth( SCCOL nEndCol ); - SCROW GetHiddenRowCount( SCROW nRow ); + SCROW GetHiddenRowCount( SCROW nRow ); - void ShowCol(SCCOL nCol, bool bShow); - void ShowRow(SCROW nRow, bool bShow); - void DBShowRow(SCROW nRow, bool bShow); + void ShowCol(SCCOL nCol, bool bShow); + void ShowRow(SCROW nRow, bool bShow); + void DBShowRow(SCROW nRow, bool bShow); - void ShowRows(SCROW nRow1, SCROW nRow2, bool bShow); - void DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags); // if bSetFlags=false, no SetRowHidden/SetRowFiltered + void ShowRows(SCROW nRow1, SCROW nRow2, bool bShow); + void DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow); - void SetColFlags( SCCOL nCol, BYTE nNewFlags ); - void SetRowFlags( SCROW nRow, BYTE nNewFlags ); - void SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags ); + void SetColFlags( SCCOL nCol, BYTE nNewFlags ); + void SetRowFlags( SCROW nRow, BYTE nNewFlags ); + void SetRowFlags( SCROW nStartRow, SCROW nEndRow, BYTE nNewFlags ); /// @return the index of the last row with any set flags (auto-pagebreak is ignored). SCROW GetLastFlaggedRow() const; @@ -696,18 +684,18 @@ public: /// @return the index of the last changed row (flags and row height, auto pagebreak is ignored). SCROW GetLastChangedRow() const; - BYTE GetColFlags( SCCOL nCol ) const; - BYTE GetRowFlags( SCROW nRow ) const; + BYTE GetColFlags( SCCOL nCol ) const; + BYTE GetRowFlags( SCROW nRow ) const; const ScBitMaskCompressedArray< SCROW, BYTE> * GetRowFlagsArray() const { return pRowFlags; } - BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ); - BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ); + BOOL UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, BOOL bShow ); + BOOL UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, BOOL bShow ); - void UpdatePageBreaks( const ScRange* pUserArea ); - void RemoveManualBreaks(); - BOOL HasManualBreaks() const; + void UpdatePageBreaks( const ScRange* pUserArea ); + void RemoveManualBreaks(); + BOOL HasManualBreaks() const; void SetRowManualBreaks( const ::std::set<SCROW>& rBreaks ); void SetColManualBreaks( const ::std::set<SCCOL>& rBreaks ); @@ -718,14 +706,14 @@ public: bool HasRowManualBreak(SCROW nRow) const; bool HasColManualBreak(SCCOL nCol) const; - /** - * Get the row position of the next manual break that occurs at or below - * specified row. When no more manual breaks are present at or below - * the specified row, -1 is returned. - * - * @param nRow row at which the search begins. - * - * @return SCROW next row position with manual page break, or -1 if no + /** + * Get the row position of the next manual break that occurs at or below + * specified row. When no more manual breaks are present at or below + * the specified row, -1 is returned. + * + * @param nRow row at which the search begins. + * + * @return SCROW next row position with manual page break, or -1 if no * more manual breaks are present. */ SCROW GetNextManualBreak(SCROW nRow) const; @@ -768,80 +756,80 @@ public: void SyncColRowFlags(); - void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); - void Sort(const ScSortParam& rSortParam, BOOL bKeepQuery); + void Sort(const ScSortParam& rSortParam, BOOL bKeepQuery); BOOL ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam, BOOL* pSpecial = NULL, ScBaseCell* pCell = NULL, BOOL* pbTestEqualCondition = NULL ); - void TopTenQuery( ScQueryParam& ); - SCSIZE Query(ScQueryParam& rQueryParam, BOOL bKeepSub); - BOOL CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + void TopTenQuery( ScQueryParam& ); + SCSIZE Query(ScQueryParam& rQueryParam, BOOL bKeepSub); + BOOL CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates); void GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates ); - BOOL GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); + BOOL GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit); - BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + BOOL HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); + BOOL HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); + void DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ); - sal_Int32 GetMaxStringLen( SCCOL nCol, + sal_Int32 GetMaxStringLen( SCCOL nCol, SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const; xub_StrLen GetMaxNumberStringLen( sal_uInt16& nPrecision, SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const; - void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); + void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges ); - void IncRecalcLevel() { ++nRecalcLvl; } - void DecRecalcLevel( bool bUpdateNoteCaptionPos = true ) { if (!--nRecalcLvl) SetDrawPageSize(true, bUpdateNoteCaptionPos); } + void IncRecalcLevel() { ++nRecalcLvl; } + void DecRecalcLevel( bool bUpdateNoteCaptionPos = true ) { if (!--nRecalcLvl) SetDrawPageSize(true, bUpdateNoteCaptionPos); } - BOOL IsSortCollatorGlobal() const; - void InitSortCollator( const ScSortParam& rPar ); - void DestroySortCollator(); + BOOL IsSortCollatorGlobal() const; + void InitSortCollator( const ScSortParam& rPar ); + void DestroySortCollator(); void SetDrawPageSize( bool bResetStreamValid = true, bool bUpdateNoteCaptionPos = true ); private: - void FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, double nStepValue, double nMaxValue, USHORT nMinDigits, BOOL bAttribs, ScProgress& rProgress ); - void FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, FillCmd& rCmd, FillDateCmd& rDateCmd, double& rInc, USHORT& rMinDigits, ScUserListData*& rListData, USHORT& rListIndex); - void FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nFillCount, FillDir eFillDir, ScProgress& rProgress ); - BOOL ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, + BOOL ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, BOOL bMarked, BOOL bUnprotected ); - void AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, + void AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, USHORT nFormatNo); - void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData); - void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData); - BOOL SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, + void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData); + void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, USHORT nFlags, USHORT nIndex, ScAutoFormatData& rData); + BOOL SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + BOOL SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + BOOL ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - BOOL SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark); - BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, + BOOL ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, BOOL bIsUndo); - BOOL SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); - BOOL ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, + BOOL SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark); + BOOL ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark, ScDocument* pUndoDoc); bool SearchAndReplaceEmptyCells( const SvxSearchItem& rSearchItem, @@ -855,49 +843,49 @@ private: String& rUndoStr, ScDocument* pUndoDoc); // benutzen globalen SortParam: - BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); - void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); - void SwapCol(SCCOL nCol1, SCCOL nCol2); - void SwapRow(SCROW nRow1, SCROW nRow2); - short CompareCell( USHORT nSort, + BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); + void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); + void SwapCol(SCCOL nCol1, SCCOL nCol2); + void SwapRow(SCROW nRow1, SCROW nRow2); + short CompareCell( USHORT nSort, ScBaseCell* pCell1, SCCOL nCell1Col, SCROW nCell1Row, ScBaseCell* pCell2, SCCOL nCell2Col, SCROW nCell2Row ); - short Compare(SCCOLROW nIndex1, SCCOLROW nIndex2); - short Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2); - ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ); - void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi); - void SortReorder( ScSortInfoArray*, ScProgress& ); + short Compare(SCCOLROW nIndex1, SCCOLROW nIndex2); + short Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2); + ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ); + void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi); + void SortReorder( ScSortInfoArray*, ScProgress& ); - BOOL CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - BOOL CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); - void GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr); + BOOL CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + BOOL CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam); + void GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr); - BOOL RefVisible(ScFormulaCell* pCell); + BOOL RefVisible(ScFormulaCell* pCell); - BOOL IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol); + BOOL IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol); - void IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd); - void FillFormula(ULONG& nFormulaCounter, BOOL bFirst, ScFormulaCell* pSrcCell, + void IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateCmd eCmd); + void FillFormula(ULONG& nFormulaCounter, BOOL bFirst, ScFormulaCell* pSrcCell, SCCOL nDestCol, SCROW nDestRow, BOOL bLast ); - void UpdateInsertTabAbs(SCTAB nNewPos); - BOOL GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, + void UpdateInsertTabAbs(SCTAB nNewPos); + BOOL GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, const ScMarkData& rMark) const; - BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ); - BOOL TestTabRefAbs(SCTAB nTable); - void CompileDBFormula(); - void CompileDBFormula( BOOL bCreateFormulaString ); - void CompileNameFormula( BOOL bCreateFormulaString ); - void CompileColRowNameFormula(); - - void StartListening( const ScAddress& rAddress, SvtListener* pListener ); - void EndListening( const ScAddress& rAddress, SvtListener* pListener ); - void StartAllListeners(); + BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ); + BOOL TestTabRefAbs(SCTAB nTable); + void CompileDBFormula(); + void CompileDBFormula( BOOL bCreateFormulaString ); + void CompileNameFormula( BOOL bCreateFormulaString ); + void CompileColRowNameFormula(); + + void StartListening( const ScAddress& rAddress, SvtListener* pListener ); + void EndListening( const ScAddress& rAddress, SvtListener* pListener ); + void StartAllListeners(); void StartNeededListeners(); // only for cells where NeedsListening()==TRUE - void SetRelNameDirty(); + void SetRelNameDirty(); void SetLoadingMedium(bool bLoading); - SCSIZE FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2, + SCSIZE FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCOL nX2, SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY, const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ); @@ -908,13 +896,13 @@ private: void SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward); - /** - * In case the cell text goes beyond the column width, move the max column + /** + * In case the cell text goes beyond the column width, move the max column * position to the right. This is called from ExtendPrintArea. */ void MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY); - /** + /** * Use this to iterate through non-empty visible cells in a single column. */ class VisibleDataCellIterator @@ -925,26 +913,26 @@ private: explicit VisibleDataCellIterator(ScFlatBoolRowSegments& rRowSegs, ScColumn& rColumn); ~VisibleDataCellIterator(); - /** + /** * Set the start row position. In case there is not visible data cell - * at the specified row position, it will move to the position of the - * first visible data cell below that point. - * + * at the specified row position, it will move to the position of the + * first visible data cell below that point. + * * @return First visible data cell if found, or NULL otherwise. - */ + */ ScBaseCell* reset(SCROW nRow); - /** - * Find the next visible data cell position. - * + /** + * Find the next visible data cell position. + * * @return Next visible data cell if found, or NULL otherwise. */ ScBaseCell* next(); - /** + /** * Get the current row position. - * - * @return Current row position, or ROW_NOT_FOUND if the iterator + * + * @return Current row position, or ROW_NOT_FOUND if the iterator * doesn't point to a valid data cell position. */ SCROW getRow() const; diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 2e27e604f68e..0b6ab11964a5 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ #include <sfx2/lnkbase.hxx> #include <sfx2/objsh.hxx> -//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED -//REMOVE SO2_DECL_REF(SvEmbeddedObject) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVEMBEDDEDOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvEmbeddedObject) +//REMOVE #endif class ScDocShell; struct TableLink_Impl; @@ -67,17 +67,17 @@ public: virtual void Edit( Window*, const Link& rEndEditHdl ); - BOOL Refresh(const String& rNewFile, const String& rNewFilter, + BOOL Refresh(const String& rNewFile, const String& rNewFilter, const String* pNewOptions /* = NULL */, ULONG nNewRefresh ); - void SetInCreate(BOOL bSet) { bInCreate = bSet; } - void SetAddUndo(BOOL bSet) { bAddUndo = bSet; } - void SetPaint(BOOL bSet) { bDoPaint = bSet; } + void SetInCreate(BOOL bSet) { bInCreate = bSet; } + void SetAddUndo(BOOL bSet) { bAddUndo = bSet; } + void SetPaint(BOOL bSet) { bDoPaint = bSet; } - const String& GetFileName() const { return aFileName; } - const String& GetFilterName() const { return aFilterName; } - const String& GetOptions() const { return aOptions; } + const String& GetFileName() const { return aFileName; } + const String& GetFilterName() const { return aFilterName; } + const String& GetOptions() const { return aOptions; } - BOOL IsUsed() const; + BOOL IsUsed() const; DECL_LINK( RefreshHdl, ScTableLink* ); DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* ); @@ -89,34 +89,34 @@ class SfxMedium; class SC_DLLPUBLIC ScDocumentLoader { private: - ScDocShell* pDocShell; + ScDocShell* pDocShell; SfxObjectShellRef aRef; - SfxMedium* pMedium; + SfxMedium* pMedium; public: ScDocumentLoader( const String& rFileName, String& rFilterName, String& rOptions, UINT32 nRekCnt = 0, BOOL bWithInteraction = FALSE ); ~ScDocumentLoader(); - ScDocument* GetDocument(); - ScDocShell* GetDocShell() { return pDocShell; } - BOOL IsError() const; - String GetTitle() const; + ScDocument* GetDocument(); + ScDocShell* GetDocShell() { return pDocShell; } + BOOL IsError() const; + String GetTitle() const; - void ReleaseDocRef(); // without calling DoClose + void ReleaseDocRef(); // without calling DoClose - static String GetOptions( SfxMedium& rMedium ); + static String GetOptions( SfxMedium& rMedium ); /** Returns the filter name and options from a file name. @param bWithContent true = Tries to detect the filter by looking at the file contents. false = Detects filter by file name extension only (should be used in filter code only). @return TRUE if a filter could be found, FALSE otherwise. */ - static BOOL GetFilterName( const String& rFileName, + static BOOL GetFilterName( const String& rFileName, String& rFilter, String& rOptions, BOOL bWithContent, BOOL bWithInteraction ); - static void RemoveAppPrefix( String& rFilterName ); + static void RemoveAppPrefix( String& rFilterName ); }; #endif diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx index 04824571105d..875aad8fbd7b 100644 --- a/sc/inc/tabopparams.hxx +++ b/sc/inc/tabopparams.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index 2d75aa79857f..692952e6e948 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ public: virtual bool isProtected() const; virtual bool isProtectedWithPass() const; virtual void setProtected(bool bProtected); - + virtual bool isPasswordEmpty() const; virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const; virtual void setPassword(const String& aPassText); @@ -117,7 +117,7 @@ public: const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED); virtual bool verifyPassword(const String& aPassText) const; - + bool isOptionEnabled(Option eOption) const; void setOption(Option eOption, bool bEnabled); @@ -128,7 +128,7 @@ private: // ============================================================================ /** sheet protection state container - + This class stores sheet's protection state: 1) whether the protection is on, 2) password and/or password hash, and 3) any associated protection options. This class is also used as a protection state @@ -166,7 +166,7 @@ public: virtual bool isProtected() const; virtual bool isProtectedWithPass() const; virtual void setProtected(bool bProtected); - + virtual bool isPasswordEmpty() const; virtual bool hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED) const; virtual void setPassword(const String& aPassText); @@ -176,7 +176,7 @@ public: const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, ScPasswordHash eHash = PASSHASH_SHA1, ScPasswordHash eHash2 = PASSHASH_UNSPECIFIED); virtual bool verifyPassword(const String& aPassText) const; - + bool isOptionEnabled(Option eOption) const; void setOption(Option eOption, bool bEnabled); diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 15cbb57e0a40..ee5d4256764c 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,16 +64,16 @@ class ScDocShell; -#define SC_LINKTARGETTYPE_SHEET 0 -#define SC_LINKTARGETTYPE_RANGENAME 1 -#define SC_LINKTARGETTYPE_DBAREA 2 +#define SC_LINKTARGETTYPE_SHEET 0 +#define SC_LINKTARGETTYPE_RANGENAME 1 +#define SC_LINKTARGETTYPE_DBAREA 2 -#define SC_LINKTARGETTYPE_COUNT 3 +#define SC_LINKTARGETTYPE_COUNT 3 -#define SCLINKTARGET_SERVICE "com.sun.star.document.LinkTarget" +#define SCLINKTARGET_SERVICE "com.sun.star.document.LinkTarget" -//! Graphic / OleObject (need separate collections!) +//! Graphic / OleObject (need separate collections!) class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< @@ -82,31 +82,31 @@ class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< public SfxListener { private: - ScDocShell* pDocShell; - String aNames[SC_LINKTARGETTYPE_COUNT]; + ScDocShell* pDocShell; + String aNames[SC_LINKTARGETTYPE_COUNT]; public: ScLinkTargetTypesObj(ScDocShell* pDocSh); - virtual ~ScLinkTargetTypesObj(); + virtual ~ScLinkTargetTypesObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) - throw( ::com::sun::star::container::NoSuchElementException, + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -117,49 +117,49 @@ class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< public SfxListener { private: - ScDocShell* pDocShell; - sal_uInt16 nType; - String aName; + ScDocShell* pDocShell; + sal_uInt16 nType; + String aName; public: ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT); - virtual ~ScLinkTargetTypeObj(); + virtual ~ScLinkTargetTypeObj(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); + static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString& PropertyName) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) - throw( ::com::sun::star::beans::UnknownPropertyException, + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -167,8 +167,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -178,28 +178,28 @@ class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo > { private: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xCollection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xCollection; public: ScLinkTargetsObj( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & rColl ); - virtual ~ScLinkTargetsObj(); + virtual ~ScLinkTargetsObj(); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) - throw( ::com::sun::star::container::NoSuchElementException, + virtual ::com::sun::star::uno::Any SAL_CALL getByName(const ::rtl::OUString& aName) + throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& aName) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); }; diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 2c59406a3955..5bda8e30cc8d 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,7 +29,7 @@ #ifndef SC_TEXTSUNO_HXX #define SC_TEXTSUNO_HXX -#include "global.hxx" // ScRange, ScAddress +#include "global.hxx" // ScRange, ScAddress #include "address.hxx" #include <editeng/unotext.hxx> #include <svl/brdcst.hxx> @@ -56,13 +56,13 @@ class ScFieldEditEngine; struct ScHeaderFieldData; -#define SC_HDFT_LEFT 0 -#define SC_HDFT_CENTER 1 -#define SC_HDFT_RIGHT 2 +#define SC_HDFT_LEFT 0 +#define SC_HDFT_CENTER 1 +#define SC_HDFT_RIGHT 2 -// ScHeaderFooterContentObj ist ein dummer Container, der per setPropertyValue -// wieder in die Seitenvorlage geschrieben werden muss +// ScHeaderFooterContentObj ist ein dummer Container, der per setPropertyValue +// wieder in die Seitenvorlage geschrieben werden muss class ScHeaderFooterContentObj : public cppu::WeakImplHelper3< com::sun::star::sheet::XHeaderFooterContent, @@ -70,10 +70,10 @@ class ScHeaderFooterContentObj : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - EditTextObject* pLeftText; - EditTextObject* pCenterText; - EditTextObject* pRightText; - SfxBroadcaster aBC; + EditTextObject* pLeftText; + EditTextObject* pCenterText; + EditTextObject* pRightText; + SfxBroadcaster aBC; ScHeaderFooterContentObj(); // disabled @@ -81,17 +81,17 @@ public: ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ); - virtual ~ScHeaderFooterContentObj(); + virtual ~ScHeaderFooterContentObj(); // fuer ScPageHFItem (per getImplementation) - const EditTextObject* GetLeftEditObject() const { return pLeftText; } - const EditTextObject* GetCenterEditObject() const { return pCenterText; } - const EditTextObject* GetRightEditObject() const { return pRightText; } + const EditTextObject* GetLeftEditObject() const { return pLeftText; } + const EditTextObject* GetCenterEditObject() const { return pCenterText; } + const EditTextObject* GetRightEditObject() const { return pRightText; } - void AddListener( SfxListener& rListener ); - void RemoveListener( SfxListener& rListener ); + void AddListener( SfxListener& rListener ); + void RemoveListener( SfxListener& rListener ); - void UpdateText( USHORT nPart, EditEngine& rSource ); + void UpdateText( USHORT nPart, EditEngine& rSource ); // XHeaderFooterContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL @@ -120,35 +120,35 @@ public: }; -// ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj +// ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj class ScHeaderFooterTextData : public SfxListener { private: - ScHeaderFooterContentObj& rContentObj; - USHORT nPart; - ScEditEngineDefaulter* pEditEngine; - SvxEditEngineForwarder* pForwarder; - BOOL bDataValid; - BOOL bInUpdate; + ScHeaderFooterContentObj& rContentObj; + USHORT nPart; + ScEditEngineDefaulter* pEditEngine; + SvxEditEngineForwarder* pForwarder; + BOOL bDataValid; + BOOL bInUpdate; public: ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, USHORT nP ); ~ScHeaderFooterTextData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // helper functions - SvxTextForwarder* GetTextForwarder(); - void UpdateData(); - ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; } + SvxTextForwarder* GetTextForwarder(); + void UpdateData(); + ScEditEngineDefaulter* GetEditEngine() { GetTextForwarder(); return pEditEngine; } - USHORT GetPart() const { return nPart; } - ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } + USHORT GetPart() const { return nPart; } + ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } }; -// ScHeaderFooterTextObj veraendert den Text in einem ScHeaderFooterContentObj +// ScHeaderFooterTextObj veraendert den Text in einem ScHeaderFooterContentObj class ScHeaderFooterTextObj : public cppu::WeakImplHelper5< com::sun::star::text::XText, @@ -158,29 +158,29 @@ class ScHeaderFooterTextObj : public cppu::WeakImplHelper5< com::sun::star::lang::XServiceInfo > { private: - ScHeaderFooterTextData aTextData; - SvxUnoText* pUnoText; + ScHeaderFooterTextData aTextData; + SvxUnoText* pUnoText; - void CreateUnoText_Impl(); + void CreateUnoText_Impl(); public: ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, USHORT nP ); - virtual ~ScHeaderFooterTextObj(); + virtual ~ScHeaderFooterTextObj(); - const SvxUnoText& GetUnoText(); + const SvxUnoText& GetUnoText(); - static void FillDummyFieldData( ScHeaderFieldData& rData ); + static void FillDummyFieldData( ScHeaderFieldData& rData ); // XText - virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); @@ -192,11 +192,11 @@ public: createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::rtl::OUString& aString, sal_Bool bAbsorb ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw(::com::sun::star::lang::IllegalArgumentException, @@ -210,11 +210,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( const ::rtl::OUString& aString ) + virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); // XTextRangeMover - virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, sal_Int16 nParagraphs ) throw(::com::sun::star::uno::RuntimeException); @@ -244,13 +244,13 @@ public: }; -// derived cursor objects for getImplementation and getText/getStart/getEnd +// derived cursor objects for getImplementation and getText/getStart/getEnd -//! uno3: SvxUnoTextCursor is not derived from XUnoTunnel, but should be (?) +//! uno3: SvxUnoTextCursor is not derived from XUnoTunnel, but should be (?) class ScCellTextCursor : public SvxUnoTextCursor { - ScCellObj& rTextObj; + ScCellObj& rTextObj; public: ScCellTextCursor(const ScCellTextCursor& rOther); @@ -280,7 +280,7 @@ public: class ScHeaderFooterTextCursor : public SvxUnoTextCursor { private: - ScHeaderFooterTextObj& rTextObj; + ScHeaderFooterTextObj& rTextObj; public: ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther); @@ -339,21 +339,21 @@ public: // ScAnnotationTextCursor isn't needed anymore - SvxUnoTextCursor is used instead -// ScEditEngineTextObj for formatted cell content that is not inserted in a cell or header/footer -// (used for XML export of change tracking contents) +// ScEditEngineTextObj for formatted cell content that is not inserted in a cell or header/footer +// (used for XML export of change tracking contents) class ScSimpleEditSourceHelper { - ScEditEngineDefaulter* pEditEngine; - SvxEditEngineForwarder* pForwarder; - ScSimpleEditSource* pOriginalSource; + ScEditEngineDefaulter* pEditEngine; + SvxEditEngineForwarder* pForwarder; + ScSimpleEditSource* pOriginalSource; public: ScSimpleEditSourceHelper(); ~ScSimpleEditSourceHelper(); - ScSimpleEditSource* GetOriginalSource() const { return pOriginalSource; } - ScEditEngineDefaulter* GetEditEngine() const { return pEditEngine; } + ScSimpleEditSource* GetOriginalSource() const { return pOriginalSource; } + ScEditEngineDefaulter* GetEditEngine() const { return pEditEngine; } }; class ScEditEngineTextObj : public ScSimpleEditSourceHelper, public SvxUnoText @@ -362,49 +362,49 @@ public: ScEditEngineTextObj(); virtual ~ScEditEngineTextObj() throw(); - void SetText( const EditTextObject& rTextObject ); - EditTextObject* CreateTextObject(); + void SetText( const EditTextObject& rTextObject ); + EditTextObject* CreateTextObject(); }; -// ScCellTextData: shared data between sub objects of a cell text object +// ScCellTextData: shared data between sub objects of a cell text object class ScCellTextData : public SfxListener { protected: - ScDocShell* pDocShell; - ScAddress aCellPos; - ScFieldEditEngine* pEditEngine; - SvxEditEngineForwarder* pForwarder; - ScSharedCellEditSource* pOriginalSource; - BOOL bDataValid; - BOOL bInUpdate; - BOOL bDirty; - BOOL bDoUpdate; + ScDocShell* pDocShell; + ScAddress aCellPos; + ScFieldEditEngine* pEditEngine; + SvxEditEngineForwarder* pForwarder; + ScSharedCellEditSource* pOriginalSource; + BOOL bDataValid; + BOOL bInUpdate; + BOOL bDirty; + BOOL bDoUpdate; protected: virtual void GetCellText(const ScAddress& rCellPos, String& rText); public: ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellTextData(); + virtual ~ScCellTextData(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // helper functions for ScSharedCellEditSource: virtual SvxTextForwarder* GetTextForwarder(); - void UpdateData(); - ScFieldEditEngine* GetEditEngine() { GetTextForwarder(); return pEditEngine; } + void UpdateData(); + ScFieldEditEngine* GetEditEngine() { GetTextForwarder(); return pEditEngine; } - ScSharedCellEditSource* GetOriginalSource(); // used as argument for SvxUnoText ctor + ScSharedCellEditSource* GetOriginalSource(); // used as argument for SvxUnoText ctor // used for ScCellEditSource: - ScDocShell* GetDocShell() const { return pDocShell; } - const ScAddress& GetCellPos() const { return aCellPos; } + ScDocShell* GetDocShell() const { return pDocShell; } + const ScAddress& GetCellPos() const { return aCellPos; } - void SetDirty(BOOL bValue) { bDirty = bValue; } - BOOL IsDirty() const { return bDirty; } - void SetDoUpdate(BOOL bValue) { bDoUpdate = bValue; } + void SetDirty(BOOL bValue) { bDirty = bValue; } + BOOL IsDirty() const { return bDirty; } + void SetDoUpdate(BOOL bValue) { bDoUpdate = bValue; } }; class ScCellTextObj : public ScCellTextData, public SvxUnoText diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 1f62b51fce50..424e1e411ac1 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ class ScToken; typedef ::std::vector< ScComplexRefData > ScRefList; typedef formula::SimpleIntrusiveReference< class ScToken > ScTokenRef; -/** - * Another ref-counted token type using shared_ptr. <b>Be extra careful - * not to mix use of this smart pointer type with ScTokenRef</b>, since - * mixing them might cause a premature object deletion because the same - * object may be ref-counted by two different smart pointer wrappers. - * - * You have been warned. +/** + * Another ref-counted token type using shared_ptr. <b>Be extra careful + * not to mix use of this smart pointer type with ScTokenRef</b>, since + * mixing them might cause a premature object deletion because the same + * object may be ref-counted by two different smart pointer wrappers. + * + * You have been warned. */ typedef ::boost::shared_ptr< ScToken > ScSharedTokenRef; @@ -476,7 +476,7 @@ public: pD = &aDub; } ~SingleDoubleRefModifier() - { + { if ( pS ) *pS = (*pD).Ref1; } diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 6dc8191b4e82..62be11acefca 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ public: /** Determines the extent of direct adjacent references. Only use with real functions, e.g. GetOuterFuncOpCode() == ocSum ! */ - BOOL GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, + BOOL GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, const ScAddress& rPos, ScDirection ); formula::FormulaToken* AddRawToken( const ScRawToken& ); diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index e213e797a76f..bb9d224a52fe 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index 5211439fd372..850c4c74e14d 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,22 +34,22 @@ class ScUnitConverterData : public StrData { - double fValue; + double fValue; // not implemented - ScUnitConverterData& operator=( const ScUnitConverterData& ); + ScUnitConverterData& operator=( const ScUnitConverterData& ); public: ScUnitConverterData( const String& rFromUnit, const String& rToUnit, double fValue = 1.0 ); ScUnitConverterData( const ScUnitConverterData& ); - virtual ~ScUnitConverterData() {}; + virtual ~ScUnitConverterData() {}; - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - double GetValue() const { return fValue; } + double GetValue() const { return fValue; } - static void BuildIndexString( String& rStr, + static void BuildIndexString( String& rStr, const String& rFromUnit, const String& rToUnit ); }; @@ -59,13 +59,13 @@ class ScUnitConverter : public ScStrCollection { // not implemented ScUnitConverter( const ScUnitConverter& ); - ScUnitConverter& operator=( const ScUnitConverter& ); + ScUnitConverter& operator=( const ScUnitConverter& ); public: ScUnitConverter( USHORT nInit = 16, USHORT nDelta = 4 ); - virtual ~ScUnitConverter() {}; + virtual ~ScUnitConverter() {}; - BOOL GetValue( double& fValue, const String& rFromUnit, + BOOL GetValue( double& fValue, const String& rFromUnit, const String& rToUnit ) const; }; diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 2d828a1b6c6d..473697e9bbc9 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,130 +42,130 @@ #define SC_SERVICENAME_CHDATAPROV "com.sun.star.chart2.data.DataProvider" #define SC_SERVICENAME_CHRANGEHILIGHT "com.sun.star.chart2.data.RangeHighlightListener" -// document -#define SC_UNO_AREALINKS "AreaLinks" -#define SC_UNO_DDELINKS "DDELinks" +// document +#define SC_UNO_AREALINKS "AreaLinks" +#define SC_UNO_DDELINKS "DDELinks" #define SC_UNO_EXTERNALDOCLINKS "ExternalDocLinks" -#define SC_UNO_COLLABELRNG "ColumnLabelRanges" -#define SC_UNO_DATABASERNG "DatabaseRanges" -#define SC_UNO_NAMEDRANGES "NamedRanges" -#define SC_UNO_ROWLABELRNG "RowLabelRanges" -#define SC_UNO_SHEETLINKS "SheetLinks" -#define SC_UNO_FORBIDDEN "ForbiddenCharacters" -#define SC_UNO_HASDRAWPAGES "HasDrawPages" - -// CharacterProperties -#define SC_UNONAME_CCOLOR "CharColor" -#define SC_UNONAME_CHEIGHT "CharHeight" -#define SC_UNONAME_CUNDER "CharUnderline" -#define SC_UNONAME_CUNDLCOL "CharUnderlineColor" -#define SC_UNONAME_CUNDLHAS "CharUnderlineHasColor" -#define SC_UNONAME_COVER "CharOverline" -#define SC_UNONAME_COVRLCOL "CharOverlineColor" -#define SC_UNONAME_COVRLHAS "CharOverlineHasColor" -#define SC_UNONAME_CWEIGHT "CharWeight" -#define SC_UNONAME_CPOST "CharPosture" -#define SC_UNONAME_CCROSS "CharCrossedOut" -#define SC_UNONAME_CSTRIKE "CharStrikeout" -#define SC_UNONAME_CLOCAL "CharLocale" -#define SC_UNONAME_CSHADD "CharShadowed" -#define SC_UNONAME_CFONT "CharFont" -#define SC_UNONAME_COUTL "CharContoured" -#define SC_UNONAME_CEMPHAS "CharEmphasis" -#define SC_UNONAME_CFNAME "CharFontName" -#define SC_UNONAME_CFSTYLE "CharFontStyleName" -#define SC_UNONAME_CFFAMIL "CharFontFamily" -#define SC_UNONAME_CFCHARS "CharFontCharSet" -#define SC_UNONAME_CFPITCH "CharFontPitch" -#define SC_UNONAME_CRELIEF "CharRelief" -#define SC_UNONAME_CWORDMOD "CharWordMode" - -#define SC_UNO_CJK_CFNAME "CharFontNameAsian" -#define SC_UNO_CJK_CFSTYLE "CharFontStyleNameAsian" -#define SC_UNO_CJK_CFFAMIL "CharFontFamilyAsian" -#define SC_UNO_CJK_CFCHARS "CharFontCharSetAsian" -#define SC_UNO_CJK_CFPITCH "CharFontPitchAsian" -#define SC_UNO_CJK_CHEIGHT "CharHeightAsian" -#define SC_UNO_CJK_CWEIGHT "CharWeightAsian" -#define SC_UNO_CJK_CPOST "CharPostureAsian" -#define SC_UNO_CJK_CLOCAL "CharLocaleAsian" - -#define SC_UNO_CTL_CFNAME "CharFontNameComplex" -#define SC_UNO_CTL_CFSTYLE "CharFontStyleNameComplex" -#define SC_UNO_CTL_CFFAMIL "CharFontFamilyComplex" -#define SC_UNO_CTL_CFCHARS "CharFontCharSetComplex" -#define SC_UNO_CTL_CFPITCH "CharFontPitchComplex" -#define SC_UNO_CTL_CHEIGHT "CharHeightComplex" -#define SC_UNO_CTL_CWEIGHT "CharWeightComplex" -#define SC_UNO_CTL_CPOST "CharPostureComplex" -#define SC_UNO_CTL_CLOCAL "CharLocaleComplex" - -// CellProperties -#define SC_UNONAME_CELLSTYL "CellStyle" -#define SC_UNONAME_CELLBACK "CellBackColor" -#define SC_UNONAME_CELLTRAN "IsCellBackgroundTransparent" -#define SC_UNONAME_CELLPRO "CellProtection" -#define SC_UNONAME_CELLHJUS "HoriJustify" -#define SC_UNONAME_CELLVJUS "VertJustify" +#define SC_UNO_COLLABELRNG "ColumnLabelRanges" +#define SC_UNO_DATABASERNG "DatabaseRanges" +#define SC_UNO_NAMEDRANGES "NamedRanges" +#define SC_UNO_ROWLABELRNG "RowLabelRanges" +#define SC_UNO_SHEETLINKS "SheetLinks" +#define SC_UNO_FORBIDDEN "ForbiddenCharacters" +#define SC_UNO_HASDRAWPAGES "HasDrawPages" + +// CharacterProperties +#define SC_UNONAME_CCOLOR "CharColor" +#define SC_UNONAME_CHEIGHT "CharHeight" +#define SC_UNONAME_CUNDER "CharUnderline" +#define SC_UNONAME_CUNDLCOL "CharUnderlineColor" +#define SC_UNONAME_CUNDLHAS "CharUnderlineHasColor" +#define SC_UNONAME_COVER "CharOverline" +#define SC_UNONAME_COVRLCOL "CharOverlineColor" +#define SC_UNONAME_COVRLHAS "CharOverlineHasColor" +#define SC_UNONAME_CWEIGHT "CharWeight" +#define SC_UNONAME_CPOST "CharPosture" +#define SC_UNONAME_CCROSS "CharCrossedOut" +#define SC_UNONAME_CSTRIKE "CharStrikeout" +#define SC_UNONAME_CLOCAL "CharLocale" +#define SC_UNONAME_CSHADD "CharShadowed" +#define SC_UNONAME_CFONT "CharFont" +#define SC_UNONAME_COUTL "CharContoured" +#define SC_UNONAME_CEMPHAS "CharEmphasis" +#define SC_UNONAME_CFNAME "CharFontName" +#define SC_UNONAME_CFSTYLE "CharFontStyleName" +#define SC_UNONAME_CFFAMIL "CharFontFamily" +#define SC_UNONAME_CFCHARS "CharFontCharSet" +#define SC_UNONAME_CFPITCH "CharFontPitch" +#define SC_UNONAME_CRELIEF "CharRelief" +#define SC_UNONAME_CWORDMOD "CharWordMode" + +#define SC_UNO_CJK_CFNAME "CharFontNameAsian" +#define SC_UNO_CJK_CFSTYLE "CharFontStyleNameAsian" +#define SC_UNO_CJK_CFFAMIL "CharFontFamilyAsian" +#define SC_UNO_CJK_CFCHARS "CharFontCharSetAsian" +#define SC_UNO_CJK_CFPITCH "CharFontPitchAsian" +#define SC_UNO_CJK_CHEIGHT "CharHeightAsian" +#define SC_UNO_CJK_CWEIGHT "CharWeightAsian" +#define SC_UNO_CJK_CPOST "CharPostureAsian" +#define SC_UNO_CJK_CLOCAL "CharLocaleAsian" + +#define SC_UNO_CTL_CFNAME "CharFontNameComplex" +#define SC_UNO_CTL_CFSTYLE "CharFontStyleNameComplex" +#define SC_UNO_CTL_CFFAMIL "CharFontFamilyComplex" +#define SC_UNO_CTL_CFCHARS "CharFontCharSetComplex" +#define SC_UNO_CTL_CFPITCH "CharFontPitchComplex" +#define SC_UNO_CTL_CHEIGHT "CharHeightComplex" +#define SC_UNO_CTL_CWEIGHT "CharWeightComplex" +#define SC_UNO_CTL_CPOST "CharPostureComplex" +#define SC_UNO_CTL_CLOCAL "CharLocaleComplex" + +// CellProperties +#define SC_UNONAME_CELLSTYL "CellStyle" +#define SC_UNONAME_CELLBACK "CellBackColor" +#define SC_UNONAME_CELLTRAN "IsCellBackgroundTransparent" +#define SC_UNONAME_CELLPRO "CellProtection" +#define SC_UNONAME_CELLHJUS "HoriJustify" +#define SC_UNONAME_CELLVJUS "VertJustify" #define SC_UNONAME_CELLHJUS_METHOD "HoriJustifyMethod" #define SC_UNONAME_CELLVJUS_METHOD "VertJustifyMethod" -#define SC_UNONAME_CELLORI "Orientation" -#define SC_UNONAME_NUMFMT "NumberFormat" -#define SC_UNONAME_SHADOW "ShadowFormat" -#define SC_UNONAME_TBLBORD "TableBorder" -#define SC_UNONAME_WRAP "IsTextWrapped" -#define SC_UNONAME_PINDENT "ParaIndent" -#define SC_UNONAME_PTMARGIN "ParaTopMargin" -#define SC_UNONAME_PBMARGIN "ParaBottomMargin" -#define SC_UNONAME_PLMARGIN "ParaLeftMargin" -#define SC_UNONAME_PRMARGIN "ParaRightMargin" -#define SC_UNONAME_ROTANG "RotateAngle" -#define SC_UNONAME_ROTREF "RotateReference" -#define SC_UNONAME_ASIANVERT "AsianVerticalMode" -#define SC_UNONAME_WRITING "WritingMode" - -#define SC_UNONAME_BOTTBORDER "BottomBorder" -#define SC_UNONAME_LEFTBORDER "LeftBorder" -#define SC_UNONAME_RIGHTBORDER "RightBorder" -#define SC_UNONAME_TOPBORDER "TopBorder" +#define SC_UNONAME_CELLORI "Orientation" +#define SC_UNONAME_NUMFMT "NumberFormat" +#define SC_UNONAME_SHADOW "ShadowFormat" +#define SC_UNONAME_TBLBORD "TableBorder" +#define SC_UNONAME_WRAP "IsTextWrapped" +#define SC_UNONAME_PINDENT "ParaIndent" +#define SC_UNONAME_PTMARGIN "ParaTopMargin" +#define SC_UNONAME_PBMARGIN "ParaBottomMargin" +#define SC_UNONAME_PLMARGIN "ParaLeftMargin" +#define SC_UNONAME_PRMARGIN "ParaRightMargin" +#define SC_UNONAME_ROTANG "RotateAngle" +#define SC_UNONAME_ROTREF "RotateReference" +#define SC_UNONAME_ASIANVERT "AsianVerticalMode" +#define SC_UNONAME_WRITING "WritingMode" + +#define SC_UNONAME_BOTTBORDER "BottomBorder" +#define SC_UNONAME_LEFTBORDER "LeftBorder" +#define SC_UNONAME_RIGHTBORDER "RightBorder" +#define SC_UNONAME_TOPBORDER "TopBorder" #define SC_UNONAME_DIAGONAL_TLBR "DiagonalTLBR" #define SC_UNONAME_DIAGONAL_BLTR "DiagonalBLTR" #define SC_UNONAME_SHRINK_TO_FIT "ShrinkToFit" -#define SC_UNONAME_PISHANG "ParaIsHangingPunctuation" -#define SC_UNONAME_PISCHDIST "ParaIsCharacterDistance" -#define SC_UNONAME_PISFORBID "ParaIsForbiddenRules" -#define SC_UNONAME_PISHYPHEN "ParaIsHyphenation" -#define SC_UNONAME_PADJUST "ParaAdjust" -#define SC_UNONAME_PLASTADJ "ParaLastLineAdjust" +#define SC_UNONAME_PISHANG "ParaIsHangingPunctuation" +#define SC_UNONAME_PISCHDIST "ParaIsCharacterDistance" +#define SC_UNONAME_PISFORBID "ParaIsForbiddenRules" +#define SC_UNONAME_PISHYPHEN "ParaIsHyphenation" +#define SC_UNONAME_PADJUST "ParaAdjust" +#define SC_UNONAME_PLASTADJ "ParaLastLineAdjust" -#define SC_UNONAME_NUMRULES "NumberingRules" +#define SC_UNONAME_NUMRULES "NumberingRules" -// Styles -#define SC_UNONAME_DISPNAME "DisplayName" +// Styles +#define SC_UNONAME_DISPNAME "DisplayName" -// XStyleLoader -#define SC_UNONAME_OVERWSTL "OverwriteStyles" -#define SC_UNONAME_LOADCELL "LoadCellStyles" -#define SC_UNONAME_LOADPAGE "LoadPageStyles" +// XStyleLoader +#define SC_UNONAME_OVERWSTL "OverwriteStyles" +#define SC_UNONAME_LOADCELL "LoadCellStyles" +#define SC_UNONAME_LOADPAGE "LoadPageStyles" -// SheetCellRange -#define SC_UNONAME_POS "Position" -#define SC_UNONAME_SIZE "Size" +// SheetCellRange +#define SC_UNONAME_POS "Position" +#define SC_UNONAME_SIZE "Size" #define SC_UNONAME_ABSNAME "AbsoluteName" -// column/row/sheet -#define SC_UNONAME_CELLHGT "Height" -#define SC_UNONAME_CELLWID "Width" -#define SC_UNONAME_CELLVIS "IsVisible" -#define SC_UNONAME_CELLFILT "IsFiltered" -#define SC_UNONAME_MANPAGE "IsManualPageBreak" -#define SC_UNONAME_NEWPAGE "IsStartOfNewPage" -#define SC_UNONAME_OHEIGHT "OptimalHeight" -#define SC_UNONAME_OWIDTH "OptimalWidth" -#define SC_UNONAME_PAGESTL "PageStyle" +// column/row/sheet +#define SC_UNONAME_CELLHGT "Height" +#define SC_UNONAME_CELLWID "Width" +#define SC_UNONAME_CELLVIS "IsVisible" +#define SC_UNONAME_CELLFILT "IsFiltered" +#define SC_UNONAME_MANPAGE "IsManualPageBreak" +#define SC_UNONAME_NEWPAGE "IsStartOfNewPage" +#define SC_UNONAME_OHEIGHT "OptimalHeight" +#define SC_UNONAME_OWIDTH "OptimalWidth" +#define SC_UNONAME_PAGESTL "PageStyle" #define SC_UNONAME_ISACTIVE "IsActive" #define SC_UNONAME_BORDCOL "BorderColor" #define SC_UNONAME_PROTECT "Protected" @@ -178,12 +178,12 @@ #define SC_UNONAME_AUTOPRINT "AutomaticPrintArea" #define SC_UNONAME_TABCOLOR "TabColor" -// LinkTarget -#define SC_UNO_LINKDISPBIT "LinkDisplayBitmap" -#define SC_UNO_LINKDISPNAME "LinkDisplayName" +// LinkTarget +#define SC_UNO_LINKDISPBIT "LinkDisplayBitmap" +#define SC_UNO_LINKDISPNAME "LinkDisplayName" -// drawing objects -#define SC_UNONAME_IMAGEMAP "ImageMap" +// drawing objects +#define SC_UNONAME_IMAGEMAP "ImageMap" #define SC_UNONAME_ANCHOR "Anchor" #define SC_UNONAME_HORIPOS "HoriOrientPosition" #define SC_UNONAME_VERTPOS "VertOrientPosition" @@ -192,58 +192,58 @@ #define SC_UNONAME_MOVEPROTECT "MoveProtect" #define SC_UNONAME_SIZEPROTECT "SizeProtect" -// other cell properties -#define SC_UNONAME_CHCOLHDR "ChartColumnAsLabel" -#define SC_UNONAME_CHROWHDR "ChartRowAsLabel" -#define SC_UNONAME_CONDFMT "ConditionalFormat" -#define SC_UNONAME_CONDLOC "ConditionalFormatLocal" -#define SC_UNONAME_CONDXML "ConditionalFormatXML" -#define SC_UNONAME_VALIDAT "Validation" -#define SC_UNONAME_VALILOC "ValidationLocal" -#define SC_UNONAME_VALIXML "ValidationXML" -#define SC_UNONAME_FORMLOC "FormulaLocal" -#define SC_UNONAME_FORMRT "FormulaResultType" - -#define SC_UNONAME_USERDEF "UserDefinedAttributes" -#define SC_UNONAME_TEXTUSER "TextUserDefinedAttributes" - -// auto format -#define SC_UNONAME_INCBACK "IncludeBackground" -#define SC_UNONAME_INCBORD "IncludeBorder" -#define SC_UNONAME_INCFONT "IncludeFont" -#define SC_UNONAME_INCJUST "IncludeJustify" -#define SC_UNONAME_INCNUM "IncludeNumberFormat" -#define SC_UNONAME_INCWIDTH "IncludeWidthAndHeight" - -// function description -#define SC_UNONAME_ARGUMENTS "Arguments" -#define SC_UNONAME_CATEGORY "Category" -#define SC_UNONAME_DESCRIPTION "Description" -#define SC_UNONAME_ID "Id" -#define SC_UNONAME_NAME "Name" - -// application settings -#define SC_UNONAME_DOAUTOCP "DoAutoComplete" -#define SC_UNONAME_ENTERED "EnterEdit" -#define SC_UNONAME_EXPREF "ExpandReferences" -#define SC_UNONAME_EXTFMT "ExtendFormat" -#define SC_UNONAME_LINKUPD "LinkUpdateMode" -#define SC_UNONAME_MARKHDR "MarkHeader" -#define SC_UNONAME_METRIC "Metric" -#define SC_UNONAME_MOVEDIR "MoveDirection" -#define SC_UNONAME_MOVESEL "MoveSelection" -#define SC_UNONAME_RANGEFIN "RangeFinder" -#define SC_UNONAME_SCALE "Scale" -#define SC_UNONAME_STBFUNC "StatusBarFunction" -#define SC_UNONAME_ULISTS "UserLists" -#define SC_UNONAME_USETABCOL "UseTabCol" -#define SC_UNONAME_PRMETRICS "UsePrinterMetrics" -#define SC_UNONAME_PRALLSH "PrintAllSheets" -#define SC_UNONAME_PREMPTY "PrintEmptyPages" +// other cell properties +#define SC_UNONAME_CHCOLHDR "ChartColumnAsLabel" +#define SC_UNONAME_CHROWHDR "ChartRowAsLabel" +#define SC_UNONAME_CONDFMT "ConditionalFormat" +#define SC_UNONAME_CONDLOC "ConditionalFormatLocal" +#define SC_UNONAME_CONDXML "ConditionalFormatXML" +#define SC_UNONAME_VALIDAT "Validation" +#define SC_UNONAME_VALILOC "ValidationLocal" +#define SC_UNONAME_VALIXML "ValidationXML" +#define SC_UNONAME_FORMLOC "FormulaLocal" +#define SC_UNONAME_FORMRT "FormulaResultType" + +#define SC_UNONAME_USERDEF "UserDefinedAttributes" +#define SC_UNONAME_TEXTUSER "TextUserDefinedAttributes" + +// auto format +#define SC_UNONAME_INCBACK "IncludeBackground" +#define SC_UNONAME_INCBORD "IncludeBorder" +#define SC_UNONAME_INCFONT "IncludeFont" +#define SC_UNONAME_INCJUST "IncludeJustify" +#define SC_UNONAME_INCNUM "IncludeNumberFormat" +#define SC_UNONAME_INCWIDTH "IncludeWidthAndHeight" + +// function description +#define SC_UNONAME_ARGUMENTS "Arguments" +#define SC_UNONAME_CATEGORY "Category" +#define SC_UNONAME_DESCRIPTION "Description" +#define SC_UNONAME_ID "Id" +#define SC_UNONAME_NAME "Name" + +// application settings +#define SC_UNONAME_DOAUTOCP "DoAutoComplete" +#define SC_UNONAME_ENTERED "EnterEdit" +#define SC_UNONAME_EXPREF "ExpandReferences" +#define SC_UNONAME_EXTFMT "ExtendFormat" +#define SC_UNONAME_LINKUPD "LinkUpdateMode" +#define SC_UNONAME_MARKHDR "MarkHeader" +#define SC_UNONAME_METRIC "Metric" +#define SC_UNONAME_MOVEDIR "MoveDirection" +#define SC_UNONAME_MOVESEL "MoveSelection" +#define SC_UNONAME_RANGEFIN "RangeFinder" +#define SC_UNONAME_SCALE "Scale" +#define SC_UNONAME_STBFUNC "StatusBarFunction" +#define SC_UNONAME_ULISTS "UserLists" +#define SC_UNONAME_USETABCOL "UseTabCol" +#define SC_UNONAME_PRMETRICS "UsePrinterMetrics" +#define SC_UNONAME_PRALLSH "PrintAllSheets" +#define SC_UNONAME_PREMPTY "PrintEmptyPages" #define SC_UNONAME_REPLWARN "ReplaceCellsWarning" -// data pilot field -#define SC_UNONAME_FUNCTION "Function" +// data pilot field +#define SC_UNONAME_FUNCTION "Function" #define SC_UNONAME_SUBTOTALS "Subtotals" #define SC_UNONAME_SELPAGE "SelectedPage" #define SC_UNONAME_USESELPAGE "UseSelectedPage" @@ -259,44 +259,44 @@ #define SC_UNONAME_GROUPINFO "GroupInfo" #define SC_UNONAME_SHOWEMPTY "ShowEmpty" -// data pilot item +// data pilot item #define SC_UNONAME_SHOWDETAIL "ShowDetail" #define SC_UNONAME_ISHIDDEN "IsHidden" -// database options -#define SC_UNONAME_CASE "CaseSensitive" -#define SC_UNONAME_DBNAME "DatabaseName" -#define SC_UNONAME_FORMATS "IncludeFormats" -#define SC_UNONAME_INSBRK "InsertPageBreaks" -#define SC_UNONAME_KEEPFORM "KeepFormats" -#define SC_UNONAME_MOVCELLS "MoveCells" -#define SC_UNONAME_ISUSER "IsUserDefined" -#define SC_UNONAME_ISNATIVE "IsNative" -#define SC_UNONAME_REGEXP "RegularExpressions" -#define SC_UNONAME_SAVEOUT "SaveOutputPosition" -#define SC_UNONAME_SKIPDUP "SkipDuplicates" -#define SC_UNONAME_SRCOBJ "SourceObject" -#define SC_UNONAME_SRCTYPE "SourceType" -#define SC_UNONAME_STRIPDAT "StripData" -#define SC_UNONAME_UNIQUE "UniqueOnly" -#define SC_UNONAME_USEREGEX "UseRegularExpressions" -#define SC_UNONAME_ULIST "UserListEnabled" -#define SC_UNONAME_UINDEX "UserListIndex" -#define SC_UNONAME_BINDFMT "BindFormatsToContent" -#define SC_UNONAME_COPYOUT "CopyOutputData" -#define SC_UNONAME_ISCASE "IsCaseSensitive" -#define SC_UNONAME_ISULIST "IsUserListEnabled" -#define SC_UNONAME_OUTPOS "OutputPosition" -#define SC_UNONAME_CONTHDR "ContainsHeader" -#define SC_UNONAME_MAXFLD "MaxFieldCount" -#define SC_UNONAME_ORIENT "Orientation" +// database options +#define SC_UNONAME_CASE "CaseSensitive" +#define SC_UNONAME_DBNAME "DatabaseName" +#define SC_UNONAME_FORMATS "IncludeFormats" +#define SC_UNONAME_INSBRK "InsertPageBreaks" +#define SC_UNONAME_KEEPFORM "KeepFormats" +#define SC_UNONAME_MOVCELLS "MoveCells" +#define SC_UNONAME_ISUSER "IsUserDefined" +#define SC_UNONAME_ISNATIVE "IsNative" +#define SC_UNONAME_REGEXP "RegularExpressions" +#define SC_UNONAME_SAVEOUT "SaveOutputPosition" +#define SC_UNONAME_SKIPDUP "SkipDuplicates" +#define SC_UNONAME_SRCOBJ "SourceObject" +#define SC_UNONAME_SRCTYPE "SourceType" +#define SC_UNONAME_STRIPDAT "StripData" +#define SC_UNONAME_UNIQUE "UniqueOnly" +#define SC_UNONAME_USEREGEX "UseRegularExpressions" +#define SC_UNONAME_ULIST "UserListEnabled" +#define SC_UNONAME_UINDEX "UserListIndex" +#define SC_UNONAME_BINDFMT "BindFormatsToContent" +#define SC_UNONAME_COPYOUT "CopyOutputData" +#define SC_UNONAME_ISCASE "IsCaseSensitive" +#define SC_UNONAME_ISULIST "IsUserListEnabled" +#define SC_UNONAME_OUTPOS "OutputPosition" +#define SC_UNONAME_CONTHDR "ContainsHeader" +#define SC_UNONAME_MAXFLD "MaxFieldCount" +#define SC_UNONAME_ORIENT "Orientation" #define SC_UNONAME_ISSORTCOLUMNS "IsSortColumns" -#define SC_UNONAME_SORTFLD "SortFields" -#define SC_UNONAME_SORTASC "SortAscending" -#define SC_UNONAME_ENUSLIST "EnableUserSortList" -#define SC_UNONAME_USINDEX "UserSortListIndex" -#define SC_UNONAME_COLLLOC "CollatorLocale" -#define SC_UNONAME_COLLALG "CollatorAlgorithm" +#define SC_UNONAME_SORTFLD "SortFields" +#define SC_UNONAME_SORTASC "SortAscending" +#define SC_UNONAME_ENUSLIST "EnableUserSortList" +#define SC_UNONAME_USINDEX "UserSortListIndex" +#define SC_UNONAME_COLLLOC "CollatorLocale" +#define SC_UNONAME_COLLALG "CollatorAlgorithm" #define SC_UNONAME_AUTOFLT "AutoFilter" #define SC_UNONAME_FLTCRT "FilterCriteriaSource" #define SC_UNONAME_USEFLTCRT "UseFilterCriteriaSource" @@ -306,170 +306,170 @@ #define SC_UNONAME_TOKENINDEX "TokenIndex" #define SC_UNONAME_ISSHAREDFMLA "IsSharedFormula" -// text fields -#define SC_UNONAME_ANCTYPE "AnchorType" -#define SC_UNONAME_ANCTYPES "AnchorTypes" -#define SC_UNONAME_TEXTWRAP "TextWrap" -#define SC_UNONAME_FILEFORM "FileFormat" - -// url field -#define SC_UNONAME_REPR "Representation" -#define SC_UNONAME_TARGET "TargetFrame" -#define SC_UNONAME_URL "URL" - -// conditional format -#define SC_UNONAME_OPERATOR "Operator" -#define SC_UNONAME_FORMULA1 "Formula1" -#define SC_UNONAME_FORMULA2 "Formula2" -#define SC_UNONAME_SOURCEPOS "SourcePosition" +// text fields +#define SC_UNONAME_ANCTYPE "AnchorType" +#define SC_UNONAME_ANCTYPES "AnchorTypes" +#define SC_UNONAME_TEXTWRAP "TextWrap" +#define SC_UNONAME_FILEFORM "FileFormat" + +// url field +#define SC_UNONAME_REPR "Representation" +#define SC_UNONAME_TARGET "TargetFrame" +#define SC_UNONAME_URL "URL" + +// conditional format +#define SC_UNONAME_OPERATOR "Operator" +#define SC_UNONAME_FORMULA1 "Formula1" +#define SC_UNONAME_FORMULA2 "Formula2" +#define SC_UNONAME_SOURCEPOS "SourcePosition" #define SC_UNONAME_SOURCESTR "SourcePositionAsString" // only for use in XML filter #define SC_UNONAME_FORMULANMSP1 "FormulaNamespace1" // only for use in XML filter #define SC_UNONAME_FORMULANMSP2 "FormulaNamespace2" // only for use in XML filter #define SC_UNONAME_GRAMMAR1 "Grammar1" // only for use in XML filter #define SC_UNONAME_GRAMMAR2 "Grammar2" // only for use in XML filter -#define SC_UNONAME_STYLENAME "StyleName" - -// validation -#define SC_UNONAME_ERRALSTY "ErrorAlertStyle" -#define SC_UNONAME_ERRMESS "ErrorMessage" -#define SC_UNONAME_ERRTITLE "ErrorTitle" -#define SC_UNONAME_IGNOREBL "IgnoreBlankCells" -#define SC_UNONAME_INPMESS "InputMessage" -#define SC_UNONAME_INPTITLE "InputTitle" -#define SC_UNONAME_SHOWERR "ShowErrorMessage" -#define SC_UNONAME_SHOWINP "ShowInputMessage" +#define SC_UNONAME_STYLENAME "StyleName" + +// validation +#define SC_UNONAME_ERRALSTY "ErrorAlertStyle" +#define SC_UNONAME_ERRMESS "ErrorMessage" +#define SC_UNONAME_ERRTITLE "ErrorTitle" +#define SC_UNONAME_IGNOREBL "IgnoreBlankCells" +#define SC_UNONAME_INPMESS "InputMessage" +#define SC_UNONAME_INPTITLE "InputTitle" +#define SC_UNONAME_SHOWERR "ShowErrorMessage" +#define SC_UNONAME_SHOWINP "ShowInputMessage" #define SC_UNONAME_SHOWLIST "ShowList" -#define SC_UNONAME_TYPE "Type" - -// links -#define SC_UNONAME_FILTER "Filter" -#define SC_UNONAME_FILTOPT "FilterOptions" -#define SC_UNONAME_LINKURL "Url" -#define SC_UNONAME_REFPERIOD "RefreshPeriod" -#define SC_UNONAME_REFDELAY "RefreshDelay" // deprecated, don't use anymore - -// search descriptor -#define SC_UNO_SRCHBACK "SearchBackwards" -#define SC_UNO_SRCHBYROW "SearchByRow" -#define SC_UNO_SRCHCASE "SearchCaseSensitive" -#define SC_UNO_SRCHREGEXP "SearchRegularExpression" -#define SC_UNO_SRCHSIM "SearchSimilarity" -#define SC_UNO_SRCHSIMADD "SearchSimilarityAdd" -#define SC_UNO_SRCHSIMEX "SearchSimilarityExchange" -#define SC_UNO_SRCHSIMREL "SearchSimilarityRelax" -#define SC_UNO_SRCHSIMREM "SearchSimilarityRemove" -#define SC_UNO_SRCHSTYLES "SearchStyles" -#define SC_UNO_SRCHTYPE "SearchType" -#define SC_UNO_SRCHWORDS "SearchWords" +#define SC_UNONAME_TYPE "Type" + +// links +#define SC_UNONAME_FILTER "Filter" +#define SC_UNONAME_FILTOPT "FilterOptions" +#define SC_UNONAME_LINKURL "Url" +#define SC_UNONAME_REFPERIOD "RefreshPeriod" +#define SC_UNONAME_REFDELAY "RefreshDelay" // deprecated, don't use anymore + +// search descriptor +#define SC_UNO_SRCHBACK "SearchBackwards" +#define SC_UNO_SRCHBYROW "SearchByRow" +#define SC_UNO_SRCHCASE "SearchCaseSensitive" +#define SC_UNO_SRCHREGEXP "SearchRegularExpression" +#define SC_UNO_SRCHSIM "SearchSimilarity" +#define SC_UNO_SRCHSIMADD "SearchSimilarityAdd" +#define SC_UNO_SRCHSIMEX "SearchSimilarityExchange" +#define SC_UNO_SRCHSIMREL "SearchSimilarityRelax" +#define SC_UNO_SRCHSIMREM "SearchSimilarityRemove" +#define SC_UNO_SRCHSTYLES "SearchStyles" +#define SC_UNO_SRCHTYPE "SearchType" +#define SC_UNO_SRCHWORDS "SearchWords" #define SC_UNO_SRCHFILTERED "SearchFiltered" -// old (5.2) property names for page styles - for compatibility only! -#define OLD_UNO_PAGE_BACKCOLOR "BackgroundColor" -#define OLD_UNO_PAGE_BACKTRANS "IsBackgroundTransparent" -#define OLD_UNO_PAGE_HDRBACKCOL "HeaderBackgroundColor" -#define OLD_UNO_PAGE_HDRBACKTRAN "TransparentHeaderBackground" -#define OLD_UNO_PAGE_HDRSHARED "HeaderShared" -#define OLD_UNO_PAGE_HDRDYNAMIC "HeaderDynamic" -#define OLD_UNO_PAGE_HDRON "HeaderOn" -#define OLD_UNO_PAGE_FTRBACKCOL "FooterBackgroundColor" -#define OLD_UNO_PAGE_FTRBACKTRAN "TransparentFooterBackground" -#define OLD_UNO_PAGE_FTRSHARED "FooterShared" -#define OLD_UNO_PAGE_FTRDYNAMIC "FooterDynamic" -#define OLD_UNO_PAGE_FTRON "FooterOn" - -// page styles -#define SC_UNO_PAGE_BACKCOLOR "BackColor" -#define SC_UNO_PAGE_BACKTRANS "BackTransparent" -#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" -#define SC_UNO_PAGE_GRAPHICLOC "BackGraphicLocation" -#define SC_UNO_PAGE_GRAPHICURL "BackGraphicURL" -#define SC_UNO_PAGE_LEFTBORDER SC_UNONAME_LEFTBORDER -#define SC_UNO_PAGE_RIGHTBORDER SC_UNONAME_RIGHTBORDER -#define SC_UNO_PAGE_BOTTBORDER SC_UNONAME_BOTTBORDER -#define SC_UNO_PAGE_TOPBORDER SC_UNONAME_TOPBORDER -#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" -#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" -#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" -#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" -#define SC_UNO_PAGE_BORDERDIST "BorderDistance" -#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" -#define SC_UNO_PAGE_LEFTMARGIN "LeftMargin" -#define SC_UNO_PAGE_RIGHTMARGIN "RightMargin" -#define SC_UNO_PAGE_TOPMARGIN "TopMargin" -#define SC_UNO_PAGE_BOTTMARGIN "BottomMargin" -#define SC_UNO_PAGE_LANDSCAPE "IsLandscape" -#define SC_UNO_PAGE_NUMBERTYPE "NumberingType" -#define SC_UNO_PAGE_SYTLELAYOUT "PageStyleLayout" -#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" -#define SC_UNO_PAGE_SIZE "Size" -#define SC_UNO_PAGE_WIDTH "Width" -#define SC_UNO_PAGE_HEIGHT "Height" -#define SC_UNO_PAGE_CENTERHOR "CenterHorizontally" -#define SC_UNO_PAGE_CENTERVER "CenterVertically" -#define SC_UNO_PAGE_PRINTANNOT "PrintAnnotations" -#define SC_UNO_PAGE_PRINTGRID "PrintGrid" -#define SC_UNO_PAGE_PRINTHEADER "PrintHeaders" -#define SC_UNO_PAGE_PRINTCHARTS "PrintCharts" -#define SC_UNO_PAGE_PRINTOBJS "PrintObjects" -#define SC_UNO_PAGE_PRINTDRAW "PrintDrawing" -#define SC_UNO_PAGE_PRINTDOWN "PrintDownFirst" -#define SC_UNO_PAGE_SCALEVAL "PageScale" -#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" +// old (5.2) property names for page styles - for compatibility only! +#define OLD_UNO_PAGE_BACKCOLOR "BackgroundColor" +#define OLD_UNO_PAGE_BACKTRANS "IsBackgroundTransparent" +#define OLD_UNO_PAGE_HDRBACKCOL "HeaderBackgroundColor" +#define OLD_UNO_PAGE_HDRBACKTRAN "TransparentHeaderBackground" +#define OLD_UNO_PAGE_HDRSHARED "HeaderShared" +#define OLD_UNO_PAGE_HDRDYNAMIC "HeaderDynamic" +#define OLD_UNO_PAGE_HDRON "HeaderOn" +#define OLD_UNO_PAGE_FTRBACKCOL "FooterBackgroundColor" +#define OLD_UNO_PAGE_FTRBACKTRAN "TransparentFooterBackground" +#define OLD_UNO_PAGE_FTRSHARED "FooterShared" +#define OLD_UNO_PAGE_FTRDYNAMIC "FooterDynamic" +#define OLD_UNO_PAGE_FTRON "FooterOn" + +// page styles +#define SC_UNO_PAGE_BACKCOLOR "BackColor" +#define SC_UNO_PAGE_BACKTRANS "BackTransparent" +#define SC_UNO_PAGE_GRAPHICFILT "BackGraphicFilter" +#define SC_UNO_PAGE_GRAPHICLOC "BackGraphicLocation" +#define SC_UNO_PAGE_GRAPHICURL "BackGraphicURL" +#define SC_UNO_PAGE_LEFTBORDER SC_UNONAME_LEFTBORDER +#define SC_UNO_PAGE_RIGHTBORDER SC_UNONAME_RIGHTBORDER +#define SC_UNO_PAGE_BOTTBORDER SC_UNONAME_BOTTBORDER +#define SC_UNO_PAGE_TOPBORDER SC_UNONAME_TOPBORDER +#define SC_UNO_PAGE_LEFTBRDDIST "LeftBorderDistance" +#define SC_UNO_PAGE_RIGHTBRDDIST "RightBorderDistance" +#define SC_UNO_PAGE_BOTTBRDDIST "BottomBorderDistance" +#define SC_UNO_PAGE_TOPBRDDIST "TopBorderDistance" +#define SC_UNO_PAGE_BORDERDIST "BorderDistance" +#define SC_UNO_PAGE_SHADOWFORM "ShadowFormat" +#define SC_UNO_PAGE_LEFTMARGIN "LeftMargin" +#define SC_UNO_PAGE_RIGHTMARGIN "RightMargin" +#define SC_UNO_PAGE_TOPMARGIN "TopMargin" +#define SC_UNO_PAGE_BOTTMARGIN "BottomMargin" +#define SC_UNO_PAGE_LANDSCAPE "IsLandscape" +#define SC_UNO_PAGE_NUMBERTYPE "NumberingType" +#define SC_UNO_PAGE_SYTLELAYOUT "PageStyleLayout" +#define SC_UNO_PAGE_PAPERTRAY "PrinterPaperTray" +#define SC_UNO_PAGE_SIZE "Size" +#define SC_UNO_PAGE_WIDTH "Width" +#define SC_UNO_PAGE_HEIGHT "Height" +#define SC_UNO_PAGE_CENTERHOR "CenterHorizontally" +#define SC_UNO_PAGE_CENTERVER "CenterVertically" +#define SC_UNO_PAGE_PRINTANNOT "PrintAnnotations" +#define SC_UNO_PAGE_PRINTGRID "PrintGrid" +#define SC_UNO_PAGE_PRINTHEADER "PrintHeaders" +#define SC_UNO_PAGE_PRINTCHARTS "PrintCharts" +#define SC_UNO_PAGE_PRINTOBJS "PrintObjects" +#define SC_UNO_PAGE_PRINTDRAW "PrintDrawing" +#define SC_UNO_PAGE_PRINTDOWN "PrintDownFirst" +#define SC_UNO_PAGE_SCALEVAL "PageScale" +#define SC_UNO_PAGE_SCALETOPAG "ScaleToPages" #define SC_UNO_PAGE_SCALETOX "ScaleToPagesX" #define SC_UNO_PAGE_SCALETOY "ScaleToPagesY" -#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" -#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" -#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" -#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" -#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" -#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" -#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" -#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" -#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" -#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" -#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" -#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" -#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" -#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" -#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" -#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" -#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" -#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" -#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" -#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" -#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" -#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" -#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" -#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" -#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" -#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" -#define SC_UNO_PAGE_HDRON "HeaderIsOn" -#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" -#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" -#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" -#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" -#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" -#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" -#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" -#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" -#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" -#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" -#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" -#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" -#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" -#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" -#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" -#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" -#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" -#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" -#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" -#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" -#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" -#define SC_UNO_PAGE_FTRON "FooterIsOn" -#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" -#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" - -// document settings +#define SC_UNO_PAGE_FIRSTPAGE "FirstPageNumber" +#define SC_UNO_PAGE_LEFTHDRCONT "LeftPageHeaderContent" +#define SC_UNO_PAGE_LEFTFTRCONT "LeftPageFooterContent" +#define SC_UNO_PAGE_RIGHTHDRCON "RightPageHeaderContent" +#define SC_UNO_PAGE_RIGHTFTRCON "RightPageFooterContent" +#define SC_UNO_PAGE_PRINTFORMUL "PrintFormulas" +#define SC_UNO_PAGE_PRINTZERO "PrintZeroValues" +#define SC_UNO_PAGE_HDRBACKCOL "HeaderBackColor" +#define SC_UNO_PAGE_HDRBACKTRAN "HeaderBackTransparent" +#define SC_UNO_PAGE_HDRGRFFILT "HeaderBackGraphicFilter" +#define SC_UNO_PAGE_HDRGRFLOC "HeaderBackGraphicLocation" +#define SC_UNO_PAGE_HDRGRFURL "HeaderBackGraphicURL" +#define SC_UNO_PAGE_HDRLEFTBOR "HeaderLeftBorder" +#define SC_UNO_PAGE_HDRRIGHTBOR "HeaderRightBorder" +#define SC_UNO_PAGE_HDRBOTTBOR "HeaderBottomBorder" +#define SC_UNO_PAGE_HDRTOPBOR "HeaderTopBorder" +#define SC_UNO_PAGE_HDRLEFTBDIS "HeaderLeftBorderDistance" +#define SC_UNO_PAGE_HDRRIGHTBDIS "HeaderRightBorderDistance" +#define SC_UNO_PAGE_HDRBOTTBDIS "HeaderBottomBorderDistance" +#define SC_UNO_PAGE_HDRTOPBDIS "HeaderTopBorderDistance" +#define SC_UNO_PAGE_HDRBRDDIST "HeaderBorderDistance" +#define SC_UNO_PAGE_HDRSHADOW "HeaderShadowFormat" +#define SC_UNO_PAGE_HDRLEFTMAR "HeaderLeftMargin" +#define SC_UNO_PAGE_HDRRIGHTMAR "HeaderRightMargin" +#define SC_UNO_PAGE_HDRBODYDIST "HeaderBodyDistance" +#define SC_UNO_PAGE_HDRHEIGHT "HeaderHeight" +#define SC_UNO_PAGE_HDRON "HeaderIsOn" +#define SC_UNO_PAGE_HDRDYNAMIC "HeaderIsDynamicHeight" +#define SC_UNO_PAGE_HDRSHARED "HeaderIsShared" +#define SC_UNO_PAGE_FTRBACKCOL "FooterBackColor" +#define SC_UNO_PAGE_FTRBACKTRAN "FooterBackTransparent" +#define SC_UNO_PAGE_FTRGRFFILT "FooterBackGraphicFilter" +#define SC_UNO_PAGE_FTRGRFLOC "FooterBackGraphicLocation" +#define SC_UNO_PAGE_FTRGRFURL "FooterBackGraphicURL" +#define SC_UNO_PAGE_FTRLEFTBOR "FooterLeftBorder" +#define SC_UNO_PAGE_FTRRIGHTBOR "FooterRightBorder" +#define SC_UNO_PAGE_FTRBOTTBOR "FooterBottomBorder" +#define SC_UNO_PAGE_FTRTOPBOR "FooterTopBorder" +#define SC_UNO_PAGE_FTRLEFTBDIS "FooterLeftBorderDistance" +#define SC_UNO_PAGE_FTRRIGHTBDIS "FooterRightBorderDistance" +#define SC_UNO_PAGE_FTRBOTTBDIS "FooterBottomBorderDistance" +#define SC_UNO_PAGE_FTRTOPBDIS "FooterTopBorderDistance" +#define SC_UNO_PAGE_FTRBRDDIST "FooterBorderDistance" +#define SC_UNO_PAGE_FTRSHADOW "FooterShadowFormat" +#define SC_UNO_PAGE_FTRLEFTMAR "FooterLeftMargin" +#define SC_UNO_PAGE_FTRRIGHTMAR "FooterRightMargin" +#define SC_UNO_PAGE_FTRBODYDIST "FooterBodyDistance" +#define SC_UNO_PAGE_FTRHEIGHT "FooterHeight" +#define SC_UNO_PAGE_FTRON "FooterIsOn" +#define SC_UNO_PAGE_FTRDYNAMIC "FooterIsDynamicHeight" +#define SC_UNO_PAGE_FTRSHARED "FooterIsShared" + +// document settings #define SC_UNO_CALCASSHOWN "CalcAsShown" #define SC_UNO_DEFTABSTOP "DefaultTabStop" #define SC_UNO_TABSTOPDIS "TabStopDistance" // is the same like the before, but only the writer name @@ -495,78 +495,78 @@ #define SC_UNO_REFERENCEDEVICE "ReferenceDevice" #define SC_UNO_CODENAME "CodeName" -// document properties from FormModel -#define SC_UNO_APPLYFMDES "ApplyFormDesignMode" -#define SC_UNO_AUTOCONTFOC "AutomaticControlFocus" +// document properties from FormModel +#define SC_UNO_APPLYFMDES "ApplyFormDesignMode" +#define SC_UNO_AUTOCONTFOC "AutomaticControlFocus" -// view options -#define SC_UNO_COLROWHDR "HasColumnRowHeaders" -#define SC_UNO_GRIDCOLOR "GridColor" +// view options +#define SC_UNO_COLROWHDR "HasColumnRowHeaders" +#define SC_UNO_GRIDCOLOR "GridColor" #define SC_UNO_HIDESPELL "HideSpellMarks" /* deprecated #i91949 */ -#define SC_UNO_HORSCROLL "HasHorizontalScrollBar" -#define SC_UNO_OUTLSYMB "IsOutlineSymbolsSet" -#define SC_UNO_SHEETTABS "HasSheetTabs" -#define SC_UNO_SHOWANCHOR "ShowAnchor" -#define SC_UNO_SHOWCHARTS "ShowCharts" -#define SC_UNO_SHOWDRAW "ShowDrawing" -#define SC_UNO_SHOWFORM "ShowFormulas" -#define SC_UNO_SHOWGRID "ShowGrid" -#define SC_UNO_SHOWHELP "ShowHelpLines" -#define SC_UNO_SHOWNOTES "ShowNotes" -#define SC_UNO_SHOWOBJ "ShowObjects" -#define SC_UNO_SHOWPAGEBR "ShowPageBreaks" -#define SC_UNO_SHOWZERO "ShowZeroValues" -#define SC_UNO_SHOWSOLID "SolidHandles" -#define SC_UNO_VALUEHIGH "IsValueHighlightingEnabled" -#define SC_UNO_VERTSCROLL "HasVerticalScrollBar" -#define SC_UNO_SNAPTORASTER "IsSnapToRaster" -#define SC_UNO_RASTERVIS "RasterIsVisible" -#define SC_UNO_RASTERRESX "RasterResolutionX" -#define SC_UNO_RASTERRESY "RasterResolutionY" -#define SC_UNO_RASTERSUBX "RasterSubdivisionX" -#define SC_UNO_RASTERSUBY "RasterSubdivisionY" -#define SC_UNO_RASTERSYNC "IsRasterAxisSynchronized" -#define SC_UNO_AUTOCALC "AutoCalculate" -#define SC_UNO_PRINTERNAME "PrinterName" -#define SC_UNO_PRINTERSETUP "PrinterSetup" -#define SC_UNO_APPLYDOCINF "ApplyUserData" -#define SC_UNO_CHARCOMP "CharacterCompressionType" -#define SC_UNO_ASIANKERN "IsKernAsianPunctuation" -#define SC_UNO_VISAREA "VisibleArea" +#define SC_UNO_HORSCROLL "HasHorizontalScrollBar" +#define SC_UNO_OUTLSYMB "IsOutlineSymbolsSet" +#define SC_UNO_SHEETTABS "HasSheetTabs" +#define SC_UNO_SHOWANCHOR "ShowAnchor" +#define SC_UNO_SHOWCHARTS "ShowCharts" +#define SC_UNO_SHOWDRAW "ShowDrawing" +#define SC_UNO_SHOWFORM "ShowFormulas" +#define SC_UNO_SHOWGRID "ShowGrid" +#define SC_UNO_SHOWHELP "ShowHelpLines" +#define SC_UNO_SHOWNOTES "ShowNotes" +#define SC_UNO_SHOWOBJ "ShowObjects" +#define SC_UNO_SHOWPAGEBR "ShowPageBreaks" +#define SC_UNO_SHOWZERO "ShowZeroValues" +#define SC_UNO_SHOWSOLID "SolidHandles" +#define SC_UNO_VALUEHIGH "IsValueHighlightingEnabled" +#define SC_UNO_VERTSCROLL "HasVerticalScrollBar" +#define SC_UNO_SNAPTORASTER "IsSnapToRaster" +#define SC_UNO_RASTERVIS "RasterIsVisible" +#define SC_UNO_RASTERRESX "RasterResolutionX" +#define SC_UNO_RASTERRESY "RasterResolutionY" +#define SC_UNO_RASTERSUBX "RasterSubdivisionX" +#define SC_UNO_RASTERSUBY "RasterSubdivisionY" +#define SC_UNO_RASTERSYNC "IsRasterAxisSynchronized" +#define SC_UNO_AUTOCALC "AutoCalculate" +#define SC_UNO_PRINTERNAME "PrinterName" +#define SC_UNO_PRINTERSETUP "PrinterSetup" +#define SC_UNO_APPLYDOCINF "ApplyUserData" +#define SC_UNO_CHARCOMP "CharacterCompressionType" +#define SC_UNO_ASIANKERN "IsKernAsianPunctuation" +#define SC_UNO_VISAREA "VisibleArea" #define SC_UNO_ZOOMTYPE "ZoomType" #define SC_UNO_ZOOMVALUE "ZoomValue" #define SC_UNO_UPDTEMPL "UpdateFromTemplate" #define SC_UNO_FILTERED_RANGE_SELECTION "FilteredRangeSelection" - + /*Stampit enable/disable print cancel */ #define SC_UNO_ALLOWPRINTJOBCANCEL "AllowPrintJobCancel" -// old (5.2) property names for view options - for compatibility only! -#define OLD_UNO_COLROWHDR "ColumnRowHeaders" -#define OLD_UNO_HORSCROLL "HorizontalScrollBar" -#define OLD_UNO_OUTLSYMB "OutlineSymbols" -#define OLD_UNO_SHEETTABS "SheetTabs" -#define OLD_UNO_VALUEHIGH "ValueHighlighting" -#define OLD_UNO_VERTSCROLL "VerticalScrollBar" - -// data pilot source -#define SC_UNO_COLGRAND "ColumnGrand" -#define SC_UNO_ROWGRAND "RowGrand" -#define SC_UNO_ORIGINAL "Original" -#define SC_UNO_ISDATALA "IsDataLayoutDimension" -#define SC_UNO_ORIENTAT "Orientation" -#define SC_UNO_POSITION "Position" -#define SC_UNO_FUNCTION "Function" -#define SC_UNO_USEDHIER "UsedHierarchy" -#define SC_UNO_FILTER "Filter" -#define SC_UNO_SUBTOTAL "SubTotals" -#define SC_UNO_SHOWEMPT "ShowEmpty" -#define SC_UNO_ISVISIBL "IsVisible" -#define SC_UNO_SHOWDETA "ShowDetails" -#define SC_UNO_IGNOREEM "IgnoreEmptyRows" -#define SC_UNO_REPEATIF "RepeatIfEmpty" -#define SC_UNO_DATADESC "DataDescription" -#define SC_UNO_NUMBERFO "NumberFormat" +// old (5.2) property names for view options - for compatibility only! +#define OLD_UNO_COLROWHDR "ColumnRowHeaders" +#define OLD_UNO_HORSCROLL "HorizontalScrollBar" +#define OLD_UNO_OUTLSYMB "OutlineSymbols" +#define OLD_UNO_SHEETTABS "SheetTabs" +#define OLD_UNO_VALUEHIGH "ValueHighlighting" +#define OLD_UNO_VERTSCROLL "VerticalScrollBar" + +// data pilot source +#define SC_UNO_COLGRAND "ColumnGrand" +#define SC_UNO_ROWGRAND "RowGrand" +#define SC_UNO_ORIGINAL "Original" +#define SC_UNO_ISDATALA "IsDataLayoutDimension" +#define SC_UNO_ORIENTAT "Orientation" +#define SC_UNO_POSITION "Position" +#define SC_UNO_FUNCTION "Function" +#define SC_UNO_USEDHIER "UsedHierarchy" +#define SC_UNO_FILTER "Filter" +#define SC_UNO_SUBTOTAL "SubTotals" +#define SC_UNO_SHOWEMPT "ShowEmpty" +#define SC_UNO_ISVISIBL "IsVisible" +#define SC_UNO_SHOWDETA "ShowDetails" +#define SC_UNO_IGNOREEM "IgnoreEmptyRows" +#define SC_UNO_REPEATIF "RepeatIfEmpty" +#define SC_UNO_DATADESC "DataDescription" +#define SC_UNO_NUMBERFO "NumberFormat" #define SC_UNO_ROWFIELDCOUNT "RowFieldCount" #define SC_UNO_COLUMNFIELDCOUNT "ColumnFieldCount" #define SC_UNO_DATAFIELDCOUNT "DataFieldCount" @@ -577,10 +577,10 @@ #define SC_UNO_FLAGS "Flags" // (preliminary:) -#define SC_UNO_REFVALUE "ReferenceValue" -#define SC_UNO_SORTING "Sorting" -#define SC_UNO_AUTOSHOW "AutoShow" -#define SC_UNO_LAYOUT "Layout" +#define SC_UNO_REFVALUE "ReferenceValue" +#define SC_UNO_SORTING "Sorting" +#define SC_UNO_AUTOSHOW "AutoShow" +#define SC_UNO_LAYOUT "Layout" // data pilot descriptor #define SC_UNO_IGNEMPROWS "IgnoreEmptyRows" @@ -597,16 +597,16 @@ #define SC_UNO_USERNAME "UserName" #define SC_UNO_PASSWORD "Password" -// range selection -#define SC_UNONAME_INITVAL "InitialValue" -#define SC_UNONAME_TITLE "Title" -#define SC_UNONAME_CLOSEONUP "CloseOnMouseRelease" -#define SC_UNONAME_SINGLECELL "SingleCellMode" +// range selection +#define SC_UNONAME_INITVAL "InitialValue" +#define SC_UNONAME_TITLE "Title" +#define SC_UNONAME_CLOSEONUP "CloseOnMouseRelease" +#define SC_UNONAME_SINGLECELL "SingleCellMode" #define SC_UNONAME_MULTISEL "MultiSelectionMode" -// XRenderable -#define SC_UNONAME_PAGESIZE "PageSize" -#define SC_UNONAME_RENDERDEV "RenderDevice" +// XRenderable +#define SC_UNONAME_PAGESIZE "PageSize" +#define SC_UNONAME_RENDERDEV "RenderDevice" #define SC_UNONAME_SOURCERANGE "SourceRange" #define SC_UNONAME_INC_NP_AREA "PageIncludesNonprintableArea" @@ -623,7 +623,7 @@ #define SC_UNONAME_REFSHEET "ReferenceSheet" // --> PB 2004-08-23 #i33095# Security Options -#define SC_UNO_LOADREADONLY "LoadReadonly" +#define SC_UNO_LOADREADONLY "LoadReadonly" // <-- #define SC_UNO_MODIFYPASSWORDINFO "ModifyPasswordInfo" @@ -646,7 +646,7 @@ #define SC_UNO_SHAREDOC "IsDocumentShared" // EventDescriptor -#define SC_UNO_EVENTTYPE "EventType" +#define SC_UNO_EVENTTYPE "EventType" #define SC_UNO_SCRIPT "Script" // Named ranges diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx index ad64f943c47d..93e61fdadc43 100644 --- a/sc/inc/unoreflist.hxx +++ b/sc/inc/unoreflist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx index ab7f68509e86..78b3e430f0e9 100644 --- a/sc/inc/unowids.hxx +++ b/sc/inc/unowids.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,40 +33,40 @@ #include "scitems.hxx" -// WIDs for uno property maps, -// never stored in files +// WIDs for uno property maps, +// never stored in files -#define SC_WID_UNO_START 1200 +#define SC_WID_UNO_START 1200 -#define SC_WID_UNO_CELLSTYL ( SC_WID_UNO_START + 0 ) -#define SC_WID_UNO_CHCOLHDR ( SC_WID_UNO_START + 1 ) -#define SC_WID_UNO_CHROWHDR ( SC_WID_UNO_START + 2 ) -#define SC_WID_UNO_CONDFMT ( SC_WID_UNO_START + 3 ) -#define SC_WID_UNO_CONDLOC ( SC_WID_UNO_START + 4 ) -#define SC_WID_UNO_CONDXML ( SC_WID_UNO_START + 5 ) -#define SC_WID_UNO_TBLBORD ( SC_WID_UNO_START + 6 ) -#define SC_WID_UNO_VALIDAT ( SC_WID_UNO_START + 7 ) -#define SC_WID_UNO_VALILOC ( SC_WID_UNO_START + 8 ) -#define SC_WID_UNO_VALIXML ( SC_WID_UNO_START + 9 ) -#define SC_WID_UNO_POS ( SC_WID_UNO_START + 10 ) -#define SC_WID_UNO_SIZE ( SC_WID_UNO_START + 11 ) -#define SC_WID_UNO_FORMLOC ( SC_WID_UNO_START + 12 ) -#define SC_WID_UNO_FORMRT ( SC_WID_UNO_START + 13 ) -#define SC_WID_UNO_PAGESTL ( SC_WID_UNO_START + 14 ) -#define SC_WID_UNO_CELLVIS ( SC_WID_UNO_START + 15 ) -#define SC_WID_UNO_LINKDISPBIT ( SC_WID_UNO_START + 16 ) -#define SC_WID_UNO_LINKDISPNAME ( SC_WID_UNO_START + 17 ) -#define SC_WID_UNO_CELLWID ( SC_WID_UNO_START + 18 ) -#define SC_WID_UNO_OWIDTH ( SC_WID_UNO_START + 19 ) -#define SC_WID_UNO_NEWPAGE ( SC_WID_UNO_START + 20 ) -#define SC_WID_UNO_MANPAGE ( SC_WID_UNO_START + 21 ) -#define SC_WID_UNO_CELLHGT ( SC_WID_UNO_START + 22 ) -#define SC_WID_UNO_CELLFILT ( SC_WID_UNO_START + 23 ) -#define SC_WID_UNO_OHEIGHT ( SC_WID_UNO_START + 24 ) -#define SC_WID_UNO_DISPNAME ( SC_WID_UNO_START + 25 ) -#define SC_WID_UNO_HEADERSET ( SC_WID_UNO_START + 26 ) -#define SC_WID_UNO_FOOTERSET ( SC_WID_UNO_START + 27 ) -#define SC_WID_UNO_NUMRULES ( SC_WID_UNO_START + 28 ) +#define SC_WID_UNO_CELLSTYL ( SC_WID_UNO_START + 0 ) +#define SC_WID_UNO_CHCOLHDR ( SC_WID_UNO_START + 1 ) +#define SC_WID_UNO_CHROWHDR ( SC_WID_UNO_START + 2 ) +#define SC_WID_UNO_CONDFMT ( SC_WID_UNO_START + 3 ) +#define SC_WID_UNO_CONDLOC ( SC_WID_UNO_START + 4 ) +#define SC_WID_UNO_CONDXML ( SC_WID_UNO_START + 5 ) +#define SC_WID_UNO_TBLBORD ( SC_WID_UNO_START + 6 ) +#define SC_WID_UNO_VALIDAT ( SC_WID_UNO_START + 7 ) +#define SC_WID_UNO_VALILOC ( SC_WID_UNO_START + 8 ) +#define SC_WID_UNO_VALIXML ( SC_WID_UNO_START + 9 ) +#define SC_WID_UNO_POS ( SC_WID_UNO_START + 10 ) +#define SC_WID_UNO_SIZE ( SC_WID_UNO_START + 11 ) +#define SC_WID_UNO_FORMLOC ( SC_WID_UNO_START + 12 ) +#define SC_WID_UNO_FORMRT ( SC_WID_UNO_START + 13 ) +#define SC_WID_UNO_PAGESTL ( SC_WID_UNO_START + 14 ) +#define SC_WID_UNO_CELLVIS ( SC_WID_UNO_START + 15 ) +#define SC_WID_UNO_LINKDISPBIT ( SC_WID_UNO_START + 16 ) +#define SC_WID_UNO_LINKDISPNAME ( SC_WID_UNO_START + 17 ) +#define SC_WID_UNO_CELLWID ( SC_WID_UNO_START + 18 ) +#define SC_WID_UNO_OWIDTH ( SC_WID_UNO_START + 19 ) +#define SC_WID_UNO_NEWPAGE ( SC_WID_UNO_START + 20 ) +#define SC_WID_UNO_MANPAGE ( SC_WID_UNO_START + 21 ) +#define SC_WID_UNO_CELLHGT ( SC_WID_UNO_START + 22 ) +#define SC_WID_UNO_CELLFILT ( SC_WID_UNO_START + 23 ) +#define SC_WID_UNO_OHEIGHT ( SC_WID_UNO_START + 24 ) +#define SC_WID_UNO_DISPNAME ( SC_WID_UNO_START + 25 ) +#define SC_WID_UNO_HEADERSET ( SC_WID_UNO_START + 26 ) +#define SC_WID_UNO_FOOTERSET ( SC_WID_UNO_START + 27 ) +#define SC_WID_UNO_NUMRULES ( SC_WID_UNO_START + 28 ) #define SC_WID_UNO_ISACTIVE ( SC_WID_UNO_START + 29 ) #define SC_WID_UNO_BORDCOL ( SC_WID_UNO_START + 30 ) #define SC_WID_UNO_PROTECT ( SC_WID_UNO_START + 31 ) @@ -90,7 +90,7 @@ inline BOOL IsScUnoWid( USHORT nWid ) inline BOOL IsScItemWid( USHORT nWid ) { - return nWid >= ATTR_STARTINDEX && nWid <= ATTR_ENDINDEX; // incl. page + return nWid >= ATTR_STARTINDEX && nWid <= ATTR_ENDINDEX; // incl. page } #endif diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index d3f22abae0d9..42ca28a888e6 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,12 +37,12 @@ //------------------------------------------------------------------------- -#define SC_DRAWLAYER 0x30334353 // Inventor: "SC30" +#define SC_DRAWLAYER 0x30334353 // Inventor: "SC30" // Object-Ids fuer UserData -#define SC_UD_OBJDATA 1 -#define SC_UD_IMAPDATA 2 -#define SC_UD_MACRODATA 3 +#define SC_UD_OBJDATA 1 +#define SC_UD_IMAPDATA 2 +#define SC_UD_MACRODATA 3 //------------------------------------------------------------------------- @@ -73,18 +73,18 @@ private: class ScIMapInfo : public SdrObjUserData { - ImageMap aImageMap; + ImageMap aImageMap; public: ScIMapInfo(); ScIMapInfo( const ImageMap& rImageMap ); ScIMapInfo( const ScIMapInfo& rIMapInfo ); - virtual ~ScIMapInfo(); + virtual ~ScIMapInfo(); - virtual SdrObjUserData* Clone( SdrObject* pObj ) const; + virtual SdrObjUserData* Clone( SdrObject* pObj ) const; - void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } - const ImageMap& GetImageMap() const { return aImageMap; } + void SetImageMap( const ImageMap& rIMap ) { aImageMap = rIMap; } + const ImageMap& GetImageMap() const { return aImageMap; } }; //------------------------------------------------------------------------- diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx index 1b8d728c1f42..fe97f9f6ce85 100644 --- a/sc/inc/userlist.hxx +++ b/sc/inc/userlist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,25 +37,25 @@ class SC_DLLPUBLIC ScUserListData : public ScDataObject { friend class ScUserList; - String aStr; - USHORT nTokenCount; + String aStr; + USHORT nTokenCount; String* pSubStrings; String* pUpperSub; - SC_DLLPRIVATE void InitTokens(); + SC_DLLPRIVATE void InitTokens(); public: ScUserListData(const String& rStr); ScUserListData(const ScUserListData& rData); - virtual ~ScUserListData(); + virtual ~ScUserListData(); - virtual ScDataObject* Clone() const { return new ScUserListData(*this); } + virtual ScDataObject* Clone() const { return new ScUserListData(*this); } - const String& GetString() const { return aStr; } - void SetString( const String& rStr); - USHORT GetSubCount() const; - BOOL GetSubIndex(const String& rSubStr, USHORT& rIndex) const; - String GetSubStr(USHORT nIndex) const; + const String& GetString() const { return aStr; } + void SetString( const String& rStr); + USHORT GetSubCount() const; + BOOL GetSubIndex(const String& rSubStr, USHORT& rIndex) const; + String GetSubStr(USHORT nIndex) const; StringCompare Compare(const String& rSubStr1, const String& rSubStr2) const; StringCompare ICompare(const String& rSubStr1, const String& rSubStr2) const; }; @@ -67,19 +67,19 @@ public: ScUserList( USHORT nLim = 4, USHORT nDel = 4); ScUserList( const ScUserList& rUserList ) : ScCollection ( rUserList ) {} - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; - ScUserListData* GetData( const String& rSubStr ) const; + ScUserListData* GetData( const String& rSubStr ) const; /// If the list in rStr is already inserted BOOL HasEntry( const String& rStr ) const; - inline ScUserListData* operator[]( const USHORT nIndex) const; - inline ScUserList& operator= ( const ScUserList& r ); - BOOL operator==( const ScUserList& r ) const; - inline BOOL operator!=( const ScUserList& r ) const; + inline ScUserListData* operator[]( const USHORT nIndex) const; + inline ScUserList& operator= ( const ScUserList& r ); + BOOL operator==( const ScUserList& r ) const; + inline BOOL operator!=( const ScUserList& r ) const; }; -inline ScUserList& ScUserList::operator=( const ScUserList& r ) +inline ScUserList& ScUserList::operator=( const ScUserList& r ) { return (ScUserList&)ScCollection::operator=( r ); } inline ScUserListData* ScUserList::operator[]( const USHORT nIndex) const diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index c56264a36a58..40a7691d80c4 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,29 +60,29 @@ enum ScValidErrorStyle }; // -// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) +// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) // class SC_DLLPUBLIC ScValidationData : public ScConditionEntry { - sal_uInt32 nKey; // Index in Attributen + sal_uInt32 nKey; // Index in Attributen - ScValidationMode eDataMode; - BOOL bShowInput; - BOOL bShowError; - ScValidErrorStyle eErrorStyle; + ScValidationMode eDataMode; + BOOL bShowInput; + BOOL bShowError; + ScValidErrorStyle eErrorStyle; sal_Int16 mnListType; // selection list type: none, unsorted, sorted. - String aInputTitle; - String aInputMessage; - String aErrorTitle; - String aErrorMessage; + String aInputTitle; + String aInputMessage; + String aErrorTitle; + String aErrorMessage; - BOOL bIsUsed; // temporaer beim Speichern + BOOL bIsUsed; // temporaer beim Speichern - BOOL DoMacro( const ScAddress& rPos, const String& rInput, + BOOL DoMacro( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; - BOOL DoScript( const ScAddress& rPos, const String& rInput, + BOOL DoScript( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; using ScConditionEntry::operator==; @@ -99,26 +99,26 @@ public: ScDocument* pDocument, const ScAddress& rPos ); ScValidationData( const ScValidationData& r ); ScValidationData( ScDocument* pDocument, const ScValidationData& r ); - virtual ~ScValidationData(); + virtual ~ScValidationData(); - ScValidationData* Clone() const // echte Kopie + ScValidationData* Clone() const // echte Kopie { return new ScValidationData( GetDocument(), *this ); } ScValidationData* Clone(ScDocument* pNew) const { return new ScValidationData( pNew, *this ); } - void ResetInput(); - void ResetError(); - void SetInput( const String& rTitle, const String& rMsg ); - void SetError( const String& rTitle, const String& rMsg, + void ResetInput(); + void ResetError(); + void SetInput( const String& rTitle, const String& rMsg ); + void SetError( const String& rTitle, const String& rMsg, ScValidErrorStyle eStyle ); - BOOL GetInput( String& rTitle, String& rMsg ) const + BOOL GetInput( String& rTitle, String& rMsg ) const { rTitle = aInputTitle; rMsg = aInputMessage; return bShowInput; } - BOOL GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const; + BOOL GetErrMsg( String& rTitle, String& rMsg, ScValidErrorStyle& rStyle ) const; - BOOL HasErrMsg() const { return bShowError; } + BOOL HasErrMsg() const { return bShowError; } - ScValidationMode GetDataMode() const { return eDataMode; } + ScValidationMode GetDataMode() const { return eDataMode; } inline sal_Int16 GetListType() const { return mnListType; } inline void SetListType( sal_Int16 nListType ) { mnListType = nListType; } @@ -133,28 +133,28 @@ public: @return true = rStrings has been filled with at least one entry. */ bool FillSelectionList( TypedScStrCollection& rStrings, const ScAddress& rPos ) const; - // mit String: bei Eingabe, mit Zelle: fuer Detektiv / RC_FORCED - BOOL IsDataValid( const String& rTest, const ScPatternAttr& rPattern, + // mit String: bei Eingabe, mit Zelle: fuer Detektiv / RC_FORCED + BOOL IsDataValid( const String& rTest, const ScPatternAttr& rPattern, const ScAddress& rPos ) const; - BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; + BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; // TRUE -> Abbruch - BOOL DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const; - void DoCalcError( ScFormulaCell* pCell ) const; + BOOL DoError( Window* pParent, const String& rInput, const ScAddress& rPos ) const; + void DoCalcError( ScFormulaCell* pCell ) const; - BOOL IsEmpty() const; - sal_uInt32 GetKey() const { return nKey; } - void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! + BOOL IsEmpty() const; + sal_uInt32 GetKey() const { return nKey; } + void SetKey(sal_uInt32 nNew) { nKey = nNew; } // nur wenn nicht eingefuegt! - void SetUsed(BOOL bSet) { bIsUsed = bSet; } - BOOL IsUsed() const { return bIsUsed; } + void SetUsed(BOOL bSet) { bIsUsed = bSet; } + BOOL IsUsed() const { return bIsUsed; } - BOOL EqualEntries( const ScValidationData& r ) const; // fuer Undo + BOOL EqualEntries( const ScValidationData& r ) const; // fuer Undo - // sortiert (per PTRARR) nach Index - // operator== nur fuer die Sortierung - BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } - BOOL operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } + // sortiert (per PTRARR) nach Index + // operator== nur fuer die Sortierung + BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } + BOOL operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } private: /** Tries to fill the passed collection with list validation entries. @@ -177,7 +177,7 @@ private: }; // -// Liste der Bedingungen: +// Liste der Bedingungen: // typedef ScValidationData* ScValidationDataPtr; @@ -193,21 +193,21 @@ public: ScValidationDataList(ScDocument* pNewDoc, const ScValidationDataList& rList); ~ScValidationDataList() {} - void InsertNew( ScValidationData* pNew ) + void InsertNew( ScValidationData* pNew ) { if (!Insert(pNew)) delete pNew; } ScValidationData* GetData( sal_uInt32 nKey ); - void CompileXML(); - void UpdateReference( UpdateRefMode eUpdateRefMode, + void CompileXML(); + void UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - /** Temporarily during save, returns RefManager's decision whether ALL + /** Temporarily during save, returns RefManager's decision whether ALL * references are marked now. */ bool MarkUsedExternalReferences() const; - BOOL operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo }; #endif diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 38e254f29fbd..0d84eecd5b03 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,10 +67,10 @@ enum ScVObjType VOBJ_TYPE_DRAW }; -#define MAX_OPT (USHORT)VOPT_BIGHANDLES+1 -#define MAX_TYPE (USHORT)VOBJ_TYPE_DRAW+1 +#define MAX_OPT (USHORT)VOPT_BIGHANDLES+1 +#define MAX_TYPE (USHORT)VOBJ_TYPE_DRAW+1 -#define SC_STD_GRIDCOLOR COL_LIGHTGRAY +#define SC_STD_GRIDCOLOR COL_LIGHTGRAY //================================================================== // SvxGrid-Optionen mit Standard-Operatoren @@ -82,10 +82,10 @@ public: ScGridOptions() : SvxOptionsGrid() {} ScGridOptions( const SvxOptionsGrid& rOpt ) : SvxOptionsGrid( rOpt ) {} - void SetDefaults(); - const ScGridOptions& operator= ( const ScGridOptions& rCpy ); - int operator== ( const ScGridOptions& rOpt ) const; - int operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } + void SetDefaults(); + const ScGridOptions& operator= ( const ScGridOptions& rCpy ); + int operator== ( const ScGridOptions& rOpt ) const; + int operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } }; //================================================================== @@ -99,31 +99,31 @@ public: ScViewOptions( const ScViewOptions& rCpy ); ~ScViewOptions(); - void SetDefaults(); + void SetDefaults(); - void SetOption( ScViewOption eOpt, BOOL bNew = TRUE ) { aOptArr[eOpt] = bNew; } - BOOL GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } + void SetOption( ScViewOption eOpt, BOOL bNew = TRUE ) { aOptArr[eOpt] = bNew; } + BOOL GetOption( ScViewOption eOpt ) const { return aOptArr[eOpt]; } - void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } - ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } + void SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; } + ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } - void SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;} - Color GetGridColor( String* pStrName = NULL ) const; + void SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;} + Color GetGridColor( String* pStrName = NULL ) const; - const ScGridOptions& GetGridOptions() const { return aGridOpt; } - void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } - SvxGridItem* CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const; + const ScGridOptions& GetGridOptions() const { return aGridOpt; } + void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } + SvxGridItem* CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const; - const ScViewOptions& operator= ( const ScViewOptions& rCpy ); - int operator== ( const ScViewOptions& rOpt ) const; - int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } + const ScViewOptions& operator= ( const ScViewOptions& rCpy ); + int operator== ( const ScViewOptions& rOpt ) const; + int operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); } private: - BOOL aOptArr [MAX_OPT]; - ScVObjMode aModeArr [MAX_TYPE]; - Color aGridCol; - String aGridColName; - ScGridOptions aGridOpt; + BOOL aOptArr [MAX_OPT]; + ScVObjMode aModeArr [MAX_TYPE]; + Color aGridCol; + String aGridColName; + ScGridOptions aGridOpt; }; //================================================================== @@ -142,10 +142,10 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - const ScViewOptions& GetViewOptions() const { return theOptions; } + const ScViewOptions& GetViewOptions() const { return theOptions; } private: - ScViewOptions theOptions; + ScViewOptions theOptions; }; @@ -155,9 +155,9 @@ private: class ScViewCfg : public ScViewOptions { - ScLinkConfigItem aLayoutItem; - ScLinkConfigItem aDisplayItem; - ScLinkConfigItem aGridItem; + ScLinkConfigItem aLayoutItem; + ScLinkConfigItem aDisplayItem; + ScLinkConfigItem aGridItem; DECL_LINK( LayoutCommitHdl, void* ); DECL_LINK( DisplayCommitHdl, void* ); @@ -170,7 +170,7 @@ class ScViewCfg : public ScViewOptions public: ScViewCfg(); - void SetOptions( const ScViewOptions& rNew ); + void SetOptions( const ScViewOptions& rNew ); }; diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 8961a3e913f2..b2ed11bf7724 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ class ScTabViewShell; -#define SC_VIEWPANE_ACTIVE 0xFFFF +#define SC_VIEWPANE_ACTIVE 0xFFFF typedef ::com::sun::star::uno::Reference< @@ -81,8 +81,8 @@ typedef ::com::sun::star::uno::Reference< SV_DECL_PTRARR_DEL( XActivationEventListenerArr_Impl, XActivationEventListenerPtr, 4, 4 ) -// ScViewPaneBase not derived from OWeakObject -// to avoid duplicate OWeakObject in ScTabViewObj +// ScViewPaneBase not derived from OWeakObject +// to avoid duplicate OWeakObject in ScTabViewObj class ScViewPaneBase : public com::sun::star::sheet::XViewPane, public com::sun::star::sheet::XCellRangeReferrer, @@ -92,15 +92,15 @@ class ScViewPaneBase : public com::sun::star::sheet::XViewPane, public SfxListener { private: - ScTabViewShell* pViewShell; - USHORT nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE + ScTabViewShell* pViewShell; + USHORT nPane; // ScSplitPos oder SC_VIEWPANE_ACTIVE protected: ::com::sun::star::awt::Rectangle GetVisArea() const; public: ScViewPaneBase(ScTabViewShell* pViewSh, USHORT nP); - virtual ~ScViewPaneBase(); + virtual ~ScViewPaneBase(); ScTabViewShell* GetViewShell() const { return pViewShell; } @@ -108,14 +108,14 @@ public: const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // XViewPane virtual sal_Int32 SAL_CALL getFirstVisibleColumn() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) + virtual void SAL_CALL setFirstVisibleColumn( sal_Int32 nFirstVisibleColumn ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getFirstVisibleRow() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) + virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellRangeAddress SAL_CALL getVisibleRange() throw(::com::sun::star::uno::RuntimeException); @@ -158,22 +158,22 @@ public: }; -// ScViewPaneObj for direct use (including OWeakObject) +// ScViewPaneObj for direct use (including OWeakObject) class ScViewPaneObj : public ScViewPaneBase, public cppu::OWeakObject { public: ScViewPaneObj(ScTabViewShell* pViewSh, USHORT nP); - virtual ~ScViewPaneObj(); + virtual ~ScViewPaneObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); }; -// OWeakObject is base of SfxBaseController -> use ScViewPaneBase +// OWeakObject is base of SfxBaseController -> use ScViewPaneBase class ScTabViewObj : public ScViewPaneBase, public SfxBaseController, @@ -191,18 +191,18 @@ class ScTabViewObj : public ScViewPaneBase, public com::sun::star::datatransfer::XTransferableSupplier { private: - SfxItemPropertySet aPropSet; - XSelectionChangeListenerArr_Impl aSelectionListeners; - XRangeSelectionListenerArr_Impl aRangeSelListeners; - XRangeSelectionChangeListenerArr_Impl aRangeChgListeners; - XViewPropertyChangeListenerArr_Impl aPropertyChgListeners; + SfxItemPropertySet aPropSet; + XSelectionChangeListenerArr_Impl aSelectionListeners; + XRangeSelectionListenerArr_Impl aRangeSelListeners; + XRangeSelectionChangeListenerArr_Impl aRangeChgListeners; + XViewPropertyChangeListenerArr_Impl aPropertyChgListeners; XMouseClickHandlerArr_Impl aMouseClickHandlers; XActivationEventListenerArr_Impl aActivationListeners; SCTAB nPreviousTab; - sal_Bool bDrawSelModeSet; + sal_Bool bDrawSelModeSet; sal_Bool bFilteredRangeSelection; - ScViewPaneObj* GetObjectByIndex_Impl(USHORT nIndex) const; + ScViewPaneObj* GetObjectByIndex_Impl(USHORT nIndex) const; INT16 GetZoom(void) const; void SetZoom(INT16 Zoom); INT16 GetZoomType(void) const; @@ -217,24 +217,24 @@ private: ScTabViewObj(); // disabled public: ScTabViewObj(ScTabViewShell* pViewSh); - virtual ~ScTabViewObj(); + virtual ~ScTabViewObj(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - void SelectionChanged(); - void VisAreaChanged(); + void SelectionChanged(); + void VisAreaChanged(); void SheetChanged(); bool IsMouseListening() const; sal_Bool MousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); sal_Bool MouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - void RangeSelDone( const String& rText ); - void RangeSelAborted( const String& rText ); - void RangeSelChanged( const String& rText ); + void RangeSelDone( const String& rText ); + void RangeSelAborted( const String& rText ); + void RangeSelChanged( const String& rText ); // XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) @@ -242,20 +242,20 @@ public: ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - //! XPrintable? + //! XPrintable? // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, @@ -267,25 +267,25 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, @@ -311,12 +311,12 @@ public: // XSpreadsheetView virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > SAL_CALL getActiveSheet() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL setActiveSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& xActiveSheet ) throw(::com::sun::star::uno::RuntimeException); //liuchen 2009-9-2 support expand (but not replace) the active sheet - virtual void SAL_CALL selectSheet( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL selectSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet >& xActiveSheet, sal_Bool bExpand) throw(::com::sun::star::uno::RuntimeException); @@ -346,29 +346,29 @@ public: virtual sal_Int32 SAL_CALL getSplitVertical() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSplitColumn() throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getSplitRow() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) + virtual void SAL_CALL splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) throw(::com::sun::star::uno::RuntimeException); // XViewFreezable virtual sal_Bool SAL_CALL hasFrozenPanes() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) + virtual void SAL_CALL freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) throw(::com::sun::star::uno::RuntimeException); // XRangeSelection - virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< + virtual void SAL_CALL startRangeSelection( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL abortRangeSelection() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addRangeSelectionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRangeSelectionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL addRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< + virtual void SAL_CALL removeRangeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelectionChangeListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx index 9ff3cfd8a2a6..d58f1cd13c8b 100644 --- a/sc/inc/waitoff.hxx +++ b/sc/inc/waitoff.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,8 +36,8 @@ class Window; class ScWaitCursorOff { private: - Window* pWin; - ULONG nWaiters; + Window* pWin; + ULONG nWaiters; public: ScWaitCursorOff( Window* pWin ); ~ScWaitCursorOff(); diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx index 4e3f2d53f499..39834e539f40 100644 --- a/sc/inc/warnpassword.hxx +++ b/sc/inc/warnpassword.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,13 +31,13 @@ -class SfxMedium; +class SfxMedium; /** Static API helper functions. */ -class ScWarnPassword +class ScWarnPassword { public: - /** Opens a query warning dialog. - @descr Pop up Query on export with a choice of yes/no if a + /** Opens a query warning dialog. + @descr Pop up Query on export with a choice of yes/no if a an encrypted password is imported. @return true if yes and false if no. default to true. */ diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx index 6ec51fa308db..9312c73c54f3 100644 --- a/sc/inc/xmlwrap.hxx +++ b/sc/inc/xmlwrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ namespace com { namespace sun { namespace star { class ScXMLImportWrapper { - ScDocument& rDoc; - SfxMedium* pMedium; + ScDocument& rDoc; + SfxMedium* pMedium; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > xStorage; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator> GetStatusIndicator(); @@ -70,7 +70,7 @@ class ScXMLImportWrapper com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xModel, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xWriter, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aDescriptor, - const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, + const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName, const sal_Bool bPlainText, com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs, ScMySharedData*& pSharedData); diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 2c695ae5b0e0..b5e3dfdee8a3 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |