summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/bitmap/BitmapScaleSuperFilter.cxx2
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx2
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/control/notebookbar.cxx20
-rw-r--r--vcl/source/filter/ipict/ipict.cxx48
-rw-r--r--vcl/source/font/PhysicalFontCollection.cxx6
-rw-r--r--vcl/source/gdi/embeddedfontshelper.cxx2
-rw-r--r--vcl/source/gdi/oldprintadaptor.cxx8
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx2
-rw-r--r--vcl/source/treelist/transfer.cxx8
-rw-r--r--vcl/source/window/brdwin.cxx16
-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
18 files changed, 87 insertions, 86 deletions
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index ac5174b2923d..7399311257a5 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -319,7 +319,7 @@ void scaleUp(const ScaleContext &rCtx, tools::Long nStartY, tools::Long nEndY)
ScaleFunction::generateComponent(pColorPtr0, pColorPtr1, nTempFX, nComponents2);
ScaleFunction::calculateDestination(pScanDest, nTempFY, nComponents1, nComponents2);
- }
+ }
}
}
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 014e62aab8f3..92b3175143f2 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -187,7 +187,7 @@ BitmapEx CreateFromData( sal_uInt8 const *pData, sal_Int32 nWidth, sal_Int32 nHe
xMaskAcc->SetPixelOnData(pMaskScanLine, x, BitmapColor(*p));
p += 4;
}
- }
+ }
}
}
if (nBitCount == 32)
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f5bf3c47b427..395c52587de8 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1579,7 +1579,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
else if ( bGoRight && ( aSel.Max() < maText.getLength() ) )
{
if ( bWord )
- {
+ {
i18n::Boundary aBoundary = xBI->nextWord( maText.toString(), aSel.Max(),
GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES );
aSel.Max() = aBoundary.startPos;
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 42fb8231327d..24e619ff98e1 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -291,17 +291,17 @@ void NotebookBar::UpdateBackground()
Wallpaper aWallpaper(aPersona);
aWallpaper.SetStyle(WallpaperStyle::TopRight);
if (!aPersona.IsEmpty())
- {
- SetBackground(aWallpaper);
- UpdatePersonaSettings();
- GetOutDev()->SetSettings( PersonaSettings );
- }
+ {
+ SetBackground(aWallpaper);
+ UpdatePersonaSettings();
+ GetOutDev()->SetSettings( PersonaSettings );
+ }
else
- {
- SetBackground(rStyleSettings.GetDialogColor());
- UpdateDefaultSettings();
- GetOutDev()->SetSettings( DefaultSettings );
- }
+ {
+ SetBackground(rStyleSettings.GetDialogColor());
+ UpdateDefaultSettings();
+ GetOutDev()->SetSettings( DefaultSettings );
+ }
Invalidate(tools::Rectangle(Point(0,0), GetSizePixel()));
}
diff --git a/vcl/source/filter/ipict/ipict.cxx b/vcl/source/filter/ipict/ipict.cxx
index 6bfb7617545c..1d22137d0fcf 100644
--- a/vcl/source/filter/ipict/ipict.cxx
+++ b/vcl/source/filter/ipict/ipict.cxx
@@ -1180,7 +1180,7 @@ void PictReader::ReadHeader()
sal_uInt32 nOffset;
int confidence[2] = { 0, 0};
for ( st = 0; st < 3 + 513; st++ )
- {
+ {
int actualConfid = 20; // the actual confidence
pPict->ResetError();
if (st < 2) nOffset = nStartPos+st*512;
@@ -1227,11 +1227,11 @@ void PictReader::ReadHeader()
if (sBuf[0] != 0x00) continue; // unrecoverable error
int numZero = 0;
do
- {
- numZero++;
- pPict->SeekRel(-1);
- pPict->ReadBytes(sBuf, 2);
- }
+ {
+ numZero++;
+ pPict->SeekRel(-1);
+ pPict->ReadBytes(sBuf, 2);
+ }
while ( sBuf[0] == 0x00 && numZero < 10);
actualConfid -= (numZero-1); // extra nop are dubious
if (!pPict->good()) continue;
@@ -1252,30 +1252,30 @@ void PictReader::ReadHeader()
if (!pPict->good()) continue;
if ( nExtVer == -2 ) // extended version 2 picture
- {
- sal_Int32 nHResFixed, nVResFixed;
- pPict->ReadInt32( nHResFixed ).ReadInt32( nVResFixed );
- pPict->ReadInt16( y1 ).ReadInt16( x1 ).ReadInt16( y2 ).ReadInt16( x2 ); // reading the optimal bounding rect
- if (x1 > x2 || y1 > y2) continue; // bad bdbox
- if (st < 2 && actualConfid != 20) { confidence[st] = actualConfid; continue; }
-
- double fHRes = nHResFixed;
- fHRes /= 65536;
- double fVRes = nVResFixed;
- fVRes /= 65536;
- aHRes /= fHRes;
- aVRes /= fVRes;
- aBoundingRect=tools::Rectangle( x1,y1, x2, y2 );
- pPict->SeekRel( 4 ); // 4 bytes reserved
- return;
- }
+ {
+ sal_Int32 nHResFixed, nVResFixed;
+ pPict->ReadInt32( nHResFixed ).ReadInt32( nVResFixed );
+ pPict->ReadInt16( y1 ).ReadInt16( x1 ).ReadInt16( y2 ).ReadInt16( x2 ); // reading the optimal bounding rect
+ if (x1 > x2 || y1 > y2) continue; // bad bdbox
+ if (st < 2 && actualConfid != 20) { confidence[st] = actualConfid; continue; }
+
+ double fHRes = nHResFixed;
+ fHRes /= 65536;
+ double fVRes = nVResFixed;
+ fVRes /= 65536;
+ aHRes /= fHRes;
+ aVRes /= fVRes;
+ aBoundingRect=tools::Rectangle( x1,y1, x2, y2 );
+ pPict->SeekRel( 4 ); // 4 bytes reserved
+ return;
+ }
else if (nExtVer == -1 ) { // basic version 2 picture
if (st < 2 && actualConfid != 20) { confidence[st] = actualConfid; continue; }
pPict->SeekRel( 16); // bdbox(4 fixed number)
pPict->SeekRel(4); // 4 bytes reserved
return;
}
- }
+ }
pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
}
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 5606b321af15..1d047781de4d 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -1105,9 +1105,9 @@ PhysicalFontFamily* PhysicalFontCollection::FindFontFamily( FontSelectPattern& r
// use the font's shortened name if needed
if ( aSearchShortName != aSearchName )
{
- PhysicalFontFamily* pFoundData = ImplFindFontFamilyBySearchName( aSearchShortName );
- if( pFoundData )
- {
+ PhysicalFontFamily* pFoundData = ImplFindFontFamilyBySearchName( aSearchShortName );
+ if( pFoundData )
+ {
#ifdef UNX
/* #96738# don't use mincho as a replacement for "MS Mincho" on X11: Mincho is
a korean bitmap font that is not suitable here. Use the font replacement table,
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 7e242d640837..5664857d3474 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -261,7 +261,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( std::u16string_view familyName, FontF
for( int i = 0;
i < fontInfo->Count();
++i )
- {
+ {
PhysicalFontFace* f = fontInfo->Get( i );
if( f->GetFamilyName() == familyName )
{
diff --git a/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
index 8423bbb1e37f..6a07eee9b619 100644
--- a/vcl/source/gdi/oldprintadaptor.cxx
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -103,10 +103,10 @@ Sequence< PropertyValue > OldStylePrintAdaptor::getPageParameters( int i_nPage )
void OldStylePrintAdaptor::printPage( int i_nPage ) const
{
if( i_nPage < int(mpData->maPages.size()) )
- {
- mpData->maPages[ i_nPage ].maPage.WindStart();
- mpData->maPages[ i_nPage ].maPage.Play(*getPrinter());
- }
+ {
+ mpData->maPages[ i_nPage ].maPage.WindStart();
+ mpData->maPages[ i_nPage ].maPage.Play(*getPrinter());
+ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index b2f6e4a874e7..724c692c8925 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -633,7 +633,7 @@ const char* OpenGLHelper::GLErrorString(GLenum errorCode)
{
return errors[i].string;
}
- }
+ }
return nullptr;
}
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index e2d04e877198..856cc5bd23a7 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -2171,7 +2171,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromPrimarySelection()
TransferableDataHelper aRet;
if( xSelection.is() )
- {
+ {
SolarMutexReleaser aReleaser;
try
@@ -2179,15 +2179,15 @@ TransferableDataHelper TransferableDataHelper::CreateFromPrimarySelection()
Reference< XTransferable > xTransferable( xSelection->getContents() );
if( xTransferable.is() )
- {
+ {
aRet = TransferableDataHelper( xTransferable );
aRet.mxClipboard = xSelection;
- }
+ }
}
catch( const css::uno::Exception& )
{
}
- }
+ }
return aRet;
}
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 3fd3503dab80..0f3ee445ec33 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1708,14 +1708,14 @@ void ImplBorderWindow::Resize()
// since size of notebookbar changes, to make common persona for menubar
// and notebookbar persona should be set again with changed coordinates
if (!aPersona.IsEmpty())
- {
- Wallpaper aWallpaper(aPersona);
- aWallpaper.SetStyle(WallpaperStyle::TopRight);
- aWallpaper.SetRect(tools::Rectangle(Point(0, -nTopBorder),
- Size(aSize.Width() - nLeftBorder - nRightBorder,
- nNotebookBarHeight + nTopBorder)));
- mpNotebookBar->SetBackground(aWallpaper);
- }
+ {
+ Wallpaper aWallpaper(aPersona);
+ aWallpaper.SetStyle(WallpaperStyle::TopRight);
+ aWallpaper.SetRect(tools::Rectangle(Point(0, -nTopBorder),
+ Size(aSize.Width() - nLeftBorder - nRightBorder,
+ nNotebookBarHeight + nTopBorder)));
+ mpNotebookBar->SetBackground(aWallpaper);
+ }
mpNotebookBar->setPosSizePixel(
nLeftBorder, nTopBorder,
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-07-02 02:38:26 +0000