[Libreoffice-commits] core.git: editeng/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk include/editeng sw/source

[Julien Nabet]

 editeng/source/misc/svxacorr.cxx |   24 ++--
 extras/CustomTarget_autocorr.mk  |2 +-
 extras/Package_autocorr.mk   |2 +-
 include/editeng/svxacorr.hxx |3 ++-
 sw/source/core/edit/acorrect.cxx |2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit 82f291d2f7630938ce6ca740f904cab07d1ff90d
Author: Julien Nabet 
Date:   Wed Jun 18 21:08:03 2014 +0200

Resolves fdo#79276 Add fallback system for autocorrection of French variants

1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no 
specific for variants of fr
2) Add a fallback system to use it

Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50
Reviewed-on: https://gerrit.libreoffice.org/9825
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8291492..7e2cc7e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1544,7 +1544,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, bool b
 {
 OSL_ENSURE(pLangTable->find(rLanguageTag) == pLangTable->end(), "Language 
already exists ");
 
-OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false ));
+OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, 
false ));
 OUString sShareDirFile( sUserDirFile );
 
 SvxAutoCorrectLanguageListsPtr pLists = 0;
@@ -1567,10 +1567,15 @@ bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, bool b
 aLastFileTable.erase(nFndPos);
 }
 }
-else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
-FStatHelper::IsDocument( sShareDirFile =
-  GetAutoCorrFileName( rLanguageTag, false, false 
) ) ) ||
-( sShareDirFile = sUserDirFile, bNewFile ))
+else if(
+ ( FStatHelper::IsDocument( sUserDirFile ) ||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, false ) ) 
||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, true) )
+ ) ||
+( sShareDirFile = sUserDirFile, bNewFile )
+  )
 {
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
 LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const 
reference
@@ -1886,9 +1891,16 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType 
eLang,
 }
 
 OUString SvxAutoCorrect::GetAutoCorrFileName( const LanguageTag& rLanguageTag,
-bool bNewFile, bool bTst ) const
+bool bNewFile, bool bTst, bool 
bUnlocalized ) const
 {
 OUString sRet, sExt( rLanguageTag.getBcp47() );
+if (bUnlocalized)
+{
+// we don't want variant, so we'll take "fr" instead of "fr-CA" for 
example
+::std::vector< OUString > vecFallBackStrings = 
rLanguageTag.getFallbackStrings(false);
+if (!vecFallBackStrings.empty())
+   sExt = vecFallBackStrings[0];
+}
 
 sExt = "_" + sExt + ".dat";
 if( bNewFile )
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index db2577f..d119e9e 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -23,7 +23,7 @@ extras_AUTOCORR_LANGS := \
es:es-ES \
fa:fa-IR \
fi:fi-FI \
-   fr:fr-FR \
+   fr:fr \
ga-IE:ga-IE \
hr:hr-HR \
hu:hu-HU \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index 54db294..a93544d 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -23,7 +23,7 @@ $(eval $(call 
gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_es-ES.dat \
acor_fa-IR.dat \
acor_fi-FI.dat \
-   acor_fr-FR.dat \
+   acor_fr.dat \
acor_ga-IE.dat \
acor_hr-HR.dat \
acor_hu-HU.dat \
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4529a5..f2d06655 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -329,7 +329,8 @@ public:
 // the default is "autocorr.dat"
 OUString GetAutoCorrFileName( const LanguageTag& rLanguageTag /* = 
LANGUAGE_SYSTEM */ ,
 bool bNewFile = false,
-bool bTstUserExist = false ) const;
+bool bTstUserExist = false,
+bool bUnlocalized = false ) const;
 
 // Query/Set the current settings of AutoCorrect
 long GetFlags() const   { return nFlags; }
diff --git a/sw/source/core/edit/

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - editeng/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk include/editeng sw/source

[Julien Nabet]

 editeng/source/misc/svxacorr.cxx |   24 ++--
 extras/CustomTarget_autocorr.mk  |2 +-
 extras/Package_autocorr.mk   |2 +-
 include/editeng/svxacorr.hxx |3 ++-
 sw/source/core/edit/acorrect.cxx |2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)

New commits:
commit a5f36fd02ad88af4bab74a074e676cf239e15d14
Author: Julien Nabet 
Date:   Wed Jun 18 21:08:03 2014 +0200

Resolves fdo#79276 Add fallback system for autocorrection of French variants

1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no 
specific for variants of fr
2) Add a fallback system to use it

Cherry-picked from 82f291d2f7630938ce6ca740f904cab07d1ff90d
Reviewed-on: https://gerrit.libreoffice.org/9825
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50
Reviewed-on: https://gerrit.libreoffice.org/10063
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c9d2834..8b1a3ee 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1544,7 +1544,7 @@ bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, bool b
 {
 OSL_ENSURE(pLangTable->find(rLanguageTag) == pLangTable->end(), "Language 
already exists ");
 
-OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false ));
+OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, 
false ));
 OUString sShareDirFile( sUserDirFile );
 
 SvxAutoCorrectLanguageListsPtr pLists = 0;
@@ -1567,10 +1567,15 @@ bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, bool b
 aLastFileTable.erase(nFndPos);
 }
 }
-else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
-FStatHelper::IsDocument( sShareDirFile =
-  GetAutoCorrFileName( rLanguageTag, false, false 
) ) ) ||
-( sShareDirFile = sUserDirFile, bNewFile ))
+else if(
+ ( FStatHelper::IsDocument( sUserDirFile ) ||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, false ) ) 
||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, true) )
+ ) ||
+( sShareDirFile = sUserDirFile, bNewFile )
+  )
 {
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
 LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const 
reference
@@ -1886,9 +1891,16 @@ bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType 
eLang,
 }
 
 OUString SvxAutoCorrect::GetAutoCorrFileName( const LanguageTag& rLanguageTag,
-bool bNewFile, bool bTst ) const
+bool bNewFile, bool bTst, bool 
bUnlocalized ) const
 {
 OUString sRet, sExt( rLanguageTag.getBcp47() );
+if (bUnlocalized)
+{
+// we don't want variant, so we'll take "fr" instead of "fr-CA" for 
example
+::std::vector< OUString > vecFallBackStrings = 
rLanguageTag.getFallbackStrings(false);
+if (!vecFallBackStrings.empty())
+   sExt = vecFallBackStrings[0];
+}
 
 sExt = "_" + sExt + ".dat";
 if( bNewFile )
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 66d32f6..ddafa02 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -23,7 +23,7 @@ extras_AUTOCORR_LANGS := \
es:es-ES \
fa:fa-IR \
fi:fi-FI \
-   fr:fr-FR \
+   fr:fr \
ga-IE:ga-IE \
hr:hr-HR \
hu:hu-HU \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index e42e3d1..8c71a60 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -23,7 +23,7 @@ $(eval $(call 
gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_es-ES.dat \
acor_fa-IR.dat \
acor_fi-FI.dat \
-   acor_fr-FR.dat \
+   acor_fr.dat \
acor_ga-IE.dat \
acor_hr-HR.dat \
acor_hu-HU.dat \
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4529a5..f2d06655 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -329,7 +329,8 @@ public:
 // the default is "autocorr.dat"
 OUString GetAutoCorrFileName( const LanguageTag& rLanguageTag /* = 
LANGUAGE_SYSTEM */ ,
 bool bNewFile = false,
-bool bTstUserExist = false ) const;
+bool bTstUserExist = false,
+bool b

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - editeng/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk include/editeng sw/source

[Julien Nabet]

 editeng/source/misc/svxacorr.cxx |   24 ++--
 extras/CustomTarget_autocorr.mk  |2 +-
 extras/Package_autocorr.mk   |2 +-
 include/editeng/svxacorr.hxx |5 +++--
 sw/source/core/edit/acorrect.cxx |2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)

New commits:
commit 1f407caeb3f6e2605973458a545547ed82e7da1c
Author: Julien Nabet 
Date:   Wed Jun 18 21:08:03 2014 +0200

Resolves fdo#79276 Add fallback system for autocorrection of French variants

1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no 
specific for variants of fr
2) Add a fallback system to use it

Reviewed-on: https://gerrit.libreoffice.org/9825
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

Conflicts:
editeng/source/misc/svxacorr.cxx
include/editeng/svxacorr.hxx
sw/source/core/edit/acorrect.cxx

Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50
Reviewed-on: https://gerrit.libreoffice.org/10065
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f0501f3..12413ee 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1560,7 +1560,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, sa
 {
 OSL_ENSURE(pLangTable->find(rLanguageTag) == pLangTable->end(), "Language 
already exists ");
 
-OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, sal_True, 
sal_False ));
+OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, 
false ));
 OUString sShareDirFile( sUserDirFile );
 
 SvxAutoCorrectLanguageListsPtr pLists = 0;
@@ -1583,10 +1583,15 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, sa
 aLastFileTable.erase(nFndPos);
 }
 }
-else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
-FStatHelper::IsDocument( sShareDirFile =
-  GetAutoCorrFileName( rLanguageTag, sal_False, 
sal_False ) ) ) ||
-( sShareDirFile = sUserDirFile, bNewFile ))
+else if(
+ ( FStatHelper::IsDocument( sUserDirFile ) ||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, false ) ) 
||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, true) )
+ ) ||
+( sShareDirFile = sUserDirFile, bNewFile )
+  )
 {
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
 LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const 
reference
@@ -1902,9 +1907,16 @@ sal_Bool 
SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
 }
 
 OUString SvxAutoCorrect::GetAutoCorrFileName( const LanguageTag& rLanguageTag,
-sal_Bool bNewFile, sal_Bool bTst ) 
const
+bool bNewFile, bool bTst, bool 
bUnlocalized ) const
 {
 OUString sRet, sExt( rLanguageTag.getBcp47() );
+if (bUnlocalized)
+{
+// we don't want variant, so we'll take "fr" instead of "fr-CA" for 
example
+::std::vector< OUString > vecFallBackStrings = 
rLanguageTag.getFallbackStrings(false);
+if (!vecFallBackStrings.empty())
+   sExt = vecFallBackStrings[0];
+}
 
 sExt = "_" + sExt + ".dat";
 if( bNewFile )
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 66d32f6..ddafa02 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -23,7 +23,7 @@ extras_AUTOCORR_LANGS := \
es:es-ES \
fa:fa-IR \
fi:fi-FI \
-   fr:fr-FR \
+   fr:fr \
ga-IE:ga-IE \
hr:hr-HR \
hu:hu-HU \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index e42e3d1..8c71a60 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -23,7 +23,7 @@ $(eval $(call 
gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_es-ES.dat \
acor_fa-IR.dat \
acor_fi-FI.dat \
-   acor_fr-FR.dat \
+   acor_fr.dat \
acor_ga-IE.dat \
acor_hr-HR.dat \
acor_hu-HU.dat \
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 82b76ce..0f99d2d 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -329,8 +329,9 @@ public:
 // Query/Set the name of the AutoCorrect file
 // the default is "autocorr.dat"
 OUString GetAutoCorrFileName( const LanguageTag& rLanguageTag /* = 
LANGUAGE_SYSTEM */ ,
-sal

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 6 commits - connectivity/source editeng/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk include/editeng sc/source s

[Julien Nabet]

 connectivity/source/parse/sqlbison.y   |3 ++-
 editeng/source/misc/svxacorr.cxx   |   24 ++--
 extras/CustomTarget_autocorr.mk|2 +-
 extras/Package_autocorr.mk |2 +-
 include/editeng/svxacorr.hxx   |5 +++--
 sc/source/core/data/column2.cxx|8 ++--
 sw/qa/extras/rtfimport/data/fdo73241.rtf   |8 
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 ++
 sw/qa/extras/ww8import/ww8import.cxx   |2 +-
 sw/source/core/edit/acorrect.cxx   |2 +-
 writerfilter/source/resourcemodel/Fraction.cxx |6 --
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 
 12 files changed, 55 insertions(+), 17 deletions(-)

New commits:
commit 50172a3b64df11cb14bc56de23889c8ee60cdfa5
Author: Julien Nabet 
Date:   Wed Jun 18 21:08:03 2014 +0200

Resolves fdo#79276 Add fallback system for autocorrection of French variants

1) Replace the creation of acor_fr-FR.dat by acor_fr.dat since there's no 
specific for variants of fr
2) Add a fallback system to use it

Reviewed-on: https://gerrit.libreoffice.org/9825
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

Conflicts:
editeng/source/misc/svxacorr.cxx
include/editeng/svxacorr.hxx
sw/source/core/edit/acorrect.cxx

Change-Id: Ia3e11fff0f266839dc148077b50c1b2f798d1c50
Reviewed-on: https://gerrit.libreoffice.org/10065
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f0501f3..12413ee 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1560,7 +1560,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, sa
 {
 OSL_ENSURE(pLangTable->find(rLanguageTag) == pLangTable->end(), "Language 
already exists ");
 
-OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, sal_True, 
sal_False ));
+OUString sUserDirFile( GetAutoCorrFileName( rLanguageTag, true, false, 
false ));
 OUString sShareDirFile( sUserDirFile );
 
 SvxAutoCorrectLanguageListsPtr pLists = 0;
@@ -1583,10 +1583,15 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( const 
LanguageTag& rLanguageTag, sa
 aLastFileTable.erase(nFndPos);
 }
 }
-else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
-FStatHelper::IsDocument( sShareDirFile =
-  GetAutoCorrFileName( rLanguageTag, sal_False, 
sal_False ) ) ) ||
-( sShareDirFile = sUserDirFile, bNewFile ))
+else if(
+ ( FStatHelper::IsDocument( sUserDirFile ) ||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, false ) ) 
||
+   FStatHelper::IsDocument( sShareDirFile =
+   GetAutoCorrFileName( rLanguageTag, false, false, true) )
+ ) ||
+( sShareDirFile = sUserDirFile, bNewFile )
+  )
 {
 pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
 LanguageTag aTmp(rLanguageTag); // this insert() needs a non-const 
reference
@@ -1902,9 +1907,16 @@ sal_Bool 
SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
 }
 
 OUString SvxAutoCorrect::GetAutoCorrFileName( const LanguageTag& rLanguageTag,
-sal_Bool bNewFile, sal_Bool bTst ) 
const
+bool bNewFile, bool bTst, bool 
bUnlocalized ) const
 {
 OUString sRet, sExt( rLanguageTag.getBcp47() );
+if (bUnlocalized)
+{
+// we don't want variant, so we'll take "fr" instead of "fr-CA" for 
example
+::std::vector< OUString > vecFallBackStrings = 
rLanguageTag.getFallbackStrings(false);
+if (!vecFallBackStrings.empty())
+   sExt = vecFallBackStrings[0];
+}
 
 sExt = "_" + sExt + ".dat";
 if( bNewFile )
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 66d32f6..ddafa02 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -23,7 +23,7 @@ extras_AUTOCORR_LANGS := \
es:es-ES \
fa:fa-IR \
fi:fi-FI \
-   fr:fr-FR \
+   fr:fr \
ga-IE:ga-IE \
hr:hr-HR \
hu:hu-HU \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index e42e3d1..8c71a60 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -23,7 +23,7 @@ $(eval $(call 
gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
acor_es-ES.dat \
acor_fa-IR.dat \
acor_fi-FI.dat \
-   acor_fr-FR.dat \
+   acor_fr.dat \
acor_ga-IE.dat \
acor_hr-HR.d

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dbaccess/source

[Julien Nabet]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f72d77e627468b08bce23bf4a5d97cb2ac931afe
Author: Julien Nabet 
Date:   Mon Jun 30 23:27:34 2014 +0200

Resolves fdo#43277  Send Legacy Report "E-Mail as ..."=>error message

Cherry-picked from 501ebd0f7c867c4df5ba84fd8b6b1a197aeeea92

Change-Id: Iaaadd4fd3015214c007a86d1a83f837aa0d2bdb6
Reviewed-on: https://gerrit.libreoffice.org/9998
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 941443a..7f7d19f 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -928,7 +928,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& 
_rOpenArgument, cons
 if ( m_bForm )
 xModule->setIdentifier( "com.sun.star.sdb.FormDesign" );
 else if ( !xReportDefinition.is() )
-xModule->setIdentifier( "com.sun.star.sdb.TextReportDesign" );
+xModule->setIdentifier( "com.sun.star.text.TextDocument" );
 
 updateDocumentTitle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/tbsdy/clipping'

[Julien Nabet]

New branch 'private/tbsdy/clipping' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/cpool/ZPoolCollection.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit abede5a4fd8edf37786a20b38a7fa765c48995d1
Author: Julien Nabet 
Date:   Sat Jul 19 19:13:09 2014 +0200

Typo: generel->general

Change-Id: Ib967981eb2b8ee6610a983b38f2f2617e873f17d

diff --git a/connectivity/source/cpool/ZPoolCollection.hxx 
b/connectivity/source/cpool/ZPoolCollection.hxx
index 2242941..c4f2226 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -73,7 +73,7 @@ namespace connectivity
 ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext >m_xContext;
 ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDriverManager2 > m_xManager;
 ::com::sun::star::uno::Reference< 
::com::sun::star::reflection::XProxyFactory > m_xProxyFactory;
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  
 m_xConfigNode;  // config node for generel connection pooling
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  
 m_xConfigNode;  // config node for general connection pooling
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2>  
 m_xDesktop;
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sc/uiconfig

[Julien Nabet]

 sc/source/ui/inc/PivotLayoutDialog.hxx |2 +-
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a82ff18269e5b37348d402b7c21c3f200068265c
Author: Julien Nabet 
Date:   Sat Jul 19 22:47:17 2014 +0200

Resolves fdo#81549: Crash pivot table

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=345d6dd9d938a88722fb6d1f1963047a9761412d
 ?

Change-Id: Ie2ebef88bd8369065b8a4ab176099c71674d5090
Reviewed-on: https://gerrit.libreoffice.org/10410
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx 
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index e3e8e74..3635d83 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -82,7 +82,7 @@ private:
 formula::RefButton* mpDestinationButton;
 
 PushButton*  mpBtnOK;
-CloseButton* mpBtnCancel;
+CancelButton* mpBtnCancel;
 
 formula::RefEdit*   mpActiveEdit;
 ScAddress::Details  maAddressDetails;
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index ebc016c..fd65936 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -797,8 +797,7 @@
 
 
   ok
-  apply
-  close
+  cancel
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source sc/uiconfig

[Julien Nabet]

 sc/source/ui/inc/PivotLayoutDialog.hxx |2 +-
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 917ff913b11309dfb13f5ee0d46a609608e5bbe3
Author: Julien Nabet 
Date:   Sat Jul 19 22:47:17 2014 +0200

Resolves fdo#81549: Crash pivot table

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=345d6dd9d938a88722fb6d1f1963047a9761412d
 ?

Change-Id: Ie2ebef88bd8369065b8a4ab176099c71674d5090
Reviewed-on: https://gerrit.libreoffice.org/10410
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 
(cherry picked from commit a82ff18269e5b37348d402b7c21c3f200068265c)

diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx 
b/sc/source/ui/inc/PivotLayoutDialog.hxx
index ace1ed5..c63177b 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -82,7 +82,7 @@ private:
 formula::RefButton* mpDestinationButton;
 
 PushButton*  mpBtnOK;
-CloseButton* mpBtnCancel;
+CancelButton* mpBtnCancel;
 
 formula::RefEdit*   mpActiveEdit;
 ScAddress::Details  maAddressDetails;
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index ad42d3f..7ffba7e 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -797,8 +797,7 @@
 
 
   ok
-  apply
-  close
+  cancel
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2 oox/source xmloff/source

[Julien Nabet]

 helpcontent2|2 +-
 oox/source/drawingml/fillproperties.cxx |   10 +-
 xmloff/source/style/prstylei.cxx|6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 42b9fa4afeabc2daaba2349ee24d4c426a032f03
Author: Julien Nabet 
Date:   Sun Jul 20 09:46:24 2014 +0200

cppcheck: Prefer prefix ++/-- operators

Change-Id: If9fa06958c4ebb45a5d4acf3b2994dd3b79f81bf

diff --git a/helpcontent2 b/helpcontent2
index a8c8f80..4afc42f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a8c8f80b933a42a284e681c1d1973166445a4451
+Subproject commit 4afc42f9eb3f50b542f22414045856bfc588855e
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index fb02bda..83ab6a4 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -402,7 +402,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 bSymmetric = false;
 else
 {
-aItA++;
+++aItA;
 aItZ = boost::prior(aItZ);
 }
 }
@@ -430,7 +430,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
  ", number of stops: " << 
aGradientStops.size());
 for (GradientFillProperties::GradientStopMap::iterator 
p(aGradientStops.begin());
  p != aGradientStops.end();
- p++)
+ ++p)
 SAL_INFO("oox.drawingml.gradient", "  " << 
std::distance(aGradientStops.begin(), p) << ": " <<
  p->first << ": " <<
  std::hex << p->second.getColor( 
rGraphicHelper, nPhClr ) << std::dec <<
@@ -443,7 +443,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 GradientFillProperties::GradientStopMap::iterator 
aIt(aGradientStops.begin());
 double nWidestWidth = -1;
 GradientFillProperties::GradientStopMap::iterator 
aWidestSegmentStart;
-aIt++;
+++aIt;
 while( aIt != aGradientStops.end() )
 {
 if( aIt->first - boost::prior(aIt)->first > 
nWidestWidth )
@@ -451,7 +451,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 nWidestWidth = aIt->first - 
boost::prior(aIt)->first;
 aWidestSegmentStart = boost::prior(aIt);
 }
-aIt++;
+++aIt;
 }
 assert( nWidestWidth > 0 );
 
@@ -515,7 +515,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 nWidestWidth = aIt->first - 
boost::prior(aIt)->first;
 aWidestSegmentStart = boost::prior(aIt);
 }
