loplugin:constantparam in xmloff/

Change-Id: I376f1d4ac65de584f9caa6ba8e25e43216374112
Reviewed-on: https://gerrit.libreoffice.org/23295
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

37 files changed, 127 insertions, 183 deletions

diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index f3cbac27651d..a33c00b2296d 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -39,7 +39,6 @@ public:
 
     bool exportXML( const css::uno::Reference < css::io::XInputStream > & rIn );
     bool exportElement( const css::uno::Reference < css::io::XInputStream > & rIn,
-            sal_uInt16 nNamespace,
             enum ::xmloff::token::XMLTokenEnum eName );
     bool exportOfficeBinaryDataElement(
             const css::uno::Reference < css::io::XInputStream > & rIn );
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index b293accfca6f..152d8669149b 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -30,7 +30,7 @@ class XMLPercentOrMeasurePropertyHandler : public XMLPropertyHandler
 private:
     bool mbPercent;
 public:
-    XMLPercentOrMeasurePropertyHandler( bool bPercent );
+    XMLPercentOrMeasurePropertyHandler();
     virtual ~XMLPercentOrMeasurePropertyHandler ();
 
     virtual bool importXML(
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 20025a0113f9..168214358386 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -287,7 +287,6 @@ protected:
     void ProcessString(
         enum ::xmloff::token::XMLTokenEnum eXmlName,        /// attribute token (namespace text)
         enum ::xmloff::token::XMLTokenEnum eValue,          /// attribute token
-        bool bOmitEmpty = false, /// omit attribute, if value is empty
         sal_uInt16 nPrefix = XML_NAMESPACE_TEXT);   /// attribute name prefix
 
     /// export a string attribute, omit if default
@@ -336,8 +335,7 @@ protected:
         enum ::xmloff::token::XMLTokenEnum eXMLName,    /// attribute token
         sal_Int32 nMinutes,             /// date/time value in minutes
         bool bIsDate,           /// export as date?
-        bool bIsDuration,       /// export as duration?
-        bool bOmitDurationIfZero);   /// omit zero-length durations
+        bool bIsDuration);       /// export as duration?
 
     /// export times, dates and durations according to ISO 8601
     void ProcessDateTime(
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index c5645638ac34..a14eeec48462 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -84,11 +84,11 @@ namespace xmloff
 namespace chart
 {
 
-ColorPropertySet::ColorPropertySet( sal_Int32 nColor, bool bFillColor /* = true */ ) :
+ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
         // note: length of FillColor and LineColor is 9
-        m_aColorPropName( (bFillColor ? "FillColor" : "LineColor"), 9, RTL_TEXTENCODING_ASCII_US ),
+        m_aColorPropName( "FillColor", 9, RTL_TEXTENCODING_ASCII_US ),
         m_nColor( nColor ),
-        m_bIsFillColor( bFillColor ),
+        m_bIsFillColor( true ),
         m_nDefaultColor( 0x0099ccff )  // blue 8
 {}
 
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index ac3c5d5b7aeb..15c65a6c7edf 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -34,8 +34,7 @@ class ColorPropertySet : public ::cppu::WeakImplHelper<
         css::beans::XPropertyState >
 {
 public:
-    // if bFillColor == false, the color is a LineColor
-    explicit ColorPropertySet( sal_Int32 nColor, bool bFillColor = true );
+    explicit ColorPropertySet( sal_Int32 nColor );
     virtual ~ColorPropertySet();
 
 protected:
diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index a89b9d86a97e..a9be3074cd32 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -185,7 +185,7 @@ void XMLSettingsExportHelper::exportBool(const bool bValue, const OUString& rNam
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_BOOLEAN );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     OUString sValue;
     if (bValue)
         sValue = GetXMLToken(XML_TRUE);
@@ -208,7 +208,7 @@ void XMLSettingsExportHelper::exportShort(const sal_Int16 nValue, const OUString
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_SHORT );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     OUStringBuffer sBuffer;
     ::sax::Converter::convertNumber(sBuffer, sal_Int32(nValue));
     m_rContext.Characters( sBuffer.makeStringAndClear() );
@@ -220,7 +220,7 @@ void XMLSettingsExportHelper::exportInt(const sal_Int32 nValue, const OUString&
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_INT );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     OUStringBuffer sBuffer;
     ::sax::Converter::convertNumber(sBuffer, nValue);
     m_rContext.Characters( sBuffer.makeStringAndClear() );
@@ -232,7 +232,7 @@ void XMLSettingsExportHelper::exportLong(const sal_Int64 nValue, const OUString&
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_LONG );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     OUString sValue(OUString::number(nValue));
     m_rContext.Characters( sValue );
     m_rContext.EndElement( false );
@@ -243,7 +243,7 @@ void XMLSettingsExportHelper::exportDouble(const double fValue, const OUString&
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_DOUBLE );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     OUStringBuffer sBuffer;
     ::sax::Converter::convertDouble(sBuffer, fValue);
     m_rContext.Characters( sBuffer.makeStringAndClear() );
@@ -255,7 +255,7 @@ void XMLSettingsExportHelper::exportString(const OUString& sValue, const OUStrin
     DBG_ASSERT(!rName.isEmpty(), "no name");
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_STRING );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     if (!sValue.isEmpty())
         m_rContext.Characters( sValue );
     m_rContext.EndElement( false );
@@ -268,7 +268,7 @@ void XMLSettingsExportHelper::exportDateTime(const util::DateTime& aValue, const
     m_rContext.AddAttribute( XML_TYPE, XML_DATETIME );
     OUStringBuffer sBuffer;
     ::sax::Converter::convertDateTime(sBuffer, aValue, nullptr);
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     m_rContext.Characters( sBuffer.makeStringAndClear() );
     m_rContext.EndElement( false );
 }
@@ -282,7 +282,7 @@ void XMLSettingsExportHelper::exportSequencePropertyValue(
     if(nLength)
     {
         m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_SET, true );
+        m_rContext.StartElement( XML_CONFIG_ITEM_SET );
         for (sal_Int32 i = 0; i < nLength; i++)
             CallTypeFunction(aProps[i].Value, aProps[i].Name);
         m_rContext.EndElement( true );
@@ -348,7 +348,7 @@ void XMLSettingsExportHelper::exportbase64Binary(
     sal_Int32 nLength(aProps.getLength());
     m_rContext.AddAttribute( XML_NAME, rName );
     m_rContext.AddAttribute( XML_TYPE, XML_BASE64BINARY );
-    m_rContext.StartElement( XML_CONFIG_ITEM, true );
+    m_rContext.StartElement( XML_CONFIG_ITEM );
     if(nLength)
     {
         OUStringBuffer sBuffer;
@@ -370,7 +370,7 @@ void XMLSettingsExportHelper::exportMapEntry(const uno::Any& rAny,
     {
         if (bNameAccess)
             m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_ENTRY, true );
+        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_ENTRY );
         for (sal_Int32 i = 0; i < nLength; i++)
             CallTypeFunction(aProps[i].Value, aProps[i].Name);
         m_rContext.EndElement( true );
@@ -387,7 +387,7 @@ void XMLSettingsExportHelper::exportNameAccess(
     if(aNamed->hasElements())
     {
         m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED, true );
+        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_NAMED );
         uno::Sequence< OUString > aNames(aNamed->getElementNames());
         for (sal_Int32 i = 0; i < aNames.getLength(); i++)
             exportMapEntry(aNamed->getByName(aNames[i]), aNames[i], true);
@@ -405,7 +405,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
     if (rIndexed->hasElements())
     {
         m_rContext.AddAttribute( XML_NAME, rName );
-        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_INDEXED, true );
+        m_rContext.StartElement( XML_CONFIG_ITEM_MAP_INDEXED );
         sal_Int32 nCount = rIndexed->getCount();
         for (sal_Int32 i = 0; i < nCount; i++)
         {
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index c178ce6ddc6a..f5c9b6d1c12e 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -69,18 +69,16 @@ bool XMLBase64Export::exportXML( const Reference < XInputStream> & rIn )
 
 bool XMLBase64Export::exportElement(
             const Reference < XInputStream > & rIn,
-            sal_uInt16 nNamespace,
             enum ::xmloff::token::XMLTokenEnum eName )
 {
-    SvXMLElementExport aElem( GetExport(), nNamespace, eName, true, true );
+    SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE, eName, true, true );
     return exportXML( rIn );
 }
 
 bool XMLBase64Export::exportOfficeBinaryDataElement(
             const Reference < XInputStream > & rIn )
 {
-    return exportElement( rIn, XML_NAMESPACE_OFFICE,
-                             ::xmloff::token::XML_BINARY_DATA );
+    return exportElement( rIn, ::xmloff::token::XML_BINARY_DATA );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index fe4e74ffb138..f4712a9f84cf 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -271,10 +271,9 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
 
 sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName(
                             const OUString& rAttrName,
-                            OUString *pLocalName,
-                            bool bCache) const
+                            OUString *pLocalName) const
 {
-    return _GetKeyByAttrName( rAttrName, nullptr, pLocalName, nullptr, bCache );
+    return _GetKeyByAttrName( rAttrName, nullptr, pLocalName, nullptr, false/*bCache*/ );
 }
 
 sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 81f0656aaa89..531018522e90 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -159,8 +159,7 @@ public:
     virtual void    AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName,
                                   enum ::xmloff::token::XMLTokenEnum i_eValue ) override;
 
-    virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName,
-                                  const bool i_bIgnoreWhitespace ) override;
+    virtual void    StartElement( enum ::xmloff::token::XMLTokenEnum i_eName ) override;
     virtual void    EndElement(   const bool i_bIgnoreWhitespace ) override;
 
     virtual void    Characters( const OUString& i_rCharacters ) override;
@@ -182,10 +181,10 @@ void SettingsExportFacade::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eN
     m_rExport.AddAttribute( XML_NAMESPACE_CONFIG, i_eName, i_eValue );
 }
 
-void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const bool i_bIgnoreWhitespace )
+void SettingsExportFacade::StartElement( enum ::xmloff::token::XMLTokenEnum i_eName )
 {
     const OUString sElementName( m_rExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_CONFIG, GetXMLToken( i_eName ) ) );
-    m_rExport.StartElement( sElementName, i_bIgnoreWhitespace );
+    m_rExport.StartElement( sElementName, true/*i_bIgnoreWhitespace*/ );
     m_aElements.push( sElementName );
 }
 
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index c0a3a6bd4822..f2b1f22f7da5 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -270,28 +270,21 @@ static sal_Char aHexTab[] = "0123456789abcdef";
 
 /** convert double number to string (using ::rtl::math) */
 void SvXMLUnitConverter::convertDouble(OUStringBuffer& rBuffer,
-    double fNumber, bool bWriteUnits) const
+    double fNumber) const
 {
     ::sax::Converter::convertDouble(rBuffer, fNumber,
-        bWriteUnits, m_pImpl->m_eCoreMeasureUnit, m_pImpl->m_eXMLMeasureUnit);
+        true/*bWriteUnits*/, m_pImpl->m_eCoreMeasureUnit, m_pImpl->m_eXMLMeasureUnit);
 }
 
 /** convert string to double number (using ::rtl::math) */
 bool SvXMLUnitConverter::convertDouble(double& rValue,
-    const OUString& rString, bool bLookForUnits) const
+    const OUString& rString) const
 {
-    if(bLookForUnits)
-    {
-        sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString(
-                rString, m_pImpl->m_eCoreMeasureUnit);
+    sal_Int16 const eSrcUnit = ::sax::Converter::GetUnitFromString(
+            rString, m_pImpl->m_eCoreMeasureUnit);
 
-        return ::sax::Converter::convertDouble(rValue, rString,
-            eSrcUnit, m_pImpl->m_eCoreMeasureUnit);
-    }
-    else
-    {
-        return ::sax::Converter::convertDouble(rValue, rString);
-    }
+    return ::sax::Converter::convertDouble(rValue, rString,
+        eSrcUnit, m_pImpl->m_eCoreMeasureUnit);
 }
 
 /** get the Null Date of the XModel and set it to the UnitConverter */
