summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-01-08 16:45:17 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-01-08 21:03:51 -0500
commit64520a6fc0b7e64a6c4e9679fca2f9c88293c13f (patch)
tree2db4c395f1c9eb42d2b61d088d3eacd5148cff14
parent4da3a0108468a3e7fd4aae32129b9c0fbe4635a4 (diff)
BinObject is no more. Change the method names to reflect that.
Change-Id: I723a7da307379c6f2e8256fe41023b4b96739f12
-rw-r--r--editeng/source/editeng/impedit.hxx4
-rw-r--r--editeng/source/editeng/impedit4.cxx12
2 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 1d762b023b58..58c72b5b0bfe 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -521,8 +521,8 @@ private:
void ParaAttribsToCharAttribs( ContentNode* pNode );
void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
- EditTextObject* CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 );
- EditSelection InsertBinTextObject( const EditTextObject&, EditPaM aPaM );
+ EditTextObject* CreateTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 );
+ EditSelection InsertTextObject( const EditTextObject&, EditPaM aPaM );
EditSelection InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
EditPaM Clear();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index a869e18d9514..a00e28e48f69 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -301,7 +301,7 @@ static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16
sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, bool bStoreUnicodeStrings )
{
- boost::scoped_ptr<EditTextObject> pObj(CreateBinTextObject(aSel, NULL));
+ boost::scoped_ptr<EditTextObject> pObj(CreateTextObject(aSel, NULL));
pObj->mpImpl->StoreUnicodeStrings(bStoreUnicodeStrings);
pObj->Store(rOutput);
return 0;
@@ -1017,10 +1017,10 @@ EditTextObject* ImpEditEngine::CreateTextObject()
EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel )
{
- return CreateBinTextObject( aSel, GetEditTextObjectPool(), aStatus.AllowBigObjects(), nBigTextObjectStart );
+ return CreateTextObject( aSel, GetEditTextObjectPool(), aStatus.AllowBigObjects(), nBigTextObjectStart );
}
-EditTextObject* ImpEditEngine::CreateBinTextObject( EditSelection aSel, SfxItemPool* pPool, sal_Bool bAllowBigObjects, sal_uInt16 nBigObjectStart )
+EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool* pPool, sal_Bool bAllowBigObjects, sal_uInt16 nBigObjectStart )
{
EditTextObject* pTxtObj = new EditTextObject(pPool);
pTxtObj->SetVertical( IsVertical() );
@@ -1195,12 +1195,12 @@ EditSelection ImpEditEngine::InsertText( const EditTextObject& rTextObject, Edit
aSel.Adjust( aEditDoc );
if ( aSel.HasRange() )
aSel = ImpDeleteSelection( aSel );
- EditSelection aNewSel = InsertBinTextObject( rTextObject, aSel.Max() );
+ EditSelection aNewSel = InsertTextObject( rTextObject, aSel.Max() );
LeaveBlockNotifications();
return aNewSel;
}
-EditSelection ImpEditEngine::InsertBinTextObject( const EditTextObject& rTextObject, EditPaM aPaM )
+EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject, EditPaM aPaM )
{
// Optimize: No getPos undFindParaportion, instead calculate index!
EditSelection aSel( aPaM, aPaM );
@@ -2944,7 +2944,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
if (bSingleNode && !bHasAttribs)
pUndo->SetText( aSel.Min().GetNode()->Copy( aSel.Min().GetIndex(), aSel.Max().GetIndex()-aSel.Min().GetIndex() ) );
else
- pUndo->SetText( CreateBinTextObject( aSel, NULL ) );
+ pUndo->SetText( CreateTextObject( aSel, NULL ) );
}
// now apply the changes from end to start to leave the offsets of the