diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-27 11:36:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-27 12:59:48 +0000 |
| commit | 595b7345012ddfb2e04f70f4d03c0bd6cbd62862 (patch) | |
| tree | bd82f2659cb0cefb44adfbbb32c4c27549aec714 /unotools | |
| parent | 7045e4e15c9a41864c92899f6a58f68e13a24930 (diff) | |
drop unnecessary include
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/optionsdlg.hxx | 14 | ||||
| -rw-r--r-- | unotools/source/config/optionsdlg.cxx | 9 |
2 files changed, 12 insertions, 11 deletions
diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx index 9a0034e1a3c8..e7a38bc147c0 100644 --- a/unotools/inc/unotools/optionsdlg.hxx +++ b/unotools/inc/unotools/optionsdlg.hxx @@ -29,7 +29,7 @@ #define INCLUDED_unotools_OPTIONSDLG_HXX #include "unotools/unotoolsdllapi.h" -#include <tools/string.hxx> +#include <rtl/ustring.hxx> #include <unotools/options.hxx> class SvtOptionsDlgOptions_Impl; @@ -43,12 +43,12 @@ public: SvtOptionsDialogOptions(); virtual ~SvtOptionsDialogOptions(); - sal_Bool IsGroupHidden ( const String& _rGroup ) const; - sal_Bool IsPageHidden ( const String& _rPage, - const String& _rGroup ) const; - sal_Bool IsOptionHidden ( const String& _rOption, - const String& _rPage, - const String& _rGroup ) const; + sal_Bool IsGroupHidden ( const rtl::OUString& _rGroup ) const; + sal_Bool IsPageHidden ( const rtl::OUString& _rPage, + const rtl::OUString& _rGroup ) const; + sal_Bool IsOptionHidden ( const rtl::OUString& _rOption, + const rtl::OUString& _rPage, + const rtl::OUString& _rGroup ) const; }; #endif diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index 51295be81ec7..53e4eac8725e 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -261,22 +261,23 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions() { if ( pOptions->IsModified() ) pOptions->Commit(); - DELETEZ( pOptions ); + delete pOptions; + pOptions = NULL; } } -sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const String& _rGroup ) const +sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const rtl::OUString& _rGroup ) const { return m_pImp->IsGroupHidden( _rGroup ); } -sal_Bool SvtOptionsDialogOptions::IsPageHidden( const String& _rPage, const String& _rGroup ) const +sal_Bool SvtOptionsDialogOptions::IsPageHidden( const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const { return m_pImp->IsPageHidden( _rPage, _rGroup ); } sal_Bool SvtOptionsDialogOptions::IsOptionHidden( - const String& _rOption, const String& _rPage, const String& _rGroup ) const + const rtl::OUString& _rOption, const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const { return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup ); } |