[Libreoffice-commits] .: extras/source

2012-03-26 Thread Andras Timar 
 extras/source/templates/layout/lyt-aqua.otp   |binary
 extras/source/templates/layout/lyt-blackandwhite.otp  |binary
 extras/source/templates/layout/lyt-bluegrey.otp   |binary
 extras/source/templates/layout/lyt-bluelinesgrad.otp  |binary
 extras/source/templates/layout/lyt-bluetitledown.otp  |binary
 extras/source/templates/layout/lyt-book.otp   |binary
 extras/source/templates/layout/lyt-brown.otp  |binary
 extras/source/templates/layout/lyt-charglow.otp   |binary
 extras/source/templates/layout/lyt-forest.otp |binary
 extras/source/templates/layout/lyt-frepa.otp  |binary
 extras/source/templates/layout/lyt-glacier.otp|binary
 extras/source/templates/layout/lyt-greengradlines.otp |binary
 extras/source/templates/layout/lyt-keyboard.otp   |binary
 extras/source/templates/layout/lyt-movwaves.otp   |binary
 extras/source/templates/layout/lyt-numdark.otp|binary
 extras/source/templates/layout/lyt-ocean.otp  |binary
 extras/source/templates/layout/lyt-organic.otp|binary
 extras/source/templates/layout/lyt-paper.otp  |binary
 extras/source/templates/layout/lyt-rededges.otp   |binary
 extras/source/templates/layout/lyt-roundedrect.otp|binary
 extras/source/templates/layout/lyt-sunrise.otp|binary
 extras/source/templates/layout/lyt-techpoly.otp   |binary
 extras/source/templates/layout/lyt-tunnel.otp |binary
 extras/source/templates/layout/lyt-water.otp  |binary
 24 files changed

New commits:
commit b9a0dfd169fa33c976fbc0bd6e869067b940d9d2
Author: Olivier Hallot olivier.hal...@documentfoundation.org
Date:   Mon Mar 26 09:13:06 2012 +0200

fdo#42328 Impress slide backgrounds with Liberation fonts

diff --git a/extras/source/templates/layout/lyt-aqua.otp 
b/extras/source/templates/layout/lyt-aqua.otp
index ded50c2..852702c 100644
Binary files a/extras/source/templates/layout/lyt-aqua.otp and 
b/extras/source/templates/layout/lyt-aqua.otp differ
diff --git a/extras/source/templates/layout/lyt-blackandwhite.otp 
b/extras/source/templates/layout/lyt-blackandwhite.otp
index 6a5eaf0..08c4824 100644
Binary files a/extras/source/templates/layout/lyt-blackandwhite.otp and 
b/extras/source/templates/layout/lyt-blackandwhite.otp differ
diff --git a/extras/source/templates/layout/lyt-bluegrey.otp 
b/extras/source/templates/layout/lyt-bluegrey.otp
index ccae1ea..1892d5f 100644
Binary files a/extras/source/templates/layout/lyt-bluegrey.otp and 
b/extras/source/templates/layout/lyt-bluegrey.otp differ
diff --git a/extras/source/templates/layout/lyt-bluelinesgrad.otp 
b/extras/source/templates/layout/lyt-bluelinesgrad.otp
index 2bce34a..7a6f608 100644
Binary files a/extras/source/templates/layout/lyt-bluelinesgrad.otp and 
b/extras/source/templates/layout/lyt-bluelinesgrad.otp differ
diff --git a/extras/source/templates/layout/lyt-bluetitledown.otp 
b/extras/source/templates/layout/lyt-bluetitledown.otp
index 04087aa..f9992be 100644
Binary files a/extras/source/templates/layout/lyt-bluetitledown.otp and 
b/extras/source/templates/layout/lyt-bluetitledown.otp differ
diff --git a/extras/source/templates/layout/lyt-book.otp 
b/extras/source/templates/layout/lyt-book.otp
index e13e0fb..19343ba 100644
Binary files a/extras/source/templates/layout/lyt-book.otp and 
b/extras/source/templates/layout/lyt-book.otp differ
diff --git a/extras/source/templates/layout/lyt-brown.otp 
b/extras/source/templates/layout/lyt-brown.otp
index edc99bc..d3ce069 100644
Binary files a/extras/source/templates/layout/lyt-brown.otp and 
b/extras/source/templates/layout/lyt-brown.otp differ
diff --git a/extras/source/templates/layout/lyt-charglow.otp 
b/extras/source/templates/layout/lyt-charglow.otp
index 58da646..86c5142 100644
Binary files a/extras/source/templates/layout/lyt-charglow.otp and 
b/extras/source/templates/layout/lyt-charglow.otp differ
diff --git a/extras/source/templates/layout/lyt-forest.otp 
b/extras/source/templates/layout/lyt-forest.otp
index aceb2d2..cfe6ae4 100644
Binary files a/extras/source/templates/layout/lyt-forest.otp and 
b/extras/source/templates/layout/lyt-forest.otp differ
diff --git a/extras/source/templates/layout/lyt-frepa.otp 
b/extras/source/templates/layout/lyt-frepa.otp
index 1fb2089..6baac36 100644
Binary files a/extras/source/templates/layout/lyt-frepa.otp and 
b/extras/source/templates/layout/lyt-frepa.otp differ
diff --git a/extras/source/templates/layout/lyt-glacier.otp 
b/extras/source/templates/layout/lyt-glacier.otp
index 4f35d9d..7e206a6 100644
Binary files a/extras/source/templates/layout/lyt-glacier.otp and 
b/extras/source/templates/layout/lyt-glacier.otp differ
diff --git a/extras/source/templates/layout/lyt-greengradlines.otp 
b/extras/source/templates/layout/lyt-greengradlines.otp
index 3bf32fd..ee8cb09 100644
Binary files a/extras/source/templates/layout/lyt-greengradlines.otp and 
b/extras/source/templates/layout/lyt-greengradlines.otp differ
diff --git

[Libreoffice-commits] .: extras/source

2012-03-26 Thread Andras Timar 
 extras/source/templates/layout/lyt-wine.otp |binary
 1 file changed

New commits:
commit 8906ad17b72fe2ccbced564a3dbfbb97286fee23
Author: Olivier Hallot olivier.hal...@documentfoundation.org
Date:   Mon Mar 26 09:15:43 2012 +0200

fdo#42328 Impress slide backgrounds with Liberation fonts

diff --git a/extras/source/templates/layout/lyt-wine.otp 
b/extras/source/templates/layout/lyt-wine.otp
index 15457db..8214332 100644
Binary files a/extras/source/templates/layout/lyt-wine.otp and 
b/extras/source/templates/layout/lyt-wine.otp differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

2012-03-26 Thread Jan Holesovsky 
 solenv/gbuild/gbuild.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3
Author: Lubos Lunak l.lu...@suse.cz
Date:   Thu Mar 22 17:26:11 2012 -0500

make gbuild follow --disable-dependency-tracking too

Signed-off-by: Jan Holesovsky ke...@suse.cz

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..574e851 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,12 +116,16 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
+ifneq ($(nodep),)
+gb_FULLDEPS := $(false)
+else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - dictionaries/an_ES

2012-03-26 Thread Petr Mladek 
 dictionaries/an_ES/dictionaries.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 976d287905accda35651052959cd85da073b9b24
Author: Andras Timar ati...@suse.com
Date:   Fri Mar 23 14:36:47 2012 +0100

fdo#47736 typo
(cherry picked from commit 6299bf66e3004cb8db805b360070762d0870cf50)

Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/dictionaries/an_ES/dictionaries.xcu 
b/dictionaries/an_ES/dictionaries.xcu
index 56f973a..73e4c71 100644
--- a/dictionaries/an_ES/dictionaries.xcu
+++ b/dictionaries/an_ES/dictionaries.xcu
@@ -10,7 +10,7 @@
 valueDICT_SPELL/value
 /prop
 prop oor:name=Locales oor:type=oor:string-list
-valuean an_ES/value
+valuean an-ES/value
 /prop
 /node
 /node
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-03-26 Thread Stephan Bergmann 
 sw/source/core/layout/paintfrm.cxx |   34 ++
 1 file changed, 14 insertions(+), 20 deletions(-)

New commits:
commit 8945f1bc858f3636d4270f16bd2e66ce88c0021c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Mar 26 11:58:51 2012 +0200

Fix recent paintfrm.cxx regressions

...as reported by Linux-RHEL6-x86_64@14-with-check tinderbox.

For one, e94c4ab5523c7dcbee2f1b7fd47685529498e774 Conver SV VARARR to
std::deque for sw module. did not use rbegin/rend to iterate backwards.

For another, e94c4ab5523c7dcbee2f1b7fd47685529498e774 and subsequent
1a412714031bf6cf3f7962b044b2edea74899b46 fixed crash due to use of STL 
deque
for SwLineRects failed to get the nested loop Remove all help line that 
are
almost covered (tables) at the start of SwSubsRects::PaintSubsidiary 
converted
correctly.  This attempt here at fixing it models the original behavior 
(before
conversion) more closely, and hopefully gets it right now.

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index a9f60f3..286908a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -492,7 +492,8 @@ void SwLineRects::AddLineRect( const SwRect rRect, const 
Color *pCol, const Svx
 //Loop backwards because lines which can be combined, can usually be 
painted
 //in the same context.
 
-for (SwLineRects::iterator it = this-end(); it != this-begin(); --it)
+for (SwLineRects::reverse_iterator it = this-rbegin(); it != this-rend();
+ ++it)
 {
 SwLineRect rLRect = (*it);
 // Test for the orientation, color, table
@@ -948,17 +949,14 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
 SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pOut );
 
 // Remove all help line that are almost covered (tables)
-SwSubsRects::iterator it = this-begin();
-while ( it != this-end() )
+for (SwSubsRects::size_type i = 0; i != this-size(); ++i)
 {
-SwLineRect rLi = *it;
+SwLineRect rLi = (*this)[i];
 const bool bVerticalSubs = rLi.Height()  rLi.Width();
 
-SwSubsRects::iterator itK = it;
-while ( itK != this-end() )
+for (SwSubsRects::size_type k = i + 1; k != this-size(); ++k)
 {
-bool bRemoved = false;
-SwLineRect rLk = (*itK);
+SwLineRect rLk = (*this)[k];
 if ( rLi.SSize() == rLk.SSize() )
 {
 if ( bVerticalSubs == ( rLk.Height()  rLk.Width() ) )
@@ -971,11 +969,11 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
  ((nLi  rLk.Left()  nLi+21  rLk.Left()) ||
   (nLk  rLi.Left()  nLk+21  rLi.Left(
 {
-this-erase( itK );
+this-erase(this-begin() + k);
 // don't continue with inner loop any more:
 // the array may shrink!
-itK = this-end();
-bRemoved = true;
+--i;
+break;
 }
 }
 else
@@ -986,21 +984,16 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
  ((nLi  rLk.Top()  nLi+21  rLk.Top()) ||
   (nLk  rLi.Top()  nLk+21  rLi.Top(
 {
-this-erase( itK );
+this-erase(this-begin() + k);
 // don't continue with inner loop any more:
 // the array may shrink!
-itK = this-end();
-bRemoved = true;
+--i;
+break;
 }
 }
 }
 }
-
-if ( !bRemoved )
-++itK;
 }
-
-++it;
 }
 
 if ( pRects  (!pRects-empty()) )
@@ -1021,7 +1014,8 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
 pOut-SetDrawMode( 0 );
 }
 
-for (it = this-begin(); it != this-end(); ++it)
+for (SwSubsRects::iterator it = this-begin(); it != this-end();
+ ++it)
 {
 SwLineRect rLRect = (*it);
 // Add condition !rLRect.IsLocked() to prevent paint of 
locked subsidiary lines.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org

[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk

2012-03-26 Thread Lubos Lunak 
 sal/CppunitTest_sal_rtl_strings.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 8a66c8f557dd97250faef6bd68c0d57970eefe43
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 12:05:44 2012 +0200

sal_rtl_strings unittest depends on sal_textenc library

there's a dlopen of it somewhere in sal's string classes

diff --git a/sal/CppunitTest_sal_rtl_strings.mk 
b/sal/CppunitTest_sal_rtl_strings.mk
index 8b267f2..f5127cb 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -42,4 +42,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\
 $(gb_STDLIBS) \
 ))
 
+# the test uses the library created by Module_DLL
+$(call gb_CppunitTest_get_target,sal_rtl_strings) : \
+$(call gb_Library_get_target,sal_textenc)
+
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

2012-03-26 Thread Michael Meeks 
 sc/source/ui/cctrl/checklistmenu.cxx  |2 ++
 sc/source/ui/namedlg/namemgrtable.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 801c5d5b88454f659a08d9a4940b90499bec9584
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Mar 26 04:58:47 2012 +0200

prevent update during init in new autofilter dlg, fdo#45679

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 9b23197..d269333 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1164,6 +1164,7 @@ void ScCheckListMenuWindow::initMembers()
 {
 size_t n = maMembers.size();
 size_t nVisMemCount = 0;
+maChecks.SetUpdateMode(false);
 for (size_t i = 0; i  n; ++i)
 {
 maChecks.InsertEntry(maMembers[i].maName);
@@ -1188,6 +1189,7 @@ void ScCheckListMenuWindow::initMembers()
 maChkToggleAll.SetState(STATE_DONTKNOW);
 mePrevToggleAllState = STATE_DONTKNOW;
 }
+maChecks.SetUpdateMode(true);
 }
 
 void ScCheckListMenuWindow::setConfig(const Config rConfig)
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index b9164d3..5a02130 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -127,6 +127,7 @@ void ScRangeManagerTable::GetLine(ScRangeNameLine rLine, 
SvLBoxEntry* pEntry)
 
 void ScRangeManagerTable::Init()
 {
+SetUpdateMode(false);
 Clear();
 for (boost::ptr_maprtl::OUString, ScRangeName::const_iterator itr = 
mrRangeMap.begin();
 itr != mrRangeMap.end(); ++itr)
@@ -147,6 +148,7 @@ void ScRangeManagerTable::Init()
 }
 }
 }
+SetUpdateMode(true);
 }
 
 const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine 
rLine)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: icon-themes/galaxy icon-themes/tango sysui/desktop

2012-03-26 Thread Andras Timar 
 icon-themes/galaxy/res/odf_16_8.png   |binary
 icon-themes/galaxy/res/sx03247.png|binary
 icon-themes/tango/res/odf_16_8.png|binary
 icon-themes/tango/res/sx03247.png |binary
 sysui/desktop/icons/hicolor/16x16/apps/math.png   |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png |binary
 6 files changed

New commits:
commit b36a42fb831b853120928e05dcf322898a92a731
Author: Andras Timar ati...@suse.com
Date:   Mon Mar 26 12:14:47 2012 +0200

fdo#34324 put 16x16 math icon in RGB color space

