Skip to content

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

rtl::OUString to OUString in basctl 

Change-Id: Iaa56c5f8a15032c3102ad58011c80e3c86fe287c
üst 4874a0dc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 61 deletions
basctl/source/basicide/basides2.cxx
Dosyayı görüntüle @ bb414e9e
......@@ -126,7 +126,7 @@ void Shell::SetMDITitle()
aTitleBuf.append(IDE_RESSTR(RID_STR_SIGNED));
aTitleBuf.append(' ');
}
::rtl::OUString aTitle(aTitleBuf.makeStringAndClear());
OUString aTitle(aTitleBuf.makeStringAndClear());
SfxViewFrame* pViewFrame = GetViewFrame();
if ( pViewFrame )
......@@ -145,18 +145,18 @@ void Shell::SetMDITitle()
}
}
ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName )
{
bCreatingWindow = true;
sal_uLong nKey = 0;
ModulWindow* pWin = 0;
::rtl::OUString aLibName( rLibName );
::rtl::OUString aModName( rModName );
OUString aLibName( rLibName );
OUString aModName( rModName );
if ( aLibName.isEmpty() )
aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
aLibName = "Standard" ;
uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
......@@ -168,7 +168,7 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::
if ( !pWin )
{
::rtl::OUString aModule;
OUString aModule;
bool bSuccess = false;
if ( rDocument.hasModule( aLibName, aModName ) )
bSuccess = rDocument.getModule( aLibName, aModName, aModule );
......@@ -200,11 +200,11 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::
{
// display a nice friendly name in the ObjectModule tab,
// combining the objectname and module name, e.g. Sheet1 ( Financials )
::rtl::OUString sObjName;
OUString sObjName;
ModuleInfoHelper::getObjectName( xLib, rModName, sObjName );
if( !sObjName.isEmpty() )
{
::rtl::OUStringBuffer aModNameBuf(aModName);
OUStringBuffer aModNameBuf(aModName);
aModNameBuf.append(' ');
aModNameBuf.append('(');
aModNameBuf.append(sObjName);
......@@ -224,7 +224,7 @@ ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::
ModulWindow* Shell::FindBasWin (
ScriptDocument const& rDocument,
rtl::OUString const& rLibName, rtl::OUString const& rName,
OUString const& rLibName, OUString const& rName,
bool bCreateIfNotExist, bool bFindSuspended
)
{
......
basctl/source/basicide/basides3.cxx
Dosyayı görüntüle @ bb414e9e
......@@ -44,17 +44,17 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName )
DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName )
{
bCreatingWindow = true;
sal_uLong nKey = 0;
DialogWindow* pWin = 0;
::rtl::OUString aLibName( rLibName );
::rtl::OUString aDlgName( rDlgName );
OUString aLibName( rLibName );
OUString aDlgName( rDlgName );
if ( aLibName.isEmpty() )
aLibName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
aLibName = "Standard" ;
rDocument.getOrCreateLibrary( E_DIALOGS, aLibName );
......@@ -79,7 +79,7 @@ DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl:
// create dialog model
Reference< lang::XMultiServiceFactory > xMSF = getProcessServiceFactory();
Reference< container::XNameContainer > xDialogModel( xMSF->createInstance
( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY );
( "com.sun.star.awt.UnoControlDialogModel" ), UNO_QUERY );
Reference< XInputStream > xInput( xISP->createInputStream() );
Reference< XComponentContext > xContext(
comphelper::getComponentContext( xMSF ) );
......@@ -120,7 +120,7 @@ DialogWindow* Shell::CreateDlgWin( const ScriptDocument& rDocument, const ::rtl:
DialogWindow* Shell::FindDlgWin (
ScriptDocument const& rDocument,
rtl::OUString const& rLibName, rtl::OUString const& rName,
OUString const& rLibName, OUString const& rName,
bool bCreateIfNotExist, bool bFindSuspended
)
{
......
basctl/source/basicide/basobj3.cxx
Dosyayı görüntüle @ bb414e9e
......@@ -87,11 +87,11 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
if ( aMacroName.Len() == 0 )
{
if ( !pModule->GetMethods()->Count() )
aMacroName = String( RTL_CONSTASCII_USTRINGPARAM( "Main" ) );
aMacroName = String( "Main" );
else
{
bool bValid = false;
String aStdMacroText( RTL_CONSTASCII_USTRINGPARAM( "Macro" ) );
String aStdMacroText( "Macro" );
sal_uInt16 nMacro = 1;
while ( !bValid )
{
......@@ -104,7 +104,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
}
}
::rtl::OUString aOUSource( pModule->GetSource32() );
OUString aOUSource( pModule->GetSource32() );
// don't produce too many empty lines...
sal_Int32 nSourceLen = aOUSource.getLength();
......@@ -112,17 +112,17 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
{
const sal_Unicode* pStr = aOUSource.getStr();
if ( pStr[ nSourceLen - 1 ] != LINE_SEP )
aOUSource += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n\n" ) );
aOUSource += "\n\n" ;
else if ( pStr[ nSourceLen - 2 ] != LINE_SEP )
aOUSource += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
aOUSource += "\n" ;
else if ( pStr[ nSourceLen - 3 ] == LINE_SEP )
aOUSource = aOUSource.copy( 0, nSourceLen-1 );
}
::rtl::OUString aSubStr;
aSubStr = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Sub " ) );
OUString aSubStr;
aSubStr = "Sub " ;
aSubStr += aMacroName;
aSubStr += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\n\nEnd Sub" ) );
aSubStr += "\n\nEnd Sub" ;
aOUSource += aSubStr;
......@@ -165,9 +165,9 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
bool RenameDialog (
Window* pErrorParent,
ScriptDocument const& rDocument,
rtl::OUString const& rLibName,
rtl::OUString const& rOldName,
rtl::OUString const& rNewName
OUString const& rLibName,
OUString const& rOldName,
OUString const& rNewName
)
throw(ElementExistException, NoSuchElementException)
{
......@@ -228,7 +228,7 @@ bool RenameDialog (
//----------------------------------------------------------------------------
bool RemoveDialog( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rDlgName )
bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName )
{
if (Shell* pShell = GetShell())
{
......@@ -267,9 +267,9 @@ BasicManager* FindBasicManager( StarBASIC* pLib )
if ( !pBasicMgr )
continue;
Sequence< ::rtl::OUString > aLibNames( doc->getLibraryNames() );
Sequence< OUString > aLibNames( doc->getLibraryNames() );
sal_Int32 nLibCount = aLibNames.getLength();
const ::rtl::OUString* pLibNames = aLibNames.getConstArray();
const OUString* pLibNames = aLibNames.getConstArray();
for ( sal_Int32 i = 0 ; i < nLibCount ; i++ )
{
......@@ -431,7 +431,7 @@ long HandleBasicError( StarBASIC* pBasic )
OSL_ENSURE( aDocument.isValid(), "basctl::HandleBasicError: no document for the given BasicManager!" );
if ( aDocument.isValid() )
{
::rtl::OUString aOULibName( pBasic->GetName() );
OUString aOULibName( pBasic->GetName() );
Reference< script::XLibraryContainer > xModLibContainer( aDocument.getLibraryContainer( E_SCRIPTS ) );
if ( xModLibContainer.is() && xModLibContainer->hasByName( aOULibName ) )
{
......
basctl/source/inc/bastypes.hxx
Dosyayı görüntüle @ bb414e9e
......@@ -50,7 +50,7 @@ class DialogWindow;
#define LINE_SEP 0x0A
// Implementation: baside2b.cxx
sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex );
sal_Int32 searchEOL( const OUString& rStr, sal_Int32 fromIndex );
// Meaning of bToBeKilled:
// While being in a reschedule-loop, I may not destroy the window.
......@@ -155,8 +155,8 @@ private:
int nStatus;
ScriptDocument m_aDocument;
rtl::OUString m_aLibName;
rtl::OUString m_aName;
OUString m_aLibName;
OUString m_aName;
friend class ModulWindow;
friend class DialogWindow;
......@@ -166,7 +166,7 @@ protected:
public:
TYPEINFO();
BaseWindow( Window* pParent, const ScriptDocument& rDocument, ::rtl::OUString aLibName, ::rtl::OUString aName );
BaseWindow( Window* pParent, const ScriptDocument& rDocument, OUString aLibName, OUString aName );
virtual ~BaseWindow();
void Init();
......@@ -192,8 +192,8 @@ public:
// print page
virtual void printPage( sal_Int32 nPage, Printer* pPrinter ) = 0;
virtual ::rtl::OUString GetTitle();
::rtl::OUString CreateQualifiedName();
virtual OUString GetTitle();
OUString CreateQualifiedName();
virtual EntryDescriptor CreateEntryDescriptor() = 0;
virtual bool IsModified();
......@@ -223,16 +223,16 @@ public:
GetDocument() const { return m_aDocument; }
void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
bool IsDocument( const ScriptDocument& rDocument ) const { return rDocument == m_aDocument; }
const ::rtl::OUString& GetLibName() const { return m_aLibName; }
void SetLibName( const ::rtl::OUString& aLibName ) { m_aLibName = aLibName; }
const ::rtl::OUString& GetName() const { return m_aName; }
void SetName( const ::rtl::OUString& aName ) { m_aName = aName; }
const OUString& GetLibName() const { return m_aLibName; }
void SetLibName( const OUString& aLibName ) { m_aLibName = aLibName; }
const OUString& GetName() const { return m_aName; }
void SetName( const OUString& aName ) { m_aName = aName; }
virtual void OnNewDocument ();
virtual char const* GetHid () const = 0;
virtual ItemType GetType () const = 0;
void InsertLibInfo () const;
bool Is (ScriptDocument const&, rtl::OUString const&, rtl::OUString const&, ItemType, bool bFindSuspended);
bool Is (ScriptDocument const&, OUString const&, OUString const&, ItemType, bool bFindSuspended);
virtual bool HasActiveEditor () const;
};
......@@ -244,19 +244,19 @@ public:
LibInfos ();
~LibInfos ();
public:
void InsertInfo (ScriptDocument const&, rtl::OUString const& rLibName, rtl::OUString const& rCurrentName, ItemType eCurrentType);
void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType);
void RemoveInfoFor (ScriptDocument const&);
Item const* GetInfo (ScriptDocument const&, rtl::OUString const& rLibName);
Item const* GetInfo (ScriptDocument const&, OUString const& rLibName);
private:
class Key
{
private:
ScriptDocument m_aDocument;
::rtl::OUString m_aLibName;
OUString m_aLibName;
public:
Key (ScriptDocument const&, rtl::OUString const& rLibName);
Key (ScriptDocument const&, OUString const& rLibName);
~Key ();
public:
bool operator == (Key const&) const;
......@@ -266,24 +266,24 @@ private:
};
public:
const ScriptDocument& GetDocument() const { return m_aDocument; }
const ::rtl::OUString& GetLibName() const { return m_aLibName; }
const OUString& GetLibName() const { return m_aLibName; }
};
public:
class Item
{
private:
ScriptDocument m_aDocument;
::rtl::OUString m_aLibName;
::rtl::OUString m_aCurrentName;
OUString m_aLibName;
OUString m_aCurrentName;
ItemType m_eCurrentType;
public:
Item (ScriptDocument const&, rtl::OUString const& rLibName, rtl::OUString const& rCurrentName, ItemType eCurrentType);
Item (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType);
~Item ();
public:
const ScriptDocument& GetDocument() const { return m_aDocument; }
const ::rtl::OUString& GetLibName() const { return m_aLibName; }
const ::rtl::OUString& GetCurrentName() const { return m_aCurrentName; }
const OUString& GetLibName() const { return m_aLibName; }
const OUString& GetCurrentName() const { return m_aCurrentName; }
ItemType GetCurrentType() const { return m_eCurrentType; }
};
private:
......@@ -291,16 +291,16 @@ private:
Map m_aMap;
};
void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines = false );
::rtl::OUString CreateMgrAndLibStr( const ::rtl::OUString& rMgrName, const ::rtl::OUString& rLibName );
void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines = false );
OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName );
sal_uLong CalcLineCount( SvStream& rStream );
bool QueryReplaceMacro( const ::rtl::OUString& rName, Window* pParent = 0 );
bool QueryDelMacro( const ::rtl::OUString& rName, Window* pParent = 0 );
bool QueryDelDialog( const ::rtl::OUString& rName, Window* pParent = 0 );
bool QueryDelModule( const ::rtl::OUString& rName, Window* pParent = 0 );
bool QueryDelLib( const ::rtl::OUString& rName, bool bRef = false, Window* pParent = 0 );
bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const ::rtl::OUString& rLibName, ::rtl::OUString& rPassword, bool bRepeat = false, bool bNewTitle = false );
bool QueryReplaceMacro( const OUString& rName, Window* pParent = 0 );
bool QueryDelMacro( const OUString& rName, Window* pParent = 0 );
bool QueryDelDialog( const OUString& rName, Window* pParent = 0 );
bool QueryDelModule( const OUString& rName, Window* pParent = 0 );
bool QueryDelLib( const OUString& rName, bool bRef = false, Window* pParent = 0 );
bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false );
class ModuleInfoHelper
{
......@@ -309,8 +309,8 @@ class ModuleInfoHelper
ModuleInfoHelper (const ModuleInfoHelper&);
ModuleInfoHelper& operator = (const ModuleInfoHelper&);
public:
static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const ::rtl::OUString& rModName, ::rtl::OUString& rObjName );
static sal_Int32 getModuleType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const ::rtl::OUString& rModName );
static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName );
static sal_Int32 getModuleType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const OUString& rModName );
};
} // namespace basctl
......
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