diff options
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/bento.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribptr.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribsection.cxx | 14 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwptablelayout.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/tocread.cxx | 3 | ||||
-rw-r--r-- | lotuswordpro/source/filter/utlist.hxx | 6 |
7 files changed, 20 insertions, 21 deletions
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index f437ce9bdbec..4668d292f4e6 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -311,11 +311,11 @@ public: // Internal methods CBenValueSegment(CBenValue * pValue, BenContainerPos Pos, size_t Size) : CUtListElmt(&pValue->GetValueSegments()) { cImmediate = false; cPos = Pos; - cSize = Size; } + cSize = Size; } CBenValueSegment(CBenValue * pValue, const void * pImmData, unsigned short Size) : CUtListElmt(&pValue->GetValueSegments()) { cImmediate = true; - std::memcpy(cImmData, pImmData, Size); cSize = Size; } + std::memcpy(cImmData, pImmData, Size); cSize = Size; } bool IsImmediate() { return cImmediate; } BenContainerPos GetPosition() { return cPos; } size_t GetSize() { return cSize; } diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 2001fe2069f3..2a7566267ba6 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -169,8 +169,8 @@ void LwpFribPtr::XFConvert() } } - switch(nFribType) - { + switch(nFribType) + { case FRIB_TAG_TEXT: { LwpFribText* textFrib= static_cast<LwpFribText*>(pFrib); diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index 95bd07ca1644..ccb7307b4fe7 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -318,15 +318,11 @@ void LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) pSectStyle->SetMarginRight(fRight); } - //if(bSectionColumns) - //{ - //set columns - XFColumns* pColumns = m_pLayout->GetXFColumns(); - if(pColumns) - { - pSectStyle->SetColumns(pColumns); - } - //} + XFColumns* pColumns = m_pLayout->GetXFColumns(); + if(pColumns) + { + pSectStyle->SetColumns(pColumns); + } m_SectionStyleName = pXFStyleManager->AddStyle(std::move(pSectStyle)).m_pStyle->GetStyleName(); } } diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index e99ee6a9e603..89a0811d35a9 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -511,8 +511,8 @@ void LwpParaStyle::ApplySpacing(LwpPara* pPara, XFParaStyle* pParaStyle, LwpSpac break; case LwpSpacingCommonOverride::SPACING_CUSTOM: { - xftype = enumLHHeight; - height = LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(sal_Int32(float(multiple)/65536L*amount))); + xftype = enumLHHeight; + height = LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(sal_Int32(float(multiple)/65536L*amount))); pParaStyle->SetLineHeight(xftype,height); } break; diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index b595dc152c6a..e7438cb27b0d 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -1310,7 +1310,7 @@ void LwpTableLayout::SplitConflictCells() iter1 = m_RowsMap.find(i); if (iter1 == m_RowsMap.end())//default rows { - i++; + i++; continue; } pRowLayout= iter1->second; @@ -1326,9 +1326,9 @@ void LwpTableLayout::SplitConflictCells() for (sal_uInt16 j = i+1; j<nEffectRows; j++) { iter2 = m_RowsMap.find(j); - if (iter2 == m_RowsMap.end()) + if (iter2 == m_RowsMap.end()) continue; - pEffectRow = iter2->second; + pEffectRow = iter2->second; if (!pEffectRow->GetMergeCellFlag()) continue; else diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 8cc0d7cdb9ab..e2421efb0931 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -112,7 +112,8 @@ CBenTOCReader::ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize) BenByte * pCurrLabel = Label + BEN_MAGIC_BYTES_SIZE; BenWord Flags = - UtGetIntelWord(pCurrLabel); pCurrLabel += 2; // Flags + UtGetIntelWord(pCurrLabel); + pCurrLabel += 2; // Flags // Newer files are 0x0101--indicates if big or little endian. Older // files are 0x0 for flags if (Flags != 0x0101 && Flags != 0x0) diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index 58a666a2f8a3..9913e3359fd8 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -95,8 +95,10 @@ private: // Data class CUtList { public: // Methods - CUtList() { cDummyElmt.SetNext(&cDummyElmt); - cDummyElmt.SetPrev(&cDummyElmt); } + CUtList() { + cDummyElmt.SetNext(&cDummyElmt); + cDummyElmt.SetPrev(&cDummyElmt); + } virtual ~CUtList(); CUtListElmt * GetFirst() { return cDummyElmt.GetNext(); } CUtListElmt * GetLast() { return cDummyElmt.GetPrev(); } |