diff --git a/icon-themes/galaxy/res/odf_16_8.png 
b/icon-themes/galaxy/res/odf_16_8.png
index ab945b1..5966254 100644
Binary files a/icon-themes/galaxy/res/odf_16_8.png and 
b/icon-themes/galaxy/res/odf_16_8.png differ
diff --git a/icon-themes/galaxy/res/sx03247.png 
b/icon-themes/galaxy/res/sx03247.png
index ab945b1..17c9ffd 100644
Binary files a/icon-themes/galaxy/res/sx03247.png and 
b/icon-themes/galaxy/res/sx03247.png differ
diff --git a/icon-themes/tango/res/odf_16_8.png 
b/icon-themes/tango/res/odf_16_8.png
index ab945b1..17c9ffd 100644
Binary files a/icon-themes/tango/res/odf_16_8.png and 
b/icon-themes/tango/res/odf_16_8.png differ
diff --git a/icon-themes/tango/res/sx03247.png 
b/icon-themes/tango/res/sx03247.png
index ab945b1..17c9ffd 100644
Binary files a/icon-themes/tango/res/sx03247.png and 
b/icon-themes/tango/res/sx03247.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png 
b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index ab945b1..17c9ffd 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/math.png and 
b/sysui/desktop/icons/hicolor/16x16/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png 
b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index ab945b1..17c9ffd 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png 
and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmloff/source

2012-03-26 Thread Thorsten Behrens 
 xmloff/source/draw/xexptran.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit a2ee8055e9c136923f0244fe289cac6377933c31
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Mar 23 17:46:43 2012 +0100

Fix fdo#47406 incorrect relative moves after closePath

I missed the fact that odf export still uses the old exporter in
xmloff/source/draw/xexptran.cxx, which was not fixed wrt. the update
of current position in basegfx/source/polygon/b2dsvgpolypolygon.cxx

diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 15ef848..6032984 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1606,6 +1606,7 @@ void SdXMLImExSvgDElement::AddPolygon(
 
 // bezier poly, handle curves
 bool  bDidWriteStart(false);
+sal_Int32 nStartX(0), nStartY(0);
 
 for(sal_Int32 a(0L); a  nCnt; a++)
 {
@@ -2080,6 +2081,8 @@ void SdXMLImExSvgDElement::AddPolygon(
 
 // remember start written
 bDidWriteStart = true;
+nStartX = nX;
+nStartY = nY;
 }
 
 // remember new last position
@@ -2100,6 +2103,13 @@ void SdXMLImExSvgDElement::AddPolygon(
 aNewString += rtl::OUString(static_castsal_Unicode('z'));
 else
 aNewString += rtl::OUString(static_castsal_Unicode('Z'));
+
+// update current point - we're back at the start
+if( bDidWriteStart )
+{
+mnLastX = nStartX;
+mnLastY = nStartY;
+}
 }
 
 // append new string
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extras/source

2012-03-26 Thread Michael Meeks 
 extras/source/palettes/standard.soe |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a35ce053b05f48e7c62deb24649e20257ee6cca2
Author: Regina Henschel rb.hensc...@t-online.de
Date:   Sun Mar 25 21:12:52 2012 +0200

Adapt arrowhead pathes to corrected svg path z hangling

Signed-off-by: Michael Meeks michael.me...@suse.com

diff --git a/extras/source/palettes/standard.soe 
b/extras/source/palettes/standard.soe
index 5a8acd9..4b576b1 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -13,11 +13,11 @@
   draw:marker draw:name=Square 45 svg:viewBox=0 0 1131 1131 svg:d=m0 564 
564 567 567-567-567-564z /
   draw:marker draw:name=Arrow concave svg:viewBox=0 0 1131 1580 
svg:d=m1013 1491 118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 
153 46z/draw:marker
   draw:marker draw:name=Short line Arrow svg:viewBox=0 0 3000 3000 
svg:d=m1500 0 1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 
2392h-114v-211z/draw:marker
-  draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 0 1500 3000h-3000zm1500-2553-1176 2353h2353z/draw:marker
-  draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 
svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm1500-2553-1276 2553 1276 2553 
1276-2553z/draw:marker
+  draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 0 1500 3000h-3000zm0 447-1176 2353h2353z/draw:marker
+  draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 
svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm0 447-1276 2553 1276 2553 
1276-2553z/draw:marker
   draw:marker draw:name=Diamond svg:viewBox=0 0 3000 6000 svg:d=m1500 0 
1500 3000-1500 3000-1500-3000z/draw:marker
   draw:marker draw:name=Circle unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 
201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 
201 750-63 511-201 750-310 411-549 549-474 201-750 201zm0-200c-239 
0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 
476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 
174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z/draw:marker
-  draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm-1500 1215-1215-1215 1215-1215 
1215 1215z/draw:marker
-  draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 
0h300v300h-300zm20-280h260v260h-260z/draw:marker
+  draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm0-285 -1215-1215 1215-1215 
1215 1215z/draw:marker
+  draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 
0h300v300h-300zm20 20h260v260h-260z/draw:marker
   draw:marker draw:name=Half Circle unfilled svg:viewBox=0 0 15000 8746 
svg:d=m14971 0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 
1206-761 1804-345 597-733 1110-1183 1560-451 450-964 837-1562 1182-598 345-1190 
596-1806 760-600 161-1223 240-1894 
244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760-598-345--732-1562-1182-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943
 0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 
151 566 383 1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 
550 317 1095 548 1661 700 566 151 1154 223 1789 223s1223-72 1789-223c566-152 
-383 1661-700 550-318 1023-673 1438-1087 414-415 770-887 1088-1437 317-549 
549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z /
 /office:marker-table
\ No newline at end of file
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - xmloff/source

2012-03-26 Thread Fridrich Strba 
 xmloff/source/draw/xexptran.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit db3597cef07a0f659be5617d9148069c7fb4a5a8
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Mar 23 17:46:43 2012 +0100

Fix fdo#47406 incorrect relative moves after closePath

I missed the fact that odf export still uses the old exporter in
xmloff/source/draw/xexptran.cxx, which was not fixed wrt. the update
of current position in basegfx/source/polygon/b2dsvgpolypolygon.cxx

Conflicts:

xmloff/source/draw/xexptran.cxx

diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 98fb45a..a2c46fe 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -1607,6 +1607,7 @@ void SdXMLImExSvgDElement::AddPolygon(
 
 // bezier poly, handle curves
 bool  bDidWriteStart(false);
+sal_Int32 nStartX(0), nStartY(0);
 
 for(sal_Int32 a(0L); a  nCnt; a++)
 {
@@ -2081,6 +2082,8 @@ void SdXMLImExSvgDElement::AddPolygon(
 
 // remember start written
 bDidWriteStart = true;
+nStartX = nX;
+nStartY = nY;
 }
 
 // remember new last position
@@ -2101,6 +2104,13 @@ void SdXMLImExSvgDElement::AddPolygon(
 aNewString += String(sal_Unicode('z'));
 else
 aNewString += String(sal_Unicode('Z'));
+
+// update current point - we're back at the start
+if( bDidWriteStart )
+{
+mnLastX = nStartX;
+mnLastY = nStartY;
+}
 }
 
 // append new string
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/inc

2012-03-26 Thread Miklos Vajna 
 oox/inc/oox/vml/vmlshape.hxx |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 2452e28a068803ad1ca910798339303cc52e45be
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Mar 26 13:07:03 2012 +0200

oox: fix doxygen syntax to avoid misleading output in ShapeTypeModel

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 8c68337..946af36 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -66,27 +66,27 @@ const sal_Int32 VML_CLIENTDATA_FORMULA  = 4;
 /** The shape model structure contains all properties shared by all types of 
shapes. */
 struct ShapeTypeModel
 {
-::rtl::OUString maShapeId;  /// Unique identifier of the 
shape.
-::rtl::OUString maShapeName;/// Name of the shape, if 
present.
-OptValue sal_Int32  moShapeType;  /// Builtin shape type 
identifier.
-
-OptValue Int32Pair  moCoordPos;   /// Top-left position of 
coordinate system for children scaling.
-OptValue Int32Pair  moCoordSize;  /// Size of coordinate system 
for children scaling.
-::rtl::OUString maPosition; /// Position type of the shape.
-::rtl::OUString maLeft; /// X position of the shape 
bounding box (number with unit).
-::rtl::OUString maTop;  /// Y position of the shape 
bounding box (number with unit).
-::rtl::OUString maWidth;/// Width of the shape 
bounding box (number with unit).
-::rtl::OUString maHeight;   /// Height of the shape 
bounding box (number with unit).
-::rtl::OUString maMarginLeft;   /// X position of the shape 
bounding box to shape anchor (number with unit).
-::rtl::OUString maMarginTop;/// Y position of the shape 
bounding box to shape anchor (number with unit).
-::rtl::OUString maPositionVerticalRelative; /// The Y position is 
relative to this.
-sal_BoolmbAutoHeight;   /// If true, the height value 
is a minimum value (mostly used for textboxes)
-
-StrokeModel maStrokeModel;  /// Border line formatting.
-FillModel   maFillModel;/// Shape fill formatting.
-
-OptValue ::rtl::OUString  moGraphicPath;  /// Path to a graphic for this 
shape.
-OptValue ::rtl::OUString  moGraphicTitle; /// Title of the graphic.
+::rtl::OUString maShapeId;  /// Unique identifier of the 
shape.
+::rtl::OUString maShapeName;/// Name of the shape, if 
present.
+OptValue sal_Int32  moShapeType;  /// Builtin shape type 
identifier.
+
+OptValue Int32Pair  moCoordPos;   /// Top-left position of 
coordinate system for children scaling.
+OptValue Int32Pair  moCoordSize;  /// Size of coordinate system 
for children scaling.
+::rtl::OUString maPosition; /// Position type of the 
shape.
+::rtl::OUString maLeft; /// X position of the shape 
bounding box (number with unit).
+::rtl::OUString maTop;  /// Y position of the shape 
bounding box (number with unit).
+::rtl::OUString maWidth;/// Width of the shape 
bounding box (number with unit).
+::rtl::OUString maHeight;   /// Height of the shape 
bounding box (number with unit).
+::rtl::OUString maMarginLeft;   /// X position of the shape 
bounding box to shape anchor (number with unit).
+::rtl::OUString maMarginTop;/// Y position of the shape 
bounding box to shape anchor (number with unit).
+::rtl::OUString maPositionVerticalRelative; /// The Y position is 
relative to this.
+sal_BoolmbAutoHeight;   /// If true, the height value 
is a minimum value (mostly used for textboxes)
+
+StrokeModel maStrokeModel;  /// Border line formatting.
+FillModel   maFillModel;/// Shape fill formatting.
+
+OptValue ::rtl::OUString  moGraphicPath;  /// Path to a graphic for 
this shape.
+OptValue ::rtl::OUString  moGraphicTitle; /// Title of the graphic.
 
 explicitShapeTypeModel();
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basegfx/inc basegfx/source xmloff/inc xmloff/source

2012-03-26 Thread Fridrich Strba 
 basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |7 ++-
 basegfx/source/polygon/b2dsvgpolypolygon.cxx|4 ++--
 xmloff/inc/xexptran.hxx |3 ++-
 xmloff/source/draw/xexptran.cxx |   15 +--
 xmloff/source/draw/ximp3dobject.cxx |3 +--
 xmloff/source/draw/ximpshap.cxx |6 ++
 xmloff/source/style/MarkerStyle.cxx |3 +--
 xmloff/source/text/XMLTextFrameContext.cxx  |3 +--
 8 files changed, 28 insertions(+), 16 deletions(-)

New commits:
commit b8fb2df5491937ccc7eb422544e25f18a6bc787c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Mar 26 12:55:44 2012 +0200

Compatibility option for incorrect relative moves after closePath 
(fdo#47406)

Signed-off-by: Thorsten Behrens tbehr...@suse.com

diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 37d2cb5..5a59c3a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -131,10 +131,15 @@ namespace basegfx
 @param rSvgDAttribute
 A valid SVG-D attribute string
 
+@param rWrongPositionAfterZ
+Indicates wheter the generator interprets wrongly
+the position in the path after Z or z elements
+https://bugs.freedesktop.org/show_bug.cgi?id=47406
+
 @return true, if the string was successfully parsed
  */
 BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon
o_rPolyPoly,
- const ::rtl::OUString rSvgDAttribute );
+ const ::rtl::OUString rSvgDAttribute, bool 
bWrongPositionAfterZ = false );
 
 /** Read poly-polygon from SVG.
 
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx 
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 863adf5..2928364 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -210,7 +210,7 @@ namespace basegfx
 }
 }
 
-bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const 
::rtl::OUString  rSvgDStatement)
+bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const 
::rtl::OUString  rSvgDStatement, bool bWrongPositionAfterZ)
 {
 o_rPolyPolygon.clear();
 const sal_Int32 nLen(rSvgDStatement.getLength());
@@ -241,7 +241,7 @@ namespace basegfx
 bIsClosed = true;
 
 // update current point - we're back at the start
-if( aCurrPoly.count() )
+if( aCurrPoly.count()  !bWrongPositionAfterZ)
 {
 const B2DPoint aFirst( aCurrPoly.getB2DPoint(0) );
 nLastX = aFirst.getX();
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 814ad2a..86883cf 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -36,6 +36,7 @@
 #include com/sun/star/awt/Size.hpp
 #include com/sun/star/drawing/HomogenMatrix.hpp
 #include tools/mapunit.hxx
+#include xmloff/xmlimp.hxx
 
 #include vector
 
@@ -171,7 +172,7 @@ public:
 const SdXMLImExViewBox rViewBox,
 const com::sun::star::awt::Point rObjectPos,
 const com::sun::star::awt::Size rObjectSize,
-const SvXMLUnitConverter rConv);
+const SvXMLImport rImport);
 
 void AddPolygon(
 com::sun::star::drawing::PointSequence* pPoints,
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index a2c46fe..e49d971 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -2122,7 +2122,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const 
OUString rNew,
 const SdXMLImExViewBox rViewBox,
 const awt::Point rObjectPos,
 const awt::Size rObjectSize,
-const SvXMLUnitConverter /*rConv*/)
+const SvXMLImport rImport)
 :   msString( rNew ),
 mrViewBox( rViewBox ),
 mbIsClosed( false ),
@@ -2131,9 +2131,20 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const 
OUString rNew,
 mnLastY( 0L ),
 maPoly()
 {
+bool bWrongPositionAfterZ( false );
+   sal_Int32 nUPD( 0 );
+   sal_Int32 nBuildId( 0 );
+   if ( rImport.getBuildIds( nUPD, nBuildId ) 
+   ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 
300 ) ||
+ ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD == 
340 ) ||
+ ( nUPD == 350  nBuildId  202 ) ) )
+{
+bWrongPositionAfterZ = true;
+}
+
 // convert string to polygon
 basegfx::B2DPolyPolygon aPoly;
-basegfx::tools::importFromSvgD(aPoly,msString);
+basegfx::tools::importFromSvgD(aPoly,msString,bWrongPositionAfterZ);
 
 mbIsCurve = aPoly.areControlPointsUsed();
 mbIsClosed = aPoly.isClosed();
diff

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 3 commits - Repository.mk vcl/Executable_ui-previewer.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/Package_inc.mk vcl/qa vcl/source vcl/unx

2012-03-26 Thread Caolán McNamara 
 Repository.mk |1 
 vcl/Executable_ui-previewer.mk|   58 +
 vcl/Library_vcl.mk|2 
 vcl/Module_vcl.mk |1 
 vcl/Package_inc.mk|1 
 vcl/inc/vcl/builder.hxx   |   53 
 vcl/qa/cppunit/builder/demo.ui|   72 +++
 vcl/source/uipreviewer/previewer.cxx  |   93 +++
 vcl/source/window/builder.cxx |  208 ++
 vcl/unx/generic/plugadapt/salplug.cxx |   15 +-
 10 files changed, 499 insertions(+), 5 deletions(-)

