diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/brwbox.hxx | 14 | ||||
-rw-r--r-- | include/svtools/ctrlbox.hxx | 10 | ||||
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/editsyntaxhighlighter.hxx | 4 | ||||
-rw-r--r-- | include/svtools/ehdl.hxx | 12 | ||||
-rw-r--r-- | include/svtools/embedtransfer.hxx | 2 | ||||
-rw-r--r-- | include/svtools/filechangedchecker.hxx | 4 | ||||
-rw-r--r-- | include/svtools/framestatuslistener.hxx | 2 | ||||
-rw-r--r-- | include/svtools/htmlout.hxx | 2 | ||||
-rw-r--r-- | include/svtools/parhtml.hxx | 12 | ||||
-rw-r--r-- | include/svtools/place.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ruler.hxx | 14 | ||||
-rw-r--r-- | include/svtools/statusbarcontroller.hxx | 2 | ||||
-rw-r--r-- | include/svtools/stringtransfer.hxx | 2 | ||||
-rw-r--r-- | include/svtools/toolboxcontroller.hxx | 2 | ||||
-rw-r--r-- | include/svtools/unoevent.hxx | 2 | ||||
-rw-r--r-- | include/vcl/imap.hxx | 2 | ||||
-rw-r--r-- | include/vcl/ivctrl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/treelistbox.hxx | 2 |
19 files changed, 47 insertions, 47 deletions
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index f7c4919a1c3f..49486aae972a 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -120,10 +120,10 @@ namespace o3tl class BrowseEvent { VclPtr<vcl::Window> pWin; - long const nRow; - tools::Rectangle const aRect; - sal_uInt16 const nCol; - sal_uInt16 const nColId; + long nRow; + tools::Rectangle aRect; + sal_uInt16 nCol; + sal_uInt16 nColId; public: BrowseEvent( vcl::Window* pWindow, @@ -244,9 +244,9 @@ private: // fdo#83943, detect if making the cursor position visible is impossible to achieve struct CursorMoveAttempt { - long const m_nCol; - long const m_nRow; - bool const m_bScrolledToReachCell; + long m_nCol; + long m_nRow; + bool m_bScrolledToReachCell; CursorMoveAttempt(long nCol, long nRow, bool bScrolledToReachCell) : m_nCol(nCol) , m_nRow(nRow) diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 60f1ab0510dc..a86722a7a603 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -44,12 +44,12 @@ class ImpLineListData private: BorderWidthImpl const m_aWidthImpl; - Color ( * const m_pColor1Fn )( Color ); - Color ( * const m_pColor2Fn )( Color ); - Color ( * const m_pColorDistFn )( Color, Color ); + Color ( * m_pColor1Fn )( Color ); + Color ( * m_pColor2Fn )( Color ); + Color ( * m_pColorDistFn )( Color, Color ); - long const m_nMinWidth; - SvxBorderLineStyle const m_nStyle; + long m_nMinWidth; + SvxBorderLineStyle m_nStyle; public: ImpLineListData( BorderWidthImpl aWidthImpl, diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 8b6d976cc5da..29b2e3ffda03 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -229,7 +229,7 @@ namespace svt class SVT_DLLPUBLIC EditCellController : public CellController { IEditImplementation* m_pEditImplementation; - bool const m_bOwnImplementation; // did we create m_pEditImplementation? + bool m_bOwnImplementation; // did we create m_pEditImplementation? public: EditCellController( Edit* _pEdit ); diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index a2ba1a22e3fd..aaa2ee61be46 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -28,8 +28,8 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public VclMultiLineEdit { private: - SyntaxHighlighter const aHighlighter; - svtools::ColorConfig const m_aColorConfig; + SyntaxHighlighter aHighlighter; + svtools::ColorConfig m_aColorConfig; private: void DoBracketHilight(sal_uInt16 aKey); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index ba7a20e11dfb..054ac94fdc23 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -42,10 +42,10 @@ public: bool GetString(ErrCode nErrId, OUString &rStr) override; private: - sal_uInt16 const nCtxId; + sal_uInt16 nCtxId; const ErrMsgCode* pIds; - std::locale const aResLocale; - OUString const aArg1; + std::locale aResLocale; + OUString aArg1; }; class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler @@ -59,10 +59,10 @@ protected: private: - ErrCodeArea const lStart; - ErrCodeArea const lEnd; + ErrCodeArea lStart; + ErrCodeArea lEnd; const ErrMsgCode* pIds; - std::locale const aResLocale; + std::locale aResLocale; SVT_DLLPRIVATE static void GetClassString(ErrCodeClass lErrId, OUString &); virtual bool CreateString(const ErrorInfo *, OUString &) const override; diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index 16c724487bfe..a6787cc24795 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -33,7 +33,7 @@ private: css::uno::Reference< css::embed::XEmbeddedObject > m_xObj; std::unique_ptr<Graphic> m_pGraphic; - sal_Int64 const m_nAspect; + sal_Int64 m_nAspect; OUString maParentShellID; diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index ec8d8a41fdac..e90db3fb29e6 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -29,9 +29,9 @@ class SVT_DLLPUBLIC FileChangedChecker { private: Idle mIdle; - OUString const mFileName; + OUString mFileName; TimeValue mLastModTime; - ::std::function<void ()> const mpCallback; + ::std::function<void ()> mpCallback; bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const; DECL_LINK(TimerHandler, Timer *, void); diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index 9ddb44c0547f..3f3e4464cbed 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -75,7 +75,7 @@ class FrameStatusListener : public css::frame::XStatusListener, Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - css::util::URL const aURL; + css::util::URL aURL; css::uno::Reference< css::frame::XDispatch > xDispatch; }; diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 5de8360987ad..7543f7335785 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -36,7 +36,7 @@ struct HTMLOutEvent { const char *pBasicName; const char *pJavaName; - SvMacroItemId const nEvent; + SvMacroItemId nEvent; }; struct SVT_DLLPUBLIC HTMLOutContext diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index a00762af8a3a..2bd863ddc96a 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -75,8 +75,8 @@ enum class HTMLScriptLanguage template<typename EnumT> struct HTMLOptionEnum { - const char *pName; // value of an HTML option - EnumT const nValue; // and corresponding value of an enum + const char *pName; // value of an HTML option + EnumT nValue; // and corresponding value of an enum }; /** Representation of an HTML option (=attribute in a start tag). @@ -86,9 +86,9 @@ struct HTMLOptionEnum */ class SVT_DLLPUBLIC HTMLOption { - OUString const aValue; // value of the option (always as string) - OUString const aToken; // name of the option as string - HtmlOptionId const nToken; // and respective token + OUString aValue; // value of the option (always as string) + OUString aToken; // name of the option as string + HtmlOptionId nToken; // and respective token public: @@ -148,7 +148,7 @@ class SVT_DLLPUBLIC HTMLParser : public SvParser<HtmlTokenId> private: mutable HTMLOptions maOptions; // options of the start tag - bool const bNewDoc : 1; // read new Doc? + bool bNewDoc : 1; // read new Doc? bool bIsInHeader : 1; // scan header section bool bReadListing : 1; // read listings bool bReadXMP : 1; // read XMP diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx index 3d39c116d372..0d59f4667667 100644 --- a/include/svtools/place.hxx +++ b/include/svtools/place.hxx @@ -18,7 +18,7 @@ private: OUString msName; INetURLObject maUrl; - bool const mbEditable; + bool mbEditable; public: diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 2872fbf82073..686b50a96d48 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -572,13 +572,13 @@ struct RulerSelection struct RulerUnitData { - MapUnit const eMapUnit; // MAP_UNIT for calculation - long const nTickUnit; // Unit divider - double const nTick1; // Minimal step - double const nTick2; // Tick quarter unit - double const nTick3; // Tick half unit - double const nTick4; // Tick whole unit - char const aUnitStr[8]; // Unit string + MapUnit eMapUnit; // MAP_UNIT for calculation + long nTickUnit; // Unit divider + double nTick1; // Minimal step + double nTick2; // Tick quarter unit + double nTick3; // Tick half unit + double nTick4; // Tick whole unit + char aUnitStr[8]; // Unit string }; diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 8eb05b4798f2..129a7af57f46 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -99,7 +99,7 @@ class SVT_DLLPUBLIC StatusbarController : Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - css::util::URL const aURL; + css::util::URL aURL; css::uno::Reference< css::frame::XDispatch > xDispatch; }; diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 6f65b746180b..de6e57264137 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -40,7 +40,7 @@ namespace svt virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& _rFlavor, const OUString& rDestDoc ) override; - OUString const m_sContent; + OUString m_sContent; }; diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 0ec7228fe5a8..b97c0e15b11a 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -135,7 +135,7 @@ class SVT_DLLPUBLIC ToolboxController : Listener( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatch >& rDispatch ) : aURL( rURL ), xDispatch( rDispatch ) {} - css::util::URL const aURL; + css::util::URL aURL; css::uno::Reference< css::frame::XDispatch > xDispatch; }; diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 0d4cdfd0ac07..46335a5d2c86 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -41,7 +41,7 @@ enum class SvMacroItemId : sal_uInt16; */ struct SvEventDescription { - SvMacroItemId const mnEvent; + SvMacroItemId mnEvent; const char* mpEventName; }; diff --git a/include/vcl/imap.hxx b/include/vcl/imap.hxx index e2217b87b6e8..5cf03071b22a 100644 --- a/include/vcl/imap.hxx +++ b/include/vcl/imap.hxx @@ -122,7 +122,7 @@ class IMapCompat SvStream* pRWStm; sal_uInt64 nCompatPos; sal_uInt64 nTotalSize; - StreamMode const nStmMode; + StreamMode nStmMode; IMapCompat( const IMapCompat& ) = delete; IMapCompat& operator=( const IMapCompat& ) { return *this; } diff --git a/include/vcl/ivctrl.hxx b/include/vcl/ivctrl.hxx index 82e44af84a79..adadcc9fefc4 100644 --- a/include/vcl/ivctrl.hxx +++ b/include/vcl/ivctrl.hxx @@ -58,7 +58,7 @@ enum class SvxIconChoiceCtrlPositionMode class SvxIconChoiceCtrlEntry { - Image const aImage; + Image aImage; OUString aText; OUString aQuickHelpText; diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index 030d6312e0ba..915730390f7a 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -734,7 +734,7 @@ public: class SvInplaceEdit2 { - Link<SvInplaceEdit2&,void> const aCallBackHdl; + Link<SvInplaceEdit2&,void> aCallBackHdl; Accelerator aAccReturn; Accelerator aAccEscape; Idle aIdle; |