diff options
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 2 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleContextBase.cxx | 8 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/numitem.cxx | 42 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 26 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtexp.cxx | 2 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtimp.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/embedobj.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/olemisc.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 8 | ||||
-rw-r--r-- | emfio/source/reader/emfreader.cxx | 4 | ||||
-rw-r--r-- | emfio/source/reader/wmfreader.cxx | 4 | ||||
-rw-r--r-- | eventattacher/source/eventattacher.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 12 | ||||
-rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 2 | ||||
-rw-r--r-- | extensions/source/scanner/sane.cxx | 4 |
20 files changed, 68 insertions, 68 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 6d600b462f39..1b8c079b58ba 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -437,7 +437,7 @@ private: //before the two letters void Test::testAutocorrect() { - SvxAutoCorrect aAutoCorrect((OUString()), (OUString())); + SvxAutoCorrect aAutoCorrect((OUString()), (OUString())); { OUString sInput("TEst-TEst"); diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index b34b26f35ee7..1744514a4e4b 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -229,11 +229,11 @@ sal_Int32 SAL_CALL } } } - } + } - // Return -1 to indicate that this object's parent does not know about the - // object. - return -1; + // Return -1 to indicate that this object's parent does not know about the + // object. + return -1; } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index c67df5641d65..9925a39ecf74 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1442,7 +1442,7 @@ sal_uInt32 EditEngine::CalcTextWidth() pImpEditEngine->FormatDoc(); sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( true ) : pImpEditEngine->GetTextHeight(); - return nWidth; + return nWidth; } void EditEngine::SetUpdateMode( bool bUpdate ) diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 3df5480422e8..713028a67d0b 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -106,7 +106,7 @@ LanguageType EditView::CheckLanguage( } else // check single word { - if (!xSpell.is()) + if (!xSpell.is()) return nLang; diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index e4f50f410f74..5304855c4aa6 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1173,7 +1173,7 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM, sal_uInt16 nCharacterIte { sal_Int32 nCount = 1; uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() ); - aNewPaM.SetIndex( + aNewPaM.SetIndex( _xBI->previousCharacters( aNewPaM.GetNode()->GetString(), aNewPaM.GetIndex(), GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount)); } @@ -3739,7 +3739,7 @@ sal_Int32 ImpEditEngine::GetChar( long nXRight = nXLeft + rPortion.GetSize().Width(); if ( ( nXLeft <= nXPos ) && ( nXRight >= nXPos ) ) { - nChar = nCurIndex; + nChar = nCurIndex; // Search within Portion... diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index e4a37a0f696e..61ccea0dda9e 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2351,7 +2351,7 @@ sal_Int32 ImpEditEngine::SplitTextPortion( ParaPortion* pPortion, sal_Int32 nPos { // We need the original size from the portion sal_Int32 nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion ); - SvxFont aTmpFont( pPortion->GetNode()->GetCharAttribs().GetDefFont() ); + SvxFont aTmpFont( pPortion->GetNode()->GetCharAttribs().GetDefFont() ); SeekCursor( pPortion->GetNode(), nTxtPortionStart+1, aTmpFont ); aTmpFont.SetPhysFont( GetRefDevice() ); GetRefDevice()->Push( PushFlags::TEXTLANGUAGE ); diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index c636ceae7473..5ed48a2b6f11 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -323,26 +323,26 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat ) if (& rFormat == this) { return *this; } SvxNumberType::SetNumberingType(rFormat.GetNumberingType()); - eNumAdjust = rFormat.eNumAdjust ; - nInclUpperLevels = rFormat.nInclUpperLevels ; - nStart = rFormat.nStart ; - cBullet = rFormat.cBullet ; - mePositionAndSpaceMode = rFormat.mePositionAndSpaceMode; - nFirstLineOffset = rFormat.nFirstLineOffset; - nAbsLSpace = rFormat.nAbsLSpace ; - nCharTextDistance = rFormat.nCharTextDistance ; - meLabelFollowedBy = rFormat.meLabelFollowedBy; - mnListtabPos = rFormat.mnListtabPos; - mnFirstLineIndent = rFormat.mnFirstLineIndent; - mnIndentAt = rFormat.mnIndentAt; - eVertOrient = rFormat.eVertOrient ; - sPrefix = rFormat.sPrefix ; - sSuffix = rFormat.sSuffix ; - aGraphicSize = rFormat.aGraphicSize ; - nBulletColor = rFormat.nBulletColor ; - nBulletRelSize = rFormat.nBulletRelSize; - SetShowSymbol(rFormat.IsShowSymbol()); - sCharStyleName = rFormat.sCharStyleName; + eNumAdjust = rFormat.eNumAdjust ; + nInclUpperLevels = rFormat.nInclUpperLevels ; + nStart = rFormat.nStart ; + cBullet = rFormat.cBullet ; + mePositionAndSpaceMode = rFormat.mePositionAndSpaceMode; + nFirstLineOffset = rFormat.nFirstLineOffset; + nAbsLSpace = rFormat.nAbsLSpace ; + nCharTextDistance = rFormat.nCharTextDistance ; + meLabelFollowedBy = rFormat.meLabelFollowedBy; + mnListtabPos = rFormat.mnListtabPos; + mnFirstLineIndent = rFormat.mnFirstLineIndent; + mnIndentAt = rFormat.mnIndentAt; + eVertOrient = rFormat.eVertOrient ; + sPrefix = rFormat.sPrefix ; + sSuffix = rFormat.sSuffix ; + aGraphicSize = rFormat.aGraphicSize ; + nBulletColor = rFormat.nBulletColor ; + nBulletRelSize = rFormat.nBulletRelSize; + SetShowSymbol(rFormat.IsShowSymbol()); + sCharStyleName = rFormat.sCharStyleName; pGraphicBrush.reset(); if(rFormat.pGraphicBrush) { @@ -777,7 +777,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(sal_uInt16 nLevel)const if(!pStdNumFmt) { pStdNumFmt = new SvxNumberFormat(SVX_NUM_ARABIC); - pStdOutlineNumFmt = new SvxNumberFormat(SVX_NUM_NUMBER_NONE); + pStdOutlineNumFmt = new SvxNumberFormat(SVX_NUM_NUMBER_NONE); } DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" ); diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index efd340efb055..0e93089acfba 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -81,7 +81,7 @@ SvXMLWordContext::SvXMLWordContext( if ( xAttrList.is() && xAttrList->hasAttribute( SvXMLAutoCorrectToken::NAME ) ) sRight = xAttrList->getValue( SvXMLAutoCorrectToken::NAME ); - if ( sWrong.isEmpty() || sRight.isEmpty()) + if ( sWrong.isEmpty() || sRight.isEmpty()) return; bool bOnlyTxt = sRight != sWrong; diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 6d597398654c..19fb8fa0ec47 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -162,8 +162,8 @@ void Outliner::ParagraphDeleted( sal_Int32 nPara ) return; Paragraph* pPara = pParaList->GetParagraph( nPara ); - if (!pPara) - return; + if (!pPara) + return; sal_Int16 nDepth = pPara->GetDepth(); @@ -711,8 +711,8 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUnd DBG_ASSERT( ( nDepth >= gnMinDepth ) && ( nDepth <= nMaxDepth ), "ImplInitDepth - Depth is invalid!" ); Paragraph* pPara = pParaList->GetParagraph( nPara ); - if (!pPara) - return; + if (!pPara) + return; sal_Int16 nOldDepth = pPara->GetDepth(); pPara->SetDepth( nDepth ); @@ -1103,7 +1103,7 @@ ErrCode Outliner::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat bFirstParaIsEmpty = false; sal_Int32 nParas = pEditEngine->GetParagraphCount(); - pParaList->Clear(); + pParaList->Clear(); for ( sal_Int32 n = 0; n < nParas; n++ ) { std::unique_ptr<Paragraph> pPara(new Paragraph( 0 )); @@ -1130,8 +1130,8 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ) for( sal_Int32 nPara = nFirstPara; nPara <= nLastPara; nPara++ ) { Paragraph* pPara = pParaList->GetParagraph( nPara ); - if (pPara) - { + if (pPara) + { if( ImpConvertEdtToOut( nPara ) ) { pLastConverted = pPara; @@ -1393,8 +1393,8 @@ const SvxNumberFormat* Outliner::GetNumberFormat( sal_Int32 nPara ) const Size Outliner::ImplGetBulletSize( sal_Int32 nPara ) { Paragraph* pPara = pParaList->GetParagraph( nPara ); - if (!pPara) - return Size(); + if (!pPara) + return Size(); if( pPara->aBulSize.Width() == -1 ) { @@ -2025,12 +2025,12 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const return nullptr; } - if (nCount < 0) - { + if (nCount < 0) + { SAL_INFO("editeng.chaining", "[Overflowing] No Overflowing text but GetNonOverflowinText called?!"); return nullptr; - } + } // NOTE: We want the selection of the overflowing text from here // At the same time we may want to consider the beginning of such text @@ -2104,7 +2104,7 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const bool bLastParaInterrupted = pEditEngine->GetOverflowingLineNum() > 0; - return new NonOverflowingText(aOverflowingTextSelection, bLastParaInterrupted); + return new NonOverflowingText(aOverflowingTextSelection, bLastParaInterrupted); } } diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index abeba94e1e6b..0ce287d2a6e4 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -276,7 +276,7 @@ SvxXMLTextExportComponent::SvxXMLTextExportComponent( : SvXMLExport( xContext, "", rFileName, xHandler, static_cast<frame::XModel*>(new SvxSimpleUnoModel()), FieldUnit::CM, SvXMLExportFlags::OASIS | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT ) { - SvxEditEngineSource aEditSource( pEditEngine ); + SvxEditEngineSource aEditSource( pEditEngine ); static const SfxItemPropertyMapEntry SvxXMLTextExportComponentPropertyMap[] = { diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 6a8e87656fd3..51994a323080 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -153,7 +153,7 @@ EditPaM SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection }; static SvxItemPropertySet aSvxXMLTextImportComponentPropertySet( SvxXMLTextImportComponentPropertyMap, EditEngine::GetGlobalItemPool() ); - assert(!rSel.HasRange()); + assert(!rSel.HasRange()); //get the initial para count before paste sal_uInt32 initialParaCount = rEditEngine.GetEditDoc().Count(); //insert para breaks before inserting the copied text diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index 14e7246b7b42..a3319d7d828f 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -332,7 +332,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) else { xInplaceClient->deactivatedUI(); - throw embed::WrongStateException(); //TODO: can't activate UI + throw embed::WrongStateException(); //TODO: can't activate UI } } } diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 2d757a594533..3225b7666953 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -160,8 +160,8 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve { if ( m_pInterfaceContainer ) { - ::cppu::OInterfaceContainerHelper* pContainer = - m_pInterfaceContainer->getContainer( + ::cppu::OInterfaceContainerHelper* pContainer = + m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get()); if ( pContainer != nullptr ) { diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index df78e09291ce..fddb668568b4 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -130,22 +130,22 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI } catch( const packages::WrongPasswordException& ) { - KillFile_Impl( aResult, xFactory ); + KillFile_Impl( aResult, xFactory ); throw io::IOException(); //TODO: } catch( const io::IOException& ) { - KillFile_Impl( aResult, xFactory ); + KillFile_Impl( aResult, xFactory ); throw; } catch( const uno::RuntimeException& ) { - KillFile_Impl( aResult, xFactory ); + KillFile_Impl( aResult, xFactory ); throw; } catch( const uno::Exception& ) { - KillFile_Impl( aResult, xFactory ); + KillFile_Impl( aResult, xFactory ); aResult.clear(); } } diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index 4ad544efcb56..af082ea64fcd 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1016,8 +1016,8 @@ namespace emfio if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { mpInputStream->ReadUInt32( offBmi ).ReadUInt32( cbBmi ).ReadUInt32( offBits ).ReadUInt32( cbBits ). ReadUInt32( nStyle ).ReadUInt32( nWidth ).ReadUInt32( nBrushStyle ); - aColorRef = ReadColor(); - mpInputStream->ReadInt32( elpHatch ).ReadUInt32( elpNumEntries ); + aColorRef = ReadColor(); + mpInputStream->ReadInt32( elpHatch ).ReadUInt32( elpNumEntries ); LineInfo aLineInfo; if ( nWidth ) diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 24824381516c..0e3172ee3c53 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -1106,8 +1106,8 @@ namespace emfio aMemoryStream.ReadInt32( nTmpX ) .ReadInt32( nTmpY ) .ReadUInt32( nStringLen ); - aPt.setX( nTmpX ); - aPt.setY( nTmpY ); + aPt.setX( nTmpX ); + aPt.setY( nTmpY ); if ( ( static_cast< sal_uInt64 >( nStringLen ) * sizeof( sal_Unicode ) ) < ( nEscLen - aMemoryStream.Tell() ) ) { diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 3bb55277c966..09d51b4843dd 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -95,7 +95,7 @@ static Reference< XInterface > createAllListenerAdapter Reference< XInterface > xAdapter; if( xInvocationAdapterFactory.is() && xListenerType.is() && xListener.is() ) { - Reference< XInvocation > xInvocationToAllListenerMapper = + Reference< XInvocation > xInvocationToAllListenerMapper = static_cast<XInvocation*>(new InvocationToAllListenerMapper( xListenerType, xListener, Helper )); Type aListenerType( xListenerType->getTypeClass(), xListenerType->getName()); Sequence<Type> arg2(1); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index da97727d7756..8371d97b61b0 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -564,9 +564,9 @@ namespace abp try { SQLException aException; - aError >>= aException; - if ( aException.Message.isEmpty() ) - { + aError >>= aException; + if ( aException.Message.isEmpty() ) + { // prepend some context info SQLContext aDetailedError; aDetailedError.Message = compmodule::ModuleRes(RID_STR_NOCONNECTION); @@ -574,9 +574,9 @@ namespace abp aDetailedError.NextException = aError; // handle (aka display) the new context info xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) ); - } - else - { + } + else + { // handle (aka display) the original error xInteractions->handle( new OInteractionRequest( makeAny( aException ) ) ); } diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index d2920a9292fd..062df51c042c 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -291,7 +291,7 @@ namespace pcr sal_Int32 nLen = Requests.getLength(); aReturn.realloc( nLen ); - Reference< XDispatch >* pReturn = aReturn.getArray(); + Reference< XDispatch >* pReturn = aReturn.getArray(); const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen; const DispatchDescriptor* pDescripts = Requests.getConstArray(); diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index a13930ceef3a..47055a2b0968 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -770,8 +770,8 @@ bool Sane::Start( BitmapTransporter& rBitmap ) } else if( eType == FrameStyle_Gray ) { - aConverter.Seek( 10 ); - aConverter.WriteUInt32( 1084 ); + aConverter.Seek( 10 ); + aConverter.WriteUInt32( 1084 ); aConverter.Seek( 28 ); aConverter.WriteUInt16( 8 ); aConverter.Seek( 54 ); |