summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx6
-rw-r--r--sd/source/core/EffectMigration.cxx4
-rw-r--r--sd/source/filter/eppt/epptso.cxx20
-rw-r--r--sd/source/filter/html/htmlex.cxx19
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/annotations/annotationmanager.cxx2
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx2
8 files changed, 30 insertions, 27 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index be8f7da7b81f..52e3e52f5145 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2574,7 +2574,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT
// first insert if we have to
if( bAnimateForm )
{
- EffectSequence::iterator aInsertIter( find( (*aIter) ) );
+ EffectSequence::iterator aInsertIter( find( *aIter ) );
CustomAnimationEffectPtr pEffect;
if( (aEffects.size() == 1) && ((*aIter)->getTarget().getValueType() != ::cppu::UnoType<ParagraphTarget>::get() ) )
@@ -2721,8 +2721,8 @@ void EffectSequenceHelper::setTextReverse( const CustomAnimationTextGroupPtr& pT
if( aIter != aEnd )
{
- pTextGroup->addEffect( (*aIter ) );
- EffectSequence::iterator aInsertIter( find( (*aIter++) ) );
+ pTextGroup->addEffect( *aIter );
+ EffectSequence::iterator aInsertIter( find( *aIter++ ) );
while( aIter != aEnd )
{
CustomAnimationEffectPtr pEffect( (*aIter++) );
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 1f9f60c6c351..11158e8c017b 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1136,7 +1136,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
std::vector< EffectSequence::iterator >::iterator aEnd( aEffectVector[nCurrentPos].end() );
while( aIter != aEnd )
{
- aEffects.push_back( (*(*aIter)) );
+ aEffects.push_back( *(*aIter) );
rSequence.erase( (*aIter++) );
}
@@ -1150,7 +1150,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
{
while( aTempIter != aTempEnd )
{
- rSequence.push_back( (*aTempIter++) );
+ rSequence.push_back( *aTempIter++ );
}
}
else
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 685f588f6693..80727694b15f 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -739,7 +739,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
if ( nPropertyFlags & 0xf )
rOut.WriteInt16( nBulletFlags );
if ( nPropertyFlags & 0x80 )
- rOut.WriteUInt16( ( pPara->cBulletId ) );
+ rOut.WriteUInt16( pPara->cBulletId );
if ( nPropertyFlags & 0x10 )
rOut.WriteUInt16( nFontId );
if ( nPropertyFlags & 0x40 )
@@ -760,17 +760,17 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
rOut.WriteUInt32( nBulletColor );
}
if ( nPropertyFlags & 0x00000800 )
- rOut.WriteUInt16( ( pPara->mnTextAdjust ) );
+ rOut.WriteUInt16( pPara->mnTextAdjust );
if ( nPropertyFlags & 0x00001000 )
- rOut.WriteUInt16( ( nLineSpacing ) );
+ rOut.WriteUInt16( nLineSpacing );
if ( nPropertyFlags & 0x00002000 )
- rOut.WriteUInt16( ( pPara->mnLineSpacingTop ) );
+ rOut.WriteUInt16( pPara->mnLineSpacingTop );
if ( nPropertyFlags & 0x00004000 )
- rOut.WriteUInt16( ( pPara->mnLineSpacingBottom ) );
+ rOut.WriteUInt16( pPara->mnLineSpacingBottom );
if ( nPropertyFlags & 0x100 )
- rOut.WriteUInt16( (pPara->nTextOfs) );
+ rOut.WriteUInt16( pPara->nTextOfs );
if ( nPropertyFlags & 0x400 )
- rOut.WriteUInt16( (pPara->nBulletOfs) );
+ rOut.WriteUInt16( pPara->nBulletOfs );
if ( nPropertyFlags & 0x000e0000 )
{
sal_uInt16 nAsianSettings = 0;
@@ -949,13 +949,13 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
.WriteUInt32( nPropertyFlags ); //PropertyFlags
if ( nPropertyFlags & 0xffff )
- rOut.WriteUInt16( ( nCharAttr ) );
+ rOut.WriteUInt16( nCharAttr );
if ( nPropertyFlags & 0x00010000 )
rOut.WriteUInt16( rPortion.mnFont );
if ( nPropertyFlags & 0x00200000 )
rOut.WriteUInt16( rPortion.mnAsianOrComplexFont );
if ( nPropertyFlags & 0x00020000 )
- rOut.WriteUInt16( ( rPortion.mnCharHeight ) );
+ rOut.WriteUInt16( rPortion.mnCharHeight );
if ( nPropertyFlags & 0x00040000 )
rOut.WriteUInt32( nCharColor );
if ( nPropertyFlags & 0x00080000 )
@@ -1100,7 +1100,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
{
rOut.WriteUInt32( EPP_DateTimeMCAtom << 16 ).WriteUInt32( 8 )
.WriteUInt32( pFieldEntry->nFieldStartPos ) // TxtOffset to TxtField;
- .WriteUChar( ( pFieldEntry->nFieldType & 0xff ) ) // Type
+ .WriteUChar( pFieldEntry->nFieldType & 0xff ) // Type
.WriteUChar( 0 ).WriteUInt16( 0 ); // PadBytes
}
break;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index e80256f82d87..0c21bb966f11 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2419,8 +2419,8 @@ bool HtmlExport::CreateNavBarFrames()
// first page
aButton = SdResId(STR_HTMLEXP_FIRSTPAGE);
if(mnButtonThema != -1)
- aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
- BTN_FIRST_0:BTN_FIRST_1)), aButton);
+ aButton = CreateImage(GetButtonName(nFile == 0 || mnSdPageCount == 1 ? BTN_FIRST_0 : BTN_FIRST_1),
+ aButton);
if(nFile != 0 && mnSdPageCount > 1)
aButton = CreateLink("JavaScript:parent.NavigateAbs(0)", aButton);
@@ -2431,8 +2431,9 @@ bool HtmlExport::CreateNavBarFrames()
// to the previous page
aButton = SdResId(STR_PUBLISH_BACK);
if(mnButtonThema != -1)
- aButton = CreateImage(GetButtonName((nFile == 0 || mnSdPageCount == 1?
- BTN_PREV_0:BTN_PREV_1)), aButton);
+ aButton = CreateImage(GetButtonName(nFile == 0 || mnSdPageCount == 1?
+ BTN_PREV_0:BTN_PREV_1),
+ aButton);
if(nFile != 0 && mnSdPageCount > 1)
aButton = CreateLink("JavaScript:parent.NavigateRel(-1)", aButton);
@@ -2443,8 +2444,9 @@ bool HtmlExport::CreateNavBarFrames()
// to the next page
aButton = SdResId(STR_PUBLISH_NEXT);
if(mnButtonThema != -1)
- aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
- BTN_NEXT_0:BTN_NEXT_1)), aButton);
+ aButton = CreateImage(GetButtonName(nFile ==2 || mnSdPageCount == 1?
+ BTN_NEXT_0:BTN_NEXT_1),
+ aButton);
if(nFile != 2 && mnSdPageCount > 1)
aButton = CreateLink("JavaScript:parent.NavigateRel(1)", aButton);
@@ -2455,8 +2457,9 @@ bool HtmlExport::CreateNavBarFrames()
// to the last page
aButton = SdResId(STR_HTMLEXP_LASTPAGE);
if(mnButtonThema != -1)
- aButton = CreateImage(GetButtonName((nFile ==2 || mnSdPageCount == 1?
- BTN_LAST_0:BTN_LAST_1)), aButton);
+ aButton = CreateImage(GetButtonName(nFile ==2 || mnSdPageCount == 1?
+ BTN_LAST_0:BTN_LAST_1),
+ aButton);
if(nFile != 2 && mnSdPageCount > 1)
{
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 115abbb07053..0e268a95a08a 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -153,7 +153,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
while( aIter != aEnd )
{
- sal_Int32 nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) );
+ sal_Int32 nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( *aIter ) );
if( (*aIter) == aPropertyValue )
mpControl->SelectEntryPos( nPos );
maPropertyValues[nPos] = (*aIter++);
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 605cdf984ff4..2d362cb0ca80 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -723,7 +723,7 @@ void CustomAnimationPane::updateControls()
{
++aIter;
}
- while( (aIter != mpMainSequence->getEnd()) && !(mpCustomAnimationList->isExpanded((*aIter)) ) );
+ while( (aIter != mpMainSequence->getEnd()) && !(mpCustomAnimationList->isExpanded(*aIter) ) );
if( aIter == mpMainSequence->getEnd() )
bEnableDown = false;
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 5539f53efcb8..d287a8e74e6c 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -680,7 +680,7 @@ void AnnotationManagerImpl::DeleteAllAnnotations()
AnnotationVector aAnnotations( pPage->getAnnotations() );
for( AnnotationVector::iterator iter = aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
{
- pPage->removeAnnotation( (*iter) );
+ pPage->removeAnnotation( *iter );
}
}
}
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index b3401f14b1d2..8250ac4a692d 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -439,7 +439,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c
SdrObject* pObj = mpShape->GetSdrObject();
if( pObj )
{
- SdAnimationInfo* pInfo = GetAnimationInfo((pEntry->nWID <= WID_THAT_NEED_ANIMINFO));
+ SdAnimationInfo* pInfo = GetAnimationInfo(pEntry->nWID <= WID_THAT_NEED_ANIMINFO);
switch(pEntry->nWID)
{
generated by cgit (git 2.34.1) at 2025-01-24 20:25:16 +0000