vcl/source/app/help.cxx | 2 vcl/source/app/svmain.cxx | 2 vcl/source/control/ctrl.cxx | 2 vcl/source/control/field.cxx | 2 vcl/source/control/imgctrl.cxx | 2 vcl/source/control/notebookbar.cxx | 4 vcl/source/edit/vclmedit.cxx | 2 vcl/source/filter/graphicfilter.cxx | 8 vcl/source/filter/wmf/emfwr.cxx | 4 vcl/source/filter/wmf/wmfwr.cxx | 14 vcl/source/fontsubset/cff.cxx | 16 - vcl/source/gdi/gradient.cxx | 4 vcl/source/gdi/metaact.cxx | 2 vcl/source/gdi/pdfextoutdevdata.cxx | 2 vcl/source/gdi/pdfwriter_impl.cxx | 4 vcl/source/graphic/UnoGraphicDescriptor.cxx | 2 vcl/source/outdev/gradient.cxx | 32 +- vcl/source/outdev/text.cxx | 2 vcl/source/treelist/svimpbox.cxx | 4 vcl/source/treelist/transfer.cxx | 2 vcl/source/treelist/transfer2.cxx | 16 - vcl/source/window/accel.cxx | 2 vcl/source/window/accessibility.cxx | 4 vcl/source/window/dialog.cxx | 20 - vcl/source/window/dlgctrl.cxx | 2 vcl/source/window/dndlistenercontainer.cxx | 6 vcl/source/window/menu.cxx | 4 vcl/source/window/paint.cxx | 8 vcl/source/window/seleng.cxx | 2 vcl/source/window/syswin.cxx | 2 vcl/source/window/window.cxx | 4 vcl/unx/generic/app/i18n_cb.cxx | 34 +- vcl/unx/generic/dtrans/X11_selection.cxx | 2 vcl/unx/generic/gdi/gdiimpl.cxx | 8 vcl/unx/generic/gdi/salvd.cxx | 2 vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 vcl/unx/generic/glyphs/glyphcache.cxx | 4 vcl/unx/generic/printer/ppdparser.cxx | 2 vcl/unx/generic/window/salframe.cxx | 22 - vcl/unx/glxtest.cxx | 2 vcl/unx/gtk/a11y/atkfactory.cxx | 6 vcl/unx/gtk/a11y/atkutil.cxx | 4 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 vcl/unx/gtk3/gtk3gtkdata.cxx | 6 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 3 writerfilter/source/dmapper/DomainMapper.cxx | 8 writerfilter/source/dmapper/DomainMapperTableManager.cxx | 22 - writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12 writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 writerfilter/source/dmapper/NumberingManager.cxx | 6 writerfilter/source/dmapper/ThemeTable.cxx | 24 - writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 12 xmlhelp/source/cxxhelp/provider/content.cxx | 2 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 2 xmlhelp/source/treeview/tvread.cxx | 36 +- xmloff/source/chart/SchXMLExport.cxx | 4 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 18 - xmloff/source/core/nmspmap.cxx | 2 xmloff/source/draw/eventimp.cxx | 192 ++++++------- xmloff/source/draw/sdxmlexp.cxx | 2 xmloff/source/draw/ximpshap.cxx | 2 xmloff/source/draw/ximpstyl.cxx | 2 xmloff/source/forms/elementexport.cxx | 12 xmloff/source/forms/elementimport.cxx | 2 xmloff/source/style/DrawAspectHdl.cxx | 2 xmloff/source/style/ImageStyle.cxx | 2 xmloff/source/style/PageMasterImportPropMapper.cxx | 6 xmloff/source/style/XMLClipPropertyHandler.cxx | 2 xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx | 2 xmloff/source/style/shadwhdl.cxx | 2 xmloff/source/style/xmlbahdl.cxx | 8 xmloff/source/table/XMLTableExport.cxx | 31 +- xmloff/source/text/XMLIndexTabStopEntryContext.cxx | 2 xmloff/source/text/XMLIndexTableSourceContext.cxx | 4 xmloff/source/text/XMLTextNumRuleInfo.cxx | 2 xmloff/source/text/XMLTextShapeImportHelper.cxx | 2 xmloff/source/text/txtfldi.cxx | 6 xmloff/source/text/txtimppr.cxx | 24 - xmloff/source/text/txtstyle.cxx | 4 xmloff/source/transform/OOo2Oasis.cxx | 2 xmloff/source/transform/TransformerBase.cxx | 2 81 files changed, 373 insertions(+), 375 deletions(-)
New commits: commit 743d5604c22e2c599ec22c1afd8c7c02388d575f Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sun Feb 10 12:30:22 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Feb 11 07:01:24 2019 +0100 loplugin:indentation in writerfilter..xmloff Change-Id: Ibda157508e92ab5fb222daf79a38941c30a8057e Reviewed-on: https://gerrit.libreoffice.org/67611 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 190f6257ef89..6a1b4e7dbc99 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -234,7 +234,7 @@ DomainMapper::~DomainMapper() catch( const uno::Exception& ) {} #ifdef DEBUG_WRITERFILTER - TagLogger::getInstance().endDocument(); + TagLogger::getInstance().endDocument(); #endif } @@ -248,8 +248,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) OUString sStringValue = val.getString(); SectionPropertyMap * pSectionContext = m_pImpl->GetSectionContext(); - switch( nName ) - { + switch( nName ) + { case NS_ooxml::LN_CT_Lvl_start: break; case NS_ooxml::LN_CT_Lvl_numFmt: @@ -1160,7 +1160,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) } default: SAL_WARN("writerfilter", "DomainMapper::lcl_attribute: unhandled token: " << nName); - } + } } void DomainMapper::lcl_sprm(Sprm & rSprm) diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index b920af4a726a..5e0f322648be 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -299,18 +299,18 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) break; case NS_ooxml::LN_Value_ST_TextDirection_btLr: { - // We have to fake this text direction - pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); - pPropMap->Insert( PROP_CHAR_ROTATION, uno::makeAny( sal_Int16( 900 ) )); - SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); + // We have to fake this text direction + pPropMap->Insert( PROP_FRM_DIRECTION, uno::makeAny( text::WritingMode2::LR_TB )); + pPropMap->Insert( PROP_CHAR_ROTATION, uno::makeAny( sal_Int16( 900 ) )); + SAL_INFO( "writerfilter", "Have inserted textDirection " << nIntValue ); - // We're faking a text direction, so don't allow multiple lines. - if (!getCellProps() || !getCellProps()->isSet(PROP_VERTICAL_MERGE)) - { - // Though in case there will be a vertical merge, don't do this, it hides text that is supposed to be visible. - m_bRowSizeTypeInserted = true; - } - m_bHasBtlrCell = true; + // We're faking a text direction, so don't allow multiple lines. + if (!getCellProps() || !getCellProps()->isSet(PROP_VERTICAL_MERGE)) + { + // Though in case there will be a vertical merge, don't do this, it hides text that is supposed to be visible. + m_bRowSizeTypeInserted = true; + } + m_bHasBtlrCell = true; } break; case NS_ooxml::LN_Value_ST_TextDirection_lrTbV: diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 5cb18fed76b0..2a1be9d95cfc 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2282,7 +2282,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape // So that the original bitmap-only shape will be replaced by the embedded object. m_aAnchoredStack.top().bToRemove = true; m_aTextAppendStack.pop(); - appendTextContent(m_xEmbedded, uno::Sequence<beans::PropertyValue>()); + appendTextContent(m_xEmbedded, uno::Sequence<beans::PropertyValue>()); } else { @@ -3833,10 +3833,10 @@ void DomainMapper_Impl::handleToc bNewLine = true ; } // \z Hides page numbers within the table of contents when shown in Web Layout View - if( lcl_FindInCommand( pContext->GetCommand(), 'z', sValue )) - { - bHideTabLeaderPageNumbers = true ; - } + if( lcl_FindInCommand( pContext->GetCommand(), 'z', sValue )) + { + bHideTabLeaderPageNumbers = true ; + } //if there's no option then it should be created from outline if( !bFromOutline && !bFromEntries && sTemplate.isEmpty() ) @@ -4762,7 +4762,7 @@ void DomainMapper_Impl::CloseFieldCommand() xFieldInterface = m_xTextFactory->createInstance( OUString::createFromAscii(aIt->second.cFieldServiceName)); - uno::Reference< beans::XPropertySet > xTC(xFieldInterface, + uno::Reference< beans::XPropertySet > xTC(xFieldInterface, uno::UNO_QUERY_THROW); OUString sCmd(pContext->GetCommand());//sCmd is the entire instrText inclusing the index e.g. CITATION Kra06 \l 1033 if( !sCmd.isEmpty()){ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 6006d2465f13..1bcde463a34c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -670,7 +670,7 @@ public: { if(!m_pFontTable) m_pFontTable = new FontTable(); - return m_pFontTable; + return m_pFontTable; } StyleSheetTablePtr const & GetStyleSheetTable() { diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 2d5605a271dc..f5f97a5f9daa 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -632,12 +632,12 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, catch( const lang::IllegalArgumentException& e ) { SAL_WARN( "writerfilter", e ); - assert( !"Incorrect argument to UNO call" ); + assert( !"Incorrect argument to UNO call" ); } catch( const uno::RuntimeException& e ) { SAL_WARN( "writerfilter", e ); - assert( !"Incorrect argument to UNO call" ); + assert( !"Incorrect argument to UNO call" ); } catch( const uno::Exception& e ) { @@ -1011,7 +1011,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) { pLevel->Insert( PROP_ADJUST, uno::makeAny( nValue ) ); - writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); + writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); } } } diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 5f9cfc041450..c967f8f63e92 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -114,21 +114,21 @@ void ThemeTable::lcl_sprm(Sprm& rSprm) break; case NS_ooxml::LN_CT_FontScheme_majorFont: case NS_ooxml::LN_CT_FontScheme_minorFont: - { - writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); + { + writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); m_pImpl->m_currentFontThemeEntry = std::map<sal_uInt32, OUString>(); - if( pProperties.get()) + if( pProperties.get()) pProperties->resolve(*this); - m_pImpl->m_themeFontMap[nSprmId] = m_pImpl->m_currentFontThemeEntry; + m_pImpl->m_themeFontMap[nSprmId] = m_pImpl->m_currentFontThemeEntry; } break; case NS_ooxml::LN_CT_FontCollection_latin: case NS_ooxml::LN_CT_FontCollection_ea: case NS_ooxml::LN_CT_FontCollection_cs: - { + { m_pImpl->m_currentThemeFontId = nSprmId; - writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) + writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); + if( pProperties.get()) pProperties->resolve(*this); } break; @@ -214,11 +214,11 @@ const OUString ThemeTable::getFontNameForTheme(const Id id) const case NS_ooxml::LN_Value_ST_Theme_majorHAnsi: case NS_ooxml::LN_Value_ST_Theme_minorAscii: case NS_ooxml::LN_Value_ST_Theme_minorHAnsi: - { - std::map<sal_uInt32, OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_latin); - if (Iter != tmpThemeFontMap.end()) - return Iter->second; - return OUString(); + { + std::map<sal_uInt32, OUString>::const_iterator Iter = tmpThemeFontMap.find(NS_ooxml::LN_CT_FontCollection_latin); + if (Iter != tmpThemeFontMap.end()) + return Iter->second; + return OUString(); } case NS_ooxml::LN_Value_ST_Theme_majorBidi: case NS_ooxml::LN_Value_ST_Theme_minorBidi: diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index c011777d2b8e..effda87f8ade 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -628,9 +628,9 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = xRelationshipAccess->getAllRelationships(); std::vector< uno::Sequence<uno::Any> > aGlossaryDomList; - sal_Int32 counter = 0; - for (sal_Int32 j = 0; j < aSeqs.getLength(); j++) - { + sal_Int32 counter = 0; + for (sal_Int32 j = 0; j < aSeqs.getLength(); j++) + { OOXMLStream::Pointer_t gStream; uno::Sequence< beans::StringPair > aSeq = aSeqs[j]; //Follows following aSeq[0] is Id, aSeq[1] is Type, aSeq[2] is Target @@ -707,9 +707,9 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) counter++; } } - } - mxGlossaryDomList = comphelper::containerToSequence(aGlossaryDomList); - } + } + mxGlossaryDomList = comphelper::containerToSequence(aGlossaryDomList); + } } void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pStream) diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index d64ea70f5bc9..33a6bc6bf4cf 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -73,7 +73,7 @@ Content::~Content() uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) { uno::Any aRet; - return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType ); + return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType ); } // XTypeProvider methods. diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 90ed9a015e5d..eac4adc7a39e 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -297,7 +297,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte { OUString aURL = aCompleteResultVector[r]; OUString aResultStr = replWith + aURL.copy(replIdx); - m_aPath.push_back( aResultStr ); + m_aPath.push_back( aResultStr ); } m_aItems.resize( m_aPath.size() ); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index c81a31bab743..325e06feac8c 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -440,30 +440,30 @@ void TVChildTarget::Check(TVDom* tvDom) return; } - unsigned i = 0; - bool h = false; + unsigned i = 0; + bool h = false; - while((i<tvDom->children.size()-1) && (!h)) + while((i<tvDom->children.size()-1) && (!h)) + { + if (((tvDom->children[i])->application == (tvDom->children[tvDom->children.size()-1])->application) && + ((tvDom->children[i])->id == (tvDom->children[tvDom->children.size()-1])->id)) { - if (((tvDom->children[i])->application == (tvDom->children[tvDom->children.size()-1])->application) && - ((tvDom->children[i])->id == (tvDom->children[tvDom->children.size()-1])->id)) - { - TVDom* p = tvDom->children.back().get(); + TVDom* p = tvDom->children.back().get(); - for(auto & k : p->children) + for(auto & k : p->children) + { + std::unique_ptr<TVDom> tmp(SearchAndInsert(std::move(k), tvDom->children[i].get())); + if (tmp) { - std::unique_ptr<TVDom> tmp(SearchAndInsert(std::move(k), tvDom->children[i].get())); - if (tmp) - { - tvDom->children[i]->newChild(std::move(tmp)); - } + tvDom->children[i]->newChild(std::move(tmp)); } - - tvDom->children.pop_back(); - h = true; } - ++i; + + tvDom->children.pop_back(); + h = true; } + ++i; + } } std::unique_ptr<TVDom> @@ -733,7 +733,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) configData.m_vReplacement[1] = productVersion; // m_vReplacement[2...4] (vendorName/-Version/-Short) are empty strings - configData.system = system; + configData.system = system; configData.locale = locale; configData.appendix = "?Language=" + diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 097eb55a281f..4c267354a693 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -1643,7 +1643,7 @@ void SchXMLExportHelper_Impl::exportTable() { bExportString = false; - ::sax::Converter::convertDouble( + ::sax::Converter::convertDouble( msStringBuffer, fValue); msString = msStringBuffer.makeStringAndClear(); mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT ); @@ -1698,7 +1698,7 @@ void SchXMLExportHelper_Impl::exportTable() { bExportString = false; - ::sax::Converter::convertDouble(msStringBuffer, fValue); + ::sax::Converter::convertDouble(msStringBuffer, fValue); msString = msStringBuffer.makeStringAndClear(); mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT ); mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE, msString ); diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 5e09a373cd97..19e76a693117 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -272,15 +272,15 @@ void XMLEmbeddedObjectImportContext::EndElement() GetPrefix(), GetLocalName() ) ); xHandler->endDocument(); - try - { - Reference < XModifiable2 > xModifiable2( xComp, UNO_QUERY_THROW ); - xModifiable2->enableSetModified(); - xModifiable2->setModified( true ); // trigger new replacement image generation - } - catch( Exception& ) - { - } + try + { + Reference < XModifiable2 > xModifiable2( xComp, UNO_QUERY_THROW ); + xModifiable2->enableSetModified(); + xModifiable2->setModified( true ); // trigger new replacement image generation + } + catch( Exception& ) + { + } } } diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index d916d56e794e..248a36213ee4 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -302,7 +302,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName, } else { - rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry); + rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry); sal_Int32 nColonPos = rAttrName.indexOf( ':' ); if( -1 == nColonPos ) diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 73a92b9592e3..bfeb15bc25e3 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -269,124 +269,124 @@ void SdXMLEventContext::EndElement() OUString sAPIEventName; uno::Sequence< beans::PropertyValue > aProperties; - sAPIEventName = "OnClick"; + sAPIEventName = "OnClick"; - if( mbScript ) - meClickAction = ClickAction_MACRO; + if( mbScript ) + meClickAction = ClickAction_MACRO; - sal_Int32 nPropertyCount = 2; - switch( meClickAction ) - { - case ClickAction_NONE: - case ClickAction_PREVPAGE: - case ClickAction_NEXTPAGE: - case ClickAction_FIRSTPAGE: - case ClickAction_LASTPAGE: - case ClickAction_INVISIBLE: - case ClickAction_STOPPRESENTATION: - break; - case ClickAction_PROGRAM: - case ClickAction_VERB: - case ClickAction_BOOKMARK: - case ClickAction_DOCUMENT: + sal_Int32 nPropertyCount = 2; + switch( meClickAction ) + { + case ClickAction_NONE: + case ClickAction_PREVPAGE: + case ClickAction_NEXTPAGE: + case ClickAction_FIRSTPAGE: + case ClickAction_LASTPAGE: + case ClickAction_INVISIBLE: + case ClickAction_STOPPRESENTATION: + break; + case ClickAction_PROGRAM: + case ClickAction_VERB: + case ClickAction_BOOKMARK: + case ClickAction_DOCUMENT: + nPropertyCount += 1; + break; + case ClickAction_MACRO: + if ( msLanguage.equalsIgnoreAsciiCase("starbasic") ) nPropertyCount += 1; - break; - case ClickAction_MACRO: - if ( msLanguage.equalsIgnoreAsciiCase("starbasic") ) - nPropertyCount += 1; - break; + break; - case ClickAction_SOUND: - nPropertyCount += 2; - break; + case ClickAction_SOUND: + nPropertyCount += 2; + break; - case ClickAction_VANISH: - nPropertyCount += 4; - break; - default: - break; - } + case ClickAction_VANISH: + nPropertyCount += 4; + break; + default: + break; + } - aProperties.realloc( nPropertyCount ); - beans::PropertyValue* pProperties = aProperties.getArray(); + aProperties.realloc( nPropertyCount ); + beans::PropertyValue* pProperties = aProperties.getArray(); - if( ClickAction_MACRO == meClickAction ) + if( ClickAction_MACRO == meClickAction ) + { + if ( msLanguage.equalsIgnoreAsciiCase("starbasic") ) { - if ( msLanguage.equalsIgnoreAsciiCase("starbasic") ) + OUString sLibrary; + const OUString& rApp = GetXMLToken( XML_APPLICATION ); + const OUString& rDoc = GetXMLToken( XML_DOCUMENT ); + if( msMacroName.getLength() > rApp.getLength()+1 && + msMacroName.copy(0,rApp.getLength()).equalsIgnoreAsciiCase( rApp ) && + ':' == msMacroName[rApp.getLength()] ) { - OUString sLibrary; - const OUString& rApp = GetXMLToken( XML_APPLICATION ); - const OUString& rDoc = GetXMLToken( XML_DOCUMENT ); - if( msMacroName.getLength() > rApp.getLength()+1 && - msMacroName.copy(0,rApp.getLength()).equalsIgnoreAsciiCase( rApp ) && - ':' == msMacroName[rApp.getLength()] ) - { - sLibrary = "StarOffice"; - msMacroName = msMacroName.copy( rApp.getLength()+1 ); - } - else if( msMacroName.getLength() > rDoc.getLength()+1 && - msMacroName.copy(0,rDoc.getLength()).equalsIgnoreAsciiCase( rDoc ) && - ':' == msMacroName[rDoc.getLength()] ) - { - sLibrary = rDoc; - msMacroName = msMacroName.copy( rDoc.getLength()+1 ); - } - - pProperties->Name = "EventType"; - pProperties->Handle = -1; - pProperties->Value <<= OUString( "StarBasic" ); - pProperties->State = beans::PropertyState_DIRECT_VALUE; - pProperties++; - - pProperties->Name = "MacroName"; - pProperties->Handle = -1; - pProperties->Value <<= msMacroName; - pProperties->State = beans::PropertyState_DIRECT_VALUE; - pProperties++; - - pProperties->Name = "Library"; - pProperties->Handle = -1; - pProperties->Value <<= sLibrary; - pProperties->State = beans::PropertyState_DIRECT_VALUE; + sLibrary = "StarOffice"; + msMacroName = msMacroName.copy( rApp.getLength()+1 ); } - else + else if( msMacroName.getLength() > rDoc.getLength()+1 && + msMacroName.copy(0,rDoc.getLength()).equalsIgnoreAsciiCase( rDoc ) && + ':' == msMacroName[rDoc.getLength()] ) { - pProperties->Name = "EventType"; - pProperties->Handle = -1; - pProperties->Value <<= OUString( "Script" ); - pProperties->State = beans::PropertyState_DIRECT_VALUE; - pProperties++; - - pProperties->Name = "Script"; - pProperties->Handle = -1; - pProperties->Value <<= msMacroName; - pProperties->State = beans::PropertyState_DIRECT_VALUE; + sLibrary = rDoc; + msMacroName = msMacroName.copy( rDoc.getLength()+1 ); } + + pProperties->Name = "EventType"; + pProperties->Handle = -1; + pProperties->Value <<= OUString( "StarBasic" ); + pProperties->State = beans::PropertyState_DIRECT_VALUE; + pProperties++; + + pProperties->Name = "MacroName"; + pProperties->Handle = -1; + pProperties->Value <<= msMacroName; + pProperties->State = beans::PropertyState_DIRECT_VALUE; + pProperties++; + + pProperties->Name = "Library"; + pProperties->Handle = -1; + pProperties->Value <<= sLibrary; + pProperties->State = beans::PropertyState_DIRECT_VALUE; } else { pProperties->Name = "EventType"; pProperties->Handle = -1; - pProperties->Value <<= OUString( "Presentation" ); + pProperties->Value <<= OUString( "Script" ); pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - // ClickAction_BOOKMARK and ClickAction_DOCUMENT share the same xml event - // so check here if its really a bookmark or maybe a document - if( meClickAction == ClickAction_BOOKMARK ) - { - if( !msBookmark.startsWith( "#" ) ) - meClickAction = ClickAction_DOCUMENT; - } - - pProperties->Name = "ClickAction"; + pProperties->Name = "Script"; pProperties->Handle = -1; - pProperties->Value <<= meClickAction; + pProperties->Value <<= msMacroName; pProperties->State = beans::PropertyState_DIRECT_VALUE; - pProperties++; + } + } + else + { + pProperties->Name = "EventType"; + pProperties->Handle = -1; + pProperties->Value <<= OUString( "Presentation" ); + pProperties->State = beans::PropertyState_DIRECT_VALUE; + pProperties++; + + // ClickAction_BOOKMARK and ClickAction_DOCUMENT share the same xml event + // so check here if its really a bookmark or maybe a document + if( meClickAction == ClickAction_BOOKMARK ) + { + if( !msBookmark.startsWith( "#" ) ) + meClickAction = ClickAction_DOCUMENT; + } - switch( meClickAction ) - { + pProperties->Name = "ClickAction"; + pProperties->Handle = -1; + pProperties->Value <<= meClickAction; + pProperties->State = beans::PropertyState_DIRECT_VALUE; + pProperties++; + + switch( meClickAction ) + { case ClickAction_NONE: case ClickAction_PREVPAGE: case ClickAction_NEXTPAGE: @@ -448,8 +448,8 @@ void SdXMLEventContext::EndElement() break; default: break; - } } + } xEvents->replaceByName( sAPIEventName, uno::Any( aProperties ) ); } while(false); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 529aabcb4a3e..41dc67caea15 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -420,7 +420,7 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent mpPresPagePropsMapper = new XMLPageExportPropertyMapper( xMapper, *this ); // add family name - GetAutoStylePool()->AddFamily( + GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetPropertySetMapper(), diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index dbf967bd6547..018e3f704452 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3442,7 +3442,7 @@ SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPr SdXMLPluginShapeContext* pPluginContext = dynamic_cast<SdXMLPluginShapeContext*>(pShapeContext); if( pPluginContext && pPluginContext->getMimeType() == "model/vnd.gltf+json" ) { - mxImplContext = nullptr; + mxImplContext = nullptr; return new SvXMLImportContext(GetImport(), nPrefix, rLocalName); } } diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 237fee20a63e..01f0f3e9e659 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -637,7 +637,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() { mnTypeId = AUTOLAYOUT_4CLIPART; } - break; + break; } case 7: diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 8ff178e015d9..1642fcfd8247 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -985,8 +985,8 @@ namespace xmloff ( *pAttributeId == SCAFlags::FocusOnClick ) ? BoolAttrFlags::DefaultTrue : BoolAttrFlags::DefaultFalse ); #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - m_nIncludeSpecial = m_nIncludeSpecial & ~*pAttributeId; + // reset the bit for later checking + m_nIncludeSpecial = m_nIncludeSpecial & ~*pAttributeId; #endif } } @@ -1026,8 +1026,8 @@ namespace xmloff nIntegerPropertyAttrDefaults[i] ); #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - m_nIncludeSpecial = m_nIncludeSpecial & ~nIntegerPropertyAttributeIds[i]; + // reset the bit for later checking + m_nIncludeSpecial = m_nIncludeSpecial & ~nIntegerPropertyAttributeIds[i]; #endif } @@ -1169,8 +1169,8 @@ namespace xmloff pStringPropertyNames[i] ); #if OSL_DEBUG_LEVEL > 0 - // reset the bit for later checking - m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i]; + // reset the bit for later checking + m_nIncludeSpecial = m_nIncludeSpecial & ~nStringPropertyAttributeIds[i]; #endif } } diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index e234ce5cf132..8adb230b5b62 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -363,7 +363,7 @@ namespace xmloff Sequence< sal_Int16 > aPropertyValueList( aXMLValueList.getLength() ); const Any* pXMLValue = aXMLValueList.getConstArray(); - sal_Int16* pPropValue = aPropertyValueList.getArray(); + sal_Int16* pPropValue = aPropertyValueList.getArray(); for ( sal_Int32 i=0; i<aXMLValueList.getLength(); ++i, ++pXMLValue, ++pPropValue ) { diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index 6b0fee7b2e87..f732118feb80 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -46,7 +46,7 @@ bool DrawAspectHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, c bool DrawAspectHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const { bool bRet = false; - OUStringBuffer aOut; + OUStringBuffer aOut; sal_Int64 nAspect = 0; if( ( rValue >>= nAspect ) && nAspect > 0 ) diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index 987d4390dc68..c70a23b4dbe9 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -90,7 +90,7 @@ void XMLImageStyle::exportXML(OUString const & rStrName, uno::Any const & rValue bool XMLImageStyle::importXML(uno::Reference<xml::sax::XAttributeList> const & xAttrList, uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport) { - static const SvXMLTokenMapEntry aHatchAttrTokenMap[] = + static const SvXMLTokenMapEntry aHatchAttrTokenMap[] = { { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_IMAGE_NAME }, { XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, XML_TOK_IMAGE_DISPLAY_NAME }, diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index beff02ecc549..610a948cf491 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -251,7 +251,7 @@ void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& r { table::BorderLine2 aBorderLine; pBorders[i]->maValue >>= aBorderLine; - if( pBorderWidths[i] ) + if( pBorderWidths[i] ) { table::BorderLine2 aBorderLineWidth; pBorderWidths[i]->maValue >>= aBorderLineWidth; @@ -274,7 +274,7 @@ void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& r { table::BorderLine2 aBorderLine; pHeaderBorders[i]->maValue >>= aBorderLine; - if( pHeaderBorderWidths[i] ) + if( pHeaderBorderWidths[i] ) { table::BorderLine2 aBorderLineWidth; pHeaderBorderWidths[i]->maValue >>= aBorderLineWidth; @@ -297,7 +297,7 @@ void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& r { table::BorderLine2 aBorderLine; pFooterBorders[i]->maValue >>= aBorderLine; - if( pFooterBorderWidths[i] ) + if( pFooterBorderWidths[i] ) { table::BorderLine2 aBorderLineWidth; pFooterBorderWidths[i]->maValue >>= aBorderLineWidth; diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index 1beaa5debdca..250063f15858 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -110,7 +110,7 @@ bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::Any& bool XMLClipPropertyHandler::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { bool bRet = false; - OUStringBuffer aOut(30); + OUStringBuffer aOut(30); GraphicCrop aCrop; if( rValue >>= aCrop ) diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx index b91fd45cb25b..bc0e20b7c0ca 100644 --- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx +++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx @@ -62,7 +62,7 @@ bool XMLPercentOrMeasurePropertyHandler::exportXML( const Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { - OUStringBuffer aOut; + OUStringBuffer aOut; sal_Int32 nValue = 0; if( !(rValue >>= nValue ) ) diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index b3c2739aa1db..278692040b8a 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -121,7 +121,7 @@ bool XMLShadowPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue bool XMLShadowPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const { bool bRet = false; - OUStringBuffer aOut; + OUStringBuffer aOut; table::ShadowFormat aShadow; if( rValue >>= aShadow ) diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index 9eb8d01c5092..488a5873f83b 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -193,7 +193,7 @@ bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co { bool bRet = false; sal_Int32 nValue; - OUStringBuffer aOut; + OUStringBuffer aOut; if( lcl_xmloff_getAny( rValue, nValue, nBytes ) ) { @@ -309,7 +309,7 @@ bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co { bool bRet = false; sal_Int32 nValue; - OUStringBuffer aOut; + OUStringBuffer aOut; if( lcl_xmloff_getAny( rValue, nValue, nBytes ) ) { @@ -387,7 +387,7 @@ bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, { bool bRet = false; sal_Int32 nValue; - OUStringBuffer aOut; + OUStringBuffer aOut; if( lcl_xmloff_getAny( rValue, nValue, nBytes ) ) { @@ -418,7 +418,7 @@ bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, { bool bRet = false; sal_Int32 nValue; - OUStringBuffer aOut; + OUStringBuffer aOut; if( lcl_xmloff_getAny( rValue, nValue, nBytes ) ) { diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index e2e3d14b230d..5fc0ff9c8d34 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -211,7 +211,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) void XMLTableExport::collectTableAutoStyles(const Reference < XColumnRowRange >& xColumnRowRange) { - if( !mbExportTables ) + if( !mbExportTables ) return; std::shared_ptr< XMLTableInfo > xTableInfo( new XMLTableInfo ); @@ -221,9 +221,9 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) { Reference< XIndexAccess > xIndexAccessCols( xColumnRowRange->getColumns(), UNO_QUERY_THROW ); const sal_Int32 nColumnCount = xIndexAccessCols->getCount(); - for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) try + for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) try { - Reference< XPropertySet > xPropSet( xIndexAccessCols->getByIndex(nColumn) , UNO_QUERY_THROW ); + Reference< XPropertySet > xPropSet( xIndexAccessCols->getByIndex(nColumn) , UNO_QUERY_THROW ); std::vector< XMLPropertyState > aPropStates( mxColumnExportPropertySetMapper->Filter( xPropSet ) ); if( has_states( aPropStates ) ) @@ -244,9 +244,10 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) StringStatisticHelper aStringStatistic; - for( sal_Int32 nRow = 0; nRow < nRowCount; ++nRow ) try + for( sal_Int32 nRow = 0; nRow < nRowCount; ++nRow ) + try { - Reference< XPropertySet > xPropSet( xIndexAccessRows->getByIndex(nRow) , UNO_QUERY_THROW ); + Reference< XPropertySet > xPropSet( xIndexAccessRows->getByIndex(nRow) , UNO_QUERY_THROW ); std::vector< XMLPropertyState > aRowPropStates( mxRowExportPropertySetMapper->Filter( xPropSet ) ); if( has_states( aRowPropStates ) ) @@ -381,7 +382,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) void XMLTableExport::ExportTableColumns( const Reference < XIndexAccess >& xtableColumnsIndexAccess, const std::shared_ptr< XMLTableInfo >& rTableInfo ) { const sal_Int32 nColumnCount = xtableColumnsIndexAccess->getCount(); - for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) + for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) { Reference< XPropertySet > xColumnProperties( xtableColumnsIndexAccess->getByIndex(nColumn) , UNO_QUERY ); if ( xColumnProperties.is() ) @@ -395,10 +396,10 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, sStyleName ); } - // TODO: All columns first have to be checked if some ones - // have identical properties. If yes, attr table:number-columns-repeated - // has to be written. - SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); + // TODO: All columns first have to be checked if some ones + // have identical properties. If yes, attr table:number-columns-repeated + // has to be written. + SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); } } } @@ -467,7 +468,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) void XMLTableExport::exportTableStyles() { - if( !mbExportTables ) + if( !mbExportTables ) return; rtl::Reference<XMLStyleExport> aStEx; @@ -493,7 +494,7 @@ void XMLTableExport::exportTableStyles() void XMLTableExport::exportAutoStyles() { - if( !mbExportTables ) + if( !mbExportTables ) return; mrExport.GetAutoStylePool()->exportXML( XML_STYLE_FAMILY_TABLE_COLUMN ); @@ -553,7 +554,7 @@ static const TableStyleElement* getWriterSpecificTableStyleAttributes() void XMLTableExport::exportTableTemplates() { - if( !mbExportTables ) + if( !mbExportTables ) return; try @@ -610,7 +611,7 @@ void XMLTableExport::exportTableTemplates() mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, GetExport().EncodeStyleName(xTableStyle->getName())); } - SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true ); + SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true ); Reference< XNameAccess > xStyleNames( xTableStyle, UNO_QUERY_THROW ); pElements = getTableStyleMap(); @@ -622,7 +623,7 @@ void XMLTableExport::exportTableTemplates() if( xStyle.is() ) { mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, GetExport().EncodeStyleName( xStyle->getName() ) ); - SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, true, true ); + SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, true, true ); } } catch(const Exception&) diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx index ab547fce279d..6c39b33a74e8 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx @@ -149,7 +149,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues( } // tab character #i21237# - pValues[nNextEntry].Name = "WithTab"; + pValues[nNextEntry].Name = "WithTab"; pValues[nNextEntry].Value <<= bWithTab; nNextEntry++; diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 3cc6d74b0966..a1a6a7bc32cd 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -103,11 +103,11 @@ void XMLIndexTableSourceContext::ProcessAttribute( sal_uInt16 nTmp; if (SvXMLUnitConverter::convertEnum(nTmp, rValue, lcl_aReferenceTypeTokenMap)) - { + { nDisplayFormat = nTmp; bDisplayFormatOK = true; } - break; + break; } default: diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 7d7410091a42..848fae8c9ae5 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -181,7 +181,7 @@ void XMLTextNumRuleInfo::Set( sal_Int32 nCount = aProps.getLength(); for( sal_Int32 i=0; i<nCount; i++ ) { - const PropertyValue& rProp = pPropArray[i]; + const PropertyValue& rProp = pPropArray[i]; if ( rProp.Name == "StartWith" ) { diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 59219712791b..f724fb8faf96 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -53,7 +53,7 @@ XMLTextShapeImportHelper::XMLTextShapeImportHelper( Reference < XDrawPageSupplier > xDPS( rImp.GetModel(), UNO_QUERY ); if( xDPS.is() ) { - Reference < XShapes > xShapes( xDPS->getDrawPage(), UNO_QUERY ); + Reference < XShapes > xShapes( xDPS->getDrawPage(), UNO_QUERY ); pushGroupForSorting( xShapes ); } diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index aa048c585485..f37f11561002 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2077,10 +2077,10 @@ void XMLFileNameImportContext::PrepareField( Reference<XPropertySetInfo> xPropertySetInfo( xPropertySet->getPropertySetInfo()); - if (xPropertySetInfo->hasPropertyByName(sPropertyFixed)) - { + if (xPropertySetInfo->hasPropertyByName(sPropertyFixed)) + { xPropertySet->setPropertyValue(sPropertyFixed, Any(bFixed)); - } + } if (xPropertySetInfo->hasPropertyByName(sPropertyFileFormat)) { diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index ee41e82b40be..adf236bbeb98 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -200,11 +200,11 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( { aAny <<= OUString(); #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG - sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( + sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( pFontFamilyName->mnIndex + 1 ); - assert(nTmp == CTF_FONTSTYLENAME || nTmp == CTF_FONTSTYLENAME_CJK || nTmp == CTF_FONTSTYLENAME_CTL); + assert(nTmp == CTF_FONTSTYLENAME || nTmp == CTF_FONTSTYLENAME_CJK || nTmp == CTF_FONTSTYLENAME_CTL); #endif - ppNewFontStyleName->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 1, + ppNewFontStyleName->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 1, aAny )); } @@ -213,11 +213,11 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( aAny <<= sal_Int16(css::awt::FontFamily::DONTKNOW); #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG - sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( + sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( pFontFamilyName->mnIndex + 2 ); - assert(nTmp == CTF_FONTFAMILY || nTmp == CTF_FONTFAMILY_CJK || nTmp == CTF_FONTFAMILY_CTL); + assert(nTmp == CTF_FONTFAMILY || nTmp == CTF_FONTFAMILY_CJK || nTmp == CTF_FONTFAMILY_CTL); #endif - ppNewFontFamily->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 2, + ppNewFontFamily->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 2, aAny )); } @@ -225,11 +225,11 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( { aAny <<= sal_Int16(css::awt::FontPitch::DONTKNOW); #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG - sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( + sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( pFontFamilyName->mnIndex + 3 ); - assert(nTmp == CTF_FONTPITCH || nTmp == CTF_FONTPITCH_CJK || nTmp == CTF_FONTPITCH_CTL); + assert(nTmp == CTF_FONTPITCH || nTmp == CTF_FONTPITCH_CJK || nTmp == CTF_FONTPITCH_CTL); #endif - ppNewFontPitch->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 3, + ppNewFontPitch->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 3, aAny )); } @@ -237,11 +237,11 @@ void XMLTextImportPropertyMapper::FontDefaultsCheck( { aAny <<= static_cast<sal_Int16>(osl_getThreadTextEncoding()); #if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG - sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( + sal_Int16 nTmp = getPropertySetMapper()->GetEntryContextId( pFontFamilyName->mnIndex + 4 ); - assert(nTmp == CTF_FONTCHARSET || nTmp == CTF_FONTCHARSET_CJK || nTmp == CTF_FONTCHARSET_CTL); + assert(nTmp == CTF_FONTCHARSET || nTmp == CTF_FONTCHARSET_CJK || nTmp == CTF_FONTCHARSET_CTL); #endif - ppNewFontCharSet->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 4, + ppNewFontCharSet->reset(new XMLPropertyState( pFontFamilyName->mnIndex + 4, aAny )); } } diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx index 103b4cc3ef40..543682d207ec 100644 --- a/xmloff/source/text/txtstyle.cxx +++ b/xmloff/source/text/txtstyle.cxx @@ -91,7 +91,7 @@ void XMLTextParagraphExport::exportStyleAttributes( { xPropSet->getPropertyValue( gsPageDescName ) >>= sName; // fix for #i5551# if( sName.getLength() > 0 ) - GetExport().AddAttribute( XML_NAMESPACE_STYLE, + GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME, GetExport().EncodeStyleName( sName ) ); } @@ -99,7 +99,7 @@ void XMLTextParagraphExport::exportStyleAttributes( if( bProgress ) { ProgressBarHelper *pProgress = GetExport().GetProgressBarHelper(); - pProgress->SetValue( pProgress->GetValue()+2 ); + pProgress->SetValue( pProgress->GetValue()+2 ); } } diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 6e8aad50b037..1c3fdf367da9 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1814,7 +1814,7 @@ Any OOo2OasisTransformer::queryInterface( const Type& rType ) if ( rType == cppu::UnoType<XImporter>::get()) { Reference<XImporter> xThis( this ); - aRet <<= xThis; + aRet <<= xThis; } else if ( rType == cppu::UnoType<XFilter>::get()) { diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 1b864ae662c1..a62f0dcee1e9 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -824,7 +824,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( XMLTransformerContext* pFirstContext = m_vContexts[0].get(); OUString aFirstContextLocalName; /* sal_uInt16 nFirstContextPrefix = */ - GetNamespaceMap().GetKeyByAttrName( pFirstContext->GetQName(), + GetNamespaceMap().GetKeyByAttrName( pFirstContext->GetQName(), &aFirstContextLocalName ); bool bIsDocumentStyle( ::xmloff::token::IsXMLToken( aFirstContextLocalName, commit 2fab2c9d494035cc55d0bc56a47e784be6e64510 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Sun Feb 10 12:29:29 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Feb 11 07:01:14 2019 +0100 loplugin:indentation in vcl Change-Id: Idd7166833764fdf1d9c42a050490572a8b330199 Reviewed-on: https://gerrit.libreoffice.org/67610 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index c1634351f0ad..8b49913d394f 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -462,7 +462,7 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer, void) else { SAL_WARN_IF( pTimer != &maHideTimer, "vcl", "HelpTextWindow::TimerHdl with bad Timer" ); - ImplDestroyHelpWindow( true ); + ImplDestroyHelpWindow( true ); } } diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index c543732630de..1c91dc01a721 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -221,7 +221,7 @@ int ImplSVMain() SolarMutexReleaser aReleaser; pSVData->mxAccessBridge->dispose(); } - pSVData->mxAccessBridge.clear(); + pSVData->mxAccessBridge.clear(); } #if HAVE_FEATURE_OPENGL diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index dc1a66e530f9..a18b50e75191 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -288,7 +288,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const for( n = 1; n < nLines; n++ ) mpControlData->mpLayoutData->m_aLineIndices.push_back( rSubControl.mpControlData->mpLayoutData->m_aLineIndices[n] + nCurrentIndex ); int nRectangles = rSubControl.mpControlData->mpLayoutData->m_aUnicodeBoundRects.size(); - tools::Rectangle aRel = const_cast<Control&>(rSubControl).GetWindowExtentsRelative( const_cast<Control*>(this) ); + tools::Rectangle aRel = const_cast<Control&>(rSubControl).GetWindowExtentsRelative( const_cast<Control*>(this) ); for( n = 0; n < nRectangles; n++ ) { tools::Rectangle aRect = rSubControl.mpControlData->mpLayoutData->m_aUnicodeBoundRects[n]; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index d444bc8c678e..43d6520bfbab 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -741,7 +741,7 @@ bool NumericField::set_property(const OString &rKey, const OUString &rValue) bool NumericField::PreNotify( NotifyEvent& rNEvt ) { - if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) + if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplNumericProcessKeyInput( *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) return true; diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 29d7f171ad39..0dff697a6391 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -154,7 +154,7 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz { const Point aPos = pDev->LogicToPixel( rPos ); const Size aSize = pDev->LogicToPixel( rSize ); - tools::Rectangle aRect( aPos, aSize ); + tools::Rectangle aRect( aPos, aSize ); pDev->Push(); pDev->SetMapMode(); diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx index e7b94551c5cc..e55ea57547c3 100644 --- a/vcl/source/control/notebookbar.cxx +++ b/vcl/source/control/notebookbar.cxx @@ -196,8 +196,8 @@ void NotebookBar::UpdateBackground() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const BitmapEx& aPersona = rStyleSettings.GetPersonaHeader(); - Wallpaper aWallpaper(aPersona); - aWallpaper.SetStyle(WallpaperStyle::TopRight); + Wallpaper aWallpaper(aPersona); + aWallpaper.SetStyle(WallpaperStyle::TopRight); if (!aPersona.IsEmpty()) { SetBackground(aWallpaper); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index f64622354fdf..3ba002e6cdff 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -125,7 +125,7 @@ void ImpVclMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) const bool bHaveHScroll = (nullptr != mpHScrollBar); const bool bHaveScrollBox = (nullptr != mpScrollBox); - bool bNeedVScroll = ( nWinStyle & WB_VSCROLL ) == WB_VSCROLL; + bool bNeedVScroll = ( nWinStyle & WB_VSCROLL ) == WB_VSCROLL; const bool bNeedHScroll = ( nWinStyle & WB_HSCROLL ) == WB_HSCROLL; const bool bAutoVScroll = ( nWinStyle & WB_AUTOVSCROLL ) == WB_AUTOVSCROLL; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index d78e054a9a87..74bd19f35187 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -831,10 +831,10 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r aMap.SetScaleY( aFrac ); Size aOldSize = aBitmap.GetSizePixel(); - aGraphic = rGraphic; - aGraphic.SetPrefMapMode( aMap ); - aGraphic.SetPrefSize( Size( aOldSize.Width() * 100, - aOldSize.Height() * 100 ) ); + aGraphic = rGraphic; + aGraphic.SetPrefMapMode( aMap ); + aGraphic.SetPrefSize( Size( aOldSize.Width() * 100, + aOldSize.Height() * 100 ) ); } // Size is set else if( nMode == 2 ) diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 52d86c92b188..c3200c53020d 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -595,13 +595,13 @@ void EMFWriter::ImplWriteExtent( long nExtent ) void EMFWriter::ImplWritePoint( const Point& rPoint ) { const Point aPoint( OutputDevice::LogicToLogic( rPoint, maVDev->GetMapMode(), maDestMapMode )); - m_rStm.WriteInt32( aPoint.X() ).WriteInt32( aPoint.Y() ); + m_rStm.WriteInt32( aPoint.X() ).WriteInt32( aPoint.Y() ); } void EMFWriter::ImplWriteSize( const Size& rSize) { const Size aSize( OutputDevice::LogicToLogic( rSize, maVDev->GetMapMode(), maDestMapMode )); - m_rStm.WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() ); + m_rStm.WriteInt32( aSize.Width() ).WriteInt32( aSize.Height() ); } void EMFWriter::ImplWriteRect( const tools::Rectangle& rRect ) diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index f787401fba1b..6b656970752f 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1612,16 +1612,16 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) default: // TODO: Implement more cases as necessary. Let's not bother with a warning. break; - } + } - nWrittenActions++; - MayCallback(); + nWrittenActions++; + MayCallback(); - if (pWMF->GetError()) - bStatus=false; + if (pWMF->GetError()) + bStatus=false; - if(!bStatus) - break; + if(!bStatus) + break; } } } diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index ef230704cd66..ade0a6607a8f 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -1109,10 +1109,10 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const writeType1Val( 0); // TODO: aSubsetterContext.getLeftSideBearing(); writeType1Val( 1000/*###getCharWidth()###*/); writeTypeOp( TYPE1OP::HSBW); -mbNeedClose = false; -mbIgnoreHints = false; -mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//####### -mnCntrMask = 0; + mbNeedClose = false; + mbIgnoreHints = false; + mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//####### + mnCntrMask = 0; while( mpReadPtr < mpReadEnd) convertOneTypeOp(); // if( bActivePath) @@ -1496,7 +1496,7 @@ int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const return -1; // get the SID/CID from the Charset table - const U8* pReadPtr = mpBasePtr + mnCharsetBase; + const U8* pReadPtr = mpBasePtr + mnCharsetBase; const U8 nCSetFormat = *(pReadPtr++); int nGlyphsToSkip = nGlyphIndex - 1; switch( nCSetFormat) { @@ -1566,7 +1566,7 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex) sprintf( aDefaultGlyphName, "bad%03d", nSID); } - return pGlyphName; + return pGlyphName; } class Type1Emitter @@ -1984,10 +1984,10 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, rEmitter.emitAllCrypted(); // mark stop of eexec encryption - if( rEmitter.mbPfbSubset) { + if( rEmitter.mbPfbSubset) { const int nEExecLen = rEmitter.tellPos() - nEExecSegTell; rEmitter.updateLen( nEExecSegTell-4, nEExecLen); - } + } // create PFB footer static const char aPfxFooter[] = "\x80\x01\x14\x02\x00\x00\n" // TODO: check segment len diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index 3dd7ded0b141..e60009519a34 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -145,8 +145,8 @@ void Gradient::GetBoundRect( const tools::Rectangle& rRect, tools::Rectangle& rB fHeight * fabs( sin( fAngle ) ); double fDY = fHeight * fabs( cos( fAngle ) ) + fWidth * fabs( sin( fAngle ) ); - fDX = (fDX - fWidth) * 0.5 + 0.5; - fDY = (fDY - fHeight) * 0.5 + 0.5; + fDX = (fDX - fWidth) * 0.5 + 0.5; + fDY = (fDY - fHeight) * 0.5 + 0.5; aRect.AdjustLeft( -static_cast<long>(fDX) ); aRect.AdjustRight(static_cast<long>(fDX) ); aRect.AdjustTop( -static_cast<long>(fDY) ); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 8a6bbbd5cf76..91abacfde3be 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1458,7 +1458,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) if( !!maBmp ) { MetaAction::Write(rOStm, pData); - VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); + VersionCompat aCompat(rOStm, StreamMode::WRITE, 1); WriteDIB(maBmp, rOStm, false, true); WritePair( rOStm, maPt ); } diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index f41b743cbaaf..df90d4592c80 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -149,7 +149,7 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter ) { case PDFExtOutDevDataSync::CreateNamedDest : //i56629 { - rWriter.Push( PushFlags::MAPMODE ); + rWriter.Push( PushFlags::MAPMODE ); rWriter.SetMapMode( mParaMapModes.front() ); mParaMapModes.pop_front(); mParaIds.push_back( rWriter.CreateNamedDest( mParaOUStrings.front(), mParaRects.front(), mParaInts.front(), mParaDestAreaTypes.front() ) ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index cdcfdc00bd3b..fdfc4cdabade 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -5401,8 +5401,8 @@ sal_Int32 PDFWriterImpl::emitInfoDict( ) aLine.append( "\n" ); } - aLine.append( "/CreationDate" ); - appendLiteralStringEncrypt( m_aCreationDateString, nObject, aLine ); + aLine.append( "/CreationDate" ); + appendLiteralStringEncrypt( m_aCreationDateString, nObject, aLine ); aLine.append( ">>\nendobj\n\n" ); if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) ) nObject = 0; diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx index 68d3b45b6451..7d89a8b7ca70 100644 --- a/vcl/source/graphic/UnoGraphicDescriptor.cxx +++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx @@ -319,7 +319,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** else aMimeType = maMimeType; - *pValues <<= aMimeType; + *pValues <<= aMimeType; } break; diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 630d99234273..fad0604920e0 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -293,14 +293,14 @@ void OutputDevice::DrawLinearGradient( const tools::Rectangle& rRect, long nEndRed = aEndCol.GetRed(); long nEndGreen = aEndCol.GetGreen(); long nEndBlue = aEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nStartRed = (nStartRed * nFactor) / 100; - nStartGreen = (nStartGreen * nFactor) / 100; - nStartBlue = (nStartBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; + nFactor = rGradient.GetStartIntensity(); + nStartRed = (nStartRed * nFactor) / 100; + nStartGreen = (nStartGreen * nFactor) / 100; + nStartBlue = (nStartBlue * nFactor) / 100; + nFactor = rGradient.GetEndIntensity(); + nEndRed = (nEndRed * nFactor) / 100; + nEndGreen = (nEndGreen * nFactor) / 100; + nEndBlue = (nEndBlue * nFactor) / 100; // gradient style axial has exchanged start and end colors if ( !bLinear) @@ -651,14 +651,14 @@ void OutputDevice::DrawLinearGradientToMetafile( const tools::Rectangle& rRect, long nEndRed = aEndCol.GetRed(); long nEndGreen = aEndCol.GetGreen(); long nEndBlue = aEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nStartRed = (nStartRed * nFactor) / 100; - nStartGreen = (nStartGreen * nFactor) / 100; - nStartBlue = (nStartBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; + nFactor = rGradient.GetStartIntensity(); + nStartRed = (nStartRed * nFactor) / 100; + nStartGreen = (nStartGreen * nFactor) / 100; + nStartBlue = (nStartBlue * nFactor) / 100; + nFactor = rGradient.GetEndIntensity(); + nEndRed = (nEndRed * nFactor) / 100; + nEndGreen = (nEndGreen * nFactor) / 100; + nEndBlue = (nEndBlue * nFactor) / 100; // gradient style axial has exchanged start and end colors if ( !bLinear) diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 054c92d068e8..45b9848c051a 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -281,7 +281,7 @@ void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, { long w = IsVirtual() ? mnOutWidth : mpGraphics->GetGraphicsWidth(); long x = rSalLayout.DrawBase().X(); - rSalLayout.DrawBase().setX( w - 1 - x ); + rSalLayout.DrawBase().setX( w - 1 - x ); if( !IsRTLEnabled() ) { OutputDevice *pOutDevRef = this; diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index cdd18ce04ed1..e8d927634960 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -1019,8 +1019,8 @@ void SvImpLBox::DrawNet(vcl::RenderContext& rRenderContext) // for platforms that don't have nets, DrawNativeControl does nothing and returns true // so that SvImpLBox::DrawNet() doesn't draw anything either - if (rRenderContext.IsNativeControlSupported(ControlType::ListNet, ControlPart::Entire)) - { + if (rRenderContext.IsNativeControlSupported(ControlType::ListNet, ControlPart::Entire)) + { ImplControlValue aControlValue; if (rRenderContext.DrawNativeControl(ControlType::ListNet, ControlPart::Entire, tools::Rectangle(), ControlState::ENABLED, aControlValue, OUString())) diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx index 40110d951b43..cc7b97ba02df 100644 --- a/vcl/source/treelist/transfer.cxx +++ b/vcl/source/treelist/transfer.cxx @@ -2093,7 +2093,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xSelection; - TransferableDataHelper aRet; + TransferableDataHelper aRet; if( pWindow ) xSelection = pWindow->GetPrimarySelection(); diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx index a5a698e076f0..9d959d02bf8c 100644 --- a/vcl/source/treelist/transfer2.cxx +++ b/vcl/source/treelist/transfer2.cxx @@ -387,12 +387,12 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) else *pImpl->pBookmk = rBkmk; - AddFormat( SotClipboardFormatId::STRING ); - AddFormat( SotClipboardFormatId::SOLK ); - AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ); - AddFormat( SotClipboardFormatId::FILECONTENT ); - AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR ); - AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ); + AddFormat( SotClipboardFormatId::STRING ); + AddFormat( SotClipboardFormatId::SOLK ); + AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK ); + AddFormat( SotClipboardFormatId::FILECONTENT ); + AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR ); + AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ); } @@ -408,7 +408,7 @@ void TransferDataContainer::CopyAnyData( SotClipboardFormatId nFormatId, memcpy( aSeq.getArray(), pData, nLen ); aEntry.aAny <<= aSeq; pImpl->aFmtList.push_back( aEntry ); - AddFormat( nFormatId ); + AddFormat( nFormatId ); } } @@ -428,7 +428,7 @@ void TransferDataContainer::CopyString( SotClipboardFormatId nFmt, const OUStrin aEntry.nId = nFmt; aEntry.aAny <<= rStr; pImpl->aFmtList.push_back( aEntry ); - AddFormat( aEntry.nId ); + AddFormat( aEntry.nId ); } } diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index a988a4966bc2..3a5e31baf8d2 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -173,7 +173,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const vcl::KeyCode& rKeyC sal_uInt16 nCode1; sal_uInt16 nCode2; sal_uInt16 nCode3; - sal_uInt16 nCode4; + sal_uInt16 nCode4; ImplGetKeyCode( rKeyCode.GetFunction(), nCode1, nCode2, nCode3, nCode4 ); if ( nCode1 ) ImplInsertAccel( nItemId, vcl::KeyCode( nCode1, nCode1 ), bEnable, pAutoAccel ); diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index de117cce9554..a4e800373347 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -421,7 +421,7 @@ sal_uInt16 Window::GetAccessibleRole() const void Window::SetAccessibleName( const OUString& rName ) { - if ( !mpWindowImpl->mpAccessibleInfos ) + if ( !mpWindowImpl->mpAccessibleInfos ) mpWindowImpl->mpAccessibleInfos.reset( new ImplAccessibleInfos ); OUString oldName = GetAccessibleName(); @@ -506,7 +506,7 @@ OUString Window::getDefaultAccessibleName() const void Window::SetAccessibleDescription( const OUString& rDescription ) { - if ( ! mpWindowImpl->mpAccessibleInfos ) + if ( ! mpWindowImpl->mpAccessibleInfos ) mpWindowImpl->mpAccessibleInfos.reset( new ImplAccessibleInfos ); SAL_WARN_IF( mpWindowImpl->mpAccessibleInfos->pAccessibleDescription, "vcl", "AccessibleDescription already set!" ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 0798c634df90..beb003238bda 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -892,18 +892,18 @@ bool Dialog::ImplStartExecute() std::abort(); } - if (bKitActive) - { - if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) + if (bKitActive) { - std::vector<vcl::LOKPayloadItem> aItems; - aItems.emplace_back("type", "dialog"); - aItems.emplace_back("size", GetSizePixel().toString()); - if (!GetText().isEmpty()) - aItems.emplace_back("title", GetText().toUtf8()); - pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); + if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier()) + { + std::vector<vcl::LOKPayloadItem> aItems; + aItems.emplace_back("type", "dialog"); + aItems.emplace_back("size", GetSizePixel().toString()); + if (!GetText().isEmpty()) + aItems.emplace_back("title", GetText().toUtf8()); + pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems); + } } - } #ifdef DBG_UTIL vcl::Window* pParent = GetParent(); diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index cb039abba23e..d6e73910805d 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -1005,7 +1005,7 @@ void Window::ImplDlgCtrlNextWindow() ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) pDlgCtrlParent = pDlgCtrlParent->ImplGetParent(); -if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) + if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) return; // lookup window in child list diff --git a/vcl/source/window/dndlistenercontainer.cxx b/vcl/source/window/dndlistenercontainer.cxx index bc0934a1ed1a..5d430629c254 100644 --- a/vcl/source/window/dndlistenercontainer.cxx +++ b/vcl/source/window/dndlistenercontainer.cxx @@ -174,7 +174,7 @@ sal_uInt32 DNDListenerContainer::fireDragExitEvent() if( xListener.is() ) { - xListener->dragExit( aEvent ); + xListener->dragExit( aEvent ); nRet++; } } @@ -222,7 +222,7 @@ sal_uInt32 DNDListenerContainer::fireDragOverEvent( const Reference< XDropTarget { if( m_xDropTargetDragContext.is() ) xListener->dragOver( aEvent ); - nRet++; + nRet++; } } catch (const RuntimeException&) @@ -345,7 +345,7 @@ sal_uInt32 DNDListenerContainer::fireDropActionChangedEvent( const Reference< XD { if( m_xDropTargetDragContext.is() ) xListener->dropActionChanged( aEvent ); - nRet++; + nRet++; } } catch (const RuntimeException&) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 4509ad496557..2f9b87822c00 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1529,8 +1529,8 @@ Size Menu::ImplCalcSize( vcl::Window* pWin ) // SubMenu? if (!IsMenuBar() && pData->pSubMenu) { - if ( nFontHeight > nWidth ) - nWidth += nFontHeight; + if ( nFontHeight > nWidth ) + nWidth += nFontHeight; pData->aSz.setHeight( std::max( std::max( nFontHeight, pData->aSz.Height() ), nMinMenuItemHeight ) ); } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 0031baf60937..ea8216bc7313 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1313,12 +1313,12 @@ void Window::Update() // trigger an update also for system windows on top of us, // otherwise holes would remain - vcl::Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap; - while ( pUpdateOverlapWindow ) - { + vcl::Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap; + while ( pUpdateOverlapWindow ) + { pUpdateOverlapWindow->Update(); pUpdateOverlapWindow = pUpdateOverlapWindow->mpWindowImpl->mpNext; - } + } pUpdateWindow->ImplCallPaint(nullptr, pUpdateWindow->mpWindowImpl->mnPaintFlags); pUpdateWindow->LogicInvalidate(nullptr); diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 53dff53e7fd5..a7ff02889bf6 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -158,7 +158,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) pFunctionSet->DeselectAll(); else pFunctionSet->DestroyAnchor(); - nFlags &= ~SelectionEngineFlags::HAS_ANCH; // bHasAnchor = false; + nFlags &= ~SelectionEngineFlags::HAS_ANCH; // bHasAnchor = false; } pFunctionSet->SetCursorAtPoint( aPos ); // special case Single-Selection, to enable simple Select+Drag diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index f743186ebebf..cc8941503187 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -728,7 +728,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) aState.mnX += displacement; aState.mnY += displacement; } - pWin = pSVData->maWinData.mpFirstFrame; // check new pos again + pWin = pSVData->maWinData.mpFirstFrame; // check new pos again } } pWin = pWin->mpWindowImpl->mpFrameData->mpNextFrame; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a464566cac06..8c560439b406 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3646,8 +3646,8 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( bool bSpriteCanvas ) } else - { #endif + { xCanvas.set( xCanvasFactory->createInstanceWithArgumentsAndContext( bSpriteCanvas ? OUString( "com.sun.star.rendering.SpriteCanvas" ) : @@ -3656,9 +3656,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( bool bSpriteCanvas ) xContext ), UNO_QUERY ); -#ifdef _WIN32 } -#endif mpWindowImpl->mxCanvas = xCanvas; } diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 6dd8d0915f2d..b683015fe5a5 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -41,7 +41,7 @@ int PreeditStartCallback ( XIC, XPointer client_data, XPointer ) { - preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); + preedit_data_t* pPreeditData = reinterpret_cast<preedit_data_t*>(client_data); if ( pPreeditData->eState == PreeditStatus::ActivationRequired ) { pPreeditData->eState = PreeditStatus::Active; @@ -109,8 +109,8 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) ptext->nLength = from; } - // NULL-terminate the string - ptext->pUnicodeBuffer[ptext->nLength] = u'\0'; + // NULL-terminate the string + ptext->pUnicodeBuffer[ptext->nLength] = u'\0'; } // reallocate the textbuffer with sufficiently large size 2^x @@ -148,9 +148,9 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) if (pInsertText->encoding_is_wchar) { wchar_t *pWCString = pInsertText->string.wide_char; - size_t nBytes = wcstombs ( nullptr, pWCString, 1024 /* don't care */); - pMBString = static_cast<char*>(alloca( nBytes + 1 )); - nMBLength = wcstombs ( pMBString, pWCString, nBytes + 1); + size_t nBytes = wcstombs ( nullptr, pWCString, 1024 /* don't care */); + pMBString = static_cast<char*>(alloca( nBytes + 1 )); + nMBLength = wcstombs ( pMBString, pWCString, nBytes + 1); } else { @@ -163,17 +163,17 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) if (nEncoding != RTL_TEXTENCODING_UNICODE) { - rtl_TextToUnicodeConverter aConverter = + rtl_TextToUnicodeConverter aConverter = rtl_createTextToUnicodeConverter( nEncoding ); - rtl_TextToUnicodeContext aContext = + rtl_TextToUnicodeContext aContext = rtl_createTextToUnicodeContext(aConverter); - sal_Size nBufferSize = nInsertTextLength * 2; + sal_Size nBufferSize = nInsertTextLength * 2; - pInsertTextString = static_cast<sal_Unicode*>(alloca(nBufferSize)); + pInsertTextString = static_cast<sal_Unicode*>(alloca(nBufferSize)); - sal_uInt32 nConversionInfo; - sal_Size nConvertedChars; + sal_uInt32 nConversionInfo; + sal_Size nConvertedChars; rtl_convertTextToUnicode( aConverter, aContext, pMBString, nMBLength, @@ -182,8 +182,8 @@ Preedit_InsertText(preedit_text_t *pText, XIMText *pInsertText, int where) | RTL_TEXTTOUNICODE_FLAGS_INVALID_IGNORE, &nConversionInfo, &nConvertedChars ); - rtl_destroyTextToUnicodeContext(aConverter, aContext); - rtl_destroyTextToUnicodeConverter(aConverter); + rtl_destroyTextToUnicodeContext(aConverter, aContext); + rtl_destroyTextToUnicodeConverter(aConverter); } else @@ -291,9 +291,9 @@ Preedit_FeedbackToSAL ( const XIMFeedback* pfeedback, int nlength, std::vector<E // copy in list psalattr[npos] = nval; noldval = nval; - } - // return list of sal attributes - return psalattr; + } + // return list of sal attributes + return psalattr; } void diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 1282881f442b..9954988e7af5 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1334,7 +1334,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > bSuccess = rTypes.hasElements(); if( bHaveText && ! bHaveUTF16 ) { - int i = 0; + int i = 0; int nNewFlavors = rTypes.getLength()+1; Sequence< DataFlavor > aTemp( nNewFlavors ); diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index e0a4879ff6fb..29f7323dbb1b 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -1362,11 +1362,11 @@ void X11SalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, pGC, aXRect.x, aXRect.y, aXRect.width, aXRect.height ); } - } + } - if( mnPenColor != SALCOLOR_NONE ) - for( sal_uInt32 i = 0; i < nPoly; i++ ) - drawPolyLine( pPoints[i], pPtAry[i], true ); + if( mnPenColor != SALCOLOR_NONE ) + for( sal_uInt32 i = 0; i < nPoly; i++ ) + drawPolyLine( pPoints[i], pPtAry[i], true ); } bool X11SalGraphicsImpl::drawPolyLineBezier( sal_uInt32, const SalPoint*, const PolyFlags* ) diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index a162a694f818..5d422b6433ed 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -155,7 +155,7 @@ X11SalVirtualDevice::X11SalVirtualDevice(SalGraphics const * pGraphics, long &nD pColormap = new SalColormap( pDisplay_, pXRenderFormat->colormap, m_nXScreen ); else pColormap = new SalColormap( nBitCount ); - bDeleteColormap = true; + bDeleteColormap = true; } else if( nBitCount != pDisplay_->GetVisual( m_nXScreen ).GetDepth() ) { diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 42bf6d0a98b9..b0a6b9935fdb 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -196,8 +196,8 @@ FT_FaceRec_* FreetypeFontInfo::GetFaceFT() maFaceFT = nullptr; } - ++mnRefCount; - return maFaceFT; + ++mnRefCount; + return maFaceFT; } void FreetypeFontInfo::ReleaseFaceFT() diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx index b541fe1861fe..3578e99174b1 100644 --- a/vcl/unx/generic/glyphs/glyphcache.cxx +++ b/vcl/unx/generic/glyphs/glyphcache.cxx @@ -128,10 +128,10 @@ bool GlyphCache::IFSD_Equal::operator()(const rtl::Reference<LogicalFontInstance if( nAWidth != nBWidth ) return false; - if (rA.meLanguage != rB.meLanguage) + if (rA.meLanguage != rB.meLanguage) return false; // check for features - if ((rA.maTargetName.indexOf(FontSelectPattern::FEAT_PREFIX) + if ((rA.maTargetName.indexOf(FontSelectPattern::FEAT_PREFIX) != -1 || rB.maTargetName.indexOf(FontSelectPattern::FEAT_PREFIX) != -1) && rA.maTargetName != rB.maTargetName) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 2401855b892c..5922aab5f3ca 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -410,7 +410,7 @@ void PPDParser::scanPPDDir( const OUString& rDir ) { if( aFileName.endsWithIgnoreAsciiCaseAsciiL( rSuffix.pSuffix, rSuffix.nSuffixLen ) ) { - (*rPPDCache.pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - rSuffix.nSuffixLen ) ] = aPPDFile.PathToFileName(); + (*rPPDCache.pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - rSuffix.nSuffixLen ) ] = aPPDFile.PathToFileName(); break; } } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f4a24cfe6458..59e5370736f1 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1879,10 +1879,10 @@ void X11SalFrame::SetSize( const Size &rSize ) { if( rSize.Width() > 0 && rSize.Height() > 0 ) { - if( ! ( nStyle_ & SalFrameStyleFlags::SIZEABLE ) + if( ! ( nStyle_ & SalFrameStyleFlags::SIZEABLE ) && ! IsChildWindow() && ( nStyle_ & (SalFrameStyleFlags::FLOAT|SalFrameStyleFlags::OWNERDRAWDECORATION) ) != SalFrameStyleFlags::FLOAT ) - { + { XSizeHints* pHints = XAllocSizeHints(); long nSupplied = 0; XGetWMNormalHints( GetXDisplay(), @@ -1899,7 +1899,7 @@ void X11SalFrame::SetSize( const Size &rSize ) GetShellWindow(), pHints ); XFree( pHints ); - } + } XResizeWindow( GetXDisplay(), IsSysChildWindow() ? GetWindow() : GetShellWindow(), rSize.Width(), rSize.Height() ); if( GetWindow() != GetShellWindow() ) { @@ -1929,20 +1929,20 @@ void X11SalFrame::SetPosSize( const tools::Rectangle &rPosSize ) if( !values.width || !values.height ) return; - if( mpParent && ! IsSysChildWindow() ) - { + if( mpParent && ! IsSysChildWindow() ) + { if( AllSettings::GetLayoutRTL() ) values.x = mpParent->maGeometry.nWidth-values.width-1-values.x; - ::Window aChild; - // coordinates are relative to parent, so translate to root coordinates - XTranslateCoordinates( GetDisplay()->GetDisplay(), + ::Window aChild; + // coordinates are relative to parent, so translate to root coordinates + XTranslateCoordinates( GetDisplay()->GetDisplay(), mpParent->GetWindow(), GetDisplay()->GetRootWindow( m_nXScreen ), values.x, values.y, &values.x, &values.y, & aChild ); - } + } bool bMoved = false; bool bSized = false; @@ -2351,7 +2351,7 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) mpInputContext.reset( new SalI18N_InputContext( this ) ); if (mpInputContext->UseContext()) { - mpInputContext->ExtendEventMask( GetShellWindow() ); + mpInputContext->ExtendEventMask( GetShellWindow() ); if (mbInputFocus) mpInputContext->SetICFocus( this ); } @@ -3247,7 +3247,7 @@ bool X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent ) else if (nLen > 0 /* nEncoding == RTL_TEXTENCODING_UNICODE */) { pString = reinterpret_cast<sal_Unicode*>(pPrintable); - nSize = nLen; + nSize = nLen; } else { diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx index 8b5265c88709..38d70aa490e2 100644 --- a/vcl/unx/glxtest.cxx +++ b/vcl/unx/glxtest.cxx @@ -173,7 +173,7 @@ static void glxtest() XSetErrorHandler(x_error_handler); ///// Get a visual ///// - int attribs[] = { + int attribs[] = { GLX_RGBA, GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1, diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index c95830f752df..3a776b20dcc7 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -70,8 +70,8 @@ atk_noop_object_wrapper_get_type() } ; type = g_type_register_static (ATK_TYPE_OBJECT, "OOoAtkNoOpObj", &typeInfo, GTypeFlags(0)) ; - } - return type; + } + return type; } static AtkObject* @@ -139,7 +139,7 @@ wrapper_factory_create_accessible( GObject *obj ) if( pWindow ) { - uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible(); + uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible(); if( xAccessible.is() ) { AtkObject *accessible = ooo_wrapper_registry_get( xAccessible ); diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 8aa3c0d80770..92905f6ec64b 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -784,9 +784,9 @@ ooo_atk_util_get_type() } ; type = g_type_register_static (parent_type, "OOoUtil", &typeInfo, GTypeFlags(0)) ; - } + } - return type; + return type; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 0027a6e9a958..0ed5b6fe7d71 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -196,7 +196,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext setLabel( LISTBOX_##elem##_LABEL, aLabel ); \ break - switch( i ) + switch( i ) { LABEL_LIST( VERSION ); LABEL_LIST( TEMPLATE ); diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index db810d745cd4..617506c9e38b 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -412,9 +412,9 @@ GtkSalData::~GtkSalData() Yield( true, true ); g_warning ("TESTME: We used to have a stop-timer here, but the central code should do this"); - // sanity check: at this point nobody should be yielding, but wake them - // up anyway before the condition they're waiting on gets destroyed. - m_aDispatchCondition.set(); + // sanity check: at this point nobody should be yielding, but wake them + // up anyway before the condition they're waiting on gets destroyed. + m_aDispatchCondition.set(); osl::MutexGuard g( m_aDispatchMutex ); if (m_pUserEvent) diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index 4799b77e672b..1c3fa5aab7d4 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -2929,8 +2929,7 @@ vcl::Font pango_to_vcl(const PangoFontDescription* font, const css::lang::Locale OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); #endif - int nPointHeight = 0; - nPointHeight = nPangoHeight/PANGO_SCALE; + int nPointHeight = nPangoHeight/PANGO_SCALE; vcl::Font aFont( aInfo.m_aFamilyName, Size( 0, nPointHeight ) ); if( aInfo.m_eWeight != WEIGHT_DONTKNOW ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits