diff options
Diffstat (limited to 'sw/source/uibase/inc')
52 files changed, 343 insertions, 343 deletions
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx index cca31c0ed9bf..280f3607e269 100644 --- a/sw/source/uibase/inc/basesh.hxx +++ b/sw/source/uibase/inc/basesh.hxx @@ -61,7 +61,7 @@ protected: DECL_LINK( InsertDBTextHdl, DBTextStruct_Impl* ); - void InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rTxt ); + void InsertURLButton( const OUString& rURL, const OUString& rTarget, const OUString& rText ); void InsertTable( SfxRequest& _rRequest ); public: @@ -94,9 +94,9 @@ public: void ExecDlg(SfxRequest &); void StateStatusLine(SfxItemSet &rSet); - void ExecTxtCtrl(SfxRequest& rReq); - void GetTxtFontCtrlState(SfxItemSet& rSet); - void GetTxtCtrlState(SfxItemSet& rSet); + void ExecTextCtrl(SfxRequest& rReq); + void GetTextFontCtrlState(SfxItemSet& rSet); + void GetTextCtrlState(SfxItemSet& rSet); void GetBorderState(SfxItemSet &rSet); void GetBckColState(SfxItemSet &rSet); diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx index 8bedf3f7e8ac..4eb1966ffc8d 100644 --- a/sw/source/uibase/inc/cfgitems.hxx +++ b/sw/source/uibase/inc/cfgitems.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem bool bNonbreakingSpace :1; bool bSoftHyphen :1; bool bCharHiddenText :1; - bool bFldHiddenText :1; + bool bFieldHiddenText :1; bool bManualBreak :1; bool bShowHiddenPara :1; diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index c10948bab9c2..8a3f95a3003c 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -27,7 +27,7 @@ #include <svx/stddlg.hxx> #include "dbtree.hxx" -class SwFldMgr; +class SwFieldMgr; class SwView; class SwWrtShell; struct SwDBData; @@ -44,14 +44,14 @@ class SwChangeDBDlg: public SvxStandardDialog ImageList aImageList; SwWrtShell *pSh; - SwFldMgr *pMgr; + SwFieldMgr *pMgr; DECL_LINK(TreeSelectHdl, void * = 0); DECL_LINK(ButtonHdl, void *); DECL_LINK(AddDBHdl, void *); virtual void Apply() SAL_OVERRIDE; - void UpdateFlds(); + void UpdateFields(); void FillDBPopup(); SvTreeListEntry* Insert(const OUString& rDBName); void ShowDBName(const SwDBData& rDBData); diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index ff6f91b3a516..58366f7c3baa 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -50,7 +50,7 @@ class SwCharDlg: public SfxTabDialog public: SwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); + sal_uInt8 nDialogMode, const OUString* pFormatStr = 0); virtual ~SwCharDlg(); diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 35a2809b7af8..506b41601969 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -95,7 +95,7 @@ private: Size m_aWinSize; Size m_aFrmSize; - SwFmtCol m_aCols; + SwFormatCol m_aCols; protected: virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; @@ -103,7 +103,7 @@ protected: public: SwColumnOnlyExample(vcl::Window*); - void SetColumns(const SwFmtCol& rCol); + void SetColumns(const SwFormatCol& rCol); virtual Size GetOptimalSize() const SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx index e63b3f0aba53..fc52425801f7 100644 --- a/sw/source/uibase/inc/colmgr.hxx +++ b/sw/source/uibase/inc/colmgr.hxx @@ -22,7 +22,7 @@ #include "swdllapi.h" #include <fmtclds.hxx> -SW_DLLPUBLIC void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth); +SW_DLLPUBLIC void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth); class SW_DLLPUBLIC SwColMgr { @@ -59,57 +59,57 @@ public: inline void NoCols(); void Update(); - const SwFmtCol& GetColumns() const { return aFmtCol; } + const SwFormatCol& GetColumns() const { return aFormatCol; } void SetActualWidth(sal_uInt16 nW); sal_uInt16 GetActualSize() const { return nWidth; } private: - SwFmtCol aFmtCol; + SwFormatCol aFormatCol; sal_uInt16 nWidth; }; inline sal_uInt16 SwColMgr::GetCount() const { - return aFmtCol.GetNumCols(); + return aFormatCol.GetNumCols(); } inline ::editeng::SvxBorderStyle SwColMgr::GetLineStyle() const { - return aFmtCol.GetLineStyle(); + return aFormatCol.GetLineStyle(); } inline sal_uLong SwColMgr::GetLineWidth() const { - return aFmtCol.GetLineWidth(); + return aFormatCol.GetLineWidth(); } inline const Color& SwColMgr::GetLineColor() const { - return aFmtCol.GetLineColor(); + return aFormatCol.GetLineColor(); } inline SwColLineAdj SwColMgr::GetAdjust() const { - return aFmtCol.GetLineAdj(); + return aFormatCol.GetLineAdj(); } inline void SwColMgr::SetAdjust(SwColLineAdj eAdj) { - aFmtCol.SetLineAdj(eAdj); + aFormatCol.SetLineAdj(eAdj); } inline bool SwColMgr::IsAutoWidth() const { - return aFmtCol.IsOrtho(); + return aFormatCol.IsOrtho(); } inline void SwColMgr::SetAutoWidth(bool bOn, sal_uInt16 nGutterWidth) { - aFmtCol.SetOrtho(bOn, nGutterWidth, nWidth); + aFormatCol.SetOrtho(bOn, nGutterWidth, nWidth); } inline void SwColMgr::NoCols() { - aFmtCol.GetColumns().clear(); + aFormatCol.GetColumns().clear(); } inline bool SwColMgr::HasLine() const { diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index d065065ee66d..0d1a804b9d86 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -26,8 +26,8 @@ class SwWrtShell; class SwContentArr; class SwContentType; -class SwFmtFld; -class SwTxtINetFmt; +class SwFormatField; +class SwTextINetFormat; class SwTOXBase; class SwRangeRedline; @@ -71,34 +71,34 @@ class SwRegionContent : public SwContent class SwURLFieldContent : public SwContent { OUString sURL; - const SwTxtINetFmt* pINetAttr; + const SwTextINetFormat* pINetAttr; public: SwURLFieldContent( const SwContentType* pCnt, const OUString& rName, const OUString& rURL, - const SwTxtINetFmt* pAttr, + const SwTextINetFormat* pAttr, long nYPos ) : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} virtual bool IsProtect() const SAL_OVERRIDE; const OUString& GetURL() const { return sURL; } - const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } + const SwTextINetFormat* GetINetAttr() { return pINetAttr; } }; class SwPostItContent : public SwContent { - const SwFmtFld* pFld; + const SwFormatField* pField; SwRangeRedline* pRedline; bool mbPostIt; public: SwPostItContent( const SwContentType* pCnt, const OUString& rName, - const SwFmtFld* pFormatField, + const SwFormatField* pFormatField, long nYPos ) : SwContent(pCnt, rName, nYPos) - , pFld(pFormatField) + , pField(pFormatField) , pRedline(NULL) , mbPostIt(true) {} @@ -107,12 +107,12 @@ public: SwRangeRedline* pRed, long nYPos ) : SwContent(pCnt, rName, nYPos) - , pFld(NULL) + , pField(NULL) , pRedline(pRed) , mbPostIt(false) {} - const SwFmtFld* GetPostIt() const { return pFld; } + const SwFormatField* GetPostIt() const { return pField; } SwRangeRedline* GetRedline() { return pRedline; } virtual bool IsProtect() const SAL_OVERRIDE; bool IsPostIt() const {return mbPostIt; } diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 9421f16c1926..48bf91fd1f3d 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -57,7 +57,7 @@ class SwContentTree OUString aContextStrings[CONTEXT_COUNT + 1]; OUString sRemoveIdx; OUString sUpdateIdx; - OUString sUnprotTbl; + OUString sUnprotTable; OUString sRename; OUString sReadonlyIdx; OUString sInvisible; diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 1a52d8ba2c99..c1ff57ab4434 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -24,7 +24,7 @@ #include <vcl/edit.hxx> #include <sfx2/basedlgs.hxx> -class SwTableAutoFmt; +class SwTableAutoFormat; class SwView; class SwWrtShell; class NumericField; @@ -49,13 +49,13 @@ class SwConvertTableDlg: public SfxModalDialog VclPtr<CheckBox> mpDontSplitCB; VclPtr<CheckBox> mpBorderCB; - VclPtr<PushButton> mpAutoFmtBtn; + VclPtr<PushButton> mpAutoFormatBtn; OUString sConvertTextTable; - SwTableAutoFmt* pTAutoFmt; + SwTableAutoFormat* pTAutoFormat; SwWrtShell* pShell; - DECL_LINK( AutoFmtHdl, PushButton* ); + DECL_LINK( AutoFormatHdl, PushButton* ); DECL_LINK( BtnHdl, Button* ); DECL_LINK(CheckBoxHdl, void * = 0); DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 ); @@ -66,8 +66,8 @@ public: virtual void dispose() SAL_OVERRIDE; void GetValues( sal_Unicode& rDelim, - SwInsertTableOptions& rInsTblOpts, - SwTableAutoFmt const*& prTAFmt ); + SwInsertTableOptions& rInsTableOpts, + SwTableAutoFormat const*& prTAFormat ); }; #endif diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 5f99c2025360..e152912e40e7 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNamed.hpp> -class SwFldMgr; +class SwFieldMgr; class SwView; #include <wrtsh.hxx> @@ -83,7 +83,7 @@ class SwCaptionDialog : public SvxStandardDialog VclPtr<SwCaptionPreview> m_pPreview; SwView &rView; // search per active, avoid View - SwFldMgr *pMgr; // pointer to save the include + SwFieldMgr *pMgr; // pointer to save the include SelectionType eType; OUString sCharacterStyle; diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 837c2f7019ab..789b197684a8 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -47,7 +47,7 @@ namespace com{namespace sun{namespace star{ } }}} -class SwTableAutoFmt; +class SwTableAutoFormat; class SwView; class SfxItemSet; class SwTableRep; @@ -56,22 +56,22 @@ typedef boost::ptr_vector<_DB_Column> _DB_Columns; struct SwInsDBColumn { - OUString sColumn, sUsrNumFmt; - sal_Int32 nDBNumFmt; - sal_uInt32 nUsrNumFmt; - LanguageType eUsrNumFmtLng; + OUString sColumn, sUsrNumFormat; + sal_Int32 nDBNumFormat; + sal_uInt32 nUsrNumFormat; + LanguageType eUsrNumFormatLng; sal_uInt16 nCol; - bool bHasFmt : 1; - bool bIsDBFmt : 1; + bool bHasFormat : 1; + bool bIsDBFormat : 1; SwInsDBColumn( const OUString& rStr, sal_uInt16 nColumn ) : sColumn( rStr ), - nDBNumFmt( 0 ), - nUsrNumFmt( 0 ), - eUsrNumFmtLng( LANGUAGE_SYSTEM ), + nDBNumFormat( 0 ), + nUsrNumFormat( 0 ), + eUsrNumFormatLng( LANGUAGE_SYSTEM ), nCol( nColumn ), - bHasFmt(false), - bIsDBFmt(true) + bHasFormat(false), + bIsDBFormat(true) {} bool operator==( const SwInsDBColumn& rCmp ) const @@ -93,13 +93,13 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem VclPtr<VclFrame> m_pHeadFrame; - VclPtr<ListBox> m_pLbTblDbColumn; - VclPtr<ListBox> m_pLbTxtDbColumn; + VclPtr<ListBox> m_pLbTableDbColumn; + VclPtr<ListBox> m_pLbTextDbColumn; VclPtr<VclFrame> m_pFormatFrame; - VclPtr<RadioButton> m_pRbDbFmtFromDb; - VclPtr<RadioButton> m_pRbDbFmtFromUsr; - VclPtr<NumFormatListBox> m_pLbDbFmtFromUsr; + VclPtr<RadioButton> m_pRbDbFormatFromDb; + VclPtr<RadioButton> m_pRbDbFormatFromUsr; + VclPtr<NumFormatListBox> m_pLbDbFormatFromUsr; // Page Text/Field VclPtr<PushButton> m_pIbDbcolToEdit; @@ -117,32 +117,32 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem VclPtr<CheckBox> m_pCbTableHeadon; VclPtr<RadioButton> m_pRbHeadlColnms; VclPtr<RadioButton> m_pRbHeadlEmpty; - VclPtr<PushButton> m_pPbTblFormat; - VclPtr<PushButton> m_pPbTblAutofmt; + VclPtr<PushButton> m_pPbTableFormat; + VclPtr<PushButton> m_pPbTableAutofmt; SwInsDBColumns aDBColumns; const SwDBData aDBData; - Link<> aOldNumFmtLnk; + Link<> aOldNumFormatLnk; OUString sNoTmpl; SwView* pView; - SwTableAutoFmt* pTAutoFmt; + SwTableAutoFormat* pTAutoFormat; - SfxItemSet* pTblSet; + SfxItemSet* pTableSet; SwTableRep* pRep; - sal_Int32 nGBFmtLen; + sal_Int32 nGBFormatLen; DECL_LINK( PageHdl, Button* ); - DECL_LINK( AutoFmtHdl, PushButton* ); - DECL_LINK( TblFmtHdl, PushButton* ); + DECL_LINK( AutoFormatHdl, PushButton* ); + DECL_LINK( TableFormatHdl, PushButton* ); DECL_LINK( DBFormatHdl, Button* ); - DECL_LINK( TblToFromHdl, Button* ); + DECL_LINK( TableToFromHdl, Button* ); DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( DblClickHdl, ListBox* ); DECL_LINK( HeaderHdl, Button* ); - bool SplitTextToColArr( const OUString& rTxt, _DB_Columns& rColArr, bool bInsField ); + bool SplitTextToColArr( const OUString& rText, _DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; virtual void ImplCommit() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx index b8656bdec8c4..a74868be1aba 100644 --- a/sw/source/uibase/inc/drwtxtsh.hxx +++ b/sw/source/uibase/inc/drwtxtsh.hxx @@ -62,7 +62,7 @@ public: void ExecDraw(SfxRequest &); void GetStatePropPanelAttr(SfxItemSet &); void GetState(SfxItemSet &); - void GetDrawTxtCtrlState(SfxItemSet&); + void GetDrawTextCtrlState(SfxItemSet&); void ExecFontWork(SfxRequest& rReq); void StateFontWork(SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 2c5062f20794..ed65f1e9d1d6 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -123,8 +123,8 @@ friend void PageNumNotify( SwViewShell* pVwSh, m_bIsInDrag : 1, // don't execute StartExecuteDrag twice m_bOldIdle : 1, // to stop to idle m_bOldIdleSet : 1, // during QeueryDrop - m_bTblInsDelMode : 1, - m_bTblIsInsMode : 1, + m_bTableInsDelMode : 1, + m_bTableIsInsMode : 1, m_bChainMode : 1, // connect frames m_bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown m_bLockInput : 1, // lock while calc panel is active @@ -289,7 +289,7 @@ public: /** fdo#55546 cut very long tooltips to 2/3 of the width of the screen via center ellipsis */ - OUString ClipLongToolTip(const OUString& rTxt); + OUString ClipLongToolTip(const OUString& rText); SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; } diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index fd4691a66453..44595cb91444 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -32,11 +32,11 @@ #include "envimg.hxx" -#define GetFldVal(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) -#define SetFldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP) +#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP)) +#define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP) class SwEnvPage; -class SwEnvFmtPage; +class SwEnvFormatPage; class SwWrtShell; class Printer; @@ -56,7 +56,7 @@ protected: class SwEnvDlg : public SfxTabDialog { friend class SwEnvPage; -friend class SwEnvFmtPage; +friend class SwEnvFormatPage; friend class SwEnvPrtPage; friend class SwEnvPreview; diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index 626dc917c8fa..21334df3c20a 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -23,9 +23,9 @@ class SwView; class SwWrtShell; -class SwFldMgr; +class SwFieldMgr; -class SwFldEditDlg : public SfxSingleTabDialog +class SwFieldEditDlg : public SfxSingleTabDialog { SwWrtShell* pSh; VclPtr<PushButton> m_pPrevBT; @@ -38,11 +38,11 @@ class SwFldEditDlg : public SfxSingleTabDialog void Init(); VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); - void EnsureSelection(SwField *pCurFld, SwFldMgr &rMgr); + void EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr); public: - SwFldEditDlg(SwView& rVw); - virtual ~SwFldEditDlg(); + SwFieldEditDlg(SwView& rVw); + virtual ~SwFieldEditDlg(); virtual void dispose() SAL_OVERRIDE; DECL_LINK(OKHdl, void *); diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 3fc3a3c85975..39ff1783c7e8 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -45,7 +45,7 @@ class SvNumberFormatter; namespace vcl { class Window; } // the groups of fields -enum SwFldGroups +enum SwFieldGroups { GRP_DOC, GRP_FKT, @@ -55,7 +55,7 @@ enum SwFldGroups GRP_VAR }; -struct SwFldGroupRgn +struct SwFieldGroupRgn { sal_uInt16 nStart; sal_uInt16 nEnd; @@ -63,7 +63,7 @@ struct SwFldGroupRgn // the field manager handles the insertation of fields // with command strings -struct SwInsertFld_Data +struct SwInsertField_Data { sal_uInt16 m_nTypeId; sal_uInt16 m_nSubType; @@ -76,30 +76,30 @@ struct SwInsertFld_Data ::com::sun::star::uno::Any m_aDBDataSource; ::com::sun::star::uno::Any m_aDBConnection; ::com::sun::star::uno::Any m_aDBColumn; - VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() + VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFieldDlg() - SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2, - sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) : + SwInsertField_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2, + sal_uLong nFormatId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) : m_nTypeId(nType), m_nSubType(nSub), m_sPar1(rPar1), m_sPar2(rPar2), - m_nFormatId(nFmtId), + m_nFormatId(nFormatId), m_pSh(pShell), m_cSeparator(cSep), m_bIsAutomaticLanguage(bIsAutoLanguage), m_pParent(0) {} - SwInsertFld_Data() : + SwInsertField_Data() : m_pSh(0), m_cSeparator(' '), m_bIsAutomaticLanguage(true){} }; -class SW_DLLPUBLIC SwFldMgr +class SW_DLLPUBLIC SwFieldMgr { private: - SwField* pCurFld; + SwField* pCurField; SbModule* pModule; const SvxMacroItem* pMacroItem; SwWrtShell* pWrtShell; // can be ZERO too! @@ -110,7 +110,7 @@ private: OUString sMacroPath; OUString sMacroName; - sal_uLong nCurFmt; + sal_uLong nCurFormat; bool bEvalExp; SAL_DLLPRIVATE sal_uInt16 GetCurrLanguage() const; @@ -120,29 +120,29 @@ private: SAL_DLLPRIVATE com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const; public: - SwFldMgr(SwWrtShell* pSh = 0); - ~SwFldMgr(); + SwFieldMgr(SwWrtShell* pSh = 0); + ~SwFieldMgr(); void SetWrtShell( SwWrtShell* pShell ) { pWrtShell = pShell; } // insert field using TypeID (TYP_ ...) - bool InsertFld( const SwInsertFld_Data& rData ); + bool InsertField( const SwInsertField_Data& rData ); // change the current field directly - void UpdateCurFld(sal_uLong nFormat, + void UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, SwField * _pField = 0); // #111840# - OUString GetCurFldPar1() const { return aCurPar1; } - OUString GetCurFldPar2() const { return aCurPar2; } - inline sal_uLong GetCurFldFmt() const; + OUString GetCurFieldPar1() const { return aCurPar1; } + OUString GetCurFieldPar2() const { return aCurPar2; } + inline sal_uLong GetCurFieldFormat() const; // determine a field - SwField* GetCurFld(); + SwField* GetCurField(); - void InsertFldType(SwFieldType& rType); + void InsertFieldType(SwFieldType& rType); bool ChooseMacro(const OUString &rSelMacro = OUString()); void SetMacroPath(const OUString& rPath); @@ -157,22 +157,22 @@ public: // query values from database fields (BASIC ) // String GetDataBaseFieldValue(const String &rDBName, const String &rFieldName, SwWrtShell* pSh); - bool IsDBNumeric(const OUString& rDBName, const OUString& rTblQryName, - bool bIsTable, const OUString& rFldName); + bool IsDBNumeric(const OUString& rDBName, const OUString& rTableQryName, + bool bIsTable, const OUString& rFieldName); // organise RefMark with names bool CanInsertRefMark( const OUString& rStr ); // access to field types via ResId - sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; - SwFieldType* GetFldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; - SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName) const; + sal_uInt16 GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX) const; + SwFieldType* GetFieldType(sal_uInt16 nResId, sal_uInt16 nId = 0) const; + SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const; - void RemoveFldType(sal_uInt16 nResId, const OUString& rName); + void RemoveFieldType(sal_uInt16 nResId, const OUString& rName); // access via TypeId from the dialog // Ids for a range of fields - static const SwFldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId); + static const SwFieldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId); static sal_uInt16 GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0); // the current field's TypeId @@ -198,15 +198,15 @@ public: // turn off evaluation of expression fields for insertation // of many expressino fields (see labels) - inline void SetEvalExpFlds(bool bEval); - void EvalExpFlds(SwWrtShell* pSh = NULL); + inline void SetEvalExpFields(bool bEval); + void EvalExpFields(SwWrtShell* pSh = NULL); }; -inline void SwFldMgr::SetEvalExpFlds(bool bEval) +inline void SwFieldMgr::SetEvalExpFields(bool bEval) { bEvalExp = bEval; } -inline sal_uLong SwFldMgr::GetCurFldFmt() const - { return nCurFmt; } +inline sal_uLong SwFieldMgr::GetCurFieldFormat() const + { return nCurFormat; } #endif diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index 71883a0f7119..cab774e12dd0 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -25,7 +25,7 @@ class SfxTabPage; class SwChildWinWrapper; struct SfxChildWinInfo; -class SwFldDlg: public SfxTabDialog +class SwFieldDlg: public SfxTabDialog { SwChildWinWrapper* m_pChildWin; SfxBindings* m_pBindings; @@ -47,8 +47,8 @@ class SwFldDlg: public SfxTabDialog bool bOnlyActivate = false ); public: - SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); - virtual ~SwFldDlg(); + SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); + virtual ~SwFieldDlg(); DECL_LINK(OKHdl, void *); DECL_LINK(CancelHdl, void *); diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx index db4cdee3a440..89b70f36c54d 100644 --- a/sw/source/uibase/inc/fldwrap.hxx +++ b/sw/source/uibase/inc/fldwrap.hxx @@ -20,30 +20,30 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX #include "chldwrap.hxx" -class AbstractSwFldDlg; +class AbstractSwFieldDlg; -class SwFldDlgWrapper : public SwChildWinWrapper +class SwFieldDlgWrapper : public SwChildWinWrapper { public: - AbstractSwFldDlg * pDlgInterface; - SwFldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, + AbstractSwFieldDlg * pDlgInterface; + SwFieldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); - SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper); + SFX_DECL_CHILDWINDOW_WITHID(SwFieldDlgWrapper); virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; void ShowReferencePage(); }; // field dialog only showing database page to support mail merge -class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper +class SwFieldDataOnlyDlgWrapper : public SwChildWinWrapper { public: - AbstractSwFldDlg * pDlgInterface; - SwFldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, + AbstractSwFieldDlg * pDlgInterface; + SwFieldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); - SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); + SFX_DECL_CHILDWINDOW(SwFieldDataOnlyDlgWrapper); virtual bool ReInitDlg(SwDocShell *pDocSh) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx index 9e1d6b589e6a..a229e4519bca 100644 --- a/sw/source/uibase/inc/formatclipboard.hxx +++ b/sw/source/uibase/inc/formatclipboard.hxx @@ -69,7 +69,7 @@ private: int m_nSelectionType; /** automatic/named character attribute set */ - SfxItemSet* m_pItemSet_TxtAttr; + SfxItemSet* m_pItemSet_TextAttr; /** automatic/named paragraph attribute set * (it can be caractere attribute applyied to the paragraph) */ SfxItemSet* m_pItemSet_ParAttr; diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index 1e5a0c42d617..ab5977b9a869 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -54,9 +54,9 @@ public: const SfxItemSet& rCoreSet, bool bNewFrm = false, const OUString& sResType = OUString("FrameDialog"), - bool bFmt = false, + bool bFormat = false, const OString& sDefPage = OString(), - const OUString* pFmtStr = 0); + const OUString* pFormatStr = 0); virtual ~SwFrmDlg(); diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx index 0cb84faeed57..f4b9ac13c659 100644 --- a/sw/source/uibase/inc/frmmgr.hxx +++ b/sw/source/uibase/inc/frmmgr.hxx @@ -33,7 +33,7 @@ class SwWrtShell; struct SvxSwFrameValidation; struct SwPosition; -class SwFmtCol; +class SwFormatCol; const SwTwips DFLT_WIDTH = MM50 * 4; const SwTwips DFLT_HEIGHT = MM50; @@ -100,7 +100,7 @@ public: void SetULSpace( long nTop = LONG_MAX, long nBottom= LONG_MAX ); - void SetCol( const SwFmtCol &rCol); + void SetCol( const SwFormatCol &rCol); // change and query attributes void UpdateAttrMgr(); @@ -115,7 +115,7 @@ public: // check and change metrics void ValidateMetrics(SvxSwFrameValidation& rVal, - const SwPosition* pToCharCntntPos, + const SwPosition* pToCharContentPos, bool bOnlyPercentRefValue = false); void DelAttr(sal_uInt16 nId); @@ -125,12 +125,12 @@ public: inline SfxItemSet &GetAttrSet() { return m_aSet; } void SetAttrSet(const SfxItemSet& rSet); - inline const SwFmtVertOrient &GetVertOrient() const; - inline const SwFmtHoriOrient &GetHoriOrient() const; + inline const SwFormatVertOrient &GetVertOrient() const; + inline const SwFormatHoriOrient &GetHoriOrient() const; inline const SvxShadowItem &GetShadow() const; inline const SvxBoxItem &GetBox() const; - inline const SwFmtSurround &GetSurround() const; - inline const SwFmtFrmSize &GetFrmSize() const; + inline const SwFormatSurround &GetSurround() const; + inline const SwFormatFrmSize &GetFrmSize() const; long CalcWidthBorder() { return CalcLeftSpace()+CalcRightSpace(); } long CalcHeightBorder() { return CalcTopSpace()+CalcBottomSpace(); } @@ -138,20 +138,20 @@ public: inline const Size& SwFlyFrmAttrMgr::GetSize() const { - return static_cast<const SwFmtFrmSize&>(m_aSet.Get(RES_FRM_SIZE)).GetSize(); + return static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE)).GetSize(); } -inline const SwFmtVertOrient &SwFlyFrmAttrMgr::GetVertOrient() const +inline const SwFormatVertOrient &SwFlyFrmAttrMgr::GetVertOrient() const { - return static_cast<const SwFmtVertOrient&>(m_aSet.Get(RES_VERT_ORIENT)); + return static_cast<const SwFormatVertOrient&>(m_aSet.Get(RES_VERT_ORIENT)); } -inline const SwFmtHoriOrient &SwFlyFrmAttrMgr::GetHoriOrient() const +inline const SwFormatHoriOrient &SwFlyFrmAttrMgr::GetHoriOrient() const { - return static_cast<const SwFmtHoriOrient &>(m_aSet.Get(RES_HORI_ORIENT)); + return static_cast<const SwFormatHoriOrient &>(m_aSet.Get(RES_HORI_ORIENT)); } -inline const SwFmtFrmSize& SwFlyFrmAttrMgr::GetFrmSize() const +inline const SwFormatFrmSize& SwFlyFrmAttrMgr::GetFrmSize() const { - return static_cast<const SwFmtFrmSize&>(m_aSet.Get(RES_FRM_SIZE)); + return static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE)); } inline const SvxShadowItem &SwFlyFrmAttrMgr::GetShadow() const { @@ -161,9 +161,9 @@ inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const { return static_cast<const SvxBoxItem&>(m_aSet.Get(RES_BOX)); } -inline const SwFmtSurround &SwFlyFrmAttrMgr::GetSurround() const +inline const SwFormatSurround &SwFlyFrmAttrMgr::GetSurround() const { - return static_cast<const SwFmtSurround&>(m_aSet.Get(RES_SURROUND)); + return static_cast<const SwFormatSurround&>(m_aSet.Get(RES_SURROUND)); } inline Point SwFlyFrmAttrMgr::GetPos() const @@ -173,7 +173,7 @@ inline Point SwFlyFrmAttrMgr::GetPos() const inline RndStdIds SwFlyFrmAttrMgr::GetAnchor() const { - return static_cast<const SwFmtAnchor&>(m_aSet.Get(RES_ANCHOR)).GetAnchorId(); + return static_cast<const SwFormatAnchor&>(m_aSet.Get(RES_ANCHOR)).GetAnchorId(); } inline sal_uInt16 SwFlyFrmAttrMgr::GetHeightPercent() const diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 095966548883..b603d5b70430 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -112,7 +112,7 @@ class SwFrmPage: public SfxTabPage // OD 12.11.2003 #i22341# - keep content position of character for // to character anchored objects. - const SwPosition* mpToCharCntntPos; + const SwPosition* mpToCharContentPos; // old alignment sal_Int16 nOldH; @@ -193,7 +193,7 @@ public: virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } - void SetFormatUsed(bool bFmt); + void SetFormatUsed(bool bFormat); void SetFrmType(const OUString &rType) { sDlgType = rType; } inline bool IsInGraficMode() { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); @@ -318,7 +318,7 @@ public: virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; - void SetFormatUsed(bool bFmt); + void SetFormatUsed(bool bFormat); void SetFrmType(const OUString &rType) { sDlgType = rType; } void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetShell(SwWrtShell* pSh) { pWrtSh = pSh; } diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 260423a01ba4..2be62a3e1a8e 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -32,14 +32,14 @@ class SwField; class SwWrtShell; // insert fields -class SwFldInputDlg: public SvxStandardDialog +class SwFieldInputDlg: public SvxStandardDialog { virtual void Apply() SAL_OVERRIDE; virtual void StateChanged( StateChangedType ) SAL_OVERRIDE; SwWrtShell& rSh; - SwInputField* pInpFld; - SwSetExpField* pSetFld; + SwInputField* pInpField; + SwSetExpField* pSetField; SwUserFieldType* pUsrType; VclPtr<Edit> m_pLabelED; @@ -51,9 +51,9 @@ class SwFldInputDlg: public SvxStandardDialog DECL_LINK(NextHdl, void *); public: - SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, + SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); - virtual ~SwFldInputDlg(); + virtual ~SwFieldInputDlg(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 6a1edfc684c4..3d5dba6ed3e1 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -25,7 +25,7 @@ #include <sfx2/childwin.hxx> -class SwFldMgr; +class SwFieldMgr; class SwWrtShell; class SwView; class SfxDispatcher; @@ -37,7 +37,7 @@ public: Edit(pParent , nStyle){} void UpdateRange(const OUString& aSel, - const OUString& aTblName ); + const OUString& aTableName ); protected: virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; @@ -50,11 +50,11 @@ friend class InputEdit; VclPtr<Edit> aPos; VclPtr<InputEdit> aEdit; PopupMenu aPopMenu; - SwFldMgr* pMgr; + SwFieldMgr* pMgr; SwWrtShell* pWrtShell; SwView* pView; SfxBindings* pBindings; - OUString aAktTableName, sOldFml; + OUString aAktTableName, sOldFormula; bool bFirst : 1; // initialisations at first call bool bActive : 1; // for hide/show when switching documents @@ -66,7 +66,7 @@ friend class InputEdit; void CleanupUglyHackWithUndo(); - void DelBoxCntnt(); + void DelBoxContent(); DECL_LINK( ModifyHdl, void* ); using Window::IsActive; @@ -92,7 +92,7 @@ public: bool IsActive(){ return bActive; }; - DECL_LINK( SelTblCellsNotify, SwWrtShell * ); + DECL_LINK( SelTableCellsNotify, SwWrtShell * ); void SetFormula( const OUString& rFormula, bool bDelSel = true ); const SwView* GetView() const{return pView;} diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 8fee498f4022..b49a2477319d 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -47,7 +47,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog VclPtr<PushButton> m_pNumberExtChar; // everything for the selection footnote/endnote - VclPtr<RadioButton> m_pFtnBtn; + VclPtr<RadioButton> m_pFootnoteBtn; VclPtr<RadioButton> m_pEndNoteBtn; VclPtr<PushButton> m_pOkBtn; diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 1e1178306d4c..c52db239c9c7 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -28,7 +28,7 @@ #include <actctrl.hxx> class SwWrtShell; -class SwTableAutoFmt; +class SwTableAutoFormat; class SwView; struct SwInsertTableOptions; @@ -49,15 +49,15 @@ class SwInsTableDlg : public SfxModalDialog VclPtr<CheckBox> m_pBorderCB; VclPtr<PushButton> m_pInsertBtn; - VclPtr<PushButton> m_pAutoFmtBtn; + VclPtr<PushButton> m_pAutoFormatBtn; SwWrtShell* pShell; - SwTableAutoFmt* pTAutoFmt; + SwTableAutoFormat* pTAutoFormat; sal_Int64 nEnteredValRepeatHeaderNF; DECL_LINK( ModifyName, Edit * ); DECL_LINK( ModifyRowCol, NumericField * ); - DECL_LINK( AutoFmtHdl, PushButton* ); + DECL_LINK( AutoFormatHdl, PushButton* ); DECL_LINK(OKHdl, void*); DECL_LINK(CheckBoxHdl, void * = 0); DECL_LINK( ReapeatHeaderCheckBoxHdl, void* p = 0 ); @@ -69,8 +69,8 @@ public: virtual void dispose() SAL_OVERRIDE; void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol, - SwInsertTableOptions& rInsTblOpts, OUString& rTableAutoFmtName, - SwTableAutoFmt *& prTAFmt ); + SwInsertTableOptions& rInsTableOpts, OUString& rTableAutoFormatName, + SwTableAutoFormat *& prTAFormat ); }; #endif diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 13b5295dc973..071faaf87f5a 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -25,7 +25,7 @@ #include <vcl/button.hxx> class SwWrtShell; -class SwFldMgr; +class SwFieldMgr; class SwScriptField; namespace sfx2 { class FileDialogHelper; } @@ -50,8 +50,8 @@ private: bool bNew; bool bIsUrl; - SwScriptField* pFld; - SwFldMgr* pMgr; + SwScriptField* pField; + SwFieldMgr* pMgr; SwWrtShell* pSh; sfx2::FileDialogHelper* pFileDlg; VclPtr<vcl::Window> pOldDefDlgParent; @@ -66,7 +66,7 @@ private: virtual void Apply() SAL_OVERRIDE; void CheckTravel(); - void SetFld(); + void SetField(); public: SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh); diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx index df51ea5a046c..1bb1800c295d 100644 --- a/sw/source/uibase/inc/macassgn.hxx +++ b/sw/source/uibase/inc/macassgn.hxx @@ -38,7 +38,7 @@ class SwMacroAssignDlg { public: static SfxEventNamesItem AddEvents( DlgEventType eType ); - static bool INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh, + static bool INetFormatDlg( vcl::Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ); }; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 1ae4b78829de..1ff9116abbb6 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -79,7 +79,7 @@ class SwMailMergeDlg : public SvxStandardDialog VclPtr<FixedText> m_pFilterFT; VclPtr<ListBox> m_pFilterLB; - VclPtr<ListBox> m_pAddressFldLB; + VclPtr<ListBox> m_pAddressFieldLB; VclPtr<FixedText> m_pSubjectFT; VclPtr<Edit> m_pSubjectED; VclPtr<FixedText> m_pFormatFT; @@ -117,7 +117,7 @@ class SwMailMergeDlg : public SvxStandardDialog public: SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, - const OUString& rTblName, + const OUString& rTableName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0); diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 5bd7548ca358..94fe4bfa94de 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -24,7 +24,7 @@ #include <vcl/fixed.hxx> #include <svx/stddlg.hxx> -class SwMergeTblDlg : public SvxStandardDialog +class SwMergeTableDlg : public SvxStandardDialog { VclPtr<RadioButton> m_pMergePrevRB; @@ -33,8 +33,8 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ); - virtual ~SwMergeTblDlg(); + SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev ); + virtual ~SwMergeTableDlg(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 8d285bea9a86..6a59a57cfefc 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox DECL_DLLPRIVATE_LINK( SelectHdl, ListBox * ); SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const; - SAL_DLLPRIVATE void Init(short nFormatType, bool bUsrFmts); + SAL_DLLPRIVATE void Init(short nFormatType, bool bUsrFormats); SAL_DLLPRIVATE SwView* GetView(); public: @@ -56,7 +56,7 @@ public: void SetFormatType(const short nFormatType); inline short GetFormatType() const { return nCurrFormatType; } - void SetDefFormat(const sal_uLong nDefFmt); + void SetDefFormat(const sal_uLong nDefFormat); sal_uLong GetFormat() const; inline LanguageType GetCurLanguage() const { return eCurLanguage;} diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 6a0f8987b07f..5ac39f582816 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -32,7 +32,7 @@ #include <swlbox.hxx> #include <caption.hxx> -class SwFldMgr; +class SwFieldMgr; class SvTreeListEntry; class SwWrtShell; @@ -150,7 +150,7 @@ private: OUString m_sNone; - SwFldMgr* pMgr; + SwFieldMgr* pMgr; bool bHTMLMode; DECL_LINK(SelectHdl, void *); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 8797615dd99d..eb8278469e8d 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -54,9 +54,9 @@ class SwContentOptPage : public SfxTabPage VclPtr<CheckBox> m_pSmoothCBox; VclPtr<CheckBox> m_pGrfCB; - VclPtr<CheckBox> m_pTblCB; + VclPtr<CheckBox> m_pTableCB; VclPtr<CheckBox> m_pDrwCB; - VclPtr<CheckBox> m_pFldNameCB; + VclPtr<CheckBox> m_pFieldNameCB; VclPtr<CheckBox> m_pPostItCB; VclPtr<VclFrame> m_pSettingsFrame; @@ -82,7 +82,7 @@ public: class SwAddPrinterTabPage : public SfxTabPage { VclPtr<CheckBox> m_pGrfCB; - VclPtr<CheckBox> m_pCtrlFldCB; + VclPtr<CheckBox> m_pCtrlFieldCB; VclPtr<CheckBox> m_pBackgroundCB; VclPtr<CheckBox> m_pBlackFontCB; VclPtr<CheckBox> m_pPrintHiddenTextCB; @@ -209,7 +209,7 @@ class SwTableOptionsTabPage : public SfxTabPage VclPtr<CheckBox> pBorderCB; VclPtr<CheckBox> pNumFormattingCB; - VclPtr<CheckBox> pNumFmtFormattingCB; + VclPtr<CheckBox> pNumFormatFormattingCB; VclPtr<CheckBox> pNumAlignmentCB; VclPtr<MetricField> pRowMoveMF; @@ -253,8 +253,8 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage VclPtr<CheckBox> m_pTabCB; VclPtr<CheckBox> m_pBreakCB; VclPtr<CheckBox> m_pCharHiddenCB; - VclPtr<CheckBox> m_pFldHiddenCB; - VclPtr<CheckBox> m_pFldHiddenParaCB; + VclPtr<CheckBox> m_pFieldHiddenCB; + VclPtr<CheckBox> m_pFieldHiddenParaCB; VclPtr<VclFrame> m_pDirectCursorFrame; VclPtr<CheckBox> m_pOnOffCB; @@ -299,7 +299,7 @@ class SwMarkPreview : public vcl::Window Color m_aMarkCol; // marks Color m_aLineCol; // general lines Color m_aShadowCol; // shadow - Color m_aTxtCol; // text + Color m_aTextCol; // text Color m_aPrintAreaCol; // frame for print area Rectangle aPage; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index d4ae3c69821e..78f96c8c0dbb 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -74,7 +74,7 @@ public: virtual void dispose() SAL_OVERRIDE; SwNumRule* GetNumRule() {return pNumRule;} - sal_uInt16 GetLevel(const OUString &rFmtName) const; + sal_uInt16 GetLevel(const OUString &rFormatName) const; OUString* GetCollNames() {return aCollNames;} static sal_uInt16 GetActNumLevel() {return nNumLevel;} @@ -87,7 +87,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage VclPtr<ListBox> m_pCollBox; VclPtr<SwNumberingTypeListBox> m_pNumberBox; - VclPtr<ListBox> m_pCharFmtLB; + VclPtr<ListBox> m_pCharFormatLB; VclPtr<FixedText> m_pAllLevelFT; VclPtr<NumericField> m_pAllLevelNF; VclPtr<Edit> m_pPrefixED; @@ -95,7 +95,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage VclPtr<NumericField> m_pStartEdit; VclPtr<NumberingPreview> m_pPreviewWIN; - OUString aNoFmtName; + OUString aNoFormatName; OUString aSaveCollNames[MAXLEVEL]; SwWrtShell* pSh; SwNumRule* pNumRule; @@ -109,7 +109,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage DECL_LINK( NumberSelect, SwNumberingTypeListBox * ); DECL_LINK(DelimModify, void *); DECL_LINK( StartModified, NumericField * ); - DECL_LINK(CharFmtHdl, void *); + DECL_LINK(CharFormatHdl, void *); void Update(); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 68fa0fd99ba4..a0932306237a 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -79,7 +79,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg OUString sDeleted; OUString sFormated; OUString sTableChgd; - OUString sFmtCollSet; + OUString sFormatCollSet; OUString sFilterAction; OUString sAutoFormat; VclPtr<SvxTPView> pTPView; @@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg Link<> aOldDeselectHdl; bool bOnlyFormatedRedlines; bool bHasReadonlySel; - bool bRedlnAutoFmt; + bool bRedlnAutoFormat; // prevent update dialog data during longer operations (cf #102657#) bool bInhibitActivate; @@ -105,7 +105,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg DECL_DLLPRIVATE_LINK( CommandHdl, void* ); SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, bool bChild); - SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFmt); + SAL_DLLPRIVATE void InsertChildren(SwRedlineDataParent *pParent, const SwRangeRedline& rRedln, const sal_uInt16 nAutoFormat); SAL_DLLPRIVATE void InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd = USHRT_MAX); SAL_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd); SAL_DLLPRIVATE void InitAuthors(); @@ -116,13 +116,13 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SAL_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const; public: - SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFmt = false); + SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFormat = false); virtual ~SwRedlineAcceptDlg(); DECL_LINK( FilterChangedHdl, void *pDummy = 0 ); inline SvxAcceptChgCtr& GetChgCtrl() { return *aTabPagesCTRL.get(); } - inline bool HasRedlineAutoFmt() const { return bRedlnAutoFmt; } + inline bool HasRedlineAutoFormat() const { return bRedlnAutoFormat; } void Init(sal_uInt16 nStart = 0); void CallAcceptReject( bool bSelect, bool bAccept ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index b0ea63315807..08fc1c6e9c8f 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -102,8 +102,8 @@ class SwEditRegionDlg : public SfxModalDialog Image BuildBitmap(bool bProtect, bool bHidden); - void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); - size_t FindArrPos(const SwSectionFmt* pFmt); + void RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry); + size_t FindArrPos(const SwSectionFormat* pFormat); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); DECL_LINK( DeselectHdl, SvTreeListBox * ); @@ -196,28 +196,28 @@ public: const SfxItemSet* rAttrSet); }; -class SwSectionFtnEndTabPage : public SfxTabPage +class SwSectionFootnoteEndTabPage : public SfxTabPage { - VclPtr<CheckBox> pFtnNtAtTextEndCB; + VclPtr<CheckBox> pFootnoteNtAtTextEndCB; - VclPtr<CheckBox> pFtnNtNumCB; - VclPtr<FixedText> pFtnOffsetLbl; - VclPtr<NumericField> pFtnOffsetFld; + VclPtr<CheckBox> pFootnoteNtNumCB; + VclPtr<FixedText> pFootnoteOffsetLbl; + VclPtr<NumericField> pFootnoteOffsetField; - VclPtr<CheckBox> pFtnNtNumFmtCB; - VclPtr<FixedText> pFtnPrefixFT; - VclPtr<Edit> pFtnPrefixED; - VclPtr<SwNumberingTypeListBox> pFtnNumViewBox; - VclPtr<FixedText> pFtnSuffixFT; - VclPtr<Edit> pFtnSuffixED; + VclPtr<CheckBox> pFootnoteNtNumFormatCB; + VclPtr<FixedText> pFootnotePrefixFT; + VclPtr<Edit> pFootnotePrefixED; + VclPtr<SwNumberingTypeListBox> pFootnoteNumViewBox; + VclPtr<FixedText> pFootnoteSuffixFT; + VclPtr<Edit> pFootnoteSuffixED; VclPtr<CheckBox> pEndNtAtTextEndCB; VclPtr<CheckBox> pEndNtNumCB; VclPtr<FixedText> pEndOffsetLbl; - VclPtr<NumericField> pEndOffsetFld; + VclPtr<NumericField> pEndOffsetField; - VclPtr<CheckBox> pEndNtNumFmtCB; + VclPtr<CheckBox> pEndNtNumFormatCB; VclPtr<FixedText> pEndPrefixFT; VclPtr<Edit> pEndPrefixED; VclPtr<SwNumberingTypeListBox> pEndNumViewBox; @@ -225,11 +225,11 @@ class SwSectionFtnEndTabPage : public SfxTabPage VclPtr<Edit> pEndSuffixED; DECL_LINK( FootEndHdl, CheckBox * ); - void ResetState( bool bFtn, const SwFmtFtnEndAtTxtEnd& ); + void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: - SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); - virtual ~SwSectionFtnEndTabPage(); + SwSectionFootnoteEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); + virtual ~SwSectionFootnoteEndTabPage(); virtual void dispose() SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index cc6a96d2c5f7..456108504aac 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -25,9 +25,9 @@ class SwWrtShell; -class SwSplitTblDlg : public SvxStandardDialog +class SwSplitTableDlg : public SvxStandardDialog { - VclPtr<RadioButton> mpCntntCopyRB; + VclPtr<RadioButton> mpContentCopyRB; VclPtr<RadioButton> mpBoxAttrCopyWithParaRB ; VclPtr<RadioButton> mpBoxAttrCopyNoParaRB ; VclPtr<RadioButton> mpBorderCopyRB; @@ -39,8 +39,8 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ); - virtual ~SwSplitTblDlg(); + SwSplitTableDlg( vcl::Window *pParent, SwWrtShell &rSh ); + virtual ~SwSplitTableDlg(); virtual void dispose() SAL_OVERRIDE; sal_uInt16 GetSplitMode() const { return m_nSplit; } diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 7facf548a45d..44d912562767 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -64,9 +64,9 @@ class SwSortDlg : public SvxStandardDialog VclPtr<CheckBox> m_pCaseCB; - OUString aColTxt; - OUString aRowTxt; - OUString aNumericTxt; + OUString aColText; + OUString aRowText; + OUString aNumericText; SwWrtShell &rSh; CollatorResource* pColRes; diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 29b3df2dee15..039875b801d1 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -34,7 +34,7 @@ class SwDoc; class SwDocFac; class SwTextBlocks; class SwWrtShell; -class SvxClipboardFmtItem; +class SvxClipboardFormatItem; class SwFrameShell; class SwView_Impl; @@ -89,9 +89,9 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper SotClipboardFormatId nFormat, SotExchangeDest nDestination ); static bool _PasteFileContent( TransferableDataHelper&, - SwWrtShell& rSh, SotClipboardFormatId nFmt, bool bMsg ); + SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg ); static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, - SotClipboardFormatId nFmt, sal_uInt8 nActionFlags, bool bMsg ); + SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg ); static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh, sal_uInt16 nAction, const Point* pPt, bool bInsertGRF ); @@ -103,21 +103,21 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste); static bool _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, - SotClipboardFormatId nFmt, sal_uInt16 nAction, const Point* pPt, + SotClipboardFormatId nFormat, sal_uInt16 nAction, const Point* pPt, sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste); static bool _PasteImageMap( TransferableDataHelper& rData, SwWrtShell& rSh ); static bool _PasteAsHyperlink( TransferableDataHelper& rData, - SwWrtShell& rSh, SotClipboardFormatId nFmt ); + SwWrtShell& rSh, SotClipboardFormatId nFormat ); static bool _PasteFileName( TransferableDataHelper& rData, - SwWrtShell& rSh, SotClipboardFormatId nFmt, sal_uInt16 nAction, + SwWrtShell& rSh, SotClipboardFormatId nFormat, sal_uInt16 nAction, const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted ); static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh, - SotClipboardFormatId nFmt, bool bLink, const Point* pDragPt, + SotClipboardFormatId nFormat, bool bLink, const Point* pDragPt, bool bMsg ); static bool _PasteFileList( TransferableDataHelper& rData, @@ -170,7 +170,7 @@ public: static bool Paste( SwWrtShell&, TransferableDataHelper& ); static bool PasteData( TransferableDataHelper& rData, SwWrtShell& rSh, sal_uInt16 nAction, SotClipboardFormatId nFormat, - SotExchangeDest nDestination, bool bIsPasteFmt, + SotExchangeDest nDestination, bool bIsPasteFormat, bool bIsDefault, const Point* pDDPos = 0, sal_Int8 nDropAction = 0, bool bPasteSelection = false ); @@ -182,9 +182,9 @@ public: static bool PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData, SotClipboardFormatId nFormat ); - static void FillClipFmtItem( const SwWrtShell& rSh, + static void FillClipFormatItem( const SwWrtShell& rSh, const TransferableDataHelper& rData, - SvxClipboardFmtItem & rToFill ); + SvxClipboardFormatItem & rToFill ); // Interfaces for Drag & Drop void StartDrag( vcl::Window* pWin, const Point& rPos ); diff --git a/sw/source/uibase/inc/swtablerep.hxx b/sw/source/uibase/inc/swtablerep.hxx index be8d2216dc05..b98e84037816 100644 --- a/sw/source/uibase/inc/swtablerep.hxx +++ b/sw/source/uibase/inc/swtablerep.hxx @@ -29,7 +29,7 @@ class SW_DLLPUBLIC SwTableRep { TColumn* pTColumns; - SwTwips nTblWidth; + SwTwips nTableWidth; SwTwips nSpace; SwTwips nLeftSpace; SwTwips nRightSpace; @@ -53,8 +53,8 @@ public: SwTwips GetRightSpace() const {return nRightSpace;} void SetRightSpace(SwTwips nSet) {nRightSpace = nSet;} - SwTwips GetWidth() const {return nTblWidth;} - void SetWidth(SwTwips nSet) {nTblWidth = nSet;} + SwTwips GetWidth() const {return nTableWidth;} + void SetWidth(SwTwips nSet) {nTableWidth = nSet;} sal_uInt16 GetWidthPercent() const {return nWidthPercent;} void SetWidthPercent(sal_uInt16 nSet) {nWidthPercent = nSet;} diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index fadb5655c59c..6934ec058952 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -22,7 +22,7 @@ #include <tools/resary.hxx> class SwWrtShell; -class SwFmt; +class SwFormat; class SwCondCollPage : public SfxTabPage { @@ -43,7 +43,7 @@ class SwCondCollPage : public SfxTabPage SwWrtShell &m_rSh; const CommandStruct*m_pCmds; - SwFmt* m_pFmt; + SwFormat* m_pFormat; bool m_bNewTemplate; @@ -70,7 +70,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE; - void SetCollection( SwFmt* pFormat, bool bNew ); + void SetCollection( SwFormat* pFormat, bool bNew ); }; #endif diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index 2276631dc818..6be1fbe54d29 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -23,10 +23,10 @@ #include "swtypes.hxx" #include "tabcol.hxx" -class SwFrmFmt; +class SwFrameFormat; class SwWrtShell; namespace vcl { class Window; } -class SwFlyFrmFmt; +class SwFlyFrameFormat; namespace com { namespace sun { namespace star { namespace frame { @@ -41,7 +41,7 @@ const char cParaDelim = 0x0a; class SW_DLLPUBLIC SwTableFUNC { - SwFrmFmt *pFmt; + SwFrameFormat *pFormat; SwWrtShell *pSh; bool bCopy; SwTabCols aCols; @@ -50,8 +50,8 @@ private: SAL_DLLPRIVATE int GetRightSeparator(int nNum) const; public: - inline SwTableFUNC(SwFrmFmt &); - SwTableFUNC(SwWrtShell *pShell, bool bCopyFmt = false); + inline SwTableFUNC(SwFrameFormat &); + SwTableFUNC(SwWrtShell *pShell, bool bCopyFormat = false); ~SwTableFUNC(); void InitTabCols(); @@ -62,9 +62,9 @@ public: sal_uInt16 GetColCount() const; sal_uInt16 GetCurColNum() const; - bool IsTableSelected() const { return pFmt != 0; } + bool IsTableSelected() const { return pFormat != 0; } - const SwFrmFmt *GetTableFmt() const { return pFmt; } + const SwFrameFormat *GetTableFormat() const { return pFormat; } SwWrtShell* GetShell() const { return pSh; } @@ -73,11 +73,11 @@ public: /// @return the XModel of the newly inserted chart if successful ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > - InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrmFmt** ppFlyFrmFmt = 0 ); + InsertChart( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 ); }; -inline SwTableFUNC::SwTableFUNC(SwFrmFmt &rFmt) : - pFmt(&rFmt), +inline SwTableFUNC::SwTableFUNC(SwFrameFormat &rFormat) : + pFormat(&rFormat), pSh(0), bCopy(false) { diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index fac2b1224840..72e62c2fe631 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -30,12 +30,12 @@ #include <vcl/virdev.hxx> -class SwTableAutoFmt; -class AutoFmtPreview; -class SwTableAutoFmtTbl; +class SwTableAutoFormat; +class AutoFormatPreview; +class SwTableAutoFormatTable; class SwWrtShell; -enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; +enum AutoFormatLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; class SwAutoFormatDlg : public SfxModalDialog { @@ -57,34 +57,34 @@ class SwAutoFormatDlg : public SfxModalDialog OUString aStrDelTitle; OUString aStrDelMsg; OUString aStrRenameTitle; - OUString aStrInvalidFmt; - VclPtr<AutoFmtPreview> m_pWndPreview; + OUString aStrInvalidFormat; + VclPtr<AutoFormatPreview> m_pWndPreview; SwWrtShell* pShell; - SwTableAutoFmtTbl* pTableTbl; + SwTableAutoFormatTable* pTableTable; sal_uInt8 nIndex; sal_uInt8 nDfltStylePos; bool bCoreDataChanged : 1; - bool bSetAutoFmt : 1; + bool bSetAutoFormat : 1; - void Init( const SwTableAutoFmt* pSelFmt ); - void UpdateChecks( const SwTableAutoFmt&, bool bEnableBtn ); + void Init( const SwTableAutoFormat* pSelFormat ); + void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn ); DECL_LINK( CheckHdl, Button * ); DECL_LINK(OkHdl, void *); DECL_LINK( AddHdl, void * ); DECL_LINK( RemoveHdl, void * ); DECL_LINK( RenameHdl, void * ); - DECL_LINK( SelFmtHdl, void * ); + DECL_LINK( SelFormatHdl, void * ); public: SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, - bool bSetAutoFmt = true, - const SwTableAutoFmt* pSelFmt = 0 ); + bool bSetAutoFormat = true, + const SwTableAutoFormat* pSelFormat = 0 ); virtual ~SwAutoFormatDlg(); virtual void dispose() SAL_OVERRIDE; - void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const; + void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const; }; #endif // SW_AUTOFMT_HXX diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx index 713084bea011..e7c1411acca4 100644 --- a/sw/source/uibase/inc/tblnumfm.hxx +++ b/sw/source/uibase/inc/tblnumfm.hxx @@ -24,10 +24,10 @@ namespace vcl { class Window; } class SfxItemSet; -class SwNumFmtDlg : public SfxSingleTabDialog +class SwNumFormatDlg : public SfxSingleTabDialog { public: - SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet); + SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index 8ac0722f5201..7c192aadb049 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -24,12 +24,12 @@ #include <unotools/caserotate.hxx> class AbstractSvxPostItDialog; -class SwFldMgr; +class SwFieldMgr; class SvxHyperlinkItem; class SwTextShell: public SwBaseShell { - SwFldMgr* pPostItFldMgr; + SwFieldMgr* pPostItFieldMgr; RotateTransliteration m_aRotateCase; void InsertSymbol( SfxRequest& ); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index a881cc41ff6c..40789e8ca2c3 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -43,7 +43,7 @@ private: SwWrtShell *mpSh; - const SwFmtPageDesc *mpPageFmtDesc; + const SwFormatPageDesc *mpPageFormatDesc; SwPageDesc *mpTitleDesc; const SwPageDesc *mpIndexDesc; diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 827c02e2fa4e..4bf83b29e1af 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -29,15 +29,15 @@ class IntlWrapper; class SwPaM; // container for FootNote -class SW_DLLPUBLIC SwPageFtnInfoItem : public SfxPoolItem +class SW_DLLPUBLIC SwPageFootnoteInfoItem : public SfxPoolItem { - SwPageFtnInfo aFtnInfo; + SwPageFootnoteInfo aFootnoteInfo; public: - SwPageFtnInfoItem(const sal_uInt16 nId, SwPageFtnInfo& rInfo); - SwPageFtnInfoItem(const SwPageFtnInfoItem& rItem ); - virtual ~SwPageFtnInfoItem(); + SwPageFootnoteInfoItem(const sal_uInt16 nId, SwPageFootnoteInfo& rInfo); + SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem ); + virtual ~SwPageFootnoteInfoItem(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; @@ -50,9 +50,9 @@ public: virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - SwPageFtnInfo& GetPageFtnInfo() { return aFtnInfo; } - const SwPageFtnInfo& GetPageFtnInfo() const { return aFtnInfo; } - void SetPageFtnInfo(SwPageFtnInfo& rInf) { aFtnInfo = rInf; } + SwPageFootnoteInfo& GetPageFootnoteInfo() { return aFootnoteInfo; } + const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; } + void SetPageFootnoteInfo(SwPageFootnoteInfo& rInf) { aFootnoteInfo = rInf; } }; class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index ae2f14446a56..65823dd0231e 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -31,38 +31,38 @@ namespace sw { class StoredChapterNumberingRules; } #define MAX_NUM_RULES 9 -typedef boost::ptr_vector<SfxPoolItem> _SwNumFmtsAttrs; +typedef boost::ptr_vector<SfxPoolItem> _SwNumFormatsAttrs; class SW_DLLPUBLIC SwNumRulesWithName { OUString maName; // the NumRule's formats _have_ to be independent of a document // (They should always be there!) - class SAL_DLLPRIVATE _SwNumFmtGlobal + class SAL_DLLPRIVATE _SwNumFormatGlobal { friend class SwNumRulesWithName; - SwNumFmt aFmt; - OUString sCharFmtName; + SwNumFormat aFormat; + OUString sCharFormatName; sal_uInt16 nCharPoolId; - _SwNumFmtsAttrs aItems; + _SwNumFormatsAttrs aItems; - _SwNumFmtGlobal& operator=( const _SwNumFmtGlobal& ) SAL_DELETED_FUNCTION; + _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION; public: - _SwNumFmtGlobal( const SwNumFmt& rFmt ); - _SwNumFmtGlobal( const _SwNumFmtGlobal& ); - ~_SwNumFmtGlobal(); + _SwNumFormatGlobal( const SwNumFormat& rFormat ); + _SwNumFormatGlobal( const _SwNumFormatGlobal& ); + ~_SwNumFormatGlobal(); - void ChgNumFmt( SwWrtShell& rSh, SwNumFmt& rChg ) const; + void ChgNumFormat( SwWrtShell& rSh, SwNumFormat& rChg ) const; }; - _SwNumFmtGlobal* aFmts[ MAXLEVEL ]; + _SwNumFormatGlobal* aFormats[ MAXLEVEL ]; protected: friend class sw::StoredChapterNumberingRules; friend class SwChapterNumRules; void SetName(const OUString& rSet) {maName = rSet;} - void SetNumFmt(size_t, SwNumFmt const&, OUString const&); + void SetNumFormat(size_t, SwNumFormat const&, OUString const&); SwNumRulesWithName(); public: @@ -76,7 +76,7 @@ public: void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const; - void GetNumFmt(size_t, SwNumFmt const*&, OUString const*&) const; + void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const; }; class SW_DLLPUBLIC SwChapterNumRules diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx index fe7aebc9b6f4..fc4620d377e4 100644 --- a/sw/source/uibase/inc/uitool.hxx +++ b/sw/source/uibase/inc/uitool.hxx @@ -31,7 +31,7 @@ class SvxTabStopItem; class SwWrtShell; class ListBox; class SwDocShell; -class SwFrmFmt; +class SwFrameFormat; class SwTabCols; class DateTime; class SfxViewFrame; @@ -96,7 +96,7 @@ SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, boo SW_DLLPUBLIC sal_Int32 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_Int32 nOffset); // Get table width and alignement -SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent, +SwTwips GetTableWidth( SwFrameFormat* pFormat, SwTabCols& rCols, sal_uInt16 *pPercent, SwWrtShell* pSh ); OUString GetAppLangDateTimeString( const DateTime& ); diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index e3baf4647561..ee90ed801585 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -127,7 +127,7 @@ class SwMasterUsrPref : public SwViewOption friend class SwCursorConfig; friend class SwWebColorConfig; - SwFldUpdateFlags eFldUpdateFlags; //update of fields and charts + SwFieldUpdateFlags eFieldUpdateFlags; //update of fields and charts sal_Int32 nLinkUpdateMode; FieldUnit eUserMetric; FieldUnit eHScrollMetric; @@ -182,25 +182,25 @@ public: void SetUpdateFields(bool bSet, bool bNoModify = false) { - if(bSet && eFldUpdateFlags == AUTOUPD_OFF) + if(bSet && eFieldUpdateFlags == AUTOUPD_OFF) { - eFldUpdateFlags = AUTOUPD_FIELD_ONLY; + eFieldUpdateFlags = AUTOUPD_FIELD_ONLY; if(!bNoModify) aContentConfig.SetModified(); } else if(!bSet) { - eFldUpdateFlags = AUTOUPD_OFF; + eFieldUpdateFlags = AUTOUPD_OFF; if(!bNoModify) aContentConfig.SetModified(); } }; - bool IsUpdateFields()const {return eFldUpdateFlags != AUTOUPD_OFF; } + bool IsUpdateFields()const {return eFieldUpdateFlags != AUTOUPD_OFF; } - SwFldUpdateFlags GetFldUpdateFlags()const {return eFldUpdateFlags;} - void SetFldUpdateFlags(SwFldUpdateFlags eSet, bool bNoModify = false) + SwFieldUpdateFlags GetFieldUpdateFlags()const {return eFieldUpdateFlags;} + void SetFieldUpdateFlags(SwFieldUpdateFlags eSet, bool bNoModify = false) { - eFldUpdateFlags = eSet; + eFieldUpdateFlags = eSet; if(!bNoModify) aContentConfig.SetModified(); } @@ -209,18 +209,18 @@ public: { if(bSet) { - eFldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS; + eFieldUpdateFlags = AUTOUPD_FIELD_AND_CHARTS; if(!bNoModify) aContentConfig.SetModified(); } - else if(eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS) + else if(eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS) { - eFldUpdateFlags = AUTOUPD_FIELD_ONLY; + eFieldUpdateFlags = AUTOUPD_FIELD_ONLY; if(!bNoModify) aContentConfig.SetModified(); } }; - bool IsUpdateCharts()const {return eFldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; } + bool IsUpdateCharts()const {return eFieldUpdateFlags == AUTOUPD_FIELD_AND_CHARTS; } FieldUnit GetMetric() const { return eUserMetric;} void SetMetric(FieldUnit eSet, bool bNoModify = false) diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 9d6a9b21e23c..a46879986888 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -39,10 +39,10 @@ class Button; class ImageButton; -class SwTxtFmtColl; +class SwTextFormatColl; class SwPageDesc; -class SwFrmFmt; -class SwCharFmt; +class SwFrameFormat; +class SwCharFormat; class SwNumRule; class SwGlossaryHdl; class SwDrawBase; @@ -71,7 +71,7 @@ class SvGlobalName; class SvtAccessibilityOptions; class SwTransferable; class SwMailMergeConfigItem; -class SwTxtNode; // #i23726# +class SwTextNode; // #i23726# class SwFormatClipboard; struct SwConversionArgs; class Graphic; @@ -122,10 +122,10 @@ struct SwApplyTemplate { union { - SwTxtFmtColl* pTxtColl; + SwTextFormatColl* pTextColl; SwPageDesc* pPageDesc; - SwFrmFmt* pFrmFmt; - SwCharFmt* pCharFmt; + SwFrameFormat* pFrameFormat; + SwCharFormat* pCharFormat; SwNumRule* pNumRule; } aColl; @@ -140,7 +140,7 @@ struct SwApplyTemplate m_pFormatClipboard(0), bUndo(false) { - aColl.pTxtColl = 0; + aColl.pTextColl = 0; } }; @@ -182,7 +182,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell OUString m_sOldSectionName; Point m_aTabColFromDocPos; // moving table colmns out of the document - SwTxtNode * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# + SwTextNode * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# Size m_aDocSz; // current document size Rectangle m_aVisArea; // visible region @@ -214,7 +214,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwGlossaryHdl *m_pGlosHdl; // handle text block SwDrawBase *m_pDrawActual; - const SwFrmFmt *m_pLastTableFormat; + const SwFrameFormat *m_pLastTableFormat; SwFormatClipboard *m_pFormatClipboard; //holds data for format paintbrush @@ -328,7 +328,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 ); SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); - SAL_DLLPRIVATE bool CheckSpecialCntnt(); + SAL_DLLPRIVATE bool CheckSpecialContent(); SAL_DLLPRIVATE void SpellKontext(bool bOn = true) { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; } @@ -377,8 +377,8 @@ protected: void SetImageButtonColor(Color& rColor); - const SwFrmFmt* GetLastTblFrmFmt() const {return m_pLastTableFormat;} - void SetLastTblFrmFmt(const SwFrmFmt* pSet) {m_pLastTableFormat = pSet;} + const SwFrameFormat* GetLastTableFrameFormat() const {return m_pLastTableFormat;} + void SetLastTableFrameFormat(const SwFrameFormat* pSet) {m_pLastTableFormat = pSet;} // form letter execution void GenerateFormLetter(bool bUseCurrentDocument); @@ -454,7 +454,7 @@ public: bool ExecSmartTagPopup( const Point& rPt ); DECL_LINK( OnlineSpellCallback, SpellCallbackInfo*); - bool ExecDrwTxtSpellPopup(const Point& rPt); + bool ExecDrwTextSpellPopup(const Point& rPt); void SetTabColFromDocPos( const Point &rPt ) { m_aTabColFromDocPos = rPt; } void SetTabColFromDoc( bool b ) { m_bTabColFromDoc = b; } @@ -463,7 +463,7 @@ public: bool IsTabRowFromDoc() const { return m_bTabRowFromDoc; } // -> #i23726# - void SetNumRuleNodeFromDoc( SwTxtNode * pNumRuleNode ) + void SetNumRuleNodeFromDoc( SwTextNode * pNumRuleNode ) { m_pNumRuleNodeFromDoc = pNumRuleNode; } void SetNumIndentFromDoc(bool b) { m_bNumIndentFromDoc = b; } bool IsNumIndentFromDoc() const { return NULL != m_pNumRuleNodeFromDoc; } diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 6d66771875ff..cf8b019860b3 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -41,7 +41,7 @@ class SwInputFieldList; class SwSectionData; class Timer; class SvxMacro; -class SwFmtINetFmt; +class SwFormatINetFormat; class SvxAutoCorrect; class NaviContentBookmark; struct SwCallMouseEvent; @@ -86,7 +86,7 @@ private: using SwCrsrShell::Down; using SwCrsrShell::LeftMargin; using SwCrsrShell::RightMargin; - using SwCrsrShell::SelectTxtAttr; + using SwCrsrShell::SelectTextAttr; using SwCrsrShell::GotoPage; using SwFEShell::InsertObject; using SwEditShell::AutoCorrect; @@ -160,8 +160,8 @@ public: void Invalidate(); // select table cells for editing of formulas in the ribbonbar - inline void SelTblCells( const Link<> &rLink, bool bMark = true ); - inline void EndSelTblCells(); + inline void SelTableCells( const Link<> &rLink, bool bMark = true ); + inline void EndSelTableCells(); // leave per word or per line selection mode. Is usually called in MB-Up. bool IsExtSel() const { return m_bSelWrd || m_bSelLn; } @@ -227,7 +227,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool SelectTableCol(); bool SelectTableCell(); - bool SelectTxtAttr( sal_uInt16 nWhich, const SwTxtAttr* pAttr = 0 ); + bool SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr = 0 ); // per column jumps bool StartOfColumn ( bool bSelect = false ); @@ -249,7 +249,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool PageCrsr(SwTwips lOffset, bool bSelect); // update fields - void UpdateInputFlds( SwInputFieldList* pLst = 0 ); + void UpdateInputFields( SwInputFieldList* pLst = 0 ); void NoEdit(bool bHideCrsr = true); void Edit(); @@ -326,13 +326,13 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool bActivate = true, sal_uInt16 nSlotId = 0); // SlotId for dialog - bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 ); + bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = 0 ); void LaunchOLEObj( long nVerb = 0 ); // start server virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) SAL_OVERRIDE; virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj, const SwRect *pFlyPrtRect = 0, const SwRect *pFlyFrmRect = 0, - const bool bNoTxtFrmPrtAreaChanged = false ) SAL_OVERRIDE; + const bool bNoTextFrmPrtAreaChanged = false ) SAL_OVERRIDE; virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt, const SwRect &rFrm ) SAL_OVERRIDE; @@ -343,11 +343,11 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); GETSTYLE_CREATESOME, // if on PoolId create mapt GETSTYLE_CREATEANY }; // return standard if applicable - SwTxtFmtColl* GetParaStyle(const OUString &rCollName, + SwTextFormatColl* GetParaStyle(const OUString &rCollName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwCharFmt* GetCharStyle(const OUString &rFmtName, + SwCharFormat* GetCharStyle(const OUString &rFormatName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwFrmFmt* GetTblStyle(const OUString &rFmtName); + SwFrameFormat* GetTableStyle(const OUString &rFormatName); void SetPageStyle(const OUString &rCollName); @@ -389,9 +389,9 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void MoveCrsr( bool bWithSelect = false ); // update input fields - bool StartInputFldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0); + bool StartInputFieldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0); // update DropDown fields - bool StartDropDownFldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); + bool StartDropDownFieldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); //"Handler" for changes at DrawView - for controls. virtual void DrawSelChanged( ) SAL_OVERRIDE; @@ -405,7 +405,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); bool GotoFieldmark(::sw::mark::IFieldmark const * const pMark); - bool GotoField( const SwFmtFld& rFld ); + bool GotoField( const SwFormatField& rField ); // jump to the next / previous hyperlink - inside text and also // on graphics @@ -424,8 +424,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); // a click at the given field. the cursor is on it. // execute the predefined actions. - void ClickToField( const SwField& rFld ); - void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER ); + void ClickToField( const SwField& rField ); + void ClickToINetAttr( const SwFormatINetFormat& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER ); bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER ); inline bool IsInClickToEdit() const ; @@ -439,8 +439,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); virtual void SetReadonlyOption( bool bSet ) SAL_OVERRIDE; // automatic update of styles - void AutoUpdateFrame(SwFrmFmt* pFmt, const SfxItemSet& rStyleSet); - void AutoUpdatePara(SwTxtFmtColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = NULL ); + void AutoUpdateFrame(SwFrameFormat* pFormat, const SfxItemSet& rStyleSet); + void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = NULL ); // link for inserting ranges via Drag&Drop/Clipboard DECL_LINK( InsertRegionDialog, SwSectionData* ); @@ -460,7 +460,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void addCurrentPosition(); bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL, bool bSelFrame = true ); - bool GotoINetAttr( const SwTxtINetFmt& rAttr ); + bool GotoINetAttr( const SwTextINetFormat& rAttr ); void GotoOutline( sal_uInt16 nIdx ); bool GotoOutline( const OUString& rName ); bool GotoRegion( const OUString& rName ); @@ -468,7 +468,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); sal_uInt16 nSeqNo = 0 ); bool GotoNextTOXBase( const OUString* pName = 0); bool GotoTable( const OUString& rName ); - bool GotoFld( const SwFmtFld& rFld ); + bool GotoFormatField( const SwFormatField& rField ); const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false); void ChangeHeaderOrFooter(const OUString& rStyleName, bool bHeader, bool bOn, bool bShowWarning); @@ -561,7 +561,7 @@ private: bool m_bRetainSelection :1; // Do not remove selections Point m_aStart; - Link<> m_aSelTblLink; + Link<> m_aSelTableLink; // resets the cursor stack after movement by PageUp/-Down SAL_DLLPRIVATE void _ResetCursorStack(); @@ -616,15 +616,15 @@ inline void SwWrtShell::ResetCursorStack() _ResetCursorStack(); } -inline void SwWrtShell::SelTblCells(const Link<> &rLink, bool bMark ) +inline void SwWrtShell::SelTableCells(const Link<> &rLink, bool bMark ) { - SetSelTblCells( true ); + SetSelTableCells( true ); m_bClearMark = bMark; - m_aSelTblLink = rLink; + m_aSelTableLink = rLink; } -inline void SwWrtShell::EndSelTblCells() +inline void SwWrtShell::EndSelTableCells() { - SetSelTblCells( false ); + SetSelTableCells( false ); m_bClearMark = true; } |