diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/dpgroup.hxx | 9 | ||||
-rw-r--r-- | sc/inc/dpobject.hxx | 4 | ||||
-rw-r--r-- | sc/inc/dpsave.hxx | 1 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 3 | ||||
-rw-r--r-- | sc/inc/dptabsrc.hxx | 4 | ||||
-rw-r--r-- | sc/inc/drawpage.hxx | 2 | ||||
-rw-r--r-- | sc/inc/drwlayer.hxx | 6 | ||||
-rw-r--r-- | sc/inc/externalrefmgr.hxx | 4 | ||||
-rw-r--r-- | sc/inc/fielduno.hxx | 3 | ||||
-rw-r--r-- | sc/inc/fillinfo.hxx | 30 | ||||
-rw-r--r-- | sc/inc/global.hxx | 23 | ||||
-rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
-rw-r--r-- | sc/inc/inputopt.hxx | 2 | ||||
-rw-r--r-- | sc/inc/linkuno.hxx | 8 | ||||
-rw-r--r-- | sc/inc/markarr.hxx | 4 | ||||
-rw-r--r-- | sc/inc/nameuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/navicfg.hxx | 2 | ||||
-rw-r--r-- | sc/inc/olinetab.hxx | 6 | ||||
-rw-r--r-- | sc/inc/prnsave.hxx | 4 | ||||
-rw-r--r-- | sc/inc/queryparam.hxx | 2 | ||||
-rw-r--r-- | sc/inc/rangeutl.hxx | 2 | ||||
-rw-r--r-- | sc/inc/rechead.hxx | 6 | ||||
-rw-r--r-- | sc/inc/sc.hrc | 154 | ||||
-rw-r--r-- | sc/inc/scabstdlg.hxx | 2 | ||||
-rw-r--r-- | sc/inc/scextopt.hxx | 10 | ||||
-rw-r--r-- | sc/inc/segmenttree.hxx | 4 | ||||
-rw-r--r-- | sc/inc/srchuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/subtotal.hxx | 2 | ||||
-rw-r--r-- | sc/inc/table.hxx | 32 | ||||
-rw-r--r-- | sc/inc/textuno.hxx | 8 | ||||
-rw-r--r-- | sc/inc/validat.hxx | 24 | ||||
-rw-r--r-- | sc/inc/zforauto.hxx | 4 |
32 files changed, 139 insertions, 234 deletions
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 6a88b6386843..ce1589cef109 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -39,8 +39,6 @@ class ScDocument; class SvNumberFormatter; -// -------------------------------------------------------------------- - //! API struct? struct ScDPNumGroupInfo { @@ -56,8 +54,6 @@ struct ScDPNumGroupInfo Start(0.0), End(0.0), Step(0.0) {} }; -// -------------------------------------------------------------------- - // ScDPDateGroupHelper is used as part of ScDPGroupDimension (additional dim.) // or ScDPNumGroupDimension (innermost, replaces the original dim.). // Source index, name and result collection are stored at the parent. @@ -79,8 +75,6 @@ public: const std::vector<SCROW>& rOriginal) const; }; -// -------------------------------------------------------------------- - typedef ::std::vector<ScDPItemData> ScDPItemDataVec; class ScDPGroupItem @@ -141,8 +135,6 @@ public: typedef ::std::vector<ScDPGroupDimension> ScDPGroupDimensionVec; -// -------------------------------------------------------------------- - class SC_DLLPUBLIC ScDPNumGroupDimension { ScDPNumGroupInfo aGroupInfo; // settings @@ -174,7 +166,6 @@ public: void DisposeData(); }; -// -------------------------------------------------------------------- // // proxy implementation of ScDPTableData to add grouped items // diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 0a2c05256f5b..9ca0e4ca31a5 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -41,8 +41,6 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/shared_ptr.hpp> -//------------------------------------------------------------------ - namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotTablePositionData; @@ -257,8 +255,6 @@ public: }; -// ============================================================================ - class ScDPCollection { private: diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 2d9ba1be7dcc..0458332d1e3d 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -53,7 +53,6 @@ namespace com { namespace sun { namespace star { namespace sheet { class ScDPDimensionSaveData; class ScDPTableData; -// -------------------------------------------------------------------- // // classes to save Data Pilot settings // diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 956985c2c891..5a676e69f046 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -45,8 +45,6 @@ namespace com { namespace sun { namespace star { namespace sheet { }}}} -// ----------------------------------------------------------------------- - #define SC_DAPI_DATE_HIERARCHIES 3 #define SC_DAPI_HIERARCHY_FLAT 0 @@ -65,7 +63,6 @@ namespace com { namespace sun { namespace star { namespace sheet { #define SC_DAPI_LEVEL_WEEKDAY 2 -// -------------------------------------------------------------------- // // base class ScDPTableData to allow implementation with tabular data // by deriving only of this diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index b6f13e21173a..5c48a4cf2f31 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -77,14 +77,10 @@ class ScDPResultData; class ScDPItemData; class ScDPTableData; -// ------------------------------------------------------------------------ - - // should be dynamic! #define SC_DAPI_MAXFIELDS 256 -// -------------------------------------------------------------------- // // implementation of DataPilotSource using ScDPTableData // diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index e27b7cce797d..a4c891ecfc9f 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -34,8 +34,6 @@ class ScDrawLayer; -// ----------------------------------------------------------------------- - class ScDrawPage: public FmFormPage { public: diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index fcf7ce1361b6..4acc8820396b 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -46,8 +46,6 @@ class SdrOle2Obj; class ScRange; class ScAddress; -// ----------------------------------------------------------------------- - class ScTabDeletedHint : public SfxHint { private: @@ -72,8 +70,6 @@ public: SCTAB GetTab() { return nTab; } }; -// ----------------------------------------------------------------------- -// // Adjusting of detective UserData and draw undo's both have to be in SdrUndoGroup; // therefore derived from SdrUndoAction @@ -94,8 +90,6 @@ public: virtual void Redo(); }; -// ----------------------------------------------------------------------- - class SC_DLLPUBLIC ScDrawLayer : public FmFormModel { private: diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 2dee2083e780..834a4fee8536 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -87,8 +87,6 @@ private: bool mbDoRefresh; }; -// ============================================================================ - /** * Cache table for external reference data. */ @@ -358,8 +356,6 @@ private: mutable DocDataType maDocs; }; -// ============================================================================ - class SC_DLLPUBLIC ScExternalRefManager : public formula::ExternalReferenceHelper { public: diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index a4a1adedbaf4..a0b18996e53b 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -55,9 +55,6 @@ class ScHeaderFooterContentObj; class ScDocShell; -//------------------------------------------------------------------ - - class ScCellFieldsObj : public cppu::WeakImplHelper5< com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx index ead88f29053c..d58f417e3f2e 100644 --- a/sc/inc/fillinfo.hxx +++ b/sc/inc/fillinfo.hxx @@ -41,8 +41,6 @@ class SvxShadowItem; class ScBaseCell; class ScPatternAttr; -// ============================================================================ - const BYTE SC_ROTDIR_NONE = 0; const BYTE SC_ROTDIR_STANDARD = 1; const BYTE SC_ROTDIR_LEFT = 2; @@ -63,8 +61,6 @@ enum ScShadowPart SC_SHADOW_CORNER }; -// ============================================================================ - struct CellInfo { ScBaseCell* pCell; @@ -74,16 +70,16 @@ struct CellInfo const SvxBrushItem* pBackground; - const SvxBoxItem* pLinesAttr; /// Original item from document. - const SvxLineItem* mpTLBRLine; /// Original item from document. - const SvxLineItem* mpBLTRLine; /// Original item from document. + const SvxBoxItem* pLinesAttr; /// original item from document. + const SvxLineItem* mpTLBRLine; /// original item from document. + const SvxLineItem* mpBLTRLine; /// original item from document. - const SvxShadowItem* pShadowAttr; // Original-Item (intern) + const SvxShadowItem* pShadowAttr; // original item (internal) const SvxShadowItem* pHShadowOrigin; const SvxShadowItem* pVShadowOrigin; - ScShadowPart eHShadowPart : 4; // Schatten effektiv zum Zeichnen + ScShadowPart eHShadowPart : 4; // shadow effective for drawing ScShadowPart eVShadowPart : 4; BYTE nClipMark; USHORT nWidth; @@ -100,29 +96,27 @@ struct CellInfo bool bPopupButton: 1; bool bFilterActive:1; - BOOL bPrinted : 1; // bei Bedarf (Pagebreak-Modus) + BOOL bPrinted : 1; // when required (pagebreak mode) - BOOL bHideGrid : 1; // output-intern - BOOL bEditEngine : 1; // output-intern + BOOL bHideGrid : 1; // output-internal + BOOL bEditEngine : 1; // output-internal }; const SCCOL SC_ROTMAX_NONE = SCCOL_MAX; -// ============================================================================ - struct RowInfo { CellInfo* pCellInfo; USHORT nHeight; SCROW nRowNo; - SCCOL nRotMaxCol; // SC_ROTMAX_NONE, wenn nichts + SCCOL nRotMaxCol; // SC_ROTMAX_NONE, if nothing BOOL bEmptyBack; BOOL bEmptyText; BOOL bAutoFilter; BOOL bPushButton; - BOOL bChanged; // TRUE, wenn nicht getestet + BOOL bChanged; // TRUE, if not tested inline explicit RowInfo() : pCellInfo( 0 ) {} @@ -131,8 +125,6 @@ private: RowInfo& operator=( const RowInfo& ); }; -// ============================================================================ - struct ScTableInfo { svx::frame::Array maArray; @@ -148,8 +140,6 @@ private: ScTableInfo& operator=( const ScTableInfo& ); }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index e521229be3e6..08fbf286883b 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -65,8 +65,6 @@ extern "C" { ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE ) #define SC_TRANSLITERATION_CASESENSE 0 -//------------------------------------------------------------------------ - // Calc has lots of names... // Clipboard names are in so3/soapp.hxx now // STRING_SCAPP was "scalc3", "scalc4", now just "scalc" @@ -76,7 +74,7 @@ extern "C" { #define STRING_STANDARD "Standard" -// characters ----------------------------------------------------------------- +// characters // '\r' does not work on a Mac... #define CHAR_CR char(13) @@ -413,12 +411,6 @@ enum ScLkUpdMode // modes for updating links }; -// ----------------------------------------------------------------------- - -//================================================================== - -// ----------------------------------------------------------------------- - // enum with values equal to old DBObject enum from sdb enum ScDBObject { @@ -455,8 +447,6 @@ struct ScStringHashCode } }; -// ----------------------------------------------------------------------- - class ScDocument; class ScDocShell; class ScDocShellRef; @@ -689,7 +679,6 @@ SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pStri }; #endif -//================================================================== // maybe move to dbdata.hxx (?): enum ScQueryOp @@ -712,16 +701,12 @@ enum ScQueryOp SC_DOES_NOT_END_WITH }; -// ----------------------------------------------------------------------- - enum ScQueryConnect { SC_AND, SC_OR }; -// ----------------------------------------------------------------------- - enum ScSubTotalFunc { SUBTOTAL_FUNC_NONE = 0, @@ -738,9 +723,6 @@ enum ScSubTotalFunc SUBTOTAL_FUNC_VARP = 11 }; - -// ----------------------------------------------------------------------- - /* * dialog returns the special field values "empty"/"not empty" * as constants SC_EMPTYFIELDS and SC_NONEMPTYFIELDS respectively in nVal in @@ -781,8 +763,6 @@ struct ScQueryEntry BOOL operator==( const ScQueryEntry& r ) const; }; -// ----------------------------------------------------------------------- - struct SC_DLLPUBLIC ScSubTotalParam { SCCOL nCol1; // selected area @@ -816,7 +796,6 @@ struct SC_DLLPUBLIC ScSubTotalParam USHORT nCount ); }; -// ----------------------------------------------------------------------- class ScArea; struct ScConsolidateParam diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index d69b34c73dc0..67170455dfa9 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -240,7 +240,7 @@ #define STR_INVALID_AFAREA 193 -#define STR_CASCADE 194 // Funktionsautopilot +#define STR_CASCADE 194 // function auto pilot #define STR_OPTIONAL 195 #define STR_REQUIRED 196 #define STR_EDITFUNCTION 197 @@ -276,7 +276,7 @@ #define STR_SPELLING_STOP_OK 219 #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 // can be removed later #define STR_UNDO_GRAFEDIT 223 diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 0b1b922fc1c7..62c73963973b 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -83,7 +83,7 @@ public: //================================================================== -// CfgItem fuer Eingabe-Optionen +// CfgItem for input options //================================================================== class ScInputCfg : public ScInputOptions, diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index feeaaea56d0f..481ab28f9f97 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -294,7 +294,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - // aus get/setPropertyValue gerufen: + // called from get/setPropertyValue: ::rtl::OUString getFileName(void) const; void setFileName(const ::rtl::OUString& FileName); ::rtl::OUString getFilter(void) const; @@ -499,8 +499,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -// ============================================================================ - class ScExternalSheetCacheObj : public cppu::WeakImplHelper1< ::com::sun::star::sheet::XExternalSheetCache > { public: @@ -534,8 +532,6 @@ private: size_t mnIndex; }; -// ============================================================================ - class ScExternalDocLinkObj : public cppu::WeakImplHelper1< ::com::sun::star::sheet::XExternalDocLink > { public: @@ -582,8 +578,6 @@ private: sal_uInt16 mnFileId; }; -// ============================================================================ - /** This is the UNO API equivalent of ScExternalRefManager. */ class ScExternalDocLinksObj : public cppu::WeakImplHelper1< ::com::sun::star::sheet::XExternalDocLinks > { diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index a41197a49d68..5ae3bacc6051 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -47,7 +47,7 @@ class ScMarkArray ScMarkEntry* pData; friend class ScMarkArrayIter; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // for FillInfo public: ScMarkArray(); @@ -70,7 +70,7 @@ public: }; -class ScMarkArrayIter // selektierte Bereiche durchgehen +class ScMarkArrayIter // iterate over selected range { const ScMarkArray* pArray; SCSIZE nPos; diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index d3338ba22743..5ba41a9f6782 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -313,7 +313,7 @@ class ScLabelRangeObj : public ::cppu::WeakImplHelper2< private: ScDocShell* pDocShell; sal_Bool bColumn; - ScRange aRange; // Kriterium um Bereich zu finden + ScRange aRange; // criterion to find range private: ScRangePair* GetData_Impl(); diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx index 939ddff5d778..bad1d9e7f4f8 100644 --- a/sc/inc/navicfg.hxx +++ b/sc/inc/navicfg.hxx @@ -33,7 +33,7 @@ //================================================================== -// CfgItem fuer Navigator-Zustand +// CfgItem for navigator-state //================================================================== class ScNavipiCfg diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index dca32db3932f..1a42b13e5cb9 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -56,8 +56,8 @@ public: SCCOLROW GetStart() const { return nStart; } SCSIZE GetSize() const { return nSize; } SCCOLROW GetEnd() const { return nStart+nSize-1; } - bool IsHidden() const { return bHidden; } // Gruppe versteckt - bool IsVisible() const { return bVisible; } // Control sichtbar? + bool IsHidden() const { return bHidden; } // group hidden + bool IsVisible() const { return bVisible; } // control visible? void Move( SCsCOLROW nDelta ); void SetSize( SCSIZE nNewSize ); @@ -147,7 +147,7 @@ public: BOOL TestInsertCol( SCSIZE nSize ); void InsertCol( SCCOL nStartCol, SCSIZE nSize ); - BOOL DeleteCol( SCCOL nStartCol, SCSIZE nSize ); // TRUE: Undo nur ueber Original + BOOL DeleteCol( SCCOL nStartCol, SCSIZE nSize ); // TRUE: Undo only using original BOOL TestInsertRow( SCSIZE nSize ); void InsertRow( SCROW nStartRow, SCSIZE nSize ); BOOL DeleteRow( SCROW nStartRow, SCSIZE nSize ); diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx index 7dacefdd943a..65bf3ebb37c7 100644 --- a/sc/inc/prnsave.hxx +++ b/sc/inc/prnsave.hxx @@ -41,8 +41,8 @@ class ScPrintSaverTab typedef ::std::vector< ScRange > ScRangeVec; ScRangeVec maPrintRanges; // Array - ScRange* mpRepeatCol; // einzeln - ScRange* mpRepeatRow; // einzeln + ScRange* mpRepeatCol; // single + ScRange* mpRepeatRow; // single BOOL mbEntireSheet; public: diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 7c1c212081e3..bf75dd086167 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -82,7 +82,7 @@ struct ScQueryParamTable struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable { - BOOL bDestPers; // nicht gespeichert + BOOL bDestPers; // not saved SCTAB nDestTab; SCCOL nDestCol; SCROW nDestRow; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index c665ed528f78..91a8a312659e 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -297,8 +297,6 @@ public: SCROW nRowEnd; }; -//------------------------------------------------------------------------ - // // returns areas with reference and all db-areas // diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index 596de88d8393..c0d8a67314f9 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -100,17 +100,17 @@ #define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges as ScRangePair //-------------------------------- #define SC_31_EXPORT_VER 0x0012 // version for 3.1-export -//-------------------------------- ab 4.0 +//-------------------------------- since 4.0 #define SC_32K_ROWS 0x0100 // 32000 rows - incompatibel #define SC_FONTCHARSET 0x0101 // Font-CharSets have to be right //-------------------------------- #define SC_40_EXPORT_VER 0x0101 // version for 4.0-Export -//-------------------------------- ab 5.0 +//-------------------------------- since 5.0 #define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode #define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implicit intersection #define SC_VERSION_EDITPOOL 0x0203 // EditCells with EditPool #define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal of formula cell (true) -//-------------------------------- ab 5.2 +//-------------------------------- since 5.2 #define SC_CONVERT_RECALC_ON_LOAD 0x0205 // CONVERT function recalculated on each load //-------------------------------- #define SC_CURRENT_VERSION 0x0205 diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index c1f075934478..a0c48a7f5a0a 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -39,7 +39,7 @@ #define RID_HANDLEBITMAP 10005 -// Bereiche ------------------------------------------------------------------ +// areas #define SC_VIEW_START (SID_SC_START) #define SC_VIEW_END (SID_SC_START + 99) @@ -50,14 +50,13 @@ #define SC_PARAM_START (SID_SC_START + 300) #define SC_PARAM_END (SID_SC_START + 399) -// kompatibel zu frueher bleiben: +// stay compatible to the past #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 +// help IDs - +// calc has a range of 2000 IDs +// the functions need 11*90 = 990 IDs #define HID_SC_FUNC_START (HID_SC_START + 0) #define HID_INSWIN_START (HID_SC_START + 1000) @@ -69,10 +68,8 @@ #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_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 ) @@ -82,7 +79,7 @@ #define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) #define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) -// Hilfe IDs fuer Vorlagen --------------------------------------------------- +// help IDs for templates #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 ) @@ -91,7 +88,7 @@ #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) ------------------------------- +// help IDs for shells (helper) (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 ) @@ -109,12 +106,12 @@ #define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) #define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) -// Hilfe IDs fuer Dokumentfenster -------------------------------------------- +// help IDs for document window #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 +// help IDs for single controls (max.30) +// header/footer edit window: header/footer left/right left/middle/right #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 ) @@ -139,15 +136,15 @@ #define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) #define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) -// Teilergebnisse +// partial results #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! +// range is full! -// Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- +// help IDs for dialogs / 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 ) @@ -206,7 +203,7 @@ #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 +// function autopilots: only as 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 ) @@ -234,13 +231,13 @@ #define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) #define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) -//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname +// header/footerDlg: context menu for filename #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) ----------------------- +// help IDs for object- and toolbars (max.10) #define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) #define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) @@ -260,7 +257,7 @@ #define HID_SC_REN_AFMT_DLG ( HID_SC_TOOLBOX_START + 10 ) -// Hilfe IDs fuer Submenus (max.50) ------------------------------------------ +// help IDs for 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 ) @@ -315,7 +312,7 @@ #define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) #define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) -// Other help IDs (max.70) --------------------------------------------------- +// other help IDs (max.70) #define HID_SCDLG_LINKAREAURL ( HID_SC_OTHER_START ) #define HID_SCMENU_EDIT_TABLE ( HID_SC_OTHER_START + 1 ) @@ -357,7 +354,7 @@ #define HID_SC_HF_FL_DEFINED ( HID_SC_OTHER_START + 28 ) #define HID_SC_HF_FR_DEFINED ( HID_SC_OTHER_START + 29 ) -// Analysis Addin Functions (max.120) ---------------------------------------- +// 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 ) @@ -452,7 +449,7 @@ #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) ----------------------------------------- +// DateFunc Addin Functions (max.20) #define HID_DAI_FUNC_DAYSINMONTH ( HID_SC_DAI_FUNCS_START ) #define HID_DAI_FUNC_DAYSINYEAR ( HID_SC_DAI_FUNCS_START + 1 ) #define HID_DAI_FUNC_WEEKSINYEAR ( HID_SC_DAI_FUNCS_START + 2 ) @@ -461,10 +458,10 @@ #define HID_DAI_FUNC_DIFFYEARS ( HID_SC_DAI_FUNCS_START + 5 ) #define HID_DAI_FUNC_ROT13 ( HID_SC_DAI_FUNCS_START + 6 ) -// Ende Hilfe IDs ------------------------------------------------------------ -// --------------------------------------------------------------------------- +// end help IDs + -// View-Funktionen (max. 100) ------------------------------------------------ +// view-functions (max. 100) #define FID_TESTFUNC0 (SC_VIEW_START) #define FID_TESTFUNC1 (SC_VIEW_START + 1) @@ -486,35 +483,35 @@ #define FID_MARKPAGEUP (SC_VIEW_START + 18) #define FID_MARKPAGEDOWN (SC_VIEW_START + 19) -// Slot-IDs fuer Attribute: +// slot-IDs for attributes -#define SID_SCATTR_HOR_JUSTIFY (SC_VIEW_START + 30) // Alignment-Page +#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_PROTECTION (SC_VIEW_START + 36) // protection-page -// sonstige Slot-IDs: +// other slot-IDs: -#define SID_SCUSERLISTS (SC_VIEW_START + 37) // Benutzerdef.Listen -#define RES_TBX_DUMMY (SC_VIEW_START + 38) // Dummy-Item +#define SID_SCUSERLISTS (SC_VIEW_START + 37) // user defined lists +#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: +// cursor movements as 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) -// Slot-IDs fuer spez. ToolBox-Funktionen: +// slot-IDs for special toolbox functions: #define SID_NUMBER_CURRENCY (SC_VIEW_START + 45) #define SID_NUMBER_PERCENT (SC_VIEW_START + 46) -// "Slot" Ids fuer Eingabezeilen Images: +// "slot" IDs for input 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) @@ -529,7 +526,7 @@ #define SID_NUMBER_INCDEC (SC_VIEW_START + 57) #define SID_NUMBER_DECDEC (SC_VIEW_START + 58) -// Sonstiges: +// misc: #define SID_LINKS (SC_VIEW_START + 60) #define SID_INSERT_SIMAGE (SC_VIEW_START + 61) #define SID_INSERT_SCHART (SC_VIEW_START + 62) @@ -547,7 +544,7 @@ #define SID_DRAW_CHART (SC_VIEW_START + 71) #define SID_UPDATETABLINKS (SC_VIEW_START + 72) -//TabPage Eingabe +// TabPage entry #define SID_SC_INPUT_SELECTION (SC_VIEW_START + 73) #define SID_SC_INPUT_SELECTIONPOS (SC_VIEW_START + 74) #define SID_SC_INPUT_EDITMODE (SC_VIEW_START + 75) @@ -574,13 +571,13 @@ // new entry "Filter..." in DP popup menu #define SID_DP_FILTER (SC_VIEW_START + 91) -// Replace cell contents warning +// replace cell contents warning #define SID_SC_INPUT_REPLCELLSWARN (SC_VIEW_START + 92) // additional IDs for list/range validity #define FID_VALID_LISTTYPE (SC_VIEW_START + 93) -// #i68101# ID for changing Title & Descriptopn of an Object +// #i68101# ID for changing title & description of an object #define SID_TITLE_DESCRIPTION_OBJECT (SC_VIEW_START + 94) // #i59082# assign macro to shape @@ -595,7 +592,7 @@ // NOTE: last valid ID is (SC_VIEW_START + 99) -// Nachrichten ------------------------------------------------------------- +// messages #define FID_INPUTLINE_STATUS (SC_MESSAGE_START) #define FID_INPUTLINE_ENTER (SC_MESSAGE_START + 1) @@ -641,7 +638,7 @@ #define SC_HINT_DOC_SAVED (SC_MESSAGE_START + 35) #define SC_HINT_FORCESETTAB (SC_MESSAGE_START + 36) -// Nachricht zum Oeffnen von Dialogen: +// messages for opening dialogs: #define SID_OPENDLG_CONSOLIDATE (SC_MESSAGE_START + 50) #define SID_OPENDLG_PIVOTTABLE (SC_MESSAGE_START + 51) #define SID_OPENDLG_FUNCTION (SC_MESSAGE_START + 52) @@ -654,7 +651,7 @@ #define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61) #define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65) -// Funktionen ------------------------------------------------------------ +// functions #define FID_DOC_MANAGER (SC_FUNCTION_START + 1) @@ -719,7 +716,7 @@ #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_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! sollte vom Svx kommen +#define SID_INSERT_CLIPART (INSERT_MENU_START + 17) //!!! should come from Svx #define FID_INS_CELLSDOWN (INSERT_MENU_START + 18) #define FID_INS_CELLSRIGHT (INSERT_MENU_START + 19) #define INSERT_MENU_END (INSERT_MENU_START + 20) @@ -764,7 +761,7 @@ #define SID_PIVOT_RECALC (EXTRA_MENU_START + 14) #define SID_PIVOT_KILL (EXTRA_MENU_START + 15) -// hier falsch, aber erstmal +// wrong here, but better than nothing #define SID_SC_HELP_PI (EXTRA_MENU_START + 16) #define SID_SC_SHOW_KEYBOARD_HELP (EXTRA_MENU_START + 17) @@ -898,7 +895,7 @@ #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) +//from 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) @@ -1003,7 +1000,7 @@ #define SID_TOGGLE_REL (SID_NEW_SLOTS+38) #define SID_DATA_SELECT (SID_NEW_SLOTS+39) -// Suchen & Ersetzen +// search & replace #define FID_SEARCH (SID_NEW_SLOTS+40) #define FID_REPEAT_SEARCH (SID_NEW_SLOTS+41) #define FID_REPLACE (SID_NEW_SLOTS+42) @@ -1024,7 +1021,7 @@ #define FID_VALIDATION (SID_NEW_SLOTS+54) -// Slots fuer Toolbox Controller in der Werkzeugleiste +// slots for toolbox controller in toolbar #define SID_TBXCTL_INSERT (SID_NEW_SLOTS+55) #define SID_TBXCTL_INSCELLS (SID_NEW_SLOTS+56) #define SID_TBXCTL_INSOBJ (SID_NEW_SLOTS+57) @@ -1033,7 +1030,7 @@ #define FID_NOTE_VISIBLE (SID_NEW_SLOTS+59) -// Items fuer Gueltigkeit +// items for validation #define FID_VALID_MODE (SID_NEW_SLOTS+60) #define FID_VALID_CONDMODE (SID_NEW_SLOTS+61) #define FID_VALID_VALUE1 (SID_NEW_SLOTS+62) @@ -1052,7 +1049,7 @@ #define FID_FOCUS_POSWND (SID_NEW_SLOTS+74) -// einzelne Slots fuer verschiedene Unterstreich-Arten (Popup-Menu) +// single slots for different underline kinds (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) @@ -1080,7 +1077,7 @@ #define SID_DELETE_SCENARIO (SID_NEW_SLOTS+95) #define SID_EDIT_SCENARIO (SID_NEW_SLOTS+96) -// idl Parameter --------------------------------------------------------- +// idl parameter #define SID_SORT_BYROW (SC_PARAM_START) #define SID_SORT_HASHEADER (SC_PARAM_START+1) @@ -1089,7 +1086,7 @@ #define SID_SORT_USERDEF (SC_PARAM_START+4) #define SID_SORT_NATURALSORT (SC_PARAM_START+5) -// Resourcen ------------------------------------------------------------- +// ressources #define RID_OBJECTBAR_APP (SC_RESOURCE_START) #define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) @@ -1192,7 +1189,7 @@ #define SCSTR_ALL (STR_START + 51) #define SCSTR_STDFILTER (STR_START + 52) -// Cfg-Item-Namen +// Cfg-Item-names #define SCSTR_CFG_APP (STR_START + 53) #define SCSTR_CFG_DOC (STR_START + 54) #define SCSTR_CFG_VIEW (STR_START + 55) @@ -1241,11 +1238,11 @@ #define STR_CAPTION_DEFAULT_TEXT (STR_START + 88) -// dialog: Select Sheets +// dialog: select sheets #define STR_DLG_SELECTTABLES_TITLE (STR_START + 89) #define STR_DLG_SELECTTABLES_LBNAME (STR_START + 90) -// Replace cell contents warning +// replace cell contents warning #define STR_REPLCELLSWARN (STR_START + 91) #define SCSTR_DPFUNCLISTBOX (STR_START + 92) @@ -1254,7 +1251,7 @@ #define SCSTR_MOREBTN_MOREOPTIONS (STR_START + 95) #define SCSTR_MOREBTN_FEWEROPTIONS (STR_START + 96) -// Items +// items #define SCSTR_HOR_JUSTIFY_LEFT (STR_START + 100) #define SCSTR_HOR_JUSTIFY_CENTER (STR_START + 101) @@ -1270,7 +1267,7 @@ #define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111) #define SCSTR_ORIENTATION_STANDARD (STR_START + 112) -// Accessibility ------------------------------------ +// accessibility // CSV import #define STR_ACC_CSVRULER_NAME (STR_START + 150) @@ -1278,7 +1275,7 @@ #define STR_ACC_CSVGRID_NAME (STR_START + 152) #define STR_ACC_CSVGRID_DESCR (STR_START + 153) -// Document +// document #define STR_ACC_DOC_NAME (STR_START + 154) #define STR_ACC_DOC_DESCR (STR_START + 155) #define STR_ACC_TABLE_NAME (STR_START + 156) @@ -1286,7 +1283,7 @@ #define STR_ACC_CELL_NAME (STR_START + 158) #define STR_ACC_CELL_DESCR (STR_START + 159) -// Preview +// preview #define STR_ACC_PREVIEWDOC_NAME (STR_START + 160) #define STR_ACC_PREVIEWDOC_DESCR (STR_START + 161) #define STR_ACC_HEADERCELL_NAME (STR_START + 162) @@ -1317,8 +1314,6 @@ #define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181) #define STR_ACC_DATAPILOT_PAGE_DESCR (STR_START + 182) -// -------------------------------------------------- - #define SCSTR_HUMAN_SCDOC_NAME (STR_START + 210) #define SCSTR_SHORT_SCDOC_NAME (STR_START + 211) #define SCSTR_LONG_SCDOC_NAME (STR_START + 212) @@ -1331,7 +1326,7 @@ #define SCSTR_PRINT_OPTIONS (STR_START + 216) #define SCSTR_WARN_ME_IN_FUTURE_CHECK (STR_START + 217) -// Navigator - in der Reihenfolge wie SC_CONTENT_... +// navigator - in the same order as SC_CONTENT_... #define SCSTR_CONTENT_ROOT (STR_START + 250) #define SCSTR_CONTENT_TABLE (STR_START + 251) #define SCSTR_CONTENT_RANGENAME (STR_START + 252) @@ -1341,9 +1336,9 @@ #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 +// some space for extensions -// Eingabezeile, Quickhelp-Strings (HelpText jetzt per HelpId aus Hilfe) +// input, quickhelp strings (HelpText now using HelpId from help) #define SCSTR_QHELP_INPUTWND (STR_START + 307) #define SCSTR_QHELP_POSWND (STR_START + 308) #define SCSTR_QHELP_BTNCALC (STR_START + 309) @@ -1352,14 +1347,14 @@ #define SCSTR_QHELP_BTNSUM (STR_START + 312) #define SCSTR_QHELP_BTNEQUAL (STR_START + 313) -// Validator +// validator #define SCSTR_VALID_MINIMUM (STR_START + 314) #define SCSTR_VALID_MAXIMUM (STR_START + 315) #define SCSTR_VALID_VALUE (STR_START + 316) #define SCSTR_VALID_RANGE (STR_START + 317) #define SCSTR_VALID_LIST (STR_START + 318) -// Formulator +// formulator #define SCSTR_FUDB (STR_START + 389) #define SCSTR_FUDATE (STR_START + 390) #define SCSTR_FUFIN (STR_START + 391) @@ -1374,7 +1369,7 @@ #define SCSTR_FILTER_STRINGS (STR_START + 399) #define SCSTR_COMPILER_INTL_STR (STR_START + 400) -// Media shell +// media shell #define SCSTR_MEDIASHELL (STR_START + 401) #define RID_SCSTR_ONCLICK (STR_START + 402) @@ -1386,7 +1381,7 @@ #define BMP_START (STR_END) -// Navigator +// navigator #define RID_IMG_DROP_URL (BMP_START + 2) #define RID_IMG_DROP_LINK (BMP_START + 3) #define RID_IMG_DROP_COPY (BMP_START + 4) @@ -1490,7 +1485,7 @@ #define RID_SCDLG_EDITCHAR (SC_DIALOGS_START + 82) -// Popup fuer Statusbar-Controller +// popup for 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) @@ -1502,7 +1497,7 @@ #define RID_SCDLG_ASCII (SC_DIALOGS_START + 91) -// Popup fuer Drop-Modus im Navigator +// popup for drop-mode in 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) @@ -1518,17 +1513,17 @@ #define RID_SCPAGE_HFED_FL (SC_DIALOGS_START + 102) #define RID_SCPAGE_HFED_FR (SC_DIALOGS_START + 103) -// Ableitungen von RID_SCDLG_MTRINPUT +// derivations from 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) -// Ableitungen von RID_SCDLG_SELENTRY +// derivations from RID_SCDLG_SELENTRY #define RID_SCDLG_SELECTDB (SC_DIALOGS_START + 108) #define RID_SCDLG_SHOW_TAB (SC_DIALOGS_START + 109) -// Ableitungen von RID_SCDLG_GROUP +// derivations from RID_SCDLG_GROUP #define RID_SCDLG_GRP_MAKE (SC_DIALOGS_START + 110) #define RID_SCDLG_GRP_KILL (SC_DIALOGS_START + 111) @@ -1596,28 +1591,27 @@ #define MID_3 3 #define MID_4 4 -// ---------------------------------------------------------------------------- // ooo-build specific resources #define SC_OOO_BUILD_START (SC_DIALOGS_END) -// Toggle sheet grid +// toggle sheet grid #define FID_TAB_TOGGLE_GRID (SC_OOO_BUILD_START + 1) -// Formula options page +// formula options page #define RID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 2) #define HID_SCPAGE_FORMULA (SC_OOO_BUILD_START + 3) -// Insert current date and time to cell via command +// insert current date and time to cell via command #define SID_INSERT_CURRENT_DATE (SC_OOO_BUILD_START + 4) #define SID_INSERT_CURRENT_TIME (SC_OOO_BUILD_START + 5) -// Data Form +// data Form #define SID_DATAFORM_NEW (SC_OOO_BUILD_START + 6) // message #define SID_DATA_FORM (SC_OOO_BUILD_START + 7) // menu (in Data menu) #define RID_SCDLG_DATAFORM (SC_OOO_BUILD_START + 8) // dialog -// Compatibility options page +// compatibility options page #define RID_SCPAGE_COMPATIBILITY (SC_OOO_BUILD_START + 9) #define HID_SCPAGE_COMPATIBILITY (SC_OOO_BUILD_START + 10) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index e610569a6d70..e5927ac0fd5a 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -399,7 +399,7 @@ public: 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! + USHORT nResId, // derivative for every dialog! long nCurrent, long nDefault, int nId , diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx index 9319b7da71fc..c39a23cf029b 100644 --- a/sc/inc/scextopt.hxx +++ b/sc/inc/scextopt.hxx @@ -34,8 +34,6 @@ #include "global.hxx" #include "rangelst.hxx" -// ============================================================================ - /** Extended settings for the document, used in import/export filters. */ struct ScExtDocSettings { @@ -47,8 +45,6 @@ struct ScExtDocSettings explicit ScExtDocSettings(); }; -// ============================================================================ - /** Enumerates possible positions of panes in split sheets. */ enum ScExtPanePos { @@ -58,8 +54,6 @@ enum ScExtPanePos SCEXT_PANE_BOTTOMRIGHT /// Bottom-right pane. }; -// ---------------------------------------------------------------------------- - /** Extended settings for a sheet, used in import/export filters. */ struct ScExtTabSettings { @@ -82,8 +76,6 @@ struct ScExtTabSettings explicit ScExtTabSettings(); }; -// ============================================================================ - struct ScExtDocOptionsImpl; /** Extended options held by an ScDocument containing additional settings for filters. @@ -127,8 +119,6 @@ private: ::std::auto_ptr< ScExtDocOptionsImpl > mxImpl; }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx index d987616bd997..1c6b36c57950 100644 --- a/sc/inc/segmenttree.hxx +++ b/sc/inc/segmenttree.hxx @@ -89,8 +89,6 @@ private: ::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl; }; -// ============================================================================ - class ScFlatBoolColSegments { public: @@ -114,8 +112,6 @@ private: ::std::auto_ptr<ScFlatBoolSegmentsImpl> mpImpl; }; -// ============================================================================ - class ScFlatUInt16SegmentsImpl; class ScFlatUInt16RowSegments diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index 9c306f29a0cc..ae19e89ff26e 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -64,7 +64,7 @@ public: virtual void SAL_CALL setSearchString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - // Search/Replace muss von aussen (vom XSearchable) gerufen werden... + // search/replace should be called from outside (from XSearchable)... // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index 9ff089270fde..23c1492700d5 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -41,7 +41,7 @@ public: }; -struct ScFunctionData // zum Berechnen von einzelnen Funktionen +struct ScFunctionData // to calculate single functions { ScSubTotalFunc eFunc; double nVal; diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 7e2d4cb1071f..f0228e858c72 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -101,7 +101,7 @@ private: typedef ::std::vector< ScAddress2D > ScAddress2DVec; typedef ::std::auto_ptr< ScAddress2DVec > ScAddress2DVecPtr; - // Daten pro Tabelle ------------------ + // data per table ScColumn aCol[MAXCOLCOUNT]; String aName; @@ -118,12 +118,12 @@ private: ULONG nLinkRefreshDelay; BYTE nLinkMode; - // Seitenformatvorlage + // page style template String aPageStyle; BOOL bPageSizeValid; - Size aPageSizeTwips; // Groesse der Druck-Seite - SCCOL nRepeatStartX; // Wiederholungszeilen/Spalten - SCCOL nRepeatEndX; // REPEAT_NONE, wenn nicht benutzt + Size aPageSizeTwips; // size of the print-page + SCCOL nRepeatStartX; // repeating rows/columns + SCCOL nRepeatEndX; // REPEAT_NONE, if not used SCROW nRepeatStartY; SCROW nRepeatEndY; @@ -152,14 +152,14 @@ private: SCROW nTableAreaY; BOOL bTableAreaValid; - // interne Verwaltung ------------------ + // internal management BOOL bVisible; BOOL bStreamValid; BOOL bPendingRowHeights; BOOL bCalcNotification; SCTAB nTab; - USHORT nRecalcLvl; // Rekursionslevel Size-Recalc + USHORT nRecalcLvl; // recursion level Size-Recalc ScDocument* pDocument; utl::SearchParam* pSearchParam; utl::TextSearch* pSearchText; @@ -168,7 +168,7 @@ private: ScAddress2DVecPtr mxUninitNotes; - // SortierParameter um den Stackbedarf von Quicksort zu Minimieren + // sort parameter to minimize stack size of quicksort ScSortParam aSortParam; CollatorWrapper* pSortCollator; BOOL bGlobalKeepQuery; @@ -191,7 +191,7 @@ private: mutable ScRangeName* mpRangeName; bool mbPageBreaksValid; -friend class ScDocument; // fuer FillInfo +friend class ScDocument; // for FillInfo friend class ScDocumentIterator; friend class ScValueIterator; friend class ScDBQueryDataIterator; @@ -213,7 +213,7 @@ public: SCSIZE GetCellCount(SCCOL nCol) const; ULONG GetCellCount() const; ULONG GetWeightedCount() const; - ULONG GetCodeCount() const; // RPN-Code in Formeln + ULONG GetCodeCount() const; // RPN code in formula BOOL SetOutlineTable( const ScOutlineTable* pNewOutline ); void StartOutlineTable(); @@ -306,7 +306,7 @@ public: 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 + // TRUE = numberformat set BOOL SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, ScSetStringParam* pParam = NULL ); void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); @@ -386,7 +386,7 @@ public: void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTransClip, USHORT nFlags, BOOL bAsLink ); - // Markierung von diesem Dokument + // mark of this document void MixMarked( const ScMarkData& rMark, USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ); void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, @@ -408,7 +408,7 @@ public: void InvalidateTableArea(); void InvalidatePageBreaks(); - BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = leer + BOOL GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = empty BOOL GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const; BOOL GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const; BOOL GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, @@ -498,7 +498,7 @@ public: 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 + void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // from sw BOOL SearchAndReplace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); @@ -640,7 +640,7 @@ public: */ void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, USHORT nNewHeight ); - // nPPT fuer Test auf Veraenderung + // nPPT to test for modification void SetManualHeight( SCROW nStartRow, SCROW nEndRow, BOOL bManual ); USHORT GetColWidth( SCCOL nCol ) const; @@ -845,7 +845,7 @@ private: const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc); - // benutzen globalen SortParam: + // use the global sort parameter: BOOL IsSorted(SCCOLROW nStart, SCCOLROW nEnd); void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); void SwapCol(SCCOL nCol1, SCCOL nCol2); diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 2c59406a3955..5b781fa784e0 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -61,8 +61,8 @@ struct ScHeaderFieldData; #define SC_HDFT_RIGHT 2 -// ScHeaderFooterContentObj ist ein dummer Container, der per setPropertyValue -// wieder in die Seitenvorlage geschrieben werden muss +// ScHeaderFooterContentObj is a dumb container which must be re-written into +// the page template using setPropertyValue class ScHeaderFooterContentObj : public cppu::WeakImplHelper3< com::sun::star::sheet::XHeaderFooterContent, @@ -83,7 +83,7 @@ public: const EditTextObject* pRight ); virtual ~ScHeaderFooterContentObj(); - // fuer ScPageHFItem (per getImplementation) + // for ScPageHFItem (using getImplementation) const EditTextObject* GetLeftEditObject() const { return pLeftText; } const EditTextObject* GetCenterEditObject() const { return pCenterText; } const EditTextObject* GetRightEditObject() const { return pRightText; } @@ -148,7 +148,7 @@ public: ScHeaderFooterContentObj& GetContentObj() const { return rContentObj; } }; -// ScHeaderFooterTextObj veraendert den Text in einem ScHeaderFooterContentObj +// ScHeaderFooterTextObj changes the text in a ScHeaderFooterContentObj class ScHeaderFooterTextObj : public cppu::WeakImplHelper5< com::sun::star::text::XText, diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 62c2f1e1ada6..1aaddbf029d1 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -60,12 +60,12 @@ enum ScValidErrorStyle }; // -// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) +// Entry for validation (only one condition exists) // class SC_DLLPUBLIC ScValidationData : public ScConditionEntry { - sal_uInt32 nKey; // Index in Attributen + sal_uInt32 nKey; // index in attributes ScValidationMode eDataMode; BOOL bShowInput; @@ -77,7 +77,7 @@ class SC_DLLPUBLIC ScValidationData : public ScConditionEntry String aErrorTitle; String aErrorMessage; - BOOL bIsUsed; // temporaer beim Speichern + BOOL bIsUsed; // temporary during saving BOOL DoMacro( const ScAddress& rPos, const String& rInput, ScFormulaCell* pCell, Window* pParent ) const; @@ -101,7 +101,7 @@ public: ScValidationData( ScDocument* pDocument, const ScValidationData& r ); virtual ~ScValidationData(); - ScValidationData* Clone() const // echte Kopie + ScValidationData* Clone() const // real copy { return new ScValidationData( GetDocument(), *this ); } ScValidationData* Clone(ScDocument* pNew) const { return new ScValidationData( pNew, *this ); } @@ -133,26 +133,26 @@ 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 + // with string: during input, with cell: for detective / RC_FORCED BOOL IsDataValid( const String& rTest, const ScPatternAttr& rPattern, const ScAddress& rPos ) const; BOOL IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const; - // TRUE -> Abbruch + // TRUE -> break 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! + void SetKey(sal_uInt32 nNew) { nKey = nNew; } // only if not inserted! 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; // for undo - // sortiert (per PTRARR) nach Index - // operator== nur fuer die Sortierung + // sort (using PTRARR) by index + // operator== only for sorting BOOL operator ==( const ScValidationData& r ) const { return nKey == r.nKey; } BOOL operator < ( const ScValidationData& r ) const { return nKey < r.nKey; } @@ -177,7 +177,7 @@ private: }; // -// Liste der Bedingungen: +// list of contitions: // typedef ScValidationData* ScValidationDataPtr; @@ -203,7 +203,7 @@ public: const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ); - BOOL operator==( const ScValidationDataList& r ) const; // fuer Ref-Undo + BOOL operator==( const ScValidationDataList& r ) const; // for ref-undo }; #endif diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 2c695ae5b0e0..fc96ea6e1589 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -46,8 +46,8 @@ public: ScNumFormatAbbrev(); ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat); ScNumFormatAbbrev(ULONG nFormat, SvNumberFormatter& rFormatter); - void Load( SvStream& rStream, CharSet eByteStrSet ); // Laden der Zahlenformate - void Save( SvStream& rStream, CharSet eByteStrSet ) const; // Speichern der Zahlenformate + void Load( SvStream& rStream, CharSet eByteStrSet ); // loading of the numberformats + void Save( SvStream& rStream, CharSet eByteStrSet ) const; // saving of the numberformats void PutFormatIndex(ULONG nFormat, SvNumberFormatter& rFormatter); ULONG GetFormatIndex( SvNumberFormatter& rFormatter); inline int operator==(const ScNumFormatAbbrev& rNumFormat) const |