diff options
91 files changed, 690 insertions, 649 deletions
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 6f5340f74127..3f388e125541 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -533,11 +533,11 @@ namespace vclcanvas if( !mpOutDev.get() ) return rendering::IntegerBitmapLayout(); // we're disposed - rendering::IntegerBitmapLayout xBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) ); + rendering::IntegerBitmapLayout aBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) ); if ( !hasAlpha() ) - xBitmapLayout.ColorSpace = canvas::tools::getStdColorSpaceWithoutAlpha(); + aBitmapLayout.ColorSpace = canvas::tools::getStdColorSpaceWithoutAlpha(); - return xBitmapLayout; + return aBitmapLayout; } BitmapEx CanvasBitmapHelper::getBitmap() const diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index b294b73503f3..79785aa15e2f 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -1190,11 +1190,11 @@ namespace vclcanvas if( !mpOutDev.get() ) return rendering::IntegerBitmapLayout(); // we're disposed - rendering::IntegerBitmapLayout xBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) ); + rendering::IntegerBitmapLayout aBitmapLayout( ::canvas::tools::getStdMemoryLayout(getSize()) ); if ( !mbHaveAlpha ) - xBitmapLayout.ColorSpace = canvas::tools::getStdColorSpaceWithoutAlpha(); + aBitmapLayout.ColorSpace = canvas::tools::getStdColorSpaceWithoutAlpha(); - return xBitmapLayout; + return aBitmapLayout; } int CanvasHelper::setupOutDevState( const rendering::ViewState& viewState, diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 389120bdc70f..85c9ec26f79c 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -413,8 +413,8 @@ void ChartAreaPanel::updateData() { OUString aGradientName; xPropSet->getPropertyValue("FillGradientName") >>= aGradientName; - XGradient xGradient = getXGradientForName(mxModel, aGradientName); - XFillGradientItem aGradientItem(aGradientName, xGradient); + XGradient aGradient = getXGradientForName(mxModel, aGradientName); + XFillGradientItem aGradientItem(aGradientName, aGradient); updateFillGradient(false, true, &aGradientItem); } @@ -422,8 +422,8 @@ void ChartAreaPanel::updateData() { OUString aHatchName; xPropSet->getPropertyValue("FillHatchName") >>= aHatchName; - XHatch xHatch = getXHatchFromName(mxModel, aHatchName); - XFillHatchItem aHatchItem(aHatchName, xHatch); + XHatch aHatch = getXHatchFromName(mxModel, aHatchName); + XFillHatchItem aHatchItem(aHatchName, aHatch); updateFillHatch(false, true, &aHatchItem); } @@ -431,8 +431,8 @@ void ChartAreaPanel::updateData() { OUString aBitmapName; xPropSet->getPropertyValue("FillBitmapName") >>= aBitmapName; - GraphicObject xBitmap = getXBitmapFromName(mxModel, aBitmapName); - XFillBitmapItem aBitmapItem(aBitmapName, xBitmap); + GraphicObject aBitmap = getXBitmapFromName(mxModel, aBitmapName); + XFillBitmapItem aBitmapItem(aBitmapName, aBitmap); XFillBitmapItem* pBitmapItem = nullptr; DrawModelWrapper* pModelWrapper = nullptr; try diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx index 7f01b041a467..dfe58235191f 100644 --- a/chart2/source/inc/CloneHelper.hxx +++ b/chart2/source/inc/CloneHelper.hxx @@ -35,9 +35,9 @@ namespace CloneHelper template< class Interface > struct CreateRefClone : public ::std::unary_function< Interface, Interface > { - Interface operator() ( const Interface & xOther ) + css::uno::Reference<Interface> operator() ( const css::uno::Reference<Interface> & xOther ) { - Interface xResult; + css::uno::Reference<Interface> xResult; css::uno::Reference< css::util::XCloneable > xCloneable( xOther, css::uno::UNO_QUERY ); if( xCloneable.is()) @@ -50,8 +50,8 @@ template< class Interface > /// clones a vector of UNO-References template< class Interface > void CloneRefVector( - const ::std::vector< Interface > & rSource, - ::std::vector< Interface > & rDestination ) + const ::std::vector< css::uno::Reference< Interface > > & rSource, + ::std::vector< css::uno::Reference< Interface > > & rDestination ) { ::std::transform( rSource.begin(), rSource.end(), ::std::back_inserter( rDestination ), @@ -61,8 +61,8 @@ template< class Interface > /// clones a UNO-sequence of UNO-References template< class Interface > void CloneRefSequence( - const css::uno::Sequence< Interface > & rSource, - css::uno::Sequence< Interface > & rDestination ) + const css::uno::Sequence< css::uno::Reference<Interface> > & rSource, + css::uno::Sequence< css::uno::Reference<Interface> > & rDestination ) { rDestination.realloc( rSource.getLength()); ::std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(), diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index df943dc4a18d..5f97ee41b46d 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -371,7 +371,7 @@ Axis::Axis( const Axis & rOther ) : m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()), m_aScaleData( rOther.m_aScaleData ) { - m_xGrid.set( CloneHelper::CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xGrid )); + m_xGrid.set( CloneHelper::CreateRefClone< beans::XPropertySet >()( rOther.m_xGrid )); if( m_xGrid.is()) ModifyListenerHelper::addListener( m_xGrid, m_xModifyEventForwarder ); @@ -382,7 +382,7 @@ Axis::Axis( const Axis & rOther ) : lcl_CloneSubGrids( rOther.m_aSubGridProperties, m_aSubGridProperties ); ModifyListenerHelper::addListenerToAllSequenceElements( m_aSubGridProperties, m_xModifyEventForwarder ); - m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle )); + m_xTitle.set( CloneHelper::CreateRefClone< chart2::XTitle >()( rOther.m_xTitle )); if( m_xTitle.is()) ModifyListenerHelper::addListener( m_xTitle, m_xModifyEventForwarder ); } diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 755cadfa3af7..d3eeedfade34 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -172,8 +172,8 @@ BaseCoordinateSystem::BaseCoordinateSystem( m_aAllAxis.resize(rSource.m_aAllAxis.size()); tAxisVecVecType::size_type nN=0; for( nN=0; nN<m_aAllAxis.size(); nN++ ) - CloneHelper::CloneRefVector< Reference< chart2::XAxis > >( rSource.m_aAllAxis[nN], m_aAllAxis[nN] ); - CloneHelper::CloneRefVector< Reference< chart2::XChartType > >( rSource.m_aChartTypes, m_aChartTypes ); + CloneHelper::CloneRefVector<chart2::XAxis>( rSource.m_aAllAxis[nN], m_aAllAxis[nN] ); + CloneHelper::CloneRefVector<chart2::XChartType>( rSource.m_aChartTypes, m_aChartTypes ); for( nN=0; nN<m_aAllAxis.size(); nN++ ) ModifyListenerHelper::addListenerToAllElements( m_aAllAxis[nN], m_xModifyEventForwarder ); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 2228337aec51..48ec54304805 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -168,11 +168,11 @@ ChartModel::ChartModel( const ChartModel & rOther ) m_xOldModelAgg->setDelegator( *this ); Reference< util::XModifyListener > xListener; - Reference< chart2::XTitle > xNewTitle = CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle ); - Reference< chart2::XDiagram > xNewDiagram = CreateRefClone< Reference< chart2::XDiagram > >()( rOther.m_xDiagram ); - Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xPageBackground ); - Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< Reference< chart2::XChartTypeManager > >()( rOther.m_xChartTypeManager ); - Reference< container::XNameAccess > xXMLNamespaceMap = CreateRefClone< Reference< container::XNameAccess > >()( rOther.m_xXMLNamespaceMap ); + Reference< chart2::XTitle > xNewTitle = CreateRefClone< chart2::XTitle >()( rOther.m_xTitle ); + Reference< chart2::XDiagram > xNewDiagram = CreateRefClone< chart2::XDiagram >()( rOther.m_xDiagram ); + Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< beans::XPropertySet >()( rOther.m_xPageBackground ); + Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< chart2::XChartTypeManager >()( rOther.m_xChartTypeManager ); + Reference< container::XNameAccess > xXMLNamespaceMap = CreateRefClone< container::XNameAccess >()( rOther.m_xXMLNamespaceMap ); { MutexGuard aGuard( m_aModelMutex ); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index cf9cae2c43f6..d016f2160476 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -139,12 +139,12 @@ DataSeries::DataSeries( const DataSeries & rOther ) : { if( ! rOther.m_aDataSequences.empty()) { - CloneHelper::CloneRefVector< tDataSequenceContainer::value_type >( + CloneHelper::CloneRefVector<css::chart2::data::XLabeledDataSequence>( rOther.m_aDataSequences, m_aDataSequences ); ModifyListenerHelper::addListenerToAllElements( m_aDataSequences, m_xModifyEventForwarder ); } - CloneHelper::CloneRefVector< Reference< chart2::XRegressionCurve > >( rOther.m_aRegressionCurves, m_aRegressionCurves ); + CloneHelper::CloneRefVector< chart2::XRegressionCurve >( rOther.m_aRegressionCurves, m_aRegressionCurves ); ModifyListenerHelper::addListenerToAllElements( m_aRegressionCurves, m_xModifyEventForwarder ); // add as listener to XPropertySet properties diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 8a2b352dc39a..f1ef40f30223 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -333,10 +333,10 @@ Diagram::Diagram( const Diagram & rOther ) : lcl_CloneCoordinateSystems( rOther.m_aCoordSystems, m_aCoordSystems ); ModifyListenerHelper::addListenerToAllElements( m_aCoordSystems, m_xModifyEventForwarder ); - m_xWall.set( CloneHelper::CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xWall )); - m_xFloor.set( CloneHelper::CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xFloor )); - m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle )); - m_xLegend.set( CloneHelper::CreateRefClone< Reference< chart2::XLegend > >()( rOther.m_xLegend )); + m_xWall.set( CloneHelper::CreateRefClone< beans::XPropertySet >()( rOther.m_xWall )); + m_xFloor.set( CloneHelper::CreateRefClone< beans::XPropertySet >()( rOther.m_xFloor )); + m_xTitle.set( CloneHelper::CreateRefClone< chart2::XTitle >()( rOther.m_xTitle )); + m_xLegend.set( CloneHelper::CreateRefClone< chart2::XLegend >()( rOther.m_xLegend )); ModifyListenerHelper::addListener( m_xWall, m_xModifyEventForwarder ); ModifyListenerHelper::addListener( m_xFloor, m_xModifyEventForwarder ); diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index a0b7bdfa7f07..9b620c0aee51 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -243,7 +243,7 @@ Title::Title( const Title & rOther ) : ::property::OPropertySet( rOther, m_aMutex ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) { - CloneHelper::CloneRefSequence< uno::Reference< chart2::XFormattedString > >( + CloneHelper::CloneRefSequence<chart2::XFormattedString>( rOther.m_aStrings, m_aStrings ); ModifyListenerHelper::addListenerToAllElements( ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder ); diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 7b020dc6c133..7bbe32b4e3d1 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -57,7 +57,7 @@ ChartType::ChartType( const ChartType & rOther ) : { { SolarMutexGuard g; // access to rOther.m_aDataSeries - CloneHelper::CloneRefVector<Reference<chart2::XDataSeries> >( + CloneHelper::CloneRefVector<css::chart2::XDataSeries>( rOther.m_aDataSeries, m_aDataSeries); } ModifyListenerHelper::addListenerToAllElements( m_aDataSeries, m_xModifyEventForwarder ); diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 6528d78e382c..11a6c762336f 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -239,9 +239,9 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR if( xCategories.is() ) aResultVector.push_back( xCategories ); - ::std::vector< Reference< chart2::XDataSeries > > xSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); + ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); uno::Reference< chart2::data::XDataSource > xSeriesSource( - DataSeriesHelper::getDataSource( comphelper::containerToSequence(xSeriesVector) ) ); + DataSeriesHelper::getDataSource( comphelper::containerToSequence(aSeriesVector) ) ); Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeqences( xSeriesSource->getDataSequences() ); //the first x-values is always the next sequence //todo ... other x-values get lost for old format diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index d35c6fa53bce..8833074513bd 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -116,7 +116,7 @@ ErrorBar::ErrorBar( const ErrorBar & rOther ) : if( ! rOther.m_aDataSequences.empty()) { if( lcl_isInternalData( rOther.m_aDataSequences.front())) - CloneHelper::CloneRefVector< tDataSequenceContainer::value_type >( + CloneHelper::CloneRefVector< css::chart2::data::XLabeledDataSequence >( rOther.m_aDataSequences, m_aDataSequences ); else m_aDataSequences = rOther.m_aDataSequences; diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index 3fe1e9413c9b..f86fe8007f8b 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -100,7 +100,7 @@ ImplOPropertySet::ImplOPropertySet( const ImplOPropertySet & rOther ) ::std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(), ::std::inserter( m_aProperties, m_aProperties.begin() )); cloneInterfaceProperties(); - m_xStyle.set( ::chart::CloneHelper::CreateRefClone< Reference< style::XStyle > >()( rOther.m_xStyle )); + m_xStyle.set( ::chart::CloneHelper::CreateRefClone< style::XStyle >()( rOther.m_xStyle )); } beans::PropertyState ImplOPropertySet::GetPropertyStateByHandle( sal_Int32 nHandle ) const diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 185354cf613c..0133ff032268 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -206,7 +206,7 @@ RegressionCurveModel::RegressionCurveModel( const RegressionCurveModel & rOther m_eRegressionCurveType( rOther.m_eRegressionCurveType ), m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()) { - m_xEquationProperties.set( CloneHelper::CreateRefClone< uno::Reference< beans::XPropertySet > >()( rOther.m_xEquationProperties )); + m_xEquationProperties.set( CloneHelper::CreateRefClone< beans::XPropertySet >()( rOther.m_xEquationProperties )); ModifyListenerHelper::addListener( m_xEquationProperties, m_xModifyEventForwarder ); } diff --git a/compilerplugins/clang/stylepolice.cxx b/compilerplugins/clang/stylepolice.cxx index 3ae718c54712..c6f0e16e55fb 100644 --- a/compilerplugins/clang/stylepolice.cxx +++ b/compilerplugins/clang/stylepolice.cxx @@ -15,6 +15,10 @@ #include "plugin.hxx" // Check for some basic naming mismatches which make the code harder to read +// +// This plugin is deliberately fairly lax, and only targets the most egregeriously faulty code, +// since we have a broad range of styles in our code and we don't want to generate unnecessary +// churn. namespace { @@ -53,6 +57,9 @@ bool isIdentifierLetter(char c) { bool matchPointerVar(const std::string& s) { return s.size() > 2 && s[0] == 'p' && isUpperLetter(s[1]); } +bool matchRefCountedPointerVar(const std::string& s) { + return s.size() > 2 && s[0] == 'x' && isUpperLetter(s[1]); +} bool matchMember(const std::string& s) { return s.size() > 3 && s[0] == 'm' && ( ( strchr("abnprsx", s[1]) && isUpperLetter(s[2]) ) @@ -95,7 +102,12 @@ bool StylePolice::VisitVarDecl(const VarDecl * varDecl) typeName = typeName.substr(6); if (startswith(typeName, "class ")) typeName = typeName.substr(6); + if (startswith(typeName, "struct ")) + typeName = typeName.substr(7); std::string aOriginalTypeName = varDecl->getType().getAsString(); + if (startswith(aOriginalTypeName, "const ")) + aOriginalTypeName = aOriginalTypeName.substr(6); + if (!qt->isPointerType() && !qt->isArrayType() && !qt->isFunctionPointerType() && !qt->isMemberPointerType() && matchPointerVar(name) && !startswith(typeName, "boost::intrusive_ptr") @@ -107,17 +119,11 @@ bool StylePolice::VisitVarDecl(const VarDecl * varDecl) && aOriginalTypeName != "GLXPixmap" && !startswith(typeName, "rtl::Reference") && !startswith(typeName, "ScopedVclPtr") - && !startswith(typeName, "std::mem_fun") - && !startswith(typeName, "std::__1::mem_fun") - && !startswith(typeName, "std::shared_ptr") - && !startswith(typeName, "std::__1::shared_ptr") - && !startswith(typeName, "shared_ptr") // weird issue in slideshow - && !startswith(typeName, "std::unique_ptr") - && !startswith(typeName, "std::__1::unique_ptr") - && !startswith(typeName, "unique_ptr") // weird issue in include/vcl/threadex.hxx - && !startswith(typeName, "std::weak_ptr") - && !startswith(typeName, "std::__1::weak_ptr") - && !startswith(typeName, "struct _LOKDocViewPrivate") + && typeName.find("::mem_fun") == std::string::npos + && typeName.find("shared_ptr") == std::string::npos + && typeName.find("unique_ptr") == std::string::npos + && typeName.find("::weak_ptr") == std::string::npos + && !startswith(typeName, "_LOKDocViewPrivate") && !startswith(typeName, "sw::UnoCursorPointer") && !startswith(typeName, "tools::SvRef") && !startswith(typeName, "VclPtr") @@ -138,6 +144,47 @@ bool StylePolice::VisitVarDecl(const VarDecl * varDecl) << typeName << aOriginalTypeName << varDecl->getSourceRange(); } } + + + if (matchRefCountedPointerVar(name) + && !startswith(typeName, "boost::intrusive_ptr") + && !startswith(typeName, "com::sun::star::uno::Reference") + && !startswith(typeName, "com::sun::star::uno::Sequence") + && !startswith(typeName, "com::sun::star::uno::WeakReference") + && !startswith(typeName, "drawinglayer::primitive2d::Primitive2DContainer") + && !startswith(typeName, "drawinglayer::primitive3d::Primitive3DContainer") + && !startswith(typeName, "jfw::CXPathObjectPtr") + && !startswith(typeName, "_LOKDocViewPrivate") + && !startswith(typeName, "oox::dump::BinaryInputStreamRef") + && !startswith(typeName, "oox::drawingml::chart::ModelRef") + && !startswith(typeName, "rtl::Reference") + && !startswith(typeName, "Reference") + && !startswith(typeName, "SfxObjectShellLock") + && !startswith(typeName, "store::PageHolderObject") + && !startswith(typeName, "store::ResourceHolder") + && !startswith(typeName, "store::OStoreHandle") + && typeName.find("unique_ptr") == std::string::npos + && typeName.find("shared_ptr") == std::string::npos + && !startswith(typeName, "ScopedVclPtr") + && !startswith(typeName, "svt::EmbeddedObjectRef") + && !startswith(typeName, "tools::SvRef") + && !startswith(typeName, "tools::WeakReference") + && !startswith(typeName, "utl::SharedUNOComponent") + && !startswith(typeName, "VclPtr") + && !startswith(typeName, "vcl::DeleteOnDeinit") + && !startswith(typeName, "vcl::DeleteUnoReferenceOnDeinit") + // there are lots of coordinate/position vars that start with "x" + && !qt->isArithmeticType() + ) + { + report( + DiagnosticsEngine::Warning, + "this local variable of type '%0' follows our ref-counted-pointer naming convention, but it is not a ref-counted-pointer, %1", + varDecl->getLocation()) + << typeName << aOriginalTypeName << varDecl->getSourceRange(); + } + + return true; } diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index b95cafac3754..1646b64ce255 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -339,33 +339,33 @@ namespace dbtools else nSign = 1; - css::util::Time xRet; + css::util::Time aRet; // normalize time // we have to sal_Int32 here because otherwise we get an overflow sal_Int64 nNanoSeconds = nNS; sal_Int32 nSeconds = nNanoSeconds / nanoSecInSec; sal_Int32 nMinutes = nSeconds / secInMin; - xRet.NanoSeconds = nNanoSeconds % nanoSecInSec; - xRet.Seconds = nSeconds % secInMin; - xRet.Hours = nMinutes / minInHour; - xRet.Minutes = nMinutes % minInHour; + aRet.NanoSeconds = nNanoSeconds % nanoSecInSec; + aRet.Seconds = nSeconds % secInMin; + aRet.Hours = nMinutes / minInHour; + aRet.Minutes = nMinutes % minInHour; // assemble time sal_Int64 nTime = nSign * - (xRet.NanoSeconds + - xRet.Seconds * secMask + - xRet.Minutes * minMask + - xRet.Hours * hourMask); + (aRet.NanoSeconds + + aRet.Seconds * secMask + + aRet.Minutes * minMask + + aRet.Hours * hourMask); if(nTime < 0) { - xRet.NanoSeconds = nanoSecInSec-1; - xRet.Seconds = secInMin-1; - xRet.Minutes = minInHour-1; - xRet.Hours = 23; + aRet.NanoSeconds = nanoSecInSec-1; + aRet.Seconds = secInMin-1; + aRet.Minutes = minInHour-1; + aRet.Hours = 23; } - return xRet; + return aRet; } css::util::DateTime DBTypeConversion::toDateTime(double dVal, const css::util::Date& _rNullDate) @@ -377,19 +377,19 @@ namespace dbtools // 12:59:59.999999790 css::util::Time aTime = toTime(dVal, 6); - css::util::DateTime xRet; + css::util::DateTime aRet; - xRet.Day = aDate.Day; - xRet.Month = aDate.Month; - xRet.Year = aDate.Year; + aRet.Day = aDate.Day; + aRet.Month = aDate.Month; + aRet.Year = aDate.Year; - xRet.NanoSeconds = aTime.NanoSeconds; - xRet.Minutes = aTime.Minutes; - xRet.Seconds = aTime.Seconds; - xRet.Hours = aTime.Hours; + aRet.NanoSeconds = aTime.NanoSeconds; + aRet.Minutes = aTime.Minutes; + aRet.Seconds = aTime.Seconds; + aRet.Hours = aTime.Hours; - return xRet; + return aRet; } css::util::Date DBTypeConversion::toDate(const OUString& _sSQLString) diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index b5d8d51d7470..65806cdb5d02 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -487,10 +487,10 @@ void OPreparedStatement::describeParameter() if ( !aParseNodes.empty() ) { // m_xParamColumns = new OSQLColumns(); - const OSQLTables& xTabs = m_aSQLIterator.getTables(); - if( !xTabs.empty() ) + const OSQLTables& rTabs = m_aSQLIterator.getTables(); + if( !rTabs.empty() ) { - OSQLTable xTable = xTabs.begin()->second; + OSQLTable xTable = rTabs.begin()->second; ::std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin(); for (;aIter != aParseNodes.end();++aIter ) { diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 257f83961bbd..1903d5895c11 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1182,14 +1182,14 @@ bool OResultSet::OpenImpl() OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!"); if(!m_pTable) { - const OSQLTables& xTabs = m_aSQLIterator.getTables(); - if (xTabs.empty() || !xTabs.begin()->second.is()) + const OSQLTables& rTabs = m_aSQLIterator.getTables(); + if (rTabs.empty() || !rTabs.begin()->second.is()) lcl_throwError(STR_QUERY_TOO_COMPLEX,*this); - if ( xTabs.size() > 1 || m_aSQLIterator.hasErrors() ) + if ( rTabs.size() > 1 || m_aSQLIterator.hasErrors() ) lcl_throwError(STR_QUERY_MORE_TABLES,*this); - OSQLTable xTable = xTabs.begin()->second; + OSQLTable xTable = rTabs.begin()->second; m_xColumns = m_aSQLIterator.getSelectColumns(); m_xColNames = xTable->getColumns(); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 1a5003972186..f374b827a179 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -394,14 +394,14 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim { m_aSQLIterator.setParseTree(m_pParseTree); m_aSQLIterator.traverseAll(); - const OSQLTables& xTabs = m_aSQLIterator.getTables(); + const OSQLTables& rTabs = m_aSQLIterator.getTables(); // sanity checks - if ( xTabs.empty() ) + if ( rTabs.empty() ) // no tables -> nothing to operate on -> error m_pConnection->throwGenericSQLException(STR_QUERY_NO_TABLE,*this); - if ( xTabs.size() > 1 || m_aSQLIterator.hasErrors() ) + if ( rTabs.size() > 1 || m_aSQLIterator.hasErrors() ) // more than one table -> can't operate on them -> error m_pConnection->throwGenericSQLException(STR_QUERY_MORE_TABLES,*this); @@ -421,7 +421,7 @@ void OStatement_Base::construct(const OUString& sql) throw(SQLException, Runtim } // at this moment we support only one table per select statement - Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xTabs.begin()->second,UNO_QUERY); + Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(rTabs.begin()->second,UNO_QUERY); if(xTunnel.is()) { if(m_pTable) diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index adc7aa4a7bc3..df0ee8a5fc9e 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -433,7 +433,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co static jmethodID mID(nullptr); obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID); jbyteArray pByteArray = t.pEnv->NewByteArray(x.getLength()); - jbyte * xData = reinterpret_cast<jbyte *>( + jbyte * pData = reinterpret_cast<jbyte *>( const_cast<sal_Int8 *>(x.getConstArray())); // 4th param of Set*ArrayRegion changed from pointer to non-const to // pointer to const between <http://docs.oracle.com/javase/6/docs/ @@ -441,7 +441,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co // <http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/ // functions.html#wp22933>; work around that difference in a way // that doesn't trigger loplugin:redundantcast - t.pEnv->SetByteArrayRegion(pByteArray,0,x.getLength(),xData); + t.pEnv->SetByteArrayRegion(pByteArray,0,x.getLength(),pData); t.pEnv->CallVoidMethod( object, mID, parameterIndex,pByteArray); t.pEnv->DeleteLocalRef(pByteArray); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 7ce1751f6ef1..d872258c82b2 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -661,7 +661,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co { jbyteArray aArray = t.pEnv->NewByteArray(x.getLength()); - jbyte * xData = reinterpret_cast<jbyte *>( + jbyte * pData = reinterpret_cast<jbyte *>( const_cast<sal_Int8 *>(x.getConstArray())); // 4th param of Set*ArrayRegion changed from pointer to non-const to // pointer to const between <http://docs.oracle.com/javase/6/docs/ @@ -669,7 +669,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co // <http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/ // functions.html#wp22933>; work around that difference in a way // that doesn't trigger loplugin:redundantcast - t.pEnv->SetByteArrayRegion(aArray,0,x.getLength(),xData); + t.pEnv->SetByteArrayRegion(aArray,0,x.getLength(),pData); // convert parameter t.pEnv->CallVoidMethod( object, mID,columnIndex,aArray); t.pEnv->DeleteLocalRef(aArray); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index ff59e956ccfb..51c6bdb08664 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -443,10 +443,10 @@ void OPreparedStatement::describeParameter() if(!aParseNodes.empty()) { m_xParamColumns = new OSQLColumns(); - const OSQLTables& xTabs = m_pSQLIterator->getTables(); - if(xTabs.size()) + const OSQLTables& rTabs = m_pSQLIterator->getTables(); + if(rTabs.size()) { - OSQLTable xTable = xTabs.begin()->second; + OSQLTable xTable = rTabs.begin()->second; ::std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin(); for (;aIter != aParseNodes.end();++aIter ) diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 65c8fbba3a7f..a183dd3670a8 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -158,10 +158,10 @@ bool MQueryHelper::checkRowAvailable( sal_Int32 nDBRow ) bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) { - MQueryHelperResultEntry* xResEntry = getByIndex( nDBRow ); + MQueryHelperResultEntry* pResEntry = getByIndex( nDBRow ); - OSL_ENSURE( xResEntry != nullptr, "xResEntry == NULL"); - if (xResEntry == nullptr ) + OSL_ENSURE( pResEntry != nullptr, "xResEntry == NULL"); + if (pResEntry == nullptr ) { rValue.setNull(); return false; @@ -169,7 +169,7 @@ bool MQueryHelper::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUS switch ( nType ) { case DataType::VARCHAR: - rValue = xResEntry->getValue( m_rColumnAlias.getProgrammaticNameOrFallbackToUTF8Alias( aDBColumnName ) ); + rValue = pResEntry->getValue( m_rColumnAlias.getProgrammaticNameOrFallbackToUTF8Alias( aDBColumnName ) ); break; default: @@ -187,30 +187,30 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression OString oStringTable = OUStringToOString( m_aAddressbook, RTL_TEXTENCODING_UTF8 ); std::set<int> listRecords; bool handleListTable = false; - MorkParser* xMork; + MorkParser* pMork; // check if we are retrieving the default table if (oStringTable == "AddressBook" || oStringTable == "CollectedAddressBook") { - xMork = xConnection->getMorkParser(oStringTable); + pMork = xConnection->getMorkParser(oStringTable); } else { // Let's try to retrieve the list in Collected Addresses book - xMork = xConnection->getMorkParser(OString("CollectedAddressBook")); - if (std::find(xMork->lists_.begin(), xMork->lists_.end(), m_aAddressbook) == xMork->lists_.end()) + pMork = xConnection->getMorkParser(OString("CollectedAddressBook")); + if (std::find(pMork->lists_.begin(), pMork->lists_.end(), m_aAddressbook) == pMork->lists_.end()) { // so the list is in Address book // TODO : manage case where an address book has been created - xMork = xConnection->getMorkParser(OString("AddressBook")); + pMork = xConnection->getMorkParser(OString("AddressBook")); } handleListTable = true; // retrieve row ids for that list table std::string listTable = oStringTable.getStr(); - xMork->getRecordKeysForListTable(listTable, listRecords); + pMork->getRecordKeysForListTable(listTable, listRecords); } MorkTableMap::Map::iterator tableIter; - MorkTableMap *Tables = xMork->getTables( 0x80 ); + MorkTableMap *Tables = pMork->getTables( 0x80 ); if (!Tables) return -1; MorkRowMap *Rows = nullptr; @@ -243,8 +243,8 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression for (MorkCells::const_iterator CellsIter = rowIter->second.begin(); CellsIter != rowIter->second.end(); ++CellsIter ) { - std::string column = xMork->getColumn(CellsIter->first); - std::string value = xMork->getValue(CellsIter->second); + std::string column = pMork->getColumn(CellsIter->first); + std::string value = pMork->getValue(CellsIter->second); OString key(column.c_str(), static_cast<sal_Int32>(column.size())); OString valueOString(value.c_str(), static_cast<sal_Int32>(value.size())); OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 10b2be9c1e98..ca0e94420fdf 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1005,7 +1005,7 @@ void OResultSet::fillRowData() MQueryExpression queryExpression; - OConnection* xConnection = static_cast<OConnection*>(m_pStatement->getConnection().get()); + OConnection* pConnection = static_cast<OConnection*>(m_pStatement->getConnection().get()); m_xColumns = m_pSQLIterator->getSelectColumns(); OSL_ENSURE(m_xColumns.is(), "Need the Columns!!"); @@ -1045,7 +1045,7 @@ void OResultSet::fillRowData() OUString aStr( m_pTable->getName() ); m_aQueryHelper.setAddressbook( aStr ); - sal_Int32 rv = m_aQueryHelper.executeQuery(xConnection, queryExpression); + sal_Int32 rv = m_aQueryHelper.executeQuery(pConnection, queryExpression); if ( rv == -1 ) { m_pStatement->getOwnConnection()->throwSQLException( STR_ERR_EXECUTING_QUERY, *this ); } @@ -1114,11 +1114,11 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep OSL_ENSURE( m_pTable, "Need a Table object"); if(!m_pTable) { - const OSQLTables& xTabs = m_pSQLIterator->getTables(); - if (xTabs.empty() || !xTabs.begin()->second.is()) + const OSQLTables& rTabs = m_pSQLIterator->getTables(); + if (rTabs.empty() || !rTabs.begin()->second.is()) m_pStatement->getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); - m_pTable = static_cast< OTable* > ((xTabs.begin()->second).get()); + m_pTable = static_cast< OTable* > ((rTabs.begin()->second).get()); } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 272f49b1f65a..f8b04da0eea6 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -140,16 +140,16 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql { m_pSQLIterator->setParseTree(m_pParseTree); m_pSQLIterator->traverseAll(); - const OSQLTables& xTabs = m_pSQLIterator->getTables(); + const OSQLTables& rTabs = m_pSQLIterator->getTables(); - if (xTabs.empty()) + if (rTabs.empty()) { getOwnConnection()->throwSQLException( STR_QUERY_AT_LEAST_ONE_TABLES, *this ); } #if OSL_DEBUG_LEVEL > 0 OSQLTables::const_iterator citer; - for( citer = xTabs.begin(); citer != xTabs.end(); ++citer ) { + for( citer = rTabs.begin(); citer != rTabs.end(); ++citer ) { OSL_TRACE("SELECT Table : %s", OUtoCStr(citer->first) ); } #endif @@ -161,9 +161,9 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql // at this moment we support only one table per select statement - OSL_ENSURE( xTabs.begin() != xTabs.end(), "Need a Table"); + OSL_ENSURE( rTabs.begin() != rTabs.end(), "Need a Table"); - m_pTable = static_cast< OTable* > (xTabs.begin()->second.get()); + m_pTable = static_cast< OTable* > (rTabs.begin()->second.get()); m_xColNames = m_pTable->getColumns(); xNames.set(m_xColNames,UNO_QUERY); // set the binding of the resultrow diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 91404f5330d0..c8de4cac85fc 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -240,10 +240,10 @@ namespace dbaui bool bShowMessage = true; try { - ::std::pair< Reference<XConnection>,sal_Bool> xConnection = m_pAdminDialog->createConnection(); - bShowMessage = xConnection.second; - bSuccess = xConnection.first.is(); - ::comphelper::disposeComponent(xConnection.first); + ::std::pair< Reference<XConnection>,sal_Bool> aConnectionPair = m_pAdminDialog->createConnection(); + bShowMessage = aConnectionPair.second; + bSuccess = aConnectionPair.first.is(); + ::comphelper::disposeComponent(aConnectionPair.first); } catch(Exception&) { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 42a62c6093b5..4f543c4b693f 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -627,8 +627,8 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& } else { - const OSQLTables& xTabs = m_pSqlIterator->getTables(); - if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || xTabs.begin() == xTabs.end() ) + const OSQLTables& rTabs = m_pSqlIterator->getTables(); + if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || rTabs.begin() == rTabs.end() ) { aError = SQLException( OUString( ModuleRes( STR_QRY_NOSELECT ) ), diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 410d99f17f88..bee0d5d8e233 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -103,11 +103,6 @@ SvParserState EditHTMLParser::CallParser(EditEngine* pEE, const EditPaM& rPaM) void EditHTMLParser::NextToken( int nToken ) { - #ifdef DBG_UTIL - HTML_TOKEN_IDS xID = (HTML_TOKEN_IDS)nToken; - (void)xID; - #endif - switch( nToken ) { case HTML_META: diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 182be5db506b..7661120ad436 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -365,7 +365,7 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a fullpath = swfdirpath + STR("/backgroundconfig.txt"); - oslFileHandle xBackgroundConfig( nullptr ); + oslFileHandle aBackgroundConfig( nullptr ); // AS: Only export the background config if we're exporting all of the pages, otherwise we'll // screw it up. @@ -373,10 +373,10 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a if (bExportAll) { osl_removeFile(fullpath.pData); - osl_openFile( fullpath.pData, &xBackgroundConfig, osl_File_OpenFlag_Create | osl_File_OpenFlag_Write ); + osl_openFile( fullpath.pData, &aBackgroundConfig, osl_File_OpenFlag_Create | osl_File_OpenFlag_Write ); sal_uInt64 bytesWritten; - err = osl_writeFile(xBackgroundConfig, "slides=", strlen("slides="), &bytesWritten); + err = osl_writeFile(aBackgroundConfig, "slides=", strlen("slides="), &bytesWritten); } // TODO: check for errors @@ -435,15 +435,15 @@ bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue >& a OString ASCIItemp(temp.getStr(), temp.getLength(), RTL_TEXTENCODING_ASCII_US); sal_uInt64 bytesWritten; - osl_writeFile(xBackgroundConfig, ASCIItemp.getStr(), ASCIItemp.getLength(), &bytesWritten); + osl_writeFile(aBackgroundConfig, ASCIItemp.getStr(), ASCIItemp.getLength(), &bytesWritten); if (nPage < nPageCount - 1) - osl_writeFile(xBackgroundConfig, "|", 1, &bytesWritten); + osl_writeFile(aBackgroundConfig, "|", 1, &bytesWritten); } } if (bExportAll) - osl_closeFile(xBackgroundConfig); + osl_closeFile(aBackgroundConfig); return true; } diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index d25143ff0887..bc64658800b1 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -49,14 +49,14 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase, SvMetaClass * pClass = rBase.ReadKnownClass( rInStm ); if( !pClass ) throw SvParseException( rInStm, "unknown imported interface" ); - SvClassElement xEle; - xEle.SetClass( pClass ); - aClassElementList.push_back( xEle ); + SvClassElement aEle; + aEle.SetClass( pClass ); + aClassElementList.push_back( aEle ); rTok = rInStm.GetToken(); if( rTok.IsString() ) { - xEle.SetPrefix( rTok.GetString() ); + aEle.SetPrefix( rTok.GetString() ); rInStm.GetToken_Next(); } return; diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx index 48e75741c90d..cb2cd8b83e1f 100644 --- a/idl/source/prj/parser.cxx +++ b/idl/source/prj/parser.cxx @@ -299,14 +299,14 @@ void SvIdlParser::ReadInterfaceOrShellEntry(SvMetaClass& rClass) if( rTok.Is( SvHash_import() ) ) { SvMetaClass * pClass = ReadKnownClass(); - SvClassElement xEle(pClass); + SvClassElement aEle(pClass); rTok = rInStm.GetToken(); if( rTok.IsString() ) { - xEle.SetPrefix( rTok.GetString() ); + aEle.SetPrefix( rTok.GetString() ); rInStm.GetToken_Next(); } - rClass.aClassElementList.push_back( xEle ); + rClass.aClassElementList.push_back( aEle ); return; } else diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx index cca0752170f9..78d4b16ecc9b 100644 --- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx +++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx @@ -157,9 +157,9 @@ BlipContext::BlipContext( ContextHandler2Helper& rParent, // code rework. OUString aRelId = rAttribs.getString( R_TOKEN( link ), OUString() ); OUString aTargetLink = getFilter().getAbsoluteUrl( getRelations().getExternalTargetFromRelId( aRelId ) ); - SfxMedium xMed( aTargetLink, STREAM_STD_READ ); - xMed.Download(); - Reference< io::XInputStream > xInStrm = xMed.GetInputStream(); + SfxMedium aMed( aTargetLink, STREAM_STD_READ ); + aMed.Download(); + Reference< io::XInputStream > xInStrm = aMed.GetInputStream(); if ( xInStrm.is() ) mrBlipProps.mxGraphic = getFilter().getGraphicHelper().importGraphic( xInStrm ); } diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 4068fa7661ea..e20e13fec539 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -550,8 +550,8 @@ bool MSConvertOCXControls::WriteOCXExcelKludgeStream( const css::uno::Reference< SvGlobalName aName; OUString sId = exportHelper.getGUID(); aName.MakeId(sId); - BinaryXOutputStream xOut( xOutStrm, false ); - OleHelper::exportGuid( xOut, aName ); + BinaryXOutputStream aOut( xOutStrm, false ); + OleHelper::exportGuid( aOut, aName ); exportHelper.exportControl( xOutStrm, rSize ); return true; } diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 60c9f1c6e4f5..e216721e045a 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -80,8 +80,8 @@ void ScMacrosTest::testMSP() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - ScDocShell* xDocSh = dynamic_cast<ScDocShell*>(pFoundShell); - CPPUNIT_ASSERT(xDocSh != nullptr); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>(pFoundShell); + CPPUNIT_ASSERT(pDocSh != nullptr); SfxObjectShell::CallXScript( xComponent, @@ -92,7 +92,7 @@ void ScMacrosTest::testMSP() SAL_INFO("sc.qa", "Result is " << sResult ); CPPUNIT_ASSERT_MESSAGE("TestMSP ( for fdo#67547) failed", sResult == "OK" ); - xDocSh->DoClose(); + pDocSh->DoClose(); } void ScMacrosTest::testPasswordProtectedStarBasic() @@ -112,8 +112,8 @@ void ScMacrosTest::testPasswordProtectedStarBasic() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - ScDocShell* xDocSh = static_cast<ScDocShell*>(pFoundShell); - ScDocument& rDoc = xDocSh->GetDocument(); + ScDocShell* pDocSh = static_cast<ScDocShell*>(pFoundShell); + ScDocument& rDoc = pDocSh->GetDocument(); // User defined types @@ -147,7 +147,7 @@ void ScMacrosTest::testPasswordProtectedStarBasic() CPPUNIT_ASSERT_MESSAGE("Far Method script did not change the value of Sheet1.C1", aValue == "success"); - xDocSh->DoClose(); + pDocSh->DoClose(); } void ScMacrosTest::testStarBasic() @@ -167,8 +167,8 @@ void ScMacrosTest::testStarBasic() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - ScDocShell* xDocSh = static_cast<ScDocShell*>(pFoundShell); - ScDocument& rDoc = xDocSh->GetDocument(); + ScDocShell* pDocSh = static_cast<ScDocShell*>(pFoundShell); + ScDocument& rDoc = pDocSh->GetDocument(); SfxObjectShell::CallXScript( xComponent, @@ -177,7 +177,7 @@ void ScMacrosTest::testStarBasic() double aValue; rDoc.GetValue(0,0,0,aValue); CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("script did not change the value of Sheet1.A1",2.0, aValue, 0.00001); - xDocSh->DoClose(); + pDocSh->DoClose(); } void ScMacrosTest::testVba() diff --git a/sc/qa/extras/recordchanges-test.cxx b/sc/qa/extras/recordchanges-test.cxx index 993841e62974..357023e0d361 100644 --- a/sc/qa/extras/recordchanges-test.cxx +++ b/sc/qa/extras/recordchanges-test.cxx @@ -52,9 +52,9 @@ void ScRecordChangesTest::testSetRecordChanges() CPPUNIT_ASSERT_MESSAGE("a new document does not protect record changes", !protectionValue); // now activate recording - uno::Any xValue; - xValue <<= true; - xDocSettingsPropSet->setPropertyValue("RecordChanges", xValue); + uno::Any aValue; + aValue <<= true; + xDocSettingsPropSet->setPropertyValue("RecordChanges", aValue); CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("RecordChanges") >>= recordChangesValue); CPPUNIT_ASSERT_MESSAGE("the document should record changes", recordChangesValue); @@ -82,9 +82,9 @@ void ScRecordChangesTest::testCheckRecordChangesProtection() CPPUNIT_ASSERT_MESSAGE("the protection should be active", protectionValue); // try to de-activate recording - uno::Any xValue; - xValue <<= false; - xDocSettingsPropSet->setPropertyValue("RecordChanges", xValue); + uno::Any aValue; + aValue <<= false; + xDocSettingsPropSet->setPropertyValue("RecordChanges", aValue); CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("RecordChanges") >>= recordChangesValue); CPPUNIT_ASSERT(xDocSettingsPropSet->getPropertyValue("IsRecordChangesProtected") >>= protectionValue); diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index 4aa3f2337fe6..4b4b048dfb0c 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -88,12 +88,12 @@ uno::Reference< uno::XInterface > ScAnnontationObj::init() CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is()); // tested annotation is in sheet 0 cell C2 - table::CellAddress xCellAddress; - xCellAddress.Sheet = 0; - xCellAddress.Row = 1; - xCellAddress.Column = 2; + table::CellAddress aCellAddress; + aCellAddress.Sheet = 0; + aCellAddress.Row = 1; + aCellAddress.Column = 2; - return getAnnotation(xCellAddress); + return getAnnotation(aCellAddress); } void ScAnnontationObj::setUp() diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 49e6c20a963b..9f1f8c7b7d8e 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -126,11 +126,11 @@ void ScConditionalFormatTest::testUndoAnchor() SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); - ScDocShell* xDocSh = dynamic_cast<ScDocShell*>(pFoundShell); - CPPUNIT_ASSERT(xDocSh); + ScDocShell* pDocSh = dynamic_cast<ScDocShell*>(pFoundShell); + CPPUNIT_ASSERT(pDocSh); // Check whether graphic imported well - ScDocument& rDoc = xDocSh->GetDocument(); + ScDocument& rDoc = pDocSh->GetDocument(); ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); CPPUNIT_ASSERT(pDrawLayer); @@ -147,7 +147,7 @@ void ScConditionalFormatTest::testUndoAnchor() CPPUNIT_ASSERT_EQUAL(sal_uLong(864900), rGraphicObj.GetSizeBytes()); // Get the document controller - ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false); + ScTabViewShell* pViewShell = pDocSh->GetBestViewShell(false); CPPUNIT_ASSERT(pViewShell); // Get the draw view of the document diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 7b2e78ff7533..037ed4046312 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -289,9 +289,7 @@ ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const OUSt aStoreMedium.SetFilter(pExportFilter); SfxItemSet* pExportSet = aStoreMedium.GetItemSet(); uno::Sequence< beans::NamedValue > aEncryptionData = comphelper::OStorageHelper::CreatePackageEncryptionData( "test" ); - uno::Any xEncryptionData; - xEncryptionData <<= aEncryptionData; - pExportSet->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, xEncryptionData)); + pExportSet->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, makeAny(aEncryptionData))); uno::Reference< embed::XStorage > xMedStorage = aStoreMedium.GetStorage(); ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( xMedStorage, aEncryptionData ); @@ -1114,18 +1112,18 @@ void ScExportTest::testRichTextCellFormat() CPPUNIT_ASSERT(pStyles); OString nFormatIdx = OString::number( aCellFormat.toInt32() + 1 ); - const OString xPath1( "/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx + "]/x:alignment" ); + const OString aXPath1( "/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx + "]/x:alignment" ); // formatting record is set to wrap text - assertXPath(pStyles, xPath1, "wrapText", "true"); + assertXPath(pStyles, aXPath1, "wrapText", "true"); // see what font it references - const OString xPath2( "/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx +"]" ); - OUString aFontId = getXPath(pStyles, xPath2, "fontId"); + const OString aXPath2( "/x:styleSheet/x:cellXfs/x:xf[" + nFormatIdx +"]" ); + OUString aFontId = getXPath(pStyles, aXPath2, "fontId"); OString nFontIdx = OString::number( aFontId.toInt32() + 1 ); // that font should be bold - const OString xPath3("/x:styleSheet/x:fonts/x:font[" + nFontIdx + "]/x:b"); - assertXPath(pStyles, xPath3, "val", "true"); + const OString aXPath3("/x:styleSheet/x:fonts/x:font[" + nFontIdx + "]/x:b"); + assertXPath(pStyles, aXPath3, "val", "true"); xDocSh->DoClose(); } diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 2c117346fbaa..321929a5422b 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1534,14 +1534,14 @@ void ScInterpreter::ScTextJoin_MS() pStack[ sp - 1 - i ] = p; } - // get xDelimiter and bSkipEmpty - std::vector< OUString > xDelimiter; + // get aDelimiters and bSkipEmpty + std::vector< OUString > aDelimiters; size_t nRefInList = 0; switch ( GetStackType() ) { case svString: case svDouble: - xDelimiter.push_back( PopString().getString() ); + aDelimiters.push_back( PopString().getString() ); break; case svSingleRef : { @@ -1553,11 +1553,11 @@ void ScInterpreter::ScTextJoin_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - xDelimiter.push_back( aCell.getString( pDok ) ); + aDelimiters.push_back( aCell.getString( pDok ) ); else { if ( !aCell.hasEmptyValue() ) - xDelimiter.push_back( OUString::number( aCell.getValue() ) ); + aDelimiters.push_back( OUString::number( aCell.getValue() ) ); } } } @@ -1595,15 +1595,15 @@ void ScInterpreter::ScTextJoin_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - xDelimiter.push_back( aCell.getString( pDok ) ); + aDelimiters.push_back( aCell.getString( pDok ) ); else { if ( !aCell.hasEmptyValue() ) - xDelimiter.push_back( OUString::number( aCell.getValue() ) ); + aDelimiters.push_back( OUString::number( aCell.getValue() ) ); } } else - xDelimiter.push_back( "" ); + aDelimiters.push_back( "" ); } } } @@ -1628,15 +1628,15 @@ void ScInterpreter::ScTextJoin_MS() if ( !pMat->IsEmpty( j, k ) ) { if ( pMat->IsString( j, k ) ) - xDelimiter.push_back( pMat->GetString( j, k ).getString() ); + aDelimiters.push_back( pMat->GetString( j, k ).getString() ); else { if ( pMat->IsValue( j, k ) ) - xDelimiter.push_back( OUString::number( pMat->GetDouble( j, k ) ) ); + aDelimiters.push_back( OUString::number( pMat->GetDouble( j, k ) ) ); } } else - xDelimiter.push_back( "" ); + aDelimiters.push_back( "" ); } } } @@ -1648,12 +1648,12 @@ void ScInterpreter::ScTextJoin_MS() SetError( errIllegalArgument); break; } - if ( xDelimiter.empty() ) + if ( aDelimiters.empty() ) { PushIllegalArgument(); return; } - SCSIZE nSize = xDelimiter.size(); + SCSIZE nSize = aDelimiters.size(); bool bSkipEmpty = static_cast< bool >( GetDouble() ); nParamCount -= 2; @@ -1674,7 +1674,7 @@ void ScInterpreter::ScTextJoin_MS() { if ( !bFirst ) { - aResBuf.append( xDelimiter[ nIdx ] ); + aResBuf.append( aDelimiters[ nIdx ] ); if ( nSize > 1 ) { if ( ++nIdx >= nSize ) @@ -1711,7 +1711,7 @@ void ScInterpreter::ScTextJoin_MS() { if ( !bFirst ) { - aResBuf.append( xDelimiter[ nIdx ] ); + aResBuf.append( aDelimiters[ nIdx ] ); if ( nSize > 1 ) { if ( ++nIdx >= nSize ) @@ -1771,7 +1771,7 @@ void ScInterpreter::ScTextJoin_MS() { if ( !bFirst ) { - aResBuf.append( xDelimiter[ nIdx ] ); + aResBuf.append( aDelimiters[ nIdx ] ); if ( nSize > 1 ) { if ( ++nIdx >= nSize ) @@ -1820,7 +1820,7 @@ void ScInterpreter::ScTextJoin_MS() { if ( !bFirst ) { - aResBuf.append( xDelimiter[ nIdx ] ); + aResBuf.append( aDelimiters[ nIdx ] ); if ( nSize > 1 ) { if ( ++nIdx >= nSize ) @@ -1842,7 +1842,7 @@ void ScInterpreter::ScTextJoin_MS() { if ( !bFirst ) { - aResBuf.append( xDelimiter[ nIdx ] ); + aResBuf.append( aDelimiters[ nIdx ] ); if ( nSize > 1 ) { if ( ++nIdx >= nSize ) diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index e0819bbdeaf9..a1a2a75443d4 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -661,8 +661,8 @@ void ExcTable::FillAsTableXml() // list of HLINK records, generated by the cell table XclExpRecordRef xHyperlinks = mxCellTable->CreateRecord( EXC_ID_HLINK ); - XclExpHyperlinkList* xHyperlinkList = dynamic_cast<XclExpHyperlinkList*>(xHyperlinks.get()); - if( xHyperlinkList != nullptr && !xHyperlinkList->IsEmpty() ) + XclExpHyperlinkList* pHyperlinkList = dynamic_cast<XclExpHyperlinkList*>(xHyperlinks.get()); + if( pHyperlinkList != nullptr && !pHyperlinkList->IsEmpty() ) { aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_hyperlinks ) ); aRecList.AppendRecord( xHyperlinks ); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 62f1735603ba..4b91c2a9b43b 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -2089,13 +2089,13 @@ void XclExpSupbookBuffer::SaveXml( XclExpXmlStream& rStrm ) sal_uInt16 nId = xRef->GetFileId(); const OUString& rUrl = xRef->GetUrl(); - ::std::pair< ::std::map< sal_uInt16, OUString >::iterator, bool > xInsert( + ::std::pair< ::std::map< sal_uInt16, OUString >::iterator, bool > aInsert( aMap.insert( ::std::make_pair( nId, rUrl))); - if (!xInsert.second) + if (!aInsert.second) { SAL_WARN( "sc.filter", "XclExpSupbookBuffer::SaveXml: file ID already used: " << nId << - " wanted for " << rUrl << " and is " << (*xInsert.first).second << - (rUrl == (*xInsert.first).second ? " multiple Supbook not supported" : "")); + " wanted for " << rUrl << " and is " << (*aInsert.first).second << + (rUrl == (*aInsert.first).second ? " multiple Supbook not supported" : "")); continue; } diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index a9ed30120401..09bd891da9c5 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2740,8 +2740,8 @@ bool XclImpChTypeGroup::HasConnectorLines() const // existence of connector lines (only in stacked bar charts) if ( !(maType.IsStacked() || maType.IsPercent()) || (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_BAR) ) return false; - XclImpChLineFormatMap::const_iterator xConLine = m_ChartLines.find(EXC_CHCHARTLINE_CONNECT); - return (xConLine != m_ChartLines.end() && xConLine->second.HasLine()); + XclImpChLineFormatMap::const_iterator aConLine = m_ChartLines.find(EXC_CHCHARTLINE_CONNECT); + return (aConLine != m_ChartLines.end() && aConLine->second.HasLine()); } OUString XclImpChTypeGroup::GetSingleSeriesTitle() const @@ -2817,9 +2817,9 @@ void XclImpChTypeGroup::ReadChChartLine( XclImpStream& rStrm ) sal_uInt16 nLineId = rStrm.ReaduInt16(); if( (rStrm.GetNextRecId() == EXC_ID_CHLINEFORMAT) && rStrm.StartNextRecord() ) { - XclImpChLineFormat xLineFmt; - xLineFmt.ReadChLineFormat( rStrm ); - m_ChartLines[ nLineId ] = xLineFmt; + XclImpChLineFormat aLineFmt; + aLineFmt.ReadChLineFormat( rStrm ); + m_ChartLines[ nLineId ] = aLineFmt; } } @@ -2919,11 +2919,11 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWFIRST, HasDropBars() ); aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWHIGHLOW, true ); // hi-lo line format - XclImpChLineFormatMap::const_iterator xHiLoLine = m_ChartLines.find( EXC_CHCHARTLINE_HILO ); - if (xHiLoLine != m_ChartLines.end()) + XclImpChLineFormatMap::const_iterator aHiLoLine = m_ChartLines.find( EXC_CHCHARTLINE_HILO ); + if (aHiLoLine != m_ChartLines.end()) { ScfPropertySet aSeriesProp( xDataSeries ); - xHiLoLine->second.Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE ); + aHiLoLine->second.Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE ); } // white dropbar format XclImpChDropBarMap::const_iterator itr = m_DropBars.find(EXC_CHDROPBAR_UP); diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index b38de6979951..2c33b961cdce 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1975,9 +1975,9 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x OUString sStyleName; sal_Int32 nNumberFormat(-1); sal_Int32 nValidationIndex(-1); - std::vector< XMLPropertyState > xPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties )); - std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin()); - std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end()); + std::vector< XMLPropertyState > aPropStates(xCellStylesExportPropertySetMapper->Filter( xProperties )); + std::vector< XMLPropertyState >::iterator aItr(aPropStates.begin()); + std::vector< XMLPropertyState >::iterator aEndItr(aPropStates.end()); sal_Int32 nCount(0); while (aItr != aEndItr) { @@ -1992,8 +1992,8 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x // if it is not the last property it is the property before the last property, // so in the worst case only one property has to be copied, but in the best case no // property has to be copied - aItr = xPropStates.erase(aItr); - aEndItr = xPropStates.end(); // old aEndItr is invalidated! + aItr = aPropStates.erase(aItr); + aEndItr = aPropStates.end(); // old aEndItr is invalidated! } break; case CTF_SC_CELLSTYLE : @@ -2027,17 +2027,17 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x } } if (nCount == 1) // this is the CellStyle and should be removed if alone - xPropStates.clear(); + aPropStates.clear(); if (nNumberFormat == -1) xProperties->getPropertyValue(SC_NUMBERFORMAT) >>= nNumberFormat; if (!sStyleName.isEmpty()) { - if (!xPropStates.empty()) + if (!aPropStates.empty()) { sal_Int32 nIndex; if (pOldName) { - if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates)) + if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, aPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_CELL, *pOldName); // add to pCellStyles, so the name is found for normal sheets @@ -2050,7 +2050,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x { OUString sName; bool bIsAutoStyle(true); - if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, xPropStates)) + if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_CELL, sStyleName, aPropStates)) { OUString* pTemp(new OUString(sName)); if (!pCellStyles->AddStyleName(pTemp, nIndex)) @@ -2107,11 +2107,11 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& { OUString SC_SCOLUMNPREFIX(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX); - std::vector<XMLPropertyState> xPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); - if(!xPropStates.empty()) + std::vector<XMLPropertyState> aPropStates(xColumnStylesExportPropertySetMapper->Filter(xColumnProperties)); + if(!aPropStates.empty()) { - std::vector< XMLPropertyState >::iterator aItr(xPropStates.begin()); - std::vector< XMLPropertyState >::iterator aEndItr(xPropStates.end()); + std::vector< XMLPropertyState >::iterator aItr(aPropStates.begin()); + std::vector< XMLPropertyState >::iterator aEndItr(aPropStates.end()); while (aItr != aEndItr) { if (xColumnStylesPropertySetMapper->GetEntryContextId(aItr->mnIndex) == CTF_SC_ISVISIBLE) @@ -2125,7 +2125,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& OUString sParent; if (pOldName) { - if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) + if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, aPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_COLUMN, *pOldName); // add to pColumnStyles, so the name is found for normal sheets @@ -2136,7 +2136,7 @@ void ScXMLExport::AddStyleFromColumn(const uno::Reference<beans::XPropertySet>& else { OUString sName; - if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, xPropStates)) + if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_COLUMN, sParent, aPropStates)) { OUString* pTemp(new OUString(sName)); rIndex = pColumnStyles->AddStyleName(pTemp); @@ -2152,13 +2152,13 @@ void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRo { OUString SC_SROWPREFIX(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX); - std::vector<XMLPropertyState> xPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); - if(!xPropStates.empty()) + std::vector<XMLPropertyState> aPropStates(xRowStylesExportPropertySetMapper->Filter(xRowProperties)); + if(!aPropStates.empty()) { OUString sParent; if (pOldName) { - if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) + if (GetAutoStylePool()->AddNamed(*pOldName, XML_STYLE_FAMILY_TABLE_ROW, sParent, aPropStates)) { GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_ROW, *pOldName); // add to pRowStyles, so the name is found for normal sheets @@ -2169,7 +2169,7 @@ void ScXMLExport::AddStyleFromRow(const uno::Reference<beans::XPropertySet>& xRo else { OUString sName; - if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, xPropStates)) + if (GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_ROW, sParent, aPropStates)) { OUString* pTemp(new OUString(sName)); rIndex = pRowStyles->AddStyleName(pTemp); @@ -2305,10 +2305,10 @@ void ScXMLExport::ExportAutoStyles_() Reference<beans::XPropertySet> xTableProperties(xIndex->getByIndex(nTable), uno::UNO_QUERY); if (xTableProperties.is()) { - std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); + std::vector<XMLPropertyState> aPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); OUString sParent; OUString sName( aTableIter->maName ); - GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); + GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, aPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TABLE_TABLE, sName); } } @@ -2343,19 +2343,19 @@ void ScXMLExport::ExportAutoStyles_() { if ( !aNoteIter->maStyleName.isEmpty() ) { - std::vector<XMLPropertyState> xPropStates(xShapeMapper->Filter(xShapeProperties)); + std::vector<XMLPropertyState> aPropStates(xShapeMapper->Filter(xShapeProperties)); OUString sParent; OUString sName( aNoteIter->maStyleName ); - GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, xPropStates); + GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sParent, aPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_SD_GRAPHICS_ID, sName); } if ( !aNoteIter->maTextStyle.isEmpty() ) { - std::vector<XMLPropertyState> xPropStates( + std::vector<XMLPropertyState> aPropStates( GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter(xShapeProperties)); OUString sParent; OUString sName( aNoteIter->maTextStyle ); - GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); + GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, aPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } } @@ -2388,10 +2388,10 @@ void ScXMLExport::ExportAutoStyles_() lcl_GetEnumerated( xCellText, aNoteParaIter->maSelection.nStartPara ), uno::UNO_QUERY ); if ( xParaProp.is() ) { - std::vector<XMLPropertyState> xPropStates(xParaPropMapper->Filter(xParaProp)); + std::vector<XMLPropertyState> aPropStates(xParaPropMapper->Filter(xParaProp)); OUString sParent; OUString sName( aNoteParaIter->maName ); - GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, xPropStates); + GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_PARAGRAPH, sParent, aPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_PARAGRAPH, sName); } } @@ -2425,10 +2425,10 @@ void ScXMLExport::ExportAutoStyles_() { pCursor->SetSelection( aNoteTextIter->maSelection ); - std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp)); + std::vector<XMLPropertyState> aPropStates(xTextPropMapper->Filter(xCursorProp)); OUString sParent; OUString sName( aNoteTextIter->maName ); - GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); + GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, aPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } } @@ -2459,10 +2459,10 @@ void ScXMLExport::ExportAutoStyles_() { pCursor->SetSelection( aTextIter->maSelection ); - std::vector<XMLPropertyState> xPropStates(xTextPropMapper->Filter(xCursorProp)); + std::vector<XMLPropertyState> aPropStates(xTextPropMapper->Filter(xCursorProp)); OUString sParent; OUString sName( aTextIter->maName ); - GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates); + GetAutoStylePool()->AddNamed(sName, XML_STYLE_FAMILY_TEXT_TEXT, sParent, aPropStates); GetAutoStylePool()->RegisterName(XML_STYLE_FAMILY_TEXT_TEXT, sName); } } @@ -2491,12 +2491,12 @@ void ScXMLExport::ExportAutoStyles_() Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY); if (xTableProperties.is()) { - std::vector<XMLPropertyState> xPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); - if(!xPropStates.empty()) + std::vector<XMLPropertyState> aPropStates(xTableStylesExportPropertySetMapper->Filter(xTableProperties)); + if(!aPropStates.empty()) { OUString sParent; OUString sName; - GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, xPropStates); + GetAutoStylePool()->Add(sName, XML_STYLE_FAMILY_TABLE_TABLE, sParent, aPropStates); aTableStyles.push_back(sName); } } diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index f7a5ca74ef6a..27a197f63e1b 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -44,14 +44,14 @@ bool ScWarnPassword::WarningOnPassword( SfxMedium& rMedium ) { OUString empty; - Any xException( makeAny(InteractiveAppException(empty, + Any aException( makeAny(InteractiveAppException(empty, Reference <XInterface> (), InteractionClassification_QUERY, ERRCODE_SVX_EXPORT_FILTER_CRYPT))); Reference< ucbhelper::SimpleInteractionRequest > xRequest = new ucbhelper::SimpleInteractionRequest( - xException, + aException, ucbhelper::CONTINUATION_APPROVE | ucbhelper::CONTINUATION_DISAPPROVE ); diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index cd9ccdd512d1..130ed99d9763 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -83,9 +83,9 @@ ScVbaComment::getAnnotationIndex() throw (uno::RuntimeException) for ( ; aIndex < aCount ; aIndex++ ) { uno::Reference< sheet::XSheetAnnotation > xAnno( xAnnos->getByIndex( aIndex ), uno::UNO_QUERY_THROW ); - table::CellAddress xAddress = xAnno->getPosition(); + table::CellAddress aAnnoAddress = xAnno->getPosition(); - if ( xAddress.Column == aAddress.Column && xAddress.Row == aAddress.Row && xAddress.Sheet == aAddress.Sheet ) + if ( aAnnoAddress.Column == aAddress.Column && aAnnoAddress.Row == aAddress.Row && aAnnoAddress.Sheet == aAddress.Sheet ) { SAL_INFO("sc.ui", "terminating search, index is " << aIndex); break; diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 22db74ad12a2..b30ebe364267 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -194,13 +194,13 @@ ScVbaNames::Add( const css::uno::Any& Name , uno::Reference< excel::XRange > xArea( xRange->Areas( uno::makeAny( sal_Int32(1) ) ), uno::UNO_QUERY ); - uno::Any xAny = xArea->getCellRange() ; + uno::Any aAny = xArea->getCellRange() ; - uno::Reference< sheet::XCellRangeAddressable > thisRangeAdd( xAny, ::uno::UNO_QUERY_THROW); + uno::Reference< sheet::XCellRangeAddressable > thisRangeAdd( aAny, ::uno::UNO_QUERY_THROW); table::CellRangeAddress aAddr = thisRangeAdd->getRangeAddress(); ScAddress aPos( static_cast< SCCOL >( aAddr.StartColumn ) , static_cast< SCROW >( aAddr.StartRow ) , static_cast< SCTAB >(aAddr.Sheet ) ); - uno::Any xAny2 ; + uno::Any aAny2 ; if ( mxNames.is() ) { sal_Int32 nUnoType = 0; @@ -213,7 +213,7 @@ ScVbaNames::Add( const css::uno::Any& Name , { xArea.set( xRange->Areas( uno::makeAny( nArea ) ), uno::UNO_QUERY_THROW ); - OUString sRangeAdd = xArea->Address( xAny2, xAny2 , xAny2 , xAny2, xAny2 ); + OUString sRangeAdd = xArea->Address( aAny2, aAny2 , aAny2 , aAny2, aAny2 ); if ( nArea > 1 ) sTmp += ","; sTmp = sTmp + "'" + xRange->getWorksheet()->getName() + "'." + sRangeAdd; diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index 857fbdd2103c..f2ac807f1bab 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -111,12 +111,12 @@ void SdMiscTest::testTdf96206() sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96206.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); - auto& xSSController = pSSVS->GetSlideSorter().GetController(); + auto& rSSController = pSSVS->GetSlideSorter().GetController(); const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), nMasterPageCnt1); - xSSController.GetClipboard().DoCopy(); - xSSController.GetClipboard().DoPaste(); + rSSController.GetClipboard().DoCopy(); + rSSController.GetClipboard().DoPaste(); const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(nMasterPageCnt1, nMasterPageCnt2); @@ -128,19 +128,19 @@ void SdMiscTest::testTdf96708() sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96708.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); - auto& xSSController = pSSVS->GetSlideSorter().GetController(); - auto& xPageSelector = xSSController.GetPageSelector(); + auto& rSSController = pSSVS->GetSlideSorter().GetController(); + auto& rPageSelector = rSSController.GetPageSelector(); const sal_uInt16 nMasterPageCnt1 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), nMasterPageCnt1); - xPageSelector.SelectAllPages(); - xSSController.GetClipboard().DoCopy(); + rPageSelector.SelectAllPages(); + rSSController.GetClipboard().DoCopy(); // Now wait for timers to trigger creation of auto-layout osl::Thread::wait(std::chrono::milliseconds(100)); Scheduler::ProcessTaskScheduling(true); - xSSController.GetClipboard().DoPaste(); + rSSController.GetClipboard().DoPaste(); const sal_uInt16 nMasterPageCnt2 = xDocSh->GetDoc()->GetMasterSdPageCount(PageKind::PK_STANDARD); CPPUNIT_ASSERT_EQUAL(nMasterPageCnt1, nMasterPageCnt2); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index f40efa6f82a4..edf11f949384 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -224,7 +224,7 @@ protected: uno::Reference< drawing::XDrawPages > xDrawPages = xDrawPagesSupplier->getDrawPages(); CPPUNIT_ASSERT(xDrawPages.is()); - XShapeDumper xShapeDumper; + XShapeDumper aShapeDumper; sal_Int32 nLength = xDrawPages->getCount(); for (sal_Int32 i = 0; i < nLength; ++i) { diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 956b8f03af3f..e9541ecff498 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1598,8 +1598,8 @@ SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath() void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) { - ::basegfx::B2DPolyPolygon xPolyPoly; - if( ::basegfx::tools::importFromSvgD( xPolyPoly, getPath(), true, nullptr ) ) + ::basegfx::B2DPolyPolygon aPolyPoly; + if( ::basegfx::tools::importFromSvgD( aPolyPoly, getPath(), true, nullptr ) ) { SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() ); if( pObj ) @@ -1608,21 +1608,21 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) if( pPage ) { const Size aPageSize( pPage->GetSize() ); - xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix((double)aPageSize.Width(), (double)aPageSize.Height())); + aPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix((double)aPageSize.Width(), (double)aPageSize.Height())); } const Rectangle aBoundRect( pObj->GetCurrentBoundRect() ); const Point aCenter( aBoundRect.Center() ); - xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(aCenter.X(), aCenter.Y())); + aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(aCenter.X(), aCenter.Y())); } } - rPathObj.SetPathPoly( xPolyPoly ); + rPathObj.SetPathPoly( aPolyPoly ); } void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj ) { - ::basegfx::B2DPolyPolygon xPolyPoly( rPathObj.GetPathPoly() ); + ::basegfx::B2DPolyPolygon aPolyPoly( rPathObj.GetPathPoly() ); SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() ); if( pObj ) @@ -1642,18 +1642,18 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj const Point aCenter( aBoundRect.Center() ); - xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); + aPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); SdrPage* pPage = pObj->GetPage(); if( pPage ) { const Size aPageSize( pPage->GetSize() ); - xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix( + aPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix( 1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height())); } } - setPath( ::basegfx::tools::exportToSvgD( xPolyPoly, true, true, true) ); + setPath( ::basegfx::tools::exportToSvgD( aPolyPoly, true, true, true) ); } EffectSequenceHelper::EffectSequenceHelper() diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 1772034bcf46..56467835cab7 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1230,8 +1230,8 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(Runti Reference< view::XSelectionSupplier > xDocView( xController, UNO_QUERY ); if ( xDocView.is() ) { - Any xSel = xDocView->getSelection(); - xSel >>= xReturn ; + Any aSel = xDocView->getSelection(); + aSel >>= xReturn ; } } diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 00b29182ae53..9c6d5d33b414 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -86,33 +86,33 @@ public: EmbedEventListener_Impl* EmbedEventListener_Impl::Create( EmbeddedObjectRef* p ) { - EmbedEventListener_Impl* xRet = new EmbedEventListener_Impl( p ); - xRet->acquire(); + EmbedEventListener_Impl* pRet = new EmbedEventListener_Impl( p ); + pRet->acquire(); if ( p->GetObject().is() ) { - p->GetObject()->addStateChangeListener( xRet ); + p->GetObject()->addStateChangeListener( pRet ); uno::Reference < util::XCloseable > xClose( p->GetObject(), uno::UNO_QUERY ); DBG_ASSERT( xClose.is(), "Object does not support XCloseable!" ); if ( xClose.is() ) - xClose->addCloseListener( xRet ); + xClose->addCloseListener( pRet ); uno::Reference < document::XEventBroadcaster > xBrd( p->GetObject(), uno::UNO_QUERY ); if ( xBrd.is() ) - xBrd->addEventListener( xRet ); + xBrd->addEventListener( pRet ); - xRet->nState = p->GetObject()->getCurrentState(); - if ( xRet->nState == embed::EmbedStates::RUNNING ) + pRet->nState = p->GetObject()->getCurrentState(); + if ( pRet->nState == embed::EmbedStates::RUNNING ) { uno::Reference < util::XModifiable > xMod( p->GetObject()->getComponent(), uno::UNO_QUERY ); if ( xMod.is() ) // listen for changes in running state (update replacements in case of changes) - xMod->addModifyListener( xRet ); + xMod->addModifyListener( pRet ); } } - return xRet; + return pRet; } void SAL_CALL EmbedEventListener_Impl::changingState( const lang::EventObject&, diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index d21cd0b10813..b23ff7e81f5e 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -601,7 +601,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const bool bBezierAl std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandles() const { - std::vector< SdrCustomShapeInteraction > xRet; + std::vector< SdrCustomShapeInteraction > aRet; try { Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() ); @@ -676,7 +676,7 @@ std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandle default: break; } aSdrCustomShapeInteraction.nMode = nMode; - xRet.push_back( aSdrCustomShapeInteraction ); + aRet.push_back( aSdrCustomShapeInteraction ); } } } @@ -684,7 +684,7 @@ std::vector< SdrCustomShapeInteraction > SdrObjCustomShape::GetInteractionHandle catch( const uno::RuntimeException& ) { } - return xRet; + return aRet; } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 5763aa183b72..0f2b64279e70 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -71,10 +71,10 @@ const Graphic ImpLoadLinkedGraphic( const OUString& aFileName, const OUString& a { Graphic aGraphic; - SfxMedium xMed( aFileName, aReferer, STREAM_STD_READ ); - xMed.Download(); + SfxMedium aMed( aFileName, aReferer, STREAM_STD_READ ); + aMed.Download(); - SvStream* pInStrm = xMed.GetInStream(); + SvStream* pInStrm = aMed.GetInStream(); if ( pInStrm ) { pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx index 8b465c5a24cd..d1bcbaf88a9c 100644 --- a/sw/qa/core/macros-test.cxx +++ b/sw/qa/core/macros-test.cxx @@ -524,7 +524,7 @@ void SwMacrosTest::testFindReplace() Reference<lang::XComponent> const xComponent = loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"); - const ::comphelper::ScopeGuard xComponentScopeGuard( + const ::comphelper::ScopeGuard aComponentScopeGuard( [&xComponent]() { xComponent->dispose(); } ); SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(xComponent.get()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index 549755cbaae3..cb0c8046ce70 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -370,7 +370,7 @@ DECLARE_OOXMLEXPORT_TEST(testTable, "table.odt") DECLARE_OOXMLEXPORT_TEST(testTablePosition, "table-position.docx") { - sal_Int32 xCoordsFromOffice[] = { 2500, -1000, 0, 0 }; + sal_Int32 aXCoordsFromOffice[] = { 2500, -1000, 0, 0 }; sal_Int32 cellLeftMarginFromOffice[] = { 250, 100, 0, 0 }; uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -386,7 +386,7 @@ DECLARE_OOXMLEXPORT_TEST(testTablePosition, "table-position.docx") uno::Reference<text::XTextViewCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY); awt::Point pos = xCursor->getPosition(); CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect X coord computed from docx", - xCoordsFromOffice[i], pos.X, 1); + aXCoordsFromOffice[i], pos.X, 1); // Verify left margin of 1st cell : // * Office left margins are measured relative to the right of the border diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 08cc3c4a1593..f29304f5ecb8 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2003,9 +2003,9 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69649, "fdo69649.docx") uno::Reference<text::XTextCursor> xTextCursor(xText->createTextCursor( ), uno::UNO_QUERY); xTextCursor->gotoRange(xTextRange->getStart(),false); xTextCursor->gotoRange(xTextRange->getEnd(),true); - OUString xTocString(xTextCursor->getString()); - xTocString = xTocString.copy(256); - CPPUNIT_ASSERT(xTocString.startsWithIgnoreAsciiCase( "Heading 15.1:\t15" ) ); + OUString aTocString(xTextCursor->getString()); + aTocString = aTocString.copy(256); + CPPUNIT_ASSERT(aTocString.startsWithIgnoreAsciiCase( "Heading 15.1:\t15" ) ); } DECLARE_OOXMLIMPORT_TEST(testFdo73389,"fdo73389.docx") diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 82f461038c2d..01c6500a0b6b 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -3418,8 +3418,8 @@ void SwUiWriterTest::testTdf96479() OUStringLiteral1<CH_TXT_ATR_INPUTFIELDSTART>() + OUStringLiteral1<CH_TXT_ATR_INPUTFIELDEND>(); SwDoc* pDoc = createDoc(); - SwXTextDocument *xTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); - CPPUNIT_ASSERT(xTextDoc); + SwXTextDocument *pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); // So we can clean up all references for reload { @@ -3483,9 +3483,9 @@ void SwUiWriterTest::testTdf96479() utl::TempFile aTempFile; save("writer8", aTempFile); loadURL(aTempFile.GetURL(), nullptr); - xTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); - CPPUNIT_ASSERT(xTextDoc); - pDoc = xTextDoc->GetDocShell()->GetDoc(); + pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + pDoc = pTextDoc->GetDocShell()->GetDoc(); // Lookup "replacement" bookmark IDocumentMarkAccess &rIDMA = *pDoc->getIDocumentMarkAccess(); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 3bbb73381ee7..6b3ef7c15c94 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -555,8 +555,8 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos) while ( linkedTextboxesIter != maFlyFrames.end() ) { uno::Reference< drawing::XShape > xShape; - ww8::Frame xFrame = *linkedTextboxesIter; - const SdrObject* pSdrObj = xFrame.GetFrameFormat().FindRealSdrObject(); + ww8::Frame aFrame = *linkedTextboxesIter; + const SdrObject* pSdrObj = aFrame.GetFrameFormat().FindRealSdrObject(); if( pSdrObj ) xShape.set(const_cast<SdrObject*>(pSdrObj)->getUnoShape(), uno::UNO_QUERY); uno::Reference< beans::XPropertySet > xPropertySet(xShape, uno::UNO_QUERY); diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx index 581bc26f2035..2772328eef17 100644 --- a/test/source/sheet/datapilotfield.cxx +++ b/test/source/sheet/datapilotfield.cxx @@ -39,29 +39,29 @@ void DataPilotField::testSortInfo() aSortInfoValue.Field = "Col1"; aSortInfoValue.IsAscending = false; aSortInfoValue.Mode = sheet::DataPilotFieldSortMode::MANUAL; - uno::Any xValue; - xValue <<= aSortInfoValue; - xPropSet->setPropertyValue(aSortInfo, xValue); + uno::Any aValue; + aValue <<= aSortInfoValue; + xPropSet->setPropertyValue(aSortInfo, aValue); sheet::DataPilotFieldSortInfo aNewSortInfoValue; - xValue = xPropSet->getPropertyValue(aSortInfo); - CPPUNIT_ASSERT( xValue >>= aNewSortInfoValue ); + aValue = xPropSet->getPropertyValue(aSortInfo); + CPPUNIT_ASSERT( aValue >>= aNewSortInfoValue ); CPPUNIT_ASSERT_MESSAGE("set value should be the same as got value", aNewSortInfoValue.Field == aSortInfoValue.Field && aNewSortInfoValue.Mode == aSortInfoValue.Mode && aNewSortInfoValue.IsAscending == aSortInfoValue.IsAscending); //setting HasSortInfo only makes sense for false, for true the uno implementation does nothing bool bHasSortInfo(false); OUString aHasSortInfo("HasSortInfo"); - xValue = xPropSet->getPropertyValue(aHasSortInfo); - CPPUNIT_ASSERT( xValue >>= bHasSortInfo ); + aValue = xPropSet->getPropertyValue(aHasSortInfo); + CPPUNIT_ASSERT( aValue >>= bHasSortInfo ); CPPUNIT_ASSERT_MESSAGE("should have sort info", bHasSortInfo); bHasSortInfo = false; - xValue <<= bHasSortInfo; - xPropSet->setPropertyValue(aHasSortInfo, xValue); + aValue <<= bHasSortInfo; + xPropSet->setPropertyValue(aHasSortInfo, aValue); - xValue = xPropSet->getPropertyValue(aHasSortInfo); - CPPUNIT_ASSERT( xValue >>= bHasSortInfo ); + aValue = xPropSet->getPropertyValue(aHasSortInfo); + CPPUNIT_ASSERT( aValue >>= bHasSortInfo ); CPPUNIT_ASSERT_MESSAGE("should have no sort info", !bHasSortInfo); } @@ -72,29 +72,29 @@ void DataPilotField::testLayoutInfo() OUString aLayoutInfo("LayoutInfo"); aLayoutInfoValue.AddEmptyLines = false; aLayoutInfoValue.LayoutMode = sheet::DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM; - uno::Any xValue; - xValue <<= aLayoutInfoValue; - xPropSet->setPropertyValue(aLayoutInfo, xValue); + uno::Any aValue; + aValue <<= aLayoutInfoValue; + xPropSet->setPropertyValue(aLayoutInfo, aValue); sheet::DataPilotFieldLayoutInfo aNewLayoutInfoValue; - xValue = xPropSet->getPropertyValue(aLayoutInfo); - CPPUNIT_ASSERT( xValue >>= aNewLayoutInfoValue ); + aValue = xPropSet->getPropertyValue(aLayoutInfo); + CPPUNIT_ASSERT( aValue >>= aNewLayoutInfoValue ); CPPUNIT_ASSERT_MESSAGE("set value should be the same as the got value", aNewLayoutInfoValue.LayoutMode == aLayoutInfoValue.LayoutMode && aNewLayoutInfoValue.AddEmptyLines == aLayoutInfoValue.AddEmptyLines); //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing bool bHasLayoutInfo(false); OUString aHasLayoutInfo("HasLayoutInfo"); - xValue = xPropSet->getPropertyValue(aHasLayoutInfo); - CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo ); + aValue = xPropSet->getPropertyValue(aHasLayoutInfo); + CPPUNIT_ASSERT( aValue >>= bHasLayoutInfo ); CPPUNIT_ASSERT_MESSAGE("should have layout information", bHasLayoutInfo); bHasLayoutInfo = false; - xValue <<= bHasLayoutInfo; - xPropSet->setPropertyValue(aHasLayoutInfo, xValue); + aValue <<= bHasLayoutInfo; + xPropSet->setPropertyValue(aHasLayoutInfo, aValue); - xValue = xPropSet->getPropertyValue(aHasLayoutInfo); - CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo ); + aValue = xPropSet->getPropertyValue(aHasLayoutInfo); + CPPUNIT_ASSERT( aValue >>= bHasLayoutInfo ); CPPUNIT_ASSERT_MESSAGE("should have no longer sort information", !bHasLayoutInfo); } @@ -105,29 +105,29 @@ void DataPilotField::testAutoShowInfo() aAutoShowInfoValue.DataField = "Col1"; aAutoShowInfoValue.IsEnabled = true; OUString aAutoShowInfo("AutoShowInfo"); - uno::Any xValue; - xValue <<= aAutoShowInfoValue; - xPropSet->setPropertyValue(aAutoShowInfo, xValue); + uno::Any aValue; + aValue <<= aAutoShowInfoValue; + xPropSet->setPropertyValue(aAutoShowInfo, aValue); sheet::DataPilotFieldAutoShowInfo aNewAutoShowInfoValue; - xValue = xPropSet->getPropertyValue(aAutoShowInfo); - CPPUNIT_ASSERT( xValue >>= aNewAutoShowInfoValue ); + aValue = xPropSet->getPropertyValue(aAutoShowInfo); + CPPUNIT_ASSERT( aValue >>= aNewAutoShowInfoValue ); CPPUNIT_ASSERT_MESSAGE("set value should be the same as the got value", aNewAutoShowInfoValue.DataField == aAutoShowInfoValue.DataField && aNewAutoShowInfoValue.IsEnabled == aAutoShowInfoValue.IsEnabled); //setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing bool bHasAutoShowInfo(false); OUString aHasAutoShowInfo("HasAutoShowInfo"); - xValue = xPropSet->getPropertyValue(aHasAutoShowInfo); - CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo ); + aValue = xPropSet->getPropertyValue(aHasAutoShowInfo); + CPPUNIT_ASSERT( aValue >>= bHasAutoShowInfo ); CPPUNIT_ASSERT_MESSAGE("should have AutoShow information", bHasAutoShowInfo); bHasAutoShowInfo = false; - xValue <<= bHasAutoShowInfo; - xPropSet->setPropertyValue(aHasAutoShowInfo, xValue); + aValue <<= bHasAutoShowInfo; + xPropSet->setPropertyValue(aHasAutoShowInfo, aValue); - xValue = xPropSet->getPropertyValue(aHasAutoShowInfo); - CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo ); + aValue = xPropSet->getPropertyValue(aHasAutoShowInfo); + CPPUNIT_ASSERT( aValue >>= bHasAutoShowInfo ); CPPUNIT_ASSERT_MESSAGE("should have no longer AutoShow information", !bHasAutoShowInfo); } @@ -138,50 +138,50 @@ void DataPilotField::testReference() aReferenceValue.ReferenceField = "Col1"; aReferenceValue.ReferenceItemType = sheet::DataPilotFieldReferenceItemType::NAMED; OUString aReference("Reference"); - uno::Any xValue; - xValue <<= aReferenceValue; - xPropSet->setPropertyValue(aReference, xValue); + uno::Any aValue; + aValue <<= aReferenceValue; + xPropSet->setPropertyValue(aReference, aValue); sheet::DataPilotFieldReference aNewReferenceValue; - xValue = xPropSet->getPropertyValue(aReference); - CPPUNIT_ASSERT( xValue >>= aNewReferenceValue ); + aValue = xPropSet->getPropertyValue(aReference); + CPPUNIT_ASSERT( aValue >>= aNewReferenceValue ); CPPUNIT_ASSERT_MESSAGE("set value should be the same as the got value", aReferenceValue.ReferenceField == aNewReferenceValue.ReferenceField && aReferenceValue.ReferenceItemType == aNewReferenceValue.ReferenceItemType); //setting HasReference only makes sense for false, tor true the uno implementation does nothing bool bHasReference(false); OUString aHasReference("HasReference"); - xValue = xPropSet->getPropertyValue(aHasReference); - CPPUNIT_ASSERT( xValue >>= bHasReference ); + aValue = xPropSet->getPropertyValue(aHasReference); + CPPUNIT_ASSERT( aValue >>= bHasReference ); CPPUNIT_ASSERT_MESSAGE("should have Reference information", bHasReference); bHasReference = false; - xValue <<= bHasReference; - xPropSet->setPropertyValue(aHasReference, xValue); + aValue <<= bHasReference; + xPropSet->setPropertyValue(aHasReference, aValue); - xValue = xPropSet->getPropertyValue(aHasReference); - CPPUNIT_ASSERT( xValue >>= bHasReference ); + aValue = xPropSet->getPropertyValue(aHasReference); + CPPUNIT_ASSERT( aValue >>= bHasReference ); CPPUNIT_ASSERT_MESSAGE("should have no longer reference information", !bHasReference); } void DataPilotField::testIsGroupField() { uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW); - uno::Any xValue; + uno::Any aValue; OUString aIsGroupField("IsGroupField"); bool bIsGroupField(false); - xValue = xPropSet->getPropertyValue(aIsGroupField); - CPPUNIT_ASSERT( xValue >>= bIsGroupField); + aValue = xPropSet->getPropertyValue(aIsGroupField); + CPPUNIT_ASSERT( aValue >>= bIsGroupField); //only setting to false is supported if (bIsGroupField) { bIsGroupField = false; - xValue <<= bIsGroupField; + aValue <<= bIsGroupField; - xPropSet->setPropertyValue(aIsGroupField, xValue); - xValue = xPropSet->getPropertyValue(aIsGroupField); - CPPUNIT_ASSERT(xValue >>= bIsGroupField); + xPropSet->setPropertyValue(aIsGroupField, aValue); + aValue = xPropSet->getPropertyValue(aIsGroupField); + CPPUNIT_ASSERT(aValue >>= bIsGroupField); CPPUNIT_ASSERT_MESSAGE("setting IsGroupField is supported and should have happened", !bIsGroupField); } else diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx index 7fb422e7885f..45f59fc9109c 100644 --- a/test/source/sheet/xdatabaserange.cxx +++ b/test/source/sheet/xdatabaserange.cxx @@ -68,59 +68,59 @@ void XDatabaseRange::testGetSortDescriptor() uno::Sequence< beans::PropertyValue > xSortDescr = xDBRange->getSortDescriptor(); for (sal_Int32 i = 0; i < xSortDescr.getLength(); ++i) { - beans::PropertyValue xProp = xSortDescr[i]; - //std::cout << "Prop " << i << " Name: " << OUString(xProp.Name) << std::endl; + beans::PropertyValue aProp = xSortDescr[i]; + //std::cout << "Prop " << i << " Name: " << OUString(aProp.Name) << std::endl; - if (xProp.Name == "IsSortColumns") + if (aProp.Name == "IsSortColumns") { bool bIsSortColumns = true; - xProp.Value >>= bIsSortColumns; + aProp.Value >>= bIsSortColumns; CPPUNIT_ASSERT(bIsSortColumns); } - else if (xProp.Name == "ContainsHeader") + else if (aProp.Name == "ContainsHeader") { bool bContainsHeader = true; - xProp.Value >>= bContainsHeader; + aProp.Value >>= bContainsHeader; CPPUNIT_ASSERT(bContainsHeader); } - else if (xProp.Name == "MaxFieldCount") + else if (aProp.Name == "MaxFieldCount") { sal_Int32 nMaxFieldCount = 0; - xProp.Value >>= nMaxFieldCount; + aProp.Value >>= nMaxFieldCount; std::cout << "Value: " << nMaxFieldCount << std::endl; } - else if (xProp.Name == "SortFields") + else if (aProp.Name == "SortFields") { } - else if (xProp.Name == "BindFormatsToContent") + else if (aProp.Name == "BindFormatsToContent") { bool bBindFormatsToContent = false; - xProp.Value >>= bBindFormatsToContent; + aProp.Value >>= bBindFormatsToContent; CPPUNIT_ASSERT(bBindFormatsToContent); } - else if (xProp.Name == "CopyOutputData") + else if (aProp.Name == "CopyOutputData") { bool bCopyOutputData = true; - xProp.Value >>= bCopyOutputData; + aProp.Value >>= bCopyOutputData; CPPUNIT_ASSERT(!bCopyOutputData); } - else if (xProp.Name == "OutputPosition") + else if (aProp.Name == "OutputPosition") { } - else if (xProp.Name == "IsUserListEnabled") + else if (aProp.Name == "IsUserListEnabled") { bool bIsUserListEnabled = true; - xProp.Value >>= bIsUserListEnabled; + aProp.Value >>= bIsUserListEnabled; CPPUNIT_ASSERT(!bIsUserListEnabled); } - else if (xProp.Name == "UserListIndex") + else if (aProp.Name == "UserListIndex") { sal_Int32 nUserListIndex = 1; - xProp.Value >>= nUserListIndex; + aProp.Value >>= nUserListIndex; CPPUNIT_ASSERT(nUserListIndex == 0); } } diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx index ee82169abbbd..3ce1477e6351 100644 --- a/test/source/sheet/xnamedrange.cxx +++ b/test/source/sheet/xnamedrange.cxx @@ -105,11 +105,11 @@ void XNamedRange::testGetReferencePosition() OUString aTestedNamedRangeString("initial2"); uno::Reference< sheet::XNamedRange > xNamedRange = getNamedRange(aTestedNamedRangeString); - table::CellAddress xCellAddress = xNamedRange->getReferencePosition(); + table::CellAddress aCellAddress = xNamedRange->getReferencePosition(); // the expected address is on B1, as it was the active cell when intial2 created - CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", xCellAddress.Sheet == 0); - CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", xCellAddress.Column == 1); - CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", xCellAddress.Row == 0); + CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", aCellAddress.Sheet == 0); + CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", aCellAddress.Column == 1); + CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", aCellAddress.Row == 0); } void XNamedRange::testSetReferencePosition() @@ -121,10 +121,10 @@ void XNamedRange::testSetReferencePosition() xNamedRange->setReferencePosition(aBaseAddress); - table::CellAddress xCellAddress = xNamedRange->getReferencePosition(); - CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position after setting it", xCellAddress.Sheet == 1); - CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position after setting it", xCellAddress.Column == 2); - CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position after setting it", xCellAddress.Row == 3); + table::CellAddress aCellAddress = xNamedRange->getReferencePosition(); + CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position after setting it", aCellAddress.Sheet == 1); + CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position after setting it", aCellAddress.Column == 2); + CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position after setting it", aCellAddress.Row == 3); } } diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx index 41295b831392..c31f4afe7d82 100644 --- a/test/source/sheet/xnamedranges.cxx +++ b/test/source/sheet/xnamedranges.cxx @@ -176,12 +176,12 @@ void XNamedRanges::testRemoveByName() void XNamedRanges::testOutputList() { - table::CellAddress xCellAddress = table::CellAddress (0,2,0); + table::CellAddress aCellAddress = table::CellAddress (0,2,0); uno::Reference< sheet::XNamedRanges > xNamedRanges(init(), UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xNamedRangesIndex(init(), UNO_QUERY_THROW); sal_Int32 nElementsCount = xNamedRangesIndex->getCount(); - xNamedRanges->outputList(xCellAddress); + xNamedRanges->outputList(aCellAddress); OUString aString; uno::Reference< table::XCell > xCell; diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx index 2755f5661a58..b39552603d13 100644 --- a/test/source/sheet/xsheetannotation.cxx +++ b/test/source/sheet/xsheetannotation.cxx @@ -22,17 +22,17 @@ namespace apitest { void XSheetAnnotation::testGetPosition() { uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW); - table::CellAddress xResultCellAddress = aSheetAnnotation->getPosition(); + table::CellAddress aResultCellAddress = aSheetAnnotation->getPosition(); //expected result - table::CellAddress xExpectedCellAddress; - xExpectedCellAddress.Sheet = 0; - xExpectedCellAddress.Row = 1; - xExpectedCellAddress.Column = 2; + table::CellAddress aExpectedCellAddress; + aExpectedCellAddress.Sheet = 0; + aExpectedCellAddress.Row = 1; + aExpectedCellAddress.Column = 2; - CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", xResultCellAddress.Sheet == xExpectedCellAddress.Sheet); - CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", xResultCellAddress.Column == xExpectedCellAddress.Column); - CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", xResultCellAddress.Row == xExpectedCellAddress.Row); + CPPUNIT_ASSERT_MESSAGE("Wrong SHEET reference position", aResultCellAddress.Sheet == aExpectedCellAddress.Sheet); + CPPUNIT_ASSERT_MESSAGE("Wrong COLUMN reference position", aResultCellAddress.Column == aExpectedCellAddress.Column); + CPPUNIT_ASSERT_MESSAGE("Wrong ROW reference position", aResultCellAddress.Row == aExpectedCellAddress.Row); } void XSheetAnnotation::testGetAuthor() diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx index d6e521f7bef1..b84acc0769c3 100644 --- a/test/source/sheet/xsheetannotations.cxx +++ b/test/source/sheet/xsheetannotations.cxx @@ -34,8 +34,8 @@ void XSheetAnnotations::testCount() uno::Reference< sheet::XSheetAnnotations > xSheet2Annotations( getAnnotations(1), UNO_QUERY_THROW); // insert a note on sheet 2 - table::CellAddress xTargetCellAddress (1,0,0); - xSheet2Annotations->insertNew(xTargetCellAddress, "an inserted annotation on sheet 2"); + table::CellAddress aTargetCellAddress (1,0,0); + xSheet2Annotations->insertNew(aTargetCellAddress, "an inserted annotation on sheet 2"); // count again on sheet 1 sal_Int32 nAfter = xAnnotationsIndex->getCount(); @@ -55,8 +55,8 @@ void XSheetAnnotations::testInsertNew() "There should already be one note", sal_Int32(1), nBefore ); // insert the annotation - table::CellAddress xTargetCellAddress (0,3,4); - aSheetAnnotations->insertNew(xTargetCellAddress, "an inserted annotation"); + table::CellAddress aTargetCellAddress (0,3,4); + aSheetAnnotations->insertNew(aTargetCellAddress, "an inserted annotation"); // count after inserting //uno::Reference< container::XIndexAccess > xAnnotationsIndexAfter (aSheetAnnotations, UNO_QUERY_THROW); @@ -67,17 +67,17 @@ void XSheetAnnotations::testInsertNew() // is the position ok ? uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW); - table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition(); + table::CellAddress aResultCellAddress = aLastSheetAnnotation->getPosition(); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Insert Annotation - Wrong SHEET reference position", - xTargetCellAddress.Sheet, xResultCellAddress.Sheet); + aTargetCellAddress.Sheet, aResultCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Insert Annotation - Wrong COLUMN reference position", - xTargetCellAddress.Column, xResultCellAddress.Column); + aTargetCellAddress.Column, aResultCellAddress.Column); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Insert Annotation - Wrong ROW reference position", - xTargetCellAddress.Row, xResultCellAddress.Row); + aTargetCellAddress.Row, aResultCellAddress.Row); // is the string ok ? uno::Reference< text::XTextRange > aTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); @@ -94,12 +94,12 @@ void XSheetAnnotations::testRemoveByIndex() uno::Reference< sheet::XSheetAnnotations > aSheetAnnotations (init(), UNO_QUERY_THROW); // insert some annotations - table::CellAddress xTargetCellAddress (0,4,5); - aSheetAnnotations->insertNew(xTargetCellAddress, "an inserted annotation 1"); - table::CellAddress xToBeRemovedCellAddress (0,5,6); - aSheetAnnotations->insertNew(xToBeRemovedCellAddress, "an inserted annotation 2"); - table::CellAddress xOtherCellAddress (0,7,8); - aSheetAnnotations->insertNew(xOtherCellAddress, "an inserted annotation 3"); + table::CellAddress aTargetCellAddress (0,4,5); + aSheetAnnotations->insertNew(aTargetCellAddress, "an inserted annotation 1"); + table::CellAddress aToBeRemovedCellAddress (0,5,6); + aSheetAnnotations->insertNew(aToBeRemovedCellAddress, "an inserted annotation 2"); + table::CellAddress aOtherCellAddress (0,7,8); + aSheetAnnotations->insertNew(aOtherCellAddress, "an inserted annotation 3"); // count before removing uno::Reference< container::XIndexAccess > xAnnotationsIndex (aSheetAnnotations, UNO_QUERY_THROW); @@ -114,17 +114,17 @@ void XSheetAnnotations::testRemoveByIndex() // the last position should be xOtherCellAddress uno::Reference< sheet::XSheetAnnotation > aLastSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-1), UNO_QUERY_THROW); - table::CellAddress xResultCellAddress = aLastSheetAnnotation->getPosition(); + table::CellAddress aResultCellAddress = aLastSheetAnnotation->getPosition(); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Remove Annotation - Wrong SHEET reference position", - xOtherCellAddress.Sheet, xResultCellAddress.Sheet); + aOtherCellAddress.Sheet, aResultCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Remove Annotation - Wrong COLUMN reference position", - xOtherCellAddress.Column, xResultCellAddress.Column); + aOtherCellAddress.Column, aResultCellAddress.Column); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Remove Annotation - Wrong ROW reference position", - xOtherCellAddress.Row, xResultCellAddress.Row); + aOtherCellAddress.Row, aResultCellAddress.Row); // is the string ok ? uno::Reference< text::XTextRange > aLastTextSheetAnnotation(aLastSheetAnnotation, UNO_QUERY_THROW); @@ -136,17 +136,17 @@ void XSheetAnnotations::testRemoveByIndex() // the previous should be xTargetCellAddress uno::Reference< sheet::XSheetAnnotation > aPreviousSheetAnnotation (xAnnotationsIndex->getByIndex(nAfter-2), UNO_QUERY_THROW); - table::CellAddress xPreviousCellAddress = aPreviousSheetAnnotation->getPosition(); + table::CellAddress aPreviousCellAddress = aPreviousSheetAnnotation->getPosition(); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Remove Annotation - Wrong SHEET reference position", - xTargetCellAddress.Sheet, xPreviousCellAddress.Sheet); + aTargetCellAddress.Sheet, aPreviousCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Remove Annotation - Wrong COLUMN reference position", - xTargetCellAddress.Column, xPreviousCellAddress.Column); + aTargetCellAddress.Column, aPreviousCellAddress.Column); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Remove Annotation - Wrong ROW reference position", - xTargetCellAddress.Row, xPreviousCellAddress.Row); + aTargetCellAddress.Row, aPreviousCellAddress.Row); // is the string ok ? uno::Reference< text::XTextRange > aPreviousTextSheetAnnotation(aPreviousSheetAnnotation, UNO_QUERY_THROW); @@ -164,39 +164,39 @@ void XSheetAnnotations::testGetByIndex() // insert annotations in first sheet uno::Reference< sheet::XSheetAnnotations > aSheet0Annotations (init(), UNO_QUERY_THROW); - table::CellAddress xTargetCellAddress0 (0,0,1); - aSheet0Annotations->insertNew(xTargetCellAddress0, "an inserted annotation 1 on sheet 1"); - table::CellAddress xSecondTargetCellAddress0 (0,0,2); - aSheet0Annotations->insertNew(xSecondTargetCellAddress0, "an inserted annotation 2 on sheet 1"); - table::CellAddress xThirdCellAddress0 (0,0,3); - aSheet0Annotations->insertNew(xThirdCellAddress0, "an inserted annotation 3 on sheet 1"); + table::CellAddress aTargetCellAddress0 (0,0,1); + aSheet0Annotations->insertNew(aTargetCellAddress0, "an inserted annotation 1 on sheet 1"); + table::CellAddress aSecondTargetCellAddress0 (0,0,2); + aSheet0Annotations->insertNew(aSecondTargetCellAddress0, "an inserted annotation 2 on sheet 1"); + table::CellAddress aThirdCellAddress0 (0,0,3); + aSheet0Annotations->insertNew(aThirdCellAddress0, "an inserted annotation 3 on sheet 1"); // insert annotations in third sheet uno::Reference< sheet::XSheetAnnotations > aSheet2Annotations (getAnnotations(2), UNO_QUERY_THROW); - table::CellAddress xTargetCellAddress2 (2,4,5); - aSheet2Annotations->insertNew(xTargetCellAddress2, "an inserted annotation 1 on sheet 3"); - table::CellAddress xSecondTargetCellAddress2 (2,5,6); - aSheet2Annotations->insertNew(xSecondTargetCellAddress2, "an inserted annotation 2 on sheet 3"); - table::CellAddress xThirdCellAddress2 (2,7,8); - aSheet2Annotations->insertNew(xThirdCellAddress2, "an inserted annotation 3 on sheet 3"); + table::CellAddress aTargetCellAddress2 (2,4,5); + aSheet2Annotations->insertNew(aTargetCellAddress2, "an inserted annotation 1 on sheet 3"); + table::CellAddress aSecondTargetCellAddress2 (2,5,6); + aSheet2Annotations->insertNew(aSecondTargetCellAddress2, "an inserted annotation 2 on sheet 3"); + table::CellAddress aThirdCellAddress2 (2,7,8); + aSheet2Annotations->insertNew(aThirdCellAddress2, "an inserted annotation 3 on sheet 3"); // get second annotation for second sheet uno::Reference< sheet::XSheetAnnotations > aSheetAnnotations (getAnnotations(2), UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xAnnotationsIndex (aSheetAnnotations, UNO_QUERY_THROW); uno::Reference< sheet::XSheetAnnotation > aAnnotation (xAnnotationsIndex->getByIndex(1), UNO_QUERY_THROW); - table::CellAddress xToBeAnalyzedCellAddress = aAnnotation->getPosition(); + table::CellAddress aToBeAnalyzedCellAddress = aAnnotation->getPosition(); // is the CellAddress ok ? CPPUNIT_ASSERT_EQUAL_MESSAGE( "GetByIndex Annotation - Wrong SHEET reference position", - xSecondTargetCellAddress2.Sheet, xToBeAnalyzedCellAddress.Sheet); + aSecondTargetCellAddress2.Sheet, aToBeAnalyzedCellAddress.Sheet); CPPUNIT_ASSERT_EQUAL_MESSAGE( "GetByIndex Annotation - Wrong COLUMN reference position", - xSecondTargetCellAddress2.Column, xToBeAnalyzedCellAddress.Column); + aSecondTargetCellAddress2.Column, aToBeAnalyzedCellAddress.Column); CPPUNIT_ASSERT_EQUAL_MESSAGE( "GetByIndex Annotation - Wrong ROW reference position", - xSecondTargetCellAddress2.Row, xToBeAnalyzedCellAddress.Row); + aSecondTargetCellAddress2.Row, aToBeAnalyzedCellAddress.Row); // is the string ok ? uno::Reference< text::XTextRange > aTextSheetAnnotation(aAnnotation, UNO_QUERY_THROW); diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx index 5da8e96e1f27..75332d5b0ee4 100644 --- a/test/source/sheet/xspreadsheets2.cxx +++ b/test/source/sheet/xspreadsheets2.cxx @@ -264,8 +264,8 @@ void XSpreadsheets2::testImportCellStyle() uno::Reference< style::XStyleFamiliesSupplier > xFamiliesSupplier (xDestDoc, UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xFamiliesNameAccess (xFamiliesSupplier->getStyleFamilies(), UNO_QUERY_THROW); OUString aCellFamilyName("CellStyles"); - uno::Any xCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName); - uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (xCellStylesFamily, UNO_QUERY_THROW); + uno::Any aCellStylesFamily = xFamiliesNameAccess->getByName(aCellFamilyName); + uno::Reference< container::XNameContainer > xCellStylesFamilyNameAccess (aCellStylesFamily, UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("New cell style not present", xCellStylesFamilyNameAccess->hasByName(aDestStyleName)); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index c9c1abd30fab..540d63677b7c 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -1726,7 +1726,8 @@ static void lcl_ApplyResolverToNestedContainees( const Reference< resource::XSt { OUString aPropName( PROPERTY_RESOURCERESOLVER ); - Any xNewStringResourceResolver; xNewStringResourceResolver <<= xStringResourceResolver; + Any aNewStringResourceResolver; + aNewStringResourceResolver <<= xStringResourceResolver; Sequence< OUString > aPropNames { aPropName }; @@ -1755,7 +1756,7 @@ static void lcl_ApplyResolverToNestedContainees( const Reference< resource::XSt xMultiPropSet->firePropertiesChangeEvent( aPropNames, xListener ); } else - xPropertySet->setPropertyValue( aPropName, xNewStringResourceResolver ); + xPropertySet->setPropertyValue( aPropName, aNewStringResourceResolver ); } catch (const Exception&) { diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index a6bdcbd2d4b5..6dd405ad5d63 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -653,21 +653,21 @@ shell::open( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ) { - XInputStream_impl* xInputStream = new XInputStream_impl( aUnqPath, bLock ); // from filinpstr.hxx + XInputStream_impl* pInputStream = new XInputStream_impl( aUnqPath, bLock ); // from filinpstr.hxx - sal_Int32 ErrorCode = xInputStream->CtorSuccess(); + sal_Int32 ErrorCode = pInputStream->CtorSuccess(); if( ErrorCode != TASKHANDLER_NO_ERROR ) { installError( CommandId, ErrorCode, - xInputStream->getMinorError() ); + pInputStream->getMinorError() ); - delete xInputStream; - xInputStream = nullptr; + delete pInputStream; + pInputStream = nullptr; } - return uno::Reference< io::XInputStream >( xInputStream ); + return uno::Reference< io::XInputStream >( pInputStream ); } @@ -686,20 +686,20 @@ shell::open_rw( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ) { - XStream_impl* xStream = new XStream_impl( aUnqPath, bLock ); // from filstr.hxx + XStream_impl* pStream = new XStream_impl( aUnqPath, bLock ); // from filstr.hxx - sal_Int32 ErrorCode = xStream->CtorSuccess(); + sal_Int32 ErrorCode = pStream->CtorSuccess(); if( ErrorCode != TASKHANDLER_NO_ERROR ) { installError( CommandId, ErrorCode, - xStream->getMinorError() ); + pStream->getMinorError() ); - delete xStream; - xStream = nullptr; + delete pStream; + pStream = nullptr; } - return uno::Reference< io::XStream >( xStream ); + return uno::Reference< io::XStream >( pStream ); } diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index e9a96e5dcdf9..5d53151f2ba4 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -181,12 +181,12 @@ namespace DOM OUString sOldValue = getValue(); OString o1 = OUStringToOString(value, RTL_TEXTENCODING_UTF8); - xmlChar const * xValue = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const * pValue = reinterpret_cast<xmlChar const *>(o1.getStr()); // this does not work if the attribute was created anew // xmlNodePtr pNode = m_aAttrPtr->parent; - // xmlSetProp(pNode, m_aAttrPtr->name, xValue); + // xmlSetProp(pNode, m_aAttrPtr->name, pValue); std::shared_ptr<xmlChar const> const buffer( - xmlEncodeEntitiesReentrant(m_aAttrPtr->doc, xValue), xmlFree); + xmlEncodeEntitiesReentrant(m_aAttrPtr->doc, pValue), xmlFree); xmlFreeNodeList(m_aAttrPtr->children); m_aAttrPtr->children = xmlStringGetNodeList(m_aAttrPtr->doc, buffer.get()); diff --git a/unoxml/source/dom/attributesmap.cxx b/unoxml/source/dom/attributesmap.cxx index 13be27c55ec1..921c085fbca3 100644 --- a/unoxml/source/dom/attributesmap.cxx +++ b/unoxml/source/dom/attributesmap.cxx @@ -70,11 +70,11 @@ namespace DOM if (pNode != nullptr) { OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); - xmlChar const * xName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const * pName = reinterpret_cast<xmlChar const *>(o1.getStr()); xmlAttrPtr cur = pNode->properties; while (cur != nullptr) { - if( strcmp(reinterpret_cast<char const *>(xName), reinterpret_cast<char const *>(cur->name)) == 0) + if( strcmp(reinterpret_cast<char const *>(pName), reinterpret_cast<char const *>(cur->name)) == 0) { aNode.set( m_pElement->GetOwnerDocument().GetCNode( reinterpret_cast<xmlNodePtr>(cur)).get() ); @@ -101,15 +101,15 @@ namespace DOM if (pNode != nullptr) { OString o1 = OUStringToOString(localName, RTL_TEXTENCODING_UTF8); - xmlChar const * xName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const * pName = reinterpret_cast<xmlChar const *>(o1.getStr()); OString o2 = OUStringToOString(namespaceURI, RTL_TEXTENCODING_UTF8); - xmlChar const*const xNs = + xmlChar const* pSearchNs = reinterpret_cast<xmlChar const*>(o2.getStr()); - xmlNsPtr const pNs = xmlSearchNsByHref(pNode->doc, pNode, xNs); + xmlNsPtr const pNs = xmlSearchNsByHref(pNode->doc, pNode, pSearchNs); xmlAttrPtr cur = pNode->properties; while (cur != nullptr && pNs != nullptr) { - if( strcmp(reinterpret_cast<char const *>(xName), reinterpret_cast<char const *>(cur->name)) == 0 && + if( strcmp(reinterpret_cast<char const *>(pName), reinterpret_cast<char const *>(cur->name)) == 0 && cur->ns == pNs) { aNode.set( m_pElement->GetOwnerDocument().GetCNode( diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index 4a017308702e..8c0b25d2ffc5 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -438,8 +438,8 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(o1.getStr()); - xmlAttrPtr const pAttr = xmlNewDocProp(m_aDocPtr, xName, nullptr); + xmlChar const *pName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlAttrPtr const pAttr = xmlNewDocProp(m_aDocPtr, pName, nullptr); ::rtl::Reference< CAttr > const pCAttr( dynamic_cast< CAttr* >(GetCNode( reinterpret_cast<xmlNodePtr>(pAttr)).get())); @@ -509,8 +509,8 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString o1 = OUStringToOString(data, RTL_TEXTENCODING_UTF8); - xmlChar const *xData = reinterpret_cast<xmlChar const *>(o1.getStr()); - xmlNodePtr pComment = xmlNewDocComment(m_aDocPtr, xData); + xmlChar const *pData = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlNodePtr pComment = xmlNewDocComment(m_aDocPtr, pData); Reference< XComment > const xRet( static_cast< XNode* >(GetCNode(pComment).get()), UNO_QUERY_THROW); @@ -537,8 +537,8 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString o1 = OUStringToOString(tagName, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(o1.getStr()); - xmlNodePtr const pNode = xmlNewDocNode(m_aDocPtr, nullptr, xName, nullptr); + xmlChar const *pName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlNodePtr const pNode = xmlNewDocNode(m_aDocPtr, nullptr, pName, nullptr); Reference< XElement > const xRet( static_cast< XNode* >(GetCNode(pNode).get()), UNO_QUERY_THROW); @@ -554,27 +554,27 @@ namespace DOM sal_Int32 i = qname.indexOf(':'); if (ns.isEmpty()) throw RuntimeException(); - xmlChar const *xPrefix; - xmlChar const *xName; + xmlChar const *pPrefix; + xmlChar const *pName; OString o1, o2, o3; if ( i != -1) { o1 = OUStringToOString(qname.copy(0, i), RTL_TEXTENCODING_UTF8); - xPrefix = reinterpret_cast<xmlChar const *>(o1.getStr()); + pPrefix = reinterpret_cast<xmlChar const *>(o1.getStr()); o2 = OUStringToOString(qname.copy(i+1, qname.getLength()-i-1), RTL_TEXTENCODING_UTF8); - xName = reinterpret_cast<xmlChar const *>(o2.getStr()); + pName = reinterpret_cast<xmlChar const *>(o2.getStr()); } else { // default prefix - xPrefix = reinterpret_cast<xmlChar const *>(""); + pPrefix = reinterpret_cast<xmlChar const *>(""); o2 = OUStringToOString(qname, RTL_TEXTENCODING_UTF8); - xName = reinterpret_cast<xmlChar const *>(o2.getStr()); + pName = reinterpret_cast<xmlChar const *>(o2.getStr()); } o3 = OUStringToOString(ns, RTL_TEXTENCODING_UTF8); - xmlChar const *xUri = reinterpret_cast<xmlChar const *>(o3.getStr()); + xmlChar const *pUri = reinterpret_cast<xmlChar const *>(o3.getStr()); // xmlNsPtr aNsPtr = xmlNewReconciledNs? // xmlNsPtr aNsPtr = xmlNewGlobalNs? - xmlNodePtr const pNode = xmlNewDocNode(m_aDocPtr, nullptr, xName, nullptr); - xmlNsPtr const pNs = xmlNewNs(pNode, xUri, xPrefix); + xmlNodePtr const pNode = xmlNewDocNode(m_aDocPtr, nullptr, pName, nullptr); + xmlNsPtr const pNs = xmlNewNs(pNode, pUri, pPrefix); xmlSetNs(pNode, pNs); Reference< XElement > const xRet( static_cast< XNode* >(GetCNode(pNode).get()), @@ -589,8 +589,8 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(o1.getStr()); - xmlNodePtr const pNode = xmlNewReference(m_aDocPtr, xName); + xmlChar const *pName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlNodePtr const pNode = xmlNewReference(m_aDocPtr, pName); Reference< XEntityReference > const xRet( static_cast< XNode* >(GetCNode(pNode).get()), UNO_QUERY_THROW); @@ -606,10 +606,10 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString o1 = OUStringToOString(target, RTL_TEXTENCODING_UTF8); - xmlChar const *xTarget = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pTarget = reinterpret_cast<xmlChar const *>(o1.getStr()); OString o2 = OUStringToOString(data, RTL_TEXTENCODING_UTF8); - xmlChar const *xData = reinterpret_cast<xmlChar const *>(o2.getStr()); - xmlNodePtr const pNode = xmlNewDocPI(m_aDocPtr, xTarget, xData); + xmlChar const *pData = reinterpret_cast<xmlChar const *>(o2.getStr()); + xmlNodePtr const pNode = xmlNewDocPI(m_aDocPtr, pTarget, pData); pNode->doc = m_aDocPtr; Reference< XProcessingInstruction > const xRet( static_cast< XNode* >(GetCNode(pNode).get()), @@ -624,8 +624,8 @@ namespace DOM ::osl::MutexGuard const g(m_Mutex); OString o1 = OUStringToOString(data, RTL_TEXTENCODING_UTF8); - xmlChar const *xData = reinterpret_cast<xmlChar const *>(o1.getStr()); - xmlNodePtr const pNode = xmlNewDocText(m_aDocPtr, xData); + xmlChar const *pData = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlNodePtr const pNode = xmlNewDocText(m_aDocPtr, pData); Reference< XText > const xRet( static_cast< XNode* >(GetCNode(pNode).get()), UNO_QUERY_THROW); @@ -696,10 +696,10 @@ namespace DOM // search the tree for an element with the given ID OString o1 = OUStringToOString(elementId, RTL_TEXTENCODING_UTF8); - xmlChar const *xId = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pId = reinterpret_cast<xmlChar const *>(o1.getStr()); xmlNodePtr const pStart = lcl_getDocumentRootPtr(m_aDocPtr); if (!pStart) { return nullptr; } - xmlNodePtr const pNode = lcl_search_element_by_id(pStart, xId); + xmlNodePtr const pNode = lcl_search_element_by_id(pStart, pId); Reference< XElement > const xRet( static_cast< XNode* >(GetCNode(pNode).get()), UNO_QUERY); diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index bd7f519e5ba3..4933f89baf3c 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -116,15 +116,15 @@ namespace DOM reinterpret_cast<xmlNodePtr>(pAttr)); OSL_ENSURE(pNode != nullptr, "CNode::get returned 0"); - const xmlChar* xName = pAttr->name; + const xmlChar* pName = pAttr->name; sal_Int32 nAttributeToken=FastToken::DONTKNOW; if( pAttr->ns && strlen(reinterpret_cast<char const *>(pAttr->ns->prefix)) ) nAttributeToken = getTokenWithPrefix( i_rContext, reinterpret_cast<char const *>(pAttr->ns->prefix), - reinterpret_cast<char const *>(xName) ); + reinterpret_cast<char const *>(pName) ); else - nAttributeToken = getToken( i_rContext, reinterpret_cast<char const *>(xName) ); + nAttributeToken = getToken( i_rContext, reinterpret_cast<char const *>(pName) ); if( nAttributeToken != FastToken::DONTKNOW ) i_rContext.mxAttribList->add( nAttributeToken, @@ -132,13 +132,13 @@ namespace DOM RTL_TEXTENCODING_UTF8)); } - const xmlChar* xPrefix = m_aNodePtr->ns ? m_aNodePtr->ns->prefix : reinterpret_cast<const xmlChar*>(""); - const xmlChar* xName = m_aNodePtr->name; + const xmlChar* pPrefix = m_aNodePtr->ns ? m_aNodePtr->ns->prefix : reinterpret_cast<const xmlChar*>(""); + const xmlChar* pName = m_aNodePtr->name; sal_Int32 nElementToken=FastToken::DONTKNOW; - if( strlen(reinterpret_cast<char const *>(xPrefix)) ) - nElementToken = getTokenWithPrefix( i_rContext, reinterpret_cast<char const *>(xPrefix), reinterpret_cast<char const *>(xName) ); + if( strlen(reinterpret_cast<char const *>(pPrefix)) ) + nElementToken = getTokenWithPrefix( i_rContext, reinterpret_cast<char const *>(pPrefix), reinterpret_cast<char const *>(pName) ); else - nElementToken = getToken( i_rContext, reinterpret_cast<char const *>(xName) ); + nElementToken = getToken( i_rContext, reinterpret_cast<char const *>(pName) ); Reference<XFastContextHandler> xParentHandler(i_rContext.mxCurrentHandler); try @@ -147,8 +147,8 @@ namespace DOM if( nElementToken == FastToken::DONTKNOW ) { const OUString aNamespace; - const OUString aElementName( reinterpret_cast<char const *>(xPrefix), - strlen(reinterpret_cast<char const *>(xPrefix)), + const OUString aElementName( reinterpret_cast<char const *>(pPrefix), + strlen(reinterpret_cast<char const *>(pPrefix)), RTL_TEXTENCODING_UTF8 ); if( xParentHandler.is() ) @@ -189,8 +189,8 @@ namespace DOM else { const OUString aNamespace; - const OUString aElementName( reinterpret_cast<char const *>(xPrefix), - strlen(reinterpret_cast<char const *>(xPrefix)), + const OUString aElementName( reinterpret_cast<char const *>(pPrefix), + strlen(reinterpret_cast<char const *>(pPrefix)), RTL_TEXTENCODING_UTF8 ); i_rContext.mxCurrentHandler->endUnknownElement( aNamespace, aElementName ); @@ -395,8 +395,8 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(o1.getStr()); - return (m_aNodePtr != nullptr && xmlHasProp(m_aNodePtr, xName) != nullptr); + xmlChar const *pName = reinterpret_cast<xmlChar const *>(o1.getStr()); + return (m_aNodePtr != nullptr && xmlHasProp(m_aNodePtr, pName) != nullptr); } /** @@ -410,10 +410,10 @@ namespace DOM ::osl::MutexGuard const g(m_rMutex); OString o1 = OUStringToOString(localName, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pName = reinterpret_cast<xmlChar const *>(o1.getStr()); OString o2 = OUStringToOString(namespaceURI, RTL_TEXTENCODING_UTF8); - xmlChar const *xNs = reinterpret_cast<xmlChar const *>(o2.getStr()); - return (m_aNodePtr != nullptr && xmlHasNsProp(m_aNodePtr, xName, xNs) != nullptr); + xmlChar const *pNs = reinterpret_cast<xmlChar const *>(o2.getStr()); + return (m_aNodePtr != nullptr && xmlHasNsProp(m_aNodePtr, pName, pNs) != nullptr); } /** @@ -619,9 +619,9 @@ namespace DOM ::osl::ClearableMutexGuard guard(m_rMutex); OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8); - xmlChar const *xName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pName = reinterpret_cast<xmlChar const *>(o1.getStr()); OString o2 = OUStringToOString(value, RTL_TEXTENCODING_UTF8); - xmlChar const *xValue = reinterpret_cast<xmlChar const *>(o2.getStr()); + xmlChar const *pValue = reinterpret_cast<xmlChar const *>(o2.getStr()); if (nullptr == m_aNodePtr) { throw RuntimeException(); @@ -629,15 +629,15 @@ namespace DOM OUString oldValue; AttrChangeType aChangeType = AttrChangeType_MODIFICATION; std::shared_ptr<xmlChar const> const pOld( - xmlGetProp(m_aNodePtr, xName), xmlFree); + xmlGetProp(m_aNodePtr, pName), xmlFree); if (pOld == nullptr) { aChangeType = AttrChangeType_ADDITION; - xmlNewProp(m_aNodePtr, xName, xValue); + xmlNewProp(m_aNodePtr, pName, pValue); } else { oldValue = OUString(reinterpret_cast<sal_Char const*>(pOld.get()), strlen(reinterpret_cast<char const*>(pOld.get())), RTL_TEXTENCODING_UTF8); - xmlSetProp(m_aNodePtr, xName, xValue); + xmlSetProp(m_aNodePtr, pName, pValue); } // dispatch DOMAttrModified event @@ -667,42 +667,42 @@ namespace DOM ::osl::ClearableMutexGuard guard(m_rMutex); OString o1, o2, o3, o4, o5; - xmlChar const *xPrefix = nullptr; - xmlChar const *xLName = nullptr; + xmlChar const *pPrefix = nullptr; + xmlChar const *pLName = nullptr; o1 = OUStringToOString(qualifiedName, RTL_TEXTENCODING_UTF8); - xmlChar const *xQName = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pQName = reinterpret_cast<xmlChar const *>(o1.getStr()); sal_Int32 idx = qualifiedName.indexOf(':'); if (idx != -1) { o2 = OUStringToOString( qualifiedName.copy(0,idx), RTL_TEXTENCODING_UTF8); - xPrefix = reinterpret_cast<xmlChar const *>(o2.getStr()); + pPrefix = reinterpret_cast<xmlChar const *>(o2.getStr()); o3 = OUStringToOString( qualifiedName.copy(idx+1), RTL_TEXTENCODING_UTF8); - xLName = reinterpret_cast<xmlChar const *>(o3.getStr()); + pLName = reinterpret_cast<xmlChar const *>(o3.getStr()); } else { - xPrefix = reinterpret_cast<xmlChar const *>(""); - xLName = xQName; + pPrefix = reinterpret_cast<xmlChar const *>(""); + pLName = pQName; } o4 = OUStringToOString(namespaceURI, RTL_TEXTENCODING_UTF8); o5 = OUStringToOString(value, RTL_TEXTENCODING_UTF8); - xmlChar const *xURI= reinterpret_cast<xmlChar const *>(o4.getStr()); - xmlChar const *xValue = reinterpret_cast<xmlChar const *>(o5.getStr()); + xmlChar const *pURI= reinterpret_cast<xmlChar const *>(o4.getStr()); + xmlChar const *pValue = reinterpret_cast<xmlChar const *>(o5.getStr()); if (nullptr == m_aNodePtr) { throw RuntimeException(); } //find the right namespace - xmlNsPtr pNs = xmlSearchNs(m_aNodePtr->doc, m_aNodePtr, xPrefix); + xmlNsPtr pNs = xmlSearchNs(m_aNodePtr->doc, m_aNodePtr, pPrefix); // if no namespace found, create a new one if (pNs == nullptr) { - pNs = xmlNewNs(m_aNodePtr, xURI, xPrefix); + pNs = xmlNewNs(m_aNodePtr, pURI, pPrefix); } - if (strcmp(reinterpret_cast<char const *>(pNs->href), reinterpret_cast<char const *>(xURI)) != 0) { + if (strcmp(reinterpret_cast<char const *>(pNs->href), reinterpret_cast<char const *>(pURI)) != 0) { // ambiguous ns prefix throw RuntimeException(); } @@ -712,15 +712,15 @@ namespace DOM OUString oldValue; AttrChangeType aChangeType = AttrChangeType_MODIFICATION; std::shared_ptr<xmlChar const> const pOld( - xmlGetNsProp(m_aNodePtr, xLName, pNs->href), xmlFree); + xmlGetNsProp(m_aNodePtr, pLName, pNs->href), xmlFree); if (pOld == nullptr) { aChangeType = AttrChangeType_ADDITION; - xmlNewNsProp(m_aNodePtr, pNs, xLName, xValue); + xmlNewNsProp(m_aNodePtr, pNs, pLName, pValue); } else { oldValue = OUString(reinterpret_cast<sal_Char const*>(pOld.get()), strlen(reinterpret_cast<char const*>(pOld.get())), RTL_TEXTENCODING_UTF8); - xmlSetNsProp(m_aNodePtr, pNs, xLName, xValue); + xmlSetNsProp(m_aNodePtr, pNs, pLName, pValue); } // dispatch DOMAttrModified event Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY); @@ -728,7 +728,7 @@ namespace DOM "DOMAttrModified"), UNO_QUERY); event->initMutationEvent( "DOMAttrModified", true, false, - Reference< XNode >(getAttributeNodeNS(namespaceURI, OUString(reinterpret_cast<char const *>(xLName), strlen(reinterpret_cast<char const *>(xLName)), RTL_TEXTENCODING_UTF8)), UNO_QUERY), + Reference< XNode >(getAttributeNodeNS(namespaceURI, OUString(reinterpret_cast<char const *>(pLName), strlen(reinterpret_cast<char const *>(pLName)), RTL_TEXTENCODING_UTF8)), UNO_QUERY), oldValue, value, qualifiedName, aChangeType); guard.clear(); // release mutex before calling event handlers @@ -758,8 +758,8 @@ namespace DOM OUString aName; if (m_aNodePtr != nullptr) { - const xmlChar* xName = m_aNodePtr->name; - aName = OUString(reinterpret_cast<const char*>(xName), strlen(reinterpret_cast<const char*>(xName)), RTL_TEXTENCODING_UTF8); + const xmlChar* pName = m_aNodePtr->name; + aName = OUString(reinterpret_cast<const char*>(pName), strlen(reinterpret_cast<const char*>(pName)), RTL_TEXTENCODING_UTF8); } return aName; } diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx index 61d0420c60eb..7ce7817319db 100644 --- a/unoxml/source/dom/entity.cxx +++ b/unoxml/source/dom/entity.cxx @@ -98,8 +98,8 @@ namespace DOM OUString aName; if (m_aNodePtr != nullptr) { - const xmlChar* xName = m_aNodePtr->name; - aName = OUString(reinterpret_cast<char const *>(xName), strlen(reinterpret_cast<char const *>(xName)), RTL_TEXTENCODING_UTF8); + const xmlChar* pName = m_aNodePtr->name; + aName = OUString(reinterpret_cast<char const *>(pName), strlen(reinterpret_cast<char const *>(pName)), RTL_TEXTENCODING_UTF8); } return aName; } diff --git a/unoxml/source/dom/entityreference.cxx b/unoxml/source/dom/entityreference.cxx index ebe19dcdaeb1..6d62e69d576c 100644 --- a/unoxml/source/dom/entityreference.cxx +++ b/unoxml/source/dom/entityreference.cxx @@ -56,8 +56,8 @@ namespace DOM OUString aName; if (m_aNodePtr != nullptr) { - const xmlChar* xName = m_aNodePtr->name; - aName = OUString(reinterpret_cast<char const *>(xName), strlen(reinterpret_cast<char const *>(xName)), RTL_TEXTENCODING_UTF8); + const xmlChar* pName = m_aNodePtr->name; + aName = OUString(reinterpret_cast<char const *>(pName), strlen(reinterpret_cast<char const *>(pName)), RTL_TEXTENCODING_UTF8); } return aName; } diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 1941c09a8ba6..77288d7365ff 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -485,8 +485,8 @@ namespace DOM (m_aNodePtr->type == XML_ELEMENT_NODE || m_aNodePtr->type == XML_ATTRIBUTE_NODE) && m_aNodePtr->ns != nullptr) { - const xmlChar* xHref = m_aNodePtr->ns->href; - aURI = OUString(reinterpret_cast<char const *>(xHref), strlen(reinterpret_cast<char const *>(xHref)), RTL_TEXTENCODING_UTF8); + const xmlChar* pHref = m_aNodePtr->ns->href; + aURI = OUString(reinterpret_cast<char const *>(pHref), strlen(reinterpret_cast<char const *>(pHref)), RTL_TEXTENCODING_UTF8); } return aURI; } @@ -600,9 +600,9 @@ namespace DOM (m_aNodePtr->type == XML_ELEMENT_NODE || m_aNodePtr->type == XML_ATTRIBUTE_NODE) && m_aNodePtr->ns != nullptr) { - const xmlChar* xPrefix = m_aNodePtr->ns->prefix; - if( xPrefix != nullptr ) - aPrefix = OUString(reinterpret_cast<char const *>(xPrefix), strlen(reinterpret_cast<char const *>(xPrefix)), RTL_TEXTENCODING_UTF8); + const xmlChar* pPrefix = m_aNodePtr->ns->prefix; + if( pPrefix != nullptr ) + aPrefix = OUString(reinterpret_cast<char const *>(pPrefix), strlen(reinterpret_cast<char const *>(pPrefix)), RTL_TEXTENCODING_UTF8); } return aPrefix; diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx index 9f2aca2bec6f..2fa8e3f6f71b 100644 --- a/unoxml/source/dom/notation.cxx +++ b/unoxml/source/dom/notation.cxx @@ -60,8 +60,8 @@ namespace DOM OUString aName; if (m_aNodePtr != nullptr) { - const xmlChar* xName = m_aNodePtr->name; - aName = OUString(reinterpret_cast<char const *>(xName), strlen(reinterpret_cast<char const *>(xName)), RTL_TEXTENCODING_UTF8); + const xmlChar* pName = m_aNodePtr->name; + aName = OUString(reinterpret_cast<char const *>(pName), strlen(reinterpret_cast<char const *>(pName)), RTL_TEXTENCODING_UTF8); } return aName; } diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx index 6452a42addfb..9e1eabd0677e 100644 --- a/unoxml/source/xpath/xpathapi.cxx +++ b/unoxml/source/xpath/xpathapi.cxx @@ -150,10 +150,10 @@ namespace XPath while (pNode != nullptr) { xmlNsPtr curDef = pNode->nsDef; while (curDef != nullptr) { - const xmlChar* xHref = curDef->href; - OUString aURI(reinterpret_cast<char const *>(xHref), strlen(reinterpret_cast<char const *>(xHref)), RTL_TEXTENCODING_UTF8); - const xmlChar* xPre = curDef->prefix; - OUString aPrefix(reinterpret_cast<char const *>(xPre), strlen(reinterpret_cast<char const *>(xPre)), RTL_TEXTENCODING_UTF8); + const xmlChar* pHref = curDef->href; + OUString aURI(reinterpret_cast<char const *>(pHref), strlen(reinterpret_cast<char const *>(pHref)), RTL_TEXTENCODING_UTF8); + const xmlChar* pPre = curDef->prefix; + OUString aPrefix(reinterpret_cast<char const *>(pPre), strlen(reinterpret_cast<char const *>(pPre)), RTL_TEXTENCODING_UTF8); // we could already have this prefix from a child node if (rNamespaces.find(aPrefix) == rNamespaces.end()) { @@ -372,9 +372,9 @@ namespace XPath /* run the query */ OString o1 = OUStringToOString(expr, RTL_TEXTENCODING_UTF8); - xmlChar const *xStr = reinterpret_cast<xmlChar const *>(o1.getStr()); + xmlChar const *pStr = reinterpret_cast<xmlChar const *>(o1.getStr()); std::shared_ptr<xmlXPathObject> const xpathObj( - xmlXPathEval(xStr, xpathCtx.get()), xmlXPathFreeObject); + xmlXPathEval(pStr, xpathCtx.get()), xmlXPathFreeObject); xmlSetGenericErrorFunc(nullptr, nullptr); if (nullptr == xpathObj) { // OSL_ENSURE(xpathCtx->lastError == NULL, xpathCtx->lastError->message); diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 0ae1f7ff4467..610868196601 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -161,7 +161,7 @@ void GenericClipboard::setContents( m_aContents = xTrans; m_aOwner = xClipboardOwner; - std::list< Reference< datatransfer::clipboard::XClipboardListener > > xListeners( m_aListeners ); + std::list< Reference< datatransfer::clipboard::XClipboardListener > > aListeners( m_aListeners ); datatransfer::clipboard::ClipboardEvent aEv; aEv.Contents = m_aContents; @@ -170,7 +170,7 @@ void GenericClipboard::setContents( if( xOldOwner.is() && xOldOwner != xClipboardOwner ) xOldOwner->lostOwnership( this, xOldContents ); for( std::list< Reference< datatransfer::clipboard::XClipboardListener > >::iterator it = - xListeners.begin(); it != xListeners.end() ; ++it ) + aListeners.begin(); it != aListeners.end() ; ++it ) { (*it)->changedContents( aEv ); } diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index e12eabd97cc0..03ad08eba2b1 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -1214,16 +1214,16 @@ BitmapEx createBlendFrame( aContent.Erase(COL_BLACK); - BitmapWriteAccess* xContent = aContent.AcquireWriteAccess(); + BitmapWriteAccess* pContent = aContent.AcquireWriteAccess(); BitmapWriteAccess* pAlpha = aAlpha.AcquireWriteAccess(); - if(xContent && pAlpha) + if(pContent && pAlpha) { long x(0); long y(0); // x == 0, y == 0, top-left corner - xContent->SetPixel(0, 0, aColorTopLeft); + pContent->SetPixel(0, 0, aColorTopLeft); pAlpha->SetPixelIndex(0, 0, nAlpha); // y == 0, top line left to right @@ -1232,7 +1232,7 @@ BitmapEx createBlendFrame( Color aMix(aColorTopLeft); aMix.Merge(aColorTopRight, 255 - sal_uInt8((x * 255) / nW)); - xContent->SetPixel(0, x, aMix); + pContent->SetPixel(0, x, aMix); pAlpha->SetPixelIndex(0, x, nAlpha); } @@ -1240,7 +1240,7 @@ BitmapEx createBlendFrame( // #i123690# Caution! When nW is 1, x == nW is possible (!) if(x < nW) { - xContent->SetPixel(0, x, aColorTopRight); + pContent->SetPixel(0, x, aColorTopRight); pAlpha->SetPixelIndex(0, x, nAlpha); } @@ -1250,7 +1250,7 @@ BitmapEx createBlendFrame( Color aMixA(aColorTopLeft); aMixA.Merge(aColorBottomLeft, 255 - sal_uInt8((y * 255) / nH)); - xContent->SetPixel(y, 0, aMixA); + pContent->SetPixel(y, 0, aMixA); pAlpha->SetPixelIndex(y, 0, nAlpha); // #i123690# Caution! When nW is 1, x == nW is possible (!) @@ -1259,7 +1259,7 @@ BitmapEx createBlendFrame( Color aMixB(aColorTopRight); aMixB.Merge(aColorBottomRight, 255 - sal_uInt8((y * 255) / nH)); - xContent->SetPixel(y, x, aMixB); + pContent->SetPixel(y, x, aMixB); pAlpha->SetPixelIndex(y, x, nAlpha); } } @@ -1268,7 +1268,7 @@ BitmapEx createBlendFrame( if(y < nH) { // x == 0, y == nH - 1, bottom-left corner - xContent->SetPixel(y, 0, aColorBottomLeft); + pContent->SetPixel(y, 0, aColorBottomLeft); pAlpha->SetPixelIndex(y, 0, nAlpha); // y == nH - 1, bottom line left to right @@ -1277,7 +1277,7 @@ BitmapEx createBlendFrame( Color aMix(aColorBottomLeft); aMix.Merge(aColorBottomRight, 255 - sal_uInt8(((x - 0)* 255) / nW)); - xContent->SetPixel(y, x, aMix); + pContent->SetPixel(y, x, aMix); pAlpha->SetPixelIndex(y, x, nAlpha); } @@ -1285,21 +1285,21 @@ BitmapEx createBlendFrame( // #i123690# Caution! When nW is 1, x == nW is possible (!) if(x < nW) { - xContent->SetPixel(y, x, aColorBottomRight); + pContent->SetPixel(y, x, aColorBottomRight); pAlpha->SetPixelIndex(y, x, nAlpha); } } - Bitmap::ReleaseAccess(xContent); + Bitmap::ReleaseAccess(pContent); Bitmap::ReleaseAccess(pAlpha); pBlendFrameCache->m_aLastResult = BitmapEx(aContent, aAlpha); } else { - if(xContent) + if(pContent) { - Bitmap::ReleaseAccess(xContent); + Bitmap::ReleaseAccess(pContent); } if(pAlpha) diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 7595aeae07bb..86723116487c 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -7712,10 +7712,10 @@ sal_Int32 PDFWriterImpl::emitOutputIntent() cmsSaveProfileToMem(hProfile, nullptr, &nBytesNeeded); if (!nBytesNeeded) return 0; - std::vector<unsigned char> xBuffer(nBytesNeeded); - cmsSaveProfileToMem(hProfile, &xBuffer[0], &nBytesNeeded); + std::vector<unsigned char> aBuffer(nBytesNeeded); + cmsSaveProfileToMem(hProfile, &aBuffer[0], &nBytesNeeded); cmsCloseProfile(hProfile); - bool written = writeBuffer( &xBuffer[0], (sal_Int32) xBuffer.size() ); + bool written = writeBuffer( &aBuffer[0], (sal_Int32) aBuffer.size() ); disableStreamEncryption(); endCompression(); sal_uInt64 nEndStreamPos = 0; diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index be429ae8960f..e7a27f4ee847 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -89,12 +89,12 @@ public: // OO Graphics Handler: abstract class to handle document SAX messages, concrete implementation here // writes to in-memory target doc - DocumentHandler xHandler(xInternalHandler); + DocumentHandler aHandler(xInternalHandler); WPXSvInputStream input(xInputStream); Generator exporter; - exporter.addDocumentHandler(&xHandler, ODF_FLAT_XML); + exporter.addDocumentHandler(&aHandler, ODF_FLAT_XML); this->doRegisterHandlers(exporter); diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 95d5dd06a845..362f4a25c698 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -227,12 +227,12 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage> &rStorage, const rt else if (aIt->IsStorage()) { const rtl::OUString aPath = concatPath(rPath, aIt->GetName()); - SotStorageRefWrapper xStorage; - xStorage.ref = rStorage->OpenSotStorage(aIt->GetName(), STREAM_STD_READ); - maStorageMap[aPath] = xStorage; + SotStorageRefWrapper aStorage; + aStorage.ref = rStorage->OpenSotStorage(aIt->GetName(), STREAM_STD_READ); + maStorageMap[aPath] = aStorage; // deep-first traversal - traverse(xStorage.ref, aPath); + traverse(aStorage.ref, aPath); } else { diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 00b2a9aba4fb..5b13c67dda95 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -140,10 +140,10 @@ throw (RuntimeException, std::exception) // OO Document Handler: abstract class to handle document SAX messages, concrete implementation here // writes to in-memory target doc - DocumentHandler xHandler(xInternalHandler); + DocumentHandler aHandler(xInternalHandler); OdtGenerator collector; - collector.addDocumentHandler(&xHandler, ODF_FLAT_XML); + collector.addDocumentHandler(&aHandler, ODF_FLAT_XML); collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject); collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage); if (libwpd::WPD_OK == libwpd::WPDocument::parse(&input, &collector, aUtf8Passwd.isEmpty() ? nullptr : aUtf8Passwd.getStr())) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 03586a0a73fb..80f18e17095d 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1653,18 +1653,18 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( const Reference<XDrawPage>& xD const rtl::Reference< SvXMLExportPropertyMapper > aMapperRef( GetPresPagePropsMapper() ); - std::vector< XMLPropertyState > xPropStates( aMapperRef->Filter( xPropSet ) ); + std::vector< XMLPropertyState > aPropStates( aMapperRef->Filter( xPropSet ) ); - if( !xPropStates.empty() ) + if( !aPropStates.empty() ) { // there are filtered properties -> hard attributes // try to find this style in AutoStylePool - sStyleName = GetAutoStylePool()->Find(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, xPropStates); + sStyleName = GetAutoStylePool()->Find(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, aPropStates); if(sStyleName.isEmpty()) { // Style did not exist, add it to AutoStalePool - sStyleName = GetAutoStylePool()->Add(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, xPropStates); + sStyleName = GetAutoStylePool()->Add(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, aPropStates); } } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index a305be733999..92c965ee0e71 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -377,12 +377,12 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } // filter propset - std::vector< XMLPropertyState > xPropStates; + std::vector< XMLPropertyState > aPropStates; sal_Int32 nCount = 0; if( (!bIsEmptyPresObj || (aShapeInfo.meShapeType != XmlShapeTypePresPageShape)) ) { - xPropStates = GetPropertySetMapper()->Filter( xPropSet ); + aPropStates = GetPropertySetMapper()->Filter( xPropSet ); if (XmlShapeTypeDrawControlShape == aShapeInfo.meShapeType) { @@ -403,13 +403,13 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap DBG_ASSERT(-1 != nIndex, "XMLShapeExport::collectShapeAutoStyles: could not obtain the index for our context id!"); XMLPropertyState aNewState(nIndex, uno::makeAny(sNumberStyle)); - xPropStates.push_back(aNewState); + aPropStates.push_back(aNewState); } } } - std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); - std::vector< XMLPropertyState >::iterator aEnd = xPropStates.end(); + std::vector< XMLPropertyState >::iterator aIter = aPropStates.begin(); + std::vector< XMLPropertyState >::iterator aEnd = aPropStates.end(); while( aIter != aEnd ) { if( aIter->mnIndex != -1 ) @@ -427,19 +427,19 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap { // there are filtered properties -> hard attributes // try to find this style in AutoStylePool - aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Find(aShapeInfo.mnFamily, aParentName, xPropStates); + aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Find(aShapeInfo.mnFamily, aParentName, aPropStates); if(aShapeInfo.msStyleName.isEmpty()) { // Style did not exist, add it to AutoStalePool - aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Add(aShapeInfo.mnFamily, aParentName, xPropStates); + aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Add(aShapeInfo.mnFamily, aParentName, aPropStates); } } // optionaly generate auto style for text attributes if( (!bIsEmptyPresObj || (aShapeInfo.meShapeType != XmlShapeTypePresPageShape)) && bObjSupportsText ) { - xPropStates = GetExport().GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter( xPropSet ); + aPropStates = GetExport().GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter( xPropSet ); // yet more additionally, we need to care for the ParaAdjust property if ( XmlShapeTypeDrawControlShape == aShapeInfo.meShapeType ) @@ -467,14 +467,14 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap uno::Any aParaAdjustValue = xPropSet->getPropertyValue( "ParaAdjust" ); XMLPropertyState aAlignDefaultState( nIndex, aParaAdjustValue ); - xPropStates.push_back( aAlignDefaultState ); + aPropStates.push_back( aAlignDefaultState ); } } } nCount = 0; - std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); - std::vector< XMLPropertyState >::iterator aEnd = xPropStates.end(); + std::vector< XMLPropertyState >::iterator aIter = aPropStates.begin(); + std::vector< XMLPropertyState >::iterator aEnd = aPropStates.end(); while( aIter != aEnd ) { if( aIter->mnIndex != -1 ) @@ -484,11 +484,11 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if( nCount ) { - aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", xPropStates ); + aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", aPropStates ); if(aShapeInfo.msTextStyleName.isEmpty()) { // Style did not exist, add it to AutoStalePool - aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", xPropStates); + aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", aPropStates); } } } @@ -3459,10 +3459,10 @@ void XMLShapeExport::ImpExport3DShape( // transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix") uno::Any aAny = xPropSet->getPropertyValue("D3DTransformMatrix"); - drawing::HomogenMatrix xHomMat; - aAny >>= xHomMat; + drawing::HomogenMatrix aHomMat; + aAny >>= aHomMat; SdXMLImExTransform3D aTransform; - aTransform.AddHomogenMatrix(xHomMat); + aTransform.AddHomogenMatrix(aHomMat); if(aTransform.NeedsAction()) mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter())); @@ -3550,13 +3550,13 @@ void XMLShapeExport::ImpExport3DShape( { // write special 3DLathe/3DExtrude attributes, get 3D tools::PolyPolygon as drawing::PolyPolygonShape3D aAny = xPropSet->getPropertyValue("D3DPolyPolygon3D"); - drawing::PolyPolygonShape3D xPolyPolygon3D; - aAny >>= xPolyPolygon3D; + drawing::PolyPolygonShape3D aUnoPolyPolygon3D; + aAny >>= aUnoPolyPolygon3D; // convert to 3D PolyPolygon const basegfx::B3DPolyPolygon aPolyPolygon3D( basegfx::tools::UnoPolyPolygonShape3DToB3DPolyPolygon( - xPolyPolygon3D)); + aUnoPolyPolygon3D)); // convert to 2D tools::PolyPolygon using identity 3D transformation (just grep X and Y) const basegfx::B3DHomMatrix aB3DHomMatrixFor2DConversion; @@ -3614,10 +3614,10 @@ void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::be // world transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix") uno::Any aAny = xPropSet->getPropertyValue("D3DTransformMatrix"); - drawing::HomogenMatrix xHomMat; - aAny >>= xHomMat; + drawing::HomogenMatrix aHomMat; + aAny >>= aHomMat; SdXMLImExTransform3D aTransform; - aTransform.AddHomogenMatrix(xHomMat); + aTransform.AddHomogenMatrix(aHomMat); if(aTransform.NeedsAction()) mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter())); @@ -3652,9 +3652,9 @@ void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::be // projection "D3DScenePerspective" drawing::ProjectionMode aAny = xPropSet->getPropertyValue("D3DScenePerspective"); - drawing::ProjectionMode xPrjMode; - aAny >>= xPrjMode; - if(xPrjMode == drawing::ProjectionMode_PARALLEL) + drawing::ProjectionMode aPrjMode; + aAny >>= aPrjMode; + if(aPrjMode == drawing::ProjectionMode_PARALLEL) aStr = GetXMLToken(XML_PARALLEL); else aStr = GetXMLToken(XML_PERSPECTIVE); @@ -3688,14 +3688,14 @@ void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::be // shadeMode aAny = xPropSet->getPropertyValue("D3DSceneShadeMode"); - drawing::ShadeMode xShadeMode; - if(aAny >>= xShadeMode) + drawing::ShadeMode aShadeMode; + if(aAny >>= aShadeMode) { - if(xShadeMode == drawing::ShadeMode_FLAT) + if(aShadeMode == drawing::ShadeMode_FLAT) aStr = GetXMLToken(XML_FLAT); - else if(xShadeMode == drawing::ShadeMode_PHONG) + else if(aShadeMode == drawing::ShadeMode_PHONG) aStr = GetXMLToken(XML_PHONG); - else if(xShadeMode == drawing::ShadeMode_SMOOTH) + else if(aShadeMode == drawing::ShadeMode_SMOOTH) aStr = GetXMLToken(XML_GOURAUD); else aStr = GetXMLToken(XML_DRAFT); @@ -3738,7 +3738,7 @@ void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XProp OUString aPropName; OUString aIndexStr; ::basegfx::B3DVector aLightDirection; - drawing::Direction3D xLightDir; + drawing::Direction3D aLightDir; bool bLightOnOff = false; for(sal_Int32 nLamp = 1; nLamp <= 8; nLamp++) { @@ -3756,8 +3756,8 @@ void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XProp // lightdirection aPropName = aDirectionPropName; aPropName += aIndexStr; - xPropSet->getPropertyValue(aPropName) >>= xLightDir; - aLightDirection = ::basegfx::B3DVector(xLightDir.DirectionX, xLightDir.DirectionY, xLightDir.DirectionZ); + xPropSet->getPropertyValue(aPropName) >>= aLightDir; + aLightDirection = ::basegfx::B3DVector(aLightDir.DirectionX, aLightDir.DirectionY, aLightDir.DirectionZ); SvXMLUnitConverter::convertB3DVector(sStringBuffer, aLightDirection); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DIRECTION, aStr); diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index e41fffcd5547..96eb4df63123 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -358,14 +358,14 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa aPolyPolygon)); // convert to UNO API class PolyPolygonShape3D - drawing::PolyPolygonShape3D xPolyPolygon3D; + drawing::PolyPolygonShape3D aPolyPolygon3D; basegfx::tools::B3DPolyPolygonToUnoPolyPolygonShape3D( aB3DPolyPolygon, - xPolyPolygon3D); + aPolyPolygon3D); // set polygon data uno::Any aAny; - aAny <<= xPolyPolygon3D; + aAny <<= aPolyPolygon3D; xPropSet->setPropertyValue("D3DPolyPolygon3D", aAny); } else diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 69fb32aef63f..666306d48dc3 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -392,11 +392,11 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const css::uno::Reference // set anys aAny <<= pCtx->GetDiffuseColor(); - drawing::Direction3D xLightDir; - xLightDir.DirectionX = pCtx->GetDirection().getX(); - xLightDir.DirectionY = pCtx->GetDirection().getY(); - xLightDir.DirectionZ = pCtx->GetDirection().getZ(); - aAny2 <<= xLightDir; + drawing::Direction3D aLightDir; + aLightDir.DirectionX = pCtx->GetDirection().getX(); + aLightDir.DirectionY = pCtx->GetDirection().getY(); + aLightDir.DirectionZ = pCtx->GetDirection().getZ(); + aAny2 <<= aLightDir; aAny3 <<= pCtx->GetEnabled(); switch(a) diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 5a3d4f5fec29..0d4f4061fa42 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -62,13 +62,13 @@ void XMLPageExport::collectPageMasterAutoStyle( DBG_ASSERT( xPageMasterPropSetMapper.is(), "page master family/XMLPageMasterPropSetMapper not found" ); if( xPageMasterPropSetMapper.is() ) { - ::std::vector<XMLPropertyState> xPropStates = xPageMasterExportPropMapper->Filter( rPropSet ); - if( !xPropStates.empty()) + ::std::vector<XMLPropertyState> aPropStates = xPageMasterExportPropMapper->Filter( rPropSet ); + if( !aPropStates.empty()) { OUString sParent; - rPageMasterName = rExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_PAGE_MASTER, sParent, xPropStates ); + rPageMasterName = rExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_PAGE_MASTER, sParent, aPropStates ); if (rPageMasterName.isEmpty()) - rPageMasterName = rExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_PAGE_MASTER, sParent, xPropStates); + rPageMasterName = rExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_PAGE_MASTER, sParent, aPropStates); } } } @@ -229,12 +229,12 @@ void XMLPageExport::exportDefaultStyle() // <style:default-style ...> GetExport().CheckAttrList(); - ::std::vector< XMLPropertyState > xPropStates = + ::std::vector< XMLPropertyState > aPropStates = xPageMasterExportPropMapper->FilterDefaults( xPropSet ); bool bExport = false; rtl::Reference < XMLPropertySetMapper > aPropMapper(xPageMasterExportPropMapper->getPropertySetMapper()); - for( ::std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); aIter != xPropStates.end(); ++aIter ) + for( ::std::vector< XMLPropertyState >::iterator aIter = aPropStates.begin(); aIter != aPropStates.end(); ++aIter ) { XMLPropertyState *pProp = &(*aIter); sal_Int16 nContextId = aPropMapper->GetEntryContextId( pProp->mnIndex ); @@ -255,7 +255,7 @@ void XMLPageExport::exportDefaultStyle() XML_DEFAULT_PAGE_LAYOUT, true, true ); - xPageMasterExportPropMapper->exportXML( GetExport(), xPropStates, + xPageMasterExportPropMapper->exportXML( GetExport(), aPropStates, SvXmlExportFlags::IGN_WS ); } } diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 0625ce210eb8..f96e1c78f188 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -314,14 +314,14 @@ bool XMLStyleExport::exportStyle( rPropMapper->SetStyleName( sName ); // <style:properties> - ::std::vector< XMLPropertyState > xPropStates = + ::std::vector< XMLPropertyState > aPropStates = rPropMapper->Filter( xPropSet, true ); bool const bUseExtensionNamespaceForGraphicProperties( rXMLFamily != "drawing-page" && rXMLFamily != "graphic" && rXMLFamily != "presentation" && rXMLFamily != "chart"); - rPropMapper->exportXML( GetExport(), xPropStates, + rPropMapper->exportXML( GetExport(), aPropStates, SvXmlExportFlags::IGN_WS, bUseExtensionNamespaceForGraphicProperties ); @@ -357,9 +357,9 @@ bool XMLStyleExport::exportDefaultStyle( XML_DEFAULT_STYLE, true, true ); // <style:properties> - ::std::vector< XMLPropertyState > xPropStates = + ::std::vector< XMLPropertyState > aPropStates = rPropMapper->FilterDefaults( xPropSet ); - rPropMapper->exportXML( GetExport(), xPropStates, + rPropMapper->exportXML( GetExport(), aPropStates, SvXmlExportFlags::IGN_WS ); } return true; diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index d8643b7bc3fc..1389f1e9f40a 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -210,11 +210,11 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) try { Reference< XPropertySet > xPropSet( xIndexAccessCols->getByIndex(nColumn) , UNO_QUERY_THROW ); - std::vector< XMLPropertyState > xPropStates( mxColumnExportPropertySetMapper->Filter( xPropSet ) ); + std::vector< XMLPropertyState > aPropStates( mxColumnExportPropertySetMapper->Filter( xPropSet ) ); - if( has_states( xPropStates ) ) + if( has_states( aPropStates ) ) { - const OUString sStyleName( mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_COLUMN, xPropStates) ); + const OUString sStyleName( mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_COLUMN, aPropStates) ); Reference< XInterface > xKey( xPropSet, UNO_QUERY ); xTableInfo->maColumnStyleMap[xKey] = sStyleName; } @@ -233,11 +233,11 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) for( sal_Int32 nRow = 0; nRow < nRowCount; ++nRow ) try { Reference< XPropertySet > xPropSet( xIndexAccessRows->getByIndex(nRow) , UNO_QUERY_THROW ); - std::vector< XMLPropertyState > xRowPropStates( mxRowExportPropertySetMapper->Filter( xPropSet ) ); + std::vector< XMLPropertyState > aRowPropStates( mxRowExportPropertySetMapper->Filter( xPropSet ) ); - if( has_states( xRowPropStates ) ) + if( has_states( aRowPropStates ) ) { - const OUString sStyleName( mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_ROW, xRowPropStates) ); + const OUString sStyleName( mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_ROW, aRowPropStates) ); Reference< XInterface > xKey( xPropSet, UNO_QUERY ); xTableInfo->maRowStyleMap[xKey] = sStyleName; } @@ -261,9 +261,9 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) // create auto style, if needed OUString sStyleName; - std::vector< XMLPropertyState > xCellPropStates( mxCellExportPropertySetMapper->Filter( xCellSet ) ); - if( has_states( xCellPropStates ) ) - sStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_CELL, xCellPropStates); + std::vector< XMLPropertyState > aCellPropStates( mxCellExportPropertySetMapper->Filter( xCellSet ) ); + if( has_states( aCellPropStates ) ) + sStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TABLE_CELL, aCellPropStates); else sStyleName = sParentStyleName; diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 62be56ba8e93..4b7a823afe19 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -467,19 +467,19 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, } DBG_ASSERT( xPropMapper.is(), "There is the property mapper?" ); - vector< XMLPropertyState > xPropStates = + vector< XMLPropertyState > aPropStates = xPropMapper->Filter( rPropSet ); if( ppAddStates ) { while( *ppAddStates ) { - xPropStates.push_back( **ppAddStates ); + aPropStates.push_back( **ppAddStates ); ppAddStates++; } } - if( !xPropStates.empty() ) + if( !aPropStates.empty() ) { Reference< XPropertySetInfo > xPropSetInfo(rPropSet->getPropertySetInfo()); OUString sParent, sCondParent; @@ -536,8 +536,8 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, { // Get parent and remove hyperlinks (they aren't of interest) rtl::Reference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); - for( ::std::vector< XMLPropertyState >::iterator i(xPropStates.begin()); - nIgnoreProps < 2 && i != xPropStates.end(); ) + for( ::std::vector< XMLPropertyState >::iterator i(aPropStates.begin()); + nIgnoreProps < 2 && i != aPropStates.end(); ) { if( i->mnIndex == -1 ) { @@ -551,7 +551,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, case CTF_HYPERLINK_URL: i->mnIndex = -1; nIgnoreProps++; - i = xPropStates.erase( i ); + i = aPropStates.erase( i ); break; default: ++i; @@ -571,11 +571,11 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, ; // section styles have no parents break; } - if( (xPropStates.size() - nIgnoreProps) > 0 ) + if( (aPropStates.size() - nIgnoreProps) > 0 ) { - GetAutoStylePool().Add( nFamily, sParent, xPropStates, bDontSeek ); + GetAutoStylePool().Add( nFamily, sParent, aPropStates, bDontSeek ); if( !sCondParent.isEmpty() && sParent != sCondParent ) - GetAutoStylePool().Add( nFamily, sCondParent, xPropStates ); + GetAutoStylePool().Add( nFamily, sCondParent, aPropStates ); } } } @@ -598,7 +598,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, } DBG_ASSERT( xPropMapper.is(), "There is the property mapper?" ); - vector< XMLPropertyState > xPropStates(xPropMapper->Filter( rPropSet )); + vector< XMLPropertyState > aPropStates(xPropMapper->Filter( rPropSet )); if( rPropSetHelper.hasProperty( NUMBERING_RULES_AUTO ) ) { @@ -638,7 +638,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, } } - if( !xPropStates.empty() ) + if( !aPropStates.empty() ) { OUString sParent, sCondParent; switch( nFamily ) @@ -658,11 +658,11 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, break; } - if( std::any_of( xPropStates.begin(), xPropStates.end(), lcl_validPropState ) ) + if( std::any_of( aPropStates.begin(), aPropStates.end(), lcl_validPropState ) ) { - GetAutoStylePool().Add( nFamily, sParent, xPropStates ); + GetAutoStylePool().Add( nFamily, sParent, aPropStates ); if( !sCondParent.isEmpty() && sParent != sCondParent ) - GetAutoStylePool().Add( nFamily, sCondParent, xPropStates ); + GetAutoStylePool().Add( nFamily, sCondParent, aPropStates ); } } } @@ -693,17 +693,17 @@ OUString XMLTextParagraphExport::Find( DBG_ASSERT( xPropMapper.is(), "There is the property mapper?" ); if( !xPropMapper.is() ) return sName; - vector< XMLPropertyState > xPropStates(xPropMapper->Filter( rPropSet )); + vector< XMLPropertyState > aPropStates(xPropMapper->Filter( rPropSet )); if( ppAddStates ) { while( *ppAddStates ) { - xPropStates.push_back( **ppAddStates ); + aPropStates.push_back( **ppAddStates ); ++ppAddStates; } } - if( std::any_of( xPropStates.begin(), xPropStates.end(), lcl_validPropState ) ) - sName = GetAutoStylePool().Find( nFamily, sName, xPropStates ); + if( std::any_of( aPropStates.begin(), aPropStates.end(), lcl_validPropState ) ) + sName = GetAutoStylePool().Find( nFamily, sName, aPropStates ); return sName; } @@ -716,19 +716,19 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( const XMLPropertyState** ppAddStates ) const { rtl::Reference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper()); - vector< XMLPropertyState > xPropStates(xPropMapper->Filter( rPropSet )); + vector< XMLPropertyState > aPropStates(xPropMapper->Filter( rPropSet )); // Get parent and remove hyperlinks (they aren't of interest) OUString sName; rbHyperlink = rbHasCharStyle = rbHasAutoStyle = false; sal_uInt16 nIgnoreProps = 0; rtl::Reference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); - ::std::vector< XMLPropertyState >::iterator aFirstDel = xPropStates.end(); - ::std::vector< XMLPropertyState >::iterator aSecondDel = xPropStates.end(); + ::std::vector< XMLPropertyState >::iterator aFirstDel = aPropStates.end(); + ::std::vector< XMLPropertyState >::iterator aSecondDel = aPropStates.end(); for( ::std::vector< XMLPropertyState >::iterator - i = xPropStates.begin(); - nIgnoreProps < 2 && i != xPropStates.end(); + i = aPropStates.begin(); + nIgnoreProps < 2 && i != aPropStates.end(); ++i ) { if( i->mnIndex == -1 ) @@ -761,11 +761,11 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( { while( *ppAddStates ) { - xPropStates.push_back( **ppAddStates ); + aPropStates.push_back( **ppAddStates ); ppAddStates++; } } - if( (xPropStates.size() - nIgnoreProps) > 0L ) + if( (aPropStates.size() - nIgnoreProps) > 0L ) { // erase the character style, otherwise the autostyle cannot be found! // erase the hyperlink, otherwise the autostyle cannot be found! @@ -774,11 +774,11 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( // If two elements of a vector have to be deleted, // we should delete the second one first. if( --nIgnoreProps ) - xPropStates.erase( aSecondDel ); - xPropStates.erase( aFirstDel ); + aPropStates.erase( aSecondDel ); + aPropStates.erase( aFirstDel ); } OUString sParent; // AutoStyles should not have parents! - sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates ); + sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent, aPropStates ); rbHasAutoStyle = true; } |