@@ -565,11 +558,11 @@ bool SvXMLUnitConverter::convertPosition3D( drawing::Position3D& rPosition,
     if ( !lcl_getPositions(rValue,aContentX,aContentY,aContentZ) )
         return false;
 
-    if ( !convertDouble( rPosition.PositionX, aContentX, true ) )
+    if ( !convertDouble( rPosition.PositionX, aContentX ) )
         return false;
-    if ( !convertDouble( rPosition.PositionY, aContentY, true ) )
+    if ( !convertDouble( rPosition.PositionY, aContentY ) )
         return false;
-    return convertDouble( rPosition.PositionZ, aContentZ, true );
+    return convertDouble( rPosition.PositionZ, aContentZ );
 }
 
 /** convert Position3D to string */
@@ -577,11 +570,11 @@ void SvXMLUnitConverter::convertPosition3D( OUStringBuffer &rBuffer,
                                            const drawing::Position3D& rPosition )
 {
     rBuffer.append( '(' );
-    convertDouble( rBuffer, rPosition.PositionX, true );
+    convertDouble( rBuffer, rPosition.PositionX );
     rBuffer.append( ' ' );
-    convertDouble( rBuffer, rPosition.PositionY, true );
+    convertDouble( rBuffer, rPosition.PositionY );
     rBuffer.append( ' ' );
-    convertDouble( rBuffer, rPosition.PositionZ, true );
+    convertDouble( rBuffer, rPosition.PositionZ );
     rBuffer.append( ')' );
 }
 
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 6011498a12d3..da4366fe0396 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1121,7 +1121,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
                 pHdl = new XMLCaptionEscapeRelative();
                 break;
             case XML_SD_TYPE_CAPTION_ESC_ABS:
