summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx2
-rw-r--r--vcl/unx/generic/app/keysymnames.cxx34
-rw-r--r--vcl/unx/generic/app/randrwrapper.cxx2
-rw-r--r--vcl/unx/generic/app/saldata.cxx4
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx4
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx4
-rw-r--r--vcl/unx/generic/glyphs/freetype_glyphcache.cxx6
-rw-r--r--vcl/unx/generic/print/common_gfx.cxx2
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx6
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx2
-rw-r--r--vcl/unx/gtk3/fpicker/resourceprovider.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx2
13 files changed, 36 insertions, 36 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index ad42c079c379..6f94fe938818 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -112,7 +112,7 @@ get_font_set( Display *p_display )
return p_font_set;
}
-static const XIMStyle g_nSupportedStatusStyle(
+const XIMStyle g_nSupportedStatusStyle(
XIMStatusCallbacks |
XIMStatusNothing |
XIMStatusNone
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index 742ebef20997..c4211be02b16 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -60,7 +60,7 @@ namespace vcl_sal {
// every string value in the replacements tables must be in UTF8
// be careful with your editor !
- static const struct KeysymNameReplacement aImplReplacements_English[] =
+ const struct KeysymNameReplacement aImplReplacements_English[] =
{
{ XK_Control_L, "Ctrl" },
{ XK_Control_R, "Ctrl" },
@@ -70,7 +70,7 @@ namespace vcl_sal {
{ XK_Page_Down, "PgDn"}
};
- static const struct KeysymNameReplacement aImplReplacements_Turkish[] =
+ const struct KeysymNameReplacement aImplReplacements_Turkish[] =
{
{ XK_Control_L, "Ctrl" },
{ XK_Control_R, "Ctrl" },
@@ -81,7 +81,7 @@ namespace vcl_sal {
{ XK_space, "Bo\305\237luk" }
};
- static const struct KeysymNameReplacement aImplReplacements_Russian[] =
+ const struct KeysymNameReplacement aImplReplacements_Russian[] =
{
{ XK_Right, "\320\222\320\277\321\200\320\260\320\262\320\276" },
{ XK_Left, "\320\222\320\273\320\265\320\262\320\276" },
@@ -90,7 +90,7 @@ namespace vcl_sal {
{ XK_space, "\320\237\321\200\320\276\320\261\320\265\320\273" }
};
- static const struct KeysymNameReplacement aImplReplacements_German[] =
+ const struct KeysymNameReplacement aImplReplacements_German[] =
{
{ XK_Control_L, "Strg" },
{ XK_Control_R, "Strg" },
@@ -125,7 +125,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Ausschneiden" },
};
- static const struct KeysymNameReplacement aImplReplacements_French[] =
+ const struct KeysymNameReplacement aImplReplacements_French[] =
{
{ XK_Shift_L, "Maj" },
{ XK_Shift_R, "Maj" },
@@ -156,7 +156,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Couper" },
};
- static const struct KeysymNameReplacement aImplReplacements_Italian[] =
+ const struct KeysymNameReplacement aImplReplacements_Italian[] =
{
{ XK_Shift_L, "Maiusc" },
{ XK_Shift_R, "Maiusc" },
@@ -185,7 +185,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Taglia" },
};
- static const struct KeysymNameReplacement aImplReplacements_Dutch[] =
+ const struct KeysymNameReplacement aImplReplacements_Dutch[] =
{
{ XK_Page_Up, "PageUp" },
{ XK_Page_Down, "PageDown" },
@@ -209,7 +209,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Cut" },
};
- static const struct KeysymNameReplacement aImplReplacements_Norwegian[] =
+ const struct KeysymNameReplacement aImplReplacements_Norwegian[] =
{
{ XK_Shift_L, "Skift" },
{ XK_Shift_R, "Skift" },
@@ -234,7 +234,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Klipp" },
};
- static const struct KeysymNameReplacement aImplReplacements_Swedish[] =
+ const struct KeysymNameReplacement aImplReplacements_Swedish[] =
{
{ XK_Shift_L, "Skift" },
{ XK_Shift_R, "Skift" },
@@ -260,7 +260,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Klipp ut" },
};
- static const struct KeysymNameReplacement aImplReplacements_Portuguese[] =
+ const struct KeysymNameReplacement aImplReplacements_Portuguese[] =
{
{ XK_Page_Up, "PageUp" },
{ XK_Page_Down, "PageDown" },
@@ -284,7 +284,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Cut" },
};
- static const struct KeysymNameReplacement aImplReplacements_Slovenian[] =
+ const struct KeysymNameReplacement aImplReplacements_Slovenian[] =
{
{ XK_Control_L, "Krmilka" },
{ XK_Control_R, "Krmilka" },
@@ -319,7 +319,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Izre\305\276i" },
};
- static const struct KeysymNameReplacement aImplReplacements_Spanish[] =
+ const struct KeysymNameReplacement aImplReplacements_Spanish[] =
{
{ XK_Shift_L, "May\303\272s" },
{ XK_Shift_R, "May\303\272s" },
@@ -349,7 +349,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Cortar" },
};
- static const struct KeysymNameReplacement aImplReplacements_Estonian[] =
+ const struct KeysymNameReplacement aImplReplacements_Estonian[] =
{
{ XK_Page_Up, "PgUp" },
{ XK_Page_Down, "PgDown" },
@@ -379,7 +379,7 @@ namespace vcl_sal {
{ SunXK_Cut, "L\303\265ika" },
};
- static const struct KeysymNameReplacement aImplReplacements_Catalan[] =
+ const struct KeysymNameReplacement aImplReplacements_Catalan[] =
{
{ XK_Shift_L, "Maj" },
{ XK_Shift_R, "Maj" },
@@ -409,7 +409,7 @@ namespace vcl_sal {
{ SunXK_Cut, "Retalla" },
};
- static const struct KeysymNameReplacement aImplReplacements_Lithuanian[] =
+ const struct KeysymNameReplacement aImplReplacements_Lithuanian[] =
{
{ XK_Control_L, "Vald" },
{ XK_Control_R, "Vald" },
@@ -445,7 +445,7 @@ namespace vcl_sal {
{ SunXK_Cut, "I\305\241kirpti" },
};
- static const struct KeysymNameReplacement aImplReplacements_Hungarian[] =
+ const struct KeysymNameReplacement aImplReplacements_Hungarian[] =
{
{ XK_Right, "Jobbra" },
{ XK_Left, "Balra" },
@@ -457,7 +457,7 @@ namespace vcl_sal {
{ XK_slash, "Oszt\303\241sjel" },
};
- static const struct KeyboardReplacements aKeyboards[] =
+ const struct KeyboardReplacements aKeyboards[] =
{
{ "ca", aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) },
{ "de", aImplReplacements_German, SAL_N_ELEMENTS(aImplReplacements_German) },
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index cb3698365968..ad884435cb36 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -83,7 +83,7 @@ RandRWrapper::RandRWrapper( Display* pDisplay ) :
m_bValid = false;
}
-static RandRWrapper* pWrapper = nullptr;
+RandRWrapper* pWrapper = nullptr;
RandRWrapper& RandRWrapper::get( Display* i_pDisplay )
{
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index f2fe146f515e..1b58c7dab0f2 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -101,8 +101,8 @@ static int XIOErrorHdl( Display * )
}
-static const struct timeval noyield_ = { 0, 0 };
-static const struct timeval yield_ = { 0, 10000 };
+const struct timeval noyield_ = { 0, 0 };
+const struct timeval yield_ = { 0, 10000 };
static const char* XRequest[] = {
// see /usr/lib/X11/XErrorDB, /usr/openwin/lib/XErrorDB ...
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 39aaf007344e..8304efbf226d 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -92,7 +92,7 @@ struct WMAdaptorProtocol
* table must be sorted ascending in strings
* since it is use with bsearch
*/
-static const WMAdaptorProtocol aProtocolTab[] =
+const WMAdaptorProtocol aProtocolTab[] =
{
{ "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE", WMAdaptor::KDE_NET_WM_WINDOW_TYPE_OVERRIDE },
{ "_NET_ACTIVE_WINDOW", WMAdaptor::NET_ACTIVE_WINDOW },
@@ -142,7 +142,7 @@ static const WMAdaptorProtocol aProtocolTab[] =
* table containing atoms to get anyway
*/
-static const WMAdaptorProtocol aAtomTab[] =
+const WMAdaptorProtocol aAtomTab[] =
{
{ "WM_STATE", WMAdaptor::WM_STATE },
{ "_MOTIF_WM_HINTS", WMAdaptor::MOTIF_WM_HINTS },
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 3e15173ba75e..735235ad2391 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -72,7 +72,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <algorithm>
-static constexpr auto DRAG_EVENT_MASK = ButtonPressMask |
+constexpr auto DRAG_EVENT_MASK = ButtonPressMask |
ButtonReleaseMask |
PointerMotionMask |
EnterWindowMask |
@@ -103,7 +103,7 @@ extern "C"
}
}
-static const long nXdndProtocolRevision = 5;
+const long nXdndProtocolRevision = 5;
namespace {
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index df59ce1c8e5c..885978ed1889 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -241,9 +241,9 @@ void FreetypeFontInfo::ReleaseFaceFT()
static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);}
-static const sal_uInt32 T_true = 0x74727565; /* 'true' */
-static const sal_uInt32 T_ttcf = 0x74746366; /* 'ttcf' */
-static const sal_uInt32 T_otto = 0x4f54544f; /* 'OTTO' */
+const sal_uInt32 T_true = 0x74727565; /* 'true' */
+const sal_uInt32 T_ttcf = 0x74746366; /* 'ttcf' */
+const sal_uInt32 T_otto = 0x4f54544f; /* 'OTTO' */
const unsigned char* FreetypeFontInfo::GetTable( const char* pTag, sal_uLong* pLength ) const
{
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 37aa3cbe2747..b6c92e49c84a 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -34,7 +34,7 @@
using namespace psp ;
-static const sal_Int32 nMaxTextColumn = 80;
+const sal_Int32 nMaxTextColumn = 80;
GraphicsStatus::GraphicsStatus() :
maEncoding(RTL_TEXTENCODING_DONTKNOW),
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index ff4b5e691d3d..aae0f9f5f7b1 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -841,7 +841,7 @@ static void standardSysQueueTokenHandler(
}
}
-static const struct SystemCommandParameters aParms[] =
+const struct SystemCommandParameters aParms[] =
{
#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)
{ "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler },
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 5b24c04b9b9a..f2423ed0310b 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -70,7 +70,7 @@
using namespace vcl_sal;
-static constexpr auto CLIENT_EVENTS = StructureNotifyMask
+constexpr auto CLIENT_EVENTS = StructureNotifyMask
| SubstructureNotifyMask
| KeyPressMask
| KeyReleaseMask
@@ -1635,10 +1635,10 @@ void X11SalFrame::SetAlwaysOnTop( bool bOnTop )
}
}
-static constexpr auto FRAMESTATE_MASK_GEOMETRY =
+constexpr auto FRAMESTATE_MASK_GEOMETRY =
WindowStateMask::X | WindowStateMask::Y |
WindowStateMask::Width | WindowStateMask::Height;
-static constexpr auto FRAMESTATE_MASK_MAXIMIZED_GEOMETRY =
+constexpr auto FRAMESTATE_MASK_MAXIMIZED_GEOMETRY =
WindowStateMask::MaximizedX | WindowStateMask::MaximizedY |
WindowStateMask::MaximizedWidth | WindowStateMask::MaximizedHeight;
diff --git a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
index 73ba933d5a98..77daf48146b0 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
@@ -743,7 +743,7 @@ String2Locale( uno::Any& rAny, const gchar * value )
// @see http://www.w3.org/TR/2002/WD-css3-fonts-20020802/#font-effect-prop
static const gchar * relief[] = { "none", "emboss", "engrave" };
-static const gchar * const outline = "outline";
+const gchar * const outline = "outline";
static gchar *
get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList,
diff --git a/vcl/unx/gtk3/fpicker/resourceprovider.cxx b/vcl/unx/gtk3/fpicker/resourceprovider.cxx
index 5ad801a6ea95..95c098a73488 100644
--- a/vcl/unx/gtk3/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk3/fpicker/resourceprovider.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
// translate control ids to resource ids
-static const struct
+const struct
{
sal_Int32 ctrlId;
const char *resId;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 84d7fa437f96..59af89e9023f 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -473,7 +473,7 @@ namespace
const char* pType; // Mime encoding on our side
};
- static const TypeEntry aConversionTab[] =
+ const TypeEntry aConversionTab[] =
{
{ "ISO10646-1", "text/plain;charset=utf-16" },
{ "UTF8_STRING", "text/plain;charset=utf-8" },
generated by cgit (git 2.34.1) at 2025-01-27 12:55:47 +0000