Resolves: #i125332# made css style stuff aware that it is case independent

(cherry picked from commit 2b179313ac95f4ae9dc2cf8f6b6d577ea893c7a8)

Conflicts:
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
svgio/inc/svgio/svgreader/svgtoken.hxx
svgio/inc/svgio/svgreader/svgtools.hxx
svgio/source/svgreader/svgdocumenthandler.cxx
svgio/source/svgreader/svgnode.cxx
svgio/source/svgreader/svgstyleattributes.cxx
svgio/source/svgreader/svgtoken.cxx
svgio/source/svgreader/svgtools.cxx

Change-Id: I8bac5a185feb0c7a54aa7bf816ab7aabd71a2e19

3 files changed, 7 insertions, 6 deletions

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 345eb651810a..ab40e9de0f4b 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -256,7 +256,8 @@ namespace svgio
 
         public:
             /// local attribute scanner
-            void parseStyleAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
+            void parseStyleAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& rContent,
+                                     bool bCaseIndependent);
 
             /// helper which does the necessary with a given path
             void add_text(
@@ -276,7 +277,7 @@ namespace svgio
             const SvgStyleAttributes* getCssStyleParent() const { return mpCssStyleParent; }
 
             /// scan helpers
-            void readStyle(const OUString& rCandidate);
+            void readCssStyle(const OUString& rCandidate);
             const SvgStyleAttributes* getParentStyle() const;
 
             SvgStyleAttributes(SvgNode& rOwner);
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx
index 4596fb2118d0..87d23b663b49 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -183,7 +183,7 @@ namespace svgio
             SVGTokenLast
         };
 
-        SVGToken StrToSVGToken(const OUString& rStr);
+        SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent);
 
         const OUString& getStrTitle();
         const OUString& getStrDesc();
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx
index df6cead11730..555a075befa4 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -201,13 +201,13 @@ namespace svgio
         bool readNumberAndUnit(const OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen);
         bool readAngle(const OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen);
         sal_Int32 read_hex(const sal_Unicode& rChar);
-        bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName);
-        bool read_color(const OUString& rCandidate, basegfx::BColor& rColor);
+        bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName, bool bCaseIndependent);
+        bool read_color(const OUString& rCandidate, basegfx::BColor& rColor, bool bCaseIndependent);
         basegfx::B2DRange readViewBox(const OUString& rCandidate, InfoProvider& rInfoProvider);
         basegfx::B2DHomMatrix readTransform(const OUString& rCandidate, InfoProvider& rInfoProvider);
         bool readSingleNumber(const OUString& rCandidate, SvgNumber& aNum);
         bool readLocalUrl(const OUString& rCandidate, OUString& rURL);
-        bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL);
+        bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL, bool bCaseIndependent);
 
         bool readSvgNumberVector(const OUString& rCandidate, SvgNumberVector& rSvgNumberVector);
         ::std::vector< double > solveSvgNumberVector(const SvgNumberVector& rInput, const InfoProvider& rInfoProvider, NumberType aNumberType = length);