loplugin:unnecessaryparen include more assignments

Change-Id: I9fb8366634b31230b732dd38a98f800075529714
Reviewed-on: https://gerrit.libreoffice.org/64510
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-12-05 07:49:30 +01:00
parent 126e5a4d5b
commit e4472d3c13
180 changed files with 481 additions and 452 deletions
@@ -222,7 +222,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil
ensureIsAlive();
ensureIsValidIndex( nChildIndex );
sal_Int32 nColumns = m_aTable.GetColumnCount();
sal_Int32 nRow = (nChildIndex / nColumns);
sal_Int32 nRow = nChildIndex / nColumns;
m_aTable.SelectRow( nRow, true );
}
sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
@@ -232,7 +232,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int
ensureIsAlive();
ensureIsValidIndex( nChildIndex );
sal_Int32 nColumns = m_aTable.GetColumnCount();
sal_Int32 nRow = (nChildIndex / nColumns);
sal_Int32 nRow = nChildIndex / nColumns;
return isAccessibleRowSelected(nRow);
}
void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
@@ -1095,7 +1095,7 @@ namespace accessibility
{
::osl::MutexGuard aGuard( m_aMutex );
Any aValue;
sal_Int32 level = (static_cast<sal_Int32>(m_aEntryPath.size()) - 1);
sal_Int32 level = static_cast<sal_Int32>(m_aEntryPath.size()) - 1;
level = level < 0 ? 0: level;
aValue <<= level;
return aValue;
+2 -2
View File
@@ -1172,8 +1172,8 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle ) // not wor
double nPaperSzHeight = aPaperSz.Height();
double nBmpSzWidth = aBmpSz.Width();
double nBmpSzHeight = aBmpSz.Height();
double nScaleX = (nPaperSzWidth / nBmpSzWidth );
double nScaleY = (nPaperSzHeight / nBmpSzHeight );
double nScaleX = nPaperSzWidth / nBmpSzWidth;
double nScaleY = nPaperSzHeight / nBmpSzHeight;
Size aOutputSz;
if( nBmpSzHeight * nScaleX <= nPaperSzHeight )
+8 -8
View File
@@ -583,11 +583,11 @@ namespace basegfx
// to bring 't' into the [0<=x<=1] interval.
::basegfx::B2DPoint dir((*next)-(*curr));
double denominator = ( pPlane->nx*dir.getX() +
pPlane->ny*dir.getY() );
double numerator = ( pPlane->nx*curr->getX() +
double denominator = pPlane->nx*dir.getX() +
pPlane->ny*dir.getY();
double numerator = pPlane->nx*curr->getX() +
pPlane->ny*curr->getY() +
pPlane->d );
pPlane->d;
double t = -numerator/denominator;
// calculate the actual point of intersection
@@ -602,11 +602,11 @@ namespace basegfx
// to bring 't' into the [0<=x<=1] interval.
::basegfx::B2DPoint dir((*next)-(*curr));
double denominator = ( pPlane->nx*dir.getX() +
pPlane->ny*dir.getY() );
double numerator = ( pPlane->nx*curr->getX() +
double denominator = pPlane->nx*dir.getX() +
pPlane->ny*dir.getY();
double numerator = pPlane->nx*curr->getX() +
pPlane->ny*curr->getY() +
pPlane->d );
pPlane->d;
double t = -numerator/denominator;
// calculate the actual point of intersection
+1 -1
View File
@@ -200,7 +200,7 @@ void SbiParser::Open()
if( Peek() == WRITE )
{
Next();
nMode |= (StreamMode::READ | StreamMode::WRITE);
nMode |= StreamMode::READ | StreamMode::WRITE;
}
else
nMode |= StreamMode::READ;
+3 -3
View File
@@ -3626,7 +3626,7 @@ void SbRtl_Shell(StarBASIC *, SbxArray & rPar, bool)
pParamList.reset( new rtl_uString*[nParamCount]);
for(int iVector = 0; iter != aTokenVector.end(); ++iVector, ++iter)
{
const OUString& rParamStr = (*iter);
const OUString& rParamStr = *iter;
pParamList[iVector] = nullptr;
rtl_uString_assign(&(pParamList[iVector]), rParamStr.pData);
}
@@ -4636,7 +4636,7 @@ void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool)
if( nLen > nLen1 )
{
// appending the leading spaces for the lowervalue
for ( sal_Int32 i= (nLen - nLen1) ; i > 0; --i )
for ( sal_Int32 i= nLen - nLen1; i > 0; --i )
{
aRetStr.append(" ");
}
@@ -4645,7 +4645,7 @@ void SbRtl_Partition(StarBASIC *, SbxArray & rPar, bool)
if( nLen > nLen2 )
{
// appending the leading spaces for the uppervalue
for ( sal_Int32 i= (nLen - nLen2) ; i > 0; --i )
for ( sal_Int32 i= nLen - nLen2; i > 0; --i )
{
aRetStr.append(" ");
}
@@ -56,7 +56,7 @@ static OUString toUNOname( char const * p )
while (*p != 'E')
{
// read chars count
int n = (*p++ - '0');
int n = *p++ - '0';
while ('0' <= *p && '9' >= *p)
{
n *= 10;
@@ -81,7 +81,7 @@ static OUString toUNOname( char const * p )
extern "C" {
static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
{
__cxxabiv1::__cxa_exception const * header = (static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1);
__cxxabiv1::__cxa_exception const * header = static_cast<__cxxabiv1::__cxa_exception const *>(pExc) - 1;
typelib_TypeDescription * pTD = nullptr;
OUString unoName( toUNOname( header->exceptionType->name() ) );
::typelib_typedescription_getByName( &pTD, unoName.pData );
+1 -1
View File
@@ -71,7 +71,7 @@ namespace cairocanvas
const Size aSize = pOutDev->GetFontMetric( *maFont ).GetFontSize();
const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
double fStretch = rFontMatrix.m00 + rFontMatrix.m01;
if( !::basegfx::fTools::equalZero( fDividend) )
fStretch /= fDividend;
+1 -1
View File
@@ -709,7 +709,7 @@ namespace oglcanvas
{
const Size aSize = pVDev->GetFontMetric( aFont ).GetFontSize();
const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
double fStretch = rFontMatrix.m00 + rFontMatrix.m01;
if( !::basegfx::fTools::equalZero( fDividend) )
fStretch /= fDividend;
+1 -1
View File
@@ -71,7 +71,7 @@ namespace vclcanvas
const Size aSize = rOutDev.GetFontMetric( *maFont ).GetFontSize();
const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
double fStretch = rFontMatrix.m00 + rFontMatrix.m01;
if( !::basegfx::fTools::equalZero( fDividend) )
fStretch /= fDividend;
@@ -335,7 +335,7 @@ Any WrappedSegmentOffsetProperty::convertOuterToInnerValue( const Any& rOuterVal
Any aResult( rOuterValue );
if( rOuterValue >>= nOffset )
aResult <<= (static_cast< double >( nOffset ) / 100.0);
aResult <<= static_cast< double >( nOffset ) / 100.0;
return aResult;
}
@@ -420,7 +420,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
(rSubIncrements[ 0 ].IntervalCount >>= nIntervalCount) &&
nIntervalCount > 0 )
{
aRet <<= ( fStepMain / static_cast< double >( nIntervalCount ) );
aRet <<= fStepMain / static_cast< double >( nIntervalCount );
bNeedToCalculateExplicitValues = false;
}
}
@@ -448,9 +448,9 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
}
}
else
aRet <<= ( aExplicitIncrement.Distance /
aRet <<= aExplicitIncrement.Distance /
static_cast< double >(
aExplicitIncrement.SubIncrements[ 0 ].IntervalCount ));
aExplicitIncrement.SubIncrements[ 0 ].IntervalCount );
}
else
{
@@ -59,7 +59,7 @@ Any WrappedTextRotationProperty::convertOuterToInnerValue( const Any& rOuterValu
sal_Int32 nVal = 0;
if( rOuterValue >>= nVal )
{
double fDoubleDegrees = ( static_cast< double >( nVal ) / 100.0 );
double fDoubleDegrees = static_cast< double >( nVal ) / 100.0;
aRet <<= fDoubleDegrees;
}
return aRet;
@@ -148,7 +148,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
// @todo: using implicit knowledge that ranges can be
// merged with ";". This should be done more general
pCellRange->Value <<= (aOldRange + ";" + aRangeString );
pCellRange->Value <<= aOldRange + ";" + aRangeString;
}
// move means replace range
else
@@ -87,7 +87,7 @@ void DragMethod_PieSegment::MoveSdrDrag(const Point& rPnt)
if( DragStat().CheckMinMoved(rPnt) )
{
//calculate new offset
B2DVector aShiftVector(( B2DVector( rPnt.X(), rPnt.Y() ) - m_aStartVector ));
B2DVector aShiftVector( B2DVector( rPnt.X(), rPnt.Y() ) - m_aStartVector );
m_fAdditionalOffset = m_aDragDirection.scalar( aShiftVector )/m_fDragRange; // projection
if( m_fAdditionalOffset < -m_fInitialOffset )
@@ -66,9 +66,9 @@ void UndoCommandDispatch::fireStatusEvent(
const bool bFireAll = rURL.isEmpty();
uno::Any aUndoState, aRedoState;
if( m_xUndoManager->isUndoPossible())
aUndoState <<= ( SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle());
aUndoState <<= SvtResId( STR_UNDO ) + m_xUndoManager->getCurrentUndoActionTitle();
if( m_xUndoManager->isRedoPossible())
aRedoState <<= ( SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle());
aRedoState <<= SvtResId( STR_REDO ) + m_xUndoManager->getCurrentRedoActionTitle();
if( bFireAll || rURL == ".uno:Undo" )
fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener );
+1 -1
View File
@@ -612,7 +612,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
nMaxMainIncrementCount--;
//choose major time interval:
long nDayCount = (aMaxDate-aMinDate);
long nDayCount = aMaxDate - aMinDate;
long nMainIncrementCount = 1;
if( !bAutoMajor )
{
+2 -2
View File
@@ -158,7 +158,7 @@ void lcl_SplineCalculation::Calculate()
else
{
m_aSecDerivY[ 0 ] = -0.5;
double xDiff = ( m_aPoints[ 1 ].first - m_aPoints[ 0 ].first );
double xDiff = m_aPoints[ 1 ].first - m_aPoints[ 0 ].first;
u[ 0 ] = ( 3.0 / xDiff ) *
((( m_aPoints[ 1 ].second - m_aPoints[ 0 ].second ) / xDiff ) - m_fYp1 );
}
@@ -193,7 +193,7 @@ void lcl_SplineCalculation::Calculate()
if( ! ::rtl::math::isInf( m_fYpN ) )
{
qn = 0.5;
double xDiff = ( m_aPoints[ n ].first - m_aPoints[ n - 1 ].first );
double xDiff = m_aPoints[ n ].first - m_aPoints[ n - 1 ].first;
un = ( 3.0 / xDiff ) *
( m_fYpN - ( m_aPoints[ n ].second - m_aPoints[ n - 1 ].second ) / xDiff );
}
+12 -12
View File
@@ -202,7 +202,7 @@ void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal
{
for (sal_Int32 nColumn = 0; nColumn < nNumberOfColumns; ++nColumn )
{
sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry < nNumberOfEntries )
{
awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() );
@@ -228,7 +228,7 @@ void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int3
sal_Int32 nCurrentRowHeight = 0;
for (sal_Int32 nColumn = 0; nColumn < nNumberOfColumns; ++nColumn)
{
sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry < nNumberOfEntries )
{
awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() );
@@ -397,7 +397,7 @@ awt::Size lcl_placeLegendEntries(
{
for (sal_Int32 nColumn = nNumberOfColumns; nColumn--; )
{
sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry < static_cast<sal_Int32>(aTextShapes.size()) )
{
DrawModelWrapper::removeShape( aTextShapes[nEntry] );
@@ -526,7 +526,7 @@ awt::Size lcl_placeLegendEntries(
sal_Int32 nCurrentYPos = nYPadding + nYStartPosition;
for (sal_Int32 nRow = 0; nRow < nNumberOfRows; ++nRow)
{
sal_Int32 nEntry = (nColumn + nRow * nNumberOfColumns);
sal_Int32 nEntry = nColumn + nRow * nNumberOfColumns;
if( nEntry >= nNumberOfEntries )
break;
@@ -625,8 +625,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_LINE_START:
{
// #i109336# Improve auto positioning in chart
const double fDefaultDistance = ( static_cast< double >( lcl_getLegendLeftRightMargin() ) /
static_cast< double >( rPageSize.Width ) );
const double fDefaultDistance = static_cast< double >( lcl_getLegendLeftRightMargin() ) /
static_cast< double >( rPageSize.Width );
aResult = chart2::RelativePosition(
fDefaultDistance, 0.5, drawing::Alignment_LEFT );
}
@@ -634,8 +634,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_LINE_END:
{
// #i109336# Improve auto positioning in chart
const double fDefaultDistance = ( static_cast< double >( lcl_getLegendLeftRightMargin() ) /
static_cast< double >( rPageSize.Width ) );
const double fDefaultDistance = static_cast< double >( lcl_getLegendLeftRightMargin() ) /
static_cast< double >( rPageSize.Width );
aResult = chart2::RelativePosition(
1.0 - fDefaultDistance, 0.5, drawing::Alignment_RIGHT );
}
@@ -643,8 +643,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_PAGE_START:
{
// #i109336# Improve auto positioning in chart
const double fDefaultDistance = ( static_cast< double >( lcl_getLegendTopBottomMargin() ) /
static_cast< double >( rPageSize.Height ) );
const double fDefaultDistance = static_cast< double >( lcl_getLegendTopBottomMargin() ) /
static_cast< double >( rPageSize.Height );
double fDistance = (static_cast<double>(rOutAvailableSpace.Y)/static_cast<double>(rPageSize.Height)) + fDefaultDistance;
aResult = chart2::RelativePosition(
0.5, fDistance, drawing::Alignment_TOP );
@@ -653,8 +653,8 @@ chart2::RelativePosition lcl_getDefaultPosition( LegendPosition ePos, const awt:
case LegendPosition_PAGE_END:
{
// #i109336# Improve auto positioning in chart
const double fDefaultDistance = ( static_cast< double >( lcl_getLegendTopBottomMargin() ) /
static_cast< double >( rPageSize.Height ) );
const double fDefaultDistance = static_cast< double >( lcl_getLegendTopBottomMargin() ) /
static_cast< double >( rPageSize.Height );
double fDistance = double(rPageSize.Height - (rOutAvailableSpace.Y + rOutAvailableSpace.Height));
fDistance += fDefaultDistance;
+2 -2
View File
@@ -728,12 +728,12 @@ OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
SfxFilterFlags nFlags = static_cast<SfxFilterFlags>(aPropsHM.getUnpackedValueOrDefault( "Flags", sal_Int32(0) ));
// that should be import, export, own filter and not a template filter ( TemplatePath flag )
SfxFilterFlags const nRequired = (SfxFilterFlags::OWN
SfxFilterFlags const nRequired = SfxFilterFlags::OWN
// fdo#78159 for OOoXML, there is code to convert
// to ODF in OCommonEmbeddedObject::store*
// so accept it even though there's no export
| (SOFFICE_FILEFORMAT_60 == nVersion ? SfxFilterFlags::NONE : SfxFilterFlags::EXPORT)
| SfxFilterFlags::IMPORT );
| SfxFilterFlags::IMPORT;
if ( ( ( nFlags & nRequired ) == nRequired ) && !( nFlags & SfxFilterFlags::TEMPLATEPATH ) )
{
// if there are more than one filter the preferred one should be used
@@ -9,6 +9,7 @@
#include <string>
#include <rtl/ustring.hxx>
#include <o3tl/typed_flags_set.hxx>
#define MACRO (1)
@@ -18,6 +19,20 @@ enum class EFoo { Bar };
struct S { operator bool(); };
enum class BrowseMode
{
Modules = 0x01,
Top = 0x02,
Bottom = 0x04,
Left = 0x04,
};
namespace o3tl
{
template <> struct typed_flags<BrowseMode> : is_typed_flags<BrowseMode, 0xf>
{
};
}
int main()
{
int x = 1;
@@ -94,15 +109,9 @@ int main()
char *p = nullptr;
delete (p); // expected-error {{parentheses immediately inside delete expr [loplugin:unnecessaryparen]}}
};
struct S2 {
S2& GetText();
void toChar();
};
void func2(S2 *p)
{
(p->GetText()).toChar(); // expected-error {{unnecessary parentheses around member expr [loplugin:unnecessaryparen]}}
BrowseMode nBits = ( BrowseMode::Modules | BrowseMode::Top ); // expected-error {{parentheses immediately inside vardecl statement [loplugin:unnecessaryparen]}}
(void)nBits;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
+31 -9
View File
@@ -386,7 +386,6 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callE
Opc != OO_AmpEqual && Opc != OO_CaretEqual &&
Opc != OO_PipeEqual)
return true;
auto parenExpr = dyn_cast<ParenExpr>(ignoreAllImplicit(callExpr->getArg(1)));
if (!parenExpr)
return true;
@@ -395,9 +394,18 @@ bool UnnecessaryParen::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callE
// Sometimes parentheses make the RHS of an assignment easier to read by
// visually disambiguating the = from a call to ==
auto sub = parenExpr->getSubExpr();
if (isa<BinaryOperator>(sub)
|| isa<CXXOperatorCallExpr>(sub)
|| isa<ConditionalOperator>(sub))
if (auto subBinOp = dyn_cast<BinaryOperator>(sub))
{
if (!(subBinOp->isMultiplicativeOp() || subBinOp->isAdditiveOp() || subBinOp->isPtrMemOp()))
return true;
}
if (auto subOperatorCall = dyn_cast<CXXOperatorCallExpr>(sub))
{
auto op = subOperatorCall->getOperator();
if (!((op >= OO_Plus && op <= OO_Exclaim) || (op >= OO_ArrowStar && op <= OO_Subscript)))
return true;
}
if (isa<ConditionalOperator>(sub))
return true;
report(
@@ -420,12 +428,26 @@ bool UnnecessaryParen::VisitVarDecl(const VarDecl* varDecl)
return true;
if (compat::getBeginLoc(parenExpr).isMacroID())
return true;
// Sometimes parentheses make the RHS of an assignment easier to read by
// visually disambiguating the = from a call to ==
auto sub = parenExpr->getSubExpr();
if (isa<BinaryOperator>(sub)
|| isa<CXXOperatorCallExpr>(sub)
|| isa<ConditionalOperator>(sub)
// these two are for "parentheses were disambiguated as a function declaration [-Werror,-Wvexing-parse]"
|| isa<CXXBindTemporaryExpr>(sub)
if (auto subBinOp = dyn_cast<BinaryOperator>(sub))
{
if (!(subBinOp->isMultiplicativeOp() || subBinOp->isAdditiveOp() || subBinOp->isPtrMemOp()))
return true;
}
if (auto subOperatorCall = dyn_cast<CXXOperatorCallExpr>(sub))
{
auto op = subOperatorCall->getOperator();
if (!((op >= OO_Plus && op <= OO_Exclaim) || (op >= OO_ArrowStar && op <= OO_Subscript)))
return true;
}
if (isa<ConditionalOperator>(sub))
return true;
// these two are for "parentheses were disambiguated as a function declaration [-Werror,-Wvexing-parse]"
if (isa<CXXBindTemporaryExpr>(sub)
|| isa<CXXFunctionalCastExpr>(sub))
return true;
@@ -439,7 +439,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
ONDXNode aResultNode;
if (IsLeaf())
{
for (sal_uInt16 i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
for (sal_uInt16 i = nCount - (nCount / 2), j = 0 ; i < nCount; i++)
rPage.Insert(j++,(*this)[i]);
// this node contains a key that already exists in the tree and must be replaced
@@ -1556,7 +1556,7 @@ void OResultSet::clearInsertRow()
const OValueRefVector::Vector::const_iterator aEnd = m_aInsertRow->get().end();
for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos)
{
ORowSetValueDecoratorRef& rValue = (*aIter);
ORowSetValueDecoratorRef& rValue = *aIter;
if ( rValue->isBound() )
{
(m_aRow->get())[nPos]->setValue( (*aIter)->getValue() );
@@ -318,7 +318,7 @@ extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Nativ
"One byte is < 0");
return -1;
}
jint nRet = ((ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0));
jint nRet = (ch[0] << 24) + (ch[1] << 16) + (ch[2] << 8) + (ch[3] << 0);
#ifdef HSQLDB_DBG
DataLogFile aDataLog( env, name, "data" );
aDataLog.write( nRet );
+1 -1
View File
@@ -946,7 +946,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void)
// calc visible area
long const nScrollOffset = m_pScrollWindow->GetScrollOffset();
long nThumbPos = m_pVScroll->GetThumbPos();
long const nWinTop = (nThumbPos * nScrollOffset);
long const nWinTop = nThumbPos * nScrollOffset;
long const nWinBottom = nWinTop + nWinHeight;
long const nCtrlPosY = rCtrl.GetPosPixel().Y();
+2 -2
View File
@@ -233,7 +233,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
OSL_ENSURE( pTemp != reinterpret_cast<void*>(0xfeeefeee),"HALT!" );
}
OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow < m_pCache->getEnd() && aCacheIter != m_pCache->m_aCacheIterators.end(),"Invalid iterator set for currentrow!");
ORowSetRow rRow = (*m_aCurrentRow);
ORowSetRow rRow = *m_aCurrentRow;
OSL_ENSURE(rRow.is() && static_cast<sal_uInt16>(columnIndex) < (rRow->get()).size(),"Invalid size of vector!");
#endif
return ((*m_aCurrentRow)->get())[m_nLastColumnIndex = columnIndex];
@@ -1038,7 +1038,7 @@ void ORowSetBase::setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow
m_bIsInsertRow = false;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
#if OSL_DEBUG_LEVEL > 0
ORowSetRow rRow = (*m_aCurrentRow);
ORowSetRow rRow = *m_aCurrentRow;
OSL_ENSURE(rRow.is() ,"Invalid size of vector!");
#endif
+5 -5
View File
@@ -393,12 +393,12 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
if ( !aCacheIter->second.pRowSet->isInsertRow()
/*&& aCacheIter->second.aIterator != m_pMatrix->end()*/ && !m_bModified )
{
ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin();
aPositions.push_back(nDist);
aCacheIterToChange[aCacheIter->first] = true;
}
}
sal_Int32 nKeyPos = (m_aMatrixIter - m_pMatrix->begin());
sal_Int32 nKeyPos = m_aMatrixIter - m_pMatrix->begin();
m_pMatrix->resize(_nSize);
if ( nKeyPos < _nSize )
@@ -919,7 +919,7 @@ void ORowSetCache::moveWindow()
if ( !aCacheIter->second.pRowSet->isInsertRow()
&& aCacheIter->second.aIterator != m_pMatrix->end() )
{
const ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
const ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin();
if ( nDist >= nOverlapSize )
{
// That's from outside the overlap area; invalidate iterator.
@@ -1458,7 +1458,7 @@ void ORowSetCache::rotateCacheIterator(ORowSetMatrix::difference_type _nDist)
if ( !aCacheIter->second.pRowSet->isInsertRow()
&& aCacheIter->second.aIterator != m_pMatrix->end())
{
ptrdiff_t nDist = (aCacheIter->second.aIterator - m_pMatrix->begin());
ptrdiff_t nDist = aCacheIter->second.aIterator - m_pMatrix->begin();
if(nDist < _nDist)
{
aCacheIter->second.aIterator = m_pMatrix->end();
@@ -1497,7 +1497,7 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo
if(!m_aInsertRow->is())
*m_aInsertRow = new ORowSetValueVector(m_xMetaData->getColumnCount());
(*(*m_aInsertRow)) = (*(*_rOriginalRow));
(*(*m_aInsertRow)) = *(*_rOriginalRow);
// we don't unbound the bookmark column
ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin();
ORowSetValueVector::Vector::const_iterator aEnd = (*m_aInsertRow)->get().end();
@@ -354,7 +354,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin )
auto aIter = m_vTableConnection.rbegin();
while(aIter != m_vTableConnection.rend() && bRemove)
{
VclPtr<OTableConnection>& rTabConn = (*aIter);
VclPtr<OTableConnection>& rTabConn = *aIter;
if (
(pData == rTabConn->GetData()->getReferencingTable()) ||
(pData == rTabConn->GetData()->getReferencedTable())
+2 -2
View File
@@ -235,7 +235,7 @@ void OTableEditorInsUndoAct::Undo()
{
// delete lines again
std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
for( long i=(m_nInsPos+m_vInsertedRows.size()-1); i>(m_nInsPos-1); i-- )
for( long i=m_nInsPos+m_vInsertedRows.size()-1; i>(m_nInsPos-1); i-- )
{
pOriginalRows->erase(pOriginalRows->begin()+i);
}
@@ -282,7 +282,7 @@ void OTableEditorInsNewUndoAct::Undo()
// delete inserted lines
std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
for( long i=(m_nInsPos+m_nInsRows-1); i>(m_nInsPos-1); i-- )
for( long i=m_nInsPos+m_nInsRows-1; i>(m_nInsPos-1); i-- )
{
pOriginalRows->erase(pOriginalRows->begin()+i);
}
+1 -1
View File
@@ -245,7 +245,7 @@ static OUString CreateMD5FromString( const OUString& aMsg )
if ( handle )
{
const sal_uInt8* pData = reinterpret_cast<const sal_uInt8*>(aMsg.getStr());
sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode ));
sal_uInt32 nSize = aMsg.getLength() * sizeof( sal_Unicode );
sal_uInt32 nMD5KeyLen = rtl_digest_queryLength( handle );
std::unique_ptr<sal_uInt8[]> pMD5KeyBuffer(new sal_uInt8[ nMD5KeyLen ]);
+1 -1
View File
@@ -106,7 +106,7 @@ const OUString OfficePipeId::operator () ()
sal_uInt8 const * data =
reinterpret_cast<sal_uInt8 const *>(userPath.getStr());
std::size_t size = (userPath.getLength() * sizeof (sal_Unicode));
std::size_t size = userPath.getLength() * sizeof (sal_Unicode);
sal_uInt32 md5_key_len = rtl_digest_queryLength( digest );
std::unique_ptr<sal_uInt8[]> md5_buf( new sal_uInt8 [ md5_key_len ] );
@@ -143,7 +143,7 @@ BackendImpl::PackageImpl::PackageImpl(
sal_Int32 segmEnd = url.getLength();
if ( url.endsWith("/") )
--segmEnd;
sal_Int32 segmStart = (url.lastIndexOf( '/', segmEnd ) + 1);
sal_Int32 segmStart = url.lastIndexOf( '/', segmEnd ) + 1;
if (segmStart < 0)
segmStart = 0;
// name and display name default the same:
@@ -139,7 +139,7 @@ namespace drawinglayer
if(basegfx::fTools::more(fCosFac, 0.0))
{
aRetval += ((rLight.getColor() * rColor) * fCosFac);
aRetval += (rLight.getColor() * rColor) * fCosFac;
if(rLight.getSpecular())
{
@@ -151,7 +151,7 @@ namespace drawinglayer
if(basegfx::fTools::more(fCosFac2, 0.0))
{
fCosFac2 = pow(fCosFac2, static_cast<double>(nSpecularIntensity));
aRetval += (rSpecular * fCosFac2);
aRetval += rSpecular * fCosFac2;
}
}
}
+1 -1
View File
@@ -417,7 +417,7 @@ void EditUndoMoveParagraphs::Undo()
Range aTmpRange( nParagraphs );
long nTmpDest = aTmpRange.Min();
long nDiff = ( nDest - aTmpRange.Min() );
long nDiff = nDest - aTmpRange.Min();
aTmpRange.Min() += nDiff;
aTmpRange.Max() += nDiff;
+2 -2
View File
@@ -460,7 +460,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara )
nCurDepth = nTabs-1; //TODO: sal_Int32 -> sal_Int16!
ImplCheckDepth( nCurDepth );
pPara->SetDepth( nCurDepth );
pPara->nFlags &= (~ParaFlag::HOLDDEPTH);
pPara->nFlags &= ~ParaFlag::HOLDDEPTH;
}
}
if( nPos ) // not with the first paragraph
@@ -1850,7 +1850,7 @@ void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRec
if (pPara->GetText() != aBulletText)
pPara->SetText( aBulletText );
pPara->nFlags &= (~ParaFlag::SETBULLETTEXT);
pPara->nFlags &= ~ParaFlag::SETBULLETTEXT;
if ( bRecalcLevel )
{
+2 -2
View File
@@ -131,7 +131,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = "Update";
aStateEvent.IsEnabled = true;
aStateEvent.Requery = false;
aStateEvent.State <<= ( "($1) " + m_pDocHolder->GetTitle() );
aStateEvent.State <<= "($1) " + m_pDocHolder->GetTitle();
Control->statusChanged(aStateEvent);
{
@@ -154,7 +154,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = "Close and Return";
aStateEvent.IsEnabled = true;
aStateEvent.Requery = false;
aStateEvent.State <<= ( "($2)" + m_pDocHolder->GetContainerName() );
aStateEvent.State <<= "($2)" + m_pDocHolder->GetContainerName();
Control->statusChanged(aStateEvent);
+2 -2
View File
@@ -128,7 +128,7 @@ void CGMFList::InsertName( sal_uInt8 const * pSource, sal_uInt32 nSize )
if ( pFound )
{
pFontEntry->nFontType |= 1;
sal_uInt32 nPrev = ( pFound - pBuf.get() );
sal_uInt32 nPrev = pFound - pBuf.get();
sal_uInt32 nToCopyOfs = 6;
if ( nPrev && ( pFound[ -1 ] == '-' || pFound[ -1 ] == ' ' ) )
{
@@ -148,7 +148,7 @@ void CGMFList::InsertName( sal_uInt8 const * pSource, sal_uInt32 nSize )
{
pFontEntry->nFontType |= 2;
sal_uInt32 nPrev = ( pFound - pBuf.get() );
sal_uInt32 nPrev = pFound - pBuf.get();
sal_uInt32 nToCopyOfs = 4;
if ( nPrev && ( pFound[ -1 ] == '-' || pFound[ -1 ] == ' ' ) )
{
+2 -2
View File
@@ -84,11 +84,11 @@ namespace PictReaderShape {
{ dest.X()+pSize.Width(), dest.Y()+pSize.Height() },
{ dest.X(), dest.Y()+pSize.Height() }};
for (int w = origAvoid+1; w < origAvoid+4; w++) {
int wh = (w%4);
int wh = w%4;
poly.append(B2DPoint(origPt[wh][0], origPt[wh][1]));
}
for (int w = origAvoid+3; w < origAvoid+6; w++) {
int wh = (w%4);
int wh = w%4;
poly.append(B2DPoint(destPt[wh][0], destPt[wh][1]));
}
int wh = (origAvoid+1)%4;
+1 -1
View File
@@ -1319,7 +1319,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(const uno::Reference<drawi
if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "VisibleArea" ) )
{
pVisArea.reset(new awt::Rectangle);
aAny >>= (*pVisArea);
aAny >>= *pVisArea;
}
sal_uInt32 nBlibId = pGraphicProvider->GetBlibID( *pPicOutStrm, rGraphicObj, pVisArea.get() );
if ( nBlibId )
+1 -1
View File
@@ -5708,7 +5708,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T
}
}
pAcc.reset();
sal_uInt32 nC = ( aSize.Width() * aSize.Height() );
sal_uInt32 nC = aSize.Width() * aSize.Height();
nRt /= nC;
nGn /= nC;
nBl /= nC;
@@ -2456,7 +2456,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
{
if ( isHorizontalDockingArea( nDockingArea ))
{
sal_Int32 nMaxReducation = ( rWinRect.Width - aMinSize.Width() );
sal_Int32 nMaxReducation = rWinRect.Width - aMinSize.Width();
if ( nMaxReducation >= -nDiff )
{
rWinRect.Width = rWinRect.Width + nDiff;
@@ -2474,7 +2474,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
}
else
{
sal_Int32 nMaxReducation = ( rWinRect.Height - aMinSize.Height() );
sal_Int32 nMaxReducation = rWinRect.Height - aMinSize.Height();
if ( nMaxReducation >= -nDiff )
{
rWinRect.Height = rWinRect.Height + nDiff;
+1 -1
View File
@@ -4039,7 +4039,7 @@ bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
nFreeSpace = aInfo.getFreeSpace();
}
sal_uInt64 nFreeMB = (nFreeSpace/1048576);
sal_uInt64 nFreeMB = nFreeSpace/1048576;
return (nFreeMB >= static_cast<sal_uInt64>(nRequiredSpace));
#endif // SIMULATE_FULL_DISC
}
+1 -1
View File
@@ -389,7 +389,7 @@ public:
ScRecalcMode GetRecalcMode() const { return nMode; }
void SetCombinedBitsRecalcMode( ScRecalcMode nBits )
{ nMode |= (nBits & ~ScRecalcMode::EMask); }
{ nMode |= nBits & ~ScRecalcMode::EMask; }
ScRecalcMode GetCombinedBitsRecalcMode() const
{ return nMode & ~ScRecalcMode::EMask; }
+1 -1
View File
@@ -89,7 +89,7 @@ class SvxIconChoiceCtrlEntry
sal_uInt16 nX,nY; // for keyboard control
SvxIconViewFlags nFlags;
void ClearFlags( SvxIconViewFlags nMask ) { nFlags &= (~nMask); }
void ClearFlags( SvxIconViewFlags nMask ) { nFlags &= ~nMask; }
void SetFlags( SvxIconViewFlags nMask ) { nFlags |= nMask; }
void AssignFlags( SvxIconViewFlags _nFlags ) { nFlags = _nFlags; }
+4 -4
View File
@@ -173,7 +173,7 @@ inline void SelectionEngine::SetAddMode( bool bNewMode )
if ( bNewMode )
nFlags |= SelectionEngineFlags::IN_ADD;
else
nFlags &= (~SelectionEngineFlags::IN_ADD);
nFlags &= ~SelectionEngineFlags::IN_ADD;
}
inline void SelectionEngine::EnableDrag( bool bOn )
@@ -181,7 +181,7 @@ inline void SelectionEngine::EnableDrag( bool bOn )
if ( bOn )
nFlags |= SelectionEngineFlags::DRG_ENAB;
else
nFlags &= (~SelectionEngineFlags::DRG_ENAB);
nFlags &= ~SelectionEngineFlags::DRG_ENAB;
}
inline void SelectionEngine::AddAlways( bool bOn )
@@ -189,7 +189,7 @@ inline void SelectionEngine::AddAlways( bool bOn )
if( bOn )
nFlags |= SelectionEngineFlags::ADD_ALW;
else
nFlags &= (~SelectionEngineFlags::ADD_ALW);
nFlags &= ~SelectionEngineFlags::ADD_ALW;
}
inline bool SelectionEngine::IsAlwaysAdding() const
@@ -221,7 +221,7 @@ inline void SelectionEngine::SetAnchor( bool bAnchor )
if ( bAnchor )
nFlags |= SelectionEngineFlags::HAS_ANCH;
else
nFlags &= (~SelectionEngineFlags::HAS_ANCH);
nFlags &= ~SelectionEngineFlags::HAS_ANCH;
}
#endif // INCLUDED_VCL_SELENG_HXX
+2 -2
View File
@@ -34,8 +34,8 @@
#include <limits.h>
const sal_uInt16 XML_NAMESPACE_XMLNS = (USHRT_MAX-2);
const sal_uInt16 XML_NAMESPACE_NONE = (USHRT_MAX-1);
const sal_uInt16 XML_NAMESPACE_XMLNS = USHRT_MAX-2;
const sal_uInt16 XML_NAMESPACE_NONE = USHRT_MAX-1;
const sal_uInt16 XML_NAMESPACE_UNKNOWN = USHRT_MAX;
const sal_uInt16 XML_NAMESPACE_UNKNOWN_FLAG = 0x8000;
+3 -3
View File
@@ -72,13 +72,13 @@
// 01/19/2005
const sal_uInt32 UNITS_PER_INCH = 65536L * 72L;
const double CM_PER_INCH = 2.54;
const double INCHT_PER_CM = (1.0 / CM_PER_INCH);
const double INCHT_PER_CM = 1.0 / CM_PER_INCH;
//end
const double POINTS_PER_INCH = 72.27;
const double TWIPS_PER_POINT = 20.0;
const double TWIPS_PER_INCH = (TWIPS_PER_POINT * POINTS_PER_INCH);
const double TWIPS_PER_CM = (TWIPS_PER_INCH/CM_PER_INCH);
const double TWIPS_PER_INCH = TWIPS_PER_POINT * POINTS_PER_INCH;
const double TWIPS_PER_CM = TWIPS_PER_INCH/CM_PER_INCH;
/**
* @brief tool class (unicode, conversion) for lwp filter.
*/
+1 -1
View File
@@ -460,7 +460,7 @@ void DrawingML::WriteGrabBagGradientFill( const Sequence< PropertyValue >& aGrad
if( sSchemeClr.isEmpty() )
{
// Calculate alpha value (see oox/source/drawingml/color.cxx : getTransparency())
sal_Int32 nAlpha = (MAX_PERCENT - ( PER_PERCENT * nTransparency ) );
sal_Int32 nAlpha = MAX_PERCENT - ( PER_PERCENT * nTransparency );
WriteColor( nRgbClr, nAlpha );
}
else
+3 -3
View File
@@ -1856,7 +1856,7 @@ void OStorage::InternalDispose( bool bNotifyImpl )
for ( WeakComponentVector::iterator pCompIter = m_pData->m_aOpenSubComponentsVector.begin();
pCompIter != m_pData->m_aOpenSubComponentsVector.end(); ++pCompIter )
{
uno::Reference< lang::XComponent > xTmp = (*pCompIter);
uno::Reference< lang::XComponent > xTmp = *pCompIter;
if ( xTmp.is() )
{
xTmp->removeEventListener( uno::Reference< lang::XEventListener >(
@@ -1907,7 +1907,7 @@ void OStorage::ChildIsDisposed( const uno::Reference< uno::XInterface >& xChild
for ( WeakComponentVector::iterator pCompIter = m_pData->m_aOpenSubComponentsVector.begin();
pCompIter != m_pData->m_aOpenSubComponentsVector.end(); )
{
uno::Reference< lang::XComponent > xTmp = (*pCompIter);
uno::Reference< lang::XComponent > xTmp = *pCompIter;
if ( !xTmp.is() || xTmp == xChild )
{
pCompIter = m_pData->m_aOpenSubComponentsVector.erase(pCompIter);
@@ -2408,7 +2408,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement(
for ( SotElementVector_Impl::iterator pElementIter = pElement->m_xStorage->m_aChildrenVector.begin();
pElementIter != pElement->m_xStorage->m_aChildrenVector.end(); )
{
SotElement_Impl* pElementToDel = (*pElementIter);
SotElement_Impl* pElementToDel = *pElementIter;
++pElementIter;
m_pImpl->RemoveElement( pElementToDel );
@@ -1319,7 +1319,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe
// bring aNewPos to the position of the next object
uno::Reference< report::XReportComponent> xRCNext(*(pColIter + 1),uno::UNO_QUERY);
Point aNextPosition = VCLPoint(xRCNext->getPosition());
aNewPos += (aNextPosition - aPrevious);
aNewPos += aNextPosition - aPrevious;
}
}
}
+2 -2
View File
@@ -399,7 +399,7 @@ oslFileError FileHandle_Impl::readFileAt(
for (*pBytesRead = 0; nBytesRequested > 0; )
{
off_t const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
size_t const bufpos = (nOffset % m_bufsiz);
size_t const bufpos = nOffset % m_bufsiz;
if (bufptr != m_bufptr)
{
@@ -479,7 +479,7 @@ oslFileError FileHandle_Impl::writeFileAt(
for (*pBytesWritten = 0; nBytesToWrite > 0;)
{
off_t const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
size_t const bufpos = (nOffset % m_bufsiz);
size_t const bufpos = nOffset % m_bufsiz;
if (bufptr != m_bufptr)
{
// flush current buffer
+4 -4
View File
@@ -166,7 +166,7 @@ public:
formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeparator = ' ',
bool bAppendStr = false,
ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) );
ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D );
static void GetStringFromRange(
OUString& rString,
const ScRange& rRange,
@@ -174,7 +174,7 @@ public:
formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeparator = ' ',
bool bAppendStr = false,
ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) );
ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D );
static void GetStringFromRangeList(
OUString& rString,
const ScRangeList* pRangeList,
@@ -189,7 +189,7 @@ public:
formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeparator,
bool bAppendStr = false,
ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) );
ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D );
/// Range to String API
static void GetStringFromAddress(
@@ -206,7 +206,7 @@ public:
formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeparator = ' ',
bool bAppendStr = false,
ScRefFlags nFormatFlags = (ScRefFlags::VALID | ScRefFlags::TAB_3D) );
ScRefFlags nFormatFlags = ScRefFlags::VALID | ScRefFlags::TAB_3D );
static void GetStringFromRangeList(
OUString& rString,
const css::uno::Sequence< css::table::CellRangeAddress >& rRangeSeq,
+6 -6
View File
@@ -145,12 +145,12 @@ void Test::testSimpleMark( const ScRange& rRange, const ScRange& rSelectionCover
aMark.GetMarkArea( aRangeResult );
CPPUNIT_ASSERT_EQUAL( rRange, aRangeResult );
SCROW nMidRow = ( ( rRange.aStart.Row() + rRange.aEnd.Row() ) / 2 );
SCCOL nMidCol = ( ( rRange.aStart.Col() + rRange.aEnd.Col() ) / 2 );
SCROW nOutRow1 = ( rRange.aEnd.Row() + 1 );
SCCOL nOutCol1 = ( rRange.aEnd.Col() + 1 );
SCROW nOutRow2 = ( rRange.aStart.Row() - 1 );
SCCOL nOutCol2 = ( rRange.aStart.Col() - 1 );
SCROW nMidRow = ( rRange.aStart.Row() + rRange.aEnd.Row() ) / 2;
SCCOL nMidCol = ( rRange.aStart.Col() + rRange.aEnd.Col() ) / 2;
SCROW nOutRow1 = rRange.aEnd.Row() + 1;
SCCOL nOutCol1 = rRange.aEnd.Col() + 1;
SCROW nOutRow2 = rRange.aStart.Row() - 1;
SCCOL nOutCol2 = rRange.aStart.Col() - 1;
CPPUNIT_ASSERT( aMark.IsCellMarked( nMidCol, nMidRow ) );
if ( ValidCol( nOutCol1 ) && ValidRow( nOutRow1 ) )
+1 -1
View File
@@ -108,7 +108,7 @@ void GetOptimalHeightsInColumn(
const SCROW nMinStart = nPos;
sal_uLong nWeightedCount = nProgressStart + rCol.back().GetWeightedCount(nStartRow, nEndRow);
const SCCOL maxCol = (rCol.size() - 1); // last col done already above
const SCCOL maxCol = rCol.size() - 1; // last col done already above
const SCCOL progressUpdateStep = rCol.size() / 10;
for (SCCOL nCol=0; nCol<maxCol; nCol++)
{
+2 -2
View File
@@ -812,8 +812,8 @@ bool ScTable::SearchAndReplace(
// This is also done in SvxSearchDialog CommandHdl, but not in API object.
if ( !rSearchItem.IsUseAsianOptions() )
aSearchOptions.transliterateFlags &=
( TransliterationFlags::IGNORE_CASE |
TransliterationFlags::IGNORE_WIDTH );
TransliterationFlags::IGNORE_CASE |
TransliterationFlags::IGNORE_WIDTH;
pSearchText.reset( new utl::TextSearch( aSearchOptions ) );
+1 -1
View File
@@ -2002,7 +2002,7 @@ template<typename T > static void lcl_Format( T& r, SCTAB nTab, SCROW nRow, SCCO
const ScAddress::Details& rDetails)
{
if( nFlags & ScRefFlags::VALID )
nFlags |= ( ScRefFlags::ROW_VALID | ScRefFlags::COL_VALID | ScRefFlags::TAB_VALID );
nFlags |= ScRefFlags::ROW_VALID | ScRefFlags::COL_VALID | ScRefFlags::TAB_VALID;
if( pDoc && (nFlags & ScRefFlags::TAB_VALID ) )
{
if ( nTab < 0 || nTab >= pDoc->GetTableCount() )
+1 -1
View File
@@ -409,7 +409,7 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv )
/* */ t[32] |= ScCharFlags::Word;
/* ! */ t[33] |= ScCharFlags::Ident | ScCharFlags::Word;
/* " */ t[34] |= ScCharFlags::Word;
/* # */ t[35] &= (~ScCharFlags::WordSep);
/* # */ t[35] &= ~ScCharFlags::WordSep;
/* # */ t[35] |= ScCharFlags::Word;
/* % */ t[37] |= ScCharFlags::Word;
/* ' */ t[39] |= ScCharFlags::Word;
+1 -1
View File
@@ -2696,7 +2696,7 @@ void ScInterpreter::ScTTest()
return;
}
double fSumD = fSum1 - fSum2;
double fDivider = (fCount*fSumSqrD - fSumD*fSumD);
double fDivider = fCount*fSumSqrD - fSumD*fSumD;
if ( fDivider == 0.0 )
{
PushError(FormulaError::DivisionByZero);
+2 -2
View File
@@ -439,7 +439,7 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
*p++ = nLen;
memcpy( p, aTmp.getStr(), nStrLen + 1);
nPos += 10 + nStrLen + 1;
sal_uInt8* q = ( pCellArr + nPos );
sal_uInt8* q = pCellArr + nPos;
if( (nStrLen & 1) == 0 )
{
*q++ = 0;
@@ -556,7 +556,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
*p++ = nLen;
memcpy( p, aTmp.getStr(), nStrLen + 1);
nPos += 2 + nStrLen + 1;
sal_uInt8* q = ( pCellArr + nPos );
sal_uInt8* q = pCellArr + nPos;
if( (nStrLen & 1) == 0 )
{
*q++ = 0;
+2 -2
View File
@@ -977,7 +977,7 @@ void ScETSForecastCalculation::GetETSPredictionIntervals( const ScMatrixRef& rTM
fMaxTarget = convertXtoMonths( fMaxTarget ) - maRange[ mnCount - 1 ].X;
else
fMaxTarget -= maRange[ mnCount - 1 ].X;
SCSIZE nSize = ( fMaxTarget / mfStepSize );
SCSIZE nSize = fMaxTarget / mfStepSize;
if ( fmod( fMaxTarget, mfStepSize ) != 0.0 )
nSize++;
@@ -1106,7 +1106,7 @@ void ScETSForecastCalculation::GetEDSPredictionIntervals( const ScMatrixRef& rTM
fMaxTarget = convertXtoMonths( fMaxTarget ) - maRange[ mnCount - 1 ].X;
else
fMaxTarget -= maRange[ mnCount - 1 ].X;
SCSIZE nSize = ( fMaxTarget / mfStepSize );
SCSIZE nSize = fMaxTarget / mfStepSize;
if ( fmod( fMaxTarget, mfStepSize ) != 0.0 )
nSize++;
+2 -2
View File
@@ -154,8 +154,8 @@ ScRefFlags ScRangeList::Parse( const OUString& rStr, const ScDocument* pDoc,
aRange.aStart.SetTab( nTab ); // default tab if not specified
ScRefFlags nRes = aRange.ParseAny( aOne, pDoc, eConv );
ScRefFlags nEndRangeBits = ScRefFlags::COL2_VALID | ScRefFlags::ROW2_VALID | ScRefFlags::TAB2_VALID;
ScRefFlags nTmp1 = ( nRes & ScRefFlags::BITS );
ScRefFlags nTmp2 = ( nRes & nEndRangeBits );
ScRefFlags nTmp1 = nRes & ScRefFlags::BITS;
ScRefFlags nTmp2 = nRes & nEndRangeBits;
// If we have a valid single range with
// any of the address bits we are interested in
// set - set the equiv end range bits
+1 -1
View File
@@ -217,7 +217,7 @@ ScRefFinder::~ScRefFinder()
static ScRefFlags lcl_NextFlags( ScRefFlags nOld )
{
const ScRefFlags Mask_ABS = (ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS);
const ScRefFlags Mask_ABS = ScRefFlags::COL_ABS | ScRefFlags::ROW_ABS | ScRefFlags::TAB_ABS;
ScRefFlags nNew = nOld & Mask_ABS;
nNew = ScRefFlags( static_cast<std::underlying_type<ScRefFlags>::type>(nNew) - 1 ) & Mask_ABS; // weiterzaehlen
+1 -1
View File
@@ -99,7 +99,7 @@ inline void set_flag( Type& rnBitField, Type nMask, bool bSet = true )
template< typename Type, typename InsertType >
void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal_uInt8 nBitCount )
{
unsigned int nMask = ((1U << nBitCount) - 1);
unsigned int nMask = (1U << nBitCount) - 1;
Type nNewValue = static_cast< Type >( nValue & nMask );
rnBitField = (rnBitField & ~(nMask << nStartBit)) | (nNewValue << nStartBit);
}
@@ -637,7 +637,7 @@ bool ScRowFormatRanges::GetNext(ScMyRowFormatRange& aFormatRange)
ScMyRowFormatRangesList::iterator aItr(aRowFormatRanges.begin());
if (aItr != aRowFormatRanges.end())
{
aFormatRange = (*aItr);
aFormatRange = *aItr;
aRowFormatRanges.erase(aItr);
--nSize;
return true;
@@ -311,8 +311,8 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount()
// FIXME: representing rows & columns this way is a plain and simple madness.
// this needs a radical re-think.
sal_Int64 nMax = (static_cast<sal_Int64>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) *
static_cast<sal_Int64>(maRange.aEnd.Col() - maRange.aStart.Col() + 1));
sal_Int64 nMax = static_cast<sal_Int64>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) *
static_cast<sal_Int64>(maRange.aEnd.Col() - maRange.aStart.Col() + 1);
if (nMax > SAL_MAX_INT32)
nMax = SAL_MAX_INT32;
if (nMax < 0)
+2 -2
View File
@@ -22,9 +22,9 @@
#include <delcodlg.hxx>
bool ScDeleteContentsDlg::bPreviousAllCheck = false;
InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = (InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING |
InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING |
InsertDeleteFlags::NOTE | InsertDeleteFlags::FORMULA |
InsertDeleteFlags::VALUE);
InsertDeleteFlags::VALUE;
ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* pParent)
: GenericDialogController(pParent, "modules/scalc/ui/deletecontents.ui", "DeleteContentsDialog")
+1 -1
View File
@@ -22,7 +22,7 @@
#include <inscodlg.hxx>
bool ScInsertContentsDlg::bPreviousAllCheck = false;
InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks = (InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING);
InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks = InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING;
ScPasteFunc ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::NONE;
InsertContentsFlags ScInsertContentsDlg::nPreviousChecks2 = InsertContentsFlags::NONE;
sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd
+1 -1
View File
@@ -1285,7 +1285,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union(
double
ScVbaApplication::InchesToPoints( double Inches )
{
double result = ( Inches * 72.0 );
double result = Inches * 72.0;
return result;
}
+4 -4
View File
@@ -2078,8 +2078,8 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
ScRefFlags const ROW_ABS = ( ScRefFlags::ROW_ABS | ScRefFlags::ROW2_ABS );
ScRefFlags const COL_ABS = ( ScRefFlags::COL_ABS | ScRefFlags::COL2_ABS );
ScRefFlags const ROW_ABS = ScRefFlags::ROW_ABS | ScRefFlags::ROW2_ABS;
ScRefFlags const COL_ABS = ScRefFlags::COL_ABS | ScRefFlags::COL2_ABS;
if ( RowAbsolute.hasValue() )
{
@@ -5387,7 +5387,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
// need to process each area, gather the results and
// create a new range from those
std::vector< table::CellRangeAddress > rangeResults;
sal_Int32 nItems = ( m_Areas->getCount() + 1 );
sal_Int32 nItems = m_Areas->getCount() + 1;
for ( sal_Int32 index=1; index <= nItems; ++index )
{
uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny(index), uno::Any() ), uno::UNO_QUERY_THROW );
@@ -5395,7 +5395,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue)
ScVbaRange* pRange = getImplementation( xRange );
if ( xRange.is() && pRange )
{
sal_Int32 nElems = ( pRange->m_Areas->getCount() + 1 );
sal_Int32 nElems = pRange->m_Areas->getCount() + 1;
for ( sal_Int32 nArea = 1; nArea < nElems; ++nArea )
{
uno::Reference< excel::XRange > xTmpRange( m_Areas->Item( uno::makeAny( nArea ), uno::Any() ), uno::UNO_QUERY_THROW );
+2 -2
View File
@@ -818,7 +818,7 @@ sal_Int32 SAL_CALL
ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points)
{
sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
double fConvertFactor = (getDevice()->getInfo().PixelPerMeterX/100000);
double fConvertFactor = getDevice()->getInfo().PixelPerMeterX/100000;
return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters );
}
@@ -826,7 +826,7 @@ sal_Int32 SAL_CALL
ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points)
{
sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
double fConvertFactor = (getDevice()->getInfo().PixelPerMeterY/100000);
double fConvertFactor = getDevice()->getInfo().PixelPerMeterY/100000;
return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters );
}
+1 -1
View File
@@ -964,7 +964,7 @@ void ScDrawView::SyncForGrid( SdrObject* pObj )
// find position of same point on the screen ( e.g. grid )
Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, true );
Point aCurPosHmm = pGridWin->PixelToLogic(aCurPos, aDrawMode );
Point aGridOff = ( aCurPosHmm - aOldPos );
Point aGridOff = aCurPosHmm - aOldPos;
// fdo#63878 Fix the X position for RTL Sheet
if( pDoc->IsNegativePage( GetTab() ) )
aGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() );
+1 -1
View File
@@ -585,7 +585,7 @@ void ScDrawStringsVars::RepeatToFill( long nColWidth )
nTextWidth = pOutput->mpRefDevice->PixelToLogic(Size(nTextWidth,0)).Width();
}
long nSpaceToFill = ( nColWidth - nTextWidth );
long nSpaceToFill = nColWidth - nTextWidth;
if ( nSpaceToFill <= nCharWidth )
return;
+1 -1
View File
@@ -147,7 +147,7 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, FormulaError nErrCode )
bFirst = false;
}
else
rFuncStr += ("; " + aStr);
rFuncStr += "; " + aStr;
}
}
+4 -4
View File
@@ -1454,8 +1454,8 @@ void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartR
}
typedef const std::vector<editeng::MisspellRanges>* MisspellRangesType;
SCROW nRowRepeatSize = (nEndRow - nStartRow + 1);
SCCOL nColRepeatSize = (nEndCol - nStartCol + 1);
SCROW nRowRepeatSize = nEndRow - nStartRow + 1;
SCCOL nColRepeatSize = nEndCol - nStartCol + 1;
SCROW nTillRow = 0;
SCCOL nTillCol = 0;
std::vector<std::vector<MisspellRangesType>> aSourceSpellRanges(nRowRepeatSize, std::vector<MisspellRangesType>(nColRepeatSize));
@@ -1472,7 +1472,7 @@ void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartR
{
for ( SCROW nRowItr = nEndRow + 1; nRowItr <= nTillRow; ++nRowItr )
{
size_t nSourceRowIdx = ( ( nRowItr - nEndRow - 1 ) % nRowRepeatSize );
size_t nSourceRowIdx = ( nRowItr - nEndRow - 1 ) % nRowRepeatSize;
MisspellRangesType pRanges = aSourceSpellRanges[nSourceRowIdx][nColItr - nStartCol];
if ( !pRanges )
continue;
@@ -1500,7 +1500,7 @@ void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW nStartR
nTillCol = nEndCol + nCount;
for ( SCCOL nColItr = nEndCol + 1; nColItr <= nTillCol; ++nColItr )
{
size_t nSourceColIdx = ( ( nColItr - nEndCol - 1 ) % nColRepeatSize );
size_t nSourceColIdx = ( nColItr - nEndCol - 1 ) % nColRepeatSize;
for ( SCROW nRowItr = nStartRow; nRowItr <= nEndRow; ++nRowItr )
{
MisspellRangesType pRanges = aSourceSpellRanges[nRowItr - nStartRow][nSourceColIdx];
+15 -15
View File
@@ -1619,7 +1619,7 @@ void EffectSequenceHelper::reset()
EffectSequence::iterator aEnd( maEffects.end() );
if( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
pEffect->setEffectSequence(nullptr);
}
maEffects.clear();
@@ -1839,7 +1839,7 @@ void EffectSequenceHelper::implRebuild()
{
std::vector< sd::AfterEffectNode > aAfterEffects;
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
bool bFirst = true;
do
@@ -1900,7 +1900,7 @@ void EffectSequenceHelper::implRebuild()
fDuration = fTemp;
if( aIter != aEnd )
pEffect = (*aIter++);
pEffect = *aIter++;
else
pEffect.reset();
}
@@ -2084,7 +2084,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const css::uno::Refer
{
if( (*aIter)->getNode() == xNode )
{
pEffect = (*aIter);
pEffect = *aIter;
break;
}
}
@@ -2114,7 +2114,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO
CustomAnimationEffectPtr pEffect;
if( aIter != maEffects.end() )
pEffect = (*aIter);
pEffect = *aIter;
return pEffect;
}
@@ -2317,7 +2317,7 @@ void EffectSequenceHelper::updateTextGroups()
const EffectSequence::iterator aEnd( maEffects.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
const sal_Int32 nGroupId = pEffect->getGroupId();
@@ -2523,7 +2523,7 @@ void EffectSequenceHelper::setTextGrouping( const CustomAnimationTextGroupPtr& p
const EffectSequence::iterator aEnd( aEffects.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() )
remove( pEffect );
@@ -2544,7 +2544,7 @@ void EffectSequenceHelper::setTextGrouping( const CustomAnimationTextGroupPtr& p
const EffectSequence::iterator aEnd( aEffects.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() )
{
@@ -2605,7 +2605,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT
{
// special case, only one effect and that targets whole text,
// convert this to target whole shape
pEffect = (*aIter++);
pEffect = *aIter++;
pEffect->setTargetSubItem( ShapeAnimationSubType::AS_WHOLE );
}
else
@@ -2621,7 +2621,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT
if( !bAnimateForm && (aEffects.size() == 1) )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
pEffect->setTarget( makeAny( (*aIter)->getTargetShape() ) );
pEffect->setTargetSubItem( ShapeAnimationSubType::ONLY_TEXT );
pTextGroup->addEffect( pEffect );
@@ -2631,7 +2631,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT
// read the rest to the group again
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() )
{
@@ -2659,7 +2659,7 @@ void EffectSequenceHelper::setTextGroupingAuto( const CustomAnimationTextGroupPt
const EffectSequence::iterator aEnd( aEffects.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() )
{
@@ -2749,7 +2749,7 @@ void EffectSequenceHelper::setTextReverse( const CustomAnimationTextGroupPtr& pT
EffectSequence::iterator aInsertIter( find( *aIter++ ) );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
maEffects.erase( find( pEffect ) );
aInsertIter = maEffects.insert( ++aInsertIter, pEffect );
pTextGroup->addEffect( pEffect );
@@ -2896,7 +2896,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
stl_CustomAnimationEffect_search_node_predict aSearchPredict( xMaster );
EffectSequence::iterator aIter( std::find_if( maEffects.begin(), maEffects.end(), aSearchPredict ) );
if( aIter != maEffects.end() )
pMasterEffect = (*aIter );
pMasterEffect = *aIter;
if( pMasterEffect.get() )
{
@@ -3289,7 +3289,7 @@ void MainSequence::implRebuild()
auto aIter( maInteractiveSequenceVector.begin() );
while( aIter != maInteractiveSequenceVector.end() )
{
InteractiveSequencePtr pIS( (*aIter) );
InteractiveSequencePtr pIS( *aIter );
if( pIS->maEffects.empty() )
{
// remove empty interactive sequences
+1 -1
View File
@@ -333,7 +333,7 @@ void CustomAnimationPresets::importEffects()
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter);
CustomAnimationEffectPtr pEffect = *aIter;
const OUString aPresetId( pEffect->getPresetId() );
CustomAnimationPresetPtr pDescriptor = getEffectDescriptor( aPresetId );
+18 -18
View File
@@ -396,7 +396,7 @@ static EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSeq
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( (pEffect->getTargetShape() == rShape) && (pEffect->getTargetSubItem() == nSubItem) )
break;
}
@@ -530,11 +530,11 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff
CustomAnimationEffectPtr pEffect;
if( aIterAsWhole != aEnd )
{
pEffect = (*aIterAsWhole);
pEffect = *aIterAsWhole;
}
else
{
pEffect = (*aIterOnlyBackground);
pEffect = *aIterOnlyBackground;
}
if( pEffect.get() )
@@ -565,7 +565,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape )
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
if( (pEffect->getTargetSubItem() == ShapeAnimationSubType::ONLY_BACKGROUND) ||
@@ -650,14 +650,14 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
EffectSequence::iterator aIterOnlyBackground( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::ONLY_BACKGROUND ) );
if( aIterOnlyBackground != aEnd )
{
pShapeEffect = (*aIterOnlyBackground);
pShapeEffect = *aIterOnlyBackground;
}
else
{
EffectSequence::iterator aIterAsWhole( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::AS_WHOLE ) );
if( aIterAsWhole != aEnd )
{
pShapeEffect = (*aIterAsWhole);
pShapeEffect = *aIterAsWhole;
}
else
{
@@ -840,7 +840,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
if( pEffect->getDuration() != 0.1 )
@@ -866,7 +866,7 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape )
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
if( pEffect->getDuration() != 0.1 )
@@ -914,7 +914,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor )
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
pEffect->setHasAfterEffect( true );
@@ -943,7 +943,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape )
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( (pEffect->getTargetShape() == xShape) &&
pEffect->getDimColor().hasValue() &&
pEffect->hasAfterEffect())
@@ -978,7 +978,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide )
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
pEffect->setHasAfterEffect( bDimHide );
@@ -1010,7 +1010,7 @@ bool EffectMigration::GetDimHide( SvxShape* pShape )
EffectSequence::iterator aIter;
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
bRet = pEffect->hasAfterEffect() &&
@@ -1050,7 +1050,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious )
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
pEffect->setHasAfterEffect( bDimPrevious );
@@ -1080,7 +1080,7 @@ bool EffectMigration::GetDimPrevious( SvxShape* pShape )
EffectSequence::iterator aIter;
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
bRet = pEffect->hasAfterEffect() &&
@@ -1117,7 +1117,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
EffectSequence::iterator aEnd( rSequence.end() );
for( nPos = 0; aIter != aEnd; ++aIter )
{
CustomAnimationEffectPtr pEffect = (*aIter);
CustomAnimationEffectPtr pEffect = *aIter;
if( !xCurrent.is() )
{
@@ -1204,7 +1204,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape )
EffectSequence::iterator aEnd( rSequence.end() );
for( ; aIter != aEnd; ++aIter )
{
CustomAnimationEffectPtr pEffect = (*aIter);
CustomAnimationEffectPtr pEffect = *aIter;
if( !xCurrent.is() || pEffect->getTargetShape() != xCurrent )
{
@@ -1241,7 +1241,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo const
for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
if( !aSoundFile.isEmpty() )
@@ -1280,7 +1280,7 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape )
(aSoundFile.isEmpty()) && (aIter != pMainSequence->getEnd());
++aIter )
{
CustomAnimationEffectPtr pEffect( (*aIter) );
CustomAnimationEffectPtr pEffect( *aIter );
if( pEffect->getTargetShape() == xShape )
{
if( pEffect->getAudio().is() )
+2 -2
View File
@@ -132,8 +132,8 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi
}
else
{
double fQ1 = ( static_cast<double>(aPrefSize.Width()) / static_cast<double>(aPrefSize.Height()) );
double fQ2 = ( static_cast<double>(rGraphicSize.Width()) / static_cast<double>(rGraphicSize.Height()) );
double fQ1 = static_cast<double>(aPrefSize.Width()) / static_cast<double>(aPrefSize.Height());
double fQ2 = static_cast<double>(rGraphicSize.Width()) / static_cast<double>(rGraphicSize.Height());
double fXScale = 1;
double fYScale = 1;
+1 -1
View File
@@ -226,7 +226,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton
std::vector< Graphic >::iterator aGraphIter( aGraphics.begin() );
while( aGraphIter != aGraphics.end() )
{
Graphic aGraphic( (*aGraphIter++) );
Graphic aGraphic( *aGraphIter++ );
aGraphic.Draw( pDev, aPos );
+1 -1
View File
@@ -929,7 +929,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
for( std::vector< PropertyValue >::iterator i = aProps.begin(); i != aProps.end(); ++i )
{
*pParams++ = (*i);
*pParams++ = *i;
}
}
+21 -21
View File
@@ -734,7 +734,7 @@ void CustomAnimationPane::updateControls()
const EffectSequence::iterator aRebuildEnd( maListSelection.end() );
while( aRebuildIter != aRebuildEnd )
{
CustomAnimationEffectPtr pEffect = (*aRebuildIter++);
CustomAnimationEffectPtr pEffect = *aRebuildIter++;
if( pEffect.get() )
{
@@ -770,7 +770,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView,
bool bChanges = false;
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
CustomAnimationEffectPtr pEffect( *aIter++ );
if( pEffect.get() && pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH )
{
rtl::Reference< MotionPathTag > xMotionPathTag;
@@ -778,7 +778,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView,
MotionPathTagVector::iterator aMIter( rOldTags.begin() );
for( ; aMIter != rOldTags.end(); ++aMIter )
{
rtl::Reference< MotionPathTag > xTag( (*aMIter) );
rtl::Reference< MotionPathTag > xTag( *aMIter );
if( xTag->getEffect() == pEffect )
{
if( !xTag->isDisposed() )
@@ -838,7 +838,7 @@ void CustomAnimationPane::updateMotionPathTags()
MotionPathTagVector::iterator aIter( aTags.begin() );
while( aIter != aTags.end() )
{
rtl::Reference< MotionPathTag > xTag( (*aIter++) );
rtl::Reference< MotionPathTag > xTag( *aIter++ );
xTag->Dispose();
}
}
@@ -1132,7 +1132,7 @@ std::unique_ptr<STLPropertySet> CustomAnimationPane::createSelectionSet()
const CustomAnimationPresets& rPresets (getPresets());
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence();
if( !pEffectSequence )
@@ -1249,7 +1249,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST
const EffectSequence::iterator aEnd( maListSelection.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
DBG_ASSERT( pEffect->getEffectSequence(), "sd::CustomAnimationPane::changeSelection(), dead effect in selection!" );
if( !pEffect->getEffectSequence() )
@@ -1520,7 +1520,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST
const EffectSequence::const_iterator iEnd( aSelectedEffects.end() );
while( iter != iEnd )
{
CustomAnimationEffectPtr const& pEffect = (*iter++);
CustomAnimationEffectPtr const& pEffect = *iter++;
EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence();
if( !pEffectSequence )
@@ -1897,7 +1897,7 @@ void CustomAnimationPane::onRemove()
const EffectSequence::iterator aEnd( aList.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
if( pEffect->getEffectSequence() )
pEffect->getEffectSequence()->remove( pEffect );
}
@@ -1947,7 +1947,7 @@ void CustomAnimationPane::onChangeStart( sal_Int16 nNodeType )
const EffectSequence::iterator aEnd( maListSelection.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
if( pEffect->getNodeType() != nNodeType )
{
pEffect->setNodeType( nNodeType );
@@ -1980,7 +1980,7 @@ void CustomAnimationPane::onChangeSpeed()
const EffectSequence::iterator aEnd( maListSelection.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
pEffect->setDuration( fDuration );
}
@@ -2077,7 +2077,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void)
const EffectSequence::iterator aEnd( maListSelection.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
if( setProperty1Value( mnPropertyType, pEffect, aValue ) )
bNeedUpdate = true;
@@ -2111,7 +2111,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, DelayLoseFocusHdl, Control&, void)
const EffectSequence::iterator aEnd( maListSelection.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
pEffect->setBegin( fBegin/10.0 );
}
@@ -2145,7 +2145,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
while( aIter != aEnd )
{
aTargets.push_back( (*aIter)->getTarget() );
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence();
if( !pEffectSequence )
@@ -2169,7 +2169,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
// get selected effect
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
// Dispose the deprecated motion path tag. It will be rebuilt later.
if (pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH)
@@ -2256,7 +2256,7 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText )
const std::vector< CustomAnimationPresetPtr >::const_iterator aEnd( aSortedVector.end() );
while( aIter != aEnd )
{
CustomAnimationPresetPtr pDescriptor = (*aIter++);
CustomAnimationPresetPtr pDescriptor = *aIter++;
// ( !isTextOnly || ( isTextOnly && bHasText ) ) <=> !isTextOnly || bHasText
if( pDescriptor.get() && ( !pDescriptor->isTextOnly() || bHasText ) )
{
@@ -2339,7 +2339,7 @@ void CustomAnimationPane::moveSelection( bool bUp )
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
EffectSequence::iterator aUpEffectPos( pSequence->find( pEffect ) );
// coverity[copy_paste_error : FALSE] - this is correct, checking if it exists
@@ -2370,7 +2370,7 @@ void CustomAnimationPane::moveSelection( bool bUp )
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
EffectSequence::iterator aDownEffectPos( pSequence->find( pEffect ) );
// coverity[copy_paste_error : FALSE] - this is correct, checking if it exists
@@ -2421,7 +2421,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
{
if( (*aIter)->isSelected() )
{
xMotionPathTag = (*aIter);
xMotionPathTag = *aIter;
break;
}
}
@@ -2450,7 +2450,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
pSequence->append( pEffect->clone() );
}
@@ -2497,7 +2497,7 @@ void CustomAnimationPane::onSelect()
const EffectSequence::iterator aEnd( maListSelection.end() );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
Reference< XShape > xShape( pEffect->getTargetShape() );
SdrObject* pObj = GetSdrObjectFromXShape( xShape );
@@ -2524,7 +2524,7 @@ void CustomAnimationPane::onDragNDropComplete(CustomAnimationEffectPtr pEffectDr
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect = (*aIter++);
CustomAnimationEffectPtr pEffect = *aIter++;
// Update model with new location (function triggers a rebuild)
// target may be null, which will insert at the end.
+2 -2
View File
@@ -77,7 +77,7 @@ void SlideShowViewListeners::notify( const lang::EventObject& _rEvent )
ViewListenerVector::iterator aIter( maListeners.begin() );
while( aIter != maListeners.end() )
{
Reference< util::XModifyListener > xListener( (*aIter) );
Reference< util::XModifyListener > xListener( *aIter );
if( xListener.is() )
{
xListener->modified( _rEvent );
@@ -97,7 +97,7 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource )
ViewListenerVector::iterator aIter( maListeners.begin() );
while( aIter != maListeners.end() )
{
Reference< util::XModifyListener > xListener( (*aIter++) );
Reference< util::XModifyListener > xListener( *aIter++ );
if( xListener.is() )
xListener->disposing( _rEventSource );
}
@@ -41,8 +41,8 @@ public:
sal_Int32 mnRightBorder;
sal_Int32 mnTopBorder;
sal_Int32 mnBottomBorder;
static const sal_Int32 gnVerticalGap = (10 - 2*Theme_FocusIndicatorWidth);
static const sal_Int32 gnHorizontalGap = (10 - 2*Theme_FocusIndicatorWidth);
static const sal_Int32 gnVerticalGap = 10 - 2*Theme_FocusIndicatorWidth;
static const sal_Int32 gnHorizontalGap = 10 - 2*Theme_FocusIndicatorWidth;
Size const maMinimalSize;
Size const maPreferredSize;
Size const maMaximalSize;
+1 -1
View File
@@ -228,7 +228,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection )
const ::std::vector<SdrObject*>::iterator aEnd( aObjects.end() );
while( aIter != aEnd )
{
SdrObject* pObj = (*aIter++);
SdrObject* pObj = *aIter++;
mrView.MarkObj( pObj, pPV );
}
}
+2 -2
View File
@@ -962,7 +962,7 @@ namespace {
if (*iPageIndex >= rDocument.GetSdPageCount(PageKind::Standard))
continue;
SdrPageObj* pPageObj = (*aPageObjIter++);
SdrPageObj* pPageObj = *aPageObjIter++;
pPageObj->SetReferencedPage(rDocument.GetSdPage(*iPageIndex, PageKind::Standard));
}
@@ -1509,7 +1509,7 @@ private:
if( bDrawLines && (iter != aAreas.end()) )
{
::tools::Rectangle aRect( (*iter++) );
::tools::Rectangle aRect( *iter++ );
basegfx::B2DPolygon aPoly;
aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) );
+2 -2
View File
@@ -656,7 +656,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
maDropPos.setY( pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ) );
// delete pages, that are not of any interest for us
for( long i = ( pWorkModel->GetPageCount() - 1 ); i >= 0; i-- )
for( long i = pWorkModel->GetPageCount() - 1; i >= 0; i-- )
{
SdPage* pP = static_cast< SdPage* >( pWorkModel->GetPage( static_cast<sal_uInt16>(i) ) );
@@ -903,7 +903,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
}
// delete pages, that are not of any interest for us
for( long i = ( pModel->GetPageCount() - 1 ); i >= 0; i-- )
for( long i = pModel->GetPageCount() - 1; i >= 0; i-- )
{
SdPage* pP = static_cast< SdPage* >( pModel->GetPage( static_cast<sal_uInt16>(i) ) );
+2 -2
View File
@@ -313,8 +313,8 @@ static Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentCont
aDestSizePixel = aSourceSizePixel;
if ( rGraphicSettings.mnImageResolution && aLogicalSize.Width && aLogicalSize.Height )
{
const double fSourceDPIX = (static_cast<double>(aSourceSizePixel.Width) / (static_cast<double>(aLogicalSize.Width) / 2540.0 ));
const double fSourceDPIY = (static_cast<double>(aSourceSizePixel.Height)/ (static_cast<double>(aLogicalSize.Height)/ 2540.0 ));
const double fSourceDPIX = static_cast<double>(aSourceSizePixel.Width) / (static_cast<double>(aLogicalSize.Width) / 2540.0 );
const double fSourceDPIY = static_cast<double>(aSourceSizePixel.Height)/ (static_cast<double>(aLogicalSize.Height)/ 2540.0 );
// check, if the bitmap DPI exceeds the maximum DPI
if( ( fSourceDPIX > rGraphicSettings.mnImageResolution ) || ( fSourceDPIY > rGraphicSettings.mnImageResolution ) )
+2 -2
View File
@@ -330,7 +330,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
aInfo.aSize = pDialog->get_size();
WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if (pDialog->get_resizable())
nMask |= (WindowStateMask::Width | WindowStateMask::Height);
nMask |= WindowStateMask::Width | WindowStateMask::Height;
aInfo.aWinState = pDialog->get_window_state(nMask);
}
else if (pWindow)
@@ -341,7 +341,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
{
WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if ( pWindow->GetStyle() & WB_SIZEABLE )
nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
nMask |= WindowStateMask::Width | WindowStateMask::Height;
aInfo.aWinState = static_cast<SystemWindow*>(pWindow.get())->GetWindowState( nMask );
}
else if (DockingWindow* pDockingWindow = dynamic_cast<DockingWindow*>(pWindow.get()))
+1 -1
View File
@@ -144,7 +144,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
SfxSlot *pLastSlot = pIter;
for ( sal_uInt16 n = nIter; n < Count(); ++n )
{
SfxSlot *pCurSlot = (pSlots+n);
SfxSlot *pCurSlot = pSlots+n;
if ( pCurSlot->GetStateFnc() == pIter->GetStateFnc() )
{
pLastSlot->pNextSlot = pCurSlot;
+3 -3
View File
@@ -258,7 +258,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl, Timer *, void)
aSize = GetSizePixel();
WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if ( GetStyle() & WB_SIZEABLE )
nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
nMask |= WindowStateMask::Width | WindowStateMask::Height;
pImpl->aWinState = GetWindowState( nMask );
GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImpl->pMgr->GetType() );
}
@@ -429,7 +429,7 @@ void SfxModelessDialogController::DeInit()
{
WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if (m_xDialog->get_resizable())
nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
nMask |= WindowStateMask::Width | WindowStateMask::Height;
m_xImpl->aWinState = m_xDialog->get_window_state(nMask);
GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, m_xImpl->pMgr->GetType() );
}
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl, Timer *, void)
aSize = GetSizePixel();
WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
if ( GetStyle() & WB_SIZEABLE )
nMask |= ( WindowStateMask::Width | WindowStateMask::Height );
nMask |= WindowStateMask::Width | WindowStateMask::Height;
pImpl->aWinState = GetWindowState( nMask );
GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, pImpl->pMgr->GetType() );
}
+1 -1
View File
@@ -226,7 +226,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
m_pReduceBitmapsResolutionLB->SelectEntryPos( 0 );
else
{
for( long i = ( DPI_COUNT - 1 ); i >= 0; i-- )
for( long i = DPI_COUNT - 1; i >= 0; i-- )
{
if( nDPI >= aDPIArray[ i ] )
{
+1 -1
View File
@@ -737,7 +737,7 @@ bool SfxMedium::Commit()
GetInitFileDate( true );
// remove truncation mode from the flags
pImpl->m_nStorOpenMode &= (~StreamMode::TRUNC);
pImpl->m_nStorOpenMode &= ~StreamMode::TRUNC;
return bResult;
}
@@ -1068,7 +1068,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime )
SAL_INFO("slideshow.opengl", "update time: " << nTime);
SAL_INFO("slideshow.opengl", "update took: " << std::chrono::duration_cast<std::chrono::milliseconds>(m_UpdateEndTime - m_UpdateStartTime).count());
m_TotalUpdateDuration += (m_UpdateEndTime - m_UpdateStartTime);
m_TotalUpdateDuration += m_UpdateEndTime - m_UpdateStartTime;
#endif
}
@@ -415,7 +415,7 @@ void RehearseTimingsActivity::paint( cppcanvas::CanvasSharedPtr const & canvas )
const sal_Int32 nTimeSecs =
static_cast<sal_Int32>(maElapsedTime.getElapsedTime());
OUStringBuffer buf;
sal_Int32 n = (nTimeSecs / 3600);
sal_Int32 n = nTimeSecs / 3600;
if (n < 10)
buf.append( '0' );
buf.append( n );
@@ -172,8 +172,8 @@ bool ShapeOfGroup::isContentChanged() const
basegfx::B2DRectangle ShapeOfGroup::getBounds() const
{
basegfx::B2DRectangle const groupPosSize( mpGroupShape->getBounds() );
double const posX = (groupPosSize.getMinX() + maPosOffset.getX());
double const posY = (groupPosSize.getMinY() + maPosOffset.getY());
double const posX = groupPosSize.getMinX() + maPosOffset.getX();
double const posY = groupPosSize.getMinY() + maPosOffset.getY();
return basegfx::B2DRectangle( posX, posY, posX + mnWidth, posY + mnHeight );
}
@@ -27,7 +27,7 @@ namespace internal {
::basegfx::B2DPolyPolygon CheckerBoardWipe::operator () ( double t )
{
const double d = (1.0 / m_unitsPerEdge);
const double d = 1.0 / m_unitsPerEdge;
::basegfx::B2DHomMatrix aTransform;
aTransform.scale( ::basegfx::pruneScaleValue( d * 2.0 * t ),
::basegfx::pruneScaleValue( d ) );
@@ -93,11 +93,11 @@ FigureWipe * FigureWipe::createHexagonWipe()
FigureWipe * FigureWipe::createStarWipe( sal_Int32 nPoints )
{
const double v = (M_PI / nPoints);
const double v = M_PI / nPoints;
const ::basegfx::B2DPoint p_( 0.0, -M_SQRT2 );
::basegfx::B2DPolygon figure;
for ( sal_Int32 pos = 0; pos < nPoints; ++pos ) {
const double w = (pos * 2.0 * M_PI / nPoints);
const double w = pos * 2.0 * M_PI / nPoints;
::basegfx::B2DHomMatrix aTransform;
::basegfx::B2DPoint p(p_);
aTransform.rotate( -w );
@@ -36,7 +36,7 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
::basegfx::B2DHomMatrix aTransform;
if (randomBars)
{
double edge = (1.0 / nElements);
double edge = 1.0 / nElements;
for ( sal_Int32 pos = nElements; pos--; )
m_positions[ pos ].setY( ::basegfx::pruneScaleValue( pos * edge ) );
aTransform.scale( 1.0, ::basegfx::pruneScaleValue(edge) );
@@ -45,7 +45,7 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
{
sal_Int32 sqrtElements = static_cast<sal_Int32>(
sqrt( static_cast<double>(nElements) ) );
double edge = (1.0 / sqrtElements);
double edge = 1.0 / sqrtElements;
for ( sal_Int32 pos = nElements; pos--; ) {
m_positions[ pos ] = ::basegfx::B2DPoint(
::basegfx::pruneScaleValue( (pos % sqrtElements) * edge ),
@@ -46,8 +46,8 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
::basegfx::B2DPolyPolygon SnakeWipe::calcSnake( double t ) const
{
::basegfx::B2DPolyPolygon res;
const double area = (t * m_sqrtElements * m_sqrtElements);
const sal_Int32 line_ = (static_cast<sal_Int32>(area) / m_sqrtElements);
const double area = t * m_sqrtElements * m_sqrtElements;
const sal_Int32 line_ = static_cast<sal_Int32>(area) / m_sqrtElements;
const double line = ::basegfx::pruneScaleValue(
static_cast<double>(line_) / m_sqrtElements );
const double col = ::basegfx::pruneScaleValue(
@@ -102,9 +102,9 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
poly.setClosed(true);
res.append(poly);
}
const double a = (M_SQRT1_2 / m_sqrtElements);
const double a = M_SQRT1_2 / m_sqrtElements;
const double d = std::modf(sqrtArea2, &o3tl::temporary(double()));
const double len = (t * M_SQRT2 * d);
const double len = t * M_SQRT2 * d;
const double height = ::basegfx::pruneScaleValue( M_SQRT1_2 / m_sqrtElements );
poly.clear();
poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) );
@@ -146,9 +146,9 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
poly.setClosed(true);
res.append(poly);
}
const double a = (M_SQRT1_2 / m_sqrtElements);
const double a = M_SQRT1_2 / m_sqrtElements;
const double d = std::modf(sqrtArea2, &o3tl::temporary(double()));
const double len = ((1.0 - t) * M_SQRT2 * d);
const double len = (1.0 - t) * M_SQRT2 * d;
const double height = ::basegfx::pruneScaleValue( M_SQRT1_2 / m_sqrtElements );
poly.clear();
poly.append( ::basegfx::B2DPoint( 0.0, 0.0 ) );

Some files were not shown because too many files have changed in this diff Show More