diff options
Diffstat (limited to 'sw/source/ui')
32 files changed, 66 insertions, 66 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 91692bb99b01..0d51258fb730 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1346,8 +1346,8 @@ namespace { // TabPage for Redlining struct CharAttr { - sal_uInt16 const nItemId; - sal_uInt16 const nAttr; + sal_uInt16 nItemId; + sal_uInt16 nAttr; }; } diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 75de0880e278..a5fd9bd0d130 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -36,7 +36,7 @@ struct SwCSVData class SwFindEntryDialog; class SwCreateAddressListDialog : public SfxDialogController { - OUString const m_sAddressListFilterName; + OUString m_sAddressListFilterName; OUString m_sURL; std::unique_ptr<SwCSVData> m_pCSVData; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 64f6c466692f..4d5248a5ef88 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -96,9 +96,9 @@ struct DB_Column const enum class Type { FILLTEXT, COL_FIELD, COL_TEXT, SPLITPARA } eColType; union { - OUString* const pText; + OUString* pText; SwField* pField; - sal_uInt32 const nFormat; + sal_uInt32 nFormat; }; const SwInsDBColumn* pColInfo; diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 6d173043f171..d55b0cf8a056 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -195,7 +195,7 @@ private: OUString m_sCurrentText; SwMailMergeConfigItem& m_rConfigItem; - DialogType const m_eType; + DialogType m_eType; Idle m_aSelectionChangedIdle; @@ -246,8 +246,8 @@ public: class SwAssignFieldsControl; class SwAssignFieldsDialog : public SfxDialogController { - OUString const m_sNone; - OUString const m_rPreviewString; + OUString m_sNone; + OUString m_rPreviewString; SwMailMergeConfigItem& m_rConfigItem; diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index bc762ef87043..8f3cf437a660 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -36,7 +36,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > const & xM static const struct SwLabItemMap { const char* pName; - OUString SwLabItem:: * const pValue; + OUString SwLabItem:: *pValue; } aArr[] = { { "BC_PRIV_FIRSTNAME" , &SwLabItem::m_aPrivFirstName }, { "BC_PRIV_NAME" , &SwLabItem::m_aPrivName }, diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index d11e4a193f79..8e6d6a1a2cea 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -31,16 +31,16 @@ class SwLabFormatPage; class SwLabPreview : public weld::CustomWidgetController { - Color const m_aGrayColor; - - OUString const m_aHDistStr; - OUString const m_aVDistStr; - OUString const m_aWidthStr; - OUString const m_aHeightStr; - OUString const m_aLeftStr; - OUString const m_aUpperStr; - OUString const m_aColsStr; - OUString const m_aRowsStr; + Color m_aGrayColor; + + OUString m_aHDistStr; + OUString m_aVDistStr; + OUString m_aWidthStr; + OUString m_aHeightStr; + OUString m_aLeftStr; + OUString m_aUpperStr; + OUString m_aColsStr; + OUString m_aRowsStr; long m_lHDistWidth; long m_lVDistWidth; diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 779d1d4526d9..7ed9fe628ff0 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -46,7 +46,7 @@ namespace { class SwSequenceOptionDialog : public weld::GenericDialogController { SwView& m_rView; - OUString const m_aFieldTypeName; + OUString m_aFieldTypeName; std::unique_ptr<weld::ComboBox> m_xLbLevel; std::unique_ptr<weld::Entry> m_xEdDelim; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 00188e194f9a..c9fd24297e02 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -81,8 +81,8 @@ namespace { struct StringIdPair_Impl { - SvxSwFramePosString::StringId const eHori; - SvxSwFramePosString::StringId const eVert; + SvxSwFramePosString::StringId eHori; + SvxSwFramePosString::StringId eVert; }; } @@ -131,20 +131,20 @@ namespace { struct RelationMap { - SvxSwFramePosString::StringId const eStrId; - SvxSwFramePosString::StringId const eMirrorStrId; - LB const nLBRelation; - sal_Int16 const nRelation; + SvxSwFramePosString::StringId eStrId; + SvxSwFramePosString::StringId eMirrorStrId; + LB nLBRelation; + sal_Int16 nRelation; }; } struct FrameMap { - SvxSwFramePosString::StringId const eStrId; - SvxSwFramePosString::StringId const eMirrorStrId; - sal_Int16 const nAlign; - LB const nLBRelations; + SvxSwFramePosString::StringId eStrId; + SvxSwFramePosString::StringId eMirrorStrId; + sal_Int16 nAlign; + LB nLBRelations; }; @@ -2113,7 +2113,7 @@ void SwFramePage::Init(const SfxItemSet& rSet) const SvGlobalName& rFactNm( pSh->GetOLEObject()->getClassID() ); static struct GlobalNameId { - sal_uInt32 const n1; + sal_uInt32 n1; sal_uInt16 n2, n3; sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15; } const aGlbNmIds[] = { { SO3_SM_CLASSID_60 }, { SO3_SM_CLASSID_50 }, diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index 6c02488fddff..324ee3b7931f 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -86,7 +86,7 @@ public: /// Dialog implementing the sending as email of the result document. class SwMMResultEmailDialog : public SfxDialogController { - OUString const m_sConfigureMail; + OUString m_sConfigureMail; OUString m_sCC; OUString m_sBCC; OUString m_sBody; @@ -150,7 +150,7 @@ class SwSendMailDialog : public weld::GenericDialogController bool m_bDestructionEnabled; std::unique_ptr<SwSendMailDialog_Impl> m_pImpl; - SwMailMergeConfigItem* const m_pConfigItem; + SwMailMergeConfigItem* m_pConfigItem; sal_Int32 m_nExpectedCount; sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 1feac619dc97..8984c566fe26 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -33,7 +33,7 @@ class SwEndNoteOptionPage : public SfxTabPage OUString aNumChapter; SwWrtShell *pSh; bool bPosDoc; - bool const bEndNote; + bool bEndNote; std::unique_ptr<SwNumberingTypeListBox> m_xNumViewBox; std::unique_ptr<weld::Label> m_xOffsetLbl; diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index f74e77fcb2bd..7b66b6ba6218 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -27,7 +27,7 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XAddin > SwVbaAddin_BA class SwVbaAddin : public SwVbaAddin_BASE { private: - OUString const msFileURL; + OUString msFileURL; bool mbInstalled; public: diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index e6130fc5158d..6333354262c9 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -30,7 +30,7 @@ class SwVbaBookmark : public SwVbaBookmark_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XTextContent > mxBookmark; - OUString const maBookmarkName; + OUString maBookmarkName; bool mbValid; private: diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 687a32594154..5561bbfcbc76 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -45,7 +45,7 @@ class SwVbaBorder : public SwVbaBorder_Base { private: uno::Reference< beans::XPropertySet > m_xProps; - sal_Int32 const m_LineType; + sal_Int32 m_LineType; void setBorderLine( table::BorderLine const & rBorderLine ) { table::TableBorder aTableBorder; @@ -229,7 +229,7 @@ class RangeBorders : public RangeBorders_Base private: uno::Reference< table::XCellRange > m_xRange; uno::Reference< uno::XComponentContext > m_xContext; - VbaPalette const m_Palette; + VbaPalette m_Palette; sal_Int32 getTableIndex( sal_Int32 nConst ) { // okay return position of the index in the table diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 5d5b99476346..9c9e7524e43f 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -29,8 +29,8 @@ class SwVbaCell : public SwVbaCell_BASE { private: css::uno::Reference< css::text::XTextTable > mxTextTable; - sal_Int32 const mnColumn; - sal_Int32 const mnRow; + sal_Int32 mnColumn; + sal_Int32 mnRow; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 9bb2a145aa72..72daf252cb69 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -57,10 +57,10 @@ private: uno::Reference< XHelperInterface > mxParent; uno::Reference< uno::XComponentContext > mxContext; uno::Reference< css::text::XTextTable > mxTextTable; - sal_Int32 const mnLeft; - sal_Int32 const mnTop; - sal_Int32 const mnRight; - sal_Int32 const mnBottom; + sal_Int32 mnLeft; + sal_Int32 mnTop; + sal_Int32 mnRight; + sal_Int32 mnBottom; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbacells.hxx b/sw/source/ui/vba/vbacells.hxx index 7438117479b5..e9de9f532f53 100644 --- a/sw/source/ui/vba/vbacells.hxx +++ b/sw/source/ui/vba/vbacells.hxx @@ -29,8 +29,8 @@ class SwVbaCells : public SwVbaCells_BASE { private: css::uno::Reference< css::text::XTextTable > mxTextTable; - sal_Int32 const mnTop; - sal_Int32 const mnBottom; + sal_Int32 mnTop; + sal_Int32 mnBottom; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 3e865d60808f..2c05f3b0e97d 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -29,7 +29,7 @@ class SwVbaColumn : public SwVbaColumn_BASE { private: css::uno::Reference< css::text::XTextTable > mxTextTable; - sal_Int32 const mnIndex; + sal_Int32 mnIndex; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbadialog.cxx b/sw/source/ui/vba/vbadialog.cxx index 4eab159b6a90..c161b5d7c239 100644 --- a/sw/source/ui/vba/vbadialog.cxx +++ b/sw/source/ui/vba/vbadialog.cxx @@ -26,7 +26,7 @@ namespace { struct WordDialogTable { - sal_Int32 const wdDialog; + sal_Int32 wdDialog; const char* ooDialog; }; diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 5274a614c7b8..5c8dea110a85 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -45,7 +45,7 @@ namespace { class DocumentEnumImpl : public EnumerationHelperImpl { - uno::Any const m_aApplication; + uno::Any m_aApplication; public: /// @throws uno::RuntimeException DocumentEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 056d7cee42ae..6e3aef2f32b7 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -72,7 +72,7 @@ namespace { class SwVbaReadFieldParams { private: - OUString const aData; + OUString aData; sal_Int32 nLen, nFnd, nNext, nSavPtr; OUString aFieldName; public: diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index d652231d5e9d..fd3a3dea462b 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -30,8 +30,8 @@ class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps; - bool const mbHeader; - sal_Int32 const mnIndex; + bool mbHeader; + sal_Int32 mnIndex; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 246b408ac6e2..03a997d3ff39 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -33,7 +33,7 @@ private: uno::Reference< uno::XComponentContext > mxContext; uno::Reference< frame::XModel > mxModel; uno::Reference< beans::XPropertySet > mxPageStyleProps; - bool const mbHeader; + bool mbHeader; public: HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {} diff --git a/sw/source/ui/vba/vbaheadersfooters.hxx b/sw/source/ui/vba/vbaheadersfooters.hxx index 3c6336d35ad0..44aa77cfde4d 100644 --- a/sw/source/ui/vba/vbaheadersfooters.hxx +++ b/sw/source/ui/vba/vbaheadersfooters.hxx @@ -29,7 +29,7 @@ class SwVbaHeadersFooters : public SwVbaHeadersFooters_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::beans::XPropertySet > mxPageStyleProps; - bool const mbHeader; + bool mbHeader; public: SwVbaHeadersFooters( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::beans::XPropertySet >& xProps, bool isHeader ); diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index b139e876ab0b..187cdd418dde 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -29,7 +29,7 @@ class SwVbaListGallery : public SwVbaListGallery_BASE { private: css::uno::Reference< css::text::XTextDocument > mxTextDocument; - sal_Int32 const mnType; + sal_Int32 mnType; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbalisthelper.hxx b/sw/source/ui/vba/vbalisthelper.hxx index f076692d1740..16c6f9d426c3 100644 --- a/sw/source/ui/vba/vbalisthelper.hxx +++ b/sw/source/ui/vba/vbalisthelper.hxx @@ -26,8 +26,8 @@ private: css::uno::Reference< css::container::XIndexReplace > mxNumberingRules; css::uno::Reference< css::container::XNameContainer > mxStyleFamily; css::uno::Reference< css::beans::XPropertySet > mxStyleProps; - sal_Int32 const mnGalleryType; - sal_Int32 const mnTemplateType; + sal_Int32 mnGalleryType; + sal_Int32 mnTemplateType; OUString msStyleName; /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index f9f5e030e56e..f149a7109104 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -29,7 +29,7 @@ class SwVbaListLevel : public SwVbaListLevel_BASE { private: SwVbaListHelperRef pListHelper; - sal_Int32 const mnLevel; + sal_Int32 mnLevel; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbalistlevels.hxx b/sw/source/ui/vba/vbalistlevels.hxx index f3a212b2c9c8..ce5674fc7e97 100644 --- a/sw/source/ui/vba/vbalistlevels.hxx +++ b/sw/source/ui/vba/vbalistlevels.hxx @@ -28,7 +28,7 @@ typedef CollTestImplHelper< ooo::vba::word::XListLevels > SwVbaListLevels_BASE; class SwVbaListLevels : public SwVbaListLevels_BASE { private: - SwVbaListHelperRef const pListHelper; + SwVbaListHelperRef pListHelper; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbalisttemplates.hxx b/sw/source/ui/vba/vbalisttemplates.hxx index 270e2cc09d4f..d9d4e9d7fba2 100644 --- a/sw/source/ui/vba/vbalisttemplates.hxx +++ b/sw/source/ui/vba/vbalisttemplates.hxx @@ -29,7 +29,7 @@ class SwVbaListTemplates : public SwVbaListTemplates_BASE { private: css::uno::Reference< css::text::XTextDocument > mxTextDocument; - sal_Int32 const mnGalleryType; + sal_Int32 mnGalleryType; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index 86628324c8d3..7c6e6f3ccf8b 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -32,7 +32,7 @@ private: css::uno::Reference< css::text::XTextTable > mxTextTable; css::uno::Reference< css::table::XTableRows > mxTableRows; css::uno::Reference< css::beans::XPropertySet > mxRowProps; - sal_Int32 const mnIndex; + sal_Int32 mnIndex; public: /// @throws css::uno::RuntimeException diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index 32cf08c84ae0..bfebbb8b48dd 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -35,9 +35,9 @@ namespace { struct BuiltinStyleTable { - sal_Int32 const wdBuiltinStyle; - const char* pOOoStyleName; - sal_Int32 const wdStyleType; + sal_Int32 wdBuiltinStyle; + const sal_Char* pOOoStyleName; + sal_Int32 wdStyleType; }; } diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 2798c5eccf43..5765c06a8ee5 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -27,7 +27,7 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTemplate > SwVbaTempl class SwVbaTemplate : public SwVbaTemplate_BASE { private: - OUString const msFullUrl; + OUString msFullUrl; public: SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& ); diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index c69ddfce023c..a278ed16d2b6 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -29,7 +29,7 @@ class SwVbaVariable : public SwVbaVariable_BASE { private: css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined; - OUString const maVariableName; + OUString maVariableName; public: /// @throws css::uno::RuntimeException |