summaryrefslogtreecommitdiff
path: root/cui/source/factory
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /cui/source/factory
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'cui/source/factory')
-rw-r--r--cui/source/factory/dlgfact.cxx22
-rw-r--r--cui/source/factory/dlgfact.hxx10
2 files changed, 16 insertions, 16 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 52bb6df63317..041557df8f5c 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -326,7 +326,7 @@ editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversio
void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString(
const String& _rNewString,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions,
+ const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions,
bool _bOriginatesFromDocument
)
{
@@ -391,7 +391,7 @@ sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew()
return pDlg->IsCreateNew();
}
-::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( ::rtl::OUString* pGraphicMediaType )
+::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString* pGraphicMediaType )
{
return pDlg->GetIconIfIconified( pGraphicMediaType );
}
@@ -729,11 +729,11 @@ void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheck
else
pDlg->SetCheckNameHdl( Link(), bCheckImmediately );
}
-void AbstractSvxNameDialog_Impl::SetEditHelpId(const rtl::OString& aHelpId)
+void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId)
{
pDlg->SetEditHelpId( aHelpId );
}
-void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
+void AbstractSvxNameDialog_Impl::SetHelpId( const OString& aHelpId )
{
pDlg->SetHelpId( aHelpId );
}
@@ -847,7 +847,7 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle )
pDlg->SetText( rNewTitle );
}
-void AbstractSvxMultiFileDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
+void AbstractSvxMultiFileDialog_Impl::SetHelpId( const OString& aHelpId )
{
pDlg->SetHelpId( aHelpId );
}
@@ -1858,7 +1858,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI
return 0;
}
-SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand,
+SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const OUString& rCommand,
const Reference < com::sun::star::embed::XStorage >& xStor,
const SvObjectServerList* pList )
{
@@ -1872,20 +1872,20 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia
if ( pDlg )
{
- pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
+ pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new AbstractInsertObjectDialog_Impl( pDlg );
}
return 0;
}
-VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand,
+VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const OUString& rCommand,
const Reference < com::sun::star::embed::XEmbeddedObject >& xObj )
{
InsertObjectDialog_Impl* pDlg=0;
if ( rCommand == ".uno:InsertObjectFloatingFrame" )
{
pDlg = new SfxInsertFloatingFrameDialog( pParent, xObj );
- pDlg->SetHelpId( rtl::OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
+ pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
return new CuiVclAbstractDialog_Impl( pDlg );
}
return 0;
@@ -1922,12 +1922,12 @@ SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog(
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog(
- Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& /*rApplicationContext*/ )
+ Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ )
{
return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) );
}
-SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId )
+SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId )
{
return new SvxInsRowColDlg( pParent, bCol, sHelpId );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 369e487946bb..cf29bdf3cac0 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -388,9 +388,9 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog)
virtual void GetName( String& rName ) ;
virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) ;
- virtual void SetEditHelpId(const rtl::OString&) ;
+ virtual void SetEditHelpId(const OString&) ;
//from class Window
- virtual void SetHelpId( const rtl::OString& ) ;
+ virtual void SetHelpId( const OString& ) ;
virtual void SetText( const OUString& rStr ) ;
private:
Link aCheckNameHdl;
@@ -460,7 +460,7 @@ class AbstractSvxMultiFileDialog_Impl :public AbstractSvxMultiFileDialog
virtual void EnableRadioButtonMode();
virtual void SetTitle( const String& rNewTitle );
//From Class Window
- virtual void SetHelpId( const rtl::OString& ) ;
+ virtual void SetHelpId( const OString& ) ;
};
//for SvxMultiFileDialog end
@@ -777,9 +777,9 @@ public:
virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) ;
virtual VclAbstractDialog* CreateOptionsDialog(
- Window* pParent, const OUString& rExtensionId, const rtl::OUString& rApplicationContext );
+ Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext );
- virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId );
+ virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId );
virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
};