New commits:
commit ceda7a38206766aa20db3fca391a0835a2a8b9eb
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 26 12:16:40 2012 +0100

add header

diff --git a/vcl/source/uipreviewer/previewer.cxx 
b/vcl/source/uipreviewer/previewer.cxx
index 9b5fa91..9f3bdb2 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -1,4 +1,31 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *Caolán McNamara caol...@redhat.com (Red Hat, Inc.)
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Caolán McNamara caol...@redhat.com
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
 #include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/lang/XMultiComponentFactory.hpp
 #include com/sun/star/lang/XMultiServiceFactory.hpp
commit f9ba39d2136f21fbdb45f40814592f303bdb8ace
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 26 12:15:22 2012 +0100

bootstrap a ui-previewer for rendering GtkBuilder xml with vcl widgets

diff --git a/Repository.mk b/Repository.mk
index 8e9b6d9..1b0f0c1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
kdefilepicker \
) \
+   ui-previewer \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
new file mode 100644
index 000..0bad665
--- /dev/null
+++ b/vcl/Executable_ui-previewer.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara caol...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,ui-previewer))
+
+$(eval $(call gb_Executable_set_include,ui-previewer,\
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_add_api,ui-previewer,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,ui-previewer,\
+vclmain \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,ui-previewer,\
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+tl \
+ucbhelper \
+vcl \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,ui-previewer,\
+vcl/source/uipreviewer/previewer \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index

[Libreoffice-commits] .: vcl/unx

2012-03-26 Thread Caolán McNamara 
 vcl/unx/generic/plugadapt/salplug.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit adf7d6e17334391459343d1f96c152872ce6e704
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 26 09:55:29 2012 +0100

configuration checked before component context exists

in simple applications, e.g. spadmin, which don't have a custom main, then 
this
configuration check happens too early before Application::Main gets run to 
have
a chance to set the ProcessComponentContext.

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 6bc7d89..b92c8c7 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,6 +28,8 @@
 
 #include officecfg/Office/Common.hxx
 
+#include comphelper/processfactory.hxx
+
 #include osl/module.h
 #include osl/process.h
 
@@ -54,11 +56,14 @@ static SalInstance* tryInstance( const OUString 
rModuleBase, bool bForce = fals
 {
 SalInstance* pInst = NULL;
 #if !defined(ANDROID)
-// Disable gtk3 plugin load except in experimental mode for now.
-if( !bForce 
-rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( gtk3 ) ) 
-!officecfg::Office::Common::Misc::ExperimentalMode::get() )
-return NULL;
+if (!bForce  
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk3)))
+{
+// Disable gtk3 plugin load except in experimental mode for now.
+using namespace com::sun::star;
+uno::Reference uno::XComponentContext  xContext = 
comphelper::getProcessComponentContext();
+if (!xContext.is() || 
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
+return NULL;
+}
 #endif
 OUStringBuffer aModName( 128 );
 aModName.appendAscii( SAL_DLLPREFIXvclplug_ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - extras/source

2012-03-26 Thread Fridrich Strba 
 extras/source/palettes/standard.soe |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5ce6fc0ff62c8a1dbe6ae22300639ccb1d4900ba
Author: Regina Henschel rb.hensc...@t-online.de
Date:   Sun Mar 25 21:12:52 2012 +0200

Adapt arrowhead pathes to corrected svg path z hangling

Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch

diff --git a/extras/source/palettes/standard.soe 
b/extras/source/palettes/standard.soe
index 5a8acd9..4b576b1 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -13,11 +13,11 @@
   draw:marker draw:name=Square 45 svg:viewBox=0 0 1131 1131 svg:d=m0 564 
564 567 567-567-567-564z /
   draw:marker draw:name=Arrow concave svg:viewBox=0 0 1131 1580 
svg:d=m1013 1491 118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 
153 46z/draw:marker
   draw:marker draw:name=Short line Arrow svg:viewBox=0 0 3000 3000 
svg:d=m1500 0 1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 
2392h-114v-211z/draw:marker
-  draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 0 1500 3000h-3000zm1500-2553-1176 2353h2353z/draw:marker
-  draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 
svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm1500-2553-1276 2553 1276 2553 
1276-2553z/draw:marker
+  draw:marker draw:name=Triangle unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 0 1500 3000h-3000zm0 447-1176 2353h2353z/draw:marker
+  draw:marker draw:name=Diamond unfilled svg:viewBox=0 0 3000 6000 
svg:d=m1500 0 1500 3000-1500 3000-1500-3000zm0 447-1276 2553 1276 2553 
1276-2553z/draw:marker
   draw:marker draw:name=Diamond svg:viewBox=0 0 3000 6000 svg:d=m1500 0 
1500 3000-1500 3000-1500-3000z/draw:marker
   draw:marker draw:name=Circle unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 
201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 
201 750-63 511-201 750-310 411-549 549-474 201-750 201zm0-200c-239 
0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 
476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 
174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z/draw:marker
-  draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm-1500 1215-1215-1215 1215-1215 
1215 1215z/draw:marker
-  draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 
0h300v300h-300zm20-280h260v260h-260z/draw:marker
+  draw:marker draw:name=Square 45 unfilled svg:viewBox=0 0 3000 3000 
svg:d=m1500 3000-1500-1500 1500-1500 1500 1500zm0-285 -1215-1215 1215-1215 
1215 1215z/draw:marker
+  draw:marker draw:name=Square unfilled svg:viewBox=0 0 300 300 svg:d=m0 
0h300v300h-300zm20 20h260v260h-260z/draw:marker
   draw:marker draw:name=Half Circle unfilled svg:viewBox=0 0 15000 8746 
svg:d=m14971 0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 
1206-761 1804-345 597-733 1110-1183 1560-451 450-964 837-1562 1182-598 345-1190 
596-1806 760-600 161-1223 240-1894 
244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760-598-345--732-1562-1182-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943
 0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 
151 566 383 1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 
550 317 1095 548 1661 700 566 151 1154 223 1789 223s1223-72 1789-223c566-152 
-383 1661-700 550-318 1023-673 1438-1087 414-415 770-887 1088-1437 317-549 
549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z /
 /office:marker-table
\ No newline at end of file
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sd/source

2012-03-26 Thread Caolán McNamara 
 sd/source/ui/slideshow/slideshowimpl.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 24b867c1e1d2264ff138d4eafa9791fcd1191160
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 26 13:53:55 2012 +0100

Resolves: rhbz#806663 SlideshowImpl can outlive SdModule (somehow)

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3bc8dc1..ed9d76d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -593,7 +593,10 @@ SlideshowImpl::SlideshowImpl( const Reference 
XPresentation2  xPresentation,
 
 SlideshowImpl::~SlideshowImpl()
 {
-SdOptions* pOptions = SD_MOD()-GetSdOptions(DOCUMENT_TYPE_IMPRESS);
+SdModule *pModule = SD_MOD();
+//rhbz#806663 SlideshowImpl can outlive SdModule
+SdOptions* pOptions = pModule ?
+pModule-GetSdOptions(DOCUMENT_TYPE_IMPRESS) : NULL;
 if( pOptions )
 {
 pOptions-SetPresentationPenColor(mnUserPaintColor);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - avmedia/source basic/source canvas/source chart2/source comphelper/inc

2012-03-26 Thread Takeshi Abe 
 avmedia/source/gstreamer/gstcommon.hxx  |1 -
 avmedia/source/quicktime/quicktimecommon.hxx|1 -
 avmedia/source/win/wincommon.hxx|1 -
 basic/source/inc/namecont.hxx   |5 -
 canvas/source/vcl/impltools.hxx |1 -
 chart2/source/inc/WrappedPropertySet.hxx|5 +
 chart2/source/tools/RegressionCalculationHelper.hxx |1 -
 comphelper/inc/comphelper/accessibleselectionhelper.hxx |1 -
 comphelper/inc/comphelper/stillreadwriteinteraction.hxx |1 -
 9 files changed, 1 insertion(+), 16 deletions(-)

New commits:
commit 6749dcc15442abc86dd473eac0885106238e8eb1
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Mar 26 22:30:53 2012 +0900

removed duplicate includes in basic / canvas / chart2 / comphelper

diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 833fc81..bf7b3bf 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -61,18 +61,13 @@
 #include cppuhelper/weakref.hxx
 #include cppuhelper/component.hxx
 #include cppuhelper/typeprovider.hxx
-#include cppuhelper/interfacecontainer.hxx
 #include cppuhelper/basemutex.hxx
 #include sot/storage.hxx
 #include comphelper/listenernotification.hxx
 #include xmlscript/xmllib_imexp.hxx
-#include com/sun/star/deployment/XPackage.hpp
 
 #include cppuhelper/implbase2.hxx
-#include cppuhelper/compbase8.hxx
 #include cppuhelper/compbase9.hxx
-#include cppuhelper/interfacecontainer.hxx
-#include com/sun/star/script/vba/XVBACompatibility.hpp
 
 class BasicManager;
 
diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 8b9293a..0dcc70f 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.hxx
@@ -30,7 +30,6 @@
 #define _VCLCANVAS_TOOLS_HXX
 
 #include osl/mutex.hxx
-#include osl/mutex.hxx
 
 #include vcl/svapp.hxx
 #include vcl/outdev.hxx
diff --git a/chart2/source/inc/WrappedPropertySet.hxx 
b/chart2/source/inc/WrappedPropertySet.hxx
index 74bbd14..e786e73 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -38,10 +38,7 @@
 #include com/sun/star/beans/Property.hpp
 #include cppuhelper/implbase4.hxx
 
-// header for class OPropertyArrayHelper
-#include cppuhelper/propshlp.hxx
-
-// header for class OMultiTypeInterfaceContainerHelperInt32
+// header for class OPropertyArrayHelper, 
OMultiTypeInterfaceContainerHelperInt32
 #include cppuhelper/propshlp.hxx
 
 #include vector
diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx 
b/chart2/source/tools/RegressionCalculationHelper.hxx
index ab634de..4fdb08c 100644
--- a/chart2/source/tools/RegressionCalculationHelper.hxx
+++ b/chart2/source/tools/RegressionCalculationHelper.hxx
@@ -33,7 +33,6 @@
 #include utility
 #include functional
 #include vector
-#include rtl/math.hxx
 
 #define NUMBER_TO_STR(number) 
(::rtl::OStringToOUString(::rtl::math::doubleToString( \
   number, rtl_math_StringFormat_G, 4, '.', true 
),RTL_TEXTENCODING_ASCII_US ))
diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx 
b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
index 73b446f..31483d3 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
@@ -32,7 +32,6 @@
 #include comphelper/uno3.hxx
 #include comphelper/accessiblecomponenthelper.hxx
 #include cppuhelper/implbase1.hxx
-#include comphelper/uno3.hxx
 #include com/sun/star/accessibility/XAccessibleSelection.hpp
 #include comphelper/comphelperdllapi.h
 
diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx 
b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
index 5ad07f2..43ee85d 100644
--- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
+++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx
@@ -35,7 +35,6 @@
 
 #include com/sun/star/task/XInteractionHandler.hpp
 
-#include ucbhelper/interceptedinteraction.hxx
 #include comphelper/comphelperdllapi.h
 
 //___
commit 3397f7cf382f711bed5a8416d34a688156a64b4a
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Mar 26 22:28:51 2012 +0900

removed duplicate includes in avmedia

diff --git a/avmedia/source/gstreamer/gstcommon.hxx 
b/avmedia/source/gstreamer/gstcommon.hxx
index 18909e3..021eb74 100644
--- a/avmedia/source/gstreamer/gstcommon.hxx
+++ b/avmedia/source/gstreamer/gstcommon.hxx
@@ -44,7 +44,6 @@
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/registry/XRegistryKey.hpp
-#include com/sun/star/lang/XComponent.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
 #include com/sun/star/awt/Rectangle.hpp
 #include com/sun/star/awt/KeyModifier.hpp
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx 
b/avmedia/source/quicktime/quicktimecommon.hxx
index

[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - sc/source tubes/inc tubes/qa tubes/source

2012-03-26 Thread Will Thompson 
 sc/source/ui/collab/collab.cxx   |4 +--
 sc/source/ui/collab/sendfunc.cxx |5 ++--
 sc/source/ui/inc/collab.hxx  |2 -
 tubes/inc/tubes/manager.hxx  |7 --
 tubes/qa/test_manager.cxx|4 +--
 tubes/source/manager.cxx |   40 ---
 6 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit 602fae9a0d2984790b1c5be8ac607990f4168202
Author: Will Thompson will.thomp...@collabora.co.uk
Date:   Mon Mar 26 14:40:17 2012 +0100

tubes: work around “We are supposed to handle only one channel” bug.

This is the bug which breaks the first request after the offerer signed
in.

diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index c75e3c1..8ba3a02 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -221,6 +221,8 @@ public:
 static void TransferDone( EmpathyFTHandler *handler, 
TpFileTransferChannel *, gpointer user_data);
 
 private:
+voidensureLegacyChannel( TpAccount* pAccount, 
TpContact* pBuddy );
+
 TeleConferenceVectormaConferences;
 
 boolmbAcceptIncoming;
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 21d0d41..73895f9 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -592,11 +592,41 @@ bool TeleManager::startGroupSession( const rtl::OUString 
rUConferenceRoom, cons
 #endif
 
 
+void TeleManager::ensureLegacyChannel( TpAccount* pAccount, TpContact* pBuddy )
+{
+/* This is a workaround for a Telepathy bug.
+ * https://bugs.freedesktop.org/show_bug.cgi?id=47760. The first time you
+ * request a tube to a contact on an account, you actually get two channels
+ * back: the tube you asked for, along with a legacy Channel.Type.Tubes
+ * object. This breaks create_and_handle_channel_async(), which expects to
+ * only get one channel back.
+ *
+ * To work around this, we make sure the legacy Tubes channel already
+ * exists before we request the channel we actually want. We don't actually
+ * have to wait for this request to succeed—we fire it off and forget 
about
+ * it.
+ */
+GHashTable* pRequest = tp_asv_new(
+TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, 
TP_IFACE_CHANNEL_TYPE_TUBES,
+TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, TP_TYPE_HANDLE, 
TP_HANDLE_TYPE_CONTACT,
+TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, 
tp_contact_get_identifier (pBuddy),
+NULL);
+TpAccountChannelRequest* pChannelRequest = tp_account_channel_request_new(
+pAccount, pRequest, TP_USER_ACTION_TIME_NOT_USER_ACTION);
+tp_account_channel_request_ensure_channel_async( pChannelRequest, NULL,
+NULL, NULL, NULL );
+g_object_unref( pChannelRequest );
+g_hash_table_unref( pRequest );
+}
+
+
 /* TODO: factor out common code with startGroupSession() */
 bool TeleManager::startBuddySession( TpAccount *pAccount, TpContact *pBuddy )
 {
 INFO_LOGGER( TeleManager::startBuddySession);
 
+ensureLegacyChannel( pAccount, pBuddy );
+
 OString aSessionId( TeleManager::createUuid());
 
 TeleConferencePtr pConference( new TeleConference( this, NULL, NULL, 
aSessionId));
commit 2ab2ac613510cf16c4cdfb8f2ac31815de56956e
Author: Will Thompson will.thomp...@collabora.co.uk
Date:   Mon Mar 26 14:22:25 2012 +0100

tubes: quick hack to allow running two instances

To record a screencast, I wanted to get two instances of LibreOffice
running in the same session. But the Client object(s) claim D-Bus names,
so initializing the second instance failed.

This patch changes things so that if LIBO_TUBES=master, no Client
objects are created. As a result, only the slave can receive files.

diff --git a/sc/source/ui/collab/collab.cxx b/sc/source/ui/collab/collab.cxx
index 4c02045..a03f4f8 100644
--- a/sc/source/ui/collab/collab.cxx
+++ b/sc/source/ui/collab/collab.cxx
@@ -66,9 +66,9 @@ void ScCollaboration::packetReceivedCallback( TeleConference 
*pConference, TeleP
 sigPacketReceived( pConference, aString);
 }
 
-bool ScCollaboration::initManager()
+bool ScCollaboration::initManager(bool bAcceptIncoming)
 {
-mpManager = TeleManager::get();
+mpManager = TeleManager::get(bAcceptIncoming);
 mpManager-sigPacketReceived.connect(
 boost::bind( ScCollaboration::packetReceivedCallback, this, _1, _2 ));
 mpManager-connect();
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index 0f74209..3dddabf 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -557,8 +557,9 @@ SC_DLLPRIVATE ScDocFunc *ScDocShell::CreateDocFunc()
 boost::bind( ScDocFuncRecv::packetReceived, pReceiver, _1, _2 ));
 pCollab-sigFileReceived.connect(
 boost::bind( ScDocFuncRecv::fileReceived, pReceiver, _1));
-bOk = bOk  pCollab-initManager();
-

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-03-26 Thread Caolán McNamara 
 sw/source/core/edit/edundo.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4822b5312b61c1b7991ad028c4c43a2d8fce513f
Author: Michael Stahl mst...@redhat.com
Date:   Thu Mar 22 23:03:05 2012 +0100

fdo#39003: fix autoformat Undo cursors:

SwEditShell::Undo: Because the Undo actions nowadays create new shell
cursors directly (while previously they worked on a SwUndoIter), it is
necessary to remove the shell cursor ring before Pop() because Pop(false)
only restores the current cursor from the stack, not the rest of the ring.
(regression from CWS undoapi, 1ba0c1878116ada5dc4ebdecdb1e0a3da9758547)
(cherry picked from commit f24153cded54954da7f0d80941707715c78e4627)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 7b2ae83..118b3f9 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -142,6 +142,10 @@ bool SwEditShell::Undo(sal_uInt16 const nCount)
 .getStr());
 }
 
+if (bRestoreCrsr)
+{   // fdo#39003 Pop does not touch the rest of the cursor ring
+KillPams(); // so call this first to get rid of unwanted cursors
+}
 Pop( !bRestoreCrsr );
 
 GetDoc()-SetRedlineMode( eOld );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - scaddins/source unusedcode.easy vcl/inc vcl/source

2012-03-26 Thread Caolán McNamara 
 scaddins/source/datefunc/datefunc.cxx |   17 -
 scaddins/source/datefunc/datefunc.hxx |1 -
 unusedcode.easy   |2 --
 vcl/inc/vcl/scrbar.hxx|1 -
 vcl/source/control/scrbar.cxx |   10 --
 5 files changed, 31 deletions(-)

New commits:
commit 564d216f77b7964a1a60995632131c80b4c1938f
Author: Santiago Martinez smvar...@gmail.com
Date:   Fri Mar 23 22:05:00 2012 +0100

Remove unused code in vlc.

diff --git a/unusedcode.easy b/unusedcode.easy
index 16f1f50..3376da1 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -110,7 +110,6 @@ ScVbaFormatooo::vba::excel::XStyle::getXServiceInfo()
 ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any 
const)
 
ScVbaFormatooo::vba::excel::XStyle::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const)
 
ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Referenceooo::vba::XHelperInterface
 const, com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext 
const)
-ScrollBarBox::ScrollBarBox(Window*, ResId const)
 ScrollableWindow::MakeVisible(Rectangle const, unsigned char)
 SectReprArr::Insert(SectRepr* const, unsigned short)
 SectReprArr::Insert(SectRepr* const*, unsigned short)
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 36c31b6..a3bf0ef 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -162,7 +162,6 @@ private:
 
 public:
 ScrollBarBox( Window* pParent, WinBits nStyle = 0 );
-ScrollBarBox( Window* pParent, const ResId rResId );
 
 virtual voidStateChanged( StateChangedType nType );
 virtual voidDataChanged( const DataChangedEvent rDCEvt );
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index d2611c6..44a093b 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1536,16 +1536,6 @@ ScrollBarBox::ScrollBarBox( Window* pParent, WinBits 
nStyle ) :
 
 // ---
 
-ScrollBarBox::ScrollBarBox( Window* pParent, const ResId rResId ) :
-Window( WINDOW_SCROLLBARBOX )
-{
-rResId.SetRT( RSC_SCROLLBAR );
-ImplInit( pParent, ImplInitRes( rResId ) );
-ImplLoadRes( rResId );
-}
-
-// ---
-
 void ScrollBarBox::ImplInitSettings()
 {
 // Hack, damit man auch DockingWindows ohne Hintergrund bauen kann
commit 6539ea5335b7904125c40e42b030ebdebe5614d6
Author: Santiago Martinez smvar...@gmail.com
Date:   Fri Mar 23 21:37:59 2012 +0100

Remove unused code in scaddins.

diff --git a/scaddins/source/datefunc/datefunc.cxx 
b/scaddins/source/datefunc/datefunc.cxx
index 4ae9543..6ba6d44 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -83,23 +83,6 @@ void ScaList::_Grow()
 pData = pNewData;
 }
 
-void ScaList::Insert( void* pNew, sal_uInt32 nIndex )
-{
-if( nIndex = nCount )
-Append( pNew );
-else
-{
-Grow();
-
-void** pIns = pData + nIndex;
-memmove( pIns + 1, pIns, (nCount - nIndex) * sizeof( void* ) );
-
-*pIns = pNew;
-nCount++;
-}
-}
-
-
 //--
 
 ScaStringList::~ScaStringList()
diff --git a/scaddins/source/datefunc/datefunc.hxx 
b/scaddins/source/datefunc/datefunc.hxx
index fae7983..61ba8da 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -76,7 +76,6 @@ public:
 inline void*Next()  { return (nCurr + 1  nCount) ? pData[ 
++nCurr ] : NULL; }
 
 inline void Append( void* pNew );
-voidInsert( void* pNew, sal_uInt32 nIndex );
 };
 
 
diff --git a/unusedcode.easy b/unusedcode.easy
index eb72ea1..16f1f50 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -110,7 +110,6 @@ ScVbaFormatooo::vba::excel::XStyle::getXServiceInfo()
 ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any 
const)
 
ScVbaFormatooo::vba::excel::XStyle::setNumberFormat(com::sun::star::lang::Locale,
 rtl::OUString const)
 
ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Referenceooo::vba::XHelperInterface
 const, com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext 
const)
-ScaList::Insert(void*, unsigned int)
 ScrollBarBox::ScrollBarBox(Window*, ResId const)
 ScrollableWindow::MakeVisible(Rectangle const, unsigned char)
 SectReprArr::Insert(SectRepr* const, unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unusedcode.easy xmloff/inc xmloff/source

2012-03-26 Thread Caolán McNamara 
 unusedcode.easy |2 --
 xmloff/inc/xmloff/xmlerror.hxx  |   12 
 xmloff/source/core/xmlerror.cxx |   17 -
 3 files changed, 31 deletions(-)

New commits:
commit c576a5c48353c0b5432d5ef918bfd14f6d7fd100
Author: Santiago Martinez smvar...@gmail.com
Date:   Sat Mar 24 01:01:49 2012 +0100

Remove unused code in xmloff.

diff --git a/unusedcode.easy b/unusedcode.easy
index 3376da1..767d6d2 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -334,8 +334,6 @@ Window::PostUserEvent(unsigned long, unsigned long, void*)
 X11SalGraphics::SetMask(int, int, unsigned int, unsigned int, int, int, 
unsigned long)
 
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface)
 XMLElement::Equals(rtl::OUString)
-XMLErrors::AddRecord(int, com::sun::star::uno::Sequencertl::OUString const)
-XMLErrors::AddRecord(int, com::sun::star::uno::Sequencertl::OUString const, 
rtl::OUString const)
 XMLFamilyDataList_Impl::GetPos(XMLFamilyData_Impl const*) const
 XMLFamilyDataList_Impl::Remove(XMLFamilyData_Impl*)
 XMLFontAutoStylePoolNames_Impl::GetPos(rtl::OUString const*) const
diff --git a/xmloff/inc/xmloff/xmlerror.hxx b/xmloff/inc/xmloff/xmlerror.hxx
index 46595f6..b5fbbd8 100644
--- a/xmloff/inc/xmloff/xmlerror.hxx
+++ b/xmloff/inc/xmloff/xmlerror.hxx
@@ -143,18 +143,6 @@ public:
 const ::com::sun::star::uno::Reference
  ::com::sun::star::xml::sax::XLocator  rLocator); /// 
