diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2012-05-01 16:30:32 +0200 |
|---|---|---|
| committer | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2012-05-01 16:48:58 +0200 |
| commit | 5977a8d415bc205947f8276d16288203ed93594a (patch) | |
| tree | 5921e67e2f67652fcbde6de9e42d98b07b7844e3 /filter | |
| parent | 810f4a007c6d92ab679205ac22ecc8621fc01168 (diff) | |
SVG: move default font size into state ctor
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/gfxtypes.hxx | 2 | ||||
| -rw-r--r-- | filter/source/svg/svgreader.cxx | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index daca2bee42c0..68463c8e84b2 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -175,7 +175,7 @@ struct State maViewBox(), mbIsText(false), maFontFamily(), // app-default - mnFontSize(0), + mnFontSize(12), maFontStyle("normal"), maFontVariant("normal"), mnFontWeight(400.0), diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 2c0c09b20b57..1cd7c54338ca 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -194,7 +194,6 @@ struct AnnotatingVisitor StateMap& rStateMap, const State& rInitialState, const uno::Reference<xml::sax::XDocumentHandler>& xDocumentHandler) : - mbSeenText(false), mnCurrStateId(0), maCurrState(), maParentStates(), @@ -216,12 +215,6 @@ struct AnnotatingVisitor maCurrState = maParentStates.back(); maCurrState.maTransform.identity(); maCurrState.maViewBox.reset(); - // set default font size here to ensure writing styles for text - if( !mbSeenText && XML_TEXT == nTagId ) - { - maCurrState.mnFontSize = 12.0; - mbSeenText = true; - } // if necessary, serialize to automatic-style section writeStyle(xElem,nTagId); } @@ -330,13 +323,6 @@ struct AnnotatingVisitor maCurrState.maTransform.identity(); maCurrState.maViewBox.reset(); - // set default font size here to ensure writing styles for text - if( !mbSeenText && XML_TEXT == nTagId ) - { - maCurrState.mnFontSize = 12.0; - mbSeenText = true; - } - // scan for style info const sal_Int32 nNumAttrs( xAttributes->getLength() ); rtl::OUString sAttributeValue; @@ -1240,7 +1226,6 @@ struct AnnotatingVisitor } } - bool mbSeenText; sal_Int32 mnCurrStateId; State maCurrState; std::vector<State> maParentStates; |