-aIt++;
+++aIt;
 }
 }
 SAL_INFO("oox.drawingml.gradient", "widest segment 
start: " << aWidestSegmentStart->first << ", border: " << nBorder);
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 97019d3..3dfbb37 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -519,7 +519,7 @@ bool 
XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist(
 
 if(rMapper.is())
 {
-for(::std::vector< XMLPropertyState >::const_iterator a = 
maProperties.begin(); a != maProperties.end(); a++)
+for(::std::vector< XMLPropertyState >::const_iterator a = 
maProperties.begin(); a != maProperties.end(); ++a)
 {
 if(a->mnIndex != -1)
 {
@@ -567,7 +567,7 @@ bool XMLPropStyleContext::deactivateOldFillStyleDefinitions(
 
 if(rMapper.is())
 {
-for(::std::vector< XMLPropertyState >::iterator a = 
maProperties.begin(); a != maProperties.end(); a++)
+for(::std::vector< XMLPropertyState >::iterator a = 
maProperties.begin(); a != maProperties.end(); ++a)
 {
 if(a->mnIndex != -1)
 {
@@ -603,7 +603,7 @@ bool 
XMLPropStyleContext::tra

[Libreoffice-commits] core.git: sw/source

[Julien Nabet]

 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a24139dafdf044b319bbf7c8e6fb34ee7b0c139d
Author: Julien Nabet 
Date:   Sun Jul 20 10:37:19 2014 +0200

cppcheck: operator "=" should return TableReference&

Change-Id: Ifefa4a314fbe9380332fd02c5fc8dfbb68e09cf5

diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index d215607..04770c5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -124,7 +124,7 @@ struct TableReference
 {
 }
 
-TableReference operator= (const TableReference& rhs)
+TableReference& operator= (const TableReference& rhs)
 {
 m_bTableCellOpen = rhs.m_bTableCellOpen ;
 m_nTableDepth= rhs.m_nTableDepth ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   59 +++
 1 file changed, 51 insertions(+), 8 deletions(-)

New commits:
commit b8f4db5bad245c2e340b3217b10df994785eecd3
Author: Julien Nabet 
Date:   Mon Jul 21 11:36:27 2014 +0200

Resolves fdo#81581: Mediawiki doesn't recognize underlining

Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 64474b3..1205536 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -118,23 +118,26 @@


 
+   
+   
+

-   
+   
 

-   
+   
 

-   
+   


-   
+   
 

-   
+   
 

-   
+   



@@ -976,6 +979,8 @@
select="($style mod (2 * $BOLD_BIT)) != 
0"/>

+   



+   



+   


<tt>

+   
+   <u>
+   

'''

@@ -1044,6 +1056,9 @@

'''

+   
+   </u>
+   

</tt>

@@ -1255,6 +1270,8 @@
select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>

+   



 
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+



@@ -1473,9 +1516,9 @@
guaranteed to be disjoint, therefore, addition can be 
use instead 
of bitwise or (which is missing in XPath). -->

+   select="$style-set + $bold-style + $italic-style + 
$underline-style + $superscript-style + $subscript-style + $code-style + 
$typewriter-style + $center-style + $right-style"/>

+   select="$style-mask + $bold-mask + $italic-mask + 
$underline-mask + $superscript-mask + $subscript-mask + $code-mask + 
$typewriter-mask + $center-mask + $right-mask"/>
 


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   59 +++
 1 file changed, 51 insertions(+), 8 deletions(-)

New commits:
commit 4d003b92fa632d38909543b7317ceb75c96beeac
Author: Julien Nabet 
Date:   Mon Jul 21 11:36:27 2014 +0200

Resolves fdo#81581: Mediawiki doesn't recognize underlining

Cherry-picked from b8f4db5bad245c2e340b3217b10df994785eecd3

Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089
Reviewed-on: https://gerrit.libreoffice.org/10438
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 64474b3..1205536 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -118,23 +118,26 @@


 
+   
+   
+

-   
+   
 

-   
+   
 

-   
+   


-   
+   
 

-   
+   
 

-   
+   



@@ -976,6 +979,8 @@
select="($style mod (2 * $BOLD_BIT)) != 
0"/>

+   



+   



+   


<tt>

+   
+   <u>
+   

'''

@@ -1044,6 +1056,9 @@

'''

+   
+   </u>
+   

</tt>

@@ -1255,6 +1270,8 @@
select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>

+   



 
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+



@@ -1473,9 +1516,9 @@
guaranteed to be disjoint, therefore, addition can be 
use instead 
of bitwise or (which is missing in XPath). -->

+   select="$style-set + $bold-style + $italic-style + 
$underline-style + $superscript-style + $subscript-style + $code-style + 
$typewriter-style + $center-style + $right-style"/>

+   select="$style-mask + $bold-mask + $italic-mask + 
$underline-mask + $superscript-mask + $subscript-mask + $code-mask + 
$typewriter-mask + $center-mask + $right-mask"/>
 


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   59 +++
 1 file changed, 51 insertions(+), 8 deletions(-)

New commits:
commit d99e06fff8532bbe69f267d96ba2211c241ccd81
Author: Julien Nabet 
Date:   Mon Jul 21 11:36:27 2014 +0200

Resolves fdo#81581: Mediawiki doesn't recognize underlining

Cherry-picked from b8f4db5bad245c2e340b3217b10df994785eecd3

Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089
Reviewed-on: https://gerrit.libreoffice.org/10437
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 64474b3..1205536 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -118,23 +118,26 @@


 
+   
+   
+

-   
+   
 

-   
+   
 

-   
+   


-   
+   
 

-   
+   
 

-   
+   



@@ -976,6 +979,8 @@
select="($style mod (2 * $BOLD_BIT)) != 
0"/>

+   



+   



+   


<tt>

+   
+   <u>
+   

'''

@@ -1044,6 +1056,9 @@

'''

+   
+   </u>
+   

</tt>

@@ -1255,6 +1270,8 @@
select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>

+   



 
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+



@@ -1473,9 +1516,9 @@
guaranteed to be disjoint, therefore, addition can be 
use instead 
of bitwise or (which is missing in XPath). -->

+   select="$style-set + $bold-style + $italic-style + 
$underline-style + $superscript-style + $subscript-style + $code-style + 
$typewriter-style + $center-style + $right-style"/>

+   select="$style-mask + $bold-mask + $italic-mask + 
$underline-mask + $superscript-mask + $subscript-mask + $code-mask + 
$typewriter-mask + $center-mask + $right-mask"/>
 


___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source

[Julien Nabet]

 basctl/source/basicide/localizationmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1840cf944b36b7ead5800a036870e38f4ddb049
Author: Julien Nabet 
Date:   Mon Jul 21 19:26:58 2014 +0200

Resolves fdo#80906: Delete any control on Dialog editing window crashes LO

Quick fix for this bt:
3  0x2b2935d2 in __GI___assert_fail (assertion=0x2aaae1f2806a 
"_pInterface != 0",
file=0x2aaae1f28018 
"/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h",
 line=402,
function=0x2aaae1f28480 
::operator->()
 const::__PRETTY_FUNCTION__> "interface_type* com::sun::star::uno::Reference< 
 >::operator->() const [with interface_type = 
com::sun::star::resource::XStringResourceManager]") at assert.c:101
4  0x2aaae1e2963b in 
com::sun::star::uno::Reference::operator->
 (this=0x7fff2d00)
at 
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h:402
5  0x2aaae1eb5c87 in 
basctl::LocalizationMgr::implHandleControlResourceProperties (aControlAny=
uno::Any { = {_vptr.XInterface = 
0x8935ea8}, }, aDialogName="Dialog1", aCtrlName="TextField1",
xStringResourceManager=empty uno::Reference, 
xSourceStringResolver=empty uno::Reference, 
eMode=basctl::LocalizationMgr::REMOVE_IDS_FROM_RESOURCE)
at 
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:202
6  0x2aaae1eb92a0 in 
basctl::LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject 
(pEditor=0x919d820, aControlAny=
uno::Any { = {_vptr.XInterface = 
0x8935ea8}, }, aCtrlName="TextField1")
at 
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:896
Indeed, LocalizationMgr::setControlResourceIDsForNewEditorObject just 
returns if !xStringResourceManager.is()
So let's do the same when trying to delete ControlResources
See 
http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/localizationmgr.cxx#835

Change-Id: I4be49503cd2464f97a25840dfdc29877e5fb2b93

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index 34d8acb..bc44262 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -197,7 +197,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 
 Reference< XPropertySet > xPropertySet;
 aControlAny >>= xPropertySet;
-if( xPropertySet.is() )
+if( xPropertySet.is() && xStringResourceManager.is())
 {
 Sequence< Locale > aLocaleSeq = xStringResourceManager->getLocales();
 sal_Int32 nLocaleCount = aLocaleSeq.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 8 commits - connectivity/source fpicker/source oox/source sal/osl sal/qa sal/rtl sc/source swext/mediawiki writerfilter/source

[Julien Nabet]

 connectivity/source/parse/sqlbison.y|8 +-
 fpicker/source/win32/filepicker/WinFileOpenImpl.cxx |   17 +++--
 oox/source/drawingml/textrun.cxx|3 -
 sal/osl/all/debugbase.cxx   |   30 ++
 sal/qa/osl/file/osl_File.cxx|4 -
 sal/qa/osl/module/osl_Module.cxx|8 +-
 sal/qa/osl/mutex/osl_Mutex.cxx  |2 
 sal/qa/osl/process/osl_Thread.cxx   |2 
 sal/qa/osl/security/osl_Security.cxx|2 
 sal/rtl/alloc_global.cxx|6 +-
 sal/rtl/hash.cxx|4 -
 sal/rtl/uri.cxx |2 
 sc/source/ui/dbgui/validate.cxx |   27 +++--
 sc/source/ui/inc/validate.hxx   |2 
 swext/mediawiki/src/filter/odt2mediawiki.xsl|   59 +---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |2 
 16 files changed, 114 insertions(+), 64 deletions(-)

New commits:
commit 504a70f2b8919203448813800e45aa46295c2f46
Author: Julien Nabet 
Date:   Mon Jul 21 11:36:27 2014 +0200

Resolves fdo#81581: Mediawiki doesn't recognize underlining

Cherry-picked from b8f4db5bad245c2e340b3217b10df994785eecd3

Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089
Reviewed-on: https://gerrit.libreoffice.org/10438
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 64474b3..1205536 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -118,23 +118,26 @@


 
+   
+   
+

-   
+   
 

-   
+   
 

-   
+   


-   
+   
 

-   
+   
 

-   
+   



@@ -976,6 +979,8 @@
select="($style mod (2 * $BOLD_BIT)) != 
0"/>

+   



+   



+   


<tt>

+   
+   <u>
+   

'''

@@ -1044,6 +1056,9 @@

'''

+   
+   </u>
+   

</tt>

@@ -1255,6 +1270,8 @@
select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>

+   



 
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+



@@ -1473,9 +1516,9 @@
guaranteed to be disjoint, therefore, addition can be 
use instead 
of bitwise or (which is missing in XPath). -->

+   select="$style-set + $bold-style + $italic-style + 
$underline-style + $superscript-style + $subscript-style + $code-style + 
$typewriter-style + $center-style + $right-style"/>

+   select="$style-mask + $bold-mask + $italic-mask + 
$underline-mask + $superscript-mask + $subscript-mask + $code-mask + 
$typewriter-mask + $center-mask + $right-mask"/>
 


commit 2115f27d792d83bffc2212ce7f50b03b5677ec71
Author: Aurimas Fišeras 
Date:   Mon Jul 21 10:43:42 2014 +0300

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basctl/source

[Julien Nabet]

 basctl/source/basicide/localizationmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e712c229f02e62641856ef5dddbf3c6a38dbf5af
Author: Julien Nabet 
Date:   Mon Jul 21 19:26:58 2014 +0200

Resolves fdo#80906: Delete any control on Dialog editing window crashes LO

Quick fix for this bt:
3  0x2b2935d2 in __GI___assert_fail (assertion=0x2aaae1f2806a 
"_pInterface != 0",
file=0x2aaae1f28018 
"/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h",
 line=402,
function=0x2aaae1f28480 
::operator->()
 const::__PRETTY_FUNCTION__> "interface_type* com::sun::star::uno::Reference< 
 >::operator->() const [with interface_type = 
com::sun::star::resource::XStringResourceManager]") at assert.c:101
4  0x2aaae1e2963b in 
com::sun::star::uno::Reference::operator->
 (this=0x7fff2d00)
at 
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h:402
5  0x2aaae1eb5c87 in 
basctl::LocalizationMgr::implHandleControlResourceProperties (aControlAny=
uno::Any { = {_vptr.XInterface = 
0x8935ea8}, }, aDialogName="Dialog1", aCtrlName="TextField1",
xStringResourceManager=empty uno::Reference, 
xSourceStringResolver=empty uno::Reference, 
eMode=basctl::LocalizationMgr::REMOVE_IDS_FROM_RESOURCE)
at 
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:202
6  0x2aaae1eb92a0 in 
basctl::LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject 
(pEditor=0x919d820, aControlAny=
uno::Any { = {_vptr.XInterface = 
0x8935ea8}, }, aCtrlName="TextField1")
at 
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:896
Indeed, LocalizationMgr::setControlResourceIDsForNewEditorObject just 
returns if !xStringResourceManager.is()
So let's do the same when trying to delete ControlResources
See 
http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/localizationmgr.cxx#835

Cherry-picked from e1840cf944b36b7ead5800a036870e38f4ddb049

Change-Id: I4be49503cd2464f97a25840dfdc29877e5fb2b93
Reviewed-on: https://gerrit.libreoffice.org/10448
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index c34ac55..53e268b 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -199,7 +199,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 
 Reference< XPropertySet > xPropertySet;
 aControlAny >>= xPropertySet;
-if( xPropertySet.is() )
+if( xPropertySet.is() && xStringResourceManager.is())
 {
 Sequence< Locale > aLocaleSeq = xStringResourceManager->getLocales();
 sal_Int32 nLocaleCount = aLocaleSeq.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - basctl/source

[Julien Nabet]

 basctl/source/basicide/localizationmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f712e0376cf77386b788093e9d19cfd0ea29913
Author: Julien Nabet 
Date:   Mon Jul 21 19:26:58 2014 +0200

Resolves fdo#80906: Delete any control on Dialog editing window crashes LO

Quick fix for this bt:
3  0x2b2935d2 in __GI___assert_fail (assertion=0x2aaae1f2806a 
"_pInterface != 0",
file=0x2aaae1f28018 
"/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h",
 line=402,
function=0x2aaae1f28480 
::operator->()
 const::__PRETTY_FUNCTION__> "interface_type* com::sun::star::uno::Reference< 
 >::operator->() const [with interface_type = 
com::sun::star::resource::XStringResourceManager]") at assert.c:101
4  0x2aaae1e2963b in 
com::sun::star::uno::Reference::operator->
 (this=0x7fff2d00)
at 
/home/julien/compile-libreoffice/libreoffice/include/com/sun/star/uno/Reference.h:402
5  0x2aaae1eb5c87 in 
basctl::LocalizationMgr::implHandleControlResourceProperties (aControlAny=
uno::Any { = {_vptr.XInterface = 
0x8935ea8}, }, aDialogName="Dialog1", aCtrlName="TextField1",
xStringResourceManager=empty uno::Reference, 
xSourceStringResolver=empty uno::Reference, 
eMode=basctl::LocalizationMgr::REMOVE_IDS_FROM_RESOURCE)
at 
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:202
6  0x2aaae1eb92a0 in 
basctl::LocalizationMgr::deleteControlResourceIDsForDeletedEditorObject 
(pEditor=0x919d820, aControlAny=
uno::Any { = {_vptr.XInterface = 
0x8935ea8}, }, aCtrlName="TextField1")
at 
/home/julien/compile-libreoffice/libreoffice/basctl/source/basicide/localizationmgr.cxx:896
Indeed, LocalizationMgr::setControlResourceIDsForNewEditorObject just 
returns if !xStringResourceManager.is()
So let's do the same when trying to delete ControlResources
See 
http://opengrok.libreoffice.org/xref/core/basctl/source/basicide/localizationmgr.cxx#835

Cherry-picked from e1840cf944b36b7ead5800a036870e38f4ddb049

Change-Id: I4be49503cd2464f97a25840dfdc29877e5fb2b93
Reviewed-on: https://gerrit.libreoffice.org/10449
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index 2812387..9d0cc87 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -199,7 +199,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 
 Reference< XPropertySet > xPropertySet;
 aControlAny >>= xPropertySet;
-if( xPropertySet.is() )
+if( xPropertySet.is() && xStringResourceManager.is())
 {
 Sequence< Locale > aLocaleSeq = xStringResourceManager->getLocales();
 sal_Int32 nLocaleCount = aLocaleSeq.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/registry connectivity/source dbaccess/source reportbuilder/java

[Julien Nabet]

 connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu  |2 
+-
 connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu |2 
+-
 connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu |2 
+-
 connectivity/source/commontools/dbmetadata.cxx  |2 
+-
 connectivity/source/drivers/jdbc/JDriver.cxx|2 
+-
 connectivity/source/drivers/odbc/ODriver.cxx|2 
+-
 dbaccess/source/core/dataaccess/ModelImpl.cxx   |2 
+-
 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java|4 
++--
 8 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 568778874429595855b435792e5ebecd52956dae
Author: Julien Nabet 
Date:   Tue Jul 22 18:36:05 2014 +0200

Resolves fdo#81213: Wrong table-clause generated by reportbuilder

Oracle doesn't accept "AS" for making an alias from a table
See https://bugs.freedesktop.org/show_bug.cgi?id=81213#c2
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c4
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c5
for more information

(thank you Lionel)

Change-Id: I33c86d78b2590116d4af46ffd3e54c3c791268ea

diff --git 
a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 34e85f4..210a9b7 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -50,7 +50,7 @@
 
 
   
-true
+false
   
 
 
diff --git 
a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index f462444..dc8b317 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -75,7 +75,7 @@
 
 
   
-true
+false
   
 
 
diff --git 
a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index e660674..8711eda 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -80,7 +80,7 @@
 
 
   
-true
+false
   
 
 
diff --git a/connectivity/source/commontools/dbmetadata.cxx 
b/connectivity/source/commontools/dbmetadata.cxx
index bb1b23df..24cdbdb 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -291,7 +291,7 @@ namespace dbtools
 
 bool DatabaseMetaData::generateASBeforeCorrelationName() const
 {
-bool doGenerate( true );
+bool doGenerate( false );
 Any setting;
 if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", 
*m_pImpl, setting ) )
 OSL_VERIFY( setting >>= doGenerate );
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx 
b/connectivity/source/drivers/jdbc/JDriver.cxx
index 4833548..d4b1fe3 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -192,7 +192,7 @@ Sequence< DriverPropertyInfo > SAL_CALL 
java_sql_Driver::getPropertyInfo( const
 OUString("GenerateASBeforeCorrelationName")
 ,OUString("Generate AS before table correlation names.")
 ,sal_False
-,OUString(  "true"  )
+,OUString(  "false"  )
 ,aBooleanValues)
 );
 aDriverInfo.push_back(DriverPropertyInfo(
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx 
b/connectivity/source/drivers/odbc/ODriver.cxx
index 1b95826..3d064f0 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -178,7 +178,7 @@ Sequence< DriverPropertyInfo > SAL_CALL 
ODBCDriver::getPropertyInfo( const OUStr
 OUString("GenerateASBeforeCorrelationName")
 ,OUString("Generate AS before table correlation names.")
 ,sal_False
-,OUString(  "true"  )
+,OUString(  "false"  )
 ,aBooleanValues)
 );
 aDriverInfo.push_back(DriverPropertyInfo(
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 1a3fa23..72cc6b2 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/registry connectivity/source dbaccess/source reportbuilder/java

[Julien Nabet]

 connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu  |2 
+-
 connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu |2 
+-
 connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu |2 
+-
 connectivity/source/commontools/dbmetadata.cxx  |2 
+-
 connectivity/source/drivers/jdbc/JDriver.cxx|2 
+-
 connectivity/source/drivers/odbc/ODriver.cxx|2 
+-
 dbaccess/source/core/dataaccess/ModelImpl.cxx   |2 
+-
 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java|4 
++--
 8 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0d5d8c22f7be41d408d8ee4012ef1a6f4368423e
Author: Julien Nabet 
Date:   Tue Jul 22 18:36:05 2014 +0200

Resolves fdo#81213: Wrong table-clause generated by reportbuilder

Oracle doesn't accept "AS" for making an alias from a table
See https://bugs.freedesktop.org/show_bug.cgi?id=81213#c2
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c4
https://bugs.freedesktop.org/show_bug.cgi?id=81213#c5
for more information

(thank you Lionel)

Cherry-picked from 568778874429595855b435792e5ebecd52956dae

Change-Id: I33c86d78b2590116d4af46ffd3e54c3c791268ea
Reviewed-on: https://gerrit.libreoffice.org/10469
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git 
a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 34e85f4..210a9b7 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -50,7 +50,7 @@
 
 
   
-true
+false
   
 
 
diff --git 
a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index f462444..dc8b317 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -75,7 +75,7 @@
 
 
   
-true
+false
   
 
 
diff --git 
a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index e660674..8711eda 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -80,7 +80,7 @@
 
 
   
-true
+false
   
 
 
diff --git a/connectivity/source/commontools/dbmetadata.cxx 
b/connectivity/source/commontools/dbmetadata.cxx
index 75fcc66..73246c2 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -291,7 +291,7 @@ namespace dbtools
 
 bool DatabaseMetaData::generateASBeforeCorrelationName() const
 {
-bool doGenerate( true );
+bool doGenerate( false );
 Any setting;
 if ( lcl_getConnectionSetting( "GenerateASBeforeCorrelationName", 
*m_pImpl, setting ) )
 OSL_VERIFY( setting >>= doGenerate );
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx 
b/connectivity/source/drivers/jdbc/JDriver.cxx
index b9ea306..a22df42 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -192,7 +192,7 @@ Sequence< DriverPropertyInfo > SAL_CALL 
java_sql_Driver::getPropertyInfo( const
 OUString("GenerateASBeforeCorrelationName")
 ,OUString("Generate AS before table correlation names.")
 ,sal_False
-,OUString(  "true"  )
+,OUString(  "false"  )
 ,aBooleanValues)
 );
 aDriverInfo.push_back(DriverPropertyInfo(
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx 
b/connectivity/source/drivers/odbc/ODriver.cxx
index b6ead37..eb690a0 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -178,7 +178,7 @@ Sequence< DriverPropertyInfo > SAL_CALL 
ODBCDriver::getPropertyInfo( const OUStr
 OUString("GenerateASBeforeCorrelationName")
 ,OUString("Generate AS before table correlation names.")
 ,sal_False
-,OUString(  "true"  )
+,OUString(  "false"  )
 ,aBooleanValues)
 );
 aDriverInfo.push_back(DriverPropertyInfo(
diff --git a/dbaccess/source/core/da

[Libreoffice-commits] core.git: android/abs-lib desktop/test framework/source include/sfx2 jurt/com sw/source udkapi/com unotools/source

[Julien Nabet]

 android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java |   
 2 +-
 desktop/test/deployment/options/readme.txt |   
 4 ++--
 framework/source/dispatch/mailtodispatcher.cxx |   
 2 +-
 framework/source/dispatch/servicehandler.cxx   |   
 4 ++--
 include/sfx2/bindings.hxx  |   
 6 +++---
 jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java|   
 2 +-
 sw/source/filter/ww8/writerhelper.hxx  |   
 2 +-
 udkapi/com/sun/star/java/XJavaThreadRegister_11.idl|   
 2 +-
 unotools/source/config/moduleoptions.cxx   |   
 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit d5fb4b731938c22fcf9c5e3280da8f722b5492e4
Author: Julien Nabet 
Date:   Wed Jul 23 22:23:52 2014 +0200

Typos

Change-Id: I0c17f40b3e593ae3771fa751a817f84bf2f2323d

diff --git 
a/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java 
b/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java
index cc4767a..72a75be 100644
--- a/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java
+++ b/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java
@@ -299,7 +299,7 @@ class ActivityChooserModel extends DataSetObservable {
 private boolean mHistoricalRecordsChanged = true;
 
 /**
- * Hander for scheduling work on client tread.
+ * Handler for scheduling work on client thread.
  */
 private final Handler mHandler = new Handler();
 
diff --git a/desktop/test/deployment/options/readme.txt 
b/desktop/test/deployment/options/readme.txt
index 9879a72..bba7844 100644
--- a/desktop/test/deployment/options/readme.txt
+++ b/desktop/test/deployment/options/readme.txt
@@ -1,4 +1,4 @@
-Important: The hander component extensionoptions.jar in the extensions may not 
+Important: The handler component extensionoptions.jar in the extensions may 
not 
 contain exactly the same sources as the one build in the handler directory. To
 make sure that debugging works build the handler directory and put the 
 extensionoptions.jar into the extension.
@@ -10,7 +10,7 @@ leaf1.oxt: Defines a leaf under the node WriterNode
 
 leaf1mod.oxt: Defines a leaf under the node WriterNode
 
-It has a douplicate entry in the manifest.xml (OptionsDialog.xcu). This would 
cause a DisposedException when uninstalling on OOo 3.0 and prevent the 
extension from being uninstalled. This is actually a bug of the extensions. 
However, the error is difficult to investigate. Therefore this was fixed to 
make OOo more robust (i96690).
+It has a duplicate entry in the manifest.xml (OptionsDialog.xcu). This would 
cause a DisposedException when uninstalling on OOo 3.0 and prevent the 
extension from being uninstalled. This is actually a bug of the extensions. 
However, the error is difficult to investigate. Therefore this was fixed to 
make OOo more robust (i96690).
 

 
 leaf2.oxt: Defines a leaf under a node that has a name which requires special 
diff --git a/framework/source/dispatch/mailtodispatcher.cxx 
b/framework/source/dispatch/mailtodispatcher.cxx
index 44946c5..a164fc4 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -67,7 +67,7 @@ MailToDispatcher::~MailToDispatcher()
 
 /**
 @short  decide if this dispatch implementation can be used for 
requested URL or not
-@descr  A protocol handler is registerd for an URL pattern inside 
configuration and will
+@descr  A protocol handler is registered for an URL pattern inside 
configuration and will
 be asked by the generic dispatch mechanism inside framework, 
if he can handle this
 special URL which match his registration. He can agree by 
returning of a valid dispatch
 instance or disagree by returning .
diff --git a/framework/source/dispatch/servicehandler.cxx 
b/framework/source/dispatch/servicehandler.cxx
index 46d8ecd..f7e5f0f 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -69,7 +69,7 @@ ServiceHandler::~ServiceHandler()
 
 /**
 @short  decide if this dispatch implementation can be used for 
requested URL or not
-@descr  A protocol handler is registerd for an URL pattern inside 
configuration and will
+@descr  A protocol handler is registered for an URL pattern inside 
configuration and will
 be asked by the generic dispatch mechanism inside framework, 
if he can handle this
 special URL which match his registration. He can agree by 
returning of a valid dispatch
 instance or disagree by returning

[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet]

 dbaccess/source/ui/tabledesign/FieldDescriptions.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 215703b494d5c4385944db06015479ef7789a497
Author: Julien Nabet 
Date:   Thu Jul 24 10:16:51 2014 +0200

Typo: PRECSION->PRECISION

Change-Id: I63f8ad597cea2562b567b7df13823b75a6e50dde

diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx 
b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index 65fb772..b23f85e 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -28,9 +28,9 @@
 #include "UITools.hxx"
 #include 
 
-#define DEFAULT_VARCHAR_PRECSION100
-#define DEFAULT_OTHER_PRECSION  16
-#define DEFAULT_NUMERIC_PRECSION5
+#define DEFAULT_VARCHAR_PRECISION100
+#define DEFAULT_OTHER_PRECISION  16
+#define DEFAULT_NUMERIC_PRECISION5
 #define DEFAULT_NUMERIC_SCALE   0
 
 using namespace dbaui;
@@ -186,7 +186,7 @@ void OFieldDescription::FillFromTypeInfo(const 
TOTypeInfoSP& _pType,bool _bForce
 case DataType::VARCHAR:
 if ( bForce )
 {
-sal_Int32 nPrec = DEFAULT_VARCHAR_PRECSION;
+sal_Int32 nPrec = DEFAULT_VARCHAR_PRECISION;
 if ( GetPrecision() )
 nPrec = GetPrecision();
 
SetPrecision(::std::min(nPrec,_pType->nPrecision));
@@ -201,7 +201,7 @@ void OFieldDescription::FillFromTypeInfo(const 
TOTypeInfoSP& _pType,bool _bForce
 default:
 if ( bForce )
 {
-sal_Int32 nPrec = DEFAULT_OTHER_PRECSION;
+sal_Int32 nPrec = DEFAULT_OTHER_PRECISION;
 switch ( _pType->nType )
 {
 case DataType::BIT:
@@ -216,7 +216,7 @@ void OFieldDescription::FillFromTypeInfo(const 
TOTypeInfoSP& _pType,bool _bForce
 }
 
 if ( _pType->nPrecision )
-SetPrecision(::std::min(nPrec ? nPrec : 
DEFAULT_NUMERIC_PRECSION,_pType->nPrecision));
+SetPrecision(::std::min(nPrec ? nPrec : 
DEFAULT_NUMERIC_PRECISION,_pType->nPrecision));
 if ( _pType->nMaximumScale )
 SetScale(::std::min(GetScale() ? GetScale() 
: DEFAULT_NUMERIC_SCALE,_pType->nMaximumScale));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source

[Julien Nabet]

 desktop/source/app/app.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c9b419b17756684793645a67b052f074cfefe801
Author: Julien Nabet 
Date:   Fri Jul 25 12:44:20 2014 +0200

Typo: Destop->Desktop

Change-Id: If09f622753c3efa449722368301f61651ad28bd5

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3704bbd..46fbebe 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -703,7 +703,7 @@ void Desktop::DeInit()
 // this will leave some garbage behind..
 }
 
-SAL_INFO( "desktop.app", "FINISHED WITH Destop::DeInit" );
+SAL_INFO( "desktop.app", "FINISHED WITH Desktop::DeInit" );
 }
 
 bool Desktop::QueryExit()
@@ -1781,7 +1781,7 @@ int Desktop::doShutdown()
 bool bRR = pExecGlobals->bRestartRequested;
 delete pExecGlobals, pExecGlobals = NULL;
 
-SAL_INFO( "desktop.app", "FINISHED WITH Destop::Main" );
+SAL_INFO( "desktop.app", "FINISHED WITH Desktop::Main" );
 if ( bRR )
 {
 restartOnMac(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet]

 dbaccess/source/ui/dlg/sqlmessage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 025a10e6d60a340fed9990e8389b8cbd272207de
Author: Julien Nabet 
Date:   Sat Jul 26 09:42:34 2014 +0200

Typo: useles->useless

Change-Id: I62c253e9ee23186efcaafda69566148bc484276d

diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx 
b/dbaccess/source/ui/dlg/sqlmessage.cxx
index efda833..991319d 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -254,7 +254,7 @@ namespace
 &&  !lcl_hasDetails( aDisplayInfo )
 )
 {
-OSL_FAIL( "lcl_buildExceptionChain: useles exception: no 
state, no error code, no message!" );
+OSL_FAIL( "lcl_buildExceptionChain: useless exception: no 
state, no error code, no message!" );
 continue;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/uiconfig

[Julien Nabet]

 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|2 --
 sc/uiconfig/scalc/ui/correlationdialog.ui   |2 --
 sc/uiconfig/scalc/ui/covariancedialog.ui|2 --
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |2 --
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui  |2 --
 sc/uiconfig/scalc/ui/movingaveragedialog.ui |2 --
 sc/uiconfig/scalc/ui/samplingdialog.ui  |2 --
 sc/uiconfig/scalc/ui/ttestdialog.ui |2 --
 8 files changed, 16 deletions(-)

New commits:
commit cb3dcb0b2ec1a7ecacb72ec134801163aa06
Author: Julien Nabet 
Date:   Sun Jul 27 19:57:08 2014 +0200

Resolves fdo#79273: Data Statistics crashes with any entry

Change-Id: I50b1a14e6bb9907f3a09e515dba28f9bed5511ea

diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui 
b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
index 60de1ca..35b86f6 100644
--- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
@@ -430,9 +430,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui 
b/sc/uiconfig/scalc/ui/correlationdialog.ui
index b066e3f..1157d5f 100644
--- a/sc/uiconfig/scalc/ui/correlationdialog.ui
+++ b/sc/uiconfig/scalc/ui/correlationdialog.ui
@@ -238,9 +238,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui 
b/sc/uiconfig/scalc/ui/covariancedialog.ui
index 03cff50..c62b9ff 100644
--- a/sc/uiconfig/scalc/ui/covariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/covariancedialog.ui
@@ -238,9 +238,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui 
b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
index ec0fc69..31d3ad5 100644
--- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
+++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
@@ -239,9 +239,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui 
b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
index 598d7bd..bbf69b3 100644
--- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
+++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
@@ -319,9 +319,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui 
b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
index b72bc6c7..0b5fe7c 100644
--- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui
+++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
@@ -318,9 +318,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui 
b/sc/uiconfig/scalc/ui/samplingdialog.ui
index ca1d661..0bb8d7e 100644
--- a/sc/uiconfig/scalc/ui/samplingdialog.ui
+++ b/sc/uiconfig/scalc/ui/samplingdialog.ui
@@ -322,9 +322,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/ttestdialog.ui 
b/sc/uiconfig/scalc/ui/ttestdialog.ui
index 86ba27d..1586cb0 100644
--- a/sc/uiconfig/scalc/ui/ttestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ttestdialog.ui
@@ -283,9 +283,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/uiconfig

[Julien Nabet]

 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|2 --
 sc/uiconfig/scalc/ui/correlationdialog.ui   |2 --
 sc/uiconfig/scalc/ui/covariancedialog.ui|2 --
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |2 --
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui  |2 --
 sc/uiconfig/scalc/ui/movingaveragedialog.ui |2 --
 sc/uiconfig/scalc/ui/samplingdialog.ui  |2 --
 sc/uiconfig/scalc/ui/ttestdialog.ui |2 --
 8 files changed, 16 deletions(-)

New commits:
commit c5ed29a621396de4fff5e9fa7b61b7303295edc9
Author: Julien Nabet 
Date:   Sun Jul 27 19:57:08 2014 +0200

Resolves fdo#79273: Data Statistics crashes with any entry

Change-Id: I50b1a14e6bb9907f3a09e515dba28f9bed5511ea
(cherry picked from commit cb3dcb0b2ec1a7ecacb72ec134801163aa06)

Signed-off-by: Kohei Yoshida 

diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui 
b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
index 60de1ca..35b86f6 100644
--- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
@@ -430,9 +430,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui 
b/sc/uiconfig/scalc/ui/correlationdialog.ui
index b066e3f..1157d5f 100644
--- a/sc/uiconfig/scalc/ui/correlationdialog.ui
+++ b/sc/uiconfig/scalc/ui/correlationdialog.ui
@@ -238,9 +238,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui 
b/sc/uiconfig/scalc/ui/covariancedialog.ui
index 03cff50..c62b9ff 100644
--- a/sc/uiconfig/scalc/ui/covariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/covariancedialog.ui
@@ -238,9 +238,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui 
b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
index ec0fc69..31d3ad5 100644
--- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
+++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui
@@ -239,9 +239,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui 
b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
index 598d7bd..bbf69b3 100644
--- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
+++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui
@@ -319,9 +319,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui 
b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
index b72bc6c7..0b5fe7c 100644
--- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui
+++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui
@@ -318,9 +318,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/samplingdialog.ui 
b/sc/uiconfig/scalc/ui/samplingdialog.ui
index ca1d661..0bb8d7e 100644
--- a/sc/uiconfig/scalc/ui/samplingdialog.ui
+++ b/sc/uiconfig/scalc/ui/samplingdialog.ui
@@ -322,9 +322,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
diff --git a/sc/uiconfig/scalc/ui/ttestdialog.ui 
b/sc/uiconfig/scalc/ui/ttestdialog.ui
index 86ba27d..1586cb0 100644
--- a/sc/uiconfig/scalc/ui/ttestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ttestdialog.ui
@@ -283,9 +283,7 @@
   
 
 
-  apply
   ok
-  close
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sfx2/source xmloff/source

[Julien Nabet]

 sfx2/source/doc/templatedlg.cxx |2 ++
 xmloff/source/draw/XMLShapeStyleContext.cxx |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93
Author: Julien Nabet 
Date:   Thu May 8 16:15:14 2014 +0200

cppcheck: Prefer prefix ++/-- operators for non-primitive types

Change-Id: Ieb7933207ed921353a9681ce850d0f4a38d69759

diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx 
b/xmloff/source/draw/XMLShapeStyleContext.cxx
index d366b96..4dbafca 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -195,7 +195,7 @@ void XMLShapeStyleContext::FillPropertySet( const 
Reference< beans::XPropertySet
 static ::rtl::OUString 
s_FillStyle(RTL_CONSTASCII_USTRINGPARAM("FillStyle"));
 
 // try to find a FillStyle entry and a value from it
-for(a = rProperties.begin(); a != rProperties.end(); a++)
+for(a = rProperties.begin(); a != rProperties.end(); ++a)
 {
 if(a->mnIndex != -1)
 {
@@ -238,7 +238,7 @@ void XMLShapeStyleContext::FillPropertySet( const 
Reference< beans::XPropertySet
 static ::rtl::OUString 
s_BackGraphicLocation(RTL_CONSTASCII_USTRINGPARAM("BackGraphicLocation"));
 static ::rtl::OUString 
s_BackGraphicTransparency(RTL_CONSTASCII_USTRINGPARAM("BackGraphicTransparency"));
 
-for(a = rProperties.begin(); a != rProperties.end(); a++)
+for(a = rProperties.begin(); a != rProperties.end(); ++a)
 {
 if(a->mnIndex != -1)
 {
commit 24cb5b3cf8ea893acd4d8a43e5405459d765b314
Author: Julien Nabet 
Date:   Thu May 8 16:15:03 2014 +0200

cppcheck: Missing bounds check for extra iterator increment in loop

Change-Id: Ia6f7d35acacc99b4cfe4f8b8d5a7c81e97558205

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7551c95..2f91796 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1263,6 +1263,8 @@ void SfxTemplateManagerDlg::OnFolderDelete()
 aFolderList = aFolderList + "\n" + (*pIter)->maTitle;
 
 ++pIter;
+if (pIter == aSelFolders.end())
+break;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source officecfg/registry ucb/workben

[Julien Nabet]

 connectivity/source/drivers/postgresql/pq_xcolumns.cxx |2 +-
 officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |4 ++--
 officecfg/registry/schema/org/openoffice/Setup.xcs |2 +-
 ucb/workben/ucb/srcharg.cxx|4 ++--
 ucb/workben/ucb/ucbdemo.cxx|4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 88db0ab698055ce1ea37a3b200a425eee5b9f2f8
Author: Julien Nabet 
Date:   Thu May 8 18:46:04 2014 +0200

Typos

Change-Id: Id4b79ae8576acaaf9d5ee1c9c030b6ffda3059a5

diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx 
b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index 90d9c6e..1176248 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -222,7 +222,7 @@ OUString columnMetaData2SDBCX(
 st.DESCRIPTION, makeAny( xRow->getString( DESCRIPTION ) ) );
 
 
-// maybe a better criterium than the type name can be found in future
+// maybe a better criterion than the type name can be found in future
 pBase->setPropertyValue_NoBroadcast_public(
 st.IS_AUTO_INCREMENT, isAutoIncrement(xRow->getString( DEFAULT_VALUE 
)) );
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs 
b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index ddcd452..1edab99 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -104,7 +104,7 @@
   
   
 
-  Specifies the column name mapping between the programatic 
column name and the logical column name.
+  Specifies the column name mapping between the programmatic 
column name and the logical column name.
 
   
 
@@ -334,7 +334,7 @@
   
   
 
-  Specifies the column name mapping between the programatic 
column name and the logical column name.
+  Specifies the column name mapping between the programmatic 
column name and the logical column name.
 
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs 
b/officecfg/registry/schema/org/openoffice/Setup.xcs
index df6e1f3..0b3ee4e 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -118,7 +118,7 @@
 
   It's the "most actual" filter, which is able to import/export
   ALL currently implemented features of this office module. It has to 
be
-  the programatic name of the filter.
+  the programmatic name of the filter.
 
   
   
diff --git a/ucb/workben/ucb/srcharg.cxx b/ucb/workben/ucb/srcharg.cxx
index f63587b..781f168 100644
--- a/ucb/workben/ucb/srcharg.cxx
+++ b/ucb/workben/ucb/srcharg.cxx
@@ -105,14 +105,14 @@ bool parseSearchArgument(String const & rInput, 
ucb::SearchInfo & rInfo)
 {
 /* Format of rInput:
 
-   argument = *option [criterium *("OR" criterium)]
+   argument = *option [criterion *("OR" criterion)]
 
option = ("--RECURSE" "=" ("NONE" / "ONE" / "DEEP"))
 / (("--BASE" / "--FOLDERVIEW" / "--DOCVIEW"
 / "--INDIRECT")
"=" bool)
 
-   criterium = "EMPTY" / (term *("AND" term))
+   criterion = "EMPTY" / (term *("AND" term))
 
term = text-term / date-term / numeric-term / bool-term
 
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index d4cf14c..0be3ecf 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -949,10 +949,10 @@ void UcbContent::open( const OUString & rName, const 
OUString& rInput,
 {
 // Sort criteria... Note that column numbering starts with 1!
 aOpenArg.SortingInfo.realloc(2);
-// primary sort criterium: column 4 --> IsFolder
+// primary sort criterion: column 4 --> IsFolder
 aOpenArg.SortingInfo[ 0 ].ColumnIndex = 4;
 aOpenArg.SortingInfo[ 0 ].Ascending   = sal_False;
-// secondary sort criterium: column 1 --> Title
+// secondary sort criterion: column 1 --> Title
 aOpenArg.SortingInfo[ 1 ].ColumnIndex = 1;
 aOpenArg.SortingInfo[ 1 ].Ascending   = sal_True;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Julien Nabet]

 sw/source/core/uibase/wrtsh/delete.cxx |   15 +--
 1 file changed, 1 insertion(+), 14 deletions(-)

New commits:
commit 6651a2493d72f2bd0613b96ee5276a1270709630
Author: Julien Nabet 
Date:   Sat May 3 20:29:26 2014 +0200

Resolves: fdo#78150 Ctrl+Backspace does not erase first character

See https://bugs.freedesktop.org/show_bug.cgi?id=78150#c1
and https://bugs.freedesktop.org/show_bug.cgi?id=78150#c2
1) there's a wrong conversion with negative number given to a xub_StrLen 
parameter, anyway it works on 4.2
2) The existing code can be simplified since we don't need to remove spaces 
before the word to delete

Change-Id: I7e2510038666018059a54ac09c1a599154084b48
Reviewed-on: https://gerrit.libreoffice.org/9245
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/core/uibase/wrtsh/delete.cxx 
b/sw/source/core/uibase/wrtsh/delete.cxx
index 0aba759..dcb9d4c 100644
--- a/sw/source/core/uibase/wrtsh/delete.cxx
+++ b/sw/source/core/uibase/wrtsh/delete.cxx
@@ -516,20 +516,7 @@ long SwWrtShell::DelPrvWord()
 if ( !IsSttWrd() ||
  !_PrvWrdForDelete() ) // #i92468#
 {
-if( IsEndWrd() )
-{
-if ( _PrvWrdForDelete() ) // #i92468#
-{
-// skip over all spaces
-short n = 0;
-while( ' ' == GetChar( false, n ))
---n;
-
-if( ++n )
-ExtendSelection( false, -n );
-}
-}
-else if( IsSttPara())
+if (IsEndWrd() || IsSttPara())
 _PrvWrdForDelete(); // #i92468#
 else
 _SttWrd();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - dictionaries

[Julien Nabet]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3c13540143d8c533ea7aa17e4db07c70eb1729f
Author: Julien Nabet 
Date:   Thu May 1 18:49:19 2014 +0200

Updated core
Project: dictionaries  55cf7aac270cac47aa66a76ef23f6a243ec2cb8f

diff --git a/dictionaries b/dictionaries
index a042ec006..55cf7aa 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a042ec0063d8f6976de5c28d12dd035b67142ad2
+Subproject commit 55cf7aac270cac47aa66a76ef23f6a243ec2cb8f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.2' - en/dialog

[Julien Nabet]

 en/dialog/en.xdl |   38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 55cf7aac270cac47aa66a76ef23f6a243ec2cb8f
Author: Julien Nabet 
Date:   Thu May 1 18:49:19 2014 +0200

Resolves: fdo#76692 LightProof: Italian translation too long in options

I also tested with French UI and German UI which had some pbs too
Also, I updated the tabindex

Change-Id: I861bea9ee2118ec4c2a698f64c03c912281447c0
(cherry picked from commit d478664ac0a8e8997d8d17a76a39d2704f7a254d)

diff --git a/en/dialog/en.xdl b/en/dialog/en.xdl
index 6e161bd..86019ce 100644
--- a/en/dialog/en.xdl
+++ b/en/dialog/en.xdl
@@ -3,24 +3,24 @@
 http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="en" dlg:left="101" 
dlg:top="52" dlg:width="196" dlg:height="72" dlg:closeable="true" 
dlg:moveable="true" dlg:withtitlebar="false">
  
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/core/data/dptabsrc.cxx |   26 +-
 sc/source/filter/xml/xmlwrap.cxx |   14 +++---
 sc/source/ui/unoobj/cellsuno.cxx |   22 +++---
 sc/source/ui/unoobj/fielduno.cxx |   12 ++--
 sc/source/ui/unoobj/styleuno.cxx |4 ++--
 5 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit 497528425499bca634c13ed5eb834559c86d948f
Author: Julien Nabet 
Date:   Fri May 9 19:20:29 2014 +0200

Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part8

Change-Id: I6d15c7869e94b8b6d92b0a4c65bbc5866a657889

diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 8a92bd5..973f009 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -1130,10 +1130,10 @@ uno::Reference SAL_CALL 
ScDPSource::getPropertySetInfo(
 { OUString(SC_UNO_DP_IGNOREEMPTY), 0,  getBooleanCppuType(),   
   0, 0 }, // for sheet data only
 { OUString(SC_UNO_DP_REPEATEMPTY), 0,  getBooleanCppuType(),   
   0, 0 }, // for sheet data only
 { OUString(SC_UNO_DP_ROWGRAND), 0,  getBooleanCppuType(),  
0, 0 },
-{ OUString(SC_UNO_DP_ROWFIELDCOUNT),0, 
getCppuType(static_cast(0)), READONLY, 0 },
-{ OUString(SC_UNO_DP_COLUMNFIELDCOUNT), 0, 
getCppuType(static_cast(0)), READONLY, 0 },
-{ OUString(SC_UNO_DP_DATAFIELDCOUNT),   0, 
getCppuType(static_cast(0)), READONLY, 0 },
-{ OUString(SC_UNO_DP_GRANDTOTAL_NAME),  0, 
getCppuType(static_cast(0)), 0, 0 },
+{ OUString(SC_UNO_DP_ROWFIELDCOUNT),0, 
cppu::UnoType::get(), READONLY, 0 },
+{ OUString(SC_UNO_DP_COLUMNFIELDCOUNT), 0, 
cppu::UnoType::get(), READONLY, 0 },
+{ OUString(SC_UNO_DP_DATAFIELDCOUNT),   0, 
cppu::UnoType::get(), READONLY, 0 },
+{ OUString(SC_UNO_DP_GRANDTOTAL_NAME),  0, 
cppu::UnoType::get(), 0, 0 },
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
 static uno::Reference aRef =
@@ -1519,17 +1519,17 @@ uno::Reference SAL_CALL 
ScDPDimension::getPropertySetIn
 {
 { OUString(SC_UNO_DP_FILTER),   0,  
getCppuType((uno::Sequence*)0), 0, 0 },
 { OUString(SC_UNO_DP_FLAGS),0,  cppu::UnoType::get(),   
 beans::PropertyAttribute::READONLY, 0 },
-{ OUString(SC_UNO_DP_FUNCTION), 0,  
getCppuType((sheet::GeneralFunction*)0),   0, 0 },
+{ OUString(SC_UNO_DP_FUNCTION), 0,  
cppu::UnoType::get(),   0, 0 },
 { OUString(SC_UNO_DP_ISDATALAYOUT), 0,  getBooleanCppuType(),  
beans::PropertyAttribute::READONLY, 0 },
 { OUString(SC_UNO_DP_NUMBERFO), 0,  cppu::UnoType::get(),   
 beans::PropertyAttribute::READONLY, 0 },
-{ OUString(SC_UNO_DP_ORIENTATION), 0,  
getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 },
+{ OUString(SC_UNO_DP_ORIENTATION), 0,  
cppu::UnoType::get(), 0, 0 },
 { OUString(SC_UNO_DP_ORIGINAL), 0,  
getCppuType((uno::Reference*)0), 
beans::PropertyAttribute::READONLY, 0 },
 { OUString(SC_UNO_DP_ORIGINAL_POS), 0, 
cppu::UnoType::get(), 0, 0 },
 { OUString(SC_UNO_DP_POSITION), 0,  cppu::UnoType::get(),   
 0, 0 },
-{ OUString(SC_UNO_DP_REFVALUE), 0,  
getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 },
+{ OUString(SC_UNO_DP_REFVALUE), 0,  
cppu::UnoType::get(), 0, 0 },
 { OUString(SC_UNO_DP_USEDHIERARCHY), 0,  
cppu::UnoType::get(),0, 0 },
-{ OUString(SC_UNO_DP_LAYOUTNAME), 0, 
getCppuType(static_cast(0)), 0, 0 },
-{ OUString(SC_UNO_DP_FIELD_SUBTOTALNAME), 0, 
getCppuType(static_cast(0)), 0, 0 },
+{ OUString(SC_UNO_DP_LAYOUTNAME), 0, cppu::UnoType::get(), 
0, 0 },
+{ OUString(SC_UNO_DP_FIELD_SUBTOTALNAME), 0, 
cppu::UnoType::get(), 0, 0 },
 { OUString(SC_UNO_DP_HAS_HIDDEN_MEMBER), 0, getBooleanCppuType(), 0, 0 
},
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
@@ -,10 +,10 @@ uno::Reference SAL_CALL 
ScDPLevel::getPropertySetInfo()
 static const SfxItemPropertyMapEntry aDPLevelMap_Impl[] =
 {
 //! change type of AutoShow/Layout/Sorting to API struct when available
-{ OUString(SC_UNO_DP_AUTOSHOW), 0,  
getCppuType((sheet::DataPilotFieldAutoShowInfo*)0), 0, 0 },
-{ OUString(SC_UNO_DP_LAYOUT),   0,  
getCppuType((sheet::DataPilotFieldLayoutInfo*)0),   0, 0 },
+{ OUString(SC_UNO_DP_AUTOSHOW), 0,  
cppu::UnoType::get(), 0, 0 },
+{ OUString(SC_UNO_DP_LAYOUT),   0,  
cppu::UnoType::get(),   0, 0 },
 { OUString(SC_UNO_DP_SHOWEMPTY), 0, getBooleanCppuType(),  
 0, 0 },
-{ OUString(SC_UNO_DP_SORTING),  0,  
getCppuType((sheet::DataPilotFieldSortInfo*)0), 0, 0 },
+{ OUString(SC_UNO_DP_SORTING),  0,  
cppu::UnoType::get(), 0, 0 },
 { OUString(SC_UNO_DP_SUBTOTAL), 0,  
getCppuType((uno::Sequence*)0), 0, 0

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7a5b0aa0a667ae2ac2d198a37bc3146c5c8e4067
Author: Julien Nabet 
Date:   Sat May 10 06:32:55 2014 +0200

Blind fix for red Tinderboxes

Change-Id: I9465943a7e3c0d485e8692e3e1ea0b258d67d120

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 51942ef..4d54397 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -224,7 +224,8 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, 
sal_Int32 startPos, sal_
 len = 0;
 }
 if (i < nCount) {
-if (doDecimal = (!doDecimal && i < nCount-1 && 
isDecimal(str[i]) && isNumber(str[i+1])))
+doDecimal = (!doDecimal && i < nCount-1 && 
isDecimal(str[i]) && isNumber(str[i+1]));
+if (doDecimal)
 newStr[count] = (DecimalChar[number->number] ? 
DecimalChar[number->number] : str[i]);
 else if (i < nCount-1 && isMinus(str[i]) && 
isNumber(str[i+1]))
 newStr[count] = (MinusChar[number->number] ? 
MinusChar[number->number] : str[i]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppcanvas/source

[Julien Nabet]

 cppcanvas/source/mtfrenderer/implrenderer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c0ec2a1dd1b4f8ca4d72124ee97ee4076636845
Author: Julien Nabet 
Date:   Sat May 10 06:57:15 2014 +0200

Blind fix for red Tinderboxes, following

Change-Id: I590a682af7fc1879ae63cda3aea73063ba4c84f4

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 5b8c437..7d2a6bc 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -92,8 +92,8 @@ namespace
   uno::Sequence< 
double >&  rColorSequence,
   const 
cppcanvas::CanvasSharedPtr& rCanvas )
 {
-// set rIsColorSet and check for true at the same time
-if (rIsColorSet = pAct->IsSetting())
+rIsColorSet = pAct->IsSetting();
+if (rIsColorSet)
 {
 ::Color aColor( pAct->GetColor() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Julien Nabet]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a784cdbd38cb03d2881096e2540fccdaf8b6a24a
Author: Julien Nabet 
Date:   Sat May 10 13:28:35 2014 +0200

Updated core
Project: dictionaries  b76a214cc1e5c52cc0f012888b25aaa3b3b4e032

diff --git a/dictionaries b/dictionaries
index d478664..b76a214 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit d478664ac0a8e8997d8d17a76a39d2704f7a254d
+Subproject commit b76a214cc1e5c52cc0f012888b25aaa3b3b4e032
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: pt_BR/dialog

[Julien Nabet]

 pt_BR/dialog/pt_BR.xdl |   56 -
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit b76a214cc1e5c52cc0f012888b25aaa3b3b4e032
Author: Julien Nabet 
Date:   Sat May 10 13:28:35 2014 +0200

Resolves: fdo#78524 Some wrong display on Portuguese grammar checking

I also updated tabindex

Change-Id: I43014eb16e2a262bfc5f5cc3c2557a869d7c4cc2

diff --git a/pt_BR/dialog/pt_BR.xdl b/pt_BR/dialog/pt_BR.xdl
index 942defe..148dc25 100644
--- a/pt_BR/dialog/pt_BR.xdl
+++ b/pt_BR/dialog/pt_BR.xdl
@@ -3,33 +3,33 @@
 http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="pt_BR" dlg:left="101" 
dlg:top="52" dlg:width="196" dlg:height="72" dlg:closeable="true" 
dlg:moveable="true" dlg:withtitlebar="false">
  
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - dictionaries

[Julien Nabet]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 288155a188643d296ed09ccc6435dab04f3eb04a
Author: Julien Nabet 
Date:   Sat May 10 13:28:35 2014 +0200

Updated core
Project: dictionaries  5666484298c4252e56d32fa630ecde93e44d54d3

diff --git a/dictionaries b/dictionaries
index 06217fb..5666484 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 06217fb7e4e03bca013563558c61cc10b8437eb7
+Subproject commit 5666484298c4252e56d32fa630ecde93e44d54d3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-2' - pt_BR/dialog

[Julien Nabet]

 pt_BR/dialog/pt_BR.xdl |   56 -
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 5666484298c4252e56d32fa630ecde93e44d54d3
Author: Julien Nabet 
Date:   Sat May 10 13:28:35 2014 +0200

Resolves: fdo#78524 Some wrong display on Portuguese grammar checking

I also updated tabindex

Change-Id: I43014eb16e2a262bfc5f5cc3c2557a869d7c4cc2
(cherry picked from commit b76a214cc1e5c52cc0f012888b25aaa3b3b4e032)

diff --git a/pt_BR/dialog/pt_BR.xdl b/pt_BR/dialog/pt_BR.xdl
index 942defe..148dc25 100644
--- a/pt_BR/dialog/pt_BR.xdl
+++ b/pt_BR/dialog/pt_BR.xdl
@@ -3,33 +3,33 @@
 http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="pt_BR" dlg:left="101" 
dlg:top="52" dlg:width="196" dlg:height="72" dlg:closeable="true" 
dlg:moveable="true" dlg:withtitlebar="false">
  
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source

[Julien Nabet]

 extensions/source/bibliography/toolbar.cxx |2 +-
 extensions/source/plugin/base/plmodel.cxx  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8d471d4b373b5d862b5b49814f04ded85e828be9
Author: Julien Nabet 
Date:   Sun May 11 10:24:46 2014 +0200

Fix previous commit (extensions part)

Change-Id: I942cca3639e4d823415da557262e35432a798d04

diff --git a/extensions/source/bibliography/toolbar.cxx 
b/extensions/source/bibliography/toolbar.cxx
index e8d8349..3db37df 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -172,7 +172,7 @@ void BibTBEditListener::statusChanged(const 
frame::FeatureStateEvent& rEvt)throw
 pToolBar->EnableQuery(rEvt.IsEnabled);
 
 uno::Any aState=rEvt.State;
-if(aState.getValueType()==::cppu::UnoType::get()0))
+if(aState.getValueType()== ::cppu::UnoType::get())
 {
 OUString aStr = *(OUString*) aState.getValue();
 pToolBar->SetQueryString(aStr);
diff --git a/extensions/source/plugin/base/plmodel.cxx 
b/extensions/source/plugin/base/plmodel.cxx
index 0ed2b51..befe3a9 100644
--- a/extensions/source/plugin/base/plmodel.cxx
+++ b/extensions/source/plugin/base/plmodel.cxx
@@ -71,12 +71,12 @@ static ::com::sun::star::beans::Property aProps[] =
 ::com::sun::star::beans::Property(
 OUString::createFromAscii( aMime ),
 1,
-::cppu::UnoType::get()0),
+::cppu::UnoType::get(),
 ::com::sun::star::beans::PropertyAttribute::BOUND ),
 ::com::sun::star::beans::Property(
 OUString::createFromAscii( aCreationURL ),
 2,
-::cppu::UnoType::get()0),
+::cppu::UnoType::get(),
 ::com::sun::star::beans::PropertyAttribute::BOUND )
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scripting/source

[Julien Nabet]

 scripting/source/provider/URIHelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3d01ad33689168d46969fd5d8fb432e03a0b41b
Author: Julien Nabet 
Date:   Sun May 11 10:37:30 2014 +0200

Fix previous commit (scripting part)

Change-Id: Ib451642924909c11db4252e81d0c6db690c0e838

diff --git a/scripting/source/provider/URIHelper.cxx 
b/scripting/source/provider/URIHelper.cxx
index b0a5204..a8498b3 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -86,8 +86,8 @@ ScriptingFrameworkURIHelper::initialize(
 throw ( uno::Exception, uno::RuntimeException, std::exception )
 {
 if ( args.getLength() != 2 ||
- args[0].getValueType() != ::cppu::UnoType::get()NULL) ||
- args[1].getValueType() != ::cppu::UnoType::get()NULL) )
+ args[0].getValueType() != ::cppu::UnoType::get() ||
+ args[1].getValueType() != ::cppu::UnoType::get() )
 {
 throw uno::RuntimeException( OUString(
 "ScriptingFrameworkURIHelper got invalid argument list" ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx

[Julien Nabet]

 vcl/unx/generic/dtrans/X11_selection.cxx|8 
 vcl/unx/generic/dtrans/X11_transferable.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e42f2fa5e338ed57a1466c5ac6fd0959aaca72a8
Author: Julien Nabet 
Date:   Sun May 11 10:39:55 2014 +0200

Fix previous commit (vcl part)

Change-Id: Ic46dae26076b87b0ef021c926604cbb2dfe6e198

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx 
b/vcl/unx/generic/dtrans/X11_selection.cxx
index a26b289..d505fc2 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -615,7 +615,7 @@ bool SelectionManager::convertData(
 if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( 
"text/plain" ) )
 {
 if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( 
"charset=utf-16" ) )
-aFlavor.DataType = cppu::UnoType::get() 0 );
+aFlavor.DataType = cppu::UnoType::get();
 else
 aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
 }
@@ -649,7 +649,7 @@ bool SelectionManager::convertData(
 if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText )
 {
 aFlavor.MimeType = "text/plain;charset=utf-16";
-aFlavor.DataType = cppu::UnoType::get() 0 );
+aFlavor.DataType = cppu::UnoType::get();
 if( xTransferable->isDataFlavorSupported( aFlavor ) )
 {
 Any aValue( xTransferable->getTransferData( aFlavor ) );
@@ -1331,7 +1331,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, 
Sequence< DataFlavor >
 if( aToken.equalsAscii( "charset=utf-16" ) )
 {
 bHaveUTF16 = true;
-pFlavors->DataType = cppu::UnoType::get()0 );
+pFlavors->DataType = cppu::UnoType::get();
 }
 else if( aToken.equalsAscii( "charset=utf-8" ) )
 {
@@ -1356,7 +1356,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, 
Sequence< DataFlavor >
 for( i = 0; i < nNewFlavors-1; i++ )
 aTemp.getArray()[i+1] = rTypes.getConstArray()[i];
 aTemp.getArray()[0].MimeType = "text/plain;charset=utf-16";
-aTemp.getArray()[0].DataType = cppu::UnoType::get()0 );
+aTemp.getArray()[0].DataType = cppu::UnoType::get();
 rTypes = aTemp;
 
 std::vector< Atom > aNativeTemp( nNewFlavors );
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx 
b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 59cf9ad..55c5092 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -95,7 +95,7 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( 
const DataFlavor& aFla
 if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
 {
 if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( 
"text/plain;charset=utf-16" ) &&
-aFlavor.DataType == cppu::UnoType::get()0 ) )
+aFlavor.DataType == cppu::UnoType::get() )
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/source svx/source

[Julien Nabet]

 chart2/source/model/filter/XMLFilter.cxx |   20 ++--
 chart2/source/model/main/ChartModel.cxx  |2 +-
 chart2/source/tools/ErrorBar.cxx |8 
 svx/source/unogallery/unogalitem.cxx |4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 8a725a02b58e525e05e4d93363f1c5c5d5a42003
Author: Julien Nabet 
Date:   Sun May 11 10:51:34 2014 +0200

Fix previous commit (svx part)

Change-Id: I58fb2aca452935c04c498ee63c3b4060b1ebc50e

diff --git a/svx/source/unogallery/unogalitem.cxx 
b/svx/source/unogallery/unogalitem.cxx
index b761d8c..284a734 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -226,10 +226,10 @@ sal_Int8 SAL_CALL GalleryItem::getType()
 { OUString("GalleryItemType"), UNOGALLERY_GALLERYITEMTYPE, 
::getCppuType( (const sal_Int8*)(0)),
   beans::PropertyAttribute::READONLY, 0 },
 
-{ OUString("URL"), UNOGALLERY_URL, 
::cppu::UnoType::get()(0)),
+{ OUString("URL"), UNOGALLERY_URL, ::cppu::UnoType::get(),
   beans::PropertyAttribute::READONLY, 0 },
 
-{ OUString("Title"), UNOGALLERY_TITLE, 
::cppu::UnoType::get()(0)),
+{ OUString("Title"), UNOGALLERY_TITLE, 
::cppu::UnoType::get(),
   0, 0 },
 
 { OUString("Thumbnail"), UNOGALLERY_THUMBNAIL, ::getCppuType( (const 
uno::Reference< graphic::XGraphic >*)(0)),
commit a1e41fc3d18816b25f7d26bf05eb548ec22309aa
Author: Julien Nabet 
Date:   Sun May 11 10:44:13 2014 +0200

Fix previous commit (chart2 part)

Change-Id: I9d6491f484eb2a8989b7e3594ca2edf702557b12

diff --git a/chart2/source/model/filter/XMLFilter.cxx 
b/chart2/source/model/filter/XMLFilter.cxx
index 5bbfa39..32f0419 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -335,23 +335,23 @@ sal_Int32 XMLFilter::impl_Import(
 comphelper::PropertyMapEntry const aImportInfoMap[] =
 {
 // necessary properties for XML progress bar at load time
-{ OUString("ProgressRange"),   0, 
::cppu::UnoType::get()0), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("ProgressMax"), 0, 
::cppu::UnoType::get()0), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("ProgressCurrent"), 0, 
::cppu::UnoType::get()0), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("ProgressRange"),   0, 
::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("ProgressMax"), 0, 
::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("ProgressCurrent"), 0, 
::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("PrivateData"), 0,
 ::getCppuType( (Reference *)0 ),
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("BaseURI"), 0,
-::cppu::UnoType::get()0 ),
+::cppu::UnoType::get(),
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("StreamRelPath"), 0,
-::cppu::UnoType::get()0 ),
+::cppu::UnoType::get(),
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("StreamName"), 0,
-::cppu::UnoType::get()0 ),
+::cppu::UnoType::get(),
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("BuildId"), 0,
-::cppu::UnoType::get()0 ),
+::cppu::UnoType::get(),
 ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
@@ -609,9 +609,9 @@ sal_Int32 XMLFilter::impl_Export(
 comphelper::PropertyMapEntry const aExportInfoMap[] =
 {
 { OUString("UsePrettyPrinting"), 0, ::getBooleanCppuType(), 
beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("BaseURI"), 0, ::cppu::UnoType::get()0 ), 
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString("StreamRelPath"), 0, ::cppu::UnoType::get()0 
), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString("StreamName"), 0, ::cppu::UnoType::get()0 ), 
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("BaseURI"), 0, ::cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("StreamRelPath"), 0, ::cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("StreamName"

[Libreoffice-commits] core.git: vcl/osx

[Julien Nabet]

 vcl/osx/DataFlavorMapping.cxx |6 +++---
 vcl/osx/OSXTransferable.cxx   |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 592b61e17c2ef5181211396123f18c501362b31d
Author: Julien Nabet 
Date:   Sun May 11 10:57:54 2014 +0200

Fix previous commit (vcl/MacOsX part)

Change-Id: I65998a01943eeb41fd8ee4f1ed5fe2eb91b1

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index f54b28a..95584bb 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -53,7 +53,7 @@ namespace // private
   {
 size_t len = aFlavor.MimeType.getLength();
 Type dtype = aFlavor.DataType;
-return ((len > 0) && ((dtype == getCppuType((Sequence*)0)) || 
(dtype == cppu::UnoType::get()0 ;
+return ((len > 0) && ((dtype == getCppuType((Sequence*)0)) || 
(dtype == cppu::UnoType::get(;
   }
 
   OUString NSStringToOUString( const NSString* cfString)
@@ -137,7 +137,7 @@ namespace // private
 
   inline bool isOUStringType(const Type& theType)
   {
-return (theType == cppu::UnoType::get()0 ));
+return (theType == cppu::UnoType::get() );
   }
 
 } // namespace private
@@ -486,7 +486,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( 
const NSString* systemDat
 {
   oOOFlavor.MimeType = 
OUString::createFromAscii(flavorMap[i].OOoFlavor);
   oOOFlavor.HumanPresentableName = 
OUString::createFromAscii(flavorMap[i].HumanPresentableName);
-  oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? 
cppu::UnoType::get()0 ) : getCppuType((Sequence*)0);
+  oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? 
cppu::UnoType::get() : getCppuType((Sequence*)0);
   return oOOFlavor;
 }
 } // for
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 2eb0236..289f548 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -38,7 +38,7 @@ namespace // private
 {
   size_t len = aFlavor.MimeType.getLength();
   Type dtype = aFlavor.DataType;
-  return ((len > 0) && ((dtype == getCppuType((Sequence*)0)) || 
(dtype == cppu::UnoType::get()0;
+  return ((len > 0) && ((dtype == getCppuType((Sequence*)0)) || 
(dtype == cppu::UnoType::get(;
 }
 
 } // namespace private
@@ -98,7 +98,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const 
DataFlavor& aFlavor )
 
 bool OSXTransferable::isUnicodeText(const DataFlavor& flavor)
 {
-  return (flavor.DataType == cppu::UnoType::get()0));
+  return (flavor.DataType == cppu::UnoType::get());
 }
 
 Sequence< DataFlavor > SAL_CALL OSXTransferable::getTransferDataFlavors(  )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source

[Julien Nabet]

 extensions/source/ole/unoconversionutilities.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5423e45f34ae3adc7dae0f2bdeb158fa90ba5a0e
Author: Julien Nabet 
Date:   Sun May 11 11:06:17 2014 +0200

Fix previous commit (extensions part, second)

Change-Id: Iac6c801478a583346c8358456b788a0085158981

diff --git a/extensions/source/ole/unoconversionutilities.hxx 
b/extensions/source/ole/unoconversionutilities.hxx
index aaa80d3..d8b12f5 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1488,7 +1488,7 @@ void UnoConversionUtilities::variantToAny( const 
VARIANT* pVariant, Any& rAny
 rAny.setValue(NULL, Type());
 break;
 case VT_I2:
-rAny.setValue( & var.iVal, 
cppu::UnoType::get()0));
+rAny.setValue( & var.iVal, 
cppu::UnoType::get());
 break;
 case VT_I4:
 rAny.setValue( & var.lVal, 
cppu::UnoType::get());
@@ -2403,7 +2403,7 @@ inline void reduceRange( Any& any)
 else if( value <= 0x7fff && value >= -0x8000)
 {// -32768 bis 32767
 sal_Int16 shortVal= static_cast( value);
-any.setValue( &shortVal, cppu::UnoType::get()0));
+any.setValue( &shortVal, cppu::UnoType::get());
 }
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet]

 dbaccess/source/core/dataaccess/databasedocument.cxx |6 +++---
 dbaccess/source/ui/browser/exsrcbrw.cxx  |4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3bd0b2ef2d3a1e16d226f1ea8789bc119dcd2f54
Author: Julien Nabet 
Date:   Sun May 11 11:11:03 2014 +0200

Fix previous commit (dbaccess part)

Change-Id: I0815cb6334ab47dbe9f5029fe553457de00c5ad5

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 2b8e2cf..7ff3492 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -482,9 +482,9 @@ namespace
 /** property map for import/exmport info set */
 comphelper::PropertyMapEntry const aExportInfoMap[] =
  {
-{ OUString("BaseURI"), 0, ::cppu::UnoType::get()0 
),beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString("StreamName"), 0, ::cppu::UnoType::get()0 
),beans::PropertyAttribute::MAYBEVOID, 0 },
-{ OUString("UsePrettyPrinting"), 0, 
::cppu::UnoType::get()0), beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("BaseURI"), 0, ::cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("StreamName"), 0, ::cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString("UsePrettyPrinting"), 0, ::cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString(), 0, css::uno::Type(), 0, 0 }
  };
 }
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx 
b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 1dbfcdb..44b9d13 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -143,14 +143,14 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const 
::com::sun::star::util::U
 {
 if ( pArguments->Name == "ColumnType" )
 {
-bool bCorrectType = 
pArguments->Value.getValueType().equals(::cppu::UnoType::get()0));
+bool bCorrectType = 
pArguments->Value.getValueType().equals(::cppu::UnoType::get());
 OSL_ENSURE(bCorrectType, "invalid type for argument 
\"ColumnType\" !");
 if (bCorrectType)
 sControlType = ::comphelper::getString(pArguments->Value);
 }
 else if ( pArguments->Name == "ColumnPosition" )
 {
-bool bCorrectType = 
pArguments->Value.getValueType().equals(::cppu::UnoType::get()0));
+bool bCorrectType = 
pArguments->Value.getValueType().equals(::cppu::UnoType::get());
 OSL_ENSURE(bCorrectType, "invalid type for argument 
\"ColumnPosition\" !");
 if (bCorrectType)
 nControlPos = ::comphelper::getINT16(pArguments->Value);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/filter/xml/xmlwrap.cxx |2 +-
 sc/source/ui/unoobj/shapeuno.cxx |2 +-
 sc/source/ui/unoobj/styleuno.cxx |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit df521e3d966cf53449c5a9558fbc30ca0f71a65b
Author: Julien Nabet 
Date:   Sun May 11 11:29:16 2014 +0200

Fix previous commit (sc part)

Change-Id: I1ec7b34c4ac31a5e84e217177a7fb08dfae052d6

diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index edeb9d1..6dea493 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -781,7 +781,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly)
 { OUString("ProgressMax"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("ProgressCurrent"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("WrittenNumberStyles"), 0, 
::getCppuType((uno::Sequence*)0), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("UsePrettyPrinting"), 0, 
::cppu::UnoType::get()0), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("UsePrettyPrinting"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("BaseURI"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("StreamRelPath"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
 { OUString("StreamName"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 8987fb5..3d9eeb6 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -54,7 +54,7 @@ static const SfxItemPropertyMapEntry* lcl_GetShapeMap()
 {OUString(SC_UNONAME_HORIPOS), 0, cppu::UnoType::get(), 0, 
0 },
 {OUString(SC_UNONAME_IMAGEMAP), 0, 
getCppuType((uno::Reference*)0), 0, 0 },
 {OUString(SC_UNONAME_VERTPOS), 0, cppu::UnoType::get(), 0, 
0 },
-{OUString(SC_UNONAME_MOVEPROTECT), 0, 
cppu::UnoType::get()0), 0, 0 },
+{OUString(SC_UNONAME_MOVEPROTECT), 0, cppu::UnoType::get(), 
0, 0 },
 // #i66550 HLINK_FOR_SHAPES
 {OUString(SC_UNONAME_HYPERLINK), 0, cppu::UnoType::get(), 0, 
0 },
 {OUString(SC_UNONAME_URL), 0, cppu::UnoType::get(), 0, 0 },
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index ba214ac..712ef01 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -158,7 +158,7 @@ static const SfxItemPropertySet* lcl_GetCellStyleSet()
 {OUString(SC_UNONAME_CELLVJUS), ATTR_VER_JUSTIFY,   
::cppu::UnoType::get(),0, 0 },
 {OUString(SC_UNONAME_CELLVJUS_METHOD), ATTR_VER_JUSTIFY_METHOD, 
::cppu::UnoType::get(),   0, 0 },
 {OUString(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,
cppu::UnoType::get(),0, 0 },
-{OUString(SC_UNONAME_HIDDEN),   ATTR_HIDDEN,
cppu::UnoType::get()0), 0, 0 },
+{OUString(SC_UNONAME_HIDDEN),   ATTR_HIDDEN,
cppu::UnoType::get(), 0, 0 },
 {OUString(SC_UNONAME_HYPERLINK),  ATTR_HYPERLINK, 
cppu::UnoType::get(),0, 0 },
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
@@ -280,7 +280,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet()
 {OUString(SC_UNONAME_USERDEF),  ATTR_USERDEF,   
getCppuType((uno::Reference*)0), 0, 0 },
 {OUString(SC_UNO_PAGE_WIDTH),   ATTR_PAGE_SIZE, 
::cppu::UnoType::get(),0, MID_SIZE_WIDTH | CONVERT_TWIPS 
},
 {OUString(SC_UNONAME_WRITING),  ATTR_WRITINGDIR,
cppu::UnoType::get(),0, 0 },
-{OUString(SC_UNONAME_HIDDEN),   ATTR_HIDDEN,
cppu::UnoType::get()0), 0, 0 },
+{OUString(SC_UNONAME_HIDDEN),   ATTR_HIDDEN,
cppu::UnoType::get(), 0, 0 },
 { OUString(), 0, css::uno::Type(), 0, 0 }
 };
 static SfxItemPropertySet aPageStyleSet_Impl( aPageStyleMap_Impl );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppuhelper/test sd/source

[Julien Nabet]

 cppuhelper/test/testpropshlp.cxx  |8 
 sd/source/filter/xml/sdxmlwrp.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 68e7692d2a961f319bb4f4d0f2d756e6f0e90d1d
Author: Julien Nabet 
Date:   Sun May 11 11:34:09 2014 +0200

Fix previous commit

Change-Id: Iebd7674cc8afb547821878dd1565b0f300d22f1f

diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index af2bcad..90145e3 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -56,7 +56,7 @@ static Property * getPropertyTable1()
  PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ), //OUString
 Property( OUString("b"), 1, getCppuCharType( ) ,
  PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ), //Char
-Property( OUString("c"), 2, cppu::UnoType::get()0) ,
+Property( OUString("c"), 2, cppu::UnoType::get(),
  PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ), //sal_Int32
 Property( OUString("d"), 5, getCppuType( (double*)0) ,
  PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ), //double
@@ -89,7 +89,7 @@ static Property * getPropertyTable2()
 PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ),   // OUString
 Property( OUString("d"), 5, getCppuType( (double*)0) ,
 PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ),   // Double
-Property( OUString("c"), 2, cppu::UnoType::get()0),
+Property( OUString("c"), 2, cppu::UnoType::get(),
 PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID ),   // sal_Int32
 Property( OUString("e"), 7, getCppuBooleanType() ,
 PropertyAttribute::READONLY | 
PropertyAttribute::MAYBEVOID )// Bool
@@ -411,8 +411,8 @@ Property * getBasicProps()
  Property( OUString("BOOL")  , PROPERTY_BOOL , 
getCppuBooleanType(), PropertyAttribute::READONLY ),
  Property( OUString("INT16") , PROPERTY_INT16,
  getCppuType( (sal_Int16*)0 ),  
PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
- Property( OUString("INT32") , PROPERTY_INT32, 
cppu::UnoType::get()0 ), PropertyAttribute::BOUND ),
- Property( OUString("TEST")  , 55, 
cppu::UnoType::get()0),  PropertyAttribute::BOUND )
+ Property( OUString("INT32") , PROPERTY_INT32, 
cppu::UnoType::get(), PropertyAttribute::BOUND ),
+ Property( OUString("TEST")  , 55, 
cppu::UnoType::get(),  PropertyAttribute::BOUND )
 };
 pTable = aBasicProps;
 }
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 4b6d092..680e865 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -444,7 +444,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
 { OUString("ProgressRange"),   0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("ProgressMax"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("ProgressCurrent"), 0, ::cppu::UnoType::get(), 
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
-{ OUString("Preview"), 0, ::cppu::UnoType::get()0),  
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+{ OUString("Preview"), 0, ::cppu::UnoType::get(),  
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("PageLayouts"), 0, ::getCppuType((const uno::Reference< 
container::XNameAccess >*)0),  
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
 { OUString("PrivateData"), 0,
   ::getCppuType( (Reference *)0 ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Julien Nabet]

 sd/source/ui/animations/CustomAnimationDialog.cxx |2 +-
 sd/source/ui/animations/CustomAnimationPane.cxx   |2 +-
 sd/source/ui/unoidl/unopage.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1b0661c82e4c3d55fed1e7313c230c8e78e9b085
Author: Julien Nabet 
Date:   Sun May 11 11:36:48 2014 +0200

Fix previous commit

Change-Id: Id9d59f73d3526114b295c75dadf908234ca5f54b

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 7318bf2..ae0fea1 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1349,7 +1349,7 @@ 
CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con
 
 const Any aValue( pSet->getPropertyValue( nHandleSoundURL ) );
 
-if( aValue.getValueType() == ::cppu::UnoType::get()0) )
+if( aValue.getValueType() == ::cppu::UnoType::get() )
 {
 nPos = 1;
 }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 7e3a2c8..457e2de 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1354,7 +1354,7 @@ void CustomAnimationPane::changeSelection( 
STLPropertySet* pResultSet, STLProper
 {
 const Any aSoundSource( pResultSet->getPropertyValue( 
nHandleSoundURL ) );
 
-if( aSoundSource.getValueType() == 
::cppu::UnoType::get()0) )
+if( aSoundSource.getValueType() == 
::cppu::UnoType::get() )
 {
 pEffect->setStopAudio();
 bChanged = true;
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 1fa1e58..35fcd9a 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -140,7 +140,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool 
bImpress, PageKind eP
 { OUString("DateTimeFormat"),   WID_PAGE_DATETIMEFORMAT, 
::cppu::UnoType::get(),   0,  0},
 { OUString("TransitionType"),   WID_TRANSITION_TYPE, 
::cppu::UnoType::get(),   0,  0},
 { OUString("TransitionSubtype"),WID_TRANSITION_SUBTYPE, 
::cppu::UnoType::get(),0,  0},
-{ OUString("TransitionDirection"),  WID_TRANSITION_DIRECTION, 
::cppu::UnoType::get()0),   0,  0},
+{ OUString("TransitionDirection"),  WID_TRANSITION_DIRECTION, 
::cppu::UnoType::get(),   0,  0},
 { OUString("TransitionFadeColor"),  WID_TRANSITION_FADE_COLOR, 
::cppu::UnoType::get(), 0,  0},
 { OUString("TransitionDuration"),   WID_TRANSITION_DURATION, 
::cppu::UnoType::get(),  0,  0},
 { OUString("LoopSound"),WID_LOOP_SOUND, 
::getBooleanCppuType(),0, 0},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/source

[Julien Nabet]

 reportdesign/source/core/api/ReportDefinition.cxx |   64 +++---
 1 file changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 7347a8ed38fb1494fde6f0bfc5a61bbc7135c790
Author: Julien Nabet 
Date:   Sun May 11 11:42:01 2014 +0200

Fix previous commit (reportdesign part)

Change-Id: I490326abccac237bd70209d2a3dd623ebd5c59a2

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 4d3bc94..2eaff03 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -304,85 +304,85 @@ OStyle::OStyle()
 sal_Int32 i = 0;
 registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( 
static_cast< OUString *>(NULL) ), &sName );
 
-registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::cppu::UnoType::get()0) ,&nTransparent);
+registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::cppu::UnoType::get(), &nTransparent);
 
 registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,  
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
 registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,  
++i,nBound,::getBooleanCppuType() ,&bTrue);
-registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,  
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,  
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::cppu::UnoType::get()0) ,&nMargin);
+registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::cppu::UnoType::get(), &nMargin);
 registerPropertyNoMember("DisplayName",   
++i,nBound,::getCppuType((OUString*)0) ,&sEmpty);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,  
++i,nBound,::cppu::UnoType::get()0) ,&nTransparent);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,  
++i,nBound,::cppu::UnoType::get(), &nTransparent);
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT,  
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC,   
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL,   
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, 
++i,nBound,::getBooleanCppuType() ,&bTrue);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,  
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,  
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,   
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,   
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC,  
++i,nBound,::getBooleanCppuType() ,&bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRON,   
++i,nBound,::getBooleanCppuType() ,&bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED,   
++i,nBound,::getBooleanCppuType() ,&bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,  
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,  
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, 
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType::get()0)
 ,&nZero);
-registerProperty

[Libreoffice-commits] core.git: reportdesign/source

[Julien Nabet]

 reportdesign/source/ui/inspection/DataProviderHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4d30abf39e2834043a4c6b49583e5e86e6e205e
Author: Julien Nabet 
Date:   Sun May 11 11:47:08 2014 +0200

Fix previous commit (reportdesign part, following)

Change-Id: Ib55bdc21fa6081c55777465115538905c1cab5e0

diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx 
b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 03ba432..9e61350 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -303,7 +303,7 @@ uno::Any SAL_CALL 
DataProviderHandler::convertToPropertyValue(const OUString & _
 case PROPERTY_ID_PREVIEW_COUNT:
 try
 {
-aPropertyValue = m_xTypeConverter->convertTo( _rControlValue, 
::cppu::UnoType::get()0));
+aPropertyValue = m_xTypeConverter->convertTo( _rControlValue, 
::cppu::UnoType::get());
 }
 catch( const uno::Exception& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - dictionaries

[Julien Nabet]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2535f5a60cec6c395690c516921f1780c4e300af
Author: Julien Nabet 
Date:   Sat May 10 13:28:35 2014 +0200

Updated core
Project: dictionaries  c7f9fbd1c238b0bd78b0f5732e5ac72b230b4345

diff --git a/dictionaries b/dictionaries
index 55cf7aa..c7f9fbd 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 55cf7aac270cac47aa66a76ef23f6a243ec2cb8f
+Subproject commit c7f9fbd1c238b0bd78b0f5732e5ac72b230b4345
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.2' - pt_BR/dialog

[Julien Nabet]

 pt_BR/dialog/pt_BR.xdl |   56 -
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit c7f9fbd1c238b0bd78b0f5732e5ac72b230b4345
Author: Julien Nabet 
Date:   Sat May 10 13:28:35 2014 +0200

Resolves: fdo#78524 Some wrong display on Portuguese grammar checking

I also updated tabindex

Change-Id: I43014eb16e2a262bfc5f5cc3c2557a869d7c4cc2
(cherry picked from commit b76a214cc1e5c52cc0f012888b25aaa3b3b4e032)

diff --git a/pt_BR/dialog/pt_BR.xdl b/pt_BR/dialog/pt_BR.xdl
index 942defe..148dc25 100644
--- a/pt_BR/dialog/pt_BR.xdl
+++ b/pt_BR/dialog/pt_BR.xdl
@@ -3,33 +3,33 @@
 http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="pt_BR" dlg:left="101" 
dlg:top="52" dlg:width="196" dlg:height="72" dlg:closeable="true" 
dlg:moveable="true" dlg:withtitlebar="false">
  
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Julien Nabet]

 cui/source/tabpages/autocdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43237fcd90d9f62198743f4a48132ef556abe05d
Author: Julien Nabet 
Date:   Sun May 11 14:16:44 2014 +0200

Revert "Resolves: fdo#78217 selected text should be copied in "Replace""

This reverts commit e4d61b3c556189bf0733ab6e7bedaf975427a35a.

See discussion https://bugs.freedesktop.org/show_bug.cgi?id=78217

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 5e41c3a..1ac62ea 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1063,7 +1063,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool 
bFromReset,
 {
 bHasSelectionText = true;
 const OUString sSelection( pViewShell->GetSelectionText() );
-m_pShortED->SetText( sSelection );
+m_pReplaceED->SetText( sSelection );
 m_pTextOnlyCB->Check( !bSWriter );
 m_pTextOnlyCB->Enable( bSWriter && !sSelection.isEmpty() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-3'

[Julien Nabet]

Tag 'cp-4.2-3' created by Andras Timar  at 
2014-05-11 18:38 +0200

cp-4.2-3

Changes since cp-4.2-2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlc/source

[Julien Nabet]

 mysqlc/source/mysqlc_propertyids.hxx |   15 ---
 mysqlc/source/mysqlc_resultset.cxx   |   13 -
 mysqlc/source/mysqlc_statement.cxx   |   20 ++--
 3 files changed, 18 insertions(+), 30 deletions(-)

New commits:
commit aa214079b4e9df493b57fbf815460b7164225f2b
Author: Julien Nabet 
Date:   Sun May 11 22:50:37 2014 +0200

Kill DECL_PROP1IMPL and related

See 
http://nabble.documentfoundation.org/About-removing-macros-td4106620.html

Change-Id: Ib934eb3f27b656b5b2f8488c2103e8eee73f9623

diff --git a/mysqlc/source/mysqlc_propertyids.hxx 
b/mysqlc/source/mysqlc_propertyids.hxx
index 4e7ac46..35e5502 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -130,21 +130,6 @@ enum
 }/* mysqlc */
 }/* connectivity */
 
-
-#define DECL_PROP1IMPL(varname, type) \
-pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), 
PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
-
-#define DECL_PROP0(varname, type)   \
-DECL_PROP1IMPL(varname, type) 0)
-
-#define DECL_BOOL_PROP1IMPL(varname) \
-pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), 
PROPERTY_ID_##varname, ::getBooleanCppuType(),
-
-#define DECL_BOOL_PROP0(varname)\
-DECL_BOOL_PROP1IMPL(varname) 0)
-
-
-
 #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX
 
 
diff --git a/mysqlc/source/mysqlc_resultset.cxx 
b/mysqlc/source/mysqlc_resultset.cxx
index aa602f6..5942ae7 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -1269,11 +1269,14 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() 
const
 Sequence< Property > aProps(5);
 Property* pProperties = aProps.getArray();
 sal_Int32 nPos = 0;
-DECL_PROP0(FETCHDIRECTION,  sal_Int32);
-DECL_PROP0(FETCHSIZE,   sal_Int32);
-DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
-DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) 
PropertyAttribute::READONLY);
-DECL_PROP1IMPL(RESULTSETTYPE,   sal_Int32) 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), 
PROPERTY_ID_FETCHDIRECTION, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), 
PROPERTY_ID_FETCHSIZE, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),
+PROPERTY_ID_ISBOOKMARKABLE, ::getBooleanCppuType(), 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
+PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType::get(), 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
+PROPERTY_ID_RESULTSETTYPE, cppu::UnoType::get(), 
PropertyAttribute::READONLY);
 
 return new OPropertyArrayHelper(aProps);
 }