location
 
-void AddRecord(
-sal_Int32 nId, /// error ID == error flags + error class + error number
-const ::com::sun::star::uno::Sequence
-  ::rtl::OUString  rParams,  /// parameters for error message
-const ::rtl::OUString rExceptionMessage); /// original exception 
string
-
-void AddRecord(
-sal_Int32 nId, /// error ID == error flags + error class + error number
-const ::com::sun::star::uno::Sequence
-  ::rtl::OUString  rParams); /// parameters for error message
-
-
 /**
  * throw a SAXParseException that describes the first error that matches
  * the given mask
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 10c437b..8d765d2 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -216,23 +216,6 @@ void XMLErrors::AddRecord(
 }
 }
 
-void XMLErrors::AddRecord(
-sal_Int32 nId,
-const SequenceOUString  rParams,
-const OUString rExceptionMessage)
-{
-OUString sEmpty;
-AddRecord( nId, rParams, rExceptionMessage, -1, -1, sEmpty, sEmpty );
-}
-
-void XMLErrors::AddRecord(
-sal_Int32 nId,
-const SequenceOUString  rParams)
-{
-OUString sEmpty;
-AddRecord( nId, rParams, sEmpty, -1, -1, sEmpty, sEmpty );
-}
-
 void XMLErrors::ThrowErrorAsSAXException(sal_Int32 nIdMask)
 throw( SAXParseException )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svtools/source

2012-03-26 Thread Caolán McNamara 
 svtools/source/filter/wmf/winmtf.cxx |   23 ---
 svtools/source/filter/wmf/winmtf.hxx |3 ---
 2 files changed, 26 deletions(-)

New commits:
commit 6bc1f24ceb2152e791301cd80ed579c26d275a69
Author: Santiago Martinez smvar...@gmail.com
Date:   Sun Mar 25 18:24:32 2012 +0200

Remove unused code in svtools.

diff --git a/svtools/source/filter/wmf/winmtf.cxx 
b/svtools/source/filter/wmf/winmtf.cxx
index 090886e..d9597ff 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -658,13 +658,6 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex )
 
 
//---
 
-void WinMtfOutput::SetFont( const Font rFont )
-{
-maFont = rFont;
-}
-
-//---
-
 const Font WinMtfOutput::GetFont() const
 {
 return maFont;
@@ -679,13 +672,6 @@ void WinMtfOutput::SetTextLayoutMode( const sal_uInt32 
nTextLayoutMode )
 
 
//---
 
-sal_uInt32 WinMtfOutput::GetTextLayoutMode() const
-{
-return mnTextLayoutMode;
-}
-
-//---
-
 void WinMtfOutput::SetBkMode( sal_uInt32 nMode )
 {
 mnBkMode = nMode;
@@ -1151,15 +1137,6 @@ void WinMtfOutput::LineTo( const Point rPoint, sal_Bool 
bRecordPath )
 
 
//---
 
-void WinMtfOutput::DrawLine( const Point rSource, const Point rDest )
-{
-UpdateClipRegion();
-UpdateLineStyle();
-mpGDIMetaFile-AddAction( new MetaLineAction( ImplMap( rSource), ImplMap( 
rDest ), maLineStyle.aLineInfo ) );
-}
-
-//---
-
 void WinMtfOutput::DrawRect( const Rectangle rRect, sal_Bool bEdge )
 {
 UpdateClipRegion();
diff --git a/svtools/source/filter/wmf/winmtf.hxx 
b/svtools/source/filter/wmf/winmtf.hxx
index 6f5e778..bf81be5 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -696,10 +696,8 @@ public:
 voidSelectObject( sal_Int32 nIndex );
 CharSet GetCharSet(){ return maFont.GetCharSet(); };
 WinMtfFillStyleGetFillStyle () { return maFillStyle; }
-voidSetFont( const Font rFont );
 const Font GetFont() const;
 voidSetTextLayoutMode( const sal_uInt32 nLayoutMode );
-sal_uInt32  GetTextLayoutMode() const;
 
 voidClearPath(){ aPathObj.Init(); };
 voidClosePath(){ aPathObj.ClosePath(); };
@@ -708,7 +706,6 @@ public:
 voidMoveTo( const Point rPoint, sal_Bool bRecordPath = 
sal_False );
 voidLineTo( const Point rPoint, sal_Bool bRecordPath = 
sal_False );
 voidDrawPixel( const Point rSource, const Color rColor );
-voidDrawLine( const Point rSource, const Point rDest );
 voidDrawRect( const Rectangle rRect, sal_Bool bEdge = 
sal_True );
 voidDrawRoundRect( const Rectangle rRect, const Size 
rSize );
 voidDrawEllipse( const Rectangle rRect );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-03-26 Thread Kohei Yoshida 
 sw/source/core/inc/frmtool.hxx |2 +-
 sw/source/core/layout/calcmove.cxx |4 ++--
 sw/source/core/layout/fly.cxx  |   10 +-
 sw/source/core/layout/frmtool.cxx  |   16 
 sw/source/core/layout/laycache.cxx |4 ++--
 sw/source/core/layout/pagechg.cxx  |4 ++--
 sw/source/core/layout/tabfrm.cxx   |6 +++---
 sw/source/core/text/txtfly.cxx |2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 19648377e1e4ad5c8c342dc45aeaca83f91b4b27
Author: Nicolas Christener nicolas.christe...@adfinis-sygroup.ch
Date:   Wed Mar 21 23:26:30 2012 +0100

Rename WEIT_WECH to FAR_AWAY

diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index ba1b0f4..e31d8b9 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -56,7 +56,7 @@ struct SwFindRowSpanCacheObj;
 #define MA_FASTCALL
 #endif
 
-#define WEIT_WECH   LONG_MAX - 2//Initale Position der Flys.
+#define FAR_AWAY   LONG_MAX - 2//Initale Position der Flys.
 #define BROWSE_HEIGHT   56700L * 10L   //10 Meter
 
 #define GRFNUM_NO 0
diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index 33e6722..eeccc20 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -669,7 +669,7 @@ void lcl_CheckObjects( SwSortedObjs* pSortedObjs, SwFrm* 
pFrm, long rBot )
 if ( pObj-ISA(SwFlyFrm) )
 {
 SwFlyFrm *pFly = static_castSwFlyFrm*(pObj);
-if( pFly-Frm().Top() != WEIT_WECH 
+if( pFly-Frm().Top() != FAR_AWAY 
 ( pFrm-IsPageFrm() ? pFly-IsFlyLayFrm() :
   ( pFly-IsFlyAtCntFrm() 
 ( pFrm-IsBodyFrm() ? pFly-GetAnchorFrm()-IsInDocBody() :
@@ -1012,7 +1012,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs 
rAttrs )
 SwAnchoredObject* pObj = (*GetDrawObjs())[i];
 const SwFrmFmt rFmt = pObj-GetFrmFmt();
 const sal_Bool bFly = pObj-ISA(SwFlyFrm);
-if ((bFly  (WEIT_WECH == pObj-GetObjRect().Width()))
+if ((bFly  (FAR_AWAY == pObj-GetObjRect().Width()))
 || rFmt.GetFrmSize().GetWidthPercent())
 {
 continue;
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index b6e7b1f..cc7c170 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -192,7 +192,7 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm 
*pAnch ) :
 
 //Und erstmal in den Wald stellen die Kiste, damit bei neuen Dokument nicht
 //unnoetig viel formatiert wird.
-Frm().Pos().X() = Frm().Pos().Y() = WEIT_WECH;
+Frm().Pos().X() = Frm().Pos().Y() = FAR_AWAY;
 }
 
 // OD 2004-01-19 #110582#
@@ -1339,7 +1339,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 
 if ( !bValidSize )
 {
-if ( Frm().Top() == WEIT_WECH  Frm().Left() == WEIT_WECH )
+if ( Frm().Top() == FAR_AWAY  Frm().Left() == FAR_AWAY )
 {
 //Sicherheitsschaltung wegnehmen (siehe SwFrm::CTor)
 Frm().Pos().X() = Frm().Pos().Y() = 0;
@@ -1414,7 +1414,7 @@ void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
 // OD 06.11.2003 #i22305# - consider
 // only Writer fly frames, which follow the text 
flow.
 if ( pFly-IsFlyLayFrm() 
- pFly-Frm().Top() != WEIT_WECH 
+ pFly-Frm().Top() != FAR_AWAY 
  
pFly-GetFmt()-GetFollowTextFlow().GetValue() )
 {
 SwTwips nDist = -(pFly-Frm().*fnRect-
@@ -2149,7 +2149,7 @@ void SwFrm::AppendFly( SwFlyFrm *pNew )
 SwPageFrm *pPage = FindPageFrm();
 if ( pPage )
 {
-if ( pNew-IsFlyAtCntFrm()  pNew-Frm().Top() == WEIT_WECH )
+if ( pNew-IsFlyAtCntFrm()  pNew-Frm().Top() == FAR_AWAY )
 {
 //Versuch die Seitenformatierung von neuen Dokumenten etwas
 //guenstiger zu gestalten.
@@ -2424,7 +2424,7 @@ void SwLayoutFrm::NotifyLowerObjs( const bool 
_bUnlockPosOfObjs )
 {
 SwFlyFrm* pFly = static_castSwFlyFrm*(pObj);
 
-if ( pFly-Frm().Left() == WEIT_WECH )
+if ( pFly-Frm().Left() == FAR_AWAY )
 continue;
 
 if ( pFly-IsAnLower( this ) )
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index c19dbf7..fe42863 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -692,7 +692,7 @@ SwFlyNotify::~SwFlyNotify()
 {
 pFly-NotifyDrawObj();
 }
-if ( bPosChgd  aFrm.Pos().X() != WEIT_WECH )
+if ( bPosChgd  aFrm.Pos().X() != FAR_AWAY )
 {

[Libreoffice-commits] .: 2 commits - oox/source sc/source unusedcode.easy vcl/generic

2012-03-26 Thread Caolán McNamara 
 oox/source/ole/vbaprojectfilter.cxx   |   13 -
 sc/source/filter/inc/biffinputstream.hxx  |   27 ---
 sc/source/filter/inc/biffoutputstream.hxx |5 --
 sc/source/filter/inc/drawingmanager.hxx   |4 -
 sc/source/filter/oox/biffdetector.cxx |5 --
 sc/source/filter/oox/biffinputstream.cxx  |   11 
 sc/source/filter/oox/biffoutputstream.cxx |   16 --
 sc/source/filter/oox/drawingmanager.cxx   |   71 --
 sc/source/filter/oox/excelfilter.cxx  |   27 ---
 sc/source/filter/oox/ooxformulaparser.cxx |5 --
 unusedcode.easy   |   13 -
 vcl/generic/print/text_gfx.cxx|   31 ++---
 12 files changed, 7 insertions(+), 221 deletions(-)

New commits:
commit 7d6656addebcaec4f8873e4a611a970a224a7bf5
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Mar 26 15:29:54 2012 +0100

merge getVerticalDeltaAngle and GetVerticalFlags

diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 06dbf7d..a270ac2 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -87,31 +87,12 @@ Font3::Font3(const PrinterGfx rGfx)
 
 static int getVerticalDeltaAngle( sal_Unicode nChar )
 {
-int nAngle = 0;
-if( ( nChar = 0x1100  nChar  0x11fa ) ||
-( nChar = 0x3000  nChar  0xfb00 ) ||
-( nChar = 0xfe20  nChar  0xfe70 ) ||
-( nChar = 0xff00  nChar  0xff64 )
-)
-{
-/* #i52932# remember:
- nChar == 0x2010 || nChar == 0x2015
- nChar == 0x2016 || nChar == 0x2026
-
- are nAngle = 0 also, but already handled in the first if
-*/
-if( ( nChar = 0x3008  nChar  0x3019  nChar != 0x3012 ) ||
-nChar == 0xff3b || nChar == 0xff3d ||
-(nChar = 0xff6b  nChar  0xff64 ) ||
-nChar == 0xffe3
-)
-nAngle = 0;
-else if( nChar == 0x30fc )
-nAngle = -900;
-else
-nAngle = 900;
-}
-return nAngle;
+int nRotation = GetVerticalFlags(nChar);
+if (nRotation == GF_ROTR)
+return -900;
+if (nRotation == GF_ROTL)
+return 900;
+return 0;
 }
 
 void
