Kaydet (Commit) 48381e5c authored tarafından Chr. Rossmanith's avatar Chr. Rossmanith Kaydeden (comit) Christina Roßmanith

use isEmpty() instead of getLength() where appropriate

Change-Id: I87bb3473af631dc321c5a8c2b06b0b5ccdf8e73b
Reviewed-on: https://gerrit.libreoffice.org/11813Reviewed-by: 's avatarChristina Roßmanith <ChrRossmanith@web.de>
Tested-by: 's avatarChristina Roßmanith <ChrRossmanith@web.de>
üst 605dc659
...@@ -135,7 +135,7 @@ namespace svgio ...@@ -135,7 +135,7 @@ namespace svgio
} }
// check for class-dependent references to CssStyles // check for class-dependent references to CssStyles
if(rClassStr.getLength()) if(!rClassStr.isEmpty())
{ {
OUString aNewConcatenated(aConcatenated); OUString aNewConcatenated(aConcatenated);
...@@ -213,7 +213,7 @@ namespace svgio ...@@ -213,7 +213,7 @@ namespace svgio
{ {
// #i125293# rOriginal will be the last element in the linked list; use no CssStyleParent // #i125293# rOriginal will be the last element in the linked list; use no CssStyleParent
// there (reset it) to ensure that the parent hierarchy will be used when it's base // there (reset it) to ensure that the parent hierarchy will be used when it's base
// is referenced. This new chaning inserts the CssStyles before the original style, // is referenced. This new chaining inserts the CssStyles before the original style,
// this makes the whole process much safer since the original style when used will // this makes the whole process much safer since the original style when used will
// be not different to the situation without CssStyles; thus loops which may be caused // be not different to the situation without CssStyles; thus loops which may be caused
// by trying to use the parent hierarchy of the owner of the style will be avoided // by trying to use the parent hierarchy of the owner of the style will be avoided
......
...@@ -85,7 +85,7 @@ namespace svgio ...@@ -85,7 +85,7 @@ namespace svgio
{ {
// aSelectors: CssStyle selectors, any combination, no comma separations, no spaces at start/end // aSelectors: CssStyle selectors, any combination, no comma separations, no spaces at start/end
// rNewStyle: the already preapared style to register on that name // rNewStyle: the already preapared style to register on that name
if(aSelectors.getLength()) if(!aSelectors.isEmpty())
{ {
std::vector< OUString > aSelectorParts; std::vector< OUString > aSelectorParts;
const sal_Int32 nLen(aSelectors.getLength()); const sal_Int32 nLen(aSelectors.getLength());
...@@ -100,7 +100,7 @@ namespace svgio ...@@ -100,7 +100,7 @@ namespace svgio
skip_char(aSelectors, sal_Unicode(' '), nPos, nLen); skip_char(aSelectors, sal_Unicode(' '), nPos, nLen);
const OUString aSelectorPart(aToken.makeStringAndClear().trim()); const OUString aSelectorPart(aToken.makeStringAndClear().trim());
if(aSelectorPart.getLength()) if(!aSelectorPart.isEmpty())
{ {
aSelectorParts.push_back(aSelectorPart); aSelectorParts.push_back(aSelectorPart);
} }
...@@ -147,7 +147,7 @@ namespace svgio ...@@ -147,7 +147,7 @@ namespace svgio
{ {
// aSelectors: possible comma-separated list of CssStyle definitions, no spaces at start/end // aSelectors: possible comma-separated list of CssStyle definitions, no spaces at start/end
// aContent: the svg style definitions as string // aContent: the svg style definitions as string
if(aSelectors.getLength() && aContent.getLength()) if(!aSelectors.isEmpty() && !aContent.isEmpty())
{ {
// create new style and add to local list (for ownership control) // create new style and add to local list (for ownership control)
SvgStyleAttributes* pNewStyle = new SvgStyleAttributes(*this); SvgStyleAttributes* pNewStyle = new SvgStyleAttributes(*this);
...@@ -203,7 +203,7 @@ namespace svgio ...@@ -203,7 +203,7 @@ namespace svgio
const OUString aSelectors(aToken.makeStringAndClear().trim()); const OUString aSelectors(aToken.makeStringAndClear().trim());
OUString aContent; OUString aContent;
if(aSelectors.getLength() && nPos < nLen) if(!aSelectors.isEmpty() && nPos < nLen)
{ {
// isolate content as text, embraced by '{' and '}' // isolate content as text, embraced by '{' and '}'
copyToLimiter(aSelectorsAndContent, sal_Unicode('}'), nPos, aToken, nLen); copyToLimiter(aSelectorsAndContent, sal_Unicode('}'), nPos, aToken, nLen);
...@@ -212,7 +212,7 @@ namespace svgio ...@@ -212,7 +212,7 @@ namespace svgio
aContent = aToken.makeStringAndClear().trim(); aContent = aToken.makeStringAndClear().trim();
} }
if(aSelectors.getLength() && aContent.getLength()) if(!aSelectors.isEmpty() && !aContent.isEmpty())
{ {
addCssStyleSheet(aSelectors, aContent); addCssStyleSheet(aSelectors, aContent);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment