summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-04 09:28:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-03-04 13:07:40 +0000
commit32f95a35514701ed16413125b440c16d90f52b4a (patch)
tree25ac5edca15ee02bc937ee47116c2197559da4cd /editeng
parent0f98299f7aa44bbb55c1bfeddca7799f727d14b0 (diff)
V813: Decreased performance
Change-Id: I8a7528366156b288dc422b09cff0d5a32cde3c91
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit.hxx12
-rw-r--r--editeng/source/editeng/impedit4.cxx36
2 files changed, 24 insertions, 24 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index bacff3989c16..ae2376b00265 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -530,7 +530,7 @@ private:
void ParaAttribsToCharAttribs( ContentNode* pNode );
void GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>& rLst ) const;
- EditTextObject* CreateTextObject( EditSelection aSelection, SfxItemPool*, bool bAllowBigObjects = false, sal_Int32 nBigObjStart = 0 );
+ EditTextObject* CreateTextObject(EditSelection aSelection, SfxItemPool*, bool bAllowBigObjects = false, sal_Int32 nBigObjStart = 0);
EditSelection InsertTextObject( const EditTextObject&, EditPaM aPaM );
EditSelection InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const OUString& rBaseURL, const EditPaM& rPaM, bool bUseSpecial );
@@ -619,9 +619,9 @@ private:
EditPaM ReadBin( SvStream& rInput, EditSelection aSel );
sal_uInt32 WriteText( SvStream& rOutput, EditSelection aSel );
sal_uInt32 WriteRTF( SvStream& rOutput, EditSelection aSel );
- sal_uInt32 WriteXML( SvStream& rOutput, EditSelection aSel );
+ sal_uInt32 WriteXML(SvStream& rOutput, const EditSelection& rSel);
sal_uInt32 WriteHTML( SvStream& rOutput, EditSelection aSel );
- sal_uInt32 WriteBin( SvStream& rOutput, EditSelection aSel, bool bStoreUnicode = false );
+ sal_uInt32 WriteBin(SvStream& rOutput, const EditSelection& rSel, bool bStoreUnicode = false);
void WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput, sal_Int32 nPara, sal_Int32 nPos,
std::vector<SvxFontItem*>& rFontTable, SvxColorList& rColorList );
@@ -775,11 +775,11 @@ public:
EditPaM InsertField(const EditSelection& rCurSel, const SvxFieldItem& rFld);
bool UpdateFields();
- EditPaM Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
- void Write( SvStream& rOutput, EETextFormat eFormat, EditSelection aSel );
+ EditPaM Read(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, const EditSelection& rSel, SvKeyValueIterator* pHTTPHeaderAttrs = NULL);
+ void Write(SvStream& rOutput, EETextFormat eFormat, const EditSelection& rSel);
EditTextObject* CreateTextObject();
- EditTextObject* CreateTextObject( EditSelection aSel );
+ EditTextObject* CreateTextObject(const EditSelection& rSel);
void SetText( const EditTextObject& rTextObject );
EditSelection InsertText( const EditTextObject& rTextObject, EditSelection aSel );
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index f843a6308763..de54276f0673 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -86,21 +86,21 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-EditPaM ImpEditEngine::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, EditSelection aSel, SvKeyValueIterator* pHTTPHeaderAttrs )
+EditPaM ImpEditEngine::Read(SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, const EditSelection& rSel, SvKeyValueIterator* pHTTPHeaderAttrs)
{
bool _bUpdate = GetUpdateMode();
SetUpdateMode( false );
EditPaM aPaM;
if ( eFormat == EE_FORMAT_TEXT )
- aPaM = ReadText( rInput, aSel );
+ aPaM = ReadText( rInput, rSel );
else if ( eFormat == EE_FORMAT_RTF )
- aPaM = ReadRTF( rInput, aSel );
+ aPaM = ReadRTF( rInput, rSel );
else if ( eFormat == EE_FORMAT_XML )
- aPaM = ReadXML( rInput, aSel );
+ aPaM = ReadXML( rInput, rSel );
else if ( eFormat == EE_FORMAT_HTML )
- aPaM = ReadHTML( rInput, rBaseURL, aSel, pHTTPHeaderAttrs );
+ aPaM = ReadHTML( rInput, rBaseURL, rSel, pHTTPHeaderAttrs );
else if ( eFormat == EE_FORMAT_BIN)
- aPaM = ReadBin( rInput, aSel );
+ aPaM = ReadBin( rInput, rSel );
else
{
OSL_FAIL( "Read: Unknown Format" );
@@ -199,7 +199,7 @@ EditPaM ImpEditEngine::ReadBin( SvStream& rInput, EditSelection aSel )
return aLastPaM;
}
-void ImpEditEngine::Write( SvStream& rOutput, EETextFormat eFormat, EditSelection aSel )
+void ImpEditEngine::Write(SvStream& rOutput, EETextFormat eFormat, const EditSelection& rSel)
{
if ( !rOutput.IsWritable() )
rOutput.SetError( SVSTREAM_WRITE_ERROR );
@@ -207,15 +207,15 @@ void ImpEditEngine::Write( SvStream& rOutput, EETextFormat eFormat, EditSelectio
if ( !rOutput.GetError() )
{
if ( eFormat == EE_FORMAT_TEXT )
- WriteText( rOutput, aSel );
+ WriteText( rOutput, rSel );
else if ( eFormat == EE_FORMAT_RTF )
- WriteRTF( rOutput, aSel );
+ WriteRTF( rOutput, rSel );
else if ( eFormat == EE_FORMAT_XML )
- WriteXML( rOutput, aSel );
+ WriteXML( rOutput, rSel );
else if ( eFormat == EE_FORMAT_HTML )
- WriteHTML( rOutput, aSel );
+ WriteHTML( rOutput, rSel );
else if ( eFormat == EE_FORMAT_BIN)
- WriteBin( rOutput, aSel );
+ WriteBin( rOutput, rSel );
else
{
OSL_FAIL( "Write: Unknown Format" );
@@ -290,17 +290,17 @@ static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_Int32
}
}
-sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, bool bStoreUnicodeStrings )
+sal_uInt32 ImpEditEngine::WriteBin(SvStream& rOutput, const EditSelection& rSel, bool bStoreUnicodeStrings)
{
- std::unique_ptr<EditTextObject> xObj(CreateTextObject(aSel, NULL));
+ std::unique_ptr<EditTextObject> xObj(CreateTextObject(rSel, NULL));
xObj->mpImpl->StoreUnicodeStrings(bStoreUnicodeStrings);
xObj->Store(rOutput);
return 0;
}
-sal_uInt32 ImpEditEngine::WriteXML( SvStream& rOutput, EditSelection aSel )
+sal_uInt32 ImpEditEngine::WriteXML(SvStream& rOutput, const EditSelection& rSel)
{
- ESelection aESel = CreateESel( aSel );
+ ESelection aESel = CreateESel(rSel);
SvxWriteXML( *GetEditEnginePtr(), rOutput, aESel );
@@ -1013,9 +1013,9 @@ EditTextObject* ImpEditEngine::CreateTextObject()
return CreateTextObject( aCompleteSelection );
}
-EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel )
+EditTextObject* ImpEditEngine::CreateTextObject(const EditSelection& rSel)
{
- return CreateTextObject( aSel, GetEditTextObjectPool(), aStatus.AllowBigObjects(), nBigTextObjectStart );
+ return CreateTextObject(rSel, GetEditTextObjectPool(), aStatus.AllowBigObjects(), nBigTextObjectStart);
}
EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool* pPool, bool bAllowBigObjects, sal_Int32 nBigObjectStart )