diff --git a/mysqlc/source/mysqlc_statement.cxx 
b/mysqlc/source/mysqlc_statement.cxx
index ca7dd9f..57b051e 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -369,16 +369,16 @@ void SAL_CALL OCommonStatement::clearWarnings()
 Sequence< Property > aProps(10);
 Property* pProperties = aProps.getArray();
 sal_Int32 nPos = 0;
-DECL_PROP0(CURSORNAME,  OUString);
-DECL_BOOL_PROP0(ESCAPEPROCESSING);
-DECL_PROP0(FETCHDIRECTION,sal_Int32);
-DECL_PROP0(FETCHSIZE,   sal_Int32);
-DECL_PROP0(MAXFIELDSIZE,sal_Int32);
-DECL_PROP0(MAXROWS, sal_Int32);
-DECL_PROP0(QUERYTIMEOUT,sal_Int32);
-DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
-DECL_PROP0(RESULTSETTYPE,sal_Int32);
-DECL_BOOL_PROP0(USEBOOKMARKS);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), 
PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),
 PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), 
PROPERTY_ID_FETCHDIRECTION, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), 
PROPERTY_ID_FETCHSIZE, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), 
PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), 
PROPERTY_ID_MAXROWS, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
Property(OPropertyMap::getPropMa

[Libreoffice-commits] core.git: odk/examples

[Julien Nabet]

 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx  |   18 
--
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx  |   30 
++
 odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx |   14 

 3 files changed, 32 insertions(+), 30 deletions(-)

New commits:
commit 5e2918bc5a1279231fbcfc359432af3f37eb8d3c
Author: Julien Nabet 
Date:   Sun May 11 23:12:55 2014 +0200

Kill DECL_PROP1IMPL and related (odk part)

Change-Id: Id4cd66b6082ec53facc985af48fc92de58a4c066

diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index b8e688c..b44ba02 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -769,12 +769,18 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) 
const
 Sequence< Property > aProps(6);
 Property* pProperties = aProps.getArray();
 sal_Int32 nPos = 0;
