[Libreoffice-commits] core.git: filter/source

[Chr. Rossmanith]

 filter/source/svg/svgwriter.cxx |   20 ++++++++++----------
 filter/source/svg/svgwriter.hxx |    6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 5a5c9d0fa42201d0fbec2670f097f00a8ff91d2c
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Tue Mar 24 22:19:46 2015 +0100

    fix typo in variable name
    
    mbIsPlacehlolderShape -> mbIsPlaceholderShape
    
    Change-Id: Ie01335293a3acd6da628e7ea123e10f77c1513da
    Reviewed-on: https://gerrit.libreoffice.org/14991
    Reviewed-by: Katarina Behrens <bubli at bubli.org>
    Tested-by: Katarina Behrens <bubli at bubli.org>

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a9c0dc4..4a394266 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -434,7 +434,7 @@ SVGTextWriter::SVGTextWriter( SVGExport& rExport )
         mbLineBreak( false ),
         mbIsURLField( false ),
         msUrl(),
-        mbIsPlacehlolderShape( false ),
+        mbIsPlaceholderShape( false ),
         mbIWS( false ),
         maCurrentFont(),
         maParentFont()
@@ -1029,7 +1029,7 @@ bool SVGTextWriter::nextTextPortion()
 {
     mrCurrentTextPortion.clear();
     mbIsURLField = false;
-    mbIsPlacehlolderShape = false;
+    mbIsPlaceholderShape = false;
     if( mrTextPortionEnumeration.is() && mrTextPortionEnumeration->hasMoreElements() )
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -1097,7 +1097,7 @@ bool SVGTextWriter::nextTextPortion()
                         if( sFieldName == "DateTime" || sFieldName == "Header"
                                 || sFieldName == "Footer" || sFieldName == "PageNumber" )
                         {
-                            mbIsPlacehlolderShape = true;
+                            mbIsPlaceholderShape = true;
                         }
                         else
                         {
@@ -1602,10 +1602,10 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", rTextPortionId );
     }
 
-    if( mbIsPlacehlolderShape )
+    if( mbIsPlaceholderShape )
     {
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" );
-        mbIsPlacehlolderShape = false;
+        mbIsPlaceholderShape = false;
     }
 
     addFontAttributes( /* isTexTContainer: */ false );
@@ -1616,7 +1616,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
     OUString sTextContent = rText;
 
     // <a> tag for link should be the innermost tag, inside <tspan>
-    if( !mbIsPlacehlolderShape && mbIsURLField && !msUrl.isEmpty() )
+    if( !mbIsPlaceholderShape && mbIsURLField && !msUrl.isEmpty() )
     {
         mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "UrlField" );
         mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrXLinkHRef, msUrl );
@@ -1647,7 +1647,7 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport
     maTextWriter( rExport ),
     mnInnerMtfCount( 0 ),
     mbClipAttrChanged( false ),
-    mbIsPlacehlolderShape( false )
+    mbIsPlaceholderShape( false )
 {
     mpVDev = new VirtualDevice;
     mpVDev->EnableOutput( false );
@@ -2456,7 +2456,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
 
     bool bIsPlaceholderField = false;
 
-    if( mbIsPlacehlolderShape )
+    if( mbIsPlaceholderShape )
     {
         OUString sTextContent = rText;
         bIsPlaceholderField = sTextContent.match( sPlaceholderTag );
@@ -2657,10 +2657,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
         bIsTextShape = true;
     }
 #endif
-    mbIsPlacehlolderShape = false;
+    mbIsPlaceholderShape = false;
     if( ( pElementId != NULL ) && ( *pElementId == sPlaceholderTag ) )
     {
-        mbIsPlacehlolderShape = true;
+        mbIsPlaceholderShape = true;
         // since we utilize pElementId in an improper way we reset it to NULL before to go on
         pElementId = NULL;
     }
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 8d296a2..a74ca30 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -204,7 +204,7 @@ class SVGTextWriter
     bool                                        mbIsURLField;
     OUString                                    msUrl;
     OUString                                    msHyperlinkIdList;
-    bool                                        mbIsPlacehlolderShape;
+    bool                                        mbIsPlaceholderShape;
     bool                                        mbIWS;
     vcl::Font                                   maCurrentFont;
     vcl::Font                                   maParentFont;
@@ -266,7 +266,7 @@ class SVGTextWriter
 
     void setPlaceholderShapeFlag( bool bState )
     {
-        mbIsPlacehlolderShape = bState;
+        mbIsPlaceholderShape = bState;
     }
 
   private:
@@ -307,7 +307,7 @@ private:
     MapMode                                     maTargetMapMode;
     sal_uInt32                                  mnInnerMtfCount;
     bool                                    mbClipAttrChanged;
-    bool                                    mbIsPlacehlolderShape;
+    bool                                    mbIsPlaceholderShape;
 
 
     SVGAttributeWriter*     ImplAcquireContext()