diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 09:04:14 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 12:02:38 +0000 |
commit | 0c816004eac48a7ac5d571fdf9a46db9fc497958 (patch) | |
tree | 0d92d0d05ee8cf0db7756c9ae8cbd9e90180198d /sw/inc | |
parent | 80b0a3a7b647b3d60379344a37a5f9b15a2bbfe9 (diff) |
tidy up SwBreakIt
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/breakit.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 93186f55cbd3..5fa2bd5c3ac5 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -29,23 +29,21 @@ #ifndef _BREAKIT_HXX #define _BREAKIT_HXX -#include <tools/solar.h> -#include <i18npool/lang.h> +#include <boost/noncopyable.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/XScriptTypeDetector.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hdl> +#include <i18npool/lang.h> #include <swdllapi.h> -class String; - /************************************************************************* * class SwBreakIt *************************************************************************/ -class SW_DLLPUBLIC SwBreakIt +class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable { com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMSF; mutable com::sun::star::uno::Reference< com::sun::star::i18n::XBreakIterator > xBreak; @@ -61,11 +59,6 @@ class SW_DLLPUBLIC SwBreakIt void createBreakIterator() const; - // forbidden and not implemented. - SwBreakIt(); - SwBreakIt( const SwBreakIt &); - SwBreakIt & operator= ( const SwBreakIt &); - // private (see @ _Create, _Delete). explicit SwBreakIt( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rxMSF); @@ -100,8 +93,8 @@ public: return *m_pForbidden; } - sal_uInt16 GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const; - sal_uInt16 GetAllScriptsOfText( const String& rTxt ) const; + sal_uInt16 GetRealScriptOfText( const rtl::OUString& rTxt, sal_Int32 nPos ) const; + sal_uInt16 GetAllScriptsOfText( const rtl::OUString& rTxt ) const; sal_Int32 getGraphemeCount(const rtl::OUString& rStr) const; }; |