-DECL_PROP1IMPL(CURSORNAME,  ::rtl::OUString) 
PropertyAttribute::READONLY);
-DECL_PROP0(FETCHDIRECTION,  sal_Int32);
-DECL_PROP0(FETCHSIZE,   sal_Int32);
-DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
-DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) 
PropertyAttribute::READONLY);
-DECL_PROP1IMPL(RESULTSETTYPE,   sal_Int32) 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
+PROPERTY_ID_CURSORNAME, ::cppu::UnoType::get(), 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
+PROPERTY_ID_FETCHDIRECTION, ::cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
+PROPERTY_ID_FETCHSIZE, ::cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),
+PROPERTY_ID_ISBOOKMARKABLE, ::getBooleanCppuType(), 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
+PROPERTY_ID_RESULTSETCONCURRENCY, ::cppu::UnoType::get(), 
PropertyAttribute::READONLY);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
+PROPERTY_ID_RESULTSETTYPE, ::cppu::UnoType::get(), 
PropertyAttribute::READONLY);
 
 return new OPropertyArrayHelper(aProps);
 }
diff --git 
a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx 
b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index b5faafb..5b91333 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -268,16 +268,26 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) 
throw(SQLException, RuntimeExce
 Sequence< Property > aProps(10);
 Property* pProperties = aProps.getArray();
 sal_Int32 nPos = 0;
-DECL_PROP0(CURSORNAME,  ::rtl::OUString);
-DECL_BOOL_PROP0(ESCAPEPROCESSING);
-DECL_PROP0(FETCHDIRECTION,sal_Int32);
-DECL_PROP0(FETCHSIZE,   sal_Int32);
-DECL_PROP0(MAXFIELDSIZE,sal_Int32);
-DECL_PROP0(MAXROWS, sal_Int32);
-DECL_PROP0(QUERYTIMEOUT,sal_Int32);
-DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
-DECL_PROP0(RESULTSETTYPE,sal_Int32);
-DECL_BOOL_PROP0(USEBOOKMARKS);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
+PROPERTY_ID_CURSORNAME, ::cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),
+PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
+PROPERTY_ID_FETCHDIRECTION, ::cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
+PROPERTY_ID_FETCHSIZE, ::cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE),
+PROPERTY_ID_MAXFIELDSIZE, ::cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS),
+PROPERTY_ID_MAXROWS, ::cppu::UnoType::get(), 0);
+pProperties[nPos

[Libreoffice-commits] core.git: 8 commits - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx  |   15 +++-
 connectivity/source/drivers/ado/AResultSet.cxx  |   20 --
 connectivity/source/drivers/ado/AStatement.cxx  |   31 
++
 connectivity/source/drivers/firebird/StatementCommonBase.cxx|   30 
++---
 connectivity/source/drivers/jdbc/JStatement.cxx |   30 
++---
 connectivity/source/drivers/jdbc/ResultSet.cxx  |   22 +--
 connectivity/source/drivers/kab/KResultSet.cxx  |   23 +--
 connectivity/source/drivers/kab/KStatement.cxx  |   30 
++---
 connectivity/source/drivers/macab/MacabResultSet.cxx|   23 +--
 connectivity/source/drivers/macab/MacabStatement.cxx|   30 
++---
 connectivity/source/drivers/mork/MResultSet.cxx |   19 --
 connectivity/source/drivers/mork/MStatement.cxx |   29 
++---
 connectivity/source/drivers/mozab/MResultSet.cxx|   19 --
 connectivity/source/drivers/mozab/MStatement.cxx|   29 
++---
 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |   15 +++-
 connectivity/source/drivers/odbc/OResultSet.cxx |   23 +--
 connectivity/source/drivers/odbc/OStatement.cxx |   30 
++---
 connectivity/source/inc/propertyids.hxx |   15 
 18 files changed, 290 insertions(+), 143 deletions(-)

New commits:
commit 0fadbdbbdbd55cf60f9a202f1cf7b1d60517078c
Author: Julien Nabet 
Date:   Mon May 12 22:52:25 2014 +0200

Kill DECL_PROP0 and the rest + clean propertyids.hxx

Change-Id: I872bc07ff9b1fe96a35e06ad3c5d8aaa75199bdd

diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx 
b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index de43945..d711304 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -706,11 +706,16 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 
_par0)
 Sequence< com::sun::star::beans::Property > aProps(5);
 com::sun::star::beans::Property* pProperties = aProps.getArray();
 sal_Int32 nPos = 0;
