diff options
author | Armin Le Grand <alg@apache.org> | 2013-06-18 09:44:12 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-18 13:21:20 +0100 |
commit | b4219ea230a9635ca2422421324af5c407216e03 (patch) | |
tree | 97e4b1e70d224ee92f41821d05c7f82ebf8287f1 /svgio/inc | |
parent | disable test that ends throwing std::bad_alloc (diff) | |
download | core-b4219ea230a9635ca2422421324af5c407216e03.tar.gz core-b4219ea230a9635ca2422421324af5c407216e03.zip |
Resolves: #i122524# fixed some text import aspects for super/sub-baseline
(cherry picked from commit def95cfb69619071811fb8e564eb4187f59f4b99)
Conflicts:
svgio/source/svgreader/svgtoken.cxx
Change-Id: I1208229a86807ce271a823415e9b8f0baf955e01
Diffstat (limited to 'svgio/inc')
-rw-r--r-- | svgio/inc/svgio/svgreader/svgstyleattributes.hxx | 18 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgtoken.hxx | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx index a84fd4648e98..13e37057af41 100644 --- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx +++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx @@ -143,6 +143,15 @@ namespace svgio FillRule_evenodd }; + enum BaselineShift + { + BaselineShift_Baseline, + BaselineShift_Sub, + BaselineShift_Super, + BaselineShift_Percentage, + BaselineShift_Length + }; + class SvgStyleAttributes { private: @@ -196,6 +205,10 @@ namespace svgio // ClipRule setting (only valid wne mbIsClipPathContent == true, default is FillRule_nonzero) FillRule maClipRule; + // BaselineShift: Type and number (in case of BaselineShift_Percentage or BaselineShift_Length) + BaselineShift maBaselineShift; + SvgNumber maBaselineShiftNumber; + /// bitfield // defines if this attributes are part of a ClipPath. If yes, @@ -422,6 +435,11 @@ namespace svgio const SvgMarkerNode* accessMarkerEndXLink() const; void setMarkerEndXLink(const OUString& rNew) { maMarkerEndXLink = rNew; } + // BaselineShift + void setBaselineShift(const BaselineShift aBaselineShift = BaselineShift_Baseline) { maBaselineShift = aBaselineShift; } + BaselineShift getBaselineShift() const { return maBaselineShift; } + void setBaselineShiftNumber(const SvgNumber& rBaselineShift = SvgNumber()) { maBaselineShiftNumber = rBaselineShift; } + SvgNumber getBaselineShiftNumber() const; }; } // end of namespace svgreader } // end of namespace svgio diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx index 2e1f8c43b036..8594ca720a71 100644 --- a/svgio/inc/svgio/svgreader/svgtoken.hxx +++ b/svgio/inc/svgio/svgreader/svgtoken.hxx @@ -178,6 +178,7 @@ namespace svgio // text tokens SVGTokenText, + SVGTokenBaselineShift, SVGTokenLast }; |