summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-20 11:37:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-20 12:57:34 +0000
commit55a40209072bac2526e74d5be7dd7be5ccd2c175 (patch)
tree3dd0257a893fcd6ff16ab164608b952f65041a94 /svtools
parenta92129ec175a1362e61a474cf64992f283db74b4 (diff)
remove ToDouble/ToFloat
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/filectrl.hxx6
-rw-r--r--svtools/inc/svtools/filedlg.hxx7
-rw-r--r--svtools/inc/svtools/fileview.hxx4
-rw-r--r--svtools/source/dialogs/filedlg.cxx4
4 files changed, 7 insertions, 14 deletions
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index 14dcc75e615e..e1c2b04e5cf4 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -86,7 +86,7 @@ public:
void SetText( const XubString& rStr );
XubString GetText() const;
- UniString GetSelectedText() const { return maEdit.GetSelected(); }
+ rtl::OUString GetSelectedText() const { return maEdit.GetSelected(); }
void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
Selection GetSelection() const { return maEdit.GetSelection(); }
@@ -95,10 +95,6 @@ public:
sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); }
//------
- //manipulate the Button-Text:
- XubString GetButtonText() const { return maButtonText; }
-
- //------
//use this to manipulate the dialog bevore executing it:
void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; }
const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index e774fa559f93..6fa7333fde35 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -46,17 +46,14 @@ private:
ImpSvFileDlg* pImpFileDlg; // Implementation
Link aOKHdlLink; // Link to OK-Handler
-protected:
- UniString aDfltExt; // Default - Extension
-
public:
PathDialog( Window* pParent, WinBits nWinStyle = 0, sal_Bool bCreateDir = sal_True );
~PathDialog();
virtual long OK();
- void SetPath( const UniString& rNewPath );
- UniString GetPath() const;
+ void SetPath( const rtl::OUString& rNewPath );
+ rtl::OUString GetPath() const;
void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; }
const Link& GetOKHdl() const { return aOKHdlLink; }
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index ec40c0519447..c5ec78ead9fb 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -215,9 +215,9 @@ protected:
struct SvtContentEntry
{
sal_Bool mbIsFolder;
- UniString maURL;
+ rtl::OUString maURL;
- SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) :
+ SvtContentEntry( const rtl::OUString& rURL, sal_Bool bIsFolder ) :
mbIsFolder( bIsFolder ), maURL( rURL ) {}
};
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index a985eda0ab01..fb56769f2b3e 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -49,12 +49,12 @@ short PathDialog::Execute()
return n;
}
-UniString PathDialog::GetPath() const
+rtl::OUString PathDialog::GetPath() const
{
return pImpFileDlg->GetDialog()->GetPath();
}
-void PathDialog::SetPath( const UniString& rPath )
+void PathDialog::SetPath( const rtl::OUString& rPath )
{
pImpFileDlg->GetDialog()->SetPath( rPath );
}