[Libreoffice-commits] core.git: include/sfx2 sfx2/inc sfx2/qa sfx2/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 18:43:15 UTC 2020
include/sfx2/StylePreviewRenderer.hxx | 2 +-
include/sfx2/childwin.hxx | 12 ++++++------
include/sfx2/dinfdlg.hxx | 2 +-
include/sfx2/docfilt.hxx | 2 +-
include/sfx2/docinsert.hxx | 4 ++--
include/sfx2/event.hxx | 10 +++++-----
include/sfx2/fcontnr.hxx | 2 +-
include/sfx2/infobar.hxx | 4 ++--
include/sfx2/linksrc.hxx | 2 +-
include/sfx2/lokcharthelper.hxx | 2 +-
include/sfx2/minfitem.hxx | 2 +-
include/sfx2/msg.hxx | 16 ++++++++--------
include/sfx2/new.hxx | 2 +-
include/sfx2/objface.hxx | 4 ++--
include/sfx2/objitem.hxx | 2 +-
include/sfx2/passwd.hxx | 6 +++---
include/sfx2/sfxhtml.hxx | 2 +-
include/sfx2/sfxstatuslistener.hxx | 2 +-
include/sfx2/sidebar/AsynchronousCall.hxx | 2 +-
include/sfx2/sidebar/ResourceManager.hxx | 2 +-
include/sfx2/sidebar/TabBar.hxx | 2 +-
include/sfx2/stbitem.hxx | 8 ++++----
include/sfx2/styfitem.hxx | 8 ++++----
include/sfx2/tbxctrl.hxx | 6 +++---
include/sfx2/templatelocalview.hxx | 2 +-
include/sfx2/viewfac.hxx | 4 ++--
include/sfx2/viewfrm.hxx | 2 +-
sfx2/inc/emojiview.hxx | 2 +-
sfx2/inc/recentdocsview.hxx | 6 +++---
sfx2/inc/srchdlg.hxx | 2 +-
sfx2/inc/templatecontaineritem.hxx | 2 +-
sfx2/inc/templateviewitem.hxx | 2 +-
sfx2/inc/thumbnailviewitem.hxx | 2 +-
sfx2/qa/cppunit/test_metadatable.cxx | 2 +-
sfx2/source/appl/appcfg.cxx | 2 +-
sfx2/source/appl/linksrc.cxx | 6 +++---
sfx2/source/appl/newhelp.cxx | 8 ++++----
sfx2/source/appl/newhelp.hxx | 14 +++++++-------
sfx2/source/appl/workwin.cxx | 2 +-
sfx2/source/bastyp/fltfnc.cxx | 4 ++--
sfx2/source/control/bindings.cxx | 6 +++---
sfx2/source/control/objface.cxx | 10 +++++-----
sfx2/source/control/recentdocsviewitem.hxx | 6 +++---
sfx2/source/control/thumbnailviewacc.hxx | 2 +-
sfx2/source/dialog/backingwindow.cxx | 4 ++--
sfx2/source/dialog/backingwindow.hxx | 2 +-
sfx2/source/dialog/filtergrouping.cxx | 8 ++++----
sfx2/source/dialog/mgetempl.hxx | 2 +-
sfx2/source/dialog/securitypage.cxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 2 +-
sfx2/source/dialog/templdlg.cxx | 6 +++---
sfx2/source/doc/doctempl.cxx | 2 +-
sfx2/source/doc/guisaveas.cxx | 2 +-
sfx2/source/doc/iframe.cxx | 2 +-
sfx2/source/doc/oleprops.cxx | 4 ++--
sfx2/source/doc/oleprops.hxx | 4 ++--
sfx2/source/doc/printhelper.cxx | 2 +-
sfx2/source/doc/templatedlg.cxx | 4 ++--
sfx2/source/inc/asyncfunc.hxx | 2 +-
sfx2/source/inc/objshimp.hxx | 2 +-
sfx2/source/inc/openurlhint.hxx | 2 +-
sfx2/source/inc/statcach.hxx | 4 ++--
sfx2/source/inc/workwin.hxx | 4 ++--
sfx2/source/view/classificationhelper.cxx | 2 +-
sfx2/source/view/sfxbasecontroller.cxx | 2 +-
sfx2/source/view/viewimp.hxx | 2 +-
sfx2/source/view/viewprn.cxx | 10 +++++-----
sfx2/source/view/viewsh.cxx | 2 +-
68 files changed, 135 insertions(+), 135 deletions(-)
New commits:
commit 503e0173bf1e207b05a33cc17e03d8b9dbcbc56b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Mar 12 16:50:24 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 19:42:37 2020 +0100
Revert "loplugin:constfields in sfx2"
This reverts commit 8411b80d46765f1ddd4e37aa634ec963dcf4b04f.
Change-Id: Ibf3aa3ce4bfedf9d47001ad824db7c48ff093a21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90416
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx
index 0a1c67063776..fc4da7a33d71 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -25,7 +25,7 @@ protected:
const SfxObjectShell& mrShell;
OutputDevice& mrOutputDev;
SfxStyleSheetBase* mpStyle;
- long const mnMaxHeight;
+ long mnMaxHeight;
public:
enum class RenderAlign
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 054f1ff0a0f5..f7d639e927c6 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -90,8 +90,8 @@ typedef std::unique_ptr<SfxChildWindowContext> (*SfxChildWinContextCtor)( vcl::W
SfxChildWinInfo *pInfo);
struct SfxChildWinContextFactory
{
- SfxChildWinContextCtor const pCtor; // Factory method
- sal_uInt16 const nContextId; // Identifier for SfxInterface
+ SfxChildWinContextCtor pCtor; // Factory method
+ sal_uInt16 nContextId; // Identifier for SfxInterface
SfxChildWinContextFactory( SfxChildWinContextCtor pTheCtor, sal_uInt16 nID )
: pCtor(pTheCtor)
@@ -103,10 +103,10 @@ class SfxChildWinContextArr_Impl;
struct SFX2_DLLPUBLIC SfxChildWinFactory
{
- SfxChildWinCtor const pCtor; // Factory method
- sal_uInt16 const nId; // ChildWindow-Id ( SlotId )
+ SfxChildWinCtor pCtor; // Factory method
+ sal_uInt16 nId; // ChildWindow-Id ( SlotId )
SfxChildWinInfo aInfo; // Configuration
- sal_uInt16 const nPos; // Position in UI
+ sal_uInt16 nPos; // Position in UI
std::unique_ptr<SfxChildWinContextArr_Impl> pArr; // Array for Contexts
SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, sal_uInt16 n );
@@ -142,7 +142,7 @@ public:
class SFX2_DLLPUBLIC SfxChildWindow
{
VclPtr<vcl::Window> pParent; // parent window ( Topwindow )
- sal_uInt16 const nType; // ChildWindow-Id
+ sal_uInt16 nType; // ChildWindow-Id
VclPtr<vcl::Window> pWindow; // actual contents
std::shared_ptr<SfxDialogController> xController; // actual contents
SfxChildAlignment eChildAlignment; // Current css::drawing::Alignment
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 2501e44903bd..90a479c099a5 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -57,7 +57,7 @@ private:
OUString m_AutoloadURL;
bool m_isAutoloadEnabled;
OUString m_DefaultTarget;
- OUString const m_TemplateName;
+ OUString m_TemplateName;
OUString m_Author;
css::util::DateTime m_CreationDate;
OUString m_ModifiedBy;
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 393bc39e12c2..80bb7734d970 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -52,7 +52,7 @@ class SFX2_DLLPUBLIC SfxFilter
* Custom provider name in case the filter is provided via external
* libraries. Empty for conventional filter types.
*/
- OUString const maProvider;
+ OUString maProvider;
SfxFilterFlags nFormatType;
sal_Int32 nVersion;
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index ae819299079c..ab75ddd187b7 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -40,8 +40,8 @@ namespace sfx2 {
class SFX2_DLLPUBLIC DocumentInserter
{
private:
- weld::Window* const m_pParent;
- OUString const m_sDocFactory;
+ weld::Window* m_pParent;
+ OUString m_sDocFactory;
OUString m_sFilter;
Link<sfx2::FileDialogHelper*,void> m_aDialogClosedLink;
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 5afbf306419e..9f7cd304a038 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -190,9 +190,9 @@ inline std::basic_ostream<charT, traits> & operator <<(
class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
{
- SfxObjectShell* const pObjShell;
- OUString const aEventName;
- SfxEventHintId const nEventId;
+ SfxObjectShell* pObjShell;
+ OUString aEventName;
+ SfxEventHintId nEventId;
public:
SfxEventHint( SfxEventHintId nId, const OUString& aName, SfxObjectShell *pObj )
@@ -233,8 +233,8 @@ public:
class SfxPrintingHint final : public SfxViewEventHint
{
- css::view::PrintableState const mnPrintableState;
- css::uno::Sequence < css::beans::PropertyValue > const aOpts;
+ css::view::PrintableState mnPrintableState;
+ css::uno::Sequence < css::beans::PropertyValue > aOpts;
public:
SfxPrintingHint(
css::view::PrintableState nState,
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 6d62f8cfa561..86f20bf111c7 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -99,7 +99,7 @@ class SFX2_DLLPUBLIC SfxFilterMatcherIter
{
SfxFilterFlags nOrMask;
- SfxFilterFlags const nAndMask;
+ SfxFilterFlags nAndMask;
sal_uInt16 nCurrent;
const SfxFilterMatcher_Impl &m_rMatch;
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index 0c866f70de5f..08de31318517 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -45,7 +45,7 @@ public:
class SFX2_DLLPUBLIC SfxInfoBarContainerChild final : public SfxChildWindow
{
private:
- SfxBindings* const m_pBindings;
+ SfxBindings* m_pBindings;
public:
SfxInfoBarContainerChild(vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings,
@@ -62,7 +62,7 @@ public:
class SFX2_DLLPUBLIC SfxInfoBarWindow final : public vcl::Window
{
private:
- OUString const m_sId;
+ OUString m_sId;
InfobarType m_eType;
VclPtr<FixedImage> m_pImage;
VclPtr<FixedText> m_pPrimaryMessage;
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index fe6706544b20..b4f21227704e 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -102,7 +102,7 @@ public:
css::uno::Reference<css::io::XInputStream>
m_xInputStreamToLoadFrom;
- bool const m_bIsReadOnly;
+ bool m_bIsReadOnly;
};
StreamToLoadFrom getStreamToLoadFrom();
diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx
index 2a921d0fa009..8998010d1258 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcharthelper.hxx
@@ -24,7 +24,7 @@ class VirtualDevice;
class SFX2_DLLPUBLIC LokChartHelper
{
private:
- SfxViewShell* const mpViewShell;
+ SfxViewShell* mpViewShell;
css::uno::Reference<css::frame::XController> mxController;
css::uno::Reference<css::frame::XDispatch> mxDispatcher;
VclPtr<vcl::Window> mpWindow;
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index 8727b7815abd..6a3eb5a65738 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.hxx
@@ -32,7 +32,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem final : public SfxPoolItem
OUString aLibName;
OUString aModuleName;
OUString aMethodName;
- OUString const aCommentText;
+ OUString aCommentText;
public:
static SfxPoolItem* CreateDefault();
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 7f9eb2de916b..5e5a15f1d3db 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -102,9 +102,9 @@ template<class T> SfxPoolItem* createSfxPoolItem()
}
struct SfxType
{
- std::function<SfxPoolItem* ()> const createSfxPoolItemFunc;
+ std::function<SfxPoolItem* ()> createSfxPoolItemFunc;
const std::type_info* pType;
- sal_uInt16 const nAttribs;
+ sal_uInt16 nAttribs;
SfxTypeAttrib aAttrib[1]; // variable length
const std::type_info* Type() const{return pType;}
@@ -114,9 +114,9 @@ struct SfxType
struct SfxType0
{
- std::function<SfxPoolItem* ()> const createSfxPoolItemFunc;
- const std::type_info* pType;
- sal_uInt16 const nAttribs;
+ std::function<SfxPoolItem* ()> createSfxPoolItemFunc;
+ const std::type_info* pType;
+ sal_uInt16 nAttribs;
const std::type_info* Type() const { return pType;}
};
#define SFX_DECL_TYPE(n) struct SfxType##n \
@@ -171,9 +171,9 @@ SFX_DECL_TYPE(23); // for SvxSearchItem
struct SfxFormalArgument
{
- const SfxType* pType; // Type of the parameter (SfxPoolItem subclass)
- const char* pName; // Name of the sParameters
- sal_uInt16 const nSlotId; // Slot-Id for identification of the Parameters
+ const SfxType* pType; // Type of the parameter (SfxPoolItem subclass)
+ const char* pName; // Name of the sParameters
+ sal_uInt16 nSlotId; // Slot-Id for identification of the Parameters
std::unique_ptr<SfxPoolItem> CreateItem() const
{ return pType->CreateItem(); }
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index e8e974cf366e..9be8586c710e 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -63,7 +63,7 @@ class SFX2_DLLPUBLIC SfxNewFileDialog final : public SfxDialogController
{
private:
Idle m_aPrevIdle;
- SfxNewFileDialogMode const m_nFlags;
+ SfxNewFileDialogMode m_nFlags;
SfxDocumentTemplates m_aTemplates;
SfxObjectShellLock m_xDocShell;
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 32f23200afbd..bda6ecc05462 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -60,8 +60,8 @@ friend class SfxSlotPool;
const SfxInterface* pGenoType; // base interface
SfxSlot* pSlots; // SlotMap
sal_uInt16 nCount; // number of slots in SlotMap
- SfxInterfaceId const nClassId; // Id of interface
- bool const bSuperClass; // Whether children inherit its toolbars etc
+ SfxInterfaceId nClassId; // Id of interface
+ bool bSuperClass; // Whether children inherit its toolbars etc
std::unique_ptr<SfxInterface_Impl> pImplData;
public:
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index b7374aa8a4f4..7fb199c88ab1 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -27,7 +27,7 @@ class SfxShell;
class SFX2_DLLPUBLIC SfxObjectItem final : public SfxPoolItem
{
- SfxShell* const _pSh;
+ SfxShell* _pSh;
public:
static SfxPoolItem* CreateDefault();
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index dd2712889517..cbbbf7a4a33d 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -63,9 +63,9 @@ private:
std::unique_ptr<weld::Button> m_xOKBtn;
- OUString const maMinLenPwdStr;
- OUString const maMinLenPwdStr1;
- OUString const maEmptyPwdStr;
+ OUString maMinLenPwdStr;
+ OUString maMinLenPwdStr1;
+ OUString maEmptyPwdStr;
OUString maMainPwdStr;
sal_uInt16 mnMinLen;
SfxShowExtras mnExtras;
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index ab7070c79af2..0cab447c8fb5 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -37,7 +37,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
{
OUString aScriptType;
- SfxMedium* const pMedium;
+ SfxMedium* pMedium;
std::unique_ptr<SfxMedium> pDLMedium; // Medium for Download Files
ScriptType eScriptType;
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 01ffb8518e9c..13cbe7376c06 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -63,7 +63,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
SfxStatusListener( const SfxStatusListener& ) = delete;
SfxStatusListener& operator=( const SfxStatusListener& ) = delete;
- sal_uInt16 const m_nSlotID;
+ sal_uInt16 m_nSlotID;
css::util::URL m_aCommand;
css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider;
css::uno::Reference< css::frame::XDispatch > m_xDispatch;
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index 98c4c75602a4..490e2d8548f0 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -42,7 +42,7 @@ public:
void Sync();
private:
- Action const maAction;
+ Action maAction;
ImplSVEvent * mnCallId;
DECL_LINK(HandleUserCall, void*, void);
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index 816aacf5c42f..8d3972c71996 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -107,7 +107,7 @@ private:
mutable std::set<OUString> maProcessedApplications;
std::map<OUString, OUString> maLastActiveDecks;
- SvtMiscOptions const maMiscOptions;
+ SvtMiscOptions maMiscOptions;
void ReadDeckList();
void ReadPanelList();
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 9d57b90a2039..909b90ef9a50 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -106,7 +106,7 @@ private:
ItemContainer maItems;
const ::std::function<void (const OUString& rsDeckId)> maDeckActivationFunctor;
sal_Int32 mnMenuSeparatorY;
- PopupMenuProvider const maPopupMenuProvider;
+ PopupMenuProvider maPopupMenuProvider;
VclPtr<RadioButton> CreateTabItem (const DeckDescriptor& rDeckDescriptor);
Image GetItemImage (const DeckDescriptor& rDeskDescriptor) const;
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index e49a81e78e88..8929e2efb2f3 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -38,9 +38,9 @@ typedef SfxStatusBarControl* (*SfxStatusBarControlCtor)( sal_uInt16 nSlotId, sal
struct SfxStbCtrlFactory
{
- SfxStatusBarControlCtor const pCtor;
+ SfxStatusBarControlCtor pCtor;
const std::type_info& nTypeId;
- sal_uInt16 const nSlotId;
+ sal_uInt16 nSlotId;
SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
@@ -57,8 +57,8 @@ class UserDrawEvent;
class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
{
- sal_uInt16 const nSlotId;
- sal_uInt16 const nId;
+ sal_uInt16 nSlotId;
+ sal_uInt16 nId;
VclPtr<StatusBar> pBar;
protected:
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index b144c840cd8e..fea8d735796b 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -28,7 +28,7 @@
struct SFX2_DLLPUBLIC SfxFilterTuple
{
- OUString const aName;
+ OUString aName;
SfxStyleSearchBits nFlags;
SfxFilterTuple(const OUString& rName, SfxStyleSearchBits nArg)
: aName(rName)
@@ -41,9 +41,9 @@ typedef std::vector<SfxFilterTuple> SfxStyleFilter;
class SFX2_DLLPUBLIC SfxStyleFamilyItem
{
- SfxStyleFamily const nFamily;
- OUString const aText;
- Image const aImage;
+ SfxStyleFamily nFamily;
+ OUString aText;
+ Image aImage;
SfxStyleFilter aFilterList;
public:
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index f12878564e87..d812aed6ee3e 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -40,9 +40,9 @@ typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uIn
struct SfxTbxCtrlFactory
{
- SfxToolBoxControlCtor const pCtor;
- const std::type_info& nTypeId;
- sal_uInt16 const nSlotId;
+ SfxToolBoxControlCtor pCtor;
+ const std::type_info& nTypeId;
+ sal_uInt16 nSlotId;
SfxTbxCtrlFactory( SfxToolBoxControlCtor pTheCtor,
const std::type_info& nTheTypeId, sal_uInt16 nTheSlotId ):
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 098ffa33e6dc..3ed02ac9037a 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -59,7 +59,7 @@ public:
private:
- FILTER_APPLICATION const mApp;
+ FILTER_APPLICATION mApp;
};
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 476fd01f9f16..efd511ea2b3d 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -50,8 +50,8 @@ public:
OUString GetAPIViewName() const;
private:
- SfxViewCtor const fnCreate;
- SfxInterfaceId const nOrd;
+ SfxViewCtor fnCreate;
+ SfxInterfaceId nOrd;
const OUString m_sViewName;
};
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 7f8be83f0aa7..0a40a4179afc 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -250,7 +250,7 @@ private:
class SFX2_DLLPUBLIC SfxViewFrameItem final : public SfxPoolItem
{
- SfxViewFrame* const pFrame;
+ SfxViewFrame* pFrame;
public:
SfxViewFrameItem( SfxViewFrame *pViewFrame ):
diff --git a/sfx2/inc/emojiview.hxx b/sfx2/inc/emojiview.hxx
index 212a785de445..4ee37ac6f581 100644
--- a/sfx2/inc/emojiview.hxx
+++ b/sfx2/inc/emojiview.hxx
@@ -45,7 +45,7 @@ public:
private:
- FILTER_CATEGORY const mCategory;
+ FILTER_CATEGORY mCategory;
};
diff --git a/sfx2/inc/recentdocsview.hxx b/sfx2/inc/recentdocsview.hxx
index e5f7ebfb5a8e..ff21644a9940 100644
--- a/sfx2/inc/recentdocsview.hxx
+++ b/sfx2/inc/recentdocsview.hxx
@@ -89,9 +89,9 @@ private:
size_t mnLastMouseDownItem;
/// Image that appears when there is no recent document.
- Image const maWelcomeImage;
- OUString const maWelcomeLine1;
- OUString const maWelcomeLine2;
+ Image maWelcomeImage;
+ OUString maWelcomeLine1;
+ OUString maWelcomeLine2;
};
} // namespace sfx2
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index 4983336b978a..3d8317477ec0 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -33,7 +33,7 @@ private:
Link<SearchDialog&,void> m_aFindHdl;
Link<LinkParamNone*,void> m_aCloseHdl;
- OUString const m_sConfigName;
+ OUString m_sConfigName;
std::unique_ptr<weld::ComboBox> m_xSearchEdit;
std::unique_ptr<weld::CheckButton> m_xWholeWordsBox;
diff --git a/sfx2/inc/templatecontaineritem.hxx b/sfx2/inc/templatecontaineritem.hxx
index 0e618e48ee5a..e11e2bd215a6 100644
--- a/sfx2/inc/templatecontaineritem.hxx
+++ b/sfx2/inc/templatecontaineritem.hxx
@@ -14,7 +14,7 @@
class TemplateContainerItem final
{
public:
- sal_uInt16 const mnId;
+ sal_uInt16 mnId;
sal_uInt16 mnRegionId;
OUString maTitle;
std::vector<TemplateItemProperties> maTemplates;
diff --git a/sfx2/inc/templateviewitem.hxx b/sfx2/inc/templateviewitem.hxx
index 64faf438b847..536808f471a1 100644
--- a/sfx2/inc/templateviewitem.hxx
+++ b/sfx2/inc/templateviewitem.hxx
@@ -38,7 +38,7 @@ public:
private:
OUString maPath;
- BitmapEx const maDefaultBitmap;
+ BitmapEx maDefaultBitmap;
bool mbIsDefaultTemplate;
};
diff --git a/sfx2/inc/thumbnailviewitem.hxx b/sfx2/inc/thumbnailviewitem.hxx
index eef035ae09d1..dea5e65c1774 100644
--- a/sfx2/inc/thumbnailviewitem.hxx
+++ b/sfx2/inc/thumbnailviewitem.hxx
@@ -67,7 +67,7 @@ class ThumbnailViewItem
public:
ThumbnailViewBase &mrParent;
- sal_uInt16 const mnId;
+ sal_uInt16 mnId;
bool mbVisible;
bool mbSelected;
bool mbHover;
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 5d3d71d5a23f..06b18edfec43 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -60,7 +60,7 @@ public:
bool const i_isInClip = false)
: m_rRegistry(i_rReg)
, m_bInClipboard(i_isInClip), m_bInUndo(false), m_bInContent(true) {}
- bool const m_bInClipboard;
+ bool m_bInClipboard;
bool m_bInUndo;
bool m_bInContent;
virtual bool IsInClipboard() const override { return m_bInClipboard; }
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index ec24c2951f03..0e72b08f566f 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -63,7 +63,7 @@ namespace {
class SfxEventAsyncer_Impl : public SfxListener
{
- SfxEventHint const aHint;
+ SfxEventHint aHint;
std::unique_ptr<Idle> pIdle;
public:
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 0e0708f8da68..d249f8e282a3 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -73,9 +73,9 @@ namespace {
struct SvLinkSource_Entry_Impl
{
tools::SvRef<SvBaseLink> xSink;
- OUString const aDataMimeType;
- sal_uInt16 const nAdviseModes;
- bool const bIsDataSink;
+ OUString aDataMimeType;
+ sal_uInt16 nAdviseModes;
+ bool bIsDataSink;
SvLinkSource_Entry_Impl( SvBaseLink* pLink, const OUString& rMimeType,
sal_uInt16 nAdvMode )
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index ee9040e0e6f1..72cc4599f03f 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -230,8 +230,8 @@ namespace {
struct IndexEntry_Impl
{
- bool const m_bSubEntry;
- OUString const m_aURL;
+ bool m_bSubEntry;
+ OUString m_aURL;
IndexEntry_Impl( const OUString& rURL, bool bSubEntry ) :
m_bSubEntry( bSubEntry ), m_aURL( rURL ) {}
@@ -241,8 +241,8 @@ struct IndexEntry_Impl
struct ContentEntry_Impl
{
- OUString const aURL;
- bool const bIsFolder;
+ OUString aURL;
+ bool bIsFolder;
ContentEntry_Impl( const OUString& rURL, bool bFolder ) :
aURL( rURL ), bIsFolder( bFolder ) {}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 5bcffa2926cd..52c01790be81 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -51,9 +51,9 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan
class ContentListBox_Impl : public SvTreeListBox
{
private:
- Image const aOpenBookImage;
- Image const aClosedBookImage;
- Image const aDocumentImage;
+ Image aOpenBookImage;
+ Image aClosedBookImage;
+ Image aDocumentImage;
void InitRoot();
void ClearChildren( SvTreeListEntry* pParent );
@@ -291,7 +291,7 @@ private:
Link<SfxHelpIndexWindow_Impl*,void> aSelectFactoryLink;
Link<Control*,bool> aPageDoubleClickLink;
- Link<IndexTabPage_Impl&,void> const aIndexKeywordLink;
+ Link<IndexTabPage_Impl&,void> aIndexKeywordLink;
OUString sKeyword;
VclPtr<SfxHelpWindow_Impl> pParentWin;
@@ -422,10 +422,10 @@ private:
Idle aSelectIdle;
Image aIndexOnImage;
Image aIndexOffImage;
- OUString const aIndexOnText;
- OUString const aIndexOffText;
+ OUString aIndexOnText;
+ OUString aIndexOffText;
OUString aSearchText;
- OUString const aOnStartupText;
+ OUString aOnStartupText;
OUString sCurrentFactory;
VclPtr<SfxHelpWindow_Impl> pHelpWin;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 9a8abd3b29bb..4343b7f18b87 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -61,7 +61,7 @@ namespace {
struct ResIdToResName
{
- ToolbarId const eId;
+ ToolbarId eId;
const char* pName;
};
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 060dd47a3d9f..393edfc7f9cd 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -105,7 +105,7 @@ static OUString ToUpper_Impl( const OUString &rStr )
class SfxFilterContainer_Impl
{
public:
- OUString const aName;
+ OUString aName;
explicit SfxFilterContainer_Impl( const OUString& rName )
: aName( rName )
@@ -211,7 +211,7 @@ std::shared_ptr<const SfxFilter> SfxFilterContainer::GetDefaultFilter_Impl( cons
class SfxFilterMatcher_Impl
{
public:
- OUString const aName;
+ OUString aName;
mutable SfxFilterList_Impl* pList; // is created on demand
void InitForIterating() const;
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 559779e7f127..94a6a2fe50dd 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -66,9 +66,9 @@ typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap;
struct SfxFoundCache_Impl
{
- sal_uInt16 const nWhichId; // If available: Which-Id, else: nSlotId
- const SfxSlot* pSlot; // Pointer to <Master-Slot>
- SfxStateCache& rCache; // Pointer to StatusCache
+ sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId
+ const SfxSlot* pSlot; // Pointer to <Master-Slot>
+ SfxStateCache& rCache; // Pointer to StatusCache
SfxFoundCache_Impl(sal_uInt16 nW, const SfxSlot *pS, SfxStateCache& rC)
: nWhichId(nW)
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 7c48f81c98ef..d794d715a9c2 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -50,11 +50,11 @@ namespace {
struct SfxObjectUI_Impl
{
- sal_uInt16 const nPos;
- SfxVisibilityFlags const nFlags;
- sal_uInt32 const nObjId;
- bool bContext;
- SfxShellFeature const nFeature;
+ sal_uInt16 nPos;
+ SfxVisibilityFlags nFlags;
+ sal_uInt32 nObjId;
+ bool bContext;
+ SfxShellFeature nFeature;
SfxObjectUI_Impl(sal_uInt16 n, SfxVisibilityFlags f, sal_uInt32 nId, SfxShellFeature nFeat) :
nPos(n),
diff --git a/sfx2/source/control/recentdocsviewitem.hxx b/sfx2/source/control/recentdocsviewitem.hxx
index fd4cddf97da2..fb259c2d3a0a 100644
--- a/sfx2/source/control/recentdocsviewitem.hxx
+++ b/sfx2/source/control/recentdocsviewitem.hxx
@@ -50,16 +50,16 @@ private:
/// Return area where is the icon to remove document from the recent documents.
tools::Rectangle getRemoveIconArea() const;
- OUString const maURL;
+ OUString maURL;
OUString m_sHelpText;
/// Is the icon that the user can click to remove the document from the recent documents highlighted?
bool m_bRemoveIconHighlighted;
- BitmapEx const m_aRemoveRecentBitmap;
+ BitmapEx m_aRemoveRecentBitmap;
- BitmapEx const m_aRemoveRecentBitmapHighlighted;
+ BitmapEx m_aRemoveRecentBitmapHighlighted;
};
#endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index c4d10e573c77..1aaed600a9b0 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -259,7 +259,7 @@ private:
mxEventListeners;
::osl::Mutex maMutex;
ThumbnailViewItem* mpParent;
- bool const mbIsTransientChildrenDisabled;
+ bool mbIsTransientChildrenDisabled;
public:
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index d64a1747bc7b..177443586698 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -703,8 +703,8 @@ namespace {
struct ImplDelayedDispatch
{
Reference< XDispatch > xDispatch;
- css::util::URL const aDispatchURL;
- Sequence< PropertyValue > const aArgs;
+ css::util::URL aDispatchURL;
+ Sequence< PropertyValue > aArgs;
ImplDelayedDispatch( const Reference< XDispatch >& i_xDispatch,
const css::util::URL& i_rURL,
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index a029557324ad..15ab2fe0728f 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -78,7 +78,7 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer
std::vector< VclPtr<vcl::Window> > maDndWindows;
- Color const maButtonsTextColor;
+ Color maButtonsTextColor;
tools::Rectangle maStartCentButtons;
bool mbInitControls;
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index b68a624cdb3d..938853bc81b1 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -192,7 +192,7 @@ namespace sfx2
struct ReadGlobalFilter
{
protected:
- OConfigurationNode const m_aClassesNode;
+ OConfigurationNode m_aClassesNode;
FilterClassReferrer& m_aClassReferrer;
public:
@@ -266,7 +266,7 @@ namespace sfx2
struct ReadLocalFilter
{
protected:
- OConfigurationNode const m_aClassesNode;
+ OConfigurationNode m_aClassesNode;
FilterClassList& m_rClasses;
public:
@@ -532,7 +532,7 @@ namespace sfx2
struct FindGroupEntry
{
- FilterGroupEntryReferrer::mapped_type const aLookingFor;
+ FilterGroupEntryReferrer::mapped_type aLookingFor;
explicit FindGroupEntry( FilterGroupEntryReferrer::mapped_type const & _rLookingFor ) : aLookingFor( _rLookingFor ) { }
bool operator() ( const MapGroupEntry2GroupEntry::value_type& _rMapEntry )
@@ -722,7 +722,7 @@ namespace sfx2
protected:
Reference< XFilterManager > m_xFilterManager;
FileDialogHelper_Impl* m_pFileDlgImpl;
- bool const m_bAddExtension;
+ bool m_bAddExtension;
public:
AppendFilter( const Reference< XFilterManager >& _rxFilterManager,
diff --git a/sfx2/source/dialog/mgetempl.hxx b/sfx2/source/dialog/mgetempl.hxx
index 26a1a32ca69c..97e1c843eb22 100644
--- a/sfx2/source/dialog/mgetempl.hxx
+++ b/sfx2/source/dialog/mgetempl.hxx
@@ -47,7 +47,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
OUString aName;
OUString aFollow;
OUString aParent;
- SfxStyleSearchBits const nFlags;
+ SfxStyleSearchBits nFlags;
std::unique_ptr<weld::Entry> m_xName;
std::unique_ptr<weld::CheckButton> m_xAutoCB;
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 6268e10e7607..84df48131b99 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -139,7 +139,7 @@ struct SfxSecurityPage_Impl
bool m_bNewPasswordIsValid;
OUString m_aNewPassword;
- OUString const m_aEndRedliningWarning;
+ OUString m_aEndRedliningWarning;
bool m_bEndRedliningWarningDone;
std::unique_ptr<weld::CheckButton> m_xOpenReadonlyCB;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 210b6fb87dc4..8ad06f98e967 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -52,7 +52,7 @@ namespace {
struct Data_Impl
{
- OString const sId; // The ID
+ OString sId; // The ID
CreateTabPage fnCreatePage; // Pointer to Factory
GetTabPageRanges fnGetRanges; // Pointer to Ranges-Function
std::unique_ptr<SfxTabPage> xTabPage; // The TabPage itself
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fb6608d6490f..5d09b4b2d119 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -83,7 +83,7 @@ namespace
class StyleLBoxString : public SvLBoxString
{
- SfxStyleFamily const meStyleFamily;
+ SfxStyleFamily meStyleFamily;
SvViewDataItem* mpViewData;
public:
@@ -562,8 +562,8 @@ namespace {
class StyleTree_Impl
{
private:
- OUString const aName;
- OUString const aParent;
+ OUString aName;
+ OUString aParent;
StyleTreeArr_Impl pChildren;
public:
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index f0b8a28e3018..a6e88fe6a834 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -99,7 +99,7 @@ class DocTempl_EntryData_Impl
// the following member must be SfxObjectShellLock since it controls that SfxObjectShell lifetime by design
// and users of this class expect it to be so.
- SfxObjectShellLock const mxObjShell;
+ SfxObjectShellLock mxObjShell;
OUString maTitle;
OUString maOwnURL;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index e42cf63c13f6..bcb058770d33 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -198,7 +198,7 @@ class DocumentSettingsGuard
bool m_bPreserveReadOnly;
bool m_bReadOnlySupported;
- bool const m_bRestoreSettings;
+ bool m_bRestoreSettings;
public:
DocumentSettingsGuard( const uno::Reference< frame::XModel >& xModel, bool bReadOnly, bool bRestore )
: m_bPreserveReadOnly( false )
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index e896b3843732..aad8ca85fdbb 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -57,7 +57,7 @@ class IFrameObject : public ::cppu::WeakImplHelper <
css::uno::Reference < css::uno::XComponentContext > mxContext;
css::uno::Reference < css::frame::XFrame2 > mxFrame;
css::uno::Reference < css::embed::XEmbeddedObject > mxObj;
- SfxItemPropertyMap const maPropMap;
+ SfxItemPropertyMap maPropMap;
SfxFrameDescriptor maFrmDescr;
public:
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 3267c58dc877..14b6e4863ad6 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -197,7 +197,7 @@ private:
virtual void ImplSave( SvStream& rStrm ) override;
private:
- uno::Sequence<sal_Int8> const mData;
+ uno::Sequence<sal_Int8> mData;
};
@@ -218,7 +218,7 @@ private:
virtual void ImplSave( SvStream& rStrm ) override;
private:
- uno::Sequence<sal_Int8> const mData;
+ uno::Sequence<sal_Int8> mData;
};
}
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index de19ff4b530f..66b4e1c7d1aa 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -210,7 +210,7 @@ protected:
void SetPropType( sal_Int32 nPropType ) { mnPropType = nPropType; }
private:
- sal_Int32 const mnPropId;
+ sal_Int32 mnPropId;
sal_Int32 mnPropType;
};
@@ -336,7 +336,7 @@ private:
SfxOleCodePageProperty maCodePageProp; /// The codepage property.
SfxOleDictionaryProperty maDictProp; /// The dictionary property.
sal_uInt64 mnStartPos; /// Start stream position of the section.
- bool const mbSupportsDict; /// true = section supports dictionary.
+ bool mbSupportsDict; /// true = section supports dictionary.
};
typedef std::shared_ptr< SfxOleSection > SfxOleSectionRef;
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 47356ce61c3d..821c78f8b897 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -467,7 +467,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
/// of course we must know the printer which execute the job
VclPtr<SfxPrinter> m_pPrinter;
/// this describes the target location for the printed temp file
- OUString const m_sTargetURL;
+ OUString m_sTargetURL;
/// it holds the temp file alive, till the print job will finish and remove it from disk automatically if the object die
::utl::TempFile* m_pTempFile;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 60b18b5795bf..3979db7cf573 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -132,8 +132,8 @@ public:
private:
- OUString const maKeyword;
- FILTER_APPLICATION const meApp;
+ OUString maKeyword;
+ FILTER_APPLICATION meApp;
};
}
diff --git a/sfx2/source/inc/asyncfunc.hxx b/sfx2/source/inc/asyncfunc.hxx
index 7d4f409b86b3..708750baaf3b 100644
--- a/sfx2/source/inc/asyncfunc.hxx
+++ b/sfx2/source/inc/asyncfunc.hxx
@@ -19,7 +19,7 @@
class AsyncFunc final : public cppu::WeakImplHelper<css::lang::XUnoTunnel>
{
private:
- std::function<void()> const m_pAsyncFunc;
+ std::function<void()> m_pAsyncFunc;
public:
AsyncFunc(const std::function<void()>&);
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 9ffb447bd272..ae0d1ed24c64 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -39,7 +39,7 @@ class SfxBasicManagerHolder;
class AutoReloadTimer_Impl : public Timer
{
- OUString const aUrl;
+ OUString aUrl;
SfxObjectShell* pObjSh;
public:
diff --git a/sfx2/source/inc/openurlhint.hxx b/sfx2/source/inc/openurlhint.hxx
index 8eac0911fe2b..026d72636157 100644
--- a/sfx2/source/inc/openurlhint.hxx
+++ b/sfx2/source/inc/openurlhint.hxx
@@ -25,7 +25,7 @@
class SfxOpenUrlHint: public SfxHint
{
- OUString const msDocumentURL;
+ OUString msDocumentURL;
public:
SfxOpenUrlHint(const OUString& sDocumentURL);
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 5b218b9ae9dd..1360db98bc9d 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -38,7 +38,7 @@ class BindDispatch_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusLi
{
friend class SfxStateCache;
css::uno::Reference< css::frame::XDispatch > xDisp;
- css::util::URL const aURL;
+ css::util::URL aURL;
css::frame::FeatureStateEvent aStatus;
SfxStateCache* pCache;
const SfxSlot* pSlot;
@@ -62,7 +62,7 @@ class SfxStateCache
friend class BindDispatch_Impl;
rtl::Reference<BindDispatch_Impl>
mxDispatch;
- sal_uInt16 const nId; // Slot-Id
+ sal_uInt16 nId; // Slot-Id
SfxControllerItem* pInternalController;
css::uno::Reference < css::frame::XDispatch > xMyDispatch;
SfxControllerItem* pController; // Pointer to first bound Controller (interlinked with each other)
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 9eb1d98a10ea..4be7657214f3 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -107,7 +107,7 @@ struct SfxChild_Impl
struct SfxChildWin_Impl
{
- sal_uInt16 const nSaveId; // the ChildWindow-Id
+ sal_uInt16 nSaveId; // the ChildWindow-Id
sal_uInt16 nInterfaceId; // the current context
sal_uInt16 nId; // current Id
SfxChildWindow* pWin;
@@ -211,7 +211,7 @@ class SfxWorkWindow final
sal_Int32 m_nLock;
css::uno::Reference< css::lang::XComponent > m_xLayoutManagerListener;
SfxFrame* pMasterFrame;
- SfxFrame* const pFrame;
+ SfxFrame* pFrame;
void CreateChildWin_Impl(SfxChildWin_Impl*,bool);
void RemoveChildWin_Impl(SfxChildWin_Impl*);
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 011ccba16dd8..1309bc774418 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -359,7 +359,7 @@ public:
uno::Reference<document::XDocumentProperties> m_xDocumentProperties;
- bool const m_bUseLocalized;
+ bool m_bUseLocalized;
explicit Impl(uno::Reference<document::XDocumentProperties> xDocumentProperties, bool bUseLocalized);
void parsePolicy();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 3d25070a0b08..cf6f2485425d 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -311,7 +311,7 @@ public:
private:
- SfxBaseController* const m_pController;
+ SfxBaseController* m_pController;
} ; // class IMPL_SfxBaseController_ListenerContainer
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 7046483ec0a3..bb4cea008d2c 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -39,7 +39,7 @@ struct SfxViewShell_Impl
::comphelper::OInterfaceContainerHelper2 aInterceptorContainer;
SfxShellArr_Impl aArr;
Size aMargin;
- bool const m_bHasPrintOptions;
+ bool m_bHasPrintOptions;
sal_uInt16 m_nFamily;
::rtl::Reference<SfxBaseController> m_pController;
std::unique_ptr< ::svt::AcceleratorExecute > m_xAccExec;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index ffb0b568ec7b..57cd026b8990 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -61,8 +61,8 @@ using namespace com::sun::star::uno;
class SfxPrinterController : public vcl::PrinterController, public SfxListener
{
- Any const maCompleteSelection;
- Any const maSelection;
+ Any maCompleteSelection;
+ Any maSelection;
Reference< view::XRenderable > mxRenderable;
mutable VclPtr<Printer> mpLastPrinter;
mutable Reference<awt::XDevice> mxDevice;
@@ -70,8 +70,8 @@ class SfxPrinterController : public vcl::PrinterController, public SfxListener
SfxObjectShell* mpObjectShell;
bool m_bOrigStatus;
bool m_bNeedsChange;
- bool const m_bApi;
- bool const m_bTempPrinter;
+ bool m_bApi;
+ bool m_bTempPrinter;
util::DateTime m_aLastPrinted;
OUString m_aLastPrintedBy;
@@ -421,7 +421,7 @@ namespace {
class SfxDialogExecutor_Impl
{
private:
- SfxViewShell* const _pViewSh;
+ SfxViewShell* _pViewSh;
PrinterSetupDialog& _rSetupParent;
std::unique_ptr<SfxItemSet> _pOptions;
bool _bHelpDisabled;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index a28dc663ade9..c26d0b6352b4 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -125,7 +125,7 @@ public:
AsyncExecuteInfo( AsyncExecuteCmd eCmd, SfxClipboardChangeListener* pListener ) :
m_eCmd( eCmd ), m_xListener( pListener ) {}
- AsyncExecuteCmd const m_eCmd;
+ AsyncExecuteCmd m_eCmd;
rtl::Reference<SfxClipboardChangeListener> m_xListener;
};
More information about the Libreoffice-commits
mailing list