summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--starmath/source/dialog.cxx2
-rw-r--r--starmath/source/document.cxx12
-rw-r--r--starmath/source/mathml.cxx2
-rw-r--r--starmath/source/node.cxx16
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx3
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx3
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx10
7 files changed, 29 insertions, 19 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 6644d0a8ce49..cdf6ef8958ca 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2082,7 +2082,7 @@ void SmSymDefineDialog::UpdateButtons()
// oder wenn es noch kein Symbol des neuen Namens gibt (wuerde implizites
// loeschen des bereits vorhandenen Symbols erfordern)
BOOL bEqualName = pOrigSymbol && aTmpSymbolName == pOrigSymbol->GetName();
- bChange = pOrigSymbol && (bEqualName && !bEqual || !bEqualName && bAdd);
+ bChange = pOrigSymbol && ( (bEqualName && !bEqual) || (!bEqualName && bAdd) );
}
aAddBtn .Enable(bAdd);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 1ed5cdab3fd7..4a4bd42c6097 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -822,8 +822,16 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
{
uno::Reference < embed::XStorage > xStorage = pMedium->GetStorage();
uno::Reference < container::XNameAccess > xAccess (xStorage, uno::UNO_QUERY);
- if ( xAccess->hasByName( C2S( "content.xml" ) ) && xStorage->isStreamElement( C2S( "content.xml" ) ) ||
- xAccess->hasByName( C2S( "Content.xml" ) ) && xStorage->isStreamElement( C2S( "Content.xml" ) ) )
+ if (
+ (
+ xAccess->hasByName( C2S( "content.xml" ) ) &&
+ xStorage->isStreamElement( C2S( "content.xml" ) )
+ ) ||
+ (
+ xAccess->hasByName( C2S( "Content.xml" ) ) &&
+ xStorage->isStreamElement( C2S( "Content.xml" ) )
+ )
+ )
{
// is this a fabulous math package ?
Reference<com::sun::star::frame::XModel> xModel(GetModel());
diff --git a/starmath/source/mathml.cxx b/starmath/source/mathml.cxx
index f6fbd1ed251c..dc3e153d3613 100644
--- a/starmath/source/mathml.cxx
+++ b/starmath/source/mathml.cxx
@@ -1323,6 +1323,7 @@ void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference<
rContext.GetSmImport().GetMM100UnitConverter().
setXMLMeasureUnit(MAP_POINT);
if (-1 == sValue.indexOf(GetXMLToken(XML_UNIT_PT)))
+ {
if (-1 == sValue.indexOf('%'))
nFontSize=0.0;
else
@@ -1330,6 +1331,7 @@ void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference<
rContext.GetSmImport().GetMM100UnitConverter().
setXMLMeasureUnit(MAP_RELATIVE);
}
+ }
break;
case XML_TOK_FONTFAMILY:
sFontFamily = sValue;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index fa5a27920cc2..114d6437bb62 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -213,9 +213,13 @@ void SmNode::SetColor(const Color& rColor)
void SmNode::SetAttribut(USHORT nAttrib)
{
- if ( nAttrib == ATTR_BOLD && !(Flags() & FLG_BOLD)
- || nAttrib == ATTR_ITALIC && !(Flags() & FLG_ITALIC))
+ if (
+ (nAttrib == ATTR_BOLD && !(Flags() & FLG_BOLD)) ||
+ (nAttrib == ATTR_ITALIC && !(Flags() & FLG_ITALIC))
+ )
+ {
nAttributes |= nAttrib;
+ }
SmNode *pNode;
USHORT nSize = GetNumSubNodes();
@@ -227,9 +231,13 @@ void SmNode::SetAttribut(USHORT nAttrib)
void SmNode::ClearAttribut(USHORT nAttrib)
{
- if ( nAttrib == ATTR_BOLD && !(Flags() & FLG_BOLD)
- || nAttrib == ATTR_ITALIC && !(Flags() & FLG_ITALIC))
+ if (
+ (nAttrib == ATTR_BOLD && !(Flags() & FLG_BOLD)) ||
+ (nAttrib == ATTR_ITALIC && !(Flags() & FLG_ITALIC))
+ )
+ {
nAttributes &= ~nAttrib;
+ }
SmNode *pNode;
USHORT nSize = GetNumSubNodes();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 7024c967c87d..5decec3d7a12 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2104,6 +2104,7 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
}
+#if 0
/* */
USHORT SwWW8Writer::StartTableFromFrmFmt(WW8Bytes &rAt, const SwFrmFmt *pFmt,
@@ -2222,7 +2223,7 @@ bool RowContainsProblematicGraphic(const SwWriteTableCellPtr *pRow,
}
return bHasGraphic;
}
-
+#endif
//---------------------------------------------------------------------------
// Tabellen
//---------------------------------------------------------------------------
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 4669beef0663..1db96f768dde 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -594,10 +594,11 @@ public:
void WriteText();
void WriteCR(ww8::WW8TableNodeInfo::Pointer_t pTableTextNodeInfo = ww8::WW8TableNodeInfo::Pointer_t());
void WriteChar( sal_Unicode c );
- void WriteCellEnd();
void WriteRowEnd(sal_uInt32 nDepth = 1);
+#if 0
USHORT StartTableFromFrmFmt(WW8Bytes &rAt, const SwFrmFmt *pFmt,
SwTwips &rPageSize);
+#endif
void OutSwString(const String&, xub_StrLen nStt, xub_StrLen nLen,
bool bUnicode, rtl_TextEncoding eChrSet);
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b14821161408..5e321f217da5 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3449,16 +3449,6 @@ ULONG SwWW8Writer::ReplaceCr( BYTE nChar )
return nRetPos;
}
-void SwWW8Writer::WriteCellEnd()
-{
- //Technically in a word document this is a different value for a
- //cell without a graphic. But it doesn't seem to make a difference
- ULONG nOffset = ReplaceCr( (BYTE)0x07 );
- ASSERT(nOffset, "Eek!, no para end mark to replace with row end mark");
- if (nOffset)
- pMagicTable->Append(Fc2Cp(nOffset),0x122);
-}
-
void SwWW8Writer::WriteRowEnd(sal_uInt32 nDepth)
{
if (nDepth == 1)
generated by cgit (git 2.34.1) at 2025-02-10 01:11:42 +0000