commit 226d310c1a31238b7f07d8e7e42ec75f0280fba5
Author: Petr Vorel petr.vo...@gmail.com
Date:   Thu Mar 22 20:14:13 2012 +0100

remove unused code (oox)

diff --git a/oox/source/ole/vbaprojectfilter.cxx 
b/oox/source/ole/vbaprojectfilter.cxx
index e152598..f4698fa 100644
--- a/oox/source/ole/vbaprojectfilter.cxx
+++ b/oox/source/ole/vbaprojectfilter.cxx
@@ -77,19 +77,6 @@ OUString SAL_CALL 
WordVbaProjectFilter_getImplementationName() throw()
 return CREATE_OUSTRING( com.sun.star.comp.oox.WordVbaProjectFilter );
 }
 
-Sequence OUString  SAL_CALL WordVbaProjectFilter_getSupportedServiceNames() 
throw()
-{
-Sequence OUString  aSeq( 1 );
-aSeq[ 0 ] = CREATE_OUSTRING( com.sun.star.document.ImportFilter );
-return aSeq;
-}
-
-Reference XInterface  SAL_CALL WordVbaProjectFilter_createInstance(
-const Reference XComponentContext  rxContext ) throw( Exception )
-{
-return static_cast ::cppu::OWeakObject* ( new WordVbaProjectFilter( 
rxContext ) );
-}
-
 // 
 
 WordVbaProjectFilter::WordVbaProjectFilter( const Reference XComponentContext 
 rxContext ) throw( RuntimeException ) :
diff --git a/sc/source/filter/inc/biffinputstream.hxx 
b/sc/source/filter/inc/biffinputstream.hxx
index 9f01b02..47ee2b0 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -129,16 +129,7 @@ private:
 Trying to read over the record limits results in a stream error. The
 isValid() function indicates that by returning false. From now on the data
 returned by the read functions is undefined. The error state will be reset,
-if the record is reset (with the function resetRecord()), or if the next
-record is started.
-
-To switch off the automatic lookup of CONTINUE records, use resetRecord()
-with false parameter. This is useful e.g. on import of drawing layer data,
-where sometimes solely CONTINUE records will occur. The automatic lookup
-keeps switched off until the method resetRecord() is called with parameter
-true. All other settings done on the stream (e.g. alternative CONTINUE
-record identifier, enabled decryption, NUL substitution character) will be
-reset to default values, if a new record is started.
+if the next record is started.
 
 The import stream supports decrypting the stream data. The contents of a
 record (not the record header) will be encrypted by Excel if the file has
@@ -189,22 +180,6 @@ public:
  */
 boolstartRecordByHandle( sal_Int64 nRecHandle );
 
-/** Sets stream pointer to begin of record content.
-
-@param bContLookup
-Automatic CONTINUE lookup on/off. In difference to

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - 2 commits - basegfx/inc basegfx/source xmloff/inc xmloff/source

2012-03-26 Thread Petr Mladek 
 basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx |7 -
 basegfx/source/polygon/b2dsvgpolypolygon.cxx|4 +--
 xmloff/inc/xexptran.hxx |3 +-
 xmloff/source/draw/xexptran.cxx |   25 ++--
 xmloff/source/draw/ximp3dobject.cxx |3 --
 xmloff/source/draw/ximpshap.cxx |6 +---
 xmloff/source/style/MarkerStyle.cxx |3 --
 xmloff/source/text/XMLTextFrameContext.cxx  |3 --
 8 files changed, 38 insertions(+), 16 deletions(-)

New commits:
commit befb1c7e26b79ae97d802659f3386882d4044251
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Mar 26 12:55:44 2012 +0200

Compatibility option for incorrect relative moves after closePath 
(fdo#47406)

Signed-off-by: Thorsten Behrens tbehr...@suse.com
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx 
b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 37d2cb5..5a59c3a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -131,10 +131,15 @@ namespace basegfx
 @param rSvgDAttribute
 A valid SVG-D attribute string
 
+@param rWrongPositionAfterZ
+Indicates wheter the generator interprets wrongly
+the position in the path after Z or z elements
+https://bugs.freedesktop.org/show_bug.cgi?id=47406
+
 @return true, if the string was successfully parsed
  */
 BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon
o_rPolyPoly,
- const ::rtl::OUString rSvgDAttribute );
+ const ::rtl::OUString rSvgDAttribute, bool 
bWrongPositionAfterZ = false );
 
 /** Read poly-polygon from SVG.
 
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx 
b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 863adf5..2928364 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -210,7 +210,7 @@ namespace basegfx
 }
 }
 
-bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const 
::rtl::OUString  rSvgDStatement)
+bool importFromSvgD(B2DPolyPolygon o_rPolyPolygon, const 
::rtl::OUString  rSvgDStatement, bool bWrongPositionAfterZ)
 {
 o_rPolyPolygon.clear();
 const sal_Int32 nLen(rSvgDStatement.getLength());
@@ -241,7 +241,7 @@ namespace basegfx
 bIsClosed = true;
 
 // update current point - we're back at the start
-if( aCurrPoly.count() )
+if( aCurrPoly.count()  !bWrongPositionAfterZ)
 {
 const B2DPoint aFirst( aCurrPoly.getB2DPoint(0) );
 nLastX = aFirst.getX();
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 814ad2a..86883cf 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -36,6 +36,7 @@
 #include com/sun/star/awt/Size.hpp
 #include com/sun/star/drawing/HomogenMatrix.hpp
 #include tools/mapunit.hxx
+#include xmloff/xmlimp.hxx
 
 #include vector
 
@@ -171,7 +172,7 @@ public:
 const SdXMLImExViewBox rViewBox,
 const com::sun::star::awt::Point rObjectPos,
 const com::sun::star::awt::Size rObjectSize,
-const SvXMLUnitConverter rConv);
+const SvXMLImport rImport);
 
 void AddPolygon(
 com::sun::star::drawing::PointSequence* pPoints,
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index a2c46fe..e49d971 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -2122,7 +2122,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const 
OUString rNew,
 const SdXMLImExViewBox rViewBox,
 const awt::Point rObjectPos,
 const awt::Size rObjectSize,
-const SvXMLUnitConverter /*rConv*/)
+const SvXMLImport rImport)
 :   msString( rNew ),
 mrViewBox( rViewBox ),
 mbIsClosed( false ),
@@ -2131,9 +2131,20 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const 
OUString rNew,
 mnLastY( 0L ),
 maPoly()
 {
+bool bWrongPositionAfterZ( false );
+   sal_Int32 nUPD( 0 );
+   sal_Int32 nBuildId( 0 );
+   if ( rImport.getBuildIds( nUPD, nBuildId ) 
+   ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 
300 ) ||
+ ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD == 
340 ) ||
+ ( nUPD == 350  nBuildId  202 ) ) )
+{
+bWrongPositionAfterZ = true;
+}
+
 // convert string to polygon
 basegfx::B2DPolyPolygon aPoly;
-basegfx::tools::importFromSvgD(aPoly,msString);
+

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sw/inc sw/source

2012-03-26 Thread Petr Mladek 
 sw/inc/swtable.hxx|2 ++
 sw/source/core/table/swtable.cxx  |7 +++
 sw/source/filter/ww8/WW8TableInfo.cxx |3 +--
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c646eaa216842443bb9bf88caf22f1805006dcc9
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Mar 21 17:15:06 2012 +0100

fdo#45522: WW8TableInfo::processSwTable: check that table has layout
(cherry picked from commit 5c3dd5af41bc801ee6023513399c01c632dc7779)

Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index fb1d253..73df08c 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -326,6 +326,8 @@ public:
 #ifdef DBG_UTIL
 void CheckConsistency() const;
 #endif
+
+bool HasLayout() const;
 };
 
 class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index ae36c31..d961289 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2804,6 +2804,13 @@ void SwTable::RegisterToFormat( SwFmt rFmt )
 rFmt.Add( this );
 }
 
