summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-08 13:15:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-09 17:07:13 +0100
commit9eed3b4a1830250cb686e386cbcbe68da0e7cb02 (patch)
tree5b82d9455c5a748d6c69255c9e84339ffb05255c /filter
parent24f7dd62517f150f4137727a72544387421027b9 (diff)
loplugin:indentation in filter
Change-Id: If0574f34effb82bf718958692a44fd422b71abd4 Reviewed-on: https://gerrit.libreoffice.org/67555 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/config/cache/filtercache.cxx6
-rw-r--r--filter/source/config/cache/filterfactory.cxx2
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx4
-rw-r--r--filter/source/graphicfilter/ios2met/ios2met.cxx3
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx10
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx4
-rw-r--r--filter/source/msfilter/eschesdo.cxx4
-rw-r--r--filter/source/msfilter/msoleexp.cxx10
-rw-r--r--filter/source/msfilter/msvbahelper.cxx4
-rw-r--r--filter/source/msfilter/svdfppt.cxx62
-rw-r--r--filter/source/svg/svgexport.cxx2
-rw-r--r--filter/source/svg/svgwriter.cxx76
-rw-r--r--filter/source/t602/t602filter.cxx4
-rw-r--r--filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx8
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx8
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx4
16 files changed, 106 insertions, 105 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 29fb682df360..5a1fba1ed651 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1409,7 +1409,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA
// for mapping extensions to its types!
const OUString* pItems = lItems.getConstArray();
- sal_Int32 c = lItems.getLength();
+ sal_Int32 c = lItems.getLength();
for (sal_Int32 i=0; i<c; ++i)
{
CacheItemList::iterator pItem = pCache->find(pItems[i]);
@@ -1479,8 +1479,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
const ::std::vector< OUString > lLocales(comphelper::sequenceToContainer< ::std::vector< OUString >>(
xUIName->getElementNames()));
- ::std::vector< OUString >::const_iterator pLocale ;
- ::comphelper::SequenceAsHashMap lUINames;
+ ::std::vector< OUString >::const_iterator pLocale ;
+ ::comphelper::SequenceAsHashMap lUINames;
for (auto const& locale : lLocales)
{
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 573be9782275..8e559f2de666 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -341,7 +341,7 @@ class stlcomp_removeIfMatchFlags
try
{
const CacheItem aFilter = m_pCache->getItem(FilterCache::E_FILTER, sFilter);
- sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(PROPNAME_FLAGS, (sal_Int32(0)));
+ sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault(PROPNAME_FLAGS, (sal_Int32(0)));
bool bMatch = false;
if (m_bIFlags)
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index cd247a23e110..3092bd51155c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -235,7 +235,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
oslFileHandle pIn = nullptr;
oslFileHandle pOut = nullptr;
oslFileHandle pErr = nullptr;
- oslProcessError eErr = runProcessWithPathSearch(
+ oslProcessError eErr = runProcessWithPathSearch(
"pstoedit" EXESUFFIX,
args, SAL_N_ELEMENTS(args),
&aProcess, &pIn, &pOut, &pErr);
@@ -303,7 +303,7 @@ static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRea
oslFileHandle pIn = nullptr;
oslFileHandle pOut = nullptr;
oslFileHandle pErr = nullptr;
- oslProcessError eErr = runProcessWithPathSearch(rProgName,
+ oslProcessError eErr = runProcessWithPathSearch(rProgName,
pArgs, nArgs,
&aProcess, &pIn, &pOut, &pErr);
if (eErr!=osl_Process_E_None)
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 61c6bde360ec..0ba1d5c19aaa 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -1663,7 +1663,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
}
break;
}
- case GOrdSClPth: { SAL_INFO("filter.os2met","GOrdSClPth");
+ case GOrdSClPth: {
+ SAL_INFO("filter.os2met","GOrdSClPth");
sal_uInt32 nID;
OSPath * p=pPathList;
pOS2MET->SeekRel(2);
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 4b6e459dad14..722234d399e5 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -357,11 +357,11 @@ Point PictReader::ReadPoint()
pPict->ReadInt16( ny ).ReadInt16( nx );
- Point aPoint( static_cast<long>(nx) - aBoundingRect.Left(),
+ Point aPoint( static_cast<long>(nx) - aBoundingRect.Left(),
static_cast<long>(ny) - aBoundingRect.Top() );
- SAL_INFO("filter.pict", "ReadPoint: " << aPoint);
- return aPoint;
+ SAL_INFO("filter.pict", "ReadPoint: " << aPoint);
+ return aPoint;
}
Point PictReader::ReadDeltaH(Point aBase)
@@ -490,13 +490,13 @@ sal_uLong PictReader::ReadPixPattern(PictReader::Pattern &pattern)
pPict->ReadUInt16( nPatType );
if (nPatType==1) {
- pattern.read(*pPict);
+ pattern.read(*pPict);
nDataSize=ReadPixMapEtc(aBMP,false,true,nullptr,nullptr,false,false);
// CHANGEME: use average pixmap colors to update the pattern, ...
if (nDataSize!=0xffffffff) nDataSize+=10;
}
else if (nPatType==2) {
- pattern.read(*pPict);
+ pattern.read(*pPict);
// RGBColor
sal_uInt16 nR, nG, nB;
pPict->ReadUInt16( nR ).ReadUInt16( nG ).ReadUInt16( nB );
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 1e609a85d52d..c055b1c20925 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -641,8 +641,8 @@ bool PSDReader::ImplReadBody()
{
nX = 0;
nY++;
- if ( nY == mpFileHeader->nRows )
- break;
+ if ( nY == mpFileHeader->nRows )
+ break;
}
}
}
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 43b8195680bc..aac095bbe373 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -264,7 +264,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x100000 ); // no fill
aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90000 ); // no linestyle
- SdrObject* pObj = GetSdrObjectFromXShape( rObj.GetShapeRef() );
+ SdrObject* pObj = GetSdrObjectFromXShape( rObj.GetShapeRef() );
if ( pObj )
{
tools::Rectangle aBound = pObj->GetCurrentBoundRect();
@@ -634,7 +634,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
mpEscherEx->OpenContainer( ESCHER_SpContainer );
addShape( ESCHER_ShpInst_PictureFrame, ShapeFlag::HaveShapeProperty | ShapeFlag::HaveAnchor );
- if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "Bitmap", false ) )
+ if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, "Bitmap", false ) )
aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x800080 );
}
else if ( rObj.GetType() == "drawing.Caption" )
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 5980a6689513..c64477f079d1 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -200,11 +200,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef const & rObj
aSeq[1].Name = "FilterName";
aSeq[1].Value <<= pExpFilter->GetName();
uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
- try
- {
- xStor->storeToURL( "private:stream", aSeq );
- }
- catch( const uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ?
+ try
+ {
+ xStor->storeToURL( "private:stream", aSeq );
+ }
+ catch( const uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ?
tools::SvRef<SotStorage> xOLEStor = new SotStorage( pStream, true );
xOLEStor->CopyTo( &rDestStg );
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 2a89ae769cdc..8a264753e28c 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -383,7 +383,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
}
catch( const uno::Exception& /*e*/) {}
- sSearchList.push_back( sThisProject ); // First Lib to search
+ sSearchList.push_back( sThisProject ); // First Lib to search
// service VBAProjectNameProvider not implemented
#if 0
@@ -758,7 +758,7 @@ void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, c
MacroResolvedInfo aMacroInfo = resolveVBAMacro( pShell, aMacroName );
if( !aMacroInfo.mbFound )
throw uno::RuntimeException( "The procedure doesn't exist" );
- MacroName = aMacroInfo.msResolvedMacro;
+ MacroName = aMacroInfo.msResolvedMacro;
}
uno::Reference< ui::XUIConfigurationManagerSupplier > xCfgSupplier(rxModel, uno::UNO_QUERY_THROW);
uno::Reference< ui::XUIConfigurationManager > xCfgMgr = xCfgSupplier->getUIConfigurationManager();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 02aa7f0a0d37..8321b494d598 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1111,40 +1111,40 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
pTObj->SetMergedItem( SdrTextFitToSizeTypeItem(drawing::TextFitToSizeType_AUTOFIT) );
}
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- {
- pTObj->SetMergedItem( makeSdrTextAutoGrowWidthItem( bAutoGrowWidth ) );
- pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoGrowHeight ) );
- }
- else
- {
- pTObj->SetMergedItem( makeSdrTextWordWrapItem( bWordWrap ) );
- pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bFitShapeToText ) );
- }
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ {
+ pTObj->SetMergedItem( makeSdrTextAutoGrowWidthItem( bAutoGrowWidth ) );
+ pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoGrowHeight ) );
+ }
+ else
+ {
+ pTObj->SetMergedItem( makeSdrTextWordWrapItem( bWordWrap ) );
+ pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bFitShapeToText ) );
+ }
- pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) );
- pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) );
+ pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) );
+ pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) );
- if ( nMinFrameHeight < 0 )
- nMinFrameHeight = 0;
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- pTObj->SetMergedItem( makeSdrTextMinFrameHeightItem( nMinFrameHeight ) );
+ if ( nMinFrameHeight < 0 )
+ nMinFrameHeight = 0;
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ pTObj->SetMergedItem( makeSdrTextMinFrameHeightItem( nMinFrameHeight ) );
- if ( nMinFrameWidth < 0 )
- nMinFrameWidth = 0;
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
+ if ( nMinFrameWidth < 0 )
+ nMinFrameWidth = 0;
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ pTObj->SetMergedItem( makeSdrTextMinFrameWidthItem( nMinFrameWidth ) );
- // set margins at the borders of the textbox
- pTObj->SetMergedItem( makeSdrTextLeftDistItem( nTextLeft ) );
- pTObj->SetMergedItem( makeSdrTextRightDistItem( nTextRight ) );
- pTObj->SetMergedItem( makeSdrTextUpperDistItem( nTextTop ) );
- pTObj->SetMergedItem( makeSdrTextLowerDistItem( nTextBottom ) );
- pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) );
+ // set margins at the borders of the textbox
+ pTObj->SetMergedItem( makeSdrTextLeftDistItem( nTextLeft ) );
+ pTObj->SetMergedItem( makeSdrTextRightDistItem( nTextRight ) );
+ pTObj->SetMergedItem( makeSdrTextUpperDistItem( nTextTop ) );
+ pTObj->SetMergedItem( makeSdrTextLowerDistItem( nTextBottom ) );
+ pTObj->SetMergedItem( SdrTextFixedCellHeightItem( true ) );
- if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
- pTObj->SetSnapRect( rTextRect );
- pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage );
+ if ( dynamic_cast<const SdrObjCustomShape* >(pTObj) == nullptr )
+ pTObj->SetSnapRect( rTextRect );
+ pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage );
if ( pTObj )
{
@@ -2993,7 +2993,7 @@ sal_uInt32 SdrPowerPointImport::GetMasterPageId( sal_uInt16 nPageNum, PptPageKin
PptSlidePersistList* pPageList = GetPageList( ePageKind );
if ( pPageList && nPageNum < pPageList->size() )
return (*pPageList)[ nPageNum ].aSlideAtom.nMasterId;
- return 0;
+ return 0;
}
sal_uInt32 SdrPowerPointImport::GetNotesPageId( sal_uInt16 nPageNum ) const
@@ -3001,7 +3001,7 @@ sal_uInt32 SdrPowerPointImport::GetNotesPageId( sal_uInt16 nPageNum ) const
PptSlidePersistList* pPageList=GetPageList( PPT_SLIDEPAGE );
if ( pPageList && nPageNum < pPageList->size() )
return (*pPageList)[ nPageNum ].aSlideAtom.nNotesId;
- return 0;
+ return 0;
}
bool SdrPowerPointImport::HasMasterPage( sal_uInt16 nPageNum, PptPageKind ePageKind ) const
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 2a1ed5169493..fa04227f18ce 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1596,7 +1596,7 @@ void SVGFilter::implExportDrawPages( const std::vector< Reference< css::drawing:
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "DummySlide" );
SvXMLElementExport aDummySlideElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
{
- SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
+ SvXMLElementExport aGElement( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true );
{
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", "dummy-slide" );
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Slide" );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 0b8ebfc988ff..d0484e68825b 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1834,7 +1834,7 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
}
}
- return aPathData.makeStringAndClear();
+ return aPathData.makeStringAndClear();
}
@@ -1917,48 +1917,48 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo &rAttrs )
sal_Int32 nStrokeWidth = ImplMap( rAttrs.GetWidth() );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
OUString::number( nStrokeWidth ) );
- // support for LineJoint
- switch(rAttrs.GetLineJoin())
- {
- case basegfx::B2DLineJoin::NONE:
- case basegfx::B2DLineJoin::Miter:
- {
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter");
- break;
- }
- case basegfx::B2DLineJoin::Bevel:
+ // support for LineJoint
+ switch(rAttrs.GetLineJoin())
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel");
- break;
- }
- case basegfx::B2DLineJoin::Round:
- {
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round");
- break;
+ case basegfx::B2DLineJoin::NONE:
+ case basegfx::B2DLineJoin::Miter:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "miter");
+ break;
+ }
+ case basegfx::B2DLineJoin::Bevel:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "bevel");
+ break;
+ }
+ case basegfx::B2DLineJoin::Round:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, "round");
+ break;
+ }
}
- }
- // support for LineCap
- switch(rAttrs.GetLineCap())
- {
- default: /* css::drawing::LineCap_BUTT */
- {
- // butt is Svg default, so no need to write until the exporter might write styles.
- // If this happens, activate here
- // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt");
- break;
- }
- case css::drawing::LineCap_ROUND:
- {
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round");
- break;
- }
- case css::drawing::LineCap_SQUARE:
+ // support for LineCap
+ switch(rAttrs.GetLineCap())
{
- mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square");
- break;
+ default: /* css::drawing::LineCap_BUTT */
+ {
+ // butt is Svg default, so no need to write until the exporter might write styles.
+ // If this happens, activate here
+ // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "butt");
+ break;
+ }
+ case css::drawing::LineCap_ROUND:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "round");
+ break;
+ }
+ case css::drawing::LineCap_SQUARE:
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, "square");
+ break;
+ }
}
- }
}
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 5eb7a4058ee7..b6aeebe59ba0 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -621,7 +621,7 @@ unsigned char T602ImportFilter::Setformat602(const char *cmd)
ch = Readchar602();
- if (cmd[0]=='M' && cmd[1]=='T') format602.mt = readnum(&ch,false);
+ if (cmd[0]=='M' && cmd[1]=='T') format602.mt = readnum(&ch,false);
else if (cmd[0]=='M' && cmd[1]=='B') format602.mb = readnum(&ch,false);
// else if (cmd[0]=='T' && cmd[1]=='B') {}
// else if (cmd[0]=='H' && cmd[1]=='E') {}
@@ -666,7 +666,7 @@ tnode T602ImportFilter::PointCmd602(unsigned char *ch)
// warning: uChar -> char
pcmd[1] = static_cast<char>(rtl::toAsciiUpperCase(*ch)); inschr(*ch);
- if (pcmd[0]=='P' && pcmd[1]=='A') { if (pst.pars) pst.willbeeop = true; }
+ if (pcmd[0]=='P' && pcmd[1]=='A') { if (pst.pars) pst.willbeeop = true; }
else if (pcmd[0]=='C' && pcmd[1]=='P') { if (pst.pars) pst.willbeeop = true; }
else if (pcmd[0]=='P' && pcmd[1]=='I') {
while (*ch && (*ch != '\n') && (*ch != ','))
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 9cafc79cf542..4d0667e463e8 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -260,7 +260,7 @@ bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >&
}
// create an XProperty set to configure the exporter for pretty printing
- PropertyMapEntry aImportInfoMap[] =
+ PropertyMapEntry aImportInfoMap[] =
{
{ OUString("UsePrettyPrinting"), 0, cppu::UnoType<sal_Bool>::get(), PropertyAttribute::MAYBEVOID, 0},
{ OUString("ExportTextNumberElement"), 0, cppu::UnoType<sal_Bool>::get(), PropertyAttribute::MAYBEVOID, 0},
@@ -268,13 +268,13 @@ bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >&
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
- Reference< XPropertySet > xInfoSet(
+ Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint ));
+ xInfoSet->setPropertyValue("UsePrettyPrinting", makeAny( bPrettyPrint ));
xInfoSet->setPropertyValue(
"ExportTextNumberElement",
makeAny( bExportTextNumberElementForListItems ));
- xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI ));
+ xInfoSet->setPropertyValue("BaseURI", makeAny( aBaseURI ));
aAnys[1] <<= xInfoSet;
Reference< XExporter > xExporter( mxContext->getServiceManager()->createInstanceWithArgumentsAndContext(
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index e5bbba97ee3e..673481b8e1b5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -871,7 +871,7 @@ void XMLFilterSettingsDialog::onSave()
}
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
+ ::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
FileDialogFlags::NONE, GetFrameWeld());
@@ -916,9 +916,9 @@ void XMLFilterSettingsDialog::onOpen()
std::vector< std::unique_ptr<filter_info_impl> > aFilters;
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- FileDialogFlags::NONE, GetFrameWeld());
+ ::sfx2::FileDialogHelper aDlg(
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+ FileDialogFlags::NONE, GetFrameWeld());
OUString aExtensions( "*.jar" );
OUString aFilterName(XsltResId(STR_FILTER_PACKAGE));
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index c245ad4c0c31..cff46da8580c 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -280,7 +280,7 @@ void XMLFilterTestDialog::onExportBrowse()
try
{
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
+ ::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
FileDialogFlags::NONE, m_xDialog.get());
@@ -517,7 +517,7 @@ void XMLFilterTestDialog::displayXMLFile( const OUString& rURL )
void XMLFilterTestDialog::onImportBrowse()
{
// Open Fileopen-Dialog
- ::sfx2::FileDialogHelper aDlg(
+ ::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
FileDialogFlags::NONE, m_xDialog.get());
OUString aFilterName( m_xFilterInfo->maInterfaceName );