[Libreoffice-commits] core.git: 2 commits - include/sax reportdesign/inc reportdesign/source sal/cppunittester sal/osl sal/qa sal/rtl sal/textenc sax/source scripting/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 08:22:58 UTC 2020
include/sax/fastattribs.hxx | 8 -
reportdesign/inc/RptObject.hxx | 8 -
reportdesign/inc/UndoActions.hxx | 8 -
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/core/inc/ReportControlModel.hxx | 2
reportdesign/source/core/inc/Shape.hxx | 2
reportdesign/source/core/sdr/UndoEnv.cxx | 2
reportdesign/source/filter/xml/xmlFunction.hxx | 2
reportdesign/source/filter/xml/xmlStyleImport.hxx | 2
reportdesign/source/ui/inc/ColorListener.hxx | 4
reportdesign/source/ui/inc/ColumnInfo.hxx | 4
reportdesign/source/ui/inc/DesignView.hxx | 4
reportdesign/source/ui/inc/FunctionHelper.hxx | 4
reportdesign/source/ui/inc/GroupsSorting.hxx | 2
reportdesign/source/ui/inc/RptUndo.hxx | 6 -
reportdesign/source/ui/inc/ViewsWindow.hxx | 4
reportdesign/source/ui/inc/dlgedclip.hxx | 2
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 4
reportdesign/source/ui/report/ViewsWindow.cxx | 2
sal/cppunittester/cppunittester.cxx | 2
sal/osl/unx/backtraceapi.cxx | 2
sal/osl/unx/file.cxx | 4
sal/osl/unx/file_impl.hxx | 4
sal/osl/unx/file_path_helper.cxx | 2
sal/osl/unx/file_url.cxx | 4
sal/osl/unx/pipe.cxx | 2
sal/osl/unx/signal.cxx | 2
sal/osl/unx/socket.cxx | 4
sal/qa/osl/condition/osl_Condition.cxx | 2
sal/qa/rtl/strings/test_oustring_convert.cxx | 8 -
sal/qa/rtl/strings/test_oustring_endswith.cxx | 6 -
sal/rtl/bootstrap.cxx | 4
sal/textenc/convertbig5hkscs.hxx | 2
sal/textenc/convertgb18030.hxx | 16 +-
sal/textenc/convertsimple.cxx | 8 -
sal/textenc/convertsinglebytetobmpunicode.hxx | 10 -
sal/textenc/tenchelp.hxx | 94 ++++++++--------
sal/textenc/tencinfo.cxx | 2
sax/source/expatwrap/sax_expat.cxx | 2
sax/source/fastparser/fastparser.cxx | 6 -
sax/source/tools/fastserializer.hxx | 2
scripting/source/basprov/baslibnode.hxx | 8 -
scripting/source/basprov/basmethnode.hxx | 4
scripting/source/basprov/basmodnode.hxx | 4
scripting/source/basprov/basscript.hxx | 2
scripting/source/dlgprov/dlgevtatt.cxx | 4
scripting/source/dlgprov/dlgevtatt.hxx | 4
scripting/source/provider/ProviderCache.hxx | 2
scripting/source/stringresource/stringresource.cxx | 2
scripting/source/vbaevents/eventhelper.cxx | 8 -
51 files changed, 150 insertions(+), 150 deletions(-)
New commits:
commit 32097c33d7de74ed89a01e88d69b6ff0d1482512
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Mar 12 09:34:04 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 09:22:31 2020 +0100
Revert "loplugin:constfields in scripting"
This reverts commit 383a4f883d4a2932167695c761611b998f773f0e.
Now that we know that making fields has negative side effects
like disabling assignment operator generation.
Change-Id: I9fc04024b12a977481d010950244cff05e18bd74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90368
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index c44ce3a536b5..1124974644cc 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -43,12 +43,12 @@ namespace basprov
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_sScriptingContext;
- BasicManager* const m_pBasicManager;
+ OUString m_sScriptingContext;
+ BasicManager* m_pBasicManager;
css::uno::Reference< css::script::XLibraryContainer > m_xLibContainer;
css::uno::Reference< css::container::XNameContainer > m_xLibrary;
- OUString const m_sLibName;
- bool const m_bIsAppScript;
+ OUString m_sLibName;
+ bool m_bIsAppScript;
public:
BasicLibraryNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 95741eb11798..ce112afbf148 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -52,9 +52,9 @@ namespace basprov
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_sScriptingContext;
+ OUString m_sScriptingContext;
SbMethod* m_pMethod;
- bool const m_bIsAppScript;
+ bool m_bIsAppScript;
// properties
OUString m_sURI;
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 6ef63b58ba84..fa2010a5fc46 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -42,9 +42,9 @@ namespace basprov
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_sScriptingContext;
+ OUString m_sScriptingContext;
SbModule* m_pModule;
- bool const m_bIsAppScript;
+ bool m_bIsAppScript;
public:
BasicModuleNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 820a172d99de..ed86b9dcb378 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -50,7 +50,7 @@ namespace basprov
{
private:
SbMethodRef m_xMethod;
- OUString const m_funcName;
+ OUString m_funcName;
BasicManager* m_documentBasicManager;
css::uno::Reference< css::document::XScriptInvocationContext >
m_xDocumentScriptContext;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index c47465610503..1269395b01f5 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -82,7 +82,7 @@ namespace dlgprov
Reference< awt::XControl > m_xControl;
Reference< XInterface > m_xHandler;
Reference< beans::XIntrospectionAccess > m_xIntrospectionAccess;
- bool const m_bDialogProviderMode;
+ bool m_bDialogProviderMode;
virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet ) override;
@@ -100,7 +100,7 @@ namespace dlgprov
{
protected:
OUString msDialogCodeName;
- OUString const msDialogLibName;
+ OUString msDialogLibName;
Reference< script::XScriptListener > mxListener;
virtual void firing_impl( const script::ScriptEvent& aScriptEvent, uno::Any* pRet ) override;
public:
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 2adcd03baa7a..239cb653040a 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -82,8 +82,8 @@ namespace dlgprov
{
private:
css::uno::Reference< css::script::XScriptListener > m_xScriptListener;
- OUString const m_sScriptType;
- OUString const m_sScriptCode;
+ OUString m_sScriptType;
+ OUString m_sScriptCode;
void firing_impl( const css::script::AllEventObject& Event, css::uno::Any* pRet );
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 3ad9bc5fab1a..9234d5bd6e6b 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -73,7 +73,7 @@ private:
css::uno::Sequence< OUString > m_sBlackList;
ProviderDetails_hash m_hProviderDetailsCache;
osl::Mutex m_mutex;
- css::uno::Sequence< css::uno::Any > const m_Sctx;
+ css::uno::Sequence< css::uno::Any > m_Sctx;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::lang::XMultiComponentFactory > m_xMgr;
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 25ea60dbb4cc..d059a087b274 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1293,7 +1293,7 @@ namespace {
class BinaryInput
{
- Sequence< sal_Int8 > const m_aData;
+ Sequence< sal_Int8 > m_aData;
Reference< XComponentContext > m_xContext;
const sal_Int8* m_pData;
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 0bec24e2a047..e3dc8ab7b670 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -184,8 +184,8 @@ namespace {
struct TranslatePropMap
{
- OUString const sEventInfo; //OO event name
- TranslateInfo const aTransInfo;
+ OUString sEventInfo; //OO event name
+ TranslateInfo aTransInfo;
};
}
@@ -200,7 +200,7 @@ namespace {
struct TypeList
{
uno::Type const * pTypeList;
- int const nListLength;
+ int nListLength;
};
}
@@ -309,7 +309,7 @@ public:
private:
Reference< XComponentContext > m_xCtx;
Reference< XInterface > m_xControl;
- bool const m_bDispose;
+ bool m_bDispose;
};
}
commit b480819dc4133f587eb960143128a7d85a44da9a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Mar 12 08:55:15 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 09:22:20 2020 +0100
Revert "loplugin:constfields in reportdesign,sal,sax"
This reverts commit d4d37662b090cb237585156a47cd8e1f1cbe2656.
Now that we know that making fields has negative side effects
like disabling assignment operator generation.
Change-Id: Idef4937b89a83d2efbfaf0ab87d059a0143c0164
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90364
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 223bd868192d..839f4c2b8cfd 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -36,9 +36,9 @@ namespace sax_fastparser
struct UnknownAttribute
{
- OUString const maNamespaceURL;
- OString const maName;
- OString const maValue;
+ OUString maNamespaceURL;
+ OString maName;
+ OString maValue;
UnknownAttribute( const OUString& rNamespaceURL, const OString& rName, const OString& value );
UnknownAttribute( const OString& rName, const OString& value );
@@ -209,7 +209,7 @@ private:
std::vector< sal_Int32 > maAttributeTokens;
UnknownAttributeList maUnknownAttributes;
css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler;
- FastTokenHandlerBase * const mpTokenHandler;
+ FastTokenHandlerBase *mpTokenHandler;
};
}
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 1b3092155ca5..ee884efd3f77 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -48,7 +48,7 @@ typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap;
class REPORTDESIGN_DLLPUBLIC DlgEdHint final : public SfxHint
{
private:
- DlgEdHintKind const eHintKind;
+ DlgEdHintKind eHintKind;
DlgEdHint(DlgEdHint const &) = delete;
void operator =(DlgEdHint const &) = delete;
@@ -70,7 +70,7 @@ protected:
mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener;
mutable css::uno::Reference< css::report::XReportComponent> m_xReportComponent;
css::uno::Reference< css::uno::XInterface > m_xKeepShapeAlive;
- OUString const m_sComponentName;
+ OUString m_sComponentName;
bool m_bIsListening;
OObjectBase(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
@@ -217,7 +217,7 @@ private:
void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel);
virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
- sal_uInt16 const m_nType;
+ sal_uInt16 m_nType;
bool m_bOnlyOnce;
};
@@ -230,7 +230,7 @@ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase
friend class OObjectBase;
friend class DlgEdFactory;
- sal_uInt16 const m_nObjectType;
+ sal_uInt16 m_nObjectType;
// tdf#118730 remember if this object was created interactively (due to ::EndCreate being called)
bool m_bSetDefaultLabel;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 78909ac7cda8..ad7277d5b652 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -170,7 +170,7 @@ namespace rptui
m_xOwnElement; // object owned by the action
css::uno::Reference< css::container::XIndexContainer >
m_xContainer;
- Action const m_eAction;
+ Action m_eAction;
public:
OUndoContainerAction(SdrModel& rMod
@@ -231,9 +231,9 @@ namespace rptui
class ORptUndoPropertyAction: public OCommentUndoAction
{
css::uno::Reference< css::beans::XPropertySet> m_xObj;
- OUString const m_aPropertyName;
- css::uno::Any const m_aNewValue;
- css::uno::Any const m_aOldValue;
+ OUString m_aPropertyName;
+ css::uno::Any m_aNewValue;
+ css::uno::Any m_aOldValue;
/** sets either the old value or the new value again at the property set.
*
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index f711547b3899..900fbd88c18d 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2235,7 +2235,7 @@ class OStylesHelper:
typedef ::std::map< OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements;
TStyleElements m_aElements;
::std::vector<TStyleElements::iterator> m_aElementsPos;
- uno::Type const m_aType;
+ uno::Type m_aType;
protected:
virtual ~OStylesHelper() override {}
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx
index 53dcee115d44..935e50647101 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -77,7 +77,7 @@ namespace reportdesign
::comphelper::OInterfaceContainerHelper2 aContainerListeners;
OReportComponentProperties aComponent;
OFormatProperties aFormatProperties;
- css::container::XContainer* const m_pOwner;
+ css::container::XContainer* m_pOwner;
::std::vector< css::uno::Reference< css::report::XFormatCondition> >
m_aFormatConditions;
osl::Mutex& m_rMutex;
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index 2fd6d6c32041..b7c9e6d882f9 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -50,7 +50,7 @@ namespace reportdesign
sal_Int32 m_nZOrder;
bool m_bOpaque;
- OUString const m_sServiceName;
+ OUString m_sServiceName;
OUString m_CustomShapeEngine;
OUString m_CustomShapeData;
css::uno::Sequence< css::beans::PropertyValue > m_CustomShapeGeometry;
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 645797498c04..21e2ad41edf9 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -63,7 +63,7 @@ namespace {
struct PropertyInfo
{
- bool const bIsReadonlyOrTransient;
+ bool bIsReadonlyOrTransient;
explicit PropertyInfo( const bool i_bIsTransientOrReadOnly )
:bIsReadonlyOrTransient( i_bIsTransientOrReadOnly )
diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx
index c58ed9738aab..bf596ed7245c 100644
--- a/reportdesign/source/filter/xml/xmlFunction.hxx
+++ b/reportdesign/source/filter/xml/xmlFunction.hxx
@@ -32,7 +32,7 @@ namespace rptxml
{
css::uno::Reference< css::report::XFunctions > m_xFunctions;
css::uno::Reference< css::report::XFunction > m_xFunction;
- bool const m_bAddToReport;
+ bool m_bAddToReport;
ORptFilter& GetOwnImport();
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 2a120bfcfa9f..4262d91d6dc1 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -74,7 +74,7 @@ namespace rptxml
{
ORptFilter& m_rImport;
sal_Int32 m_nNumberFormatIndex;
- bool const bAutoStyles : 1;
+ bool bAutoStyles : 1;
//mutable rtl::Reference < SvXMLImportPropertyMapper > m_xControlImpPropMapper;
mutable rtl::Reference < SvXMLImportPropertyMapper > m_xCellImpPropMapper;
diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 2958437fe72b..0f8a89acad9e 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -32,9 +32,9 @@ namespace rptui
void operator =(const OColorListener&) = delete;
protected:
Link<OColorListener&,void> m_aCollapsedLink;
- svtools::ColorConfig const m_aColorConfig;
+ svtools::ColorConfig m_aColorConfig;
svtools::ExtendedColorConfig m_aExtendedColorConfig;
- OUString const m_sColorEntry;
+ OUString m_sColorEntry;
Color m_nColor;
Color m_nTextBoundaries;
bool m_bCollapsed;
diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx
index 6a9a2e360960..65062f9dc136 100644
--- a/reportdesign/source/ui/inc/ColumnInfo.hxx
+++ b/reportdesign/source/ui/inc/ColumnInfo.hxx
@@ -25,8 +25,8 @@ namespace rptui
{
struct ColumnInfo
{
- OUString const sColumnName;
- OUString const sLabel;
+ OUString sColumnName;
+ OUString sLabel;
ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel)
: sColumnName(i_sColumnName)
, sLabel(i_sLabel)
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 7b904b22db11..a8c979879711 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -69,8 +69,8 @@ namespace rptui
Idle m_aMarkIdle;
DlgEdMode m_eMode;
sal_uInt16 m_eActObj;
- Size const m_aGridSizeCoarse;
- Size const m_aGridSizeFine;
+ Size m_aGridSizeCoarse;
+ Size m_aGridSizeFine;
bool m_bDeleted;
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index 4d94f6f40bd9..df18ed34cb36 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -83,8 +83,8 @@ class FunctionCategory : public formula::IFunctionCategory
{
mutable ::std::vector< std::shared_ptr< FunctionDescription > > m_aFunctions;
css::uno::Reference< css::report::meta::XFunctionCategory> m_xCategory;
- sal_uInt32 const m_nFunctionCount;
- sal_uInt32 const m_nNumber;
+ sal_uInt32 m_nFunctionCount;
+ sal_uInt32 m_nNumber;
const FunctionManager* m_pFunctionManager;
public:
FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPos,const css::uno::Reference< css::report::meta::XFunctionCategory>& _xCategory);
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 17a6e517e824..405c5c0bc2a3 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -58,7 +58,7 @@ class OGroupsSortingDialog : public weld::GenericDialogController
::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener;
css::uno::Reference< css::report::XGroups> m_xGroups;
css::uno::Reference< css::container::XNameAccess > m_xColumns;
- bool const m_bReadOnly;
+ bool m_bReadOnly;
std::unique_ptr<weld::Toolbar> m_xToolBox;
std::unique_ptr<weld::Widget> m_xProperties;
diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx
index cf2bd6e50196..9c125121b9e1 100644
--- a/reportdesign/source/ui/inc/RptUndo.hxx
+++ b/reportdesign/source/ui/inc/RptUndo.hxx
@@ -42,8 +42,8 @@ namespace rptui
m_aControls;
::std::vector< ::std::pair< OUString ,css::uno::Any> >
m_aValues;
- Action const m_eAction;
- sal_uInt16 const m_nSlot;
+ Action m_eAction;
+ sal_uInt16 m_nSlot;
bool m_bInserted;
virtual void implReInsert( ) = 0;
@@ -114,7 +114,7 @@ namespace rptui
{
css::uno::Reference< css::report::XGroup> m_xGroup; ///<! the group for the undo redo action
css::uno::Reference< css::report::XReportDefinition > m_xReportDefinition; ///<! the parent report definition
- Action const m_eAction; ///<! the current action
+ Action m_eAction; ///<! the current action
sal_Int32 m_nLastPosition; ///<! the last position of the group
void implReInsert( );
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index d668df78ab4f..fb7674138066 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -47,8 +47,8 @@ namespace rptui
struct RectangleLess
{
enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL };
- CompareMode const m_eCompareMode;
- Point const m_aRefPoint;
+ CompareMode m_eCompareMode;
+ Point m_aRefPoint;
RectangleLess(CompareMode _eCompareMode,const Point& _rRefPoint ) : m_eCompareMode(_eCompareMode),m_aRefPoint(_rRefPoint){}
bool operator() (const tools::Rectangle& lhs, const tools::Rectangle& rhs) const
{
diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx
index d4974ed7c40a..54a0baab3a3a 100644
--- a/reportdesign/source/ui/inc/dlgedclip.hxx
+++ b/reportdesign/source/ui/inc/dlgedclip.hxx
@@ -72,7 +72,7 @@ protected:
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
private:
- TSectionElements const m_aCopyElements;
+ TSectionElements m_aCopyElements;
};
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDCLIP_HXX
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index f659099e2b66..f03277fdd555 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -179,7 +179,7 @@ namespace rptui
{
const char* programmaticName;
const char* uiNameResId;
- OString const helpId;
+ OString helpId;
} aCategories[] = {
{ "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL },
{ "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA },
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 1fe36c88effb..2361f0d8cb1d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -546,8 +546,8 @@ namespace
lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::makeAny( pFontItem->GetEnumValue() ) );
}
struct Items {
- sal_uInt16 const nWhich;
- OUString const sPropertyName;
+ sal_uInt16 nWhich;
+ OUString sPropertyName;
};
const Items pItems[] = { {ITEMID_LANGUAGE,OUString(PROPERTY_CHARLOCALE)}
,{ITEMID_LANGUAGE_ASIAN,OUString(PROPERTY_CHARLOCALEASIAN)}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 38c7bd2ed83c..d68cba1a27b2 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -915,7 +915,7 @@ namespace
class ApplySectionViewAction
{
private:
- SectionViewAction const m_eAction;
+ SectionViewAction m_eAction;
public:
explicit ApplySectionViewAction()
diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index 3e2cdd512e68..a760ecf8ff41 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -196,7 +196,7 @@ struct test_name_compare
return nEndPos == maName.size();
}
- std::string const maName;
+ std::string maName;
};
bool addRecursiveTests(const std::vector<std::string>& test_names, CppUnit::Test* pTest, CppUnit::TestRunner& rRunner)
diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx
index 93ca94da5ff2..d11128353d47 100644
--- a/sal/osl/unx/backtraceapi.cxx
+++ b/sal/osl/unx/backtraceapi.cxx
@@ -30,7 +30,7 @@ struct FreeGuard {
~FreeGuard() { std::free(buffer); }
- char ** const buffer;
+ char ** buffer;
};
}
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index aa293f914d74..d8396f6279b6 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -89,7 +89,7 @@ struct FileHandle_Impl
KIND_FD = 1,
KIND_MEM = 2
};
- int const m_kind;
+ int m_kind;
/** State
*/
State m_state;
@@ -161,7 +161,7 @@ struct FileHandle_Impl
class Guard
{
- pthread_mutex_t * const m_mutex;
+ pthread_mutex_t *m_mutex;
public:
explicit Guard(pthread_mutex_t *pMutex);
diff --git a/sal/osl/unx/file_impl.hxx b/sal/osl/unx/file_impl.hxx
index eadb1257a068..ed8a93ea5c9d 100644
--- a/sal/osl/unx/file_impl.hxx
+++ b/sal/osl/unx/file_impl.hxx
@@ -28,8 +28,8 @@ struct DirectoryItem_Impl
{
sal_Int32 m_RefCount;
- rtl_String * const m_strFilePath; /* holds native file name */
- unsigned char const m_DType;
+ rtl_String * m_strFilePath; /* holds native file name */
+ unsigned char m_DType;
explicit DirectoryItem_Impl(
rtl_String * strFilePath, unsigned char DType = 0);
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 163deb0c2493..a0ef13f9503d 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -220,7 +220,7 @@ private:
}
private:
- OUString const m_path_list;
+ OUString m_path_list;
const sal_Unicode* m_end;
const sal_Unicode m_separator;
const sal_Unicode* m_path_segment_begin;
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 9dade1c3f09a..5e99d5306cdc 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -110,7 +110,7 @@ namespace {
class UnicodeToTextConverter_Impl
{
- rtl_UnicodeToTextConverter const m_converter;
+ rtl_UnicodeToTextConverter m_converter;
UnicodeToTextConverter_Impl()
: m_converter (rtl_createUnicodeToTextConverter (osl_getThreadTextEncoding()))
@@ -865,7 +865,7 @@ namespace
{
class TextToUnicodeConverter_Impl
{
- rtl_TextToUnicodeConverter const m_converter;
+ rtl_TextToUnicodeConverter m_converter;
TextToUnicodeConverter_Impl()
: m_converter (rtl_createTextToUnicodeConverter (osl_getThreadTextEncoding()))
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 153db04d99fa..ec9fe4b9d5ca 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -43,7 +43,7 @@ static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Option
static struct
{
- int const errcode;
+ int errcode;
oslPipeError error;
} const PipeError[]= {
{ 0, osl_Pipe_E_None }, /* no error */
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 55d09b4f6249..00c3ca3f522e 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -77,7 +77,7 @@ extern "C" using Handler1 = void (*)(int);
extern "C" using Handler2 = void (*)(int, siginfo_t *, void *);
struct SignalAction
{
- int const Signal;
+ int Signal;
int Action;
Handler1 Handler;
bool siginfo; // Handler's type is Handler2
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index d3b192f4e1f1..239a8dcb248d 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -207,8 +207,8 @@ static const sal_uInt32 SocketDirection[]= {
static const struct
{
- int const errcode;
- oslSocketError const error;
+ int errcode;
+ oslSocketError error;
} SocketError[]= {
{ 0, osl_Socket_E_None }, /* no error */
{ ENOTSOCK, osl_Socket_E_NotSocket }, /* Socket operation on non-socket */
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 0e6a56f37c3b..05b7fc661f6a 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -41,7 +41,7 @@ public:
protected:
::osl::Condition& m_MyCon;
- ConditionType const m_MyType;
+ ConditionType m_MyType;
void SAL_CALL run() override
{
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index cfae69f0012a..bfd1a2aac784 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -45,10 +45,10 @@ namespace {
struct TestConvertToString
{
- sal_Unicode const aSource[100];
- sal_Int32 const nLength;
- rtl_TextEncoding const nEncoding;
- sal_uInt32 const nFlags;
+ sal_Unicode aSource[100];
+ sal_Int32 nLength;
+ rtl_TextEncoding nEncoding;
+ sal_uInt32 nFlags;
char const * pStrict;
char const * pRelaxed;
};
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 7649de312f81..bf01577e28be 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -71,10 +71,10 @@ void test::oustring::EndsWith::endsWith()
{
struct Data {
char const * str1;
- sal_Int32 const str1Len;
+ sal_Int32 str1Len;
char const * str2;
- sal_Int32 const str2Len;
- bool const endsWith;
+ sal_Int32 str2Len;
+ bool endsWith;
};
Data const data[] = {
{ RTL_CONSTASCII_STRINGPARAM(""), RTL_CONSTASCII_STRINGPARAM(""),
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index dae54a88df66..97cbd1f79e0a 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -88,7 +88,7 @@ enum LookupMode {
struct ExpandRequestLink {
ExpandRequestLink const * next;
Bootstrap_Impl const * file;
- OUString const key;
+ OUString key;
};
OUString expandMacros(
@@ -289,7 +289,7 @@ struct Bootstrap_Impl
Bootstrap_Impl * _base_ini;
NameValueVector _nameValueVector;
- OUString const _iniName;
+ OUString _iniName;
explicit Bootstrap_Impl (OUString const & rIniName);
~Bootstrap_Impl();
diff --git a/sal/textenc/convertbig5hkscs.hxx b/sal/textenc/convertbig5hkscs.hxx
index 1a2d1d689e47..089ac5845c95 100644
--- a/sal/textenc/convertbig5hkscs.hxx
+++ b/sal/textenc/convertbig5hkscs.hxx
@@ -34,7 +34,7 @@ struct ImplBig5HkscsConverterData
sal_Int32 const * m_pUnicodeToBig5Hkscs2001PlaneOffsets;
ImplUniToDBCSHighTab const * m_pUnicodeToBig5Data;
ImplDBCSEUDCData const * m_pEudcData;
- int const m_nEudcCount;
+ int m_nEudcCount;
};
void * ImplCreateBig5HkscsToUnicodeContext();
diff --git a/sal/textenc/convertgb18030.hxx b/sal/textenc/convertgb18030.hxx
index d3b3621dab24..680384794eb4 100644
--- a/sal/textenc/convertgb18030.hxx
+++ b/sal/textenc/convertgb18030.hxx
@@ -26,18 +26,18 @@
struct ImplGb180302000ToUnicodeRange
{
- sal_Int32 const m_nNonRangeDataIndex;
- sal_uInt32 const m_nFirstLinear;
- sal_uInt32 const m_nPastLinear;
- sal_Unicode const m_nFirstUnicode;
+ sal_Int32 m_nNonRangeDataIndex;
+ sal_uInt32 m_nFirstLinear;
+ sal_uInt32 m_nPastLinear;
+ sal_Unicode m_nFirstUnicode;
};
struct ImplUnicodeToGb180302000Range
{
- sal_Int32 const m_nNonRangeDataIndex;
- sal_Unicode const m_nFirstUnicode;
- sal_Unicode const m_nLastUnicode;
- sal_uInt32 const m_nFirstLinear;
+ sal_Int32 m_nNonRangeDataIndex;
+ sal_Unicode m_nFirstUnicode;
+ sal_Unicode m_nLastUnicode;
+ sal_uInt32 m_nFirstLinear;
};
struct ImplGb18030ConverterData
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
index 9e4950edbac1..ab4e136ef711 100644
--- a/sal/textenc/convertsimple.cxx
+++ b/sal/textenc/convertsimple.cxx
@@ -22,8 +22,8 @@ namespace {
struct ImplReplaceCharData
{
- sal_uInt16 const mnUniChar;
- sal_uInt16 const mnReplaceChar;
+ sal_uInt16 mnUniChar;
+ sal_uInt16 mnReplaceChar;
};
static ImplReplaceCharData const aImplRepCharTab[] =
@@ -353,8 +353,8 @@ sal_uInt16 ImplGetReplaceChar( sal_Unicode c )
struct ImplReplaceCharStrData
{
- sal_uInt16 const mnUniChar;
- sal_uInt16 const maReplaceChars[IMPL_MAX_REPLACECHAR];
+ sal_uInt16 mnUniChar;
+ sal_uInt16 maReplaceChars[IMPL_MAX_REPLACECHAR];
};
static ImplReplaceCharStrData const aImplRepCharStrTab[] =
diff --git a/sal/textenc/convertsinglebytetobmpunicode.hxx b/sal/textenc/convertsinglebytetobmpunicode.hxx
index aef3f627192c..7673228a4615 100644
--- a/sal/textenc/convertsinglebytetobmpunicode.hxx
+++ b/sal/textenc/convertsinglebytetobmpunicode.hxx
@@ -40,7 +40,7 @@ struct BmpUnicodeToSingleByteRange {
/**
The start of the range of BMP Unicode code points.
*/
- sal_Unicode const unicode;
+ sal_Unicode unicode;
/**
The extend of the range of BMP Unicode code points.
@@ -49,7 +49,7 @@ struct BmpUnicodeToSingleByteRange {
inclusive. It is an error if <code>unicode + range</code> is greater
than <code>0xFFFF</code>.</p>
*/
- sal_uInt8 const range;
+ sal_uInt8 range;
/**
The start of the corresponding range of individual bytes.
@@ -57,7 +57,7 @@ struct BmpUnicodeToSingleByteRange {
<p>It is an error if <code>byte + range</code> is greater than
<code>0xFF</code>.</p>
*/
- sal_uInt8 const byte;
+ sal_uInt8 byte;
};
/**
@@ -77,12 +77,12 @@ struct BmpUnicodeToSingleByteConverterData {
<p>Illegal units from the single-byte character set are mapped to
<code>0xFFFF</code>.</p>
*/
- sal_Unicode const byteToUnicode[256];
+ sal_Unicode byteToUnicode[256];
/**
The number of Unicode-to-byte conversion ranges.
*/
- std::size_t const unicodeToByteEntries;
+ std::size_t unicodeToByteEntries;
/**
The array of Unicode-to-byte conversion ranges, sorted by increasing
diff --git a/sal/textenc/tenchelp.hxx b/sal/textenc/tenchelp.hxx
index 655641ab606c..901156730da5 100644
--- a/sal/textenc/tenchelp.hxx
+++ b/sal/textenc/tenchelp.hxx
@@ -73,14 +73,14 @@ typedef void (* ImplResetUnicodeContextProc)(void * pContext);
struct ImplTextConverter
{
void const * mpConvertData;
- ImplConvertToUnicodeProc const mpConvertTextToUnicodeProc;
- ImplConvertToTextProc const mpConvertUnicodeToTextProc;
- ImplCreateTextContextProc const mpCreateTextToUnicodeContext;
- ImplDestroyTextContextProc const mpDestroyTextToUnicodeContext;
- ImplResetTextContextProc const mpResetTextToUnicodeContext;
- ImplCreateUnicodeContextProc const mpCreateUnicodeToTextContext;
- ImplDestroyUnicodeContextProc const mpDestroyUnicodeToTextContext;
- ImplResetUnicodeContextProc const mpResetUnicodeToTextContext;
+ ImplConvertToUnicodeProc mpConvertTextToUnicodeProc;
+ ImplConvertToTextProc mpConvertUnicodeToTextProc;
+ ImplCreateTextContextProc mpCreateTextToUnicodeContext;
+ ImplDestroyTextContextProc mpDestroyTextToUnicodeContext;
+ ImplResetTextContextProc mpResetTextToUnicodeContext;
+ ImplCreateUnicodeContextProc mpCreateUnicodeToTextContext;
+ ImplDestroyUnicodeContextProc mpDestroyUnicodeToTextContext;
+ ImplResetUnicodeContextProc mpResetUnicodeToTextContext;
};
/* ----------------------------- */
@@ -90,13 +90,13 @@ struct ImplTextConverter
struct SAL_DLLPUBLIC_RTTI ImplTextEncodingData
{
ImplTextConverter maConverter;
- sal_uInt8 const mnMinCharSize;
- sal_uInt8 const mnMaxCharSize;
- sal_uInt8 const mnAveCharSize;
- sal_uInt8 const mnBestWindowsCharset;
+ sal_uInt8 mnMinCharSize;
+ sal_uInt8 mnMaxCharSize;
+ sal_uInt8 mnAveCharSize;
+ sal_uInt8 mnBestWindowsCharset;
char const * mpBestUnixCharset;
char const * mpBestMimeCharset;
- sal_uInt32 const mnInfoFlags;
+ sal_uInt32 mnInfoFlags;
};
/* ----------------------------------- */
@@ -105,9 +105,9 @@ struct SAL_DLLPUBLIC_RTTI ImplTextEncodingData
struct ImplUniCharTabData
{
- sal_uInt16 const mnUniChar;
- unsigned char const mnChar;
- unsigned char const mnChar2;
+ sal_uInt16 mnUniChar;
+ unsigned char mnChar;
+ unsigned char mnChar2;
// to cater for mappings like MS1258 with 1--2 bytes per Unicode char,
// 0 if unused
};
@@ -116,18 +116,18 @@ struct ImplByteConvertData
{
const sal_uInt16* mpToUniTab1;
const sal_uInt16* mpToUniTab2;
- unsigned char const mnToUniStart1;
- unsigned char const mnToUniEnd1;
- unsigned char const mnToUniStart2;
- unsigned char const mnToUniEnd2;
+ unsigned char mnToUniStart1;
+ unsigned char mnToUniEnd1;
+ unsigned char mnToUniStart2;
+ unsigned char mnToUniEnd2;
const unsigned char* mpToCharTab1;
const unsigned char* mpToCharTab2;
const ImplUniCharTabData* mpToCharExTab;
- sal_uInt16 const mnToCharStart1;
- sal_uInt16 const mnToCharEnd1;
- sal_uInt16 const mnToCharStart2;
- sal_uInt16 const mnToCharEnd2;
- sal_uInt16 const mnToCharExCount;
+ sal_uInt16 mnToCharStart1;
+ sal_uInt16 mnToCharEnd1;
+ sal_uInt16 mnToCharStart2;
+ sal_uInt16 mnToCharEnd2;
+ sal_uInt16 mnToCharExCount;
};
/* ----------------------------------- */
@@ -136,32 +136,32 @@ struct ImplByteConvertData
struct ImplDBCSEUDCData
{
- unsigned char const mnLeadStart;
- unsigned char const mnLeadEnd;
- unsigned char const mnTrail1Start;
- unsigned char const mnTrail1End;
- unsigned char const mnTrail2Start;
- unsigned char const mnTrail2End;
- unsigned char const mnTrail3Start;
- unsigned char const mnTrail3End;
- unsigned char const mnTrailCount;
- sal_uInt16 const mnTrailRangeCount;
- sal_uInt16 const mnUniStart;
- sal_uInt16 const mnUniEnd;
+ unsigned char mnLeadStart;
+ unsigned char mnLeadEnd;
+ unsigned char mnTrail1Start;
+ unsigned char mnTrail1End;
+ unsigned char mnTrail2Start;
+ unsigned char mnTrail2End;
+ unsigned char mnTrail3Start;
+ unsigned char mnTrail3End;
+ unsigned char mnTrailCount;
+ sal_uInt16 mnTrailRangeCount;
+ sal_uInt16 mnUniStart;
+ sal_uInt16 mnUniEnd;
};
struct ImplDBCSToUniLeadTab
{
- sal_uInt16 const mnUniChar;
- sal_uInt8 const mnTrailStart;
- sal_uInt8 const mnTrailEnd;
+ sal_uInt16 mnUniChar;
+ sal_uInt8 mnTrailStart;
+ sal_uInt8 mnTrailEnd;
const sal_uInt16* mpToUniTrailTab;
};
struct ImplUniToDBCSHighTab
{
- sal_uInt8 const mnLowStart;
- sal_uInt8 const mnLowEnd;
+ sal_uInt8 mnLowStart;
+ sal_uInt8 mnLowEnd;
const sal_uInt16* mpToUniTrailTab;
};
@@ -169,12 +169,12 @@ struct ImplDBCSConvertData
{
const ImplDBCSToUniLeadTab* mpToUniLeadTab;
const ImplUniToDBCSHighTab* mpToDBCSHighTab;
- unsigned char const mnLeadStart;
- unsigned char const mnLeadEnd;
- unsigned char const mnTrailStart;
- unsigned char const mnTrailEnd;
+ unsigned char mnLeadStart;
+ unsigned char mnLeadEnd;
+ unsigned char mnTrailStart;
+ unsigned char mnTrailEnd;
const ImplDBCSEUDCData* mpEUDCTab;
- sal_uInt16 const mnEUDCCount;
+ sal_uInt16 mnEUDCCount;
};
/* ---------------------------------- */
diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx
index c2ee6850f515..61439b489a7c 100644
--- a/sal/textenc/tencinfo.cxx
+++ b/sal/textenc/tencinfo.cxx
@@ -107,7 +107,7 @@ namespace {
struct ImplStrCharsetDef
{
const char* mpCharsetStr;
- rtl_TextEncoding const meTextEncoding;
+ rtl_TextEncoding meTextEncoding;
};
struct ImplStrFirstPartCharsetDef
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 8218436b4569..3172fbe89503 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -387,7 +387,7 @@ class ParserCleanup
{
private:
SaxExpatParser_Impl& m_rParser;
- XML_Parser const m_xmlParser;
+ XML_Parser m_xmlParser;
public:
ParserCleanup(SaxExpatParser_Impl& rParser, XML_Parser xmlParser)
: m_rParser(rParser)
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index f70995763c4c..81591e4a3649 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -92,8 +92,8 @@ struct Event
struct NameWithToken
{
- OUString const msName;
- sal_Int32 const mnToken;
+ OUString msName;
+ sal_Int32 mnToken;
NameWithToken(const OUString& sName, sal_Int32 nToken) :
msName(sName), mnToken(nToken) {}
@@ -102,7 +102,7 @@ struct NameWithToken
struct SaxContext
{
Reference< XFastContextHandler > mxContext;
- sal_Int32 const mnElementToken;
+ sal_Int32 mnElementToken;
OUString maNamespace;
OUString maElementName;
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index ba956610f533..0b7ad72d8c0c 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -35,7 +35,7 @@ namespace sax_fastparser {
struct TokenValue
{
- sal_Int32 const nToken;
+ sal_Int32 nToken;
const char *pValue;
TokenValue(sal_Int32 _nToken, const char *_pValue) : nToken(_nToken), pValue(_pValue) {}
};
More information about the Libreoffice-commits
mailing list