+bool SwTable::HasLayout() const
+{
+const SwFrmFmt* pFrmFmt = GetFrmFmt();
+//a table in a clipboard document doesn't have any layout information
+return pFrmFmt  SwIteratorSwTabFrm,SwFmt::FirstElement(*pFrmFmt);
+}
+
 void SwTableLine::RegisterToFormat( SwFmt rFmt )
 {
 rFmt.Add( this );
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx 
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 6171430..095c94b 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -631,8 +631,7 @@ void WW8TableInfo::processSwTable(const SwTable * pTable)
 
 WW8TableNodeInfo * pPrev = NULL;
 
-SwFrmFmt * pFrmFmt = pTable-GetFrmFmt();
-if (pFrmFmt != NULL  pTable-IsTblComplex())
+if (pTable-IsTblComplex()  pTable-HasLayout())
 {
 pPrev = processSwTableByLayout(pTable);
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - ucb/source

2012-03-26 Thread Petr Mladek 
 ucb/source/ucp/gvfs/gvfs_content.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c946784f3b58d357eb15d699e1376df0d6f938ac
Author: Daniel Mihalyi amidab...@gmail.com
Date:   Mon Feb 6 18:04:37 2012 +0100

In the current glib version only the main glib.h can be included directly.

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx 
b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 990ea9f..5c8e7aa 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -35,7 +35,7 @@
 #include com/sun/star/ucb/XContentCreator.hpp
 #include ucbhelper/contenthelper.hxx
 
-#include glib/gthread.h
+#include glib.h
 #include libgnomevfs/gnome-vfs-ops.h
 #include libgnomevfs/gnome-vfs-directory.h
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - ucb/source

2012-03-26 Thread Petr Mladek 
 ucb/source/ucp/gvfs/gvfs_content.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ba91e8f3ccd90a2e957885d3d0654dc48eed0b6
Author: Daniel Mihalyi amidab...@gmail.com
Date:   Mon Feb 6 18:04:37 2012 +0100

In the current glib version only the main glib.h can be included directly.

Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Fridrich Strba fridrich.st...@graduateinstitute.ch

diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx 
b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 990ea9f..5c8e7aa 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -35,7 +35,7 @@
 #include com/sun/star/ucb/XContentCreator.hpp
 #include ucbhelper/contenthelper.hxx
 
-#include glib/gthread.h
+#include glib.h
 #include libgnomevfs/gnome-vfs-ops.h
 #include libgnomevfs/gnome-vfs-directory.h
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - sc/source

2012-03-26 Thread Petr Mladek 
 sc/source/ui/cctrl/checklistmenu.cxx  |2 ++
 sc/source/ui/namedlg/namemgrtable.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 208d129b7214eaedfc3dd22f78330c099d680dd3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Mon Mar 26 04:58:47 2012 +0200

prevent update during init in new autofilter dlg, fdo#45679

Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 9b23197..d269333 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1164,6 +1164,7 @@ void ScCheckListMenuWindow::initMembers()
 {
 size_t n = maMembers.size();
 size_t nVisMemCount = 0;
+maChecks.SetUpdateMode(false);
 for (size_t i = 0; i  n; ++i)
 {
 maChecks.InsertEntry(maMembers[i].maName);
@@ -1188,6 +1189,7 @@ void ScCheckListMenuWindow::initMembers()
 maChkToggleAll.SetState(STATE_DONTKNOW);
 mePrevToggleAllState = STATE_DONTKNOW;
 }
+maChecks.SetUpdateMode(true);
 }
 
 void ScCheckListMenuWindow::setConfig(const Config rConfig)
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index b9164d3..5a02130 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -127,6 +127,7 @@ void ScRangeManagerTable::GetLine(ScRangeNameLine rLine, 
SvLBoxEntry* pEntry)
 
 void ScRangeManagerTable::Init()
 {
+SetUpdateMode(false);
 Clear();
 for (boost::ptr_maprtl::OUString, ScRangeName::const_iterator itr = 
mrRangeMap.begin();
 itr != mrRangeMap.end(); ++itr)
@@ -147,6 +148,7 @@ void ScRangeManagerTable::Init()
 }
 }
 }
+SetUpdateMode(true);
 }
 
 const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine 
rLine)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

2012-03-26 Thread Lubos Lunak 
 solenv/gbuild/gbuild.mk |4 
 1 file changed, 4 deletions(-)

New commits:
commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 17:36:14 2012 +0200

Revert make gbuild follow --disable-dependency-tracking too

3-5 branch is not ready for this, there are a number of build failures.
Okayed by Petr Mladek, but this is rather obvious.

This reverts commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 574e851..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,16 +116,12 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
-ifneq ($(nodep),)
-gb_FULLDEPS := $(false)
-else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
-endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk

2012-03-26 Thread Lubos Lunak 
 sal/CppunitTest_sal_rtl_strings.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cedaaf89d7d9c2e41650dcc4df07b2be24649826
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 17:41:33 2012 +0200

fix comment

diff --git a/sal/CppunitTest_sal_rtl_strings.mk 
b/sal/CppunitTest_sal_rtl_strings.mk
index f5127cb..0a00e8b 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_rtl_strings,\
 $(gb_STDLIBS) \
 ))
 
-# the test uses the library created by Module_DLL
+# the test uses O(U)String capabilities that dlopen this lib
 $(call gb_CppunitTest_get_target,sal_rtl_strings) : \
 $(call gb_Library_get_target,sal_textenc)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - bridges/source jvmfwk/Module_jvmfwk.mk jvmfwk/Package_javavendors.mk jvmfwk/Package_rcfiles.mk testtools/source

2012-03-26 Thread Stephan Bergmann 
 bridges/source/jni_uno/jni_data.cxx |   21 
 bridges/source/jni_uno/jni_info.cxx |   11 ++
 bridges/source/jni_uno/jni_info.h   |2 -
 jvmfwk/Module_jvmfwk.mk |1 
 jvmfwk/Package_javavendors.mk   |   56 
 jvmfwk/Package_rcfiles.mk   |   32 +-
 testtools/source/bridgetest/makefile.mk |6 +--
 7 files changed, 39 insertions(+), 90 deletions(-)

New commits:
commit 40193672b163cd1a23c00d2e4313805983fc8a60
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Mar 26 17:48:45 2012 +0200

Revert Field IDs on Dalvik are more unique than in JVMs

This reverts commit b5ca34fa409bc4cbeb41a84b900612e302f5b0fb.

829a9b9c1041626efb688157658c1e0e2f6e8414 In Java, css.uno.RuntimeException 
is
not derived from css.uno.Exception is a better fix.

