diff options
Diffstat (limited to 'sw/source/uibase/inc')
46 files changed, 151 insertions, 151 deletions
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index b0d13647aff7..0492be67e589 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -15,7 +15,7 @@ */ class SwDashedLine : public FixedLine { - Color& (* const m_pColorFn)(); + Color& (*m_pColorFn)(); public: SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 441007363011..dc1cee8cc0ae 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -36,7 +36,7 @@ class SwHeaderFooterWin : public SwFrameMenuButtonBase { VclBuilder m_aBuilder; OUString m_sLabel; - bool const m_bIsHeader; + bool m_bIsHeader; VclPtr<PopupMenu> m_pPopupMenu; VclPtr<vcl::Window> m_pLine; bool m_bIsAppearing; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 1d6bc7ee5970..9c07ce2b502d 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -41,7 +41,7 @@ class SwBreakDlg : public weld::GenericDialogController sal_uInt16 nKind; ::std::optional<sal_uInt16> oPgNum; - bool const bHtmlMode; + bool bHtmlMode; DECL_LINK(ToggleHdl, weld::ToggleButton&, void); DECL_LINK(ChangeHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 660d60da0723..09138b5ccb51 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -28,7 +28,7 @@ class SvxMacroItem; class SwCharDlg : public SfxTabDialogController { SwView& m_rView; - SwCharDlgMode const m_nDialogMode; + SwCharDlgMode m_nDialogMode; public: SwCharDlg(weld::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index b755186e33de..41f7e4143a71 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -87,7 +87,7 @@ class SW_DLLPUBLIC SwColumnOnlyExample : public weld::CustomWidgetController private: Size m_aWinSize; - Size const m_aFrameSize; + Size m_aFrameSize; SwFormatCol m_aCols; protected: diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index c0d4e221b3cc..414db7068dcb 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -35,9 +35,9 @@ class SwRangeRedline; class SwOutlineContent : public SwContent { - SwOutlineNodes::size_type const nOutlinePos; - sal_uInt8 const nOutlineLevel; - bool const bIsMoveable; + SwOutlineNodes::size_type nOutlinePos; + sal_uInt8 nOutlineLevel; + bool bIsMoveable; public: SwOutlineContent( const SwContentType* pCnt, const OUString& rName, @@ -56,7 +56,7 @@ class SwOutlineContent : public SwContent class SwRegionContent : public SwContent { - sal_uInt8 const nRegionLevel; + sal_uInt8 nRegionLevel; public: SwRegionContent( const SwContentType* pCnt, @@ -70,7 +70,7 @@ class SwRegionContent : public SwContent class SwURLFieldContent : public SwContent { - OUString const sURL; + OUString sURL; const SwTextINetFormat* pINetAttr; public: @@ -105,7 +105,7 @@ public: class SwGraphicContent : public SwContent { - OUString const sLink; + OUString sLink; public: SwGraphicContent(const SwContentType* pCnt, const OUString& rName, const OUString& rLink, long nYPos) : SwContent( pCnt, rName, nYPos ), sLink( rLink ) @@ -140,11 +140,11 @@ class SwContentType : public SwTypeNumber SwWrtShell* m_pWrtShell; std::unique_ptr<SwContentArr> m_pMember; // array for content - OUString const m_sContentTypeName; // name of content type - OUString const m_sSingleContentTypeName; // name of content type, singular + OUString m_sContentTypeName; // name of content type + OUString m_sSingleContentTypeName; // name of content type, singular OUString m_sTypeToken; // attachment for URL size_t m_nMemberCount; // content count - ContentTypeId const m_nContentType; // content type's Id + ContentTypeId m_nContentType; // content type's Id sal_uInt8 m_nOutlineLevel; bool m_bDataValid : 1; bool m_bEdit: 1; // can this type be edited? diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index c42b081e7aa0..3cb48bc804d2 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -73,22 +73,22 @@ class SwContentTree final , public SfxListener { VclPtr<SwNavigationPI> m_xDialog; - OUString const m_sSpace; + OUString m_sSpace; AutoTimer m_aUpdTimer; o3tl::enumarray<ContentTypeId,std::unique_ptr<SwContentType>> m_aActiveContentArr; o3tl::enumarray<ContentTypeId,std::unique_ptr<SwContentType>> m_aHiddenContentArr; OUString m_aContextStrings[CONTEXT_COUNT + 1]; - OUString const m_sRemoveIdx; - OUString const m_sUpdateIdx; - OUString const m_sUnprotTable; - OUString const m_sRename; - OUString const m_sReadonlyIdx; - OUString const m_sInvisible; - OUString const m_sPostItShow; - OUString const m_sPostItHide; - OUString const m_sPostItDelete; - OUString const m_sProtected; + OUString m_sRemoveIdx; + OUString m_sUpdateIdx; + OUString m_sUnprotTable; + OUString m_sRename; + OUString m_sReadonlyIdx; + OUString m_sInvisible; + OUString m_sPostItShow; + OUString m_sPostItHide; + OUString m_sPostItDelete; + OUString m_sProtected; SwWrtShell* m_pHiddenShell; // dropped Doc SwWrtShell* m_pActiveShell; // the active or a const. open view diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 899575b7b540..08a831b0b459 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -49,7 +49,7 @@ class SwConvertTableDlg : public SfxDialogController std::unique_ptr<weld::Button> m_xAutoFormatBtn; std::unique_ptr<SwTableAutoFormat> mxTAutoFormat; - SwWrtShell* const pShell; + SwWrtShell* pShell; DECL_LINK(AutoFormatHdl, weld::Button&, void); DECL_LINK(BtnHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 58fffc2dce37..cc992240cccd 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -31,7 +31,7 @@ class SwView; class SwCaptionDialog : public SfxDialogController { - OUString const m_sNone; + OUString m_sNone; TextFilterAutoConvert m_aTextFilter; SwView &rView; // search per active, avoid View std::unique_ptr<SwFieldMgr> pMgr; // pointer to save the include diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 4815a44f8966..25175f9ea85f 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -81,7 +81,7 @@ class SwInsertDBColAutoPilot : public SfxDialogController, public utl::ConfigIte SwInsDBColumns aDBColumns; const SwDBData aDBData; - OUString const sNoTmpl; + OUString sNoTmpl; SwView* pView; std::unique_ptr<SwTableAutoFormat> m_xTAutoFormat; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index ca1420493fb2..2ff081427d31 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -55,8 +55,8 @@ class SwDropCapsPict : public weld::CustomWidgetController struct ScriptInfo { sal_uLong textWidth; ///< Physical width of this segment. - sal_uInt16 const scriptType; ///< Script type (e.g. Latin, Asian, Complex) - sal_Int32 const changePos; ///< Character position where the script changes. + sal_uInt16 scriptType; ///< Script type (e.g. Latin, Asian, Complex) + sal_Int32 changePos; ///< Character position where the script changes. ScriptInfo(sal_uInt16 scrptType, sal_Int32 position) : textWidth(0), scriptType(scrptType), changePos(position) {} }; diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 6046e9c50a07..29ad3d768955 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -60,23 +60,23 @@ enum SwFieldGroups struct SwFieldGroupRgn { - sal_uInt16 const nStart; - sal_uInt16 const nEnd; + sal_uInt16 nStart; + sal_uInt16 nEnd; }; // the field manager handles the insertation of fields // with command strings struct SwInsertField_Data { - SwFieldTypesEnum const m_nTypeId; - sal_uInt16 const m_nSubType; + SwFieldTypesEnum m_nTypeId; + sal_uInt16 m_nSubType; const OUString m_sPar1; const OUString m_sPar2; - sal_uInt32 const m_nFormatId; - SwWrtShell* const m_pSh; - sal_Unicode const m_cSeparator; - bool const m_bIsAutomaticLanguage; - css::uno::Any const m_aDBDataSource; + sal_uInt32 m_nFormatId; + SwWrtShell* m_pSh; + sal_Unicode m_cSeparator; + bool m_bIsAutomaticLanguage; + css::uno::Any m_aDBDataSource; css::uno::Any m_aDBConnection; css::uno::Any m_aDBColumn; weld::Widget* m_pParent; // parent widget used for SwWrtShell::StartInputFieldDlg() diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index d14710deca6d..e3c079a2228f 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -28,10 +28,10 @@ class SwWrtShell; // frame dialog class SwFrameDlg : public SfxTabDialogController { - bool const m_bFormat; - bool const m_bNew; + bool m_bFormat; + bool m_bNew; const SfxItemSet& m_rSet; - OUString const m_sDlgType; + OUString m_sDlgType; SwWrtShell* m_pWrtShell; virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx index bdd26ed28a4d..dd876c3a6284 100644 --- a/sw/source/uibase/inc/gloshdl.hxx +++ b/sw/source/uibase/inc/gloshdl.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwGlossaryHdl SwGlossaries& rStatGlossaries; OUString aCurGrp; - SfxViewFrame* const pViewFrame; + SfxViewFrame* pViewFrame; SwWrtShell* pWrtShell; std::unique_ptr<SwTextBlocks> pCurGrp; diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 866239aa2c5f..9b2d26d1216e 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -31,7 +31,7 @@ private: SwView* pView; sal_uInt16 nPageCount; // page count for progress view sal_uInt16 nPageStart; // 1st checked page - bool const bInSelection : 1; // separating selected text + bool bInSelection : 1; // separating selected text bool bAutomatic : 1; // insert separators without further inquiry bool bInfoBox : 1; // display info-box when ending diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index cb4dde5b9938..6ea4cc339108 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -33,7 +33,7 @@ class SwInsFootNoteDlg: public weld::GenericDialogController OUString m_aFontName; rtl_TextEncoding m_eCharSet; bool m_bExtCharAvailable; - bool const m_bEdit; + bool m_bEdit; std::unique_ptr<weld::Widget> m_xNumberFrame; std::unique_ptr<weld::RadioButton> m_xNumberAutoBtn; diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index 463f4e34c89d..86d08a2573a1 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -32,7 +32,7 @@ class Printer; class SwLabDlg : public SfxTabDialogController { SwLabelConfig aLabelsCfg; - SwDBManager* const pDBManager; + SwDBManager* pDBManager; SwLabPrtPage* m_pPrtPage; std::vector<sal_uInt16> aTypeIds; @@ -41,7 +41,7 @@ class SwLabDlg : public SfxTabDialogController std::unique_ptr<SwLabRecs> m_pRecs; OUString aLstGroup; OUString m_sBusinessCardDlg; - bool const m_bLabel; + bool m_bLabel; void ReplaceGroup_( const OUString &rMake ); virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index 8456f8d53710..ec01bf38ffcc 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -106,7 +106,7 @@ class SwLabCfgItem : public utl::ConfigItem { private: SwLabItem aItem; - bool const bIsLabel; + bool bIsLabel; css::uno::Sequence<OUString> GetPropertyNames() const; diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index dc933e92f551..88bd4bb86184 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -136,7 +136,7 @@ public: class SW_DLLPUBLIC SwAuthenticator : public cppu::WeakImplHelper<css::mail::XAuthenticator> { - OUString const m_aUserName; + OUString m_aUserName; OUString m_aPassword; weld::Window* m_pParentWindow; public: @@ -157,9 +157,9 @@ public: class SW_DLLPUBLIC SwConnectionContext : public cppu::WeakImplHelper<css::uno::XCurrentContext> { - OUString const m_sMailServer; - sal_Int16 const m_nPort; - OUString const m_sConnectionType; + OUString m_sMailServer; + sal_Int16 m_nPort; + OUString m_sConnectionType; public: SwConnectionContext(const OUString& rMailServer, sal_Int16 nPort, const OUString& rConnectionType); @@ -197,11 +197,11 @@ class SW_DLLPUBLIC SwMailTransferable : public SwMutexBase, public cppu::WeakComponentImplHelper<css::datatransfer::XTransferable, css::beans::XPropertySet> { - OUString const m_aMimeType; - OUString const m_sBody; - OUString const m_aURL; - OUString const m_aName; - bool const m_bIsBody; + OUString m_aMimeType; + OUString m_sBody; + OUString m_aURL; + OUString m_aName; + bool m_bIsBody; public: SwMailTransferable(const OUString& rURL, const OUString& rName, const OUString& rMimeType); diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index 27fbe4436168..0ab3c8dce8aa 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -36,18 +36,18 @@ using vcl::WizardTypes::CommitPageReason; class SwMailMergeWizard : public ::vcl::RoadmapWizardMachine { - SwView* const m_pSwView; + SwView* m_pSwView; OUString sDocumentURL; bool m_bDocumentLoad; std::shared_ptr<SwMailMergeConfigItem> m_xConfigItem; - OUString const m_sStarting; - OUString const m_sDocumentType; - OUString const m_sAddressBlock; - OUString const m_sAddressList; - OUString const m_sGreetingsLine; - OUString const m_sLayout; + OUString m_sStarting; + OUString m_sDocumentType; + OUString m_sAddressBlock; + OUString m_sAddressList; + OUString m_sGreetingsLine; + OUString m_sLayout; sal_uInt16 m_nRestartPage; diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index a357ff4433de..a0ab9d595adc 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -77,18 +77,18 @@ class SW_DLLPUBLIC SwSpellPopup { VclBuilder m_aBuilder; VclPtr<PopupMenu> m_xPopupMenu; - sal_uInt16 const m_nIgnoreWordId; - sal_uInt16 const m_nAddMenuId; - sal_uInt16 const m_nAddId; - sal_uInt16 const m_nSpellDialogId; - sal_uInt16 const m_nCorrectMenuId; - sal_uInt16 const m_nCorrectDialogId; - sal_uInt16 const m_nLangSelectionMenuId; - sal_uInt16 const m_nLangParaMenuId; - sal_uInt16 const m_nRedlineAcceptId; - sal_uInt16 const m_nRedlineRejectId; - sal_uInt16 const m_nRedlineNextId; - sal_uInt16 const m_nRedlinePrevId; + sal_uInt16 m_nIgnoreWordId; + sal_uInt16 m_nAddMenuId; + sal_uInt16 m_nAddId; + sal_uInt16 m_nSpellDialogId; + sal_uInt16 m_nCorrectMenuId; + sal_uInt16 m_nCorrectDialogId; + sal_uInt16 m_nLangSelectionMenuId; + sal_uInt16 m_nLangParaMenuId; + sal_uInt16 m_nRedlineAcceptId; + sal_uInt16 m_nRedlineRejectId; + sal_uInt16 m_nRedlineNextId; + sal_uInt16 m_nRedlinePrevId; SwWrtShell* m_pSh; css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > m_aDics; css::uno::Reference< css::linguistic2::XSpellAlternatives > m_xSpellAlt; @@ -100,8 +100,8 @@ class SW_DLLPUBLIC SwSpellPopup std::map< sal_Int16, OUString > m_aLangTable_Text; std::map< sal_Int16, OUString > m_aLangTable_Paragraph; - OUString m_aDicNameSingle; - bool const m_bGrammarResults; // show grammar results? Or show spellcheck results? + OUString m_aDicNameSingle; + bool m_bGrammarResults; // show grammar results? Or show spellcheck results? static void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart, const css::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh, diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 2a6a8a498aac..1db4fcbf59e5 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -45,7 +45,7 @@ class TextFilterAutoConvert : public TextFilter { private: OUString m_sLastGoodText; - OUString const m_sNone; + OUString m_sNone; public: TextFilterAutoConvert(const OUString &rNone) : m_sNone(rNone) @@ -116,22 +116,22 @@ public: class SwCaptionOptPage : public SfxTabPage { private: - OUString const m_sSWTable; - OUString const m_sSWFrame; - OUString const m_sSWGraphic; - OUString const m_sOLE; + OUString m_sSWTable; + OUString m_sSWFrame; + OUString m_sSWGraphic; + OUString m_sOLE; OUString m_sIllustration; OUString m_sTable; OUString m_sText; OUString m_sDrawing; - OUString const m_sBegin; - OUString const m_sEnd; - OUString const m_sAbove; - OUString const m_sBelow; + OUString m_sBegin; + OUString m_sEnd; + OUString m_sAbove; + OUString m_sBelow; - OUString const m_sNone; + OUString m_sNone; int m_nPrevSelectedEntry; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index afb2a78d4236..73062bb3b730 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -70,7 +70,7 @@ public: // TabPage printer settings additions class SwAddPrinterTabPage : public SfxTabPage { - OUString const sNone; + OUString sNone; bool bAttrModified; bool bPreview; @@ -143,9 +143,9 @@ class SwStdFontTabPage : public SfxTabPage sal_uInt8 m_nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL] - OUString const m_sScriptWestern; - OUString const m_sScriptAsian; - OUString const m_sScriptComplex; + OUString m_sScriptWestern; + OUString m_sScriptAsian; + OUString m_sScriptComplex; std::unique_ptr<weld::Label> m_xLabelFT; std::unique_ptr<weld::ComboBox> m_xStandardBox; @@ -256,7 +256,7 @@ public: class SwMarkPreview : public weld::CustomWidgetController { Color m_aBgCol; // background - Color const m_aTransCol; // transparency + Color m_aTransCol; // transparency Color m_aMarkCol; // marks Color m_aLineCol; // general lines Color m_aShadowCol; // shadow diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index cf0f1818d86d..f9c3c1f15dde 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -40,7 +40,7 @@ class SwOutlineTabDialog final : public SfxTabDialogController std::unique_ptr<SwNumRule> xNumRule; SwChapterNumRules* pChapterNumRules; - bool const bModified : 1; + bool bModified : 1; std::unique_ptr<weld::MenuButton> m_xMenuButton; @@ -65,7 +65,7 @@ public: class SwOutlineSettingsTabPage : public SfxTabPage { - OUString const aNoFormatName; + OUString aNoFormatName; OUString aSaveCollNames[MAXLEVEL]; SwWrtShell* pSh; SwNumRule* pNumRule; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 711d5d9faf6e..38f743f9c71c 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell // to support keyboard the number of the page to go to can be set too sal_uInt16 m_nNewPage; // visible range - OUString const m_sPageStr; + OUString m_sPageStr; Size m_aDocSize; tools::Rectangle m_aVisArea; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 99243b52c4c0..6bc664653ecd 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -61,15 +61,15 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg final SwRedlineDataChildArr m_RedlineChildren; SwRedlineDataParentSortArr m_aUsedSeqNo; Timer m_aSelectTimer; - OUString const m_sInserted; - OUString const m_sDeleted; - OUString const m_sFormated; - OUString const m_sTableChgd; - OUString const m_sFormatCollSet; + OUString m_sInserted; + OUString m_sDeleted; + OUString m_sFormated; + OUString m_sTableChgd; + OUString m_sFormatCollSet; OUString m_sFilterAction; - OUString const m_sAutoFormat; + OUString m_sAutoFormat; bool m_bOnlyFormatedRedlines; - bool const m_bRedlnAutoFormat; + bool m_bRedlnAutoFormat; // prevent update dialog data during longer operations (cf #102657#) bool m_bInhibitActivate; diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 772011c595ec..fff22eb0dbd0 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -22,11 +22,11 @@ class SwScrollbar: public ScrollBar { - Size aDocSz; - bool const bHori :1; // horizontal = salTrue, otherwise vertical - bool bAuto :1; // for scrolling mode - bool bVisible :1; // show/hide should only set this flag - bool bSizeSet :1; // was the size already set? + Size aDocSz; + bool bHori :1; // horizontal = salTrue, otherwise vertical + bool bAuto :1; // for scrolling mode + bool bVisible :1; // show/hide should only set this flag + bool bSizeSet :1; // was the size already set? void AutoShow(); diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 4ae03f2fc422..2bd51c69ced3 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -28,7 +28,7 @@ class SwShadowCursor { VclPtr<vcl::Window> pWin; - Color const aCol; + Color aCol; Point aOldPt; long nOldHeight; sal_uInt16 nOldMode; diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 85bba0a2131b..b4828dcf5e0a 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -27,7 +27,7 @@ class SwWrtShell; class SwSortDlg : public weld::GenericDialogController { - weld::Window* const m_pParent; + weld::Window* m_pParent; std::unique_ptr<weld::Label> m_xColLbl; std::unique_ptr<weld::CheckButton> m_xKeyCB1; @@ -60,9 +60,9 @@ class SwSortDlg : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xCaseCB; - OUString const aColText; - OUString const aRowText; - OUString const aNumericText; + OUString aColText; + OUString aRowText; + OUString aNumericText; SwWrtShell &rSh; std::unique_ptr<CollatorResource> m_xColRes; diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx index cb334f9141eb..76efc6d88df2 100644 --- a/sw/source/uibase/inc/swcont.hxx +++ b/sw/source/uibase/inc/swcont.hxx @@ -58,7 +58,7 @@ enum class RegionMode //mini rtti class SwTypeNumber { - sal_uInt8 const nTypeId; + sal_uInt8 nTypeId; public: SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){} @@ -70,8 +70,8 @@ class SwTypeNumber class SwContent : public SwTypeNumber { const SwContentType* pParent; - OUString const sContentName; - long const nYPosition; + OUString sContentName; + long nYPosition; // some subclasses appear to use this for a tools/gen.hxx-style // geometric Y position, while e.g. SwOutlineContent wants to store // the index in its subtree diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index b0deb956da9e..1f78ac1d36d5 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -68,12 +68,12 @@ class SwMultiTOXTabDialog : public SfxTabDialogController CurTOXType m_eCurrentTOXType; - OUString const m_sUserDefinedIndex; - sal_uInt16 const m_nInitialTOXType; + OUString m_sUserDefinedIndex; + sal_uInt16 m_nInitialTOXType; bool m_bEditTOX; bool m_bExampleCreated; - bool const m_bGlobalFlag; + bool m_bGlobalFlag; std::unique_ptr<SwOneExampleFrame> m_xExampleFrame; std::unique_ptr<weld::CheckButton> m_xShowExampleCB; @@ -119,7 +119,7 @@ class SwTOXSelectTabPage : public SfxTabPage OUString aStyleArr[MAXLEVEL]; OUString sAutoMarkURL; - OUString const sAutoMarkType; + OUString sAutoMarkType; OUString sAddStyleUser; OUString sAddStyleContent; @@ -227,7 +227,7 @@ class SwTokenWindow bool m_bValid; OUString m_aButtonTexts[TOKEN_END]; // Text of the buttons OUString m_aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons - OUString const m_sCharStyle; + OUString m_sCharStyle; Link<SwFormToken&,void> m_aButtonSelectedHdl; SwTOXWidget* m_pActiveCtrl; Link<LinkParamNone*,void> m_aModifyHdl; @@ -302,11 +302,11 @@ private: class SwTOXEntryTabPage : public SfxTabPage { - OUString const sDelimStr; + OUString sDelimStr; OUString sLevelStr; OUString sAuthTypeStr; - OUString const sNoCharStyle; + OUString sNoCharStyle; SwForm* m_pCurrentForm; CurTOXType aLastTOXType; diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index d05819ccfde0..2bd2fb4e4fa9 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -167,7 +167,7 @@ class SwAuthorMarkPane friend class SwAuthMarkModalDlg; friend class SwAuthMarkFloatDlg; - bool const bNewEntry; + bool bNewEntry; bool bBibAccessInitialized; SwWrtShell* pSh; diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index dd385845eccc..bd282a470b20 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -26,7 +26,7 @@ class SwParaDlg: public SfxTabDialogController { SwView& rView; - bool const bDrawParaDlg; + bool bDrawParaDlg; void PageCreated(const OString& rId, SfxTabPage& rPage) override; diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx index 1cffcc9193f3..45be074db906 100644 --- a/sw/source/uibase/inc/swwrtshitem.hxx +++ b/sw/source/uibase/inc/swwrtshitem.hxx @@ -25,7 +25,7 @@ class SwWrtShell; class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem { - SwWrtShell* const pWrtSh; + SwWrtShell* pWrtSh; public: SwWrtShellItem( SwWrtShell* pWrtSh ); diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 8db3671e34c0..3d4af57d89d1 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -27,7 +27,7 @@ struct TColumn; // table dialog class SwTableTabDlg : public SfxTabDialogController { - SwWrtShell* const pShell; + SwWrtShell* pShell; virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; public: diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index a5c1bf953084..c1f2893c7ce1 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -43,7 +43,7 @@ const char cParaDelim = 0x0a; class SW_DLLPUBLIC SwTableFUNC { - SwFrameFormat * const pFormat; + SwFrameFormat *pFormat; SwWrtShell *pSh; SwTabCols aCols; diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 69e9938ba11c..8438e5701049 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -35,19 +35,19 @@ class SwWrtShell; class SwAutoFormatDlg : public SfxDialogController { - OUString const m_aStrTitle; - OUString const m_aStrLabel; - OUString const m_aStrClose; - OUString const m_aStrDelTitle; - OUString const m_aStrDelMsg; - OUString const m_aStrRenameTitle; - OUString const m_aStrInvalidFormat; + OUString m_aStrTitle; + OUString m_aStrLabel; + OUString m_aStrClose; + OUString m_aStrDelTitle; + OUString m_aStrDelMsg; + OUString m_aStrRenameTitle; + OUString m_aStrInvalidFormat; SwWrtShell* m_pShell; sal_uInt8 m_nIndex; sal_uInt8 m_nDfltStylePos; bool m_bCoreDataChanged : 1; - bool const m_bSetAutoFormat : 1; + bool m_bSetAutoFormat : 1; AutoFormatPreview m_aWndPreview; std::unique_ptr<SwTableAutoFormatTable> m_xTableTable; diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index 514867c2bc9c..95682aaa07e5 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -29,7 +29,7 @@ class SwWrtShell; class SwTemplateDlgController : public SfxStyleDialogController { - SfxStyleFamily const nType; + SfxStyleFamily nType; sal_uInt16 nHtmlMode; SwWrtShell* pWrtShell; bool bNewStyle; diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index 70174273c01d..629013cf32b8 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -60,7 +60,7 @@ public: class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem { - void* const pMisc; + void* pMisc; public: SwPtrItem( const sal_uInt16 nId, void* pPtr); @@ -92,7 +92,7 @@ public: class SwPaMItem : public SfxPoolItem { - SwPaM* const m_pPaM; + SwPaM* m_pPaM; public: SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM); diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index f4e58ad73d92..ec91c89c4402 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -90,7 +90,7 @@ class SwView_Impl // temporary document for printing text of selection / multi selection // in PDF export. - SfxObjectShellLock const xTmpSelDocSh; + SfxObjectShellLock xTmpSelDocSh; SwView* pView; rtl::Reference<SwScannerEventListener> diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index c386d0c145fd..dba379b2c43e 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -165,8 +165,8 @@ class SwXAutoTextEntry final > { SwGlossaries* pGlossaries; - OUString const sGroupName; - OUString const sEntryName; + OUString sGroupName; + OUString sEntryName; SwDocShellRef xDocSh; rtl::Reference<SwXBodyText> mxBodyText; diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx index 14218153cee1..316bcf0152a4 100644 --- a/sw/source/uibase/inc/unodispatch.hxx +++ b/sw/source/uibase/inc/unodispatch.hxx @@ -42,7 +42,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper class DispatchMutexLock_Impl { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently - SolarMutexGuard const aGuard; + SolarMutexGuard aGuard; public: DispatchMutexLock_Impl(); ~DispatchMutexLock_Impl(); diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index ef53b761b544..1bd195689f48 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -73,7 +73,7 @@ class SwXPrintSettings final : public comphelper::ChainablePropertySet { friend class SwXDocumentSettings; - SwXPrintSettingsType const meType; + SwXPrintSettingsType meType; SwPrintData * mpPrtOpt; SwDoc *mpDoc; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 76a371740916..1c6c3708d433 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -47,9 +47,9 @@ class SW_DLLPUBLIC SwOneExampleFrame : public weld::CustomWidgetController OUString m_sArgumentURL; - SwView* const m_pModuleView; + SwView* m_pModuleView; - sal_uInt32 const m_nStyleFlags; + sal_uInt32 m_nStyleFlags; bool m_bIsInitialized; diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index cd3d2f098f2f..16365468628b 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -31,7 +31,7 @@ class SwContentViewConfig : public utl::ConfigItem { private: SwMasterUsrPref& rParent; - bool const bWeb; + bool bWeb; css::uno::Sequence<OUString> GetPropertyNames() const; @@ -52,7 +52,7 @@ class SwLayoutViewConfig : public utl::ConfigItem { private: SwMasterUsrPref& rParent; - bool const bWeb; + bool bWeb; css::uno::Sequence<OUString> GetPropertyNames() const; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index c661225c604c..4c02e5e465b5 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -497,7 +497,7 @@ private: struct ModeStack { ModeStack *pNext; - bool const bAdd, + bool bAdd, bBlock, bExt, bIns; @@ -522,9 +522,9 @@ private: { Point aDocPos; std::unique_ptr<CursorStack> pNext; - bool const bValidCurPos : 1; + bool bValidCurPos : 1; bool bIsFrameSel : 1; - SwTwips const lOffset; + SwTwips lOffset; CursorStack( bool bValid, bool bFrameSel, const Point &rDocPos, SwTwips lOff, std::unique_ptr<CursorStack> pN ) |