date:20130731

 sc/source/core/data/column.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit a38f09fec16f24886414c3e9f9574a06b56d8077
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 09:51:40 2013 +0300

WaE: Unused private fields

Change-Id: I164748245326b67bbe61e5ede6b98f713b8d5d03

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 98ccd26..66343a7 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2407,8 +2407,6 @@ class InsertTabUpdater
 sc::CellTextAttrStoreType mrTextAttrs;
 sc::CellTextAttrStoreType::iterator miAttrPos;
 SCTAB mnTab;
-SCTAB mnInsPos;
-SCTAB mnNewSheets;
 bool mbModified;
 
 public:
@@ -2441,8 +2439,6 @@ class DeleteTabUpdater
 sc::RefUpdateDeleteTabContext mrCxt;
 sc::CellTextAttrStoreType mrTextAttrs;
 sc::CellTextAttrStoreType::iterator miAttrPos;
-SCTAB mnDelPos;
-SCTAB mnSheets;
 SCTAB mnTab;
 bool mbModified;
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/excel/frmbase.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 66054ae2ee5aaaf371e5279ca7e17abee023e28f
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 10:26:25 2013 +0300

Fix errors: no members 'Ref1' or 'Ref2' in 'ScRange'

Change-Id: Iaa77f252750e38eeb7922ccb9b9604d13b4ee7f4

diff --git a/sc/source/filter/excel/frmbase.cxx 
b/sc/source/filter/excel/frmbase.cxx
index d27bf08..c4ec189 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -110,10 +110,12 @@ void _ScRangeListTabs::Append( const ScRange aCRD, SCTAB 
nTab, bool b )
 }
 else
 {
+#if 0 // no members 'Ref1' or 'Ref2' in 'ScRange'
 OSL_ENSURE( ValidTab(a.Ref1.nTab),
 -_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze! );
 OSL_ENSURE( a.Ref1.nTab == a.Ref2.nTab,
 +_ScRangeListTabs::Append(): 3D-Ranges werden in SC nicht 
unterstuetzt! );
+#endif
 }
 
 if( nTab == SCTAB_MAX)
commit fc3f4d546ab9fb3a4201caef582ca3e94f4913c9
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 10:23:54 2013 +0300

Fix error: 'nTab' is a private member of 'ScAddress'

Change-Id: Ic3d350da6400e1e1425579e3ce8d1aa784210284

diff --git a/sc/source/filter/excel/frmbase.cxx 
b/sc/source/filter/excel/frmbase.cxx
index b1166ee..d27bf08 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -46,7 +46,7 @@ void _ScRangeListTabs::Append( const ScAddress aSRD, SCTAB 
nTab, const bool b )
 }
 else
 {
-OSL_ENSURE( ValidTab(a.nTab), -_ScRangeListTabs::Append(): A lie has 
no crash! );
+OSL_ENSURE( ValidTab(a.Tab()), -_ScRangeListTabs::Append(): A lie has 
no crash! );
 }
 
 if( nTab == SCTAB_MAX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/excel/frmbase.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5c7ddb12afe9423a63f8bb13b53d5a38636ad04
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 31 09:33:29 2013 +0200

if-0-ing the whole else branch

Change-Id: I850577dc9a5684ad66d7fcb995c6b47b1744265e

diff --git a/sc/source/filter/excel/frmbase.cxx 
b/sc/source/filter/excel/frmbase.cxx
index c4ec189..6d167ff 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -108,15 +108,15 @@ void _ScRangeListTabs::Append( const ScRange aCRD, SCTAB 
nTab, bool b )
 else if (a.aEnd.Row()  0)
 a.aEnd.SetRow(0);
 }
+#if 0 // no members 'Ref1' or 'Ref2' in 'ScRange'
 else
 {
-#if 0 // no members 'Ref1' or 'Ref2' in 'ScRange'
 OSL_ENSURE( ValidTab(a.Ref1.nTab),
 -_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze! );
 OSL_ENSURE( a.Ref1.nTab == a.Ref2.nTab,
 +_ScRangeListTabs::Append(): 3D-Ranges werden in SC nicht 
unterstuetzt! );
-#endif
 }
+#endif
 
 if( nTab == SCTAB_MAX)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa vcl/win

2013-07-31 Thread Isamu Mogi

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
 sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
 sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
 vcl/win/source/window/keynames.cxx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ded871e9c1a69f640d6283ae6f79820689f0d612
Author: Isamu Mogi saturda...@gmail.com
Date:   Fri Jun 21 15:47:30 2013 +

fdo#66246 fdo#66395 BOM for MSVC with UTF-8 unfriendly codepage

MSVC misinterprets UTF-8 source code without BOM as ANSI/OEM codepage.
For that reason if local codepage is unfriendly to UTF-8, it sometimes
causes compilation error.

Change-Id: I8acd5500e581e020fd60b5a2ec20629f92fdf87c

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b0f9845..81e7f3f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ï»¿/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0d10002..ef66d1a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 48db195..8d3edf0 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c676d08..17be4fc 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index c85360a..226ff8f 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ï»¿/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sw/qa vcl/win

2013-07-31 Thread Isamu Mogi

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
 sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
 sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
 vcl/win/source/window/keynames.cxx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0e9469032254d3b4fa50bfa447b2527403547541
Author: Isamu Mogi saturda...@gmail.com
Date:   Fri Jun 21 15:47:30 2013 +

fdo#66246 fdo#66395 BOM for MSVC with UTF-8 unfriendly codepage

MSVC misinterprets UTF-8 source code without BOM as ANSI/OEM codepage.
For that reason if local codepage is unfriendly to UTF-8, it sometimes
causes compilation error.