diff --git a/bridges/source/jni_uno/jni_data.cxx 
b/bridges/source/jni_uno/jni_data.cxx
index cabca76..9d77812 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1968,26 +1968,7 @@ void Bridge::map_to_java(
 comp_td)-pParameterizedTypes != 0;
 for ( sal_Int32 nPos = comp_td-nMembers; nPos--; )
 {
-jfieldID field_id;
-
-// Handle com.sun.star.uno.RuntimeException::Context as a
-// special case. In (C++) UNO css::uno::RuntimeException
-// is simply a subclass of css::uno::Exception, which
-// contains the Context field. In the Java UNO mapping
-// css.uno.RuntimeException is a subclass of
-// java.lang.RuntimeException, and has a Context field of
-// its own, separate from that of css.uno.Exception.
-
-// In Dalvik the field IDs of these Context fields
-// differ. (In Java VMs they seem to be the same.)
-
-if (type_equals( comp_info-m_td.get()-pWeakRef,
- 
m_jni_info-m_RuntimeException_type.getTypeLibType() )
- nPos == 1)
-field_id = 
m_jni_info-m_field_css_uno_RuntimeException_m_Context;
-else
-field_id = linfo-m_fields[ nPos ];
-
+jfieldID field_id = linfo-m_fields[ nPos ];
 if (0 != field_id)
 {
 void const * p =
diff --git a/bridges/source/jni_uno/jni_info.cxx 
b/bridges/source/jni_uno/jni_info.cxx
index 6f2a2a6..c3f34ed 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -766,11 +766,6 @@ JNI_info::JNI_info(
 jni.ensure_no_exception();
 OSL_ASSERT( 0 != m_field_JNI_proxy_m_oid );
 
-m_field_css_uno_RuntimeException_m_Context = jni-GetFieldID(
-(jclass) jo_RuntimeException.get(), Context, Ljava/lang/Object; );
-jni.ensure_no_exception();
-OSL_ASSERT( 0 != m_field_css_uno_RuntimeException_m_Context );
-
 // get java env
 OUString java_env_type_name( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_JAVA) );
 JLocalAutoRef jo_java(
diff --git a/bridges/source/jni_uno/jni_info.h 
b/bridges/source/jni_uno/jni_info.h
index 9cdbbf4..a356be2 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -204,8 +204,6 @@ public:
 jfieldIDm_field_JNI_proxy_m_type;
 jfieldIDm_field_JNI_proxy_m_oid;
 
-jfieldIDm_field_css_uno_RuntimeException_m_Context;
-
 //
 ::com::sun::star::uno::TypeDescription m_XInterface_queryInterface_td;
 ::com::sun::star::uno::Type const  m_Exception_type;
commit 829a9b9c1041626efb688157658c1e0e2f6e8414
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Mar 26 17:46:52 2012 +0200

In Java, css.uno.RuntimeException is not derived from css.uno.Exception

which lead to Bridge::map_to_java (jni_data.cxx) copying the Context member 
of RuntimeException
twice, once with a fieldID for Exception, which fails on Dalvik.

diff --git a/bridges/source/jni_uno/jni_info.cxx 
b/bridges/source/jni_uno/jni_info.cxx
index 1d601cf..6f2a2a6 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -282,7 +282,11 @@ JNI_compound_type_info::JNI_compound_type_info(
 
 // retrieve info for base type
 typelib_TypeDescription * base_td =
-reinterpret_cast typelib_TypeDescription * (
+type_equals(
+td-aBase.pWeakRef,
+jni_info-m_RuntimeException_type.getTypeLibType())
+? 0
+: reinterpret_cast typelib_TypeDescription * (
 td-pBaseTypeDescription );
 m_base = (0 == base_td ? 0 : jni_info-get_type_info( jni, base_td ));
 
commit 094cf7caf9659be5a0325048fa8a164e22de1fc9
Author: Stephan Bergmann sberg...@redhat.com

[Libreoffice-commits] .: sal/CppunitTest_sal_rtl_strings.mk

2012-03-26 Thread Tor Lillqvist 
 sal/CppunitTest_sal_rtl_strings.mk |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0a08973de9e3431edb90633fcefdbaa1af7837fd
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Mar 26 19:10:36 2012 +0300

No separate sal_textenc library built for Android

(As a low-hanging fruit to drop the shared library count by
one... Each library less counts.)

diff --git a/sal/CppunitTest_sal_rtl_strings.mk 
b/sal/CppunitTest_sal_rtl_strings.mk
index 0a00e8b..fc384d6 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -42,9 +42,11 @@ $(eval $(call 
gb_CppunitTest_add_linked_libs,sal_rtl_strings,\
 $(gb_STDLIBS) \
 ))
 
-# the test uses O(U)String capabilities that dlopen this lib
+# The test uses O(U)String capabilities that dlopen this lib
+ifneq ($(OS),ANDROID)
+# Except that on Android we don't build it separately
 $(call gb_CppunitTest_get_target,sal_rtl_strings) : \
 $(call gb_Library_get_target,sal_textenc)
-
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sal/inc sal/qa

2012-03-26 Thread Lubos Lunak 
 sal/inc/rtl/string.hxx  |   35 ++
 sal/inc/rtl/ustrbuf.hxx |   18 +++
 sal/qa/rtl/strings/test_ostring_stringliterals.cxx  |   50 
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx |   22 +++-
 4 files changed, 121 insertions(+), 4 deletions(-)

New commits:
commit 09517a98fe44eafcd19a8eecb0c14384799e2684
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 18:51:59 2012 +0200

string literal overload for OString::operator=()

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 79b9a15..d899067 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -57,6 +57,12 @@ namespace rtl
 
 #ifdef RTL_STRING_UNITTEST
 #undef rtl
+// helper macros to make functions appear more readable
+#define RTL_STRING_CONST_FUNCTION rtl_string_unittest_const_literal_function = 
true;
+#define RTL_STRING_NON_CONST_FUNCTION 
rtl_string_unittest_non_const_literal_function = true;
+#else
+#define RTL_STRING_CONST_FUNCTION
+#define RTL_STRING_NON_CONST_FUNCTION
 #endif
 
 /* === */
@@ -209,6 +215,7 @@ public:
 
   If there are any embedded \0's in the string literal, the result is 
undefined.
   Use the overload that explicitly accepts length.
+  @since LibreOffice 3.6
 
   @paramliteral   a string literal
 */
@@ -225,6 +232,7 @@ public:
 /**
   @overload
   New string from a non-const char array.
+  @since LibreOffice 3.6
 
   @param value non-const char array
 */
@@ -299,6 +307,33 @@ public:
 }
 
 /**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+ @since LibreOffice 3.6
+*/
+template int N 
+OString operator=( const char (literal)[ N ] ) SAL_THROW(())
+{
+rtl_string_newFromLiteral( pData, literal, N - 1 );
+RTL_STRING_CONST_FUNCTION
+return *this;
+}
+/**
+  @overload
+  This function accepts a non-const char array as its argument.
+  @since LibreOffice 3.6
+
+  @param value non-const char array
+*/
+template int N 
+OString operator=( char (value)[ N ] ) SAL_THROW(())
+{
+rtl_string_newFromStr( pData, value );
+RTL_STRING_NON_CONST_FUNCTION
+return *this;
+}
+
+/**
   Append a string to this string.
 
   @paramstr a OString.
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx 
b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 8398ae9..2176a50 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -29,6 +29,8 @@
 // activate the extra needed ctor
 #define RTL_STRING_UNITTEST
 bool rtl_string_unittest_const_literal;
+bool rtl_string_unittest_const_literal_function;
+bool rtl_string_unittest_non_const_literal_function;
 
 #include sal/config.h
 #include sal/precppunit.hxx
@@ -38,17 +40,33 @@ bool rtl_string_unittest_const_literal;
 #include rtl/string.h
 #include rtl/string.hxx
 
+namespace rtlunittest {
+
+template typename charT, typename traits  std::basic_ostreamcharT, traits 
+operator (
+std::basic_ostreamcharT, traits  stream, rtl::OString const  string)
+{
+return stream  string.getStr();
+// best effort; potentially loses data due to embedded null characters
+}
+
+}
+
 namespace test { namespace ostring {
 
 class StringLiterals: public CppUnit::TestFixture
 {
 private:
 void checkCtors();
+void checkUsage();
+void checkNonConstUsage();
 
 void testcall( const char str[] );
 
 CPPUNIT_TEST_SUITE(StringLiterals);
 CPPUNIT_TEST(checkCtors);
+CPPUNIT_TEST(checkUsage);
+CPPUNIT_TEST(checkNonConstUsage);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -116,6 +134,38 @@ void test::ostring::StringLiterals::testcall( const char 
str[] )
 #endif
 }
 
+void test::ostring::StringLiterals::checkUsage()
+{
+// simply check that all string literal based calls work as expected
+// also check that they really use string literal overload and do not convert 
to OString
+rtl::OString foo( foo );
+
+rtl_string_unittest_const_literal = false; // start checking for OString 
conversions
+rtl_string_unittest_non_const_literal_function = false; // and check for 
non-const variants
+CPPUNIT_ASSERT_EQUAL( foo, rtl::OString() = foo );
+// if this is not true, some of the calls above converted to OString
+CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
+// if this is not true, some of the calls above used non-const variants
+CPPUNIT_ASSERT( rtl_string_unittest_non_const_literal_function == false );
+}
+
+void test::ostring::StringLiterals::checkNonConstUsage()
+{
+// check that (non-const) char[] overloads work and do not use const char[] 
overloads
+rtl::OString foo( foo );
+char foo_c[] = foo;
+
+rtl_string_unittest_const_literal = false; // start

[Libreoffice-commits] .: sal/qa

2012-03-26 Thread Lubos Lunak 
 sal/qa/rtl/strings/test_ostring_stringliterals.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 205ee3062e494733f10b13057135b1eb8646e93d
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 19:09:34 2012 +0200

finish work-in-progress test

diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx 
b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 2176a50..d665ee2 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -157,8 +157,7 @@ void test::ostring::StringLiterals::checkNonConstUsage()
 
 rtl_string_unittest_const_literal = false; // start checking for OString 
conversions
 rtl_string_unittest_const_literal_function = false; // and check for const 
variants
-sleep(10);
-rtl::OString() = (const char*)foo;
+CPPUNIT_ASSERT_EQUAL( foo, rtl::OString() = (const char*)foo );
 CPPUNIT_ASSERT_EQUAL( foo, rtl::OString() = foo_c );
 // if this is not true, some of the calls above converted to OString
 CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

2012-03-26 Thread Lubos Lunak 
 solenv/gbuild/gbuild.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 3b1adf08e38c26c2d0d22b831f9582bc60049681
Author: Luboš Luňák l.lu...@suse.cz
Date:   Mon Mar 26 20:38:41 2012 +0200

Revert Revert make gbuild follow --disable-dependency-tracking too

Revert again, the option itself is correct. Resulting problems need to
be fixed and the option should not be used now where it breaks.

This reverts commit 2ee0eeef5803659e096fc788c01cff0ea54ec6e8.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..574e851 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -116,12 +116,16 @@ ifneq ($(gb_DEBUGLEVEL),0)
 gb_SYMBOL := $(true)
 endif
 
+ifneq ($(nodep),)
+gb_FULLDEPS := $(false)
+else
 # for clean, setuplocal and removelocal goals we switch off dependencies
 ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables 
help debugrun,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)
 endif
+endif
 
 # save user-supplied flags for latter use
 ifneq ($(strip $(CFLAGS)),)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: config_host.mk.in configure.in solenv/gbuild

2012-03-26 Thread Norbert Thiebaud 
 config_host.mk.in |2 +-
 configure.in  |2 +-
 solenv/gbuild/Tempfile.mk |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5dd7f9e4689b6155f5b646034fc59bf02dcb0941
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Mar 26 14:06:16 2012 -0500

typo in HAVE_GNUMAKE_FILE_FUNC, and var2file must return the filename

diff --git a/config_host.mk.in b/config_host.mk.in
index c9103f0..ed5f6df 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -188,7 +188,7 @@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_NO_LONG_DOUBLE=@HAVE_GCC_NO_LONG_DOUBLE@
 export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
 export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
-export HAVE_GNUMAKE_FILE_FUNC@=HAVE_GNUMAKE_FILE_FUNC@
+export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_SFINAE_ANONYMOUS_BROKEN=@HAVE_SFINAE_ANONYMOUS_BROKEN@
 export HAVE_GETOPT=@HAVE_GETOPT@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
diff --git a/configure.in b/configure.in
index 8276698..cd8aa6c 100644
--- a/configure.in
+++ b/configure.in
@@ -3697,7 +3697,7 @@ all:
 EOF
 $GNUMAKE -C $TESTGMAKEFILEFUNC 2/dev/null 12
 if test -f $TESTGMAKEFILEFUNC/test.txt ; then
-HAVE_GNUMKAE_FILE_FUNC=YES
+HAVE_GNUMAKE_FILE_FUNC=YES
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index 87f582b..691abc4 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -2,7 +2,7 @@
 
 ifeq ($(HAVE_GNUMAKE_FILE_FUNC),YES)
 define var2file
-$(file $(1),$(3))
+$(file $(1),$(3))$(1)
 endef
 else
 # Write string to temporary file by chopping into pieces that
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 8 commits - chart2/source cui/source svx/inc svx/source

2012-03-26 Thread Kohei Yoshida 
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |   98 +-
 cui/source/inc/cuitabline.hxx |5 
 cui/source/tabpages/tpline.cxx|  523 +++---
 svx/inc/svx/gallery.hxx   |1 
 svx/source/gallery2/galexpl.cxx   |   17 
 5 files changed, 335 insertions(+), 309 deletions(-)

New commits:
commit c7b8b3482c50eb5de8d43acf036642dc684fe8d9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Mar 26 16:17:36 2012 -0400

fdo#46942: Fix a regression caused by List removal.

3236c2c3af9355157c62f68fcbd429498f7f747b accidentally removed the gallery
item count which was used to differentiate the gallery symbols from
normal ones.

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 1436c0a..ede160b 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -277,6 +277,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
 rtl::OUString aEmptyStr;
 const rtl::OUString *pUIName = NULL;
 sal_uInt32 i = 0;
+nNumMenuGalleryItems = aGrfNames.size();
 for(std::vectorrtl::OUString::iterator it = aGrfNames.begin(); it != 
aGrfNames.end(); ++it, ++i)
 {
 pUIName = (*it);
commit 622a0ee58130a6c0e712f70eb5d6daed810a64f0
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Mar 26 15:18:52 2012 -0400

Move this into a real method also.

diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 0bc07ff..6a0881c 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -197,6 +197,7 @@ private:
 sal_Bool FillXLSet_Impl();
 #endif
 
+void InitSymbols(MenuButton* pButton);
 void SymbolSelected(MenuButton* pButton);
 void FillListboxes();
 public:
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 255db52..1436c0a 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -265,6 +265,157 @@ void SvxLineTabPage::Construct()
 FillListboxes();
 }
 
+void SvxLineTabPage::InitSymbols(MenuButton* pButton)
+{
+//Popup initialisieren
+if(!pButton-GetPopupMenu()-GetPopupMenu( MN_GALLERY ))
+{
+// Gallery-Eintraege besorgen
+GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
+
+PopupMenu* pPopup = new PopupMenu;
+rtl::OUString aEmptyStr;
+const rtl::OUString *pUIName = NULL;
+sal_uInt32 i = 0;
+for(std::vectorrtl::OUString::iterator it = aGrfNames.begin(); it != 
aGrfNames.end(); ++it, ++i)
+{
+pUIName = (*it);
+
+// convert URL encodings to UI characters (eg %20 for spaces)
+rtl::OUString aPhysicalName;
+if (utl::LocalFileHelper::ConvertURLToPhysicalName(*it, 
aPhysicalName))
+{
+pUIName = aPhysicalName;
+}
+
+SvxBrushItem* pBrushItem = new SvxBrushItem(*it, aEmptyStr, 
GPOS_AREA, SID_ATTR_BRUSH);
+pBrushItem-SetDoneLink(STATIC_LINK(this, SvxLineTabPage, 
GraphicArrivedHdl_Impl));
+
+SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
+pInfo-pBrushItem = pBrushItem;
+pInfo-nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i);
+if ( i  aGrfBrushItems.size() ) {
+aGrfBrushItems.insert( aGrfBrushItems.begin() + i, pInfo );
+} else {
+aGrfBrushItems.push_back( pInfo );
+}
+const Graphic* pGraphic = pBrushItem-GetGraphic();
+
+if(pGraphic)
+{
+Bitmap aBitmap(pGraphic-GetBitmap());
+Size aSize(aBitmap.GetSizePixel());
+if(aSize.Width()   MAX_BMP_WIDTH ||
+   aSize.Height()  MAX_BMP_HEIGHT)
+{
+sal_Bool bWidth = aSize.Width()  aSize.Height();
+double nScale = bWidth ?
+(double)MAX_BMP_WIDTH / 
(double)aSize.Width():
+(double)MAX_BMP_HEIGHT / 
(double)aSize.Height();
+aBitmap.Scale(nScale, nScale);
+
+}
+Image aImage(aBitmap);
+pPopup-InsertItem(pInfo-nItemId, *pUIName, aImage );
+}
+else
+{
+Image aImage;
+pPopup-InsertItem(pInfo-nItemId, *pUIName, aImage );
+}
+}
+aSymbolMB.GetPopupMenu()-SetPopupMenu( MN_GALLERY, pPopup );
+
+if(aGrfNames.empty())
+aSymbolMB.GetPopupMenu()-EnableItem(MN_GALLERY, sal_False);
+}
+
+if(!pButton-GetPopupMenu()-GetPopupMenu( MN_SYMBOLS )  pSymbolList)
+{
+VirtualDevice aVDev;
+aVDev.SetMapMode(MapMode(MAP_100TH_MM));
+SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
+

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/Library_collator_data.mk i18npool/Library_i18npool.mk i18npool/Library_index_data.mk i18npool/Library_textconv_dict.mk

2012-03-26 Thread Lubos Lunak 
 i18npool/Library_collator_data.mk |3 ++-
 i18npool/Library_i18npool.mk  |5 ++---
 i18npool/Library_index_data.mk|3 ++-
 i18npool/Library_textconv_dict.mk |3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 3ab34677d8a20eb098b6310601bc353d455d3bff
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Mar 26 20:51:45 2012 +0200

i18npool: fix dependency problem

When parsing makefiles, there is no guarantee that all files
are already generated, so we can't use $(wildcard $(WORKDIR)/..).

Signed-off-by: Luboš Luňák l.lu...@suse.cz

diff --git a/i18npool/Library_collator_data.mk 
b/i18npool/Library_collator_data.mk
index 7f00e8b..bfc38ce 100644
--- a/i18npool/Library_collator_data.mk
+++ b/i18npool/Library_collator_data.mk
@@ -31,7 +31,8 @@ $(eval $(call gb_Library_Library,collator_data))
 $(eval $(call gb_Library_add_package_headers,collator_data,i18npool_generated))
 
 $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
-   $(subst $(WORKDIR)/,,$(basename $(wildcard 
$(WORKDIR)/CustomTarget/i18npool/source/collator/collator_*.cxx))) \
+   $(foreach txt,$(wildcard 
$(SRCDIR)/i18npool/source/collator/data/*.txt),\
+   CustomTarget/i18npool/source/collator/collator_$(notdir 
$(basename $(txt \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 3faaa6a..57875c9 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -139,11 +139,10 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/transliteration/transliteration_OneToOne \
 ))
 
-BRKFILES := $(subst $(WORKDIR)/,,$(basename $(wildcard 
$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/*_brk.c))) \
-
 $(eval $(call gb_Library_add_generated_cobjects,i18npool,\
CustomTarget/i18npool/source/breakiterator/OpenOffice_dat \
-   $(BRKFILES) \
+   $(foreach txt,$(wildcard 
$(SRCDIR)/i18npool/source/breakiterator/data/*.txt),\
+   CustomTarget/i18npool/source/breakiterator/$(notdir $(basename 
$(txt)))_brk) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
index 43d4c52..68eaa58 100644
--- a/i18npool/Library_index_data.mk
+++ b/i18npool/Library_index_data.mk
@@ -31,7 +31,8 @@ $(eval $(call gb_Library_Library,index_data))
 $(eval $(call gb_Library_add_package_headers,index_data,i18npool_generated))
 
 $(eval $(call gb_Library_add_generated_exception_objects,index_data,\
-   $(subst $(WORKDIR)/,,$(basename $(wildcard 
$(WORKDIR)/CustomTarget/i18npool/source/indexentry/*.cxx))) \
+   $(foreach txt,$(wildcard 
$(SRCDIR)/i18npool/source/indexentry/data/*.txt),\
+   CustomTarget/i18npool/source/indexentry/$(notdir $(basename 
$(txt \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_textconv_dict.mk 
b/i18npool/Library_textconv_dict.mk
index 3b9213c..8df4a29 100644
--- a/i18npool/Library_textconv_dict.mk
+++ b/i18npool/Library_textconv_dict.mk
@@ -41,7 +41,8 @@ $(eval $(call gb_Library_add_api,textconv_dict,\
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\
-   $(subst $(WORKDIR)/,,$(basename $(wildcard 
$(WORKDIR)/CustomTarget/i18npool/source/textconversion/*.cxx))) \
+   $(foreach txt,$(wildcard 
$(SRCDIR)/i18npool/source/textconversion/data/*.dic),\
+   CustomTarget/i18npool/source/textconversion/$(notdir $(basename 
$(txt \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-03-26 Thread Julien Nabet 
 sw/source/core/docnode/ndcopy.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a04fee7204b769dc98c3592aaed2dce5e8eb0161
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Mar 26 23:11:58 2012 +0200

Fix Prefer prefix ++/-- operators for non-primitive types

diff --git a/sw/source/core/docnode/ndcopy.cxx 
b/sw/source/core/docnode/ndcopy.cxx
index 97557f2..9b1ec4c 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1478,7 +1478,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
 //die Chains entsprechend aufgebaut werden koennen.
 ::std::vector SwFrmFmt*  aVecSwFrmFmt;
 
-for (::std::set _ZSortFly ::const_iterator it=aSet.begin() ; it != 
aSet.end(); it++ )
+for (::std::set _ZSortFly ::const_iterator it=aSet.begin() ; it != 
aSet.end(); ++it )
 {
 // #i59964#
 // correct determination of new anchor position
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/tubes2' - 3 commits - tubes/inc tubes/qa tubes/source

2012-03-26 Thread Eike Rathke 
 tubes/inc/tubes/manager.hxx |3 ---
 tubes/qa/test_manager.cxx   |8 
 tubes/source/approver.c |   28 ++--
 tubes/source/file-transfer-helper.c |8 
 tubes/source/manager.cxx|   12 
 5 files changed, 26 insertions(+), 33 deletions(-)

New commits:
commit 60fdff033ba2f38063c2a14f01a22c89e7d166b5
Author: Eike Rathke er...@redhat.com
Date:   Mon Mar 26 23:54:58 2012 +0200

cleanout flushLoop

relict from testing era, not needed anymore

diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 8ba3a02..74d0424 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -192,9 +192,6 @@ public:
 /** Iterate our GMainLoop, blocking, until the callback is done. */
 voiditerateLoop( const TeleConference* pConference, 
ConferenceCallBackInvokedFunc pFunc );
 
-/** Iterate our GMainLoop, non-blocking, until nothing pending. */
-voidflushLoop() const;
-
 /// LibreOfficeWhatEver
 static rtl::OString getFullClientName();
 
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index ae9b713..dcfbb47 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -60,7 +60,6 @@ public:
 void testSendPacket();
 void testReceivePacket();
 void testSendFile();
-void testFlushLoops();
 void testDestroyManager1();
 void testDestroyManager2();
 void testDestroyAccepterContact();
@@ -88,7 +87,6 @@ public:
 CPPUNIT_TEST( testSendPacket );
 CPPUNIT_TEST( testReceivePacket );
 CPPUNIT_TEST( testSendFile );
-CPPUNIT_TEST( testFlushLoops );
 CPPUNIT_TEST( testDestroyManager1 );
 CPPUNIT_TEST( testDestroyManager2 );
 CPPUNIT_TEST( testDestroyAccepterContact );
@@ -346,12 +344,6 @@ void TestTeleTubes::testSendFile()
 maFileReceivedUri == file:///tmp/LibreOffice-collab-test-config.ini);
 }
 
-void TestTeleTubes::testFlushLoops()
-{
-mpManager1-flushLoop();
-mpManager2-flushLoop();
-}
-
 void TestTeleTubes::testDestroyManager1()
 {
 delete mpManager1;
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 73895f9..b9ecfd0 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -931,18 +931,6 @@ void TeleManager::iterateLoop( const TeleConference* 
pConference, ConferenceCall
 }
 
 
-void TeleManager::flushLoop() const
-{
-if (pImpl-mpLoop)
-{
-GMainContext* pContext = g_main_loop_get_context( pImpl-mpLoop);
-while (g_main_context_iteration( pContext, FALSE))
-{
-}
-}
-}
-
-
 GMainLoop* TeleManager::getMainLoop() const
 {
 return pImpl-mpLoop;
commit d824a60f80c5d4055d5ce69a2dfcd40f8d5a00e6
Author: Eike Rathke er...@redhat.com
Date:   Mon Mar 26 23:31:58 2012 +0200

silence WaE incompatible pointer type and unused parameters

* passing argument 1 of ‘gtk_message_dialog_format_secondary_markup’ 
from
  incompatible pointer type
  * dialog was in fact constructed as GtkMessageDialog using
gtk_message_dialog_new_with_markup(), so use it as such
* passing argument 1 of ‘gtk_widget_destroy’ from incompatible pointer 
type
  * use GTK_WIDGET() on dialog GtkMessageDialog*
* passing argument 1 of ‘g_object_get_data’ from incompatible pointer 
type
  * use G_OBJECT on dialog GtkWidget*
* passing argument 1 of ‘gtk_dialog_set_response_sensitive’ from 
incompatible
  pointer type
  * use GTK_DIALOG on dialog GtkWidget*
* passing argument 1 of ‘gtk_message_dialog_set_image’ from 
incompatible
  pointer type and passing argument 1 of ‘gtk_dialog_add_buttons’ from
  incompatible pointer type
  * use GTK_MESSAGE_DIALOG() on dialog GtkWidget*
* passing argument 1 of ‘g_object_set_data_full’ from incompatible 
pointer
  type
  * use G_OBJECT() on dialog GtkWidget*:x
* passing argument 3 of ‘g_signal_connect_data’ from incompatible 
pointer
  type
  * use G_CALLBACK() on dialog_response_cb
* passing argument 1 of ‘gtk_window_set_skip_taskbar_hint’ from 
incompatible
  pointer type
  * use GTK_WINDOW() on dialog GtkWidget*

How awful C is :-/  GtkMessageDialog is a GtkDialog is a GtkWindow is
a GtkWidget is a GObject, but still ...

diff --git a/tubes/source/approver.c b/tubes/source/approver.c
index 5f4bbde..f5e5812 100644
--- a/tubes/source/approver.c
+++ b/tubes/source/approver.c
@@ -45,7 +45,7 @@ handle_with_cb (GObject *source,
 gpointer user_data)
 {
   TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
-  GtkDialog *dialog = GTK_DIALOG (user_data);
+  GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (user_data);
   GError *error = NULL;
 
   if (!tp_channel_dispatch_operation_handle_with_finish (cdo, result, error))
@@ -59,7 +59,7 @@ handle_with_cb (GObject *source,
 }

[Libreoffice-commits] .: 2 commits - basctl/AllLangResTarget_basctl.mk formula/AllLangResTarget_for.mk solenv/gbuild

2012-03-26 Thread Matus Kukan 
 basctl/AllLangResTarget_basctl.mk |4 +++-
 formula/AllLangResTarget_for.mk   |1 +
 solenv/gbuild/Module.mk   |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f64d58e3e1c65589163a1255b36fde4cbd84b3a0
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Mar 26 23:01:46 2012 +0200

more dependencies and include paths

diff --git a/basctl/AllLangResTarget_basctl.mk 
b/basctl/AllLangResTarget_basctl.mk
index e4dffd1..d238350 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,6 +54,8 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/dlged/managelang.src \
 ))
 
-$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call 
gb_Package_get_target,svx_globlmn_hrc)
+$(call gb_SrsTemplateTarget_get_target,basctl/res) : \
+   $(call gb_Package_get_target,svx_globlmn_hrc) \
+   $(call gb_Package_get_target,svx_inc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 7eb72e3..0cc451e 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res))
 
 $(eval $(call gb_SrsTarget_set_include,formula/res,\
 $$(INCLUDE) \
+-I$(SRCDIR)/formula/inc \
 -I$(SRCDIR)/formula/source/core/inc \
 ))
 
commit 5686fe0ad1ecd09dbe05dd1a36064f8be96321d6
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Sun Mar 25 18:46:08 2012 +0200

be consistent

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 64d7d13..15237eb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -145,7 +145,7 @@ unitcheck :
$(call gb_Output_announce_bell)
 
 slowcheck :
-   $(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),SCHK,6)
+   $(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),SLC,6)
$(call gb_Output_announce_title,all slowtests checked.)
$(call gb_Output_announce_bell)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

