diff options
author | Justin Luth <jluth@mail.com> | 2023-05-20 13:04:17 -0400 |
---|---|---|
committer | Justin Luth <jluth@mail.com> | 2023-05-20 21:34:24 +0200 |
commit | 02c56a8d3ea86f28ffbdd645f83d1d4de2b56bea (patch) | |
tree | 99c87f5a5a00a3b6414158f490467122704abdf9 /sw/source/filter/ww8/ww8par5.cxx | |
parent | fc15f483988622b8e3ea2a97c9a8593f2beb18fb (diff) |
tdf#90408 Revert #i79169# save/apply attributes of macrobutton text
This reverts ancient commit a79a0101f114e0fcac40503220c5d34750124367.
I'm not sure what problem it was trying to solve,
but it doesn't seem necessary now.
At least, I took my unit test and set some different
font sizes to them, and they correctly got those attributes.
This was the original file that needed to be fixed:
make CppunitTest_sw_ww8export4 CPPUNIT_TEST_NAME=testTdf90408
This is for the current bug report:
make CppunitTest_sw_ww8export4 CPPUNIT_TEST_NAME=testTdf90408B
Change-Id: I09fb3bd12d645318f1024ac78a9b3154a1fcd078
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152025
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Diffstat (limited to 'sw/source/filter/ww8/ww8par5.cxx')
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index ddaad0e3f741..a5f1d6892fbb 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2360,8 +2360,6 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) bool bBracket = false; WW8ReadFieldParams aReadParam( rStr ); - sal_Int32 nOffset = 0; - for (;;) { const sal_Int32 nRet = aReadParam.SkipToNextToken(); @@ -2374,8 +2372,6 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) aName = aReadParam.GetResult(); else if( aVText.isEmpty() || bBracket ) { - nOffset = aReadParam.GetTokenSttPtr() + 1; - if( bBracket ) aVText += " "; aVText += aReadParam.GetResult(); @@ -2403,19 +2399,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( SwFieldIds::Macro )), aName, aVText ); if( !bApplyWingdings ) - { - m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) ); - WW8_CP nOldCp = m_xPlcxMan->Where(); - WW8_CP nCp = nOldCp + nOffset; - - SwPaM aPaM(*m_pPaM, m_pPaM); - aPaM.SetMark(); - aPaM.Move(fnMoveBackward); - aPaM.Exchange(); - - m_pPostProcessAttrsInfo.reset(new WW8PostProcessAttrsInfo(nCp, nCp, aPaM)); - } else { //set Wingdings font @@ -2446,16 +2430,6 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr) return eF_ResT::OK; } -WW8PostProcessAttrsInfo::WW8PostProcessAttrsInfo(WW8_CP nCpStart, WW8_CP nCpEnd, - SwPaM & rPaM) - : mbCopy(false) - , mnCpStart(nCpStart) - , mnCpEnd(nCpEnd) - , mPaM(*rPaM.GetMark(), *rPaM.GetPoint()) - , mItemSet(rPaM.GetDoc().GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>) -{ -} - bool CanUseRemoteLink(const OUString &rGrfName) { bool bUseRemote = false; |