-DECL_PROP0(CURSORNAME,  OUString);
-DECL_PROP0(FETCHDIRECTION,  sal_Int32);
-DECL_PROP0(FETCHSIZE,   sal_Int32);
-DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
-DECL_PROP0(RESULTSETTYPE,   sal_Int32);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
+PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
+PROPERTY_ID_FETCHDIRECTION, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
+PROPERTY_ID_FETCHSIZE, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
+PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
+PROPERTY_ID_RESULTSETTYPE, cppu::UnoType::get(), 0);
 
 return new ::cppu::OPropertyArrayHelper(aProps);
 }
diff --git a/connectivity/source/drivers/ado/AStatement.cxx 
b/connectivity/source/drivers/ado/AStatement.cxx
index a232ad1..03e06a0 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -654,17 +654,26 @@ void OStatement_Base::setCursorName(const OUString 
&_par0) throw(SQLException, R
 Sequence< com::sun::star::beans::Property > aProps(10);
 com::sun::star::beans::Property* pProperties = aProps.getArray();
 sal_Int32 nPos = 0;
-DECL_PROP0(CURSORNAME,  OUString);
-DECL_BOOL_PROP0(ESCAPEPROCESSING);
-DECL_PROP0(FETCHDIRECTION,sal_Int32);
-DECL_PROP0(FETCHSIZE,   sal_Int32);
-DECL_PROP0(MAXFIELDSIZE,sal_Int32);
-DECL_PROP0(MAXROWS, sal_Int32);
-DECL_PROP0(QUERYTIMEOUT,sal_Int32);
-DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
-DECL_PROP0(RESULTSETTYPE,sal_Int32);
-DECL_BOOL_PROP0(USEBOOKMARKS);
-
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
+PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0);
+pProperties[nPos++] = 
::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),
+PROPERTY_ID_

[Libreoffice-commits] core.git: comphelper/source connectivity/source cppuhelper/source extensions/source filter/source forms/source reportdesign/source sc/source sd/source sfx2/source starmath/source

[Julien Nabet]

 comphelper/source/property/propertycontainerhelper.cxx |6 +++---
 connectivity/source/commontools/dbexception.cxx|2 +-
 cppuhelper/source/propertysetmixin.cxx |   10 +++---
 extensions/source/propctrlr/standardcontrol.cxx|6 +++---
 extensions/source/resource/ResourceIndexAccess.hxx |2 +-
 filter/source/config/cache/basecontainer.cxx   |8 +++-
 forms/source/component/DatabaseForm.cxx|   14 +++---
 forms/source/component/Date.cxx|2 +-
 forms/source/component/ListBox.cxx |6 +++---
 forms/source/component/Time.cxx|2 +-
 forms/source/component/formcontrolfont.cxx |4 ++--
 forms/source/component/refvaluecomponent.cxx   |2 +-
 forms/source/component/scrollbar.cxx   |2 +-
 forms/source/component/spinbutton.cxx  |2 +-
 reportdesign/source/core/api/FixedLine.cxx |2 +-
 reportdesign/source/core/api/FixedText.cxx |2 +-
 reportdesign/source/core/api/FormattedField.cxx|2 +-
 reportdesign/source/core/api/Functions.cxx |2 +-
 reportdesign/source/core/api/Groups.cxx|2 +-
 reportdesign/source/core/api/ImageControl.cxx  |2 +-
 reportdesign/source/core/api/Section.cxx   |2 +-
 reportdesign/source/core/api/Shape.cxx |2 +-
 reportdesign/source/filter/xml/xmlControlProperty.cxx  |   14 +++---
 sc/source/ui/unoobj/cellvaluebinding.cxx   |2 +-
 sd/source/ui/framework/factories/ViewShellWrapper.cxx  |2 +-
 sfx2/source/notify/globalevents.cxx|2 +-
 starmath/source/unomodel.cxx   |2 +-
 stoc/source/corereflection/criface.cxx |2 +-
 sw/source/core/access/acccell.cxx  |4 ++--
 sw/source/core/access/accdoc.cxx   |4 ++--
 sw/source/core/access/accnotextframe.cxx   |4 ++--
 sw/source/core/access/accpara.cxx  |   10 +-
 sw/source/core/unocore/unofield.cxx|4 ++--
 sw/source/core/unocore/unoframe.cxx|2 +-
 ucb/source/core/ucbcmds.cxx|8 ++--
 ucb/source/ucp/cmis/cmis_content.cxx   |2 +-
 ucb/source/ucp/ext/ucpext_content.cxx  |2 +-
 ucb/source/ucp/file/shell.cxx  |6 +++---
 ucb/source/ucp/ftp/ftpcontent.cxx  |   12 ++--
 ucb/source/ucp/hierarchy/hierarchycontent.cxx  |6 ++
 ucb/source/ucp/tdoc/tdoc_content.cxx   |   11 +++
 vcl/qa/cppunit/dndtest.cxx |2 +-
 xmloff/source/draw/sdpropls.cxx|4 ++--
 43 files changed, 86 insertions(+), 103 deletions(-)

New commits:
commit c288b17cc5a1d5051325e02a29aa40df5be6f016
Author: Julien Nabet 
Date:   Wed May 14 23:17:17 2014 +0200

Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part12

Change-Id: I7c514b7a1d86f52d77672b826b1f08b825fd7aa7

