diff options
37 files changed, 144 insertions, 150 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b10d6a5acc58..1e73718ec2ab 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -514,7 +514,7 @@ void Chart2ExportTest::testScatterChartTextXValues() Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0, 0); + Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xCT.is()); // Make sure we have exactly 3 data series. @@ -1031,7 +1031,7 @@ void Chart2ExportTest::testScatterPlotLabels() Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0, 0); + Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xCT.is()); // Make sure the original chart has 'a', 'b', 'c' as its data labels. @@ -1047,7 +1047,7 @@ void Chart2ExportTest::testScatterPlotLabels() xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xCT = getChartTypeFromDoc(xChartDoc, 0, 0); + xCT = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xCT.is()); aLabels = getDataSeriesLabelsFromChartType(xCT); @@ -1167,7 +1167,7 @@ void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartDocument > xC { CPPUNIT_ASSERT(xChartDoc.is()); - Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0, 0 ); + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); CPPUNIT_ASSERT(xChartType.is()); Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 9d3d891c3b1d..3c33e1f7686a 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -354,7 +354,7 @@ void Chart2ImportTest::testDOCXChartSeries() Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0, 0); + Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xCT.is()); std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); @@ -382,7 +382,7 @@ void Chart2ImportTest::testPPTXChartSeries() Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0, 0); + Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xCT.is()); std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); @@ -405,7 +405,7 @@ void Chart2ImportTest::testPPTXHiddenDataSeries() CPPUNIT_ASSERT_MESSAGE("'Automatic' chart background fill in pptx should be loaded as no fill (transparent).", eStyle == drawing::FillStyle_NONE); - Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0, 0); + Reference<chart2::XChartType> xCT = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xCT.is()); // There should be only one data series present. @@ -621,7 +621,7 @@ void Chart2ImportTest::testFlatODSStackedColumnChart() Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); - Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0, 0); + Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xChartType.is()); Reference<chart2::XDataSeriesContainer> xDSCont(xChartType, UNO_QUERY); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index eb1375214528..c18ee94f1d64 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -436,14 +436,14 @@ void EscherPropertyContainer::CreateGradientProperties( // Transparency gradient: Means the third setting in transparency page is set if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, OUString( "FillTransparenceGradient" ), false ) ) + aAny, rXPropSet, OUString( "FillTransparenceGradient" ) ) ) { pGradient = static_cast<css::awt::Gradient const *>(aAny.getValue()); ::com::sun::star::uno::Any aAnyTemp; const rtl::OUString aPropName( "FillStyle" ); if ( EscherPropertyValueHelper::GetPropertyValue( - aAnyTemp, rXPropSet, aPropName, false ) ) + aAnyTemp, rXPropSet, aPropName ) ) { ::com::sun::star::drawing::FillStyle eFS; if ( ! ( aAnyTemp >>= eFS ) ) @@ -452,7 +452,7 @@ void EscherPropertyContainer::CreateGradientProperties( if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID) { if ( EscherPropertyValueHelper::GetPropertyValue( - aAnyTemp, rXPropSet, OUString( "FillColor" ), false ) ) + aAnyTemp, rXPropSet, OUString( "FillColor" ) ) ) { const_cast<css::awt::Gradient *>(pGradient)->StartColor = ImplGetColor( *static_cast<sal_uInt32 const *>(aAnyTemp.getValue()), false ); const_cast<css::awt::Gradient *>(pGradient)->EndColor = ImplGetColor( *static_cast<sal_uInt32 const *>(aAnyTemp.getValue()), false ); @@ -462,7 +462,7 @@ void EscherPropertyContainer::CreateGradientProperties( else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT ) { if ( EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, OUString( "FillGradient" ), false ) ) + aAny, rXPropSet, OUString( "FillGradient" ) ) ) pGradient = static_cast<css::awt::Gradient const *>(aAny.getValue()); } } @@ -470,7 +470,7 @@ void EscherPropertyContainer::CreateGradientProperties( } // Not transparency gradient else if ( EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, OUString( "FillGradient" ), false ) ) + aAny, rXPropSet, OUString( "FillGradient" ) ) ) { pGradient = static_cast<css::awt::Gradient const *>(aAny.getValue()); } @@ -539,7 +539,7 @@ void EscherPropertyContainer::CreateGradientProperties( // Transparency gradient if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, OUString( "FillTransparenceGradient" ), false ) ) + aAny, rXPropSet, OUString( "FillTransparenceGradient" ) ) ) { pGradient = static_cast<css::awt::Gradient const *>(aAny.getValue()); if ( pGradient ) @@ -581,7 +581,7 @@ void EscherPropertyContainer::CreateFillProperties( const OUString aPropName( "FillStyle" ); if ( EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, aPropName, false ) ) + aAny, rXPropSet, aPropName ) ) { ::com::sun::star::drawing::FillStyle eFS; if ( ! ( aAny >>= eFS ) ) @@ -621,7 +621,7 @@ void EscherPropertyContainer::CreateFillProperties( AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid ); if ( EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, OUString( "FillColor" ), false ) ) + aAny, rXPropSet, OUString( "FillColor" ) ) ) { sal_uInt32 nFillColor = ImplGetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ); nFillBackColor = nFillColor ^ 0xffffff; @@ -677,7 +677,7 @@ void EscherPropertyContainer::CreateTextProperties( aAny >>= eHA; if ( bIsCustomShape ) { - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWordWrap" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextWordWrap" ) ) ) aAny >>= bWordWrap; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "TextAutoGrowHeight" ), true ) ) aAny >>= bAutoGrowSize; @@ -853,8 +853,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, bool bIsArrow = false; ::com::sun::star::uno::Any aAny; - if ( EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, sLine, false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, sLine ) ) { tools::PolyPolygon aPolyPoly( EscherPropertyContainer::GetPolyPolygon( aAny ) ); if ( aPolyPoly.Count() && aPolyPoly[ 0 ].GetSize() ) @@ -865,8 +864,7 @@ bool EscherPropertyContainer::GetLineArrow( const bool bLineStart, rnArrowLength = 1; rnArrowWidth = 1; - if ( EscherPropertyValueHelper::GetPropertyValue( - aAny, rXPropSet, sLineName, false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, sLineName ) ) { OUString aArrowStartName = *static_cast<OUString const *>(aAny.getValue()); sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND; @@ -978,7 +976,7 @@ void EscherPropertyContainer::CreateLineProperties( } // support LineCaps - if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, OUString( "LineCap" ), false)) + if(EscherPropertyValueHelper::GetPropertyValue(aAny, rXPropSet, OUString( "LineCap" ))) { ::com::sun::star::drawing::LineCap aLineCap(com::sun::star::drawing::LineCap_BUTT); @@ -1005,7 +1003,7 @@ void EscherPropertyContainer::CreateLineProperties( } } - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineStyle" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineStyle" ) ) ) { ::com::sun::star::drawing::LineStyle eLS; if ( aAny >>= eLS ) @@ -1018,7 +1016,7 @@ void EscherPropertyContainer::CreateLineProperties( case ::com::sun::star::drawing::LineStyle_DASH : { - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineDash" ) ) ) { ESCHER_LineDashing eDash = ESCHER_LineSolid; ::com::sun::star::drawing::LineDash const * pLineDash = static_cast<css::drawing::LineDash const *>(aAny.getValue()); @@ -1073,7 +1071,7 @@ void EscherPropertyContainer::CreateLineProperties( break; } } - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineColor" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineColor" ) ) ) { sal_uInt32 nLineColor = ImplGetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ); AddOpt( ESCHER_Prop_lineColor, nLineColor ); @@ -1081,7 +1079,7 @@ void EscherPropertyContainer::CreateLineProperties( } } - sal_uInt32 nLineSize = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineWidth" ), false ) ) + sal_uInt32 nLineSize = ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "LineWidth" ) ) ) ? *static_cast<sal_uInt32 const *>(aAny.getValue()) : 0; if ( nLineSize > 1 ) AddOpt( ESCHER_Prop_lineWidth, nLineSize * 360 ); // 100TH MM -> PT , 1PT = 12700 EMU @@ -1354,7 +1352,7 @@ bool EscherPropertyContainer::CreateEmbeddedBitmapProperties( bool bRetValue = false; OUString aVndUrl( "vnd.sun.star.GraphicObject:" ); OUString aBmpUrl( rBitmapUrl ); - sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl, 0 ); + sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl ); if( nIndex != -1 ) { nIndex += aVndUrl.getLength(); @@ -1499,7 +1497,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( if ( aAny >>= aHatch ) { Color aBackColor; - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillColor" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "FillColor" ) ) ) { aBackColor = ImplGetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()), false ); } @@ -1562,7 +1560,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( if ( aGraphicUrl.getLength() ) { OUString aVndUrl( "vnd.sun.star.GraphicObject:" ); - sal_Int32 nIndex = aGraphicUrl.indexOf( aVndUrl, 0 ); + sal_Int32 nIndex = aGraphicUrl.indexOf( aVndUrl ); if ( nIndex != -1 ) { nIndex = nIndex + aVndUrl.getLength(); @@ -1840,7 +1838,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st if ( ePolyFlags == css::drawing::PolygonFlags_CONTROL ) continue; } - aPolyPolygon.Insert( aPolygon, POLYPOLY_APPEND ); + aPolyPolygon.Insert( aPolygon ); } } } @@ -1878,7 +1876,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st aPolygon[ b ] = Point( pArray->X, pArray->Y ); pArray++; } - aPolyPolygon.Insert( aPolygon, POLYPOLY_APPEND ); + aPolyPolygon.Insert( aPolygon ); } } } @@ -1905,7 +1903,7 @@ tools::PolyPolygon EscherPropertyContainer::GetPolyPolygon( const ::com::sun::st aPolygon[ a ] = Point( pArray->X, pArray->Y ); pArray++; } - aPolyPolygon.Insert( aPolygon, POLYPOLY_APPEND ); + aPolyPolygon.Insert( aPolygon ); } } } @@ -1928,7 +1926,7 @@ bool EscherPropertyContainer::CreatePolygonProperties( tools::PolyPolygon aPolyPolygon; if ( pPolygon ) - aPolyPolygon.Insert( *pPolygon, POLYPOLY_APPEND ); + aPolyPolygon.Insert( *pPolygon ); else { ::com::sun::star::uno::Any aAny; @@ -2356,13 +2354,13 @@ bool EscherPropertyContainer::CreateShadowProperties( if ( bHasShadow ) { nShadowFlags |= 2; - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowColor" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowColor" ) ) ) AddOpt( ESCHER_Prop_shadowColor, ImplGetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ) ); - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowXDistance" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowXDistance" ) ) ) AddOpt( ESCHER_Prop_shadowOffsetX, *static_cast<sal_Int32 const *>(aAny.getValue()) * 360 ); - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowYDistance" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowYDistance" ) ) ) AddOpt( ESCHER_Prop_shadowOffsetY, *static_cast<sal_Int32 const *>(aAny.getValue()) * 360 ); - if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowTransparence" ), false ) ) + if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, OUString( "ShadowTransparence" ) ) ) AddOpt( ESCHER_Prop_shadowOpacity, 0x10000 - (((sal_uInt32)*static_cast<sal_uInt16 const *>(aAny.getValue())) * 655 ) ); } } @@ -5416,7 +5414,7 @@ sal_uInt32 EscherEx::GetColor( const Color& rSOColor, bool bSwap ) nColor |= rSOColor.GetBlue(); if ( !bSwap ) - nColor = GetColor( nColor, true ); + nColor = GetColor( nColor ); return nColor; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index cd329f4d0a24..97aeca8513c1 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -995,7 +995,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh rSet.Put( XLineDashItem( OUString(), XDash( eDash, nDots, nDotLen, nDashes, nDashLen, nDistance ) ) ); rSet.Put( XLineStyleItem( drawing::LineStyle_DASH ) ); } - rSet.Put( XLineColorItem( OUString(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_lineColor, 0 ), DFF_Prop_lineColor ) ) ); + rSet.Put( XLineColorItem( OUString(), rManager.MSO_CLR_ToColor( GetPropertyValue( DFF_Prop_lineColor, 0 ) ) ) ); if ( IsProperty( DFF_Prop_lineOpacity ) ) { double nTrans = GetPropertyValue(DFF_Prop_lineOpacity, 0x10000); @@ -3643,7 +3643,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) OUString aParagraph( pCurrent, nParaSize ); if ( !nParaIndex && aParagraph.isEmpty() ) // SJ: we are crashing if the first paragraph is empty ? aParagraph += " "; // otherwise these two lines can be removed. - rOutliner.Insert( aParagraph, nParaIndex, 0 ); + rOutliner.Insert( aParagraph, nParaIndex ); rOutliner.SetParaAttribs( nParaIndex, rOutliner.GetEmptyItemSet() ); SfxItemSet aParagraphAttribs( rOutliner.GetEmptyItemSet() ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index bd90eeb290af..47e9f35fb558 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1820,7 +1820,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, rStCtrl.SeekRel( 4 ); ::utl::TempFile aTmpFile; - aTmpFile.EnableKillingFile( true ); + aTmpFile.EnableKillingFile(); if ( aTmpFile.IsValid() ) { @@ -1876,7 +1876,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, uno::Reference< frame::XModel > xModel( pOe->pShell->GetModel() ); PPTConvertOCXControls aPPTConvertOCXControls( this, xIStrm, xModel, eAktPageKind ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; - if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape, false ) ) + if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) ) pRet = GetSdrObjectFromXShape( xShape ); } diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index cecc7d989df6..440f4aa0ff3e 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -1194,7 +1194,7 @@ OUString ToggleUnicodeCodepoint::StringToReplace() nUnicode = sIn.toString().toUInt32(16); if( !nUnicode || nUnicode > 0x10ffff ) - maInput.truncate(0).append( sIn[sIn.getLength()-1] ); + maInput.truncate().append( sIn[sIn.getLength()-1] ); return maInput.toString(); } @@ -1205,7 +1205,7 @@ sal_uInt32 ToggleUnicodeCodepoint::CharsToDelete() sal_uInt32 counter = 0; while( nPos < sIn.getLength() ) { - sIn.iterateCodePoints(&nPos,1); + sIn.iterateCodePoints(&nPos); ++counter; } return counter; @@ -1243,7 +1243,7 @@ OUString ToggleUnicodeCodepoint::ReplacementString() while( nPos < sIn.getLength() ) { maOutput.append( "U+" ); - maOutput.append( OUString::number(sIn.iterateCodePoints(&nPos,1),16) ); + maOutput.append( OUString::number(sIn.iterateCodePoints(&nPos),16) ); } } return maOutput.toString(); diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 8b6f66647f2c..4dd558bec98b 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -162,7 +162,7 @@ void ScConditionalFormatTest::testUndoAnchor() CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawView != NULL ); // Select graphic object - pDrawView->MarkNextObj(false); + pDrawView->MarkNextObj(); CPPUNIT_ASSERT_MESSAGE( sFailedMessage.getStr(), pDrawView->AreObjectsMarked() ); // Set Cell Anchor diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index bdc3a2a7701a..28628518b795 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -228,7 +228,7 @@ void testContentImpl(ScDocument& rDoc, sal_Int32 nFormat ) //same code for ods, { SCCOL nCol = 4; SCROW nRow = 1; - rDoc.ExtendMerge(4, 1, nCol, nRow, 0, false); + rDoc.ExtendMerge(4, 1, nCol, nRow, 0); CPPUNIT_ASSERT_MESSAGE("merged cells are not imported", nCol == 5 && nRow == 2); //check notes import diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index c8036c791b99..785d5c4aebc5 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -2738,7 +2738,7 @@ void ScExportTest::testMoveCellAnchoredShapes() CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL ); // Get anchor data - ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj, false); + ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated upon import.", !pData->maLastRect.IsEmpty()); @@ -2759,7 +2759,7 @@ void ScExportTest::testMoveCellAnchoredShapes() rDoc.InsertRow(ScRange( 0, aDataStart.Row() - 1, 0, MAXCOL, aDataStart.Row(), 0)); // Get anchor data - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated upon import.", !pData->maLastRect.IsEmpty()); @@ -2800,7 +2800,7 @@ void ScExportTest::testMoveCellAnchoredShapes() CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL ); // Get anchor data - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated upon import.", !pData->maLastRect.IsEmpty()); @@ -2820,7 +2820,7 @@ void ScExportTest::testMoveCellAnchoredShapes() rDoc1.InsertCol(ScRange( aDataStart.Col(), 0 , 0 , aDataStart.Col(), MAXROW, 0 )); // Get anchor data - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated upon import.", !pData->maLastRect.IsEmpty()); @@ -2861,7 +2861,7 @@ void ScExportTest::testMoveCellAnchoredShapes() CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL ); // Get anchor data - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated upon import.", !pData->maLastRect.IsEmpty()); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 98c80d373bdf..2bc98075c234 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -1084,7 +1084,7 @@ void checkMergedCells( ScDocument& rDoc, const ScAddress& rStartAddress, SCCOL nActualEndCol = rStartAddress.Col(); SCROW nActualEndRow = rStartAddress.Row(); rDoc.ExtendMerge( rStartAddress.Col(), rStartAddress.Row(), - nActualEndCol, nActualEndRow, rStartAddress.Tab(), false ); + nActualEndCol, nActualEndRow, rStartAddress.Tab() ); OString sTab = OString::number( rStartAddress.Tab() + 1 ); OString msg = "Merged cells are not correctly imported on sheet" + sTab; OString msgCol = msg + "; end col"; @@ -1703,7 +1703,7 @@ void ScFiltersTest::testCellAnchoredShapesODS() { SdrObject* pObj = pPage->GetObj(i); CPPUNIT_ASSERT_MESSAGE("Failed to get drawing object.", pObj); - ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj, false); + ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated upon import.", !pData->maLastRect.IsEmpty()); } diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index b3d809c2373e..68c57c8d75f5 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -4101,7 +4101,7 @@ void Test::testCopyPasteRepeatOneFormula() ScRange aRowOne(0,0,0,MAXCOL,0,0); aMark.SetMarkArea(aRowOne); ScDocFunc& rFunc = getDocShell().GetDocFunc(); - rFunc.InsertCells(aRowOne, &aMark, INS_INSROWS_BEFORE, true, true, false); + rFunc.InsertCells(aRowOne, &aMark, INS_INSROWS_BEFORE, true, true); CPPUNIT_ASSERT_MESSAGE("C1 should be empty.", m_pDoc->GetCellType(ScAddress(2,0,0)) == CELLTYPE_NONE); @@ -4192,13 +4192,13 @@ void Test::testMergedCells() m_pDoc->DoMerge(0, 1, 1, 3, 3, false); SCCOL nEndCol = 1; SCROW nEndRow = 1; - m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0, false); + m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0); CPPUNIT_ASSERT_MESSAGE("did not merge cells", nEndCol == 3 && nEndRow == 3); ScRange aRange(0,2,0,MAXCOL,2,0); ScMarkData aMark; aMark.SetMarkArea(aRange); getDocShell().GetDocFunc().InsertCells(aRange, &aMark, INS_INSROWS_BEFORE, true, true); - m_pDoc->ExtendMerge(1, 1, nEndCol, nEndRow, 0, false); + m_pDoc->ExtendMerge(1, 1, nEndCol, nEndRow, 0); CPPUNIT_ASSERT_MESSAGE("did not increase merge area", nEndCol == 3 && nEndRow == 4); m_pDoc->DeleteTab(0); } @@ -5130,7 +5130,7 @@ void Test::testNoteLifeCycle() ScDocument aClipDoc(SCDOCMODE_CLIP); ScMarkData aMarkData; aMarkData.SelectOneTable(0); - m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMarkData, false, false, true, true, false); + m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMarkData, false, false, true, true); ScPostIt* pClipNote = aClipDoc.GetNote(aPos); CPPUNIT_ASSERT_MESSAGE("Failed to copy note to the clipboard.", pClipNote); @@ -5168,7 +5168,7 @@ void Test::testNoteCopyPaste() ScDocument aClipDoc(SCDOCMODE_CLIP); aClipDoc.ResetClip(m_pDoc, &aMark); ScClipParam aClipParam(aCopyRange, false); - m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark, false, false, false, true, false); + m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark, false, false, false, true); // Make sure the notes are in the clipboard. pNote = aClipDoc.GetNote(ScAddress(1,1,0)); @@ -6636,7 +6636,7 @@ void Test::testUndoDataAnchor() ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *m_pDoc, 0); // Get anchor data - ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj, false); + ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); ScAddress aOldStart = pData->maStart; @@ -6656,9 +6656,9 @@ void Test::testUndoDataAnchor() ScDocFunc& rFunc = getDocShell().GetDocFunc(); ScMarkData aMark; aMark.SelectOneTable(0); - rFunc.InsertCells(ScRange( 0, aOldStart.Row() - 1, 0, MAXCOL, aOldStart.Row(), 0 ), &aMark, INS_INSROWS_BEFORE, true, true, false); + rFunc.InsertCells(ScRange( 0, aOldStart.Row() - 1, 0, MAXCOL, aOldStart.Row(), 0 ), &aMark, INS_INSROWS_BEFORE, true, true); - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); ScAddress aNewStart = pData->maStart; @@ -6684,7 +6684,7 @@ void Test::testUndoDataAnchor() CPPUNIT_ASSERT_MESSAGE( "Failed to check state SCA_CELL.", oldType == SCA_CELL ); // Get anchor data - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); // Get non rotated anchor data @@ -6701,7 +6701,7 @@ void Test::testUndoDataAnchor() pUndoMgr->Redo(); // Get anchor data - pData = ScDrawLayer::GetObjData(pObj, false); + pData = ScDrawLayer::GetObjData(pObj); CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", pData); // Get non rotated anchor data diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 1ae9ed6be81f..3d60fdf5178f 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1679,7 +1679,7 @@ void Test::testFormulaRefUpdateInsertRows() ScMarkData aMark; aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); - rFunc.InsertCells(ScRange(0,0,0,MAXCOL,1,0), &aMark, INS_INSROWS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,0,0,MAXCOL,1,0), &aMark, INS_INSROWS_BEFORE, false, true); // The raw data should have shifted to B4:B6. CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(1,3,0))); @@ -1703,7 +1703,7 @@ void Test::testFormulaRefUpdateInsertRows() CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(ScAddress(0,2,0))); // Insert 3 rows over 2:4. This should push A3:A6 to A6:A9. - rFunc.InsertCells(ScRange(0,1,0,MAXCOL,3,0), &aMark, INS_INSROWS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,1,0,MAXCOL,3,0), &aMark, INS_INSROWS_BEFORE, false, true); ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(0,5,0)); CPPUNIT_ASSERT(pFC); CPPUNIT_ASSERT_MESSAGE("This formula cell should not be an error.", pFC->GetErrCode() == 0); @@ -1848,7 +1848,7 @@ void Test::testFormulaRefUpdateInsertColumns() ScMarkData aMark; aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); - rFunc.InsertCells(ScRange(0,0,0,1,MAXROW,0), &aMark, INS_INSCOLS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,0,0,1,MAXROW,0), &aMark, INS_INSCOLS_BEFORE, false, true); // Now, the original column B has moved to column D. if (!checkFormula(*m_pDoc, ScAddress(3,3,0), "SUM(D1:D3)")) @@ -2680,7 +2680,7 @@ void Test::testFormulaRefUpdateNameExpandRef() ScDocFunc& rFunc = getDocShell().GetDocFunc(); ScMarkData aMark; aMark.SelectOneTable(0); - rFunc.InsertCells(ScRange(0,3,0,MAXCOL,3,0), &aMark, INS_INSROWS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,3,0,MAXCOL,3,0), &aMark, INS_INSROWS_BEFORE, false, true); ScRangeData* pName = m_pDoc->GetRangeName()->findByUpperName("MYRANGE"); CPPUNIT_ASSERT(pName); OUString aSymbol; @@ -2709,7 +2709,7 @@ void Test::testFormulaRefUpdateNameExpandRef() CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(0,0,0)); // Insert rows over 3:5 which should expand the range by 3 rows. - rFunc.InsertCells(ScRange(0,2,0,MAXCOL,4,0), &aMark, INS_INSROWS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,2,0,MAXCOL,4,0), &aMark, INS_INSROWS_BEFORE, false, true); pName = m_pDoc->GetRangeName()->findByUpperName("MYRANGE"); CPPUNIT_ASSERT(pName); @@ -2752,7 +2752,7 @@ void Test::testFormulaRefUpdateNameExpandRef() CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(ScAddress(4,0,0))); // Insert a new row at row 3. This should expand MyData to A1:A4. - rFunc.InsertCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, INS_INSROWS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, INS_INSROWS_BEFORE, false, true); // Set new value to A3. m_pDoc->SetValue(ScAddress(0,2,0), 4.0); @@ -2980,7 +2980,7 @@ void Test::testFormulaRefUpdateValidity() aMark.SelectOneTable(0); // Insert a new column at Column B, to move the list from C2:C4 to D2:D4. - bool bInserted = rFunc.InsertCells(ScRange(1,0,0,1,MAXROW,0), &aMark, INS_INSCOLS_BEFORE, true, true, false); + bool bInserted = rFunc.InsertCells(ScRange(1,0,0,1,MAXROW,0), &aMark, INS_INSCOLS_BEFORE, true, true); CPPUNIT_ASSERT_MESSAGE("Column insertion failed.", bInserted); CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(3,1,0))); CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(3,2,0))); @@ -3234,7 +3234,7 @@ void Test::testFuncROW() ScDocFunc& rFunc = getDocShell().GetDocFunc(); ScMarkData aMark; aMark.SelectOneTable(0); - rFunc.InsertCells(ScRange(0,3,0,MAXCOL,3,0), &aMark, INS_INSROWS_BEFORE, false, true, false); + rFunc.InsertCells(ScRange(0,3,0,MAXCOL,3,0), &aMark, INS_INSROWS_BEFORE, false, true); if (!checkFormula(*m_pDoc, ScAddress(0,1,0), "ROW(A6)")) CPPUNIT_FAIL("Wrong formula!"); if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "ROW(B6)")) diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx index 898bcb5ae833..88666a299503 100644 --- a/sc/qa/unit/ucalc_sharedformula.cxx +++ b/sc/qa/unit/ucalc_sharedformula.cxx @@ -898,7 +898,7 @@ void Test::testSharedFormulasInsertRow() ScDocFunc& rFunc = getDocShell().GetDocFunc(); ScMarkData aMark; aMark.SelectOneTable(0); - rFunc.InsertCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, INS_INSROWS_BEFORE, true, true, false); + rFunc.InsertCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, INS_INSROWS_BEFORE, true, true); bool bResult = aCheck.checkContent(m_pDoc); CPPUNIT_ASSERT_MESSAGE("Failed on the initial content check.", bResult); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 270f33ae14a4..9be0c5592098 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -534,7 +534,7 @@ void XclImpChEscherFormat::ReadHeaderRecord( XclImpStream& rStrm ) // get the data aPropSet.FillToItemSet( *maData.mxItemSet ); // get fill type from DFF property set - mnDffFillType = aPropSet.GetPropertyValue( DFF_Prop_fillType, mso_fillSolid ); + mnDffFillType = aPropSet.GetPropertyValue( DFF_Prop_fillType ); } void XclImpChEscherFormat::ReadSubRecord( XclImpStream& rStrm ) diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index f3a1336aea5e..aded80fbd404 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -503,11 +503,11 @@ void SdPage::getAlienAttributes( com::sun::star::uno::Any& rAttributes ) if( (mpItems == NULL) || ( SfxItemState::SET != mpItems->GetItemState( SDRATTR_XMLATTRIBUTES, false, &pItem ) ) ) { SvXMLAttrContainerItem aAlienAttributes; - aAlienAttributes.QueryValue( rAttributes, 0 ); + aAlienAttributes.QueryValue( rAttributes ); } else { - static_cast<const SvXMLAttrContainerItem*>(pItem)->QueryValue( rAttributes, 0 ); + static_cast<const SvXMLAttrContainerItem*>(pItem)->QueryValue( rAttributes ); } } diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index c55a88fb9fa0..81dc5b7daa86 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -81,22 +81,22 @@ namespace { bool IsPrintPageName() const { - return GetBoolValue("IsPrintName"); + return GetBoolValue("IsPrintName", false); } bool IsDate() const { - return GetBoolValue("IsPrintDateTime"); + return GetBoolValue("IsPrintDateTime", false); } bool IsTime() const { - return GetBoolValue("IsPrintDateTime"); + return GetBoolValue("IsPrintDateTime", false); } bool IsHiddenPages() const { - return GetBoolValue("IsPrintHidden"); + return GetBoolValue("IsPrintHidden", false); } bool IsHandoutHorizontal() const @@ -229,7 +229,7 @@ namespace { */ bool GetBoolValue ( const sal_Char* pName, - const bool bDefaultValue = false) const + const bool bDefaultValue) const { bool bValue = mrProperties.getBoolValue( pName, bDefaultValue ); return bValue; @@ -1432,7 +1432,7 @@ private: } if (mpOptions->IsTime()) - aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( ::tools::Time( ::tools::Time::SYSTEM ), false, false ); + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( ::tools::Time( ::tools::Time::SYSTEM ), false ); // Draw and Notes should usually use specified paper size when printing if (!mpOptions->IsPrinterPreferred(mrBase.GetDocShell()->GetDocumentType())) diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 4a6c73d5b0b3..0f52e97b815e 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -1085,7 +1085,7 @@ void SAL_CALL SmModel::render( // release SmPrintUIOptions when everything is done. // That way, when SmPrintUIOptions is needed again it will read the latest configuration settings in its c-tor. - if (m_pPrintUIOptions->getBoolValue( "IsLastPage", false )) + if (m_pPrintUIOptions->getBoolValue( "IsLastPage" )) { m_pPrintUIOptions.reset(); } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 84b9ab20be4c..9aaf0ae1ea18 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1241,7 +1241,7 @@ void SmViewShell::Impl_Print(OutputDevice &rOutDev, const SmPrintUIOptions &rPri MapMode OutputMapMode; // PDF export should always use PRINT_SIZE_NORMAL ... - if (!rPrintUIOptions.getBoolValue( "IsPrinter", false ) ) + if (!rPrintUIOptions.getBoolValue( "IsPrinter" ) ) ePrintSize = PRINT_SIZE_NORMAL; switch (ePrintSize) { @@ -1287,7 +1287,7 @@ void SmViewShell::Impl_Print(OutputDevice &rOutDev, const SmPrintUIOptions &rPri rOutDev.SetMapMode(OutputMapMode); rOutDev.SetClipRegion(vcl::Region(aOutRect)); - GetDoc()->DrawFormula(rOutDev, aPos, false); + GetDoc()->DrawFormula(rOutDev, aPos); rOutDev.SetClipRegion(); rOutDev.Pop(); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 8bacc46cd735..ac1f0dda0641 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1232,7 +1232,7 @@ void SwUiWriterTest::testTdf79236() const SwAttrSet& attrSet = pTextFormat->GetAttrSet(); SfxItemSet* itemSet = attrSet.Clone(); sal_uInt16 initialCount = itemSet->Count(); - SvxAdjustItem AdjustItem = attrSet.GetAdjust(true); + SvxAdjustItem AdjustItem = attrSet.GetAdjust(); SvxAdjust initialAdjust = AdjustItem.GetAdjust(); //By default the adjust is LEFT CPPUNIT_ASSERT_EQUAL(SVX_ADJUST_LEFT, initialAdjust); @@ -1251,7 +1251,7 @@ void SwUiWriterTest::testTdf79236() //Checking the Changes SwTextFormatColl* pTextFormat2 = pDoc->FindTextFormatCollByName(OUString("Text Body")); const SwAttrSet& attrSet2 = pTextFormat2->GetAttrSet(); - const SvxAdjustItem& AdjustItem2 = attrSet2.GetAdjust(true); + const SvxAdjustItem& AdjustItem2 = attrSet2.GetAdjust(); SvxAdjust Adjust2 = AdjustItem2.GetAdjust(); //The adjust should be RIGHT as per the modifications made CPPUNIT_ASSERT_EQUAL(SVX_ADJUST_RIGHT, Adjust2); @@ -1259,7 +1259,7 @@ void SwUiWriterTest::testTdf79236() rUndoManager.Undo(); SwTextFormatColl* pTextFormat3 = pDoc->FindTextFormatCollByName(OUString("Text Body")); const SwAttrSet& attrSet3 = pTextFormat3->GetAttrSet(); - const SvxAdjustItem& AdjustItem3 = attrSet3.GetAdjust(true); + const SvxAdjustItem& AdjustItem3 = attrSet3.GetAdjust(); SvxAdjust Adjust3 = AdjustItem3.GetAdjust(); //The adjust should be back to default, LEFT CPPUNIT_ASSERT_EQUAL(SVX_ADJUST_LEFT, Adjust3); @@ -1267,7 +1267,7 @@ void SwUiWriterTest::testTdf79236() rUndoManager.Redo(); SwTextFormatColl* pTextFormat4 = pDoc->FindTextFormatCollByName(OUString("Text Body")); const SwAttrSet& attrSet4 = pTextFormat4->GetAttrSet(); - const SvxAdjustItem& AdjustItem4 = attrSet4.GetAdjust(true); + const SvxAdjustItem& AdjustItem4 = attrSet4.GetAdjust(); SvxAdjust Adjust4 = AdjustItem4.GetAdjust(); //The adjust should be RIGHT as per the modifications made CPPUNIT_ASSERT_EQUAL(SVX_ADJUST_RIGHT, Adjust4); @@ -1275,7 +1275,7 @@ void SwUiWriterTest::testTdf79236() rUndoManager.Undo(); SwTextFormatColl* pTextFormat5 = pDoc->FindTextFormatCollByName(OUString("Text Body")); const SwAttrSet& attrSet5 = pTextFormat5->GetAttrSet(); - const SvxAdjustItem& AdjustItem5 = attrSet5.GetAdjust(true); + const SvxAdjustItem& AdjustItem5 = attrSet5.GetAdjust(); SvxAdjust Adjust5 = AdjustItem5.GetAdjust(); //The adjust should be back to default, LEFT CPPUNIT_ASSERT_EQUAL(SVX_ADJUST_LEFT, Adjust5); @@ -1621,14 +1621,14 @@ void SwUiWriterTest::testSearchWithTransliterate() SearchOpt.insertedChars = 0; SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL; //transliteration option set so that at least one of the search strings is not found - sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false); + sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY); SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true); CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText()); CPPUNIT_ASSERT_EQUAL(0,(int)case1); SearchOpt.searchString = "paragraph"; SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL; //transliteration option set so that all search strings are found - sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false); + sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY); pShellCrsr = pWrtShell->getShellCrsr(true); CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText()); CPPUNIT_ASSERT_EQUAL(1,(int)case2); @@ -1892,9 +1892,9 @@ void SwUiWriterTest::testTdf75137() sal_uLong firstIndex = pShellCrsr->GetNode().GetIndex(); pShellCrsr->GotoFootnoteAnchor(); pWrtShell->InsertFootnote(OUString("This is second footnote")); - pWrtShell->Up(false, 1, false); + pWrtShell->Up(false, 1); sal_uLong secondIndex = pShellCrsr->GetNode().GetIndex(); - pWrtShell->Down(false, 1, false); + pWrtShell->Down(false, 1); sal_uLong thirdIndex = pShellCrsr->GetNode().GetIndex(); CPPUNIT_ASSERT_EQUAL(firstIndex, thirdIndex); CPPUNIT_ASSERT(firstIndex != secondIndex); @@ -2221,8 +2221,8 @@ void SwUiWriterTest::testShapeAnchorUndo() pWrtShell->SelectObj(Point(), 0, pObject); - pWrtShell->GetDrawView()->MoveMarkedObj(Size(100, 100), false); - pWrtShell->ChgAnchor(0, true, true); + pWrtShell->GetDrawView()->MoveMarkedObj(Size(100, 100)); + pWrtShell->ChgAnchor(0, true); rUndoManager.EndUndo(UNDO_END, NULL); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 61fe58993e3b..789fbb94ad31 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1638,9 +1638,9 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew) OUString SwDoc::GetPaMDescr(const SwPaM & rPam) { - if (&rPam.GetNode(true) == &rPam.GetNode(false)) + if (&rPam.GetNode() == &rPam.GetNode(false)) { - SwTextNode * pTextNode = rPam.GetNode(true).GetTextNode(); + SwTextNode * pTextNode = rPam.GetNode().GetTextNode(); if (0 != pTextNode) { diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 1c0335b0d153..584fac7fa174 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1567,7 +1567,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: } } - pFormat->GetDoc()->SetFrameFormatToFly( *pFormat, *pFrameFormat, pSet, false ); + pFormat->GetDoc()->SetFrameFormatToFly( *pFormat, *pFrameFormat, pSet ); delete pSet; } else @@ -3285,7 +3285,7 @@ uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration() thr if(!pFormat) return nullptr; SwPosition aPos(pFormat->GetContent().GetContentIdx()->GetNode()); - auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos, false)); + auto pUnoCursor(GetDoc()->CreateUnoCrsr(aPos)); pUnoCursor->Move(fnMoveForward, fnGoNode); return SwXParagraphEnumeration::Create(this, pUnoCursor, CURSOR_FRAME); } diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 87d0cb52785b..9b63caa42e1f 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1490,7 +1490,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFormat if(pOrient) { uno::Any any; - pOrient->QueryValue(any, MID_VERTORIENT_ORIENT); + pOrient->QueryValue(any); aPropertyValues.push_back(PropertyValue( UNO_NAME_VERT_ORIENT, -1, any, PropertyState_DIRECT_VALUE)); } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 3e289ca40587..02881ce84351 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1289,7 +1289,7 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, 0 ); - aTstItemSet.Set( pDCCharFormat->GetAttrSet(), true ); + aTstItemSet.Set( pDCCharFormat->GetAttrSet() ); return HasScriptDependentItems( aTstItemSet, false ); } } @@ -1441,7 +1441,7 @@ static void OutCSS1DropCapRule( RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT, 0 ); if( pDCCharFormat ) - aScriptItemSet.Set( pDCCharFormat->GetAttrSet(), true ); + aScriptItemSet.Set( pDCCharFormat->GetAttrSet() ); OUString aNewSelector( aSelector ); aNewSelector += ".western" + aPseudo; @@ -1553,9 +1553,9 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat, // (all but for nDeep==1) const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet(); SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() ); - aItemSet.Set( rFormatItemSet, true ); // Was nDeep!=1 that is not working - // for script dependent items buts should - // not make a difference for any other + aItemSet.Set( rFormatItemSet ); // Was nDeep!=1 that is not working + // for script dependent items buts should + // not make a difference for any other bool bSetDefaults = true, bClearSame = true; const SwFormat *pRefFormat = 0; @@ -1755,7 +1755,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, const SwFrameFormat &rMaster = rPageDesc.GetMaster(); SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(), RES_LR_SPACE, RES_UL_SPACE ); - aItemSet.Set( rMaster.GetAttrSet(), true ); + aItemSet.Set( rMaster.GetAttrSet() ); if( pRefPageDesc ) { @@ -1807,7 +1807,7 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo, { const SfxItemSet& rFormatItemSet = pSymCharFormat->GetAttrSet(); SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() ); - aItemSet.Set( rFormatItemSet, true ); + aItemSet.Set( rFormatItemSet ); // If there are footnotes or endnotes, then all Attributes have to be // exported, so that Netscape displays the document correctly. diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 776d47249de4..f8f6d4d7e9c7 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -305,7 +305,7 @@ SwHTMLFormatInfo::SwHTMLFormatInfo( const SwFormat *pF, SwDoc *pDoc, SwDoc *pTem // sollen ist harte Attributierung noetig. Fuer Vorlagen, die // nicht von HTML-Tag-Vorlagen abgeleitet sind, gilt das immer - pItemSet->Set( pFormat->GetAttrSet(), true ); + pItemSet->Set( pFormat->GetAttrSet() ); if( pReferenceFormat ) SwHTMLWriter::SubtractItemSet( *pItemSet, pReferenceFormat->GetAttrSet(), @@ -1893,7 +1893,7 @@ void HTMLEndPosLst::Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos, SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj, true ); bool bOutStylesOld = bOutStyles; bOutStyles = false; - Insert( aItemSet, nPos, nPos+1, rFormatInfos, false, false ); + Insert( aItemSet, nPos, nPos+1, rFormatInfos, false ); bOutStyles = bOutStylesOld; } } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index ff50777eb83e..cda4f26a4565 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -684,8 +684,8 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, if( aClearItems[j] || (pParentItemSet && SfxItemState::SET == rItemSet.GetItemState( nWhich, false, &pItem ) && - (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich, true ) ) - : *pItem == pParentItemSet->Get(nWhich, true ) ) ) ) + (0==i ? swhtml_css1atr_equalFontItems( *pItem, pParentItemSet->Get(nWhich ) ) + : *pItem == pParentItemSet->Get(nWhich ) ) ) ) { rItemSet.ClearItem( nWhich ); } @@ -1099,7 +1099,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, if( !pCFormat ) { pCFormat = pDoc->MakeCharFormat( aName, pParentCFormat ); - pCFormat->SetAuto( false ); + pCFormat->SetAuto(); } } @@ -1184,7 +1184,7 @@ SwCharFormat* SwCSS1Parser::GetChrFormat( sal_uInt16 nToken2, const OUString& rC if( !pCFormat ) { pCFormat = pDoc->MakeCharFormat( sCName, pDoc->GetDfltCharFormat() ); - pCFormat->SetAuto( false ); + pCFormat->SetAuto(); } } @@ -1209,7 +1209,7 @@ SwCharFormat* SwCSS1Parser::GetChrFormat( sal_uInt16 nToken2, const OUString& rC if( pClass ) { pCFormat = pDoc->MakeCharFormat( aTmp, pCFormat ); - pCFormat->SetAuto( false ); + pCFormat->SetAuto(); SfxItemSet aItemSet( pClass->GetItemSet() ); SetCharFormatAttrs( pCFormat, aItemSet ); } @@ -1533,7 +1533,7 @@ void SwCSS1Parser::FillDropCap( SwFormatDrop& rDrop, if( !pCFormat ) { pCFormat = pDoc->MakeCharFormat( aName, pDoc->GetDfltCharFormat() ); - pCFormat->SetAuto( false ); + pCFormat->SetAuto(); } SetCharFormatAttrs( pCFormat, rItemSet ); diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index da355ef21dad..b5cc039b48c0 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -352,8 +352,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) rOption.GetEnum( aHTMLImgVAlignTable, text::VertOrientation::TOP ); eHoriOri = - rOption.GetEnum( aHTMLImgHAlignTable, - text::HoriOrientation::NONE ); + rOption.GetEnum( aHTMLImgHAlignTable ); break; } } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 7378aa78c33c..24cd281b3bf8 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -349,8 +349,7 @@ void SwHTMLParser::InsertImage() rOption.GetEnum( aHTMLImgVAlignTable, text::VertOrientation::TOP ); eHoriOri = - rOption.GetEnum( aHTMLImgHAlignTable, - text::HoriOrientation::NONE ); + rOption.GetEnum( aHTMLImgHAlignTable ); break; case HTML_O_WIDTH: // erstmal nur als Pixelwerte merken! @@ -1160,8 +1159,7 @@ ANCHOR_SETEVENT: if( !aName.isEmpty() ) { OUString sDecoded( INetURLObject::decode( aName, - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 )); + INetURLObject::DECODE_UNAMBIGUOUS )); sal_Int32 nPos = sDecoded.lastIndexOf( cMarkSeparator ); if( nPos != -1 ) { diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 9e2dc5e0d120..48d2cc2e8934 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5662,7 +5662,7 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType , const SfxItemSet *pOut case style::NumberingType::NUMBER_LOWER_ZH: aType="taiwaneseCountingThousand"; if (pOutSet) { - const SvxLanguageItem rLang = static_cast<const SvxLanguageItem&>( pOutSet->Get( RES_CHRATR_CJK_LANGUAGE,true) ); + const SvxLanguageItem rLang = static_cast<const SvxLanguageItem&>( pOutSet->Get( RES_CHRATR_CJK_LANGUAGE) ); const LanguageType eLang = rLang.GetLanguage(); if (LANGUAGE_CHINESE_SIMPLIFIED == eLang) { diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 72edde6d85f0..4e0c0a2f0ddb 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1298,7 +1298,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, nVal=35; if (pOutSet) { - const SvxLanguageItem rlang = static_cast<const SvxLanguageItem&>(pOutSet->Get(RES_CHRATR_CJK_LANGUAGE,true)); + const SvxLanguageItem rlang = static_cast<const SvxLanguageItem&>(pOutSet->Get(RES_CHRATR_CJK_LANGUAGE)); if (LANGUAGE_CHINESE_SIMPLIFIED == rlang.GetLanguage()) { nVal=39; diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 30187b0f84d9..cf5a3cf43f44 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -204,7 +204,7 @@ static sal_uInt8 GetLevelNFC( sal_uInt16 eNumType, const SfxItemSet *pOutSet) case SVX_NUM_NUMBER_LOWER_ZH: nRet = 35; if ( pOutSet ) { - const SvxLanguageItem rLang = static_cast<const SvxLanguageItem&>( pOutSet->Get( RES_CHRATR_CJK_LANGUAGE,true) ); + const SvxLanguageItem rLang = static_cast<const SvxLanguageItem&>( pOutSet->Get( RES_CHRATR_CJK_LANGUAGE) ); const LanguageType eLang = rLang.GetLanguage(); if (LANGUAGE_CHINESE_SIMPLIFIED ==eLang) { nRet = 39; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index c758c1771318..59f418dbdd79 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -672,7 +672,7 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const // EditEngine Range nWhich = sw::hack::GetSetWhichFromSwDocWhich(*m_pISet, *m_pDoc, nWhich); OSL_ENSURE(nWhich != 0, "All broken, Impossible"); - pItem = &m_pISet->Get(nWhich, true); + pItem = &m_pISet->Get(nWhich); } else if( m_pChpIter ) pItem = &m_pChpIter->GetItem( nWhich ); @@ -1521,7 +1521,7 @@ void WW8_WrtRedlineAuthor::Write( Writer& rWrt ) { WW8Export & rWW8Wrt = *(static_cast<SwWW8Writer&>(rWrt).m_pExport); rWW8Wrt.WriteAsStringTable(maAuthors, rWW8Wrt.pFib->fcSttbfRMark, - rWW8Wrt.pFib->lcbSttbfRMark, 0); + rWW8Wrt.pFib->lcbSttbfRMark); } sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId ) @@ -3283,7 +3283,7 @@ void WW8Export::PrepareStorage() if ( SvtFilterOptions::Get().IsEnableWordPreview() ) { std::shared_ptr<GDIMetaFile> xMetaFile = - pDocShell->GetPreviewMetaFile(false); + pDocShell->GetPreviewMetaFile(); uno::Sequence<sal_uInt8> metaFile( sfx2::convertMetaFile(xMetaFile.get())); sfx2::SaveOlePropertySet(xDocProps, &GetWriter().GetStorage(), &metaFile); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index dd12be46abf5..2041ccce8b3c 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1775,7 +1775,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) { sal_uInt16 nPos = aAttr.GetPos(SVBT16ToShort(pDel + i*2)); if( nPos != SVX_TAB_NOTFOUND ) - aAttr.Remove( nPos, 1 ); + aAttr.Remove( nPos ); } for (short i=0; i < nIns; ++i) @@ -1819,7 +1819,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) sal_uInt16 nPos2 = aAttr.GetPos( nPos ); if (nPos2 != SVX_TAB_NOTFOUND) - aAttr.Remove(nPos2, 1); // Or else Insert() refuses + aAttr.Remove(nPos2); // Or else Insert() refuses aAttr.Insert(aTabStop); } @@ -4913,7 +4913,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos) { SwDocShell * pDocShell = m_rDoc.GetDocShell(); if (pDocShell) - pDocShell->SetReadOnlyUI(true); + pDocShell->SetReadOnlyUI(); } mpCrsr = m_rDoc.CreateUnoCrsr(rPos); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 671615d4aff6..2fccfb5baadc 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -873,7 +873,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); sShellTitle = sOutBackup = rFontHL.GetFamilyName(); - const SvxFontHeightItem& rFontHeightTitle = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich, true )); + const SvxFontHeightItem& rFontHeightTitle = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich )); nTitleHeight = (sal_Int32)rFontHeightTitle.GetHeight(); const sal_uInt16 nFontWhich = sal::static_int_cast< sal_uInt16, RES_CHRATR >( @@ -885,7 +885,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) bListDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); sShellList = sListBackup = rFontLS.GetFamilyName(); - const SvxFontHeightItem& rFontHeightList = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich, true)); + const SvxFontHeightItem& rFontHeightList = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich)); nListHeight = (sal_Int32)rFontHeightList.GetHeight(); bListHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); @@ -894,7 +894,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) const SvxFontItem& rFontCP = !nFontGroup ? pColl->GetFont() : FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); sShellLabel = sCapBackup = rFontCP.GetFamilyName(); - const SvxFontHeightItem& rFontHeightLabel = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich, true)); + const SvxFontHeightItem& rFontHeightLabel = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich)); nLabelHeight = (sal_Int32)rFontHeightLabel.GetHeight(); bLabelHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); @@ -903,7 +903,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) const SvxFontItem& rFontIDX = !nFontGroup ? pColl->GetFont() : FONT_GROUP_CJK == nFontGroup ? pColl->GetCJKFont() : pColl->GetCTLFont(); sShellIndex = sIdxBackup = rFontIDX.GetFamilyName(); - const SvxFontHeightItem& rFontHeightIndex = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich, true)); + const SvxFontHeightItem& rFontHeightIndex = static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr(nFontHeightWhich)); nIndexHeight = (sal_Int32)rFontHeightIndex.GetHeight(); bIndexHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index ffedf522e941..1e5bb2d2384a 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -288,7 +288,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) nFontHeight = SwStdFontConfig::GetDefaultHeightFor( aFontIdPoolId[nIdx], eLanguage ); if(!pColl) pColl = m_pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(aFontIdPoolId[nIdx + 1]); - SvxFontHeightItem aFontHeight( static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich, true ))); + SvxFontHeightItem aFontHeight( static_cast<const SvxFontHeightItem&>(pColl->GetFormatAttr( nFontHeightWhich ))); if(aFontHeight.GetHeight() != sal::static_int_cast<sal_uInt32, sal_Int32>(nFontHeight)) { aFontHeight.SetHeight(nFontHeight); diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index 614b18177c98..f736e6b8c19a 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -852,7 +852,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) if(nEEWhich) { - rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich); + rSet.Put(aEditAttr.Get(nEEWhich), nWhich); if(nEEWhich == EE_CHAR_KERNING) { SfxItemState eState = aEditAttr.GetItemState( EE_CHAR_KERNING, true ); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 2102494000c4..e3eec1c26230 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1385,7 +1385,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) if ( rSh.IsTableMode() ) { SwFrameFormat *pFormat = rSh.GetTableFormat(); - aSet.Put(pFormat->GetFormatAttr( nWhich, true )); + aSet.Put(pFormat->GetFormatAttr( nWhich )); } else if( rSh.IsFrmSelected() ) { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index ed69e7b5b9f9..0cdf83fb1d69 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -450,7 +450,7 @@ void SwXTextDocument::GetNumberFormatter() if ( pDocShell->GetDoc() ) { SvNumberFormatsSupplierObj* pNumFormat = new SvNumberFormatsSupplierObj( - pDocShell->GetDoc()->GetNumberFormatter( true )); + pDocShell->GetDoc()->GetNumberFormatter()); Reference< util::XNumberFormatsSupplier > xTmp = pNumFormat; xNumFormatAgg = Reference< XAggregation >(xTmp, UNO_QUERY); } @@ -471,7 +471,7 @@ void SwXTextDocument::GetNumberFormatter() } OSL_ENSURE(pNumFormat, "No number formatter available"); if (pNumFormat && !pNumFormat->GetNumberFormatter()) - pNumFormat->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter( true )); + pNumFormat->SetNumberFormatter(pDocShell->GetDoc()->GetNumberFormatter()); } } } @@ -922,8 +922,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > & bool bCancel; nResult = (sal_Int32)pUnoCrsr->Find( aSearchOpt, bSearchInNotes, eStart, eEnd, bCancel, - (FindRanges)eRanges, - /*bool bReplace =*/false ); + (FindRanges)eRanges ); } if(nResult || (eRanges&(FND_IN_SELALL|FND_IN_OTHER))) break; @@ -2094,7 +2093,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) break; case WID_DOC_TWO_DIGIT_YEAR: { - aAny <<= static_cast < sal_Int16 > (pDocShell->GetDoc()->GetNumberFormatter ( true )->GetYear2000()); + aAny <<= static_cast < sal_Int16 > (pDocShell->GetDoc()->GetNumberFormatter ()->GetYear2000()); } break; case WID_DOC_AUTOMATIC_CONTROL_FOCUS: @@ -2608,7 +2607,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( // #122919# Force field update before PDF export pViewShell->SwViewShell::UpdateFields(true); if( bStateChanged ) - pRenderDocShell->EnableSetModified( true ); + pRenderDocShell->EnableSetModified(); // there is some redundancy between those two function calls, but right now // there is no time to sort this out. @@ -2626,7 +2625,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( // get number of pages to be rendered - const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false ); + const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect" ); if (bPrintProspect) { SwDoc::CalculatePagePairsForProspectPrinting( *pViewShell->GetLayout(), *m_pRenderData, *m_pPrintUIOptions, nPageCount ); @@ -2687,9 +2686,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( if (!m_pPrintUIOptions) m_pPrintUIOptions = lcl_GetPrintUIOptions( pDocShell, pView ); m_pPrintUIOptions->processProperties( rxOptions ); - const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false ); + const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect" ); const bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport ); - const bool bPrintPaperFromSetup = m_pPrintUIOptions->getBoolValue( "PrintPaperFromSetup", false ); + const bool bPrintPaperFromSetup = m_pPrintUIOptions->getBoolValue( "PrintPaperFromSetup" ); SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport ); OSL_ENSURE( pDoc && pView, "doc or view shell missing!" ); @@ -2957,8 +2956,8 @@ void SAL_CALL SwXTextDocument::render( if (!m_pPrintUIOptions) m_pPrintUIOptions = lcl_GetPrintUIOptions( pDocShell, pView ); m_pPrintUIOptions->processProperties( rxOptions ); - const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false ); - const bool bLastPage = m_pPrintUIOptions->getBoolValue( "IsLastPage", false ); + const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect" ); + const bool bLastPage = m_pPrintUIOptions->getBoolValue( "IsLastPage" ); SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport ); OSL_ENSURE( pDoc && pView, "doc or view shell missing!" ); @@ -3006,7 +3005,7 @@ void SAL_CALL SwXTextDocument::render( if(pVwSh && pOut && m_pRenderData->HasSwPrtOptions()) { const OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() ); - const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage", false ); + const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage" ); bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport ); OSL_ENSURE(( pView->IsA(aSwViewTypeId) && m_pRenderData->IsViewOptionAdjust()) |