mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XubString->OUString

Browse Source 
Change-Id: I40ff06facc304630ccedd82d2f20b3573bdc5cb4
This commit is contained in:
Caolán McNamara
2013-06-30 13:49:12 +01:00
parent d70786a761
commit 0306e253fe
12 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/vcl/btndlg.hxx
View File

@@ -84,14 +84,14 @@ public:
sal_uInt16 GetCurButtonId() const { return mnCurButtonId; } sal_uInt16 GetCurButtonId() const { return mnCurButtonId; }
void AddButton( const XubString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 ); void AddButton( const OUString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
void AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 ); void AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
void RemoveButton( sal_uInt16 nId ); void RemoveButton( sal_uInt16 nId );
void Clear(); void Clear();
sal_uInt16 GetButtonId( sal_uInt16 nButton ) const; sal_uInt16 GetButtonId( sal_uInt16 nButton ) const;
PushButton* GetPushButton( sal_uInt16 nId ) const; PushButton* GetPushButton( sal_uInt16 nId ) const;
void SetButtonText( sal_uInt16 nId, const XubString& rText ); void SetButtonText( sal_uInt16 nId, const OUString& rText );
void SetButtonHelpText( sal_uInt16 nId, const XubString& rText ); void SetButtonHelpText( sal_uInt16 nId, const OUString& rText );
void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
sal_uInt16 GetFocusButton() const { return mnFocusButtonId; } sal_uInt16 GetFocusButton() const { return mnFocusButtonId; }

6
include/vcl/svapp.hxx
View File

@@ -144,11 +144,11 @@ public:
virtual void DeInit(); virtual void DeInit();
static sal_uInt16 GetCommandLineParamCount(); static sal_uInt16 GetCommandLineParamCount();
static XubString GetCommandLineParam( sal_uInt16 nParam ); static OUString GetCommandLineParam( sal_uInt16 nParam );
static const XubString& GetAppFileName(); static OUString GetAppFileName();
virtual sal_uInt16 Exception( sal_uInt16 nError ); virtual sal_uInt16 Exception( sal_uInt16 nError );
static void Abort( const XubString& rErrorText ); static void Abort( const OUString& rErrorText );
static void Execute(); static void Execute();
static void Quit(); static void Quit();

2
svx/source/dialog/prtqry.cxx
View File

@@ -35,7 +35,7 @@ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) :
AddButton(String(SVX_RES(RID_SVXSTR_QRY_PRINT_ALL)), 2, 0); AddButton(String(SVX_RES(RID_SVXSTR_QRY_PRINT_ALL)), 2, 0);
AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
SetButtonHelpText( RET_OK, String() ); SetButtonHelpText( RET_OK, OUString() );
} }
SvxPrtQryBox::~SvxPrtQryBox() SvxPrtQryBox::~SvxPrtQryBox()

2
sw/source/ui/shells/textsh1.cxx
View File

@@ -279,7 +279,7 @@ static short lcl_AskRedlineMode(Window *pWin)
aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT ); aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT );
aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0); aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0);
aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG); aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG);
aQBox.SetButtonHelpText( RET_OK, aEmptyStr ); aQBox.SetButtonHelpText( RET_OK, OUString() );
return aQBox.Execute(); return aQBox.Execute();
} }

4
uui/source/alreadyopen.cxx
View File

@@ -42,8 +42,8 @@ AlreadyOpenQueryBox::AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, cons
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
} }
SetButtonHelpText( RET_YES, String::EmptyString() ); SetButtonHelpText( RET_YES, OUString() );
SetButtonHelpText( RET_NO, String::EmptyString() ); SetButtonHelpText( RET_NO, OUString() );
} }
AlreadyOpenQueryBox::~AlreadyOpenQueryBox() AlreadyOpenQueryBox::~AlreadyOpenQueryBox()

2
uui/source/filechanged.cxx
View File

@@ -31,7 +31,7 @@ FileChangedQueryBox::FileChangedQueryBox( Window* pParent, ResMgr* pResMgr ) :
BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON); BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
SetButtonHelpText( RET_YES, String::EmptyString() ); SetButtonHelpText( RET_YES, OUString() );
SetMessText(ResId(STR_FILECHANGED_MSG, *pResMgr).toString()); SetMessText(ResId(STR_FILECHANGED_MSG, *pResMgr).toString());
} }

4
uui/source/openlocked.cxx
View File

@@ -33,8 +33,8 @@ OpenLockedQueryBox::OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const
AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO, 0); AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO, 0);
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
SetButtonHelpText( RET_YES, String() ); SetButtonHelpText( RET_YES, OUString() );
SetButtonHelpText( RET_NO, String() ); SetButtonHelpText( RET_NO, OUString() );
#ifdef WNT #ifdef WNT
// bnc#656566 // bnc#656566

4
uui/source/trylater.cxx
View File

@@ -32,8 +32,8 @@ TryLaterQueryBox::TryLaterQueryBox( Window* pParent, ResMgr* pResMgr, const Stri
AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO, 0); AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO, 0);
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON ); AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
SetButtonHelpText( RET_YES, String::EmptyString() ); SetButtonHelpText( RET_YES, OUString() );
SetButtonHelpText( RET_NO, String::EmptyString() ); SetButtonHelpText( RET_NO, OUString() );
} }
TryLaterQueryBox::~TryLaterQueryBox() TryLaterQueryBox::~TryLaterQueryBox()

2
vcl/inc/svdata.hxx
View File

