diff options
-rw-r--r-- | include/xmloff/SchXMLImportHelper.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/nmspmap.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/styleexp.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/table/XMLTableImport.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtimp.hxx | 2 | ||||
-rw-r--r-- | include/xmloff/txtparae.hxx | 21 | ||||
-rw-r--r-- | include/xmloff/xmlexppr.hxx | 10 | ||||
-rw-r--r-- | include/xmloff/xmlimppr.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/xmlnume.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfindex.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfliststyle.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfpagemaster.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfparastyle.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/xmlstyle.hxx | 8 | ||||
-rw-r--r-- | xmloff/inc/XMLChartPropertySetMapper.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/forms/controlpropertymap.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/PageMasterExportPropMapper.hxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.hxx | 4 |
19 files changed, 47 insertions, 50 deletions
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx index 765a96014c9e..0e513e076c82 100644 --- a/include/xmloff/SchXMLImportHelper.hxx +++ b/include/xmloff/SchXMLImportHelper.hxx @@ -137,7 +137,7 @@ public: const css::uno::Reference< css::chart2::XChartDocument > & xDoc, sal_Int32 nCoordinateSystemIndex, const OUString & rChartTypeName, - bool bPushLastChartType = false ); + bool bPushLastChartType ); static void DeleteDataSeries( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, diff --git a/include/xmloff/nmspmap.hxx b/include/xmloff/nmspmap.hxx index 5f2bac1de514..0a2849df7d8c 100644 --- a/include/xmloff/nmspmap.hxx +++ b/include/xmloff/nmspmap.hxx @@ -119,7 +119,7 @@ public: /* This will replace the version with the unused 3rd default parameter */ sal_uInt16 GetKeyByAttrName_( const OUString& rAttrName, - OUString *pLocalName = nullptr) const; + OUString *pLocalName) const; sal_uInt16 GetFirstKey() const; sal_uInt16 GetNextKey( sal_uInt16 nOldKey ) const; @@ -134,7 +134,7 @@ public: static bool NormalizeURI( OUString& rName ); /* deprecated */ void AddAtIndex( sal_uInt16 nIdx, const OUString& rPrefix, - const OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN ); + const OUString& rName, sal_uInt16 nKey ); /* deprecated */ static sal_uInt16 GetIndexByKey( sal_uInt16 nKey ); /* deprecated */ sal_uInt16 GetIndexByPrefix( const OUString& rPrefix ) const; /* deprecated */ sal_uInt16 GetFirstIndex() const; @@ -147,7 +147,7 @@ public: /* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, OUString *pPrefix, OUString *pLocalName, - OUString *pNamespace=nullptr, + OUString *pNamespace, sal_uInt16 nIdxGuess = USHRT_MAX ) const; /* deprecated */ sal_uInt16 GetKeyByAttrName( const OUString& rAttrName, OUString *pLocalName = nullptr, diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index 1f4cb92995c8..0e89d4880ea5 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -75,7 +75,7 @@ protected: const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, const css::uno::Reference< css::container::XNameAccess > & xStyles, - const OUString* pPrefix = nullptr ); + const OUString* pPrefix ); virtual void exportStyleAttributes( const css::uno::Reference< css::style::XStyle > & rStyle ); @@ -109,13 +109,13 @@ public: void exportStyleFamily( const OUString& rFamily, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, - bool bUsed, sal_uInt16 nFamily = 0, + bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix = nullptr); void exportStyleFamily( const sal_Char *pFamily, const OUString& rXMLFamily, const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, - bool bUsed, sal_uInt16 nFamily = 0, + bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix = nullptr); }; diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index 7d5ddf041aa1..df5f5eddd619 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -57,7 +57,7 @@ public: void addTableTemplate( const OUString& rsStyleName, XMLTableTemplate& xTableTemplate ); /// Inserts to the doc template with given name. - void insertTabletemplate( const OUString& rsStyleName, bool bOverwrite = false); + void insertTabletemplate( const OUString& rsStyleName, bool bOverwrite); /// Inserts all table templates. void finishStyles(); diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index 225d8c7e15e9..ceaf392d6bb2 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -496,7 +496,7 @@ public: const OUString& rTargetFrameName, const OUString& rStyleName, const OUString& rVisitedStyleName, - XMLEventsImportContext* pEvents = nullptr); + XMLEventsImportContext* pEvents); void SetRuby( SvXMLImport& rImport, const css::uno::Reference< css::text::XTextCursor >& rCursor, diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index fc3edc0d7a8d..99d9ce877ca4 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -264,7 +264,7 @@ protected: void exportPageFrames( bool bProgress ); void exportFrameFrames( bool bAutoStyles, bool bProgress, - const css::uno::Reference< css::text::XTextFrame > *pParentTxtFrame = nullptr ); + const css::uno::Reference< css::text::XTextFrame > *pParentTxtFrame ); void exportNumStyles( bool bUsed ); @@ -292,7 +292,7 @@ protected: bool bAutoStyles, bool bProgress, bool bExportParagraph, MultiPropertySetHelper& rPropSetHelper, - TextPNS eExtensionNS = TextPNS::ODF); + TextPNS eExtensionNS); virtual void exportTable( const css::uno::Reference< css::text::XTextContent > & rTextContent, @@ -311,7 +311,7 @@ protected: const css::uno::Reference< css::text::XTextContent > & rTextContent, FrameType eTxpe, bool bAutoStyles, bool bProgress, bool bExportContent, - const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet = nullptr ); + const css::uno::Reference< css::beans::XPropertySet > *pRangePropSet ); void _exportTextFrame( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo, @@ -457,9 +457,7 @@ public: SvXMLExport& rExport); // This methods exports all (or all used) styles - void exportTextStyles( bool bUsed - , bool bProg = false - ); + void exportTextStyles( bool bUsed, bool bProg ); /// This method exports (text field) declarations etc. void exportTextDeclarations(); @@ -512,15 +510,14 @@ public: void collectTextAutoStyles( const css::uno::Reference< css::text::XText > & rText, const css::uno::Reference< css::text::XTextSection > & rBaseSection, - bool bIsProgress = false ) + bool bIsProgress ) { exportText( rText, rBaseSection, true, bIsProgress, true/*bExportParagraph*/ ); } // It the model implements the xAutoStylesSupplier interface, the automatic // styles can exported without iterating over the text portions - bool collectTextAutoStylesOptimized( - bool bIsProgress = false ); + bool collectTextAutoStylesOptimized( bool bIsProgress ); // This method exports all automatic styles that have been collected. void exportTextAutoStyles(); @@ -543,19 +540,19 @@ public: void exportText( const css::uno::Reference< css::text::XText > & rText, const css::uno::Reference< css::text::XTextSection > & rBaseSection, - bool bIsProgress = false, + bool bIsProgress, TextPNS eExtensionNS = TextPNS::ODF) { exportText( rText, rBaseSection, false, bIsProgress, true/*bExportParagraph*/, eExtensionNS ); } - void exportFramesBoundToPage( bool bIsProgress = false ) + void exportFramesBoundToPage( bool bIsProgress ) { exportPageFrames( bIsProgress ); } void exportFramesBoundToFrame( const css::uno::Reference< css::text::XTextFrame >& rParentTxtFrame, - bool bIsProgress = false ) + bool bIsProgress ) { exportFrameFrames( false, bIsProgress, &rParentTxtFrame ); } diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 0df386996248..7ad68bb981f4 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -88,7 +88,7 @@ protected: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const; void exportElementItems( @@ -133,7 +133,7 @@ public: void exportXML( SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, - SvXmlExportFlags nFlags = SvXmlExportFlags::NONE, + SvXmlExportFlags nFlags, bool bUseExtensionNamespaceForGraphicProperties = false ) const; /** like above but only properties whose property map index is within the @@ -145,7 +145,7 @@ public: SvXMLExport& rExport, const ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nPropMapStartIdx, sal_Int32 nPropMapEndIdx, - SvXmlExportFlags nFlags = SvXmlExportFlags::NONE, bool bExtensionNamespace = false ) const; + SvXmlExportFlags nFlags, bool bExtensionNamespace = false ) const; /** this method is called for every item that has the MID_FLAG_ELEMENT_EXPORT flag set */ @@ -153,7 +153,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const; /** this method is called for every item that has the @@ -163,7 +163,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const; const rtl::Reference<XMLPropertySetMapper>& getPropertySetMapper() const; diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index cd140e8bca0b..308f6be0ec84 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -133,7 +133,7 @@ public: // parameter for use by txtstyli.cxx; allows efficient // catching the combined characters property - ContextID_Index_Pair* pSpecialContextIds = nullptr ); + ContextID_Index_Pair* pSpecialContextIds ); /** implementation helper for FillPropertySet: fill an XMultiPropertySet. * If unsuccessul, set return value. */ @@ -145,7 +145,7 @@ public: // parameters for use by txtstyli.cxx; allows efficient // catching the combined characters property - ContextID_Index_Pair* pSpecialContextIds = nullptr ); + ContextID_Index_Pair* pSpecialContextIds ); /** implementation helper for FillPropertySet: fill an XTolerantMultiPropertySet. * If unsuccessul, set return value. */ @@ -157,7 +157,7 @@ public: // parameters for use by txtstyli.cxx; allows efficient // catching the combined characters property - ContextID_Index_Pair* pSpecialContextIds = nullptr ); + ContextID_Index_Pair* pSpecialContextIds ); static void PrepareForMultiPropertySet_( diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx index e343865494dc..9fe84190e0d4 100644 --- a/include/xmloff/xmlnume.hxx +++ b/include/xmloff/xmlnume.hxx @@ -52,7 +52,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport SAL_DLLPRIVATE void exportLevelStyle( sal_Int32 nLevel, const css::uno::Sequence< css::beans::PropertyValue>& rProps, - bool bOutline=false ); + bool bOutline ); protected: @@ -76,7 +76,7 @@ public: void exportStyles( bool bUsed, XMLTextListAutoStylePool *pPool, - bool bExportChapterNumbering = true ); + bool bExportChapterNumbering ); void exportNumberingRule( const OUString& rName, bool bIsHidden, const css::uno::Reference< css::container::XIndexReplace > & xNumRule ); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index 71276172e6ac..1f958d7ab517 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -97,7 +97,7 @@ public: /** * @descr Add a tab entry in the template. */ - void AddTabEntry(enumXFTab type, double len, sal_Unicode leader, sal_Unicode delimiter, const OUString& styleName = ""); + void AddTabEntry(enumXFTab type, double len, sal_Unicode leader, sal_Unicode delimiter, const OUString& styleName); /** * @descr Add a entry in the template. diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx index 6f6b33ae0610..88a5de6fc926 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx @@ -202,7 +202,7 @@ public: OUString const & bullet_char, const OUString& fontname, const OUString& prefix, - const OUString& suffix = "" + const OUString& suffix ); void SetListNumber( sal_Int32 level, XFNumFmt& numFmt, sal_Int16 nStartValue ); diff --git a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx index f61f4910e761..9493e2df0a7c 100644 --- a/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpagemaster.hxx @@ -85,7 +85,7 @@ public: void SetPageHeight(double height); - void SetMargins(double left, double right=-1,double top=-1, double bottom=-1); + void SetMargins(double left, double right, double top=-1, double bottom=-1); void SetPageUsage(enumXFPageUsage usage); @@ -107,7 +107,7 @@ public: void SetFootNoteSeparator(enumXFAlignType align, double width, - sal_Int32 lengthPercent = 25, + sal_Int32 lengthPercent, double spaceAbove = 0.1, double spaceBelow = 0.1, XFColor color=XFColor(0,0,0) diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index 3a41bf76845d..aa1f98bd93d6 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -133,7 +133,7 @@ public: between the border and the top of the text. * @param indent value of the padding. */ - void SetPadding(double left, double right, double top = -1, double bottom = -1); + void SetPadding(double left, double right, double top, double bottom); /** * @descr Set the Margins of the paragraph. diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 2730ec16aa27..f1f17d406910 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -118,7 +118,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ @@ -127,7 +127,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; }; @@ -158,7 +158,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; }; @@ -176,7 +176,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; }; diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx index cb8dcd5a9222..8a4433fc5a5e 100644 --- a/xmloff/inc/XMLChartPropertySetMapper.hxx +++ b/xmloff/inc/XMLChartPropertySetMapper.hxx @@ -59,14 +59,14 @@ private: virtual void handleElementItem( SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; /// this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set virtual void handleSpecialItem( SvXMLAttributeList& rAttrList, const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; public: diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 9a71457557f1..522b341a990d 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -92,7 +92,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState >* pProperties = nullptr, + const ::std::vector< XMLPropertyState >* pProperties, sal_uInt32 nIdx = 0 ) const override; @@ -103,7 +103,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; }; @@ -125,7 +125,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState >* pProperties = nullptr, + const ::std::vector< XMLPropertyState >* pProperties, sal_uInt32 nIdx = 0 ) const override; }; diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx index e3c7a871a4e9..123c53a570e5 100644 --- a/xmloff/source/forms/controlpropertymap.hxx +++ b/xmloff/source/forms/controlpropertymap.hxx @@ -42,7 +42,7 @@ namespace xmloff const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter, const SvXMLNamespaceMap& _rNamespaceMap, - const ::std::vector< XMLPropertyState >* _pProperties = nullptr, + const ::std::vector< XMLPropertyState >* _pProperties, sal_uInt32 _nIdx = 0 ) const override; }; diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index 8ee27e53e6c1..5425acc7f858 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -49,7 +49,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState >* pProperties = nullptr, + const ::std::vector< XMLPropertyState >* pProperties, sal_uInt32 nIdx = 0 ) const override; virtual void handleSpecialItem( @@ -57,7 +57,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState >* pProperties = nullptr, + const ::std::vector< XMLPropertyState >* pProperties, sal_uInt32 nIdx = 0 ) const override; }; diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index 823db14079e4..8a853560cd94 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -73,7 +73,7 @@ public: SvXMLExport& rExport, const XMLPropertyState& rProperty, SvXmlExportFlags nFlags, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; virtual void handleSpecialItem( @@ -81,7 +81,7 @@ public: const XMLPropertyState& rProperty, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = nullptr, + const ::std::vector< XMLPropertyState > *pProperties, sal_uInt32 nIdx = 0 ) const override; }; |