clang-tidy modernize-concat-nested-namespace in chart2

Change-Id: I320234b60963d80f6870a9ce1fead8e29de437aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86759
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2020-01-14 15:21:18 +02:00
parent d038e27a98
commit db54dd2351
91 changed files with 114 additions and 244 deletions

View File

@ -28,8 +28,8 @@
#include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
namespace com { namespace sun { namespace star { namespace table { class XCellRange; } } } }
namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
namespace com::sun::star::table { class XCellRange; }
namespace com::sun::star::util { class XNumberFormats; }
class PivotChartTest : public ChartTest
{

View File

@ -68,9 +68,7 @@ struct StaticAreaWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
AreaWrapper::AreaWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -174,7 +172,6 @@ css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames()
"com.sun.star.drawing.LineProperties" };
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -356,9 +356,7 @@ struct StaticAxisWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
AxisWrapper::AxisWrapper(
@ -660,7 +658,6 @@ css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames()
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -35,9 +35,7 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
Chart2ModelContact::Chart2ModelContact(
@ -296,7 +294,6 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< css::chart
return aPoint;
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -85,9 +85,7 @@ uno::Sequence< uno::Sequence< double > > lcl_getDBL_MINInsteadNAN( const uno::Se
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
struct lcl_Operator
@ -692,7 +690,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNam
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -243,9 +243,7 @@ struct StaticChartDocumentWrapperPropertyArray : public rtl::StaticAggregate< Se
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace {
@ -1444,7 +1442,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServic
};
}
} // namespace wrapper
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *

View File

@ -416,9 +416,7 @@ void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPr
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -852,7 +850,6 @@ css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServ
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -567,9 +567,7 @@ OUString lcl_getOldChartTypeName( const OUString & rNewChartTypeName )
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
DiagramWrapper::DiagramWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -1927,7 +1925,6 @@ css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -68,9 +68,7 @@ struct StaticGridWrapperPropertyArray : public rtl::StaticAggregate< Sequence< P
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
GridWrapper::GridWrapper(tGridType eType, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -184,7 +182,6 @@ css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames()
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -258,9 +258,7 @@ struct StaticLegendWrapperPropertyArray : public rtl::StaticAggregate< Sequence<
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
LegendWrapper::LegendWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -420,7 +418,6 @@ css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames(
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -113,9 +113,7 @@ struct StaticMinMaxLineWrapperInfo : public rtl::StaticAggregate< uno::Reference
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
MinMaxLineWrapper::MinMaxLineWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -394,7 +392,6 @@ css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNa
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -186,9 +186,7 @@ struct StaticTitleWrapperPropertyArray : public rtl::StaticAggregate< Sequence<
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
TitleWrapper::TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType,
@ -508,7 +506,6 @@ css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames()
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -119,9 +119,7 @@ struct StaticUpDownBarWrapperDefaults : public rtl::StaticAggregate< ::chart::tP
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
UpDownBarWrapper::UpDownBarWrapper(
@ -362,7 +360,6 @@ css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNam
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -70,9 +70,7 @@ struct StaticWallFloorWrapperPropertyArray : public rtl::StaticAggregate< Sequen
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
WallFloorWrapper::WallFloorWrapper( bool bWall,
@ -166,7 +164,6 @@ css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNam
};
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -25,9 +25,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
using namespace ::com::sun::star;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
WrappedAddInProperty::WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@ -118,8 +116,6 @@ Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans
return uno::Any( m_rChartDocumentWrapper.getUpdateAddIn() );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -30,9 +30,7 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace {
@ -120,7 +118,6 @@ void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< std:
rList.emplace_back( new WrappedAutomaticPositionProperty() );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -29,9 +29,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace {
@ -398,7 +396,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean
return aRet;
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -28,9 +28,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
WrappedCharacterHeightProperty_Base::WrappedCharacterHeightProperty_Base(
const OUString& rOuterEqualsInnerName
@ -135,7 +133,6 @@ WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty()
{
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -31,9 +31,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace
@ -147,7 +145,6 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp
xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::Any( aLabel ) );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -26,9 +26,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
const sal_Int32 DEFAULT_GAPWIDTH = 100;
@ -168,7 +166,6 @@ WrappedBarOverlapProperty::~WrappedBarOverlapProperty()
{
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -28,9 +28,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
WrappedNumberFormatProperty::WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
@ -118,7 +116,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans:
return uno::Any( true ); // bLink
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -34,9 +34,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::chart::TimeIncrement;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
WrappedScaleProperty::WrappedScaleProperty(tScaleProperty eScaleProperty
@ -581,7 +579,6 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
return aRet;
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -32,9 +32,7 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace {
@ -135,7 +133,6 @@ void WrappedScaleTextProperties::addWrappedProperties( std::vector< std::unique_
rList.emplace_back( new WrappedScaleTextProperty( spChart2ModelContact ) );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -26,9 +26,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
void WrappedSceneProperty::addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList
@ -98,7 +96,6 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans:
return WrappedProperty::getPropertyValue( xInnerPropertySet );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -20,9 +20,7 @@
#include "WrappedSeriesAreaOrLineProperty.hxx"
#include "DataSeriesPointWrapper.hxx"
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
WrappedSeriesAreaOrLineProperty::WrappedSeriesAreaOrLineProperty(
@ -48,7 +46,6 @@ OUString WrappedSeriesAreaOrLineProperty::getInnerName() const
return m_aInnerAreaTypeName;
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -35,9 +35,7 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace
@ -288,7 +286,6 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue
return uno::Any(aInnerValue);
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -36,16 +36,14 @@
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
#include <utility>
namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } }
namespace com::sun::star::chart2::data { class XDataProvider; }
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace
@ -1069,7 +1067,6 @@ void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< st
lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -32,9 +32,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace {
@ -278,7 +276,6 @@ void WrappedStockProperties::addWrappedProperties( std::vector< std::unique_ptr<
rList.emplace_back( new WrappedUpDownProperty( spChart2ModelContact ) );
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -38,9 +38,7 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::beans::Property;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
namespace
@ -526,7 +524,6 @@ beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Refe
return beans::PropertyState_DEFAULT_VALUE;
}
} //namespace wrapper
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -19,7 +19,7 @@
#include "WrappedTextRotationProperty.hxx"
namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } }
namespace com::sun::star::beans { class XPropertyState; }
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;

View File

@ -24,7 +24,7 @@
#include <vcl/svapp.hxx>
#include <com/sun/star/frame/XModel.hpp>
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
namespace com::sun::star::awt { class XWindow; }
namespace chart
{

View File

@ -63,8 +63,8 @@
#include <svl/cjkoptions.hxx>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } }
namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
namespace com::sun::star::chart2 { class XChartType; }
namespace com::sun::star::chart2 { class XDataSeries; }
namespace chart
{

View File

@ -54,7 +54,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::chart::TimeInterval;
using ::com::sun::star::chart::TimeIncrement;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -967,6 +967,6 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
return (bSetScale || bChangedOtherwise);
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -37,7 +37,7 @@
using namespace ::com::sun::star;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -551,6 +551,6 @@ const uno::Reference<beans::XPropertySet>& CharacterPropertyItemConverter::GetRe
return m_xRefSizePropSet;
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -54,7 +54,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -707,6 +707,6 @@ void DataPointItemConverter::FillSpecialItem(
}
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -74,9 +74,7 @@ void lcl_getErrorIndicatorValues(
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
ErrorBarItemConverter::ErrorBarItemConverter(
@ -430,7 +428,6 @@ void ErrorBarItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -43,7 +43,7 @@
using namespace ::com::sun::star;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -745,7 +745,6 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
return bChanged;
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -30,7 +30,7 @@
using namespace ::com::sun::star;
namespace chart { namespace wrapper {
namespace chart::wrapper {
ItemConverter::ItemConverter(
const uno::Reference< beans::XPropertySet > & rPropertySet,
@ -218,6 +218,6 @@ void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItem
}
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -33,9 +33,7 @@
using namespace ::com::sun::star;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
LegendItemConverter::LegendItemConverter(
@ -181,7 +179,6 @@ void LegendItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -38,7 +38,7 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
namespace chart { namespace wrapper {
namespace chart::wrapper {
AllAxisItemConverter::AllAxisItemConverter(
const uno::Reference< frame::XModel > & xChartModel,
@ -188,6 +188,6 @@ const sal_uInt16 * AllSeriesStatisticsConverter::GetWhichPairs() const
return nStatWhichPairs;
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -23,7 +23,7 @@
using namespace ::com::sun::star;
namespace chart { namespace wrapper {
namespace chart::wrapper {
MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool )
: ItemConverter( nullptr, rItemPool )
@ -67,6 +67,6 @@ bool MultipleItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropert
return false;
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -80,9 +80,7 @@ void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
RegressionCurveItemConverter::RegressionCurveItemConverter(
@ -332,7 +330,6 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS
}
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -31,7 +31,7 @@
using namespace ::com::sun::star;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -144,6 +144,6 @@ void RegressionEquationItemConverter::FillSpecialItem(
}
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -37,9 +37,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
SeriesOptionsItemConverter::SeriesOptionsItemConverter(
@ -435,7 +433,6 @@ void SeriesOptionsItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -209,9 +209,7 @@ void lclConvertToItemSetDouble(SfxItemSet& rItemSet, sal_uInt16 nWhichId, const
} // anonymous namespace
namespace chart
{
namespace wrapper
namespace chart::wrapper
{
StatisticsItemConverter::StatisticsItemConverter(
@ -846,7 +844,6 @@ void StatisticsItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -46,7 +46,7 @@ using namespace com::sun::star;
using namespace com::sun::star::chart2;
using com::sun::star::uno::Reference;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -652,6 +652,6 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r
}
}
}}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -33,7 +33,7 @@
using namespace ::com::sun::star;
namespace chart { namespace wrapper {
namespace chart::wrapper {
namespace {
@ -205,7 +205,6 @@ void TitleItemConverter::FillSpecialItem(
}
}
} // namespace wrapper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -15,7 +15,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart {

View File

@ -28,9 +28,7 @@
using namespace ::com::sun::star;
namespace chart
{
namespace impl
namespace chart::impl
{
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XModel;
@ -120,7 +118,6 @@ void SAL_CALL ShapeUndoElement::disposing()
{
}
} // namespace impl
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -38,7 +38,7 @@
using namespace css::uno;
namespace chart { namespace sidebar {
namespace chart::sidebar {
ChartPanelFactory::ChartPanelFactory()
: PanelFactoryInterfaceBase(m_aMutex)
@ -143,7 +143,7 @@ css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames()
return { "com.sun.star.ui.UIElementFactory" };
}
} } // end of namespace chart::sidebar
} // end of namespace chart::sidebar
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
org_libreoffice_comp_chart2_sidebar_ChartPanelFactory(css::uno::XComponentContext*, css::uno::Sequence<css::uno::Any> const &)

View File

@ -26,7 +26,7 @@
#include <svx/tbcontrl.hxx>
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -525,6 +525,6 @@ void ChartAreaPanel::updateModel(
}
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -30,7 +30,7 @@
using namespace css;
using namespace css::uno;
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -372,6 +372,6 @@ IMPL_LINK(ChartAxisPanel, TextRotationHdl, weld::MetricSpinButton&, rMetricField
setAxisRotation(mxModel, aCID, nVal);
}
}} // end of namespace ::chart::sidebar
} // end of namespace ::chart::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -16,7 +16,7 @@
#include <svx/tbcontrl.hxx>
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -104,6 +104,6 @@ void ChartColorWrapper::updateData()
mpControl->statusChanged(aEvent);
}
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -38,7 +38,7 @@
using namespace css;
using namespace css::uno;
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -588,6 +588,6 @@ void ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV
}
}
}} // end of namespace ::chart::sidebar
} // end of namespace ::chart::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -28,7 +28,7 @@
using namespace css;
using namespace css::uno;
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -419,6 +419,6 @@ IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, weld::SpinButton&, rMetricField,
setValue(mxModel, aCID, nVal, ErrorBarDirection::NEGATIVE);
}
}} // end of namespace ::chart::sidebar
} // end of namespace ::chart::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -27,7 +27,7 @@
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -324,6 +324,6 @@ void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem)
xPropSet->setPropertyValue("LineWidth", css::uno::Any(rItem.GetValue()));
}
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -37,7 +37,7 @@
using namespace css;
using namespace css::uno;
namespace chart { namespace sidebar {
namespace chart::sidebar {
namespace {
@ -465,6 +465,6 @@ IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, weld::ComboBox&, void)
setDataLabelPlacement(mxModel, aCID, nPos);
}
}} // end of namespace ::chart::sidebar
} // end of namespace ::chart::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -9,8 +9,7 @@
#include "ChartSidebarModifyListener.hxx"
namespace chart {
namespace sidebar {
namespace chart::sidebar {
ChartSidebarModifyListenerParent::~ChartSidebarModifyListenerParent()
{
@ -40,6 +39,6 @@ void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEven
mpParent = nullptr;
}
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -14,8 +14,7 @@
#include <ObjectIdentifier.hxx>
namespace chart {
namespace sidebar {
namespace chart::sidebar {
ChartSidebarSelectionListenerParent::~ChartSidebarSelectionListenerParent()
{
@ -80,6 +79,6 @@ void ChartSidebarSelectionListener::setAcceptedTypes(const std::vector<ObjectTyp
maTypes = aTypes;
}
} }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -38,9 +38,7 @@
using namespace css;
using namespace css::uno;
namespace chart
{
namespace sidebar
namespace chart::sidebar
{
ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
@ -436,7 +434,6 @@ void ChartTypePanel::selectMainType()
m_pCurrentMainType->fillExtraControls(m_xChartModel, xTemplateProps);
}
}
}
} // end of namespace ::chart::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -26,7 +26,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
namespace
{

View File

@ -34,7 +34,7 @@
#include <algorithm>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -25,7 +25,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -27,8 +27,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::beans { class XPropertySetInfo; }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -35,7 +35,7 @@
#include <algorithm>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;

View File

@ -31,7 +31,7 @@
#include <vector>
#include <algorithm>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -21,7 +21,7 @@
#include <servicenames_coosystems.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -28,7 +28,7 @@
#include <algorithm>
namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
namespace com::sun::star::beans { class XPropertySetInfo; }
using namespace ::com::sun::star;

View File

@ -35,7 +35,7 @@
#include <vector>
#include <algorithm>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;

View File

@ -21,7 +21,7 @@
#include <servicenames_charttypes.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -21,7 +21,7 @@
#include <servicenames_charttypes.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -26,7 +26,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -23,7 +23,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;

View File

@ -21,7 +21,7 @@
#include <servicenames_charttypes.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;

View File

@ -26,7 +26,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/CurveStyle.hpp>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -25,9 +25,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::drawing;
using namespace ::basegfx;
namespace chart
{
namespace BaseGFXHelper
namespace chart::BaseGFXHelper
{
::basegfx::B3DRange getBoundVolume( const drawing::PolyPolygonShape3D& rPolyPoly )
@ -195,7 +193,6 @@ void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix )
rB3DMatrix = aRotationMatrix;
}
} // namespace BaseGFXHelper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -184,10 +184,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
} // anonymous namespace
namespace chart
{
namespace DataSeriesHelper
namespace chart::DataSeriesHelper
{
OUString getRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xLabeledDataSequence )
@ -844,7 +841,6 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr
}
}
} // namespace DataSeriesHelper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -20,7 +20,7 @@
#include <DataSource.hxx>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;

View File

@ -84,9 +84,7 @@ struct lcl_replaceInterfacePropertiesByClones
} // anonymous namespace
namespace property
{
namespace impl
namespace property::impl
{
ImplOPropertySet::ImplOPropertySet()
@ -175,7 +173,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle )
return true;
}
} // namespace impl
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -43,7 +43,7 @@
#include <vector>
#include <algorithm>
namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
namespace com::sun::star::chart2 { class XChartDocument; }
using namespace ::com::sun::star;
using namespace ::std;

View File

@ -22,7 +22,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -78,9 +78,7 @@ private:
} // anonymous namespace
namespace chart
{
namespace ModifyListenerHelper
namespace chart::ModifyListenerHelper
{
uno::Reference< util::XModifyListener > createModifyEventForwarder()
@ -180,7 +178,6 @@ void SAL_CALL ModifyEventForwarder::disposing()
DisposeAndClear( this );
}
} // namespace ModifyListenerHelper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -42,7 +42,7 @@
#include <rtl/ustrbuf.hxx>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
namespace com::sun::star::drawing { class XShape; }
namespace chart
{

View File

@ -172,9 +172,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
} // anonymous namespace
namespace chart
{
namespace PropertyHelper
namespace chart::PropertyHelper
{
OUString addLineDashUniqueNameToTable(
@ -294,8 +292,6 @@ void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMa
setPropertyValueDefault( rOutMap, key, uno::Any());
}
} // namespace PropertyHelper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -28,7 +28,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <tools/diagnose_ex.h>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -37,7 +37,7 @@
#include <algorithm>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;

View File

@ -22,7 +22,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <cppuhelper/supportsservice.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace com::sun::star::uno { class XComponentContext; }
namespace
{

View File

@ -22,7 +22,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } }
namespace com::sun::star::beans { class XPropertyState; }
using namespace ::com::sun::star;

View File

@ -283,9 +283,7 @@ bool lcl_getCellRangeAddressFromXMLString(
} // anonymous namespace
namespace chart
{
namespace XMLRangeHelper
namespace chart::XMLRangeHelper
{
CellRange getCellRangeFromXMLString( const OUString & rXMLString )
@ -389,7 +387,6 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
return aBuffer.makeStringAndClear();
}
} // namespace XMLRangeHelper
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@ -102,7 +102,7 @@
#include <tools/stream.hxx>
#include <memory>
namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
namespace com::sun::star::chart2 { class XChartDocument; }
namespace chart {

View File

@ -36,8 +36,8 @@
#include <com/sun/star/container/XChild.hpp>
namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } }
namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; } } } }
namespace com::sun::star::linguistic2 { class XHyphenator; }
namespace com::sun::star::linguistic2 { class XSpellChecker1; }
using namespace ::com::sun::star;