desktop/source/app/officeipcthread.cxx | 2 -
sax/source/fastparser/fastparser.cxx | 8 +++---
sc/source/filter/lotus/filter.cxx | 4 +--
svx/source/sidebar/nbdtmg.cxx | 40 +++++++++++++++---------------
ucb/source/ucp/cmis/cmis_content.cxx | 4 +--
ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 +--
6 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 79f1315a02b1dd4dd7b4a78dea410c3192663522
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:56:54 2016 +0200
cid#1371326 Misused comma operator
Change-Id: I8b27c4d20e86b6cf173374df0242f438909b4db6
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 3c65230..279e173 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1202,7 +1202,7 @@ void PipeIpcThread::execute()
m_handler->cReady.wait();
// we might have decided to shutdown while we were sleeping
- if (!m_handler->pGlobal.is()) return;
+ if (!RequestHandler::pGlobal.is()) return;
// only lock the mutex when processing starts, othewise we
deadlock when the office goes
// down during wait
commit 9a87305f5f4048c2b08136bbab434a2d6776d749
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:51:30 2016 +0200
cid#1371328 Misused comma operator
Change-Id: I3e585fb44612cb7ab2e6f04570b233310b01d8c8
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 14af01c..c3fca07 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -377,7 +377,7 @@ namespace cmis
libcmis::OAuth2DataPtr oauth2Data;
if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
{
-
libcmis::SessionFactory::setOAuth2AuthCodeProvider(aAuthProvider.gdriveAuthCodeFallback);
+
libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::gdriveAuthCodeFallback);
oauth2Data.reset( new libcmis::OAuth2Data(
GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
@@ -390,7 +390,7 @@ namespace cmis
ALFRESCO_CLOUD_CLIENT_ID,
ALFRESCO_CLOUD_CLIENT_SECRET ) );
if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
{
-
libcmis::SessionFactory::setOAuth2AuthCodeProvider(aAuthProvider.onedriveAuthCodeFallback);
+
libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::onedriveAuthCodeFallback);
oauth2Data.reset( new libcmis::OAuth2Data(
ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
commit c5a2e968de63bbed210ec43327f3c8c3f286393d
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:50:10 2016 +0200
cid#1371329 Misused comma operator
Change-Id: Iba29bce22c59b25a452b454e2b7cad3c4e95f3a3
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index f35acea..03ea471 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -777,7 +777,7 @@ void FastSaxParserImpl::parseStream(const InputSource&
maStructSource)
osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
while (!rEntity.maPendingEvents.empty())
{
- if (rEntity.maPendingEvents.size() <=
rEntity.mnEventLowWater)
+ if (rEntity.maPendingEvents.size() <=
Entity::mnEventLowWater)
rEntity.maProduceResume.set(); // start producer again
EventList *pEventList = rEntity.maPendingEvents.front();
@@ -789,7 +789,7 @@ void FastSaxParserImpl::parseStream(const InputSource&
maStructSource)
aGuard.reset(); // lock
- if ( rEntity.maPendingEvents.size() <=
rEntity.mnEventLowWater )
+ if ( rEntity.maPendingEvents.size() <=
Entity::mnEventLowWater )
{
aGuard.clear();
for (auto aEventIt = pEventList->maEvents.begin();
commit c2e38d4dc455e47cee72b7b78e4f2dc0cf0e624c
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:48:21 2016 +0200
cid#1371331 Misused comma operator
Change-Id: I729c90f7873a7735eb59805e336f4dd337dea69b
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index a095aff..217febe 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -255,7 +255,7 @@ BulletsTypeMgr::BulletsTypeMgr(const BulletsTypeMgr&
aTypeMgr):
{
for (sal_uInt16 i=0; i < DEFAULT_BULLET_TYPES; ++i)
{
- const BulletsSettings_Impl* pSrcBullet = aTypeMgr.pActualBullets[i];
+ const BulletsSettings_Impl* pSrcBullet =
BulletsTypeMgr::pActualBullets[i];
BulletsSettings_Impl* pTargetBullet = pActualBullets[i];
pTargetBullet->bIsCustomized = pSrcBullet->bIsCustomized;
pTargetBullet->cBulletChar = pSrcBullet->cBulletChar;
commit 3aeb1f80527dc0adf4ed28f8b9bd67d970e65649
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:47:01 2016 +0200
cid#1371332 Misused comma operator
Change-Id: Ib7ba126d53e81dbd65451aa4bb33033f468ca295
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 6e2938e..e761058 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -176,7 +176,7 @@ namespace cmis
libcmis::OAuth2DataPtr oauth2Data;
if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL )
{
-
libcmis::SessionFactory::setOAuth2AuthCodeProvider(
authProvider.gdriveAuthCodeFallback );
+
libcmis::SessionFactory::setOAuth2AuthCodeProvider(
AuthProvider::gdriveAuthCodeFallback );
oauth2Data.reset( new libcmis::OAuth2Data(
GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL,
GDRIVE_SCOPE, GDRIVE_REDIRECT_URI,
@@ -189,7 +189,7 @@ namespace cmis
ALFRESCO_CLOUD_CLIENT_ID,
ALFRESCO_CLOUD_CLIENT_SECRET ) );
if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
{
-
libcmis::SessionFactory::setOAuth2AuthCodeProvider(
authProvider.onedriveAuthCodeFallback );
+
libcmis::SessionFactory::setOAuth2AuthCodeProvider(
AuthProvider::onedriveAuthCodeFallback );
oauth2Data.reset( new libcmis::OAuth2Data(
ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL,
ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI,
commit e64edc463553634c616abf93138279c7ca6f1a32
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:45:15 2016 +0200
cid#1371333 Misused comma operator
Change-Id: I5288cfb4e86bbcf07df1c74cdacdd5f0e7bf03fb
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 24811fd..f35acea 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -925,11 +925,11 @@ void FastSaxParserImpl::produce( bool bForceFlush )
{
Entity& rEntity = getEntity();
if (bForceFlush ||
- rEntity.mnProducedEventsSize == rEntity.mnEventListSize)
+ rEntity.mnProducedEventsSize == Entity::mnEventListSize)
{
osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
- while (rEntity.maPendingEvents.size() >= rEntity.mnEventHighWater)
+ while (rEntity.maPendingEvents.size() >= Entity::mnEventHighWater)
{ // pause parsing for a bit
aGuard.clear(); // unlock
rEntity.maProduceResume.wait();
commit ed104d2d671ab08c712f6840a96f01632dcd1d15
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:43:04 2016 +0200
cid#1371335 Misused comma operator
Change-Id: I05d330f4326304645aa75014c15a98d57e9039a1
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 1949094..a095aff 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -776,31 +776,31 @@ MixBulletsTypeMgr::MixBulletsTypeMgr(const
MixBulletsTypeMgr& aTypeMgr):
{
for (sal_uInt16 i=0;i<DEFAULT_BULLET_TYPES;i++)
{
- if ( aTypeMgr.pActualBullets[i]->eType == eNBType::BULLETS )
+ if ( MixBulletsTypeMgr::pActualBullets[i]->eType == eNBType::BULLETS )
{
- pActualBullets[i]->eType = aTypeMgr.pActualBullets[i]->eType;
- pActualBullets[i]->nIndex = aTypeMgr.pActualBullets[i]->nIndex;
//index in the tab page display
- pActualBullets[i]->nIndexDefault =
aTypeMgr.pActualBullets[i]->nIndexDefault;
+ pActualBullets[i]->eType =
MixBulletsTypeMgr::pActualBullets[i]->eType;
+ pActualBullets[i]->nIndex =
MixBulletsTypeMgr::pActualBullets[i]->nIndex; //index in the tab page display
+ pActualBullets[i]->nIndexDefault =
MixBulletsTypeMgr::pActualBullets[i]->nIndexDefault;
pActualBullets[i]->pBullets = new
BulletsSettings_Impl(eNBType::BULLETS) ;
-
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->cBulletChar =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->cBulletChar;
-
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->aFont =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->aFont;
-
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->sDescription =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->sDescription;
-
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->bIsCustomized
=
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized;
-
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->eType =
static_cast<BulletsSettings_Impl*>(aTypeMgr.pActualBullets[i]->pBullets)->eType;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->cBulletChar =
static_cast<BulletsSettings_Impl*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->cBulletChar;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->aFont =
static_cast<BulletsSettings_Impl*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->aFont;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->sDescription =
static_cast<BulletsSettings_Impl*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->sDescription;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->bIsCustomized
=
static_cast<BulletsSettings_Impl*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->bIsCustomized;
+
static_cast<BulletsSettings_Impl*>(pActualBullets[i]->pBullets)->eType =
static_cast<BulletsSettings_Impl*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->eType;
}
- else if ( aTypeMgr.pActualBullets[i]->eType == eNBType::GRAPHICBULLETS
)
+ else if ( MixBulletsTypeMgr::pActualBullets[i]->eType ==
eNBType::GRAPHICBULLETS )
{
- pActualBullets[i]->eType = aTypeMgr.pActualBullets[i]->eType;
- pActualBullets[i]->nIndex = aTypeMgr.pActualBullets[i]->nIndex;
//index in the tab page display
- pActualBullets[i]->nIndexDefault =
aTypeMgr.pActualBullets[i]->nIndexDefault;
+ pActualBullets[i]->eType =
MixBulletsTypeMgr::pActualBullets[i]->eType;
+ pActualBullets[i]->nIndex =
MixBulletsTypeMgr::pActualBullets[i]->nIndex; //index in the tab page display
+ pActualBullets[i]->nIndexDefault =
MixBulletsTypeMgr::pActualBullets[i]->nIndexDefault;
pActualBullets[i]->pBullets = new
GrfBulDataRelation(eNBType::GRAPHICBULLETS) ;
-
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sGrfName =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->sGrfName;
-
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sDescription =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->sDescription;
-
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->bIsCustomized =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized;
-
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->eType =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->eType;
- if (
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->bIsCustomized
&&
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj
!= nullptr)
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sGrfName =
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->sGrfName;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->sDescription =
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->sDescription;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->bIsCustomized =
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->bIsCustomized;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->eType =
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->eType;
+ if (
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->bIsCustomized
&&
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->pGrfObj
!= nullptr)
{
-
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->pGrfObj =
static_cast<GrfBulDataRelation*>(aTypeMgr.pActualBullets[i]->pBullets)->pGrfObj;
+
static_cast<GrfBulDataRelation*>(pActualBullets[i]->pBullets)->pGrfObj =
static_cast<GrfBulDataRelation*>(MixBulletsTypeMgr::pActualBullets[i]->pBullets)->pGrfObj;
}
}
}
commit 9bef4b9584eddcc19540c9a825b575c8409de7fc
Author: Noel Grandin <n...@peralex.com>
Date: Thu Aug 25 09:35:18 2016 +0200
cid#1371336 Misused comma operator
Change-Id: I0aaf7dd1075ba9fe323f6a0e1b69203a57a8c7b7
diff --git a/sc/source/filter/lotus/filter.cxx
b/sc/source/filter/lotus/filter.cxx
index 5ca3f52..6a7bf21 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -47,11 +47,11 @@ generate_Opcodes(LotusContext &rContext, SvStream& aStream,
{
case eWK_1:
case eWK_2:
- pOps = rContext.pOpFkt;
+ pOps = LotusContext::pOpFkt;
nOps = FKT_LIMIT;
break;
case eWK123:
- pOps = rContext.pOpFkt123;
+ pOps = LotusContext::pOpFkt123;
nOps = FKT_LIMIT123;
break;
case eWK3: return eERR_NI;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
