Kaydet (Commit) 3139b8f3 authored tarafından Noel Grandin's avatar Noel Grandin

convert include/svtools/helpopt.hxx from String to OUString

and remove unused IdList typedef.

Change-Id: Ia154a8255f1a745cede24f112868c074adce0fbe
üst 018785fb
......@@ -25,8 +25,6 @@
#include <tools/string.hxx>
#include <unotools/options.hxx>
typedef std::list< sal_Int32 > IdList;
class SvtHelpOptions_Impl;
class SVT_DLLPUBLIC SvtHelpOptions: public utl::detail::Options
......@@ -42,13 +40,13 @@ public:
void SetHelpTips( sal_Bool b );
sal_Bool IsHelpTips() const;
const String& GetHelpStyleSheet()const;
void SetHelpStyleSheet(const String& rStyleSheet);
const OUString& GetHelpStyleSheet()const;
void SetHelpStyleSheet(const OUString& rStyleSheet);
void SetWelcomeScreen( sal_Bool b );
sal_Bool IsWelcomeScreen() const;
String GetSystem() const;
OUString GetSystem() const;
};
#endif
......
......@@ -49,9 +49,9 @@ class SvtHelpOptions_Impl : public utl::ConfigItem
sal_Bool bExtendedHelp;
sal_Bool bHelpTips;
sal_Bool bWelcomeScreen;
String aLocale;
String aSystem;
String sHelpStyleSheet;
OUString aLocale;
OUString aSystem;
OUString sHelpStyleSheet;
DECLARE_STL_USTRINGACCESS_MAP( sal_Int32, MapString2Int );
MapString2Int aURLIgnoreCounters;
......@@ -73,11 +73,11 @@ public:
void SetWelcomeScreen( sal_Bool b ) { bWelcomeScreen = b; SetModified(); }
sal_Bool IsWelcomeScreen() const { return bWelcomeScreen; }
String GetLocale() const { return aLocale; }
String GetSystem() const { return aSystem; }
OUString GetLocale() const { return aLocale; }
OUString GetSystem() const { return aSystem; }
const String& GetHelpStyleSheet()const{return sHelpStyleSheet;}
void SetHelpStyleSheet(const String& rStyleSheet){sHelpStyleSheet = rStyleSheet; SetModified();}
const OUString& GetHelpStyleSheet()const{return sHelpStyleSheet;}
void SetHelpStyleSheet(const OUString& rStyleSheet){sHelpStyleSheet = rStyleSheet; SetModified();}
static ::osl::Mutex & getInitMutex();
};
......@@ -316,17 +316,17 @@ sal_Bool SvtHelpOptions::IsWelcomeScreen() const
return pImp->IsWelcomeScreen();
}
String SvtHelpOptions::GetSystem() const
OUString SvtHelpOptions::GetSystem() const
{
return pImp->GetSystem();
}
const String& SvtHelpOptions::GetHelpStyleSheet()const
const OUString& SvtHelpOptions::GetHelpStyleSheet()const
{
return pImp->GetHelpStyleSheet();
}
void SvtHelpOptions::SetHelpStyleSheet(const String& rStyleSheet)
void SvtHelpOptions::SetHelpStyleSheet(const OUString& rStyleSheet)
{
pImp->SetHelpStyleSheet(rStyleSheet);
}
......
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