mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tuck this anonymous namespace inside chart namespace.

Browse Source 
This way we can eliminate those explicit '::chart' qualifications.

Change-Id: I764e0ca57c8e10f7eac47f48a4cabf28d0562113
This commit is contained in:
Kohei Yoshida
2014-06-25 20:09:58 -04:00
parent 78751ce780
commit 94c56f6a76
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
chart2/source/controller/dialogs/DataBrowserModel.cxx
View File

@@ -61,8 +61,10 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Sequence;
namespace namespace chart {
{
namespace {
OUString lcl_getRole( OUString lcl_getRole(
const Reference< chart2::data::XDataSequence > & xSeq ) const Reference< chart2::data::XDataSequence > & xSeq )
{ {
@@ -85,9 +87,9 @@ OUString lcl_getRole(
OUString lcl_getUIRoleName( OUString lcl_getUIRoleName(
const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{ {
OUString aResult = ::chart::DataSeriesHelper::getRole(xLSeq); OUString aResult = DataSeriesHelper::getRole(xLSeq);
if( !aResult.isEmpty()) if( !aResult.isEmpty())
aResult = ::chart::DialogModel::ConvertRoleFromInternalToUI( aResult ); aResult = DialogModel::ConvertRoleFromInternalToUI(aResult);
return aResult; return aResult;
} }
@@ -114,8 +116,7 @@ bool lcl_SequenceOfSeriesIsShared(
Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW ); Reference< chart2::data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( xSource->getDataSequences()); Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeq( xSource->getDataSequences());
for( sal_Int32 i=0; i<aLSeq.getLength(); ++i ) for( sal_Int32 i=0; i<aLSeq.getLength(); ++i )
if( aLSeq[i].is() && if (aLSeq[i].is() && DataSeriesHelper::getRole(aLSeq[i]).equals(aValuesRole))
::chart::DataSeriesHelper::getRole(aLSeq[i]).equals( aValuesRole ))
{ {
// getValues().is(), because lcl_getRole checked that already // getValues().is(), because lcl_getRole checked that already
bResult = (aValuesRep == aLSeq[i]->getValues()->getSourceRangeRepresentation()); bResult = (aValuesRep == aLSeq[i]->getValues()->getSourceRangeRepresentation());
@@ -196,11 +197,11 @@ private:
struct lcl_RolesOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool > struct lcl_RolesOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{ {
lcl_RolesOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) : lcl_RolesOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) :
m_aRole(::chart::DataSeriesHelper::getRole(xLSeq)) {} m_aRole(DataSeriesHelper::getRole(xLSeq)) {}
bool operator() ( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) bool operator() ( const Reference< chart2::data::XLabeledDataSequence > & xLSeq )
{ {
return ::chart::DataSeriesHelper::getRole(xLSeq).equals(m_aRole); return DataSeriesHelper::getRole(xLSeq).equals(m_aRole);
} }
private: private:
OUString m_aRole; OUString m_aRole;
@@ -214,14 +215,11 @@ bool lcl_ShowCategories( const Reference< chart2::XDiagram > & /* xDiagram */ )
bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagram ) bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagram )
{ {
return ! ::chart::DiagramHelper::isCategoryDiagram( xDiagram ); return !DiagramHelper::isCategoryDiagram(xDiagram);
} }
} // anonymous namespace } // anonymous namespace
namespace chart
{
struct DataBrowserModel::tDataColumn struct DataBrowserModel::tDataColumn
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<