vcl/win/dtrans/ImplHelper.cxx | 16 +++++++--------
vcl/win/window/salframe.cxx | 44 +++++++++++++++++++++---------------------
2 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 166399c5017c05406ecae4132e817f2b206170d8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 29 09:20:10 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 29 13:25:25 2021 +0200
loplugin:indentation (clang-cl)
Change-Id: If23252e7640a9cfc9dd9feab4416ae832feddaf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124403
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/win/dtrans/ImplHelper.cxx b/vcl/win/dtrans/ImplHelper.cxx
index 227876b19cb8..84c7383b2ce7 100644
--- a/vcl/win/dtrans/ImplHelper.cxx
+++ b/vcl/win/dtrans/ImplHelper.cxx
@@ -241,17 +241,17 @@ bool CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC
petcSrc )
if ( petcDest != petcSrc )
{
- petcDest->cfFormat = petcSrc->cfFormat;
+ petcDest->cfFormat = petcSrc->cfFormat;
- petcDest->ptd = nullptr;
- if ( nullptr != petcSrc->ptd )
- petcDest->ptd = CopyTargetDevice(petcSrc->ptd);
+ petcDest->ptd = nullptr;
+ if ( nullptr != petcSrc->ptd )
+ petcDest->ptd = CopyTargetDevice(petcSrc->ptd);
- petcDest->dwAspect = petcSrc->dwAspect;
- petcDest->lindex = petcSrc->lindex;
- petcDest->tymed = petcSrc->tymed;
+ petcDest->dwAspect = petcSrc->dwAspect;
+ petcDest->lindex = petcSrc->lindex;
+ petcDest->tymed = petcSrc->tymed;
- bRet = true;
+ bRet = true;
}
}
__except( EXCEPTION_EXECUTE_HANDLER )
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 8d3f52d9c354..6593b2fbebb6 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -5328,41 +5328,41 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd,
LPARAM lParam )
UINT nImeProps = ImmGetProperty( GetKeyboardLayout( 0 ), IGP_SETCOMPSTR );
if( (nImeProps & SCS_CAP_SETRECONVERTSTRING) == 0 )
{
- // This IME does not support reconversion.
- return 0;
+ // This IME does not support reconversion.
+ return 0;
}
if( !pReconvertString )
{
- // The first call for reconversion.
- pFrame->CallCallback( SalEvent::StartReconversion, nullptr );
+ // The first call for reconversion.
+ pFrame->CallCallback( SalEvent::StartReconversion, nullptr );
- // Retrieve the surrounding text from the focused control.
- pFrame->CallCallback( SalEvent::SurroundingTextRequest, &aEvt );
+ // Retrieve the surrounding text from the focused control.
+ pFrame->CallCallback( SalEvent::SurroundingTextRequest, &aEvt );
- if( aEvt.maText.isEmpty())
- {
- return 0;
- }
+ if( aEvt.maText.isEmpty())
+ {
+ return 0;
+ }
- nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.getLength() + 1) *
sizeof(WCHAR);
+ nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.getLength() + 1) *
sizeof(WCHAR);
}
else
{
- // The second call for reconversion.
+ // The second call for reconversion.
- // Retrieve the surrounding text from the focused control.
- pFrame->CallCallback( SalEvent::SurroundingTextRequest, &aEvt );
- nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.getLength() + 1) *
sizeof(WCHAR);
+ // Retrieve the surrounding text from the focused control.
+ pFrame->CallCallback( SalEvent::SurroundingTextRequest, &aEvt );
+ nRet = sizeof(RECONVERTSTRING) + (aEvt.maText.getLength() + 1) *
sizeof(WCHAR);
- pReconvertString->dwStrOffset = sizeof(RECONVERTSTRING);
- pReconvertString->dwStrLen = aEvt.maText.getLength();
- pReconvertString->dwCompStrOffset = aEvt.mnStart * sizeof(WCHAR);
- pReconvertString->dwCompStrLen = aEvt.mnEnd - aEvt.mnStart;
- pReconvertString->dwTargetStrOffset = pReconvertString->dwCompStrOffset;
- pReconvertString->dwTargetStrLen = pReconvertString->dwCompStrLen;
+ pReconvertString->dwStrOffset = sizeof(RECONVERTSTRING);
+ pReconvertString->dwStrLen = aEvt.maText.getLength();
+ pReconvertString->dwCompStrOffset = aEvt.mnStart * sizeof(WCHAR);
+ pReconvertString->dwCompStrLen = aEvt.mnEnd - aEvt.mnStart;
+ pReconvertString->dwTargetStrOffset =
pReconvertString->dwCompStrOffset;
+ pReconvertString->dwTargetStrLen = pReconvertString->dwCompStrLen;
- memcpy( pReconvertString + 1, aEvt.maText.getStr(),
(aEvt.maText.getLength() + 1) * sizeof(WCHAR) );
+ memcpy( pReconvertString + 1, aEvt.maText.getStr(),
(aEvt.maText.getLength() + 1) * sizeof(WCHAR) );
}
// just return the required size of buffer to reconvert.
