diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index bbd9a1f16df6..12739e4c02d0 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -79,7 +79,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; // needs to be converted to a better data structure -SfxFormalArgument aFormalArgs[] = { +SfxFormalArgument const aFormalArgs[] = { { reinterpret_cast(&aSfxStringItem_Impl), "SuggestedSaveAsName", SID_DEFAULTFILENAME }, { reinterpret_cast(&aSfxStringItem_Impl), "SuggestedSaveAsDir", SID_DEFAULTFILEPATH }, { reinterpret_cast(&aSfxStringItem_Impl), "VersionAuthor", SID_DOCINFO_AUTHOR }, diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 52d176dc1224..1b5c039a8700 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -55,7 +55,7 @@ static GtkWidget *pExitMenuItem = nullptr; static GtkWidget *pOpenMenuItem = nullptr; static GtkWidget *pDisableMenuItem = nullptr; #if ENABLE_GIO -GFileMonitor* pMonitor = nullptr; +static GFileMonitor* pMonitor = nullptr; #endif static void open_url_cb( GtkWidget *, gpointer data ) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 15e725693ccc..03f76373f424 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -99,7 +99,7 @@ enum URLTypeId URLType_COUNT }; -const char* URLTypeNames[URLType_COUNT] = +const char* const URLTypeNames[URLType_COUNT] = { "bool", "byte", diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 3afb9420b230..9136fee5e803 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -66,7 +66,7 @@ using namespace ::com::sun::star::document; const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess"; // increase size of the text in the buttons on the left fMultiplier-times -float fMultiplier = 1.4f; +float const fMultiplier = 1.4f; BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 903f69d34ac2..22b810f8cad7 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -251,7 +251,7 @@ public: } }; -SfxDocTemplate_Impl *gpTemplateData = nullptr; +static SfxDocTemplate_Impl *gpTemplateData = nullptr; static bool getTextProperty_Impl( Content& rContent, diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 4c298be7affc..a7cd7cfac138 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -176,7 +176,7 @@ sal_uInt32 Get10ThSec() return n10Ticks / CLOCKS_PER_SEC; } -sal_Int32 m_nInReschedule = 0; /// static counter for rescheduling +static sal_Int32 m_nInReschedule = 0; /// static counter for rescheduling void reschedule() {