summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui/report
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-04-30 07:15:55 +0300
committerTor Lillqvist <tml@collabora.com>2015-04-30 09:11:40 +0300
commitc07a3b0396ab131bef7ef23305180c8f27bf5c9b (patch)
tree31b1dca0adcd846db2a7d9fde354f7bee3ab263e /reportdesign/source/ui/report
parentd883c12556a71c5d3719454b1f95809a505f0ace (diff)
Get rid of initial :: for the svx namespace
Change-Id: I03e428a749bca409ebac9c142acaddafcbfeca23
Diffstat (limited to 'reportdesign/source/ui/report')
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx10
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx12
2 files changed, 11 insertions, 11 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 24f274ee56dd..4398c00949bd 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3364,7 +3364,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
bHandleOnlyOne = true;
aValue = aArgs;
}
- ::svx::ODataAccessDescriptor aDescriptor(aValue);
+ svx::ODataAccessDescriptor aDescriptor(aValue);
SequenceAsHashMap aMap(aValue);
uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault("Section",xCurrentSection);
uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition();
@@ -3394,16 +3394,16 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
// clear all selections
getDesignView()->unmarkAllObjects(NULL);
- uno::Reference< beans::XPropertySet > xField( aDescriptor[ ::svx::daColumnObject ], uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xField( aDescriptor[ svx::daColumnObject ], uno::UNO_QUERY );
uno::Reference< lang::XComponent > xHoldAlive;
if ( !xField.is() )
{
OUString sCommand;
OUString sColumnName;
sal_Int32 nCommandType( -1 );
- OSL_VERIFY( aDescriptor[ ::svx::daCommand ] >>= sCommand );
- OSL_VERIFY( aDescriptor[ ::svx::daColumnName ] >>= sColumnName );
- OSL_VERIFY( aDescriptor[ ::svx::daCommandType ] >>= nCommandType );
+ OSL_VERIFY( aDescriptor[ svx::daCommand ] >>= sCommand );
+ OSL_VERIFY( aDescriptor[ svx::daColumnName ] >>= sColumnName );
+ OSL_VERIFY( aDescriptor[ svx::daCommandType ] >>= nCommandType );
uno::Reference< container::XNameAccess > xColumns;
uno::Reference< sdbc::XConnection > xConnection( getConnection() );
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index a01b1c2fa5bc..d8e97db06131 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -766,8 +766,8 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
else
{
const DataFlavorExVector& rFlavors = GetDataFlavorExVector();
- if ( ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors)
- || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) )
+ if ( svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors)
+ || svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) )
return _rEvt.mnAction;
const sal_Int8 nDropOption = ( OReportExchange::canExtract(rFlavors) ) ? DND_ACTION_COPYMOVE : DND_ACTION_NONE;
@@ -789,7 +789,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
sal_Int8 nDropOption = DND_ACTION_NONE;
const TransferableDataHelper aDropped(_rEvt.maDropEvent.Transferable);
DataFlavorExVector& rFlavors = aDropped.GetDataFlavorExVector();
- bool bMultipleFormat = ::svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors);
+ bool bMultipleFormat = svx::OMultiColumnTransferable::canExtractDescriptor(rFlavors);
if ( OReportExchange::canExtract(rFlavors) )
{
OReportExchange::TSectionElements aCopies = OReportExchange::extractCopies(aDropped);
@@ -799,7 +799,7 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
m_pParent->getViewsWindow()->unmarkAllObjects(m_pView);
}
else if ( bMultipleFormat
- || ::svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) )
+ || svx::OColumnTransferable::canExtractColumnDescriptor(rFlavors, ColumnTransferFormatFlags::FIELD_DESCRIPTOR | ColumnTransferFormatFlags::CONTROL_EXCHANGE | ColumnTransferFormatFlags::COLUMN_DESCRIPTOR) )
{
m_pParent->getViewsWindow()->getView()->setMarked(m_pView, true);
m_pView->UnmarkAll();
@@ -815,13 +815,13 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
uno::Sequence<beans::PropertyValue> aValues;
if ( !bMultipleFormat )
{
- ::svx::ODataAccessDescriptor aDescriptor = ::svx::OColumnTransferable::extractColumnDescriptor(aDropped);
+ svx::ODataAccessDescriptor aDescriptor = svx::OColumnTransferable::extractColumnDescriptor(aDropped);
aValues.realloc(1);
aValues[0].Value <<= aDescriptor.createPropertyValueSequence();
}
else
- aValues = ::svx::OMultiColumnTransferable::extractDescriptor(aDropped);
+ aValues = svx::OMultiColumnTransferable::extractDescriptor(aDropped);
beans::PropertyValue* pIter = aValues.getArray();
beans::PropertyValue* pEnd = pIter + aValues.getLength();