2012-03-26 Thread Thorsten Behrens 
 vcl/source/gdi/outdev2.cxx |   66 -
 1 file changed, 36 insertions(+), 30 deletions(-)

New commits:
commit 06c16e1e26a0137a0048085cdf1c7758d3ac96cd
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Mar 27 02:54:42 2012 +0200

Fix vcl alpha blending n#714787

The way alpha compositing took place in vcl's alpha vdev was subtly
wrong - it was supposed to implement porter-duff 'over', but didn't.
This is now fixed also for cases where the source surface contains
alpha, and needs to blend correctly into fully-transparent
background.

For reference: http://en.wikipedia.org/wiki/Alpha_compositing

diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 11a9c1e..b8c144e 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1573,11 +1573,14 @@ void OutputDevice::DrawPixel( const Polygon rPts, 
const Color rColor )
 
 namespace
 {
-sal_uInt8 lcl_calcColor( const sal_uInt8 nSourceColor, const sal_uInt8 
nSourceOpaq, const sal_uInt8 nDestColor )
+// Co = Cs + Cd*(1-As) premultiplied alpha -or-
+// Co = (AsCs + AdCd*(1-As)) / Ao
+inline sal_uInt8 lcl_calcColor( const sal_uInt8 nSourceColor, const 
sal_uInt8 nSourceAlpha,
+const sal_uInt8 nDstAlpha, const sal_uInt8 
nResAlpha, const sal_uInt8 nDestColor )
 {
-int c = ( (int)nDestColor * ( 255 - nSourceOpaq ) )
-+ (int)nSourceOpaq * (int)nSourceColor;
-return sal_uInt8( c / 255 );
+int c = nResAlpha ? ( (int)nSourceAlpha*nSourceColor + 
(int)nDstAlpha*nDestColor -
+  (int)nDstAlpha*nDestColor*nSourceAlpha/255 ) / 
(int)nResAlpha : 0;
+return sal_uInt8( c );
 }
 }
 
@@ -1631,27 +1634,29 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap 
 aBmp,
 
 aSrcCol = pP-GetColor( nMapY, nMapX );
 aDstCol = pB-GetColor( nY, nX );
-const sal_uInt8 nSrcOpaq = 255 - pA-GetPixel( nMapY, 
nMapX ).GetBlueOrIndex();
-const sal_uInt8 nDstOpaq  = 255 - pAlphaW-GetPixel( nY, 
nX ).GetBlueOrIndex();
 
-aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), nSrcOpaq, 
aDstCol.GetRed() ) );
-aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), 
nSrcOpaq, aDstCol.GetBlue() ) );
-aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), 
nSrcOpaq, aDstCol.GetGreen() ) );
+// vcl stores transparency, not alpha - invert it
+const sal_uInt8 nSrcAlpha = 255 - pA-GetPixel( nMapY, 
nMapX ).GetBlueOrIndex();
+const sal_uInt8 nDstAlpha = 255 - pAlphaW-GetPixel( nY, 
nX ).GetBlueOrIndex();
+
+// Perform porter-duff compositing 'over' operation
+//
+// Co = Cs + Cd*(1-As)
+// Ad = As + Ad*(1-As)
+const sal_uInt8 nResAlpha = (int)nSrcAlpha + 
(int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255;
+
+aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), 
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetRed() ) );
+aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), 
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetBlue() ) );
+aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), 
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetGreen() ) );
 
 aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 
aDstCol.GetRed() ] + nD )  16UL ] +
   nVCLGLut[ ( nVCLLut[ 
aDstCol.GetGreen() ] + nD )  16UL ] +
   nVCLBLut[ ( nVCLLut[ 
aDstCol.GetBlue() ] + nD )  16UL ] ) );
 pW-SetPixel( nY, nX, aIndex );
 
-// Have to perform the compositing 'algebra' in
-// the inverse alpha space (with 255 meaning
-// opaque), otherwise, transitivity is not
-// achieved.
-const sal_uInt8 nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, 
(sal_uInt8)nDstOpaq, nSrcOpaq );
-
-aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 
nSrcAlpha ] + nD )  16UL ] +
-  nVCLGLut[ ( nVCLLut[ nSrcAlpha ] 
+ nD )  16UL ] +
-  nVCLBLut[ ( nVCLLut[ nSrcAlpha ] 
+ nD )  16UL ] ) );
+aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 
255-nResAlpha ] + nD )  16UL ] +
+   nVCLGLut[ ( nVCLLut[ 
255-nResAlpha ] + nD )  16UL ] +
+   nVCLBLut[ ( nVCLLut[ 
255-nResAlpha ] + nD )  16UL ] ) );
 pAlphaW-SetPixel( nY, nX, aIndex );
 }
 }
@@ -1676,22 +1681,23 @@ Bitmap OutputDevice::ImplBlendWithAlpha(

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

2012-03-26 Thread Markus Mohrhard 
 sc/inc/attarray.hxx|2 +-
 sc/inc/column.hxx  |2 +-
 sc/inc/document.hxx|1 +
 sc/inc/table.hxx   |2 +-
 sc/source/core/data/attarray.cxx   |4 ++--
 sc/source/core/data/column2.cxx|4 ++--
 sc/source/core/data/document.cxx   |   13 +
 sc/source/core/data/table1.cxx |4 ++--
 sc/source/filter/excel/xetable.cxx |2 +-
 9 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 5d123a0b0e827aba59ddb50ef1b961a529a34a15
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Mar 27 05:14:06 2012 +0200

export all style information to xls/xlsx, fdo#46738

Fixes that if more than 84 empty but formatted rows at the end of a file
have been found the export skipped those rows.

diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 706a1c0..c6d2aff 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -173,7 +173,7 @@ public:
 boolIsEmpty() const;
 
 boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool 
bFullFormattedArea = false ) const;
 boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
 boolIsVisibleEqual( const ScAttrArray rOther,
 SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e503005..4988ffc 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -182,7 +182,7 @@ public:
 boolHasSelectionMatrixFragment(const ScMarkData rMark) const;
 
 boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea = 
false ) const;
 boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
 boolIsVisibleAttrEqual( const ScColumn rCol, SCROW nStartRow = 0,
 SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0d63e3b..bc48fab 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -935,6 +935,7 @@ public:
 SCCOL rEndCol, SCROW rEndRow, bool 
bIncludeOld, bool bOnlyDown ) const;
 SC_DLLPUBLIC bool   GetCellArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow ) const;
 SC_DLLPUBLIC bool   GetTableArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow ) const;
+SC_DLLPUBLIC void   GetFormattedAndUsedArea( SCTAB nTab, SCCOL 
rEndCol, SCROW rEndRow ) const;
 SC_DLLPUBLIC bool   GetPrintArea( SCTAB nTab, SCCOL rEndCol, 
SCROW rEndRow,
 bool bNotes = true ) const;
 SC_DLLPUBLIC bool   GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, 
SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b99caf8..cec3676 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -401,7 +401,7 @@ public:
 
 boolGetCellArea( SCCOL rEndCol, SCROW rEndRow ) const;   
 // FALSE = empty
 boolGetTableArea( SCCOL rEndCol, SCROW rEndRow ) const;
-boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes ) 
const;
+boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes, 
bool bFullFormattedArea = false ) const;
 boolGetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
 SCCOL rEndCol, bool bNotes ) const;
 boolGetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 3b0c923..72d08fc 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1760,7 +1760,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW rFirstRow ) 
const
 
 const SCROW SC_VISATTR_STOP = 84;
 
-bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool 
bFullFormattedArea ) const
 {
 //  #i30830# changed behavior:
 //  ignore all attributes starting with the first run of SC_VISATTR_STOP 
equal rows
@@ -1791,7 +1791,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, 
SCROW nLastData ) const
 if ( nAttrStartRow = nLastData )
 nAttrStartRow = nLastData + 1;
 SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
-if ( nAttrSize = SC_VISATTR_STOP )
+if ( nAttrSize = SC_VISATTR_STOP  !bFullFormattedArea )
 {
 bFound = false;// ignore this range and below
 }
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 1ca582d..393e18e 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1429,14 +1429,14 @@ bool ScColumn::GetFirstVisibleAttr( SCROW

[Libreoffice-commits] .: editeng/inc

2012-03-26 Thread Kohei Yoshida 
 editeng/inc/editeng/flditem.hxx |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 292d71f513ee2dd3c276f950ca561704b2deb11b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Mar 26 22:02:36 2012 -0400

Translated German class description (thanks to Markus Mohrhard).

diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index e911d41..b35cb54 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -57,13 +57,11 @@ public:
 virtual MetaAction* createEndComment() const;
 };
 
-/*
-[Description]
-In diesem Item wird ein Feld (SvxFieldData) gespeichert.
-Das Feld gehoert dem Item.
-Das Feld selbst wird durch eine Ableitung von SvxFieldData bestimmt. (RTTI)
-*/
-
+/**
+ * This item stores a field (SvxFieldData).  The field is controlled by or
+ * belongs to the item.  The field itself is determined by a derivation from
+ * SvxFieldData (RTTI)
+ */
 class EDITENG_DLLPUBLIC SvxFieldItem : public SfxPoolItem
 {
 private:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/source sc/source

2012-03-26 Thread Kohei Yoshida 
 editeng/source/items/flditem.cxx |   16 
 sc/source/ui/app/scdll.cxx   |6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit df827af160fa255c56b9aaef644a2d9c4680977d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Mar 27 01:34:35 2012 -0400

Let's not use a macro for this...

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index a182a36..58f6ab1 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -948,14 +948,14 @@ SvClassManager SvxFieldItem::GetClassManager()
 if ( !pClassMgr )
 {
 pClassMgr = new SvClassManager;
-pClassMgr-SV_CLASS_REGISTER( SvxFieldData );
-pClassMgr-SV_CLASS_REGISTER( SvxURLField );
-pClassMgr-SV_CLASS_REGISTER( SvxDateField );
-pClassMgr-SV_CLASS_REGISTER( SvxPageField );
-pClassMgr-SV_CLASS_REGISTER( SvxTimeField );
-pClassMgr-SV_CLASS_REGISTER( SvxExtTimeField );
-pClassMgr-SV_CLASS_REGISTER( SvxExtFileField );
-pClassMgr-SV_CLASS_REGISTER( SvxAuthorField );
+pClassMgr-Register(SvxFieldData::StaticClassId(),
SvxFieldData::CreateInstance);
+pClassMgr-Register(SvxURLField::StaticClassId(), 
SvxURLField::CreateInstance);
+pClassMgr-Register(SvxDateField::StaticClassId(),
SvxDateField::CreateInstance);
+pClassMgr-Register(SvxPageField::StaticClassId(),
SvxPageField::CreateInstance);
+pClassMgr-Register(SvxTimeField::StaticClassId(),
SvxTimeField::CreateInstance);
+pClassMgr-Register(SvxExtTimeField::StaticClassId(), 
SvxExtTimeField::CreateInstance);
+pClassMgr-Register(SvxExtFileField::StaticClassId(), 
SvxExtFileField::CreateInstance);
+pClassMgr-Register(SvxAuthorField::StaticClassId(),  
SvxAuthorField::CreateInstance);
 }
 
 return *pClassMgr;
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 25712d4..2d9af16 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -295,9 +295,9 @@ void ScDLL::Init()
 //  Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
 
 SvClassManager rClassManager = SvxFieldItem::GetClassManager();
-rClassManager.SV_CLASS_REGISTER( SvxPagesField );
-rClassManager.SV_CLASS_REGISTER( SvxFileField );
-rClassManager.SV_CLASS_REGISTER( SvxTableField );
+rClassManager.Register(SvxPagesField::StaticClassId(), 
SvxPagesField::CreateInstance);
+rClassManager.Register(SvxFileField::StaticClassId(),  
SvxFileField::CreateInstance);
+rClassManager.Register(SvxTableField::StaticClassId(), 
SvxTableField::CreateInstance);
 
 SdrRegisterFieldClasses();  // SvDraw-Felder registrieren
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits