[Libreoffice-commits] .: unotools/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 22 16:46:57 PDT 2012
unotools/inc/unotools/accelcfg.hxx | 2 -
unotools/inc/unotools/atom.hxx | 14 ++++-----
unotools/inc/unotools/bootstrap.hxx | 2 -
unotools/inc/unotools/calendarwrapper.hxx | 6 +--
unotools/inc/unotools/charclass.hxx | 12 +++----
unotools/inc/unotools/cmdoptions.hxx | 2 -
unotools/inc/unotools/collatorwrapper.hxx | 6 +--
unotools/inc/unotools/compatibility.hxx | 6 +--
unotools/inc/unotools/configitem.hxx | 46 +++++++++++++++---------------
9 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 376023dc270ceee04f17ef551dda39635592f7ac
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Fri Sep 21 22:16:42 2012 -0300
rtl::OUString to OUString in unotools
Change-Id: I9d045c6947fa2acb86befdb9bf43c666f82e8858
Reviewed-on: https://gerrit.libreoffice.org/670
Reviewed-by: Olivier Hallot <olivier.hallot at alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot at alta.org.br>
diff --git a/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index 3da44d1..c60a4f0 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.hxx
@@ -29,7 +29,7 @@ struct SvtAcceleratorConfigItem
{
sal_uInt16 nCode;
sal_uInt16 nModifier;
- ::rtl::OUString aCommand;
+ OUString aCommand;
};
#include <list>
diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx
index fd784ca..5b8f193 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/unotools/inc/unotools/atom.hxx
@@ -35,20 +35,20 @@ namespace utl {
struct AtomDescription
{
int atom;
- ::rtl::OUString description;
+ OUString description;
};
class AtomProvider
{
int m_nAtoms;
- ::boost::unordered_map< int, ::rtl::OUString, ::boost::hash< int > > m_aStringMap;
- ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash > m_aAtomMap;
+ ::boost::unordered_map< int, OUString, ::boost::hash< int > > m_aStringMap;
+ ::boost::unordered_map< OUString, int, OUStringHash > m_aAtomMap;
public:
AtomProvider();
~AtomProvider();
- int getAtom( const ::rtl::OUString&, sal_Bool bCreate = sal_False );
- const ::rtl::OUString& getString( int ) const;
+ int getAtom( const OUString&, sal_Bool bCreate = sal_False );
+ const OUString& getString( int ) const;
};
@@ -59,9 +59,9 @@ namespace utl {
MultiAtomProvider();
~MultiAtomProvider();
- int getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate = sal_False );
+ int getAtom( int atomClass, const OUString& rString, sal_Bool bCreate = sal_False );
- const ::rtl::OUString& getString( int atomClass, int atom ) const;
+ const OUString& getString( int atomClass, int atom ) const;
};
}
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx
index e3f6e2f..4555390 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.hxx
@@ -47,7 +47,7 @@ namespace utl
static rtl::OUString getProductKey(rtl::OUString const& _sDefault);
/// retrieve the product source (MWS name)
- static ::rtl::OUString getProductSource(rtl::OUString const& _sDefault);
+ static rtl::OUString getProductSource(rtl::OUString const& _sDefault);
/// retrieve the BUILDID information item; uses the given default, if not found
static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault);
diff --git a/unotools/inc/unotools/calendarwrapper.hxx b/unotools/inc/unotools/calendarwrapper.hxx
index 939357b..96de48d 100644
--- a/unotools/inc/unotools/calendarwrapper.hxx
+++ b/unotools/inc/unotools/calendarwrapper.hxx
@@ -58,9 +58,9 @@ public:
// wrapper implementations of XCalendar
void loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale );
- void loadCalendar( const ::rtl::OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale );
- ::com::sun::star::uno::Sequence< ::rtl::OUString > getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const;
- ::rtl::OUString getUniqueID() const;
+ void loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale );
+ ::com::sun::star::uno::Sequence< OUString > getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const;
+ OUString getUniqueID() const;
/// set UTC date/time
void setDateTime( double nTimeInDays );
/// get UTC date/time
diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx
index 0af4abe..5538e68 100644
--- a/unotools/inc/unotools/charclass.hxx
+++ b/unotools/inc/unotools/charclass.hxx
@@ -161,19 +161,19 @@ public:
// Wrapper implementations of class CharacterClassification
- ::rtl::OUString uppercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
- ::rtl::OUString lowercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
- ::rtl::OUString titlecase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
+ OUString uppercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
+ OUString lowercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
+ OUString titlecase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const;
- ::rtl::OUString uppercase( const ::rtl::OUString& _rStr ) const
+ OUString uppercase( const OUString& _rStr ) const
{
return uppercase(_rStr, 0, _rStr.getLength());
}
- ::rtl::OUString lowercase( const ::rtl::OUString& _rStr ) const
+ OUString lowercase( const OUString& _rStr ) const
{
return lowercase(_rStr, 0, _rStr.getLength());
}
- ::rtl::OUString titlecase( const ::rtl::OUString& _rStr ) const
+ OUString titlecase( const OUString& _rStr ) const
{
return titlecase(_rStr, 0, _rStr.getLength());
}
diff --git a/unotools/inc/unotools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx
index 04ba63f..b925704 100644
--- a/unotools/inc/unotools/cmdoptions.hxx
+++ b/unotools/inc/unotools/cmdoptions.hxx
@@ -110,7 +110,7 @@ class UNOTOOLS_DLLPUBLIC SvtCommandOptions: public utl::detail::Options
@onerror -
*//*-*****************************************************************************************************/
- sal_Bool Lookup( CmdOption eOption, const ::rtl::OUString& aCommandURL ) const;
+ sal_Bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const;
/*-****************************************************************************************************//**
@short register an office frame, which must update its dispatches if
diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx
index 41c6f30..0752b65 100644
--- a/unotools/inc/unotools/collatorwrapper.hxx
+++ b/unotools/inc/unotools/collatorwrapper.hxx
@@ -49,9 +49,9 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
sal_Int32
compareString (
- const ::rtl::OUString& s1, const ::rtl::OUString& s2) const;
+ const OUString& s1, const OUString& s2) const;
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ ::com::sun::star::uno::Sequence< OUString >
listCollatorAlgorithms (
const ::com::sun::star::lang::Locale& rLocale) const;
@@ -61,7 +61,7 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
sal_Int32
loadCollatorAlgorithm (
- const ::rtl::OUString& rAlgorithm,
+ const OUString& rAlgorithm,
const ::com::sun::star::lang::Locale& rLocale, sal_Int32 nOption);
protected:
diff --git a/unotools/inc/unotools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx
index b6a5d60..a7b4aa0 100644
--- a/unotools/inc/unotools/compatibility.hxx
+++ b/unotools/inc/unotools/compatibility.hxx
@@ -137,7 +137,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
void Clear();
- void SetDefault( ::rtl::OUString sName, bool bValue );
+ void SetDefault( OUString sName, bool bValue );
/*-****************************************************************************************************//**
@short return complete specified list
@@ -168,8 +168,8 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
@onerror -
*//*-*****************************************************************************************************/
- void AppendItem( const ::rtl::OUString& sName,
- const ::rtl::OUString& sModule,
+ void AppendItem( const OUString& sName,
+ const OUString& sModule,
bool bUsePrtMetrics,
bool bAddSpacing,
bool bAddSpacingAtPages,
diff --git a/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx
index 2340e7b..19cbe1c 100644
--- a/unotools/inc/unotools/configitem.hxx
+++ b/unotools/inc/unotools/configitem.hxx
@@ -69,7 +69,7 @@ namespace utl
friend class ConfigChangeListener_Impl;
friend class ConfigManager;
- const rtl::OUString sSubTree;
+ const OUString sSubTree;
com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess>
m_xHierarchyAccess;
com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
@@ -79,7 +79,7 @@ namespace utl
ConfigItem();//
void RemoveChangesListener();
void CallNotify(
- const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+ const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
//***********************************************************************************************************************
// In special mode ALL_LOCALES we must support reading/writing of localized cfg entries as Sequence< PropertyValue >.
@@ -92,32 +92,32 @@ namespace utl
// LOCALE VALUE
// "de" "Mein Name"
// "en-US" "my name"
- void impl_packLocalizedProperties ( const com::sun::star::uno::Sequence< rtl::OUString >& lInNames ,
+ void impl_packLocalizedProperties ( const com::sun::star::uno::Sequence< OUString >& lInNames ,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lInValues ,
com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lOutValues );
- void impl_unpackLocalizedProperties ( const com::sun::star::uno::Sequence< rtl::OUString >& lInNames ,
+ void impl_unpackLocalizedProperties ( const com::sun::star::uno::Sequence< OUString >& lInNames ,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lInValues ,
- com::sun::star::uno::Sequence< rtl::OUString >& lOutNames ,
+ com::sun::star::uno::Sequence< OUString >& lOutNames ,
com::sun::star::uno::Sequence< com::sun::star::uno::Any >& lOutValues );
com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess>
GetTree();
protected:
- ConfigItem(const rtl::OUString &rSubTree,
+ ConfigItem(const OUString &rSubTree,
sal_Int16 nMode = CONFIG_MODE_DELAYED_UPDATE);
void SetModified (); // mark item as modified
void ClearModified(); // reset state after commit!
com::sun::star::uno::Sequence< com::sun::star::uno::Any>
- GetProperties(const com::sun::star::uno::Sequence< rtl::OUString >& rNames);
+ GetProperties(const com::sun::star::uno::Sequence< OUString >& rNames);
com::sun::star::uno::Sequence< sal_Bool >
- GetReadOnlyStates(const com::sun::star::uno::Sequence< rtl::OUString >& rNames);
+ GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames);
sal_Bool PutProperties(
- const com::sun::star::uno::Sequence< rtl::OUString >& rNames,
+ const com::sun::star::uno::Sequence< OUString >& rNames,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues);
/** enables notifications about changes on selected sub nodes/values
@@ -128,7 +128,7 @@ namespace utl
@see Notify
@see DisableNotification
*/
- sal_Bool EnableNotification(const com::sun::star::uno::Sequence< rtl::OUString >& rNames,
+ sal_Bool EnableNotification(const com::sun::star::uno::Sequence< OUString >& rNames,
sal_Bool bEnableInternalNotification = sal_False);
/** disables notifications about changes on sub nodes/values, which previosly had
been enabled with EnableNotification
@@ -139,22 +139,22 @@ namespace utl
sal_Bool IsInternalNotification()const {return IsInValueChange();}
//returns all members of a node in a specific format
- com::sun::star::uno::Sequence< rtl::OUString >
- GetNodeNames(const rtl::OUString& rNode);
+ com::sun::star::uno::Sequence< OUString >
+ GetNodeNames(const OUString& rNode);
//returns all members of a node in a specific format
- com::sun::star::uno::Sequence< rtl::OUString >
- GetNodeNames(const rtl::OUString& rNode, ConfigNameFormat eFormat);
+ com::sun::star::uno::Sequence< OUString >
+ GetNodeNames(const OUString& rNode, ConfigNameFormat eFormat);
// remove all members of a set
- sal_Bool ClearNodeSet(const rtl::OUString& rNode);
+ sal_Bool ClearNodeSet(const OUString& rNode);
// remove selected members of a set
- sal_Bool ClearNodeElements(const rtl::OUString& rNode,
- com::sun::star::uno::Sequence< rtl::OUString >& rElements);
+ sal_Bool ClearNodeElements(const OUString& rNode,
+ com::sun::star::uno::Sequence< OUString >& rElements);
// change or add members to a set
- sal_Bool SetSetProperties(const rtl::OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues);
+ sal_Bool SetSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues);
// remove, change or add members of a set
- sal_Bool ReplaceSetProperties(const rtl::OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues);
+ sal_Bool ReplaceSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues);
// add a new node without setting any properties
- sal_Bool AddNode(const rtl::OUString& rNode, const rtl::OUString& rNewNode);
+ sal_Bool AddNode(const OUString& rNode, const OUString& rNewNode);
/** get a name for a new element of a set node
@param _rSetNode
@@ -165,16 +165,16 @@ namespace utl
</ul>
@return <TRUE/> if a free name could be generated
*/
- sal_Bool getUniqueSetElementName( const rtl::OUString& _rSetNode, rtl::OUString& _rBaseName);
+ sal_Bool getUniqueSetElementName( const OUString& _rSetNode, OUString& _rBaseName);
public:
virtual ~ConfigItem();
/** is called from the ConfigManager before application ends of from the
PropertyChangeListener if the sub tree broadcasts changes. */
- virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames)=0;
+ virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames)=0;
- const rtl::OUString& GetSubTreeName() const {return sSubTree;}
+ const OUString& GetSubTreeName() const {return sSubTree;}
sal_Bool IsModified() const;
More information about the Libreoffice-commits
mailing list