[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/intlwrapper.hxx|8 +---
unotools/inc/unotools/transliterationwrapper.hxx |8 ++--
unotools/source/config/lingucfg.cxx | 13 +++---
unotools/source/config/syslocaleoptions.cxx | 44 ++-
unotools/source/i18n/intlwrapper.cxx | 16
unotools/source/i18n/localedatawrapper.cxx | 19 +++--
unotools/source/i18n/textsearch.cxx |5 +-
unotools/source/i18n/transliterationwrapper.cxx | 22 +--
8 files changed, 63 insertions(+), 72 deletions(-)
New commits:
commit 2814ecb92f9dc1f60094cfa41ab1fa6eaa03471b
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 12:29:37 2012 +0100
converted to use LanguageTag
Change-Id: I25c5d965d953146e91903cf2ff8e6b58f978ad20
diff --git a/unotools/inc/unotools/intlwrapper.hxx
b/unotools/inc/unotools/intlwrapper.hxx
index a6ec4e3..aceba1d 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -47,15 +47,13 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper
{
private:
-::com::sun::star::lang::Locale aLocale;
+LanguageTag aLanguageTag;
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSMgr;
LocaleDataWrapper* pLocaleData;
CollatorWrapper*pCollator;
CollatorWrapper*pCaseCollator;
-LanguageTypeeLanguage;
-
voidImplNewLocaleData() const;
voidImplNewCollator( sal_Bool bCaseSensitive )
const;
@@ -71,8 +69,8 @@ public:
);
~IntlWrapper();
-LanguageTypegetLanguage() const { return eLanguage; }
-const ::com::sun::star::lang::Locale getLocale() const { return
aLocale; }
+LanguageTypegetLanguage() const { return
aLanguageTag.getLanguageType(); }
+const ::com::sun::star::lang::Locale getLocale() const { return
aLanguageTag.getLocale(); }
const LocaleDataWrapper*getLocaleData() const
{
diff --git a/unotools/inc/unotools/transliterationwrapper.hxx
b/unotools/inc/unotools/transliterationwrapper.hxx
index 3a0a8de..18b7072 100644
--- a/unotools/inc/unotools/transliterationwrapper.hxx
+++ b/unotools/inc/unotools/transliterationwrapper.hxx
@@ -22,6 +22,7 @@
#define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#include tools/string.hxx
#include tools/solar.h
+#include i18npool/languagetag.hxx
#include com/sun/star/i18n/XExtendedTransliteration.hpp
namespace com { namespace sun { namespace star {
@@ -37,9 +38,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
{
::com::sun::star::uno::Reference
::com::sun::star::i18n::XExtendedTransliteration xTrans;
-::com::sun::star::lang::Locale aLocale;
+LanguageTag aLanguageTag;
sal_uInt32 nType;
-sal_uInt16 nLanguage;
mutable sal_Bool bFirstCall;
// not implemented, prevent usage
@@ -57,8 +57,8 @@ public:
~TransliterationWrapper();
// get current Locale / Language
-const ::com::sun::star::lang::Locale getLocale() const { return aLocale;}
-sal_uInt16 getLanguage() const { return nLanguage; }
+const ::com::sun::star::lang::Locale getLocale() const { return
aLanguageTag.getLocale();}
+sal_uInt16 getLanguage() const { return aLanguageTag.getLanguageType(); }
sal_uInt32 getType() const { return nType; }
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index 7407d82..7c1893b 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -29,6 +29,7 @@
#include rtl/instance.hxx
#include osl/mutex.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/debug.hxx
#include tools/string.hxx
#include unotools/lingucfg.hxx
@@ -61,7 +62,7 @@ static sal_Bool lcl_SetLocale( sal_Int16 rLanguage, const
uno::Any rVal )
lang::Locale aNew;
if (rVal = aNew) // conversion successful?
{
-sal_Int16 nNew = MsLangId::convertLocaleToLanguage( aNew );
+sal_Int16 nNew = LanguageTag( aNew ).getLanguageType( false);
if (nNew != rLanguage)
{
rLanguage = nNew;
@@ -75,7 +76,7 @@ static inline const OUString lcl_LanguageToCfgLocaleStr(
sal_Int16 nLanguage )
{
OUString aRes;
if (LANGUAGE_SYSTEM != nLanguage)
-aRes = MsLangId::convertLanguageToIsoString( nLanguage );
+aRes = LanguageTag( nLanguage ).getBcp47();
return aRes;
}
@@ -83,7 +84,7 @@ static sal_Int16 lcl_CfgAnyToLanguage( const uno::Any rVal )
{
OUString aTmp;
rVal = aTmp;
-return (aTmp.isEmpty()) ? LANGUAGE_SYSTEM :
MsLangId::convertIsoStringToLanguage( aTmp );
+return (aTmp.isEmpty()) ? LANGUAGE_SYSTEM : LanguageTag( aTmp
).getLanguageType();
}
[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/textsearch.hxx | 13 +
unotools/source/i18n/textsearch.cxx |2 +-
2 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit ac60fba3b5a506f6659f268a8b4fa8e1da600603
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Oct 18 12:19:04 2012 +0200
delegating a constructor can't work like this, fdo#55033
Change-Id: I6b057ad68054fe5806daec722b3bfe4e33bc3602
diff --git a/unotools/inc/unotools/textsearch.hxx
b/unotools/inc/unotools/textsearch.hxx
index 42a9e27..2812ee6 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -71,23 +71,12 @@ private:
long nTransliterationFlags;
public:
-SearchParam( const String rText,
+SearchParam( const rtl::OUString rText,
SearchType eSrchType = SearchParam::SRCH_NORMAL,
sal_Bool bCaseSensitive = sal_True,
sal_Bool bWordOnly = sal_False,
sal_Bool bSearchInSelection = sal_False );
-// Wrapper to use OUString as parameter
-SearchParam( const ::rtl::OUString rText,
-SearchType eSrchType = SearchParam::SRCH_NORMAL,
-sal_Bool bCaseSensitive = sal_True,
-sal_Bool bWordOnly = sal_False,
-sal_Bool bSearchInSelection = sal_False )
-{
-String rText2(rText);
-SearchParam( rText2, eSrchType, bCaseSensitive, bWordOnly,
bSearchInSelection );
-}
-
SearchParam( const SearchParam );
const String GetSrchStr() const { return sSrchStr; }
diff --git a/unotools/source/i18n/textsearch.cxx
b/unotools/source/i18n/textsearch.cxx
index e0dd061..05eecd8 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -36,7 +36,7 @@ namespace utl
{
//
-SearchParam::SearchParam( const String rText,
+SearchParam::SearchParam( const rtl::OUString rText,
SearchType eType,
sal_Bool bCaseSensitive,
sal_Bool bWrdOnly,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/inc unotools/source unusedcode.easy
unotools/inc/unotools/useroptions.hxx |8
unotools/source/config/useroptions.cxx |8
unusedcode.easy|8
3 files changed, 24 deletions(-)
New commits:
commit 053b68a0c7b75eae7d86d4465f65abc6046515ee
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Mon Oct 1 20:28:10 2012 +0200
Unused code cleanup.
Change-Id: Iad4d1f6cdd9ad03c5ccc02c57acef5b9bbb47d35
diff --git a/unotools/inc/unotools/useroptions.hxx
b/unotools/inc/unotools/useroptions.hxx
index 502fcce..a7b2267 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -78,14 +78,6 @@ public:
rtl::OUString GetFullName () const;
// set the address token
-void SetCompany(rtl::OUString const);
-void SetFirstName (rtl::OUString const);
-void SetID (rtl::OUString const);
-void SetState (rtl::OUString const);
-void SetCountry(rtl::OUString const);
-void SetPosition (rtl::OUString const);
-void SetTitle (rtl::OUString const);
-void SetFax(rtl::OUString const);
void SetCustomerNumber (rtl::OUString const);
sal_Bool IsTokenReadonly (sal_uInt16 nToken) const;
diff --git a/unotools/source/config/useroptions.cxx
b/unotools/source/config/useroptions.cxx
index a8efcd1..1da014a 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -317,14 +317,6 @@ OUString SvtUserOptions::GetCustomerNumber () const {
return GetToken(USER_OPT_C
//
// setters
//
-void SvtUserOptions::SetCompany (OUString const sToken) {
SetToken(USER_OPT_COMPANY, sToken); }
-void SvtUserOptions::SetFirstName (OUString const sToken) {
SetToken(USER_OPT_FIRSTNAME, sToken); }
-void SvtUserOptions::SetID(OUString const sToken) {
SetToken(USER_OPT_ID,sToken); }
-void SvtUserOptions::SetState (OUString const sToken) {
SetToken(USER_OPT_STATE, sToken); }
-void SvtUserOptions::SetCountry (OUString const sToken) {
SetToken(USER_OPT_COUNTRY, sToken); }
-void SvtUserOptions::SetPosition (OUString const sToken) {
SetToken(USER_OPT_POSITION, sToken); }
-void SvtUserOptions::SetTitle (OUString const sToken) {
SetToken(USER_OPT_TITLE, sToken); }
-void SvtUserOptions::SetFax (OUString const sToken) {
SetToken(USER_OPT_FAX, sToken); }
void SvtUserOptions::SetCustomerNumber (OUString const sToken) {
SetToken(USER_OPT_CUSTOMERNUMBER, sToken); }
// ---
diff --git a/unusedcode.easy b/unusedcode.easy
index a4612b7..1ac9306 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -7,14 +7,6 @@
ScVbaFormatooo::vba::excel::XRange::setNumberFormat(com::sun::star::lang::Loca
ScVbaFormatooo::vba::excel::XStyle::getAddIndent()
ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any
const)
ScVbaFormatooo::vba::excel::XStyle::setNumberFormat(com::sun::star::lang::Locale,
rtl::OUString const)
-SvtUserOptions::SetCompany(rtl::OUString const)
-SvtUserOptions::SetCountry(rtl::OUString const)
-SvtUserOptions::SetFax(rtl::OUString const)
-SvtUserOptions::SetFirstName(rtl::OUString const)
-SvtUserOptions::SetID(rtl::OUString const)
-SvtUserOptions::SetPosition(rtl::OUString const)
-SvtUserOptions::SetState(rtl::OUString const)
-SvtUserOptions::SetTitle(rtl::OUString const)
TextEngine::GetLeftMargin() const
ThumbnailView::GetItemCount() const
ThumbnailView::ImplScroll(Point const)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/inc unotools/source unusedcode.easy
unotools/inc/unotools/useroptions.hxx |6 --
unotools/source/config/useroptions.cxx |6 --
unusedcode.easy|5 -
3 files changed, 17 deletions(-)
New commits:
commit 855454e18d084b28c4d25d1faeb77d34cbd6dcae
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Sep 20 21:44:46 2012 +0200
Dump some newly unused methods
Change-Id: I3c2fd7eb1ccf445f7f389f7400784748a80aa929
diff --git a/unotools/inc/unotools/useroptions.hxx
b/unotools/inc/unotools/useroptions.hxx
index 6dc8bc6..204f035 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.hxx
@@ -74,8 +74,6 @@ public:
rtl::OUString GetFax() const;
rtl::OUString GetEmail () const;
rtl::OUString GetCustomerNumber () const;
-rtl::OUString GetFathersName() const;
-rtl::OUString GetApartment () const;
rtl::OUString GetFullName () const;
@@ -85,7 +83,6 @@ public:
void SetLastName (rtl::OUString const);
void SetID (rtl::OUString const);
void SetStreet (rtl::OUString const);
-void SetCity (rtl::OUString const);
void SetState (rtl::OUString const);
void SetZip(rtl::OUString const);
void SetCountry(rtl::OUString const);
@@ -94,10 +91,7 @@ public:
void SetTelephoneHome (rtl::OUString const);
void SetTelephoneWork (rtl::OUString const);
void SetFax(rtl::OUString const);
-void SetEmail (rtl::OUString const);
void SetCustomerNumber (rtl::OUString const);
-void SetFathersName(rtl::OUString const);
-void SetApartment (rtl::OUString const);
sal_Bool IsTokenReadonly (sal_uInt16 nToken) const;
rtl::OUString GetToken (sal_uInt16 nToken) const;
diff --git a/unotools/source/config/useroptions.cxx
b/unotools/source/config/useroptions.cxx
index 3e81f7e..2f216d7 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -311,8 +311,6 @@ OUString SvtUserOptions::GetTelephoneWork () const {
return GetToken(USER_OPT_T
OUString SvtUserOptions::GetFax() const { return
GetToken(USER_OPT_FAX); }
OUString SvtUserOptions::GetEmail () const { return
GetToken(USER_OPT_EMAIL); }
OUString SvtUserOptions::GetCustomerNumber () const { return
GetToken(USER_OPT_CUSTOMERNUMBER); }
-OUString SvtUserOptions::GetFathersName() const { return
GetToken(USER_OPT_FATHERSNAME); }
-OUString SvtUserOptions::GetApartment () const { return
GetToken(USER_OPT_APARTMENT); }
// ---
@@ -324,19 +322,15 @@ void SvtUserOptions::SetFirstName (OUString const
sToken) { SetToken(USER_OPT_F
void SvtUserOptions::SetLastName (OUString const sToken) {
SetToken(USER_OPT_LASTNAME, sToken); }
void SvtUserOptions::SetID(OUString const sToken) {
SetToken(USER_OPT_ID,sToken); }
void SvtUserOptions::SetStreet(OUString const sToken) {
SetToken(USER_OPT_STREET,sToken); }
-void SvtUserOptions::SetCity (OUString const sToken) {
SetToken(USER_OPT_CITY, sToken); }
void SvtUserOptions::SetState (OUString const sToken) {
SetToken(USER_OPT_STATE, sToken); }
void SvtUserOptions::SetZip (OUString const sToken) {
SetToken(USER_OPT_ZIP, sToken); }
void SvtUserOptions::SetCountry (OUString const sToken) {
SetToken(USER_OPT_COUNTRY, sToken); }
void SvtUserOptions::SetPosition (OUString const sToken) {
SetToken(USER_OPT_POSITION, sToken); }
void SvtUserOptions::SetTitle (OUString const sToken) {
SetToken(USER_OPT_TITLE, sToken); }
void SvtUserOptions::SetFax (OUString const sToken) {
SetToken(USER_OPT_FAX, sToken); }
-void SvtUserOptions::SetEmail (OUString const sToken) {
SetToken(USER_OPT_EMAIL, sToken); }
void SvtUserOptions::SetTelephoneHome (OUString const sToken) {
SetToken(USER_OPT_TELEPHONEHOME, sToken); }
void SvtUserOptions::SetTelephoneWork (OUString const sToken) {
SetToken(USER_OPT_TELEPHONEWORK, sToken); }
void SvtUserOptions::SetCustomerNumber (OUString const sToken) {
SetToken(USER_OPT_CUSTOMERNUMBER, sToken); }
-void SvtUserOptions::SetFathersName(OUString const sToken) {
SetToken(USER_OPT_FATHERSNAME,sToken); }
-void SvtUserOptions::SetApartment (OUString const sToken) {
SetToken(USER_OPT_APARTMENT, sToken); }
// ---
diff --git a/unusedcode.easy b/unusedcode.easy
index df2d6bd..726b0df 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -8,14 +8,9 @@
ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any cons
ScVbaFormatooo::vba::excel::XStyle::setNumberFormat(com::sun::star::lang::Locale,
rtl::OUString const)
SvtSlideSorterBarOptions::AddListenerLink(Link const)
[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/ucbhelper.hxx |7 +++
unotools/source/ucbhelper/ucbhelper.cxx | 17 -
2 files changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 27c7682e5e5859eb353443d6091143694a56bee8
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Aug 22 09:11:23 2012 +0200
fdo#46249: UCBContentHelper::GetTitle must not fail for void property
This was a regression introduced with
2af9040d38af7c7353855415dbea0134585058f3
Cleaned up utl::UCBContentHelper. GetSize exhibited the same problem and
has
also been fixed. IsYounger exhibits a similar problem, but has not been
addressed, as it is unclear what to return in case no dates can be
compared; it
is only used in one place (handling SID_EDITDOC in
SfxViewFrame::ExecReload_Impl, sfx2/source/view/viewfrm.cxx) where, it
appears,
only contents for which DateModified /does/ yield a non-void value are
relevant.
Change-Id: Iff9f5e1ed6f45eede117713d64a265b98f6862b1
diff --git a/unotools/inc/unotools/ucbhelper.hxx
b/unotools/inc/unotools/ucbhelper.hxx
index 9bf80c2..084db94 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -38,6 +38,10 @@ UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const
url);
UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const url);
+/// @param title must not be null
+/// @return true iff title has been set (i.e., if obtaining the Title
property
+/// of the given content yields a non-void value without raising a
+/// non-RuntimeException; RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC bool GetTitle(
rtl::OUString const url, rtl::OUString * title);
@@ -50,6 +54,9 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
ucbhelper::Content parent, rtl::OUString const title,
ucbhelper::Content result, bool exclusive = false);
+/// @return the value of the Size property of the given content, or zero if
+/// obtaining the property yields a void value or raises a
+/// non-RuntimeException (RuntimeExceptions are passed through)
UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const url);
UNOTOOLS_DLLPUBLIC bool IsYounger(
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx
b/unotools/source/ucbhelper/ucbhelper.cxx
index 408e51f..0709caa 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -191,11 +191,7 @@ bool utl::UCBContentHelper::GetTitle(
{
assert(title != 0);
try {
-*title = content(url).
-getPropertyValue(
-rtl::OUString(Title)).
-getrtl::OUString();
-return true;
+return content(url).getPropertyValue(rtl::OUString(Title)) =
*title;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
@@ -300,10 +296,13 @@ bool utl::UCBContentHelper::MakeFolder(
sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const url) {
try {
-return
-content(url).getPropertyValue(
-rtl::OUString(Size)).
-getsal_Int64();
+sal_Int64 n = 0;
+bool ok = (content(url).getPropertyValue(rtl::OUString(Size)) = n);
+SAL_INFO_IF(
+!ok, unotools,
+UCBContentHelper::GetSize( url
+ ): Size cannot be determined);
+return n;
} catch (css::uno::RuntimeException const ) {
throw;
} catch (css::ucb::CommandAbortedException const ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/textsearch.hxx | 34 +-
unotools/source/i18n/textsearch.cxx | 12 ++--
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit c6189b43f3103300dd03375a4bd6a5589708d8c9
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Aug 18 15:10:41 2012 -0500
WAE parameter shadow member
Change-Id: Icf41caa23ce9a548223da4613a199116641e7fe5
diff --git a/unotools/inc/unotools/textsearch.hxx
b/unotools/inc/unotools/textsearch.hxx
index be34f6f..dd34f09 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -57,9 +57,9 @@ private:
SearchType eSrchType; // search normal/regular/LevDist
-int bWordOnly : 1;// used by normal search
-int bSrchInSel : 1;// search only in the selection
-int bCaseSense : 1;//
+int m_bWordOnly : 1;// used by normal search
+int m_bSrchInSel : 1;// search only in the selection
+int m_bCaseSense : 1;//
// values for the weight Levenshtein-Distance
int bLEV_Relaxed : 1;
@@ -73,19 +73,19 @@ private:
public:
SearchParam( const String rText,
SearchType eSrchType = SearchParam::SRCH_NORMAL,
-sal_Bool bCaseSens = sal_True,
-sal_Bool bWrdOnly = sal_False,
-sal_Bool bSrchInSel = sal_False );
+sal_Bool bCaseSensitive = sal_True,
+sal_Bool bWordOnly = sal_False,
+sal_Bool bSearchInSelection = sal_False );
// Wrapper to use OUString as parameter
-SearchParam( const OUString rText,
+SearchParam( const ::rtl::OUString rText,
SearchType eSrchType = SearchParam::SRCH_NORMAL,
-sal_Bool bCaseSens = sal_True,
-sal_Bool bWrdOnly = sal_False,
-sal_Bool bSrchInSel = sal_False )
+sal_Bool bCaseSensitive = sal_True,
+sal_Bool bWordOnly = sal_False,
+sal_Bool bSearchInSelection = sal_False )
{
String rText2(rText);
-SearchParam( rText2, eSrchType, bCaseSens, bWrdOnly, bSrchInSel );
+SearchParam( rText2, eSrchType, bCaseSensitive, bWordOnly,
bSearchInSelection );
}
SearchParam( const SearchParam );
@@ -94,18 +94,18 @@ public:
const String GetReplaceStr() const { return sReplaceStr; }
SearchType GetSrchType() const { return eSrchType; }
-int IsCaseSensitive() const { return bCaseSense; }
-int IsSrchInSelection() const { return bSrchInSel; }
-int IsSrchWordOnly() const { return bWordOnly; }
+int IsCaseSensitive() const { return m_bCaseSense; }
+int IsSrchInSelection() const { return m_bSrchInSel; }
+int IsSrchWordOnly() const { return m_bWordOnly; }
void SetSrchStr( const String rStr ) { sSrchStr = rStr; }
void SetReplaceStr( const String rStr ){ sReplaceStr = rStr; }
void SetSrchType( SearchType eType ){ eSrchType = eType; }
-void SetCaseSensitive( int bFlag ) { bCaseSense = bFlag; }
-void SetSrchInSelection( int bFlag ){ bSrchInSel = bFlag; }
-void SetSrchWordOnly( int bFlag ) { bWordOnly = bFlag; }
+void SetCaseSensitive( int bFlag ) { m_bCaseSense = bFlag; }
+void SetSrchInSelection( int bFlag ){ m_bSrchInSel = bFlag; }
+void SetSrchWordOnly( int bFlag ) { m_bWordOnly = bFlag; }
int IsSrchRelaxed() const { return bLEV_Relaxed; }
int GetLEVOther() const { return nLEV_OtherX; }
diff --git a/unotools/source/i18n/textsearch.cxx
b/unotools/source/i18n/textsearch.cxx
index 0583597..13636b9 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -45,9 +45,9 @@ SearchParam::SearchParam( const String rText,
sSrchStr= rText;
eSrchType = eType;
-bWordOnly = bWrdOnly;
-bSrchInSel = bSearchInSel;
-bCaseSense = bCaseSensitive;
+m_bWordOnly = bWrdOnly;
+m_bSrchInSel = bSearchInSel;
+m_bCaseSense = bCaseSensitive;
nTransliterationFlags = 0;
@@ -64,9 +64,9 @@ SearchParam::SearchParam( const SearchParam rParam )
sReplaceStr = rParam.sReplaceStr;
eSrchType = rParam.eSrchType;
-bWordOnly = rParam.bWordOnly;
-bSrchInSel = rParam.bSrchInSel;
-bCaseSense = rParam.bCaseSense;
+m_bWordOnly = rParam.m_bWordOnly;
+m_bSrchInSel = rParam.m_bSrchInSel;
+m_bCaseSense = rParam.m_bCaseSense;
bLEV_Relaxed= rParam.bLEV_Relaxed;
nLEV_OtherX = rParam.nLEV_OtherX;
___
Libreoffice-commits mailing
[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/textsearch.hxx |6 +++---
unotools/source/i18n/textsearch.cxx |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit aa767cc26534f374c00dc35038a38f0d146f0d06
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Aug 18 22:31:19 2012 -0500
WaE parameter shadow member
Change-Id: I231e41771e81f7e6f2939468e6b2175f2bc10101
diff --git a/unotools/inc/unotools/textsearch.hxx
b/unotools/inc/unotools/textsearch.hxx
index dd34f09..42a9e27 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.hxx
@@ -55,7 +55,7 @@ private:
String sSrchStr;// the search string
String sReplaceStr; // the replace string
-SearchType eSrchType; // search normal/regular/LevDist
+SearchType m_eSrchType; // search normal/regular/LevDist
int m_bWordOnly : 1;// used by normal search
int m_bSrchInSel : 1;// search only in the selection
@@ -92,7 +92,7 @@ public:
const String GetSrchStr() const { return sSrchStr; }
const String GetReplaceStr() const { return sReplaceStr; }
-SearchType GetSrchType() const { return eSrchType; }
+SearchType GetSrchType() const { return m_eSrchType; }
int IsCaseSensitive() const { return m_bCaseSense; }
int IsSrchInSelection() const { return m_bSrchInSel; }
@@ -101,7 +101,7 @@ public:
void SetSrchStr( const String rStr ) { sSrchStr = rStr; }
void SetReplaceStr( const String rStr ){ sReplaceStr = rStr; }
-void SetSrchType( SearchType eType ){ eSrchType = eType; }
+void SetSrchType( SearchType eType ){ m_eSrchType = eType; }
void SetCaseSensitive( int bFlag ) { m_bCaseSense = bFlag; }
void SetSrchInSelection( int bFlag ){ m_bSrchInSel = bFlag; }
diff --git a/unotools/source/i18n/textsearch.cxx
b/unotools/source/i18n/textsearch.cxx
index 13636b9..f6d606c 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -43,7 +43,7 @@ SearchParam::SearchParam( const String rText,
sal_Bool bSearchInSel )
{
sSrchStr= rText;
-eSrchType = eType;
+m_eSrchType = eType;
m_bWordOnly = bWrdOnly;
m_bSrchInSel = bSearchInSel;
@@ -62,7 +62,7 @@ SearchParam::SearchParam( const SearchParam rParam )
{
sSrchStr= rParam.sSrchStr;
sReplaceStr = rParam.sReplaceStr;
-eSrchType = rParam.eSrchType;
+m_eSrchType = rParam.m_eSrchType;
m_bWordOnly = rParam.m_bWordOnly;
m_bSrchInSel = rParam.m_bSrchInSel;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
