summaryrefslogtreecommitdiffstats
path: root/svgio/source/svgreader/svgstylenode.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svgio/source/svgreader/svgstylenode.cxx')
-rw-r--r--svgio/source/svgreader/svgstylenode.cxx204
1 files changed, 102 insertions, 102 deletions
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index 5fdd73e9828b..68a101fb9637 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -85,100 +85,100 @@ namespace svgio
{
// aSelectors: CssStyle selectors, any combination, no comma separations, no spaces at start/end
// rNewStyle: the already prepared style to register on that name
- if(!aSelectors.isEmpty())
- {
- std::vector< OUString > aSelectorParts;
- const sal_Int32 nLen(aSelectors.getLength());
- sal_Int32 nPos(0);
- OUStringBuffer aToken;
+ if(aSelectors.isEmpty())
+ return;
- // split into single tokens (currently only space separator)
- while(nPos < nLen)
- {
- const sal_Int32 nInitPos(nPos);
- copyToLimiter(aSelectors, u' ', nPos, aToken, nLen);
- skip_char(aSelectors, u' ', nPos, nLen);
- const OUString aSelectorPart(aToken.makeStringAndClear().trim());
+ std::vector< OUString > aSelectorParts;
+ const sal_Int32 nLen(aSelectors.getLength());
+ sal_Int32 nPos(0);
+ OUStringBuffer aToken;
- if(!aSelectorPart.isEmpty())
- {
- aSelectorParts.push_back(aSelectorPart);
- }
+ // split into single tokens (currently only space separator)
+ while(nPos < nLen)
+ {
+ const sal_Int32 nInitPos(nPos);
+ copyToLimiter(aSelectors, u' ', nPos, aToken, nLen);
+ skip_char(aSelectors, u' ', nPos, nLen);
+ const OUString aSelectorPart(aToken.makeStringAndClear().trim());
- if(nInitPos == nPos)
- {
- OSL_ENSURE(false, "Could not interpret on current position (!)");
- nPos++;
- }
+ if(!aSelectorPart.isEmpty())
+ {
+ aSelectorParts.push_back(aSelectorPart);
}
- if(!aSelectorParts.empty())
+ if(nInitPos == nPos)
{
- OUStringBuffer aConcatenatedSelector;
+ OSL_ENSURE(false, "Could not interpret on current position (!)");
+ nPos++;
+ }
+ }
- // re-combine without spaces, create a unique name (for now)
- for(size_t a(0); a < aSelectorParts.size(); a++)
- {
- aConcatenatedSelector.append(aSelectorParts[a]);
- }
+ if(aSelectorParts.empty())
+ return;
- // CssStyles in SVG are currently not completely supported; the current idea for
- // supporting the needed minimal set is to register CssStyles associated to a string
- // which is just the space-char cleaned, concatenated Selectors. The part to 'match'
- // these is in fillCssStyleVectorUsingHierarchyAndSelectors. There, the same string is
- // built up using the priorities of local CssStyle, Id, Class and other info combined
- // with the existing hierarchy. This creates a specificity and priority-sorted local
- // list for each node which is then chained using get/setCssStyleParent.
- // The current solution is capable of solving space-separated selectors which can be
- // mixed between Id, Class and type specifiers.
- // When CssStyles need more specific solving, the start point is here; remember the
- // needed infos not in maIdStyleTokenMapperList at the document, but select evtl.
- // more specific infos there in a class capable of handling more complex matchings.
- // Additionally fillCssStyleVector (or the mechanism above that when a linked list of
- // SvgStyleAttributes will not do it) will have to be adapted to make use of it.
-
- // register new style at document for (evtl. concatenated) stylename
- const_cast< SvgDocument& >(getDocument()).addSvgStyleAttributesToMapper(aConcatenatedSelector.makeStringAndClear(), rNewStyle);
- }
+ OUStringBuffer aConcatenatedSelector;
+
+ // re-combine without spaces, create a unique name (for now)
+ for(size_t a(0); a < aSelectorParts.size(); a++)
+ {
+ aConcatenatedSelector.append(aSelectorParts[a]);
}
+
+ // CssStyles in SVG are currently not completely supported; the current idea for
+ // supporting the needed minimal set is to register CssStyles associated to a string
+ // which is just the space-char cleaned, concatenated Selectors. The part to 'match'
+ // these is in fillCssStyleVectorUsingHierarchyAndSelectors. There, the same string is
+ // built up using the priorities of local CssStyle, Id, Class and other info combined
+ // with the existing hierarchy. This creates a specificity and priority-sorted local
+ // list for each node which is then chained using get/setCssStyleParent.
+ // The current solution is capable of solving space-separated selectors which can be
+ // mixed between Id, Class and type specifiers.
+ // When CssStyles need more specific solving, the start point is here; remember the
+ // needed infos not in maIdStyleTokenMapperList at the document, but select evtl.
+ // more specific infos there in a class capable of handling more complex matchings.
+ // Additionally fillCssStyleVector (or the mechanism above that when a linked list of
+ // SvgStyleAttributes will not do it) will have to be adapted to make use of it.
+
+ // register new style at document for (evtl. concatenated) stylename
+ const_cast< SvgDocument& >(getDocument()).addSvgStyleAttributesToMapper(aConcatenatedSelector.makeStringAndClear(), rNewStyle);
}
void SvgStyleNode::addCssStyleSheet(const OUString& aSelectors, const OUString& aContent)
{
// aSelectors: possible comma-separated list of CssStyle definitions, no spaces at start/end
// aContent: the svg style definitions as string
- if(!aSelectors.isEmpty() && !aContent.isEmpty())
- {
- // create new style and add to local list (for ownership control)
- SvgStyleAttributes* pNewStyle = new SvgStyleAttributes(*this);
- maSvgStyleAttributes.push_back(pNewStyle);
+ if(!(!aSelectors.isEmpty() && !aContent.isEmpty()))
+ return;
- // fill with content
- pNewStyle->readCssStyle(aContent);
+ // create new style and add to local list (for ownership control)
+ SvgStyleAttributes* pNewStyle = new SvgStyleAttributes(*this);
+ maSvgStyleAttributes.push_back(pNewStyle);
- // comma-separated split (Css abbreviation for same style for multiple selectors)
- const sal_Int32 nLen(aSelectors.getLength());
- sal_Int32 nPos(0);
- OUStringBuffer aToken;
+ // fill with content
+ pNewStyle->readCssStyle(aContent);
- while(nPos < nLen)
- {
- const sal_Int32 nInitPos(nPos);
- copyToLimiter(aSelectors, u',', nPos, aToken, nLen);
- skip_char(aSelectors, u' ', u',', nPos, nLen);
+ // comma-separated split (Css abbreviation for same style for multiple selectors)
+ const sal_Int32 nLen(aSelectors.getLength());
+ sal_Int32 nPos(0);
+ OUStringBuffer aToken;
- const OUString aSingleName(aToken.makeStringAndClear().trim());
+ while(nPos < nLen)
+ {
+ const sal_Int32 nInitPos(nPos);
+ copyToLimiter(aSelectors, u',', nPos, aToken, nLen);
+ skip_char(aSelectors, u' ', u',', nPos, nLen);
- if(aSingleName.getLength())
- {
- addCssStyleSheet(aSingleName, *pNewStyle);
- }
+ const OUString aSingleName(aToken.makeStringAndClear().trim());
- if(nInitPos == nPos)
- {
- OSL_ENSURE(false, "Could not interpret on current position (!)");
- nPos++;
- }
+ if(aSingleName.getLength())
+ {
+ addCssStyleSheet(aSingleName, *pNewStyle);
+ }
+
+ if(nInitPos == nPos)
+ {
+ OSL_ENSURE(false, "Could not interpret on current position (!)");
+ nPos++;
}
}
}
@@ -187,41 +187,41 @@ namespace svgio
{
const sal_Int32 nLen(aSelectorsAndContent.getLength());
- if(nLen)
- {
- sal_Int32 nPos(0);
- OUStringBuffer aToken;
+ if(!nLen)
+ return;
- while(nPos < nLen)
- {
- // read the full selectors (may be multiple, comma-separated)
- const sal_Int32 nInitPos(nPos);
- skip_char(aSelectorsAndContent, u' ', nPos, nLen);
- copyToLimiter(aSelectorsAndContent, u'{', nPos, aToken, nLen);
- skip_char(aSelectorsAndContent, u' ', u'{', nPos, nLen);
+ sal_Int32 nPos(0);
+ OUStringBuffer aToken;
- const OUString aSelectors(aToken.makeStringAndClear().trim());
- OUString aContent;
+ while(nPos < nLen)
+ {
+ // read the full selectors (may be multiple, comma-separated)
+ const sal_Int32 nInitPos(nPos);
+ skip_char(aSelectorsAndContent, u' ', nPos, nLen);
+ copyToLimiter(aSelectorsAndContent, u'{', nPos, aToken, nLen);
+ skip_char(aSelectorsAndContent, u' ', u'{', nPos, nLen);
- if(!aSelectors.isEmpty() && nPos < nLen)
- {
- // isolate content as text, embraced by '{' and '}'
- copyToLimiter(aSelectorsAndContent, u'}', nPos, aToken, nLen);
- skip_char(aSelectorsAndContent, u' ', u'}', nPos, nLen);
+ const OUString aSelectors(aToken.makeStringAndClear().trim());
+ OUString aContent;
- aContent = aToken.makeStringAndClear().trim();
- }
+ if(!aSelectors.isEmpty() && nPos < nLen)
+ {
+ // isolate content as text, embraced by '{' and '}'
+ copyToLimiter(aSelectorsAndContent, u'}', nPos, aToken, nLen);
+ skip_char(aSelectorsAndContent, u' ', u'}', nPos, nLen);
- if(!aSelectors.isEmpty() && !aContent.isEmpty())
- {
- addCssStyleSheet(aSelectors, aContent);
- }
+ aContent = aToken.makeStringAndClear().trim();
+ }
- if(nInitPos == nPos)
- {
- OSL_ENSURE(false, "Could not interpret on current position (!)");
- nPos++;
- }
+ if(!aSelectors.isEmpty() && !aContent.isEmpty())
+ {
+ addCssStyleSheet(aSelectors, aContent);
+ }
+
+ if(nInitPos == nPos)
+ {
+ OSL_ENSURE(false, "Could not interpret on current position (!)");
+ nPos++;
}
}
}
generated by cgit (git 2.34.1) at 2024-06-27 07:47:50 +0000