summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/saldisp.cxx15
-rw-r--r--vcl/unx/generic/app/wmadaptor.cxx4
-rw-r--r--vcl/unx/generic/gdi/freetypetextrender.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx4
-rw-r--r--vcl/unx/gtk3/a11y/atkwrapper.cxx4
-rw-r--r--vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx16
-rw-r--r--vcl/unx/gtk3/hudawareness.cxx12
7 files changed, 29 insertions, 28 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 9399cab30527..f7135eeada0a 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -769,15 +769,16 @@ void SalDisplay::ModifierMapping()
{
KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock );
- if( aNumLock ) for( int i = ShiftMapIndex; i <= Mod5MapIndex; i++ )
- {
- if( pXModMap->modifiermap[i*pXModMap->max_keypermod] == aNumLock )
+ if( aNumLock )
+ for( int i = ShiftMapIndex; i <= Mod5MapIndex; i++ )
{
- bNumLockFromXS_ = False;
- nNumLockIndex_ = i;
- break;
+ if( pXModMap->modifiermap[i*pXModMap->max_keypermod] == aNumLock )
+ {
+ bNumLockFromXS_ = False;
+ nNumLockIndex_ = i;
+ break;
+ }
}
- }
}
XFreeModifiermap( pXModMap );
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 42896c694794..fe6f465b90b6 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -764,7 +764,7 @@ bool WMAdaptor::getNetWmName()
&& aRealType == XA_WINDOW
&& nFormat == 32
&& nItems != 0 )
- {
+ {
if ( ! GetGenericUnixSalData()->ErrorTrapPop( false ) )
{
GetGenericUnixSalData()->ErrorTrapPush();
@@ -850,7 +850,7 @@ bool WMAdaptor::getNetWmName()
}
GetGenericUnixSalData()->ErrorTrapPush();
}
- }
+ }
GetGenericUnixSalData()->ErrorTrapPop();
}
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 0e6556b24588..b32b34c2051a 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -126,7 +126,7 @@ void FreeTypeTextRenderImpl::GetDevFontList( PhysicalFontCollection* pFontCollec
aDFA.IncreaseQualityBy( 4096 );
const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
rFreetypeManager.AddFontFile(rFileName, nFaceNum, nVariantNum, aInfo.m_nID, aDFA);
- }
+ }
// announce glyphcache fonts
rFreetypeManager.AnnounceFonts(pFontCollection);
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 6e1c392706a9..43f1b98a224a 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1042,7 +1042,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon )
GetDisplay()->GetRootWindow( m_nXScreen ),
&nCount );
for( int i = 0; i < nCount && !bGnomeIconSize; i++ )
- {
+ {
char* pName = XGetAtomName( GetXDisplay(), pProps[i] );
if( pName )
{
@@ -1050,7 +1050,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon )
bGnomeIconSize = true;
XFree( pName );
}
- }
+ }
if( pProps )
XFree( pProps );
}
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index 1d53043f3d2b..53ac1e79df98 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -661,7 +661,7 @@ atk_object_wrapper_get_type()
static GType type = 0;
if (!type)
- {
+ {
static const GTypeInfo typeInfo =
{
sizeof (AtkObjectWrapperClass),
@@ -678,7 +678,7 @@ atk_object_wrapper_get_type()
type = g_type_register_static (ATK_TYPE_OBJECT,
"OOoAtkObj",
&typeInfo, GTypeFlags(0)) ;
- }
+ }
return type;
}
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index cb73a86c3af3..14f7762fd7b0 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -797,18 +797,18 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles()
bool bChangeFilter = true;
if ( m_pFilterVector)
for (auto const& filter : *m_pFilterVector)
- {
- if( lcl_matchFilter( filter.getFilter(), "*." + sExtension ) )
{
- if( aNewFilter.isEmpty() )
- aNewFilter = filter.getTitle();
+ if( lcl_matchFilter( filter.getFilter(), "*." + sExtension ) )
+ {
+ if( aNewFilter.isEmpty() )
+ aNewFilter = filter.getTitle();
- if( aOldFilter == filter.getTitle() )
- bChangeFilter = false;
+ if( aOldFilter == filter.getTitle() )
+ bChangeFilter = false;
- bExtensionTypedIn = true;
+ bExtensionTypedIn = true;
+ }
}
- }
if( bChangeFilter && bExtensionTypedIn )
{
gchar* pCurrentName = gtk_file_chooser_get_current_name(GTK_FILE_CHOOSER(m_pDialog));
diff --git a/vcl/unx/gtk3/hudawareness.cxx b/vcl/unx/gtk3/hudawareness.cxx
index be84933249e2..ebcbaf747fca 100644
--- a/vcl/unx/gtk3/hudawareness.cxx
+++ b/vcl/unx/gtk3/hudawareness.cxx
@@ -36,13 +36,13 @@ hud_awareness_method_call (GDBusConnection * /* connection */,
HudAwarenessHandle *handle = static_cast<HudAwarenessHandle*>(user_data);
if (g_str_equal (method_name, "HudActiveChanged"))
- {
+ {
gboolean active;
g_variant_get (parameters, "(b)", &active);
(* handle->callback) (active, handle->user_data);
- }
+ }
g_dbus_method_invocation_return_value (invocation, nullptr);
}
@@ -65,7 +65,7 @@ hud_awareness_register (GDBusConnection *connection,
vtable.method_call = hud_awareness_method_call;
if G_UNLIKELY (iface == nullptr)
- {
+ {
GError *local_error = nullptr;
info = g_dbus_node_info_new_for_xml ("<node>"
@@ -80,17 +80,17 @@ hud_awareness_register (GDBusConnection *connection,
g_assert_no_error (local_error);
iface = g_dbus_node_info_lookup_interface (info, "com.canonical.hud.Awareness");
g_assert (iface != nullptr);
- }
+ }
handle = static_cast<HudAwarenessHandle*>(g_malloc (sizeof (HudAwarenessHandle)));
object_id = g_dbus_connection_register_object (connection, object_path, iface, &vtable, handle, &g_free, error);
if (object_id == 0)
- {
+ {
g_free (handle);
return 0;
- }
+ }
handle->connection = g_object_ref(connection);
handle->callback = callback;
generated by cgit (git 2.34.1) at 2024-12-27 19:39:54 +0000