David Tardon | 20 Jun 2013 06:35
Picon
Favicon

core.git: instsetoo_native/CustomTarget_install.mk

 instsetoo_native/CustomTarget_install.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0db3134653cfc0e3c59e25203728a02865ceead
Author: David Tardon <dtardon <at> redhat.com>
Date:   Thu Jun 20 06:35:11 2013 +0200

    do not try to install helppacks that were not built

    Change-Id: I0156c38e71fe46ea599a8366b953d429dfa424bb

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 0962ac8..573b9c6 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
 <at>  <at>  -122,7 +122,7  <at>  <at>  ifeq (,$(filter WNT MACOSX,$(OS)))
 	$(call instsetoo_native_install_command,not-used,en-US,_Test,,$(PKGFORMAT))
 endif
 ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS)))
-	$(foreach lang,$(filter-out
$(WITH_POOR_HELP_LOCALIZATIONS),$(instsetoo_native_WITH_LANG)), \
+	$(foreach lang,$(gb_HELP_LANGS),\
 		$(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
 endif
 ifneq (WNT,$(OS))
Kohei Yoshida | 20 Jun 2013 02:03
Picon

core.git: Branch 'feature/formula-core-rework' - sc/source

 sc/source/core/data/column.cxx |   27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

New commits:
commit b8f1fb252d45a7b97390264d4f3536562d868017
Author: Kohei Yoshida <kohei.yoshida <at> gmail.com>
Date:   Wed Jun 19 18:04:26 2013 -0400

    Update references on all cells.

    Passed row range is the range of moved cells, not the range of cells
    to update.

    This alone fixes 3 unit tests.

    Change-Id: I4cb154879c6c33bc277bc2ab136f7580c35e479e

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a239a0f..a62b05c 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
 <at>  <at>  -2055,20 +2055,33  <at>  <at>  public:
     }
 };

-class UpdateRefOnNonCopy : public UpdateRefHandler
+class UpdateRefOnNonCopy
 {
     SCCOL mnCol;
     SCROW mnTab;
(Continue reading)

Khaled Hosny | 20 Jun 2013 01:34
Gravatar

core.git: vcl/generic

 vcl/generic/glyphs/gcach_ftyp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78
Author: Khaled Hosny <khaledhosny <at> eglug.org>
Date:   Thu Jun 20 01:27:21 2013 +0200

    Fix calculation of internal leading

    Stupid me, I totally messed this up! God only knows how many non-bugs
    people had to fix because of this typo.

    Has the side effect of fixing fdo#64972 (among many others of course,
    but this is the only one still open).

    Change-Id: I9d8fdb6d37d4af9b0ac973902e469e0bd3a2408a

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index cdcfe4c..d75c7d2 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
 <at>  <at>  -989,7 +989,7  <at>  <at>  void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
         }
     }

-    rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6);
+    rTo.mnIntLeading = rTo.mnAscent + rTo.mnDescent - (maFaceFT->units_per_EM * fScale + 0.5);

     if( pOS2 && (pOS2->version != 0xFFFF) )
(Continue reading)

Michael Stahl | 20 Jun 2013 00:56
Picon
Favicon

core.git: Branch 'libreoffice-4-1' - 4 commits - editeng/source libmwaw/libmwaw-infinite-loop.patch.1 libmwaw/UnpackedTarball_libmwaw.mk sw/inc sw/source

 editeng/source/misc/svxacorr.cxx      |   13 +-
 libmwaw/UnpackedTarball_libmwaw.mk    |    1 
 libmwaw/libmwaw-infinite-loop.patch.1 |   32 +++++
 sw/inc/doc.hxx                        |    1 
 sw/inc/ndhints.hxx                    |    2 
 sw/inc/swtypes.hxx                    |    4 
 sw/inc/txatbase.hxx                   |    6 
 sw/source/core/doc/doc.cxx            |   35 -----
 sw/source/core/doc/docfmt.cxx         |   68 ++++++++++
 sw/source/core/edit/editsh.cxx        |   15 +-
 sw/source/core/inc/UndoInsert.hxx     |    3 
 sw/source/core/inc/rolbck.hxx         |    2 
 sw/source/core/layout/frmtool.cxx     |    3 
 sw/source/core/layout/laycache.cxx    |    5 
 sw/source/core/text/itratr.cxx        |   24 +++
 sw/source/core/txtnode/ndhints.cxx    |   88 +++++++++++++-
 sw/source/core/txtnode/ndtxt.cxx      |   44 ++++++-
 sw/source/core/txtnode/thints.cxx     |  213 ++++++++++++++++++++++++++++++----
 sw/source/core/txtnode/txatbase.cxx   |    2 
 sw/source/core/txtnode/txtedt.cxx     |    4 
 sw/source/core/undo/rolbck.cxx        |   14 ++
 sw/source/core/undo/unins.cxx         |   22 +++
 22 files changed, 513 insertions(+), 88 deletions(-)