diff --git a/comphelper/source/property/propertycontainerhelper.cxx 
b/comphelper/source/property/propertycontainerhelper.cxx
index b13b7f5..0fd8e9e 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -81,7 +81,7 @@ void OPropertyContainerHelper::registerProperty(const 
OUString& _rName, sal_Int3
 {
 OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) == 0,
 "OPropertyContainerHelper::registerProperty: don't use this for 
properties which may be void ! There is a method called 
\"registerMayBeVoidProperty\" for this !");
-OSL_ENSURE(!_rMemberType.equals(::getCppuType(static_cast< Any* >(NULL))),
+OSL_ENSURE(!_rMemberType.equals(cppu::UnoType::get()),
 "OPropertyContainerHelper::registerProperty: don't give my the type of 
an uno::Any ! Really can't handle this !");
 OSL_ENSURE(_pPointerToMember,
 "OPropertyContainerHelper::registerProperty: you gave me nonsense : 
the pointer must be non-NULL");
@@ -109,7 +109,7 @@ void 
OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName,
 {
 OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) != 0,
 "OPropertyContainerHelper::registerMayBeVoidProperty: why calling this 
when the attributes say nothing about may-be-void ?");
-OSL_ENSURE(!_rExpectedType.equals(::getCppuType(static_cast< Any* 
>(NULL))),
+OSL_ENSURE(!_rExpectedType.equals(cppu::UnoType::get()),
 "OPropertyContainerHelper::registerMayBeVoidProperty: don't give my 
the type of an uno::Any ! Really can't handle this !");
 OSL_ENS

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/drivers/odbc/ODatabaseMetaData.cxx |   23 +++--
 1 file changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 224002ee63b043404ecb3b594e6d902e5cd7
Author: Julien Nabet 
Date:   Sat Apr 5 10:30:54 2014 +0200

Use SQL_DEFAULT_TXN_ISOLATION to get getDefaultTransactionIsolation

Change-Id: I7f4785088151490ae1d55d2bb78bce28357d5c45
Reviewed-on: https://gerrit.libreoffice.org/8863
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx 
b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index ab62346..6a98544 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "odbc/OFunctiondefs.hxx"
 #include "stdio.h"
 #include "TPrivilegesResultSet.hxx"
@@ -1252,8 +1253,26 @@ sal_Int32 SAL_CALL 
ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeExc
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) 
throw(SQLException, RuntimeException, std::exception)
 {
 SQLUINTEGER nValue;
-
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
-return nValue;
+sal_Int32 nValueTranslated;
+
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DEFAULT_TXN_ISOLATION,nValue,*this);
+switch(nValue)
+{
+case SQL_TXN_READ_UNCOMMITTED:
+nValueTranslated = 
com::sun::star::sdbc::TransactionIsolation::READ_UNCOMMITTED;
+break;
+case SQL_TXN_READ_COMMITTED:
+nValueTranslated = 
com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED;
+break;
+case SQL_TXN_REPEATABLE_READ:
+nValueTranslated = 
com::sun::star::sdbc::TransactionIsolation::REPEATABLE_READ;
+break;
+case  SQL_TXN_SERIALIZABLE:
+nValueTranslated = 
com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE;
+break;
+default:
+nValueTranslated = 0;
+}
+return nValueTranslated;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) 
throw(RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/unoobj/linkuno.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f9ed1ec1bac799f79fcdf28ce817990e4f307bf1
Author: Julien Nabet 
Date:   Sat May 17 00:28:44 2014 +0200

Fix previous commit

Change-Id: I22ded05f328aeb4479c90e79b12729eb3835b3ec

diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 3fbeb9d..27cc395 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1026,7 +1026,7 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 
nIndex )
 uno::Type SAL_CALL ScAreaLinksObj::getElementType() 
throw(uno::RuntimeException, std::exception)
 {
 SolarMutexGuard aGuard;
-return cppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, 
std::exception)
@@ -1333,7 +1333,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 
nIndex )
 uno::Type SAL_CALL ScDDELinksObj::getElementType() 
throw(uno::RuntimeException, std::exception)
 {
 SolarMutexGuard aGuard;
-return cppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException, 
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/unoobj/docuno.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 280eed820fdd7fccb4fe6f4095b80f7ec50c
Author: Julien Nabet 
Date:   Sat May 17 00:33:08 2014 +0200

More fix

Change-Id: Iadb275a3799195a8c2eb57a975315f21d8215b31

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9837217..9aeceb7 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -111,10 +111,10 @@ static const SfxItemPropertyMapEntry* 
lcl_GetDocOptPropertyMap()
 static const SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
 {
 {OUString(SC_UNO_APPLYFMDES),  0, getBooleanCppuType(),
 0, 0},
-{OUString(SC_UNO_AREALINKS),   0, 
cppu::UnoType::get(),   0, 0},
+{OUString(SC_UNO_AREALINKS),   0, 
cppu::UnoType::get(),   0, 0},
 {OUString(SC_UNO_AUTOCONTFOC), 0, getBooleanCppuType(),
 0, 0},
-{OUString(SC_UNO_BASICLIBRARIES),  0, 
cppu::UnoType::get(), beans::PropertyAttribute::READONLY, 
0},
-{OUString(SC_UNO_DIALOGLIBRARIES), 0, 
cppu::UnoType::get(), beans::PropertyAttribute::READONLY, 
0},
+{OUString(SC_UNO_BASICLIBRARIES),  0, 
cppu::UnoType::get(), 
beans::PropertyAttribute::READONLY, 0},
+{OUString(SC_UNO_DIALOGLIBRARIES), 0, 
cppu::UnoType::get(), 
beans::PropertyAttribute::READONLY, 0},
 {OUString(SC_UNO_VBAGLOBNAME), 0, 
cppu::UnoType::get(),  
beans::PropertyAttribute::READONLY, 0},
 {OUString(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, 
getBooleanCppuType(),  0, 0},
 {OUString(SC_UNONAME_CLOCAL),  0, 
cppu::UnoType::get(),0, 0},
@@ -123,8 +123,8 @@ static const SfxItemPropertyMapEntry* 
lcl_GetDocOptPropertyMap()
 {OUString(SC_UNO_COLLABELRNG), 0, 
cppu::UnoType::get(), 0, 0},
 {OUString(SC_UNO_DDELINKS),0, 
cppu::UnoType::get(),  0, 0},
 {OUString(SC_UNO_DEFTABSTOP),  PROP_UNO_DEFTABSTOP, 
cppu::UnoType::get(), 0, 0},
-{OUString(SC_UNO_EXTERNALDOCLINKS),0, 
cppu::UnoType::get(),0, 0},
-{OUString(SC_UNO_FORBIDDEN),   0, 
cppu::UnoType::get(),  beans::PropertyAttribute::READONLY, 
0},
+{OUString(SC_UNO_EXTERNALDOCLINKS),0, 
cppu::UnoType::get(),0, 0},
+{OUString(SC_UNO_FORBIDDEN),   0, 
cppu::UnoType::get(),  
beans::PropertyAttribute::READONLY, 0},
 {OUString(SC_UNO_HASDRAWPAGES),0, getBooleanCppuType(),
 beans::PropertyAttribute::READONLY, 0},
 {OUString(SC_UNO_IGNORECASE),  PROP_UNO_IGNORECASE, 
getBooleanCppuType(),   0, 0},
 {OUString(SC_UNO_ITERENABLED), PROP_UNO_ITERENABLED, 
getBooleanCppuType(),  0, 0},
@@ -133,7 +133,7 @@ static const SfxItemPropertyMapEntry* 
lcl_GetDocOptPropertyMap()
 {OUString(SC_UNO_LOOKUPLABELS),PROP_UNO_LOOKUPLABELS, 
getBooleanCppuType(), 0, 0},
 {OUString(SC_UNO_MATCHWHOLE),  PROP_UNO_MATCHWHOLE, 
getBooleanCppuType(),   0, 0},
 {OUString(SC_UNO_NAMEDRANGES), 0, 
cppu::UnoType::get(), 0, 0},
-{OUString(SC_UNO_DATABASERNG), 0, 
cppu::UnoType::get(),  0, 0},
+{OUString(SC_UNO_DATABASERNG), 0, 
cppu::UnoType::get(),  0, 0},
 {OUString(SC_UNO_NULLDATE),PROP_UNO_NULLDATE, 
cppu::UnoType::get(),  0, 0},
 {OUString(SC_UNO_ROWLABELRNG), 0, 
cppu::UnoType::get(), 0, 0},
 {OUString(SC_UNO_SHEETLINKS),  0, 
cppu::UnoType::get(),  0, 0},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/unoobj/chartuno.cxx |2 +-
 sc/source/ui/unoobj/confuno.cxx  |2 +-
 sc/source/ui/unoobj/datauno.cxx  |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 42af6f983164dcaf87d4a05e36ab8bbfbdd49eea
Author: Julien Nabet 
Date:   Sat May 17 00:35:25 2014 +0200

Fixes

Change-Id: Iaecba29cb5958787ec2581198943d373e37a3934

diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 23e31cd..c94e4d9 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -365,7 +365,7 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex 
)
 uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException, 
std::exception)
 {
 SolarMutexGuard aGuard;
-return cppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException, 
std::exception)
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 9099f91..58f8b89 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -65,7 +65,7 @@ static const SfxItemPropertyMapEntry* 
lcl_GetConfigPropertyMap()
 {OUString(SC_UNO_PRINTERNAME),  0,  cppu::UnoType::get(),
0, 0},
 {OUString(SC_UNO_PRINTERSETUP), 0,  
getCppuType((uno::Sequence*)0), 0, 0},
 {OUString(SC_UNO_APPLYDOCINF),  0,  getBooleanCppuType(),  
0, 0},
-{OUString(SC_UNO_FORBIDDEN),0,  
cppu::UnoType::get(), beans::PropertyAttribute::READONLY, 0},
+{OUString(SC_UNO_FORBIDDEN),0,  
cppu::UnoType::get(), 
beans::PropertyAttribute::READONLY, 0},
 {OUString(SC_UNO_CHARCOMP), 0,  cppu::UnoType::get(),   
 0, 0},
 {OUString(SC_UNO_ASIANKERN),0,  getBooleanCppuType(),  
0, 0},
 {OUString(SCSAVEVERSION),   0,  getBooleanCppuType(),  
0, 0},
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index b8d6bb2..fd160cf 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -669,7 +669,7 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( 
sal_Int32 nIndex )
 uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() 
throw(uno::RuntimeException, std::exception)
 {
 SolarMutexGuard aGuard;
-return cppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() 
throw(uno::RuntimeException, std::exception)
@@ -2332,7 +2332,7 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( 
sal_Int32 nIndex )
 uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() 
throw(uno::RuntimeException, std::exception)
 {
 SolarMutexGuard aGuard;
-return cppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() 
throw(uno::RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/core/tool/addincol.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 53130f7afb3fcf39f95f69e3752cec1fa00d6d93
Author: Julien Nabet 
Date:   Sat May 17 00:41:03 2014 +0200

Fixes

Change-Id: I5e2c57f4c53147ab4ae58f48059c8020de144f3c

diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 77567d4..bbc709e 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -684,7 +684,7 @@ static bool lcl_ValidReturnType( const 
uno::Reference& xC
 
 OUString sName = xClass->getName();
 return (
-IsTypeName( sName, cppu::UnoType::get()) ||
+IsTypeName( sName, 
cppu::UnoType::get()) ||
 IsTypeName( sName, cppu::UnoType::get()) 
);
 }
 
@@ -734,7 +734,7 @@ static ScAddInArgumentType lcl_GetArgType( const 
uno::Reference 
>*)0) ))
 return SC_ADDINARG_MIXED_ARRAY;
 
-if (IsTypeName( sName, cppu::UnoType::get()))
+if (IsTypeName( sName, cppu::UnoType::get()))
 return SC_ADDINARG_VALUE_OR_ARRAY;
 
 if (IsTypeName( sName, cppu::UnoType::get()))
@@ -821,11 +821,11 @@ void ScUnoAddInCollection::ReadFromAddIn( const 
uno::Reference&
 IsTypeName( sName,
 cppu::UnoType::get()) ||
 IsTypeName( sName,
-cppu::UnoType::get()) ||
+cppu::UnoType::get()) 
||
 IsTypeName( sName,
 cppu::UnoType::get()) 
||
 IsTypeName( sName,
-cppu::UnoType::get()) );
+cppu::UnoType::get()) );
 }
 if (!bSkip)
 {
@@ -1491,10 +1491,10 @@ void 
ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequence& rCallArgs)
 catch(const reflection::InvocationTargetException& rWrapped)
 {
 if ( rWrapped.TargetException.getValueType().equals(
-cppu::UnoType::get()) )
+cppu::UnoType::get()) )
 nErrCode = errIllegalArgument;
 else if ( rWrapped.TargetException.getValueType().equals(
-cppu::UnoType::get()) )
+cppu::UnoType::get()) )
 nErrCode = errNoConvergence;
 else
 nErrCode = errNoValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source reportdesign/source xmloff/source

[Julien Nabet]

 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx   |1 +
 reportdesign/source/filter/xml/xmlControlProperty.cxx |1 +
 xmloff/source/forms/propertyimport.cxx|5 +
 3 files changed, 7 insertions(+)

New commits:
commit f62de9113a4866f7152acbe0e8221c594b7a7b68
Author: Julien Nabet 
Date:   Sat May 17 09:36:18 2014 +0200

Comment why it's not a copy paste error

See 
http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-td4109071.html
Thank you Lionel!

Change-Id: I999bad0d6de0327bea7ba04a6c61a497d45f53a0

diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx 
b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 5618378..6c6bacf 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -74,6 +74,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& 
rImport
 if (s_aTypeNameMap.empty())
 {
 s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)]   = 
::getBooleanCppuType();
+// Not a copy paste error, see comment 
xmloff/source/forms/propertyimport.cxx lines 244-248
 s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = 
::cppu::UnoType::get();
 s_aTypeNameMap[GetXMLToken( XML_DOUBLE)]= 
::cppu::UnoType::get();
 s_aTypeNameMap[GetXMLToken( XML_STRING)]= 
::cppu::UnoType::get();
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx 
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 5545bb2..942cf3f 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -85,6 +85,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
 if (s_aTypeNameMap.empty())
 {
 s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)]   = 
::getBooleanCppuType();
+// Not a copy paste error, see comment 
xmloff/source/forms/propertyimport.cxx lines 244-248
 s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = 
cppu::UnoType::get();
 s_aTypeNameMap[GetXMLToken( XML_DOUBLE)]= 
cppu::UnoType::get();
 s_aTypeNameMap[GetXMLToken( XML_STRING)]= 
cppu::UnoType::get();
diff --git a/xmloff/source/forms/propertyimport.cxx 
b/xmloff/source/forms/propertyimport.cxx
index 1b47bf3..c992b6f 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -241,6 +241,11 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& 
_rType )
 if ( s_aTypeNameMap.empty() )
 {
 s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = 
::getBooleanCppuType();
+// Not a copy paste error, quotation from:
+// 
http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-tp4109071p4109116.html
+// all numeric types (including the UNO double)
+// consistently map to XML_FLOAT, so taking the extra precision from 
the
+// C++ type "float" to "double" makes absolute sense
 s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT )   ] = 
::cppu::UnoType::get();
 s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING )  ] = 
::cppu::UnoType::get();
 s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID )] = 
::getVoidCppuType();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Julien Nabet]

 svtools/source/graphic/descriptor.cxx  |   38 +++---
 svtools/source/graphic/graphic.cxx |   10 ++---
 svtools/source/graphic/provider.cxx|6 +--
 svtools/source/graphic/renderer.cxx|   32 +-
 svtools/source/hatchwindow/hatchwindow.cxx |2 -
 svtools/source/uno/unoiface.cxx|   16 -
 svtools/source/uno/unoimap.cxx |   50 ++---
 7 files changed, 77 insertions(+), 77 deletions(-)

New commits:
commit 3558f9c0592b443f20ca1f406198f89a5385767e
Author: Julien Nabet 
Date:   Sun May 18 01:14:29 2014 +0200

Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part17

Change-Id: Ie6dbe87599c9cf53c7b9cc6becb9438e62cdb537

diff --git a/svtools/source/graphic/descriptor.cxx 
b/svtools/source/graphic/descriptor.cxx
index ed42faf..d24911d 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -198,15 +198,15 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( 
const uno::Type & rType )
 {
 uno::Any aAny;
 
-if( rType == ::getCppuType((const uno::Reference< lang::XServiceInfo >*)0) 
)
+if( rType == cppu::UnoType::get())
 aAny <<= uno::Reference< lang::XServiceInfo >(this);
-else if( rType == ::getCppuType((const uno::Reference< lang::XTypeProvider 
>*)0) )
+else if( rType == cppu::UnoType::get())
 aAny <<= uno::Reference< lang::XTypeProvider >(this);
-else if( rType == ::getCppuType((const uno::Reference< beans::XPropertySet 
>*)0) )
+else if( rType == cppu::UnoType::get())
 aAny <<= uno::Reference< beans::XPropertySet >(this);
-else if( rType == ::getCppuType((const uno::Reference< 
beans::XPropertyState >*)0) )
+else if( rType == cppu::UnoType::get())
 aAny <<= uno::Reference< beans::XPropertyState >(this);
-else if( rType == ::getCppuType((const uno::Reference< 
beans::XMultiPropertySet >*)0) )
+else if( rType == cppu::UnoType::get())
 aAny <<= uno::Reference< beans::XMultiPropertySet >(this);
 else
 aAny <<= OWeakAggObject::queryAggregation( rType );
@@ -268,12 +268,12 @@ uno::Sequence< uno::Type > SAL_CALL 
GraphicDescriptor::getTypes()
 uno::Sequence< uno::Type >  aTypes( 6 );
 uno::Type*  pTypes = aTypes.getArray();
 
-*pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0);
-*pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0);
-*pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0);
-*pTypes++ = ::getCppuType((const uno::Reference< beans::XPropertySet>*)0);
-*pTypes++ = ::getCppuType((const uno::Reference< 
beans::XPropertyState>*)0);
-*pTypes++ = ::getCppuType((const uno::Reference< 
beans::XMultiPropertySet>*)0);
+*pTypes++ = cppu::UnoType::get();
+*pTypes++ = cppu::UnoType::get();
+*pTypes++ = cppu::UnoType::get();
+*pTypes++ = cppu::UnoType::get();
+*pTypes++ = cppu::UnoType::get();
+*pTypes++ = cppu::UnoType::get();
 
 return aTypes;
 }
