[Libreoffice-commits] core.git: 2 commits - scaddins/source sc/inc sc/qa scripting/source sc/source sdext/source sd/qa sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 9 20:04:45 UTC 2019
sc/inc/bigrange.hxx | 4
sc/qa/extras/macros-test.cxx | 2
sc/qa/unit/opencl-test.cxx | 2
sc/source/core/data/dpgroup.cxx | 4
sc/source/core/data/dpobject.cxx | 6
sc/source/core/data/dptabres.cxx | 26
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/drwlayer.cxx | 2
sc/source/core/data/table6.cxx | 2
sc/source/core/opencl/op_array.cxx | 72 -
sc/source/core/opencl/op_database.cxx | 164 +-
sc/source/core/opencl/op_financial.cxx | 40
sc/source/core/opencl/op_math.cxx | 50
sc/source/core/opencl/op_statistical.cxx | 164 +-
sc/source/core/tool/appoptio.cxx | 2
sc/source/core/tool/interpr5.cxx | 4
sc/source/core/tool/interpr8.cxx | 2
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xestream.cxx | 4
sc/source/filter/excel/xetable.cxx | 8
sc/source/filter/lotus/lotform.cxx | 4
sc/source/filter/oox/richstring.cxx | 2
sc/source/filter/oox/workbookfragment.cxx | 26
sc/source/filter/rtf/eeimpars.cxx | 8
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/filter/xml/xmldrani.hxx | 6
sc/source/filter/xml/xmlstyle.cxx | 8
sc/source/filter/xml/xmltabi.cxx | 2
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 2
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 4
sc/source/ui/Accessibility/AccessibleDocument.cxx | 26
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 6
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 2
sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 2
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 4
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 8
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 2
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 52
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/filtdlg.cxx | 6
sc/source/ui/dbgui/pfiltdlg.cxx | 4
sc/source/ui/dbgui/sfiltdlg.cxx | 42
sc/source/ui/docshell/dbdocimp.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 4
sc/source/ui/docshell/olinefun.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/navipi/content.cxx | 12
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 4
sc/source/ui/unoobj/dapiuno.cxx | 4
sc/source/ui/unoobj/datauno.cxx | 2
sc/source/ui/vba/vbaapplication.cxx | 38
sc/source/ui/vba/vbachart.cxx | 18
sc/source/ui/vba/vbacomment.cxx | 2
sc/source/ui/vba/vbaformatcondition.cxx | 2
sc/source/ui/vba/vbaoleobjects.cxx | 12
sc/source/ui/vba/vbarange.cxx | 266 ++--
sc/source/ui/vba/vbavalidation.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 22
sc/source/ui/vba/vbaworksheets.cxx | 8
sc/source/ui/view/drawvie4.cxx | 2
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/gridwin.cxx | 2
sc/source/ui/view/output2.cxx | 4
sc/source/ui/view/preview.cxx | 16
sc/source/ui/view/tabvwsh4.cxx | 4
sc/source/ui/view/tabvwshg.cxx | 2
sc/source/ui/view/viewfun3.cxx | 2
scaddins/source/analysis/analysishelper.cxx | 8
scripting/source/vbaevents/eventhelper.cxx | 2
sd/qa/unit/export-tests.cxx | 2
sd/qa/unit/import-tests.cxx | 2
sd/source/core/drawdoc4.cxx | 574 +++++-----
sd/source/core/sdpage.cxx | 4
sd/source/core/stlsheet.cxx | 8
sd/source/filter/eppt/eppt.cxx | 4
sd/source/filter/eppt/epptso.cxx | 4
sd/source/filter/eppt/pptexanimations.cxx | 14
sd/source/filter/eppt/pptx-epptbase.cxx | 4
sd/source/filter/ppt/pptinanimations.cxx | 2
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 8
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 6
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/paragr.cxx | 2
sd/source/ui/framework/configuration/ConfigurationController.cxx | 2
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx | 6
sd/source/ui/func/fusel.cxx | 4
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 20
sd/source/ui/remotecontrol/DiscoveryService.cxx | 2
sd/source/ui/remotecontrol/Server.cxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 8
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 18
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 8
sd/source/ui/view/drviews2.cxx | 2
sd/source/ui/view/drviewsf.cxx | 4
sd/source/ui/view/outlview.cxx | 4
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/sdview3.cxx | 2
sd/source/ui/view/unmodpg.cxx | 4
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 10
sdext/source/pdfimport/tree/style.cxx | 2
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 2
sdext/source/presenter/PresenterProtocolHandler.cxx | 2
sdext/source/presenter/PresenterSlideShowView.cxx | 2
sdext/source/presenter/PresenterSlideSorter.cxx | 4
sdext/source/presenter/PresenterTheme.cxx | 8
sdext/source/presenter/PresenterToolBar.cxx | 2
sdext/source/presenter/PresenterWindowManager.cxx | 2
122 files changed, 1009 insertions(+), 1009 deletions(-)
New commits:
commit 34f333445c54c87f3afe777fa467f7a2bb122208
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:53:56 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 21:04:23 2019 +0100
loplugin:indentation in sd
Change-Id: I8ce307b8c467ac1e3f19faca1df15a079bc14169
Reviewed-on: https://gerrit.libreoffice.org/67563
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 787c99bd3dd8..40cfd180fb71 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -948,10 +948,10 @@ OUString GetString( double f, bool bLeadingSign, sal_uInt16 nMaxDig )
sal_Char aBuff[ nBuff + 1 ];
const char* pFormStr = bLeadingSign? "%+.*g" : "%.*g";
int nLen = snprintf( aBuff, nBuff, pFormStr, int( nMaxDig ), f );
- // you never know which underlying implementation you get ...
- aBuff[nBuff] = 0;
- if ( nLen < 0 || nLen > nBuff )
- nLen = strlen( aBuff );
+ // you never know which underlying implementation you get ...
+ aBuff[nBuff] = 0;
+ if ( nLen < 0 || nLen > nBuff )
+ nLen = strlen( aBuff );
OUString aRet( aBuff, nLen, RTL_TEXTENCODING_MS_1252 );
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index c0859edfaa4e..405ad6b4747b 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -577,7 +577,7 @@ public:
}
}
OPropertyContainer::setFastPropertyValue( nHandle, rValue );
- if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
+ if ( nHandle == EVENTLSTNR_PROPERTY_ID_MODEL )
setShellFromModel();
}
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)
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index b50a80a2ff48..ceedace97f6a 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -615,8 +615,8 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< std::unique_pt
// move element to current paragraph
- if (! pCurPara ) // new paragraph, insert one
- {
+ if (! pCurPara ) // new paragraph, insert one
+ {
pCurPara = ElementFactory::createParagraphElement( nullptr );
// set parent
pCurPara->Parent = &elem;
@@ -627,7 +627,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< std::unique_pt
// update next_element which is now invalid
next_page_element = page_element;
++ next_page_element;
- }
+ }
Element* pCurEle = page_element->get();
Element::setParent( page_element, pCurPara );
OSL_ENSURE( !pText || pCurEle == pText || pCurEle == pLink, "paragraph child list in disorder" );
@@ -709,9 +709,9 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
{
pCur->updateGeometryWith( pNext );
// append text to current element
- pCur->Text.append( pNext->Text );
+ pCur->Text.append( pNext->Text );
- str = pCur->Text.getStr();
+ str = pCur->Text.getStr();
for(int i=0; i< str.getLength(); i++)
{
sal_Int16 nType = GetBreakIterator()->getScriptType( str, i );
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index b00920a62f93..dd4afd89579b 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -189,7 +189,7 @@ void StyleContainer::impl_emitStyle( sal_Int32 nStyleId,
if( it != m_aIdToStyle.end() )
{
const HashedStyle& rStyle = it->second.style;
- PropertyMap aProps( rStyle.Properties );
+ PropertyMap aProps( rStyle.Properties );
if( !rStyle.IsSubStyle )
aProps[ "style:name" ] = getStyleName( nStyleId );
if (rStyle.Name == "draw:stroke-dash")
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index b0a6ac41ba94..5b1e13c909c2 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
for (int j = k; j < argc; ++j)
argv[j] = argv[j+2];
}
- ++k;
+ ++k;
}
// read config file
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 6311f322cbce..150e54755028 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -547,7 +547,7 @@ bool GotoNextEffectCommand::IsEnabled() const
if ( ! mpPresenterController->GetSlideShowController().is())
return false;
- return ( mpPresenterController->GetSlideShowController()->getNextSlideIndex() < mpPresenterController->GetSlideShowController()->getSlideCount() );
+ return ( mpPresenterController->GetSlideShowController()->getNextSlideIndex() < mpPresenterController->GetSlideShowController()->getSlideCount() );
}
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 55606ad9b9e9..e6988c25fb6c 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -110,7 +110,7 @@ void PresenterSlideShowView::LateInit()
if (xCC.is())
{
- mxTopPane.set(xCC->getResource(mxViewId->getAnchor()->getAnchor()), UNO_QUERY);
+ mxTopPane.set(xCC->getResource(mxViewId->getAnchor()->getAnchor()), UNO_QUERY);
Reference<XPane> xPane (xCC->getResource(mxViewId->getAnchor()), UNO_QUERY_THROW);
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index ad07a02b4b27..95db3970d6e5 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -921,7 +921,7 @@ void PresenterSlideSorter::PaintPreview (
nullptr,
Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
- rxCanvas->drawBitmap(xAnimationIcon, aViewState, aAnimationRenderState);
+ rxCanvas->drawBitmap(xAnimationIcon, aViewState, aAnimationRenderState);
}
if( bTransition )
{
@@ -935,7 +935,7 @@ void PresenterSlideSorter::PaintPreview (
nullptr,
Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
- rxCanvas->drawBitmap(xTransitionIcon, aViewState, aTransitionRenderState);
+ rxCanvas->drawBitmap(xTransitionIcon, aViewState, aTransitionRenderState);
}
}
}
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index bb80862ebc30..f7189e27add0 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -745,8 +745,8 @@ std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
std::shared_ptr<PresenterTheme::Theme> pTheme;
OUString sCurrentThemeName (rsThemeName);
- if (sCurrentThemeName.isEmpty())
- {
+ if (sCurrentThemeName.isEmpty())
+ {
// No theme name given. Look up the CurrentTheme property.
rConfiguration.GetConfigurationNode("Presenter/CurrentTheme") >>= sCurrentThemeName;
if (sCurrentThemeName.isEmpty())
@@ -754,7 +754,7 @@ std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
// Still no name. Use "DefaultTheme".
sCurrentThemeName = "DefaultTheme";
}
- }
+ }
Reference<container::XNameAccess> xThemes (
rConfiguration.GetConfigurationNode("Presenter/Themes"),
@@ -765,7 +765,7 @@ std::shared_ptr<PresenterTheme::Theme> ReadContext::ReadTheme (
Sequence<OUString> aKeys (xThemes->getElementNames());
for (sal_Int32 nItemIndex=0; nItemIndex < aKeys.getLength(); ++nItemIndex)
{
- const OUString& rsKey (aKeys[nItemIndex]);
+ const OUString& rsKey (aKeys[nItemIndex]);
Reference<container::XHierarchicalNameAccess> xTheme (
xThemes->getByName(rsKey), UNO_QUERY);
if (xTheme.is())
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 37e5bc3a3da1..c20ece60019d 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1679,7 +1679,7 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv
if (mpFont->mxFont.is())
{
rendering::StringContext aContext (msText, 0, msText.getLength());
- Reference<rendering::XTextLayout> xLayout (
+ Reference<rendering::XTextLayout> xLayout (
mpFont->mxFont->createTextLayout(
aContext,
rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 212e0da6d4c6..4e3e7b72e6bb 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -631,7 +631,7 @@ void PresenterWindowManager::LayoutStandardMode()
aNextSlideOuterBox.Height);
}
- LayoutToolBar();
+ LayoutToolBar();
}
void PresenterWindowManager::LayoutNotesMode()
commit b4f38d8b788018b3f88421d72bb82ad3bdeef9e2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 8 13:53:20 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 9 21:04:10 2019 +0100
loplugin:indentation in sc
Change-Id: Ieafabbafde456edba5adbe1fd587c32f04aedb98
Reviewed-on: https://gerrit.libreoffice.org/67562
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index ab9d91659d1d..fef2443b1461 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -125,12 +125,12 @@ public:
void Set( sal_Int32 nCol1, sal_Int32 nRow1, sal_Int32 nTab1,
sal_Int32 nCol2, sal_Int32 nRow2, sal_Int32 nTab2 )
{ aStart.Set( nCol1, nRow1, nTab1 );
- aEnd.Set( nCol2, nRow2, nTab2 ); }
+ aEnd.Set( nCol2, nRow2, nTab2 ); }
void GetVars( sal_Int32& nCol1, sal_Int32& nRow1, sal_Int32& nTab1,
sal_Int32& nCol2, sal_Int32& nRow2, sal_Int32& nTab2 ) const
{ aStart.GetVars( nCol1, nRow1, nTab1 );
- aEnd.GetVars( nCol2, nRow2, nTab2 ); }
+ aEnd.GetVars( nCol2, nRow2, nTab2 ); }
bool IsValid( const ScDocument* pDoc ) const
{ return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); }
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index de4f00ca8f95..596e70fe6ce7 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -141,7 +141,7 @@ void ScMacrosTest::testPasswordProtectedStarBasic()
// far big method tdf#94617
- SfxObjectShell::CallXScript(
+ SfxObjectShell::CallXScript(
xComponent,
"vnd.sun.Star.script:MyLibrary.BigModule.farBigMethod?language=Basic&location=document",
aParams, aRet, aOutParamIndex, aOutParam);
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 79cf3ab8fb69..2cb7667751cf 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -1889,7 +1889,7 @@ void ScOpenCLTest::testFinacialXNPVFormula()
CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
}
- for (SCROW i = 16; i <= 26; ++i)
+ for (SCROW i = 16; i <= 26; ++i)
{
double fLibre = rDoc.GetValue(ScAddress(3, i, 0));
double fExcel = rDocRes.GetValue(ScAddress(3, i, 0));
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 37d184a07e41..34fc1a0e0259 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -1012,8 +1012,8 @@ long ScDPGroupTableData::GetSourceDim( long nDim )
return nSourceCount;
if ( nDim >= nSourceCount && nDim < nSourceCount +static_cast<long>(aGroups.size()) )
{
- const ScDPGroupDimension& rGroupDim = aGroups[nDim - nSourceCount];
- return rGroupDim.GetSourceDim();
+ const ScDPGroupDimension& rGroupDim = aGroups[nDim - nSourceCount];
+ return rGroupDim.GetSourceDim();
}
return nDim;
}
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 24ff05b2df16..4f83e326b87f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -3573,11 +3573,11 @@ bool ScDPCollection::GetReferenceGroups(const ScDPObject& rDPObj, const ScDPDime
if (!pRefDesc->HasRangeName())
continue;
- if (pDesc->GetRangeName() == pRefDesc->GetRangeName())
- {
+ if (pDesc->GetRangeName() == pRefDesc->GetRangeName())
+ {
*pGroups = rRefObj.GetSaveData()->GetExistingDimensionData();
return true;
- }
+ }
}
else
{
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index c1ac4eb130d7..357ab98fbeac 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -241,10 +241,10 @@ bool ScDPColMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex2 ) con
{
const ScDPDataMember* pDataMember1 = rDimension.GetMember(nIndex1);
const ScDPDataMember* pDataMember2 = rDimension.GetMember(nIndex2);
- bool bHide1 = pDataMember1 && !pDataMember1->IsVisible();
- bool bHide2 = pDataMember2 && !pDataMember2->IsVisible();
- if ( bHide1 || bHide2 )
- return !bHide1;
+ bool bHide1 = pDataMember1 && !pDataMember1->IsVisible();
+ bool bHide2 = pDataMember2 && !pDataMember2->IsVisible();
+ if ( bHide1 || bHide2 )
+ return !bHide1;
return lcl_IsLess( pDataMember1, pDataMember2, nMeasure, bAscending );
}
@@ -975,7 +975,7 @@ ScDPResultMember::~ScDPResultMember()
OUString ScDPResultMember::GetName() const
{
- const ScDPMember* pMemberDesc = GetDPMember();
+ const ScDPMember* pMemberDesc = GetDPMember();
if (pMemberDesc)
return pMemberDesc->GetNameStr( false );
else
@@ -1056,10 +1056,10 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect
{
if ( ppDim[nPos]->getIsDataLayoutDimension() )
{
- if ( !pChildDimension )
- pChildDimension.reset( new ScDPResultDimension( pResultData ) );
- pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState , false );
- return;
+ if ( !pChildDimension )
+ pChildDimension.reset( new ScDPResultDimension( pResultData ) );
+ pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState , false );
+ return;
}
else
{ //find next dim
@@ -1227,7 +1227,7 @@ long ScDPResultMember::GetSubTotalCount( long* pUserSubStart ) const
if ( pUserSubStart )
*pUserSubStart = 0; // default
- const ScDPLevel* pParentLevel = GetParentLevel();
+ const ScDPLevel* pParentLevel = GetParentLevel();
if ( bForceSubTotal ) // set if needed for root members
return 1; // grand total is always "automatic"
@@ -2775,7 +2775,7 @@ ScDPResultMember *ScDPResultDimension::FindMember( SCROW iData ) const
MemberHash::const_iterator aRes = maMemberHash.find( iData );
if( aRes != maMemberHash.end()) {
- if ( aRes->second->IsNamedItem( iData ) )
+ if ( aRes->second->IsNamedItem( iData ) )
return aRes->second;
OSL_FAIL("problem! hash result is not the same as IsNamedItem");
}
@@ -3968,8 +3968,8 @@ size_t ScDPResultVisibilityData::MemberHash::operator() (const ScDPItemData& r)
}
SCROW ScDPResultMember::GetDataId( ) const
{
- const ScDPMember* pMemberDesc = GetDPMember();
- if (pMemberDesc)
+ const ScDPMember* pMemberDesc = GetDPMember();
+ if (pMemberDesc)
return pMemberDesc->GetItemDataId();
return -1;
}
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 4acd3720274c..e456e3b8136a 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2523,7 +2523,7 @@ sal_Int32 ScDPMember::Compare( const ScDPMember& rOther ) const
}
// no positions set - compare names
- return pSource->GetData()->Compare( pSource->GetSourceDim(nDim),mnDataId,rOther.GetItemDataId());
+ return pSource->GetData()->Compare( pSource->GetSourceDim(nDim),mnDataId,rOther.GetItemDataId());
}
ScDPItemData ScDPMember::FillItemData() const
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 162211e59074..251c76905a14 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1094,7 +1094,7 @@ bool ScDrawLayer::GetPrintArea( ScRange& rRange, bool bSetHor, bool bSetVer ) co
{
nStartX = 0;
SCCOL nStartCol = rRange.aStart.Col();
- SCCOL i;
+ SCCOL i;
for (i=0; i<nStartCol; i++)
nStartX +=pDoc->GetColWidth(i,nTab);
nEndX = nStartX;
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 021a185aaf99..728a86ee744b 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -130,7 +130,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo
{
if ( bDoBack )
{
- sal_Int32 nTemp=nStart; nStart=nEnd; nEnd=nTemp;
+ sal_Int32 nTemp=nStart; nStart=nEnd; nEnd=nTemp;
bFound = pSearchText->SearchBackward(aString, &nStart, &nEnd, &aSearchResult);
// change results to definition before 614:
--nEnd;
diff --git a/sc/source/core/opencl/op_array.cxx b/sc/source/core/opencl/op_array.cxx
index 58954a626646..69990cff921f 100644
--- a/sc/source/core/opencl/op_array.cxx
+++ b/sc/source/core/opencl/op_array.cxx
@@ -40,23 +40,23 @@ void OpSumX2MY2::GenSlidingWindowFunction(std::stringstream &ss,
size_t nCurWindowSize = pCurDVR->GetArrayLength() <
pCurDVR->GetRefRowSize() ? pCurDVR->GetArrayLength():
pCurDVR->GetRefRowSize() ;
- ss << " int i ;\n";
- ss << " for (i = ";
- if (!pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()) {
+ ss << " int i ;\n";
+ ss << " for (i = ";
+ if (!pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()) {
ss << "gid0; i < "<< nCurWindowSize <<"; i++)\n";
- } else if (pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed()) {
+ } else if (pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed()) {
ss << "0; i < gid0+"<< nCurWindowSize <<"; i++)\n";
- } else {
+ } else {
ss << "0; i < "<< nCurWindowSize <<"; i++)\n";
- }
- ss << " {\n";
- if(!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
- {
+ }
+ ss << " {\n";
+ if(!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
+ {
ss << " int doubleIndex =i+gid0;\n";
- }else
- {
+ }else
+ {
ss << " int doubleIndex =i;\n";
- }
+ }
CheckSubArgumentIsNan(ss,vSubArguments,0);
CheckSubArgumentIsNan(ss,vSubArguments,1);
@@ -97,23 +97,23 @@ void OpSumX2PY2::GenSlidingWindowFunction(std::stringstream &ss,
size_t nCurWindowSize = pCurDVR->GetArrayLength() <
pCurDVR->GetRefRowSize() ? pCurDVR->GetArrayLength():
pCurDVR->GetRefRowSize() ;
- ss << " int i ;\n";
- ss << " for (i = ";
- if (!pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()) {
+ ss << " int i ;\n";
+ ss << " for (i = ";
+ if (!pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()) {
ss << "gid0; i < "<< nCurWindowSize <<"; i++)\n";
- } else if (pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed()) {
+ } else if (pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed()) {
ss << "0; i < gid0+"<< nCurWindowSize <<"; i++)\n";
- } else {
+ } else {
ss << "0; i < "<< nCurWindowSize <<"; i++)\n";
- }
- ss << " {\n";
- if(!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
- {
+ }
+ ss << " {\n";
+ if(!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
+ {
ss << " int doubleIndex =i+gid0;\n";
- }else
- {
+ }else
+ {
ss << " int doubleIndex =i;\n";
- }
+ }
CheckSubArgumentIsNan(ss,vSubArguments,0);
CheckSubArgumentIsNan(ss,vSubArguments,1);
@@ -153,23 +153,23 @@ void OpSumXMY2::GenSlidingWindowFunction(std::stringstream &ss,
size_t nCurWindowSize = pCurDVR->GetArrayLength() <
pCurDVR->GetRefRowSize() ? pCurDVR->GetArrayLength():
pCurDVR->GetRefRowSize() ;
- ss << " int i ;\n";
- ss << " for (i = ";
- if (!pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()) {
+ ss << " int i ;\n";
+ ss << " for (i = ";
+ if (!pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()) {
ss << "gid0; i < "<< nCurWindowSize <<"; i++)\n";
- } else if (pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed()) {
+ } else if (pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed()) {
ss << "0; i < gid0+"<< nCurWindowSize <<"; i++)\n";
- } else {
+ } else {
ss << "0; i < "<< nCurWindowSize <<"; i++)\n";
- }
- ss << " {\n";
- if(!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
- {
+ }
+ ss << " {\n";
+ if(!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
+ {
ss << " int doubleIndex =i+gid0;\n";
- }else
- {
+ }else
+ {
ss << " int doubleIndex =i;\n";
- }
+ }
CheckSubArgumentIsNan(ss,vSubArguments,0);
CheckSubArgumentIsNan(ss,vSubArguments,1);
diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx
index 594b8ea8d75a..4071ea62d17a 100644
--- a/sc/source/core/opencl/op_database.cxx
+++ b/sc/source/core/opencl/op_database.cxx
@@ -46,14 +46,14 @@ void OpDmax::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -173,14 +173,14 @@ void OpDmin::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -301,14 +301,14 @@ void OpDproduct::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -428,14 +428,14 @@ void OpDaverage::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -560,14 +560,14 @@ void OpDstdev::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -742,14 +742,14 @@ void OpDstdevp::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -922,14 +922,14 @@ void OpDsum::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -1051,14 +1051,14 @@ void OpDvar::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -1233,14 +1233,14 @@ void OpDvarp::GenSlidingWindowFunction(std::stringstream &ss,
formula::svSingleVectorRef)
throw Unhandled(__FILE__, __LINE__);
- const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
- formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
- GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=0;\n";
+ const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(vSubArguments[dataCol]->
+ GetFormulaToken());
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=0;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -1416,11 +1416,11 @@ void OpDcount::GenSlidingWindowFunction(std::stringstream &ss,
const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
formula::SingleVectorRefToken *>(vSubArguments[dataCol]
->GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=DBL_MIN;\n";
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=DBL_MIN;\n";
int conditionCol = 0;
int conditionRow = 0;
@@ -1544,11 +1544,11 @@ void OpDcount2::GenSlidingWindowFunction(std::stringstream &ss,
const formula::SingleVectorRefToken*pTmpDVR1= static_cast<const
formula::SingleVectorRefToken *>(vSubArguments[dataCol]
->GetFormulaToken());
- ss << " tmp"<<dataCol<<"=";
- ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
- ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
- ss << "tmp"<<dataCol<<"))\n";
- ss << " tmp"<<dataCol<<"=DBL_MIN;\n";
+ ss << " tmp"<<dataCol<<"=";
+ ss << vSubArguments[dataCol]->GenSlidingWindowDeclRef()<<";\n";
+ ss << " if(gid0>="<<pTmpDVR1->GetArrayLength()<<" ||isnan(";
+ ss << "tmp"<<dataCol<<"))\n";
+ ss << " tmp"<<dataCol<<"=DBL_MIN;\n";
int conditionCol = 0;
int conditionRow = 0;
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index 66d1f9d18e28..4cbfbe564e18 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -110,7 +110,7 @@ vSubArguments)
assert(pCur);
if (pCur->GetType() == formula::svSingleVectorRef)
{
- const formula::SingleVectorRefToken* pSVR =
+ const formula::SingleVectorRefToken* pSVR =
static_cast< const formula::SingleVectorRefToken* >(pCur);
ss << " if (gid0 < " << pSVR->GetArrayLength() << "){\n";
}
@@ -1221,7 +1221,7 @@ void PriceMat::GenSlidingWindowFunction(
ss<< "int buffer_settle_len = ";
ss<< tmpCurDVR0->GetArrayLength();
ss << ";\n\t";
- ss<< "int buffer_mat_len = ";
+ ss<< "int buffer_mat_len = ";
ss<< tmpCurDVR1->GetArrayLength();
ss << ";\n\t";
ss<< "int buffer_issue_len = ";
@@ -1882,10 +1882,10 @@ void OpAccrintm::GenSlidingWindowFunction(
ss<< "int buffer_nMode_len = ";
ss<< tmpCurDVR4->GetArrayLength();
ss << ";\n\t";
- ss <<"if(gid0 >= buffer_nIssue_len || isnan(";
- ss <<vSubArguments[0]->GenSlidingWindowDeclRef();
- ss <<"))\n\t\t";
- ss <<"nStartDate = 0;\n\telse\n\t\t";
+ ss <<"if(gid0 >= buffer_nIssue_len || isnan(";
+ ss <<vSubArguments[0]->GenSlidingWindowDeclRef();
+ ss <<"))\n\t\t";
+ ss <<"nStartDate = 0;\n\telse\n\t\t";
ss << "nStartDate=(int)";
ss << vSubArguments[0]->GenSlidingWindowDeclRef();
ss <<";\n\t";
@@ -2018,7 +2018,7 @@ void OpYield::GenSlidingWindowFunction(
ss<< tmpCurDVR2->GetArrayLength();
ss << ";\n\t";
- ss<< "int buffer_tmp003_len = ";
+ ss<< "int buffer_tmp003_len = ";
ss<< tmpCurDVR3->GetArrayLength();
ss << ";\n\t";
@@ -2320,7 +2320,7 @@ void OpPMT::GenSlidingWindowFunction(std::stringstream &ss,
assert(pCur);
if (pCur->GetType() == formula::svSingleVectorRef)
{
- const formula::SingleVectorRefToken* pSVR =
+ const formula::SingleVectorRefToken* pSVR =
static_cast< const formula::SingleVectorRefToken* >(pCur);
ss << "if (gid0 < " << pSVR->GetArrayLength() << "){\n";
}
@@ -2444,8 +2444,8 @@ void OpNPV::GenSlidingWindowFunction(std::stringstream &ss,
ss << " nCount += 1;\n";
}
}
- ss << " return tmp;\n";
- ss << "}";
+ ss << " return tmp;\n";
+ ss << "}";
}
void OpPrice::BinInlineFun(std::set<std::string>& decls,
@@ -3966,7 +3966,7 @@ void OpYielddisc::GenSlidingWindowFunction(
ss<< tmpCurDVR2->GetArrayLength();
ss << ";\n\t";
- ss<< "int buffer_tmp003_len = ";
+ ss<< "int buffer_tmp003_len = ";
ss<< tmpCurDVR3->GetArrayLength();
ss << ";\n\t";
@@ -4408,17 +4408,17 @@ vSubArguments)
ss << " double fv;\n";
ss << " double type;\n";
- FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
- const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const
- formula::SingleVectorRefToken *>(tmpCur0);
+ FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken();
+ const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const
+ formula::SingleVectorRefToken *>(tmpCur0);
- FormulaToken *tmpCur1 = vSubArguments[1]->GetFormulaToken();
- const formula::SingleVectorRefToken*tmpCurDVR1= static_cast<const
- formula::SingleVectorRefToken *>(tmpCur1);
+ FormulaToken *tmpCur1 = vSubArguments[1]->GetFormulaToken();
+ const formula::SingleVectorRefToken*tmpCurDVR1= static_cast<const
+ formula::SingleVectorRefToken *>(tmpCur1);
- FormulaToken *tmpCur2 = vSubArguments[2]->GetFormulaToken();
- const formula::SingleVectorRefToken*tmpCurDVR2= static_cast<const
- formula::SingleVectorRefToken *>(tmpCur2);
+ FormulaToken *tmpCur2 = vSubArguments[2]->GetFormulaToken();
+ const formula::SingleVectorRefToken*tmpCurDVR2= static_cast<const
+ formula::SingleVectorRefToken *>(tmpCur2);
if(vSubArguments.size()>3)
{
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index 4b34df551426..4ed984941d87 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -516,13 +516,13 @@ void OpCountIfs::GenSlidingWindowFunction(std::stringstream &ss,
ss << " int loop;\n";
GenTmpVariables(ss,vSubArguments);
- ss<< " int singleIndex =gid0;\n";
- int m=0;
+ ss<< " int singleIndex =gid0;\n";
+ int m=0;
- std::stringstream tmpss;
+ std::stringstream tmpss;
- for(size_t j=0;j<vSubArguments.size();j+=2,m++)
- {
+ for(size_t j=0;j<vSubArguments.size();j+=2,m++)
+ {
CheckSubArgumentIsNan(tmpss,vSubArguments,j);
CheckSubArgumentIsNan(ss,vSubArguments,j+1);
tmpss <<" if(isequal(";
@@ -532,17 +532,17 @@ void OpCountIfs::GenSlidingWindowFunction(std::stringstream &ss,
tmpss << "tmp";
tmpss << j+1;
tmpss << ")){\n";
- }
+ }
tmpss << " tmp ++;\n";
for(size_t j=0;j<vSubArguments.size();j+=2,m--)
- {
- for(int n = 0;n<m+1;n++)
+ {
+ for(int n = 0;n<m+1;n++)
{
tmpss << " ";
}
tmpss<< "}\n";
- }
- UnrollDoubleVector(ss,tmpss,pCurDVR,nCurWindowSize);
+ }
+ UnrollDoubleVector(ss,tmpss,pCurDVR,nCurWindowSize);
ss << "return tmp;\n";
ss << "}";
@@ -856,11 +856,11 @@ void OpAverageIfs::GenSlidingWindowFunction(std::stringstream &ss,
ss << " int count=0;\n";
ss << " int loop;";
GenTmpVariables(ss,vSubArguments);
- ss<< " int singleIndex =gid0;\n";
- int m=0;
- std::stringstream tmpss;
- for(size_t j=1;j<vSubArguments.size();j+=2,m++)
- {
+ ss<< " int singleIndex =gid0;\n";
+ int m=0;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list