summaryrefslogtreecommitdiff
path: root/starmath/source/node.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:23:52 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:23:52 +0200
commited41260b25bbb72c3afc173c3950e4db6586aae5 (patch)
treea1e1f6e9e7c7152281500b4f2885db86de114299 /starmath/source/node.cxx
parentcce335a211fc31158cc2c257c03fa602dd89e19f (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit f4e134e37cd1c6bcdf821aea38aa549c9ea1c46b (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:29 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit 11ab1028c5e354ac40ee58ace0dc84989eae8a27 Author: Jiao Jianhua <jjiao@novell.com> Date: Tue Sep 14 17:14:11 2010 +0200 sw-default-cjk-fontsize.diff: default CJK font fontsize as 10.5pt i#72010 sw/source/ui/config/fontcfg.cxx | 5 ++++- sw/source/ui/inc/fontcfg.hxx | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) commit 216f84e4b0933612276690a7f69f264e9ded5c71 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 17:11:44 2010 +0200 sw-graphic-save-problem.diff: n240770 sw/source/core/graphic/ndgrf.cxx | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 9ec22325aba338803a96a373db97f3f4e2bc2b12 Author: Michel Loiseleur <mloiseleur@linagora.com> Date: Tue Sep 14 17:04:28 2010 +0200 sw-html-insert-unknown-tags.diff: paste html text between 2 unknown tags i#59064 sw/source/filter/html/swhtml.cxx | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 4b3a488ecb4e6810735825973bb9433249a19fb6 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 16:54:36 2010 +0200 sw-paste-table.diff: Refresh the cell formatting after pasting in it n#564789 sw/source/filter/basflt/shellio.cxx | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) commit d4ad757a11eb662f853ea78fefd6d11ea1df2119 Author: Fong Lin <pflin@novell.com> Date: Tue Sep 14 16:42:39 2010 +0200 sw-changes-format-fix.diff: show insertion change first n#545815 sw/source/core/doc/docredln.cxx | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) commit 33370870cc133b7cb7f470f752526cdd4a4339ab Author: Fong Lin <pflin@novell.com> Date: Tue Sep 14 16:39:57 2010 +0200 sw-ww8-import-list-fix.diff:fix bullet indent issue n#547308 sw/source/filter/ww8/ww8par6.cxx | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) commit 0589e7f8eb08119cee8ff1a186bfbb887d3838e4 Author: Fong Lin <pflin@novell.com> Date: Tue Sep 14 16:35:20 2010 +0200 sw-ww8-textframe-background-fix.diff n#547308 sw/source/filter/ww8/ww8graf.cxx | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit b7551ace7e57ba3a4dbacf5d8906000600a43467 Author: Amelia Wang <amwang@novell.com> Date: Tue Sep 14 16:23:16 2010 +0200 sw-insert-pagebreak-in-numbered-paragraph.diff n#396648 sw/inc/doc.hxx | 1 + sw/source/core/docnode/ndtbl.cxx | 43 ++++++++++++++++++++++++++++++++++++++ sw/source/ui/wrtsh/wrtsh1.cxx | 2 + 3 files changed, 46 insertions(+), 0 deletions(-) commit edbd32ded9f6dddb75ebb57d03a10ac10d0fa107 Author: Amelia Wang <amwang@novell.com> Date: Tue Sep 14 16:20:45 2010 +0200 sw-outline-numbering-broken-fix.diff: outline numbering fix in master docs i#96092, n#445536 sw/source/core/docnode/ndcopy.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 7dd2e230f9de2676be07d094a837a0167e275194 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 16:12:59 2010 +0200 sw-import-html-controls.diff: n#485609 sw/source/filter/ww8/ww8par.hxx | 2 ++ sw/source/filter/ww8/ww8par3.cxx | 8 ++++++++ sw/source/filter/ww8/ww8par5.cxx | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) commit 8208802eed76b29302c132dd0a0608cc71dd396f Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 16:00:07 2010 +0200 field-patch-lock.diff: enhanced fields lock fix sw/source/core/crsr/pam.cxx | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) commit 7bd9bc8377047629a69450bf7d4c7dee67af517b Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 15:58:16 2010 +0200 field-patch-uno-fix.diff: enhanced fields UNO fix sw/source/core/unocore/unocoll.cxx | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) commit d19c7c96ee03fccc41fb5a74128304bd432eac81 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 15:00:33 2010 +0200 sw-table-join-fix-i99267.diff: n#417814 sw/source/core/layout/tabfrm.cxx | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit 47472e8e70c1ae3dc55a5b00ef69eaa85f651a7f Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 14:40:15 2010 +0200 sw-collapse-empty-table-par-like-html.diff: n#376690 sw/inc/IDocumentSettingAccess.hxx | 1 + sw/inc/doc.hxx | 1 + sw/inc/ndtxt.hxx | 2 + sw/source/core/crsr/callnk.cxx | 50 ++++++++++++++++++++++++++++++ sw/source/core/doc/doc.cxx | 4 ++ sw/source/core/doc/docnew.cxx | 1 + sw/source/core/inc/frame.hxx | 4 ++ sw/source/core/layout/calcmove.cxx | 43 +++++++++++++++++++++++++ sw/source/core/layout/findfrm.cxx | 9 +++++ sw/source/core/text/frmpaint.cxx | 34 +++++++++++--------- sw/source/core/text/porrst.cxx | 16 +++++++++ sw/source/filter/ww8/ww8par.cxx | 1 + sw/source/filter/ww8/ww8par2.cxx | 14 -------- sw/source/ui/uno/SwXDocumentSettings.cxx | 16 +++++++++- 14 files changed, 166 insertions(+), 30 deletions(-) commit 440bab6daea191ddf18b019fb88600b82e11a0ed Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 14:36:01 2010 +0200 sw-invert-border-spacing.diff: n#391591 sw/inc/IDocumentSettingAccess.hxx | 1 + sw/inc/doc.hxx | 1 + sw/source/core/doc/doc.cxx | 4 ++++ sw/source/core/doc/docnew.cxx | 1 + sw/source/core/layout/frmtool.cxx | 9 +++++++-- sw/source/core/layout/paintfrm.cxx | 2 +- sw/source/filter/rtf/swparrtf.cxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 2 ++ sw/source/filter/ww8/ww8par6.cxx | 17 +++++++++++++---- sw/source/ui/uno/SwXDocumentSettings.cxx | 18 +++++++++++++++--- 10 files changed, 46 insertions(+), 11 deletions(-) commit 70597695b23b5c45dfc735a7afd175f034428195 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 14:32:01 2010 +0200 sw-allow-negative-spacing.diff: correctly display linespacing < 100% n#364534 sw/source/core/text/itrform2.cxx | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) commit 998c642599c9196e2249fe35cf1450711fdd5d75 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 14:28:15 2010 +0200 sw-section-import-fix.diff: Additional paragraph imported from ww8 n#364533 sw/source/filter/ww8/ww8par.cxx | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 70561fdb1c47bc0bcfdbb97ffed28fe13ab556f8 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 14:16:21 2010 +0200 g++44-debug.diff: Fixed some imports for debug more sw/source/core/text/inftxt.cxx | 4 ++++ sw/source/filter/ww8/WW8Sttbf.cxx | 4 ++++ sw/source/filter/ww8/wrtww8gr.cxx | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) commit 10c10ffa04a952c81e0a85e0606b46e2433705c3 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 13:12:33 2010 +0200 win32-vs2005-compat.diff: Fix build with Visual Studio 2005 sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 985b180a2fae4ffeaac83ead0a71e1e128db0f79 Author: Octavio Alvarez <alvarezp@alvarezp.ods.org> Date: Mon Sep 13 17:30:41 2010 +0200 sw-preserve-char-style-on-reset-format.diff:Perserve character style on links i#47893 sw/source/ui/shells/textsh1.cxx | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 46c042512344d9e714ea716efc8f707ede5e179b Author: Octavio Alvarez <alvarezp@alvarezp.ods.org> Date: Mon Sep 13 17:26:19 2010 +0200 sw-show-Remove-Hyperlink-even-with-selection.diff: sw/source/ui/shells/textsh1.cxx | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) commit 1ccbb5d782056eeaf0c50333eed49ded73acfc5f Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Mon Sep 13 17:15:50 2010 +0200 sw-rtf-num-fix.diff:Fixes for RTF numbering export n#569266 sw/source/filter/rtf/rtfatr.cxx | 12 +++--- sw/source/filter/rtf/rtfnum.cxx | 78 ++++++++++++-------------------------- 2 files changed, 31 insertions(+), 59 deletions(-) commit 934cea09a95d7d638d09f881629579c568a30621 Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:46:36 2010 +0200 cjk-character-units-in-pggrid-fix.diff: add a new character unit sw/source/ui/inc/pggrid.hxx | 1 + sw/source/ui/misc/pggrid.cxx | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 16 deletions(-) commit dae07c66db3014b7f0eefada5e4ff8af8556e768 Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:45:00 2010 +0200 cjk-character-units-fix-376788.diff: add a new character unit i#376788 sw/source/ui/app/swmodul1.cxx | 14 ++++++++++---- sw/source/ui/config/optload.cxx | 8 +++++--- sw/source/ui/misc/pggrid.cxx | 4 ++-- sw/source/ui/uiview/view.cxx | 36 ++++++++++++++++++++++++++++++------ 4 files changed, 47 insertions(+), 15 deletions(-) commit 6321ca557a2a188a3a3f8f6eeb2881f8e7eacce8 Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:43:46 2010 +0200 cjk-character-units-fix.diff: add a new unit 'character unit' i#356101 sw/source/ui/app/appopt.cxx | 1 + sw/source/ui/app/swmodul1.cxx | 6 ++++-- sw/source/ui/config/optload.cxx | 3 +++ sw/source/ui/config/optload.src | 3 +-- sw/source/ui/config/usrpref.cxx | 3 ++- sw/source/ui/misc/pggrid.cxx | 6 +++--- sw/source/ui/uiview/view.cxx | 6 ++++-- 7 files changed, 18 insertions(+), 10 deletions(-) commit 723b3fc153061b39604a032d578409d7f22d708f Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:42:44 2010 +0200 cjk-character-units-rulers-sync-with-pggrid-fix.diff: sw/source/ui/inc/pggrid.hxx | 2 ++ sw/source/ui/misc/pggrid.cxx | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) commit baf4316376191dce3a3d070a07e745e0286b7bac Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:40:57 2010 +0200 cjk-character-units-ui.diff: add a new unit 'character unit' sw/source/ui/config/optload.cxx | 6 ++++++ sw/source/ui/config/optload.hrc | 1 + sw/source/ui/config/optload.src | 12 ++++++++++++ sw/source/ui/config/optpage.cxx | 23 +++++++++++++++++------ sw/source/ui/inc/optload.hxx | 1 + sw/source/ui/inc/pggrid.hxx | 2 ++ sw/source/ui/misc/pggrid.cxx | 3 +++ sw/source/ui/misc/pggrid.hrc | 2 ++ sw/source/ui/misc/pggrid.src | 12 ++++++++++++ 9 files changed, 56 insertions(+), 6 deletions(-) commit 4cd64c0c68b4c81406d0075ac9d846014538840b Author: Amelia Wang <amwang@novell.com> Date: Mon Sep 13 14:37:51 2010 +0200 cjk-character-units-imp.diff: add a new unit 'character unit' sw/inc/swmodule.hxx | 2 + sw/source/ui/app/appopt.cxx | 10 +++++++ sw/source/ui/app/swmodul1.cxx | 57 +++++++++++++++++++++++++++++++++++++++ sw/source/ui/config/optload.cxx | 17 +++++++++++ sw/source/ui/config/usrpref.cxx | 11 +++++--- sw/source/ui/inc/pggrid.hxx | 2 +- sw/source/ui/inc/uitool.hxx | 3 ++ sw/source/ui/inc/usrpref.hxx | 12 ++++++++ sw/source/ui/misc/pggrid.cxx | 32 ++++++++++++++++++--- sw/source/ui/shells/textsh1.cxx | 4 +++ sw/source/ui/uiview/view.cxx | 17 ++++++++++- sw/source/ui/utlui/uitool.cxx | 13 +++++++++ 12 files changed, 168 insertions(+), 12 deletions(-) commit 825b1706ab0a71d86812cbb95ac056e78f6a5864 Author: Jiao Jianhua <jjiao@novell.com> Date: Mon Sep 13 14:07:35 2010 +0200 plus-minus-sw-navigator2.diff: Folding for each heading in Navigator i#64886, n#129410i sw/source/ui/inc/conttree.hxx | 5 +++ sw/source/ui/utlui/content.cxx | 74 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 4 deletions(-) commit c2b6b1ab7a949fb80fd98f506486d45a1166fbc5 Author: Jiao Jianhua <jjiao@novell.com> Date: Mon Sep 13 14:06:16 2010 +0200 plus-minus-sw-navigator.diff: folding for each heading in Navigator i#64886, n#129410 sw/source/ui/utlui/content.cxx | 134 +++++++++++++++++++++++++++++++--------- 1 files changed, 105 insertions(+), 29 deletions(-) commit 290f7aba51f626e259764487fec8795ef6b4043a Merge: d3ae4c6 4937fcb Author: Jan Holesovsky <kendy@suse.cz> Date: Wed Sep 8 11:34:21 2010 +0200 Merge commit 'ooo/OOO330_m7' commit d3ae4c683dda23722661cad8b5992586d2883bd0 Merge: e0b0ca3 17b62cb Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 7 09:33:10 2010 +0200 Merge commit 'ooo/OOO330_m6' commit 4937fcb1c4fa15194c01a79c57523d9a9333c710 (tag: refs/tags/ooo/OOO330_m7) Merge: 17b62cb 3274d37 Author: Kurt Zenker <kz@openoffice.org> Date: Fri Sep 3 14:39:55 2010 +0200 CWS-TOOLING: integrate CWS fs33a commit 17b62cb5acad25dc82a95a40d545e6af6a185f55 (tag: refs/tags/ooo/OOO330_m6) Author: obo <obo@openoffice.org> Date: Fri Aug 27 13:02:34 2010 +0200 masterfix OOO330: #i10000# new exception file unovwr.cxx sw/source/core/undo/makefile.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit a3019ec68acb22c8f590ee104fd6e7aad20c4778 Merge: aa24f45 631d42d Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 14:19:19 2010 +0200 CWS-TOOLING: integrate CWS sw33bf08 commit 631d42da043d690b931e3750176a3a295b376c7e Author: Thomas Lange [tl] <tl@openoffice.org> Date: Tue Aug 17 16:46:36 2010 +0200 cws sw33bf08: #i113584#, #i113587# transliteration fixed sw/inc/undobj.hxx | 6 +- sw/source/core/doc/docedt.cxx | 33 +++-- sw/source/core/txtnode/txtedt.cxx | 271 ++++++++++++++++++++++++++++++++----- sw/source/core/undo/unovwr.cxx | 136 +++++++++---------- 4 files changed, 326 insertions(+), 120 deletions(-) commit 3274d37826fc2613aa5061a985d1aab476e3a6fc Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Fri Aug 13 23:34:21 2010 +0200 fs33a: make compile in non-pro build (removed seemingly dead assertion) sw/source/ui/lingu/olmenu.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 013feef7fc5add0b3468b2c3d11bea8d4f830174 Merge: db3cc71 aa24f45 Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Fri Aug 13 12:04:35 2010 +0200 fs33a: merge after pulling OOO330.m4's change sets commit db3cc711f90a781bc8cd82a90d872f6e281ae205 Merge: e1a0f88 80200b9 Author: Frank Schoenheit [fs] <frank.schoenheit@oracle.com> Date: Tue Aug 10 14:53:21 2010 +0200 merging in latest changes from OOO330(m3)
Notes
split repo tag: writer_OOO_BUILD_3_2_98_1
Diffstat (limited to 'starmath/source/node.cxx')
-rwxr-xr-xstarmath/source/node.cxx270
1 files changed, 135 insertions, 135 deletions
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index b986a046b205..a01cab246c66 100755
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -138,7 +138,7 @@ void SmTmpDevice::SetFont(const Font &rNewFont)
SmNode::SmNode(SmNodeType eNodeType, const SmToken &rNodeToken)
{
- eType = eNodeType;
+ eType = eNodeType;
eScaleMode = SCALE_NONE;
aNodeToken = rNodeToken;
nAccIndex = -1;
@@ -169,7 +169,7 @@ SmNode * SmNode::GetSubNode(USHORT /*nIndex*/)
SmNode * SmNode::GetLeftMost()
- // returns leftmost node of current subtree.
+ // returns leftmost node of current subtree.
//! (this assumes the one with index 0 is always the leftmost subnode
//! for the current node).
{
@@ -186,7 +186,7 @@ void SmNode::SetPhantom(BOOL bIsPhantomP)
bIsPhantom = bIsPhantomP;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetPhantom(bIsPhantom);
@@ -199,7 +199,7 @@ void SmNode::SetColor(const Color& rColor)
GetFont().SetColor(rColor);
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetColor(rColor);
@@ -248,7 +248,7 @@ void SmNode::SetFont(const SmFace &rFace)
GetFont() = rFace;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetFont(rFace);
@@ -264,8 +264,8 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
{
Fraction aVal (SmPtsTo100th_mm(rSize.GetNumerator()),
rSize.GetDenominator());
- //long nHeight = ::rtl::math::round(aVal);
- long nHeight = (long)aVal;
+ //long nHeight = ::rtl::math::round(aVal);
+ long nHeight = (long)aVal;
aFntSize = GetFont().GetSize();
aFntSize.Width() = 0;
@@ -296,7 +296,7 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
}
// check the requested size against maximum value
- static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128);
+ static int __READONLY_DATA nMaxVal = SmPtsTo100th_mm(128);
if (aFntSize.Height() > nMaxVal)
aFntSize.Height() = nMaxVal;
@@ -304,8 +304,8 @@ void SmNode::SetFontSize(const Fraction &rSize, USHORT nType)
}
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetFontSize(rSize, nType);
}
@@ -316,8 +316,8 @@ void SmNode::SetSize(const Fraction &rSize)
GetFont() *= rSize;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetSize(rSize);
}
@@ -341,7 +341,7 @@ void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, BOOL bApplyToSubTree )
void SmNode::PrepareAttributes()
{
- GetFont().SetWeight((Attributes() & ATTR_BOLD) ? WEIGHT_BOLD : WEIGHT_NORMAL);
+ GetFont().SetWeight((Attributes() & ATTR_BOLD) ? WEIGHT_BOLD : WEIGHT_NORMAL);
GetFont().SetItalic((Attributes() & ATTR_ITALIC) ? ITALIC_NORMAL : ITALIC_NONE);
}
@@ -349,18 +349,18 @@ void SmNode::PrepareAttributes()
void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
{
#if OSL_DEBUG_LEVEL > 1
- bIsDebug = TRUE;
+ bIsDebug = TRUE;
#else
- bIsDebug = FALSE;
+ bIsDebug = FALSE;
#endif
- bIsPhantom = FALSE;
- nFlags = 0;
+ bIsPhantom = FALSE;
+ nFlags = 0;
nAttributes = 0;
switch (rFormat.GetHorAlign())
- { case AlignLeft: eRectHorAlign = RHA_LEFT; break;
- case AlignCenter: eRectHorAlign = RHA_CENTER; break;
- case AlignRight: eRectHorAlign = RHA_RIGHT; break;
+ { case AlignLeft: eRectHorAlign = RHA_LEFT; break;
+ case AlignCenter: eRectHorAlign = RHA_CENTER; break;
+ case AlignRight: eRectHorAlign = RHA_RIGHT; break;
}
GetFont() = rFormat.GetFont(FNT_MATH);
@@ -371,7 +371,7 @@ void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
GetFont().SetItalic(ITALIC_NONE);
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Prepare(rFormat, rDocShell);
@@ -387,7 +387,7 @@ void SmNode::ToggleDebug() const
pThis->bIsDebug = bIsDebug ? FALSE : TRUE;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = pThis->GetSubNode(i)))
pNode->ToggleDebug();
@@ -397,14 +397,14 @@ void SmNode::ToggleDebug() const
void SmNode::Move(const Point& rPosition)
{
- if (rPosition.X() == 0 && rPosition.Y() == 0)
+ if (rPosition.X() == 0 && rPosition.Y() == 0)
return;
SmRect::Move(rPosition);
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Move(rPosition);
}
@@ -413,8 +413,8 @@ void SmNode::Move(const Point& rPosition)
void SmNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Arrange(rDev, rFormat);
}
@@ -422,10 +422,10 @@ void SmNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
void SmNode::CreateTextFromNode(String &rText)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
if (nSize > 1)
rText.Append('{');
- for (USHORT i = 0; i < nSize; i++)
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->CreateTextFromNode(rText);
if (nSize > 1)
@@ -452,10 +452,10 @@ void SmNode::Draw(OutputDevice &rDev, const Point &rPosition) const
return;
const SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
- { Point aOffset (pNode->GetTopLeft() - GetTopLeft());
+ { Point aOffset (pNode->GetTopLeft() - GetTopLeft());
pNode->Draw(rDev, rPosition + aOffset);
}
@@ -473,15 +473,15 @@ const SmNode * SmNode::FindTokenAt(USHORT nRow, USHORT nCol) const
// position 'nRow', 'nCol'.
//! (there should be exactly one such node if any)
{
- if ( IsVisible()
- && nRow == GetToken().nRow
- && nCol >= GetToken().nCol && nCol < GetToken().nCol + GetToken().aText.Len())
+ if ( IsVisible()
+ && nRow == GetToken().nRow
+ && nCol >= GetToken().nCol && nCol < GetToken().nCol + GetToken().aText.Len())
return this;
else
{
- USHORT nNumSubNodes = GetNumSubNodes();
- for (USHORT i = 0; i < nNumSubNodes; i++)
- { const SmNode *pNode = GetSubNode(i);
+ USHORT nNumSubNodes = GetNumSubNodes();
+ for (USHORT i = 0; i < nNumSubNodes; i++)
+ { const SmNode *pNode = GetSubNode(i);
if (!pNode)
continue;
@@ -498,16 +498,16 @@ const SmNode * SmNode::FindTokenAt(USHORT nRow, USHORT nCol) const
const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const
{
- long nDist = LONG_MAX;
+ long nDist = LONG_MAX;
const SmNode *pResult = 0;
if (IsVisible())
pResult = this;
else
{
- USHORT nNumSubNodes = GetNumSubNodes();
- for (USHORT i = 0; i < nNumSubNodes; i++)
- { const SmNode *pNode = GetSubNode(i);
+ USHORT nNumSubNodes = GetNumSubNodes();
+ for (USHORT i = 0; i < nNumSubNodes; i++)
+ { const SmNode *pNode = GetSubNode(i);
if (!pNode)
continue;
@@ -515,7 +515,7 @@ const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const
long nTmp;
const SmNode *pFound = pNode->FindRectClosestTo(rPoint);
if (pFound && (nTmp = pFound->OrientedDist(rPoint)) < nDist)
- { nDist = nTmp;
+ { nDist = nTmp;
pResult = pFound;
// quit immediately if 'rPoint' is inside the *should not
@@ -552,8 +552,8 @@ const SmNode * SmNode::FindNodeWithAccessibleIndex(xub_StrLen nAccIdx) const
pResult = this;
else
{
- USHORT nNumSubNodes = GetNumSubNodes();
- for (USHORT i = 0; i < nNumSubNodes; i++)
+ USHORT nNumSubNodes = GetNumSubNodes();
+ for (USHORT i = 0; i < nNumSubNodes; i++)
{
const SmNode *pNode = GetSubNode(i);
if (!pNode)
@@ -592,7 +592,7 @@ SmStructureNode::~SmStructureNode()
{
SmNode *pNode;
- for (USHORT i = 0; i < GetNumSubNodes(); i++)
+ for (USHORT i = 0; i < GetNumSubNodes(); i++)
if (NULL != (pNode = GetSubNode(i)))
delete pNode;
}
@@ -707,10 +707,10 @@ void SmGraphicNode::GetAccessibleText( String &rText ) const
void SmExpressionNode::CreateTextFromNode(String &rText)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
if (nSize > 1)
rText.Append('{');
- for (USHORT i = 0; i < nSize; i++)
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
{
pNode->CreateTextFromNode(rText);
@@ -737,7 +737,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
Point rPosition;
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
// make distance depend on font size
long nDist = +(rFormat.GetDistance(DIS_VERTICAL)
@@ -750,9 +750,9 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
long nMaxWidth = 0,
nTmp;
USHORT i;
- for (i = 0; i < nSize; i++)
+ for (i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
- { pNode->Arrange(rDev, rFormat);
+ { pNode->Arrange(rDev, rFormat);
if ((nTmp = pNode->GetItalicWidth()) > nMaxWidth)
nMaxWidth = nTmp;
}
@@ -761,8 +761,8 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
SmRect::operator = (SmRect(nMaxWidth, 0));
for (i = 0; i < nSize; i++)
{ if (NULL != (pNode = GetSubNode(i)))
- { const SmRect &rNodeRect = pNode->GetRect();
- const SmNode *pCoNode = pNode->GetLeftMost();
+ { const SmRect &rNodeRect = pNode->GetRect();
+ const SmNode *pCoNode = pNode->GetLeftMost();
//SmTokenType eType = pCoNode->GetToken().eType;
RectHorAlign eHorAlign = pCoNode->GetRectHorAlign();
@@ -804,9 +804,9 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// arranges all subnodes in one row with some extra space between
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
USHORT i;
- for (i = 0; i < nSize; i++)
+ for (i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->Arrange(rDev, rFormat);
@@ -857,7 +857,7 @@ void SmExpressionNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
{
SmLineNode::Arrange(rDev, rFormat);
- // copy alignment of leftmost subnode if any
+ // copy alignment of leftmost subnode if any
SmNode *pNode = GetLeftMost();
if (pNode)
SetRectHorAlign(pNode->GetRectHorAlign(), FALSE);
@@ -912,7 +912,7 @@ void SmRootNode::GetHeightVerOffset(const SmRect &rRect,
rVerOffset = (rRect.GetBottom() - rRect.GetAlignB()) / 2;
rHeight = rRect.GetHeight() - rVerOffset;
- DBG_ASSERT(rHeight >= 0, "Sm : Ooops...");
+ DBG_ASSERT(rHeight >= 0, "Sm : Ooops...");
DBG_ASSERT(rVerOffset >= 0, "Sm : Ooops...");
}
@@ -946,11 +946,11 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
//! not to get the root symbol but the pExtra when clicking on it in the
//! GraphicWindow. (That is because of the simplicity of the algorithm
//! that finds the node corresponding to a mouseclick in the window.)
- SmNode *pExtra = GetSubNode(0),
+ SmNode *pExtra = GetSubNode(0),
*pRootSym = GetSubNode(1),
- *pBody = GetSubNode(2);
+ *pBody = GetSubNode(2);
DBG_ASSERT(pRootSym, "Sm: NULL pointer");
- DBG_ASSERT(pBody, "Sm: NULL pointer");
+ DBG_ASSERT(pBody, "Sm: NULL pointer");
pBody->Arrange(rDev, rFormat);
@@ -973,7 +973,7 @@ void SmRootNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pRootSym->MoveTo(aPos);
if (pExtra)
- { pExtra->SetSize(Fraction(rFormat.GetRelSize(SIZ_INDEX), 100));
+ { pExtra->SetSize(Fraction(rFormat.GetRelSize(SIZ_INDEX), 100));
pExtra->Arrange(rDev, rFormat);
aPos = GetExtraPos(*pRootSym, *pExtra);
@@ -1065,9 +1065,9 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pDenom->Arrange(rDev, rFormat);
long nFontHeight = GetFont().GetSize().Height(),
- nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L,
- nThick = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L,
- nWidth = Max(pNum->GetItalicWidth(), pDenom->GetItalicWidth()),
+ nExtLen = nFontHeight * rFormat.GetDistance(DIS_FRACTION) / 100L,
+ nThick = nFontHeight * rFormat.GetDistance(DIS_STROKEWIDTH) / 100L,
+ nWidth = Max(pNum->GetItalicWidth(), pDenom->GetItalicWidth()),
nNumDist = bIsTextmode ? 0 :
nFontHeight * rFormat.GetDistance(DIS_NUMERATOR) / 100L,
nDenomDist = bIsTextmode ? 0 :
@@ -1079,7 +1079,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pLine->Arrange(rDev, rFormat);
// get horizontal alignment for numerator
- const SmNode *pLM = pNum->GetLeftMost();
+ const SmNode *pLM = pNum->GetLeftMost();
RectHorAlign eHorAlign = pLM->GetRectHorAlign();
// move numerator to its position
@@ -1088,7 +1088,7 @@ void SmBinVerNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pNum->MoveTo(aPos);
// get horizontal alignment for denominator
- pLM = pDenom->GetLeftMost();
+ pLM = pDenom->GetLeftMost();
eHorAlign = pLM->GetRectHorAlign();
// move denominator to its position
@@ -1175,7 +1175,7 @@ USHORT GetLineIntersectionPoint(Point &rResult,
{
// hier achten wir nicht auf Rechengenauigkeit
// (das wuerde aufwendiger und lohnt sich hier kaum)
- double fLambda = ( (rPoint1.Y() - rPoint2.Y()) * rHeading2.X()
+ double fLambda = ( (rPoint1.Y() - rPoint2.Y()) * rHeading2.X()
- (rPoint1.X() - rPoint2.X()) * rHeading2.Y())
/ fDet;
rResult = Point(rPoint1.X() + (long) (fLambda * rHeading1.X()),
@@ -1188,7 +1188,7 @@ USHORT GetLineIntersectionPoint(Point &rResult,
SmBinDiagonalNode::SmBinDiagonalNode(const SmToken &rNodeToken)
-: SmStructureNode(NBINDIAGONAL, rNodeToken)
+: SmStructureNode(NBINDIAGONAL, rNodeToken)
{
bAscending = FALSE;
SetNumSubNodes(3);
@@ -1199,18 +1199,18 @@ void SmBinDiagonalNode::GetOperPosSize(Point &rPos, Size &rSize,
const Point &rDiagPoint, double fAngleDeg) const
// gibt die Position und Groesse fuer den Diagonalstrich zurueck.
// Vor.: das SmRect des Nodes gibt die Begrenzung vor(!), muss also selbst
- // bereits bekannt sein.
+ // bereits bekannt sein.
{
const double fPi = 3.1415926535897932384626433;
double fAngleRad = fAngleDeg / 180.0 * fPi;
- long nRectLeft = GetItalicLeft(),
+ long nRectLeft = GetItalicLeft(),
nRectRight = GetItalicRight(),
nRectTop = GetTop(),
nRectBottom = GetBottom();
- Point aRightHdg (100, 0),
- aDownHdg (0, 100),
- aDiagHdg ( (long)(100.0 * cos(fAngleRad)),
+ Point aRightHdg (100, 0),
+ aDownHdg (0, 100),
+ aDiagHdg ( (long)(100.0 * cos(fAngleRad)),
(long)(-100.0 * sin(fAngleRad)) );
long nLeft, nRight, nTop, nBottom; // Raender des Rechtecks fuer die
@@ -1412,9 +1412,9 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
long nDelta, nDist;
// iterate over all possible sub-/supscripts
- SmRect aTmpRect (rBodyRect);
+ SmRect aTmpRect (rBodyRect);
for (int i = 0; i < SUBSUP_NUM_ENTRIES; i++)
- { SmSubSup eSubSup = (SmSubSup) i; // cast
+ { SmSubSup eSubSup = (SmSubSup) i; // cast
SmNode *pSubSup = GetSubSup(eSubSup);
if (!pSubSup)
@@ -1423,8 +1423,8 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// switch position of limits if we are in textmode
if (rFormat.IsTextmode() && (GetToken().nGroup & TGLIMIT))
switch (eSubSup)
- { case CSUB: eSubSup = RSUB; break;
- case CSUP: eSubSup = RSUP; break;
+ { case CSUB: eSubSup = RSUB; break;
+ case CSUP: eSubSup = RSUP; break;
default:
break;
}
@@ -1446,7 +1446,7 @@ void SmSubSupNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
//! be sure that CSUB, CSUP are handled before the other cases!
switch (eSubSup)
- { case RSUB :
+ { case RSUB :
case LSUB :
if (!bIsTextmode)
nDist = nOrigHeight
@@ -1608,14 +1608,14 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
pBody->Arrange(rDev, rFormat);
BOOL bIsScaleNormal = rFormat.IsScaleNormalBrackets(),
- bScale = pBody->GetHeight() > 0 &&
+ bScale = pBody->GetHeight() > 0 &&
(GetScaleMode() == SCALE_HEIGHT || bIsScaleNormal),
- bIsABS = GetToken().eType == TABS;
+ bIsABS = GetToken().eType == TABS;
long nFaceHeight = GetFont().GetSize().Height();
// Uebergroesse in % ermitteln
- USHORT nPerc = 0;
+ USHORT nPerc = 0;
if (!bIsABS && bScale)
{ // im Fall von Klammern mit Uebergroesse...
USHORT nIndex = GetScaleMode() == SCALE_HEIGHT ?
@@ -1670,7 +1670,7 @@ void SmBraceNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// damit auch "\(a\) - (a) - left ( a right )" vernuenftig aussieht
RectVerAlign eVerAlign = bScale ? RVA_CENTERY : RVA_BASELINE;
- Point aPos;
+ Point aPos;
aPos = pLeft->AlignTo(*pBody, RP_LEFT, RHA_CENTER, eVerAlign);
aPos.X() -= nDist;
pLeft->MoveTo(aPos);
@@ -1890,14 +1890,14 @@ void SmAlignNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
DBG_ASSERT(GetNumSubNodes() > 0, "Sm: SubNode fehlt");
- SmNode *pNode = GetSubNode(0);
+ SmNode *pNode = GetSubNode(0);
RectHorAlign eHorAlign = RHA_CENTER;
switch (GetToken().eType)
{
- case TALIGNL: eHorAlign = RHA_LEFT; break;
- case TALIGNC: eHorAlign = RHA_CENTER; break;
- case TALIGNR: eHorAlign = RHA_RIGHT; break;
+ case TALIGNL: eHorAlign = RHA_LEFT; break;
+ case TALIGNC: eHorAlign = RHA_CENTER; break;
+ case TALIGNR: eHorAlign = RHA_RIGHT; break;
default:
break;
}
@@ -1927,9 +1927,9 @@ void SmAttributNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// get relative position of attribut
RectVerAlign eVerAlign;
- long nDist = 0;
+ long nDist = 0;
switch (GetToken().eType)
- { case TUNDERLINE :
+ { case TUNDERLINE :
eVerAlign = RVA_ATTRIBUT_LO;
break;
case TOVERSTRIKE :
@@ -2050,9 +2050,9 @@ void SmFontNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
int nFnt = -1;
switch (GetToken().eType)
{
- case TFIXED: nFnt = FNT_FIXED; break;
- case TSANS: nFnt = FNT_SANS; break;
- case TSERIF: nFnt = FNT_SERIF; break;
+ case TFIXED: nFnt = FNT_FIXED; break;
+ case TSANS: nFnt = FNT_SANS; break;
+ case TSERIF: nFnt = FNT_SERIF; break;
default:
break;
}
@@ -2073,7 +2073,7 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
DBG_ASSERT(pNode, "Sm: SubNode fehlt");
switch (GetToken().eType)
- { case TSIZE :
+ { case TSIZE :
pNode->SetFontSize(aFontSize, nSizeType);
break;
case TSANS :
@@ -2081,22 +2081,22 @@ void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
case TFIXED :
pNode->SetFont(GetFont());
break;
- case TUNKNOWN : break; // no assertion on "font <?> <?>"
-
- case TPHANTOM : SetPhantom(TRUE); break;
- case TBOLD : SetAttribut(ATTR_BOLD); break;
- case TITALIC : SetAttribut(ATTR_ITALIC); break;
- case TNBOLD : ClearAttribut(ATTR_BOLD); break;
- case TNITALIC : ClearAttribut(ATTR_ITALIC); break;
-
- case TBLACK : SetColor(Color(COL_BLACK)); break;
- case TWHITE : SetColor(Color(COL_WHITE)); break;
- case TRED : SetColor(Color(COL_RED)); break;
- case TGREEN : SetColor(Color(COL_GREEN)); break;
- case TBLUE : SetColor(Color(COL_BLUE)); break;
- case TCYAN : SetColor(Color(COL_CYAN)); break;
- case TMAGENTA : SetColor(Color(COL_MAGENTA)); break;
- case TYELLOW : SetColor(Color(COL_YELLOW)); break;
+ case TUNKNOWN : break; // no assertion on "font <?> <?>"
+
+ case TPHANTOM : SetPhantom(TRUE); break;
+ case TBOLD : SetAttribut(ATTR_BOLD); break;
+ case TITALIC : SetAttribut(ATTR_ITALIC); break;
+ case TNBOLD : ClearAttribut(ATTR_BOLD); break;
+ case TNITALIC : ClearAttribut(ATTR_ITALIC); break;
+
+ case TBLACK : SetColor(Color(COL_BLACK)); break;
+ case TWHITE : SetColor(Color(COL_WHITE)); break;
+ case TRED : SetColor(Color(COL_RED)); break;
+ case TGREEN : SetColor(Color(COL_GREEN)); break;
+ case TBLUE : SetColor(Color(COL_BLUE)); break;
+ case TCYAN : SetColor(Color(COL_CYAN)); break;
+ case TMAGENTA : SetColor(Color(COL_MAGENTA)); break;
+ case TYELLOW : SetColor(Color(COL_YELLOW)); break;
default:
DBG_ASSERT(FALSE, "Sm: unbekannter Fall");
@@ -2119,7 +2119,7 @@ void SmFontNode::SetSizeParameter(const Fraction& rValue, USHORT Type)
SmPolyLineNode::SmPolyLineNode(const SmToken &rNodeToken)
-: SmGraphicNode(NPOLYLINE, rNodeToken)
+: SmGraphicNode(NPOLYLINE, rNodeToken)
{
aPoly.SetSize(2);
nWidth = 0;
@@ -2172,7 +2172,7 @@ void SmPolyLineNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aPoly.SetPoint(aPointA, 0);
aPoly.SetPoint(aPointB, 1);
- long nThick = GetFont().GetSize().Height()
+ long nThick = GetFont().GetSize().Height()
* rFormat.GetDistance(DIS_STROKEWIDTH) / 100L;
nWidth = nThick + 2 * nBorderwidth;
@@ -2293,7 +2293,7 @@ void SmRectangleNode::Arrange(const OutputDevice &rDev, const SmFormat &/*rForma
if (nHeight == 0)
nHeight = nFontHeight / 30;
if (nWidth == 0)
- nWidth = nFontHeight / 3;
+ nWidth = nFontHeight / 3;
SmTmpDevice aTmpDev ((OutputDevice &) rDev, TRUE);
aTmpDev.SetFont(GetFont());
@@ -2333,8 +2333,8 @@ void SmRectangleNode::Draw(OutputDevice &rDev, const Point &rPosition) const
//! avoid GROWING AND SHRINKING of drawn rectangle when constantly
//! increasing zoomfactor.
- // This is done by shifting it's output-position to a point that
- // corresponds exactly to a pixel on the output device.
+ // This is done by shifting it's output-position to a point that
+ // corresponds exactly to a pixel on the output device.
Point aPos (rDev.PixelToLogic(rDev.LogicToPixel(aTmp.TopLeft())));
aTmp.SetPos(aPos);
@@ -2353,7 +2353,7 @@ void SmRectangleNode::Draw(OutputDevice &rDev, const Point &rPosition) const
/**************************************************************************/
-SmTextNode::SmTextNode( SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP ) :
+SmTextNode::SmTextNode( SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP ) :
SmVisibleNode(eNodeType, rNodeToken)
{
nFontDesc = nFontDescP;
@@ -2397,7 +2397,7 @@ void SmTextNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
PrepareAttributes();
- USHORT nSizeDesc = GetFontDesc() == FNT_FUNCTION ?
+ USHORT nSizeDesc = GetFontDesc() == FNT_FUNCTION ?
SIZ_FUNCTION : SIZ_TEXT;
GetFont() *= Fraction (rFormat.GetRelSize(nSizeDesc), 100);
@@ -2511,7 +2511,7 @@ void SmMatrixNode::CreateTextFromNode(String &rText)
void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
- Point aPosition,
+ Point aPosition,
aOffset;
SmNode *pNode;
USHORT i, j;
@@ -2519,7 +2519,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// initialize array that is to hold the maximum widhts of all
// elements (subnodes) in that column.
long *pColWidth = new long[nNumCols];
- for (j = 0; j < nNumCols; j++)
+ for (j = 0; j < nNumCols; j++)
pColWidth[j] = 0;
// arrange subnodes and calculate the aboves arrays contents
@@ -2528,7 +2528,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
{
USHORT nIdx = nNodes - 1 - i;
if (NULL != (pNode = GetSubNode(nIdx)))
- {
+ {
pNode->Arrange(rDev, rFormat);
int nCol = nIdx % nNumCols;
pColWidth[nCol] = Max(pColWidth[nCol], pNode->GetItalicWidth());
@@ -2546,17 +2546,17 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// build array that holds the leftmost position for each column
long *pColLeft = new long[nNumCols];
long nX = 0;
- for (j = 0; j < nNumCols; j++)
- { pColLeft[j] = nX;
+ for (j = 0; j < nNumCols; j++)
+ { pColLeft[j] = nX;
nX += pColWidth[j] + nHorDist;
}
- Point aPos, aDelta;
- SmRect aLineRect;
+ Point aPos, aDelta;
+ SmRect aLineRect;
SmRect::operator = (SmRect());
- for (i = 0; i < nNumRows; i++)
- { aLineRect = SmRect();
- for (j = 0; j < nNumCols; j++)
+ for (i = 0; i < nNumRows; i++)
+ { aLineRect = SmRect();
+ for (j = 0; j < nNumCols; j++)
{ SmNode *pTmpNode = GetSubNode(i * nNumCols + j);
DBG_ASSERT(pTmpNode, "Sm: NULL pointer");
@@ -2573,7 +2573,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
// caculate horizontal position of element depending on column
// and horizontal alignment
switch (eHorAlign)
- { case RHA_LEFT:
+ { case RHA_LEFT:
aPos.X() = rNodeRect.GetLeft() + pColLeft[j];
break;
case RHA_CENTER:
@@ -2595,10 +2595,10 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
aPos.Y() += nVerDist;
// move 'aLineRect' and rectangles in that line to final position
- aDelta.X() = 0; // since horizontal alignment is already done
+ aDelta.X() = 0; // since horizontal alignment is already done
aDelta.Y() = aPos.Y() - aLineRect.GetTop();
aLineRect.Move(aDelta);
- for (j = 0; j < nNumCols; j++)
+ for (j = 0; j < nNumCols; j++)
if (NULL != (pNode = GetSubNode(i * nNumCols + j)))
pNode->Move(aDelta);
@@ -2627,7 +2627,7 @@ SmNode * SmMatrixNode::GetLeftMost()
SmMathSymbolNode::SmMathSymbolNode(const SmToken &rNodeToken)
-: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
+: SmSpecialNode(NMATH, rNodeToken, FNT_MATH)
{
xub_Unicode cChar = GetToken().cMathChar;
if ((xub_Unicode) '\0' != cChar)
@@ -2715,7 +2715,7 @@ void SmMathSymbolNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat
const XubString &rText = GetText();
if (rText.Len() == 0 || rText.GetChar(0) == xub_Unicode('\0'))
- { SmRect::operator = (SmRect());
+ { SmRect::operator = (SmRect());
return;
}
@@ -2757,7 +2757,7 @@ void SmRectangleNode::CreateTextFromNode(String &rText)
void SmAttributNode::CreateTextFromNode(String &rText)
{
SmNode *pNode;
- USHORT nSize = GetNumSubNodes();
+ USHORT nSize = GetNumSubNodes();
DBG_ASSERT(nSize == 2, "Node missing members");
rText.Append('{');
sal_Unicode nLast=0;
@@ -2835,7 +2835,7 @@ SmSpecialNode::SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, US
SmSpecialNode::SmSpecialNode(const SmToken &rNodeToken) :
- SmTextNode(NSPECIAL, rNodeToken, FNT_MATH) //! default Font nicht immer richtig
+ SmTextNode(NSPECIAL, rNodeToken, FNT_MATH) //! default Font nicht immer richtig
{
bIsFromGreekSymbolSet = lcl_IsFromGreekSymbolSet( rNodeToken.aText );
}
@@ -2845,7 +2845,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell
{
SmNode::Prepare(rFormat, rDocShell);
- const SmSym *pSym;
+ const SmSym *pSym;
SmModule *pp = SM_MOD();
String aName( GetToken().aText.Copy(1) );
@@ -2996,8 +2996,8 @@ void SmBlankNode::IncreaseBy(const SmToken &rToken)
{
switch(rToken.eType)
{
- case TBLANK: nNum += 4; break;
- case TSBLANK: nNum += 1; break;
+ case TBLANK: nNum += 4; break;
+ case TSBLANK: nNum += 1; break;
default:
break;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 16:19:01 +0000