-                pHdl = new XMLPercentOrMeasurePropertyHandler( false );
+                pHdl = new XMLPercentOrMeasurePropertyHandler;
                 break;
             case XML_SD_TYPE_CAPTION_ESC_DIR:
                 pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum , ::cppu::UnoType<sal_Int32>::get());
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index a4df0e843844..a6c9f368a389 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -688,7 +688,7 @@ SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName,
     const uno::Reference<xml::sax::XAttributeList>&)
 {
     SvXMLImportContext *pContext = nullptr;
-    pContext = new SdXMLBodyContext(*this, XML_NAMESPACE_OFFICE, rLocalName);
+    pContext = new SdXMLBodyContext(*this, rLocalName);
     return pContext;
 }
 
@@ -699,7 +699,7 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName,
         return GetShapeImport()->GetStylesContext();
 
     GetShapeImport()->SetStylesContext(new SdXMLStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, false));
+        *this, rLocalName, xAttrList, false));
 
     return GetShapeImport()->GetStylesContext();
 }
@@ -711,7 +711,7 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN
         return GetShapeImport()->GetAutoStylesContext();
 
     GetShapeImport()->SetAutoStylesContext(new SdXMLStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName, xAttrList, true));
+        *this, rLocalName, xAttrList, true));
 
     return GetShapeImport()->GetAutoStylesContext();
 }
@@ -723,7 +723,7 @@ SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLoca
         return mpMasterStylesContext;
 
     mpMasterStylesContext = new SdXMLMasterStylesContext(
-        *this, XML_NAMESPACE_OFFICE, rLocalName);
+        *this, rLocalName);
     mpMasterStylesContext->AddFirstRef();
 
     return mpMasterStylesContext;
@@ -745,9 +745,7 @@ SvXMLImportContext *SdXMLImport::CreateScriptContext(
 {
     SvXMLImportContext *pContext = nullptr;
 
-    pContext = new XMLScriptContext( *this,
-                                    XML_NAMESPACE_OFFICE, rLocalName,
-                                    GetModel() );
+    pContext = new XMLScriptContext( *this, rLocalName, GetModel() );
     return pContext;
 }
 
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 2c71dfa2e380..976cf1afd8dc 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4298,7 +4298,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
                                             double fDepth = 0;
                                             if ( aDepthParaPair.First.Value >>= fDepth )
                                             {
-                                                rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth, true );
+                                                rExport.GetMM100UnitConverter().convertDouble( aStrBuffer, fDepth );
                                                 ExportParameter( aStrBuffer, aDepthParaPair.Second );
                                                 aStr = aStrBuffer.makeStringAndClear();
                                                 rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_EXTRUSION_DEPTH, aStr );
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index f75da95b5393..1f98a132bb4b 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -409,25 +409,25 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext(
             case XML_TOK_3DSCENE_3DCUBE:
             {
                 // dr3d:3dcube inside dr3d:3dscene context
-                pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+                pContext = new SdXML3DCubeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
                 break;
             }
             case XML_TOK_3DSCENE_3DSPHERE:
             {
                 // dr3d:3dsphere inside dr3d:3dscene context
-                pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+                pContext = new SdXML3DSphereObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
                 break;
             }
             case XML_TOK_3DSCENE_3DLATHE:
             {
                 // dr3d:3dlathe inside dr3d:3dscene context
-                pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+                pContext = new SdXML3DLatheObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
                 break;
             }
             case XML_TOK_3DSCENE_3DEXTRUDE:
             {
                 // dr3d:3dextrude inside dr3d:3dscene context
-                pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false);
+                pContext = new SdXML3DExtrudeObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes);
                 break;
             }
         }