Change-Id: I8acd5500e581e020fd60b5a2ec20629f92fdf87c

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8dc69f2..1efea3d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ï»¿/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8c64063..636d0b1 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 0605b82..6aa94ec 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 5f81a1f..74ac76e 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1,4 +1,4 @@
-/*
+ï»¿/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index fcac7d6..ceebd95 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ï»¿/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Depends on||67489

--- Comment #62 from Cor Nouws c...@nouenoff.nl ---
Adding Bug 67489 - EDITING: copied and pasted cells containing formulas are not
recalculated

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 connectivity/source/drivers/firebird/FDatabaseMetaData.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit daa08c1027e62c76c171628e2a2e6adce0ad3a45
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Wed Jul 31 10:36:27 2013 +0200

Add parameters to char/varchar in getTypeInfo. (firebird-sdbc)

This means that char/varchar columns can once again be created.

Change-Id: I081f1dd3abad6d007b1f957d72841983a1130f72

diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 539df19..52f44ca 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -819,8 +819,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 
 // Common data
 aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal 
quote marks
-aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal 
quote marks
-aRow[6] = new ORowSetValueDecorator();   // Create Params
+aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); // Literal 
quote marks // Create Params
 aRow[7] = new ORowSetValueDecorator(sal_Bool(true)); // Nullable
 aRow[8] = new ORowSetValueDecorator(sal_Bool(true)); // Case sensitive
 aRow[10] = new ORowSetValueDecorator(sal_Bool(false)); // Is unsigned
@@ -836,6 +835,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 aRow[1] = new ORowSetValueDecorator(OUString(CHAR));
 aRow[2] = new ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TEXT));
 aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = 
max length
+aRow[6] = new ORowSetValueDecorator(OUString(length));
 aRow[9] = new ORowSetValueDecorator(
 sal_Int16(ColumnSearch::FULL)); // Searchable
 aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money 
value
@@ -848,6 +848,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 aRow[1] = new ORowSetValueDecorator(OUString(VARCHAR));
 aRow[2] = new 
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_VARYING));
 aRow[3] = new ORowSetValueDecorator(sal_Int16(32767)); // Prevision = 
max length
+aRow[6] = new ORowSetValueDecorator(OUString(length));
 aRow[9] = new ORowSetValueDecorator(
 sal_Int16(ColumnSearch::FULL)); // Searchable
 aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be money 
value
@@ -858,6 +859,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 
 // Integer Types common
 {
+aRow[6] = new ORowSetValueDecorator();
 aRow[9] = new ORowSetValueDecorator(
 sal_Int16(ColumnSearch::FULL)); // Searchable
 aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be 
money value
@@ -883,6 +885,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 
 // Decimal Types common
 {
+aRow[6] = new ORowSetValueDecorator();
 aRow[9] = new ORowSetValueDecorator(
 sal_Int16(ColumnSearch::FULL)); // Searchable
 aRow[11] = new ORowSetValueDecorator(sal_Bool(true)); // Can be 
money value
@@ -916,6 +919,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 aRow[1] = new ORowSetValueDecorator(OUString(timestamp));
 aRow[2] = new 
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TIMESTAMP));
 aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max 
length
+aRow[6] = new ORowSetValueDecorator();
 aRow[9] = new ORowSetValueDecorator(
 sal_Int16(ColumnSearch::FULL)); // Searchable
 aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money 
value
@@ -929,6 +933,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 aRow[1] = new ORowSetValueDecorator(OUString(TIME));
 aRow[2] = new 
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_TIME));
 aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max 
length
+aRow[6] = new ORowSetValueDecorator();
 aRow[9] = new ORowSetValueDecorator(
 sal_Int16(ColumnSearch::FULL)); // Searchable
 aRow[11] = new ORowSetValueDecorator(sal_Bool(false)); // Can be money 
value
@@ -942,6 +947,7 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTypeInfo()
 aRow[1] = new ORowSetValueDecorator(OUString(DATE));
 aRow[2] = new 
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TYPE_DATE));
 aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max 
length
+aRow[6] = new ORowSetValueDecorator();
 aRow[9] = new

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Timur gti...@gmail.com changed:

   What|Removed |Added

 Depends on||37606

--- Comment #164 from Timur gti...@gmail.com ---
Really added Bug 37606 to the list.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/qa vcl/win

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 +-
 sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
 sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
 vcl/win/source/window/keynames.cxx   |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c7a8462b839f37712620fd2c236cfda026ec546d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 31 11:36:27 2013 +0200

Revert fdo#66246 fdo#66395 BOM for MSVC with UTF-8 unfriendly codepage

This breaks tinderbox builds. Better fix on the way.

This reverts commit ded871e9c1a69f640d6283ae6f79820689f0d612.

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 81e7f3f..b0f9845 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1,4 +1,4 @@
-ï»¿/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ef66d1a..0d10002 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1,4 +1,4 @@
-ï»¿/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 8d3edf0..48db195 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -1,4 +1,4 @@
-ï»¿/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 17be4fc..c676d08 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1,4 +1,4 @@
-ï»¿/*
+/*
  * This file is part of the LibreOffice project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 226ff8f..c85360a 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -1,4 +1,4 @@
-ï»¿/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 
-*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fwd: Current state of libreoffice headless build.

2013-07-31 Thread Maxim Lacrima

-- Forwarded message --
From: Maxim Lacrima lacrima.ma...@gmail.com
Date: 31 July 2013 12:36
Subject: Re: Current state of libreoffice headless build.
To: Riccardo Magliocchetti riccardo.magliocche...@gmail.com

Hi Riccardo,

I don't know if it is a problem specific to headless build, but when using
--enable-headless and --enable-epm, there are some issues with created
packages (in my case rpm). It looks like it incorrectly resolves
dependencies. Here is the tail of `yum install *.rpm`:

-- Finished Dependency Resolution
Error: Package: libreofficedev4.1-4.1.0.4.0-4.x86_64
(/libreofficedev4.1-4.1.0.4.0-4.x86_64)
   Requires: lodevbasis4.1-images

It looks like epm doesn't create 'images' rpm, but other packages require
it.

On 30 July 2013 14:27, Maxim Lacrima lacrima.ma...@gmail.com wrote:

 Hi Riccardo,

 thanks a lot for your help!

 On 29 July 2013 18:40, Riccardo Magliocchetti 
 riccardo.magliocche...@gmail.com wrote:

 Hello Maxim,

 Il 29/07/2013 17:01, Maxim Lacrima ha scritto:

  Hello,

 I can see that there is a dedicated wiki page:
 https://wiki.**documentfoundation.org/**Development/HeadlessBuildhttps://wiki.documentfoundation.org/Development/HeadlessBuild

 that provides some hints on how to build libreoffice in headless mode.

 Yes, now that 4.1 is out i should update the wiki (...updated).

  What is the current state of libreoffice headless? I mean is such a build
 stable and functional for libreoffice 4.1 branch?

 It's supposed to be working fine on linux platforms. Personally i've
 never checked without the --without-java switch. If you have any build
 issue just open a bug report or report it here.

 Thanks for your interest,
 riccardo

 --
 Regards,
 Maxim

-- 
Regards,
Maxim

-- 
Regards,
Maxim
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sc/qa/extras/macros-test.cxx   |   40 +
 sc/qa/extras/testdocuments/MasterScriptProviderProblem.ods |binary
 2 files changed, 40 insertions(+)

New commits:
commit 6add3c38a82bbac7e096327277707ba4858bf26a
Author: Noel Power noel.po...@suse.com
Date:   Wed Jul 31 10:50:35 2013 +0100

unit ( slowcheck ) test for fdo#67547

although this really isn't the correct location for the test ( a scripting
module slowcheck test would be more appropriate I think ). Still better than
 no test.

Change-Id: I434e1217c25ee33b59ea3b09c4500bdd7bb081ba

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index f65b88c..31171c7 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -39,11 +39,13 @@ public:
 
 void testStarBasic();
 void testVba();
+void testMSP();
 CPPUNIT_TEST_SUITE(ScMacrosTest);
 #if !defined(MACOSX)
 //enable this test if you want to play with star basic macros in unit tests
 //works but does nothing useful yet
 CPPUNIT_TEST(testStarBasic);
+CPPUNIT_TEST(testMSP);
 CPPUNIT_TEST(testVba);
 #endif
 
@@ -53,6 +55,44 @@ private:
 uno::Referenceuno::XInterface m_xCalcComponent;
 };
 
+// I suppose you could say this test doesn't really belong here, OTOH
+// we need a full document to run the test ( it related originally to an
+// imported Excel VBA macro ) It's convenient and fast to unit test
+// this the problem this way. Perhaps in the future there will be some sort
+// of slowcheck tests ( requiring a full document environment in the scripting
+// module, we could move the test there then ) - relates to fdo#67547
+void ScMacrosTest::testMSP()
+{
+const OUString aFileNameBase(MasterScriptProviderProblem.ods);
+OUString aFileName;
+createFileURL(aFileNameBase, aFileName);
+std::cout  MasterScriptProviderProblem (fdo#67547) test  std::endl;
+uno::Reference com::sun::star::lang::XComponent  xComponent = 
loadFromDesktop(aFileName, com.sun.star.sheet.SpreadsheetDocument);
+
+CPPUNIT_ASSERT_MESSAGE(Failed to load MasterScriptProviderProblem.ods, 
xComponent.is());
+
+OUString 
aURL(vnd.sun.Star.script:Standard.Module1.TestMSP?language=Basiclocation=document);
+String sUrl = aURL;
+Any aRet;
+Sequence sal_Int16  aOutParamIndex;
+Sequence Any  aOutParam;
+Sequence uno::Any  aParams;
+
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+
+CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell);
+ScDocShell* xDocSh = static_castScDocShell*(pFoundShell);
+ScDocument* pDoc = xDocSh-GetDocument();
+
+pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, 
aOutParamIndex,aOutParam);
+OUString sResult;
+aRet = sResult;
+
+std::cout  Result is   sResult  std::endl;
+CPPUNIT_ASSERT_MESSAGE(TestMSP ( for fdo#67547) failed, sResult == OK 
);
+xDocSh-DoClose();
+}
+
 void ScMacrosTest::testStarBasic()
 {
 const OUString aFileNameBase(StarBasic.ods);
diff --git a/sc/qa/extras/testdocuments/MasterScriptProviderProblem.ods 
b/sc/qa/extras/testdocuments/MasterScriptProviderProblem.ods
new file mode 100644
index 000..35e2b985
Binary files /dev/null and 
b/sc/qa/extras/testdocuments/MasterScriptProviderProblem.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/inc/shellio.hxx |4 +-
 sw/source/core/inc/SwXMLTextBlocks.hxx |2 -
 sw/source/core/inc/swblocks.hxx|2 -
 sw/source/core/swg/SwXMLTextBlocks.cxx |4 +-
 sw/source/core/swg/swblocks.cxx|4 +-
 sw/source/ui/dochdl/gloshdl.cxx|   60 +++--
 sw/source/ui/inc/glosbib.hxx   |2 -
 sw/source/ui/inc/glosdoc.hxx   |6 +--
 sw/source/ui/inc/gloshdl.hxx   |   14 +++
 sw/source/ui/misc/glosbib.cxx  |   27 +++---
 sw/source/ui/misc/glosdoc.cxx  |   38 +---
 sw/source/ui/misc/glossary.cxx |   56 +++---
 sw/source/ui/uno/unoatxt.cxx   |   18 -
 13 files changed, 115 insertions(+), 122 deletions(-)

New commits:
commit e1c2cb7dc89753c81618a6e4ce95dd9b0d43782f
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Thu Jul 25 19:42:17 2013 +0200

String to OUString

Change-Id: Ifc5e74f3a484229e05fe65b47ac5e8b763595fd0
Reviewed-on: https://gerrit.libreoffice.org/5183
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 7e33733..7efeca0 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -331,8 +331,8 @@ public:
 
 sal_Bool   Delete( sal_uInt16 );
 sal_uInt16 Rename( sal_uInt16, const String*, const String* );
-sal_uLong  CopyBlock( SwTextBlocks rSource, String rSrcShort,
-const String rLong );
+sal_uLong  CopyBlock( SwTextBlocks rSource, OUString rSrcShort,
+const OUString rLong );
 
 sal_Bool   BeginGetDoc( sal_uInt16 );   // Read text modules.
 void   EndGetDoc(); // Release text modules.
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx 
b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 8aa3a94..b3c1b3b 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -60,7 +60,7 @@ public:
 //virtual sal_Bool   IsOld() const;
 virtual sal_uLong Delete( sal_uInt16 );
 virtual sal_uLong Rename( sal_uInt16, const String, const String );
-virtual sal_uLong CopyBlock( SwImpBlocks rImp, String rShort, const 
String rLong);
+virtual sal_uLong CopyBlock( SwImpBlocks rImp, OUString rShort, const 
OUString rLong);
 virtual void  ClearDoc();
 virtual sal_uLong GetDoc( sal_uInt16 );
 virtual sal_uLong BeginPutDoc( const String, const String );
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index d2f72bf..9561e55 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -109,7 +109,7 @@ public:
 
 virtual sal_uLong Delete( sal_uInt16 ) = 0;
 virtual sal_uLong Rename( sal_uInt16, const String, const String ) = 0;
-virtual sal_uLong CopyBlock( SwImpBlocks rImp, String rShort, const 
String rLong) = 0;
+virtual sal_uLong CopyBlock( SwImpBlocks rImp, OUString rShort, const 
OUString rLong) = 0;
 virtual sal_uLong GetDoc( sal_uInt16 ) = 0;
 virtual sal_uLong BeginPutDoc( const String, const String ) = 0;
 virtual sal_uLong PutDoc() = 0;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx 
b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 30b8500..1a35392 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -244,8 +244,8 @@ sal_uLong SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const 
String rNewShort, con
 return 0;
 }
 
-sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks rDestImp, String rShort,
-const String rLong)
+sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks rDestImp, OUString rShort,
+const OUString rLong)
 {
 sal_uLong nError = 0;
 OpenFile(sal_True);
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 574d04e..3045aa5 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -387,8 +387,8 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const 
String* s, const String* l
 return nIdx;
 }
 
-sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks rSource, String rSrcShort,
-const String rLong )
+sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks rSource, OUString rSrcShort,
+const OUString rLong )
 {
 bool bIsOld = false;
 if (rSource.pImp)
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index d796fe9..95c8b45 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -104,11 +104,10 @@ void SwGlossaryHdl::GlossaryDlg()
 // the group is created temporarily for faster access
 void SwGlossaryHdl::SetCurGroup(const String rGrp, sal_Bool bApi, sal_Bool 
bAlwaysCreateNew )
 {
-String sGroup(rGrp);

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

 sw/inc/shellio.hxx   |   28 +++
 sw/source/core/inc/SwXMLTextBlocks.hxx   |   34 -
 sw/source/core/inc/swblocks.hxx  |   52 +++---
 sw/source/core/swg/SwXMLBlockListContext.cxx |6 +
 sw/source/core/swg/SwXMLTextBlocks.cxx   |   68 ++-
 sw/source/core/swg/SwXMLTextBlocks1.cxx  |   18 ++---
 sw/source/core/swg/swblocks.cxx  |   96 +--
 sw/source/ui/dochdl/gloshdl.cxx  |   71 +--
 sw/source/ui/inc/gloshdl.hxx |   40 +--
 sw/source/ui/misc/glosdoc.cxx|2 
 sw/source/ui/uno/unoatxt.cxx |4 -
 11 files changed, 213 insertions(+), 206 deletions(-)

New commits:
commit 734295ee6081686b62a4521dacf4975240e1109e
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sat Jul 27 12:56:48 2013 +0200

String to OUString

Change-Id: I412801fbc1a692c02badd15ce03d4d7ff82aab5e
Reviewed-on: https://gerrit.libreoffice.org/5186
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 7efeca0..fa3f34b 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -306,46 +306,46 @@ class SW_DLLPUBLIC SwTextBlocks
 sal_uLongnErr;
 
 public:
-SwTextBlocks( const String );
+SwTextBlocks( const OUString );
 ~SwTextBlocks();
 
 void Flush(){}
 
 SwDoc* GetDoc();
 void   ClearDoc();  // Delete Doc-contents.
-const  String GetName();
-void   SetName( const String );
+OUString GetName();
+void   SetName( const OUString );
 sal_uLong GetError() const { return nErr; }
 
-String GetBaseURL() const;
-void   SetBaseURL( const String rURL );
+OUString GetBaseURL() const;
+void   SetBaseURL( const OUString rURL );
 
 sal_Bool   IsOld() const;
 sal_uLong  ConvertToNew();  // Convert text modules.
 
 sal_uInt16 GetCount() const;// Get count text 
modules.
-sal_uInt16 GetIndex( const String ) const; // Get index of short 
names.
-sal_uInt16 GetLongIndex( const String ) const; // Get index of long 
names.
-const  String GetShortName( sal_uInt16 ) const;// Get short name for 
index.
-const  String GetLongName( sal_uInt16 ) const; // Get long name for 
index.
+sal_uInt16 GetIndex( const OUString ) const;   // Get index of short 
names.
+sal_uInt16 GetLongIndex( const OUString ) const;   // Get index of long 
names.
+OUString GetShortName( sal_uInt16 ) const;  // Get short name for 
index.
+OUString GetLongName( sal_uInt16 ) const;   // Get long name for 
index.
 
 sal_Bool   Delete( sal_uInt16 );
-sal_uInt16 Rename( sal_uInt16, const String*, const String* );
+sal_uInt16 Rename( sal_uInt16, const OUString*, const OUString* );
 sal_uLong  CopyBlock( SwTextBlocks rSource, OUString rSrcShort,
 const OUString rLong );
 
 sal_Bool   BeginGetDoc( sal_uInt16 );   // Read text modules.
 void   EndGetDoc(); // Release text modules.
 
-sal_Bool   BeginPutDoc( const String, const String ); // Begin save.
+sal_Bool   BeginPutDoc( const OUString, const OUString ); // Begin save.
 sal_uInt16 PutDoc();// End save.
 
-sal_uInt16 PutText( const String, const String, const String ); // Save 
(short name, text).
+sal_uInt16 PutText( const OUString, const OUString, const OUString ); 
// Save (short name, text).
 
 sal_Bool IsOnlyTextBlock( sal_uInt16 ) const;
-sal_Bool IsOnlyTextBlock( const String rShort ) const;
+sal_Bool IsOnlyTextBlock( const OUString rShort ) const;
 
-const String GetFileName() const;  // Filename of pImp.
+OUString GetFileName() const;   // Filename of pImp.
 sal_Bool IsReadOnly() const;// ReadOnly-flag of pImp.
 
 sal_Bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor rMacroTbl );
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx 
b/sw/source/core/inc/SwXMLTextBlocks.hxx
index b3c1b3b..ec21818 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -51,36 +51,36 @@ public:
 com::sun::star::uno::Reference  com::sun::star::embed::XStorage  
xBlkRoot;
 com::sun::star::uno::Reference  com::sun::star::embed::XStorage  xRoot;
 short   nCurBlk;
-SwXMLTextBlocks( const String rFile );
-SwXMLTextBlocks( const com::sun::star::uno::Reference  
com::sun::star::embed::XStorage , const String rFile );
-void   AddName( const String, const String, const String, sal_Bool 
bOnlyTxt = sal_False );
-virtual void   AddName( const String, const String, sal_Bool bOnlyTxt = 
sal_False );
-OUString GeneratePackageName ( const String rShort );
+SwXMLTextBlocks(

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

 sw/source/ui/misc/glosbib.cxx |   18 ++
 1 file changed, 6 insertions(+), 12 deletions(-)

New commits:
commit de7529b38f8ea9ee8198de1d82525a68cc6e89b8
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Thu Jul 25 20:31:37 2013 +0200

Do not use deprecated comphelper::string::getToken

Change-Id: I35caf7a7806a36a7e0a8d4440e68bd682074136c
Reviewed-on: https://gerrit.libreoffice.org/5184
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 5b18557..a6019e6 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include comphelper/string.hxx
 #include tools/urlobj.hxx
 #include tools/stream.hxx
 #include vcl/msgbox.hxx
@@ -128,8 +127,7 @@ void SwGlossaryGroupDlg::Apply()
 for (OUVector_t::const_iterator it(m_RemovedArr.begin());
 it != m_RemovedArr.end(); ++it)
 {
-const String sDelGroup =
-::comphelper::string::getToken(*it, 0, '\t');
+const String sDelGroup = it-getToken(0, '\t');
 if( sDelGroup == aActGroup )
 {
 //when the current group is deleted, the current group has to be 
relocated
@@ -141,7 +139,7 @@ void SwGlossaryGroupDlg::Apply()
 }
 }
 String sMsg(SW_RES(STR_QUERY_DELETE_GROUP1));
-String sTitle( ::comphelper::string::getToken(*it, 1, '\t') );
+String sTitle( it-getToken(1, '\t') );
 if(sTitle.Len())
 sMsg += sTitle;
 else
@@ -156,12 +154,9 @@ void SwGlossaryGroupDlg::Apply()
 for (OUVector_t::const_iterator it(m_RenamedArr.begin());
 it != m_RenamedArr.end(); ++it)
 {
-OUString const sOld(
-::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM));
-OUString sNew(
-::comphelper::string::getToken(*it, 1, RENAME_TOKEN_DELIM));
-OUString const sTitle(
-::comphelper::string::getToken(*it, 2, RENAME_TOKEN_DELIM));
+OUString const sOld(it-getToken(0, RENAME_TOKEN_DELIM));
+OUString sNew(it-getToken(1, RENAME_TOKEN_DELIM));
+OUString const sTitle(it-getToken(2, RENAME_TOKEN_DELIM));
 pGlosHdl-RenameGroup(sOld, sNew, sTitle);
 if (it == m_RenamedArr.begin())
 {
@@ -259,8 +254,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton  
)
 for (OUVector_t::iterator it(m_RenamedArr.begin());
 it != m_RenamedArr.end(); ++it)
 {
-if (::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM)
-== sEntry)
+if (it-getToken(0, RENAME_TOKEN_DELIM) == sEntry)
 {
 m_RenamedArr.erase(it);
 bDelete = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-31 Thread Stephan Bergmann

 sw/source/core/doc/visiturl.cxx |   48 +---
 1 file changed, 26 insertions(+), 22 deletions(-)

New commits:
commit 8434c577ae2b45d70baff4ba0a00048bc0f10e6a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jul 31 12:07:51 2013 +0200

Work around MSVC may be uninitialized warnings

Change-Id: Ibac83d2d97f178605f717fc675853d86101195e3

diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 74e5716..78f51e9 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -56,32 +56,36 @@ void SwURLStateChanged::Notify( SfxBroadcaster , const 
SfxHint rHint )
 (sBkmk = pIURL-GetMark()).Insert( INET_MARK_TOKEN, 0 );
 
 bool bAction = false, bUnLockView = false;
-const SwFmtINetFmt* pItem;
-const SwTxtINetFmt* pTxtAttr;
-const SwTxtNode* pTxtNd;
-sal_uInt32 n, nMaxItems = pDoc-GetAttrPool().GetItemCount2( 
RES_TXTATR_INETFMT );
-for( n = 0; n  nMaxItems; ++n )
-if( 0 != (pItem = (SwFmtINetFmt*)pDoc-GetAttrPool().GetItem2(
-RES_TXTATR_INETFMT, n ) ) 
-( pItem-GetValue() == sURL ||
-( sBkmk.Len()  pItem-GetValue() == sBkmk )) 
-0 != ( pTxtAttr = pItem-GetTxtINetFmt()) 
-0 != ( pTxtNd = pTxtAttr-GetpTxtNode() ) )
+sal_uInt32 nMaxItems = pDoc-GetAttrPool().GetItemCount2( 
RES_TXTATR_INETFMT );
+for( sal_uInt32 n = 0; n  nMaxItems; ++n )
+{
+const SwFmtINetFmt* pItem = 
(SwFmtINetFmt*)pDoc-GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n );
+if( pItem != 0 
+( pItem-GetValue() == sURL || ( sBkmk.Len()  
pItem-GetValue() == sBkmk )))
 {
-if( !bAction  pESh )
+const SwTxtINetFmt* pTxtAttr = pItem-GetTxtINetFmt();
+if (pTxtAttr != 0)
 {
-pESh-StartAllAction();
-bAction = true;
-bUnLockView = !pESh-IsViewLocked();
-pESh-LockView( sal_True );
+const SwTxtNode* pTxtNd = pTxtAttr-GetpTxtNode();
+if (pTxtNd != 0)
+{
+if( !bAction  pESh )
+{
+pESh-StartAllAction();
+bAction = true;
+bUnLockView = !pESh-IsViewLocked();
+pESh-LockView( sal_True );
+}
+const_castSwTxtINetFmt*(pTxtAttr)-SetVisitedValid( 
false );
+const SwTxtAttr* pAttr = pTxtAttr;
+SwUpdateAttr aUpdateAttr( *pAttr-GetStart(),
+  *pAttr-GetEnd(),
+  RES_FMT_CHG );
+((SwTxtNode*)pTxtNd)-ModifyNotification( 
aUpdateAttr, aUpdateAttr );
+}
 }
-const_castSwTxtINetFmt*(pTxtAttr)-SetVisitedValid( false );
-const SwTxtAttr* pAttr = pTxtAttr;
-SwUpdateAttr aUpdateAttr( *pAttr-GetStart(),
-  *pAttr-GetEnd(),
-  RES_FMT_CHG );
-((SwTxtNode*)pTxtNd)-ModifyNotification( aUpdateAttr, 
aUpdateAttr );
 }
+}
 
 if( bAction )
 pESh-EndAllAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Björn Michaelsen bjoern.michael...@canonical.com changed:

   What|Removed |Added

 Depends on||67572

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSOC] Call of beta-testers for iOS Impress Remote control

2013-07-31 Thread Siqi Liu

Hello all,

I've recently ported the iOS remote app to iPad and I think it's time to
start some beta-testing at this stage so that I can identify problems as
early as possible. The app has been tested mainly on an iPad1 running
iOS5.1.1 and occasionally on an iPad2 running iOS6. All other tests are
done on the simulator --- That's why I'm eager to hear from you about your
experiences on other physical devices! The app should support all devices
running iOS5 and later.

Please join me to make this app better by registering on this
formhttps://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/viewform.
According to Apple's policy, I will have to register your devices' UDID
before distributing it to you. You can find instructions on how to obtain
the UDID by clicking
herehttp://siqi43.wordpress.com/2013/07/15/how-to-find-your-idevices-udid/

Additional Information and instructions are available in the description in
the gdoc. You will be informed once your devices have been added to the
list.

Thank you in advance and prepare for all the bugscrash that you may (and
I'm sure you will :-P) encounter. As always, contact me on IRC (siqi) or by
email if any questions/problems.

Happy testing!
-- 


Cordialement,
Siqi LIU

Étudiant Ingénieur, École Supérieure d'Électricité

--
  Tel. +33 7 61 16 95 83
  email: m...@siqi.fr
--
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] update help ids for page number dialog .ui conversion

2013-07-31 Thread via Code Review

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5212

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/12/5212/1

update help ids for page number dialog .ui conversion

Change-Id: Id74ac417c50d32c0edb3e78330450fabc2b510ea
---
M helpers/help_hid.lst
M source/text/shared/explorer/database/rep_pagenumbers.xhp
2 files changed, 5 insertions(+), 11 deletions(-)



diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0ffa5cf..c154513 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6254,7 +6254,6 @@
 framework_PushButton_DLG_LICENSE_PB_PAGEDOWN,1077940754,
 reportdesign_CheckBox_RID_DATETIME_DLG_CB_DATE,1577878529,
 reportdesign_CheckBox_RID_DATETIME_DLG_CB_TIME,1577878533,
-reportdesign_CheckBox_RID_PAGENUMBERS_CB_SHOWNUMBERONFIRSTPAGE,1577862153,
 reportdesign_ListBox_RID_DATETIME_DLG_LB_DATE_TYPE,1577881091,
 reportdesign_ListBox_RID_DATETIME_DLG_LB_TIME_TYPE,1577881095,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236,
@@ -6262,12 +6261,7 @@
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_KEEPTOGETHERLST,2114719242,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_ORDER,2114719249,
-reportdesign_ListBox_RID_PAGENUMBERS_LST_ALIGNMENT,1577864712,
 reportdesign_NumericField_RID_GROUPS_SORTING_ED_GROUPINTERVALLST,2114721800,
-reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE,1577861638,
-reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_N,1577861634,
-reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_N_OF_M,1577861635,
-reportdesign_RadioButton_RID_PAGENUMBERS_RB_PAGE_TOPPAGE,1577861637,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ADJUST,1493533722,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_ALIGNMENT,1493533721,
 sc_CheckBox_RID_SCDLG_AUTOFORMAT_BTN_BORDER,1493533717,
diff --git a/source/text/shared/explorer/database/rep_pagenumbers.xhp 
b/source/text/shared/explorer/database/rep_pagenumbers.xhp
index ac11530..03f19a6 100644
--- a/source/text/shared/explorer/database/rep_pagenumbers.xhp
+++ b/source/text/shared/explorer/database/rep_pagenumbers.xhp
@@ -33,11 +33,11 @@
 /variable/paragraph
 paragraph role=paragraph id=par_id3424481 xml-lang=en-US 
l10n=NEWahelp hid=.You can open the Page Numbers dialog of the link 
href=text/shared/explorer/database/rep_main.xhpReport Builder/link by 
choosing item type=menuitemInsert - Page Numbers/item./ahelp/paragraph
 paragraph role=tip id=par_id1068758 xml-lang=en-US l10n=NEWPress 
item type=keycodeShift-F1/item and point with the mouse at an input box 
to see a help text for this input box./paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N 
id=bm_id7565843 localize=false/paragraph role=paragraph 
id=par_id1559190 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenPage N/ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_N_OF_M 
id=bm_id6649372 localize=false/paragraph role=paragraph 
id=par_id9879146 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenPage N of M/ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_TOPPAGE 
id=bm_id7334208 localize=false/paragraph role=paragraph 
id=par_id9404278 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenTop of Page (Header)/ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_RADIOBUTTON_RID_PAGENUMBERS_RB_PAGE_BOTTOMPAGE 
id=bm_id8313852 localize=false/paragraph role=paragraph 
id=par_id7626880 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenBottom of Page (Footer)/ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_LISTBOX_RID_PAGENUMBERS_LST_ALIGNMENT 
id=bm_id8829309 localize=false/paragraph role=paragraph 
id=par_id6124149 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenAlignment/ahelp/paragraphcommentShow Number On First 
Page - not in UI/commentparagraph role=paragraph id=par_id9651478 
xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenShow Number on 
First Page/ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/reportdesign/uiconfig/dbreport/ui/pagenumberdialog/pagen 
id=bm_id7565843 localize=false/paragraph role=paragraph 
id=par_id1559190 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenPage N/ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/reportdesign/uiconfig/dbreport/ui/pagenumberdialog/pagenofm 
id=bm_id6649372 localize=false/paragraph role=paragraph 
id=par_id9879146 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenPage N of M/ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/reportdesign/uiconfig/dbreport/ui/pagenumberdialog/toppage 
id=bm_id7334208 localize=false/paragraph role=paragraph 
id=par_id9404278 xml-lang=en-US l10n=NEWahelp hid=. 
visibility=hiddenTop of Page (Header)/ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/reportdesign/uiconfig/dbreport/ui/pagenumberdialog/bottompage 
id=bm_id8313852

[Libreoffice-commits] core.git: ios/iosremote

2013-07-31 Thread Siqi LIU

 ios/iosremote/iPad_autosize.storyboard|   81 
--
 ios/iosremote/iosremote.xcodeproj/project.pbxproj |   53 
+-
 ios/iosremote/iosremote/AppDelegate.m |2 
 ios/iosremote/iosremote/AppDelegate_ipad.h|   10 -
 ios/iosremote/iosremote/AppDelegate_ipad.m|   10 -
 ios/iosremote/iosremote/BasePresentationViewController.h  |   10 -
 ios/iosremote/iosremote/BasePresentationViewController.m  |   10 -
 ios/iosremote/iosremote/Communication/SlideShow.m |1 
 ios/iosremote/iosremote/ControlVariables.h|   10 -
 ios/iosremote/iosremote/HorizontalSlideCell.h |   10 -
 ios/iosremote/iosremote/HorizontalSlideCell.m |   10 -
 ios/iosremote/iosremote/MainSplitViewController.h |   10 -
 ios/iosremote/iosremote/MainSplitViewController.m |   10 -
 ios/iosremote/iosremote/autoDismissKeyboardNavigationViewController.h |   10 -
 ios/iosremote/iosremote/autoDismissKeyboardNavigationViewController.m |   10 -
 ios/iosremote/iosremote/server_list_vc_ipad.h |   10 -
 ios/iosremote/iosremote/server_list_vc_ipad.m |   10 -
 ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.h   |   10 -
 ios/iosremote/iosremote/slideShowPreviewTable_vc_ipad.m   |   10 -
 ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.h |   10 -
 ios/iosremote/iosremote/slideShowPreviewTable_vc_iphone.m |   10 -
 ios/iosremote/iosremote/slideShowSwipeInList_ipad.h   |   10 -
 ios/iosremote/iosremote/slideShowSwipeInList_ipad.m   |   10 -
 ios/iosremote/iosremote/stopWatch.h   |   10 -
 ios/iosremote/iosremote/stopWatch.m   |   10 -
 25 files changed, 191 insertions(+), 156 deletions(-)

New commits:
commit 6a45fc1e3ebb016d0c6691af2d0f1a4d5eb635c1
Author: Siqi LIU m...@siqi.fr
Date:   Wed Jul 31 12:32:24 2013 +0200

license update

Change-Id: I7e89b88694b0875b33fa5541acbdb73aff28f53c

diff --git a/ios/iosremote/iPad_autosize.storyboard 
b/ios/iosremote/iPad_autosize.storyboard
index 2028340..b06f4f8 100644
--- a/ios/iosremote/iPad_autosize.storyboard
+++ b/ios/iosremote/iPad_autosize.storyboard
@@ -338,17 +338,6 @@
 rect key=frame x=0.0 y=458 width=129 
height=768/
 autoresizingMask key=autoresizingMask/
 color key=backgroundColor 
white=0.1 alpha=1 colorSpace=calibratedWhite/
-prototypes
-tableViewCell contentMode=scaleToFill 
selectionStyle=blue hidesAccessoryWhenEditing=NO indentationLevel=1 
indentationWidth=0.0 id=zSs-IC-htx
-rect key=frame x=0.0 y=22 
width=129 height=44/
-autoresizingMask 
key=autoresizingMask/
-view key=contentView opaque=NO 
clipsSubviews=YES multipleTouchEnabled=YES contentMode=center
-rect key=frame x=0.0 y=0.0 
width=129 height=43/
-autoresizingMask 
key=autoresizingMask/
-color key=backgroundColor 
white=0.0 alpha=0.0 colorSpace=calibratedWhite/
-/view
-/tableViewCell
-/prototypes
 connections
 outlet property=dataSource 
destination=TYh-Hw-m1Q id=42R-0X-OyE/
 outlet property=delegate 
destination=TYh-Hw-m1Q id=mMV-1F-8OM/
@@ -565,6 +554,76 @@
 image name=timer_clear_btn.png width=74 height=74/
 image name=timer_start_btn.png width=74 height=74/
 /resources
+classes
+class className=BasePresentationViewController 
superclassName=UIViewController
+source key=sourceIdentifier type=project 
relativePath=./Classes/BasePresentationViewController.h/
+relationships
+relationship kind=action name=startConnectionModal:/
+relationship kind=outlet name=NoteWebView 
candidateClass=UIWebView/
+relationship kind=outlet name=NotesView 
candidateClass=UIView/
+relationship kind=outlet name=clearButton 
candidateClass=UIButton/
+relationship kind=outlet name=currentSlideImageView 
candidateClass=UIImageView/
+relationship kind=outlet name=horizontalTableView 
candidateClass=UITableView/
+relationship kind=outlet name=movingPointer

[Libreoffice-commits] core.git: sw/qa vcl/win

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   30 -
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |2 -
 sw/qa/extras/rtfexport/rtfexport.cxx |   24 ++---
 sw/qa/extras/rtfimport/rtfimport.cxx |   12 +++---
 vcl/win/source/window/keynames.cxx   |   54 +++
 5 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit 3e48277e36a485d964d7b91305b1bf70a83c4451
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 12:46:29 2013 +0200

Convert utf-8 bytes to \xNN hex representation

Change-Id: I5d1cc0331278f09a6e32345980c660d877d606fa

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b0f9845..f4932ff 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -350,8 +350,8 @@ void Test::testFdo51034()
 #define CHECK_FORMULA( expected, actual ) \
 CPPUNIT_ASSERT_EQUAL( \
 OUString( expected, strlen( expected ), RTL_TEXTENCODING_UTF8 ) \
-.replaceAll(  ,  ).replaceAll( OUString( â, strlen( â 
), RTL_TEXTENCODING_UTF8 ), - ), \
-OUString( actual ).replaceAll(  ,  ).replaceAll( OUString( â, 
strlen( â ), RTL_TEXTENCODING_UTF8 ), - ))
+.replaceAll(  ,  ).replaceAll( OUString( \xe2\x88\x92, 
strlen( \xe2\x88\x92 ), RTL_TEXTENCODING_UTF8 ), - ), \
+OUString( actual ).replaceAll(  ,  ).replaceAll( OUString( 
\xe2\x88\x92, strlen( \xe2\x88\x92 ), RTL_TEXTENCODING_UTF8 ), - ))
 
 void Test::testMathAccents()
 {
@@ -376,12 +376,12 @@ void Test::testMathD()
 
 void Test::testMathEscaping()
 {
-CHECK_FORMULA( â â  x  â, getFormula( getRun( getParagraph( 1 ), 
1 )));
+CHECK_FORMULA( \xe2\x88\x92 \xe2\x88\x9e  x  \xe2\x88\x9e, getFormula( 
getRun( getParagraph( 1 ), 1 )));
 }
 
 void Test::testMathLim()
 {
-CHECK_FORMULA( lim from {x â 1} {x}, getFormula( getRun( getParagraph( 
1 ), 1 )));
+CHECK_FORMULA( lim from {x \xe2\x86\x92 1} {x}, getFormula( getRun( 
getParagraph( 1 ), 1 )));
 }
 
 void Test::testMathMalformedXml()
@@ -396,32 +396,32 @@ void Test::testMathMatrix()
 
 void Test::testMathMso2k7()
 {
-CHECK_FORMULA( A = Ï {r} ^ {2}, getFormula( getRun( getParagraph( 1 ), 
1 )));
+CHECK_FORMULA( A = \xcf\x80 {r} ^ {2}, getFormula( getRun( getParagraph( 
1 ), 1 )));
 // TODO check the stack/binom difference
 //CHECK_FORMULA( {left (x+a right )} ^ {n} = sum from {k=0} to {n} {left 
(binom {n} {k} right ) {x} ^ {k} {a} ^ {n-k}},
 CHECK_FORMULA( {left (x+a right )} ^ {n} = sum from {k=0} to {n} {left 
(stack {n # k} right ) {x} ^ {k} {a} ^ {n-k}},
 getFormula( getRun( getParagraph( 2 ), 1 )));
-CHECK_FORMULA( {left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left 
(n-1 right ) {x} ^ {2}} over {2!} +â¦,
+CHECK_FORMULA( {left (1+x right )} ^ {n} =1+ {nx} over {1!} + {n left 
(n-1 right ) {x} ^ {2}} over {2!} +\xe2\x80\xa6,
 getFormula( getRun( getParagraph( 3 ), 1 )));
 // TODO check (cos/sin miss {})
-//CHECK_FORMULA( f left (x right ) = {a} rsub {0} + sum from {n=1} to 
{â} {left ({a} rsub {n} cos {{nÏx} over {L}} + {b} rsub {n} sin {{nÏx} over 
{L}} right )},
-CHECK_FORMULA( f left (x right ) = {a} rsub {0} + sum from {n=1} to {â} 
{left ({a} rsub {n} cos {nÏx} over {L} + {b} rsub {n} sin {nÏx} over {L} 
right )},
+//CHECK_FORMULA( f left (x right ) = {a} rsub {0} + sum from {n=1} to 
{\xe2\x88\x9e} {left ({a} rsub {n} cos {{n\xcf\x80x} over {L}} + {b} rsub {n} 
sin {{n\xcf\x80x} over {L}} right )},
+CHECK_FORMULA( f left (x right ) = {a} rsub {0} + sum from {n=1} to 
{\xe2\x88\x9e} {left ({a} rsub {n} cos {n\xcf\x80x} over {L} + {b} rsub {n} sin 
{n\xcf\x80x} over {L} right )},
 getFormula( getRun( getParagraph( 4 ), 1 )));
 CHECK_FORMULA( {a} ^ {2} + {b} ^ {2} = {c} ^ {2}, getFormula( getRun( 
getParagraph( 5 ), 1 )));
-CHECK_FORMULA( x = {- b Â± sqrt {{b} ^ {2} -4 ac}} over {2 a},
+CHECK_FORMULA( x = {- b \xc2\xb1 sqrt {{b} ^ {2} -4 ac}} over {2 a},
 getFormula( getRun( getParagraph( 6 ), 1 )));
 CHECK_FORMULA(
-{e} ^ {x} =1+ {x} over {1!} + {{x} ^ {2}} over {2!} + {{x} ^ {3}} 
over {3!} +â¦,-âxâ,
+{e} ^ {x} =1+ {x} over {1!} + {{x} ^ {2}} over {2!} + {{x} ^ {3}} 
over {3!} +\xe2\x80\xa6,-\xe2\x88\x9ex\xe2\x88\x9e,
 getFormula( getRun( getParagraph( 7 ), 1 )));
 CHECK_FORMULA(
-//sin {Î±} Â± sin {Î²} =2 sin {{1} over {2} left (Î±Â±Î² right )} cos 
{{1} over {2} left (Î±âÎ² right )},
+//sin {\xce\xb1} \xc2\xb1 sin {\xce\xb2} =2 sin {{1} over {2} left 
(\xce\xb1\xc2\xb1\xce\xb2 right )} cos {{1} over {2} left 
(\xce\xb1\xe2\x88\x93\xce\xb2 right )},
 // TODO check (cos/in miss {})
-sin Î± Â± sin Î² =2 sin {1} over {2} left (Î±Â±Î² right ) cos {1} 
over {2} left (Î±âÎ² right ),
+sin \xce\xb1 \xc2\xb1 sin \xce\xb2 =2 sin {1} over {2} left 
(\xce\xb1\xc2\xb1\xce\xb2 right ) cos {1} over {2}

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #239 from tommy27 ba...@quipo.it ---
LibO 3.6.7 is out and will be the last release of the 3.6.x branch.

all the unfixed mab3.6 are actually under review before being moved to the
mab4.0 page.

so, please don't add new bugs to the current meta-bug.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sc/qa/extras/macros-test.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3ab7a98844f9a3453bac23bcd963ad0b171c291a
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 14:02:15 2013 +0300

WaE: unused variable 'pDoc'

Change-Id: I2d5cc2a56c0df779df93d4b207e15e45c63e9572

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 31171c7..9bc3a0f 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -82,7 +82,6 @@ void ScMacrosTest::testMSP()
 
 CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell);
 ScDocShell* xDocSh = static_castScDocShell*(pFoundShell);
-ScDocument* pDoc = xDocSh-GetDocument();
 
 pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, 
aOutParamIndex,aOutParam);
 OUString sResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/qa/extras/macros-test.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 16c3a29849b31029f2a0ac1e8b2425de9c6991de
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 31 13:10:40 2013 +0200

WaE: unused variables

Change-Id: I37523f34bdf6e21f5e5781927884bd0311a17fe8

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 9bc3a0f..fe9c071 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -79,9 +79,7 @@ void ScMacrosTest::testMSP()
 Sequence uno::Any  aParams;
 
 SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
-
 CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell);
-ScDocShell* xDocSh = static_castScDocShell*(pFoundShell);
 
 pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, 
aOutParamIndex,aOutParam);
 OUString sResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - setup_native/CustomTarget_scripts.mk sysui/CustomTarget_slackware.mk sysui/desktop sysui/Module_sysui.mk

2013-07-31 Thread Michael Stahl

 setup_native/CustomTarget_scripts.mk  |5 +-
 sysui/CustomTarget_slackware.mk   |   61 --
 sysui/Module_sysui.mk |1 
 sysui/desktop/slackware/slack-desc|   13 ---
 sysui/desktop/slackware/update-script |8 
 5 files changed, 3 insertions(+), 85 deletions(-)

New commits:
commit 01b47bffd84c7731634f631cd32803bbbc881ad7
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 31 13:03:56 2013 +0200

sysui: remove slackware desktop integration stuff

This is apparently not used at all currently; cloph says the
*slackware-menus*.tgz used to be bundled with RPM instsets but the last
release that contained it was apparently OOo 3.1.1; it is gone in OOo
3.2.1 RPM instset.  There are no bug reports about it missing, so no
problem with removing it altogether.

Change-Id: I1b93c94c4ac5c1d1826069b05cb58fdbb30cd71f

diff --git a/sysui/CustomTarget_slackware.mk b/sysui/CustomTarget_slackware.mk
deleted file mode 100644
index f717df7..000
--- a/sysui/CustomTarget_slackware.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-include $(SRCDIR)/sysui/productlist.mk
-
-slack_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/slackware)
-slack_SRCDIR := $(SRCDIR)/sysui/desktop/slackware
-
-$(eval $(call gb_CustomTarget_CustomTarget,sysui/slackware))
-
-$(eval $(call gb_CustomTarget_register_targets,sysui/slackware,\
-   empty.tar \
-$(foreach product,$(PRODUCTLIST),\
-   $(product)/install/doinst.sh \
-   $(product)/install/slack-desc \
-   
$(product)$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_VERSION_PATCH).tgz)
 \
-))
-
-
-$(slack_WORKDIR)/empty.tar:
-   mkdir $(slack_WORKDIR)/empty
-   $(GNUTAR) -C $(slack_WORKDIR)/empty --owner=root $(if $(filter-out 
MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner -cf $@ .
-
-$(slack_WORKDIR)/%/install/doinst.sh: $(slack_SRCDIR)/update-script $(call 
gb_CustomTarget_get_workdir,sysui/share)/%/launcherlist
-   echo ( cd etc; rm -rf $(UNIXFILENAME.$*) )  $@
-   echo ( cd etc; ln -snf /opt/$(UNIXFILENAME.$*) $(UNIXFILENAME.$*) ) 
 $@
-   echo ( cd usr/bin; rm -rf soffice )  $@
-   echo ( cd usr/bin; ln -sf /etc/$(UNIXFILENAME.$*)/program/soffice 
soffice )  $@
-   for i in `cat $(call 
gb_CustomTarget_get_workdir,sysui/share)/$*/launcherlist`; do \
-   echo (cd usr/share/applications; rm -rf $(UNIXFILENAME.$*)-$$i)  
$@; \
-   echo (cd usr/share/applications; ln -sf 
/etc/$(UNIXFILENAME.$*)/share/xdg/$$i $(UNIXFILENAME.$*)-$$i)  $@; \
-   done
-   cat $  $@
-
-$(slack_WORKDIR)/%/install/slack-desc: $(slack_SRCDIR)/slack-desc
-   sed -e s/PKGNAME/$*-slackware-menus/g \
-   -e s/PKGVERSION/$(PKGVERSION)/g \
-   -e s/LONGPRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/g \
-   -e s/PRODUCTNAME/$(PRODUCTNAME.$*)/g \
-   -e s/UNIXFILENAME/$(UNIXFILENAME.$*)/g \
-   $  $@
-
-$(slack_WORKDIR)/%$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_VERSION_PATCH).tgz:
 $(slack_WORKDIR)/empty.tar $(slack_WORKDIR)/%/install/doinst.sh 
$(slack_WORKDIR)/%/install/slack-desc $(call 
gb_CustomTarget_get_workdir,sysui/share)/%/create_tree.sh
-   cd $(call gb_CustomTarget_get_workdir,sysui/share)/$* \
-DESTDIR=$(slack_WORKDIR)/$* \
-   ICON_PREFIX=$(UNIXFILENAME.$*) \
-   KDEMAINDIR=/opt/kde \
-   GNOMEDIR= \
-   ./create_tree.sh
-   cp $(slack_WORKDIR)/empty.tar $@.tmp
-   $(GNUTAR) -C $(slack_WORKDIR)/$* --owner=root $(if $(filter-out 
MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner \
-   -rf $@.tmp install usr opt
-   gzip  $@.tmp  $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 6f7bc71..9744ba8 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -13,7 +13,6 @@ ifneq ($(OS),WNT)
 ifneq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,sysui,\
CustomTarget_share \
-   $(if $(filter LINUX,$(OS)),CustomTarget_slackware) \
Package_share \
Package_desktop \
$(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \
diff --git a/sysui/desktop/slackware/slack-desc 
b/sysui/desktop/slackware/slack-desc
deleted file mode 100755
index 38bc199..000
--- a/sysui/desktop/slackware/slack-desc
+++ /dev/null
@@ -1,13 +0,0 @@
-# needs to be 11 lines - variables replaced by the makefile...
-   |-handy-ruler--|
-PKGNAME: PRODUCTNAME Desktop-Integration for Slackware
-PKGNAME: Version: PKGVERSION, License: LGPLv3 with MPLv2, ALv2 and more
-PKGNAME:

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

 sc/qa/extras/macros-test.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e9dc114a2b47c4f0bb42d69c117afc9e0256fd06
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 31 13:22:42 2013 +0200

Revert WaE: unused variables

This reverts commit 16c3a29849b31029f2a0ac1e8b2425de9c6991de.

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index fe9c071..9bc3a0f 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -79,7 +79,9 @@ void ScMacrosTest::testMSP()
 Sequence uno::Any  aParams;
 
 SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+
 CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell);
+ScDocShell* xDocSh = static_castScDocShell*(pFoundShell);
 
 pFoundShell-CallXScript(xComponent, sUrl, aParams, aRet, 
aOutParamIndex,aOutParam);
 OUString sResult;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/win/source/window/keynames.cxx |   50 ++---
 1 file changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 610265284d11c14c98c2874fabfc06b9aaeb0349
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 14:23:45 2013 +0300

Argh, the \xNN syntax uses as many hex chars there happens to be...

So use string splicing after a sequence of \xNN. (For consistency
even if it isn't a valid hex character that follows.)

Change-Id: I269788fa5d5fbc4eda5b9edcaaabfcbce59e4885

diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 78ced0b..7ec5af4 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -75,30 +75,30 @@ namespace vcl_sal {
 { PAPUGA_KEY_SPACEBAR, Espaciu },
 { PAPUGA_KEY_HOME, Aniciu },
 { PAPUGA_KEY_UP, Arriba },
-{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa1x },
+{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa1 x },
 { PAPUGA_KEY_LEFT, Izquierda },
 { PAPUGA_KEY_RIGHT, Drecha },
 { PAPUGA_KEY_END, Fin },
 { PAPUGA_KEY_DOWN, Abaxo },
-{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa1x },
+{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa1 x },
 { PAPUGA_KEY_INSERT, Ins },
 { PAPUGA_KEY_DELETE, Supr },
-{ PAPUGA_KEY_SHIFT, May\xc3\xbas },
+{ PAPUGA_KEY_SHIFT, May\xc3\xba s },
 };
 
 static const struct KeysNameReplacement aImplReplacements_Catalan[] =
 {
-{ PAPUGA_KEY_BACK, Retroc\xc3\xa9s },
+{ PAPUGA_KEY_BACK, Retroc\xc3\xa9 s },
 { PAPUGA_KEY_ENTER, Retorn },
 { PAPUGA_KEY_SPACEBAR, Espai },
 { PAPUGA_KEY_HOME, Inici },
 { PAPUGA_KEY_UP, Amunt },
-{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa0g },
+{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa0 g },
 { PAPUGA_KEY_LEFT, Esquerra },
 { PAPUGA_KEY_RIGHT, Dreta },
 { PAPUGA_KEY_END, Fi },
 { PAPUGA_KEY_DOWN, Avall },
-{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa0g },
+{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa0 g },
 { PAPUGA_KEY_INSERT, Ins },
 { PAPUGA_KEY_DELETE, Supr },
 { PAPUGA_KEY_SHIFT, Maj },
@@ -108,29 +108,29 @@ namespace vcl_sal {
 {
 { PAPUGA_KEY_RIGHT, Nool paremale },
 { PAPUGA_KEY_LEFT, Nool vasakule },
-{ PAPUGA_KEY_UP, Nool \xc3\xbcles },
+{ PAPUGA_KEY_UP, Nool \xc3\xbc les },
 { PAPUGA_KEY_DOWN, Nool alla },
-{ PAPUGA_KEY_BACK, Tagasil\xc3\xbcke },
+{ PAPUGA_KEY_BACK, Tagasil\xc3\xbc ke },
 { PAPUGA_KEY_ENTER, Enter },
-{ PAPUGA_KEY_SPACEBAR, T\xc3\xbchik },
+{ PAPUGA_KEY_SPACEBAR, T\xc3\xbc hik },
 };
 
 static const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
 {
 { PAPUGA_KEY_ESC, Gr },
 { PAPUGA_KEY_BACK, Naikinti },
-{ PAPUGA_KEY_ENTER, \xc4\xaevesti },
+{ PAPUGA_KEY_ENTER, \xc4\xae vesti },
 { PAPUGA_KEY_SPACEBAR, Tarpas },
 { PAPUGA_KEY_HOME, Prad },
-{ PAPUGA_KEY_UP, Auk\xc5\xa1tyn },
+{ PAPUGA_KEY_UP, Auk\xc5\xa1 tyn },
 { PAPUGA_KEY_PAGEUP, Psl\xe2\x86\x91 },
-{ PAPUGA_KEY_LEFT, Kair\xc4\x97n },
-{ PAPUGA_KEY_RIGHT, De\xc5\xa1in\xc4\x97n },
+{ PAPUGA_KEY_LEFT, Kair\xc4\x97 n },
+{ PAPUGA_KEY_RIGHT, De\xc5\xa1 in\xc4\x97 n },
 { PAPUGA_KEY_END, Pab },
-{ PAPUGA_KEY_DOWN, \xc5\xbdemyn },
+{ PAPUGA_KEY_DOWN, \xc5\xbd emyn },
 { PAPUGA_KEY_PAGEDOWN, Psl\xe2\x86\x93 },
-{ PAPUGA_KEY_INSERT, \xc4\xaeterpti },
-{ PAPUGA_KEY_DELETE, \xc5\xa0al },
+{ PAPUGA_KEY_INSERT, \xc4\xae terpti },
+{ PAPUGA_KEY_DELETE, \xc5\xa0 al },
 { PAPUGA_KEY_CONTROL, Vald },
 { PAPUGA_KEY_SHIFT, Lyg2 },
 { PAPUGA_KEY_ALT, Alt },
@@ -138,13 +138,13 @@ namespace vcl_sal {
 
 static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
 {
-{ PAPUGA_KEY_ESC, Ube\xc5\xbenica },
-{ PAPUGA_KEY_BACK, Vra\xc4\x8dalka },
-{ PAPUGA_KEY_ENTER, Vna\xc5\xa1alka },
+{ PAPUGA_KEY_ESC, Ube\xc5\xbe nica },
+{ PAPUGA_KEY_BACK, Vra\xc4\x8d alka },
+{ PAPUGA_KEY_ENTER, Vna\xc5\xa1 alka },
 { PAPUGA_KEY_SPACEBAR, Preslednica },
-{ PAPUGA_KEY_HOME, Za\xc4\x8detek },
+{ PAPUGA_KEY_HOME, Za\xc4\x8d etek },
 { PAPUGA_KEY_UP, Navzgor },
-{ PAPUGA_KEY_PAGEUP, Prej\xc5\xa1nja stran },
+{ PAPUGA_KEY_PAGEUP, Prej\xc5\xa1 nja stran },
 { PAPUGA_KEY_LEFT, Levo },
 { PAPUGA_KEY_RIGHT, Desno },
 { PAPUGA_KEY_END, Konec },
@@ -164,15 +164,15 @@ namespace vcl_sal {
 { PAPUGA_KEY_SPACEBAR, Espacio },
 { PAPUGA_KEY_HOME, Inicio },
 { PAPUGA_KEY_UP, Arriba },
-{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa1g },
+{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa1 g },
 { PAPUGA_KEY_LEFT, Izquierda },
 { PAPUGA_KEY_RIGHT, Derecha },

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

 vcl/win/source/window/keynames.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4980d1acdf1498e9fd8cc0d6c31c2b8184c4439a
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 14:45:07 2013 +0300

Update cautionary comment

Change-Id: Idafce559e6499e240c90dc0baa7359f63476ff7d

diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 7ec5af4..0179551 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -63,8 +63,8 @@ namespace vcl_sal {
 // 
 //
 // CAUTION CAUTION CAUTION
-// every string value in the replacements tables must be in UTF8
-// be careful with your editor !
+// Every string value in the replacements tables must be in UTF-8
+// but with the UTF-8 bytes encoded, not as such! Be careful!
 //
 // 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC]Use Widget Layout for the Start Center Weekly Update 05

2013-07-31 Thread Krisztian Pinter

Hi all!

Since my last update I was working on moving BackingWindow from framework
to sfx2, to resolve the circular dependency problem. It's working right
now, I just have to readd dragdrop file opening functionality.
After I'm done with this I should finally be able to continue work on the
custom thumbnail widget.

All the best,
Krisztian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-07-31 Thread Stephan Bergmann

 extensions/source/propctrlr/formmetadata.cxx |  461 +--
 1 file changed, 232 insertions(+), 229 deletions(-)

New commits:
commit a6fe1fde409ff1accdea49ff9de69658de1e6f5f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jul 31 13:53:29 2013 +0200

fdo#67430 Keep original order of entry positions, not alphabetically sorted

...turns out ca0600f0c9022d631317423ab5a59493b41906ab multiple unsequenced
modifications to 'nPos' [-Werror,-Wunsequenced] was wrong in assuming that 
the
order of getPropertyPos had no meaning, as it determines the order in which
form property dialogs display items.

So, reintroduced a fixed order, but without resorting to undefined behavior 
due
to repeated uses of ++ with no sequence points in between.  This is rather
sluggish, but gets the job done.

Change-Id: If9c5f4130fe6523eebd3a13e5a685fc9c0f53fc0

diff --git a/extensions/source/propctrlr/formmetadata.cxx 
b/extensions/source/propctrlr/formmetadata.cxx
index ad2febd..b460cff 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -44,23 +44,26 @@ namespace pcr
 String  sTranslation;
 OStringsHelpId;
 sal_Int32   nId;
+sal_uInt16  nPos;
 sal_uInt32  nUIFlags;
 
 OPropertyInfoImpl(
 const OUString  rName,
 sal_Int32   _nId,
 const String   aTranslation,
+sal_uInt16  nPosId,
 const OString,
 sal_uInt32  _nUIFlags);
 };
 
 //
 OPropertyInfoImpl::OPropertyInfoImpl(const OUString _rName, sal_Int32 
_nId,
-   const String aString, const OString sHid, 
sal_uInt32 _nUIFlags)
+   const String aString, sal_uInt16 nP, const 
OString sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
,nId(_nId)
+   ,nPos(nP)
,nUIFlags(_nUIFlags)
 {
 }
@@ -78,21 +81,21 @@ namespace pcr
 //
 //= OPropertyInfoService
 //
-#define DEF_INFO( ident, uinameres, helpid, flags )   \
+#define DEF_INFO( ident, uinameres, pos, helpid, flags )   \
 OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-PcrRes( RID_STR_##uinameres ).toString(), HID_PROP_##helpid, flags 
)
+PcrRes( RID_STR_##uinameres ).toString(), pos, HID_PROP_##helpid, 
flags )
 
-#define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
+#define DEF_INFO_1( ident, uinameres, pos, helpid, flag1 )   \
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 )
 
-#define DEF_INFO_2( ident, uinameres, helpid, flag1, flag2 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 )
+#define DEF_INFO_2( ident, uinameres, pos, helpid, flag1, flag2 )\
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | 
PROP_FLAG_##flag2 )
 
-#define DEF_INFO_3( ident, uinameres, helpid, flag1, flag2, flag3 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 
| PROP_FLAG_##flag3 )
+#define DEF_INFO_3( ident, uinameres, pos, helpid, flag1, flag2, flag3 ) \
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | 
PROP_FLAG_##flag2 | PROP_FLAG_##flag3 )
 
-#define DEF_INFO_4( ident, uinameres, helpid, flag1, flag2, flag3, flag4 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 
| PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
+#define DEF_INFO_4( ident, uinameres, pos, helpid, flag1, flag2, flag3, flag4 
) \
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | 
PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
 
 sal_uInt16  OPropertyInfoService::s_nCount = 0;
 OPropertyInfoImpl*  OPropertyInfoService::s_pPropertyInfos = NULL;
@@ -108,239 +111,239 @@ namespace pcr
 static OPropertyInfoImpl aPropertyInfos[] =
 {
 /*
-DEF_INFO_?( propname and id,   resoure id, help id,   
flags ),
+DEF_INFO_?( propname and id,   resoure id, pos, help id,   
flags ),
 */
-DEF_INFO_3( NAME,  NAME,   NAME,  
FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-DEF_INFO_2( TITLE, TITLE,  TITLE, 
FORM_VISIBLE, DIALOG_VISIBLE ),
-DEF_INFO_3( LABEL, LABEL,  LABEL, 
FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE

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

 vcl/source/control/tabctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48e3a04f5c81d88cf054ea658826c51bf413a185
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 15:02:09 2013 +0300

Fix bogus change of Len() to isEmpty()

Change-Id: Ie1dece00176985bc82dd89c9831b23cb8594b1c3

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 2cc1802..c362d06 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -307,7 +307,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long 
nMaxWidth )
 
 // For languages with short names (e.g. Chinese), because the space is
 // normally only one pixel per char
-if ( !pItem-maFormatText.isEmpty()  TAB_EXTRASPACE_X )
+if ( pItem-maFormatText.Len()  TAB_EXTRASPACE_X )
 aSize.Width() += TAB_EXTRASPACE_X-pItem-maFormatText.getLength();
 
 // shorten Text if needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] update help ids for date time dialog .ui conversion

2013-07-31 Thread via Code Review

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5214

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/14/5214/1

update help ids for date time dialog .ui conversion

Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753
---
M helpers/help_hid.lst
M source/text/shared/explorer/database/rep_datetime.xhp
2 files changed, 2 insertions(+), 6 deletions(-)



diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c154513..4ea244f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6252,10 +6252,6 @@
 framework_PushButton_DLG_LICENSE_PB_ACCEPT,1077940759,
 framework_PushButton_DLG_LICENSE_PB_DECLINE,1077940758,
 framework_PushButton_DLG_LICENSE_PB_PAGEDOWN,1077940754,
-reportdesign_CheckBox_RID_DATETIME_DLG_CB_DATE,1577878529,
-reportdesign_CheckBox_RID_DATETIME_DLG_CB_TIME,1577878533,
-reportdesign_ListBox_RID_DATETIME_DLG_LB_DATE_TYPE,1577881091,
-reportdesign_ListBox_RID_DATETIME_DLG_LB_TIME_TYPE,1577881095,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_GROUPONLST,2114719238,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234,
diff --git a/source/text/shared/explorer/database/rep_datetime.xhp 
b/source/text/shared/explorer/database/rep_datetime.xhp
index 15e0ed0..bdf4821 100644
--- a/source/text/shared/explorer/database/rep_datetime.xhp
+++ b/source/text/shared/explorer/database/rep_datetime.xhp
@@ -33,11 +33,11 @@
 /variable/paragraph
 paragraph role=paragraph id=par_id8638874 xml-lang=en-US 
l10n=NEWahelp hid=.You can open the Date and Time dialog of the link 
href=text/shared/explorer/database/rep_main.xhpReport Builder/link by 
choosing item type=menuitemInsert - Date and 
Time/item./ahelp/paragraph
 paragraph role=tip id=par_id6278878 xml-lang=en-US l10n=NEWPress 
item type=keycodeShift-F1/item and point with the mouse at an input box 
to see a help text for this input box./paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_DATE id=bm_id5607470 
localize=false/paragraph role=paragraph id=par_id393078 
xml-lang=en-US l10n=NEWahelp hid=.Enable Include Date to insert a date 
field into the active area of the report. The date field displays the current 
date when the report is executed./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/modules/dbreport/ui/date 
id=bm_id5607470 localize=false/paragraph role=paragraph 
id=par_id393078 xml-lang=en-US l10n=NEWahelp hid=.Enable Include 
Date to insert a date field into the active area of the report. The date field 
displays the current date when the report is executed./ahelp/paragraph
 !-- removed HID 1577878018 --
 !-- removed HID 1577878019 --
 !-- removed HID 1577878020 --paragraph role=paragraph id=par_id1271401 
xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a format 
to display the date./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/REPORTDESIGN_CHECKBOX_RID_DATETIME_DLG_CB_TIME id=bm_id6481215 
localize=false/paragraph role=paragraph id=par_id8718832 
xml-lang=en-US l10n=NEWahelp hid=.Enable Include Time to insert a time 
field into the active area of the report. The time field displays the current 
time when the report is executed./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/modules/dbreport/ui/time 
id=bm_id6481215 localize=false/paragraph role=paragraph 
id=par_id8718832 xml-lang=en-US l10n=NEWahelp hid=.Enable Include 
Time to insert a time field into the active area of the report. The time field 
displays the current time when the report is executed./ahelp/paragraph
 !-- removed HID 1577878022 --
 !-- removed HID 1577878023 --
 !-- removed HID 1577878024 --paragraph role=paragraph id=par_id8561052 
xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenSelect a format 
to display the time./ahelp/paragraph

-- 
To view, visit https://gerrit.libreoffice.org/5214
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: master
Gerrit-Owner: Tamás Csikós csks.t...@gmail.com

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

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

 vcl/source/control/tabctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00ca0272697f701da80af6664df090e1ccadc746
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 15:05:23 2013 +0300

Thinko

Change-Id: I778de768f42377c93db89c6dd1dd204ae7987d3d

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index c362d06..86e3ead 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -307,7 +307,7 @@ Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long 
nMaxWidth )
 
 // For languages with short names (e.g. Chinese), because the space is
 // normally only one pixel per char
-if ( pItem-maFormatText.Len()  TAB_EXTRASPACE_X )
+if ( pItem-maFormatText.getLength()  TAB_EXTRASPACE_X )
 aSize.Width() += TAB_EXTRASPACE_X-pItem-maFormatText.getLength();
 
 // shorten Text if needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: upgrade of Libreoffice

2013-07-31 Thread Thorsten Behrens

Антон Шамарин wrote:
 I'm using LibreOffice for several years and recomend this product
 for my friends. Product is good, but I found that then I make footer
 of my page and inserting page number, after that page number is not
 showing, but LibreOffice is showing Page number. It would be nice
 to see in next releases not Page number but the real number of the
 page like in OpenOffice and Microsoft Office.
 
Hi Anton,

glad to hear you're spreading the word for LibreOffice, thanks for
that!

The list you've mailed to is for discussing code, debugging and
hacking LibreOffice; a better venue for reporting bugs or suggesting
enhancements (unless you want to work on the code, that is) would be
our bugtracker:

 http://www.libreoffice.org/get-help/bug/

Kind regards,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 vcl/source/gdi/pdfwriter_impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89133bbf19a91bd78c7d8f7ec5cedc6b24521014
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed Jul 31 15:21:29 2013 +0300

Fix compilation error with MSVC

Change-Id: Ibd81f2f5252d00c2545e429552028b2115475524

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index d431630..baa82e5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8382,7 +8382,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point rPos, 
long nWidth, FontStrik
 //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need
 //to tweak this
 
-OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? / : X;
+OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? OUString( / ) 
: OUString( X );
 OUString aStrikeout = aStrikeoutChar;
 while( m_pReferenceDevice-GetTextWidth( aStrikeout )  nWidth )
 aStrikeout += aStrikeout;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/iosremote

2013-07-31 Thread Siqi LIU

 ios/iosremote/iosremote.xcodeproj/project.pbxproj  |6 +++
 ios/iosremote/iosremote/Communication/SlideShow.m  |6 +--
 ios/iosremote/iosremote/UIImageView+setImageAnimated.h |   16 
 ios/iosremote/iosremote/UIImageView+setImageAnimated.m |   31 +
 4 files changed, 56 insertions(+), 3 deletions(-)

New commits:
commit abfddb389930ef7ea80e33f22e48342e0c8ef473
Author: Siqi LIU m...@siqi.fr
Date:   Wed Jul 31 15:13:11 2013 +0200

add category for imageView disolve transition

Change-Id: I25ca4ab5d69b129e08544a27d4d27f7cde90baed

diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj 
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index 3d3ee78..9baef73 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -51,6 +51,7 @@
57DF0A85178FFFAB008B2D3D /* iPhone_autosize.storyboard in 
Resources */ = {isa = PBXBuildFile; fileRef = 57DF0A83178FFFAB008B2D3D /* 
iPhone_autosize.storyboard */; };
57FE71E31785C61400B50125 /* pinValidation_vc.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 57FE71E21785C61400B50125 /* pinValidation_vc.m 
*/; };
57FE71E917861A9000B50125 /* slideShowPreviewTable_vc.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 57FE71E817861A9000B50125 /* 
slideShowPreviewTable_vc.m */; };
+   8C0323AB17A943720037432E /* UIImageView+setImageAnimated.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 8C0323AA17A943720037432E /* 
UIImageView+setImageAnimated.m */; };
8C0DC83A17A4177C0099E5AE /* nextButton_pressed.png in Resources 
*/ = {isa = PBXBuildFile; fileRef = 8C0DC83617A4177C0099E5AE /* 
nextButton_pressed.png */; };
8C0DC83B17A4177C0099E5AE /* nextbutton_pres...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83717A4177C0099E5AE /* 
nextbutton_pres...@2x.png */; };
8C0DC83C17A4177C0099E5AE /* previousButton_pressed.png in 
Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC83817A4177C0099E5AE /* 
previousButton_pressed.png */; };
@@ -151,6 +152,8 @@
57FE71E21785C61400B50125 /* pinValidation_vc.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name 
= pinValidation_vc.m; path = iosremote/Communication/pinValidation_vc.m; 
sourceTree = group; };
57FE71E717861A9000B50125 /* slideShowPreviewTable_vc.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = slideShowPreviewTable_vc.h; sourceTree = group; };
57FE71E817861A9000B50125 /* slideShowPreviewTable_vc.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = slideShowPreviewTable_vc.m; sourceTree = group; };
+   8C0323A917A943720037432E /* UIImageView+setImageAnimated.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
name = UIImageView+setImageAnimated.h; path = 
iosremote/UIImageView+setImageAnimated.h; sourceTree = group; };
+   8C0323AA17A943720037432E /* UIImageView+setImageAnimated.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; name = UIImageView+setImageAnimated.m; path = 
iosremote/UIImageView+setImageAnimated.m; sourceTree = group; };
8C0DC83617A4177C0099E5AE /* nextButton_pressed.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = nextButton_pressed.png; 
sourceTree = group; };
8C0DC83717A4177C0099E5AE /* nextbutton_pres...@2x.png */ = {isa 
= PBXFileReference; lastKnownFileType = image.png; path = 
nextbutton_pres...@2x.png; sourceTree = group; };
8C0DC83817A4177C0099E5AE /* previousButton_pressed.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; path = 
previousButton_pressed.png; sourceTree = group; };
@@ -419,6 +422,8 @@
8C26E5CF17A58703007DA4B7 /* 
HorizontalSlideCell.m */,
8C26E5D517A68154007DA4B7 /* stopWatch.h */,
8C26E5D617A68154007DA4B7 /* stopWatch.m */,
+   8C0323A917A943720037432E /* 
UIImageView+setImageAnimated.h */,
+   8C0323AA17A943720037432E /* 
UIImageView+setImageAnimated.m */,
);
name = Support;
sourceTree = group;
@@ -635,6 +640,7 @@
8C26E5C917A5731D007DA4B7 /* 
autoDismissKeyboardNavigationViewController.m in Sources */,
8C26E5D017A58703007DA4B7 /* 
HorizontalSlideCell.m in Sources */,
8C26E5D717A68154007DA4B7 /* stopWatch.m in 
Sources */,
+   8C0323AB17A943720037432E /* 
UIImageView+setImageAnimated.m in Sources */,
);

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

2013-07-31 Thread Pierre-Eric Pelloux-Prayer

 sd/source/ui/slidesorter/view/SlideSorterView.cxx |4 ++--
 sd/source/ui/slidesorter/view/SlsLayouter.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 72319bfcced8b416c347e3d92d17296b2996b80b
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date:   Fri Jul 26 15:43:17 2013 +0200

sd/slidesorter: double thumbnails resolution and disable supersampling

This is a band-aid patch to improve Presenter on high resolution displays.
Supersampling is disabled because:
 - it uses a lot of cpu
 - and it seems more appropriate to do:
 render page at thumbnail resolution
instead of:
 render page at thumbnail resolutionx2 then scale it down by 2
(see BitmapFactory::CreateBitmap)

See also: https://gerrit.libreoffice.org/#/c/4052/

Change-Id: I380ddf3645f7c48eecf0df986dfaa1492e23228a
Reviewed-on: https://gerrit.libreoffice.org/5127
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx 
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 5186521..dfd04ba 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -480,7 +480,7 @@ void SlideSorterView::Layout ()
 PageObjectLayouter::WindowCoordinateSystem));
 if (maPreviewSize != aNewPreviewSize  GetPreviewCache())
 {
-mpPreviewCache-ChangeSize(aNewPreviewSize, true);
+mpPreviewCache-ChangeSize(aNewPreviewSize, false);
 maPreviewSize = aNewPreviewSize;
 }
 }
@@ -810,7 +810,7 @@ void SlideSorterView::ConfigurationChanged (
 mpPreviewCache.reset(
 new cache::PageCache(
 mpLayouter-GetPageObjectSize(),
-true,
+false,
 cache::SharedCacheContext(new 
ViewCacheContext(mrSlideSorter;
 }
 
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx 
b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 61105f7..c4b6ae2 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -497,7 +497,7 @@ Layouter::Implementation::Implementation (
   mnHorizontalGap(10 - 2*Theme_FocusIndicatorWidth),
   maMinimalSize(132,98),
   maPreferredSize(200,150),
-  maMaximalSize(300,200),
+  maMaximalSize(600,400),
   mnMinimalColumnCount(1),
   mnMaximalColumnCount(15),
   mnPageCount(0),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Petr Mladek pmla...@suse.cz changed:

   What|Removed |Added

 Depends on||67128, 66700

--- Comment #7 from Petr Mladek pmla...@suse.cz ---
Add bug 67128: Auto Filter Sort Results in Crash
Add bug 66700: Crash when deleting field added in Report Design mode

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-07-31 Thread Julien Nabet

 sfx2/source/appl/appopen.cxx |   50 +--
 sfx2/source/appl/appserv.cxx |   43 ++--
 2 files changed, 27 insertions(+), 66 deletions(-)

New commits:
commit a8c403a1f8298cede274f315e367f799d4fb0f32
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Jul 26 23:01:33 2013 +0200

fdo#46037: less occurrences of comphelper/configurationhelper in sfx2/appl

Change-Id: If1c4bafebcc570c4adb30bc507e4562357ce3f63
Reviewed-on: https://gerrit.libreoffice.org/5132
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index b05b714..363bfab 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -45,7 +45,6 @@
 #include cppuhelper/implbase1.hxx
 #include rtl/ustring.hxx
 
-#include comphelper/configurationhelper.hxx
 #include comphelper/processfactory.hxx
 #include comphelper/sequenceasvector.hxx
 #include comphelper/storagehelper.hxx
@@ -102,6 +101,8 @@
 #include templatedlg.hxx
 #include openuriexternally.hxx
 
+#include officecfg/Office/ProtocolHandler.hxx
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -897,39 +898,28 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest rReq )
 aProtocols[0] = OUString(private:*);
 aProtocols[1] = OUString(vnd.sun.star.*);
 
-try
+// get registered protocol handlers from configuration
+Reference  XNameAccess  
xAccess(officecfg::Office::ProtocolHandler::HandlerSet::get());
+Sequence  OUString  aNames = xAccess-getElementNames();
+for ( sal_Int32 nName = 0; nName  aNames.getLength(); 
nName ++)
 {
-// get registered protocol handlers from configuration
-Reference  XNameAccess  xAccess( 
::comphelper::ConfigurationHelper::openConfig( 
::comphelper::getProcessComponentContext(),
-
OUString(org.openoffice.Office.ProtocolHandler/HandlerSet), 
::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
-if ( xAccess.is() )
+Reference  XPropertySet  xSet;
+Any aRet = xAccess-getByName( aNames[nName] );
+aRet = xSet;
+if ( xSet.is() )
 {
-Sequence  OUString  aNames = 
xAccess-getElementNames();
-for ( sal_Int32 nName = 0; nName  
aNames.getLength(); nName ++)
-{
-Reference  XPropertySet  xSet;
-Any aRet = xAccess-getByName( aNames[nName] );
-aRet = xSet;
-if ( xSet.is() )
-{
-// copy protocols
-aRet = xSet-getPropertyValue(Protocols);
-Sequence  OUString  aTmp;
-aRet = aTmp;
-
-// todo: add operator+= to 
SequenceAsVector class and use SequenceAsVector for aProtocols
-sal_Int32 nLength = aProtocols.getLength();
-aProtocols.realloc( 
nLength+aTmp.getLength() );
-for ( sal_Int32 n=0; naTmp.getLength(); 
n++ )
-aProtocols[(++nLength)-1] = aTmp[n];
-}
-}
+// copy protocols
+aRet = xSet-getPropertyValue(Protocols);
+Sequence  OUString  aTmp;
+aRet = aTmp;
+
+// todo: add operator+= to SequenceAsVector class 
and use SequenceAsVector for aProtocols
+sal_Int32 nLength = aProtocols.getLength();
+aProtocols.realloc( nLength+aTmp.getLength() );
+for ( sal_Int32 n=0; naTmp.getLength(); n++ )
+aProtocols[(++nLength)-1] = aTmp[n];
 }
 }
-catch ( Exception )
-{
-// registered protocols could not be read
-}
 
 sal_Bool bFound = sal_False;
 for ( sal_Int32 nProt=0; nProtaProtocols.getLength(); 
nProt++ )
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 1df307f..b280bee 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -122,6 +122,9 @@

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

2013-07-31 Thread Julien Nabet

 sfx2/source/dialog/templdlg.cxx |1 
 sfx2/source/view/viewfrm.cxx|   78 +++-
 2 files changed, 30 insertions(+), 49 deletions(-)

New commits:
commit 78c5a2ce8c2d4967d954fceaf9b7707ec56a3d7b
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Jul 26 23:28:59 2013 +0200

fdo#46037: no more comphelper/configurationhelper in sfx2/view

Change-Id: Iba139247f3515c834d8abcfd4322964dbc3abca4
Reviewed-on: https://gerrit.libreoffice.org/5134
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 73c9f87..203f200 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -62,7 +62,6 @@
 #include appdata.hxx
 #include sfx2/viewfrm.hxx
 
-#include comphelper/configurationhelper.hxx
 #include comphelper/string.hxx
 
 using namespace ::com::sun::star;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index d027b7d..0a9b205 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -94,7 +94,7 @@
 
 #include comphelper/processfactory.hxx
 #include comphelper/configuration.hxx
-#include officecfg/Office/Common.hxx
+#include officecfg/Office/Common.hxx
 
 #include boost/optional.hpp
 
@@ -2330,62 +2330,44 @@ void SfxViewFrame::ExecView_Impl
 */
 sal_Bool impl_maxOpenDocCountReached()
 {
-try
-{
-css::uno::Reference css::uno::XComponentContext  xContext = 
::comphelper::getProcessComponentContext();
-css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
-xContext,
-OUString(org.openoffice.Office.Common/),
-OUString(Misc),
-OUString(MaxOpenDocuments),
-::comphelper::ConfigurationHelper::E_READONLY);
-
-// NIL means: count of allowed documents = infinite !
-if ( ! aVal.hasValue())
-return sal_False;
-
-sal_Int32 nOpenDocs = 0;
-sal_Int32 nMaxDocs  = 0;
-aVal = nMaxDocs;
+css::uno::Reference css::uno::XComponentContext  xContext = 
::comphelper::getProcessComponentContext();
+boost::optionalsal_Int32 
x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext));
+// NIL means: count of allowed documents = infinite !
+if (!x)
+return sal_False;
+sal_Int32 nMaxDocs(x.get());
+sal_Int32 nOpenDocs = 0;
 
-css::uno::Reference css::frame::XDesktop2   xDesktop = 
css::frame::Desktop::create(xContext);
-css::uno::Reference css::container::XIndexAccess  xCont   
(xDesktop-getFrames() , css::uno::UNO_QUERY_THROW);
+css::uno::Reference css::frame::XDesktop2   xDesktop = 
css::frame::Desktop::create(xContext);
+css::uno::Reference css::container::XIndexAccess  
xCont(xDesktop-getFrames(), css::uno::UNO_QUERY_THROW);
 
-sal_Int32 c = xCont-getCount();
-sal_Int32 i = 0;
+sal_Int32 c = xCont-getCount();
+sal_Int32 i = 0;
 
-for (i=0; ic; ++i)
+for (i=0; ic; ++i)
+{
+try
 {
-try
-{
-css::uno::Reference css::frame::XFrame  xFrame;
-xCont-getByIndex(i) = xFrame;
-if ( ! xFrame.is())
-continue;
+css::uno::Reference css::frame::XFrame  xFrame;
+xCont-getByIndex(i) = xFrame;
+if ( ! xFrame.is())
+continue;
 
-// a) do not count the help window
-if ( xFrame-getName() == OFFICE_HELP_TASK )
-continue;
+// a) do not count the help window
+if ( xFrame-getName() == OFFICE_HELP_TASK )
+continue;
 
-// b) count all other frames
-++nOpenDocs;
-}
-catch(const css::uno::Exception)
-// A IndexOutOfBoundException can happen in multithreaded
-// environments, where any other thread can change this
-// container !
-{ continue; }
+// b) count all other frames
+++nOpenDocs;
 }
-
-return (nOpenDocs = nMaxDocs);
+catch(const css::uno::Exception)
+// A IndexOutOfBoundException can happen in multithreaded
+// environments, where any other thread can change this
+// container !
+{ continue; }
 }
-catch(const css::uno::Exception)
-{}
 
-// Any internal error is no reason to stop opening documents !
-// Limitation of opening documents is a special nice to  have feature.
-// Otherwhise it can happen, that NO document will be opened ...
-return sal_False;
+return (nOpenDocs = nMaxDocs);
 }

[Libreoffice-commits] core.git: 3 commits - include/vcl sfx2/source vcl/source

2013-07-31 Thread Noel Grandin

 include/vcl/keycod.hxx  |2 
 include/vcl/longcurr.hxx|8 +--
 sfx2/source/appl/appinit.cxx|4 -
 vcl/source/control/longcurr.cxx |   94 
 vcl/source/window/keycod.cxx|4 -
 5 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit d67d5698c67ccc97675de2830e6dd980a93c3000
Author: Noel Grandin n...@peralex.com
Date:   Wed Jul 31 15:16:16 2013 +0200

fix android build after my XubString changes in VCL

Change-Id: I6727db5f64041a6f181810696eef56175385c96c

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 646993d..51f2b23 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -157,7 +157,7 @@ Sequence OUString  SAL_CALL 
SfxTerminateListener_Impl::getSupportedServiceName
 
 //
 
-typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font 
i_rFont, String o_rOutString );
+typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const Font 
i_rFont, OUString o_rOutString );
 
 //
 // Lazy binding of the GetSpecialCharsForEdit function as it resides in
@@ -198,7 +198,7 @@ OUString GetSpecialCharsForEdit(Window* pParent, const 
Font rFont)
 #endif
 }
 
-String aRet;
+OUString aRet;
 if ( pfunc_getSpecialCharsForEdit )
 (*pfunc_getSpecialCharsForEdit)( pParent, rFont, aRet );
 return aRet;
commit ee30fdf6780d642e5f7e91385d9e7b5cca434888
Author: Noel Grandin n...@peralex.com
Date:   Wed Jul 31 15:15:25 2013 +0200

convert vcl/longcurr.hxx from XubString to OUString

Change-Id: I1803e4fdef67cd461c140578b46e0ef5632da3fb

diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index f911ca8..fd4c821 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -33,7 +33,7 @@ class LocaleDataWrapper;
 class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase
 {
 private:
-SAL_DLLPRIVATE friend bool ImplLongCurrencyReformat( const XubString, 
BigInt, BigInt, sal_uInt16, const LocaleDataWrapper, XubString, 
LongCurrencyFormatter );
+SAL_DLLPRIVATE friend bool ImplLongCurrencyReformat( const OUString, 
BigInt, BigInt, sal_uInt16, const LocaleDataWrapper, OUString, 
LongCurrencyFormatter );
 SAL_DLLPRIVATE voidImpInit();
 
 protected:
@@ -42,7 +42,7 @@ protected:
 BigInt  mnMin;
 BigInt  mnMax;
 BigInt  mnCorrectedValue;
-OUString   maCurrencySymbol;
+OUStringmaCurrencySymbol;
 sal_uInt16  mnType;
 sal_uInt16  mnDecimalDigits;
 sal_BoolmbThousandSep;
@@ -57,8 +57,8 @@ public:
 voidSetUseThousandSep( sal_Bool b );
 sal_BoolIsUseThousandSep() const { return 
mbThousandSep; }
 
-voidSetCurrencySymbol( const String rStr );
-String  GetCurrencySymbol() const;
+voidSetCurrencySymbol( const OUString rStr );
+OUStringGetCurrencySymbol() const;
 
 voidSetMin( BigInt nNewMin );
 BigInt  GetMin() const { return mnMin; }
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 9881521..14ace59 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -48,7 +48,7 @@ static BigInt ImplPower10( sal_uInt16 n )
 return nValue;
 }
 
-static XubString ImplGetCurr( const LocaleDataWrapper rLocaleDataWrapper, 
const BigInt rNumber, sal_uInt16 nDigits, const String rCurrSymbol, sal_Bool 
bShowThousandSep )
+static OUString ImplGetCurr( const LocaleDataWrapper rLocaleDataWrapper, 
const BigInt rNumber, sal_uInt16 nDigits, const OUString rCurrSymbol, 
sal_Bool bShowThousandSep )
 {
 DBG_ASSERT( nDigits  10, LongCurrency may only have 9 decimal places );
 
@@ -70,7 +70,7 @@ static XubString ImplGetCurr( const LocaleDataWrapper 
rLocaleDataWrapper, const
 if ( rNumber.IsNeg() )
 aFraction *= -1;
 
-XubString aTemplate = rLocaleDataWrapper.getCurr( (long)aFraction, 
nDigits, rCurrSymbol, bShowThousandSep );
+OUStringBuffer aTemplate = rLocaleDataWrapper.getCurr( (long)aFraction, 
nDigits, rCurrSymbol, bShowThousandSep );
 while( !aInteger.IsZero() )
 {
 aFraction  = aInteger;
@@ -79,19 +79,19 @@ static XubString ImplGetCurr( const LocaleDataWrapper 
rLocaleDataWrapper, const
 if( !aInteger.IsZero() )
 aFraction += aTmp;
 
-XubString aFractionStr = rLocaleDataWrapper.getNum( (long)aFraction, 0 
);
+OUString aFractionStr = rLocaleDataWrapper.getNum( (long)aFraction, 0 
);
 
-xub_StrLen nSPos = aTemplate.Search( '1' );
-if ( aFractionStr.Len() == 1 )
-aTemplate.SetChar(

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

2013-07-31 Thread Lionel Elie Mamane

 connectivity/source/commontools/dbconversion.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2f9c340b4f8f54872eb97880d03c802a1620a1b6
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Jul 29 15:26:08 2013 +0200

fdo#67387 skip separating space between date and time in timestamp

Change-Id: I3c38d179f8b2f59e79cd889fa88f4582f650c09e
Reviewed-on: https://gerrit.libreoffice.org/5166
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/connectivity/source/commontools/dbconversion.cxx 
b/connectivity/source/commontools/dbconversion.cxx
index 0b04dbd..847f45f 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -450,7 +450,13 @@ namespace dbtools
 utl::Time aTime;
 sal_Int32 nSeparation = _sSQLString.indexOf( ' ' );
 if ( -1 != nSeparation )
+{
+const sal_Unicode *p = _sSQLString.getStr() + nSeparation;
+const sal_Unicode *const begin = p;
+for(;isspace(*p);++p);
+nSeparation += p - begin;
 aTime = toTime( _sSQLString.copy( nSeparation ) );
+}
 
 return utl::DateTime(aTime.NanoSeconds, aTime.Seconds, aTime.Minutes, 
aTime.Hours,
 aDate.Day, aDate.Month, aDate.Year, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 connectivity/Library_firebird_sdbc.mk|   16 
 connectivity/source/drivers/firebird/Blob.cxx|2 
 connectivity/source/drivers/firebird/Connection.cxx  |  737 
 connectivity/source/drivers/firebird/Connection.hxx  |  183 +
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx| 1660 +++
 connectivity/source/drivers/firebird/DatabaseMetaData.hxx|  205 +
 connectivity/source/drivers/firebird/Driver.cxx  |  222 +
 connectivity/source/drivers/firebird/Driver.hxx  |   79 
 connectivity/source/drivers/firebird/FConnection.cxx |  737 
 connectivity/source/drivers/firebird/FConnection.hxx |  183 -
 connectivity/source/drivers/firebird/FDatabaseMetaData.cxx   | 1588 --
 connectivity/source/drivers/firebird/FDatabaseMetaData.hxx   |  204 -
 connectivity/source/drivers/firebird/FDriver.cxx |  221 -
 connectivity/source/drivers/firebird/FDriver.hxx |   78 
 connectivity/source/drivers/firebird/FPreparedStatement.cxx  |  570 ---
 connectivity/source/drivers/firebird/FPreparedStatement.hxx  |  167 -
 connectivity/source/drivers/firebird/FResultSet.cxx  | 1025 --
 connectivity/source/drivers/firebird/FResultSet.hxx  |  307 --
 connectivity/source/drivers/firebird/FResultSetMetaData.cxx  |  210 -
 connectivity/source/drivers/firebird/FResultSetMetaData.hxx  |  107 
 connectivity/source/drivers/firebird/FServices.cxx   |  134 
 connectivity/source/drivers/firebird/FStatement.cxx  |  213 -
 connectivity/source/drivers/firebird/FStatement.hxx  |   86 
 connectivity/source/drivers/firebird/FSubComponent.hxx   |  147 
 connectivity/source/drivers/firebird/PreparedStatement.cxx   |  570 +++
 connectivity/source/drivers/firebird/PreparedStatement.hxx   |  167 +
 connectivity/source/drivers/firebird/ResultSet.cxx   | 1024 ++
 connectivity/source/drivers/firebird/ResultSet.hxx   |  307 ++
 connectivity/source/drivers/firebird/ResultSetMetaData.cxx   |  210 +
 connectivity/source/drivers/firebird/ResultSetMetaData.hxx   |  107 
 connectivity/source/drivers/firebird/Services.cxx|  135 
 connectivity/source/drivers/firebird/Statement.cxx   |  213 +
 connectivity/source/drivers/firebird/Statement.hxx   |   86 
 connectivity/source/drivers/firebird/StatementCommonBase.cxx |4 
 connectivity/source/drivers/firebird/StatementCommonBase.hxx |2 
 connectivity/source/drivers/firebird/SubComponent.hxx|  148 
 36 files changed, 6065 insertions(+), 5989 deletions(-)

New commits:
commit da25756ba9a6b7ea51625dc5ca9291d209867068
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Wed Jul 31 16:03:29 2013 +0200

Remove unnecessary F- prefix for firebird-sdbc files.

Change-Id: I6574ef7fd1c26770a74b2d1f2b0d997fcca97779

diff --git a/connectivity/Library_firebird_sdbc.mk 
b/connectivity/Library_firebird_sdbc.mk
index 6030fec..1893718 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -38,14 +38,14 @@ $(eval $(call 
gb_Library_set_componentfile,firebird_sdbc,connectivity/source/dri
 
 $(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\
 connectivity/source/drivers/firebird/Blob \
-connectivity/source/drivers/firebird/FConnection \
-connectivity/source/drivers/firebird/FDatabaseMetaData \
-connectivity/source/drivers/firebird/FDriver \
-connectivity/source/drivers/firebird/FPreparedStatement \
-connectivity/source/drivers/firebird/FResultSet \
-connectivity/source/drivers/firebird/FResultSetMetaData \
-connectivity/source/drivers/firebird/FServices \
-connectivity/source/drivers/firebird/FStatement \
+connectivity/source/drivers/firebird/Connection \
+connectivity/source/drivers/firebird/DatabaseMetaData \
+connectivity/source/drivers/firebird/Driver \
+connectivity/source/drivers/firebird/PreparedStatement \
+connectivity/source/drivers/firebird/ResultSet \
+connectivity/source/drivers/firebird/ResultSetMetaData \
+connectivity/source/drivers/firebird/Services \
+connectivity/source/drivers/firebird/Statement \
 connectivity/source/drivers/firebird/StatementCommonBase \
 connectivity/source/drivers/firebird/Util \
 ))
diff --git a/connectivity/source/drivers/firebird/Blob.cxx 
b/connectivity/source/drivers/firebird/Blob.cxx
index 8423b28..f27835d 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -8,7 +8,7 @@
  */
 
 #include Blob.hxx
-#include FConnection.hxx
+#include Connection.hxx
 #include Util.hxx
 
 #include connectivity/dbexception.hxx
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
similarity index 99%
rename from connectivity/source/drivers/firebird/FConnection.cxx
rename to

Re: [libreoffice-l10n] Invalid Entry in Po Files

2013-07-31 Thread Tadele Assefa

Dear Yaron,

I am still struggling with the 'invalid entry' message during LO build. The
followings are things I have done since you advised me last time:

1) corrected all 'critical errors' suggested
2) Tried to build and failed
3) Uploaded all files to Pootle, corrected all errors suggested by pootle
downloaded the translations and tried to build, not OK
4) Pulled the latest source code from git, switched to master and tried to
build, not OK

I did this on both Win and Ubuntu with same result. When I open the files
in Virtaal I cannot see any problem. What shall I do?

Regards,


On Sun, Jul 28, 2013 at 11:11 AM, Yaron Shahrabani sh.ya...@gmail.comwrote:

 I attached 2 files.

 msgfmtlog.txt - Displays all errors, even the non critical one (these can
 be fixed with recursive regex operation).

 msgfmtcrit.txt - Displays only the critical errors (grep -v did the job).

 The commands I used:
 # recursively find all po files and send then to msgfmt for inspection
 find . -name *.po -exec msgfmt -vco /dev/null {} \;  msgfmtlog.txt
 # filter out all the non critical messages (usefull only in this case) and
 put them in a file
 cat msgfmtlog.txt | grep -v 'initial\|translated'  msgfmtcrit.txt


 Kind regards,

 Yaron Shahrabani

 Hebrew translator



 On Sat, Jul 27, 2013 at 6:10 PM, Zolnai Tamás 
 zolnaitamas2...@gmail.comwrote:

 Yes, gettext may help, to find the problem, but the contains invalid
 entry message come from LO specific po checks. The LO used po has some
 additional requirements to meet. If you use Pootle, than this problem don't
 come up, but If you intend to use Find and Replace in a text editor than
 you have to be sure that this replacing touch only the lines started with
 msgstr and not others.

 Best regards,
 Tamás

 2013/7/27 Yaron Shahrabani sh.ya...@gmail.com

 It's fairly simple, assuming you have the gettext tools installed, if
 not just send me the file and I'll scan it for you.

 With gettext the command would be: msgfmt -vco /dev/null base.po (in the
 same dir of course)

 Yaron Shahrabani

 Hebrew translator



 On Sat, Jul 27, 2013 at 11:37 AM, Tadele Assefa milky...@gmail.comwrote:

 Dear All,

 After we did a 100%, we decided to change some of owr strings to a  new
 terminology. As a result I did a Find and Replace in All Files using
 Sublime Text 2 to change the terms.

 After this I started building entire LO,(libreoffice-4-1 branch), but it
 failed to include the new terms saying invalid entry like
 git/libowin/translations/source/sid/scp2/source/base.po contains
 invalid
 entry.


 What mistake did I do? How may i resolve this?
 --
 Regards,*
 ___
 Tadele Assefa***

 --
 To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org
 Problems?
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more:
 http://wiki.documentfoundation.org/Netiquette
 List archive: http://listarchives.libreoffice.org/global/l10n/
 All messages sent to this list will be publicly archived and cannot be
 deleted



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






-- 
Regards,*
___
Tadele Assefa
Managing Director*
*

Cell: +25-911-84-13-84*
*Think Green – Please do not print this email unless you really need to*
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sfx2/source/doc/templatedlg.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d
Author: Noel Power noel.po...@suse.com
Date:   Wed Jul 31 15:52:05 2013 +0100

fix for fdo#60883 ( macros disabled for documents opened from templates )

Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index ba60060..9cf7714 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -53,6 +53,7 @@
 #include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/FolderPicker.hpp
+#include com/sun/star/task/InteractionHandler.hpp
 
 #include doc.hrc
 #include templatedlg.hrc
@@ -750,13 +751,15 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, 
ThumbnailViewItem*, pItem)
 {
 if (!mbIsSaveMode)
 {
-uno::Sequence PropertyValue  aArgs(3);
+uno::Sequence PropertyValue  aArgs(4);
 aArgs[0].Name = AsTemplate;
 aArgs[0].Value = sal_True;
 aArgs[1].Name = MacroExecutionMode;
 aArgs[1].Value = MacroExecMode::USE_CONFIG;
 aArgs[2].Name = UpdateDocMode;
 aArgs[2].Value = UpdateDocMode::ACCORDING_TO_CONFIG;
+aArgs[3].Name = InteractionHandler;
+aArgs[3].Value = task::InteractionHandler::createWithParent( 
::comphelper::getProcessComponentContext(), 0 );
 
 TemplateViewItem *pTemplateItem = 
static_castTemplateViewItem*(pItem);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/inc sd/source sd/xml

2013-07-31 Thread Vishv Brahmbhatt

 sd/inc/drawdoc.hxx |5 ++
 sd/source/core/drawdoc.cxx |   88 +
 sd/xml/layoutlist.xml  |   22 +--
 3 files changed, 103 insertions(+), 12 deletions(-)

New commits:
commit b51863296598dc9fe90af07bb8288d13652f1d72
Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com
Date:   Wed Jul 31 01:58:58 2013 +0530

Temporarily adding new methods to drawdoc.cxx.

Adding new methods to SdDrawDocument class to set the vector layoutlist
from the constructor of SdDrawDocument and use it in 
CalcAutoLayoutRectangles.
Build got failed in-between,so authentication of it's working is left to be 
done.

Change-Id: Ia614ab0e1d45022d770e61d27b0ae6c74dc71bf8

diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 77ac6b6..066cc1a 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -30,6 +30,7 @@
 #include unotools/charclass.hxx
 #include sot/storage.hxx
 #include rsc/rscsfx.hxx
+#include com/sun/star/xml/dom/XNode.hpp
 
 #include svx/svdundo.hxx
 
@@ -187,6 +188,7 @@ private:
 DECL_LINK(OnlineSpellEventHdl, EditStatus*);
 
 std::vector OUString  maAnnotationAuthors;
+
std::vectorcom::sun::star::uno::Referencecom::sun::star::xml::dom::XNode 
layoutinfo;
 
 boolmbUseEmbedFonts;
 
@@ -257,7 +259,8 @@ public:
 
 bool IsStartWithPresentation() const;
 void SetStartWithPresentation( bool bStartWithPresentation );
-
+void SetLayoutVector();
+
std::vectorcom::sun::star::uno::Referencecom::sun::star::xml::dom::XNode 
GetLayoutVector();
 /** Insert pages into this document
 
 This method inserts whole pages into this document, either
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index aca4996..ca12a96 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -62,6 +62,22 @@
 #include unotools/pathoptions.hxx
 #include unotools/lingucfg.hxx
 #include unotools/linguprops.hxx
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/xml/dom/XDocumentBuilder.hpp
+#include com/sun/star/xml/dom/XDocument.hpp
+#include com/sun/star/xml/dom/XNode.hpp
+#include com/sun/star/xml/dom/XNodeList.hpp
+#include com/sun/star/xml/dom/XNamedNodeMap.hpp
+#include com/sun/star/xml/dom/DocumentBuilder.hpp
+#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/io/XInputStream.hpp
+#include com/sun/star/util/theMacroExpander.hpp
+#include com/sun/star/container/XNameAccess.hpp
+#include com/sun/star/configuration/theDefaultProvider.hpp
+#include com/sun/star/beans/PropertyValue.hpp
+#include rtl/ustring.hxx
+#include rtl/uri.hxx
+#include unotools/ucbstreamhelper.hxx
 
 #include editeng/outliner.hxx
 #include drawdoc.hxx
@@ -90,6 +106,13 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::linguistic2;
 
+using namespace com::sun::star::xml::dom;
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::io::XInputStream;
+using ::com::sun::star::lang::XMultiServiceFactory;
+using ::com::sun::star::container::XNameAccess;
+using ::com::sun::star::beans::PropertyValue;
+
 //
 
 TYPEINIT1( SdDrawDocument, FmFormModel );
@@ -169,6 +192,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, 
SfxObjectShell* pDrDocSh)
 mpMasterPageListWatcher = ::std::auto_ptrImpMasterPageListWatcher(
 new ImpMasterPageListWatcher(*this));
 
+SetLayoutVector();
 SetObjectShell(pDrDocSh);   // for VCDrawModel
 
 if (mpDocSh)
@@ -978,4 +1002,68 @@ sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( 
const OUString rAuthor )
 return idx;
 }
 
+#define EXPAND_PROTOCOL vnd.sun.star.expand:
+// to get the root element of the xml file
+ReferenceXElement getRoot()
+{
+const Referencecss::uno::XComponentContext 
xContext(comphelper_getProcessComponentContext());
+Reference XMultiServiceFactory  
xServiceFactory(xContext-getServiceManager(), UNO_QUERY_THROW );
+Reference util::XMacroExpander  xMacroExpander 
=util::theMacroExpander::get(xContext);
+Reference XMultiServiceFactory  xConfigProvider 
=configuration::theDefaultProvider::get( xContext );
+
+Any propValue = uno::makeAny(
+beans::PropertyValue(
+nodepath, -1,
+uno::makeAny( OUString( /org.openoffice.Office.Impress/Misc )),
+beans::PropertyState_DIRECT_VALUE ) );
+
+Referencecontainer::XNameAccess xNameAccess(
+xConfigProvider-createInstanceWithArguments(
+com.sun.star.configuration.ConfigurationAccess,
+SequenceAny( propValue, 1 ) ), UNO_QUERY_THROW );
+Sequence rtl::OUString  aFiles;
+xNameAccess-getByName( LayoutListFiles ) = aFiles;
+rtl::OUString aURL;
+for( sal_Int32 i=0; iaFiles.getLength(); ++i )
+{
+aURL = aFiles[i];
+if( aURL.startsWith( EXPAND_PROTOCOL ) )
+

Re: [libreoffice-l10n] Invalid Entry in Po Files

2013-07-31 Thread Yaron Shahrabani

Dear Tadele!
Try using Poedit (Any version above 1.5 is fine).

This tool shows the misbehaving strings in red on top of the list after you
save.
This way you can look at the strings that Virtaal will simply ignore upon
saving (Sorry Friedel ☺).

Another great tool I would suggest you to use (mainly in Ubuntu) is
msgfmt.
After you edit the file just go to the command line and type msgfmt -vco
/dev/null /path/to/your/file.sid.po (replace the last part with the actual
file location).

If you don't have the msgfmt tool you'll have to install gettext using the
following command:
sudo apt-get install gettext
You will be asked for your password and then the tool will be installed so
you can use it.

Anyways I'm so glad to see this translation completing so fast.
Good job!

Yaron Shahrabani

Hebrew translator



On Wed, Jul 31, 2013 at 5:43 PM, Tadele Assefa milky...@gmail.com wrote:

 Dear Yaron,

 I am still struggling with the 'invalid entry' message during LO build.
 The followings are things I have done since you advised me last time:

 1) corrected all 'critical errors' suggested
 2) Tried to build and failed
 3) Uploaded all files to Pootle, corrected all errors suggested by pootle
 downloaded the translations and tried to build, not OK
 4) Pulled the latest source code from git, switched to master and tried to
 build, not OK

 I did this on both Win and Ubuntu with same result. When I open the files
 in Virtaal I cannot see any problem. What shall I do?

 Regards,


 On Sun, Jul 28, 2013 at 11:11 AM, Yaron Shahrabani sh.ya...@gmail.comwrote:

 I attached 2 files.

 msgfmtlog.txt - Displays all errors, even the non critical one (these can
 be fixed with recursive regex operation).

 msgfmtcrit.txt - Displays only the critical errors (grep -v did the job).

 The commands I used:
 # recursively find all po files and send then to msgfmt for inspection
 find . -name *.po -exec msgfmt -vco /dev/null {} \;  msgfmtlog.txt
 # filter out all the non critical messages (usefull only in this case)
 and put them in a file
 cat msgfmtlog.txt | grep -v 'initial\|translated'  msgfmtcrit.txt


 Kind regards,

 Yaron Shahrabani

 Hebrew translator



 On Sat, Jul 27, 2013 at 6:10 PM, Zolnai Tamás 
 zolnaitamas2...@gmail.comwrote:

 Yes, gettext may help, to find the problem, but the contains invalid
 entry message come from LO specific po checks. The LO used po has some
 additional requirements to meet. If you use Pootle, than this problem don't
 come up, but If you intend to use Find and Replace in a text editor than
 you have to be sure that this replacing touch only the lines started with
 msgstr and not others.

 Best regards,
 Tamás

 2013/7/27 Yaron Shahrabani sh.ya...@gmail.com

 It's fairly simple, assuming you have the gettext tools installed, if
 not just send me the file and I'll scan it for you.

 With gettext the command would be: msgfmt -vco /dev/null base.po (in
 the same dir of course)

 Yaron Shahrabani

 Hebrew translator



 On Sat, Jul 27, 2013 at 11:37 AM, Tadele Assefa milky...@gmail.comwrote:

 Dear All,

 After we did a 100%, we decided to change some of owr strings to a  new
 terminology. As a result I did a Find and Replace in All Files using
 Sublime Text 2 to change the terms.

 After this I started building entire LO,(libreoffice-4-1 branch), but
 it
 failed to include the new terms saying invalid entry like
 git/libowin/translations/source/sid/scp2/source/base.po contains
 invalid
 entry.


 What mistake did I do? How may i resolve this?
 --
 Regards,*
 ___
 Tadele Assefa***

 --
 To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org
 Problems?
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more:
 http://wiki.documentfoundation.org/Netiquette
 List archive: http://listarchives.libreoffice.org/global/l10n/
 All messages sent to this list will be publicly archived and cannot be
 deleted



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






 --
 Regards,*
 ___
 Tadele Assefa
 Managing Director*
 *

 Cell: +25-911-84-13-84*
 *Think Green – Please do not print this email unless you really need to*

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basctl/uiconfig basic/Library_sb.mk basic/source include/basic officecfg/registry

2013-07-31 Thread Gergo Mocsi

 basctl/source/basicide/baside2b.cxx  |   23 +++-
 basctl/source/basicide/codecompleteoptionsdlg.cxx|   29 ---
 basctl/source/basicide/codecompleteoptionsdlg.hxx|3 +
 basctl/uiconfig/basicide/ui/codecompleteoptionsdlg.ui|   17 ++
 basic/Library_sb.mk  |4 +
 basic/source/classes/codecompletecache.cxx   |   15 -
 basic/source/classes/sbxmod.cxx  |2 
 include/basic/codecompletecache.hxx  |3 -
 officecfg/registry/schema/org/openoffice/Office/BasicIDE.xcs |6 ++
 9 files changed, 89 insertions(+), 13 deletions(-)

New commits:
commit bc7e841728c820de6d2fade0c052e53da4a87bcf
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Wed Jul 31 17:08:18 2013 +0200

GSOC work, ListBox appearance fix (at the borders) + code fixes

ListBox appearance fixed at the borders:
a) bottom: it it placed over the current line (not under)
b) right side: listbox's right side is adjusted to the window's right side
Coed fixes:
CodeCompleteOptions now intializes itself from the configuration file 
BasicIDE.xcs
Added a checkbox for enabling extended types in the options dialog.
Cursor is visible when the listbox is active.
Fixed the small issue when deleting a character.

Change-Id: I68b80143de245cebfce65cdd8af37ea4694aa81b

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 3aebafd..7b550ba 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -746,6 +746,7 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 pCodeCompleteWnd-Show();
 pCodeCompleteWnd-ResizeListBox();
 pCodeCompleteWnd-SelectFirstEntry();
+pEditView-GetWindow()-GrabFocus();
 }
 }
 }
@@ -2605,7 +2606,7 @@ long CodeCompleteListBox::PreNotify( NotifyEvent rNEvt )
 {
 TextPaM 
aEnd(pCodeCompleteWindow-aTextSelection.GetEnd().GetPara(), 
pCodeCompleteWindow-GetTextSelection().GetEnd().GetIndex() + 
aFuncBuffer.getLength());
 TextPaM 
aStart(pCodeCompleteWindow-aTextSelection.GetEnd().GetPara(), 
pCodeCompleteWindow-GetTextSelection().GetEnd().GetIndex() + 
aFuncBuffer.getLength()-1);
-
aFuncBuffer.stripEnd(aFuncBuffer[aFuncBuffer.getLength()-1]);
+aFuncBuffer = 
aFuncBuffer.remove(aFuncBuffer.getLength()-1, 1);
 
pCodeCompleteWindow-pParent-GetEditView()-SetSelection(TextSelection(aStart, 
aEnd));
 
pCodeCompleteWindow-pParent-GetEditView()-DeleteSelected();
 SetVisibleEntries();
@@ -2689,9 +2690,27 @@ void CodeCompleteWindow::ResizeListBox()
 Size aSize = pListBox-CalcSize( aLongestEntry.getLength(), std::min( 
(sal_uInt16) 4, pListBox-GetEntryCount()) );
 const Font aFont = pListBox-GetUnzoomedControlPointFont();
 
+Rectangle aVisArea( pParent-GetEditView()-GetStartDocPos(), 
pParent-GetOutputSizePixel() );
 aSize.setHeight( aFont.GetSize().getHeight() * 16 );
 aSize.setWidth( pListBox-CalcSize(aLongestEntry.getLength(), 
pListBox-GetEntryCount()).getWidth() );
-
+Point aBottomPoint = aVisArea.BottomRight();
+Point aTopPoint = aVisArea.TopRight();
+long nYDiff = std::abs((aBottomPoint.Y() - aTopPoint.Y()) - 
GetPosPixel().Y());
+
+if( (nYDiff + aFont.GetSize().getHeight())  aSize.Height() )
+{//bottom part is clipped, fix the visibility by placing it over the 
line (not under)
+//std::cerr  clipped at the bottom  std::endl;
+Point aPos = GetPosPixel();
+aPos.Y() = aPos.Y() - (aSize.getHeight() + 
aFont.GetSize().getHeight());
+SetPosPixel(aPos);
+}
+long nXDiff = std::abs(aTopPoint.X() - GetPosPixel().X());
+if( nXDiff  aSize.Width() )
+{//clipped at the right side, move it a bit left
+Point aPos = GetPosPixel();
+aPos.X() = aPos.X() - aSize.Width() + nXDiff;
+SetPosPixel(aPos);
+}
 pListBox-SetSizePixel( aSize );
 aSize.setWidth( aSize.getWidth() + 1 );
 aSize.setHeight( aSize.getHeight() + 1 );
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx 
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index 130f361..e8537c6 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -39,16 +39,15 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window* 
pWindow )
 get(pAutocloseParenChk, autoclose_paren);
 get(pAutocloseQuotesChk, autoclose_quotes);
 get(pAutoCorrectSpellingChk,

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source

2013-07-31 Thread Gergo Mocsi

 basctl/source/basicide/baside2b.cxx |   15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit dc85b9f31c7b7035c9ee11721bfbaef7649afd15
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Wed Jul 31 17:24:15 2013 +0200

GSOC work, autoclose procedures fix

Fixed function autoclose procedures: when there was an incomplete 
function/sub, and the lookahead found another sub/function, autocorrected the 
wrong ending. This is fixed.

Change-Id: I3d894808fe8111f1ea1fac797b16576d843bff68

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 7b550ba..0cc2f60 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -605,6 +605,7 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 if( nLine+1 == pEditEngine-GetParagraphCount() )
 { //append to the end
 OUString sText(\nEnd );
+std::cerr  sProcType:   sProcType  std::endl;
 if( sProcType.equalsIgnoreAsciiCase(function) )
 sText += OUString( Function\n );
 if( sProcType.equalsIgnoreAsciiCase(sub) )
@@ -627,12 +628,22 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 {
 if( sStr1.equalsIgnoreAsciiCase(sub) )
 {
-pEditView-InsertText( OUString ( \nEnd 
Sub\n ) );
+OUString sText(\nEnd );
+if( 
sProcType.equalsIgnoreAsciiCase(function) )
+sText += OUString( Function\n );
+if( sProcType.equalsIgnoreAsciiCase(sub) 
)
+sText += OUString( Sub\n );
+pEditView-InsertText( sText );
 break;
 }
 if( sStr1.equalsIgnoreAsciiCase(function) )
 {
-pEditView-InsertText( OUString ( \nEnd 
Function\n ) );
+OUString sText(\nEnd );
+if( 
sProcType.equalsIgnoreAsciiCase(function) )
+sText += OUString( Function\n );
+if( sProcType.equalsIgnoreAsciiCase(sub) 
)
+sText += OUString( Sub\n );
+pEditView-InsertText( sText );
 break;
 }
 if( sStr1.equalsIgnoreAsciiCase(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-1' - extensions/source

2013-07-31 Thread Stephan Bergmann

 extensions/source/propctrlr/formmetadata.cxx |  461 +--
 1 file changed, 232 insertions(+), 229 deletions(-)

New commits:
commit b23a866a93e42467ef42c2d46735e1ffcf6f1c78
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jul 31 13:53:29 2013 +0200

fdo#67430 Keep original order of entry positions, not alphabetically sorted

...turns out ca0600f0c9022d631317423ab5a59493b41906ab multiple unsequenced
modifications to 'nPos' [-Werror,-Wunsequenced] was wrong in assuming that 
the
order of getPropertyPos had no meaning, as it determines the order in which
form property dialogs display items.

So, reintroduced a fixed order, but without resorting to undefined behavior 
due
to repeated uses of ++ with no sequence points in between.  This is rather
sluggish, but gets the job done.

(cherry picked from commit a6fe1fde409ff1accdea49ff9de69658de1e6f5f)
Conflicts:
extensions/source/propctrlr/formmetadata.cxx

Change-Id: If9c5f4130fe6523eebd3a13e5a685fc9c0f53fc0
Reviewed-on: https://gerrit.libreoffice.org/5215
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/extensions/source/propctrlr/formmetadata.cxx 
b/extensions/source/propctrlr/formmetadata.cxx
index f1cb08c..7e42130 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -44,23 +44,26 @@ namespace pcr
 String  sTranslation;
 OStringsHelpId;
 sal_Int32   nId;
+sal_uInt16  nPos;
 sal_uInt32  nUIFlags;
 
 OPropertyInfoImpl(
 const OUString  rName,
 sal_Int32   _nId,
 const String   aTranslation,
+sal_uInt16  nPosId,
 const OString,
 sal_uInt32  _nUIFlags);
 };
 
 //
 OPropertyInfoImpl::OPropertyInfoImpl(const OUString _rName, sal_Int32 
_nId,
-   const String aString, const OString sHid, 
sal_uInt32 _nUIFlags)
+   const String aString, sal_uInt16 nP, const 
OString sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
,nId(_nId)
+   ,nPos(nP)
,nUIFlags(_nUIFlags)
 {
 }
@@ -78,21 +81,21 @@ namespace pcr
 //
 //= OPropertyInfoService
 //
-#define DEF_INFO( ident, uinameres, helpid, flags )   \
+#define DEF_INFO( ident, uinameres, pos, helpid, flags )   \
 OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-String( PcrRes( RID_STR_##uinameres ) ), HID_PROP_##helpid, flags )
+String( PcrRes( RID_STR_##uinameres ) ), pos, HID_PROP_##helpid, 
flags )
 
-#define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
+#define DEF_INFO_1( ident, uinameres, pos, helpid, flag1 )   \
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 )
 
-#define DEF_INFO_2( ident, uinameres, helpid, flag1, flag2 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 )
+#define DEF_INFO_2( ident, uinameres, pos, helpid, flag1, flag2 )\
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | 
PROP_FLAG_##flag2 )
 
-#define DEF_INFO_3( ident, uinameres, helpid, flag1, flag2, flag3 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 
| PROP_FLAG_##flag3 )
+#define DEF_INFO_3( ident, uinameres, pos, helpid, flag1, flag2, flag3 ) \
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | 
PROP_FLAG_##flag2 | PROP_FLAG_##flag3 )
 
-#define DEF_INFO_4( ident, uinameres, helpid, flag1, flag2, flag3, flag4 ) \
-DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 
| PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
+#define DEF_INFO_4( ident, uinameres, pos, helpid, flag1, flag2, flag3, flag4 
) \
+DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 | 
PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
 
 sal_uInt16  OPropertyInfoService::s_nCount = 0;
 OPropertyInfoImpl*  OPropertyInfoService::s_pPropertyInfos = NULL;
@@ -108,239 +111,239 @@ namespace pcr
 static OPropertyInfoImpl aPropertyInfos[] =
 {
 /*
-DEF_INFO_?( propname and id,   resoure id, help id,   
flags ),
+DEF_INFO_?( propname and id,   resoure id, pos, help id,   
flags ),
 */
-DEF_INFO_3( NAME,

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

 sfx2/source/doc/templatedlg.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d125339986db266025faa344f87a89bb34a9901b
Author: Noel Power noel.po...@suse.com
Date:   Wed Jul 31 15:52:05 2013 +0100

fix for fdo#60883 ( macros disabled for documents opened from templates )

Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280
(cherry picked from commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d)
Reviewed-on: https://gerrit.libreoffice.org/5220
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 82289ba..e6d16dd 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -52,6 +52,7 @@
 #include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/FolderPicker.hpp
+#include com/sun/star/task/InteractionHandler.hpp
 
 #include doc.hrc
 #include templatedlg.hrc
@@ -740,13 +741,15 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, 
ThumbnailViewItem*, pItem)
 {
 if (!mbIsSaveMode)
 {
-uno::Sequence PropertyValue  aArgs(3);
+uno::Sequence PropertyValue  aArgs(4);
 aArgs[0].Name = AsTemplate;
 aArgs[0].Value = sal_True;
 aArgs[1].Name = MacroExecutionMode;
 aArgs[1].Value = MacroExecMode::USE_CONFIG;
 aArgs[2].Name = UpdateDocMode;
 aArgs[2].Value = UpdateDocMode::ACCORDING_TO_CONFIG;
+aArgs[3].Name = InteractionHandler;
+aArgs[3].Value = task::InteractionHandler::createWithParent( 
::comphelper::getProcessComponentContext(), 0 );
 
 TemplateViewItem *pTemplateItem = 
static_castTemplateViewItem*(pItem);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source

 sfx2/source/doc/templatedlg.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c32feb2921aec20c017c63d62269482c483f81d5
Author: Noel Power noel.po...@suse.com
Date:   Wed Jul 31 15:52:05 2013 +0100

fix for fdo#60883 ( macros disabled for documents opened from templates )

Change-Id: I5d4478176bd18a5d7a08dd4472393ea56e1ea280
(cherry picked from commit 4bc42b6d7140144f5e17528276e8ddc80c033d6d)
Reviewed-on: https://gerrit.libreoffice.org/5219
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 2db2c8b..a31c235 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -53,6 +53,7 @@
 #include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp
 #include com/sun/star/ui/dialogs/TemplateDescription.hpp
 #include com/sun/star/ui/dialogs/FolderPicker.hpp
+#include com/sun/star/task/InteractionHandler.hpp
 
 #include doc.hrc
 #include templatedlg.hrc
@@ -750,13 +751,15 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, 
ThumbnailViewItem*, pItem)
 {
 if (!mbIsSaveMode)
 {
-uno::Sequence PropertyValue  aArgs(3);
+uno::Sequence PropertyValue  aArgs(4);
 aArgs[0].Name = AsTemplate;
 aArgs[0].Value = sal_True;
 aArgs[1].Name = MacroExecutionMode;
 aArgs[1].Value = MacroExecMode::USE_CONFIG;
 aArgs[2].Name = UpdateDocMode;
 aArgs[2].Value = UpdateDocMode::ACCORDING_TO_CONFIG;
+aArgs[3].Name = InteractionHandler;
+aArgs[3].Value = task::InteractionHandler::createWithParent( 
::comphelper::getProcessComponentContext(), 0 );
 
 TemplateViewItem *pTemplateItem = 
static_castTemplateViewItem*(pItem);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - scripting/source

 scripting/source/provider/MasterScriptProvider.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cba4eda4c9ca1174d7b9f3db821fc3452b4af486
Author: Noel Power noel.po...@suse.com
Date:   Tue Jul 30 17:29:42 2013 +0100

fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VB

access to libreoffice objects ( and methods/properties of those objects )
from VB all goes through the ole automation bridge. There has been a long
standing issue where the bridge falls over trying to access methods of the
scripting framework MasterScriptProvider object.

Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb
(cherry picked from commit 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d)
Reviewed-on: https://gerrit.libreoffice.org/5207
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/scripting/source/provider/MasterScriptProvider.cxx 
b/scripting/source/provider/MasterScriptProvider.cxx
index 4362330..fb5b51b 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -700,7 +700,9 @@ MasterScriptProvider::hasByName( const ::rtl::OUString 
aName ) throw (RuntimeEx
 
 result = xCont-hasByName( aName );
 }
-else
+// If this is a document provider then we shouldn't
+// have a PackageProvider
+else if (!m_xModel.is())
 {
 throw RuntimeException( OUSTR(PackageMasterScriptProvider is 
unitialised),
 Reference XInterface () );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scripting/source

 scripting/source/provider/MasterScriptProvider.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6a3c26a46c28ca1bcc26f4cc546b9facafe7030a
Author: Noel Power noel.po...@suse.com
Date:   Tue Jul 30 17:29:42 2013 +0100

fdo#67547 fix access to methods (getScript) of MasterScriptProvider from VB

access to libreoffice objects ( and methods/properties of those objects )
from VB all goes through the ole automation bridge. There has been a long
standing issue where the bridge falls over trying to access methods of the
scripting framework MasterScriptProvider object.

Change-Id: I3b9391286e1030bef2a12d6e546a5c47a4f68edb
(cherry picked from commit 92500896a9d0ba873c06a4a2728eb5a1b9d8f68d)
Reviewed-on: https://gerrit.libreoffice.org/5206
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/scripting/source/provider/MasterScriptProvider.cxx 
b/scripting/source/provider/MasterScriptProvider.cxx
index 32c89b4..afe5957 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -696,7 +696,9 @@ MasterScriptProvider::hasByName( const OUString aName ) 
throw (RuntimeException
 
 result = xCont-hasByName( aName );
 }
-else
+// If this is a document provider then we shouldn't
+// have a PackageProvider
+else if (!m_xModel.is())
 {
 throw RuntimeException( PackageMasterScriptProvider is 
unitialised,
 Reference XInterface () );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic

2013-07-31 Thread Michael Stahl

 vcl/generic/fontmanager/fontconfig.cxx |   35 +++--
 1 file changed, 21 insertions(+), 14 deletions(-)

New commits:
commit ff8a6b661dc304cb3a858facbd0dbda66ff01641
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jul 30 16:11:54 2013 +0200

fdo#66715: fontconfig: try harder to ignore duplicate fonts

The thin space not being displayed correctly is caused by using the
wrong font, namely
/usr/share/fonts/liberation/LiberationSerif-Regular.ttf,
which (on Fedora 18) is version 1 and does not contain u2006 etc.
glyphs, whereas the LiberationSerif-Regular.ttf bundled with LO
is version 2 and does contain these.

There is already isPreviouslyDuplicateOrObsoleted() function to ignore
older fonts but it does not work for this case because:

1) Only the previous element was looked at, but there may be several
   fonts with different weight/slant that need to be checked.

2) The LiberationSerif-Regular.ttf differ in the lang entry.

Change-Id: I2f9e8d50a1f8155b65f8f07c9259dd988c32992a
(cherry picked from commit 1c48e4efa2369e5708798bdefb46b74a86415d00)
Reviewed-on: https://gerrit.libreoffice.org/5203
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index 1b36980..fb3bae2 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -209,30 +209,37 @@ namespace
 //on being sorted with SortFont
 bool isPreviouslyDuplicateOrObsoleted(FcFontSet *pFSet, int i)
 {
-if (i == 0)
-return false;
-
 const FcPattern *a = pFSet-fonts[i];
-const FcPattern *b = pFSet-fonts[i-1];
-
-if (compareFontNames(a, b) != 0)
-return false;
 
 FcPattern* pTestPatternA = FcPatternDuplicate(a);
 FcPatternDel(pTestPatternA, FC_FILE);
 FcPatternDel(pTestPatternA, FC_CHARSET);
 FcPatternDel(pTestPatternA, FC_CAPABILITY);
 FcPatternDel(pTestPatternA, FC_FONTVERSION);
+FcPatternDel(pTestPatternA, FC_LANG);
 
-FcPattern* pTestPatternB = FcPatternDuplicate(b);
-FcPatternDel(pTestPatternB, FC_FILE);
-FcPatternDel(pTestPatternB, FC_CHARSET);
-FcPatternDel(pTestPatternB, FC_CAPABILITY);
-FcPatternDel(pTestPatternB, FC_FONTVERSION);
+bool bIsDup(false);
 
-bool bIsDup = FcPatternEqual(pTestPatternA, pTestPatternB);
+// fdo#66715: loop for case of several font files for same font
+for (int j = i - 1; 0 = j  !bIsDup; --j)
+{
+const FcPattern *b = pFSet-fonts[j];
+
+if (compareFontNames(a, b) != 0)
+break;
+
+FcPattern* pTestPatternB = FcPatternDuplicate(b);
+FcPatternDel(pTestPatternB, FC_FILE);
+FcPatternDel(pTestPatternB, FC_CHARSET);
+FcPatternDel(pTestPatternB, FC_CAPABILITY);
+FcPatternDel(pTestPatternB, FC_FONTVERSION);
+FcPatternDel(pTestPatternB, FC_LANG);
+
+bIsDup = FcPatternEqual(pTestPatternA, pTestPatternB);
+
+FcPatternDestroy(pTestPatternB);
+}
 
-FcPatternDestroy(pTestPatternB);
 FcPatternDestroy(pTestPatternA);
 
 return bIsDup;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/vcl svx/uiconfig vcl/source

 include/vcl/builder.hxx  |3 +++
 include/vcl/layout.hxx   |   17 +
 svx/uiconfig/ui/findreplacedialog.ui |1 +
 vcl/source/window/builder.cxx|   22 +-
 vcl/source/window/layout.cxx |   12 
 5 files changed, 54 insertions(+), 1 deletion(-)

New commits:
commit b3abb55edd5f6c3168882239df2b4b28dc96cfab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Jul 12 11:40:27 2013 +0100

Resolves: fdo#67378 merge the label into the disclosure button

(cherry picked from commit 479bba2cdcda8dbd86861ea62c8c25bfef633148)

(cherry picked from commit 06ac689a8d3887519d98a616f9a1727fcc7d0bf6)

(cherry picked from commit 5718ffbf0e3e68e43f87541ce0368a15de8ec90e)

Change-Id: I11c9a35e3d50a827127e4542a40f6f29580d4e8b
8b65b4986bf316e352131e737ebf736d91173d16
43df94c16a178c90da9c006565390a81c2fda29b

Related: fdo#67378 rows missing HIG 6pixel spacing

Change-Id: I6d4767c3159c1e9ebef19978a94ad994aab6ff4b
(cherry picked from commit c2ce9bf0c2bfd2b38262de8571257c8f02b076b4)
Reviewed-on: https://gerrit.libreoffice.org/5202
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index d699d50..508377d 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -31,6 +31,7 @@ class PopupMenu;
 class ScrollBar;
 class DateField;
 class TimeField;
+class VclExpander;
 class VclMultiLineEdit;
 
 class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable
@@ -209,6 +210,8 @@ private:
 AtkMap m_aAtkInfo;
 
 std::vectorMnemonicWidgetMap m_aMnemonicWidgetMaps;
+
+std::vectorVclExpander* m_aExpanderWidgets;
 };
 
 void loadTranslations(const com::sun::star::lang::Locale rLocale, const 
OUString rUri);
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index dd2c0bc..978eaca 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -517,6 +517,23 @@ public:
 virtual Window *get_child();
 virtual const Window *get_child() const;
 virtual bool set_property(const OString rKey, const OString rValue);
+bool get_expanded() const
+{
+return m_aDisclosureButton.IsChecked();
+}
+void set_expanded(bool bExpanded)
+{
+m_aDisclosureButton.Check(bExpanded);
+}
+void set_label(const OUString rLabel)
+{
+m_aDisclosureButton.SetText(rLabel);
+}
+OUString get_label() const
+{
+return m_aDisclosureButton.GetText();
+}
+virtual void StateChanged(StateChangedType nType);
 protected:
 virtual Size calculateRequisition() const;
 virtual void setAllocation(const Size rAllocation);
diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index 1fef7c6..aec160e 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -496,6 +496,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
+property name=row_spacing6/property
 child
   object class=GtkCheckButton id=matchcase
 property name=label translatable=yesMa_tch 
case/property
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9793b86..7e5282c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -401,6 +401,22 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, 
OUString sUIFile, OStri
 delete_by_window(aI-first);
 }
 
+//fdo#67378 merge the label into the disclosure button
+for (std::vectorVclExpander*::iterator aI = 
m_pParserState-m_aExpanderWidgets.begin(),
+aEnd = m_pParserState-m_aExpanderWidgets.end(); aI != aEnd; ++aI)
+{
+VclExpander *pOne = *aI;
+
+Window *pChild = pOne-get_child();
+Window* pLabel = pOne-GetWindow(WINDOW_LASTCHILD);
+if (pLabel  pLabel != pChild  pLabel-GetType() == 
WINDOW_FIXEDTEXT)
+{
+FixedText *pLabelWidget = static_castFixedText*(pLabel);
+pOne-set_label(pLabelWidget-GetText());
+delete_by_window(pLabel);
+}
+}
+
 //drop maps, etc. that we don't need again
 delete m_pParserState;
 
@@ -1003,7 +1019,11 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 else if (name == GtkFrame)
 pWindow = new VclFrame(pParent);
 else if (name == GtkExpander)
-pWindow = new VclExpander(pParent);
+{
+VclExpander *pExpander = new VclExpander(pParent);
+m_pParserState-m_aExpanderWidgets.push_back(pExpander);
+pWindow = pExpander;
+}
 else if (name == GtkAlignment)
 pWindow = new VclAlignment(pParent);

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

 connectivity/source/drivers/dbase/DDatabaseMetaData.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea4003de2ea92424c60ef2aaa9c5ff260b804852
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Wed Jul 31 10:24:20 2013 +0200

Reserve correct size (dbase).

19 values are inserted (but misleadingly only 1-18 are used).

Change-Id: Iae76c16494e8a9a1c1057b0993679ef828254b8f
Reviewed-on: https://gerrit.libreoffice.org/5210
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx 
b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 15b683e..bc2e3da 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -66,7 +66,7 @@ Reference XResultSet  
ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 if(aRows.empty())
 {
 ODatabaseMetaDataResultSet::ORow aRow;
-aRow.reserve(18);
+aRow.reserve(19);
 
 aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
 aRow.push_back(new ORowSetValueDecorator(OUString(VARCHAR)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice-l10n] Invalid Entry in Po Files

2013-07-31 Thread Tadele Assefa

Dear Yaron,

Well I have gettext and in fact I have tried the command you gave me on all
offending files. I have also opened 2 of the files in poedit, and found no
error. The first file which comes as having invalid entry (during build)
is [1]. I opened that file and compared it to a Hungarian translation using
Meld Diff Viewer.  The difference I spotted appeared at the bottom of the
files with many more comments in my file than the Hungarian one. Can that
be a cause?

[1]
https://translations.documentfoundation.org/export/libo_ui/sid/vcl/source/src.po


On Wed, Jul 31, 2013 at 5:57 PM, Yaron Shahrabani sh.ya...@gmail.comwrote:

 Dear Tadele!
 Try using Poedit (Any version above 1.5 is fine).

 This tool shows the misbehaving strings in red on top of the list after
 you save.
 This way you can look at the strings that Virtaal will simply ignore upon
 saving (Sorry Friedel ☺).

 Another great tool I would suggest you to use (mainly in Ubuntu) is
 msgfmt.
 After you edit the file just go to the command line and type msgfmt -vco
 /dev/null /path/to/your/file.sid.po (replace the last part with the actual
 file location).

 If you don't have the msgfmt tool you'll have to install gettext using the
 following command:
 sudo apt-get install gettext
 You will be asked for your password and then the tool will be installed so
 you can use it.

 Anyways I'm so glad to see this translation completing so fast.
 Good job!

 Yaron Shahrabani

 Hebrew translator



 On Wed, Jul 31, 2013 at 5:43 PM, Tadele Assefa milky...@gmail.com wrote:

 Dear Yaron,

 I am still struggling with the 'invalid entry' message during LO build.
 The followings are things I have done since you advised me last time:

 1) corrected all 'critical errors' suggested
 2) Tried to build and failed
 3) Uploaded all files to Pootle, corrected all errors suggested by pootle
 downloaded the translations and tried to build, not OK
 4) Pulled the latest source code from git, switched to master and tried
 to build, not OK

 I did this on both Win and Ubuntu with same result. When I open the files
 in Virtaal I cannot see any problem. What shall I do?

 Regards,


 On Sun, Jul 28, 2013 at 11:11 AM, Yaron Shahrabani sh.ya...@gmail.comwrote:

 I attached 2 files.

 msgfmtlog.txt - Displays all errors, even the non critical one (these
 can be fixed with recursive regex operation).

 msgfmtcrit.txt - Displays only the critical errors (grep -v did the job).

 The commands I used:
 # recursively find all po files and send then to msgfmt for inspection
 find . -name *.po -exec msgfmt -vco /dev/null {} \;  msgfmtlog.txt
 # filter out all the non critical messages (usefull only in this case)
 and put them in a file
 cat msgfmtlog.txt | grep -v 'initial\|translated'  msgfmtcrit.txt


 Kind regards,

 Yaron Shahrabani

 Hebrew translator



 On Sat, Jul 27, 2013 at 6:10 PM, Zolnai Tamás zolnaitamas2...@gmail.com
  wrote:

 Yes, gettext may help, to find the problem, but the contains invalid
 entry message come from LO specific po checks. The LO used po has some
 additional requirements to meet. If you use Pootle, than this problem don't
 come up, but If you intend to use Find and Replace in a text editor than
 you have to be sure that this replacing touch only the lines started with
 msgstr and not others.

 Best regards,
 Tamás

 2013/7/27 Yaron Shahrabani sh.ya...@gmail.com

 It's fairly simple, assuming you have the gettext tools installed, if
 not just send me the file and I'll scan it for you.

 With gettext the command would be: msgfmt -vco /dev/null base.po (in
 the same dir of course)

 Yaron Shahrabani

 Hebrew translator



 On Sat, Jul 27, 2013 at 11:37 AM, Tadele Assefa milky...@gmail.comwrote:

 Dear All,

 After we did a 100%, we decided to change some of owr strings to a
  new
 terminology. As a result I did a Find and Replace in All Files using
 Sublime Text 2 to change the terms.

 After this I started building entire LO,(libreoffice-4-1 branch), but
 it
 failed to include the new terms saying invalid entry like
 git/libowin/translations/source/sid/scp2/source/base.po contains
 invalid
 entry.


 What mistake did I do? How may i resolve this?
 --
 Regards,*
 ___
 Tadele Assefa***

 --
 To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org
 Problems?
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more:
 http://wiki.documentfoundation.org/Netiquette
 List archive: http://listarchives.libreoffice.org/global/l10n/
 All messages sent to this list will be publicly archived and cannot
 be deleted



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






 --
 Regards,*
 ___
 Tadele Assefa
 Managing Director*
 *

 Cell: +25-911-84-13-84*
 *Think Green – Please do not print this email unless you really need to*





-- 
Regards,*

[PATCH] update help ids for footnotes endnotes tab page .ui conversi...

2013-07-31 Thread via Code Review

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5222

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/22/5222/1

update help ids for footnotes endnotes tab page .ui conversion

Change-Id: Ia4a156a966172f388d0f7cc08521ef5a53ebde14
---
M helpers/help_hid.lst
M source/text/swriter/01/05040700.xhp
2 files changed, 28 insertions(+), 42 deletions(-)



diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 4ea244f..769184f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7701,12 +7701,6 @@
 sw_CheckBox_TP_OPTSHDWCRSR_CB_SHYPH,878806025,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_SPACE,878806023,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_TAB,878806022,
-sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_AT_TXTEND,879248387,
-sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM,879248388,
-sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_END_NUM_FMT,879248396,
-sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_AT_TXTEND,879248390,
-sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_NUM,879248391,
-sw_CheckBox_TP_SECTION_FTNENDNOTES_CB_FTN_NUM_FMT,879248395,
 sw_CheckBox_TP_TABLE_COLUMN_CB_MOD_TBL,888489082,
 sw_CheckBox_TP_TABLE_COLUMN_CB_PROP,888489083,
 sw_CheckBox_TP_TABLE_TEXTFLOW_CB_HEADLINE,878511144,
@@ -7812,10 +7806,6 @@
 sw_Edit_TP_PRIVATE_DATA_ED_TITLE,879216684,
 sw_Edit_TP_PRIVATE_DATA_ED_WWW,879216691,
 sw_Edit_TP_PRIVATE_DATA_ED_ZIP,879216678,
-sw_Edit_TP_SECTION_FTNENDNOTES_ED_END_PREFIX,879249422,
-sw_Edit_TP_SECTION_FTNENDNOTES_ED_END_SUFFIX,879249423,
-sw_Edit_TP_SECTION_FTNENDNOTES_ED_FTN_PREFIX,879249425,
-sw_Edit_TP_SECTION_FTNENDNOTES_ED_FTN_SUFFIX,879249426,
 sw_Edit_TP_TOX_SELECT_ED_TITLE,879134735,
 sw_FI_PREVIEW_DLG_MM_GREETINGS_PAGE,898252800,
 sw_FT_BODY_DLG_MM_MAILBODY,1435402240,
@@ -7929,8 +7919,6 @@
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671,
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680,
 sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260,
-sw_ListBox_TP_SECTION_FTNENDNOTES_LB_END_NUMVIEW,879250980,
-sw_ListBox_TP_SECTION_FTNENDNOTES_LB_FTN_NUMVIEW,879250981,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_TEXTORIENTATION,878513708,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_VERTORIENT,878513815,
@@ -8037,8 +8025,6 @@
 sw_NumericField_TP_LINENUMBERING_NF_NUM_INVERVAL,878893067,
 sw_NumericField_TP_NUMPARA_NF_NEW_START,878860294,
 sw_NumericField_TP_NUMPARA_NF_RESTART_PARA,878860299,
-sw_NumericField_TP_SECTION_FTNENDNOTES_FLD_END_OFFSET,879253527,
-sw_NumericField_TP_SECTION_FTNENDNOTES_FLD_FTN_OFFSET,879253528,
 sw_NumericField_TP_TABLE_TEXTFLOW_NF_PAGENUM,878516363,
 sw_NumericField_TP_TABLE_TEXTFLOW_NF_REPEAT_HEADER,878516264,
 sw_NumericField_TP_TOX_ENTRY_NF_LEVEL_OL,879155353,
diff --git a/source/text/swriter/01/05040700.xhp 
b/source/text/swriter/01/05040700.xhp
index 6ebf929..8ded371 100644
--- a/source/text/swriter/01/05040700.xhp
+++ b/source/text/swriter/01/05040700.xhp
@@ -41,35 +41,35 @@
 /section
   paragraph xml-lang=en-US role=note id=par_id3149800 l10n=U 
oldref=3This tab is not available in link 
href=text/swriter/01/0313.xhp name=Print LayoutPrint Layout/link 
view./paragraph
   paragraph role=heading level=2 id=hd_id3153538 l10n=U 
xml-lang=en-US oldref=4Footnotes/paragraph
-  bookmark branch=hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND 
xml-lang=en-US id=bm_id3154572 localize=false/paragraph role=heading 
level=3 id=hd_id3154480 l10n=U xml-lang=en-US oldref=5Collect at end 
of text/paragraph
-  paragraph l10n=U role=paragraph id=par_id3151309 xml-lang=en-US 
oldref=11ahelp hid=SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND 
visibility=visibleAdds footnotes at the end of the section. If the section 
spans more than one page, the footnotes are added to the bottom of the page on 
which the footnote anchors appear./ahelp/paragraph
-  bookmark branch=hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM 
xml-lang=en-US id=bm_id3153671 localize=false/paragraph role=heading 
level=3 id=hd_id3152960 l10n=U xml-lang=en-US oldref=6Restart 
numbering/paragraph
-  paragraph l10n=U role=paragraph id=par_id3153677 xml-lang=en-US 
oldref=12ahelp hid=SW:CHECKBOX:TP_SECTION_FTNENDNOTES:CB_FTN_NUM 
visibility=visibleRestarts the footnote numbering at the number that you 
specify./ahelp/paragraph
-  bookmark branch=hid/sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET 
xml-lang=en-US id=bm_id3154190 localize=false/paragraph role=heading 
level=3 id=hd_id3149688 l10n=U xml-lang=en-US oldref=13Start 
at/paragraph
-  paragraph l10n=U role=paragraph id=par_id3154196 xml-lang=en-US 
oldref=14ahelp hid=SW:NUMERICFIELD:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET 
visibility=visibleEnter the number that you want to assign the 
footnote./ahelp/paragraph
-  bookmark branch=hid/sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT 
xml-lang=en-US id=bm_id3143277 localize=false/paragraph role=heading 
level=3 id=hd_id3155185 l10n=U xml-lang=en-US oldref=15Custom 
format/paragraph
-  paragraph

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

2013-07-31 Thread Adam Co

 sw/qa/extras/ooxmlexport/data/fdo67013.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   53 ++-
 sw/source/filter/ww8/docxattributeoutput.cxx |3 +
 sw/source/filter/ww8/docxattributeoutput.hxx |6 +++
 sw/source/filter/ww8/docxexport.cxx  |6 +++
 5 files changed, 59 insertions(+), 9 deletions(-)

New commits:
commit a4b4bde0a28b06f150ec80a65e322491a547f803
Author: Adam Co rattles2...@gmail.com
Date:   Mon Jul 29 19:37:33 2013 +0300

fdo#67013 : fix for borders in headers and footers

Change-Id: I45d71348a64b8e79c34e24829cceadedd0d8f6a9
Reviewed-on: https://gerrit.libreoffice.org/5170
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/qa/extras/ooxmlexport/data/fdo67013.docx 
b/sw/qa/extras/ooxmlexport/data/fdo67013.docx
new file mode 100644
index 000..5512550
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo67013.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f4932ff..0b4003e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -105,6 +105,7 @@ public:
 void testFdo60990();
 void testFdo65718();
 void testFdo64350();
+void testFdo67013();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -186,6 +187,7 @@ void Test::run()
 {fdo60990.odt, Test::testFdo60990},
 {fdo65718.docx, Test::testFdo65718},
 {fdo64350.docx, Test::testFdo64350},
+{fdo67013.docx, Test::testFdo67013},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -998,14 +1000,12 @@ void Test::testFdo66929()
 
 void Test::testPageBorderSpacingExportCase2()
 {
-/*
- * The problem was that the exporter didn't mirror the workaround of the
- * importer, regarding the page border's spacing : the w:pgBorders 
w:offsetFrom=page
- * and the inner nodes like w:top w:space=24  /
- *
- * The exporter ALWAYS exported 'w:offsetFrom=text' even when the 
spacing values where too large
- * for Word to handle (larger than 31 points)
- */
+ // The problem was that the exporter didn't mirror the workaround of the
+ // importer, regarding the page border's spacing : the w:pgBorders 
w:offsetFrom=page
+ // and the inner nodes like w:top w:space=24  /
+ //
+ // The exporter ALWAYS exported 'w:offsetFrom=text' even when the 
spacing values where too large
+ // for Word to handle (larger than 31 points)
 
 xmlDocPtr pXmlDoc = parseExport();
 
@@ -1097,6 +1097,43 @@ void Test::testFdo64350()
 CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, aShadow.Location);
 }
 
+void Test::testFdo67013()
+{
+/*
+ * The problem was that borders inside headers \ footers were not exported
+ * This was checked in xray using these commands:
+ *
+ * xHeaderText = 
ThisComponent.getStyleFamilies().getByName(PageStyles).getByName(Standard).HeaderText
+ * xHeaderEnum = xHeaderText.createEnumeration()
+ * xHeaderFirstParagraph = xHeaderEnum.nextElement()
+ * xHeaderBottomBorder = xHeaderFirstParagraph.BottomBorder
+ *
+ * xFooterText = 
ThisComponent.getStyleFamilies().getByName(PageStyles).getByName(Standard).FooterText
+ * xFooterEnum = xFooterText.createEnumeration()
+ * xFooterFirstParagraph = xFooterEnum.nextElement()
+ * xFooterTopBorder = xFooterFirstParagraph.TopBorder
+ */
+uno::Referencetext::XText xHeaderText = getProperty 
uno::Referencetext::XText 
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), HeaderText);
+uno::Reference text::XTextRange  xHeaderParagraph = getParagraphOfText( 
1, xHeaderText );
+table::BorderLine2 aHeaderBottomBorder = 
getPropertytable::BorderLine2(xHeaderParagraph, BottomBorder);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aHeaderBottomBorder.Color);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(106), aHeaderBottomBorder.InnerLineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(26), aHeaderBottomBorder.LineDistance);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(7), aHeaderBottomBorder.LineStyle);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(159), aHeaderBottomBorder.LineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(26), aHeaderBottomBorder.OuterLineWidth);
+
+uno::Referencetext::XText xFooterText = getProperty 
uno::Referencetext::XText 
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), FooterText);
+uno::Reference text::XTextRange  xFooterParagraph = getParagraphOfText( 
1, xFooterText );
+table::BorderLine2 aFooterTopBorder = 
getPropertytable::BorderLine2(xFooterParagraph, TopBorder);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aFooterTopBorder.Color);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(26), aFooterTopBorder.InnerLineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(26),

[Libreoffice-commits] core.git: sal/osl

2013-07-31 Thread Mark Wielaard

 sal/osl/unx/file_url.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 431d894f3e04a2fa0addc495587d0080b65c0e36
Author: Mark Wielaard m...@klomp.org
Date:   Tue Jul 30 23:46:10 2013 +0200

Fix memory leak in osl_getSystemPathFromFileURL.

rtl_uStrings should never be directly assigned. That might mess up
reference counting. osl_getSystemPathFromFileURL can be called with
pustrSystemPath pointing to a non-empty rtl_uStrings. A special case
being when the ustrFileURL input and the pustrSystemPath output point
to the same rtl_uString instance. So use rtl_uString_assign.

Change-Id: I48e17817cba905a4a6d4bc303d072d62941b0d9c
Reviewed-on: https://gerrit.libreoffice.org/5209
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 304f8b4..6026660 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -283,7 +283,8 @@ oslFileError SAL_CALL osl_getSystemPathFromFileURL( 
rtl_uString *ustrFileURL, rt
 OSL_ASSERT( !findWrongUsage( pTmp-buffer, pTmp-length ) );
 */
 
-*pustrSystemPath = pTmp;
+rtl_uString_assign ( pustrSystemPath, pTmp );
+rtl_uString_release ( pTmp );
 return osl_File_E_None;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/inc/SwStyleNameMapper.hxx |   10 
 sw/source/core/doc/SwStyleNameMapper.cxx |  388 +++
 2 files changed, 146 insertions(+), 252 deletions(-)

New commits:
commit 85992e23e734dd728919b72bfa0632c1bf940c28
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Jul 28 20:28:15 2013 +0200

Reduce scope, simplify and reuse code

Change-Id: I94a5df5f947d51fe52f2fd2c9f02dc8558687b0a
Reviewed-on: https://gerrit.libreoffice.org/5190
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 9ad540f..1c3d512 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -121,19 +121,9 @@ protected:
 *pFrameProgMap,
 *pNumRuleProgMap;
 
-static boost::ptr_vectorString* NewUINameArray( 
boost::ptr_vectorString*,
-  sal_uInt16 nStt,
-  sal_uInt16 nEnd );
-
-static boost::ptr_vectorString* NewProgNameArray( 
boost::ptr_vectorString*,
-  const SwTableEntry *pTable,
-  sal_uInt8 nCount);
-
 static void fillNameFromId ( sal_uInt16 nId, String rName, bool bProgName 
);
 static const String getNameFromId ( sal_uInt16 nId, const String rName, 
bool bProgName );
 static const NameToIdHash getHashTable ( SwGetPoolIdFromName, bool 
bProgName );
-static bool SuffixIsUser ( const String  rString );
-static void CheckSuffixAndDelete ( String  rString );
 
 public:
 // This gets the UI Name from the programmatic name
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx 
b/sw/source/core/doc/SwStyleNameMapper.cxx
index f19d04b..486094b 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -71,6 +71,9 @@ struct SwTableEntry
 const sal_Char *pChar;
 };
 
+namespace
+{
+
 #define ENTRY( s ) { sizeof (s)-1, s }
 
 // Hard coded Programmatic Name tables
@@ -305,7 +308,58 @@ const struct SwTableEntry NumRuleProgNameTable [] =
 };
 #undef ENTRY
 
-bool SwStyleNameMapper::SuffixIsUser ( const String  rString )
+boost::ptr_vectorString* lcl_NewUINameArray( sal_uInt16 nStt, sal_uInt16 
nEnd )
+{
+boost::ptr_vectorString* pNameArray = new boost::ptr_vectorString;
+pNameArray-reserve(nEnd - nStt);
+while( nStt  nEnd )
+{
+const ResId rRId( nStt, *pSwResMgr );
+pNameArray-push_back(new String(rRId));
+++nStt;
+}
+return pNameArray;
+}
+
+boost::ptr_vectorString* lcl_NewProgNameArray( const SwTableEntry *pTable, 
sal_uInt8 nCount )
+{
+boost::ptr_vectorString* pProgNameArray = new boost::ptr_vectorString;
+pProgNameArray-reserve(nCount);
+while (pTable-nLength)
+{
+pProgNameArray-push_back(new String( pTable-pChar, pTable-nLength, 
RTL_TEXTENCODING_ASCII_US ));
+pTable++;
+}
+return pProgNameArray;
+}
+
+String lcl_GetSpecialExtraName( const String rExtraName, const bool bIsUIName 
)
+{
+const boost::ptr_vectorString rExtraArr = bIsUIName
+? SwStyleNameMapper::GetExtraUINameArray()
+: SwStyleNameMapper::GetExtraProgNameArray();
+static const sal_uInt16 nIds[] =
+{
+RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN,
+RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN,
+RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN,
+RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN,
+0
+};
+const sal_uInt16 * pIds;
+for ( pIds = nIds; *pIds; ++pIds)
+{
+if (rExtraName == rExtraArr[ *pIds ])
+{
+return bIsUIName
+? SwStyleNameMapper::GetExtraProgNameArray()[*pIds]
+: SwStyleNameMapper::GetExtraUINameArray()[*pIds];
+}
+}
+return rExtraName;
+}
+
+bool lcl_SuffixIsUser ( const String  rString )
 {
 const sal_Unicode *pChar = rString.GetBuffer();
 sal_Int32 nLen = rString.Len();
@@ -321,22 +375,17 @@ bool SwStyleNameMapper::SuffixIsUser ( const String  
rString )
 bRet = true;
 return bRet;
 }
-void SwStyleNameMapper::CheckSuffixAndDelete ( String  rString )
+
+void lcl_CheckSuffixAndDelete ( String  rString )
 {
-const sal_Unicode *pChar = rString.GetBuffer();
-xub_StrLen nLen = rString.Len();
-if (nLen  8 
-pChar[nLen-7] == ' ' 
-pChar[nLen-6] == '(' 
-pChar[nLen-5] == 'u' 
-pChar[nLen-4] == 's' 
-pChar[nLen-3] == 'e' 
-pChar[nLen-2] == 'r' 
-pChar[nLen-1] == ')')
+if (lcl_SuffixIsUser(rString))
 {
-rString.Erase ( nLen - 7, 7 );
+rString.Erase ( rString.Len() - 7, 7 );
 }
 }
+
+}
+
 const NameToIdHash  SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName 
eFlags, bool bProgName )
 {

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 56209, which changed state.

Bug 56209 Summary: FILEOPEN: opening a .ods file saved in Excel damages all 
formula
https://bugs.freedesktop.org/show_bug.cgi?id=56209

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|NOTOURBUG   |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx  |   33 -
 connectivity/source/drivers/firebird/ResultSetMetaData.cxx |4 +
 connectivity/source/drivers/firebird/Util.cxx  |6 ++
 connectivity/source/drivers/firebird/Util.hxx  |8 +++
 4 files changed, 39 insertions(+), 12 deletions(-)

New commits:
commit fe010c7c1905f76e2c1dcddfa3bf8b4bc70b858a
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Wed Jul 31 17:31:00 2013 +0200

Use correct MetaDataResultSetType (firebird-sdbc).

Change-Id: I9f501dc9e578c9d7bd997072345578bdc860f6a6

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 452f72d..580fa23 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1012,7 +1012,8 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getColumnPrivileges(
  Table:   sTable
 ColumnNamePattern:   sColumnNamePattern);
 
-ODatabaseMetaDataResultSet* pResultSet = new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
+ODatabaseMetaDataResultSet* pResultSet = new
+
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eColumnPrivileges);
 uno::Reference XResultSet  xResultSet = pResultSet;
 uno::Reference XStatement  statement = m_pConnection-createStatement();
 
@@ -1297,7 +1298,8 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getColumns(
 
 aResults.push_back(aCurrentRow);
 }
-ODatabaseMetaDataResultSet* pResultSet = new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
+ODatabaseMetaDataResultSet* pResultSet = new
+ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eColumns);
 uno::Reference XResultSet  xResultSet = pResultSet;
 pResultSet-setRows( aResults );
 
@@ -1318,7 +1320,8 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTables(
 SAL_INFO(connectivity.firebird, getTables() with 
  TableNamePattern:   tableNamePattern);
 
-ODatabaseMetaDataResultSet* pResultSet = new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
+ODatabaseMetaDataResultSet* pResultSet = new
+ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
 uno::Reference XResultSet  xResultSet = pResultSet;
 uno::Reference XStatement  statement = m_pConnection-createStatement();
 
@@ -1510,7 +1513,8 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getPrimaryKeys(
 
 aResults.push_back(aCurrentRow);
 }
-ODatabaseMetaDataResultSet* pResultSet = new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
+ODatabaseMetaDataResultSet* pResultSet = new
+
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::ePrimaryKeys);
 uno::Reference XResultSet  xResultSet = pResultSet;
 pResultSet-setRows( aResults );
 
@@ -1553,7 +1557,8 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getTablePrivileges(
 SAL_INFO(connectivity.firebird, getTablePrivileges() with 
  TableNamePattern:   sTableNamePattern);
 
-ODatabaseMetaDataResultSet* pResultSet = new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
+ODatabaseMetaDataResultSet* pResultSet = new
+
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges);
 uno::Reference XResultSet  xResultSet = pResultSet;
 uno::Reference XStatement  statement = m_pConnection-createStatement();
 
commit 43095140eb162dad953919facc636a19c24c8cc0
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Wed Jul 31 17:22:43 2013 +0200

Cut identifier to correct length (firebird-sdbc).

Currently firebird returns table and column identifiers as being
93 chars long (rather than 31 as per spec), this leads to problems
with ALTER and DROP commands which are unable to deal with the incorrect
length. For now we simply discard the extra characters (which are
blank characters).

(SELECT and similar commands have been able to deal with the overlength
identifiers previously, which is why this hack wasn't required
beforehand.)

Change-Id: Ib6c984b5fc72dc4e326b3f8d36f6cbc4a3c9086a

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 943bb82..452f72d 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1067,11 +1067,13 @@ uno::Reference XResultSet  SAL_CALL 
ODatabaseMetaData::getColumnPrivileges(
 // 3. TABLE_NAME
 {
 OUString sTableName = xRow-getString(1);
+sanitizeIdentifier(sTableName);
 aCurrentRow.push_back(new ORowSetValueDecorator(sTableName));
 }
 // 3. COLUMN_NAME

Re: [libreoffice-l10n] Invalid Entry in Po Files

2013-07-31 Thread Zolnai Tamás

2013/7/31 Andras Timar tima...@gmail.com

 Hi Tadele,

 On Wed, Jul 31, 2013 at 5:44 PM, Tadele Assefa milky...@gmail.com wrote:
  Meld Diff Viewer.  The difference I spotted appeared at the bottom of the
  files with many more comments in my file than the Hungarian one. Can that
  be a cause?
 

 Yes, it is the cause. Remove those obsolete entries from the end of
 the file. As far as I remember, Tamas Zolnai fixed this misbehaviour
 in po parser in master and libreoffice-4-1. I guess you are compiling
 LibreOffice 4.0.x


Yes, I did and so comments at the end of the files doesn't make the parser
to skip strings, but warnings are still alive. It can be helpful to avoid
useless lines from git repository. So these warnings can appear in 4.1 too,
but strings are merged, as long as there are no other problem.
However as I see this is not true.

For example:
msgid There are no pages to be printed. Please check your document for
ranges relevant to printing.
msgstr 
Attamantanno qoolla dino. Eeggatena bortajekki attamote hakkigeeshsha
buuxi.

If the translation doesn't include end line than it have to stand directly
behind msgstr, like this:
msgstr Attamantanno qoolla dino. Eeggatena bortajekki attamote
hakkigeeshsha buuxi.

Other example (with the same problem):
msgid Click '%OK' to start %PRODUCTNAME %PRODUCTVERSION without
accessibility support, or click '%CANCEL' to exit %PRODUCTNAME
%PRODUCTVERSION.
msgstr 
Click '%OK' to start %PRODUCTNAME %PRODUCTVERSION without accessibility 
support, or click '%CANCEL' to exit %PRODUCTNAME %PRODUCTVERSION.

Andras, as I remember you said, you use msgcat to get this kind of result.
That's why LO po parser works this kind of po files.

Best regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 framework/source/uielement/menubarmanager.cxx |6 
 include/vcl/menu.hxx  |   28 ++--
 include/vcl/outdev.hxx|4 
 svtools/source/uno/contextmenuhelper.cxx  |2 
 vcl/source/gdi/outdev3.cxx|   24 +--
 vcl/source/gdi/pdfwriter_impl.cxx |2 
 vcl/source/window/menu.cxx|  159 +-
 7 files changed, 115 insertions(+), 110 deletions(-)

New commits:
commit f89637e329e765bce0bd513c843e4e2b673c38fd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 13:01:36 2013 -0400

Revert convert vcl/menu.hxx from XubString to OUString

This reverts commit 43b1ac3651732a1ceb193268ab72b4aaa90dee65.

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 23baa74..7f7f69a 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -845,7 +845,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
 {
 sal_uInt16 nItemId = pMenu-GetItemId( nPos );
 if (( pMenu-GetItemType( nPos ) != MENUITEM_SEPARATOR ) 
-( pMenu-GetItemText( nItemId ).isEmpty() ))
+( pMenu-GetItemText( nItemId ).Len() == 0 ))
 {
 String aCommand = pMenu-GetItemCommand( nItemId );
 if ( aCommand.Len()  0 ) {
@@ -1252,7 +1252,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference XFrame  rF
 }
 
 if (( pMenu-IsMenuBar() || bAccessibilityEnabled ) 
-( pMenu-GetItemText( nItemId ).isEmpty() ))
+( pMenu-GetItemText( nItemId ).Len() == 0 ))
 {
 if ( !aItemCommand.isEmpty() )
 pMenu-SetItemText( nItemId, RetrieveLabelFromCommand( 
aItemCommand ));
@@ -1272,7 +1272,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference XFrame  rF
 {
 // Retrieve module identifier from Help Command entry
 OUString aModuleIdentifier( rModuleIdentifier );
-if ( !pMenu-GetHelpCommand( nItemId ).isEmpty() )
+if ( pMenu-GetHelpCommand( nItemId ).Len()  0 )
 {
 aModuleIdentifier = pMenu-GetHelpCommand( nItemId );
 pMenu-SetHelpCommand( nItemId, aEmpty );
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 8328166..f05ee5d 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -164,7 +164,7 @@ protected:
 SAL_DLLPRIVATE void ImplFillLayoutData() const;
 SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; }
 SAL_DLLPRIVATE void ImplSetSalMenu( SalMenu *pMenu );
-SAL_DLLPRIVATE const OUString  ImplGetHelpText( sal_uInt16 nItemId ) 
const;
+SAL_DLLPRIVATE const XubString ImplGetHelpText( sal_uInt16 nItemId ) 
const;
 
 // returns native check and option menu symbol height in rCheckHeight and 
rRadioHeight
 // return value is maximum width and height of checkboxes and radiobuttons
@@ -194,7 +194,7 @@ public:
 virtual voidSelect();
 virtual voidRequestHelp( const HelpEvent rHEvt );
 
-voidInsertItem( sal_uInt16 nItemId, const OUString rStr,
+voidInsertItem( sal_uInt16 nItemId, const XubString rStr,
 MenuItemBits nItemBits = 0,
 const OString rIdent = OString(),
 sal_uInt16 nPos = MENU_APPEND );
@@ -203,7 +203,7 @@ public:
 const OString rIdent = OString(),
 sal_uInt16 nPos = MENU_APPEND );
 voidInsertItem( sal_uInt16 nItemId,
-const OUString rString, const Image 
rImage,
+const XubString rString, const Image 
rImage,
 MenuItemBits nItemBits = 0,
 const OString rIdent = OString(),
 sal_uInt16 nPos = MENU_APPEND );
@@ -267,8 +267,8 @@ public:
 voidRemoveDisabledEntries( sal_Bool bCheckPopups = 
sal_True, sal_Bool bRemoveEmptyPopups = sal_False );
 sal_BoolHasValidEntries( sal_Bool bCheckPopups = sal_True );
 
-voidSetItemText( sal_uInt16 nItemId, const OUString rStr 
);
-OUStringGetItemText( sal_uInt16 nItemId ) const;
+voidSetItemText( sal_uInt16 nItemId, const XubString rStr 
);
+XubString   GetItemText( sal_uInt16 nItemId ) const;
 
 voidSetItemImage( sal_uInt16 nItemId, const Image rImage 
);
 Image   GetItemImage( sal_uInt16 nItemId ) const;
@@ -280,14 +280,14 @@ public:
 voidSetItemCommand( sal_uInt16 nItemId, const OUString

[Libreoffice-commits] buildbot.git: 4 commits - .gitignore tb3/dist-packages tb3/replay-branch tb3/tb3 tb3/tb3-local-client tb3/tests

2013-07-31 Thread Bjoern Michaelsen

 .gitignore |1 +
 tb3/dist-packages/tb3/__init__.py  |2 +-
 tb3/dist-packages/tb3/repostate.py |6 +++---
 tb3/dist-packages/tb3/scheduler.py |8 
 tb3/replay-branch  |2 +-
 tb3/tb3|   20 ++--
 tb3/tb3-local-client   |   12 ++--
 tb3/tests/helpers.py   |2 +-
 tb3/tests/tb3-cli.py   |2 +-
 tb3/tests/tb3-local-client.py  |2 +-
 tb3/tests/tb3/repostate.py |6 +++---
 tb3/tests/tb3/scheduler.py |6 +++---
 12 files changed, 35 insertions(+), 34 deletions(-)

New commits:
commit c88440b1e1c6113f957fd063f0361b6986163698
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jul 31 03:23:06 2013 +0200

add python bytecode to gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..04a41a2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**.pyc
commit d5c46e6da56bf3c68d3e7650beff522b8996ad25
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jul 31 03:21:48 2013 +0200

python2 - python3 transition

diff --git a/tb3/dist-packages/tb3/__init__.py 
b/tb3/dist-packages/tb3/__init__.py
index c7a73e3..56b7d5a 100644
--- a/tb3/dist-packages/tb3/__init__.py
+++ b/tb3/dist-packages/tb3/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/tb3/dist-packages/tb3/repostate.py 
b/tb3/dist-packages/tb3/repostate.py
index 6963da5..fc5a1fe 100644
--- a/tb3/dist-packages/tb3/repostate.py
+++ b/tb3/dist-packages/tb3/repostate.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # This file is part of the LibreOffice project.
 #
@@ -22,7 +22,7 @@ class StateEncoder(json.JSONEncoder):
 class StateDecoder(json.JSONDecoder):
 def decode(self, s):
 obj = super(StateDecoder, self).decode(s)
-for (key, value) in obj.iteritems():
+for (key, value) in obj.items():
 if isinstance(value, list):
 if value[0] == '__datetime__':
 obj[key] = datetime.datetime.utcfromtimestamp(value[1])
diff --git a/tb3/dist-packages/tb3/scheduler.py 
b/tb3/dist-packages/tb3/scheduler.py
index 8e9beb1..0f85b4b 100644
--- a/tb3/dist-packages/tb3/scheduler.py
+++ b/tb3/dist-packages/tb3/scheduler.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This file is part of the LibreOffice project.
 #
@@ -18,8 +18,8 @@ class Proposal:
 (self.score, self.commit, self.scheduler, self.platform, self.repo, 
self.branch) = (score, commit, scheduler, platform, repo, branch)
 def __repr__(self):
 return 'Proposal(%f, %s, %s, %s, %s, %s)' % (self.score, self.commit, 
self.scheduler, self.platform, self.repo, self.branch)
-def __cmp__(self, other):
-return other.score - self.score
+def __lt__(self, other):
+return self.score  other.score
 
 class Scheduler:
 def __init__(self, platform, branch, repo):
@@ -110,5 +110,5 @@ class MergeScheduler(Scheduler):
 for proposal in new_proposals:
 proposal.score *= scheduler[0]
 proposals.append(proposal)
-return sorted(proposals)
+return sorted(proposals, key=lambda p: -p.score)
 # vim: set et sw=4 ts=4:
diff --git a/tb3/replay-branch b/tb3/replay-branch
index 79fdfcc..d307fe7 100755
--- a/tb3/replay-branch
+++ b/tb3/replay-branch
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/tb3/tb3 b/tb3/tb3
index 850906b..6ab865e 100755
--- a/tb3/tb3
+++ b/tb3/tb3
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # This file is part of the LibreOffice project.
 #
@@ -40,12 +40,12 @@ def set_commit_running(parms):
 get_updater(parms).set_scheduled(parms['set_commit_running'], 
parms['builder'], parms['estimated_duration'])
 
 def show_state(parms):
-if parms.has_key('format') and parms['format'] == 'json':
+if 'format' in parms and parms['format'] == 'json':
 raise NotImplementedError
 print(get_repostate(parms))
 
 def show_history(parms):
-if parms.has_key('format') and parms['format'] == 'json':
+if 'format' in parms and parms['format'] == 'json':
 raise NotImplementedError
 history = tb3.repostate.RepoHistory(parms['platform'], parms['repo'])
 for (commit, state) in history.get_recent_commit_states(parms['branch'], 
parms['history_count']):
@@ -65,17 +65,17 @@ def show_proposals(parms):
 print(json.dumps([p.__dict__ for p in proposals]))
 
 def execute(parms):
-if parms.has_key('estimated_duration') and 
type(parms['estimated_duration']) is float:
+if 'estimated_duration' in parms and type(parms['estimated_duration']) is 
float:
 parms['estimated_duration'] = 
datetime.timedelta(minutes=parms['estimated_duration'])
 if

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 50399, which changed state.

Bug 50399 Summary: FILESAVE document created with 3.4.5 destroys grouped 
elements for 3.4 VIEWING
https://bugs.freedesktop.org/show_bug.cgi?id=50399

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source

2013-07-31 Thread Efe Gürkan YALAMAN

 cui/source/options/optaboutconfig.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 48ad992534d2995a39fc122c6511f75b8dc688d1
Author: Efe GÃ¼rkan YALAMAN efeyala...@gmail.com
Date:   Wed Jul 31 22:01:07 2013 +0300

Hardcoded 3 toplevel configuration names for merging to master

Change-Id: Ic4271291f6f0adc66a69f5d9cd1b10c3393503cd

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 7f890a1..71a04d1 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -95,9 +95,21 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet )
m_pDefaultBtn-Enable(sal_False);
m_pEditBtn-Enable(sal_False);
 
-   Reference XNameAccess  xConfigAccess = getConfigAccess( sRootNodePath, 
sal_False );
+   OUString array[ 3 ] = {
+   /org.openoffice.Office.Common,
+   /org.openoffice.Office.Math,
+   /org.openoffice.Office.Addons };
 
-   FillItems( xConfigAccess, sRootNodePath );
+for (sal_Int16 nInd = 0; nInd  3 ; ++nInd )
+{
+sRootNodePath = array[nInd];
+Reference XNameAccess  xConfigAccess = getConfigAccess( 
sRootNodePath, sal_False );
+FillItems( xConfigAccess, sRootNodePath );
+}
+
+   //Reference XNameAccess  xConfigAccess = getConfigAccess( sRootNodePath, 
sal_False );
+
+   //FillItems( xConfigAccess, sRootNodePath );
 }
 
 void CuiAboutConfigTabPage::FillItems( Reference XNameAccess xNameAccess, 
OUString sPath)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|40594   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||40594

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Can I put back OxygenOffice product ti instset_native?

2013-07-31 Thread KAMI911 KAMI911

Thanks!

KAMI

2013/7/22 Miklos Vajna vmik...@suse.cz

 Hi Kami,

 On Mon, Jul 22, 2013 at 07:08:05AM +0200, KAMI911 KAMI911 
 kami...@gmail.com wrote:
  Can I put back OxygenOffice product ti instset_native that was removed
 here?
 
 
 http://cgit.freedesktop.org/libreoffice/core/commit/instsetoo_native/util/openoffice.lst.in?id=33b05d5de716707e54ae09afe88a7e02c63e388d

 Yes, sure -- I guess it was removed as everyone thought OxygenOffice is
 MIA.

 Best,

 Miklos

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

[Libreoffice-commits] core.git: animations/source basic/source sal/qa sax/source sfx2/source svtools/source

2013-07-31 Thread Takeshi Abe

 animations/source/animcore/factreg.cxx |2 +-
 basic/source/comp/exprgen.cxx  |4 ++--
 basic/source/comp/parser.cxx   |4 ++--
 basic/source/comp/token.cxx|   10 +-
 basic/source/sbx/sbxscan.cxx   |2 +-
 sal/qa/osl/file/osl_File.cxx   |6 +++---
 sax/source/tools/converter.cxx |2 +-
 sfx2/source/doc/iframe.cxx |2 +-
 sfx2/source/doc/plugin.cxx |2 +-
 sfx2/source/sidebar/Deck.cxx   |2 +-
 svtools/source/uno/miscservices.cxx|2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 392c5b2a70440c03341f21c7583ca5139b4a253b
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Aug 1 04:32:32 2013 +0900

Mark as const

Change-Id: Idd1d0641d5b7d8594f354c7d2e2a9093ecc6b2f7

diff --git a/animations/source/animcore/factreg.cxx 
b/animations/source/animcore/factreg.cxx
index 4f5b078..d957981 100644
--- a/animations/source/animcore/factreg.cxx
+++ b/animations/source/animcore/factreg.cxx
@@ -40,7 +40,7 @@ using namespace animcore;
 0, 0\
 }\
 
-static struct ImplementationEntry g_entries[] =
+static const struct ImplementationEntry g_entries[] =
 {
 IMPLEMENTATION_ENTRY( PAR ),
 IMPLEMENTATION_ENTRY( SEQ ),
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 3578097..762e0e3 100644
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -28,7 +28,7 @@ typedef struct {
 SbiOpcode eOp;  // Opcode
 } OpTable;
 
-static OpTable aOpTable [] = {
+static const OpTable aOpTable [] = {
 { EXPON,_EXP },
 { MUL,  _MUL },
 { DIV,  _DIV },
@@ -156,7 +156,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
 {
 pRight-Gen();
 }
-for( OpTable* p = aOpTable; p-eTok != NIL; p++ )
+for( const OpTable* p = aOpTable; p-eTok != NIL; p++ )
 {
 if( p-eTok == eTok )
 {
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index bb53d93..d61f334 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -38,7 +38,7 @@ struct SbiStatement {
 #define Y   sal_True
 #define N   sal_False
 
-static SbiStatement StmntTable [] = {
+static const SbiStatement StmntTable [] = {
 { ATTRIBUTE, SbiParser::Attribute, Y, Y, }, // ATTRIBUTE
 { CALL, SbiParser::Call,   N, Y, }, // CALL
 { CLOSE,SbiParser::Close,  N, Y, }, // CLOSE
@@ -409,7 +409,7 @@ bool SbiParser::Parse()
 
 // statement parsers
 
-SbiStatement* p;
+const SbiStatement* p;
 for( p = StmntTable; p-eTok != NIL; p++ )
 if( p-eTok == eCurTok )
 break;
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 0da1c51..f3d27ed 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -25,9 +25,9 @@ struct TokenTable { SbiToken t; const char *s; };
 
 static short nToken;// number of tokens
 
-static TokenTable* pTokTable;
+static const TokenTable* pTokTable;
 
-static TokenTable aTokTable_Basic [] = {
+static const TokenTable aTokTable_Basic [] = {
 { CAT,   },
 { MUL,  * },
 { PLUS, + },
@@ -220,7 +220,7 @@ SbiTokenizer::SbiTokenizer( const OUString rSrc, 
StarBASIC* pb )
 bEos = bKeywords = bErrorIsSymbol = true;
 if( !nToken )
 {
-TokenTable *tp;
+const TokenTable *tp;
 for( nToken = 0, tp = pTokTable; tp-t; nToken++, tp++ )
 {}
 }
@@ -297,7 +297,7 @@ const OUString SbiTokenizer::Symbol( SbiToken t )
 default:
 break;
 }
-TokenTable* tp = pTokTable;
+const TokenTable* tp = pTokTable;
 for( short i = 0; i  nToken; i++, tp++ )
 {
 if( tp-t == t )
@@ -336,7 +336,7 @@ SbiToken SbiTokenizer::Next()
 bEos = IsEoln( eCurTok );
 return eCurTok;
 }
-TokenTable *tp;
+const TokenTable *tp;
 
 if( !NextSym() )
 {
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 157407e..180de7e 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -288,7 +288,7 @@ SbxError SbxValue::ScanNumIntnl( const OUString rSrc, 
double nVal, bool bSingl
 }
 
 
-static double roundArray[] = {
+static const double roundArray[] = {
 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6, 0.5e-7,
 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,0.5e-15 };
 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 15df1b8..6357a8b 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -6198,9 +6198,9 @@ namespace osl_Directory
 #ifdef WNT
 
 //##
-char* get_unused_drive_letter()
+const char* get_unused_drive_letter()
 {
-static char m_aBuff[] = ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+

[Libreoffice-commits] libcdr.git: src/lib

 src/lib/CDRInternalStream.cpp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d66580805e97af0eb21907034f23033b99f4990b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jul 31 21:52:26 2013 +0200

Really reduce the scope of have :)

diff --git a/src/lib/CDRInternalStream.cpp b/src/lib/CDRInternalStream.cpp
index 83ae298..c602270 100644
--- a/src/lib/CDRInternalStream.cpp
+++ b/src/lib/CDRInternalStream.cpp
@@ -87,7 +87,6 @@ libcdr::CDRInternalStream::CDRInternalStream(WPXInputStream 
*input, unsigned lon
 
 strm.avail_in = (uInt)tmpNumBytesRead;
 strm.next_in = (Bytef *)tmpBuffer;
-unsigned have;
 
 do
 {
@@ -104,7 +103,7 @@ libcdr::CDRInternalStream::CDRInternalStream(WPXInputStream 
*input, unsigned lon
 return;
   }
 
-  have = CHUNK - strm.avail_out;
+  unsigned have = CHUNK - strm.avail_out;
 
   for (unsigned long i=0; ihave; i++)
 m_buffer.push_back(out[i]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|34957   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||34957

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|48409   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||48409

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 3 commits - sw/qa vcl/win

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   32 +++
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 -
 sw/qa/extras/rtfexport/rtfexport.cxx |   26 ++--
 sw/qa/extras/rtfimport/rtfimport.cxx |   14 +++---
 vcl/win/source/window/keynames.cxx   |   64 +--
 5 files changed, 75 insertions(+), 65 deletions(-)

New commits:
commit 336c4424c1c840cd0146483f35b0857fc0bf47cc
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 14:23:45 2013 +0300

Argh, the \xNN syntax uses as many hex chars there happens to be...

So use string splicing after a sequence of \xNN. (For consistency
even if it isn't a valid hex character that follows.)

Change-Id: I269788fa5d5fbc4eda5b9edcaaabfcbce59e4885
(cherry picked from commit 610265284d11c14c98c2874fabfc06b9aaeb0349)

diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 5577548..69fd98b 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -75,30 +75,30 @@ namespace vcl_sal {
 { PAPUGA_KEY_SPACEBAR, Espaciu },
 { PAPUGA_KEY_HOME, Aniciu },
 { PAPUGA_KEY_UP, Arriba },
-{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa1x },
+{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa1 x },
 { PAPUGA_KEY_LEFT, Izquierda },
 { PAPUGA_KEY_RIGHT, Drecha },
 { PAPUGA_KEY_END, Fin },
 { PAPUGA_KEY_DOWN, Abaxo },
-{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa1x },
+{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa1 x },
 { PAPUGA_KEY_INSERT, Ins },
 { PAPUGA_KEY_DELETE, Supr },
-{ PAPUGA_KEY_SHIFT, May\xc3\xbas },
+{ PAPUGA_KEY_SHIFT, May\xc3\xba s },
 };
 
 static const struct KeysNameReplacement aImplReplacements_Catalan[] =
 {
-{ PAPUGA_KEY_BACK, Retroc\xc3\xa9s },
+{ PAPUGA_KEY_BACK, Retroc\xc3\xa9 s },
 { PAPUGA_KEY_ENTER, Retorn },
 { PAPUGA_KEY_SPACEBAR, Espai },
 { PAPUGA_KEY_HOME, Inici },
 { PAPUGA_KEY_UP, Amunt },
-{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa0g },
+{ PAPUGA_KEY_PAGEUP, Re P\xc3\xa0 g },
 { PAPUGA_KEY_LEFT, Esquerra },
 { PAPUGA_KEY_RIGHT, Dreta },
 { PAPUGA_KEY_END, Fi },
 { PAPUGA_KEY_DOWN, Avall },
-{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa0g },
+{ PAPUGA_KEY_PAGEDOWN, Av P\xc3\xa0 g },
 { PAPUGA_KEY_INSERT, Ins },
 { PAPUGA_KEY_DELETE, Supr },
 { PAPUGA_KEY_SHIFT, Maj },
@@ -108,29 +108,29 @@ namespace vcl_sal {
 {
 { PAPUGA_KEY_RIGHT, Nool paremale },
 { PAPUGA_KEY_LEFT, Nool vasakule },
-{ PAPUGA_KEY_UP, Nool \xc3\xbcles },
+{ PAPUGA_KEY_UP, Nool \xc3\xbc les },
 { PAPUGA_KEY_DOWN, Nool alla },
-{ PAPUGA_KEY_BACK, Tagasil\xc3\xbcke },
+{ PAPUGA_KEY_BACK, Tagasil\xc3\xbc ke },
 { PAPUGA_KEY_ENTER, Enter },
-{ PAPUGA_KEY_SPACEBAR, T\xc3\xbchik },
+{ PAPUGA_KEY_SPACEBAR, T\xc3\xbc hik },
 };
 
 static const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
 {
 { PAPUGA_KEY_ESC, Gr },
 { PAPUGA_KEY_BACK, Naikinti },
-{ PAPUGA_KEY_ENTER, \xc4\xaevesti },
+{ PAPUGA_KEY_ENTER, \xc4\xae vesti },
 { PAPUGA_KEY_SPACEBAR, Tarpas },
 { PAPUGA_KEY_HOME, Prad },
-{ PAPUGA_KEY_UP, Auk\xc5\xa1tyn },
+{ PAPUGA_KEY_UP, Auk\xc5\xa1 tyn },
 { PAPUGA_KEY_PAGEUP, Psl\xe2\x86\x91 },
-{ PAPUGA_KEY_LEFT, Kair\xc4\x97n },
-{ PAPUGA_KEY_RIGHT, De\xc5\xa1in\xc4\x97n },
+{ PAPUGA_KEY_LEFT, Kair\xc4\x97 n },
+{ PAPUGA_KEY_RIGHT, De\xc5\xa1 in\xc4\x97 n },
 { PAPUGA_KEY_END, Pab },
-{ PAPUGA_KEY_DOWN, \xc5\xbdemyn },
+{ PAPUGA_KEY_DOWN, \xc5\xbd emyn },
 { PAPUGA_KEY_PAGEDOWN, Psl\xe2\x86\x93 },
-{ PAPUGA_KEY_INSERT, \xc4\xaeterpti },
-{ PAPUGA_KEY_DELETE, \xc5\xa0al },
+{ PAPUGA_KEY_INSERT, \xc4\xae terpti },
+{ PAPUGA_KEY_DELETE, \xc5\xa0 al },
 { PAPUGA_KEY_CONTROL, Vald },
 { PAPUGA_KEY_SHIFT, Lyg2 },
 { PAPUGA_KEY_ALT, Alt },
@@ -138,13 +138,13 @@ namespace vcl_sal {
 
 static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
 {
-{ PAPUGA_KEY_ESC, Ube\xc5\xbenica },
-{ PAPUGA_KEY_BACK, Vra\xc4\x8dalka },
-{ PAPUGA_KEY_ENTER, Vna\xc5\xa1alka },
+{ PAPUGA_KEY_ESC, Ube\xc5\xbe nica },
+{ PAPUGA_KEY_BACK, Vra\xc4\x8d alka },
+{ PAPUGA_KEY_ENTER, Vna\xc5\xa1 alka },
 { PAPUGA_KEY_SPACEBAR, Preslednica },
-{ PAPUGA_KEY_HOME, Za\xc4\x8detek },
+{ PAPUGA_KEY_HOME, Za\xc4\x8d etek },
 { PAPUGA_KEY_UP, Navzgor },
-{ PAPUGA_KEY_PAGEUP, Prej\xc5\xa1nja stran },
+{ PAPUGA_KEY_PAGEUP, Prej\xc5\xa1 nja stran },
 { PAPUGA_KEY_LEFT, Levo },
 { PAPUGA_KEY_RIGHT, Desno },
 { PAPUGA_KEY_END, Konec },
@@ -164,15 +164,15 @@

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - vcl/win

 vcl/win/source/window/keynames.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5bc21e977094d2b78d405a911996f294717071e
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 31 14:45:07 2013 +0300

Update cautionary comment

Change-Id: Idafce559e6499e240c90dc0baa7359f63476ff7d
(cherry picked from commit 4980d1acdf1498e9fd8cc0d6c31c2b8184c4439a)

diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 69fd98b..d8b35a5 100644
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -63,8 +63,8 @@ namespace vcl_sal {
 // 
 //
 // CAUTION CAUTION CAUTION
-// every string value in the replacements tables must be in UTF8
-// be careful with your editor !
+// Every string value in the replacements tables must be in UTF-8
+// but with the UTF-8 bytes encoded, not as such! Be careful!
 //
 // 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-31 Thread Katarina Behrens

 sd/source/ui/animations/CustomAnimationPane.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 238002acc070571a36208458866a912035caaf33
Author: Katarina Behrens bu...@bubli.org
Date:   Wed Jul 31 23:17:01 2013 +0200

Removing more dead code after .ui conversion

Change-Id: If2a26967a3cb344b7d686f3db8774fe9ce28d79f

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 10bb39d..1fa1753 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -833,10 +833,6 @@ void CustomAnimationPane::UpdateLook (void)
 ::sfx2::sidebar::Theme::GetWallpaper(
 ::sfx2::sidebar::Theme::Paint_PanelBackground));
 SetBackground(aBackground);
-/*if (mpFLModify != NULL)
-mpFLModify-SetBackground(aBackground);
-if (mpFLEffect != NULL)
-mpFLEffect-SetBackground(aBackground);*/
 if (mpFTStart != NULL)
 mpFTStart-SetBackground(aBackground);
 if (mpFTProperty != NULL)
@@ -845,10 +841,6 @@ void CustomAnimationPane::UpdateLook (void)
 mpFTSpeed-SetBackground(aBackground);
 if (mpFTChangeOrder != NULL)
 mpFTChangeOrder-SetBackground(aBackground);
-/*if (mpFLSeparator1 != NULL)
-mpFLSeparator1-SetBackground(aBackground);
-if (mpFLSeparator2 != NULL)
-mpFLSeparator2-SetBackground(aBackground);*/
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/inc/compiler.hxx  |   60 +--
 sc/source/core/tool/compiler.cxx |   52 +
 2 files changed, 60 insertions(+), 52 deletions(-)

New commits:
commit eaa64ac2edbd07638e76545ec954d89b46df9dad
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 17:24:40 2013 -0400

Avoid having these fat inline methods.

They tend to cause linkage problem on Windows.

Change-Id: I98fff8c5e45987670629e6eeacec7ecadf71ff48

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 46606d8..6cb4301 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -443,66 +443,22 @@ public:
 
 /** If the character is allowed as first character in sheet names or
 references, includes '$' and '?'. */
-static inline bool IsCharWordChar( String const  rStr,
-   xub_StrLen nPos,
-   const 
formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO )
-{
-sal_Unicode c = rStr.GetChar( nPos );
-sal_Unicode cLast = nPos  0 ? rStr.GetChar(nPos-1) : 0;
-if (c  128)
-{
-return pConventions[eConv] ? 
(pConventions[eConv]-getCharTableFlags(c, cLast)  SC_COMPILER_C_CHAR_WORD) == 
SC_COMPILER_C_CHAR_WORD :
-false;   // no convention = assume invalid
-}
-else
-return ScGlobal::pCharClass-isLetterNumeric( rStr, nPos );
-}
+static bool IsCharWordChar(
+String const  rStr, xub_StrLen nPos,
+const formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO );
 
 /** If the character is allowed in sheet names, thus may be part of a
 reference, includes '$' and '?' and such. */
-static inline bool IsWordChar( String const  rStr,
-   xub_StrLen nPos,
-   const 
formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO )
-{
-sal_Unicode c = rStr.GetChar( nPos );
-sal_Unicode cLast = nPos  0 ? rStr.GetChar(nPos-1) : 0;
-if (c  128)
-{
-return pConventions[eConv] ? 
(pConventions[eConv]-getCharTableFlags(c, cLast)  SC_COMPILER_C_WORD) == 
SC_COMPILER_C_WORD :
-false;   // convention not known = assume invalid
-}
-else
-return ScGlobal::pCharClass-isLetterNumeric( rStr, nPos );
-}
+static bool IsWordChar(
+String const  rStr, xub_StrLen nPos,
+const formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO );
 
 /** If the character is allowed as tested by nFlags (SC_COMPILER_C_...
 bits) for all known address conventions. If more than one bit is given
 in nFlags, all bits must match. If bTestLetterNumeric is false and
 char=128, no LetterNumeric test is done and false is returned. */
-static inline bool IsCharFlagAllConventions( String const  rStr,
- xub_StrLen nPos,
- sal_uLong nFlags,
- bool bTestLetterNumeric = 
true )
-{
-sal_Unicode c = rStr.GetChar( nPos );
-sal_Unicode cLast = nPos  0 ? rStr.GetChar( nPos-1 ) : 0;
-if (c  128)
-{
-for ( int nConv = formula::FormulaGrammar::CONV_UNSPECIFIED;
-++nConv  formula::FormulaGrammar::CONV_LAST; )
-{
-if (pConventions[nConv] 
-((pConventions[nConv]-getCharTableFlags(c, cLast) 
 nFlags) != nFlags))
-return false;
-// convention not known = assume valid
-}
-return true;
-}
-else if (bTestLetterNumeric)
-return ScGlobal::pCharClass-isLetterNumeric( rStr, nPos );
-else
-return false;
-}
+static bool IsCharFlagAllConventions(
+String const  rStr, xub_StrLen nPos, sal_uLong nFlags, bool 
bTestLetterNumeric = true );
 
 private:
 // FormulaCompiler
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 4d140ba..6391690 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4137,6 +4137,58 @@ void ScCompiler::MoveRelWrap( ScTokenArray rArr, 
ScDocument* pDoc, const ScAddr
 }
 }
 
+bool ScCompiler::IsCharWordChar(
+String const  rStr, xub_StrLen nPos, const 
formula::FormulaGrammar::AddressConvention eConv )
+{
+sal_Unicode c = rStr.GetChar( nPos );
+sal_Unicode cLast = nPos  0 ? rStr.GetChar(nPos-1) : 0;
+if (c  128)
+{
+return

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit cdcbb8d74c3956501343009d7290d2b2b3b7b3d7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 31 11:08:35 2013 +0100

Updated core
Project: help  b3408bc3c60ddee2eac3dce5a04d596da328528f

diff --git a/helpcontent2 b/helpcontent2
index 3579243..b3408bc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 35792431d1fb897b52e1815390f6a1bb988f5696
+Subproject commit b3408bc3c60ddee2eac3dce5a04d596da328528f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - cui/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

 cui/source/dialogs/hldoctp.cxx   |2 
 cui/source/dialogs/hlinettp.cxx  |2 
 cui/source/dialogs/hlmarkwn.cxx  |  155 ++--
 cui/source/dialogs/hltpbase.cxx  |2 
 cui/source/inc/hldoctp.hxx   |2 
 cui/source/inc/hlinettp.hxx  |2 
 cui/source/inc/hlmarkwn.hxx  |9 +
 cui/source/inc/hltpbase.hxx  |2 
 sw/UIConfig_swriter.mk   |1 
 sw/inc/helpid.h  |1 
 sw/source/ui/dialog/regionsw.hrc |8 -
 sw/source/ui/dialog/regionsw.src |   69 --
 sw/source/ui/dialog/uiregionsw.cxx   |   55 +--
 sw/source/ui/inc/regionsw.hxx|   12 --
 sw/uiconfig/swriter/ui/indentpage.ui |  167 +++
 15 files changed, 334 insertions(+), 155 deletions(-)

New commits:
commit d49e3805c58b2c08c5cb0483ed620ab6ef86fedd
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 31 16:11:55 2013 +0100

InsertTarget UniString-OUString

Change-Id: If335c313c9c2a13cc748adc9f21492d213f8a4fa

diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a7db3c3..001c2b2 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -341,7 +341,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl)
 |*
 |/
 
-void SvxHyperlinkDocTp::SetMarkStr ( String aStrMark )
+void SvxHyperlinkDocTp::SetMarkStr ( const String aStrMark )
 {
 maEdTarget.SetText ( aStrMark );
 
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index e0866fc..9e7392e 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -465,7 +465,7 @@ void SvxHyperlinkInternetTp::RefreshMarkWindow()
 |*
 |/
 
-void SvxHyperlinkInternetTp::SetMarkStr ( String aStrMark )
+void SvxHyperlinkInternetTp::SetMarkStr ( const String aStrMark )
 {
 String aStrURL ( maCbbTarget.GetText() );
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index bd7a50e..8366fa6 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -53,13 +53,13 @@ using namespace ::rtl;
 
 struct TargetData
 {
-OUStringaUStrLinkname;
-sal_BoolbIsTarget;
+OUString aUStrLinkname;
+bool bIsTarget;
 
-TargetData ( OUString aUStrLName, sal_Bool bTarget )
-:   bIsTarget ( bTarget )
+TargetData (OUString aUStrLName, bool bTarget)
+: bIsTarget(bTarget)
 {
-if ( bIsTarget )
+if (bIsTarget)
 aUStrLinkname = aUStrLName;
 }
 };
@@ -269,7 +269,7 @@ void SvxHlinkDlgMarkWnd::RestoreLastSelection()
 |*
 |/
 
-void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL )
+void SvxHlinkDlgMarkWnd::RefreshTree (OUString aStrURL)
 {
 OUString aUStrURL;
 
@@ -277,19 +277,19 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL )
 
 ClearTree();
 
-xub_StrLen nPos = aStrURL.Search ( sal_Unicode('#') );
+sal_Int32 nPos = aStrURL.indexOf('#');
 
-if( nPos != 0 )
-aUStrURL = OUString( aStrURL );
+if (nPos != 0)
+aUStrURL = aStrURL;
 
-if( !RefreshFromDoc ( aUStrURL ) )
+if (!RefreshFromDoc(aUStrURL))
 maLbTree.Invalidate();
 
 bool bSelectedEntry = false;
 
-if ( nPos != STRING_NOTFOUND )
+if ( nPos != -1 )
 {
-String aStrMark = aStrURL.Copy ( nPos+1 );
+OUString aStrMark = aStrURL.copy(nPos+1);
 bSelectedEntry = SelectEntry(aStrMark);
 }
 
@@ -307,7 +307,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL )
 |*
 |/
 
-sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
+sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(OUString aURL)
 {
 mnError = LERR_NOERROR;
 
@@ -497,7 +497,7 @@ void SvxHlinkDlgMarkWnd::ClearTree()
 |*
 |/
 
-SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName )
+SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (OUString aStrName)
 {
 sal_Bool bFound=sal_False;
 SvTreeListEntry* pEntry = maLbTree.First();
@@ -505,7 +505,7 @@ SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry ( String 
aStrName )
 while ( pEntry  !bFound )
 {
 TargetData* pUserData = ( TargetData * ) pEntry-GetUserData ();
-if ( aStrName == String( pUserData-aUStrLinkname ) )
+if (aStrName == pUserData-aUStrLinkname)
 bFound = sal_True;
 else
 pEntry = maLbTree.Next( pEntry );
@@ -520,13 +520,13 @@ SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry ( String 
aStrName )
 |*
 |/

[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

 helpers/help_hid.lst|5 -
 source/text/shared/01/0615.xhp  |1 +
 source/text/swriter/01/04020200.xhp |9 +
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit b3408bc3c60ddee2eac3dce5a04d596da328528f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Jul 31 11:08:35 2013 +0100

update help ids for section margins tabpage .ui conversion

Change-Id: Id6cb6bfb8670ec628f2830cf7ba4b7a21f253d00

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index be10053..d97b164 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3430,7 +3430,6 @@ HID_SEARCH_STARTOVER,38186,
 HID_SEARCH_TEXT,38178,
 HID_SEARCH_WILDCARD,38187,
 HID_SECTION_FTNENDNOTES_PAGE,53249,
-HID_SECTION_INDENTS_PAGE,54953,
 HID_SECTION_PROPERTIES_DLG,53237,
 HID_SELECTION_TLB,34844,
 HID_SELECTTABLES,59000,
@@ -7904,8 +7903,6 @@ sw_MetricField_TP_LAB_FMT_FLD_UPPER,909711885,
 sw_MetricField_TP_LAB_FMT_FLD_VDIST,909711877,
 sw_MetricField_TP_LAB_FMT_FLD_WIDTH,909711879,
 sw_MetricField_TP_LINENUMBERING_MF_OFFSET,878893577,
-sw_MetricField_TP_SECTION_INDENTS_MF_AFTER,879335941,
-sw_MetricField_TP_SECTION_INDENTS_MF_BEFORE,879335939,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_1,888494700,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_2,888494702,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_3,888494704,
diff --git a/source/text/swriter/01/04020200.xhp 
b/source/text/swriter/01/04020200.xhp
index 3d6b495..db31ddc 100644
--- a/source/text/swriter/01/04020200.xhp
+++ b/source/text/swriter/01/04020200.xhp
@@ -32,18 +32,19 @@
 /meta
 body
 section id=indents
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/indentpage/IndentPage id=bm_id3149819 
localize=false/
 paragraph role=heading id=hd_id3155898 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/swriter/01/04020200.xhp 
name=IndentsIndents/link/paragraph
 paragraph role=paragraph id=par_id3155182 xml-lang=en-US l10n=U 
oldref=2Indents the section with a left and right margin./paragraph
 /section
 section id=howtoget
   embed href=text/swriter/00/0404.xhp#sectionindents/
 /section
-bookmark xml-lang=en-US 
branch=hid/sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE id=bm_id3149818 
localize=false/
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/indentpage/before 
id=bm_id3149818 localize=false/
 paragraph role=heading id=hd_id3149488 xml-lang=en-US level=2 
l10n=U oldref=3Before section/paragraph
-paragraph role=paragraph id=par_id3149824 xml-lang=en-US l10n=U 
oldref=4ahelp hid=SW_METRICFIELD_TP_SECTION_INDENTS_MF_BEFORESpecifies 
the indents before the section, at the left margin./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sw:MetricField:TP_SECTION_INDENTS:MF_AFTER id=bm_id3151258 
localize=false/
+paragraph role=paragraph id=par_id3149824 xml-lang=en-US l10n=U 
oldref=4ahelp hid=modules/swriter/ui/indentpage/beforeSpecifies the 
indents before the section, at the left margin./ahelp/paragraph
+bookmark xml-lang=en-US branch=hid/modules/swriter/ui/indentpage/after 
id=bm_id3151258 localize=false/
 paragraph role=heading id=hd_id3149108 xml-lang=en-US level=2 
l10n=U oldref=5After section/paragraph
-paragraph role=paragraph id=par_id3148970 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SW_METRICFIELD_TP_SECTION_INDENTS_MF_AFTERSpecifies 
the indents after the section, at the right margin./ahelp/paragraph
+paragraph role=paragraph id=par_id3148970 xml-lang=en-US l10n=U 
oldref=6ahelp hid=modules/swriter/ui/indentpage/afterSpecifies the 
indents after the section, at the right margin./ahelp/paragraph
 embed href=text/shared/00/0004.xhp#related/
 embed href=text/swriter/01/0402.xhp#bereicheinfuegen/
 paragraph role=paragraph id=par_id3149032 xml-lang=en-US l10n=U 
oldref=7link href=text/swriter/01/0409.xhp name=Field 
commandsField commands/link/paragraph
commit f8d0ccd4eb21cb04e1d7442de41bab6df7465b78
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jul 30 23:31:00 2013 +0100

add a toplevel dialog help id for xslt settings dialog

Change-Id: Icc7539ffdc1d1773ca8b9d077317f981460338d5

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 618fa40..be10053 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3905,8 +3905,6 @@ HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE,64087,
 HID_XML_FILTER_IMPORT_XSLT,64073,
 HID_XML_FILTER_IMPORT_XSLT_BROWSE,64074,
 HID_XML_FILTER_OUTPUT_WINDOW,64089,
-HID_XML_FILTER_TABDIALOG,64060,
-HID_XML_FILTER_TABPAGE_CTRL,64091,
 HID_XML_FILTER_TEST_CLOSE,64086,
 HID_XML_FILTER_TEST_DIALOG,64076,
 HID_XML_FILTER_TEST_EXPORT_BROWSE,64077,
diff --git a/source/text/shared/01/0615.xhp 
b/source/text/shared/01/0615.xhp
index 3710a58..d67d6c4 100644
--- a/source/text/shared/01/0615.xhp
+++ b/source/text/shared/01/0615.xhp
@@ -96,6 +96,7 @@
 /listitem
 /list
 bookmark xml-lang=en-US branch=hid/filter/ui/xmlfiltersettings/new 
id=bm_id3148924 localize=false/
+bookmark xml-lang=en-US

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/inc sc/qa sc/source

 sc/inc/compiler.hxx  |   60 +--
 sc/qa/unit/ucalc_formula.cxx |   18 +++
 sc/source/core/tool/compiler.cxx |   52 +
 3 files changed, 78 insertions(+), 52 deletions(-)

New commits:
commit 9313a71461a76f8e5fda13a00aeafdf4e0ed1cb2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 19:19:41 2013 -0400

Add test on updating references in named range.

This currently fails.

Change-Id: Ibb2b9e4430c97479d068d94d233f04f60b255966

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index f731f2a..e85c01c55 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1064,6 +1064,24 @@ void Test::testFormulaRefUpdateNamedExpression()
 CPPUNIT_ASSERT_EQUAL(34.0, m_pDoc-GetValue(ScAddress(2,7,0)));
 #endif
 
+// Clear all and start over.
+clearRange(m_pDoc, ScRange(0,0,0,100,100,0));
+pGlobalNames-clear();
+
+pName = new ScRangeData(
+m_pDoc, MyRange, $B$1:$C$6, ScAddress(0,0,0), RT_NAME, 
formula::FormulaGrammar::GRAM_NATIVE);
+bInserted = pGlobalNames-insert(pName);
+CPPUNIT_ASSERT_MESSAGE(Failed to insert a new name., bInserted);
+pName-GetSymbol(aExpr);
+CPPUNIT_ASSERT_EQUAL(OUString($B$1:$C$6), aExpr);
+
+// Insert range of cells to shift right. The range partially overlaps the 
named range.
+m_pDoc-InsertCol(ScRange(2,4,0,3,8,0));
+
+// This should not alter the range.
+pName-GetSymbol(aExpr);
+CPPUNIT_ASSERT_EQUAL(OUString($B$1:$C$6), aExpr);
+
 m_pDoc-DeleteTab(0);
 }
 
commit 4de00d49a6eb42d2cc2c41cb0a2fa76ca9661b04
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 17:24:40 2013 -0400

Avoid having these fat inline methods.

They tend to cause linkage problem on Windows.

Change-Id: I98fff8c5e45987670629e6eeacec7ecadf71ff48

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 46606d8..6cb4301 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -443,66 +443,22 @@ public:
 
 /** If the character is allowed as first character in sheet names or
 references, includes '$' and '?'. */
-static inline bool IsCharWordChar( String const  rStr,
-   xub_StrLen nPos,
-   const 
formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO )
-{
-sal_Unicode c = rStr.GetChar( nPos );
-sal_Unicode cLast = nPos  0 ? rStr.GetChar(nPos-1) : 0;
-if (c  128)
-{
-return pConventions[eConv] ? 
(pConventions[eConv]-getCharTableFlags(c, cLast)  SC_COMPILER_C_CHAR_WORD) == 
SC_COMPILER_C_CHAR_WORD :
-false;   // no convention = assume invalid
-}
-else
-return ScGlobal::pCharClass-isLetterNumeric( rStr, nPos );
-}
+static bool IsCharWordChar(
+String const  rStr, xub_StrLen nPos,
+const formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO );
 
 /** If the character is allowed in sheet names, thus may be part of a
 reference, includes '$' and '?' and such. */
-static inline bool IsWordChar( String const  rStr,
-   xub_StrLen nPos,
-   const 
formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO )
-{
-sal_Unicode c = rStr.GetChar( nPos );
-sal_Unicode cLast = nPos  0 ? rStr.GetChar(nPos-1) : 0;
-if (c  128)
-{
-return pConventions[eConv] ? 
(pConventions[eConv]-getCharTableFlags(c, cLast)  SC_COMPILER_C_WORD) == 
SC_COMPILER_C_WORD :
-false;   // convention not known = assume invalid
-}
-else
-return ScGlobal::pCharClass-isLetterNumeric( rStr, nPos );
-}
+static bool IsWordChar(
+String const  rStr, xub_StrLen nPos,
+const formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO );
 
 /** If the character is allowed as tested by nFlags (SC_COMPILER_C_...
 bits) for all known address conventions. If more than one bit is given
 in nFlags, all bits must match. If bTestLetterNumeric is false and
 char=128, no LetterNumeric test is done and false is returned. */
-static inline bool IsCharFlagAllConventions( String const  rStr,
- xub_StrLen nPos,
- sal_uLong nFlags,
- bool bTestLetterNumeric = 
true )
-{
-sal_Unicode c = rStr.GetChar( nPos );
-sal_Unicode cLast = nPos  0 ? rStr.GetChar( nPos-1 ) : 0;
-if (c  128)
-{
-

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source

 sc/qa/extras/macros-test.cxx  |2 --
 sc/source/core/tool/token.cxx |   38 ++
 2 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit 2f8f96f516a09b649e8c6ebef8ad0189737f5538
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 21:10:50 2013 -0400

Fix reference update on range references in named expressions.

This fixes the macro test failure.

Change-Id: I8dd49d1faf36cc37212895c21023a4ab6135

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 9bc3a0f..023f627 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -198,12 +198,10 @@ void ScMacrosTest::testVba()
 OUString(Shapes.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
 },
-#if 0 // TODO : fix this
 {
 OUString(Ranges.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
 },
-#endif
 {
 OUString(CheckOptionToggleValue.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 83094d2..4703cde 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2598,6 +2598,20 @@ bool adjustSingleRefInName(
 return bChanged;
 }
 
+bool adjustDoubleRefInName(
+ScComplexRefData rRef, const sc::RefUpdateContext rCxt, const ScAddress 
rPos )
+{
+bool bRefChanged = false;
+
+if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
+bRefChanged = true;
+
+if (adjustSingleRefInName(rRef.Ref2, rCxt, rPos))
+bRefChanged = true;
+
+return bRefChanged;
+}
+
 }
 
 sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
@@ -2623,10 +2637,26 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
 {
 ScToken* pToken = static_castScToken*(*p);
 ScComplexRefData rRef = pToken-GetDoubleRef();
-if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
-aRes.mbReferenceModified = true;
-if (adjustSingleRefInName(rRef.Ref2, rCxt, rPos))
-aRes.mbReferenceModified = true;
+ScRange aAbs = rRef.toAbs(rPos);
+if (rCxt.maRange.In(aAbs))
+{
+// This range is entirely within the shifted region.
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+else if (rCxt.maRange.Intersects(aAbs))
+{
+if (rCxt.mnColDelta  rCxt.maRange.aStart.Row() = 
aAbs.aStart.Row()  aAbs.aEnd.Row() = rCxt.maRange.aEnd.Row())
+{
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+if (rCxt.mnRowDelta  rCxt.maRange.aStart.Col() = 
aAbs.aStart.Col()  aAbs.aEnd.Col() = rCxt.maRange.aEnd.Col())
+{
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+}
 }
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source

 sc/source/core/tool/token.cxx |   38 ++
 1 file changed, 34 insertions(+), 4 deletions(-)

New commits:
commit caf9c2a4423119f553a4c9ef3846cbfa6e8fe029
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 21:10:50 2013 -0400

Fix reference update on range references in named expressions.

This fixes the macro test failure.

Change-Id: I8dd49d1faf36cc37212895c21023a4ab6135

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 93cf603..e60780a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2598,6 +2598,20 @@ bool adjustSingleRefInName(
 return bChanged;
 }
 
+bool adjustDoubleRefInName(
+ScComplexRefData rRef, const sc::RefUpdateContext rCxt, const ScAddress 
rPos )
+{
+bool bRefChanged = false;
+
+if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
+bRefChanged = true;
+
+if (adjustSingleRefInName(rRef.Ref2, rCxt, rPos))
+bRefChanged = true;
+
+return bRefChanged;
+}
+
 }
 
 sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
@@ -2623,10 +2637,26 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
 {
 ScToken* pToken = static_castScToken*(*p);
 ScComplexRefData rRef = pToken-GetDoubleRef();
-if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
-aRes.mbReferenceModified = true;
-if (adjustSingleRefInName(rRef.Ref2, rCxt, rPos))
-aRes.mbReferenceModified = true;
+ScRange aAbs = rRef.toAbs(rPos);
+if (rCxt.maRange.In(aAbs))
+{
+// This range is entirely within the shifted region.
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+else if (rCxt.maRange.Intersects(aAbs))
+{
+if (rCxt.mnColDelta  rCxt.maRange.aStart.Row() = 
aAbs.aStart.Row()  aAbs.aEnd.Row() = rCxt.maRange.aEnd.Row())
+{
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+if (rCxt.mnRowDelta  rCxt.maRange.aStart.Col() = 
aAbs.aStart.Col()  aAbs.aEnd.Col() = rCxt.maRange.aEnd.Col())
+{
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+}
 }
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/qa/extras/macros-test.cxx  |2 --
 sc/qa/unit/ucalc_formula.cxx  |   18 ++
 sc/source/core/tool/token.cxx |   38 ++
 3 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit 3bade6b47973a228723b240b9410f15891487812
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 21:10:50 2013 -0400

Fix reference update on range references in named expressions.

This fixes the macro test failure.

Change-Id: I8dd49d1faf36cc37212895c21023a4ab6135

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 9bc3a0f..023f627 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -198,12 +198,10 @@ void ScMacrosTest::testVba()
 OUString(Shapes.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
 },
-#if 0 // TODO : fix this
 {
 OUString(Ranges.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
 },
-#endif
 {
 OUString(CheckOptionToggleValue.),
 
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 83094d2..4703cde 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2598,6 +2598,20 @@ bool adjustSingleRefInName(
 return bChanged;
 }
 
+bool adjustDoubleRefInName(
+ScComplexRefData rRef, const sc::RefUpdateContext rCxt, const ScAddress 
rPos )
+{
+bool bRefChanged = false;
+
+if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
+bRefChanged = true;
+
+if (adjustSingleRefInName(rRef.Ref2, rCxt, rPos))
+bRefChanged = true;
+
+return bRefChanged;
+}
+
 }
 
 sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
@@ -2623,10 +2637,26 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
 {
 ScToken* pToken = static_castScToken*(*p);
 ScComplexRefData rRef = pToken-GetDoubleRef();
-if (adjustSingleRefInName(rRef.Ref1, rCxt, rPos))
-aRes.mbReferenceModified = true;
-if (adjustSingleRefInName(rRef.Ref2, rCxt, rPos))
-aRes.mbReferenceModified = true;
+ScRange aAbs = rRef.toAbs(rPos);
+if (rCxt.maRange.In(aAbs))
+{
+// This range is entirely within the shifted region.
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+else if (rCxt.maRange.Intersects(aAbs))
+{
+if (rCxt.mnColDelta  rCxt.maRange.aStart.Row() = 
aAbs.aStart.Row()  aAbs.aEnd.Row() = rCxt.maRange.aEnd.Row())
+{
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+if (rCxt.mnRowDelta  rCxt.maRange.aStart.Col() = 
aAbs.aStart.Col()  aAbs.aEnd.Col() = rCxt.maRange.aEnd.Col())
+{
+if (adjustDoubleRefInName(rRef, rCxt, rPos))
+aRes.mbReferenceModified = true;
+}
+}
 }
 break;
 default:
commit 10dfaebc6cc2191745d4d7323596bb8e22c9d029
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed Jul 31 19:19:41 2013 -0400

Add test on updating references in named range.

This currently fails.

Change-Id: Ibb2b9e4430c97479d068d94d233f04f60b255966

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index f731f2a..e85c01c55 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1064,6 +1064,24 @@ void Test::testFormulaRefUpdateNamedExpression()
 CPPUNIT_ASSERT_EQUAL(34.0, m_pDoc-GetValue(ScAddress(2,7,0)));
 #endif
 
+// Clear all and start over.
+clearRange(m_pDoc, ScRange(0,0,0,100,100,0));
+pGlobalNames-clear();
+
+pName = new ScRangeData(
+m_pDoc, MyRange, $B$1:$C$6, ScAddress(0,0,0), RT_NAME, 
formula::FormulaGrammar::GRAM_NATIVE);
+bInserted = pGlobalNames-insert(pName);
+CPPUNIT_ASSERT_MESSAGE(Failed to insert a new name., bInserted);
+pName-GetSymbol(aExpr);
+CPPUNIT_ASSERT_EQUAL(OUString($B$1:$C$6), aExpr);
+
+// Insert range of cells to shift right. The range partially overlaps the 
named range.
+m_pDoc-InsertCol(ScRange(2,4,0,3,8,0));
+
+// This should not alter the range.
+pName-GetSymbol(aExpr);
+CPPUNIT_ASSERT_EQUAL(OUString($B$1:$C$6), aExpr);
+
 m_pDoc-DeleteTab(0);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/Library_scfilt.mk sc/source

2013-07-31 Thread Akash Shetye

 sc/Library_scfilt.mk|1 
 sc/source/filter/excel/excdoc.cxx   |2 
 sc/source/filter/excel/xedbdata.cxx |   77 +---
 sc/source/filter/excel/xeroot.cxx   |9 
 sc/source/filter/inc/xedbdata.hxx   |   15 ++-
 sc/source/filter/inc/xeroot.hxx |6 ++
 6 files changed, 103 insertions(+), 7 deletions(-)

New commits:
commit e98ae0f0161703e37e006b5965e43418eca2bcb7
Author: Akash Shetye shetyeak...@gmail.com
Date:   Thu Aug 1 08:14:25 2013 +0530

Completed the export of DBData ranges to xlsx.

All tags covered except auto filter tag. Need to add code to decide which 
DBData need to be exported by looking only for the ones that implement table 
style instead of exporting each one of them.

Change-Id: I2655b62a33b516c6ba5516cf90fcc2627604770e

diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 014b833..3a9638a 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/excel/tokstack \
sc/source/filter/excel/xechart \
sc/source/filter/excel/xecontent \
+sc/source/filter/excel/xedbdata \
sc/source/filter/excel/xeescher \
sc/source/filter/excel/xeextlst \
sc/source/filter/excel/xeformula \
diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc/source/filter/excel/excdoc.cxx
index b56f780..bc83431 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -68,6 +68,7 @@
 #include xeescher.hxx
 #include xepivot.hxx
 #include XclExpChangeTrack.hxx
+#include xedbdata.hxx
 
 #include math.h
 
@@ -313,6 +314,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList 
rBoundsheetList )
 if( GetOutput() != EXC_OUTPUT_BINARY )
 {
 aRecList.AppendNewRecord( new XclExpXmlStyleSheet( *this ) );
+aRecList.AppendNewRecord( new XclExpXmlDBDataTables( *this ) );
 }
 else
 {
diff --git a/sc/source/filter/excel/xedbdata.cxx 
b/sc/source/filter/excel/xedbdata.cxx
index ebce789..0b178ac 100644
--- a/sc/source/filter/excel/xedbdata.cxx
+++ b/sc/source/filter/excel/xedbdata.cxx
@@ -19,53 +19,100 @@
 
 #include xedbdata.hxx
 #include document.hxx
+#include address.hxx
+#include globstr.hrc
+
+#include oox/token/tokens.hxx
+
+using namespace oox;
 
 XclExpXmlDBDataStyleInfo::XclExpXmlDBDataStyleInfo( const XclExpRoot rRoot, 
ScDBDataFormatting rDBDataFormatting )
-: XclExpRoot( rRoot )
+: XclExpRoot( rRoot ),
+maDBDataFormatting( rDBDataFormatting )
 {
 }
 
 void XclExpXmlDBDataStyleInfo::SaveXml( XclExpXmlStream rStrm )
 {
+   sax_fastparser::FSHelperPtr rDBDataTable = rStrm.GetCurrentStream();
+   rDBDataTable-singleElement( XML_tableStyleInfo, XML_name, 
OUStringToOString(maDBDataFormatting.GetTableStyleName(), RTL_TEXTENCODING_UTF8 
).getStr(), XML_showFirstColumn, XclXmlUtils::ToPsz( false ), 
XML_showLastColumn, XclXmlUtils::ToPsz( false ), XML_showRowStripes, 
XclXmlUtils::ToPsz( maDBDataFormatting.GetBandedRows() ), 
XML_showColumnStripes, XclXmlUtils::ToPsz( 
maDBDataFormatting.GetBandedColumns() ),FSEND );// hardcoded two values for 
functions not supported yet
 }
 
 // 
 XclExpXmlDBDataColumn::XclExpXmlDBDataColumn( const XclExpRoot rRoot, int 
iID, OUString rName )
-: XclExpRoot( rRoot )
+: XclExpRoot( rRoot ),
+  maName( rName ),
+  miID( iID )
 {
 }
 
 void XclExpXmlDBDataColumn::SaveXml( XclExpXmlStream rStrm )
 {
+   sax_fastparser::FSHelperPtr rDBDataTable = rStrm.GetCurrentStream();
+   rDBDataTable-singleElement( XML_tableColumn, XML_id, OString::number( miID 
).getStr(), XML_name, OUStringToOString( maName, RTL_TEXTENCODING_UTF8 ), FSEND 
);
 }
 
 // 
 XclExpXmlDBDataColumns::XclExpXmlDBDataColumns( const XclExpRoot rRoot, 
ScDBData rDBData )
 : XclExpRoot( rRoot )
 {
+ScRange aRange;
+rDBData.GetArea( aRange );
+SCROW anRow1, anRow2;
+SCCOL anCol1, anCol2, anTotalCols;
+SCTAB anTab1, anTab2;
+aRange.GetVars( anCol1, anRow1, anTab1, anCol2, anRow2, anTab2 );
+anTotalCols = (anCol2 - anCol1) + 1; //addressing starts from 0
+// Needs special handling for different tab ranges
+miCount = anTotalCols;
+OUString aColName = Column;
+for( int i = 1; i = anTotalCols; i++ )
+{
+OUString aStri = aColName + OUString::number( i );
+maDBDataColumnContainer.push_back( new XclExpXmlDBDataColumn( rRoot, 
i, aStri ) );
+}
 }
 
 void XclExpXmlDBDataColumns::SaveXml( XclExpXmlStream rStrm )
 {
+   sax_fastparser::FSHelperPtr rDBDataTable = rStrm.GetCurrentStream();
+   rDBDataTable-startElement( XML_tableColumns, XML_count, OString::number( 
miCount ).getStr(), FSEND );
+for ( DBDataColumnContainer::iterator itr = 
maDBDataColumnContainer.begin(); itr != maDBDataColumnContainer.end();

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|34467   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||34467

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 CC||ba...@quipo.it
   See Also|https://bugs.freedesktop.or |
   |g/show_bug.cgi?id=58853 |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|47355   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||47355

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-qa] [GSOC] Call of beta-testers for iOS Impress Remote control

2013-07-31 Thread Siqi Liu

Hello all,

I've recently ported the iOS remote app to iPad and I think it's time to
start some beta-testing at this stage so that I can identify problems as
early as possible. The app has been tested mainly on an iPad1 running
iOS5.1.1 and occasionally on an iPad2 running iOS6. All other tests are
done on the simulator --- That's why I'm eager to hear from you about your
experiences on other physical devices! The app should support all devices
running iOS5 and later.

Please join me to make this app better by registering on this
formhttps://docs.google.com/forms/d/1XXpZWnPoIZEsyVG9Q-9TuvinjvjtuzeirEFY0WwRrJA/viewform.
According to Apple's policy, I will have to register your devices' UDID
before distributing it to you. You can find instructions on how to obtain
the UDID by clicking
herehttp://siqi43.wordpress.com/2013/07/15/how-to-find-your-idevices-udid/

Additional Information and instructions are available in the description in
the gdoc. You will be informed once your devices have been added to the
list.

Thank you in advance and prepare for all the bugscrash that you may (and
I'm sure you will :-P) encounter. As always, contact me on IRC (siqi) or by
email if any questions/problems.

Happy testing!
--

Cordialement,
Siqi LIU

Étudiant Ingénieur, École Supérieure d'Électricité

--
Tel. +33 7 61 16 95 83
email: m...@siqi.fr
--
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] [libreoffice-projects] Re: [ANN] LibreOffice 4.1.0 RC3 available

2013-07-31 Thread Jean-Baptiste Faure

Hi,

Le 21/07/2013 10:47, Thorsten Behrens a écrit :
 I wrote:
 fdo#67031 + fdo#67041 are being hotfixed as we speak. :)

 New debs available here:
 
  http://dev-builds.libreoffice.org/pre-releases/deb/
 
 , if someone could confirm the above two bugs are fixed there, I'll
 replace the packages on the mirrors.

Sorry for the late answer, I was offline last week.
Great to see that a RC4 which fixes the main bugs has been released.

Thank you very much.

Best regards
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] MAB. 3.6 to 4.0 migration. When?

2013-07-31 Thread Tommy


On Tue, 30 Jul 2013 11:42:57 +0200, Petr Mladek pmla...@suse.cz wrote:


bfoman píše v So 27. 07. 2013 v 02:44 -0700:

Petr Mladek wrote
 About 3000 bugs were fixed for LO 4.1 [...] Only small part of them  
was

 fixed via the MABs process.

Hi!
Code freeze for 4.0.x branch is set to end of October and branch will be
EOLed in November, just in 3-4 months. Migrating 3.6 MABs to 4.0 MAB is  
like

watching the same movie all over again - you know what will happen. Bugs
will be confirmed, got MAB status (or not) and usually nothing will  
happen

till next MAB moving round.


This is why I suggested to clean up the MAB list and do not blindly move
the bugs to 4.0 MAB.


I agree with you. actually I'm doing critical review to get rid of some  
bugs that became WFM, bugs that do not really represent a MAB etc. etc.  
and move to the 4.0mab only those bugs which really deserve it.



.
I think that all this MAB per branch procedure should be reinvented  
together
with the devs - the question is how to get their attention to help  
users by
fixing major and annoying issues, even by slowing down introduction of  
new

features.


let's see how things work with the 3.6 -- 4.0 migration and then decide  
if such a thing should be done again when 4.0.x reaches the EOL.



Nobody is perfect and MAB list is just a helper process. Here are some
statistics:

MAB versionnominated fixedopen  success
3.6245   184  6175%
4.0138   124  1490%
4.16859   9 87%

So, we fixed nearly 90% of MABs for 4.0 and 4.1. Is it something bad?
I do not thing so. IMHO, it is a great success.


I agree that the devs did a lot of work. the fixed percentage is very high.

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-qa] Easy QA Tasks - Input Needed

2013-07-31 Thread Joel Madero


Hi All,

As we build our team up it's becoming more and more possible to tackle a 
wider array of things. I am looking for a list of easy tasks that can be 
done by people just joining the team. We have a call Friday for North 
America and I'd like to have a few options if I can get volunteers to 
tackle things. So if there are items that you've taken on but haven't 
had time for or new items that seem good for new contributors - please 
pass them my way.


An example is cleaning our wiki up - if there are pages you know for 
sure need cleaned let me know. One is the whiteboard page - it needs 
some love and hopefully someone Friday will volunteer :)




Best,
Joel
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Easy QA Tasks - Input Needed

2013-07-31 Thread Bjoern Michaelsen

Hi Joel,

On Wed, Jul 31, 2013 at 03:10:40PM -0700, Joel Madero wrote:
 Hi All,
 
 As we build our team up it's becoming more and more possible to
 tackle a wider array of things. I am looking for a list of easy
 tasks that can be done by people just joining the team. We have a
 call Friday for North America and I'd like to have a few options if
 I can get volunteers to tackle things. So if there are items that
 you've taken on but haven't had time for or new items that seem good
 for new contributors - please pass them my way.

Here is an (old) list:

 https://wiki.documentfoundation.org/QA/Easy_Hacks

;)

Best,

Bjoern
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

[Libreoffice-bugs] [Bug 67489] EDITING: copied and pasted cells containing formulas are not recalculated