@@ -117,7 +117,7 @@ struct ImplSVAppData
VclEventListeners* mpKeyListeners; // listeners for key events only (eg, extended toolkit) VclEventListeners* mpKeyListeners; // listeners for key events only (eg, extended toolkit)
ImplAccelManager* mpAccelMgr; // Accelerator Manager ImplAccelManager* mpAccelMgr; // Accelerator Manager
XubString* mpAppName; // Application name XubString* mpAppName; // Application name
XubString* mpAppFileName; // Abs. Application FileName OUString* mpAppFileName; // Abs. Application FileName
OUString* mpDisplayName; // Application Display Name OUString* mpDisplayName; // Application Display Name
String* mpFontPath; // Additional Fontpath String* mpFontPath; // Additional Fontpath
Help* mpHelp; // Application help Help* mpHelp; // Application help

21
vcl/source/app/svapp.cxx
View File

@@ -287,7 +287,7 @@ sal_uInt16 Application::GetCommandLineParamCount()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
XubString Application::GetCommandLineParam( sal_uInt16 nParam ) OUString Application::GetCommandLineParam( sal_uInt16 nParam )
{ {
OUString aParam; OUString aParam;
osl_getCommandArg( nParam, &aParam.pData ); osl_getCommandArg( nParam, &aParam.pData );
@@ -296,7 +296,7 @@ XubString Application::GetCommandLineParam( sal_uInt16 nParam )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
const XubString& Application::GetAppFileName() OUString Application::GetAppFileName()
{ {
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
DBG_ASSERT( pSVData->maAppData.mpAppFileName, "AppFileName should be set to something after SVMain!" ); DBG_ASSERT( pSVData->maAppData.mpAppFileName, "AppFileName should be set to something after SVMain!" );
@@ -304,20 +304,15 @@ const XubString& Application::GetAppFileName()
return *pSVData->maAppData.mpAppFileName; return *pSVData->maAppData.mpAppFileName;
/* /*
* #91147# provide a fallback for people without initialized * provide a fallback for people without initialized vcl here (like setup
* vcl here (like setup in responsefile mode) * in responsefile mode)
*/ */
static String aAppFileName; OUString aAppFileName;
if( !aAppFileName.Len() )
{
OUString aExeFileName; OUString aExeFileName;
osl_getExecutableFile(&aExeFileName.pData); osl_getExecutableFile(&aExeFileName.pData);
// convert path to native file format // convert path to native file format
OUString aNativeFileName; osl::FileBase::getSystemPathFromFileURL(aExeFileName, aAppFileName);
osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
aAppFileName = aNativeFileName;
}
return aAppFileName; return aAppFileName;
} }
@@ -358,7 +353,7 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
void Application::Abort( const XubString& rErrorText ) void Application::Abort( const OUString& rErrorText )
{ {
//HACK: Dump core iff --norestore command line argument is given (assuming //HACK: Dump core iff --norestore command line argument is given (assuming
// this process is run by developers who are interested in cores, vs. end // this process is run by developers who are interested in cores, vs. end
@@ -366,7 +361,7 @@ void Application::Abort( const XubString& rErrorText )
bool dumpCore = false; bool dumpCore = false;
sal_uInt16 n = GetCommandLineParamCount(); sal_uInt16 n = GetCommandLineParamCount();
for (sal_uInt16 i = 0; i != n; ++i) { for (sal_uInt16 i = 0; i != n; ++i) {
if (GetCommandLineParam(i).EqualsAscii("--norestore")) { if (GetCommandLineParam(i).equals("--norestore")) {
dumpCore = true; dumpCore = true;
break; break;
} }

2
vcl/source/app/svmain.cxx
View File

@@ -289,7 +289,7 @@ bool InitVCL()
// convert path to native file format // convert path to native file format
OUString aNativeFileName; OUString aNativeFileName;
osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName ); osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
pSVData->maAppData.mpAppFileName = new String( aNativeFileName ); pSVData->maAppData.mpAppFileName = new OUString( aNativeFileName );
// Initialize global data // Initialize global data
pSVData->maGDIData.mpScreenFontList = new ImplDevFontList; pSVData->maGDIData.mpScreenFontList = new ImplDevFontList;

8
vcl/source/window/btndlg.cxx
View File

@@ -262,7 +262,7 @@ void ButtonDialog::Click()
maClickHdl.Call( this ); maClickHdl.Call( this );
} }
void ButtonDialog::AddButton( const XubString& rText, sal_uInt16 nId, void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
sal_uInt16 nBtnFlags, long nSepPixel ) sal_uInt16 nBtnFlags, long nSepPixel )
{ {
// PageItem anlegen // PageItem anlegen
@@ -272,7 +272,7 @@ void ButtonDialog::AddButton( const XubString& rText, sal_uInt16 nId,
pItem->mnSepSize = nSepPixel; pItem->mnSepSize = nSepPixel;
pItem->mpPushButton = ImplCreatePushButton( nBtnFlags ); pItem->mpPushButton = ImplCreatePushButton( nBtnFlags );
if ( rText.Len() ) if (!rText.isEmpty())
pItem->mpPushButton->SetText( rText ); pItem->mpPushButton->SetText( rText );
maItemList.push_back(pItem); maItemList.push_back(pItem);
@@ -370,7 +370,7 @@ PushButton* ButtonDialog::GetPushButton( sal_uInt16 nId ) const
return NULL; return NULL;
} }
void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText ) void ButtonDialog::SetButtonText( sal_uInt16 nId, const OUString& rText )
{ {
ImplBtnDlgItem* pItem = ImplGetItem( nId ); ImplBtnDlgItem* pItem = ImplGetItem( nId );
@@ -381,7 +381,7 @@ void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText )
} }
} }
void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const XubString& rText ) void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const OUString& rText )
{ {
ImplBtnDlgItem* pItem = ImplGetItem( nId ); ImplBtnDlgItem* pItem = ImplGetItem( nId );