diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:53:56 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-09 21:04:23 +0100 |
commit | 34f333445c54c87f3afe777fa467f7a2bb122208 (patch) | |
tree | 542b1f2344c9da43ca33da8afec890acc01e712e /sd | |
parent | b4f38d8b788018b3f88421d72bb82ad3bdeef9e2 (diff) |
loplugin:indentation in sd
Change-Id: I8ce307b8c467ac1e3f19faca1df15a079bc14169
Reviewed-on: https://gerrit.libreoffice.org/67563
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
38 files changed, 372 insertions, 372 deletions
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index c5120a610c00..dc2fa945194e 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -293,7 +293,7 @@ void checkFontAttributes( const SdrTextObj* pObj, ItemValue nVal) void SdExportTest::testTransparentBackground() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/transparent_background.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/transparent_background.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); const SdrPage *pPage = GetPage( 1, xDocShRef ); diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 30d2f1aacefd..630856750799 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1780,7 +1780,7 @@ void SdImportTest::testTdf104445() sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104445.pptx"), PPTX); // First shape should not have bullet - { + { uno::Reference< beans::XPropertySet > xShape(getShapeFromPage(0, 0, xDocShRef)); uno::Reference< text::XText > xText = uno::Reference< text::XTextRange>(xShape, uno::UNO_QUERY)->getText(); CPPUNIT_ASSERT_MESSAGE("Not a text shape", xText.is()); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 6aed664232b5..2d2a6b56523b 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -136,8 +136,8 @@ void SdDrawDocument::CreateLayoutTemplates() XDash aNullDash; XGradient aNullGrad(aNullCol,COL_WHITE); - aNullGrad.SetStartIntens( 100 ); - aNullGrad.SetEndIntens( 100 ); + aNullGrad.SetStartIntens( 100 ); + aNullGrad.SetEndIntens( 100 ); XHatch aNullHatch(aNullCol); // Line attributes (Extended OutputDevice) @@ -245,333 +245,333 @@ void SdDrawDocument::CreateLayoutTemplates() SfxItemSet* pISet = nullptr; // Default > Object without filling -{ - aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aStdName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL ); -} + { + aName = SdResId(STR_POOLSHEET_OBJWITHOUTFILL); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aStdName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHOUTFILL ); + } // Default > Object no fill no line -{ - aName = SdResId(STR_POOLSHEET_OBJNOLINENOFILL); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aStdName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL ); - pISet = &pSheet->GetItemSet(); - - pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); -} + { + aName = SdResId(STR_POOLSHEET_OBJNOLINENOFILL); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aStdName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL ); + pISet = &pSheet->GetItemSet(); + + pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); + } // tdf#94369 // Text OUString aTextName; -{ - aTextName = SdResId(STR_POOLSHEET_TEXT); - pSheet = &(pSSPool->Make(aTextName, SfxStyleFamily::Para, nMask)); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT ); - pISet = &pSheet->GetItemSet(); - aSvxFontItem.SetFamilyName("Noto Sans"); - pISet->Put( aSvxFontItem ); // Noto Sans - pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID)); // solid fill - pISet->Put(XFillColorItem(OUString(), Color(0xeeeeee))); // light gray 5 - pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID)); // solid fill - pISet->Put(XLineColorItem(OUString(), Color(0xcccccc))); // light gray 3 -} + { + aTextName = SdResId(STR_POOLSHEET_TEXT); + pSheet = &(pSSPool->Make(aTextName, SfxStyleFamily::Para, nMask)); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_TEXT ); + pISet = &pSheet->GetItemSet(); + aSvxFontItem.SetFamilyName("Noto Sans"); + pISet->Put( aSvxFontItem ); // Noto Sans + pISet->Put(XFillStyleItem(drawing::FillStyle_SOLID)); // solid fill + pISet->Put(XFillColorItem(OUString(), Color(0xeeeeee))); // light gray 5 + pISet->Put(XLineStyleItem(drawing::LineStyle_SOLID)); // solid fill + pISet->Put(XLineColorItem(OUString(), Color(0xcccccc))); // light gray 3 + } // Text > A4 OUString aA4Name; -{ - aA4Name = SdResId(STR_POOLSHEET_A4); - pSheet = &(pSSPool->Make(aA4Name, SfxStyleFamily::Para, nMask)); - pSheet->SetParent( aTextName ); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4 ); - pISet = &pSheet->GetItemSet(); - pISet->Put(SvxFontHeightItem(635, 100, EE_CHAR_FONTHEIGHT )); // 18 pt - pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); // no filling -} + { + aA4Name = SdResId(STR_POOLSHEET_A4); + pSheet = &(pSSPool->Make(aA4Name, SfxStyleFamily::Para, nMask)); + pSheet->SetParent( aTextName ); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4 ); + pISet = &pSheet->GetItemSet(); + pISet->Put(SvxFontHeightItem(635, 100, EE_CHAR_FONTHEIGHT )); // 18 pt + pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); // no filling + } // Text > A4 > Title -{ + { - aName = SdResId(STR_POOLSHEET_A4_TITLE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent( aA4Name ); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4_TITLE ); - pISet = &pSheet->GetItemSet(); - pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT )); // 44 pt - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border -} + aName = SdResId(STR_POOLSHEET_A4_TITLE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent( aA4Name ); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4_TITLE ); + pISet = &pSheet->GetItemSet(); + pISet->Put(SvxFontHeightItem(1551, 100, EE_CHAR_FONTHEIGHT )); // 44 pt + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border + } // Text > A4 > Headline -{ - aName = SdResId(STR_POOLSHEET_A4_HEADLINE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent( aA4Name ); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4_HEADLINE ); - pISet = &pSheet->GetItemSet(); - pISet->Put(SvxFontHeightItem(847, 100, EE_CHAR_FONTHEIGHT )); // 24 pt - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border -} + { + aName = SdResId(STR_POOLSHEET_A4_HEADLINE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent( aA4Name ); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4_HEADLINE ); + pISet = &pSheet->GetItemSet(); + pISet->Put(SvxFontHeightItem(847, 100, EE_CHAR_FONTHEIGHT )); // 24 pt + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border + } // Text > A4 > Text -{ - aName = SdResId(STR_POOLSHEET_A4_TEXT); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aA4Name); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4_TEXT ); - pISet = &pSheet->GetItemSet(); - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border -} + { + aName = SdResId(STR_POOLSHEET_A4_TEXT); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aA4Name); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A4_TEXT ); + pISet = &pSheet->GetItemSet(); + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border + } // Text > A0 OUString aA0Name; -{ - aA0Name = SdResId(STR_POOLSHEET_A0); - pSheet = &(pSSPool->Make(aA0Name, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aTextName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0 ); - pISet = &pSheet->GetItemSet(); - pISet->Put(SvxFontHeightItem(1692, 100, EE_CHAR_FONTHEIGHT )); // 48 pt - pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); // no filling -} + { + aA0Name = SdResId(STR_POOLSHEET_A0); + pSheet = &(pSSPool->Make(aA0Name, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aTextName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0 ); + pISet = &pSheet->GetItemSet(); + pISet->Put(SvxFontHeightItem(1692, 100, EE_CHAR_FONTHEIGHT )); // 48 pt + pISet->Put(XFillStyleItem(drawing::FillStyle_NONE)); // no filling + } // Text > A0 > Title -{ - aName = SdResId(STR_POOLSHEET_A0_TITLE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aA0Name); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0_TITLE ); - pISet = &pSheet->GetItemSet(); - pISet->Put(SvxFontHeightItem(3385, 100, EE_CHAR_FONTHEIGHT )); // 96 pt - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border -} + { + aName = SdResId(STR_POOLSHEET_A0_TITLE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aA0Name); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0_TITLE ); + pISet = &pSheet->GetItemSet(); + pISet->Put(SvxFontHeightItem(3385, 100, EE_CHAR_FONTHEIGHT )); // 96 pt + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border + } // Text > A0 > Headline -{ - aName = SdResId(STR_POOLSHEET_A0_HEADLINE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aA0Name); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0_HEADLINE ); - pISet = &pSheet->GetItemSet(); - pISet->Put(SvxFontHeightItem(2538, 100, EE_CHAR_FONTHEIGHT )); // 72 pt - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border -} + { + aName = SdResId(STR_POOLSHEET_A0_HEADLINE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aA0Name); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0_HEADLINE ); + pISet = &pSheet->GetItemSet(); + pISet->Put(SvxFontHeightItem(2538, 100, EE_CHAR_FONTHEIGHT )); // 72 pt + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border + } // Text > A0 > Text -{ - aName = SdResId(STR_POOLSHEET_A0_TEXT); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aA0Name); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0_TEXT ); - pISet = &pSheet->GetItemSet(); - pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border -} + { + aName = SdResId(STR_POOLSHEET_A0_TEXT); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aA0Name); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_A0_TEXT ); + pISet = &pSheet->GetItemSet(); + pISet->Put(XLineStyleItem(drawing::LineStyle_NONE)); // no border + } // Graphic OUString aGraphicName; XFillGradientItem aFillGradient; XGradient aGradient; -{ - aGraphicName = SdResId(STR_POOLSHEET_GRAPHIC); - pSheet = &(pSSPool->Make(aGraphicName, SfxStyleFamily::Para, nMask)); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_GRAPHIC ); - pISet = &pSheet->GetItemSet(); - aSvxFontItem.SetFamilyName("Liberation Sans"); // Liberation Sans - pISet->Put( aSvxFontItem ); - pISet->Put( SvxFontHeightItem(635, 100, EE_CHAR_FONTHEIGHT) ); // 18 pt - pISet->Put( XFillStyleItem(drawing::FillStyle_SOLID) ); // solid fill - pISet->Put( XFillColorItem(OUString(), COL_WHITE) ); // filled white + { + aGraphicName = SdResId(STR_POOLSHEET_GRAPHIC); + pSheet = &(pSSPool->Make(aGraphicName, SfxStyleFamily::Para, nMask)); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_GRAPHIC ); + pISet = &pSheet->GetItemSet(); + aSvxFontItem.SetFamilyName("Liberation Sans"); // Liberation Sans + pISet->Put( aSvxFontItem ); + pISet->Put( SvxFontHeightItem(635, 100, EE_CHAR_FONTHEIGHT) ); // 18 pt + pISet->Put( XFillStyleItem(drawing::FillStyle_SOLID) ); // solid fill + pISet->Put( XFillColorItem(OUString(), COL_WHITE) ); // filled white -} + } // Graphic > Shapes OUString aShapesName; -{ - aShapesName = SdResId(STR_POOLSHEET_SHAPES); - pSheet = &(pSSPool->Make(aShapesName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent( aGraphicName ); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_SHAPES); - pISet = &pSheet->GetItemSet(); - pISet->Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); // fill with gradient - aGradient.SetGradientStyle( ::awt::GradientStyle_RECT); // square type - aGradient.SetAngle( 0 ); // 0° angle - aGradient.SetStartColor( Color(0xcccccc) ); // white - aGradient.SetEndColor( COL_WHITE ); // light gray 3 - aFillGradient.SetName( aShapesName ); - aFillGradient.SetGradientValue(aGradient); - pISet->Put( aFillGradient ); - pISet->Put( XLineStyleItem(drawing::LineStyle_NONE) ); // no border - pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt - pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold - } + { + aShapesName = SdResId(STR_POOLSHEET_SHAPES); + pSheet = &(pSSPool->Make(aShapesName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent( aGraphicName ); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_SHAPES); + pISet = &pSheet->GetItemSet(); + pISet->Put(XFillStyleItem(drawing::FillStyle_GRADIENT)); // fill with gradient + aGradient.SetGradientStyle( ::awt::GradientStyle_RECT); // square type + aGradient.SetAngle( 0 ); // 0° angle + aGradient.SetStartColor( Color(0xcccccc) ); // white + aGradient.SetEndColor( COL_WHITE ); // light gray 3 + aFillGradient.SetName( aShapesName ); + aFillGradient.SetGradientValue(aGradient); + pISet->Put( aFillGradient ); + pISet->Put( XLineStyleItem(drawing::LineStyle_NONE) ); // no border + pISet->Put( SvxFontHeightItem(494, 100, EE_CHAR_FONTHEIGHT) ); // 14 pt + pISet->Put( SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT) ); // bold + } // Graphic > Shapes > Filled OUString aFilledName(SdResId(STR_POOLSHEET_FILLED)); -{ - aName = aFilledName; - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED ); - pSheet->SetParent( aShapesName ); - pISet = &pSheet->GetItemSet(); - - aGradient.SetGradientStyle( ::awt::GradientStyle_LINEAR ); - aGradient.SetAngle( 300 ); - aGradient.SetStartColor( COL_WHITE ); // white - aGradient.SetEndColor( Color(0xcccccc) ); // light gray 3 - aFillGradient.SetName( aName ); - aFillGradient.SetGradientValue(aGradient); - pISet->Put( XFillStyleItem(drawing::FillStyle_GRADIENT) ); - pISet->Put( aFillGradient ); -} + { + aName = aFilledName; + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED ); + pSheet->SetParent( aShapesName ); + pISet = &pSheet->GetItemSet(); + + aGradient.SetGradientStyle( ::awt::GradientStyle_LINEAR ); + aGradient.SetAngle( 300 ); + aGradient.SetStartColor( COL_WHITE ); // white + aGradient.SetEndColor( Color(0xcccccc) ); // light gray 3 + aFillGradient.SetName( aName ); + aFillGradient.SetGradientValue(aGradient); + pISet->Put( XFillStyleItem(drawing::FillStyle_GRADIENT) ); + pISet->Put( aFillGradient ); + } // Graphic > Shapes > Filled > Blue -{ - aName =SdResId(STR_POOLSHEET_FILLED_BLUE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aFilledName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_BLUE ); - pISet = &pSheet->GetItemSet(); - - aGradient.SetStartColor( Color(0x00729fcf) ); // light blue 2 - aGradient.SetEndColor( Color(0x00355269) ); // dark blue 2 - aFillGradient.SetName( aName ); - aFillGradient.SetGradientValue(aGradient); - pISet->Put( aFillGradient ); - pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white -} + { + aName =SdResId(STR_POOLSHEET_FILLED_BLUE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aFilledName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_BLUE ); + pISet = &pSheet->GetItemSet(); + + aGradient.SetStartColor( Color(0x00729fcf) ); // light blue 2 + aGradient.SetEndColor( Color(0x00355269) ); // dark blue 2 + aFillGradient.SetName( aName ); + aFillGradient.SetGradientValue(aGradient); + pISet->Put( aFillGradient ); + pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white + } // Graphic > Shapes > Filled > Green -{ - aName =SdResId(STR_POOLSHEET_FILLED_GREEN); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aFilledName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_GREEN ); - pISet = &pSheet->GetItemSet(); - - aGradient.SetStartColor( Color(0x0077bc65) ); // light green 2 - aGradient.SetEndColor( Color(0x00127622) ); // dark green 2 - aFillGradient.SetName( aName ); - aFillGradient.SetGradientValue(aGradient); - pISet->Put( aFillGradient ); - pISet->Put( aSvxFontItem ); // font name - pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white -} + { + aName =SdResId(STR_POOLSHEET_FILLED_GREEN); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aFilledName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_GREEN ); + pISet = &pSheet->GetItemSet(); + + aGradient.SetStartColor( Color(0x0077bc65) ); // light green 2 + aGradient.SetEndColor( Color(0x00127622) ); // dark green 2 + aFillGradient.SetName( aName ); + aFillGradient.SetGradientValue(aGradient); + pISet->Put( aFillGradient ); + pISet->Put( aSvxFontItem ); // font name + pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white + } // Graphic > Shapes > Filled > Red -{ - aName =SdResId(STR_POOLSHEET_FILLED_RED); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aFilledName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_RED ); - pISet = &pSheet->GetItemSet(); - - aGradient.SetStartColor( Color(0x00ff6d6d) ); // light red 2 - aGradient.SetEndColor( Color(0x00c9211e) ); // dark red 2 - aFillGradient.SetName( aName ); - aFillGradient.SetGradientValue(aGradient); - pISet->Put( aFillGradient ); - pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white -} + { + aName =SdResId(STR_POOLSHEET_FILLED_RED); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aFilledName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_RED ); + pISet = &pSheet->GetItemSet(); + + aGradient.SetStartColor( Color(0x00ff6d6d) ); // light red 2 + aGradient.SetEndColor( Color(0x00c9211e) ); // dark red 2 + aFillGradient.SetName( aName ); + aFillGradient.SetGradientValue(aGradient); + pISet->Put( aFillGradient ); + pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white + } // Graphic > Shapes > Filled > Yellow -{ - aName =SdResId(STR_POOLSHEET_FILLED_YELLOW); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aFilledName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_YELLOW ); - pISet = &pSheet->GetItemSet(); - - aGradient.SetStartColor( Color(0x00ffde59) ); // light gold 2 - aGradient.SetEndColor( Color(0x00b47804) ); // dark gold 2 - aFillGradient.SetName( aName ); - aFillGradient.SetGradientValue(aGradient); - pISet->Put( aFillGradient ); - pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white -} + { + aName =SdResId(STR_POOLSHEET_FILLED_YELLOW); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aFilledName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_FILLED_YELLOW ); + pISet = &pSheet->GetItemSet(); + + aGradient.SetStartColor( Color(0x00ffde59) ); // light gold 2 + aGradient.SetEndColor( Color(0x00b47804) ); // dark gold 2 + aFillGradient.SetName( aName ); + aFillGradient.SetGradientValue(aGradient); + pISet->Put( aFillGradient ); + pISet->Put( SvxColorItem(COL_WHITE, EE_CHAR_COLOR )); // font white + } // Graphic > Shapes > Outlines OUString aOutlineName(SdResId(STR_POOLSHEET_OUTLINE)); -{ - aName = aOutlineName; - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE ); - pSheet->SetParent( aShapesName ); - pISet = &pSheet->GetItemSet(); - pISet->Put( XFillStyleItem(drawing::FillStyle_NONE) ); // clear - pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID) ); // solide line - pISet->Put( XLineWidthItem(81) ); // 2.3 pt - pISet->Put( XLineColorItem(OUString(), COL_BLACK) ); // b/w -} + { + aName = aOutlineName; + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE ); + pSheet->SetParent( aShapesName ); + pISet = &pSheet->GetItemSet(); + pISet->Put( XFillStyleItem(drawing::FillStyle_NONE) ); // clear + pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID) ); // solide line + pISet->Put( XLineWidthItem(81) ); // 2.3 pt + pISet->Put( XLineColorItem(OUString(), COL_BLACK) ); // b/w + } // Graphic > Shapes > Outlines > Blue -{ - aName =SdResId(STR_POOLSHEET_OUTLINE_BLUE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aOutlineName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_BLUE ); - pISet = &pSheet->GetItemSet(); - pISet->Put( XLineColorItem(OUString(), Color(0x00355269)) ); // dark blue 2 - pISet->Put( SvxColorItem(Color(0x00355269), EE_CHAR_COLOR )); // font color -} + { + aName =SdResId(STR_POOLSHEET_OUTLINE_BLUE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aOutlineName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_BLUE ); + pISet = &pSheet->GetItemSet(); + pISet->Put( XLineColorItem(OUString(), Color(0x00355269)) ); // dark blue 2 + pISet->Put( SvxColorItem(Color(0x00355269), EE_CHAR_COLOR )); // font color + } // Graphic > Shapes > Outlines > Green -{ - aName =SdResId(STR_POOLSHEET_OUTLINE_GREEN); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aOutlineName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_GREEN ); - pISet = &pSheet->GetItemSet(); - pISet->Put( XLineColorItem(OUString(), Color(0x00127622)) ); // dark green 2 - pISet->Put( SvxColorItem(Color(0x00127622), EE_CHAR_COLOR )); // font color -} + { + aName =SdResId(STR_POOLSHEET_OUTLINE_GREEN); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aOutlineName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_GREEN ); + pISet = &pSheet->GetItemSet(); + pISet->Put( XLineColorItem(OUString(), Color(0x00127622)) ); // dark green 2 + pISet->Put( SvxColorItem(Color(0x00127622), EE_CHAR_COLOR )); // font color + } // Graphic > Shapes > Outlines > Red -{ - aName =SdResId(STR_POOLSHEET_OUTLINE_RED); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aOutlineName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_RED ); - pISet = &pSheet->GetItemSet(); - pISet->Put( XLineColorItem(OUString(), Color(0x00c9211e)) ); // dark red 2 - pISet->Put( SvxColorItem(Color(0x00c9211e), EE_CHAR_COLOR )); // font color -} + { + aName =SdResId(STR_POOLSHEET_OUTLINE_RED); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aOutlineName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_RED ); + pISet = &pSheet->GetItemSet(); + pISet->Put( XLineColorItem(OUString(), Color(0x00c9211e)) ); // dark red 2 + pISet->Put( SvxColorItem(Color(0x00c9211e), EE_CHAR_COLOR )); // font color + } // Graphic > Shapes > Outlines > Yellow -{ - aName =SdResId(STR_POOLSHEET_OUTLINE_YELLOW); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aOutlineName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_YELLOW ); - pISet = &pSheet->GetItemSet(); - pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID)); - pISet->Put( XLineColorItem(OUString(), Color(0x00b47804)) ); // dark gold 2 - pISet->Put( SvxColorItem(Color(0x00b47804), EE_CHAR_COLOR )); // font color -} + { + aName =SdResId(STR_POOLSHEET_OUTLINE_YELLOW); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aOutlineName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OUTLINE_YELLOW ); + pISet = &pSheet->GetItemSet(); + pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID)); + pISet->Put( XLineColorItem(OUString(), Color(0x00b47804)) ); // dark gold 2 + pISet->Put( SvxColorItem(Color(0x00b47804), EE_CHAR_COLOR )); // font color + } // Graphic > Lines OUString aLinesName; -{ - aLinesName = SdResId(STR_POOLSHEET_LINES); - pSheet = &(pSSPool->Make(aLinesName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent( aGraphicName ); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_LINES); - pISet = &pSheet->GetItemSet(); - pISet->Put( XFillStyleItem(drawing::FillStyle_NONE) ); // clear - pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID) ); // solide line - pISet->Put( XLineColorItem(OUString(), COL_BLACK) ); // b/w -} + { + aLinesName = SdResId(STR_POOLSHEET_LINES); + pSheet = &(pSSPool->Make(aLinesName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent( aGraphicName ); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_LINES); + pISet = &pSheet->GetItemSet(); + pISet->Put( XFillStyleItem(drawing::FillStyle_NONE) ); // clear + pISet->Put( XLineStyleItem(drawing::LineStyle_SOLID) ); // solide line + pISet->Put( XLineColorItem(OUString(), COL_BLACK) ); // b/w + } // Graphic > Lines > Measurements -{ - aName = SdResId(STR_POOLSHEET_MEASURE); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aLinesName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE ); - pISet = &pSheet->GetItemSet(); - - ::basegfx::B2DPolygon aArrow; // arrows - aArrow.append(::basegfx::B2DPoint(10.0, 0.0)); - aArrow.append(::basegfx::B2DPoint(0.0, 30.0)); - aArrow.append(::basegfx::B2DPoint(20.0, 30.0)); - aArrow.setClosed(true); - - pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow))); - pISet->Put(XLineStartWidthItem(200)); - pISet->Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow))); - pISet->Put(XLineEndWidthItem(200)); - pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true)); -} + { + aName = SdResId(STR_POOLSHEET_MEASURE); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aLinesName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_MEASURE ); + pISet = &pSheet->GetItemSet(); + + ::basegfx::B2DPolygon aArrow; // arrows + aArrow.append(::basegfx::B2DPoint(10.0, 0.0)); + aArrow.append(::basegfx::B2DPoint(0.0, 30.0)); + aArrow.append(::basegfx::B2DPoint(20.0, 30.0)); + aArrow.setClosed(true); + + pISet->Put(XLineStartItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow))); + pISet->Put(XLineStartWidthItem(200)); + pISet->Put(XLineEndItem(SvxResId(RID_SVXSTR_ARROW),::basegfx::B2DPolyPolygon(aArrow))); + pISet->Put(XLineEndWidthItem(200)); + pISet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true)); + } // Graphic > Lines > Dashed -{ - aName = SdResId(STR_POOLSHEET_LINES_DASHED); - pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); - pSheet->SetParent(aLinesName); - pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_LINES_DASHED ); - pISet = &pSheet->GetItemSet(); - pISet->Put( XLineStyleItem(drawing::LineStyle_DASH) ); // dashed line -} + { + aName = SdResId(STR_POOLSHEET_LINES_DASHED); + pSheet = &(pSSPool->Make(aName, SfxStyleFamily::Para, nMask)); + pSheet->SetParent(aLinesName); + pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_LINES_DASHED ); + pISet = &pSheet->GetItemSet(); + pISet->Put( XLineStyleItem(drawing::LineStyle_DASH) ); // dashed line + } // Generate presentation templates for default layout. OUString aPrefix = SdResId(STR_LAYOUT_DEFAULT_NAME); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1f7d1c07256f..3396c395cc74 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2219,7 +2219,7 @@ SdrObject* SdPage::InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, pUndoManager->AddUndoAction( std::make_unique<UndoObjectUserCall>( *pObj ) ); } - pObj->AdjustToMaxRect(rRect); + pObj->AdjustToMaxRect(rRect); pObj->SetUserCall(this); @@ -2806,7 +2806,7 @@ bool SdPage::checkVisibility( if( ( pObj->GetObjInventor() == SdrInventor::Default ) && ( pObj->GetObjIdentifier() == OBJ_TEXT ) ) { - const SdPage* pCheckPage = dynamic_cast< const SdPage* >(pObj->getSdrPageFromSdrObject()); + const SdPage* pCheckPage = dynamic_cast< const SdPage* >(pObj->getSdrPageFromSdrObject()); if( pCheckPage ) { diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index b33d681b8172..4ff39ddd3947 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -361,10 +361,10 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const aRealStyle = pSheet->GetName(); } - if( aRealStyle.indexOf(aSep) >= 0) - { - aRealStyle = aRealStyle.copy(0,(aRealStyle.indexOf(aSep) + aSep.getLength())); - } + if( aRealStyle.indexOf(aSep) >= 0) + { + aRealStyle = aRealStyle.copy(0,(aRealStyle.indexOf(aSep) + aSep.getLength())); + } } /* now map from the name (specified for country language) to the internal diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 7da772eb2ad2..24a0d6ba31bc 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -1329,8 +1329,8 @@ void PPTWriter::ImplWriteAtomEnding() mpStrm->WriteUInt32( 0 ).WriteUInt32( 0 ).WriteUInt32( 0 ); // skip record header and first entry // write document persist - nPersistEntrys++; - mpStrm->WriteUInt32( 0 ); + nPersistEntrys++; + mpStrm->WriteUInt32( 0 ); // write MasterPages persists for ( i = 0; i < mnMasterPages; i++ ) { diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index e6215a39e158..c6779e9417c0 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -637,9 +637,9 @@ bool PropStateValue::ImplGetPropertyValue( const OUString& rString, bool bGetPro ePropState = css::beans::PropertyState_AMBIGUOUS_VALUE; bool bRetValue = true; #ifdef UNX - css::uno::Reference< css::beans::XPropertySetInfo > + css::uno::Reference< css::beans::XPropertySetInfo > aXPropSetInfo( mXPropSet->getPropertySetInfo() ); - if ( !aXPropSetInfo.is() ) + if ( !aXPropSetInfo.is() ) return false; #endif try diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 59b9d2bca504..d1049bd8256f 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -915,14 +915,14 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n else { const oox::ppt::preset_mapping* p = oox::ppt::preset_mapping::getList(); - while( p->mpStrPresetId && ((p->mnPresetClass != static_cast<sal_Int32>(nAPIPresetClass)) || !rPreset.equalsAscii( p->mpStrPresetId )) ) - p++; + while( p->mpStrPresetId && ((p->mnPresetClass != static_cast<sal_Int32>(nAPIPresetClass)) || !rPreset.equalsAscii( p->mpStrPresetId )) ) + p++; - if( p->mpStrPresetId ) - { - nPresetId = p->mnPresetId; - bPresetId = true; - } + if( p->mpStrPresetId ) + { + nPresetId = p->mnPresetId; + bPresetId = true; + } } return nPresetId; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 178ae1f8c41c..e63c90884e7e 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -1014,9 +1014,9 @@ bool PPTWriterBase::ContainsOtherShapeThanPlaceholders() } else bOtherThanPlaceHolders = true; + } + SAL_INFO("sd.eppt", "mType == " << mType); } - SAL_INFO("sd.eppt", "mType == " << mType); - } return bOtherThanPlaceHolders; } diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index b8e24a39f9d8..f5d95d9e5079 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -2564,7 +2564,7 @@ void AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rT break; } - pChildAtom = Atom::findNextChildAtom( pChildAtom ); + pChildAtom = Atom::findNextChildAtom( pChildAtom ); } } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index ce310215752f..d52da42fd1ab 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -808,7 +808,7 @@ sal_Int32 SAL_CALL AccessibleDocumentViewBase::getForeground( ) sal_Int32 SAL_CALL AccessibleDocumentViewBase::getBackground( ) { - ThrowIfDisposed (); + ThrowIfDisposed (); ::osl::MutexGuard aGuard (maMutex); return sal_Int32(mpViewShell->GetView()->getColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor); } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index bb55af18a6f3..f86604ca3775 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -711,10 +711,10 @@ void AccessibleDrawDocumentView::Activated() } else ResetState (AccessibleStateType::FOCUSED); - mpChildrenManager->UpdateSelection(); - // if the child gets focus in UpdateSelection(), needs to reset the focus on document. - if (mpChildrenManager->HasFocus() && bChange) - ResetState (AccessibleStateType::FOCUSED); + mpChildrenManager->UpdateSelection(); + // if the child gets focus in UpdateSelection(), needs to reset the focus on document. + if (mpChildrenManager->HasFocus() && bChange) + ResetState (AccessibleStateType::FOCUSED); } } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 3c0193e5c552..ef6b37566a0c 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -663,7 +663,7 @@ void AccessibleSlideSorterView::Implementation::UpdateChildren() //By default, all children should be accessible. So here workaround is to make all children visible. // MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?! // In the IA2 CWS, also setting mnFirst/LastVisibleChild was commented out! - mnLastVisibleChild = maPageObjects.size(); + mnLastVisibleChild = maPageObjects.size(); if (mbModelChangeLocked) { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 0c365ee9afc1..f91bf1a547ee 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2112,9 +2112,9 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) pEffectSequence->remove( pEffect ); } - createPath( ePathKind, aTargets, 0.0 ); - updateMotionPathTags(); - return; + createPath( ePathKind, aTargets, 0.0 ); + updateMotionPathTags(); + return; } CustomAnimationPresetPtr pDescriptor(*pPreset); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 663c2360618d..fe32441114af 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -356,7 +356,7 @@ bool AnnotationTag::Command( const CommandEvent& rCEvt ) if( pWindow ) { ::tools::Rectangle aContextRect(rCEvt.GetMousePosPixel(),Size(1,1)); - mrManager.ExecuteAnnotationContextMenu( mxAnnotation, pWindow, aContextRect ); + mrManager.ExecuteAnnotationContextMenu( mxAnnotation, pWindow, aContextRect ); return true; } } diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 29d21d46e301..69a03e0712ef 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -535,7 +535,7 @@ void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotatio if( !sMeta.isEmpty() ) sMeta += "\n"; - sMeta += sDateTime; + sMeta += sDateTime; } mpMeta->SetText(sMeta); } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 8f9dbdf3cae0..476e4192d549 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -275,7 +275,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Recta } // FIXME: draw bluetooth or wifi icon - Point aPos(rRect.TopLeft()); + Point aPos(rRect.TopLeft()); // Setup fonts vcl::Font aStdFont(rRenderContext.GetFont()); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 7ef07aaa7ea9..d06ec0fe70b6 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -604,7 +604,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs->Clear(); // delete list of DocInfos - maDocList.clear(); + maDocList.clear(); if( mbDocImported ) maLbDocs->InsertEntry( aStr, 0 ); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index b6eb3583cbcc..feb8f507dcb9 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -180,7 +180,7 @@ SdParagraphDlg::SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) else RemoveTabPage( "labelNUMBERING" ); - AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); + AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } void SdParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage) diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 3c4fcf4bb147..bbaa961a16eb 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -232,7 +232,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation ( ResourceActivationMode eMode) { ::osl::MutexGuard aGuard (maMutex); - ThrowIfDisposed(); + ThrowIfDisposed(); // Check whether we are being disposed. This is handled differently // then being completely disposed because the first thing disposing() diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 8bc71472a6e7..9657957d9ed2 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -105,11 +105,11 @@ void ConfigurationControllerResourceManager::ActivateResource ( const Reference<XResourceId>& rxResourceId, const Reference<XConfiguration>& rxConfiguration) { - if ( ! rxResourceId.is()) - { + if ( ! rxResourceId.is()) + { OSL_ASSERT(rxResourceId.is()); return; - } + } SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": activating resource " << FrameworkHelper::ResourceIdToString(rxResourceId)); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 81988e00a351..30619d2a303a 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1354,7 +1354,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { } #endif - bAnimated = true; + bAnimated = true; } break; @@ -1387,7 +1387,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { &aUrl, &aBrowsing }); } - bAnimated = true; + bAnimated = true; } break; diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx index cc0036aa8251..72f27e98a200 100644 --- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx +++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx @@ -180,26 +180,26 @@ void AvahiNetworkService::setup() { } #endif - int error = 0; - avahiService = this; - if (!(threaded_poll = avahi_threaded_poll_new())) { + int error = 0; + avahiService = this; + if (!(threaded_poll = avahi_threaded_poll_new())) { SAL_WARN("sdremote.wifi", "avahi_threaded_poll_new '" << avahiService->getName() << "' failed"); return; - } + } - if (!(client = avahi_client_new(avahi_threaded_poll_get(threaded_poll), static_cast<AvahiClientFlags>(0), client_callback, nullptr, &error))) { + if (!(client = avahi_client_new(avahi_threaded_poll_get(threaded_poll), static_cast<AvahiClientFlags>(0), client_callback, nullptr, &error))) { SAL_WARN("sdremote.wifi", "avahi_client_new failed"); return; - } + } - if(!create_services(client)) + if(!create_services(client)) return; - /* Finally, start the event loop thread */ - if (avahi_threaded_poll_start(threaded_poll) < 0) { + /* Finally, start the event loop thread */ + if (avahi_threaded_poll_start(threaded_poll) < 0) { SAL_WARN("sdremote.wifi", "avahi_threaded_poll_start failed"); return; - } + } } void AvahiNetworkService::clear() { diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index a23df8fade0e..a0067eaa14a6 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -72,7 +72,7 @@ DiscoveryService::~DiscoveryService() #endif } - if (zService) + if (zService) zService->clear(); } diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 704558ab7366..a4cc985595ff 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -285,7 +285,7 @@ bool RemoteServer::connectClient( const std::shared_ptr< ClientInfo >& pClient, Reference<XSingleServiceFactory> xChildFactory ( xConfig, UNO_QUERY); Reference<XNameReplace> xChild( xChildFactory->createInstance(), UNO_QUERY); - Any aValue; + Any aValue; if (xChild.is()) { // Check whether the client is already saved diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index c4eed2a1ee42..215793b95489 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -269,14 +269,14 @@ void DocumentHelper::ProvideStyles ( if( !aCreatedStyles.empty() ) { SfxUndoManager* pUndoManager = rTargetDocument.GetDocSh()->GetUndoManager(); - if (pUndoManager != nullptr) - { - pUndoManager->AddUndoAction ( + if (pUndoManager != nullptr) + { + pUndoManager->AddUndoAction ( std::make_unique<SdMoveStyleSheetsUndoAction>( &rTargetDocument, aCreatedStyles, true)); - } + } } } diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index f07235d16021..8151a4f6918c 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -114,18 +114,18 @@ const Image& MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize { mpPreviewProvider = rDescriptor.mpPreviewProvider; bPreviewChanged = true; - } + } - if (mnTemplateIndex<0 && rDescriptor.mnTemplateIndex>=0) - { + if (mnTemplateIndex<0 && rDescriptor.mnTemplateIndex>=0) + { mnTemplateIndex = rDescriptor.mnTemplateIndex; bIndexChanged = true; - } + } // Prepare the list of event types that will be returned. - ::std::unique_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > pResult; - if (bDataChanged || bIndexChanged || bPreviewChanged) - { + ::std::unique_ptr<std::vector<MasterPageContainerChangeEvent::EventType> > pResult; + if (bDataChanged || bIndexChanged || bPreviewChanged) + { pResult.reset(new std::vector<MasterPageContainerChangeEvent::EventType>); if (bDataChanged) pResult->push_back(MasterPageContainerChangeEvent::EventType::DATA_CHANGED); @@ -133,9 +133,9 @@ const Image& MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize pResult->push_back(MasterPageContainerChangeEvent::EventType::INDEX_CHANGED); if (bPreviewChanged) pResult->push_back(MasterPageContainerChangeEvent::EventType::PREVIEW_CHANGED); - } + } - return pResult; + return pResult; } int MasterPageDescriptor::UpdatePageObject ( diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 153edd8a28a8..9af16e40e4a6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -423,7 +423,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) { rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( mpViewShell->GetViewShellBase() ) ); - if( xSlideShow.is() ) + if( xSlideShow.is() ) { AddWindowToPaintView(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index cddf9e40ba6d..330e37b24c6c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -316,7 +316,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X } else { - Reference< animations::XAnimationNodeSupplier > xAnimNodeSupplier( xSlide, UNO_QUERY_THROW ); + Reference< animations::XAnimationNodeSupplier > xAnimNodeSupplier( xSlide, UNO_QUERY_THROW ); xAnimNode = xAnimNodeSupplier->getAnimationNode(); } @@ -2149,7 +2149,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool ) else if (sMenuId == "erase") { setEraseAllInk(true); - mbWasPaused = false; + mbWasPaused = false; } else if (sMenuId == "pen") { diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 9f7c5c59f8f9..3f851b76e508 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -113,7 +113,7 @@ void RequestQueue::AddRequest ( #if OSL_DEBUG_LEVEL >=2 bool bRemoved = #endif - RemoveRequest(aKey); + RemoveRequest(aKey); // The priority of the request inside its priority class is defined by // the page number. This ensures a strict top-to-bottom, left-to-right diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index e9bb8eb97b32..0875ba1c981d 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -831,7 +831,7 @@ void SlotManager::GetStatusBarState (SfxItemSet& rSet) if(nPageCount != nActivePageCount) aPageStr = aPageStr.replaceFirst("%3", OUString::number(nActivePageCount)); } - rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) ); + rSet.Put( SfxStringItem( SID_STATUS_PAGE, aPageStr ) ); } //Set layout if (nSelectedPages == 1 && pPage != nullptr) diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 678c9d474616..5006a49a2f59 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1407,7 +1407,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property aSeq.realloc( nSeqIndex ); aAny <<= aSeq; - break; + break; } case WID_MODEL_INTEROPGRABBAG: getGrabBagItem(aAny); @@ -2191,10 +2191,10 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if( xShapes.is() && xShapes->getCount() ) { - SdrPageView* pPV = nullptr; + SdrPageView* pPV = nullptr; - ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(), - pOldSdView ? pOldSdView->GetSdrPageView() : nullptr, pPDFExtOutDevData ); + ImplRenderPaintProc aImplRenderPaintProc( mpDoc->GetLayerAdmin(), + pOldSdView ? pOldSdView->GetSdrPageView() : nullptr, pPDFExtOutDevData ); for( sal_uInt32 i = 0, nCount = xShapes->getCount(); i < nCount; i++ ) { diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 691c1a7eb787..d7bf382f5ec3 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1982,7 +1982,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, SdResId(STR_WARN_NAME_DUPLICATE))); - xWarn->run(); + xWarn->run(); } else bLoop = false; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 5261ff37d6d2..48659c094ddf 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -617,7 +617,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) if ( pBullets ) { sal_uInt16 nBulIndex = pBullets->GetNBOIndexForNumRule(*pNumRule,nActNumLvl); - rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX,nBulIndex)); + rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX,nBulIndex)); } }else { @@ -625,7 +625,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) if ( pNumbering ) { sal_uInt16 nBulIndex = pNumbering->GetNBOIndexForNumRule(*pNumRule,nActNumLvl); - rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX,nBulIndex)); + rSet.Put(SfxUInt16Item(FN_NUM_NUM_RULE_INDEX,nBulIndex)); } } } diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 32ead7b49988..743b00a104a4 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -706,7 +706,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner::DepthChangeHdlParam, aParam // before we set the style sheet we need to preserve the bullet item // since all items will be deleted while setting a new style sheet - SfxItemSet aOldAttrs( pOutliner->GetParaAttribs( nPara ) ); + SfxItemSet aOldAttrs( pOutliner->GetParaAttribs( nPara ) ); pOutliner->SetStyleSheet( nPara, pStyleSheet ); @@ -1227,7 +1227,7 @@ void OutlineView::SetActualPage( SdPage const * pActual ) */ SfxStyleSheet* OutlineView::GetStyleSheet() const { - ::sd::Window* pActWin = mrOutlineViewShell.GetActiveWindow(); + ::sd::Window* pActWin = mrOutlineViewShell.GetActiveWindow(); OutlinerView* pOlView = GetViewByWindow(pActWin); SfxStyleSheet* pResult = pOlView->GetStyleSheet(); return pResult; diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 392c709c5890..6c80320db1b1 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -854,7 +854,7 @@ void View::SetMarkedOriginalSize() { // TODO/LEAN: working with VisualArea can switch object to running state - sal_Int64 nAspect = static_cast<SdrOle2Obj*>(pObj)->GetAspect(); + sal_Int64 nAspect = static_cast<SdrOle2Obj*>(pObj)->GetAspect(); Size aOleSize; if ( nAspect == embed::Aspects::MSOLE_ICON ) diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 0db3d07f7dd6..3c96e5abd9a8 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1445,7 +1445,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if( pOLV ) { ::tools::Rectangle aRect( pOLV->GetOutputArea() ); - Point aPos( pOLV->GetWindow()->PixelToLogic( maDropPos ) ); + Point aPos( pOLV->GetWindow()->PixelToLogic( maDropPos ) ); if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index b82e3413f717..af7c753836c7 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -78,7 +78,7 @@ void ModifyPageUndoAction::Undo() { // invalidate Selection, there could be objects deleted in this UNDO // which are no longer allowed to be selected then. - SdrViewIter aIter(mpPage); + SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); while(pView) @@ -121,7 +121,7 @@ void ModifyPageUndoAction::Redo() { // invalidate Selection, there could be objects deleted in this UNDO // which are no longer allowed to be selected then. - SdrViewIter aIter(mpPage); + SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); while(pView) |