@@ -568,7 +568,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
         case XML_TOK_GROUP_CUSTOM_SHAPE:
         {
             // draw:customshape
-            pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLCustomShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
          case XML_TOK_GROUP_A:
@@ -617,20 +617,20 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
         case XML_TOK_FRAME_TEXT_BOX:
         {
             // text:text-box inside group context
-            pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLTextBoxShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
         case XML_TOK_FRAME_IMAGE:
         {
             // office:image inside group context
-            pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLGraphicObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
         case XML_TOK_FRAME_OBJECT:
         case XML_TOK_FRAME_OBJECT_OLE:
         {
             // draw:object or draw:object_ole
-            pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLObjectShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
         case XML_TOK_FRAME_TABLE:
@@ -644,19 +644,19 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext(
         case XML_TOK_FRAME_PLUGIN:
         {
             // draw:plugin
-            pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLPluginShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
         case XML_TOK_FRAME_FLOATING_FRAME:
         {
             // draw:floating-frame
-            pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLFloatingFrameShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
         case XML_TOK_FRAME_APPLET:
         {
             // draw:applet
-            pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, false );
+            pContext = new SdXMLAppletShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes );
             break;
         }
         // add other shapes here...
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 82c2fa84fff6..7c4debc31f50 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -130,7 +130,7 @@ double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32
     if(!sNumberString.isEmpty())
     {
         if(bLookForUnits)
-            rConv.convertDouble(fRetval, sNumberString.makeStringAndClear(), true);
+            rConv.convertDouble(fRetval, sNumberString.makeStringAndClear());
         else
         {
             ::sax::Converter::convertDouble(fRetval,
@@ -154,7 +154,7 @@ void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double f
     OUStringBuffer sStringBuffer;
 
     if(bConvertUnits)
-        rConv.convertDouble(sStringBuffer, fValue, true);
+        rConv.convertDouble(sStringBuffer, fValue);
     else
     {
         ::sax::Converter::convertDouble(sStringBuffer, fValue);
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index baf1aebd24cd..3f8d16bd8723 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -110,9 +110,8 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
     maMinEdge(-2500.0, -2500.0, -2500.0),
     maMaxEdge(2500.0, 2500.0, 2500.0),
     mbMinEdgeUsed(false),
@@ -211,9 +210,8 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
     maCenter(0.0, 0.0, 0.0),
     maSize(5000.0, 5000.0, 5000.0),
     mbCenterUsed(false),
@@ -395,9 +393,8 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
 {
 }
 
@@ -429,9 +426,8 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXML3DPolygonBasedShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
 {
 }
 
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index f8d40969c4f2..db180dbbc9c6 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -67,8 +67,7 @@ public:
     SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXML3DCubeObjectShapeContext();
 
     virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -89,8 +88,7 @@ public:
     SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXML3DSphereObjectShapeContext();
 
     virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -126,8 +124,7 @@ public:
     SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXML3DLatheObjectShapeContext();
 
     virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
@@ -143,8 +140,7 @@ public:
     SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXML3DExtrudeObjectShapeContext();
 
     virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 7f380088f28d..586539f92505 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -19,6 +19,7 @@
 
 #include "ximpbody.hxx"
 #include <xmloff/prstylei.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include "ximpnote.hxx"
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
@@ -304,8 +305,8 @@ void SdXMLDrawPageContext::EndElement()
 }
 
 SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport,
-    sal_uInt16 nPrfx, const OUString& rLocalName )
-:   SvXMLImportContext( rImport, nPrfx, rLocalName )
+    const OUString& rLocalName )
+:   SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLocalName )
 {
 }
 
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index cc4361ecd2e7..95358cfc3bce 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -58,7 +58,7 @@ class SdXMLBodyContext : public SvXMLImportContext
     SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
 
 public:
-    SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName );
+    SdXMLBodyContext( SdXMLImport& rImport, const OUString& rLocalName );
     virtual ~SdXMLBodyContext();
 
     virtual SvXMLImportContext *CreateChildContext(
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 41454f109489..45f1e5cff4fb 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1583,9 +1583,8 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
     mnRadius(0),
     maChainNextName("")
 {
@@ -2403,9 +2402,8 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
     maURL()
 {
 }
@@ -2670,9 +2668,8 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre
 SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+        css::uno::Reference< css::drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
 {
 }
 
@@ -2882,9 +2879,8 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
 SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+        css::uno::Reference< css::drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
   mbIsScript( false )
 {
 }
@@ -3043,9 +3039,8 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n
 SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape) :
-SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
+        css::uno::Reference< css::drawing::XShapes >& rShapes) :
+SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ ),
 mbMedia( false )
 {
 }
@@ -3320,9 +3315,8 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n
 SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape)
-: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+        css::uno::Reference< css::drawing::XShapes >& rShapes)
+: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
 {
 }
 
@@ -3707,9 +3701,8 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext(
     sal_uInt16 nPrfx,
     const OUString& rLocalName,
     const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-    uno::Reference< drawing::XShapes >& rShapes,
-    bool bTemporaryShape)
-:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape )
+    uno::Reference< drawing::XShapes >& rShapes)
+:   SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false/*bTemporaryShape*/ )
 {
     // See the XMLTextFrameContext ctor, a frame has Writer content (and not
     // editeng) if its autostyle has a parent style. Do the same for shapes as well.
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index b8883e56cb6e..c4244853c9ae 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -246,8 +246,7 @@ public:
     SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLTextBoxShapeContext();
     virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override;
 
@@ -389,8 +388,7 @@ public:
     SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLGraphicObjectShapeContext();
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -439,8 +437,7 @@ public:
     SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLObjectShapeContext();
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -470,8 +467,7 @@ public:
     SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLAppletShapeContext();
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -500,8 +496,7 @@ public:
     SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLPluginShapeContext();
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -531,8 +526,7 @@ public:
     SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
         const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLFloatingFrameShapeContext();
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -589,8 +583,7 @@ public:
 
     SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
         const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
-        css::uno::Reference< css::drawing::XShapes >& rShapes,
-        bool bTemporaryShape);
+        css::uno::Reference< css::drawing::XShapes >& rShapes);
     virtual ~SdXMLCustomShapeContext();
 
     virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 978199e4c722..09cc9008331b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -936,11 +936,10 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
 
 SdXMLStylesContext::SdXMLStylesContext(
     SdXMLImport& rImport,
-    sal_uInt16 nPrfx,
     const OUString& rLName,
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
     bool bIsAutoStyle)
