Skip to content

C
core
Kaydet (Commit) d3e08f25 authored tarafından Ricardo Montania's avatar Ricardo Montania Kaydeden (comit) Muthu Subramanian
Dosyalara gözat
Seçenekler

More ::rtl::OUString to OUString in basctl 

Change-Id: Ie27a55e933462c644f315d0123978082054d79af
üst bb414e9e
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 42 deletions
basctl/source/basicide/bastype3.cxx
Dosyayı görüntüle @ d3e08f25
......@@ -58,7 +58,7 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
}
else if ( eType == OBJ_TYPE_LIBRARY )
{
::rtl::OUString aOULibName( aDesc.GetLibName() );
OUString aOULibName( aDesc.GetLibName() );
// check password
bool bOK = true;
......@@ -68,7 +68,7 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
Reference< script::XLibraryContainerPassword > xPasswd( xModLibContainer, UNO_QUERY );
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
{
::rtl::OUString aPassword;
OUString aPassword;
bOK = QueryPassword( xModLibContainer, aOULibName, aPassword );
}
}
......@@ -123,7 +123,7 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
|| eType == OBJ_TYPE_NORMAL_MODULES
|| eType == OBJ_TYPE_CLASS_MODULES )
{
::rtl::OUString aLibName( aDesc.GetLibName() );
OUString aLibName( aDesc.GetLibName() );
ImpCreateLibSubSubEntriesInVBAMode( pEntry, aDocument, aLibName );
}
else {
......@@ -452,9 +452,9 @@ SvLBoxEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, Librar
return 0;
}
::rtl::OUString CreateMgrAndLibStr( const ::rtl::OUString& rMgrName, const ::rtl::OUString& rLibName )
OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName )
{
::rtl::OUStringBuffer aName;
OUStringBuffer aName;
aName.append('[');
aName.append(rMgrName);
aName.append(']');
......
basctl/source/basicide/bastypes.cxx
Dosyayı görüntüle @ d3e08f25
......@@ -54,7 +54,7 @@ DBG_NAME( BaseWindow )
TYPEINIT0( BaseWindow )
TYPEINIT1( SbxItem, SfxPoolItem );
BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName )
BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName )
:Window( pParent, WinBits( WB_3DLOOK ) )
,m_aDocument( rDocument )
,m_aLibName( aLibName )
......@@ -176,14 +176,14 @@ void BaseWindow::UpdateData()
{
}
::rtl::OUString BaseWindow::GetTitle()
OUString BaseWindow::GetTitle()
{
return ::rtl::OUString();
return OUString();
}
::rtl::OUString BaseWindow::CreateQualifiedName()
OUString BaseWindow::CreateQualifiedName()
{
::rtl::OUStringBuffer aName;
OUStringBuffer aName;
if ( !m_aLibName.isEmpty() )
{
LibraryLocation eLocation = m_aDocument.getLibraryLocation( m_aLibName );
......@@ -250,7 +250,7 @@ void BaseWindow::InsertLibInfo () const
bool BaseWindow::Is (
ScriptDocument const& rDocument,
rtl::OUString const& rLibName, rtl::OUString const& rName,
OUString const& rLibName, OUString const& rName,
ItemType eType, bool bFindSuspended
)
{
......@@ -521,7 +521,7 @@ void TabBar::Command( const CommandEvent& rCEvt )
if (Shell* pShell = GetShell())
{
ScriptDocument aDocument( pShell->GetCurDocument() );
::rtl::OUString aOULibName( pShell->GetCurLibName() );
OUString aOULibName( pShell->GetCurLibName() );
Reference< script::XLibraryContainer2 > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
Reference< script::XLibraryContainer2 > xDlgLibContainer( aDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) && xModLibContainer->isLibraryReadOnly( aOULibName ) ) ||
......@@ -651,7 +651,7 @@ void TabBar::Sort()
}
}
void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines )
void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines )
{
sal_Int32 nStartPos = 0;
sal_Int32 nLine = 0;
......@@ -678,7 +678,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bo
else
nEndPos++;
::rtl::OUString aEndStr = rStr.copy( nEndPos );
OUString aEndStr = rStr.copy( nEndPos );
rStr = rStr.copy( 0, nStartPos );
rStr += aEndStr;
}
......@@ -694,7 +694,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bo
if ( n > nStartPos )
{
::rtl::OUString aEndStr = rStr.copy( n );
OUString aEndStr = rStr.copy( n );
rStr = rStr.copy( 0, nStartPos );
rStr += aEndStr;
}
......@@ -737,8 +737,8 @@ LibInfos::~LibInfos ()
void LibInfos::InsertInfo (
ScriptDocument const& rDocument,
rtl::OUString const& rLibName,
rtl::OUString const& rCurrentName,
OUString const& rLibName,
OUString const& rCurrentName,
ItemType eCurrentType
)
{
......@@ -758,14 +758,14 @@ void LibInfos::RemoveInfoFor (ScriptDocument const& rDocument)
}
LibInfos::Item const* LibInfos::GetInfo (
ScriptDocument const& rDocument, rtl::OUString const& rLibName
ScriptDocument const& rDocument, OUString const& rLibName
)
{
Map::iterator it = m_aMap.find(Key(rDocument, rLibName));
return it != m_aMap.end() ? &it->second : 0;
}
LibInfos::Key::Key (ScriptDocument const& rDocument, rtl::OUString const& rLibName) :
LibInfos::Key::Key (ScriptDocument const& rDocument, OUString const& rLibName) :
m_aDocument(rDocument), m_aLibName(rLibName)
{ }
......@@ -784,8 +784,8 @@ size_t LibInfos::Key::Hash::operator () (Key const& rKey) const
LibInfos::Item::Item (
ScriptDocument const& rDocument,
rtl::OUString const& rLibName,
rtl::OUString const& rCurrentName,
OUString const& rLibName,
OUString const& rCurrentName,
ItemType eCurrentType
) :
m_aDocument(rDocument),
......@@ -797,10 +797,10 @@ LibInfos::Item::Item (
LibInfos::Item::~Item ()
{ }
bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent )
bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent )
{
::rtl::OUString aQuery(rId.toString());
::rtl::OUStringBuffer aNameBuf( rName );
OUString aQuery(rId.toString());
OUStringBuffer aNameBuf( rName );
aNameBuf.append('\'');
aNameBuf.insert(sal_Int32(0), sal_Unicode('\''));
aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear());
......@@ -808,32 +808,32 @@ bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent )
return ( aQueryBox.Execute() == RET_YES );
}
bool QueryDelMacro( const ::rtl::OUString& rName, Window* pParent )
bool QueryDelMacro( const OUString& rName, Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent );
}
bool QueryReplaceMacro( const ::rtl::OUString& rName, Window* pParent )
bool QueryReplaceMacro( const OUString& rName, Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent );
}
bool QueryDelDialog( const ::rtl::OUString& rName, Window* pParent )
bool QueryDelDialog( const OUString& rName, Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent );
}
bool QueryDelLib( const ::rtl::OUString& rName, bool bRef, Window* pParent )
bool QueryDelLib( const OUString& rName, bool bRef, Window* pParent )
{
return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent );
}
bool QueryDelModule( const ::rtl::OUString& rName, Window* pParent )
bool QueryDelModule( const OUString& rName, Window* pParent )
{
return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent );
}
bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& rLibName, ::rtl::OUString& rPassword, bool bRepeat, bool bNewTitle )
bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat, bool bNewTitle )
{
bool bOK = false;
sal_uInt16 nRet = 0;
......@@ -847,7 +847,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
// set new title
if ( bNewTitle )
{
::rtl::OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD));
OUString aTitle(IDE_RESSTR(RID_STR_ENTERPASSWORD));
aTitle = aTitle.replaceAll("XX", rLibName);
aDlg.SetText( aTitle );
}
......@@ -864,7 +864,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer,
if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( rLibName ) && !xPasswd->isLibraryPasswordVerified( rLibName ) )
{
rPassword = aDlg.GetPassword();
// ::rtl::OUString aOUPassword( rPassword );
// OUString aOUPassword( rPassword );
bOK = xPasswd->verifyLibraryPassword( rLibName, rPassword );
if ( !bOK )
......
basctl/source/basicide/brkdlg.cxx
Dosyayı görüntüle @ d3e08f25
......@@ -38,15 +38,15 @@ namespace basctl
namespace
{
bool lcl_ParseText(rtl::OUString const &rText, size_t& rLineNr )
bool lcl_ParseText(OUString const &rText, size_t& rLineNr )
{
// aText should look like "# n" where
// n > 0 && n < std::numeric_limits< sal_uInt16 >::max().
// All spaces are ignored, so there can even be spaces within the
// number n. (Maybe it would be better to ignore all whitespace instead
// of just spaces.)
rtl::OUString aText(
rText.replaceAll(" ", rtl::OUString()));
OUString aText(
rText.replaceAll(" ", OUString()));
sal_Unicode cFirst = aText[0];
if (cFirst != '#' && !(cFirst >= '0' && cFirst <= '9'))
return false;
......@@ -82,7 +82,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList
for ( size_t i = 0, n = m_aModifiedBreakPointList.size(); i < n; ++i )
{
BreakPoint* pBrk = m_aModifiedBreakPointList.at( i );
String aEntryStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) );
String aEntryStr( "# " );
aEntryStr += String::CreateFromInt32( pBrk->nLine );
aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND );
}
......@@ -111,7 +111,7 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList
void BreakPointDialog::SetCurrentBreakPoint( BreakPoint* pBrk )
{
String aStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) );
String aStr( "# " );
aStr += String::CreateFromInt32( pBrk->nLine );
aComboBox.SetText( aStr );
UpdateFields( pBrk );
......@@ -200,7 +200,7 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
pBrk->bEnabled = aCheckBox.IsChecked();
pBrk->nStopAfter = (size_t) aNumericField.GetValue();
m_aModifiedBreakPointList.InsertSorted( pBrk );
String aEntryStr( RTL_CONSTASCII_USTRINGPARAM( "# " ) );
String aEntryStr( "# " );
aEntryStr += String::CreateFromInt32( pBrk->nLine );
aComboBox.InsertEntry( aEntryStr, COMBOBOX_APPEND );
if (SfxDispatcher* pDispatcher = GetDispatcher())
......
basctl/source/basicide/iderdll.cxx
Dosyayı görüntüle @ d3e08f25
......@@ -46,7 +46,6 @@
namespace basctl
{
using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
......@@ -71,7 +70,7 @@ public:
class DllInstance : public comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll>
{
public:
DllInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll>(::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))), ::com::sun::star::uno::UNO_QUERY_THROW), new Dll)
DllInstance() : comphelper::scoped_disposing_solar_mutex_reset_ptr<Dll>(::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.frame.Desktop")), ::com::sun::star::uno::UNO_QUERY_THROW), new Dll)
{ }
};
......@@ -137,7 +136,7 @@ Dll::Dll () :
SfxModule* pMod = Module::Get();
SfxObjectFactory& rFactory = DocShell::Factory();
rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.script.BasicIDE") );
rFactory.SetDocumentServiceName( "com.sun.star.script.BasicIDE" );
DocShell::RegisterInterface( pMod );
Shell::RegisterFactory( SVX_INTERFACE_BASIDE_VIEWSH );
......@@ -198,7 +197,7 @@ IMPL_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic )
OSL_ENSURE( aDocument.isValid(), "basctl::ExtraData::GlobalBasicBreakHdl: no document for the basic manager!" );
if ( aDocument.isValid() )
{
::rtl::OUString aOULibName( pBasic->GetName() );
OUString aOULibName( pBasic->GetName() );
Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment