[Libreoffice-commits] core.git: embeddedobj/source extensions/source hwpfilter/source jvmfwk/plugins sal/osl winaccessibility/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jul 9 07:16:25 UTC 2021
embeddedobj/source/msole/olecomponent.cxx | 12 -
extensions/source/ole/unoobjw.cxx | 2
hwpfilter/source/hcode.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2
sal/osl/w32/profile.cxx | 6
sal/osl/w32/salinit.cxx | 6
winaccessibility/source/service/AccComponentEventListener.cxx | 68 +++++-----
7 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit 010cf46e04907fa2503477ce4c0c85f465747034
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jul 9 08:34:31 2021 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jul 9 09:15:52 2021 +0200
loplugin:indentation (clang-cl)
Change-Id: Iae559ca8bee9650c01167a4d1b918e18cbf03c28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118660
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index da5b02874b07..cbcc1f6e79d7 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -360,13 +360,13 @@ bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium,
if ( pBuf && !bAnyIsReady )
{
for ( auto const & supportedFormat : std::as_const(m_aSupportedGraphFormats) )
- if ( aFlavor.MimeType.match( supportedFormat.MimeType )
+ if ( aFlavor.MimeType.match( supportedFormat.MimeType )
&& aFlavor.DataType == supportedFormat.DataType
&& aFlavor.DataType == cppu::UnoType<uno::Sequence< sal_Int8 >>::get() )
- {
- bAnyIsReady = ConvertBufferToFormat( pBuf.get(), nBufSize, aFormat, aResult );
- break;
- }
+ {
+ bAnyIsReady = ConvertBufferToFormat( pBuf.get(), nBufSize, aFormat, aResult );
+ break;
+ }
}
}
@@ -612,7 +612,7 @@ void OleComponent::RetrieveObjectDataFlavors_Impl()
if( hr2 == S_OK || hr2 == S_FALSE )
{
for( sal_uInt32 nInd = 0; nInd < FORMATS_NUM; nInd++ )
- {
+ {
if ( pElem[nInd].cfFormat == pFormatTemplates[nInd].cfFormat
&& pElem[nInd].tymed == pFormatTemplates[nInd].tymed )
nSupportedAspects |= pElem[nInd].dwAspect;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 2d935f8d9583..595d4276e3c4 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1731,7 +1731,7 @@ static bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
else
{
// variantarg and variant must have same type
- if ((V_VT(pDest) & oleTypeFlags) == oleTypeFlags)
+ if ((V_VT(pDest) & oleTypeFlags) == oleTypeFlags)
{
if ((oleTypeFlags & VT_ARRAY) != 0)
{
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index dfd9af78b4b8..ff133cebd25a 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -1352,10 +1352,10 @@ char *hcolor2str(uchar color, uchar shade, char *buf, bool bIsChar)
{
std::string ret;
if( !_strnicmp(src, "http", 4))
- {
+ {
// nothing special here, just copy
}
- else
+ else
{
unsigned int srclen = strlen(src);
if (3 < srclen)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index df14c0841bf9..bc66d68de052 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -614,7 +614,7 @@ static void addJavaInfoFromWinReg(
{
getAndAddJREInfoByPath(javaHome, allInfos, addedInfos);
}
- }
+ }
vecJavaHome.clear();
if (getJavaInfoFromRegistry(L"Software\\JavaSoft\\JDK", vecJavaHome)) {
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 17540f65e424..a0790c3de632 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1977,10 +1977,10 @@ static bool releaseProfile(osl_TProfileImpl* pProfile)
else
{
#ifdef DEBUG_OSL_PROFILE
- SAL_INFO("sal.osl", "DEFAULT MODE");
+ SAL_INFO("sal.osl", "DEFAULT MODE");
#endif
- if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
- osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
+ if (! (pProfile->m_Flags & (osl_Profile_READLOCK |
+ osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE)))
{
if (pProfile->m_Flags & FLG_MODIFIED)
storeProfile(pProfile, false);
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx
index 9b89cebc20ab..c0b91712726a 100644
--- a/sal/osl/w32/salinit.cxx
+++ b/sal/osl/w32/salinit.cxx
@@ -58,9 +58,9 @@ void sal_detail_initialize(int argc, char ** argv)
if ((LOBYTE(wsaData.wVersion) < wMajorVersionRequired) ||
((LOBYTE(wsaData.wVersion) == wMajorVersionRequired) &&
(HIBYTE(wsaData.wVersion) < wMinorVersionRequired)))
- {
- // How to handle a very unlikely error ???
- }
+ {
+ // How to handle a very unlikely error ???
+ }
}
else
{
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 148331acf6cd..7f7acfe1e1e1 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -207,44 +207,44 @@ void AccComponentEventListener::SetComponentState(short state, bool enable)
void AccComponentEventListener::FireStatePropertyChange(short state, bool set)
{
if( set)
+ {
+ // new value
+ switch(state)
{
- // new value
- switch(state)
- {
- case AccessibleStateType::CHECKED:
- case AccessibleStateType::INDETERMINATE:
- pAgent->IncreaseState(m_xAccessible.get(), state);
- pAgent->UpdateAction(m_xAccessible.get());
+ case AccessibleStateType::CHECKED:
+ case AccessibleStateType::INDETERMINATE:
+ pAgent->IncreaseState(m_xAccessible.get(), state);
+ pAgent->UpdateAction(m_xAccessible.get());
- if(!pAgent->IsSpecialToolboItem(m_xAccessible.get()))
- {
- pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, m_xAccessible.get());
- }
- break;
- case AccessibleStateType::PRESSED:
- pAgent->IncreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, m_xAccessible.get());
- break;
- case AccessibleStateType::SELECTED:
- pAgent->IncreaseState(m_xAccessible.get(), state);
- break;
- case AccessibleStateType::ARMED:
- pAgent->IncreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, m_xAccessible.get());
- break;
- case AccessibleStateType::SHOWING:
- pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC);
- // UNO !SHOWING == MSAA OFFSCREEN
- pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::SHOWING );
- break;
- case AccessibleStateType::VISIBLE:
- // UNO !VISIBLE == MSAA INVISIBLE
- pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::VISIBLE );
- break;
- default:
- break;
+ if(!pAgent->IsSpecialToolboItem(m_xAccessible.get()))
+ {
+ pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, m_xAccessible.get());
}
+ break;
+ case AccessibleStateType::PRESSED:
+ pAgent->IncreaseState(m_xAccessible.get(), state);
+ pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, m_xAccessible.get());
+ break;
+ case AccessibleStateType::SELECTED:
+ pAgent->IncreaseState(m_xAccessible.get(), state);
+ break;
+ case AccessibleStateType::ARMED:
+ pAgent->IncreaseState(m_xAccessible.get(), state);
+ pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, m_xAccessible.get());
+ break;
+ case AccessibleStateType::SHOWING:
+ pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC);
+ // UNO !SHOWING == MSAA OFFSCREEN
+ pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::SHOWING );
+ break;
+ case AccessibleStateType::VISIBLE:
+ // UNO !VISIBLE == MSAA INVISIBLE
+ pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::VISIBLE );
+ break;
+ default:
+ break;
}
+ }
else
{
// old value
More information about the Libreoffice-commits
mailing list