diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /reportdesign/source/ui | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'reportdesign/source/ui')
63 files changed, 589 insertions, 589 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 681023fb232c..54ff5c2f7e58 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -276,22 +276,22 @@ void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) //----------------------------------------------------------------------- namespace { - void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< ::rtl::OUString >& _rEntries ) + void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< OUString >& _rEntries ) { - const ::rtl::OUString* pEntries = _rEntries.getConstArray(); + const OUString* pEntries = _rEntries.getConstArray(); sal_Int32 nEntries = _rEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries) ); } void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { - uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); - const ::rtl::OUString* pEntries = aEntries.getConstArray(); + uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); + const OUString* pEntries = aEntries.getConstArray(); sal_Int32 nEntries = aEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) { uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) @@ -324,10 +324,10 @@ void OAddFieldWindow::Update() SetText(aTitle); if ( m_xRowSet.is() ) { - ::rtl::OUString sCommand( m_aCommandName ); + OUString sCommand( m_aCommandName ); sal_Int32 nCommandType( m_nCommandType ); sal_Bool bEscapeProcessing( m_bEscapeProcessing ); - ::rtl::OUString sFilter( m_sFilter ); + OUString sFilter( m_sFilter ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); OSL_VERIFY( m_xRowSet->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nCommandType ); @@ -353,7 +353,7 @@ void OAddFieldWindow::Update() // add the parameter columns to the list uno::Reference< ::com::sun::star::sdbc::XRowSet > xRowSet(m_xRowSet,uno::UNO_QUERY); - Sequence< ::rtl::OUString > aParamNames( getParameterNames( xRowSet ) ); + Sequence< OUString > aParamNames( getParameterNames( xRowSet ) ); lcl_addToList( *m_pListBox, aParamNames ); // set title @@ -454,11 +454,11 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent { if ( m_pListBox.get() ) { - ::rtl::OUString sName; + OUString sName; if ( (_rEvent.Accessor >>= sName) && m_xColumns->hasByName(sName) ) { uno::Reference< beans::XPropertySet> xColumn(m_xColumns->getByName(sName),UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index fa4fb8b99413..5839248267ed 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -213,7 +213,7 @@ namespace rptui if ( bLastCondition ) { Reference< XFormatCondition > xFormatCondition( m_xCopy->getByIndex( 0 ), UNO_QUERY_THROW ); - xFormatCondition->setFormula( ::rtl::OUString() ); + xFormatCondition->setFormula( OUString() ); (*pos)->setCondition( xFormatCondition ); } else @@ -429,9 +429,9 @@ namespace rptui } // ----------------------------------------------------------------------------- - ::rtl::OUString ConditionalFormattingDialog::getDataField() const + OUString ConditionalFormattingDialog::getDataField() const { - ::rtl::OUString sDataField; + OUString sDataField; try { sDataField = m_xFormatConditions->getDataField(); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 2d6ad039369a..eee8c29e0762 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -63,7 +63,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed m_pSubEdit->EnableRTL( sal_False ); m_pSubEdit->SetPosPixel( Point() ); - m_aFormula.SetText(::rtl::OUString("...")); + m_aFormula.SetText(OUString("...")); m_aFormula.SetClickHdl( LINK( this, ConditionField, OnFormula ) ); m_aFormula.Show(); m_pSubEdit->Show(); @@ -88,7 +88,7 @@ void ConditionField::Resize() // ----------------------------------------------------------------------------- IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ ) { - ::rtl::OUString sFormula(m_pSubEdit->GetText()); + OUString sFormula(m_pSubEdit->GetText()); const sal_Int32 nLen = sFormula.getLength(); if ( nLen ) { @@ -569,21 +569,21 @@ void Condition::impl_layoutOperands() } // ----------------------------------------------------------------------------- -void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula ) +void Condition::impl_setCondition( const OUString& _rConditionFormula ) { // determine the condition's type and comparison operation ConditionType eType( eFieldValueComparison ); ComparisonOperation eOperation( eBetween ); // LHS and RHS, matched below - ::rtl::OUString sLHS, sRHS; + OUString sLHS, sRHS; if ( !_rConditionFormula.isEmpty() ) { // the unprefixed expression which forms the condition ReportFormula aFormula( _rConditionFormula ); OSL_ENSURE( aFormula.getType() == ReportFormula::Expression, "Condition::setCondition: illegal formula!" ); - ::rtl::OUString sExpression; + OUString sExpression; if ( aFormula.getType() == ReportFormula::Expression ) sExpression = aFormula.getExpression(); // as fallback, if the below matching does not succeed, assume @@ -593,7 +593,7 @@ void Condition::impl_setCondition( const ::rtl::OUString& _rConditionFormula ) // the data field (or expression) to which our control is bound const ReportFormula aFieldContentFormula( m_rAction.getDataField() ); - const ::rtl::OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); + const OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); // check whether one of the Field Value Expression Factories recognizes the expression for ( ConditionalExpressions::const_iterator exp = m_aConditionalExpressions.begin(); @@ -627,7 +627,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >& if ( !_rxCondition.is() ) return; - ::rtl::OUString sConditionFormula; + OUString sConditionFormula; try { if ( _rxCondition.is() ) @@ -678,15 +678,15 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi const ConditionType eType( impl_getCurrentConditionType() ); const ComparisonOperation eOperation( impl_getCurrentComparisonOperation() ); - const ::rtl::OUString sLHS( m_aCondLHS.GetText() ); - const ::rtl::OUString sRHS( m_aCondRHS.GetText() ); + const OUString sLHS( m_aCondLHS.GetText() ); + const OUString sRHS( m_aCondRHS.GetText() ); - ::rtl::OUString sUndecoratedFormula( sLHS ); + OUString sUndecoratedFormula( sLHS ); if ( eType == eFieldValueComparison ) { ReportFormula aFieldContentFormula( m_rAction.getDataField() ); - ::rtl::OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); + OUString sUnprefixedFieldContent( aFieldContentFormula.getBracketedFieldOrExpression() ); PConditionalExpression pFactory( m_aConditionalExpressions[ eOperation ] ); sUndecoratedFormula = pFactory->assembleExpression( sUnprefixedFieldContent, sLHS, sRHS ); diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index b46b2e768915..321baefd8089 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -159,7 +159,7 @@ namespace rptui inline ComparisonOperation impl_getCurrentComparisonOperation() const; - void impl_setCondition( const ::rtl::OUString& _rConditionFormula ); + void impl_setCondition( const OUString& _rConditionFormula ); private: DECL_LINK( OnTypeSelected, ListBox* ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index aa393881f7c2..e2574d109280 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -177,12 +177,12 @@ short ODateTimeDialog::Execute() return nRet; } // ----------------------------------------------------------------------------- -::rtl::OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime) +OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime) { uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey); OSL_ENSURE(xFormSet.is(),"XPropertySet is null!"); - ::rtl::OUString sFormat; - xFormSet->getPropertyValue(::rtl::OUString("FormatString")) >>= sFormat; + OUString sFormat; + xFormSet->getPropertyValue(OUString("FormatString")) >>= sFormat; double nValue = 0; if ( _bTime ) diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 61b9dcbc3293..abbed45b6655 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -45,7 +45,7 @@ namespace rptui FormulaDialog::FormulaDialog(Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory , const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr - , const ::rtl::OUString& _sFormula + , const OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet) : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this) ,m_aFunctionManager(_pFunctionMgr) @@ -53,7 +53,7 @@ FormulaDialog::FormulaDialog(Window* pParent ,m_pAddField(NULL) ,m_xRowSet(_xRowSet) ,m_pEdit(NULL) - ,m_sFormula(::rtl::OUString("=")) + ,m_sFormula(OUString("=")) ,m_nStart(0) ,m_nEnd(1) { @@ -64,7 +64,7 @@ FormulaDialog::FormulaDialog(Window* pParent else m_sFormula = _sFormula; } - m_xParser.set(_xServiceFactory->createInstance(::rtl::OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY); + m_xParser.set(_xServiceFactory->createInstance(OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY); if ( m_xParser.is() ) m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper(); fill(); @@ -86,8 +86,8 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); + aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); boost::scoped_ptr<Window> aTemp2(m_pAddField); m_pAddField = NULL; @@ -198,10 +198,10 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { - m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); } @@ -221,11 +221,11 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg) uno::Sequence< beans::PropertyValue > aValue; aArgs[0].Value >>= aValue; ::svx::ODataAccessDescriptor aDescriptor(aValue); - ::rtl::OUString sName; + OUString sName; aDescriptor[ ::svx::daColumnName ] >>= sName; if ( !sName.isEmpty() ) { - sName = ::rtl::OUString("[") + sName + ::rtl::OUString("]"); + sName = OUString("[") + sName + OUString("]"); m_pEdit->SetText(sName); } } diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index eb127406bb75..06753d8d7653 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -31,7 +31,7 @@ namespace rptui static sal_uInt32 s_nReportFormat = (sal_uInt32)-1; if ( (sal_uInt32)-1 == s_nReportFormat ) { - s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" )); + s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"reportdesign.GroupFormat\"" )); OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "Bad exchange id!"); } return s_nReportFormat; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index d8b950fb1ac6..201093267276 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -59,13 +59,13 @@ using namespace ::comphelper; void lcl_addToList_throw( ComboBoxControl& _rListBox, ::std::vector<ColumnInfo>& o_aColumnList,const uno::Reference< container::XNameAccess>& i_xColumns ) { - uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames(); - const ::rtl::OUString* pEntries = aEntries.getConstArray(); + uno::Sequence< OUString > aEntries = i_xColumns->getElementNames(); + const OUString* pEntries = aEntries.getConstArray(); sal_Int32 nEntries = aEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) { uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),uno::UNO_QUERY_THROW); - ::rtl::OUString sLabel; + OUString sLabel; if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; o_aColumnList.push_back( ColumnInfo(*pEntries,sLabel) ); @@ -357,7 +357,7 @@ void OFieldExpressionControl::lateInit() aFont.SetWeight( WEIGHT_LIGHT ); SetFont(aFont); - InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(rtl::OUString('0')) * 4)/*, sal_True */); + InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */); InsertDataColumn( FIELD_EXPRESSION, String(ModuleRes(STR_RPT_EXPRESSION)), 100); m_pComboCell = new ComboBoxControl( &GetDataWindow() ); @@ -455,7 +455,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow) if ( xGroup.is() ) { sal_uInt16 nPos = m_pComboCell->GetSelectEntryPos(); - ::rtl::OUString sExpression; + OUString sExpression; if ( COMBOBOX_ENTRY_NOTFOUND == nPos ) sExpression = m_pComboCell->GetText(); else @@ -499,7 +499,7 @@ String OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) try { uno::Reference< report::XGroup> xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]); - ::rtl::OUString sExpression = xGroup->getExpression(); + OUString sExpression = xGroup->getExpression(); for(::std::vector<ColumnInfo>::const_iterator aIter = m_aColumnInfo.begin(); aIter != m_aColumnInfo.end();++aIter) { @@ -1116,7 +1116,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) } // ----------------------------------------------------------------------------- -sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColumnName) +sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName) { sal_Int32 nDataType = sdbc::DataType::VARCHAR; try @@ -1344,7 +1344,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x nPos = 0; } m_aGroupOnLst.SelectEntryPos(nPos); - m_aGroupIntervalEd.SetText(rtl::OUString::valueOf(_xGroup->getGroupInterval())); + m_aGroupIntervalEd.SetText(OUString::valueOf(_xGroup->getGroupInterval())); m_aGroupIntervalEd.SaveValue(); m_aGroupIntervalEd.Enable( nPos != 0 ); m_aKeepTogetherLst.SelectEntryPos(_xGroup->getKeepTogether()); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 9680fb8584ca..b37468cc4be5 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -79,17 +79,17 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle return nId; } // ----------------------------------------------------------------------------- -::rtl::OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement) +OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement) { OSL_ENSURE(_xElement.is(),"Found report element which is NULL!"); - ::rtl::OUString sTempName; + OUString sTempName; _xElement->getPropertyValue(PROPERTY_NAME) >>= sTempName; - ::rtl::OUStringBuffer sName = sTempName; + OUStringBuffer sName = sTempName; uno::Reference< report::XFixedText> xFixedText(_xElement,uno::UNO_QUERY); uno::Reference< report::XReportControlModel> xReportModel(_xElement,uno::UNO_QUERY); if ( xFixedText.is() ) { - sName.append(::rtl::OUString(" : ")); + sName.append(OUString(" : ")); sName.append(xFixedText->getLabel()); } else if ( xReportModel.is() && _xElement->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATAFIELD) ) @@ -97,7 +97,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle ReportFormula aFormula( xReportModel->getDataField() ); if ( aFormula.isValid() ) { - sName.append(::rtl::OUString(" : ")); + sName.append(OUString(" : ")); sName.append( aFormula.getUndecoratedContent() ); } } @@ -151,7 +151,7 @@ class NavigatorTree : public ::cppu::BaseMutex ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; unsigned short m_nTimerCounter; - SvTreeListEntry* insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); + SvTreeListEntry* insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData); void traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = LIST_APPEND); void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent); @@ -500,7 +500,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( m_pSelectionListener->unlock(); } // ----------------------------------------------------------------------------- -SvTreeListEntry* NavigatorTree::insertEntry(const ::rtl::OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) +SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData) { SvTreeListEntry* pEntry = NULL; if ( _nImageId ) @@ -676,7 +676,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent ) { SvTreeListEntry* pEntry = find(_rEvent.Source); uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY_THROW); - ::rtl::OUString sName; + OUString sName; uno::Reference< beans::XPropertySetInfo> xInfo = xProp->getPropertySetInfo(); if ( xInfo.is() ) { @@ -725,7 +725,7 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent ) UserData* pData = static_cast<UserData*>(pEntry->GetUserData()); xProp.set(_rEvent.Element,uno::UNO_QUERY); pData->setContent(xProp); - ::rtl::OUString sName; + OUString sName; xProp->getPropertyValue(PROPERTY_NAME) >>= sName; SetEntryText(pEntry,sName); } @@ -828,7 +828,7 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& } else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName) { - ::rtl::OUString sNewName; + OUString sNewName; _rEvent.NewValue >>= sNewName; m_pTree->SetEntryText(pEntry,sNewName); } diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 07db3b7e1373..bee27840d260 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -62,8 +62,8 @@ class OAddFieldWindow :public FloatingWindow PushButton m_aInsertButton; Link m_aCreateLink; - ::rtl::OUString m_aCommandName; - ::rtl::OUString m_sFilter; + OUString m_aCommandName; + OUString m_sFilter; sal_Int32 m_nCommandType; sal_Bool m_bEscapeProcessing; ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; @@ -84,7 +84,7 @@ public: virtual void GetFocus(); virtual long PreNotify( NotifyEvent& _rNEvt ); - inline const ::rtl::OUString& GetCommand() const { return m_aCommandName; } + inline const OUString& GetCommand() const { return m_aCommandName; } inline sal_Int32 GetCommandType() const { return m_nCommandType; } inline sal_Bool GetEscapeProcessing() const { return m_bEscapeProcessing; } inline void SetCreateHdl(const Link& _aCreateLink) { m_aCreateLink = _aCreateLink; } diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 97a5331f4ce7..10142e381d85 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -36,7 +36,7 @@ namespace rptui Link m_aCollapsedLink; svtools::ColorConfig m_aColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig; - ::rtl::OUString m_sColorEntry; + OUString m_sColorEntry; sal_Int32 m_nColor; sal_Int32 m_nTextBoundaries; sal_Bool m_bCollapsed; @@ -46,7 +46,7 @@ namespace rptui protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - OColorListener(Window* _pParent,const ::rtl::OUString& _sColorEntry); + OColorListener(Window* _pParent,const OUString& _sColorEntry); virtual ~OColorListener(); using Window::Notify; diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index a0cf8be24112..4a3a64e10291 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -25,16 +25,16 @@ namespace rptui { struct ColumnInfo { - ::rtl::OUString sColumnName; - ::rtl::OUString sLabel; + OUString sColumnName; + OUString sLabel; bool bColumn; - ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel) + ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel) : sColumnName(i_sColumnName) , sLabel(i_sLabel) , bColumn(true) { } - ColumnInfo(const ::rtl::OUString& i_sColumnName) + ColumnInfo(const OUString& i_sColumnName) : sColumnName(i_sColumnName) , bColumn(false) { diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 465f02aebd63..4d8fa7c515cd 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -55,7 +55,7 @@ namespace rptui virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) = 0; virtual void moveConditionUp( size_t _nCondIndex ) = 0; virtual void moveConditionDown( size_t _nCondIndex ) = 0; - virtual ::rtl::OUString getDataField() const = 0; + virtual OUString getDataField() const = 0; protected: ~IConditionalFormatAction() {} @@ -107,7 +107,7 @@ namespace rptui virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ); virtual void moveConditionUp( size_t _nCondIndex ); virtual void moveConditionDown( size_t _nCondIndex ); - virtual ::rtl::OUString getDataField() const; + virtual OUString getDataField() const; protected: virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index 102b52c6aa4d..f24d1f58e024 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -51,8 +51,8 @@ namespace rptui { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -60,9 +60,9 @@ namespace rptui private: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent: virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException); @@ -70,20 +70,20 @@ namespace rptui // ::com::sun::star::inspection::XPropertyHandler: virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); - virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index ae709eec530a..6d2e16612080 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -68,7 +68,7 @@ class ODateTimeDialog : public ModalDialog * \param _bTime * \return */ - ::rtl::OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); + OUString getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats>& _xFormats,bool _bTime); /** returns the number format key @param _nNumberFormatIndex the number format index @see com::sun::star::i18n::NumberFormatIndex diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index 7efd3f8a563f..e108a0e9968e 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -59,9 +59,9 @@ namespace rptui virtual ~DefaultComponentInspectorModel(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XObjectInspectorModel virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getHandlerFactories() throw (::com::sun::star::uno::RuntimeException); @@ -72,15 +72,15 @@ namespace rptui virtual void SAL_CALL setIsReadOnly( ::sal_Bool _isreadonly ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::inspection::PropertyCategoryDescriptor > SAL_CALL describeCategories( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getPropertyOrderIndex( const OUString& PropertyName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index efaae2c8bafd..d0bd083cc181 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -114,9 +114,9 @@ namespace rptui inline OReportController& getController() const { return m_rReportController; } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); sal_uInt16 GetInsertObj() const; - rtl::OUString GetInsertObjString() const; + OUString GetInsertObjString() const; DlgEdMode GetMode() const { return m_eMode; } /** cuts the current selection in this section @@ -168,7 +168,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); inline Size getGridSizeCoarse() const { return m_aGridSizeCoarse; } @@ -231,8 +231,8 @@ namespace rptui */ void collapseSections(const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections); - ::rtl::OUString getCurrentPage() const; - void setCurrentPage(const ::rtl::OUString& _sLastActivePage); + OUString getCurrentPage() const; + void setCurrentPage(const OUString& _sLastActivePage); /** checks if the keycode is known by the child windows @param _rCode the keycode diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index cfd340cb4c97..6cd3f195fd38 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -33,7 +33,7 @@ namespace rptui protected: virtual void ImplInitSettings(); public: - OEndMarker(Window* _pParent,const ::rtl::OUString& _sColorEntry); + OEndMarker(Window* _pParent,const OUString& _sColorEntry); virtual ~OEndMarker(); // windows diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx index ba75b9274b93..b32b90395df4 100644 --- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx +++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx @@ -40,7 +40,7 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent) throw(::com::sun::star::uno::RuntimeException); void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText ); + void setPlaceholderText( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ); sal_Int32 getTextColor(); diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 8bb6a5238b66..fcfbc6c82e62 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -56,7 +56,7 @@ public: FormulaDialog( Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr - , const ::rtl::OUString& _sFormula + , const OUString& _sFormula , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet); virtual ~FormulaDialog(); diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index df42f61bfd98..99dbd351a40d 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -49,7 +49,7 @@ public: virtual sal_uInt32 getCount() const; virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; - virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; + virtual const formula::IFunctionDescription* getFunctionByName(const OUString& _sFunctionName) const; virtual sal_Unicode getSingleToken(const EToken _eToken) const; ::boost::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; @@ -64,18 +64,18 @@ public: FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription); virtual ~FunctionDescription(){} - virtual ::rtl::OUString getFunctionName() const ; + virtual OUString getFunctionName() const ; virtual const formula::IFunctionCategory* getCategory() const ; - virtual ::rtl::OUString getDescription() const ; + virtual OUString getDescription() const ; virtual xub_StrLen getSuppressedArgumentCount() const ; - virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ; + virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ; virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ; virtual void initArgumentInfo() const; - virtual ::rtl::OUString getSignature() const ; - virtual rtl::OString getHelpId() const ; + virtual OUString getSignature() const ; + virtual OString getHelpId() const ; virtual sal_uInt32 getParameterCount() const ; - virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; - virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; + virtual OUString getParameterName(sal_uInt32 _nPos) const ; + virtual OUString getParameterDescription(sal_uInt32 _nPos) const ; virtual bool isParameterOptional(sal_uInt32 _nPos) const ; }; //============================================================================ @@ -94,7 +94,7 @@ public: virtual const formula::IFunctionDescription* getFunction(sal_uInt32 _nPos) const; virtual sal_uInt32 getNumber() const; virtual const formula::IFunctionManager* getFunctionManager() const; - virtual ::rtl::OUString getName() const; + virtual OUString getName() const; }; // ============================================================================= } // rptui diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index bdef435806c2..ef9bfcfb1bcb 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -44,19 +44,19 @@ namespace rptui struct DefaultFunction { - com::sun::star::beans::Optional< ::rtl::OUString> m_sInitialFormula; - ::rtl::OUString m_sName; - ::rtl::OUString m_sSearchString; - ::rtl::OUString m_sFormula; + com::sun::star::beans::Optional< OUString> m_sInitialFormula; + OUString m_sName; + OUString m_sSearchString; + OUString m_sFormula; ::sal_Bool m_bPreEvaluated; ::sal_Bool m_bDeepTraversing; - inline ::rtl::OUString getName() const { return m_sName; } + inline OUString getName() const { return m_sName; } } ; class OPropertyInfoService; typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>, ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> > TFunctionPair; - typedef ::std::multimap< ::rtl::OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions; + typedef ::std::multimap< OUString,TFunctionPair, ::comphelper::UStringMixLess > TFunctions; typedef ::comphelper::OSimpleListenerContainer < ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::beans::PropertyChangeEvent > PropertyChangeListeners; @@ -81,17 +81,17 @@ namespace rptui @return <TRUE/> if and only if the user successfully chose a clause */ - bool impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; + bool impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const; /** returns the data field type depending on the data field of the report control * * \param _sDataField if the data field is not empty it will be used as data field, otherwise the data field will be used. * \return the data field type */ - sal_uInt32 impl_getDataFieldType_throw(const ::rtl::OUString& _sDataField = ::rtl::OUString()) const; + sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const; - ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const ::rtl::OUString& _sConstantName,const ::rtl::OUString & PropertyName ); - ::com::sun::star::beans::Property getProperty(const ::rtl::OUString & PropertyName); + ::com::sun::star::uno::Any getConstantValue(sal_Bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); + ::com::sun::star::beans::Property getProperty(const OUString & PropertyName); void implCreateListLikeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ,::com::sun::star::inspection::LineDescriptor & out_Descriptor @@ -102,16 +102,16 @@ namespace rptui void implCreateListLikeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ,::com::sun::star::inspection::LineDescriptor & out_Descriptor - ,const ::std::vector< ::rtl::OUString>& _aEntries + ,const ::std::vector< OUString>& _aEntries ,sal_Bool _bReadOnlyControl ,sal_Bool _bTrueIfListBoxFalseIfComboBox ); void checkPosAndSize( const ::com::sun::star::awt::Point& _aNewPos, const ::com::sun::star::awt::Size& _aSize); - ::rtl::OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue ); + OUString impl_convertToFormula( const ::com::sun::star::uno::Any& _rControlValue ); - void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rFieldNames ) const; + void impl_initFieldList_nothrow( ::com::sun::star::uno::Sequence< OUString >& _rFieldNames ) const; /** Creates the function defined by the function template * @@ -119,7 +119,7 @@ namespace rptui * \param _sDataField the data field * \param _aFunction the function template */ - void impl_createFunction(const ::rtl::OUString& _sFunctionName,const ::rtl::OUString& _sDataField,const DefaultFunction& _aFunction); + void impl_createFunction(const OUString& _sFunctionName,const OUString& _sDataField,const DefaultFunction& _aFunction); /** check whether the given function name is a countr function. * @@ -127,7 +127,7 @@ namespace rptui * \param _Out_sScope the scope of the function * \return When true it is a counter functions otherwise false. */ - bool impl_isCounterFunction_throw(const ::rtl::OUString& _sQuotedFunctionName,::rtl::OUString& _Out_sScope) const; + bool impl_isCounterFunction_throw(const OUString& _sQuotedFunctionName,OUString& _Out_sScope) const; /** clear the own properties like function and scope and send a notification * @@ -136,51 +136,51 @@ namespace rptui * \param _sOldScope * \param _nOldDataFieldType */ - void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const ::rtl::OUString& _sOldFunctionName,const ::rtl::OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType); + void resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const OUString& _sOldFunctionName,const OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType); /** checks whether the name is a field or a parameter * * \param _sName the name to check * \return true when it is a field or parameter otherwise false */ - bool impl_isDataField(const ::rtl::OUString& _sName) const; + bool impl_isDataField(const OUString& _sName) const; /**return all formula in a semicolon separated list * * \param _rList the localized function names */ - void impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const; + void impl_fillFormulaList_nothrow(::std::vector< OUString >& _out_rList) const; /** return all group names in a semicolon separated list starting with the group where this control is contained in. * * \param _rList fills the list with all scope names. */ - void impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const; + void impl_fillScopeList_nothrow(::std::vector< OUString >& _out_rList) const; /** return all supported output formats of the report definition * * \param _rList fills the list with all mime types */ - void impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const; + void impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out_rList) const; /** return the one supported output formats of the report definition * * \param _sMimetype the mimetype */ - ::rtl::OUString impl_ConvertMimeTypeToUI_nothrow(const ::rtl::OUString& _sMimetype) const; + OUString impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMimetype) const; /** return the MimeType for the given UI Name * * \param _sUIName the doc ui name */ - ::rtl::OUString impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const; + OUString impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const; /** get the functions supplier for the set scope, default is the surrounding group. * * \param _rsNamePostFix the name post fix which canbe used when the scope as name part is needed * \return the function supplier */ - ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(::rtl::OUString& _rsNamePostFix); + ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier> fillScope_throw(OUString& _rsNamePostFix); /** checks if the given function is a default function we know. * @@ -190,8 +190,8 @@ namespace rptui * \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful. * \return sal_True with known otherwise sal_False */ - sal_Bool isDefaultFunction(const ::rtl::OUString& _sQuotedFunction - ,::rtl::OUString& _Out_rDataField + sal_Bool isDefaultFunction(const OUString& _sQuotedFunction + ,OUString& _Out_rDataField ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>& _xFunctionsSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunctionsSupplier>() ,bool _bSet = false) const; @@ -203,8 +203,8 @@ namespace rptui * \return */ sal_Bool impl_isDefaultFunction_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction>& _xFunction - ,::rtl::OUString& _rDataField - ,::rtl::OUString& _rsDefaultFunctionName) const; + ,OUString& _rDataField + ,OUString& _rsDefaultFunctionName) const; /** fills the memeber m_aDefaultFunctions * @@ -218,7 +218,7 @@ namespace rptui * \param _sFunction The name of the function. * \param _sDataField The name of the data field. */ - void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const ::rtl::OUString& _sFunction,const ::rtl::OUString& _sDataField); + void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField); void removeFunction(); @@ -238,8 +238,8 @@ namespace rptui public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -247,9 +247,9 @@ namespace rptui explicit GeometryHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent: virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException); @@ -257,20 +257,20 @@ namespace rptui // ::com::sun::star::inspection::XPropertyHandler: virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); - virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException); protected: @@ -286,8 +286,8 @@ namespace rptui virtual void SAL_CALL disposing(); PropertyChangeListeners m_aPropertyListeners; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aFieldNames; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aParamNames; + ::com::sun::star::uno::Sequence< OUString > m_aFieldNames; + ::com::sun::star::uno::Sequence< OUString > m_aParamNames; TFunctions m_aFunctionNames; ::std::vector< DefaultFunction > m_aDefaultFunctions; DefaultFunction m_aCounterFunction; @@ -302,8 +302,8 @@ namespace rptui SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< OPropertyInfoService > m_pInfoService; SAL_WNODEPRECATED_DECLARATIONS_POP - mutable ::rtl::OUString m_sDefaultFunction; - mutable ::rtl::OUString m_sScope; + mutable OUString m_sDefaultFunction; + mutable OUString m_sScope; sal_uInt32 m_nDataFieldType; mutable bool m_bNewFunction; bool m_bIn; diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 1b67a6d5506a..53b7d50e4569 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -124,7 +124,7 @@ private: /** returns the data type for the given column name @param _sColumnName */ - sal_Int32 getColumnDataType(const ::rtl::OUString& _sColumnName); + sal_Int32 getColumnDataType(const OUString& _sColumnName); /** shows the text given by the id in the multiline edit @param _nResId the string id diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 833513ce9c45..97532abd31ef 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -45,8 +45,8 @@ namespace rptui { public: // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -54,9 +54,9 @@ namespace rptui explicit ReportComponentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent: virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener) throw (::com::sun::star::uno::RuntimeException); @@ -64,20 +64,20 @@ namespace rptui // ::com::sun::star::inspection::XPropertyHandler: virtual void SAL_CALL inspect(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & Component) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual void SAL_CALL setPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & Value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& ControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & ControlValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue(const OUString & PropertyName, const ::com::sun::star::uno::Any & PropertyValue, const ::com::sun::star::uno::Type & ControlValueType) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); virtual void SAL_CALL addPropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & Listener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual void SAL_CALL removePropertyChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & _rxListener) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getSupportedProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isComposable(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); - virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); - virtual void SAL_CALL actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupersededProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getActuatingProperties() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isComposable(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); + virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, ::com::sun::star::uno::Any & out_Data, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException); + virtual void SAL_CALL actuatingPropertyChanged(const OUString & ActuatingPropertyName, const ::com::sun::star::uno::Any & NewValue, const ::com::sun::star::uno::Any & OldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException); virtual ::sal_Bool SAL_CALL suspend(::sal_Bool Suspend) throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index cb3c95cacc1e..9f2cbe0167fb 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -112,9 +112,9 @@ namespace rptui ::boost::shared_ptr<rptui::OReportModel> m_aReportModel; - ::rtl::OUString m_sName; /// name for the report definition - ::rtl::OUString m_sLastActivePage; /// last active property browser page - ::rtl::OUString m_sMode; /// the current mode of the controller + OUString m_sName; /// name for the report definition + OUString m_sLastActivePage; /// last active property browser page + OUString m_sMode; /// the current mode of the controller sal_Int32 m_nSplitPos; /// the position of the splitter sal_Int32 m_nPageNum; /// the page number from the restoreView call sal_Int32 m_nSelectionCount; @@ -137,7 +137,7 @@ namespace rptui * \param _xSection the section where to create the formatted field * \param _sFunction the function which will be set at the data field. */ - void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const ::rtl::OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD); + void createControl(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD); /** switch the report header/footer sectionon off with undo or without depending on the given id. * * \param _nId Can either be SID_REPORTHEADER_WITHOUT_UNDO or SID_REPORTFOOTER_WITHOUT_UNDO or SID_REPORTHEADERFOOTER. @@ -201,7 +201,7 @@ namespace rptui @param _bShow when <TRUE/> the header and footer will be shown otherwise not */ void groupChange( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup - ,const ::rtl::OUString& _sPropName + ,const OUString& _sPropName ,sal_Int32 _nGroupPos ,bool _bShow); @@ -304,14 +304,14 @@ namespace rptui @param _sProperty the property which should be filled in the value @param _rState the state to fill */ - void impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const; + void impl_fillState_nothrow(const OUString& _sProperty,dbaui::FeatureState& _rState) const; void impl_fillCustomShapeState_nothrow(const char* _pCustomShapeType,dbaui::FeatureState& _rState) const; /** set the property at all selected controls. @return <TRUE/> when the selection is not empty */ bool impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId - ,const ::rtl::OUString& _sProperty + ,const OUString& _sProperty ,const ::com::sun::star::uno::Any& _aValue ,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); @@ -363,11 +363,11 @@ namespace rptui virtual void SAL_CALL disposing(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -399,13 +399,13 @@ namespace rptui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); // XModeSelector - virtual void SAL_CALL setMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getMode( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::sal_Bool SAL_CALL supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getMode( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::sal_Bool SAL_CALL supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) ; // XVisualObject virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -462,7 +462,7 @@ namespace rptui ::boost::shared_ptr<OSectionWindow> getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getColumns() const; - ::rtl::OUString getColumnLabel_throw(const ::rtl::OUString& i_sColumnName) const; + OUString getColumnLabel_throw(const OUString& i_sColumnName) const; SfxUndoManager& getUndoManager() const; void clearUndoManager() const; diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index a7cf37642048..072973d2f1ff 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -144,14 +144,14 @@ namespace rptui * * @param _sType */ - void createDefault(const ::rtl::OUString& _sType); + void createDefault(const OUString& _sType); /** creates a new default custom shape * * \param _sType * \param _pObj */ - void createDefault(const ::rtl::OUString& _sType,SdrObject* _pObj); + void createDefault(const OUString& _sType,SdrObject* _pObj); void stopScrollTimer(); /** deactivate the currect active ole object if any diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 878914bfe651..93c7e87f3173 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -78,8 +78,8 @@ namespace rptui inline OScrollWindowHelper* getScrollWindow() const { return m_pParent; } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - rtl::OUString GetInsertObjString() const; + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); + OUString GetInsertObjString() const; void setGridSnap(sal_Bool bOn); void setDragStripes(sal_Bool bOn); @@ -123,7 +123,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); sal_uInt16 getSectionCount() const; diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 1e36634a9a03..b4d47c7fcc37 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -40,7 +40,7 @@ namespace rptui protected: ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> > m_aControls; - ::std::vector< ::std::pair< ::rtl::OUString ,::com::sun::star::uno::Any> > + ::std::vector< ::std::pair< OUString ,::com::sun::star::uno::Any> > m_aValues; Action m_eAction; sal_uInt16 m_nSlot; @@ -95,7 +95,7 @@ namespace rptui ::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > ,OGroupHelper> m_pMemberFunction; - mutable ::rtl::OUString m_sName; + mutable OUString m_sName; void implReInsert( ); void implReRemove( ); @@ -112,7 +112,7 @@ namespace rptui ,Action _eAction ,sal_uInt16 nCommentID); - virtual rtl::OUString GetComment() const; + virtual OUString GetComment() const; }; /** /class OGroupUndo diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 618d8ad6a7a3..c2b0816cd921 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -88,8 +88,8 @@ namespace rptui // forwards void SetMode( DlgEdMode _eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - rtl::OUString GetInsertObjString() const; + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); + OUString GetInsertObjString() const; void setGridSnap(sal_Bool bOn); void setDragStripes(sal_Bool bOn); /** copies the current selection in this section @@ -130,7 +130,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); sal_uInt16 getSectionCount() const; diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 7f00e8ea3b59..0b262fa18e77 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -95,7 +95,7 @@ namespace rptui public: OSectionWindow( OViewsWindow* _pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry); + ,const OUString& _sColorEntry); virtual ~OSectionWindow(); inline OStartMarker& getStartMarker() { return m_aStartMarker; } diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index 6bfe03a55849..0c3115cfb87a 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -48,7 +48,7 @@ namespace rptui OStartMarker(OStartMarker&); void operator =(OStartMarker&); public: - OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sColorEntry); + OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry); virtual ~OStartMarker(); // SfxListener diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 29b7c4c1095d..19967ed3c059 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -101,7 +101,7 @@ namespace rptui @return <TRUE/> if and only if the user successfully chose a clause */ - bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula + bool openDialogFormula_nothrow( OUString& _in_out_rFormula , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet @@ -153,7 +153,7 @@ namespace rptui /** retrieves the names of the parameters of the command which the given RowSet is bound to */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getParameterNames( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet ); /** ensures that no control overlaps the given one. diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 1c469f96b666..d868f25453ac 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -128,7 +128,7 @@ namespace rptui TSectionsMap m_aSections; svtools::ColorConfig m_aColorConfig; OReportWindow* m_pParent; - ::rtl::OUString m_sShapeType; + OUString m_sShapeType; sal_Bool m_bInSplitHandler; sal_Bool m_bInUnmark; @@ -177,7 +177,7 @@ namespace rptui If the position is grater than the current elements, the section will be appended. */ void addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition = USHRT_MAX); sal_uInt16 getSectionCount() const; @@ -202,8 +202,8 @@ namespace rptui inline bool empty() const { return m_aSections.empty(); } void SetMode( DlgEdMode m_eMode ); - void SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString()); - rtl::OUString GetInsertObjString() const; + void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString()); + OUString GetInsertObjString() const; /** copies the current selection in this section */ void Copy(); @@ -277,7 +277,7 @@ namespace rptui * * \return \member m_sShapeType */ - inline ::rtl::OUString getShapeType() const { return m_sShapeType; } + inline OUString getShapeType() const { return m_sShapeType; } /** returns the current position in the list */ diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 06493f08cfc8..543efb1bf0b0 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -50,12 +50,12 @@ namespace rptui // IPropertyInfoService sal_Int32 getPropertyId(const String& _rName) const; String getPropertyTranslation(sal_Int32 _nId) const; - rtl::OString getPropertyHelpId(sal_Int32 _nId) const; + OString getPropertyHelpId(sal_Int32 _nId) const; sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); bool isComposable( - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler ); @@ -73,7 +73,7 @@ namespace rptui class HelpIdUrl { public: - static ::rtl::OUString getHelpURL( const rtl::OString& _sHelpId ); + static OUString getHelpURL( const OString& _sHelpId ); }; //======================================================================== diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index fcb6809cb16b..005d1d554a38 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -58,7 +58,7 @@ private: m_xBrowserComponentWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xLastSection; /// is the previously displayed section - ::rtl::OUString m_sLastActivePage; + OUString m_sLastActivePage; ODesignView* m_pDesignView; OSectionView* m_pView; sal_Bool m_bInitialStateChange; @@ -76,7 +76,7 @@ protected: void implSetNewObject( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >()); - ::rtl::OUString GetHeadlineName( + OUString GetHeadlineName( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects); void implDetachController(); @@ -97,8 +97,8 @@ public: void Update( OSectionView* m_pView ); void Update( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent); inline OSectionView* GetCurView() const { return m_pView; } - ::rtl::OUString getCurrentPage() const; - void setCurrentPage(const ::rtl::OUString& _sLastActivePage); + OUString getCurrentPage() const; + void setCurrentPage(const OUString& _sLastActivePage); ::Size getMinimumSize() const; private: diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index a6927bc724f1..413cca6d2ac9 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -40,8 +40,8 @@ namespace rptui public: OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); @@ -50,11 +50,11 @@ namespace rptui // XInterface DECLARE_XINTERFACE( ) // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 01e534de889e..41c0a5fd33b7 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -53,14 +53,14 @@ namespace rptui virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // need by registration - static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -71,8 +71,8 @@ namespace rptui // XSubToolbarController virtual ::sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 6dad9740dcd4..219860eabd33 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -63,7 +63,7 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); m_xTypeConverter.set(script::Converter::create(m_xContext)); }catch(const uno::Exception &) @@ -72,34 +72,34 @@ DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext } //------------------------------------------------------------------------ -::rtl::OUString SAL_CALL DataProviderHandler::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL DataProviderHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ -sal_Bool SAL_CALL DataProviderHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL DataProviderHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ -::rtl::OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString DataProviderHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.DataProviderHandler"); + return OUString("com.sun.star.comp.report.DataProviderHandler"); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > DataProviderHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DataProviderHandler"); + uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.inspection.DataProviderHandler"); return aSupported; } @@ -136,11 +136,11 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent("FormComponent"); + const OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) { uno::Reference<beans::XPropertySet> xProp(xNameCont->getByName(sFormComponent),uno::UNO_QUERY); - const ::rtl::OUString sModel("Model"); + const OUString sModel("Model"); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sModel) ) { m_xChartModel.set(xProp->getPropertyValue(sModel),uno::UNO_QUERY); @@ -149,7 +149,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface } } m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY); - m_xReportComponent.set( xNameCont->getByName( ::rtl::OUString( "ReportComponent" ) ), uno::UNO_QUERY ); + m_xReportComponent.set( xNameCont->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY ); if ( m_xDataProvider.is() ) { ::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter()); @@ -170,7 +170,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface } } -uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Any aPropertyValue; @@ -184,7 +184,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // uno::Reference< chart2::XDiagram > xDiagram( m_xChartModel->getFirstDiagram() ); // if( xDiagram.is() ) // { - // ::rtl::OUString sChartTypes; + // OUString sChartTypes; // uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW ); // const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems()); // const uno::Reference< chart2::XCoordinateSystem >* pIter = aCooSysSeq.getConstArray(); @@ -198,7 +198,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & // for(;pChartTypeIter != pChartTypeEnd;++pChartTypeIter) // { // sChartTypes += (*pChartTypeIter)->getChartType(); - // sChartTypes += ::rtl::OUString(";"); + // sChartTypes += OUString(";"); // } // } // aPropertyValue;// <<= sChartTypes; @@ -215,7 +215,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const ::rtl::OUString & return aPropertyValue; } -void SAL_CALL DataProviderHandler::setPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Any aPropertyValue; @@ -241,13 +241,13 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); if ( !xTitle.is() ) { - xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY); + xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY); xTitled->setTitleObject(xTitle); } if ( xTitle.is() ) { - uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.chart2.FormattedString"),m_xContext),uno::UNO_QUERY); - ::rtl::OUString sStr; + uno::Reference< chart2::XFormattedString> xFormatted(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.chart2.FormattedString"),m_xContext),uno::UNO_QUERY); + OUString sStr; _aValue>>= sStr; xFormatted->setString(sStr); uno::Sequence< uno::Reference< chart2::XFormattedString> > aArgs(1); @@ -257,19 +257,19 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) } } -beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->getPropertyState(PropertyName); } -inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const ::rtl::OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) +inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) { inspection::LineDescriptor aOut; const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName); switch(nId) { case PROPERTY_ID_CHARTTYPE: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True); aOut.HasPrimaryButton = sal_True; break; @@ -279,7 +279,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); aOut.HasPrimaryButton = sal_True; break; default: @@ -288,16 +288,16 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co if ( nId != -1 ) { aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ? - ::rtl::OUString("Data") + OUString("Data") : - ::rtl::OUString("General"); + OUString("General"); aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) ); aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId); } return aOut; } -uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const ::rtl::OUString & _rPropertyValue, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _rPropertyValue, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Any aPropertyValue( _rControlValue ); @@ -325,7 +325,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const ::rtl::OUStr return aPropertyValue; } -uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const ::rtl::OUString & _rPropertyName, const uno::Any & _rPropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _rPropertyName, const uno::Any & _rPropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) { uno::Any aControlValue( _rPropertyValue ); if ( !aControlValue.hasValue() ) @@ -373,7 +373,7 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope { m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); beans::Property aValue; - static const ::rtl::OUString s_pProperties[] = + static const OUString s_pProperties[] = { PROPERTY_CHARTTYPE ,PROPERTY_MASTERFIELDS @@ -390,28 +390,28 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } -uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getSupersededProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DataProviderHandler::getSupersededProperties() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet(1); + uno::Sequence< OUString > aRet(1); aRet[0] = PROPERTY_TITLE; // have a look at OPropertyInfoService::getExcludeProperties return aRet; } -uno::Sequence< ::rtl::OUString > SAL_CALL DataProviderHandler::getActuatingProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - uno::Sequence< ::rtl::OUString > aSeq(1); + uno::Sequence< OUString > aSeq(1); aSeq[0] = PROPERTY_TITLE; return ::comphelper::concatSequences(m_xFormComponentHandler->getActuatingProperties(),aSeq); } -::sal_Bool SAL_CALL DataProviderHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) +::sal_Bool SAL_CALL DataProviderHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler ); } -inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) +inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) { if ( !_rxInspectorUI.is() ) throw lang::NullPointerException(); @@ -438,7 +438,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti return eResult; } -void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) +void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -454,7 +454,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin sal_Bool bModified = xReport->isModified(); // this fills the chart again ::comphelper::NamedValueCollection aArgs; - aArgs.put( "CellRangeRepresentation", uno::makeAny( ::rtl::OUString( "all" ) ) ); + aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) ); aArgs.put( "HasCategories", uno::makeAny( sal_True ) ); aArgs.put( "FirstCellAsLabel", uno::makeAny( sal_True ) ); aArgs.put( "DataRowSource", uno::makeAny( chart::ChartDataRowSource_COLUMNS ) ); @@ -494,29 +494,29 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex { uno::Sequence<uno::Any> aSeq(6); beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString("ParentWindow"); - aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow")); + aParam.Name = OUString("ParentWindow"); + aParam.Value <<= m_xContext->getValueByName( OUString("DialogParentWindow")); aSeq[0] <<= aParam; - aParam.Name = ::rtl::OUString("Detail"); + aParam.Name = OUString("Detail"); aParam.Value <<= m_xDataProvider; aSeq[1] <<= aParam; - aParam.Name = ::rtl::OUString("Master"); + aParam.Name = OUString("Master"); aParam.Value <<= m_xReportComponent->getSection()->getReportDefinition(); aSeq[2] <<= aParam; - aParam.Name = ::rtl::OUString("Explanation"); - aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_EXPLANATION))); + aParam.Name = OUString("Explanation"); + aParam.Value <<= OUString(String(ModuleRes(RID_STR_EXPLANATION))); aSeq[3] <<= aParam; - aParam.Name = ::rtl::OUString("DetailLabel"); - aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_DETAILLABEL))); + aParam.Name = OUString("DetailLabel"); + aParam.Value <<= OUString(String(ModuleRes(RID_STR_DETAILLABEL))); aSeq[4] <<= aParam; - aParam.Name = ::rtl::OUString("MasterLabel"); - aParam.Value <<= ::rtl::OUString(String(ModuleRes(RID_STR_MASTERLABEL))); + aParam.Name = OUString("MasterLabel"); + aParam.Value <<= OUString(String(ModuleRes(RID_STR_MASTERLABEL))); aSeq[5] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq + OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog"),aSeq , m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); @@ -527,16 +527,16 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua { uno::Sequence<uno::Any> aSeq(2); beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString("ParentWindow"); - aParam.Value <<= m_xContext->getValueByName( ::rtl::OUString("DialogParentWindow")); + aParam.Name = OUString("ParentWindow"); + aParam.Value <<= m_xContext->getValueByName( OUString("DialogParentWindow")); aSeq[0] <<= aParam; - aParam.Name = ::rtl::OUString("ChartModel"); + aParam.Name = OUString("ChartModel"); aParam.Value <<= m_xChartModel; aSeq[1] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( - ::rtl::OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq + OUString("com.sun.star.comp.chart2.ChartTypeDialog"),aSeq , m_xContext), uno::UNO_QUERY); _rClearBeforeDialog.clear(); diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 977cf8660456..bb5088dc365a 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -33,10 +33,10 @@ //........................................................................ namespace rptui { - ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) + OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { - ::rtl::OUStringBuffer aBuffer; - ::rtl::OUString aTmp( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); + OUStringBuffer aBuffer; + OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); aBuffer.appendAscii( INET_HID_SCHEME ); aBuffer.append( aTmp.getStr() ); @@ -71,34 +71,34 @@ namespace rptui } //------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ - sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL DefaultComponentInspectorModel::supportsService( const OUString& ServiceName ) throw(RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL DefaultComponentInspectorModel::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ - ::rtl::OUString DefaultComponentInspectorModel::getImplementationName_Static( ) throw(RuntimeException) + OUString DefaultComponentInspectorModel::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.DefaultComponentInspectorModel"); + return OUString("com.sun.star.comp.report.DefaultComponentInspectorModel"); } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) + Sequence< OUString > DefaultComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel"); + Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.inspection.DefaultComponentInspectorModel"); return aSupported; } @@ -134,7 +134,7 @@ namespace rptui Any* pReturn = aReturn.getArray(); for ( size_t i = 0; i < nFactories; ++i ) { - *pReturn++ <<= ::rtl::OUString::createFromAscii( aFactories[i].serviceName ); + *pReturn++ <<= OUString::createFromAscii( aFactories[i].serviceName ); } return aReturn; @@ -188,12 +188,12 @@ namespace rptui if ( _arguments.getLength() == 2 ) { // constructor: "createWithHelpSection( long, long )" if ( !( _arguments[0] >>= nMinHelpTextLines ) || !( _arguments[1] >>= nMaxHelpTextLines ) ) - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw lang::IllegalArgumentException( OUString(), *this, 0 ); createWithHelpSection( nMinHelpTextLines, nMaxHelpTextLines ); return; } - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw lang::IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- @@ -205,7 +205,7 @@ namespace rptui void DefaultComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines ) { if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) ) - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw lang::IllegalArgumentException( OUString(), *this, 0 ); m_bHasHelpSection = true; m_nMinHelpTextLines = _nMinHelpTextLines; @@ -221,7 +221,7 @@ namespace rptui { const sal_Char* programmaticName; sal_uInt16 uiNameResId; - rtl::OString helpId; + OString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA }, @@ -232,7 +232,7 @@ namespace rptui PropertyCategoryDescriptor* pReturn = aReturn.getArray(); for ( size_t i=0; i<nCategories; ++i, ++pReturn ) { - pReturn->ProgrammaticName = ::rtl::OUString::createFromAscii( aCategories[i].programmaticName ); + pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); pReturn->UIName = String( ModuleRes( aCategories[i].uiNameResId ) ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } @@ -241,7 +241,7 @@ namespace rptui } //-------------------------------------------------------------------- - ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const ::rtl::OUString& _rPropertyName ) throw (RuntimeException) + ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); const sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -251,7 +251,7 @@ namespace rptui if ( !m_xComponent.is() ) try { - m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW); + m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW); } catch(const Exception &) { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index e1d18fd0af77..d586521002aa 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -781,12 +781,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const break; case PROPERTY_ID_INITIALFORMULA: case PROPERTY_ID_FORMULA: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; @@ -801,7 +801,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const if ( m_nDataFieldType == DATA_OR_FORMULA ) { - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; } @@ -828,12 +828,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); break; case PROPERTY_ID_FONT: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; case PROPERTY_ID_AREA: - aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); + aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 13f179165c81..df01a77b1118 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -45,7 +45,7 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo { try { - m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); + m_xFormComponentHandler.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.FormComponentPropertyHandler"),m_xContext),uno::UNO_QUERY_THROW); }catch(const uno::Exception &) { @@ -53,34 +53,34 @@ ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentCo } //------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ReportComponentHandler::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL ReportComponentHandler::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------------ -sal_Bool SAL_CALL ReportComponentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL ReportComponentHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static()); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_static(); } //------------------------------------------------------------------------ -::rtl::OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) +OUString ReportComponentHandler::getImplementationName_Static( ) throw(uno::RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.report.ReportComponentHandler"); + return OUString("com.sun.star.comp.report.ReportComponentHandler"); } //------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) +uno::Sequence< OUString > ReportComponentHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString("com.sun.star.report.inspection.ReportComponentHandler"); + uno::Sequence< OUString > aSupported(1); + aSupported[0] = OUString("com.sun.star.report.inspection.ReportComponentHandler"); return aSupported; } @@ -115,10 +115,10 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf try { uno::Reference< container::XNameContainer > xNameCont(Component,uno::UNO_QUERY); - const ::rtl::OUString sFormComponent("FormComponent"); + const OUString sFormComponent("FormComponent"); if ( xNameCont->hasByName(sFormComponent) ) xNameCont->getByName(sFormComponent) >>= m_xFormComponent; - const ::rtl::OUString sRowSet("RowSet"); + const OUString sRowSet("RowSet"); if ( xNameCont->hasByName(sRowSet) ) { uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); @@ -135,32 +135,32 @@ void SAL_CALL ReportComponentHandler::inspect(const uno::Reference< uno::XInterf } } -uno::Any SAL_CALL ReportComponentHandler::getPropertyValue(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL ReportComponentHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->getPropertyValue(PropertyName); } -void SAL_CALL ReportComponentHandler::setPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) +void SAL_CALL ReportComponentHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException) { m_xFormComponentHandler->setPropertyValue(PropertyName, Value); } -beans::PropertyState SAL_CALL ReportComponentHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) +beans::PropertyState SAL_CALL ReportComponentHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->getPropertyState(PropertyName); } -inspection::LineDescriptor SAL_CALL ReportComponentHandler::describePropertyLine(const ::rtl::OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & ControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) +inspection::LineDescriptor SAL_CALL ReportComponentHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & ControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException) { return m_xFormComponentHandler->describePropertyLine(PropertyName, ControlFactory); } -uno::Any SAL_CALL ReportComponentHandler::convertToPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & ControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL ReportComponentHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & ControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->convertToPropertyValue(PropertyName, ControlValue); } -uno::Any SAL_CALL ReportComponentHandler::convertToControlValue(const ::rtl::OUString & PropertyName, const uno::Any & PropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) +uno::Any SAL_CALL ReportComponentHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & PropertyValue, const uno::Type & ControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_xFormComponentHandler->convertToControlValue(PropertyName, PropertyValue, ControlValueType); } @@ -183,28 +183,28 @@ uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedPr return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } -uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getSupersededProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getSupersededProperties() throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aRet; + uno::Sequence< OUString > aRet; return aRet; } -uno::Sequence< ::rtl::OUString > SAL_CALL ReportComponentHandler::getActuatingProperties() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getActuatingProperties() throw (uno::RuntimeException) { return m_xFormComponentHandler->getActuatingProperties(); } -::sal_Bool SAL_CALL ReportComponentHandler::isComposable( const ::rtl::OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) +::sal_Bool SAL_CALL ReportComponentHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException) { return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler ); } -inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) +inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException) { return m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, out_Data, InspectorUI); } -void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) +void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI, ::sal_Bool FirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException) { m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit); } diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index d9f12f309b65..aa14f7c43db7 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -42,7 +42,7 @@ namespace rptui { String sName; String sTranslation; - rtl::OString sHelpId; + OString sHelpId; sal_Int32 nId; sal_uInt32 nUIFlags; @@ -50,13 +50,13 @@ namespace rptui const OUString& rName, sal_Int32 _nId, const String& aTranslation, - const rtl::OString& _sHelpId, + const OString& _sHelpId, sal_uInt32 _nUIFlags); }; //------------------------------------------------------------------------ OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId, - const String& aString, const rtl::OString& sHid, sal_uInt32 _nUIFlags) + const String& aString, const OString& sHid, sal_uInt32 _nUIFlags) :sName(_rName) ,sTranslation(aString) ,sHelpId(sHid) @@ -170,10 +170,10 @@ namespace rptui } //------------------------------------------------------------------------ - rtl::OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const + OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); - return (pInfo) ? pInfo->sHelpId : rtl::OString(); + return (pInfo) ? pInfo->sHelpId : OString(); } //------------------------------------------------------------------------ diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 7c8237b4d2fd..66e83b974224 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -25,7 +25,7 @@ namespace rptui { //===================================================================== DBG_NAME( rpt_OColorListener ) -OColorListener::OColorListener(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry) : Window(_pParent) ,m_sColorEntry(_sColorEntry) ,m_nColor(COL_LIGHTBLUE) diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index bfd87207dcb6..19ce7b86bd4b 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -67,7 +67,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) return m_aCategoryIndex[_nPos]->second.get(); } // ----------------------------------------------------------------------------- -const formula::IFunctionDescription* FunctionManager::getFunctionByName(const ::rtl::OUString& _sFunctionName) const +const formula::IFunctionDescription* FunctionManager::getFunctionByName(const OUString& _sFunctionName) const { const formula::IFunctionDescription* pDesc = NULL; try @@ -89,12 +89,12 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula ::boost::shared_ptr< FunctionDescription > pDesc; if ( _xFunctionDescription.is() ) { - const ::rtl::OUString sFunctionName = _xFunctionDescription->getName(); + const OUString sFunctionName = _xFunctionDescription->getName(); TFunctionsMap::const_iterator aFunctionFind = m_aFunctions.find(sFunctionName); if ( aFunctionFind == m_aFunctions.end() ) { const uno::Reference< report::meta::XFunctionCategory> xCategory = _xFunctionDescription->getCategory(); - const ::rtl::OUString sCategoryName = xCategory->getName(); + const OUString sCategoryName = xCategory->getName(); TCategoriesMap::iterator aCategoryFind = m_aCategories.find(sCategoryName); if ( aCategoryFind == m_aCategories.end() ) { @@ -142,7 +142,7 @@ const formula::IFunctionManager* FunctionCategory::getFunctionManager() const return m_pFunctionManager; } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionCategory::getName() const +OUString FunctionCategory::getName() const { return m_xCategory->getName(); } @@ -153,7 +153,7 @@ FunctionDescription::FunctionDescription(const formula::IFunctionCategory* _pFun { m_aParameter = m_xFunctionDescription->getArguments(); } -::rtl::OUString FunctionDescription::getFunctionName() const +OUString FunctionDescription::getFunctionName() const { return m_xFunctionDescription->getName(); } @@ -163,7 +163,7 @@ const formula::IFunctionCategory* FunctionDescription::getCategory() const return m_pFunctionCategory; } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getDescription() const +OUString FunctionDescription::getDescription() const { return m_xFunctionDescription->getDescription(); } @@ -173,13 +173,13 @@ xub_StrLen FunctionDescription::getSuppressedArgumentCount() const return static_cast<xub_StrLen>(m_aParameter.getLength()); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const +OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArguments) const { - ::rtl::OUString sFormula; + OUString sFormula; try { - const ::rtl::OUString *pArguments = _aArguments.empty() ? 0 : &_aArguments[0]; - sFormula = m_xFunctionDescription->createFormula(uno::Sequence< ::rtl::OUString >(pArguments, _aArguments.size())); + const OUString *pArguments = _aArguments.empty() ? 0 : &_aArguments[0]; + sFormula = m_xFunctionDescription->createFormula(uno::Sequence< OUString >(pArguments, _aArguments.size())); } catch(const uno::Exception&) { @@ -201,14 +201,14 @@ void FunctionDescription::initArgumentInfo() const { } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getSignature() const +OUString FunctionDescription::getSignature() const { return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -rtl::OString FunctionDescription::getHelpId() const +OString FunctionDescription::getHelpId() const { - return rtl::OString(); + return OString(); } // ----------------------------------------------------------------------------- sal_uInt32 FunctionDescription::getParameterCount() const @@ -216,18 +216,18 @@ sal_uInt32 FunctionDescription::getParameterCount() const return m_aParameter.getLength(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const +OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Name; - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -::rtl::OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const +OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const { if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) ) return m_aParameter[_nPos].Description; - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 497ec21131c1..6a280720da5a 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -87,12 +87,12 @@ namespace } } //---------------------------------------------------------------------------- - void lcl_setValues(const uno::Reference< report::XSection >& _xSection,const ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >& _aValues) + void lcl_setValues(const uno::Reference< report::XSection >& _xSection,const ::std::vector< ::std::pair< OUString ,uno::Any> >& _aValues) { if ( _xSection.is() ) { - ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >::const_iterator aIter = _aValues.begin(); - ::std::vector< ::std::pair< ::rtl::OUString ,uno::Any> >::const_iterator aEnd = _aValues.end(); + ::std::vector< ::std::pair< OUString ,uno::Any> >::const_iterator aIter = _aValues.begin(); + ::std::vector< ::std::pair< OUString ,uno::Any> >::const_iterator aEnd = _aValues.end(); for (; aIter != aEnd; ++aIter) { try @@ -166,7 +166,7 @@ void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xS for(;pIter != pEnd;++pIter) { if ( 0 == (pIter->Attributes & beans::PropertyAttribute::READONLY) ) - m_aValues.push_back(::std::pair< ::rtl::OUString ,uno::Any>(pIter->Name,_xSection->getPropertyValue(pIter->Name))); + m_aValues.push_back(::std::pair< OUString ,uno::Any>(pIter->Name,_xSection->getPropertyValue(pIter->Name))); } lcl_collectElements(_xSection,m_aControls); } @@ -277,7 +277,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot } } //---------------------------------------------------------------------------- -rtl::OUString OGroupSectionUndo::GetComment() const +OUString OGroupSectionUndo::GetComment() const { if ( m_sName.isEmpty() ) { diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index ff16950ad394..9d2103a33f4a 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -161,15 +161,15 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF"); if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() ) { - ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER)); - sName += ::rtl::OUString::valueOf(_nPos); + OUString sName = String(ModuleRes(RID_STR_GROUPHEADER)); + sName += OUString::valueOf(_nPos); _xGroup->getHeader()->setName(sName); } if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() ) { - ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER)); - sName += ::rtl::OUString::valueOf(_nPos); + OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER)); + sName += OUString::valueOf(_nPos); _xGroup->getFooter()->setName(sName); } } @@ -365,7 +365,7 @@ namespace } // ------------------------------------------------------------------------- - void lcl_pushBack( uno::Sequence< beans::NamedValue >& _out_rProperties, const ::rtl::OUString& _sName, const uno::Any& _rValue ) + void lcl_pushBack( uno::Sequence< beans::NamedValue >& _out_rProperties, const OUString& _sName, const uno::Any& _rValue ) { sal_Int32 nLen( _out_rProperties.getLength() ); _out_rProperties.realloc( nLen + 1 ); @@ -445,11 +445,11 @@ namespace // create an AWT font awt::FontDescriptor aAwtFont; lcl_initAwtFont( _rOriginalControlFont, _rItemSet, aAwtFont,ITEMID_FONT,ITEMID_FONTHEIGHT,ITEMID_POSTURE, ITEMID_WEIGHT); - lcl_pushBack( _out_rProperties, ::rtl::OUString("Font"), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, OUString("Font"), uno::makeAny( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontAsian, _rItemSet, aAwtFont,ITEMID_FONT_ASIAN,ITEMID_FONTHEIGHT_ASIAN,ITEMID_POSTURE_ASIAN, ITEMID_WEIGHT_ASIAN); - lcl_pushBack( _out_rProperties, ::rtl::OUString("FontAsian"), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, OUString("FontAsian"), uno::makeAny( aAwtFont ) ); lcl_initAwtFont( _rOriginalControlFontComplex, _rItemSet, aAwtFont,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_POSTURE_COMPLEX, ITEMID_WEIGHT_COMPLEX); - lcl_pushBack( _out_rProperties, ::rtl::OUString("FontComplex"), uno::makeAny( aAwtFont ) ); + lcl_pushBack( _out_rProperties, OUString("FontComplex"), uno::makeAny( aAwtFont ) ); // properties which cannot be represented in an AWT font need to be preserved directly if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_SHADOWED,sal_True,&pItem) && pItem->ISA(SvxShadowedItem)) @@ -515,8 +515,8 @@ namespace { const SvxTwoLinesItem* pFontItem = static_cast<const SvxTwoLinesItem*>(pItem); lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEISON, uno::makeAny( pFontItem->GetValue() ) ); - lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEPREFIX, uno::makeAny( ::rtl::OUString( pFontItem->GetStartBracket() ) ) ); - lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINESUFFIX, uno::makeAny( ::rtl::OUString( pFontItem->GetEndBracket() ) ) ); + lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEPREFIX, uno::makeAny( OUString( pFontItem->GetStartBracket() ) ) ); + lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINESUFFIX, uno::makeAny( OUString( pFontItem->GetEndBracket() ) ) ); } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_COLOR,sal_True,&pItem) && pItem->ISA(SvxColorItem)) { @@ -535,7 +535,7 @@ namespace } struct Items { sal_uInt16 nWhich; - ::rtl::OUString sPropertyName; + OUString sPropertyName; }; const Items pItems[] = { {ITEMID_LANGUAGE,PROPERTY_CHARLOCALE} ,{ITEMID_LANGUAGE_ASIAN,PROPERTY_CHARLOCALEASIAN} @@ -572,9 +572,9 @@ namespace // ------------------------------------------------------------------------- void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName, const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, - void (SAL_CALL report::XReportControlFormat::*pSetter)( const ::rtl::OUString& ) ) + void (SAL_CALL report::XReportControlFormat::*pSetter)( const OUString& ) ) { - ::rtl::OUString aAttributeValue; + OUString aAttributeValue; if ( _rAttrValues.get_ensureType( _pAttributeName, aAttributeValue ) ) (_rxReportControlFormat.get()->*pSetter)( aAttributeValue ); } @@ -704,7 +704,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep 0 }; - SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(OUString("ReportCharProperties"), ITEMID_FONT,ITEMID_WEIGHT_COMPLEX, aItemInfos, pDefaults) ); // not needed for font height pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same bool bSuccess = false; @@ -787,22 +787,22 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat awt::FontDescriptor aAwtFont; if ( aSettings.get( "Font" ) >>= aAwtFont ) { - ::rtl::OUString sTemp = aAwtFont.Name; - aAwtFont.Name = ::rtl::OUString(); // hack to + OUString sTemp = aAwtFont.Name; + aAwtFont.Name = OUString(); // hack to _rxReportControlFormat->setFontDescriptor( aAwtFont ); _rxReportControlFormat->setCharFontName( sTemp ); } if ( aSettings.get( "FontAsian" ) >>= aAwtFont ) { - ::rtl::OUString sTemp = aAwtFont.Name; - aAwtFont.Name = ::rtl::OUString(); // hack to + OUString sTemp = aAwtFont.Name; + aAwtFont.Name = OUString(); // hack to _rxReportControlFormat->setFontDescriptorAsian( aAwtFont ); _rxReportControlFormat->setCharFontNameAsian( sTemp ); } if ( aSettings.get( "FontComplex" ) >>= aAwtFont ) { - ::rtl::OUString sTemp = aAwtFont.Name; - aAwtFont.Name = ::rtl::OUString(); // hack to + OUString sTemp = aAwtFont.Name; + aAwtFont.Name = OUString(); // hack to _rxReportControlFormat->setFontDescriptorComplex( aAwtFont ); _rxReportControlFormat->setCharFontNameComplex( sTemp ); } @@ -925,9 +925,9 @@ SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMark } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > getParameterNames( const uno::Reference< sdbc::XRowSet >& _rxRowSet ) +uno::Sequence< OUString > getParameterNames( const uno::Reference< sdbc::XRowSet >& _rxRowSet ) { - uno::Sequence< ::rtl::OUString > aNames; + uno::Sequence< OUString > aNames; try { @@ -939,7 +939,7 @@ uno::Sequence< ::rtl::OUString > getParameterNames( const uno::Reference< sdbc:: aNames.realloc( count ); uno::Reference< beans::XPropertySet > xParam; - ::rtl::OUString sParamName; + OUString sParamName; for ( sal_Int32 i=0; i<count; ++i ) { xParam.set( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); @@ -1003,7 +1003,7 @@ void setZoomFactor(const Fraction& _aZoom,Window& _rWindow) _rWindow.SetMapMode(aMapMode); } // ----------------------------------------------------------------------------- -bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula +bool openDialogFormula_nothrow( OUString& _in_out_rFormula , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext , const uno::Reference< awt::XWindow>& _xInspectorWindow , const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& _xRowSet @@ -1023,7 +1023,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula xServiceFactory.set(xFactory,uno::UNO_QUERY); Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow ); - uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(::rtl::OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY); + uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY); if ( xMgr.is() ) { ::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) ); @@ -1036,7 +1036,7 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula xub_StrLen nIndex = 0; if ( sFormula.GetChar(0) == '=' ) nIndex = 1; - _in_out_rFormula = ::rtl::OUString("rpt:") + sFormula.Copy(nIndex); + _in_out_rFormula = OUString("rpt:") + sFormula.Copy(nIndex); } } } diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index c0ebbdbd9e1a..6f73dadbdcd5 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -39,30 +39,30 @@ namespace rptui using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; -::rtl::OUString SAL_CALL OStatusbarController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OStatusbarController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException ) +OUString OStatusbarController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("com.sun.star.report.comp.StatusbarController"); + return OUString("com.sun.star.report.comp.StatusbarController"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.frame.StatusbarController"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.frame.StatusbarController"); return aSupported; } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL OStatusbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) +::sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) throw (RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 598d0db94ba3..f05b07f995a6 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -56,30 +56,30 @@ namespace rptui using namespace util; using namespace ui; -::rtl::OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OToolboxController::getImplementationName_Static() throw( RuntimeException ) +OUString OToolboxController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("com.sun.star.report.comp.ReportToolboxController"); + return OUString("com.sun.star.report.comp.ReportToolboxController"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.report.ReportToolboxController"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.report.ReportToolboxController"); return aSupported; } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL OToolboxController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_Static()); } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -147,48 +147,48 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments } if ( m_aCommandURL == ".uno:BasicShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BasicShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:BasicShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_BASIC,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:SymbolShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:SymbolShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:SymbolShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_SYMBOL,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:ArrowShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:ArrowShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:ArrowShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_ARROW,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:FlowChartShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FlowChartShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:FlowChartShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_FLOWCHART,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:CalloutShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CalloutShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:CalloutShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_CALLOUT,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:StarShapes" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:StarShapes"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:StarShapes"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxTbxCtlCustomShapes(m_nSlotId = SID_DRAWTBX_CS_STAR,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL == ".uno:CharFontName" ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:CharFontName"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:CharFontName"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxFontNameToolBoxControl/*SvxStyleToolBoxControl*/(m_nSlotId = SID_ATTR_CHAR_FONT,m_nToolBoxId,*pToolBox)); } else if ( m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FontColor")) || m_aCommandURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Color")) ) { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:FontColor"),sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:Color"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:FontColor"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:Color"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorExtToolBoxControl(m_nSlotId = SID_ATTR_CHAR_COLOR2,m_nToolBoxId,*pToolBox)); } else { - m_aStates.insert(TCommandState::value_type(::rtl::OUString(".uno:BackgroundColor"),sal_True)); + m_aStates.insert(TCommandState::value_type(OUString(".uno:BackgroundColor"),sal_True)); m_pToolbarController = TToolbarHelper::createFromQuery(new SvxColorToolBoxControl(m_nSlotId = SID_BACKGROUND_COLOR,m_nToolBoxId,*pToolBox)); } @@ -223,7 +223,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event if ( nId == 0 ) continue; - rtl::OUString aCmd = rTb.GetItemCommand( nId ); + OUString aCmd = rTb.GetItemCommand( nId ); if ( aCmd == Event.FeatureURL.Complete ) { // Enable/disable item @@ -237,7 +237,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event rTb.CheckItem( nId, bCheckmark ); else { - rtl::OUString aItemText; + OUString aItemText; if ( Event.State >>= aItemText ) rTb.SetItemText( nId, aItemText ); @@ -290,17 +290,17 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw return m_nSlotId == SID_DRAWTBX_CS_BASIC; } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) +OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); if ( xSub.is() ) return xSub->getSubToolbarName(); - return ::rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- -void SAL_CALL OToolboxController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) +void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index c60bd113567f..9d9ef89ea7c1 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -147,8 +147,8 @@ ODesignView::~ODesignView() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( UID_RPT_RPT_APP_VIEW ) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); + aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -158,7 +158,7 @@ ODesignView::~ODesignView() if ( m_pReportExplorer ) { SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<Window> aTemp2(m_pReportExplorer); @@ -312,13 +312,13 @@ void ODesignView::SetMode( DlgEdMode _eNewMode ) m_aScrollWindow.SetMode(_eNewMode); } //---------------------------------------------------------------------------- -void ODesignView::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_eActObj = eObj; m_aScrollWindow.SetInsertObj( eObj,_sShapeType ); } //---------------------------------------------------------------------------- -rtl::OUString ODesignView::GetInsertObjString() const +OUString ODesignView::GetInsertObjString() const { return m_aScrollWindow.GetInsertObjString(); } @@ -404,7 +404,7 @@ void ODesignView::removeSection(sal_uInt16 _nPosition) m_aScrollWindow.removeSection(_nPosition); } //---------------------------------------------------------------------------- -void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { m_aScrollWindow.addSection(_xSection,_sColorEntry,_nPosition); } @@ -510,7 +510,7 @@ void ODesignView::toggleReportExplorer() m_pReportExplorer = new ONavigator(this,rReportController); SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_NAVIGATOR) ); if ( aDlgOpt.Exists() ) - m_pReportExplorer->SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_pReportExplorer->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pReportExplorer->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } @@ -545,9 +545,9 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = new OAddFieldWindow(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, rtl::OUString( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) - m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_pAddField->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pAddField->Update(); m_pAddField->AddEventListener(LINK(&rReportController,OReportController,EventLstHdl)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::AddWindow)); @@ -601,12 +601,12 @@ void ODesignView::collapseSections(const uno::Sequence< beans::PropertyValue>& _ m_aScrollWindow.collapseSections(_aCollpasedSections); } // ----------------------------------------------------------------------------- -::rtl::OUString ODesignView::getCurrentPage() const +OUString ODesignView::getCurrentPage() const { - return m_pPropWin ? m_pPropWin->getCurrentPage() : ::rtl::OUString(); + return m_pPropWin ? m_pPropWin->getCurrentPage() : OUString(); } // ----------------------------------------------------------------------------- -void ODesignView::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +void ODesignView::setCurrentPage(const OUString& _sLastActivePage) { if ( m_pPropWin ) m_pPropWin->setCurrentPage(_sLastActivePage); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 0b54ed385a2a..bf414c564d24 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -31,7 +31,7 @@ namespace rptui { //===================================================================== DBG_NAME( rpt_OEndMarker ) -OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) +OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { DBG_CTOR( rpt_OEndMarker,NULL); diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 43ae9e24f2c9..0cbe5ffab466 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -77,7 +77,7 @@ namespace rptui // ----------------------------------------------------------------------------- void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< uno::XInterface >& _rxComponent ) { - ::rtl::OUString sDataField; + OUString sDataField; try { @@ -92,11 +92,11 @@ namespace rptui bool bSet = true; if ( aFormula.getType() == ReportFormula::Field ) { - const ::rtl::OUString sColumnName = aFormula.getFieldName(); - ::rtl::OUString sLabel = m_rReportController.getColumnLabel_throw(sColumnName); + const OUString sColumnName = aFormula.getFieldName(); + OUString sLabel = m_rReportController.getColumnLabel_throw(sColumnName); if ( !sLabel.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "=" ); aBuffer.append( sLabel ); sDataField = aBuffer.makeStringAndClear(); @@ -118,7 +118,7 @@ namespace rptui } // ----------------------------------------------------------------------------- - void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const ::rtl::OUString& _rText ) + void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText ) { OSL_ENSURE( _xVclWindowPeer.is(), "FormattedFieldBeautifier::setPlaceholderText: invalid peer!" ); if ( !_xVclWindowPeer.is() ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 360967886093..4498bed857bc 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -178,13 +178,13 @@ using namespace ::cppu; namespace { // comparing two PropertyValue instances - struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString , bool > + struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString , bool > { - bool operator() (const beans::PropertyValue& x, const ::rtl::OUString& y) const + bool operator() (const beans::PropertyValue& x, const OUString& y) const { return x.Name.equals(y); } - bool operator() (const ::rtl::OUString& x,const beans::PropertyValue& y) const + bool operator() (const OUString& x,const beans::PropertyValue& y) const { return x.equals(y.Name); } @@ -250,25 +250,25 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, _xWindow = VCLUnoHelper::GetInterface(_pView); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -::rtl::OUString OReportController::getImplementationName_Static() throw( RuntimeException ) +OUString OReportController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString("com.sun.star.report.comp.ReportDesign"); + return OUString("com.sun.star.report.comp.ReportDesign"); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) +Sequence< OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { - Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.ReportDesign"); + Sequence< OUString> aSupported(1); + aSupported.getArray()[0] = OUString("com.sun.star.sdb.ReportDesign"); return aSupported; } //------------------------------------------------------------------------- -Sequence< ::rtl::OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException) +Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } @@ -307,9 +307,9 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon m_pReportControllerObserver = new OXReportControllerObserver(*this); m_pReportControllerObserver->acquire(); - m_sMode = ::rtl::OUString("normal"); + m_sMode = OUString("normal"); DBG_CTOR( rpt_OReportController,NULL); - registerProperty(::rtl::OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); + registerProperty(OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); } // ----------------------------------------------------------------------------- @@ -334,7 +334,7 @@ void OReportController::disposing() if ( m_pGroupsFloater ) { SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_GROUPS_SORTING ) ); - aDlgOpt.SetWindowState(::rtl::OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); + aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FloatingWindow> aTemp(m_pGroupsFloater); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -424,7 +424,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_REPORTHEADERFOOTER: { aReturn.bEnabled = isEditable(); - ::rtl::OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT)); + OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT)); aReturn.sTitle = sText; } break; @@ -433,7 +433,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_PAGEHEADERFOOTER: { aReturn.bEnabled = isEditable(); - ::rtl::OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); + OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); aReturn.sTitle = sText; } break; @@ -459,7 +459,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const if ( aReturn.bEnabled ) { // TODO: add "Undo/Redo: prefix" - rtl::OUString ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const = + OUString ( SfxUndoManager::*retrieveComment )( size_t, bool const ) const = ( _nId == SID_UNDO ) ? &SfxUndoManager::GetUndoActionComment : &SfxUndoManager::GetRedoActionComment; aReturn.sTitle = (rUndoManager.*retrieveComment)( 0, ::svl::IUndoManager::TopLevel ); } @@ -586,7 +586,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = !pSectionWindow->getReportSection().isUiActive(); } { - ::rtl::OUString sText = String(ModuleRes(RID_STR_DELETE)); + OUString sText = String(ModuleRes(RID_STR_DELETE)); aReturn.sTitle = sText; } break; @@ -1355,28 +1355,28 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { URL aUrl = getURLForId(_nId); sal_Int32 nIndex = 1; - ::rtl::OUString sType = aUrl.Complete.getToken(0,'.',nIndex); + OUString sType = aUrl.Complete.getToken(0,'.',nIndex); if ( nIndex == -1 || sType.isEmpty() ) { switch(_nId) { case SID_DRAWTBX_CS_SYMBOL: - sType = ::rtl::OUString("smiley"); + sType = OUString("smiley"); break; case SID_DRAWTBX_CS_ARROW: - sType = ::rtl::OUString("left-right-arrow"); + sType = OUString("left-right-arrow"); break; case SID_DRAWTBX_CS_FLOWCHART: - sType = ::rtl::OUString("flowchart-internal-storage"); + sType = OUString("flowchart-internal-storage"); break; case SID_DRAWTBX_CS_CALLOUT: - sType = ::rtl::OUString("round-rectangular-callout"); + sType = OUString("round-rectangular-callout"); break; case SID_DRAWTBX_CS_STAR: - sType = ::rtl::OUString("star5"); + sType = OUString("star5"); break; default: - sType = ::rtl::OUString("diamond"); + sType = OUString("diamond"); } } else @@ -1661,7 +1661,7 @@ void OReportController::impl_initialize( ) const ::comphelper::NamedValueCollection& rArguments( getInitParams() ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_REPORTNAME, m_sName ); + rArguments.get_ensureType( (OUString)PROPERTY_REPORTNAME, m_sName ); if ( m_sName.isEmpty() ) rArguments.get_ensureType( "DocumentTitle", m_sName ); @@ -1680,7 +1680,7 @@ void OReportController::impl_initialize( ) UndoSuppressor aSuppressUndo( getUndoManager() ); ::comphelper::NamedValueCollection aArgs(getModel()->getArgs()); - setMode(aArgs.getOrDefault("Mode", ::rtl::OUString("normal"))); + setMode(aArgs.getOrDefault("Mode", OUString("normal"))); listen(true); setEditable( !m_aReportModel->IsReadOnly() ); @@ -1688,14 +1688,14 @@ void OReportController::impl_initialize( ) m_xFormatter->attachNumberFormatsSupplier(Reference< XNumberFormatsSupplier>(m_xReportDefinition,uno::UNO_QUERY)); ::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() ); - ::rtl::OUString sHierarchicalDocumentName; - sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("HierarchicalDocumentName"),sHierarchicalDocumentName); + OUString sHierarchicalDocumentName; + sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),sHierarchicalDocumentName); if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() ) { uno::Reference<sdbcx::XTablesSupplier> xTablesSup(getConnection(),uno::UNO_QUERY_THROW); uno::Reference<container::XNameAccess> xTables = xTablesSup->getTables(); - const uno::Sequence< ::rtl::OUString > aNames( xTables->getElementNames() ); + const uno::Sequence< OUString > aNames( xTables->getElementNames() ); if ( aNames.hasElements() ) { @@ -1740,7 +1740,7 @@ void OReportController::impl_initialize( ) if ( m_bShowProperties && m_nPageNum == -1 ) { - m_sLastActivePage = ::rtl::OUString("Data"); + m_sLastActivePage = OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); uno::Sequence< beans::PropertyValue> aArgs; executeUnChecked(SID_SELECT_REPORT,aArgs); @@ -1781,7 +1781,7 @@ void OReportController::doOpenHelpAgent() { if (getFrame().is()) { - rtl::OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); + OUString suURL("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"); openHelpAgent(suURL); } else @@ -2103,15 +2103,15 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ { if ( _xLayoutManager.is() ) { - static const ::rtl::OUString s_sMenu[] = { - ::rtl::OUString("private:resource/statusbar/statusbar") - ,::rtl::OUString("private:resource/toolbar/reportcontrols") - ,::rtl::OUString("private:resource/toolbar/drawbar") - ,::rtl::OUString("private:resource/toolbar/Formatting") - ,::rtl::OUString("private:resource/toolbar/alignmentbar") - ,::rtl::OUString("private:resource/toolbar/sectionalignmentbar") - ,::rtl::OUString("private:resource/toolbar/resizebar") - ,::rtl::OUString("private:resource/toolbar/sectionshrinkbar") + static const OUString s_sMenu[] = { + OUString("private:resource/statusbar/statusbar") + ,OUString("private:resource/toolbar/reportcontrols") + ,OUString("private:resource/toolbar/drawbar") + ,OUString("private:resource/toolbar/Formatting") + ,OUString("private:resource/toolbar/alignmentbar") + ,OUString("private:resource/toolbar/sectionalignmentbar") + ,OUString("private:resource/toolbar/resizebar") + ,OUString("private:resource/toolbar/sectionshrinkbar") }; for (size_t i = 0; i< sizeof(s_sMenu)/sizeof(s_sMenu[0]); ++i) { @@ -2308,11 +2308,11 @@ static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XG return nNonVisibleGroups; } // ----------------------------------------------------------------------------- -void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const ::rtl::OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow) +void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow) { ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn); ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader); - ::rtl::OUString sColor(DBGROUPHEADER); + OUString sColor(DBGROUPHEADER); sal_uInt16 nPosition = 0; bool bHandle = false; if ( _sPropName.equals( PROPERTY_HEADERON ) ) @@ -2405,7 +2405,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ SID_ATTR_METRIC,SID_ATTR_METRIC, 0 }; - SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(OUString("ReportPageProperties"), RPTUI_ID_LRSPACE,RPTUI_ID_METRIC, aItemInfos, pDefaults) ); pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -2539,7 +2539,7 @@ void OReportController::openSortingAndGroupingDialog() m_pGroupsFloater = new OGroupsSortingDialog(getView(),!isEditable(),this); SvtViewOptions aDlgOpt( E_WINDOW, OUString::number( RID_GROUPS_SORTING) ); if ( aDlgOpt.Exists() ) - m_pGroupsFloater->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); + m_pGroupsFloater->SetWindowState(OUStringToOString(aDlgOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US)); m_pGroupsFloater->AddEventListener(LINK(this,OReportController,EventLstHdl)); } else if ( isUiVisible() ) @@ -2715,7 +2715,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept { const FeatureState aFeatureState = GetState( nCommandIDs[i] ); - ::rtl::OUString sCommandURL( getURLForId( nCommandIDs[i] ).Main ); + OUString sCommandURL( getURLForId( nCommandIDs[i] ).Main ); OSL_ENSURE( sCommandURL.indexOfAsciiL( ".uno:", 5 ) == 0, "OReportController::getViewData: illegal command URL!" ); sCommandURL = sCommandURL.copy( 5 ); @@ -2778,9 +2778,9 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( ::comphelper::NamedValueCollection aCommandProperties( aViewData.get( "CommandProperties" ) ); - const ::std::vector< ::rtl::OUString > aCommandNames( aCommandProperties.getNames() ); + const ::std::vector< OUString > aCommandNames( aCommandProperties.getNames() ); - for ( ::std::vector< ::rtl::OUString >::const_iterator commandName = aCommandNames.begin(); + for ( ::std::vector< OUString >::const_iterator commandName = aCommandNames.begin(); commandName != aCommandNames.end(); ++commandName ) @@ -2792,10 +2792,10 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( if ( getView() ) { util::URL aCommand; - aCommand.Complete = ::rtl::OUString( ".uno:" ) + *commandName; + aCommand.Complete = OUString( ".uno:" ) + *commandName; Sequence< PropertyValue > aCommandArgs(1); - aCommandArgs[0].Name = ::rtl::OUString( "Value" ); + aCommandArgs[0].Name = OUString( "Value" ); aCommandArgs[0].Value = rCommandValue; executeUnChecked( aCommand, aCommandArgs ); @@ -2839,7 +2839,7 @@ Reference<XFrame> OReportController::getXFrame() m_xFrameLoader.set( frame::Desktop::create(m_xContext) ); } const sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | frame::FrameSearchFlag::CREATE; - const ::rtl::OUString sTarget("_blank"); + const OUString sTarget("_blank"); Reference<XFrame> xFrame = m_xFrameLoader->findFrame(sTarget,nFrameSearchFlag); return xFrame; } @@ -2883,7 +2883,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); - m_sLastActivePage = ::rtl::OUString("Data"); + m_sLastActivePage = OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); nCommand = SID_SELECT_REPORT; } @@ -3022,10 +3022,10 @@ void OReportController::insertGraphic() xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink; uno::Sequence<beans::PropertyValue> aArgs(2); aArgs[0].Name = PROPERTY_IMAGEURL; - aArgs[0].Value <<= ::rtl::OUString(aDialog.GetPath()); + aArgs[0].Value <<= OUString(aDialog.GetPath()); aArgs[1].Name = PROPERTY_PRESERVEIRI; aArgs[1].Value <<= bLink; - createControl(aArgs,xSection,::rtl::OUString(),OBJ_DLG_IMAGECONTROL); + createControl(aArgs,xSection,OUString(),OBJ_DLG_IMAGECONTROL); } } catch(const Exception&) @@ -3105,7 +3105,7 @@ void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< void OReportController::createNewFunction(const uno::Any& _aValue) { uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW); - const ::rtl::OUString sNewName = String(ModuleRes(RID_STR_FUNCTION)); + const OUString sNewName = String(ModuleRes(RID_STR_FUNCTION)); uno::Reference< report::XFunction> xFunction(report::Function::create(m_xContext)); xFunction->setName(sNewName); // the call below will also create an undo action -> listener @@ -3118,7 +3118,7 @@ IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/) return 0L; } // ----------------------------------------------------------------------------- -void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const ::rtl::OUString& _sFunction,sal_uInt16 _nObjectId) +void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId) { SequenceAsHashMap aMap(_aArgs); getDesignView()->setMarked(_xSection ,sal_True); @@ -3141,9 +3141,9 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co { pNewControl = SdrObjFactory::MakeNewObject( ReportInventor, _nObjectId, pSectionWindow->getReportSection().getPage(),m_aReportModel.get() ); xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY); - ::rtl::OUString sCustomShapeType = getDesignView()->GetInsertObjString(); + OUString sCustomShapeType = getDesignView()->GetInsertObjString(); if ( sCustomShapeType.isEmpty() ) - sCustomShapeType = ::rtl::OUString("diamond"); + sCustomShapeType = OUString("diamond"); pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl); pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width } @@ -3165,7 +3165,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co SdrUnoObj* pControl( NULL ); FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,NULL,NULL,_nObjectId,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + ,NULL,NULL,_nObjectId,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, NULL,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(), pLabel,pControl); delete pLabel; @@ -3177,7 +3177,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo(); - const ::rtl::OUString sProps[] = { PROPERTY_NAME + const OUString sProps[] = { PROPERTY_NAME ,PROPERTY_FONTDESCRIPTOR ,PROPERTY_FONTDESCRIPTORASIAN ,PROPERTY_FONTDESCRIPTORCOMPLEX @@ -3206,7 +3206,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co if ( nFormatKey && xInfo->hasPropertyByName(PROPERTY_FORMATKEY) ) xUnoProp->setPropertyValue( PROPERTY_FORMATKEY, uno::makeAny( nFormatKey ) ); - ::rtl::OUString sUrl = aMap.getUnpackedValueOrDefault(PROPERTY_IMAGEURL,::rtl::OUString()); + OUString sUrl = aMap.getUnpackedValueOrDefault(PROPERTY_IMAGEURL,OUString()); if ( !sUrl.isEmpty() && xInfo->hasPropertyByName(PROPERTY_IMAGEURL) ) xUnoProp->setPropertyValue( PROPERTY_IMAGEURL, uno::makeAny( sUrl ) ); @@ -3244,18 +3244,18 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) aMap.createItemIfMissing(PROPERTY_FORMATKEY,aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYDATE,sal_Int32(0))); uno::Reference< report::XSection> xSection = aMap.getUnpackedValueOrDefault(PROPERTY_SECTION,uno::Reference< report::XSection>()); - ::rtl::OUString sFunction; + OUString sFunction; sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); if ( bDate ) { - sFunction = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("TODAY()")); + sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TODAY()")); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); if ( bTime ) { - sFunction = ::rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())")); + sFunction = OUString (RTL_CONSTASCII_USTRINGPARAM("TIMEVALUE(NOW())")); aMap[PROPERTY_FORMATKEY] <<= aMap.getUnpackedValueOrDefault(PROPERTY_FORMATKEYTIME,sal_Int32(0)); createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } @@ -3278,14 +3278,14 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); String sFunction = String(ModuleRes(STR_RPT_PN_PAGE)); - ::rtl::OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); - sFunction.SearchAndReplace(rtl::OUString("#PAGENUMBER#"),sPageNumber); + OUString sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()")); + sFunction.SearchAndReplace(OUString("#PAGENUMBER#"),sPageNumber); if ( bStateOfPage ) { - ::rtl::OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); + OUString sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()")); sFunction += String(ModuleRes(STR_RPT_PN_PAGE_OF)); - sFunction.SearchAndReplace(rtl::OUString("#PAGECOUNT#"),sPageCount); + sFunction.SearchAndReplace(OUString("#PAGECOUNT#"),sPageCount); } sal_Bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True); @@ -3327,7 +3327,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } ::svx::ODataAccessDescriptor aDescriptor(aValue); SequenceAsHashMap aMap(aValue); - uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString("Section"),xCurrentSection); + uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(OUString("Section"),xCurrentSection); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); getDesignView()->setMarked(xSection,sal_True); @@ -3339,7 +3339,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.X = nLeftMargin; // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down - sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString("DNDAction"), sal_Int8(0)); + sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(OUString("DNDAction"), sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) @@ -3359,8 +3359,8 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) uno::Reference< lang::XComponent > xHoldAlive; if ( !xField.is() ) { - ::rtl::OUString sCommand; - ::rtl::OUString sColumnName; + OUString sCommand; + OUString sColumnName; sal_Int32 nCommandType( -1 ); OSL_VERIFY( aDescriptor[ ::svx::daCommand ] >>= sCommand ); OSL_VERIFY( aDescriptor[ ::svx::daColumnName ] >>= sColumnName ); @@ -3387,7 +3387,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) try { uno::Reference< beans::XPropertySet > xRowSetProps( getRowSet(), UNO_QUERY_THROW ); - ::rtl::OUString sRowSetCommand; + OUString sRowSetCommand; sal_Int32 nRowSetCommandType( -1 ); OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_COMMAND ) >>= sRowSetCommand ); OSL_VERIFY( xRowSetProps->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nRowSetCommandType ); @@ -3411,8 +3411,8 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) for ( sal_Int32 i=0; i<nParamCount; ++i) { uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); - ::rtl::OUString sParamName; - OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= sParamName ); + OUString sParamName; + OSL_VERIFY( xParamCol->getPropertyValue( OUString( "Name" ) ) >>= sParamName ); if ( sParamName == sColumnName ) { xField = xParamCol; @@ -3458,7 +3458,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // find this in svx FmFormView::createControlLabelPair( getDesignView() ,nLeftMargin,0 - ,xField,xNumberFormats,nOBJID,::rtl::OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, + ,xField,xNumberFormats,nOBJID,OUString(),ReportInventor,OBJ_DLG_FIXEDTEXT, pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(), pControl[0],pControl[1]); if ( pControl[0] && pControl[1] ) @@ -3468,7 +3468,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) pPgViews[1] = pSectionViews[1]->GetSdrPageView(); if ( pPgViews[0] && pPgViews[1] ) { - ::rtl::OUString sDefaultName; + OUString sDefaultName; size_t i = 0; OUnoObject* pObjs[2]; for(i = 0; i < sizeof(pControl)/sizeof(pControl[0]);++i) @@ -3480,7 +3480,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) uno::Reference<beans::XPropertySetInfo> xShapeInfo = xShapeProp->getPropertySetInfo(); uno::Reference<beans::XPropertySetInfo> xInfo = xUnoProp->getPropertySetInfo(); - const ::rtl::OUString sProps[] = { PROPERTY_FONTDESCRIPTOR + const OUString sProps[] = { PROPERTY_FONTDESCRIPTOR ,PROPERTY_FONTDESCRIPTORASIAN ,PROPERTY_FONTDESCRIPTORCOMPLEX ,PROPERTY_BORDER @@ -3493,7 +3493,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) ) { - ::rtl::OUString sName; + OUString sName; xUnoProp->getPropertyValue(PROPERTY_DATAFIELD) >>= sName; sDefaultName = sName; xUnoProp->setPropertyValue(PROPERTY_NAME,uno::makeAny(sDefaultName)); @@ -3516,7 +3516,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.Y += xShapeProp->getHeight(); aPos.X += nShapeWidth; } - ::rtl::OUString sLabel; + OUString sLabel; if ( xField->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xField->getPropertyValue(PROPERTY_LABEL) >>= sLabel; @@ -3650,12 +3650,12 @@ void OReportController::changeZOrder(sal_Int32 _nId) // ----------------------------------------------------------------------------- void OReportController::listen(const bool _bAdd) { - const ::rtl::OUString aProps [] = { PROPERTY_REPORTHEADERON,PROPERTY_REPORTFOOTERON + const OUString aProps [] = { PROPERTY_REPORTHEADERON,PROPERTY_REPORTFOOTERON ,PROPERTY_PAGEHEADERON,PROPERTY_PAGEFOOTERON ,PROPERTY_COMMAND, PROPERTY_COMMANDTYPE,PROPERTY_CAPTION }; - void (SAL_CALL XPropertySet::*pPropertyListenerAction)( const ::rtl::OUString&, const uno::Reference< XPropertyChangeListener >& ) = + void (SAL_CALL XPropertySet::*pPropertyListenerAction)( const OUString&, const uno::Reference< XPropertyChangeListener >& ) = _bAdd ? &XPropertySet::addPropertyChangeListener : &XPropertySet::removePropertyChangeListener; for (size_t i = 0; i < sizeof(aProps)/sizeof(aProps[0]); ++i) @@ -3666,8 +3666,8 @@ void OReportController::listen(const bool _bAdd) uno::Sequence< beans::Property> aSeq = m_xReportDefinition->getPropertySetInfo()->getProperties(); const beans::Property* pIter = aSeq.getConstArray(); const beans::Property* pEnd = pIter + aSeq.getLength(); - const ::rtl::OUString* pPropsBegin = &aProps[0]; - const ::rtl::OUString* pPropsEnd = pPropsBegin + (sizeof(aProps)/sizeof(aProps[0])) - 3; + const OUString* pPropsBegin = &aProps[0]; + const OUString* pPropsEnd = pPropsBegin + (sizeof(aProps)/sizeof(aProps[0])) - 3; for(;pIter != pEnd;++pIter) { if ( ::std::find(pPropsBegin,pPropsEnd,pIter->Name) == pPropsEnd ) @@ -3962,7 +3962,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert if ( xSection.is() ) { - const ::rtl::OUString sKeyModifier("KeyModifier"); + const OUString sKeyModifier("KeyModifier"); const beans::PropertyValue* pIter = _aArgs.getConstArray(); const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter,pEnd,::std::bind2nd(PropertyValueCompare(),boost::cref(sKeyModifier))); @@ -3971,7 +3971,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert { Sequence< PropertyValue > aCreateArgs; getDesignView()->unmarkAllObjects(NULL); - createControl(aCreateArgs,xSection,::rtl::OUString(),getDesignView()->GetInsertObj()); + createControl(aCreateArgs,xSection,OUString(),getDesignView()->GetInsertObj()); } } } @@ -3986,8 +3986,8 @@ void OReportController::checkChartEnabled() if ( !m_bChartEnabledAsked ) { m_bChartEnabledAsked = true; - const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); - const ::rtl::OUString sPropertyName( "UserData/Chart" ); + const OUString sConfigName( "/org.openoffice.Office.ReportDesign" ); + const OUString sPropertyName( "UserData/Chart" ); try { @@ -4007,7 +4007,7 @@ void OReportController::checkChartEnabled() // ----------------------------------------------------------------------------- // css.frame.XTitle -::rtl::OUString SAL_CALL OReportController::getTitle() +OUString SAL_CALL OReportController::getTitle() throw (uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -4047,27 +4047,27 @@ void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHa impl_zoom_nothrow(); } } -void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OReportController::setMode( const OUString& aMode ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); m_sMode = aMode; } -::rtl::OUString SAL_CALL OReportController::getMode( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OReportController::getMode( ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( getMutex() ); return m_sMode; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) { - static ::rtl::OUString s_sModes[] = { ::rtl::OUString("remote"), - ::rtl::OUString("normal") }; - return uno::Sequence< ::rtl::OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); + static OUString s_sModes[] = { OUString("remote"), + OUString("normal") }; + return uno::Sequence< OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); } -::sal_Bool SAL_CALL OReportController::supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) { - uno::Sequence< ::rtl::OUString> aModes = getSupportedModes(); - const ::rtl::OUString* pIter = aModes.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aModes.getLength(); + uno::Sequence< OUString> aModes = getSupportedModes(); + const OUString* pIter = aModes.getConstArray(); + const OUString* pEnd = pIter + aModes.getLength(); for(;pIter != pEnd;++pIter) { if ( pIter->equals(aMode ) ) @@ -4081,7 +4081,7 @@ bool OReportController::isUiVisible() const return m_sMode != "remote"; } // ----------------------------------------------------------------------------- -void OReportController::impl_fillState_nothrow(const ::rtl::OUString& _sProperty,dbaui::FeatureState& _rState) const +void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui::FeatureState& _rState) const { _rState.bEnabled = isEditable(); if ( _rState.bEnabled ) @@ -4157,7 +4157,7 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un return bRet; } // ----------------------------------------------------------------------------- -bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const ::rtl::OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) +bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) { ::std::vector< uno::Reference< uno::XInterface > > aSelection; uno::Reference< awt::XWindow> xWindow; @@ -4216,7 +4216,7 @@ void OReportController::openZoomDialog() SID_ATTR_ZOOM,SID_ATTR_ZOOM, 0 }; - SfxItemPool* pPool( new SfxItemPool(rtl::OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); + SfxItemPool* pPool( new SfxItemPool(OUString("ZoomProperties"), SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, pDefaults) ); pPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try @@ -4329,9 +4329,9 @@ uno::Reference< container::XNameAccess > OReportController::getColumns() const return m_xColumns; } // ----------------------------------------------------------------------------- -::rtl::OUString OReportController::getColumnLabel_throw(const ::rtl::OUString& i_sColumnName) const +OUString OReportController::getColumnLabel_throw(const OUString& i_sColumnName) const { - ::rtl::OUString sLabel; + OUString sLabel; uno::Reference< container::XNameAccess > xColumns = getColumns(); if ( xColumns.is() && xColumns->hasByName(i_sColumnName) ) { diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 97d78406acdc..cc9890eecb9c 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -245,9 +245,9 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u if (xSet.is()) { if (!m_pImpl->m_bReadOnly) - xSet->addPropertyChangeListener( ::rtl::OUString(), this ); + xSet->addPropertyChangeListener( OUString(), this ); else - xSet->removePropertyChangeListener( ::rtl::OUString(), this ); + xSet->removePropertyChangeListener( OUString(), this ); } } @@ -302,9 +302,9 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn if ( xProps.is() ) { if ( _bStartListening ) - xProps->addPropertyChangeListener( ::rtl::OUString(), this ); + xProps->addPropertyChangeListener( OUString(), this ); else - xProps->removePropertyChangeListener( ::rtl::OUString(), this ); + xProps->removePropertyChangeListener( OUString(), this ); } } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 13eb3a5e5454..ffcfbc20fad8 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -245,7 +245,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC // unmark all objects m_pView->UnmarkAll(); - const ::rtl::OUString sSectionName = m_xSection->getName(); + const OUString sSectionName = m_xSection->getName(); const sal_Int32 nLength = _aAllreadyCopiedObjects.getLength(); const beans::NamedValue* pIter = _aAllreadyCopiedObjects.getConstArray(); const beans::NamedValue* pEnd = pIter + nLength; @@ -450,7 +450,7 @@ void lcl_insertMenuItemImages( } else { - const ::rtl::OUString sCommand = rContextMenu.GetItemCommand(nId); + const OUString sCommand = rContextMenu.GetItemCommand(nId); rContextMenu.SetItemImage(nId,framework::GetImageFromURL(_rFrame,sCommand,sal_False)); if ( nId == SID_PAGEHEADERFOOTER ) { @@ -492,7 +492,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) if ( nId == SID_ATTR_CHAR_COLOR_BACKGROUND ) { aArgs.realloc(1); - aArgs[0].Name = ::rtl::OUString("Selection"); + aArgs[0].Name = OUString("Selection"); aArgs[0].Value <<= m_xSection; } rController.executeChecked(nId,aArgs); @@ -614,7 +614,7 @@ void OReportSection::deactivateOle() m_pFunc->deactivateOle(true); } // ----------------------------------------------------------------------------- -void OReportSection::createDefault(const ::rtl::OUString& _sType) +void OReportSection::createDefault(const OUString& _sType) { SdrObject* pObj = m_pView->GetCreateObj(); if ( !pObj ) @@ -622,17 +622,17 @@ void OReportSection::createDefault(const ::rtl::OUString& _sType) createDefault(_sType,pObj); } // ----------------------------------------------------------------------------- -void OReportSection::createDefault(const ::rtl::OUString& _sType,SdrObject* _pObj) +void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) { sal_Bool bAttributesAppliedFromGallery = sal_False; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { - std::vector< rtl::OUString > aObjList; + std::vector< OUString > aObjList; if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) ) { - std::vector< rtl::OUString >::iterator aIter = aObjList.begin(); - std::vector< rtl::OUString >::iterator aEnd = aObjList.end(); + std::vector< OUString >::iterator aIter = aObjList.begin(); + std::vector< OUString >::iterator aEnd = aObjList.end(); for (sal_uInt32 i=0 ; aIter != aEnd; ++aIter,++i) { if ( aIter->equalsIgnoreAsciiCase( _sType ) ) @@ -833,10 +833,10 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); // give also the DND Action (Shift|Ctrl) Key to really say what we want - aCurrent[nLength].Name = ::rtl::OUString("DNDAction"); + aCurrent[nLength].Name = OUString("DNDAction"); aCurrent[nLength++].Value <<= _rEvt.mnAction; - aCurrent[nLength].Name = ::rtl::OUString("Section"); + aCurrent[nLength].Name = OUString("Section"); aCurrent[nLength++].Value <<= getSection(); pIter->Value <<= aCurrent; } diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 2542c37df2a5..7b1ef7285a59 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -96,13 +96,13 @@ void OReportWindow::initialize() m_aViewsWindow.initialize(); } //---------------------------------------------------------------------------- -void OReportWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_aViewsWindow.SetInsertObj( eObj,_sShapeType); } //---------------------------------------------------------------------------- -rtl::OUString OReportWindow::GetInsertObjString() const +OUString OReportWindow::GetInsertObjString() const { return m_aViewsWindow.GetInsertObjString(); } @@ -119,7 +119,7 @@ void OReportWindow::removeSection(sal_uInt16 _nPosition) m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT); } //---------------------------------------------------------------------------- -void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { if ( !_xSection.is() ) return; diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 4698db625882..ca153c51a2f0 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -191,7 +191,7 @@ IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/ ) } //------------------------------------------------------------------------------ void OScrollWindowHelper::addSection(const uno::Reference< report::XSection >& _xSection - ,const ::rtl::OUString& _sColorEntry + ,const OUString& _sColorEntry ,sal_uInt16 _nPosition) { m_aReportWindow.addSection(_xSection,_sColorEntry,_nPosition); @@ -212,12 +212,12 @@ sal_uInt16 OScrollWindowHelper::getSectionCount() const return m_aReportWindow.getSectionCount(); } //------------------------------------------------------------------------------ -void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { m_aReportWindow.SetInsertObj(eObj,_sShapeType); } //---------------------------------------------------------------------------- -rtl::OUString OScrollWindowHelper::GetInsertObjString() const +OUString OScrollWindowHelper::GetInsertObjString() const { return m_aReportWindow.GetInsertObjString(); } diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 4030f8e02824..d6a49ed62423 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star; using namespace ::comphelper; DBG_NAME( rpt_OSectionWindow ) -OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry) +OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry) : Window( _pParent,WB_DIALOGCONTROL) ,OPropertyChangeListener(m_aMutex) ,m_pParent(_pParent) @@ -176,15 +176,15 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection.getSection() ; if ( bRet ) { - ::rtl::OUString sExpression = _xGroup->getExpression(); - ::rtl::OUString sLabel = getViewsWindow()->getView()->getReportView()->getController().getColumnLabel_throw(sExpression); + OUString sExpression = _xGroup->getExpression(); + OUString sLabel = getViewsWindow()->getView()->getReportView()->getController().getColumnLabel_throw(sExpression); if ( !sLabel.isEmpty() ) { sExpression = sLabel; } String sTitle = ModuleRes(_nResId).toString(); - sTitle.SearchAndReplace(rtl::OUString('#') ,sExpression); + sTitle.SearchAndReplace(OUString('#') ,sExpression); m_aStartMarker.setTitle(sTitle); m_aStartMarker.Invalidate(INVALIDATE_CHILDREN); } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 14bc01063820..fbb10b47f914 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -45,7 +45,7 @@ oslInterlockedCount OStartMarker::s_nImageRefCount = 0; DBG_NAME( rpt_OStartMarker ) // ----------------------------------------------------------------------------- -OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sColorEntry) +OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) ,m_aVRuler(this,WB_VERT) ,m_aText(this,WB_HYPHENATION) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 39bb7e9a8a0f..d7277b84babe 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -296,7 +296,7 @@ void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt ) } } //---------------------------------------------------------------------------- -void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const ::rtl::OUString& _sColorEntry,sal_uInt16 _nPosition) +void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition) { ::boost::shared_ptr<OSectionWindow> pSectionWindow( new OSectionWindow(this,_xSection,_sColorEntry) ); m_aSections.insert(getIteratorAtPos(_nPosition) , TSectionsMap::value_type(pSectionWindow)); @@ -343,7 +343,7 @@ sal_uInt16 OViewsWindow::getSectionCount() const return static_cast<sal_uInt16>(m_aSections.size()); } //---------------------------------------------------------------------------- -void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType ) +void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) { TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -353,7 +353,7 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeT m_sShapeType = _sShapeType; } //---------------------------------------------------------------------------- -rtl::OUString OViewsWindow::GetInsertObjString() const +OUString OViewsWindow::GetInsertObjString() const { return m_sShapeType; } @@ -1017,7 +1017,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ if ( &rView != &_rSection ) { - SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString("com.sun.star.form.component.FixedText")); + SdrObject *pNewObj = new SdrUnoObj(OUString("com.sun.star.form.component.FixedText")); if (pNewObj) { pNewObj->SetLogicRect(_aRect); diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index e70bd8e32495..48b334e9cbd5 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -41,7 +41,7 @@ sal_uInt32 OReportExchange::getDescriptorFormatId() static sal_uInt32 s_nFormat = (sal_uInt32)-1; if ((sal_uInt32)-1 == s_nFormat) { - s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\"")); + s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"report.ReportObjectsTransfer\"")); OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OReportExchange::getDescriptorFormatId: bad exchange id!"); } return s_nFormat; diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 9d7f52c31f9c..8afad4a9ada3 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -54,24 +54,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { case OBJ_DLG_FIXEDTEXT: pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT - ,::rtl::OUString("com.sun.star.form.component.FixedText") + ,OUString("com.sun.star.form.component.FixedText") ,OBJ_DLG_FIXEDTEXT); break; case OBJ_DLG_IMAGECONTROL: pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL - ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl") + ,OUString("com.sun.star.form.component.DatabaseImageControl") ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD - ,::rtl::OUString("com.sun.star.form.component.FormattedField") + ,OUString("com.sun.star.form.component.FormattedField") ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_VFIXEDLINE: case OBJ_DLG_HFIXEDLINE: { OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE - ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel") + ,OUString("com.sun.star.awt.UnoControlFixedLineModel") ,pObjFactory->nIdentifier); pObjFactory->pNewObj = pObj; if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE ) @@ -88,7 +88,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new OOle2Obj(SERVICE_REPORTDEFINITION,OBJ_DLG_SUBREPORT); break; case OBJ_OLE2: - pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2); + pObjFactory->pNewObj = new OOle2Obj(OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2); break; default: OSL_FAIL("Unknown object id"); diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 6805f5e496dc..d915dce80df1 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -182,7 +182,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) if ( m_pParent->GetMode() != RPTUI_READONLY ) { uno::Sequence<beans::PropertyValue> aArgs(1); - aArgs[0].Name = ::rtl::OUString("ShowProperties"); + aArgs[0].Name = OUString("ShowProperties"); aArgs[0].Value <<= sal_True; m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index a804d872b292..d7f4e22054dc 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -72,8 +72,8 @@ namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) { - const ::rtl::OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); - const ::rtl::OUString sPropertyName( "DirectHelp" ); + const OUString sConfigName( "/org.openoffice.Office.ReportDesign/PropertyBrowser/" ); + const OUString sPropertyName( "DirectHelp" ); ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) ); @@ -107,11 +107,11 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame")), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(OUString("com.sun.star.frame.Frame")), UNO_QUERY); if (m_xMeAsFrame.is()) { m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) ); - m_xMeAsFrame->setName(::rtl::OUString("report property browser")); // change name! + m_xMeAsFrame->setName(OUString("report property browser")); // change name! } } catch (Exception&) @@ -129,9 +129,9 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), - ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( ::rtl::OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), + ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), + ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), + ::cppu::ContextEntry_Init( OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -145,7 +145,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen m_xBrowserController = inspection::ObjectInspector::createWithModel(m_xInspectorContext, xInspectorModel); if ( !m_xBrowserController.is() ) { - const ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); + const OUString sServiceName( "com.sun.star.inspection.ObjectInspector" ); ShowServiceNotAvailableError(pParent, sServiceName, sal_True); } else @@ -199,9 +199,9 @@ PropBrw::~PropBrw() uno::Reference<container::XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) - , ::rtl::OUString( "DialogParentWindow" ) - , ::rtl::OUString( "ActiveConnection" )}; + const OUString pProps[] = { OUString( "ContextDocument" ) + , OUString( "DialogParentWindow" ) + , OUString( "ActiveConnection" )}; for (size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i) xName->removeByName(pProps[i]); } @@ -214,7 +214,7 @@ PropBrw::~PropBrw() DBG_DTOR( rpt_PropBrw,NULL); } // ----------------------------------------------------------------------------- -void PropBrw::setCurrentPage(const ::rtl::OUString& _sLastActivePage) +void PropBrw::setCurrentPage(const OUString& _sLastActivePage) { m_sLastActivePage = _sLastActivePage; } @@ -236,9 +236,9 @@ void PropBrw::implDetachController() m_xBrowserComponentWindow.clear(); } //----------------------------------------------------------------------- -::rtl::OUString PropBrw::getCurrentPage() const +OUString PropBrw::getCurrentPage() const { - ::rtl::OUString sCurrentPage; + OUString sCurrentPage; try { if ( m_xBrowserController.is() ) @@ -336,9 +336,9 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> //---------------------------------------------------------------------------- -::rtl::OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) +OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects ) { - ::rtl::OUString aName; + OUString aName; if ( !_aObjects.getLength() ) { aName = String(ModuleRes(RID_STR_BRWTITLE_NO_PROPERTIES)); @@ -348,7 +348,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES)); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); - Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString("ReportComponent")), UNO_QUERY ); + Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(OUString("ReportComponent")), UNO_QUERY ); if ( xServiceInfo.is() ) { sal_uInt16 nResId = 0; @@ -419,9 +419,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen ,const uno::Reference< uno::XInterface>& _xReportComponent) { uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString("FormComponent"),uno::makeAny(_xFormComponent)); - xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(_xReportComponent)); - xNameCont->insertByName(::rtl::OUString("RowSet") + xNameCont->insertByName(OUString("FormComponent"),uno::makeAny(_xFormComponent)); + xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(_xReportComponent)); + xNameCont->insertByName(OUString("RowSet") ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont.get(); @@ -534,7 +534,7 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(xTemp)); + xNameCont->insertByName(OUString("ReportComponent"),uno::makeAny(xTemp)); xTemp = xNameCont; implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); |