@@ -293,14 +293,14 @@ uno::Sequence< sal_Int8 > SAL_CALL 
GraphicDescriptor::getImplementationId()
 
 static ::comphelper::PropertyMapEntry const aEntries[] =
 {
-{ OUString("GraphicType"), UNOGRAPHIC_GRAPHICTYPE, ::getCppuType( 
(const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("MimeType"), UNOGRAPHIC_MIMETYPE, ::getCppuType( (const 
OUString*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("SizePixel"), UNOGRAPHIC_SIZEPIXEL, ::getCppuType( (const 
awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("Size100thMM"), UNOGRAPHIC_SIZE100THMM, ::getCppuType( 
(const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("BitsPerPixel"), UNOGRAPHIC_BITSPERPIXEL, ::getCppuType( 
(const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("Transparent"), UNOGRAPHIC_TRANSPARENT, ::getCppuType( 
(const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("Alpha"), UNOGRAPHIC_ALPHA, ::getCppuType( (const 
sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
-{ OUString("Animated"), UNOGRAPHIC_ANIMATED, ::getCppuType( (const 
sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 },
+{ OUString("GraphicType"), UNOGRAPHIC_GRAPHICTYPE, 
cppu::UnoType::get(), beans::PropertyAttribute::READONLY, 0 },
+{ OUString("MimeType"), UNOGRAPHIC_MIMETYPE, 
cppu::UnoType::get(), beans::PropertyAttribute::READONLY, 0 },
+{ OUString("SizePixel"), UNOGRAPHIC_SIZEPIXEL, 
cppu::UnoType::get(), beans::PropertyAttribute::READONLY, 0 },
+

[Libreoffice-commits] core.git: extras/source

[Julien Nabet]

 extras/source/autotext/lang/en-AU/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-GB/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-US/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-ZA/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/ja/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/ko/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/zh-CN/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/zh-TW/acor/DocumentList.xml |4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 9868373a6f6db525e963ec79301ecbd74fbfdeba
Author: Julien Nabet 
Date:   Sun May 18 18:38:59 2014 +0200

Resolves: fdo#78846 wrong AutoCorrect entries

Change-Id: Iff2e343c56092ba85a1179f121f460e5ada841f4

diff --git a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
index 5d91d0a..28424d1 100644
--- a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
index 2548ff2..678d820 100644
--- a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-US/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
index b8c3da2..6052471 100644
--- a/extras/source/autotext/lang/en-US/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
index 5576dc8..878db3e 100644
--- a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
@@ -260,7 +260,7 @@
   
   
   
-  
+  
   
   
   
@@ -301,7 +301,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ja/acor/DocumentList.xml 
b/extras/source/autotext/lang/ja/acor/DocumentList.xml
index 659af8f..f54314d 100644
--- a/extras/source/autotext/lang/ja/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ja/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ko/acor/DocumentList.xml 
b/extras/source/autotext/lang/ko/acor/DocumentList.xml
index 659af8f..f54314d 100644
--- a/extras/source/autotext/lang/ko/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ko/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
index 5583c5f..09f5325 100644
--- a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
index 5583c5f..09f5325 100644
--- a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - extras/source

[Julien Nabet]

 extras/source/autotext/lang/en-AU/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-GB/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-US/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/en-ZA/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/ja/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/ko/acor/DocumentList.xml|4 ++--
 extras/source/autotext/lang/zh-CN/acor/DocumentList.xml |4 ++--
 extras/source/autotext/lang/zh-TW/acor/DocumentList.xml |4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit cacde838a6369cfe9231f0808b76ecedfb87e312
Author: Julien Nabet 
Date:   Sun May 18 18:38:59 2014 +0200

Resolves: fdo#78846 wrong AutoCorrect entries

Cherry-picked from master (9868373a6f6db525e963ec79301ecbd74fbfdeba)

Change-Id: Iff2e343c56092ba85a1179f121f460e5ada841f4
Reviewed-on: https://gerrit.libreoffice.org/9397
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
index 33312da..8332403 100644
--- a/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-AU/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
index d46b7ea..18719ca 100644
--- a/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-GB/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-US/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
index 26abc6f..dc18c01 100644
--- a/extras/source/autotext/lang/en-US/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-US/acor/DocumentList.xml
@@ -269,7 +269,7 @@
   
   
   
-  
+  
   
   
   
@@ -310,7 +310,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml 
b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
index febfe61..00964f5 100644
--- a/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/en-ZA/acor/DocumentList.xml
@@ -260,7 +260,7 @@
   
   
   
-  
+  
   
   
   
@@ -301,7 +301,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ja/acor/DocumentList.xml 
b/extras/source/autotext/lang/ja/acor/DocumentList.xml
index d533d06..8cc47df 100644
--- a/extras/source/autotext/lang/ja/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ja/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/ko/acor/DocumentList.xml 
b/extras/source/autotext/lang/ko/acor/DocumentList.xml
index d533d06..8cc47df 100644
--- a/extras/source/autotext/lang/ko/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/ko/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
index 8298a1d..e7dad2f 100644
--- a/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-CN/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml 
b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
index 8298a1d..e7dad2f 100644
--- a/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/zh-TW/acor/DocumentList.xml
@@ -265,7 +265,7 @@
   
   
   
-  
+  
   
   
   
@@ -306,7 +306,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/app/inputhdl.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1df54514d7a1ebb1b4fa16cca386a34e7c41c490
Author: Julien Nabet 
Date:   Tue May 20 07:33:00 2014 +0200

Resolves: fdo#78838 past-the-end iterator

Inserting data in pColumnData invalidated miAutoPosColumn
See https://bugs.freedesktop.org/show_bug.cgi?id=78838#c6

Change-Id: Iece423cd8d14f5ae7bf382583c0369895a00f168

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d354cba..af767b9 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1418,7 +1418,10 @@ void ScInputHandler::GetColData()
 pDoc->GetDataEntries(
 aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true, 
aEntries, true);
 if (!aEntries.empty())
+{
 pColumnData->insert(aEntries.begin(), aEntries.end());
+miAutoPosColumn = pColumnData->end();
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Julien Nabet]

 sc/source/ui/app/inputhdl.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bb8acc29e4ad4fb8245b2ed47e60c6cac641ddb1
Author: Julien Nabet 
Date:   Tue May 20 07:33:00 2014 +0200

Resolves: fdo#78838 past-the-end iterator

Inserting data in pColumnData invalidated miAutoPosColumn
See https://bugs.freedesktop.org/show_bug.cgi?id=78838#c6

Cherry-picked from 1df54514d7a1ebb1b4fa16cca386a34e7c41c490

Change-Id: Iece423cd8d14f5ae7bf382583c0369895a00f168
Reviewed-on: https://gerrit.libreoffice.org/9409
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index d964312..ed5e352 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1536,7 +1536,10 @@ void ScInputHandler::GetColData()
 pDoc->GetDataEntries(
 aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), true, 
aEntries, true);
 if (!aEntries.empty())
+{
 pColumnData->insert(aEntries.begin(), aEntries.end());
+miAutoPosColumn = pColumnData->end();
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ucb/source

[Julien Nabet]

 ucb/source/core/ucbcmds.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f332958999cc38ad778ac381cc67d249e9bd918a
Author: Julien Nabet 
Date:   Tue May 20 20:09:41 2014 +0200

Fix wrong copy paste, should be 

See 
http://nabble.documentfoundation.org/Wrong-copy-paste-in-ucbcmds-cxx-ucb-module-td4109103.html
for more details

Change-Id: I4f6754cf0350e969cece52008b310e1d8f182622

diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 22f5dc9..c4ed448 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -251,7 +251,7 @@ CommandProcessorInfo::CommandProcessorInfo()
 = ucb::CommandInfo(
 OUString( CHECKIN_NAME ), // Name
 CHECKIN_HANDLE, // Handle
-cppu::UnoType::get() ); // 
ArgType
+cppu::UnoType::get() ); // ArgType
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/ui/app/inputhdl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04831249713827fb175faa118205bb132387dad9
Author: Julien Nabet 
Date:   Tue May 20 20:50:44 2014 +0200

Following fdo#78838, let's make this part safe too

(Thank you Eike)

Change-Id: Icc7061c7f7296302d6ed21f0e74a48cbaa82011a

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b9e1b90..be0220d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -718,7 +718,6 @@ void ScInputHandler::GetFormulaData()
 else
 {
 pFormulaData = new ScTypedCaseStrSet;
-miAutoPosFormula = pFormulaData->end();
 }
 
 if( pFormulaDataPara )
@@ -749,6 +748,7 @@ void ScInputHandler::GetFormulaData()
 pFormulaDataPara->insert(ScTypedStrData(aEntry, 0.0, 
ScTypedStrData::Standard));
 }
 }
+miAutoPosFormula = pFormulaData->end();
 pDoc->GetFormulaEntries( *pFormulaData );
 pDoc->GetFormulaEntries( *pFormulaDataPara );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/sdbcx/VCollection.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4ec60ac717bfc0ef30cc2755a99987d731c1dd1
Author: Julien Nabet 
Date:   Thu May 22 23:43:49 2014 +0200

Fix previous commit

Change-Id: I629b5f6e57c5d8368bafc544c1c23785ee209a1e

diff --git a/connectivity/source/sdbcx/VCollection.cxx 
b/connectivity/source/sdbcx/VCollection.cxx
index 8081d15..9473d95 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -480,7 +480,7 @@ void SAL_CALL OCollection::release() throw()
 
 Type SAL_CALL OCollection::getElementType(  ) throw(RuntimeException, 
std::exception)
 {
-returncppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool SAL_CALL OCollection::hasElements(  ) throw(RuntimeException, 
std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet]

 dbaccess/source/core/dataaccess/databasecontext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6deec9c9106eed60e32450a28323e139bd3ced1f
Author: Julien Nabet 
Date:   Thu May 22 23:48:37 2014 +0200

Fix

Change-Id: Ib4d7c2da71a6fa083fc1ed56f058c8dfbc6e58fb

diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx 
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 94b3d37..99a647d 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -580,7 +580,7 @@ void SAL_CALL 
ODatabaseContext::removeDatabaseRegistrationsListener( const Refer
 // ::com::sun::star::container::XElementAccess
 Type ODatabaseContext::getElementType(  ) throw(RuntimeException, 
std::exception)
 {
-returncppu::UnoType::get();
+return cppu::UnoType::get();
 }
 
 sal_Bool ODatabaseContext::hasElements(void) throw( RuntimeException, 
std::exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Julien Nabet]

 sw/source/core/text/txtdrop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06afd4067f7bc321d7dd0a4e8c235b0b21e3d49a
Author: Julien Nabet 
Date:   Fri May 23 22:55:41 2014 +0200

Resolves: fdo#79139 Crash in SwDropCapCache::CalcFontSize

Minimum of nMaxFontHeight must be at least 1

Change-Id: I35462fc069c7026958e597c2e0605345ed009c91

diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 98556aa..563a1ff 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -703,7 +703,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, 
SwTxtFormatInfo &rInf )
 long nWishedHeight = pDrop->GetDropHeight();
 
 // find out biggest font size for initial scaling factor
-long nMaxFontHeight = 0;
+long nMaxFontHeight = 1;
 while ( pCurrPart )
 {
 const SwFont& rFnt = pCurrPart->GetFont();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/android xmlsecurity/source

[Julien Nabet]

 vcl/android/androidinst.cxx   |2 +-
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2ed32f7afa712992486ad516407d30bce85b3530
Author: Julien Nabet 
Date:   Sat May 24 11:30:49 2014 +0200

cppcheck: Prefer prefix ++/-- operators

Change-Id: I290ccba1487e59ea6f86bfb0382671ca4ed50831

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 21d9007..4f716e0 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -110,7 +110,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow_Buffer 
*pBuffer)
 {
 int i = 0;
 std::list< SalFrame* >::const_iterator it;
-for ( it = getFrames().begin(); it != getFrames().end(); i++, it++ )
+for ( it = getFrames().begin(); it != getFrames().end(); i++, ++it )
 {
 SvpSalFrame *pFrame = static_cast(*it);
 
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 4d58c74..1be530f 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -278,7 +278,7 @@ PK11SymKey* SecurityEnvironment_NssImpl :: getSymKey( 
unsigned int position ) th
 unsigned int pos ;
 
 symkey = NULL ;
-for( pos = 0, keyIt = m_tSymKeyList.begin() ; pos < position && keyIt != 
m_tSymKeyList.end() ; pos ++ , keyIt ++ ) ;
+for( pos = 0, keyIt = m_tSymKeyList.begin() ; pos < position && keyIt != 
m_tSymKeyList.end() ; pos ++ , ++keyIt ) ;
 
 if( pos == position && keyIt != m_tSymKeyList.end() )
 symkey = *keyIt ;
@@ -332,7 +332,7 @@ SECKEYPublicKey* SecurityEnvironment_NssImpl :: getPubKey( 
unsigned int position
 unsigned int pos ;
 
 pubkey = NULL ;
-for( pos = 0, keyIt = m_tPubKeyList.begin() ; pos < position && keyIt != 
m_tPubKeyList.end() ; pos ++ , keyIt ++ ) ;
+for( pos = 0, keyIt = m_tPubKeyList.begin() ; pos < position && keyIt != 
m_tPubKeyList.end() ; pos ++ , ++keyIt ) ;
 
 if( pos == position && keyIt != m_tPubKeyList.end() )
 pubkey = *keyIt ;
@@ -386,7 +386,7 @@ SECKEYPrivateKey* SecurityEnvironment_NssImpl :: getPriKey( 
unsigned int positio
 unsigned int pos ;
 
 prikey = NULL ;
-for( pos = 0, keyIt = m_tPriKeyList.begin() ; pos < position && keyIt != 
m_tPriKeyList.end() ; pos ++ , keyIt ++ ) ;
+for( pos = 0, keyIt = m_tPriKeyList.begin() ; pos < position && keyIt != 
m_tPriKeyList.end() ; pos ++ , ++keyIt ) ;
 
 if( pos == position && keyIt != m_tPriKeyList.end() )
 prikey = *keyIt ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source

[Julien Nabet]

 oox/source/vml/vmlinputstream.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 372d5d74ad8cfb9b69dc20557359c4a2c1597b57
Author: Julien Nabet 
Date:   Sat May 24 16:35:49 2014 +0200

Resolves: fdo#79137  Crash in oox::vml::InputStream::updateBuffer

bt shows:
Program received signal SIGSEGV, Segmentation fault.
0x2aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) 
at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339
339 while( (mnBufferPos >= maBuffer.getLength()) && 
!mxTextStrm->isEOF() )
(gdb) bt
0x2aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) 
at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339
0x2aaadba21048 in oox::vml::InputStream::available (this=0x8d7fd80) at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:326
0x2aaacf5a0249 in sax_fastparser::FastSaxParserImpl::parseStream 
(this=0x89aea30, maStructSource=...)
at 
/home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:810

Indeed, mxTextStrm is invalid, so let's test its validity in InputStream 
constructor

Change-Id: Ifed79603e33b64d11eb07656df17824b7f98058f

diff --git a/oox/source/vml/vmlinputstream.cxx 
b/oox/source/vml/vmlinputstream.cxx
index 70896e1..f373bad0 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -266,6 +266,8 @@ InputStream::InputStream( const Reference< 
XComponentContext >& rxContext, const
 maClosingCData( CREATE_OSTRING( "]]>" ) ),
 mnBufferPos( 0 )
 {
+if (!mxTextStrm.is())
+throw IOException();
 maOpeningBracket[ 0 ] = '<';
 maClosingBracket[ 0 ] = '>';
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

[Julien Nabet]

 oox/source/vml/vmlinputstream.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 38365bf44e7ea37d25463787baab83e985240a41
Author: Julien Nabet 
Date:   Sat May 24 16:35:49 2014 +0200

Resolves: fdo#79137 Crash in oox::vml::InputStream::updateBuffer

bt shows:
Program received signal SIGSEGV, Segmentation fault.
0x2aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) 
at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339
339 while( (mnBufferPos >= maBuffer.getLength()) && 
!mxTextStrm->isEOF() )
(gdb) bt
0x2aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) 
at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339
0x2aaadba21048 in oox::vml::InputStream::available (this=0x8d7fd80) at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:326
0x2aaacf5a0249 in sax_fastparser::FastSaxParserImpl::parseStream 
(this=0x89aea30, maStructSource=...)
at 
/home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:810

Indeed, mxTextStrm is invalid, so let's test its validity in InputStream 
constructor

Cherry-picked from 372d5d74ad8cfb9b69dc20557359c4a2c1597b57

Change-Id: Ifed79603e33b64d11eb07656df17824b7f98058f
Reviewed-on: https://gerrit.libreoffice.org/9465
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/oox/source/vml/vmlinputstream.cxx 
b/oox/source/vml/vmlinputstream.cxx
index 70896e1..f373bad0 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -266,6 +266,8 @@ InputStream::InputStream( const Reference< 
XComponentContext >& rxContext, const
 maClosingCData( CREATE_OSTRING( "]]>" ) ),
 mnBufferPos( 0 )
 {
+if (!mxTextStrm.is())
+throw IOException();
 maOpeningBracket[ 0 ] = '<';
 maClosingBracket[ 0 ] = '>';
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source

[Julien Nabet]

 oox/source/vml/vmlinputstream.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5a1a182f626bd9caa077e20850a132759fec5d86
Author: Julien Nabet 
Date:   Sat May 24 16:35:49 2014 +0200

Resolves: fdo#79137  Crash in oox::vml::InputStream::updateBuffer

bt shows:
Program received signal SIGSEGV, Segmentation fault.
0x2aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) 
at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339
339 while( (mnBufferPos >= maBuffer.getLength()) && 
!mxTextStrm->isEOF() )
(gdb) bt
0x2aaadba213fb in oox::vml::InputStream::updateBuffer (this=0x8d7fd80) 
at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:339
0x2aaadba21048 in oox::vml::InputStream::available (this=0x8d7fd80) at 
/home/julien/compile-libreoffice/libreoffice/oox/source/vml/vmlinputstream.cxx:326
0x2aaacf5a0249 in sax_fastparser::FastSaxParserImpl::parseStream 
(this=0x89aea30, maStructSource=...)
at 
/home/julien/compile-libreoffice/libreoffice/sax/source/fastparser/fastparser.cxx:810

Indeed, mxTextStrm is invalid, so let's test its validity in InputStream 
constructor

Cherry-picked from 372d5d74ad8cfb9b69dc20557359c4a2c1597b57

Change-Id: Ifed79603e33b64d11eb07656df17824b7f98058f
Reviewed-on: https://gerrit.libreoffice.org/9466
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/oox/source/vml/vmlinputstream.cxx 
b/oox/source/vml/vmlinputstream.cxx
index 48d0a3c..34336a5 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -266,6 +266,8 @@ InputStream::InputStream( const Reference< 
XComponentContext >& rxContext, const
 maClosingCData( CREATE_OSTRING( "]]>" ) ),
 mnBufferPos( 0 )
 {
+if (!mxTextStrm.is())
+throw IOException();
 maOpeningBracket[ 0 ] = '<';
 maClosingBracket[ 0 ] = '>';
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Julien Nabet]

 sw/source/core/text/txtdrop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c172eb71bbd725d6ddca9255a288c47534bb9113
Author: Julien Nabet 
Date:   Fri May 23 22:55:41 2014 +0200

Resolves: fdo#79139 Crash in SwDropCapCache::CalcFontSize

Minimum of nMaxFontHeight must be at least 1

Cherry-picked from 06afd4067f7bc321d7dd0a4e8c235b0b21e3d49a

Change-Id: I35462fc069c7026958e597c2e0605345ed009c91
Reviewed-on: https://gerrit.libreoffice.org/9457
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 98556aa..563a1ff 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -703,7 +703,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, 
SwTxtFormatInfo &rInf )
 long nWishedHeight = pDrop->GetDropHeight();
 
 // find out biggest font size for initial scaling factor
-long nMaxFontHeight = 0;
+long nMaxFontHeight = 1;
 while ( pCurrPart )
 {
 const SwFont& rFnt = pCurrPart->GetFont();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

[Julien Nabet]

 sw/source/core/text/txtdrop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9732b4a0045c1e72493f16d03f60a048d5fbfa9d
Author: Julien Nabet 
Date:   Fri May 23 22:55:41 2014 +0200

Resolves: fdo#79139 Crash in SwDropCapCache::CalcFontSize

Minimum of nMaxFontHeight must be at least 1

Cherry-picked from 06afd4067f7bc321d7dd0a4e8c235b0b21e3d49a

Change-Id: I35462fc069c7026958e597c2e0605345ed009c91
Reviewed-on: https://gerrit.libreoffice.org/9458
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index f4af8af..8d3f3b9 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -793,7 +793,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, 
SwTxtFormatInfo &rInf )
 long nWishedHeight = pDrop->GetDropHeight();
 
 // find out biggest font size for initial scaling factor
-long nMaxFontHeight = 0;
+long nMaxFontHeight = 1;
 while ( pCurrPart )
 {
 const SwFont& rFnt = pCurrPart->GetFont();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Julien Nabet]

 sc/source/core/tool/interpr1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b41504503cdf4ac562f82e668bf2fe9217260493
Author: Julien Nabet 
Date:   Wed May 28 20:30:36 2014 +0200

Related fdo#75971 Crash when invoking "Insert > Names > Create"

bt:
0x2aaac837cd3c in rtl::OUString::copy (this=0x7ffec760, 
beginIndex=-2147483595) at 
/home/julien/compile-libreoffice/libreoffice/include/rtl/ustring.hxx:1464
0x2aaac87604ea in ScInterpreter::ScRight (this=0x8a6b7a0) at 
/home/julien/compile-libreoffice/libreoffice/sc/source/core/tool/interpr1.cxx:8106
0x2aaac879be5c in ScInterpreter::Interpret (this=0x8a6b7a0) at 
/home/julien/compile-libreoffice/libreoffice/sc/source/core/tool/interpr4.cxx:4150

So apply similar fix 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=37d7d115dd346ba7a713a5a18d90fc48a0d35072
to scRight

Change-Id: I576e82cd033f0e0e5f9e9cbb9dd5f569782bbbc4

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 9223dc6..bae7962 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8091,7 +8091,7 @@ void ScInterpreter::ScRight()
 if (nParamCount == 2)
 {
 double nVal = ::rtl::math::approxFloor(GetDouble());
-if ( nVal < 0.0 || nVal > SAL_MAX_UINT16 )
+if ( rtl::math::isNan(nVal) || nVal < 0.0 || nVal > SAL_MAX_UINT16 
)
 {
 PushIllegalArgument();
 return ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet]

 dbaccess/source/core/api/table.cxx |   54 ++---
 1 file changed, 27 insertions(+), 27 deletions(-)

New commits:
commit b158fd26951e42a9b31ca2bb4aa0bdd36f26a3ab
Author: Julien Nabet 
Date:   Wed May 28 23:06:44 2014 +0200

Prefer cppu::UnoType::get() to ::getCppuType(&T)

See 
http://nabble.documentfoundation.org/Questions-about-getCppuType-td4106361i20.html

Change-Id: I05d0b026e1ef2088472a42ee20e0823df1588428

diff --git a/dbaccess/source/core/api/table.cxx 
b/dbaccess/source/core/api/table.cxx
index b4e8274..07c4077 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -169,51 +169,51 @@ void ODBTable::construct()
 OTable_Base::construct();
 
 registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, 
PropertyAttribute::BOUND,
-&m_sFilter, ::getCppuType(&m_sFilter));
+&m_sFilter, cppu::UnoType::get());
 
 registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, 
PropertyAttribute::BOUND,
-&m_sOrder, ::getCppuType(&m_sOrder));
+&m_sOrder, cppu::UnoType::get());
 
 registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, 
PropertyAttribute::BOUND,
-&m_bApplyFilter, ::getBooleanCppuType());
+&m_bApplyFilter, cppu::UnoType::get());
 
 registerProperty(PROPERTY_FONT, PROPERTY_ID_FONT, PropertyAttribute::BOUND,
-&m_aFont, ::getCppuType(&m_aFont));
+&m_aFont, 
cppu::UnoType::get());
 
 registerMayBeVoidProperty(PROPERTY_ROW_HEIGHT, PROPERTY_ID_ROW_HEIGHT, 
PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
-&m_aRowHeight, ::cppu::UnoType::get());
+&m_aRowHeight, cppu::UnoType::get());
 
 registerMayBeVoidProperty(PROPERTY_TEXTCOLOR, PROPERTY_ID_TEXTCOLOR, 
PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
-&m_aTextColor, ::cppu::UnoType::get());
+&m_aTextColor, cppu::UnoType::get());
 
 registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, 
PropertyAttribute::BOUND | PropertyAttribute::READONLY,
-&m_nPrivileges, ::cppu::UnoType::get());
+&m_nPrivileges, cppu::UnoType::get());
 
 registerMayBeVoidProperty(PROPERTY_TEXTLINECOLOR, 
PROPERTY_ID_TEXTLINECOLOR, PropertyAttribute::BOUND | 
PropertyAttribute::MAYBEVOID,
-&m_aTextLineColor, ::cppu::UnoType::get());
+&m_aTextLineColor, cppu::UnoType::get());
 
 registerProperty(PROPERTY_TEXTEMPHASIS, PROPERTY_ID_TEXTEMPHASIS, 
PropertyAttribute::BOUND,
-&m_nFontEmphasis, ::getCppuType(&m_nFontEmphasis));
+&m_nFontEmphasis, cppu::UnoType::get());
 
 registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, 
PropertyAttribute::BOUND,
-&m_nFontRelief, ::getCppuType(&m_nFontRelief));
-
-registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME,
PropertyAttribute::BOUND,&m_aFont.Name,
::getCppuType(&m_aFont.Name));
-registerProperty(PROPERTY_FONTHEIGHT,   PROPERTY_ID_FONTHEIGHT,  
PropertyAttribute::BOUND,&m_aFont.Height,  
::getCppuType(&m_aFont.Height));
-registerProperty(PROPERTY_FONTWIDTH,PROPERTY_ID_FONTWIDTH,   
PropertyAttribute::BOUND,&m_aFont.Width,   
::getCppuType(&m_aFont.Width));
-registerProperty(PROPERTY_FONTSTYLENAME,PROPERTY_ID_FONTSTYLENAME,   
PropertyAttribute::BOUND,&m_aFont.StyleName,   
::getCppuType(&m_aFont.StyleName));
-registerProperty(PROPERTY_FONTFAMILY,   PROPERTY_ID_FONTFAMILY,  
PropertyAttribute::BOUND,&m_aFont.Family,  
::getCppuType(&m_aFont.Family));
-registerProperty(PROPERTY_FONTCHARSET,  PROPERTY_ID_FONTCHARSET, 
PropertyAttribute::BOUND,&m_aFont.CharSet, 
::getCppuType(&m_aFont.CharSet));
-registerProperty(PROPERTY_FONTPITCH,PROPERTY_ID_FONTPITCH,   
PropertyAttribute::BOUND,&m_aFont.Pitch,   
::getCppuType(&m_aFont.Pitch));
-registerProperty(PROPERTY_FONTCHARWIDTH,PROPERTY_ID_FONTCHARWIDTH,   
PropertyAttribute::BOUND,&m_aFont.CharacterWidth,  
::getCppuType(&m_aFont.CharacterWidth));
-registerProperty(PROPERTY_FONTWEIGHT,   PROPERTY_ID_FONTWEIGHT,  
PropertyAttribute::BOUND,&m_aFont.Weight,  
::getCppuType(&m_aFont.Weight));
-registerProperty(PROPERTY_FONTSLANT,PROPERTY_ID_FONTSLANT,   
PropertyAttribute::BOUND,&m_aFont.Slant,   
::getCppuType(&m_aFont.Slant));
-registerProperty(PROPERTY_FONTUNDERLINE,PROPERTY_ID_FONTUNDERLINE,   
PropertyAttribute::BOUND,&m_aFont.Underline,   
::getCppuType(&

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

[Julien Nabet]

 sc/source/core/tool/interpr1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f24e3d480bb88a568de10b4d81116766b136c91
Author: Julien Nabet 
Date:   Wed May 28 20:30:36 2014 +0200

Related fdo#75971 Crash when invoking "Insert > Names > Create"

bt:
0x2aaac837cd3c in rtl::OUString::copy (this=0x7ffec760, 
beginIndex=-2147483595) at 
/home/julien/compile-libreoffice/libreoffice/include/rtl/ustring.hxx:1464
0x2aaac87604ea in ScInterpreter::ScRight (this=0x8a6b7a0) at 
/home/julien/compile-libreoffice/libreoffice/sc/source/core/tool/interpr1.cxx:8106
0x2aaac879be5c in ScInterpreter::Interpret (this=0x8a6b7a0) at 
/home/julien/compile-libreoffice/libreoffice/sc/source/core/tool/interpr4.cxx:4150

So apply similar fix 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=37d7d115dd346ba7a713a5a18d90fc48a0d35072
to scRight

Cherry-picked from b41504503cdf4ac562f82e668bf2fe9217260493

Change-Id: I576e82cd033f0e0e5f9e9cbb9dd5f569782bbbc4
Reviewed-on: https://gerrit.libreoffice.org/9536
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 9223dc6..bae7962 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8091,7 +8091,7 @@ void ScInterpreter::ScRight()
 if (nParamCount == 2)
 {
 double nVal = ::rtl::math::approxFloor(GetDouble());
-if ( nVal < 0.0 || nVal > SAL_MAX_UINT16 )
+if ( rtl::math::isNan(nVal) || nVal < 0.0 || nVal > SAL_MAX_UINT16 
)
 {
 PushIllegalArgument();
 return ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Strange part in connectivity/source/drivers/jdbc/tools.cxx

[Julien Nabet]

On 29/05/2014 11:41, Lionel Elie Mamane wrote:

On Wed, May 28, 2014 at 03:43:24PM -0700, julien2412 wrote:


I noticed this part:
 113 // this is a special property to find the jdbc driver
 114 if  (   pBegin->Name.compareToAscii( "JavaDriverClass" )
 115 &&  pBegin->Name.compareToAscii( "JavaDriverClassPath" )
 116 &&  pBegin->Name.compareToAscii( "SystemProperties" )
 117 &&  pBegin->Name.compareToAscii( "CharSet" )
etc.

This means:

  if pBegin->Name is neither "JavaDriverClass", nor
  "JavaDriverClassPath", nor "SystemProperties", nor "CharSet"

That could be correct... or not.

That is in function createStringPropertyArray, which is used only in
JConnection.hxx to create the arguments that are passed to the JDBC
driver "connect" method. So, is this a list of properties that
*should* be passed or a list of properties that should *not*? That's
the question.

But as it is, this "if" can never be true since pBegin->Name can't be at 
the same time = to "JavaDriverClass" and also equal to "CharSet" for example

So either it's :

114   !pBegin->Name.compareToAscii( "JavaDriverClass" )
115 &&  !pBegin->Name.compareToAscii( "JavaDriverClassPath" )
116 &&  !pBegin->Name.compareToAscii( "SystemProperties" )
117 &&  !pBegin->Name.compareToAscii( "CharSet" )

or

114  pBegin->Name.compareToAscii( "JavaDriverClass" )
115 ||  pBegin->Name.compareToAscii( "JavaDriverClassPath" )
116 ||  pBegin->Name.compareToAscii( "SystemProperties" )
117 ||  pBegin->Name.compareToAscii( "CharSet" )


Sorry if I'm missing something obvious :-(

Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/drivers/jdbc/tools.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 74393875bcad5890a9510c7e8fd8643f63e081c2
Author: Julien Nabet 
Date:   Thu May 29 12:45:20 2014 +0200

To avoid some confusion for people like me :)

Thank you Lionel and Tor!
(see 
http://nabble.documentfoundation.org/Strange-part-in-connectivity-source-drivers-jdbc-tools-cxx-td4110680.html)

Change-Id: Ibbe68b8b3d12e4dfacf7f66bb3adbc2fd831d1a5

diff --git a/connectivity/source/drivers/jdbc/tools.cxx 
b/connectivity/source/drivers/jdbc/tools.cxx
index 8c52188..91ed303 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -111,6 +111,7 @@ java_util_Properties* 
connectivity::createStringPropertyArray(const Sequence< Pr
 for(;pBegin != pEnd;++pBegin)
 {
 // this is a special property to find the jdbc driver
+// FYI, OUString::compareToAscii() returns zero on equality, like 
strcmp()
 if  (   pBegin->Name.compareToAscii( "JavaDriverClass" )
 &&  pBegin->Name.compareToAscii( "JavaDriverClassPath" )
 &&  pBegin->Name.compareToAscii( "SystemProperties" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[SOLVED] Re: Strange part in connectivity/source/drivers/jdbc/tools.cxx

[Julien Nabet]

On 29/05/2014 12:31, Tor Lillqvist wrote:

But as it is, this "if" can never be true since pBegin->Name can't be at the
same time = to "JavaDriverClass" and also equal to "CharSet" for example

Check the semantics of OUString::compareToAscii(). It returns zero on
equality, like strcmp()

Should have begun with this, thank you both of you.
And to avoid asking the same question a second time, I added a comment 
by quoting Tor,
see 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=74393875bcad5890a9510c7e8fd8643f63e081c2


Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - oox/source rsc/source sd/source svgio/source writerfilter/source

[Julien Nabet]

 oox/source/drawingml/shapecontext.cxx  |1 -
 rsc/source/rscpp/cpp2.c|1 -
 sd/source/ui/dlg/docprev.cxx   |2 +-
 svgio/source/svgreader/svgtools.cxx|1 -
 writerfilter/source/dmapper/ThemeTable.cxx |1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 839dde414f88c095237a956d2d9b97afc0d05a0d
Author: Julien Nabet 
Date:   Thu May 29 20:45:46 2014 +0200

cppcheck: consecutive return/break/...

Change-Id: I171df68539fc41046b706157c04ab1e8cc1e60ca

diff --git a/oox/source/drawingml/shapecontext.cxx 
b/oox/source/drawingml/shapecontext.cxx
index bc246d2..74cc2d9 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -104,7 +104,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 
aElementToken, const
 {
 mpShapePtr->getTextBody()->getTextProperties().moRotation = 
rAttribs.getInteger( XML_rot );
 return 0;
-break;
 }
 case XML_cNvSpPr:
 break;
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index 1431e15..578052c 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -278,7 +278,6 @@ nest_err:   cerror("#%s must be in an #if", token);
 cput(c);
 fprintf( pCppOut, "\n" );
 exit( 1 );
-break;
 }
 default:
 /*
diff --git a/svgio/source/svgreader/svgtools.cxx 
b/svgio/source/svgreader/svgtools.cxx
index afc6fec..8c7ba0f 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -186,7 +186,6 @@ namespace svgio
 }
 
 return fRetval;
-break;
 }
 default:
 {
commit c46cc5751b5af4ce180fca63f998fe7eb405f93c
Author: Julien Nabet 
Date:   Thu May 29 20:45:00 2014 +0200

cppcheck: zerodiv

Change-Id: I09e1c86bdda301c11700ffe05d4a3d83b7a1104d

diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index cd015cd..4c4293c 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -87,7 +87,7 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, 
Size& rSize, Point& rP
 long nWidth = rSize.Width() - 2*FRAME;
 long nHeight = rSize.Height() - 2*FRAME;
 if( nWidth < 0 ) nWidth = 0;
-if( nHeight < 0 ) nHeight = 0;
+if( nHeight < 0 ) nHeight = 1;
 
 double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
 double dRatioPreV=((double) nWidth ) / nHeight;
commit 1af3579ecbe3747bcb9535d026d2a34792cd9106
Author: Julien Nabet 
Date:   Thu May 29 20:44:49 2014 +0200

cppcheck: unused variable

Change-Id: If497a2bbcc13702a960f510b3daf3bf7dc12d4c7

diff --git a/writerfilter/source/dmapper/ThemeTable.cxx 
b/writerfilter/source/dmapper/ThemeTable.cxx
index 2cc3566..7817175 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -177,7 +177,6 @@ void ThemeTable::lcl_entry(int /*pos*/, 
writerfilter::Reference::Poi
 
 OUString ThemeTable::getStringForTheme(const Id id)
 {
-std::map tmpThemeFontMap;
 switch (id)
 {
 case NS_ooxml::LN_Value_ST_Theme_majorEastAsia:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/drivers/jdbc/tools.cxx |   65 ++---
 1 file changed, 32 insertions(+), 33 deletions(-)

New commits:
commit 6cc359f8d739a92c2695a5248dfbb49f43d1ca6e
Author: Julien Nabet 
Date:   Fri May 30 22:15:26 2014 +0200

Replace "compareToAscii" by !=

See 
http://nabble.documentfoundation.org/Strange-part-in-connectivity-source-drivers-jdbc-tools-cxx-td4110680.html

Change-Id: I1ed37671e6c248ada7a972dba00e0fe98b565e75

diff --git a/connectivity/source/drivers/jdbc/tools.cxx 
b/connectivity/source/drivers/jdbc/tools.cxx
index 0d9ae1e..5d99330 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -113,39 +113,38 @@ java_util_Properties* 
connectivity::createStringPropertyArray(const Sequence< Pr
 // these are properties used internally by LibreOffice,
 // and should not be passed to the JDBC driver
 // (which probably does not know anything about them anyway).
-// FYI, OUString::compareToAscii() returns zero on equality, like 
strcmp()
-if  (   pBegin->Name.compareToAscii( "JavaDriverClass" )
-&&  pBegin->Name.compareToAscii( "JavaDriverClassPath" )
-&&  pBegin->Name.compareToAscii( "SystemProperties" )
-&&  pBegin->Name.compareToAscii( "CharSet" )
-&&  pBegin->Name.compareToAscii( "AppendTableAliasName" )
-&&  pBegin->Name.compareToAscii( "AddIndexAppendix" )
-&&  pBegin->Name.compareToAscii( "FormsCheckRequiredFields" )
-&&  pBegin->Name.compareToAscii( "GenerateASBeforeCorrelationName" 
)
-&&  pBegin->Name.compareToAscii( "EscapeDateTime" )
-&&  pBegin->Name.compareToAscii( "ParameterNameSubstitution" )
-&&  pBegin->Name.compareToAscii( "IsPasswordRequired" )
-&&  pBegin->Name.compareToAscii( "IsAutoRetrievingEnabled" )
-&&  pBegin->Name.compareToAscii( "AutoRetrievingStatement" )
-&&  pBegin->Name.compareToAscii( "UseCatalogInSelect" )
-&&  pBegin->Name.compareToAscii( "UseSchemaInSelect" )
-&&  pBegin->Name.compareToAscii( "AutoIncrementCreation" )
-&&  pBegin->Name.compareToAscii( "Extension" )
-&&  pBegin->Name.compareToAscii( "NoNameLengthLimit" )
-&&  pBegin->Name.compareToAscii( "EnableSQL92Check" )
-&&  pBegin->Name.compareToAscii( "EnableOuterJoinEscape" )
-&&  pBegin->Name.compareToAscii( "BooleanComparisonMode" )
-&&  pBegin->Name.compareToAscii( "IgnoreCurrency" )
-&&  pBegin->Name.compareToAscii( "TypeInfoSettings" )
-&&  pBegin->Name.compareToAscii( "IgnoreDriverPrivileges" )
-&&  pBegin->Name.compareToAscii( "ImplicitCatalogRestriction" )
-&&  pBegin->Name.compareToAscii( "ImplicitSchemaRestriction" )
-&&  pBegin->Name.compareToAscii( "SupportsTableCreation" )
-&&  pBegin->Name.compareToAscii( "UseJava" )
-&&  pBegin->Name.compareToAscii( "Authentication" )
-&&  pBegin->Name.compareToAscii( "PreferDosLikeLineEnds" )
-&&  pBegin->Name.compareToAscii( "PrimaryKeySupport" )
-&&  pBegin->Name.compareToAscii( "RespectDriverResultSetType" )
+if  (   pBegin->Name != "JavaDriverClass"
+&&  pBegin->Name != "JavaDriverClassPath"
+&&  pBegin->Name != "SystemProperties"
+&&  pBegin->Name != "CharSet"
+&&  pBegin->Name != "AppendTableAliasName"
+&&  pBegin->Name != "AddIndexAppendix"
+&&  pBegin->Name != "FormsCheckRequiredFields"
+&&  pBegin->Name != "GenerateASBeforeCorrelationName"
+&&  pBegin->Name != "EscapeDateTime"
+&&  pBegin->Name != "ParameterNameSubstitution"
+&&  pBegin->Name != "IsPasswordRequired"
+&&  pBegin->Name != "IsAutoRetrievingEnabled"
+&&  pBegin->Name != "AutoRetrievingStatement"
+

[Libreoffice-commits] core.git: sd/source

[Julien Nabet]

 sd/source/ui/dlg/docprev.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea15c9dc4da75fcd56e6b0dbce473b9e912fa4e2
Author: Julien Nabet 
Date:   Fri May 30 22:38:39 2014 +0200

Revert "cppcheck: zerodiv"

This reverts commit c46cc5751b5af4ce180fca63f998fe7eb405f93c.

See 
http://nabble.documentfoundation.org/avoiding-cppunit-zerodiv-correction-td4110788.html
for more details

diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 4c4293c..cd015cd 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -87,7 +87,7 @@ void SdDocPreviewWin::CalcSizeAndPos( GDIMetaFile* pFile, 
Size& rSize, Point& rP
 long nWidth = rSize.Width() - 2*FRAME;
 long nHeight = rSize.Height() - 2*FRAME;
 if( nWidth < 0 ) nWidth = 0;
-if( nHeight < 0 ) nHeight = 1;
+if( nHeight < 0 ) nHeight = 0;
 
 double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
 double dRatioPreV=((double) nWidth ) / nHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/source

[Julien Nabet]

 connectivity/source/drivers/firebird/Tables.cxx |   16 ++--
 connectivity/source/drivers/firebird/Tables.hxx |5 +
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit d7dd4bbf0a54cc780002052a370f835572035f51
Author: Julien Nabet 
Date:   Sun Jun 1 00:20:14 2014 +0200

Resolves: fdo#79493 Refresh Tables option fails with Firebird

Comparing with hsqldb part, sdbcx::OCollection link wasn't present in 
Tables constructor
Also include Catalog.hxx to be able to call "refreshTables" method

Change-Id: I1d8f2b0b361f8fd90f3065c07b3224894a3700d6

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index 70e3272..eea2987 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -9,6 +9,7 @@
 
 #include "Table.hxx"
 #include "Tables.hxx"
+#include "Catalog.hxx"
 
 #include 
 
@@ -29,24 +30,11 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 
 
-Tables::Tables(const uno::Reference< XDatabaseMetaData >& rMetaData,
-   OWeakObject& rParent,
-   Mutex& rMutex,
-   TStringVector& rNames) :
-OCollection(rParent,
-true,
-rMutex,
-rNames),
-m_rMutex(rMutex),
-m_xMetaData(rMetaData)
-{
-}
-
 //- OCollection ---
 void Tables::impl_refresh()
 throw(RuntimeException)
 {
-// TODO: IMPLEMENT ME
+static_cast(m_rParent).refreshTables();
 }
 
 ObjectType Tables::createObject(const OUString& rName)
diff --git a/connectivity/source/drivers/firebird/Tables.hxx 
b/connectivity/source/drivers/firebird/Tables.hxx
index 3d5f696..df66e60 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -25,9 +25,6 @@ namespace connectivity
  */
 class Tables: public ::connectivity::sdbcx::OCollection
 {
-private:
-::osl::Mutex& m_rMutex;
-
 protected:
 ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >
 m_xMetaData;
@@ -47,7 +44,7 @@ namespace connectivity
 Tables(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >& rMetaData,
::cppu::OWeakObject& rParent,
::osl::Mutex& rMutex,
-   ::connectivity::TStringVector& rNames);
+   ::connectivity::TStringVector& rNames) : 
sdbcx::OCollection(rParent, true, rMutex, rNames), m_xMetaData(rMetaData) {}
 
 // TODO: we should also implement XDataDescriptorFactory, 
XRefreshable,
 // XAppend,  etc., but all are optional.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - filter/source svx/source

[Julien Nabet]

 filter/source/msfilter/svdfppt.cxx |2 +-
 svx/source/fmcomp/fmgridcl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d7eb2703913d9e07749bda0b5f6437ee7d423142
Author: Julien Nabet 
Date:   Sun Jun 1 13:59:49 2014 +0200

Typo: colect->collect

Change-Id: Ib53aad3b773e8818c174f5dd35685e5bbe70afd7

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index def9fa6..4957096 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1177,7 +1177,7 @@ void FmGridControl::DeleteSelectedRows()
 {
 Reference< ::com::sun::star::sdbcx::XDeleteRows >  
xDeleteThem((Reference< XInterface >)*getDataSource(), UNO_QUERY);
 
-// colect the bookmarks of the selected rows
+// collect the bookmarks of the selected rows
 Sequence < Any> aBookmarks = getSelectionBookmarks();
 
 // determine the next row to position after deletion
commit 332d71b4b3cfb26c409bf0e897d8b812b524a8ee
Author: Julien Nabet 
Date:   Sun Jun 1 13:58:40 2014 +0200

Typo: hanlde->handle

Change-Id: I79e9018207c11c6f523dffc96ced1ff72fd728bc

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 20acbda..0c97eb3 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -699,7 +699,7 @@ void SdrEscherImport::RecolorGraphic( SvStream& rSt, 
sal_uInt32 nRecLen, Graphic
 }
 }
 
-/* ProcessObject is called from ImplSdPPTImport::ProcessObj to hanlde all 
application specific things,
+/* ProcessObject is called from ImplSdPPTImport::ProcessObj to handle all 
application specific things,
such as the import of text, animation effects, header footer and 
placeholder.
 
The parameter pOriginalObj is the object as it was imported by our general 
escher import, it must either
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/uiconfig cui/uiconfig sc/uiconfig svx/uiconfig sw/uiconfig

[Julien Nabet]

 chart2/uiconfig/ui/tp_Trendline.ui   |2 +-
 cui/uiconfig/ui/calloutpage.ui   |6 +++---
 cui/uiconfig/ui/connpooloptions.ui   |2 +-
 cui/uiconfig/ui/mosaicdialog.ui  |2 +-
 cui/uiconfig/ui/wordcompletionpage.ui|4 ++--
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui |2 +-
 sc/uiconfig/scalc/ui/datastreams.ui  |2 +-
 svx/uiconfig/ui/sidebarparagraph.ui  |   10 +-
 sw/uiconfig/swriter/ui/mmlayoutpage.ui   |2 +-
 sw/uiconfig/swriter/ui/optgeneralpage.ui |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit acdff9f9763847c992e0853022896cff781c5ffe
Author: Julien Nabet 
Date:   Sun Jun 1 22:24:36 2014 +0200

Resolves: fdo#79506 Some numbers are marked as translatable

Exception:

http://opengrok.libreoffice.org/xref/core/sd/source/ui/view/DocumentRenderer.src#55

Change-Id: Iecfe49b51ed68de00f1b5adfb5bca9fa793fb1f9

diff --git a/chart2/uiconfig/ui/tp_Trendline.ui 
b/chart2/uiconfig/ui/tp_Trendline.ui
index e9ce8ef..7060c99 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -510,7 +510,7 @@
 True
 True
 ●
-0
+0
 False
 number
   
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
index 8863313..846b7e6 100644
--- a/cui/uiconfig/ui/calloutpage.ui
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -112,7 +112,7 @@
   
 True
 True
-0.00
+0.00
 adjustment1
 2
   
@@ -225,7 +225,7 @@
   
 True
 True
-0.00
+0.00
 adjustment1
 2
   
@@ -269,7 +269,7 @@
   
 True
 True
-0.00
+0.00
 adjustment1
 2
   
diff --git a/cui/uiconfig/ui/connpooloptions.ui 
b/cui/uiconfig/ui/connpooloptions.ui
index 97be7d8..c206625 100644
--- a/cui/uiconfig/ui/connpooloptions.ui
+++ b/cui/uiconfig/ui/connpooloptions.ui
@@ -171,7 +171,7 @@
 True
 True
 ●
-60
+60
 adjustment1
 60
   
diff --git a/cui/uiconfig/ui/mosaicdialog.ui b/cui/uiconfig/ui/mosaicdialog.ui
index e00626d..cf98d16 100644
--- a/cui/uiconfig/ui/mosaicdialog.ui
+++ b/cui/uiconfig/ui/mosaicdialog.ui
@@ -127,7 +127,7 @@
   
 True
 True
-2
+2
 adjustment1
 2
   
diff --git a/cui/uiconfig/ui/wordcompletionpage.ui 
b/cui/uiconfig/ui/wordcompletionpage.ui
index 85f6b35..7e14c4a 100644
--- a/cui/uiconfig/ui/wordcompletionpage.ui
+++ b/cui/uiconfig/ui/wordcompletionpage.ui
@@ -106,7 +106,7 @@
 True
 True
 start
-500
+500
 adjustment1
 500
   
@@ -151,7 +151,7 @@
 True
 True
 start
-100
+100
 adjustment2
 100
   
diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui 
b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
index 3fcf8ea..60de1ca 100644
--- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
@@ -312,7 +312,7 @@
 True
 True
 •
-0,05
+0,05
 rows-per-sample-adjustment
 1
   
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui 
b/sc/uiconfig/scalc/ui/datastreams.ui
index cd48886..7986432 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -420,7 +420,7 @@
 True
 True
 ●
-1000
+1000
 True
   
   
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/uiconfig cui/uiconfig sc/uiconfig svx/uiconfig sw/uiconfig

[Julien Nabet]

 chart2/uiconfig/ui/tp_Trendline.ui   |2 +-
 cui/uiconfig/ui/calloutpage.ui   |6 +++---
 cui/uiconfig/ui/connpooloptions.ui   |2 +-
 cui/uiconfig/ui/mosaicdialog.ui  |2 +-
 cui/uiconfig/ui/wordcompletionpage.ui|4 ++--
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui |2 +-
 sc/uiconfig/scalc/ui/datastreams.ui  |2 +-
 svx/uiconfig/ui/sidebarparagraph.ui  |   10 +-
 sw/uiconfig/swriter/ui/mmlayoutpage.ui   |2 +-
 sw/uiconfig/swriter/ui/optgeneralpage.ui |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 791f129273dfabce4989cf6607db625104d28571
Author: Julien Nabet 
Date:   Sun Jun 1 22:24:36 2014 +0200

Resolves: fdo#79506 Some numbers are marked as translatable

Exception:

http://opengrok.libreoffice.org/xref/core/sd/source/ui/view/DocumentRenderer.src#55

Cherry-picked from acdff9f9763847c992e0853022896cff781c5ffe

Change-Id: Iecfe49b51ed68de00f1b5adfb5bca9fa793fb1f9
Reviewed-on: https://gerrit.libreoffice.org/9614
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/chart2/uiconfig/ui/tp_Trendline.ui 
b/chart2/uiconfig/ui/tp_Trendline.ui
index e9ce8ef..7060c99 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -510,7 +510,7 @@
 True
 True
 ●
-0
+0
 False
 number
   
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
index 8863313..846b7e6 100644
--- a/cui/uiconfig/ui/calloutpage.ui
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -112,7 +112,7 @@
   
 True
 True
-0.00
+0.00
 adjustment1
 2
   
@@ -225,7 +225,7 @@
   
 True
 True
-0.00
+0.00
 adjustment1
 2
   
@@ -269,7 +269,7 @@
   
 True
 True
-0.00
+0.00
 adjustment1
 2
   
diff --git a/cui/uiconfig/ui/connpooloptions.ui 
b/cui/uiconfig/ui/connpooloptions.ui
index 97be7d8..c206625 100644
--- a/cui/uiconfig/ui/connpooloptions.ui
+++ b/cui/uiconfig/ui/connpooloptions.ui
@@ -171,7 +171,7 @@
 True
 True
 ●
-60
+60
 adjustment1
 60
   
diff --git a/cui/uiconfig/ui/mosaicdialog.ui b/cui/uiconfig/ui/mosaicdialog.ui
index e00626d..cf98d16 100644
--- a/cui/uiconfig/ui/mosaicdialog.ui
+++ b/cui/uiconfig/ui/mosaicdialog.ui
@@ -127,7 +127,7 @@
   
 True
 True
-2
+2
 adjustment1
 2
   
diff --git a/cui/uiconfig/ui/wordcompletionpage.ui 
b/cui/uiconfig/ui/wordcompletionpage.ui
index 85f6b35..7e14c4a 100644
--- a/cui/uiconfig/ui/wordcompletionpage.ui
+++ b/cui/uiconfig/ui/wordcompletionpage.ui
@@ -106,7 +106,7 @@
 True
 True
 start
-500
+500
 adjustment1
 500
   
@@ -151,7 +151,7 @@
 True
 True
 start
-100
+100
 adjustment2
 100
   
diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui 
b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
index 3fcf8ea..60de1ca 100644
--- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
+++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui
@@ -312,7 +312,7 @@
 True
 True
 •
-0,05
+0,05
 rows-per-sample-adjustment
 1
   
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui 
b/sc/uiconfig/scalc/ui/datastreams.ui
index cd48886..7986432 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -420,7 +420,7 @@
 True
 True
 ●
-1000
+1000

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/firebird/Tables.cxx |   16 ++--
 connectivity/source/drivers/firebird/Tables.hxx |5 +
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit ee38fa4ff5234b6b2342b330b39f5f456ee4a68c
Author: Julien Nabet 
Date:   Sun Jun 1 00:20:14 2014 +0200

Resolves: fdo#79493 Refresh Tables option fails with Firebird

Comparing with hsqldb part, sdbcx::OCollection link wasn't present in 
Tables constructor
Also include Catalog.hxx to be able to call "refreshTables" method

Cherry-picked from d7dd4bbf0a54cc780002052a370f835572035f51

Change-Id: I1d8f2b0b361f8fd90f3065c07b3224894a3700d6
Reviewed-on: https://gerrit.libreoffice.org/9600
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index 70e3272..eea2987 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -9,6 +9,7 @@
 
 #include "Table.hxx"
 #include "Tables.hxx"
+#include "Catalog.hxx"
 
 #include 
 
@@ -29,24 +30,11 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 
 
-Tables::Tables(const uno::Reference< XDatabaseMetaData >& rMetaData,
-   OWeakObject& rParent,
-   Mutex& rMutex,
-   TStringVector& rNames) :
-OCollection(rParent,
-true,
-rMutex,
-rNames),
-m_rMutex(rMutex),
-m_xMetaData(rMetaData)
-{
-}
-
 //- OCollection ---
 void Tables::impl_refresh()
 throw(RuntimeException)
 {
-// TODO: IMPLEMENT ME
+static_cast(m_rParent).refreshTables();
 }
 
 ObjectType Tables::createObject(const OUString& rName)
diff --git a/connectivity/source/drivers/firebird/Tables.hxx 
b/connectivity/source/drivers/firebird/Tables.hxx
index 3d5f696..df66e60 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -25,9 +25,6 @@ namespace connectivity
  */
 class Tables: public ::connectivity::sdbcx::OCollection
 {
-private:
-::osl::Mutex& m_rMutex;
-
 protected:
 ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >
 m_xMetaData;
@@ -47,7 +44,7 @@ namespace connectivity
 Tables(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >& rMetaData,
::cppu::OWeakObject& rParent,
::osl::Mutex& rMutex,
-   ::connectivity::TStringVector& rNames);
+   ::connectivity::TStringVector& rNames) : 
sdbcx::OCollection(rParent, true, rMutex, rNames), m_xMetaData(rMetaData) {}
 
 // TODO: we should also implement XDataDescriptorFactory, 
XRefreshable,
 // XAppend,  etc., but all are optional.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/firebird/Tables.cxx |   18 +++---
 connectivity/source/drivers/firebird/Tables.hxx |7 ++-
 2 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit f03c2bb813d87bc3c89af78f7f01c587db4c59de
Author: Julien Nabet 
Date:   Sun Jun 1 00:20:14 2014 +0200

Resolves: fdo#79493 Refresh Tables option fails with Firebird

Comparing with hsqldb part, sdbcx::OCollection link wasn't present in 
Tables constructor
Also include Catalog.hxx to be able to call "refreshTables" method

(cherry picked from commit d7dd4bbf0a54cc780002052a370f835572035f51)

Conflicts:
connectivity/source/drivers/firebird/Tables.cxx

Change-Id: I1d8f2b0b361f8fd90f3065c07b3224894a3700d6
Reviewed-on: https://gerrit.libreoffice.org/9601
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index fc55d2a..6a03d9e 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -9,6 +9,7 @@
 
 #include "Table.hxx"
 #include "Tables.hxx"
+#include "Catalog.hxx"
 
 #include 
 
@@ -29,24 +30,11 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
 
 
-Tables::Tables(const uno::Reference< XDatabaseMetaData >& rMetaData,
-   OWeakObject& rParent,
-   Mutex& rMutex,
-   TStringVector& rNames) :
-OCollection(rParent,
-sal_True,
-rMutex,
-rNames),
-m_rMutex(rMutex),
-m_xMetaData(rMetaData)
-{
-}
-
 //- OCollection ---
 void Tables::impl_refresh()
 throw(RuntimeException)
 {
-// TODO: IMPLEMENT ME
+static_cast(m_rParent).refreshTables();
 }
 
 ObjectType Tables::createObject(const OUString& rName)
@@ -117,4 +105,4 @@ void Tables::dropObject(sal_Int32 nPosition, const OUString 
sName)
 }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Tables.hxx 
b/connectivity/source/drivers/firebird/Tables.hxx
index b2e570f..438f3c1 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -25,9 +25,6 @@ namespace connectivity
  */
 class Tables: public ::connectivity::sdbcx::OCollection
 {
-private:
-::osl::Mutex& m_rMutex;
-
 protected:
 ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >
 m_xMetaData;
@@ -47,7 +44,7 @@ namespace connectivity
 Tables(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >& rMetaData,
::cppu::OWeakObject& rParent,
::osl::Mutex& rMutex,
-   ::connectivity::TStringVector& rNames);
+   ::connectivity::TStringVector& rNames) : 
sdbcx::OCollection(rParent, true, rMutex, rNames), m_xMetaData(rMetaData) {}
 
 // TODO: we should also implement XDataDescriptorFactory, 
XRefreshable,
 // XAppend,  etc., but all are optional.
@@ -63,4 +60,4 @@ namespace connectivity
 
 #endif // CONNECTIVITY_FIREBIRD_TABLES_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/workben

[Julien Nabet]

 vcl/workben/outdevgrind.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d69ec4912c4d5bb8eb03e2dece8cbba0910f11b
Author: Julien Nabet 
Date:   Tue Jun 3 20:23:40 2014 +0200

Remove xub_StrLen refs

Change-Id: Iea8c3f881a3ddfeaed4f4dca5d66dbe1716b8ce0

diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 8e592dc..648c52b 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -139,8 +139,8 @@ void setupMethodStubs( functor_vector_type& res )
 
 /* void DrawTextArray( const Point& rStartPt, const OUString& rStr,
const sal_Int32* pDXAry = NULL,
-   xub_StrLen nIndex = 0,
-   xub_StrLen nLen = STRING_LEN );
+   sal_uInt16 nIndex = 0,
+   sal_Int32 nLen = STRING_LEN );
 */
 add(res,
 "DrawTextArray",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Julien Nabet]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48882c10e7547a8df021f73630094e485b66e72b
Author: Julien Nabet 
Date:   Sat Jun 7 13:52:18 2014 +0200

Updated core
Project: dictionaries  ad4dea48c420f123afa083ac5cc4b12287c9c17f

diff --git a/dictionaries b/dictionaries
index b312442..ad4dea4 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b31244205066114f5721beef118be7f9e518cd22
+Subproject commit ad4dea48c420f123afa083ac5cc4b12287c9c17f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: hu_HU/dialog

[Julien Nabet]

 hu_HU/dialog/hu_HU.xdl |   56 -
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit ad4dea48c420f123afa083ac5cc4b12287c9c17f
Author: Julien Nabet 
Date:   Sat Jun 7 13:52:18 2014 +0200

Resolves: fdo#78526 Some problem on display of Hungarian sentence checking

I took into account this:
https://bugs.freedesktop.org/attachment.cgi?id=100592

Change-Id: Iadd7a372b9e6f68a6e70e3e059ef762a530ad41a

diff --git a/hu_HU/dialog/hu_HU.xdl b/hu_HU/dialog/hu_HU.xdl
index c62bd3a..252471b 100644
--- a/hu_HU/dialog/hu_HU.xdl
+++ b/hu_HU/dialog/hu_HU.xdl
@@ -5,33 +5,33 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build fail with MacOs in connectivity part

[Julien Nabet]

On 08/06/2014 19:29, Norbert Thiebaud wrote:

On Sun, Jun 8, 2014 at 9:05 AM, julien2412  wrote:

--with-system-odbc

Any idea?

Julien


with-system-odbc pick sqlext.h from the 10.8 SDK

it define SQLWCHAR using

#if defined(WIN32)
typedef unsigned short SQLWCHAR;
#else
#  include 

#  if defined(__cplusplus)  || \
   defined(_WCHAR_T) || \
   defined(_WCHAR_T_DEFINED) || \
   defined(_WCHAR_T_DEFINED_)|| \
   defined(_WCHAR_T_DECLARED)|| \
   defined(_BSD_WCHAR_T_DEFINED_)|| \
   defined(_BSD_WCHAR_T_)|| \
   defined(_BSD_CT_RUNE_T_)
typedef wchar_t SQLWCHAR;
#  else
#error Please make sure your system supports the wchar_t type
#  endif
#endif /* WIN32 */

iow as wchar_t which in 10.9 (iow using clang) is defined as int not
short. (see i386/_types.h)

Thank you Norbert for your feedback.
Now is the boost_assertion wrong or is there something else to fix? (and 
which one?)


Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[SOLVED] Re: Build fail with MacOs in connectivity part

[Julien Nabet]

On 08/06/2014 20:04, Norbert Thiebaud wrote:

On Sun, Jun 8, 2014 at 10:55 AM, Julien Nabet  wrote:

Now is the boost_assertion wrong or is there something else to fix? (and
which one?)

I doubt the assertion is wrong there. internally we use 16 bits for
character representation (OUString)... 32 bit wchar_t will probably
not play well with that.

how about not using --with-system-odbc ?
any particular reason you added that ?


I thought it was mandatory to test odbc related bugtrackers.
If it's not the case, I'll try without this option.

Thank you again! :-)

Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice