Kaydet (Commit) 64520a6f authored tarafından Kohei Yoshida's avatar Kohei Yoshida

BinObject is no more. Change the method names to reflect that.

Change-Id: I723a7da307379c6f2e8256fe41023b4b96739f12
üst 4da3a010
...@@ -521,8 +521,8 @@ private: ...@@ -521,8 +521,8 @@ private:
void ParaAttribsToCharAttribs( ContentNode* pNode ); void ParaAttribsToCharAttribs( ContentNode* pNode );
void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const; void GetCharAttribs( sal_uInt16 nPara, std::vector<EECharAttrib>& rLst ) const;
EditTextObject* CreateBinTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 ); EditTextObject* CreateTextObject( EditSelection aSelection, SfxItemPool*, sal_Bool bAllowBigObjects = sal_False, sal_uInt16 nBigObjStart = 0 );
EditSelection InsertBinTextObject( const EditTextObject&, EditPaM aPaM ); 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 ); EditSelection InsertText( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxDataObj, const String& rBaseURL, const EditPaM& rPaM, sal_Bool bUseSpecial );
EditPaM Clear(); EditPaM Clear();
......
...@@ -301,7 +301,7 @@ static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16 ...@@ -301,7 +301,7 @@ static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_uInt16
sal_uInt32 ImpEditEngine::WriteBin( SvStream& rOutput, EditSelection aSel, bool bStoreUnicodeStrings ) 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->mpImpl->StoreUnicodeStrings(bStoreUnicodeStrings);
pObj->Store(rOutput); pObj->Store(rOutput);
return 0; return 0;
...@@ -1017,10 +1017,10 @@ EditTextObject* ImpEditEngine::CreateTextObject() ...@@ -1017,10 +1017,10 @@ EditTextObject* ImpEditEngine::CreateTextObject()
EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel ) 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); EditTextObject* pTxtObj = new EditTextObject(pPool);
pTxtObj->SetVertical( IsVertical() ); pTxtObj->SetVertical( IsVertical() );
...@@ -1195,12 +1195,12 @@ EditSelection ImpEditEngine::InsertText( const EditTextObject& rTextObject, Edit ...@@ -1195,12 +1195,12 @@ EditSelection ImpEditEngine::InsertText( const EditTextObject& rTextObject, Edit
aSel.Adjust( aEditDoc ); aSel.Adjust( aEditDoc );
if ( aSel.HasRange() ) if ( aSel.HasRange() )
aSel = ImpDeleteSelection( aSel ); aSel = ImpDeleteSelection( aSel );
EditSelection aNewSel = InsertBinTextObject( rTextObject, aSel.Max() ); EditSelection aNewSel = InsertTextObject( rTextObject, aSel.Max() );
LeaveBlockNotifications(); LeaveBlockNotifications();
return aNewSel; 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! // Optimize: No getPos undFindParaportion, instead calculate index!
EditSelection aSel( aPaM, aPaM ); EditSelection aSel( aPaM, aPaM );
...@@ -2944,7 +2944,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, ...@@ -2944,7 +2944,7 @@ EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection,
if (bSingleNode && !bHasAttribs) if (bSingleNode && !bHasAttribs)
pUndo->SetText( aSel.Min().GetNode()->Copy( aSel.Min().GetIndex(), aSel.Max().GetIndex()-aSel.Min().GetIndex() ) ); pUndo->SetText( aSel.Min().GetNode()->Copy( aSel.Min().GetIndex(), aSel.Max().GetIndex()-aSel.Min().GetIndex() ) );
else 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 // now apply the changes from end to start to leave the offsets of the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment