5 files changed, 9 insertions, 5 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 66a7b296e25c..6f316e332f9b 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -321,6 +321,8 @@ OUString ChartController::GetContextName()
             return OUString("ErrorBar");
         case OBJECTTYPE_AXIS:
             return OUString("Axis");
+        case OBJECTTYPE_GRID:
+            return OUString("Grid");
         default:
         break;
     }
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index fd48b5cb8935..ba2c452afacd 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -404,7 +404,7 @@ void getAxisLabelProperties(
     Reference<beans::XPropertySet> xProps(rAxisProp.m_xAxisModel, uno::UNO_QUERY);
 
     PropertyMapper::getTextLabelMultiPropertyLists(
-        xProps, rPropNames, rPropValues, false, nLimitedSpaceForText, bLimitedHeight);
+        xProps, rPropNames, rPropValues, false, nLimitedSpaceForText, bLimitedHeight, false);
 
     LabelPositionHelper::doDynamicFontResize(
         rPropValues, rPropNames, xProps, rAxisLabelProp.m_aFontReferenceSize);
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index adbf8e66884f..d72086895dc2 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -66,7 +66,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
     tAnySequence aPropValues;
 
     uno::Reference< beans::XPropertySet > xProps( m_aAxisProperties.m_xAxisModel, uno::UNO_QUERY );
-    PropertyMapper::getTextLabelMultiPropertyLists( xProps, aPropNames, aPropValues, false );
+    PropertyMapper::getTextLabelMultiPropertyLists( xProps, aPropNames, aPropValues, false, -1, false, false );
     LabelPositionHelper::doDynamicFontResize( aPropValues, aPropNames, xProps
         , rAxisLabelProperties.m_aFontReferenceSize );
 
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index c1c29b7ea4d1..171e30244bbe 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -123,7 +123,8 @@ public:
                 , tNameSequence& rPropNames, tAnySequence& rPropValues
                 , bool bName=true
                 , sal_Int32 nLimitedSpace=-1
-                , bool bLimitedHeight=false );
+                , bool bLimitedHeight=false
+                , bool bSupportsLabelBorder = true);
 
     /** adds line-, fill- and character properties and sets some suitable
         defaults for auto-grow properties
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index c373f38561ee..313c2370902a 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -435,11 +435,12 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
     , tNameSequence& rPropNames, tAnySequence& rPropValues
     , bool bName
     , sal_Int32 nLimitedSpace
-    , bool bLimitedHeight )
+    , bool bLimitedHeight
+    , bool bSupportsLabelBorder)
 {
     //fill character properties into the ValueMap
     tPropertyNameValueMap aValueMap;
-    tMakePropertyNameMap aNameMap = PropertyMapper::getPropertyNameMapForTextLabelProperties();
+    tMakePropertyNameMap aNameMap = bSupportsLabelBorder ? PropertyMapper::getPropertyNameMapForTextLabelProperties() : getPropertyNameMapForCharacterProperties();
 
     PropertyMapper::getValueMap(aValueMap, aNameMap, xSourceProp);