-:   SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList),
+:   SvXMLStylesContext(rImport, XML_NAMESPACE_OFFICE, rLName, xAttrList),
     mbIsAutoStyle(bIsAutoStyle)
 {
     Reference< uno::XComponentContext > xContext = rImport.GetComponentContext();
@@ -1459,9 +1458,8 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
 
 SdXMLMasterStylesContext::SdXMLMasterStylesContext(
     SdXMLImport& rImport,
-    sal_uInt16 nPrfx,
     const OUString& rLName)
-:   SvXMLImportContext( rImport, nPrfx, rLName)
+:   SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLName)
 {
 }
 
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index c82cb06302e2..6e1c5c08f2ad 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -210,7 +210,6 @@ public:
 
     SdXMLStylesContext(
         SdXMLImport& rImport,
-        sal_uInt16 nPrfx,
         const OUString& rLName,
         const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
         bool bIsAutoStyle);
@@ -238,7 +237,6 @@ public:
 
     SdXMLMasterStylesContext(
         SdXMLImport& rImport,
-        sal_uInt16 nPrfx,
         const OUString& rLName);
     virtual ~SdXMLMasterStylesContext();
 
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index cd2f88d0cf6f..8ebd29d548e7 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -97,9 +97,9 @@ void XMLScriptChildContext::EndElement()
 
 // XMLScriptContext: context for <office:scripts> element
 
-XMLScriptContext::XMLScriptContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
+XMLScriptContext::XMLScriptContext( SvXMLImport& rImport, const OUString& rLName,
         const Reference<XModel>& rDocModel )
-    :SvXMLImportContext( rImport, nPrfx, rLName )
+    :SvXMLImportContext( rImport, XML_NAMESPACE_OFFICE, rLName )
     ,m_xModel( rDocModel )
 {
 }
diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx
index fde6964f4247..d0c0715e25bf 100644
--- a/xmloff/source/style/PageMasterPropMapper.cxx
+++ b/xmloff/source/style/PageMasterPropMapper.cxx
@@ -28,16 +28,15 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper( bool bForExport ):
-    XMLPropertySetMapper( aXMLPageMasterStyleMap, new XMLPageMasterPropHdlFactory(), bForExport)
+XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper():
+    XMLPropertySetMapper( aXMLPageMasterStyleMap, new XMLPageMasterPropHdlFactory(), false/*bForExport*/)
 {
 }
 
 XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper(
         const XMLPropertyMapEntry* pEntries,
-        const rtl::Reference< XMLPropertyHandlerFactory >& rFactory,
-        bool bForExport ) :
-    XMLPropertySetMapper( pEntries, rFactory, bForExport )
+        const rtl::Reference< XMLPropertyHandlerFactory >& rFactory ) :
+    XMLPropertySetMapper( pEntries, rFactory, true/*bForExport*/ )
 {
 }
 
diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx
index 27b6d9c53832..6b45fbd9ca1e 100644
--- a/xmloff/source/style/PageMasterPropMapper.hxx
+++ b/xmloff/source/style/PageMasterPropMapper.hxx
@@ -25,11 +25,10 @@
 class XMLPageMasterPropSetMapper : public XMLPropertySetMapper
 {
 public:
-    explicit XMLPageMasterPropSetMapper( bool bForExport );
+    explicit XMLPageMasterPropSetMapper();
                         XMLPageMasterPropSetMapper(
                             const XMLPropertyMapEntry* pEntries,
-                            const rtl::Reference< XMLPropertyHandlerFactory >& rFactory,
-                            bool bForExport );
+                            const rtl::Reference< XMLPropertyHandlerFactory >& rFactory );
     virtual             ~XMLPageMasterPropSetMapper();
 };
 
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 5463fc18d17f..5a3d4f5fec29 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -158,7 +158,7 @@ XMLPageExport::XMLPageExport( SvXMLExport& rExp ) :
     xPageMasterPropHdlFactory = new XMLPageMasterPropHdlFactory;
     xPageMasterPropSetMapper = new XMLPageMasterPropSetMapper(
                                 aXMLPageMasterStyleMap,
-                                xPageMasterPropHdlFactory, true );
+                                xPageMasterPropHdlFactory );
     xPageMasterExportPropMapper = new XMLPageMasterExportPropMapper(
                                     xPageMasterPropSetMapper, rExp);
 
diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
index 6d04ebeddf78..86ac8e27874e 100644
--- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
+++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx
@@ -32,8 +32,8 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
 
-XMLPercentOrMeasurePropertyHandler::XMLPercentOrMeasurePropertyHandler( bool bPercent )
-: mbPercent( bPercent )
+XMLPercentOrMeasurePropertyHandler::XMLPercentOrMeasurePropertyHandler()
+: mbPercent( false )
 {
 }
 
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index 22d62d61eadf..2e13bca105d5 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -78,7 +78,7 @@ XMLNumberFormatAttributesExportHelper::~XMLNumberFormatAttributesExportHelper()
 
 sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, OUString& sCurrency, bool& bIsStandard)
 {
-    XMLNumberFormat aFormat("", nNumberFormat, 0);
+    XMLNumberFormat aFormat("", nNumberFormat);
     XMLNumberFormatSet::iterator aItr(aNumberFormats.find(aFormat));
     XMLNumberFormatSet::iterator aEndItr(aNumberFormats.end());
     if (aItr != aEndItr)
@@ -503,13 +503,12 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
 
 void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
     const OUString& rValue, const OUString& rCharacters,
-    bool bExportValue, bool bExportTypeAttribute,
+    bool bExportValue,
     sal_uInt16 nNamespace)
 {
     if (pExport)
     {
-        if (bExportTypeAttribute)
-            pExport->AddAttribute(nNamespace, XML_VALUE_TYPE, XML_STRING);
+        pExport->AddAttribute(nNamespace, XML_VALUE_TYPE, XML_STRING);
         if (bExportValue && !rValue.isEmpty() && (rValue != rCharacters))
             pExport->AddAttribute(sAttrStringValue, rValue);
     }
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 47881cc35dea..a31ca4e4cabf 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -666,7 +666,7 @@ rtl::Reference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProper
         if( ! mxPageImpPropMapper.is() )
         {
             XMLPropertySetMapper *pPropMapper =
-                new XMLPageMasterPropSetMapper( false );
+                new XMLPageMasterPropSetMapper();
             mxPageImpPropMapper =
                 new PageMasterImportPropertyMapper( pPropMapper,
                                     const_cast<SvXMLStylesContext*>(this)->GetImport() );
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 7e9bbda0250e..7332be96c17d 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -275,7 +275,7 @@ void XMLSectionImportContext::ProcessAttributes(
                 {
                     OUString sTmp;
                     sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                                    _GetKeyByAttrName( sAttr, &sTmp, false );
+                                    _GetKeyByAttrName( sAttr, &sTmp );
                     if( XML_NAMESPACE_OOOW == nPrefix )
                     {
                         sCond = sTmp;
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index 1239c0bbdf88..8b6b7c6fefb4 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -143,8 +143,7 @@ void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
 XMLTextShapeStyleContext::XMLTextShapeStyleContext( SvXMLImport& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
         const Reference< XAttributeList > & xAttrList,
-        SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
-        bool /*bDefaultStyle*/ ) :
+        SvXMLStylesContext& rStyles, sal_uInt16 nFamily ) :
     XMLShapeStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles,
                           nFamily ),
     sIsAutoUpdate( "IsAutoUpdate" ),
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index dd9625b1c882..4964024b2369 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2128,7 +2128,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
             else
             {
                 // string: write regardless of default
-                ProcessString(XML_VALUE_TYPE, XML_STRING, false,
+                ProcessString(XML_VALUE_TYPE, XML_STRING,
                               XML_NAMESPACE_OFFICE);
                 ProcessString(XML_STRING_VALUE,
                               GetStringProperty(sPropertyContent, xPropSet),
@@ -2518,19 +2518,13 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
 void XMLTextFieldExport::ProcessString(
     enum XMLTokenEnum eName,
     enum XMLTokenEnum eValue,
-    bool bOmitEmpty,
     sal_uInt16 nPrefix)
 {
     DBG_ASSERT( eName != XML_TOKEN_INVALID, "invalid element token" );
-    DBG_ASSERT( bOmitEmpty || (eValue != XML_TOKEN_INVALID),
-                "invalid value token" );
+    DBG_ASSERT( eValue != XML_TOKEN_INVALID, "invalid value token" );
     if ( XML_TOKEN_INVALID == eName )
         return;
 
-    // check for empty string, if applicable
-    if (bOmitEmpty && (eValue == XML_TOKEN_INVALID))
-        return;
-
     GetExport().AddAttribute(nPrefix, eName, eValue);
 }
 
@@ -2669,14 +2663,13 @@ void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName,
 void XMLTextFieldExport::ProcessDateTime(enum XMLTokenEnum eName,
                                          sal_Int32 nMinutes,
                                          bool bIsDate,
-                                         bool bIsDuration,
-                                         bool bOmitDurationIfZero)
+                                         bool bIsDuration)
 {
     // handle bOmitDurationIfZero here, because we can precisely compare ints
-    if (!(bIsDuration && bOmitDurationIfZero && (nMinutes==0)))
+    if (!(bIsDuration && (nMinutes==0)))
     {
         ProcessDateTime(eName, (double)nMinutes / (double)(24*60),
-                        bIsDate, bIsDuration, bOmitDurationIfZero);
+                        bIsDate, bIsDuration, true/*bOmitDurationIfZero*/);
     }
 }
 
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index c00504aaff52..13ccc015f1c3 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1422,7 +1422,7 @@ void XMLDatabaseNextImportContext::ProcessAttribute(
     {
         OUString sTmp;
         sal_uInt16 nPrefix = GetImport().GetNamespaceMap()._GetKeyByAttrName(
-                                    sAttrValue, &sTmp, false );
+                                    sAttrValue, &sTmp );
         if( XML_NAMESPACE_OOOW == nPrefix )
         {
             sCondition = sTmp;
@@ -1966,7 +1966,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute(
     {
         OUString sTmp;
         sal_uInt16 nPrefix = GetImport().GetNamespaceMap()._GetKeyByAttrName(
-                                    sAttrValue, &sTmp, false );
+                                    sAttrValue, &sTmp );
         if( XML_NAMESPACE_OOOW == nPrefix )
         {
             sCondition = sTmp;
@@ -2027,7 +2027,7 @@ void XMLConditionalTextImportContext::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                        _GetKeyByAttrName( sAttrValue, &sTmp, false );
+                        _GetKeyByAttrName( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sCondition = sTmp;
@@ -2108,7 +2108,7 @@ void XMLHiddenTextImportContext::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                                        _GetKeyByAttrName( sAttrValue, &sTmp, false );
+                                        _GetKeyByAttrName( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sCondition = sTmp;
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 80f565db7b04..3c3b3ff8f91c 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -158,7 +158,7 @@ void XMLVarFieldImportContext::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-                        _GetKeyByAttrName( sAttrValue, &sTmp, false );
+                        _GetKeyByAttrName( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sFormula = sTmp;
@@ -1311,7 +1311,7 @@ void XMLValueImportHelper::ProcessAttribute(
             {
                 OUString sTmp;
                 sal_uInt16 nPrefix = rImport.GetNamespaceMap().
-                        _GetKeyByAttrName( sAttrValue, &sTmp, false );
+                        _GetKeyByAttrName( sAttrValue, &sTmp );
                 if( XML_NAMESPACE_OOOW == nPrefix )
                 {
                     sFormula = sTmp;
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index fe7653f40639..d2d893271fb7 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -45,7 +45,6 @@ public:
                            const OUString& rQName );
     XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer,
                            const OUString& rQName,
-                              sal_uInt16 nAttrPrefix,
                            XMLTokenEnum eAttrToken );
 
     virtual ~XMLFormPropValueTContext_Impl();
@@ -74,11 +73,10 @@ XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl(
 XMLFormPropValueTContext_Impl::XMLFormPropValueTContext_Impl(
         XMLTransformerBase& rTransformer,
         const OUString& rQName,
-        sal_uInt16 nAttrPrefix,
         XMLTokenEnum eAttrToken ) :
     XMLTransformerContext( rTransformer, rQName ),
     m_aAttrQName( rTransformer.GetNamespaceMap().GetQNameByKey(
-                    nAttrPrefix, GetXMLToken(eAttrToken) ) ),
+                    XML_NAMESPACE_OFFICE, GetXMLToken(eAttrToken) ) ),
     m_bPersistent( true ),
     m_bIsVoid( false )
 {
@@ -165,7 +163,6 @@ rtl::Reference<XMLTransformerContext> XMLFormPropOOoTransformerContext::CreateCh
         {
             pContext.set(new XMLFormPropValueTContext_Impl( GetTransformer(),
                                                           rQName,
-                                                          XML_NAMESPACE_OFFICE,
                                                           m_eValueToken ));
         }
         else if( !m_xValueContext.is() )
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index d5668b5a175c..4a237834c4c6 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1240,7 +1240,7 @@ bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName,
 {
     OUString aLocalName;
     sal_uInt16 nPrefix =
-        GetNamespaceMap()._GetKeyByAttrName( rName, &aLocalName, false );
+        GetNamespaceMap()._GetKeyByAttrName( rName, &aLocalName );
     bool bRet = XML_NAMESPACE_UNKNOWN != nPrefix &&
                     (USHRT_MAX == nPrefixOnly || nPrefix == nPrefixOnly);
     if( bRet )