summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/fmtcol.hxx2
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx4
-rw-r--r--sw/source/core/text/atrstck.cxx9
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx12
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx2
-rw-r--r--sw/source/filter/rtf/wrtrtf.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/uiconfig/layout/layout.mk2
10 files changed, 25 insertions, 16 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 7dcb6720d593..d06a64cf9bfd 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -116,7 +116,7 @@ public:
void SetAttrOutlineLevel( int );
int GetAttrOutlineLevel() const;
int GetAssignedOutlineStyleLevel() const;
- inline const bool IsAssignedToListLevelOfOutlineStyle() const
+ inline bool IsAssignedToListLevelOfOutlineStyle() const
{
return mbAssignedToOutlineStyle;
}
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index f06b74504481..4b9e9ec73cfe 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -676,8 +676,8 @@ void SwTaggedPDFHelper::SetAttributes( vcl::PDFWriter::StructElement eType )
const SwAttrSet& aSet = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode()->GetSwAttrSet();
const SvxAdjust nAdjust = aSet.GetAdjust().GetAdjust();
if ( SVX_ADJUST_BLOCK == nAdjust || SVX_ADJUST_CENTER == nAdjust ||
- ( pFrm->IsRightToLeft() && SVX_ADJUST_LEFT == nAdjust ||
- !pFrm->IsRightToLeft() && SVX_ADJUST_RIGHT == nAdjust ) )
+ ( (pFrm->IsRightToLeft() && SVX_ADJUST_LEFT == nAdjust) ||
+ (!pFrm->IsRightToLeft() && SVX_ADJUST_RIGHT == nAdjust) ) )
{
eVal = SVX_ADJUST_BLOCK == nAdjust ?
vcl::PDFWriter::Justify :
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 383791c8a671..eb4148264931 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -270,8 +270,11 @@ bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr,
// attribute, instead we take the colors from the view options:
//
if ( pShell->GetWin() &&
- ( ((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks() ||
- !((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsLinks() ) )
+ (
+ (((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsVisitedLinks()) ||
+ (!((SwTxtINetFmt&)rAttr).IsVisited() && SwViewOption::IsLinks())
+ )
+ )
{
if ( pColor )
{
@@ -749,7 +752,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, sal_Bool bPu
pDefaultArray[ nStackPos ];
if( (mpShell && !mpShell->GetWin()) ||
- pTmpItem && !static_cast<const SvxCharHiddenItem*>(pTmpItem)->GetValue() )
+ (pTmpItem && !static_cast<const SvxCharHiddenItem*>(pTmpItem)->GetValue()) )
{
rFnt.SetUnderline( ((SvxUnderlineItem&)rItem).GetLineStyle() );
rFnt.SetUnderColor( ((SvxUnderlineItem&)rItem).GetColor() );
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index d2485a585605..08f61b1341c0 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -630,10 +630,14 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
}
}
//jetzt nochmal fuer Fonts
- if(pBulletFontNames[i] != SwXNumberingRules::GetInvalidStyle() &&
- ((pBulletFontNames[i].Len() && !aFmt.GetBulletFont()) ||
- pBulletFontNames[i].Len() &&
- aFmt.GetBulletFont()->GetName() != pBulletFontNames[i] ))
+ if(
+ pBulletFontNames[i] != SwXNumberingRules::GetInvalidStyle() &&
+ (
+ (pBulletFontNames[i].Len() && !aFmt.GetBulletFont()) ||
+ (pBulletFontNames[i].Len() &&
+ aFmt.GetBulletFont()->GetName() != pBulletFontNames[i])
+ )
+ )
{
const SvxFontListItem* pFontListItem =
(const SvxFontListItem* )pDoc->GetDocShell()
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 74c3c30c71c2..030409c1e955 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -460,7 +460,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
};
sal_uInt16 nRef = 0;
- sal_uInt16 aSets[2];
+ sal_uInt16 aSets[2] = {0,0};
switch( nCSS1Script )
{
case CSS1_OUTMODE_WESTERN:
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index ed32aeb9d361..fd9b8511b906 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -4004,11 +4004,13 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
}
if (!rbCollExist)
+ {
//pColl->SetOutlineLevel( nOutlineLevel ); //#outline level,removed by zhaojianwei
if(nOutlineLevel < MAXLEVEL) //->add by zhaojianwei
pColl->AssignToListLevelOfOutlineStyle( nOutlineLevel );
else
pColl->DeleteAssignmentToListLevelOfOutlineStyle(); //<-end,zhaojianwei
+ }
return pColl;
}
diff --git a/sw/source/filter/rtf/wrtrtf.cxx b/sw/source/filter/rtf/wrtrtf.cxx
index d0dc00deb276..84eb60cf3847 100644
--- a/sw/source/filter/rtf/wrtrtf.cxx
+++ b/sw/source/filter/rtf/wrtrtf.cxx
@@ -1683,8 +1683,8 @@ void SwRTFWriter::CheckEndNodeForSection( const SwNode& rNd )
// wer bestimmt den nachsten??
SwNodeIndex aIdx( rNd, 1 );
pSectNd = aIdx.GetNode().GetSectionNode();
- if( !( ( pSectNd || aIdx.GetNode().IsEndNode() &&
- 0 != ( pSectNd = aIdx.GetNode().StartOfSectionNode()->GetSectionNode() ))
+ if( !( ( pSectNd || (aIdx.GetNode().IsEndNode() &&
+ 0 != ( pSectNd = aIdx.GetNode().StartOfSectionNode()->GetSectionNode() )) )
/*&& CONTENT_SECTION == pSectNd->GetSection().GetType()*/ ))
{
// wer bestimmt denn nun den neuen Abschnitt?
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index d8769159afc1..e93c3339bc73 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3436,7 +3436,7 @@ void wwSectionManager::InsertSegments()
bool bThisAndNextAreCompatible = (aNext != aEnd) ? ((aIter->GetPageWidth() == aNext->GetPageWidth()) &&
(aIter->GetPageHeight() == aNext->GetPageHeight()) && (aIter->IsLandScape() == aNext->IsLandScape())) : true;
- if ((aNext != aEnd && aNext->IsContinous() && bThisAndNextAreCompatible || bProtected))
+ if ((aNext != aEnd && aNext->IsContinous() && bThisAndNextAreCompatible) || bProtected)
{
bIgnoreCols = true;
if ((aIter->NoCols() > 1) || bProtected)
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index d96a072d6893..03dd5fa36fdd 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1244,7 +1244,7 @@ void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
}
BOOL bPercent;
// im Rahmenformat nur relative Angaben
- if ( bFormat || rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff)
+ if ( bFormat || (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff) )
{
// Wert fuer 100% setzen
aEd1.SetRefValue(nTotalWish);
diff --git a/sw/uiconfig/layout/layout.mk b/sw/uiconfig/layout/layout.mk
index f6bea876d898..8daa1c5e8fab 100644
--- a/sw/uiconfig/layout/layout.mk
+++ b/sw/uiconfig/layout/layout.mk
@@ -1,7 +1,7 @@
# TODO: move to solenv/inc
# copies: sw/uiconfig/layout svx/uiconfig/layout
-TRALAY=tralay
+TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
XML_DEST=$(DLLDEST)
XML_LANGS=$(alllangiso)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 02:14:27 +0000