New commits:
commit c5423c79efc8f225d63419ebe71da5a4a009bc64
Author: Michael Stahl <mstahl <at> redhat.com>
Date:   Thu Jun 20 00:20:52 2013 +0200

    fdo#62536: sw: fix AutoCorrect bold/underline on existing AUTOFMT
(Continue reading)

Michael Stahl | 20 Jun 2013 00:37
Picon
Favicon

core.git: 4 commits - editeng/source libmwaw/libmwaw-infinite-loop.patch.1 libmwaw/UnpackedTarball_libmwaw.mk sw/inc sw/source

 editeng/source/misc/svxacorr.cxx      |   13 +-
 libmwaw/UnpackedTarball_libmwaw.mk    |    1 
 libmwaw/libmwaw-infinite-loop.patch.1 |   32 +++++
 sw/inc/doc.hxx                        |    1 
 sw/inc/ndhints.hxx                    |    2 
 sw/inc/swtypes.hxx                    |    4 
 sw/inc/txatbase.hxx                   |    6 
 sw/source/core/doc/doc.cxx            |   35 -----
 sw/source/core/doc/docfmt.cxx         |   68 ++++++++++
 sw/source/core/edit/editsh.cxx        |   15 +-
 sw/source/core/inc/UndoInsert.hxx     |    3 
 sw/source/core/inc/rolbck.hxx         |    2 
 sw/source/core/layout/frmtool.cxx     |    3 
 sw/source/core/layout/laycache.cxx    |    5 
 sw/source/core/text/itratr.cxx        |   24 +++
 sw/source/core/txtnode/ndhints.cxx    |   88 +++++++++++++-
 sw/source/core/txtnode/ndtxt.cxx      |   44 ++++++-
 sw/source/core/txtnode/thints.cxx     |  213 ++++++++++++++++++++++++++++++----
 sw/source/core/txtnode/txatbase.cxx   |    2 
 sw/source/core/txtnode/txtedt.cxx     |    4 
 sw/source/core/undo/rolbck.cxx        |   14 ++
 sw/source/core/undo/unins.cxx         |   22 +++
 22 files changed, 513 insertions(+), 88 deletions(-)

New commits:
commit fe444d1f74abe417962be0bcd3340f40f2446b58
Author: Michael Stahl <mstahl <at> redhat.com>
Date:   Thu Jun 20 00:20:52 2013 +0200

    fdo#62536: sw: fix AutoCorrect bold/underline on existing AUTOFMT
(Continue reading)

Kohei Yoshida | 19 Jun 2013 22:46
Picon

core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

 sc/inc/dociter.hxx              |    2 
 sc/source/core/data/dociter.cxx |   83 +++++++++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 24 deletions(-)

New commits:
commit a859bb34457b8c20839a2790ff9bb954b11adf53
Author: Kohei Yoshida <kohei.yoshida <at> gmail.com>
Date:   Wed Jun 19 16:48:32 2013 -0400

    Fix the horizontal cell iterator.

    I got its logic totally wrong. Now it works.

    Change-Id: I79e556da19c7c0b0d8cecbb4875d6d21d5ec4208

diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 87d17b2..2452a60 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
 <at>  <at>  -410,8 +410,6  <at>  <at>  public:

 class ScHorizontalCellIterator      // walk through all non empty cells in an area
 {                                   // row by row
-    typedef std::pair<sc::CellStoreType::const_iterator,size_t> PositionType;
-
     struct ColParam
     {
         sc::CellStoreType::const_iterator maPos;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 7479097..207c305 100644
(Continue reading)

Caolán McNamara | 19 Jun 2013 22:19
Picon
Favicon
Gravatar

core.git: sfx2/source

 sfx2/source/dialog/dinfdlg.cxx |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 7694bb997a68f6f8ebc03817be7e31ceb872ceb4
Author: Caolán McNamara <caolanm <at> redhat.com>
Date:   Wed Jun 19 21:18:20 2013 +0100

    Resolves: fdo#65930 line height needs to be calculated in ctor

    we need to know that right from the start, not after the first
    layout event after shown.

    Change-Id: If7cc12cdf3e83913f0162fe34b376196162f6a45

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 60fb441..cc2768c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
 <at>  <at>  -1398,6 +1398,19  <at>  <at>  CustomPropertiesWindow::CustomPropertiesWindow(Window* pParent,
     m_aNameBox.SetAccessibleName(rHeaderAccName);
     m_aTypeBox.SetAccessibleName(rHeaderAccType);
     m_aValueEdit.SetAccessibleName(rHeaderAccValue);
+
+    m_aNameBox.Hide();
+    m_aTypeBox.Hide();
+    m_aValueEdit.Hide();
+    m_aDateField.Hide();
+    m_aTimeField.Hide();
+    m_aDurationField.Hide();
(Continue reading)

Caolán McNamara | 19 Jun 2013 21:18
Picon
Favicon
Gravatar

core.git: Branch 'refs/notes/commits' - d7/0e1e8ea81a942875f91fdef75d3e39fba42eff

 d7/0e1e8ea81a942875f91fdef75d3e39fba42eff |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 75b645d9d78b799f1ea3797bf53f18311a32b291
Author: Caolán McNamara <caolanm <at> redhat.com>
Date:   Wed Jun 19 20:18:11 2013 +0100

    Notes added by 'git notes add'

diff --git a/d7/0e1e8ea81a942875f91fdef75d3e39fba42eff b/d7/0e1e8ea81a942875f91fdef75d3e39fba42eff
new file mode 100644
index 0000000..4477362
--- /dev/null
+++ b/d7/0e1e8ea81a942875f91fdef75d3e39fba42eff
 <at>  <at>  -0,0 +1  <at>  <at> 
+merged as: b7f2129c1186e1c5b2dd19ebb79ff82b213c0870
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits <at> lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Kohei Yoshida | 19 Jun 2013 21:17
Picon

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

 sc/inc/cellvalue.hxx              |    5 ++
 sc/source/core/data/cellvalue.cxx |   77 ++++++++++++++++++++++++++++----------
 sc/source/core/data/table4.cxx    |   23 ++---------
 3 files changed, 68 insertions(+), 37 deletions(-)

New commits:
commit 0ad0d04928da99a3a9b8f1bdd44382388240f8d1
Author: Kohei Yoshida <kohei.yoshida <at> gmail.com>
Date:   Wed Jun 19 15:19:31 2013 -0400

    Same fix for fill series & some cleanup.

    Change-Id: I2f741305ac64c221c5af8ab99f3ddff0ce56f458

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 02f9c7d..c605a97 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
 <at>  <at>  -766,7 +766,7  <at>  <at>  void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
             short nHeadNoneTail = 0;
             sal_Int32 nStringValue = 0;
             String aValue;
-            ScRefCellValue aSrcCell;
+            ScCellValue aSrcCell;
             CellType eCellType = CELLTYPE_NONE;
             bool bIsOrdinalSuffix = false;

 <at>  <at>  -846,21 +846,8  <at>  <at>  void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                                 }
                             }
(Continue reading)

Oliver-Rainer Wittmann | 19 Jun 2013 21:16
Picon
Favicon

core.git: 3 commits - Makefile.in sw/source vcl/source vcl/win

 Makefile.in                           |    2 ++
 sw/source/filter/ww8/rtfexport.cxx    |   15 ++++++++++++++-
 vcl/source/gdi/textlayout.cxx         |    2 +-
 vcl/source/glyphs/graphite_layout.cxx |    2 +-
 vcl/source/window/winproc.cxx         |   11 -----------
 vcl/win/source/window/salframe.cxx    |    4 ----
 6 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit b7f2129c1186e1c5b2dd19ebb79ff82b213c0870
Author: Oliver-Rainer Wittmann <orw <at> apache.org>
Date:   Wed Jun 19 14:18:36 2013 +0000

    Resolves: #i120023# RTF export certain special copy-and-paste scenarios

    (cherry picked from commit d70e1e8ea81a942875f91fdef75d3e39fba42eff)

    Conflicts:
    	sw/source/filter/ww8/rtfexport.cxx

    Change-Id: I845f3f2bebe411969483a53c45ef9413f7f1b903

diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index a766e348..0787f37 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
 <at>  <at>  -391,8 +391,21  <at>  <at>  void RtfExport::WriteStyles()
 void RtfExport::WriteMainText()
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << " start");
(Continue reading)

Caolán McNamara | 19 Jun 2013 21:10
Picon
Favicon
Gravatar

core.git: Branch 'refs/notes/commits' - e1/4095bc3b573f2c48c996fa2cb58226280d5e87

 e1/4095bc3b573f2c48c996fa2cb58226280d5e87 |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 652d672bf491232897930de37bb3344a20277894
Author: Caolán McNamara <caolanm <at> redhat.com>
Date:   Wed Jun 19 20:09:58 2013 +0100

    Notes added by 'git notes add'

diff --git a/e1/4095bc3b573f2c48c996fa2cb58226280d5e87 b/e1/4095bc3b573f2c48c996fa2cb58226280d5e87
new file mode 100644
index 0000000..8e5c182
--- /dev/null
+++ b/e1/4095bc3b573f2c48c996fa2cb58226280d5e87
 <at>  <at>  -0,0 +1  <at>  <at> 
+ignore: aoo
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits <at> lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Gmane