date:20150414

[Bug 90290] reduce some copy&paste code in ucalc

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=90290

--- Comment #16 from David Tardon  ---
(In reply to Brent Ritzema from comment #15)
> I have submitted a patch to gerrit for this, however I will amend what I did
> to accommodate these new suggestions. I will use CPPUNIT_ASSERT_MESSAGE
> instead.

Please do not do this. Instead, make checkFormula a custom assertion, as Markus
suggested. See http://cppunit.sourceforge.net/doc/cvs/struct_asserter.html for
details.

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

Crash test update

2015-04-14 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/b12c44133549e0694e5e10bd98e9677209b89c6a/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: df#50950 sort out Calc (ISO)WEEKNUM functions

2015-04-14 Thread Winfried Donkers

Hi Eike,


> I'm a bit lost here. Maybe we need to sort that out from scratch again.
> This appears to be the most complicated change in function names we're
> tackling because of the different functions AND having an Add-In function
> involved AND different names for similar but not quite identical functions
> in UI and file formats.
> 
> Let's postpone until April ...

It's April, the sun is up :)

I'll try to explain the situation as I see it.

As you know, the problem is that the ODFF function name ISOWEEKNUM is currently 
used for a function with WEEKNUM functionality.

I checked the function definitions for WEEKNUM and ISOWEEKNUM, for ODFF and 
Excel. ODFF and Excel are as good as identical, except that Excel may 
experience problems when the date value is entered is text.
I intend to ignore that difference and support both WEEKNUM and ISOWEEKNUM in 
Calc.

I propose to put right in 2 steps.
UI: English function name used in user interface
ODFF:   function name used in ODFF-document (ods)
ODFF-legacy:function name that can be read from ODFF-document and will be 
converted to ODFF function name; used for backwards compatibility (conversion 
in ScCompiler::IsOpCode())
EXcel:  function name used for export/import to/from Excel (xlsx)

LO version 4.5:
UI  ODFFODFF-'legacy'   Excel
WEEKNUM WEEKNUM ISOWEEKNUM  WEEKNUM
ISOWEEKNUM  ISOWEEKNUM_TMP  ISOWEEKNUM
remove UI WEEKNUM_ADD (similar as with GCD_ADD, gerrit#15185)

LO version 4.6:
UI  ODFFODFF-'legacy'   Excel
WEEKNUM WEEKNUM WEEKNUM
ISOWEEKNUM  ISOWEEKNUM  ISOWEEKNUM_TMP  ISOWEEKNUM

Any questions, objections, suggestions?

Winfried

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

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

2015-04-14 Thread Stephan Bergmann

 sw/source/ui/table/tabledlg.cxx   |1 -
 sw/source/uibase/inc/tabledlg.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 5a04ff004f57769a2635269eefd3177966348143
Author: Stephan Bergmann 
Date:   Wed Apr 15 08:10:44 2015 +0200

-Werror,-Wunused-private-field

Change-Id: I27afea85c339cf2239ed118cf6cedaece032dfae

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 4f9f8a4..d902fd2 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1206,7 +1206,6 @@ SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, 
SfxItemPool&,
 : SfxTabDialog(0, pParent, "TablePropertiesDialog",
 "modules/swriter/ui/tableproperties.ui", pItemSet)
 , pShell(pSh)
-, m_nHtmlMode(::GetHtmlMode(pSh->GetView().GetDocShell()))
 {
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "Dialog creation failed!");
diff --git a/sw/source/uibase/inc/tabledlg.hxx 
b/sw/source/uibase/inc/tabledlg.hxx
index d9b9988..2bd62de 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -31,7 +31,6 @@ struct TColumn;
 class SwTableTabDlg : public SfxTabDialog
 {
 SwWrtShell* pShell;
-sal_uInt16 m_nHtmlMode;
 sal_uInt16 m_nTextFlowId;
 sal_uInt16 m_nBackgroundId;
 sal_uInt16 m_nBorderId;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Matthew Francis

 vcl/osx/salframe.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit b144821188aac238a38d647dff489fc53d9bf3f6
Author: Matthew Francis 
Date:   Wed Apr 15 13:57:48 2015 +0800

tdf#71278 Revert both the previous cursor commit and the commit it fixed

The original commit was based on a misunderstanding. In fact, the call to
GetSalData()->getCursor() at the end of AquaSalFrame::getCurrentCursor()
already handles POINTER_NULL correctly, or at least in the same way as on
other platforms. The cursor in presentation mode disappears after 10
seconds - if this is to be changed, it should be changed for all platforms.

Reverts:

  commit 58a3a99efec9d4bcb4ab61c41bf2feb707c8e1ef
  Author: Matthew Francis 
  Date:   Sun Apr 12 23:10:58 2015 +0800

  tdf#71278 Set an invisible cursor rather than hiding the cursor

  commit 8d351c59d4393aa37ab38139b3a741f15a49dbfe
  Author: jorendc 
  Date:   Sun Apr 14 00:33:19 2013 +0200

  fdo#31082 cursor visible during impress presentation

Change-Id: Ie40882661dc1a2f4857027ff04393874042e04ec
Reviewed-on: https://gerrit.libreoffice.org/15316
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 202c2ee..da85f00 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -802,18 +802,6 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags)
 
 NSCursor* AquaSalFrame::getCurrentCursor() const
 {
-/* Create invisible cursor */
-static NSCursor *invisibleCursor = NULL;
-if (!invisibleCursor) {
-NSImage *cursorImage = [[[NSImage alloc] initWithSize:NSMakeSize (16, 
16)] autorelease];
-[cursorImage lockFocus];
-[[NSColor clearColor] set];
-NSRectFill( NSMakeRect( 0, 0, 16, 16 ) );
-[cursorImage unlockFocus];
-invisibleCursor = [[NSCursor alloc] initWithImage:cursorImage
-  hotSpot:NSZeroPoint];
-}
-
 NSCursor* pCursor = nil;
 switch( mePointerStyle )
 {
@@ -837,7 +825,6 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
 case POINTER_WINDOW_WSIZE:
 pCursor = [NSCursor resizeLeftRightCursor]; break;
 case POINTER_REFHAND:   pCursor = [NSCursor pointingHandCursor];break;
-case POINTER_NULL:  pCursor = invisibleCursor;  break;
 
 default:
 pCursor = GetSalData()->getCursor( mePointerStyle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2015-04-15

2015-04-14 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ tdf#89394. fix hangs because of unavailable Windows UNC path.
  in https://gerrit.libreoffice.org/15311 from Jan K.
  about module unotools
+ tdf#90607: Bullets not having  any text following them are not getting ex
  in https://gerrit.libreoffice.org/15298 from Charu Tyagi
  about module oox
+ tdf#90605 : FILESAVE:PPTX Line shape style was not exported
  in https://gerrit.libreoffice.org/15297 from Priyanka Gaikwad
  about module oox, sd
 End of freshness 

+ fdo#50950 make Calc functions (ISO)WEEKNUM comply with ODFF1.2
  in https://gerrit.libreoffice.org/12089 from Winfried Donkers
  about module formula, include, sc, scaddins
+ convert TXTFORMAT constants to scoped enum
  in https://gerrit.libreoffice.org/15303 from Noel Grandin
  about module include, sw
+ convert LOCKFILE_ constants to scoped enum and cleanup
  in https://gerrit.libreoffice.org/15304 from Noel Grandin
  about module include, sc, sfx2, svl
+ convert SFX_ITEM constants to scoped enum
  in https://gerrit.libreoffice.org/15302 from Noel Grandin
  about module chart2, dbaccess, editeng, extensions, include, reportdesign, 
sc, sfx2, svl, svx, sw
+ convert SIGNATURESTATE_ constants to scoped enum
  in https://gerrit.libreoffice.org/15301 from Noel Grandin
  about module basctl, dbaccess, include, sfx2, svx
+ convert SFX_VIEW constants to scoped enum
  in https://gerrit.libreoffice.org/15300 from Noel Grandin
  about module basctl, include, sc, sd, sfx2, starmath, sw
+ remove unnecessary use of void in function declarations
  in https://gerrit.libreoffice.org/15299 from Noel Grandin
  about module accessibility, animations, avmedia, basctl, basic, bridges, 
chart2, comphelper, compilerplugins, connectivity, cppu, cppuhelper, cui, 
dbaccess, desktop, dtrans, editeng, embeddedobj, embedserv, eventattacher, 
extensions, filter, forms, framework, helpcompiler, hwpfilter, i18nlangtag, 
i18npool, i18nutil, include, io, linguistic, lotuswordpro, mysqlc, odk, oox, 
package, registry, reportdesign, rsc, sal, salhelper, sax, sc, scaddins, 
scripting, sd, sdext, sfx2, shell, slideshow, soltools, sot, starmath, stoc, 
store, svl, svtools, svx, sw, toolkit, tools, ucb, ucbhelper, unotools, vcl, 
winaccessibility, xmlhelp, xmloff, xmlsecurity
+ tdf#90594: MM: Fix for broken translation between Bookmarks and row indiz
  in https://gerrit.libreoffice.org/15289 from Christoph Lutz
  about module sw
+ tdf#69701 use Calc's GCD() function instead of add-in GCD and
  in https://gerrit.libreoffice.org/15185 from Winfried Donkers
  about module sc, scaddins


* Merged changes on master for project core changed in the last 25 hours:

+ tdf#71278 Set an invisible cursor rather than hiding the cursor
  in https://gerrit.libreoffice.org/15269 from Matthew Francis
+ Remove checks for HTMLMODE_SOME_STYLES
  in https://gerrit.libreoffice.org/15264 from Harri Pitkänen
+ remove build warning
  in https://gerrit.libreoffice.org/15288 from Laurent Godard
+ tdf#88710 Kill svx dbtoolsclient
  in https://gerrit.libreoffice.org/15147 from Matthew James Nicholls
+ tdf#90447 vba find() should NOT select the found cell.
  in https://gerrit.libreoffice.org/15189 from Justin Luth


* Abandoned changes on master for project core changed in the last 25 hours:

+ tdf#89666: vcl: speed up text formatting further, sacrificing parentheses
  in https://gerrit.libreoffice.org/14642 from Michael Stahl
+ BUG - tdf#38835 strip out non-trivial globals before main
  in https://gerrit.libreoffice.org/14830 from Karthick Prasad
+ tdf#86624 Forced update if it is a legend
  in https://gerrit.libreoffice.org/15268 from Laurent BP


* Open changes needing tweaks, but being untouched for more than a week:

+ Fix typo code Persistant
  in https://gerrit.libreoffice.org/14030 from Andrea Gelmini
+ tdf#90222: replace ScaList in scaddins with a std container
  in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen
+ replace ScaList in scaddins with a std container tdf#90222
  in https://gerrit.libreoffice.org/15177 from Pieter Adriaensen
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ Add KDE5 plugin for vcl
  in https://gerrit.libreoffice.org/13078 from Jonathan Riddell
+ tdf#64575 Photo Album: Better Image Layout
  in https://gerrit.libreoffice.org/14912 from Enes Ateş
+ WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind
  in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius
+ Upgrade firebird to 2.5.3 , a few patches are already applied upstream
  in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
+ Removed unnecessary variables which occupy space
  in https://gerrit.libreoffice.org/14951 from Karthick Prasad
+ Fixed all  postfix operator++ and operator--
  in https://gerrit.libreoffice.org/14975 f

[Bug 90290] reduce some copy&paste code in ucalc

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=90290

--- Comment #15 from Brent Ritzema  ---
I have submitted a patch to gerrit for this, however I will amend what I did to
accommodate these new suggestions. I will use CPPUNIT_ASSERT_MESSAGE instead.
However I will be gone these next few days, so I hope to get it done sometime
within the next week or so.

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 71278, which changed state.

Bug 71278 Summary: UI mouse pointer disappears during presentation and does not 
come back after exiting presentation
https://bugs.documentfoundation.org/show_bug.cgi?id=71278

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

2015-04-14 Thread Matthew Francis

 vcl/osx/salframe.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 58a3a99efec9d4bcb4ab61c41bf2feb707c8e1ef
Author: Matthew Francis 
Date:   Sun Apr 12 23:10:58 2015 +0800

tdf#71278 Set an invisible cursor rather than hiding the cursor

Change-Id: I5ecfa01ab444148aa8d13d04f78db1c6c131a4df
Reviewed-on: https://gerrit.libreoffice.org/15269
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 61dd536..202c2ee 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -802,6 +802,18 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags)
 
 NSCursor* AquaSalFrame::getCurrentCursor() const
 {
+/* Create invisible cursor */
+static NSCursor *invisibleCursor = NULL;
+if (!invisibleCursor) {
+NSImage *cursorImage = [[[NSImage alloc] initWithSize:NSMakeSize (16, 
16)] autorelease];
+[cursorImage lockFocus];
+[[NSColor clearColor] set];
+NSRectFill( NSMakeRect( 0, 0, 16, 16 ) );
+[cursorImage unlockFocus];
+invisibleCursor = [[NSCursor alloc] initWithImage:cursorImage
+  hotSpot:NSZeroPoint];
+}
+
 NSCursor* pCursor = nil;
 switch( mePointerStyle )
 {
@@ -825,7 +837,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const
 case POINTER_WINDOW_WSIZE:
 pCursor = [NSCursor resizeLeftRightCursor]; break;
 case POINTER_REFHAND:   pCursor = [NSCursor pointingHandCursor];break;
-case POINTER_NULL:  [NSCursor hide];break;
+case POINTER_NULL:  pCursor = invisibleCursor;  break;
 
 default:
 pCursor = GetSalData()->getCursor( mePointerStyle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - chart2/qa include/oox oox/source sc/source

2015-04-14 Thread Markus Mohrhard

 chart2/qa/extras/chart2export.cxx |   30 +
 chart2/qa/extras/data/xlsx/markerColor.xlsx   |binary
 include/oox/export/chartexport.hxx|3 +
 oox/source/drawingml/chart/typegroupconverter.cxx |1 
 oox/source/export/chartexport.cxx |   48 +-
 sc/source/filter/excel/xestyle.cxx|2 
 6 files changed, 83 insertions(+), 1 deletion(-)

New commits:
commit a4757e800be39ca528d3b7d3f39b09d10c39978e
Author: Markus Mohrhard 
Date:   Wed Apr 15 03:54:24 2015 +0200

add test case for tdf#81407

Change-Id: I45124d662cee9b845c1f851de4f564dfe8c0e94e

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 4d67a24..b60c1e4 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -82,6 +82,7 @@ public:
 void testFdo83058dlblPos();
 void testAutoTitleDelXLSX();
 void testDispBlanksAsXLSX();
+void testMarkerColorXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -129,6 +130,7 @@ public:
 CPPUNIT_TEST(testFdo83058dlblPos);
 CPPUNIT_TEST(testAutoTitleDelXLSX);
 CPPUNIT_TEST(testDispBlanksAsXLSX);
+CPPUNIT_TEST(testMarkerColorXLSX);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1219,6 +1221,14 @@ void Chart2ExportTest::testDispBlanksAsXLSX()
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap");
 }
 
+void Chart2ExportTest::testMarkerColorXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr",
 "val", "92d050");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/markerColor.xlsx 
b/chart2/qa/extras/data/xlsx/markerColor.xlsx
new file mode 100644
index 000..65e87ff
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/markerColor.xlsx differ
commit 30936e3f6f8242950526ce9a0d02971a881b7910
Author: Markus Mohrhard 
Date:   Wed Apr 15 03:25:55 2015 +0200

import marker color from OOXML, related tdf#81407

Change-Id: Ie416d757b73e99836d14b7f24a5cb4b370284d8c

diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx 
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 7a7b2a6..2a38f5a 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -478,6 +478,7 @@ void TypeGroupConverter::convertMarker( PropertySet& 
rPropSet, sal_Int32 nOoxSym
 {
 Color aFillColor = xShapeProps->getFillProperties().maFillColor;
 aSymbol.FillColor = 
aFillColor.getColor(getFilter().getGraphicHelper());
+rPropSet.setProperty(PROP_Color, aSymbol.FillColor);
 }
 
 // set the property
commit 96c05f82cd4df35505497bc29d96c8a250072db0
Author: Markus Mohrhard 
Date:   Wed Apr 15 03:02:01 2015 +0200

export marker color correctly, tdf#81407

Change-Id: Iebc3d87642c93fcdecddd6332fd57b7fdfb2d337

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 7161242..2373c5a 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3101,7 +3101,12 @@ void ChartExport::exportMarker(Reference< 
chart2::XDataSeries > xSeries)
 
 pFS->startElement( FSNS( XML_c, XML_spPr ),
 FSEND );
-WriteSolidFill(aSymbol.FillColor);
+
+util::Color aColor = aSymbol.FillColor;
+if (GetProperty(xPropSet, "Color"))
+mAny >>= aColor;
+
+WriteSolidFill(aColor);
 pFS->endElement( FSNS( XML_c, XML_spPr ) );
 
 pFS->endElement( FSNS( XML_c, XML_marker ) );
commit 3781872660f1d7a28fb601c57ea063deb2aacb60
Author: Markus Mohrhard 
Date:   Wed Apr 15 00:29:10 2015 +0200

add test for dispBlanksAs export

Change-Id: I5d48b99c87c66033a1e5ada05a9d2aa6bd3fb667

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index b0874dd..4d67a24 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -81,6 +81,7 @@ public:
 void testDataLabelDefaultLineChartDOCX();
 void testFdo83058dlblPos();
 void testAutoTitleDelXLSX();
+void testDispBlanksAsXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(test);
@@ -127,6 +128,7 @@ public:
 CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX);
 CPPUNIT_TEST(testFdo83058dlblPos);
 CPPUNIT_TEST(testAutoTitleDelXLSX);
+CPPUNIT_TEST(testDispBlanksAsXLSX);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1209,6 +1211,14 @@ void Chart2ExportTest::testAutoTitleDelXLSX()
 assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", 
"0");
 }
 
+void Chart2ExportTest::testDispBlanksA

Re: New version of Spanish dictionaries (0.8)

2015-04-14 Thread Adolfo Jayme Barrientos

2015-04-14 7:19 GMT-05:00 Andras Timar :
> - Spanish spelling dictionary, hyphenation rules,
> and thesaurus
> + Español (España y América Latina): Ortografía,
> separación y sinónimos
>
> This prevents localization (other than Spanish) of description.

Thanks a lot for the heads-up! Corrected with
http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=59ff183f473301efcdf7d5b85f3f5e2769d030ac

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

[Libreoffice-commits] core.git: dictionaries

2015-04-14 Thread Adolfo Jayme Barrientos

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

New commits:
commit d1a6c61a51f4a15d3818ece4336f16b0a96299eb
Author: Adolfo Jayme Barrientos 
Date:   Tue Apr 14 18:41:36 2015 -0500

Updated core
Project: dictionaries  59ff183f473301efcdf7d5b85f3f5e2769d030ac

Revert Spanish dictionaryâs description to allow for its localization

Thanks to AndrÃ¡s for noticing.

diff --git a/dictionaries b/dictionaries
index cbf6d67..59ff183 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit cbf6d67ea480b68c40697e56efda4cd07e2a4e18
+Subproject commit 59ff183f473301efcdf7d5b85f3f5e2769d030ac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: es/description.xml

2015-04-14 Thread Adolfo Jayme Barrientos

 es/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59ff183f473301efcdf7d5b85f3f5e2769d030ac
Author: Adolfo Jayme Barrientos 
Date:   Tue Apr 14 18:41:36 2015 -0500

Revert Spanish dictionaryâs description to allow for its localization

Thanks to AndrÃ¡s for noticing.

diff --git a/es/description.xml b/es/description.xml
index 77211d4..e7ac452 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -5,7 +5,7 @@
 
 
 
-EspaÃ±ol (EspaÃ±a y AmÃ©rica Latina): OrtografÃa, 
separaciÃ³n y sinÃ³nimos
+Spanish spelling dictionary, hyphenation rules, and 
thesaurus
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Michael Stahl

 svx/source/core/extedit.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 582cdc273ec0e91d27be8a7893994acadf4d7d18
Author: Michael Stahl 
Date:   Tue Apr 14 23:40:06 2015 +0200

tdf#89750: svx: fix ExternalToolEdit on Windows

While adding check that the temp file move succeeds, overlooked that the
file handle is actually leaked, which means the move will fail on WNT
because the file is already open.

(regression from ef490df2119523e1761f99b5fdbb387c2c71608d)

Change-Id: I779ccde79871930fef3bad7e17b633fb62e36a46

diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index d0f9909..bb15fca 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -113,9 +113,8 @@ void ExternalToolEdit::Edit(GraphicObject const*const 
pGraphicObject)
 OUString aTempFileBase;
 OUString aTempFileName;
 
-oslFileHandle pHandle;
 osl::FileBase::RC rc =
-osl::FileBase::createTempFile(0, &pHandle, &aTempFileBase);
+osl::FileBase::createTempFile(nullptr, nullptr, &aTempFileBase);
 if (osl::FileBase::E_None != rc)
 {
 SAL_WARN("svx", "ExternalToolEdit::Edit: cannot create temp file");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.4.3.1'

2015-04-14 Thread Christian Lohmaier

Tag 'libreoffice-4.4.3.1' created by Christian Lohmaier 
 at 2015-04-14 21:50 -0700

Tag libreoffice-4.4.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVLX2qAAoJEPQ0oe+v7q6jqxYP/iQL2SQARC+kte3q0IZEgDmd
iGDwDW4PIl55oIZ2O4+7n7gIhRahT3mgWZD6cHdcVMVk3dOwEo/sN9Bfc3EisJwC
LUEsAWvMCINDVcHGVPzApyitEIXXN5othdinlO0f1L63n3NFIr/TVwC727+7o+ed
qF6OlN5Gh0MklTON5HJ5Jz0cPGbipXqk2zqI8RF5fmO5jIOc/VYFkXU1y/HLeMy2
NfXI/E1EegmIdUQLsclrxuBEbjCW9A3AiEC1GnZyxcOvNdjPZaG+al8byHfp9d8f
ubiBkro94nAYz6mEy7DjgFWWs8bVXguleHqjR3UZoe6UISulR4ojTt8zs0t00FrV
Q4f0l5rjHeTQyEMvGOCMHv+VQSQ66MHMOS9Oq0JPC1wno1hjErfaFixDRodr9LED
l8D9eZ6kaAwUNNM0qgpVFty2H3JEN9inSmwkDgnIwQt70OyB6aTjpPz0wj33idns
42U8qQBZ4Xia39ftfv4+moPT0z2O8N8/c+hcMJUhO8GcM5Irb/FuQYF48DE5WdEo
wXRBndVkmY5UPIsHw5uFoArJT4gw2hHUrpRz6SjH3l8XAh2HUvv97Y1zE4FKY6L4
iq3NtIbTjZmzdCmUBAJE3mvfVRucwmQnev8To8KJbcuJB8M9R4tbJba88RfNaC44
EfL9BcJ6de67eRQK1hxB
=TAQx
-END PGP SIGNATURE-

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.4.3.1'

2015-04-14 Thread Christian Lohmaier

Tag 'libreoffice-4.4.3.1' created by Christian Lohmaier 
 at 2015-04-14 21:50 -0700

Tag libreoffice-4.4.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVLX2vAAoJEPQ0oe+v7q6j+K8P/jVFuM3un0F0fEHozYMLHTpK
OQBBzkO8mA/qC9ThUX6CJLaU5uzW98kkeC3SseO0qzJQWcp27tINZksZKFmPNYq7
j+CGbaN1rsnMWI/g72iq9WDHr1Y9L6xjzwmZfOUMmEEk1A5H8AdILw6mnyiMEEKN
wmK0WD3SAHaGl60i+EimEKgCwvOmscs8b6jRYJOKIgw3vV7/l+js62EFBBVpxC2E
c2JqDcU0gvrBaXwnwYl4ds2b0gj3vzjKL7vKjoRAFCgYxbCSlK+2GKqcWIAFtRPh
TZEJZaPJZYBzuGuE5VkSZZz8VgkOOKO7+94uQYdroB2oOZWErlBh+J7KzL0CI5dX
jIVZiruu91RWTcbh9RJS3OTPf6Tk9THa0N0u0r+YKY9x3vWJWCcaBhUR0Vp1xqVk
GPRVzyvJUCEaEnBYh0CPUjznnbDlfua+mP99YBI4/M2pgZtlO/0ezqGaK5kI88Jm
E+vUlPAjM3ylXWqVAc0Rk5dqBiQt4c256RrYyzjdaz+MzD+xyVIx84QHP0r0qN+O
2my8tyVIJiQOi5MiuReVOlG4VfLKlZpp6NZYJibczA73QWdDzSi2PmfsrbslNR0d
rGLzkxdP1mv8nPTl/vEildU5edtesQ62ufw56SEXjYjABiw+YeoAfqq0IOHgKG8+
vI/10bX3uO8u1BKNow8Q
=zPW+
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.4.3.1'

2015-04-14 Thread Christian Lohmaier

Tag 'libreoffice-4.4.3.1' created by Christian Lohmaier 
 at 2015-04-14 21:51 -0700

Tag libreoffice-4.4.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVLX21AAoJEPQ0oe+v7q6jX2MQAMq3dNyvJxKdqOyCkKUUxv2l
zNrdYn7X5VN6l+6PXHPVe8bUKlA02dbViP4T/tJ/qU0D9z8KWulDzvmaL0qjLVuD
KV5s1DOLPgcV7oSmNf/AFouErUkO9ngy4BcB00c27cu5UcnkrNqwcpgIS1Lt6cr6
9yh8SsoO+wfK8LqyfZRLZl+gltt8VBJ7LHFSqpPd91Xbwkz1FJeiSv1jTB6xxHKl
tIFapR3uiPwf7aoWY4Gtxch+Eat+82d4n3sD1QdTcST8U+nyYT20WgjfnT0Qchze
wy9ieUUZBlBYZvkXWuRQclEn4XhCP5Opsg00pNIdpfELRsdp0Ggo+1gaM3OHfhWn
kiyst2Nes3G7UAIGGJD9MvvUsUdu0xYfimBWDC191Vaa9Jh3BSCnLXovGMwt0qFa
G8iV2qm5H0HwBXRygynw5rbjbMdaPzITxAZ8Ae51LmAq87bHBcFA7qVuebGQGiqk
civgyJz9sU2XMxYGRUpbkGHMgfj2GRWuC0jFIMawVrQNmscQ+0I2gmuJXWy6IZCj
kADzpi+nWdpsFsGO7CliUuSXZOSOBiLH2YDrxRSA3ebNYWhHdgPbHmk7psep2or+
QnQY/XQqifbOOMSVssOcRfQo3jDsH/dqENa7WgFD/hO6z4BIj2k3qxjPer1YYKz5
D0OaHDKccJC4UpzDwxOP
=/kUa
-END PGP SIGNATURE-

Changes since cp-4.4-branch-point-85:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/openssl

2015-04-14 Thread Michael Stahl

 external/openssl/opensslsol.patch |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 2a675287afa853a255eaab77e76ef3a594fdd951
Author: Michael Stahl 
Date:   Tue Apr 14 21:31:36 2015 +0200

openssl: drop SunStudio specific patch hunk

Besides, wtf is it using -fast by default so the binaries don't run on any
system other than the one that did the build?

Change-Id: I5adc26fb6370a5292721df3167afc5485c15cb0a

diff --git a/external/openssl/opensslsol.patch 
b/external/openssl/opensslsol.patch
index ef70130..6122b67 100644
--- a/external/openssl/opensslsol.patch
+++ b/external/openssl/opensslsol.patch
@@ -1,16 +1,3 @@
 misc/openssl-0.9.8v/Configure  Mon Nov  9 15:14:26 2009
-+++ build/openssl-0.9.8v/Configure Fri Mar 26 16:01:32 2010
-@@ -228,8 +228,8 @@
- "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket 
-lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT 
DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared 
-static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
-  
-  Solaris x86 with Sun C setups
--"solaris-x86-cc","cc:-fast -xarch=generic -O -Xa::-D_REENTRANT::-lsocket 
-lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL 
BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z 
text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa 
-DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK 
DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G 
-dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
-+"solaris-x86-cc","cc:-xarch=generic -O -Xa::-D_REENTRANT::-lsocket -lnsl 
-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL 
BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z 
text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"solaris64-x86_64-cc","cc:-xarch=amd64 -xstrconst -Xa 
-DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK 
BF_PTR2 DES_INT 
DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z 
text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
- 
-  SPARC Solaris with GNU C setups
- "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN 
-DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK 
DES_UNROLL 
BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 --- misc/openssl-0.9.8v/Makefile.sharedWed Sep 17 17:56:40 2008
 +++ build/openssl-0.9.8v/Makefile.shared   Fri Mar 26 16:04:41 2010
 @@ -95,7 +95,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.4.3.1'

2015-04-14 Thread Christian Lohmaier

Tag 'libreoffice-4.4.3.1' created by Christian Lohmaier 
 at 2015-04-14 21:50 -0700

Tag libreoffice-4.4.3.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVLX2yAAoJEPQ0oe+v7q6jYJ4P/3bbtc12Dkse0ecfvEKVF78I
jUdKqAFDDQLbtNBakTdR0i4neDTmGmCq36Mx5+DC8RuEVM7PPvJG3AuXo6L2LlhK
ZwG/HVT6kwZ3T0lfwJ3ATSNQoUwTPOSGVGcLWKk1RJ2HNbaseYSqnN46mKzSqFXD
FWq+qLCY7D7qC4DW2wUraYaVY+Jy25muYVz2WRIwhKAkKvxULIx3DoCbmYCpIOOa
Sp/PLF3UqeV+UbGA8Ruq61wMVq65i0FOWPNxJlfXFiDk6IEWkC/LoIw+0arUVk+c
SBP3V0qKbV3//8aykRqrNgsszvxPtF9Esp2DwUR6UvM3gA9OCv+IoyjRqCyOFmEp
SNbdnkOEC/YXpDhwJA39m5rnJAyh5wsBcHaEAOGaj48Se6lVc7NOsBThm0tIm/K4
kcYg+Nxzm7F9mhsjB6wzHHp/DDOmeiVX+TOYktanckstcFY9L8sBzkL+pEpfS2vo
IjXfu6/3Cprlw4dVU+ssWtvj6FKMvsDII1GJoY7UNRbDzW2ApkCkwswQATcBJQOS
Yz46rWEAWB0XQuj9RjLHWtxbYB83rWv4Bs6nsVJghE1/Wg0OQLjrK7tvLZsWpD4A
QXzni6jTuXWBln24/3kPeLZsn9wJZMh98ZUa1IJJGCLfq2YKAIDCPgX9tYQqcme+
OEVn4HxHYF+nQQ3eYJBf
=A2NF
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-3' - configure.ac

2015-04-14 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e8631e631ec55b7baf61e449225e63bd1b001df
Author: Christian Lohmaier 
Date:   Tue Apr 14 22:51:35 2015 +0200

bump product version to 4.4.3.1.0+

Change-Id: I03ff442b46bb45d8bd7bdbd2e165ce745d5ac2ba

diff --git a/configure.ac b/configure.ac
index f0de637..25097e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.4.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.3.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - configure.ac

2015-04-14 Thread Christian Lohmaier

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c1dc9dfbc478c9a519d4dd12346b84793e4f9dc
Author: Christian Lohmaier 
Date:   Tue Apr 14 22:44:53 2015 +0200

bump product version to 4.4.4.0.0+

Change-Id: I502f3b5687c306b007343162209625ba995344ad

diff --git a/configure.ac b/configure.ac
index f0de637..56bce20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.4.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.4.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-4-3'

2015-04-14 Thread Christian Lohmaier

New branch 'libreoffice-4-4-3' available with the following commits:
commit e062d36a185c93a87b61613ca12ec84e823efab9
Author: Christian Lohmaier 
Date:   Tue Apr 14 22:42:42 2015 +0200

Branch libreoffice-4-4-3

This is 'libreoffice-4-4-3' - the stable branch for the 4.4.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I9c7687b5a5b1c8c6c689e43273136e7f2901e9ec

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-4-3'

2015-04-14 Thread Christian Lohmaier

New branch 'libreoffice-4-4-3' available with the following commits:
commit a4d6e6ac1dbdecb6b7f465aa8d1275d71c0389f2
Author: Christian Lohmaier 
Date:   Tue Apr 14 22:42:25 2015 +0200

Branch libreoffice-4-4-3

This is 'libreoffice-4-4-3' - the stable branch for the 4.4.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Icd56fe139b559279b87ed7bfe2866d2852631362

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-4-3'

2015-04-14 Thread Christian Lohmaier

New branch 'libreoffice-4-4-3' available with the following commits:
commit 84989d93ecb28045598000d6bd2f104362b763de
Author: Christian Lohmaier 
Date:   Tue Apr 14 22:42:26 2015 +0200

Branch libreoffice-4-4-3

This is 'libreoffice-4-4-3' - the stable branch for the 4.4.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic0d4488159e25f33d620e2e2112f745e75a98bb0

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-4-3'

2015-04-14 Thread Christian Lohmaier

New branch 'libreoffice-4-4-3' available with the following commits:
commit 0afea47a130e4ad0356b265da4aa8494b59b5ae5
Author: Christian Lohmaier 
Date:   Tue Apr 14 22:42:26 2015 +0200

Branch libreoffice-4-4-3

This is 'libreoffice-4-4-3' - the stable branch for the 4.4.3 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I35d25bfb0d4d8de15b17190b86279c4f31e0da29

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

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

2015-04-14 Thread Caolán McNamara

 svx/source/engine3d/scene3d.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 488d09771dfbdae0b94898dd675bc39b8550b85e
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 13 15:51:43 2015 +0100

Resolves: tdf#90583 3D pie-chart missing guide handles

partial revert of

commit db1d2af02861b49e4f53d726d59cd71c20cee9b1
Author: Armin Le Grand 
Date:   Tue Feb 18 21:18:13 2014 +

Resolves: #i123539# some optimizations for 3D chart...

geometry creation using UNO API

(cherry picked from commit bbe35be767d76d08891c4f3d3600d80e0e6805f2)

Change-Id: If35f05fb62230e90cfc43a0beac053e8a87820d4
(cherry picked from commit bca8d8985666d3fd22b91eb280f9baaeb933c2d0)
Reviewed-on: https://gerrit.libreoffice.org/15284
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 40e606a..d9c02c5 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -380,14 +380,7 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj)
 void E3dScene::StructureChanged()
 {
 E3dObject::StructureChanged();
-
-if(!GetModel() || !GetModel()->isLocked())
-{
-// #i123539# optimization for 3D chart object generation: do not reset
-// already calculated scene projection data every time an object gets
-// initialized
-SetRectsDirty();
-}
+SetRectsDirty();
 
 ImpCleanup3DDepthMapper();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Chr . Rossmanith

 filter/source/svg/svgexport.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4542e5bd0a9b3838794c72becd1f7caa41846c07
Author: Chr. Rossmanith 
Date:   Sat Apr 4 20:55:29 2015 +0200

tdf#56467 / tdf#88117: SVG export further improved

omitting the clip-path from the  element and keeping it only in
the slides enables rendering of exported selection in viewers like
firefox and inkscape

Change-Id: If296a78a3f948728e8b2ec257849be129bec5d92
Reviewed-on: https://gerrit.libreoffice.org/15155
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/15312
Tested-by: Norbert Thiebaud 
Reviewed-by: Norbert Thiebaud 

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 7d0914a..a73ce92 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -799,13 +799,9 @@ bool SVGFilter::implExportDocument()
 
 aAttr += OUString::number(nDocWidth) + " " + OUString::number(nDocHeight);
 
-msClipPathId = "presentation_clip_path";
-OUString sClipPathAttrValue = "url(#" + msClipPathId + ")";
-
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", 
"xMidYMid" );
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", "evenodd" );
-mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clip-path", 
sClipPathAttrValue );
 
 // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", 
OUString::number( 28.222 ) );
@@ -822,6 +818,7 @@ bool SVGFilter::implExportDocument()
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", 
"ClipPathGroup" );
 SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, 
"defs", true, true );
 {
+msClipPathId = "presentation_clip_path";
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", msClipPathId 
);
 mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits", 
"userSpaceOnUse" );
 SvXMLElementExport aClipPathElem( *mpSVGExport, 
XML_NAMESPACE_NONE, "clipPath", true, true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 filter/source/msfilter/escherex.cxx |   37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)

New commits:
commit a1e252733e3ddbab7b4854799acb05edc25dd07a
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 13 12:46:34 2015 +0100

Related: tdf#74018 fix int wraparound + crash on export

of fdo74018-2.docx to doc

nPoints is 16bit and accumulated value wraps around, so use
a 32bit nTotalPoints instead and move 16bit declarations to
use points to confirm no other wraparounds

(cherry picked from commit ce705ac56a8709970356d634abb964adef105594)

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

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 7217ec1..b85979d 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2059,42 +2059,43 @@ bool EscherPropertyContainer::CreatePolygonProperties(
 {
 Polygon aPolygon;
 
-sal_uInt16 i, j, k, nPoints, nBezPoints, nPolyCount = 
aPolyPolygon.Count();
+sal_uInt16 nPolyCount = aPolyPolygon.Count();
+sal_uInt32 nTotalPoints(0), nTotalBezPoints(0);
 Rectangle aRect( aPolyPolygon.GetBoundRect() );
 rGeoRect = ::com::sun::star::awt::Rectangle( aRect.Left(), 
aRect.Top(), aRect.GetWidth(), aRect.GetHeight() );
 
-for ( nBezPoints = nPoints = i = 0; i < nPolyCount; i++ )
+for (sal_uInt16 i = 0; i < nPolyCount; ++i)
 {
-k = aPolyPolygon[ i ].GetSize();
-nPoints = nPoints + k;
-for ( j = 0; j < k; j++ )
+sal_uInt16 k = aPolyPolygon[ i ].GetSize();
+nTotalPoints += k;
+for (sal_uInt16 j = 0; j < k; ++j)
 {
 if ( aPolyPolygon[ i ].GetFlags( j ) != POLY_CONTROL )
-nBezPoints++;
+nTotalBezPoints++;
 }
 }
-sal_uInt32 nVerticesBufSize = ( nPoints << 2 ) + 6;
+sal_uInt32 nVerticesBufSize = ( nTotalPoints << 2 ) + 6;
 sal_uInt8* pVerticesBuf = new sal_uInt8[ nVerticesBufSize ];
 
 
-sal_uInt32 nSegmentBufSize = ( ( nBezPoints << 2 ) + 8 );
+sal_uInt32 nSegmentBufSize = ( ( nTotalBezPoints << 2 ) + 8 );
 if ( nPolyCount > 1 )
 nSegmentBufSize += ( nPolyCount << 1 );
 sal_uInt8* pSegmentBuf = new sal_uInt8[ nSegmentBufSize ];
 
 sal_uInt8* pPtr = pVerticesBuf;
-*pPtr++ = (sal_uInt8)( nPoints );// Little 
endian
-*pPtr++ = (sal_uInt8)( nPoints >> 8 );
-*pPtr++ = (sal_uInt8)( nPoints );
-*pPtr++ = (sal_uInt8)( nPoints >> 8 );
+*pPtr++ = (sal_uInt8)( nTotalPoints );// 
Little endian
+*pPtr++ = (sal_uInt8)( nTotalPoints >> 8 );
+*pPtr++ = (sal_uInt8)( nTotalPoints );
+*pPtr++ = (sal_uInt8)( nTotalPoints >> 8 );
 *pPtr++ = (sal_uInt8)0xf0;
 *pPtr++ = (sal_uInt8)0xff;
 
-for ( j = 0; j < nPolyCount; j++ )
+for (sal_uInt16 j = 0; j < nPolyCount; ++j)
 {
 aPolygon = aPolyPolygon[ j ];
-nPoints = aPolygon.GetSize();
-for ( i = 0; i < nPoints; i++ ) // write points 
from polygon to buffer
+sal_uInt16 nPoints = aPolygon.GetSize();
+for (sal_uInt16 i = 0; i < nPoints; ++i) // write 
points from polygon to buffer
 {
 Point aPoint = aPolygon[ i ];
 aPoint.X() -= rGeoRect.X;
@@ -2115,13 +2116,13 @@ bool EscherPropertyContainer::CreatePolygonProperties(
 *pPtr++ = (sal_uInt8)2;
 *pPtr++ = (sal_uInt8)0;
 
-for ( j = 0; j < nPolyCount; j++ )
+for (sal_uInt16 j = 0; j < nPolyCount; ++j)
 {
 *pPtr++ = 0x0;  // Polygon start
 *pPtr++ = 0x40;
 aPolygon = aPolyPolygon[ j ];
-nPoints = aPolygon.GetSize();
-for ( i = 0; i < nPoints; i++ ) // write Polyflags to 
Buffer
+sal_uInt16 nPoints = aPolygon.GetSize();
+for (sal_uInt16 i = 0; i < nPoints; ++i) // write 
Polyflags to Buffer
 {
 *pPtr++ = 0;
 if ( bBezier )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 sd/source/filter/eppt/pptx-epptooxml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 265d14ceb3da1f5091cb9e9cad4615da6847e12c
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 17:05:10 2015 +0100

fix export of ooo120353-1.odp to pptx, mismatch of start and end element

cut and paste error I guess from the block above it

Change-Id: I121e1d1a9f08ea3731bb7f65c385f264b3c2d2f4
(cherry picked from commit 1d4e66a79453f7b020a3dcea328c03637407add9)
Reviewed-on: https://gerrit.libreoffice.org/15308
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 1f1362b..ece21dd 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1107,7 +1107,7 @@ void 
PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
 WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild );
 } else
 WriteAnimationCondition( pFS, aAny, false, bMainSeqChild );
-pFS->endElementNS( XML_p, XML_stCondLst );
+pFS->endElementNS( XML_p, XML_endCondLst );
 }
 
 Reference< XEnumerationAccess > xEnumerationAccess( rXNode, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 sd/source/filter/eppt/pptx-epptooxml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9ac39aa8418745f959bc4daa0877fed23fc72c1
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 17:05:10 2015 +0100

fix export of ooo120353-1.odp to pptx, mismatch of start and end element

cut and paste error I guess from the block above it

Change-Id: I121e1d1a9f08ea3731bb7f65c385f264b3c2d2f4
(cherry picked from commit 1d4e66a79453f7b020a3dcea328c03637407add9)
Reviewed-on: https://gerrit.libreoffice.org/15309
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 980befa2..2cb61d5 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1093,7 +1093,7 @@ void 
PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
 WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild );
 } else
 WriteAnimationCondition( pFS, aAny, false, bMainSeqChild );
-pFS->endElementNS( XML_p, XML_stCondLst );
+pFS->endElementNS( XML_p, XML_endCondLst );
 }
 
 Reference< XEnumerationAccess > xEnumerationAccess( rXNode, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Harri Pitkänen

 cui/source/tabpages/backgrnd.cxx |2 --
 sw/source/ui/table/tabledlg.cxx  |5 +
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3791159628d26364c391330d9bfc67d081d291f9
Author: Harri PitkÃ¤nen 
Date:   Sun Apr 12 13:21:24 2015 +0300

Remove checks for HTMLMODE_SOME_STYLES

HTMLMODE_SOME_STYLES is enabled if we are in HTML mode (it is
enabled for all HTML modes). These checks for conditionally disabling
some table background controls are not needed anymore.

Change-Id: I10fb73a67ac4bba250da4cea79ff6bae427a1613
Reviewed-on: https://gerrit.libreoffice.org/15264
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 7465f02..795b8b9 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1588,8 +1588,6 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, 
ListBox*, pBox )
 nWhich = pTableBck_Impl->nCellWhich;
 break;
 case TBL_DEST_ROW:
-if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & 
HTMLMODE_SOME_STYLES))
-m_pLbSelect->Disable();
 pActItem = pTableBck_Impl->pRowBrush;
 nWhich = pTableBck_Impl->nRowWhich;
 break;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 0f49309..4f9f8a4 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1222,10 +1222,7 @@ void  SwTableTabDlg::PageCreated(sal_uInt16 nId, 
SfxTabPage& rPage)
 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 if (nId == m_nBackgroundId)
 {
-sal_Int32 nFlagType = SVX_SHOW_TBLCTL;
-if(!( m_nHtmlMode & HTMLMODE_ON ) ||
-m_nHtmlMode & HTMLMODE_SOME_STYLES)
-nFlagType |= SVX_SHOW_SELECTOR;
+sal_Int32 nFlagType = SVX_SHOW_TBLCTL | SVX_SHOW_SELECTOR;
 aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
 rPage.PageCreated(aSet);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 sd/source/filter/eppt/epptso.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d946f85440f4f225ecda88b121bad601b5573549
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 20:59:50 2015 +0100

fix assert on re-export of ooo48994-1.ppt to ppt

Change-Id: Ic8274e7d060f315d7891f8f5cf576f834ca89117
(cherry picked from commit eece059c1f728059b536763bffd2d4fc3537833e)
Reviewed-on: https://gerrit.libreoffice.org/15314
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index bf8bd4f..2b13085 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1138,7 +1138,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 aFile = aFile.replaceAll( "/", "\\" );
 aTarget = aFile;
 }
-else if ( pFieldEntry->aFieldUrl[0] == '#' )
+else if ( pFieldEntry->aFieldUrl.startsWith("#") )
 {
 OUString aPage( INetURLObject::decode( 
pFieldEntry->aFieldUrl, '%', INetURLObject::DECODE_WITH_CHARSET ) );
 aPage = aPage.copy( 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Julien Nabet

 sfx2/source/sidebar/Theme.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7c19d748285f033dbc398070018ce45833a0
Author: Julien Nabet 
Date:   Mon Apr 13 20:29:25 2015 +0200

Cherry-pick 2 fixes:

tdf#90566: memory leak: maChangeListeners is not properly disposed
cbbb24d0afcdbdac21d03ec4ee1455a3834afff4

fix loop
d170afda29bf4557df568732b1feba47f2c9439f

Change-Id: Ie575d503349b3218c7a0211e1f81d791e995297e
Reviewed-on: https://gerrit.libreoffice.org/15290
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 4acbe85..262f363 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -429,15 +429,15 @@ void Theme::UpdateTheme (void)
 void SAL_CALL Theme::disposing (void)
 {
 ChangeListeners aListeners;
-maChangeListeners.swap(aListeners);
+aListeners.swap(maChangeListeners);
 
 const lang::EventObject aEvent (static_cast(this));
 
 for (ChangeListeners::const_iterator
- iContainer(maChangeListeners.begin()),
- iContainerEnd(maChangeListeners.end());
- iContainerEnd!=iContainerEnd;
- ++iContainerEnd)
+ iContainer(aListeners.begin()),
+ iContainerEnd(aListeners.end());
+ iContainer != iContainerEnd;
+ ++iContainer)
 {
 for (ChangeListenerContainer::const_iterator
  iListener(iContainer->second.begin()),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 sd/source/filter/eppt/epptso.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f12510bf60c2261e8d7d3b843c815b12d411601e
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 20:59:50 2015 +0100

fix assert on re-export of ooo48994-1.ppt to ppt

Change-Id: Ic8274e7d060f315d7891f8f5cf576f834ca89117
(cherry picked from commit eece059c1f728059b536763bffd2d4fc3537833e)
Reviewed-on: https://gerrit.libreoffice.org/15313
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 939751a..1082b6b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1140,7 +1140,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 aFile = aFile.replaceAll( "/", "\\" );
 aTarget = aFile;
 }
-else if ( pFieldEntry->aFieldUrl[0] == '#' )
+else if ( pFieldEntry->aFieldUrl.startsWith("#") )
 {
 OUString aPage( INetURLObject::decode( 
pFieldEntry->aFieldUrl, '%', INetURLObject::DECODE_WITH_CHARSET ) );
 aPage = aPage.copy( 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Michael Stahl

 svx/source/unodraw/unobrushitemhelper.cxx  |   27 -
 sw/qa/extras/odfimport/data/PageBackground.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |6 +
 3 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit ac8be3d609a219c62713d37d22f8fef0115809f1
Author: Michael Stahl 
Date:   Tue Apr 14 16:25:42 2015 +0200

tdf#89478: svx: ODF import: SvxBrushItem Graphics should override Color

The bugdoc has:





In this case it's clearly better to prefer the Graphics.

The old code could actually store both in the model but the UI only
allows setting either Color or Graphic, so this should be good enough.

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: Id33231ad90815d9791f90289fb0b55455d334c14
(cherry picked from commit b82791e3c586d6e4247d0eb1bb94681bcb113762)
Reviewed-on: https://gerrit.libreoffice.org/15307
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svx/source/unodraw/unobrushitemhelper.cxx 
b/svx/source/unodraw/unobrushitemhelper.cxx
index 4a2ec1d..d10aab6 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -50,19 +50,8 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const 
SvxBrushItem& rBrush, SfxI
 
 const sal_uInt8 nTransparency(rBrush.GetColor().GetTransparency());
 
-if(0xff != nTransparency)
-{
-// we have a color fill
-const Color aColor(rBrush.GetColor().GetRGBColor());
-
-rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
-rToSet.Put(XFillColorItem(OUString(), aColor));
-
-// #125189# nTransparency is in range [0..254], convert to [0..100] 
which is used in
-// XFillTransparenceItem (caution with the range which is in an 
*item-specific* range)
-rToSet.Put(XFillTransparenceItemsal_Int32)nTransparency * 100) + 
127) / 254));
-}
-else if(GPOS_NONE != rBrush.GetGraphicPos())
+// tdf#89478 check for image first
+if (GPOS_NONE != rBrush.GetGraphicPos())
 {
 // we have a graphic fill, set fill style
 rToSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
@@ -131,6 +120,18 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const 
SvxBrushItem& rBrush, SfxI
 rToSet.Put(XFillTransparenceItem(nGraphicTransparency));
 }
 }
+else if (0xff != nTransparency)
+{
+// we have a color fill
+const Color aColor(rBrush.GetColor().GetRGBColor());
+
+rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
+rToSet.Put(XFillColorItem(OUString(), aColor));
+
+// #125189# nTransparency is in range [0..254], convert to [0..100] 
which is used in
+// XFillTransparenceItem (caution with the range which is in an 
*item-specific* range)
+rToSet.Put(XFillTransparenceItemsal_Int32)nTransparency * 100) + 
127) / 254));
+}
 else
 {
 // GPOS_NONE == rBrush.GetGraphicPos() && 0xff == 
rBrush.GetColor().GetTransparency(),
diff --git a/sw/qa/extras/odfimport/data/PageBackground.odt 
b/sw/qa/extras/odfimport/data/PageBackground.odt
index dbb1082..3733d5b 100644
Binary files a/sw/qa/extras/odfimport/data/PageBackground.odt and 
b/sw/qa/extras/odfimport/data/PageBackground.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index a4de654..5db4370 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -315,6 +315,12 @@ DECLARE_ODFIMPORT_TEST(testPageBackground, 
"PageBackground.odt")
 CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xPropertySet, "FillStyle"));
 CPPUNIT_ASSERT_EQUAL(OUString("Sky"), getProperty(xPropertySet, 
"FillBitmapName"));
 CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, 
getProperty(xPropertySet, "FillBitmapMode"));
+
+uno::Reference 
xPropertySetOld(getStyles("PageStyles")->getByName("OldStandard"), 
uno::UNO_QUERY);
+// The background image was overridden by color
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xPropertySetOld, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(OUString("Sky"), 
getProperty(xPropertySetOld, "FillBitmapName"));
+CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, 
getProperty(xPropertySetOld, "FillBitmapMode"));
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Michael Stahl

 sw/qa/extras/odfimport/data/PageBackground.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   11 
 sw/source/core/unocore/unomap.cxx  |   66 +
 xmloff/source/style/PageMasterStyleMap.cxx |1 
 4 files changed, 78 insertions(+)

New commits:
commit 53cd20e94d7cd2a72bf82d0dc8ed71fc5140e938
Author: Michael Stahl 
Date:   Tue Apr 14 14:35:44 2015 +0200

xmloff: add back the presumably accidentally removed "FootnoteLineStyle"

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: I67ec4516ff431efd47451ff07fc261ba32e80385
(cherry picked from commit ea8db4ad8e1c75c3ab2f31fea4e061600231f9d1)
Reviewed-on: https://gerrit.libreoffice.org/15306
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/xmloff/source/style/PageMasterStyleMap.cxx 
b/xmloff/source/style/PageMasterStyleMap.cxx
index 16dac27..da1308b 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -153,6 +153,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] =
 PLMAP( "FootnoteLineRelativeWidth", XML_NAMESPACE_STYLE,XML__EMPTY,
 XML_TYPE_PERCENT8|MID_FLAG_SPECIAL_ITEM,CTF_PM_FTN_LINE_WIDTH ),
 PLMAP( "FootnoteLineTextDistance", XML_NAMESPACE_STYLE,XML__EMPTY, 
XML_TYPE_MEASURE|MID_FLAG_SPECIAL_ITEM,CTF_PM_FTN_LINE_DISTANCE ),
 PLMAP( "FootnoteLineWeight",XML_NAMESPACE_STYLE,
XML_FOOTNOTE_SEP,XML_TYPE_MEASURE16|MID_FLAG_ELEMENT_ITEM,
CTF_PM_FTN_LINE_WEIGHT ),
+PLMAP( "FootnoteLineStyle", XML_NAMESPACE_STYLE,XML_EMPTY,  
XML_TYPE_STRING|MID_FLAG_ELEMENT_ITEM,  CTF_PM_FTN_LINE_STYLE ),
 
 //
 //Index 92: Section for 'header-style' own section, all members *have* 
to use CTF_PM_HEADERFLAG in the context entry (the 5th one)
commit d2c490fb9f4b2b6b63b82c4ba26df9a3672f9d55
Author: Michael Stahl 
Date:   Tue Apr 14 10:37:01 2015 +0200

tdf#88337 tdf#89193: sw: add missing SwXPageStyle properties

Add the fill style properties so background images etc. are not lost.

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: I517350eec2f32e4b4bb80427666aad23a31d666a
(cherry picked from commit 65a56636a68451d15499a37c2d5bd9efb71b1279)
Reviewed-on: https://gerrit.libreoffice.org/15305
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/odfimport/data/PageBackground.odt 
b/sw/qa/extras/odfimport/data/PageBackground.odt
new file mode 100644
index 000..dbb1082
Binary files /dev/null and b/sw/qa/extras/odfimport/data/PageBackground.odt 
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index c0534d7..a4de654 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -11,6 +11,8 @@
 #if !defined(WNT)
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -306,6 +308,15 @@ DECLARE_ODFIMPORT_TEST(testFdo79269_header, 
"fdo79269_header.odt")
 CPPUNIT_ASSERT_EQUAL(OUString("second"), xFooter->getString());
 }
 
+DECLARE_ODFIMPORT_TEST(testPageBackground, "PageBackground.odt")
+{
+uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName("Default Style"), 
uno::UNO_QUERY);
+// The background image was lost
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xPropertySet, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(OUString("Sky"), getProperty(xPropertySet, 
"FillBitmapName"));
+CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, 
getProperty(xPropertySet, "FillBitmapMode"));
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
 {
 uno::Reference xShape = getShape(1);
diff --git a/sw/source/core/unocore/unomap.cxx 
b/sw/source/core/unocore/unomap.cxx
index cb7cdf0..540f4b5 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1070,6 +1070,72 @@ const SfxItemPropertyMapEntry* 
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
 { OUString(UNO_NAME_GRID_SNAP_TO_CHARS), RES_TEXTGRID, 
cppu::UnoType::get(), PROPERTY_NONE, MID_GRID_SNAPTOCHARS},
 { OUString(UNO_NAME_GRID_STANDARD_PAGE_MODE), 
RES_TEXTGRID, cppu::UnoType::get(), PROPERTY_NONE, 
MID_GRID_STANDARD_MODE},
 { OUString(UNO_NAME_HIDDEN), FN_UNO_HIDDEN, 
cppu::UnoType::get(), PROPERTY_NONE, 0},
+
+// added FillProperties for SW, same as 
FILL_PROPERTIES in svx
+// but need own defines in Writer due to later association 
of strings
+// and uno types (see loop at end of this method and 
definition of SW_PROP_NMID)
+// This entry is for adding that properties to style 
import/export
+FILL_PROPERTIES_SW
+
+// Added DrawingLayer FillS

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

2015-04-14 Thread Miklos Vajna

 sw/qa/extras/mailmerge/data/empty.odt |binary
 sw/qa/extras/mailmerge/mailmerge.cxx  |5 +
 sw/source/core/doc/docnew.cxx |   26 ++
 3 files changed, 31 insertions(+)

New commits:
commit 2d66204f9676e5a3361de0b6dcc5fcc5a4a625e2
Author: Miklos Vajna 
Date:   Fri Apr 10 11:54:03 2015 +0200

tdf#90230 SwDoc::AppendDoc: take care of marks when inserting page break

SwDoc::AppendDoc() inserts nodes from an other document, and before
doing that, it inserts a page break at the end of the document. In case
there are marks at the end of the last paragraph, the insertion of the
page break moves them to the next page. This is a rare situation, but
happens e.g. when the source document is an empty one: then MM puts a
mark at the first paragraph of each inserted MM part, and then the first
paragraph == the last paragraph, so the mark of the only paragraph in
the document gets moved to the next page.

This is a problem on its own, but is detected by the SwIndexReg dtor
when that empty paragraph gets deleted later in SwNodes::Delete() called
by SwDoc::AppendDoc(), resulting in an assertion failure.

Triggered by commit a305a2c91420652db450b7f8edd140e1d69f42cf (use
bookmarks to mark mailmerge parts in a mailmerge document (fdo#80823),
2014-10-20), these not adjusted bookmarks were not detected before.

(cherry picked from commit 2819ee71da631116662401f14f8a0fb78c2a7f3a)

Conflicts:
sw/qa/extras/mailmerge/mailmerge.cxx

Change-Id: I89775b477a2fd3182b2bc87144aed2bfe7912aff
Reviewed-on: https://gerrit.libreoffice.org/15310
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/qa/extras/mailmerge/data/empty.odt 
b/sw/qa/extras/mailmerge/data/empty.odt
new file mode 100644
index 000..311cb06
Binary files /dev/null and b/sw/qa/extras/mailmerge/data/empty.odt differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 3ac9724..37bbed4 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -346,6 +346,11 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf89214, "tdf89214.odt", 
"10-testing-addresses
 CPPUNIT_ASSERT(!getProperty(xParagraph, "ListId").isEmpty());
 }
 
+DECLARE_SHELL_MAILMERGE_TEST(testTdf90230, "empty.odt", 
"10-testing-addresses.ods", "testing-addresses")
+{
+// MM of an empty document caused an assertion in the SwIndexReg dtor.
+executeMailMerge();
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index c6d353b..95a3ded 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -985,6 +985,32 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, 
sal_uInt16 const nStartPageNu
 if ( pTargetPageDesc ) {
 OUString name = pTargetPageDesc->GetName();
 pTargetShell->InsertPageBreak( &name, nStartPageNumber );
+
+// There is now a new empty text node on the new page. If it has
+// any marks, those are from the previous page: move them back
+// there, otherwise later we can't delete that empty text node.
+SwNodeIndex aNodeIndex(GetNodes().GetEndOfContent(), -1);
+if (SwTxtNode* pTxtNode = aNodeIndex.GetNode().GetTxtNode())
+{
+// Position of the last paragraph on the previous page.
+--aNodeIndex;
+SwPaM aPaM(aNodeIndex);
+// Collect the marks starting or ending at this text node.
+std::set aSeenMarks;
+IDocumentMarkAccess* pMarkAccess = getIDocumentMarkAccess();
+for (const SwIndex* pIndex = pTxtNode->GetFirstIndex(); 
pIndex; pIndex = pIndex->GetNext())
+{
+sw::mark::IMark* pMark = 
const_cast(pIndex->GetMark());
+if (!pMark)
+continue;
+if (aSeenMarks.find(pMark) != aSeenMarks.end())
+continue;
+aSeenMarks.insert(pMark);
+}
+// And move them back.
+for (sw::mark::IMark* pMark : aSeenMarks)
+pMarkAccess->repositionMark(pMark, aPaM);
+}
 }
 }
 #ifdef DBG_UTIL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 2 commits - include/svtools svtools/source sw/source

2015-04-14 Thread Michael Meeks

 include/svtools/treelistbox.hxx   |6 +++---
 svtools/source/contnr/treelistbox.cxx |5 ++---
 sw/source/uibase/misc/redlndlg.cxx|3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0a285fad16cac7a6cf06e186c5a844079593e8f7
Author: Michael Meeks 
Date:   Tue Apr 14 20:59:26 2015 +0100

Fix redline dialog lifecycle foo.

Change-Id: Idf34e57243b7baba7789fd3d83a2bd7726d3c147

diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index c2f616c..6d69bfa 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -149,7 +149,7 @@ void SwModelessRedlineAcceptDlg::dispose()
 SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, 
VclBuilderContainer *pBuilder,
vcl::Window *pContentArea, bool 
bAutoFmt) :
 pParentDlg  (pParent),
-aTabPagesCTRL   (new SvxAcceptChgCtr(pContentArea, pBuilder)),
+aTabPagesCTRL   (VclPtr::Create(pContentArea, pBuilder)),
 aPopup  (SW_RES(MN_REDLINE_POPUP)),
 sInserted   (SW_RES(STR_REDLINE_INSERTED)),
 sDeleted(SW_RES(STR_REDLINE_DELETED)),
@@ -221,6 +221,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window 
*pParent, VclBuilderContainer
 
 SwRedlineAcceptDlg::~SwRedlineAcceptDlg()
 {
+aTabPagesCTRL.disposeAndClear();
 }
 
 void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
commit 35237cb348d22c60dbde4b3378f7eab5546631d3
Author: Michael Meeks 
Date:   Tue Apr 14 20:59:00 2015 +0100

Help SvTreeListBox survive post dispose.

Change-Id: I7a4aca5918b2bdadc32810a84afb84477e97fd2e

diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index ed81c37..56ffb51 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -349,11 +349,11 @@ public:
 
 sal_uLong GetEntryCount() const
 {
-return pModel->GetEntryCount();
+return pModel ? pModel->GetEntryCount() : 0;
 }
 SvTreeListEntry* First() const
 {
-return pModel->First();
+return pModel ? pModel->First() : NULL;
 }
 SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth = 0 ) 
const
 {
@@ -365,7 +365,7 @@ public:
 }
 SvTreeListEntry* Last() const
 {
-return pModel->Last();
+return pModel ? pModel->Last() : NULL;
 }
 
 SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const;
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index b4861c3..bc5e933e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2221,10 +2221,9 @@ void SvTreeListBox::LoseFocus()
 {
 //If there is no item in the tree, delete visual focus.
 if( !First())
-{
 Invalidate();
-}
-pImp->LoseFocus();
+if( pImp )
+pImp->LoseFocus();
 Control::LoseFocus();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 filter/source/msfilter/escherex.cxx |   37 ++--
 1 file changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 78ca28fb175f8b08b83b40050e41fe30f1bf6237
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 13 12:46:34 2015 +0100

Related: tdf#74018 fix int wraparound + crash on export

of fdo74018-2.docx to doc

nPoints is 16bit and accumulated value wraps around, so use
a 32bit nTotalPoints instead and move 16bit declarations to
use points to confirm no other wraparounds

(cherry picked from commit ce705ac56a8709970356d634abb964adef105594)

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

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 23fcc48..517b548 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2056,42 +2056,43 @@ bool EscherPropertyContainer::CreatePolygonProperties(
 {
 Polygon aPolygon;
 
-sal_uInt16 i, j, k, nPoints, nBezPoints, nPolyCount = 
aPolyPolygon.Count();
+sal_uInt16 nPolyCount = aPolyPolygon.Count();
+sal_uInt32 nTotalPoints(0), nTotalBezPoints(0);
 Rectangle aRect( aPolyPolygon.GetBoundRect() );
 rGeoRect = ::com::sun::star::awt::Rectangle( aRect.Left(), 
aRect.Top(), aRect.GetWidth(), aRect.GetHeight() );
 
-for ( nBezPoints = nPoints = i = 0; i < nPolyCount; i++ )
+for (sal_uInt16 i = 0; i < nPolyCount; ++i)
 {
-k = aPolyPolygon[ i ].GetSize();
-nPoints = nPoints + k;
-for ( j = 0; j < k; j++ )
+sal_uInt16 k = aPolyPolygon[ i ].GetSize();
+nTotalPoints += k;
+for (sal_uInt16 j = 0; j < k; ++j)
 {
 if ( aPolyPolygon[ i ].GetFlags( j ) != POLY_CONTROL )
-nBezPoints++;
+nTotalBezPoints++;
 }
 }
-sal_uInt32 nVerticesBufSize = ( nPoints << 2 ) + 6;
+sal_uInt32 nVerticesBufSize = ( nTotalPoints << 2 ) + 6;
 sal_uInt8* pVerticesBuf = new sal_uInt8[ nVerticesBufSize ];
 
 
-sal_uInt32 nSegmentBufSize = ( ( nBezPoints << 2 ) + 8 );
+sal_uInt32 nSegmentBufSize = ( ( nTotalBezPoints << 2 ) + 8 );
 if ( nPolyCount > 1 )
 nSegmentBufSize += ( nPolyCount << 1 );
 sal_uInt8* pSegmentBuf = new sal_uInt8[ nSegmentBufSize ];
 
 sal_uInt8* pPtr = pVerticesBuf;
-*pPtr++ = (sal_uInt8)( nPoints );// Little 
endian
-*pPtr++ = (sal_uInt8)( nPoints >> 8 );
-*pPtr++ = (sal_uInt8)( nPoints );
-*pPtr++ = (sal_uInt8)( nPoints >> 8 );
+*pPtr++ = (sal_uInt8)( nTotalPoints );// 
Little endian
+*pPtr++ = (sal_uInt8)( nTotalPoints >> 8 );
+*pPtr++ = (sal_uInt8)( nTotalPoints );
+*pPtr++ = (sal_uInt8)( nTotalPoints >> 8 );
 *pPtr++ = (sal_uInt8)0xf0;
 *pPtr++ = (sal_uInt8)0xff;
 
-for ( j = 0; j < nPolyCount; j++ )
+for (sal_uInt16 j = 0; j < nPolyCount; ++j)
 {
 aPolygon = aPolyPolygon[ j ];
-nPoints = aPolygon.GetSize();
-for ( i = 0; i < nPoints; i++ ) // write points 
from polygon to buffer
+sal_uInt16 nPoints = aPolygon.GetSize();
+for (sal_uInt16 i = 0; i < nPoints; ++i) // write 
points from polygon to buffer
 {
 Point aPoint = aPolygon[ i ];
 aPoint.X() -= rGeoRect.X;
@@ -2112,13 +2113,13 @@ bool EscherPropertyContainer::CreatePolygonProperties(
 *pPtr++ = (sal_uInt8)2;
 *pPtr++ = (sal_uInt8)0;
 
-for ( j = 0; j < nPolyCount; j++ )
+for (sal_uInt16 j = 0; j < nPolyCount; ++j)
 {
 *pPtr++ = 0x0;  // Polygon start
 *pPtr++ = 0x40;
 aPolygon = aPolyPolygon[ j ];
-nPoints = aPolygon.GetSize();
-for ( i = 0; i < nPoints; i++ ) // write Polyflags to 
Buffer
+sal_uInt16 nPoints = aPolygon.GetSize();
+for (sal_uInt16 i = 0; i < nPoints; ++i) // write 
Polyflags to Buffer
 {
 *pPtr++ = 0;
 if ( bBezier )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 sd/source/filter/eppt/epptso.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eece059c1f728059b536763bffd2d4fc3537833e
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 20:59:50 2015 +0100

fix assert on re-export of ooo48994-1.ppt to ppt

Change-Id: Ic8274e7d060f315d7891f8f5cf576f834ca89117

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b80f143..4223c58 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1140,7 +1140,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, 
int nTextInstance, sal_u
 aFile = aFile.replaceAll( "/", "\\" );
 aTarget = aFile;
 }
-else if ( pFieldEntry->aFieldUrl[0] == '#' )
+else if ( pFieldEntry->aFieldUrl.startsWith("#") )
 {
 OUString aPage( INetURLObject::decode( 
pFieldEntry->aFieldUrl, INetURLObject::DECODE_WITH_CHARSET ) );
 aPage = aPage.copy( 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Matthew Francis

 sw/source/ui/index/cnttab.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33a67ac2c5e6a60b5a99ebf6767f803277b79148
Author: Matthew Francis 
Date:   Mon Apr 6 01:46:45 2015 +0400

tdf#89630 Remove extra space added when assigning styles for TOC

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

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index c0065b7..a528f65 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3623,7 +3623,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl)
nTemplPos != LISTBOX_ENTRY_NOTFOUND)
 {
 const OUString aStr(m_pLevelLB->GetEntry(nLevPos).getToken(0, 
aDeliStart)
-+ " " + OUString(aDeliStart)
++ OUString(aDeliStart)
 + m_pParaLayLB->GetSelectEntry()
 + OUString(aDeliEnd));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Jan Holesovsky

 sw/source/uibase/uiview/view.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5087e4caa4343a1a17ffb42eea4aa0354cab8636
Author: Jan Holesovsky 
Date:   Wed Jan 28 13:45:32 2015 +0100

tdf#80960: Attempt to fix the cursor placement after document load.

This is a blind attempt - don't have a 32bit system at hand to really try 
it.

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

diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 358937f..c3d3f2a 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1254,8 +1254,8 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < 
beans::PropertyValue >
 const Rectangle &rVis = GetVisArea();
 const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions();
 
-long nX = rRect.Left(), nY = rRect.Top(), nLeft = rVis.Left(), nTop = 
rVis.Top();
-long nRight = bBrowse ? LONG_MIN : rVis.Right(), nBottom = bBrowse ? 
LONG_MIN : rVis.Bottom();
+sal_Int64 nX = rRect.Left(), nY = rRect.Top(), nLeft = rVis.Left(), 
nTop = rVis.Top();
+sal_Int64 nRight = bBrowse ? LONG_MIN : rVis.Right(), nBottom = 
bBrowse ? LONG_MIN : rVis.Bottom();
 sal_Int16 nZoomType = static_cast< sal_Int16 >(pVOpt->GetZoomType());
 sal_Int16 nZoomFactor = static_cast < sal_Int16 > (pVOpt->GetZoom());
 bool bViewLayoutBookMode = pVOpt->IsViewLayoutBookMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2015-04-14 Thread Laurent Godard

 offapi/com/sun/star/util/XNumberFormats.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f02ef85f4a5b6770cddf94ccc2eeb3c187d67b22
Author: Laurent Godard 
Date:   Mon Apr 13 18:42:25 2015 +0200

remove build warning

Change-Id: I533d603ac1f073336eda99de57892ff5e12132d4
Reviewed-on: https://gerrit.libreoffice.org/15288
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/offapi/com/sun/star/util/XNumberFormats.idl 
b/offapi/com/sun/star/util/XNumberFormats.idl
index 7d9c0f5..8e4bcbe 100644
--- a/offapi/com/sun/star/util/XNumberFormats.idl
+++ b/offapi/com/sun/star/util/XNumberFormats.idl
@@ -154,7 +154,7 @@ published interface XNumberFormats: 
com::sun::star::uno::XInterface
 the thousands separator is shown or not
 
 @param bRed
-show negative number in red colored if 
+show negative number in red colored if `TRUE`
 
 @param nDecimals
 how many digits are shown after the decimal point
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - download.lst external/openssl

2015-04-14 Thread Caolán McNamara

 download.lst   |4 -
 external/openssl/UnpackedTarball_openssl.mk|   17 ++--
 external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 |8 +-
 external/openssl/openssl-3650-masm.patch.1 |   35 
 external/openssl/opensslmingw.patch|   68 +
 external/openssl/opensslosxppc.patch   |4 -
 external/openssl/opensslsol.patch  |   68 ++---
 external/openssl/opensslwnt.patch  |   64 
 8 files changed, 136 insertions(+), 132 deletions(-)

New commits:
commit aa8e87e6b21eda9d008002e59d1d25f61e1c38e2
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 7 11:51:50 2015 +0100

upgrade to openssl-1.0.2a

and de-ifdef-per-platform the patch makefile so an upgrade attempt on one
platform tests the patchs applying on all platforms

ubsan.patch.0 was effectively applied upstream while need
to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build
under windows

Reviewed-on: https://gerrit.libreoffice.org/15183
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 04a98015101b8fea3b200e0bf3a2469d8c75fdf7)

Conflicts:
external/openssl/UnpackedTarball_openssl.mk

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

diff --git a/download.lst b/download.lst
index cb087d1..4f4f28a 100644
--- a/download.lst
+++ b/download.lst
@@ -115,8 +115,8 @@ export ODFGEN_TARBALL := 
libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_MD5SUM := f7175c9cd3c39bb1907ac8bba9df8ed3
-export OPENSSL_TARBALL := openssl-1.0.1j.tar.gz
+export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef
+export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz
 export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671
 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2
diff --git a/external/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
index 98844b9..b44f576 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -22,14 +22,15 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,openssl,\
 endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-   $(if $(filter LINUX FREEBSD 
ANDROID,$(OS)),external/openssl/openssllnx.patch) \
-   $(if $(filter WNTGCC,$(OS)$(COM)),external/openssl/opensslmingw.patch) \
-   $(if $(filter MSC,$(COM)),external/openssl/opensslwnt.patch) \
-   $(if $(filter 
MSC,$(COM)),external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1) \
-   $(if $(filter 
MSC,$(COM)),external/openssl/openssl-1.0.1h-win64.patch.1) \
-   $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \
-   $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \
-   $(if $(filter 
MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \
+   external/openssl/openssllnx.patch \
+   external/openssl/opensslmingw.patch \
+   external/openssl/opensslwnt.patch \
+   external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 \
+   external/openssl/openssl-1.0.1h-win64.patch.1 \
+   external/openssl/opensslsol.patch \
+   external/openssl/opensslios.patch \
+   external/openssl/opensslosxppc.patch \
+   external/openssl/openssl-3650-masm.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 
b/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1
index 611ffbc..de9e6fc 100644
--- a/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1
+++ b/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1
@@ -1,7 +1,7 @@
 --- openssl.org/util/pl/VC-32.pl   2014-05-18 23:41:39.336594400 +0200
 +++ openssl/util/pl/VC-32.pl   2014-05-18 23:47:40.055279300 +0200
-@@ -49,7 +49,7 @@
- $lib_cflag='/Zl' if (!$shlib);# remove /DEFAULTLIBs from static lib
+@@ -48,7 +48,7 @@
+ my $f = $shlib || $fips ?' /MD':' /MT';
  $opt_cflags=$f.' /Ox';
  $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
 -$lflags="/nologo /subsystem:console /opt:ref";
@@ -9,12 +9,12 @@
  
  *::perlasm_compile_target = sub {
my ($target,$source,$bname)=@_;
-@@ -131,7 +131,7 @@
+@@ -135,7 +135,7 @@
  $ff = "/fixed";
  $opt_cflags=$f.' -Ox -O2 -Ob2';
  $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG';
 -$lflags="/nologo /subsystem:console /opt:ref";
 +$lflags="/nologo /subsystem:console,5.01 /opt:ref";
  }
+ $li

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

2015-04-14 Thread Christian Lohmaier

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

New commits:
commit 56fc35f690218a7690458f65a6fcef1460e0c574
Author: Christian Lohmaier 
Date:   Tue Apr 14 20:26:53 2015 +0200

Updated core
Project: translations  ba4bf5bfaa0a475ddd90506a5f8282b1b2625d6a

diff --git a/translations b/translations
index 0790015..ba4bf5b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0790015275c5309a4bf44e3819ba81aaff70fd57
+Subproject commit ba4bf5bfaa0a475ddd90506a5f8282b1b2625d6a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

 sw/qa/extras/odfimport/data/fdo90130-1.odt |binary
 sw/qa/extras/odfimport/data/fdo90130-2.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   20 
 sw/source/core/unocore/unoframe.cxx|   23 +++
 4 files changed, 35 insertions(+), 8 deletions(-)

New commits:
commit 5c17754f824987b26b3aa2f126b383f117b2e63e
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 13 20:56:45 2015 +0100

Resolves: tdf#90130 don't clobber new solid-color on seeing old transparency

...and tdf#90130 gradient transparency goes missing

(cherry picked from commit bc892b04144d82507ccd59953c9f4da357c2e7b4)

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

diff --git a/sw/qa/extras/odfimport/data/fdo90130-1.odt 
b/sw/qa/extras/odfimport/data/fdo90130-1.odt
new file mode 100644
index 000..6839b36
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo90130-1.odt differ
diff --git a/sw/qa/extras/odfimport/data/fdo90130-2.odt 
b/sw/qa/extras/odfimport/data/fdo90130-2.odt
new file mode 100644
index 000..6cf08950
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo90130-2.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index e880ee0..c0534d7 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -548,6 +548,26 @@ DECLARE_ODFIMPORT_TEST(fdo81223, "fdo81223.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xfeff), nValue);
 }
 
+DECLARE_ODFIMPORT_TEST(fdo90130_1, "fdo90130-1.odt")
+{
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+uno::Reference xFrame(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+sal_Int32 nValue(0);
+xFrame->getPropertyValue("BackColor") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00ff), nValue);
+}
+
+DECLARE_ODFIMPORT_TEST(fdo90130_2, "fdo90130-2.odt")
+{
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+uno::Reference xFrame(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+sal_Int32 nValue(0);
+xFrame->getPropertyValue("BackColorTransparency") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(50), nValue);
+}
+
 DECLARE_ODFIMPORT_TEST(testBnc800714, "bnc800714.fodt")
 {
 // Document's second paragraph wants to be together with the third one, 
but:
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index db5cb5b..7cd950e 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -352,6 +352,9 @@ bool 
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 
 aXFillColorItem.PutValue(*pXFillColorItem);
 rToSet.Put(aXFillColorItem);
+//set old-school brush color if we later encounter the
+//MID_BACK_COLOR_TRANSPARENCY case below
+aBrush = getSvxBrushItemFromSourceSet(rToSet, RES_BACKGROUND, 
false);
 }
 else if (aXFillStyleItem.GetValue() == drawing::FillStyle_SOLID && 
(pCol || pRGBCol))
 {
@@ -446,20 +449,24 @@ bool 
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 }
 }
 
-if(pXFillTransparenceItem)
+if (pXFillTransparenceItem)
 {
-const XGradient aNullGrad(RGB_Color(COL_BLACK), 
RGB_Color(COL_WHITE));
 XFillTransparenceItem aXFillTransparenceItem;
-
 aXFillTransparenceItem.PutValue(*pXFillTransparenceItem);
 rToSet.Put(aXFillTransparenceItem);
 }
-else if (aXFillStyleItem.GetValue() == drawing::FillStyle_SOLID && 
pColTrans)
+else if (pColTrans)
 {
-// Fill style is set to solid, but no fill transparency is given.
-// On the other hand, we have a BackColorTransparency, so use that.
-aBrush.PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
-setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
+// No fill transparency is given.  On the other hand, we have a
+// BackColorTransparency, so use that.
+sal_Int8 nGraphicTransparency(0);
+*pColTrans >>= nGraphicTransparency;
+rToSet.Put(XFillTransparenceItem(nGraphicTransparency));
+if (aXFillStyleItem.GetValue() == drawing::FillStyle_SOLID)
+{
+aBrush.PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
+setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
+}
 }
 
 if(pXGradientStepCountItem)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.f

[Libreoffice-commits] core.git: 2 commits - android/README libreofficekit/README

2015-04-14 Thread Siqi Liu

 android/README|   20 +++-
 libreofficekit/README |   18 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 6bea14a701d1b9d4442e442dd5fe1ddb8c4c4aba
Author: Siqi Liu 
Date:   Tue Apr 14 21:14:46 2015 +0200

add gdb debugging info on gtktiledviewer

Change-Id: I1460131d25212266b910d76a7713d1e973f7c415

diff --git a/libreofficekit/README b/libreofficekit/README
index 8e32e62..669cb80 100644
--- a/libreofficekit/README
+++ b/libreofficekit/README
@@ -23,7 +23,7 @@ functionality as in LibreOfficeKit.h.)
 
 An example program (currently using the older shim.c/static library
 integration) can be seen on:
-https://github.com/ojwb/lloconv
+https://github.com/ojwb/lloconv
 
 Tiled Rendering
 ---
@@ -86,6 +86,22 @@ once a feature works there, then implement the Android part, 
with its slower
 development iteration (slow uploading to the device, the need to link all
 object files into a single .so, etc).
 
+* Debugging with gdb and gtktiledviewer
+
+To run gtktiledviewer:
+
+bin/run gtktiledviewer $PWD/instdir/program path/to/test.odt
+
+To receive all incoming evetns from core use G_MESSAGES_DEBUG=all
+
+G_MESSAGES_DEBUG=all bin/run gtktiledviewer $PWD/instdir/program 
../test.odt
+
+To debug with gdb:
+
+export LO_TRACE='gdb --tui --args'
+
+before bin/run, this will run gtktiledviewer in the debugger instead.
+
 LibreOfficeKitGtk
 *
 
commit 2932bf06be3676af81c9433eb99372031080b636
Author: Siqi Liu 
Date:   Tue Apr 14 21:09:16 2015 +0200

add debugging missing services to README

Change-Id: Ib30a0e3d56ca9ebd07ee55e0aee9b13c0474a060

diff --git a/android/README b/android/README
index 0989cf6..6b5e22b 100644
--- a/android/README
+++ b/android/README
@@ -145,7 +145,7 @@ Overlay
 Overlay elements like cursor and selections aren't drawn by the LO core, 
instead the core
 only provides data (cursor position, selection rectangles) and the app needs 
to draw them.
 DocumentOverlay (org.libreoffice.overlay.DocumentOverlay) and 
DocumentOverlayView
-(org.libreoffice.overlay.DocumentOverlayView) are the classes that provide the 
overlay over 
+(org.libreoffice.overlay.DocumentOverlayView) are the classes that provide the 
overlay over
 the document, where selections and the cursor is drawn.
 
 Emulator and debugging notes
@@ -239,6 +239,24 @@ started debuggable application.
 
 Assuming that you're already in the LOAndroid3 directory in your shell.
 
+* Debugging the missing services
+
+Android library only include essential services that are compiled for
+LibreOffice in order to reduce the size of the apk. When developing,
+some services might become useful and we should add those services
+to the combined library.
+
+In order to identify missing services, we need to be able to receive
+SAL_INFO from cppuhelper/source/shlib.cxx in logcat and therefore identify
+what services are missing. To do so, you may want add the following
+when configuring the build.
+
+--enable-selective-debuginfo="cppuhelper/ sal/"
+
+Which services are combined in the android lib is determined by
+
+solenv/bin/native-code.py
+
 * Common Errors / Gotchas
 
 lo_dlneeds: Could not read ELF header of /data/data/org.libreoffice...libfoo.so
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Markus Mohrhard

 sc/inc/fonthelper.hxx |   51 ++
 1 file changed, 51 insertions(+)

New commits:
commit 64e26b35802c4429dbf223f3e8c24fa12465f28e
Author: Markus Mohrhard 
Date:   Tue Apr 14 19:19:22 2015 +0200

add missing file

Change-Id: I81dcd2c9f13a93e15689fed6491883e7d828ca99

diff --git a/sc/inc/fonthelper.hxx b/sc/inc/fonthelper.hxx
new file mode 100644
index 000..c06930f
--- /dev/null
+++ b/sc/inc/fonthelper.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SC_INC_FONTHELPER_HXX
+#define INCLUDED_SC_INC_FONTHELPER_HXX
+
+#include "scdllapi.h"
+#include 
+#include 
+#include 
+#include 
+#include 
+
+class SvxFontItem;
+
+struct SC_DLLPUBLIC ScDxfFont
+{
+boost::optional pFontAttr;
+boost::optional nFontHeight;
+boost::optional eWeight;
+boost::optional eItalic;
+boost::optional eUnder;
+boost::optional eOver;
+boost::optional bWordLine;
+boost::optional eStrike;
+boost::optional bOutline;
+boost::optional bShadow;
+boost::optional eEmphasis;
+boost::optional eRelief;
+boost::optional aColor;
+boost::optional eLang;
+
+bool isEmpty()
+{
+return !(pFontAttr || nFontHeight ||
+eWeight || eItalic || eUnder ||
+eOver || bWordLine || eStrike ||
+bOutline || bShadow || eEmphasis ||
+eRelief || aColor || eLang);
+}
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025

Jay Philips  changed:

   What|Removed |Added

 Depends on||48887

--- Comment #105 from Jay Philips  ---
Regression - worked in 4.1
Bug 48887: Saving to html embeds images rather than referencing it

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

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

2015-04-14 Thread Justin Luth

 sc/inc/patattr.hxx  |3 
 sc/qa/extras/macros-test.cxx|4 
 sc/qa/extras/testdocuments/vba_findFunction.xls |binary
 sc/source/core/data/patattr.cxx |  151 ---
 sc/source/filter/excel/xestyle.cxx  |  190 ++--
 sc/source/filter/inc/xestyle.hxx|   27 ++-
 sc/source/ui/condformat/condformatdlgentry.cxx  |   47 -
 sc/source/ui/vba/vbarange.cxx   |1 
 8 files changed, 339 insertions(+), 84 deletions(-)

New commits:
commit a623d1a0e65c4fb1f72f4ce87f462e5dcd8c3c45
Author: Justin Luth 
Date:   Tue Apr 7 19:26:17 2015 +0300

tdf#90447 vba find() should NOT select the found cell.

Change-Id: Ia8c331f33bc81e7bdabeea649a47c73930dae206

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 2c7f5b8..3bc3a94 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -229,6 +229,10 @@ void ScMacrosTest::testVba()
 OUString("vba_endFunction."),
 
OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
 },
+{
+OUString("vba_findFunction."),
+
OUString("vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document")
+},
 };
 OUString sTempDir;
 OUString sTempDirURL;
diff --git a/sc/qa/extras/testdocuments/vba_findFunction.xls 
b/sc/qa/extras/testdocuments/vba_findFunction.xls
new file mode 100644
index 000..2ea964e
Binary files /dev/null and b/sc/qa/extras/testdocuments/vba_findFunction.xls 
differ
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index d312d3a..7cd73f3 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3281,7 +3281,6 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 uno::Reference< excel::XRange > xResultRange = new ScVbaRange( 
mxParent, mxContext, xCellRange );
 if( xResultRange.is() )
 {
-xResultRange->Select();
 return xResultRange;
 }
 }
commit 853bfc68b93427f105d2c8c0ed959b3971861755
Author: Markus Mohrhard 
Date:   Tue Apr 14 17:52:49 2015 +0200

implement a sane and working dxf font export, tdf#81918

Dxf font export needs a lot of special handling to detect which parts
are set in the itemset and only export these. The old code only checked
for font name, font family and text encoding and exported the whole font
as dxf font in that case. The new approach just exports the necessary
bits.

Change-Id: Ic9a9c547723a65f26ebb6c88040a51f04f3cc42b

diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index dfba0e2..cbc37d1 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include "scdllapi.h"
+#include "fonthelper.hxx"
 
 namespace vcl { class Font; }
 class OutputDevice;
@@ -87,6 +88,8 @@ public:
 const SfxItemSet* pCondSet = NULL,
 sal_uInt8 nScript = 0, const Color* 
pBackConfigColor = NULL,
 const Color* pTextConfigColor = NULL );
+
+static ScDxfFontGetDxfFont(const SfxItemSet& rSet, sal_uInt8 
nScript);
 /** Fills a font object from the own item set. */
 voidGetFont( vcl::Font& rFont, ScAutoFontColorMode 
eAutoMode,
 OutputDevice* pOutDev = NULL,
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index dfcfa70..878f8af 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -215,30 +215,11 @@ SvxCellOrientation ScPatternAttr::GetCellOrientation( 
const SfxItemSet* pCondSet
 return GetCellOrientation( GetItemSet(), pCondSet );
 }
 
-void ScPatternAttr::GetFont(
-vcl::Font& rFont, const SfxItemSet& rItemSet, ScAutoFontColorMode 
eAutoMode,
-OutputDevice* pOutDev, const Fraction* pScale,
-const SfxItemSet* pCondSet, sal_uInt8 nScript,
-const Color* pBackConfigColor, const Color* pTextConfigColor )
-{
-// Read items
-
-const SvxFontItem* pFontAttr;
-sal_uInt32 nFontHeight;
-FontWeight eWeight;
-FontItalic eItalic;
-FontUnderline eUnder;
-FontUnderline eOver;
-bool bWordLine;
-FontStrikeout eStrike;
-bool bOutline;
-bool bShadow;
-FontEmphasisMark eEmphasis;
-FontRelief eRelief;
-Color aColor;
-LanguageType eLang;
+namespace {
 
-sal_uInt16 nFontId, nHeightId, nWeightId, nPostureId, nLangId;
+void getFontIDsByScriptType(sal_uInt8 nScript,
+sal_uInt16& nFontId, sal_uInt16& nHeightId, sal_uInt16& nWeightId, sal_uInt16& 
nPostureId, sal_uInt16& nLangId)
+{
 if ( nScript == SCRIPTTYPE_ASIAN )
 {
 nFontId= ATTR_CJK_FONT;
@@ -26

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 2 commits - configure.ac instsetoo_native/util setup_native/source solenv/bin

2015-04-14 Thread Andras Timar

 configure.ac  |2 +-
 instsetoo_native/util/openoffice.lst.in   |2 +-
 setup_native/source/packinfo/finals_instsetoo.txt |1 +
 solenv/bin/modules/installer/globals.pm   |2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 02b4563d8ac90063a56f86e8db2196ee491a83c5
Author: Andras Timar 
Date:   Sun Jan 12 13:41:18 2014 -0800

enable MSP creation

Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43

diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index 407b912..b4f74220 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -26,7 +26,7 @@ Globals
 REGISTRYLAYERNAME Layers
 SERVICEPACK 1
 UPDATE_DATABASE 1
-CREATE_MSP_INSTALLSET 0
+CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
 WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt 
b/setup_native/source/packinfo/finals_instsetoo.txt
index d5a68d36..b45b52943 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,3 +30,4 @@
 # OpenOffice   pro de  
msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack   pro es  
msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE  pro en-US   
msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
+LibreOfficepro 
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
   c:\lo\src\cp-4.3-5\LibreOffice_4.3-5_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 2076e8b..ed22148 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -219,7 +219,7 @@ BEGIN
 $fix_number_of_cab_files = 1;
 $cabfilecompressionlevel = 21; # Using LZX compression, possible values 
are: 15 | 16 | ... | 21 (best compression)
 $number_of_cabfiles = 1;# only for $fix_number_of_cab_files = 1
-$include_cab_in_msi = 1;
+$include_cab_in_msi = 0;
 $msidatabasename = "";
 $prepare_winpatch = 0;
 $previous_idt_dir = "";
commit cbe116caa67cb5e6d1639ef0394d7d91d4027b09
Author: Andras Timar 
Date:   Wed Apr 8 02:53:47 2015 -0700

Bump version to 4.3-6

Change-Id: I0d0e94d10204c33dc5055a7a48a9c17d9726b5af

diff --git a/configure.ac b/configure.ac
index fe6878b..e3cd488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.3.10.5],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.3.10.6],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 39 commits - chart2/source connectivity/source cui/uiconfig desktop/source extensions/source external/icu filter/source icon-themes/s

2015-04-14 Thread Andras Timar

 chart2/source/view/main/VLegend.cxx|4 
 connectivity/source/drivers/mork/MNSFolders.cxx|   18 
 connectivity/source/drivers/mork/MNSProfileDiscover.cxx|9 
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |   18 
 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |9 
 cui/uiconfig/ui/select_persona_dialog.ui   |5 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|   21 
 extensions/source/bibliography/bibview.cxx |4 
 extensions/source/bibliography/datman.cxx  |   59 
 extensions/source/bibliography/general.cxx |   76 
 extensions/source/bibliography/general.hxx |1 
 external/icu/UnpackedTarball_icu.mk|3 
 external/icu/icu.changeset_36724.patch.1   |   37 
 external/icu/icu.changeset_36727.patch.1   |   52 
 external/icu/icu.changeset_36801.patch.1   | 1222 
++
 filter/source/svg/svgexport.cxx|4 
 filter/source/svg/svgwriter.cxx|4 
 icon-themes/sifr/cmd/lc_autofilter.png |binary
 icon-themes/sifr/cmd/lc_connector.png  |binary
 icon-themes/sifr/cmd/lc_connectorarrowend.png  |binary
 icon-themes/sifr/cmd/lc_connectorarrows.png|binary
 icon-themes/sifr/cmd/lc_connectorarrowstart.png|binary
 icon-themes/sifr/cmd/lc_connectorcircleend.png |binary
 icon-themes/sifr/cmd/lc_connectorcircles.png   |binary
 icon-themes/sifr/cmd/lc_connectorcirclestart.png   |binary
 icon-themes/sifr/cmd/lc_connectorcurve.png |binary
 icon-themes/sifr/cmd/lc_connectorcurvearrowend.png |binary
 icon-themes/sifr/cmd/lc_connectorcurvearrows.png   |binary
 icon-themes/sifr/cmd/lc_connectorcurvearrowstart.png   |binary
 icon-themes/sifr/cmd/lc_connectorcurvecircleend.png|binary
 icon-themes/sifr/cmd/lc_connectorcurvecircles.png  |binary
 icon-themes/sifr/cmd/lc_connectorcurvecirclestart.png  |binary
 icon-themes/sifr/cmd/lc_connectorline.png  |binary
 icon-themes/sifr/cmd/lc_connectorlinearrowend.png  |binary
 icon-themes/sifr/cmd/lc_connectorlinearrows.png|binary
 icon-themes/sifr/cmd/lc_connectorlinearrowstart.png|binary
 icon-themes/sifr/cmd/lc_connectorlinecircleend.png |binary
 icon-themes/sifr/cmd/lc_connectorlinecircles.png   |binary
 icon-themes/sifr/cmd/lc_connectorlinecirclestart.png   |binary
 icon-themes/sifr/cmd/lc_connectorlines.png |binary
 icon-themes/sifr/cmd/lc_connectorlinesarrowend.png |binary
 icon-themes/sifr/cmd/lc_connectorlinesarrows.png   |binary
 icon-themes/sifr/cmd/lc_connectorlinesarrowstart.png   |binary
 icon-themes/sifr/cmd/lc_connectorlinescircleend.png|binary
 icon-themes/sifr/cmd/lc_connectorlinescircles.png  |binary
 icon-themes/sifr/cmd/lc_connectorlinescirclestart.png  |binary
 icon-themes/sifr/cmd/lc_line.png   |binary
 icon-themes/sifr/cmd/lc_linearrowcircle.png|binary
 icon-themes/sifr/cmd/lc_linearrowend.png   |binary
 icon-themes/sifr/cmd/lc_linearrows.png |binary
 icon-themes/sifr/cmd/lc_linearrowsquare.png|binary
 icon-themes/sifr/cmd/lc_linearrowstart.png |binary
 icon-themes/sifr/cmd/lc_linecirclearrow.png|binary
 icon-themes/sifr/cmd/lc_linediagonal.png   |binary
 icon-themes/sifr/cmd/lc_linesquarearrow.png|binary
 icon-themes/sifr/cmd/lc_measureline.png|binary
 icon-themes/sifr/cmd/lc_printdefault.png   |binary
 icon-themes/sifr/cmd/sc_autofilter.png |binary
 icon-themes/sifr/cmd/sc_printdefault.png   |binary
 include/sfx2/dinfdlg.hxx   |2 
 include/vcl/floatwin.hxx   |9 
 include/vcl/window.hxx |4 
 offapi/com/sun/star/awt/Key.idl|1 
 offapi/type_reference/offapi.idl   |   38 
 oox/source/drawingml/shape.cxx |   17 
 sc/inc/scmatrix.hxx

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 16 commits - chart2/source desktop/source download.lst extensions/source external/openssl offapi/com oox/source sc/source sd/qa svtoo

2015-04-14 Thread Eike Rathke

 chart2/source/view/main/VLegend.cxx|4 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|   21 +-
 download.lst   |4 
 extensions/source/bibliography/bib.hrc |   23 ++
 extensions/source/bibliography/datman.cxx  |   59 +
 extensions/source/bibliography/general.cxx |   76 +--
 extensions/source/bibliography/general.hxx |1 
 extensions/source/bibliography/sections.hrc|   23 --
 extensions/source/bibliography/sections.src|  177 -
 external/openssl/UnpackedTarball_openssl.mk|   15 -
 external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 |8 
 external/openssl/openssl-1.0.1h-win64.patch.1  |   47 
 external/openssl/openssl-3650-masm.patch.1 |   35 +++
 external/openssl/opensslmingw.patch|   68 +++---
 external/openssl/opensslosxppc.patch   |   15 +
 external/openssl/opensslsol.patch  |   68 --
 external/openssl/opensslwnt.patch  |   64 +++---
 offapi/com/sun/star/awt/Key.idl|1 
 oox/source/drawingml/shape.cxx |   17 +
 sc/source/core/data/document.cxx   |   12 -
 sc/source/core/tool/interpr1.cxx   |   23 +-
 sd/qa/unit/data/tdf90403.pptx  |binary
 sd/qa/unit/data/xml/tdf90403_0.xml |4 
 sd/qa/unit/import-tests.cxx|1 
 svtools/source/control/headbar.cxx |3 
 sw/inc/doc.hxx |8 
 sw/qa/extras/rtfimport/data/tdf75614.rtf   |   18 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 
 sw/source/core/doc/docnum.cxx  |8 
 sw/source/core/edit/ednumber.cxx   |   18 +
 sw/source/core/undo/undobj.cxx |2 
 sw/source/ui/chrdlg/drpcps.cxx |4 
 vcl/source/gdi/sallayout.cxx   |   13 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 
 34 files changed, 502 insertions(+), 350 deletions(-)

New commits:
commit 73e873044a612fd8cf9dfa617f58a2472ceb9986
Author: Eike Rathke 
Date:   Mon Apr 13 18:06:46 2015 +0200

string access out of bounds

Another UniString to OUString conversion fallout.

Change-Id: I5e62b049da3e7f8b5a892ea6aae7110a33564a46
(cherry picked from commit 9f52efa43b2d65c0b6c92790cc2859e752bf975f)
Reviewed-on: https://gerrit.libreoffice.org/15287
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c77b72a..55917d7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3254,15 +3254,20 @@ void ScInterpreter::ScCode()
 {
 //2do: make it full range unicode?
 OUString aStr = GetString().getString();
-//"classic" ByteString conversion flags
-const sal_uInt32 convertFlags =
-RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
-RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE |
-RTL_UNICODETOTEXT_FLAGS_FLUSH |
-RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
-RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
-RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE;
-PushInt( (unsigned char) OUStringToOString(OUString(aStr[0]), 
osl_getThreadTextEncoding(), convertFlags).toChar() );
+if (aStr.isEmpty())
+PushInt(0);
+else
+{
+//"classic" ByteString conversion flags
+const sal_uInt32 convertFlags =
+RTL_UNICODETOTEXT_FLAGS_NONSPACING_IGNORE |
+RTL_UNICODETOTEXT_FLAGS_CONTROL_IGNORE |
+RTL_UNICODETOTEXT_FLAGS_FLUSH |
+RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
+RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
+RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE;
+PushInt( (unsigned char) OUStringToOString(OUString(aStr[0]), 
osl_getThreadTextEncoding(), convertFlags).toChar() );
+}
 }
 
 
commit b056b9bb629082d8b2facfd470173720c7c5bbf6
Author: Miklos Vajna 
Date:   Sun Apr 12 15:01:23 2015 +0200

tdf#75614 RTF import: fix missing text after footnote

(cherry picked from commit cec5f2eab25578a9859134d697c200089c597faa)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: I5901094cb603c35a1cd8ac718fd434a9dd55729b
Reviewed-on: https://gerrit.libreoffice.org/15271
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/sw/qa/extras/rtfimport/data/tdf75614.rtf 
b/sw/qa/extras/rtfimport/data/tdf75614.rtf
new file mode 100644
index 000..1233801
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf75614.rtf
@@ -0,0 +1,18 @@
+{\rtf1\ansi\ansicpg0\uc1\deff0\deflang0\deflangfe0\fet2
+{\*\ftnsep\pa

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 86578, which changed state.

Bug 86578 Summary: Text frame and coincident image frame style transparency and 
color fill corruption in Writer 4.4
https://bugs.documentfoundation.org/show_bug.cgi?id=86578

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

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

2015-04-14 Thread Caolán McNamara

 sd/source/filter/eppt/pptx-epptooxml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d4e66a79453f7b020a3dcea328c03637407add9
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 17:05:10 2015 +0100

fix export of ooo120353-1.odp to pptx, mismatch of start and end element

cut and paste error I guess from the block above it

Change-Id: I121e1d1a9f08ea3731bb7f65c385f264b3c2d2f4

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 1ff74f5..f454540 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1106,7 +1106,7 @@ void 
PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons
 WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild );
 } else
 WriteAnimationCondition( pFS, aAny, false, bMainSeqChild );
-pFS->endElementNS( XML_p, XML_stCondLst );
+pFS->endElementNS( XML_p, XML_endCondLst );
 }
 
 Reference< XEnumerationAccess > xEnumerationAccess( rXNode, UNO_QUERY );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Jan Holesovsky

 sc/source/ui/view/tabview2.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 85ab76f7047abd14139548b3343cb27905f130e8
Author: Jan Holesovsky 
Date:   Tue Apr 14 17:47:22 2015 +0200

sc: 0 as the default zoom is curious, should be 100.

This fixes a fallout from bf8b86e932df3edaeaa887509a22e57cd3920bc1.

Change-Id: Ie2d2a1329df0ec36f21a07938af142c32c74277a

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index fc9b1a8..9e7d4d0 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1170,7 +1170,7 @@ static bool lcl_FitsInWindow( double fScaleX, double 
fScaleY, sal_uInt16 nZoom,
 
 sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
 {
-sal_uInt16 nZoom = 0; // Ergebnis
+sal_uInt16 nZoom = 100;
 
 switch ( eType )
 {
@@ -1298,7 +1298,9 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, 
sal_uInt16 nOldZoom )
 //  (with frozen panes, the size of the individual 
parts
 //  depends on the scale that is to be calculated)
 
-if ( !pGridWin[SC_SPLIT_BOTTOMLEFT] ) return 0;
+if (!pGridWin[SC_SPLIT_BOTTOMLEFT])
+return nZoom;
+
 Size aWinSize = 
pGridWin[SC_SPLIT_BOTTOMLEFT]->GetOutputSizePixel();
 ScSplitMode eHMode = aViewData.GetHSplitMode();
 if ( eHMode != SC_SPLIT_NONE && 
pGridWin[SC_SPLIT_BOTTOMRIGHT] )
@@ -1338,19 +1340,18 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, 
sal_uInt16 nOldZoom )
( aPageSize.Width() * nPPTX ) );
 long nZoomY = (long) ( aWinSize.Height() * 100 /
( aPageSize.Height() * nPPTY ) 
);
-long nNew = nZoomX;
 
-if (eType == SvxZoomType::WHOLEPAGE && nZoomY < nNew)
-nNew = nZoomY;
+if (nZoomX > 0)
+nZoom = static_cast(nZoomX);
 
-nZoom = (sal_uInt16) nNew;
+if (eType == SvxZoomType::WHOLEPAGE && nZoomY > 0 && 
nZoomY < nZoom)
+nZoom = static_cast(nZoomY);
 }
 }
 break;
 
 default:
 OSL_FAIL("Unknown Zoom-Revision");
-nZoom = 0;
 }
 
 return nZoom;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - svx/source sw/inc sw/qa sw/source xmloff/source

2015-04-14 Thread Michael Stahl

 svx/source/dialog/svxruler.cxx |   10 +++
 svx/source/unodraw/unobrushitemhelper.cxx  |   27 +-
 sw/inc/unoprnms.hxx|   52 +++
 sw/qa/extras/odfimport/data/PageBackground.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   17 ++
 sw/source/core/unocore/unomap.cxx  |   66 +
 xmloff/source/style/PageMasterStyleMap.cxx |1 
 7 files changed, 160 insertions(+), 13 deletions(-)

New commits:
commit b82791e3c586d6e4247d0eb1bb94681bcb113762
Author: Michael Stahl 
Date:   Tue Apr 14 16:25:42 2015 +0200

tdf#89478: svx: ODF import: SvxBrushItem Graphics should override Color

The bugdoc has:





In this case it's clearly better to prefer the Graphics.

The old code could actually store both in the model but the UI only
allows setting either Color or Graphic, so this should be good enough.

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: Id33231ad90815d9791f90289fb0b55455d334c14

diff --git a/svx/source/unodraw/unobrushitemhelper.cxx 
b/svx/source/unodraw/unobrushitemhelper.cxx
index 4a2ec1d..d10aab6 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -50,19 +50,8 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const 
SvxBrushItem& rBrush, SfxI
 
 const sal_uInt8 nTransparency(rBrush.GetColor().GetTransparency());
 
-if(0xff != nTransparency)
-{
-// we have a color fill
-const Color aColor(rBrush.GetColor().GetRGBColor());
-
-rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
-rToSet.Put(XFillColorItem(OUString(), aColor));
-
-// #125189# nTransparency is in range [0..254], convert to [0..100] 
which is used in
-// XFillTransparenceItem (caution with the range which is in an 
*item-specific* range)
-rToSet.Put(XFillTransparenceItemsal_Int32)nTransparency * 100) + 
127) / 254));
-}
-else if(GPOS_NONE != rBrush.GetGraphicPos())
+// tdf#89478 check for image first
+if (GPOS_NONE != rBrush.GetGraphicPos())
 {
 // we have a graphic fill, set fill style
 rToSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
@@ -131,6 +120,18 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const 
SvxBrushItem& rBrush, SfxI
 rToSet.Put(XFillTransparenceItem(nGraphicTransparency));
 }
 }
+else if (0xff != nTransparency)
+{
+// we have a color fill
+const Color aColor(rBrush.GetColor().GetRGBColor());
+
+rToSet.Put(XFillStyleItem(drawing::FillStyle_SOLID));
+rToSet.Put(XFillColorItem(OUString(), aColor));
+
+// #125189# nTransparency is in range [0..254], convert to [0..100] 
which is used in
+// XFillTransparenceItem (caution with the range which is in an 
*item-specific* range)
+rToSet.Put(XFillTransparenceItemsal_Int32)nTransparency * 100) + 
127) / 254));
+}
 else
 {
 // GPOS_NONE == rBrush.GetGraphicPos() && 0xff == 
rBrush.GetColor().GetTransparency(),
diff --git a/sw/qa/extras/odfimport/data/PageBackground.odt 
b/sw/qa/extras/odfimport/data/PageBackground.odt
index dbb1082..3733d5b 100644
Binary files a/sw/qa/extras/odfimport/data/PageBackground.odt and 
b/sw/qa/extras/odfimport/data/PageBackground.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index f967f34..551c2de 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -316,6 +316,12 @@ DECLARE_ODFIMPORT_TEST(testPageBackground, 
"PageBackground.odt")
 CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xPropertySet, "FillStyle"));
 CPPUNIT_ASSERT_EQUAL(OUString("Sky"), getProperty(xPropertySet, 
"FillBitmapName"));
 CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, 
getProperty(xPropertySet, "FillBitmapMode"));
+
+uno::Reference 
xPropertySetOld(getStyles("PageStyles")->getByName("OldStandard"), 
uno::UNO_QUERY);
+// The background image was overridden by color
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, 
getProperty(xPropertySetOld, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(OUString("Sky"), 
getProperty(xPropertySetOld, "FillBitmapName"));
+CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, 
getProperty(xPropertySetOld, "FillBitmapMode"));
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
commit ea8db4ad8e1c75c3ab2f31fea4e061600231f9d1
Author: Michael Stahl 
Date:   Tue Apr 14 14:35:44 2015 +0200

xmloff: add back the presumably accidentally removed "FootnoteLineStyle"

(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)

Change-Id: I67ec4516ff431efd47451ff07fc261ba32e80385

diff --git a/xmloff/source/style/PageMasterStyleMap.cxx 
b/xmloff/source/style/PageMasterStyleMap.cxx
index 92c5575..092e694 100644
--- a/xmloff/

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

2015-04-14 Thread Caolán McNamara

 sw/source/filter/basflt/shellio.cxx |7 +--
 sw/source/filter/ww8/docxexport.cxx |2 +-
 sw/source/filter/ww8/rtfexport.cxx  |2 +-
 sw/source/filter/ww8/wrtww8.cxx |   22 --
 sw/source/filter/ww8/wrtww8.hxx |2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 0b037361b890a83a735186b98d5a3cef124027f4
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 15:56:48 2015 +0100

solve assert on restoring redline mode on exporting of abi9915-1.odt to doc

see also on export of ooo103014-1.odt to doc and many more

easiest thing is to move the restoration of the redline mode upwards for
all filters to the central SwWriter::Write after all pams have been
destroyed.

Change-Id: Ieb747ad2ed465d3fd3de81db0ef820073bc3ab55

diff --git a/sw/source/filter/basflt/shellio.cxx 
b/sw/source/filter/basflt/shellio.cxx
index 2004492..567aad5 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -856,8 +856,9 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const 
OUString* pRealFileName )
 pESh->StartAllAction();
 }
 
-bool bWasPurgeOle = 
pOutDoc->getIDocumentSettingAccess().get(DocumentSettingId::PURGE_OLE);
+const bool bOrigPurgeOle = 
pOutDoc->getIDocumentSettingAccess().get(DocumentSettingId::PURGE_OLE);
 pOutDoc->getIDocumentSettingAccess().set(DocumentSettingId::PURGE_OLE, 
false);
+const RedlineMode_t nOrigRedlineMode = 
pOutDoc->getIDocumentRedlineAccess().GetRedlineMode();
 
 sal_uLong nError = 0;
 if( pMedium )
@@ -869,7 +870,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const 
OUString* pRealFileName )
 else if( xStg.is() )
 nError = rxWriter->Write( *pPam, xStg, pRealFileName );
 
-pOutDoc->getIDocumentSettingAccess().set(DocumentSettingId::PURGE_OLE, 
bWasPurgeOle );
+pOutDoc->getIDocumentSettingAccess().set(DocumentSettingId::PURGE_OLE, 
bOrigPurgeOle );
 
 if( pESh )
 {
@@ -887,10 +888,12 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const 
OUString* pRealFileName )
 else
 delete pPam;
 }
+pOutDoc->getIDocumentRedlineAccess().SetRedlineMode(nOrigRedlineMode);
 }
 else
 {
 delete pPam;// delete the created Pam
+pOutDoc->getIDocumentRedlineAccess().SetRedlineMode(nOrigRedlineMode);
 // Everything was written successfully? Tell the document!
 if ( !IsError( nError ) && !pDoc )
 {
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 30ea867..2490066 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -421,7 +421,7 @@ void DocxExport::OutputDML(uno::Reference& 
xShape)
 void DocxExport::ExportDocument_Impl()
 {
 // Set the 'Track Revisions' flag in the settings structure
-m_aSettings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON & 
mnRedlineMode );
+m_aSettings.trackRevisions = 0 != ( nsRedlineMode_t::REDLINE_ON & 
mnOrigRedlineMode );
 
 InitStyles();
 
diff --git a/sw/source/filter/ww8/rtfexport.cxx 
b/sw/source/filter/ww8/rtfexport.cxx
index e6e503a..60ca1f0 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -510,7 +510,7 @@ void RtfExport::ExportDocument_Impl()
 OutULong(pViewShell->GetViewOptions()->GetZoom());
 }
 // Record changes?
-if (nsRedlineMode_t::REDLINE_ON & mnRedlineMode)
+if (nsRedlineMode_t::REDLINE_ON & mnOrigRedlineMode)
 Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_REVISIONS);
 // Mirror margins?
 if ((nsUseOnPage::PD_MIRROR & pDoc->GetPageDesc(0).ReadUseOn()) == 
nsUseOnPage::PD_MIRROR)
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 695a189..75732f1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3050,11 +3050,13 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
 // #i81405# - Collect anchored objects before changing the redline mode.
 maFrames = GetFrames( *pDoc, bWriteAll? NULL : pOrigPam );
 
-mnRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
+mnOrigRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
 if ( !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
 {
-pDoc->getIDocumentRedlineAccess().SetRedlineMode( 
(RedlineMode_t)(mnRedlineMode | nsRedlineMode_t::REDLINE_SHOW_DELETE |
- nsRedlineMode_t::REDLINE_SHOW_INSERT) );
+//restored to original state by SwWriter::Write
+pDoc->getIDocumentRedlineAccess().SetRedlineMode(mnOrigRedlineMode |
+ 
nsRedlineMode_t::REDLINE_SHOW_DELETE |
+ 
nsRedlineMode_t::REDLINE_SHOW_INSERT);
 }
 
 maFontHelper.InitFontTable( SupportsUnico

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk

2015-04-14 Thread Stephan Bergmann

 officecfg/Configuration_officecfg.mk |1 +
 officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |6 --
 postprocess/CustomTarget_registry.mk |3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit ab0500bfb68982c2c3e1288e0f2d7dd31f531cd5
Author: Stephan Bergmann 
Date:   Mon Apr 13 18:27:33 2015 +0200

rhbz#1134285: Access dav, davs URLs via GVFS

...so that LO shares the credentials with Nautilus once the connection has 
been
set up in Nautilus.

The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS 
and
successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME-
specific gnomevfs resp. gio UCP since 
b07a5fcc600ad564315d36fbd18495184fdf69cf
"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at
 "mixing neon and the 
hidden
embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is
unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio 
one.
So keep handling dav, davs URLs via LO's internal webdav UCP under legacy
--enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the
default --enable-gio.

Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594
(cherry picked from commit 51e0d789c344547956764c3b5f0ef5a304f4e0aa)
Reviewed-on: https://gerrit.libreoffice.org/15296
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index 5f345b7..6cb44d0 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -122,6 +122,7 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/TypeDetection/UISort-math.xcu \
org/openoffice/ucb/Configuration-gio.xcu \
org/openoffice/ucb/Configuration-neon.xcu \
+   org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \
org/openoffice/ucb/Configuration-win.xcu \
 ))
 
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 
b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index e9704d3..9cb2a1a 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -89,7 +89,8 @@
 
   
 
-
+
   
 com.sun.star.ucb.WebDAVContentProvider
   
@@ -155,7 +156,8 @@
 
   
 
-
+
   
 com.sun.star.ucb.WebDAVContentProvider
   
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index b147251..83c0883 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -333,6 +333,9 @@ postprocess_DRIVERS += ado
 endif
 ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+ifeq ($(ENABLE_GNOMEVFS),TRUE)
+postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu
+endif
 endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
 postprocess_FILES_main += $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk

2015-04-14 Thread Stephan Bergmann

 officecfg/Configuration_officecfg.mk |1 +
 officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |6 --
 postprocess/CustomTarget_registry.mk |3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit feb56c8eb39e886cd089eb9942f881ae25d80506
Author: Stephan Bergmann 
Date:   Mon Apr 13 18:27:33 2015 +0200

rhbz#1134285: Access dav, davs URLs via GVFS

...so that LO shares the credentials with Nautilus once the connection has 
been
set up in Nautilus.

The reason the (non-standard) dav, davs URLs used by GNOME's old GnomeVFS 
and
successor GVFS/GIO were handled via LO's webdav UCP rather than the GNOME-
specific gnomevfs resp. gio UCP since 
b07a5fcc600ad564315d36fbd18495184fdf69cf
"INTEGRATION: CWS tkr10: i84676 neon and gnome-vfs2" is discussed at
 "mixing neon and the 
hidden
embedded contents old [sic] another neon inside libhttp.so of gnome-vfs2 is
unreliable" and only pertains to the legacy gnomevfs UCP, not the new gio 
one.
So keep handling dav, davs URLs via LO's internal webdav UCP under legacy
--enable-gnome-vfs, but handle them via the GNOME-specific gio UCP under the
default --enable-gio.

Change-Id: Ib132168701a7ae0a7dcabdead6a299eda0cd4594
(cherry picked from commit 51e0d789c344547956764c3b5f0ef5a304f4e0aa)
Reviewed-on: https://gerrit.libreoffice.org/15295
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index 7e2af03..af992b9 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -121,6 +121,7 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/TypeDetection/UISort-math.xcu \
org/openoffice/ucb/Configuration-gio.xcu \
org/openoffice/ucb/Configuration-neon.xcu \
+   org/openoffice/ucb/Configuration-neon_gnomevfs.xcu \
org/openoffice/ucb/Configuration-win.xcu \
 ))
 
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 
b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index e9704d3..9cb2a1a 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -89,7 +89,8 @@
 
   
 
-
+
   
 com.sun.star.ucb.WebDAVContentProvider
   
@@ -155,7 +156,8 @@
 
   
 
-
+
   
 com.sun.star.ucb.WebDAVContentProvider
   
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index a568832..e12640f 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -328,6 +328,9 @@ postprocess_DRIVERS += ado
 endif
 ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon.xcu
+ifeq ($(ENABLE_GNOMEVFS),TRUE)
+postprocess_FILES_main += 
$(postprocess_MOD)/org/openoffice/ucb/Configuration-neon_gnomevfs.xcu
+endif
 endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
 postprocess_FILES_main += $(call 
gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Caolán McNamara

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

New commits:
commit 5ec5bb3f8108aef32ae314fa0a809f95e791084c
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 16:09:22 2015 +0100

WaE: bogus C4701 uninitialized local variable

Change-Id: Ib43b844ead1720df3c93b2d2371d310af400fb29

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 838318e..54d7d81 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1775,7 +1775,7 @@ void ScGridWindow::HandleMouseButtonDown( const 
MouseEvent& rMEvt, MouseEventSta
 if (bIsTiledRendering)
 {
 Point aPos(rMEvt.GetPosPixel());
-SCsCOL nPosX, nNonEmptyX;
+SCsCOL nPosX, nNonEmptyX(0);
 SCsROW nPosY;
 SCTAB nTab = pViewData->GetTabNo();
 pViewData->GetPosFromPixel(aPos.X(), aPos.Y(), eWhich, nPosX, nPosY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Katarina Behrens

 svtools/source/contnr/simptabl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 0ac8d1544a9b3b1b7c3c5ae5fed2943d11f8b8c9
Author: Katarina Behrens 
Date:   Tue Apr 14 17:02:40 2015 +0200

tdf#90024: Don't set compare handler in constructor

it breaks sorting of conditional formatting manager table.
This reverts part of commit f92ab4da51647a4353038b1c56

Change-Id: I22d4b939cf888451bff6500fdf0d6b900903deb1

diff --git a/svtools/source/contnr/simptabl.cxx 
b/svtools/source/contnr/simptabl.cxx
index a6e07c5..1b2754b 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -98,7 +98,6 @@ SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, 
WinBits nBits):
 aHeaderBar.SetSelectHdl(LINK( this, SvSimpleTable, HeaderBarClick));
 aHeaderBar.SetDoubleClickHdl(LINK( this, SvSimpleTable, 
HeaderBarDblClick));
 
-GetModel()->SetCompareHdl( LINK( this, SvSimpleTable, CompareHdl));
 
 EnableCellFocus();
 DisableTransientChildren();
@@ -280,6 +279,9 @@ void SvSimpleTable::SortByCol(sal_uInt16 nCol, bool bDir)
 aHeaderBar.SetItemBits( nCol+1, HIB_STDSTYLE | HIB_UPARROW);
 GetModel()->SetSortMode(SortDescending);
 }
+
+GetModel()->SetCompareHdl( LINK( this, SvSimpleTable, CompareHdl));
+
 if(nSortCol == nCol)
 {
 GetModel()->Reverse();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build issue generating .jars

2015-04-14 Thread Tomáš Chvátal

2015-04-13 16:18 GMT+02:00 Michael Stahl :

>
> these unoil.jar should not be re-built again after "make" is done, try
> running "make -d unitcheck" (warning: generates gigabytes of text) to
> see which dependency is triggering the re-build of unoil.jar.
>

I solved it by running the unitcheck during the build and running only
slowcheck later on.
It works like charm, but still something must be fishy there.
Sadly can't accomodate the build to get more space to generate the GBs of
text for the -d option.

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

[Libreoffice-commits] core.git: connectivity/inc connectivity/Library_dbtools.mk connectivity/source include/connectivity include/svx sc/source svx/Library_svxcore.mk svx/Library_svx.mk svx/source sw/

2015-04-14 Thread Matthew Nicholls

 connectivity/Library_dbtools.mk  |1 
 connectivity/inc/simpledbt/charset_s.hxx |   54 
 connectivity/inc/simpledbt/parser_s.hxx  |   60 +
 connectivity/source/commontools/dbtools.cxx  |   15 +
 connectivity/source/simpledbt/charset_s.cxx  |2 
 connectivity/source/simpledbt/charset_s.hxx  |   54 
 connectivity/source/simpledbt/dbtfactory.cxx |4 
 connectivity/source/simpledbt/parser_s.cxx   |2 
 connectivity/source/simpledbt/parser_s.hxx   |   60 -
 include/connectivity/dbtools.hxx |   17 +
 include/svx/dbcharsethelper.hxx  |   13 -
 include/svx/dbtoolsclient.hxx|  164 --
 sc/source/ui/docshell/docsh8.cxx |1 
 svx/Library_svx.mk   |2 
 svx/Library_svxcore.mk   |1 
 svx/source/fmcomp/fmgridcl.cxx   |7 
 svx/source/fmcomp/gridcell.cxx   |5 
 svx/source/fmcomp/gridctrl.cxx   |1 
 svx/source/form/dbcharsethelper.cxx  |   13 -
 svx/source/form/dbtoolsclient.cxx|  310 ---
 svx/source/form/filtnav.cxx  |7 
 svx/source/form/fmdocumentclassification.cxx |1 
 svx/source/form/fmpgeimp.cxx |5 
 svx/source/form/fmshimp.cxx  |   11 
 svx/source/form/fmtools.cxx  |2 
 svx/source/form/fmundo.cxx   |   10 
 svx/source/form/fmvwimp.cxx  |   13 -
 svx/source/form/formcontrolfactory.cxx   |7 
 svx/source/form/formcontroller.cxx   |   26 +-
 svx/source/form/sqlparserclient.cxx  |   14 -
 svx/source/form/tabwin.cxx   |5 
 svx/source/inc/fmshimp.hxx   |2 
 svx/source/inc/sqlparserclient.hxx   |   15 -
 svx/source/inc/tabwin.hxx|7 
 sw/CppunitTest_sw_uwriter.mk |2 
 sw/Library_sw.mk |3 
 sw/Library_swui.mk   |2 
 sw/inc/dbmgr.hxx |7 
 sw/inc/swdbtoolsclient.hxx   |   69 --
 sw/source/ui/dbui/dbinsdlg.cxx   |5 
 sw/source/uibase/dbui/dbmgr.cxx  |   30 --
 sw/source/uibase/dbui/swdbtoolsclient.cxx|  232 
 sw/source/uibase/utlui/initui.cxx|3 
 43 files changed, 240 insertions(+), 1024 deletions(-)

New commits:
commit b7bb34d74c5c764844f5b87483d09a61d3088695
Author: Matthew Nicholls 
Date:   Wed Apr 1 15:43:32 2015 +0100

tdf#88710 Kill svx dbtoolsclient

Removes dynamic loading logic described in tdf#84315, similar thing
removed in swdbtoolsclient.

Change-Id: I8762102a7263e6933354c2ff6f9978929b760f6e
Reviewed-on: https://gerrit.libreoffice.org/15147
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 7170dc0..d0fc36c 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -19,6 +19,7 @@ $(eval $(call 
gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/d
 
 $(eval $(call gb_Library_set_include,dbtools,\
$$(INCLUDE) \
+   -I$(SRCDIR)/connectivity/inc \
-I$(SRCDIR)/connectivity/source/inc \
 ))
 
diff --git a/connectivity/source/simpledbt/charset_s.hxx 
b/connectivity/inc/simpledbt/charset_s.hxx
similarity index 100%
rename from connectivity/source/simpledbt/charset_s.hxx
rename to connectivity/inc/simpledbt/charset_s.hxx
diff --git a/connectivity/source/simpledbt/parser_s.hxx 
b/connectivity/inc/simpledbt/parser_s.hxx
similarity index 100%
rename from connectivity/source/simpledbt/parser_s.hxx
rename to connectivity/inc/simpledbt/parser_s.hxx
diff --git a/connectivity/source/commontools/dbtools.cxx 
b/connectivity/source/commontools/dbtools.cxx
index 4f5e395..557e428 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -82,6 +82,9 @@
 #include "resource/sharedresources.hxx"
 #include 
 
+#include "simpledbt/parser_s.hxx"
+#include "simpledbt/charset_s.hxx"
+
 #include 
 #include 
 #include 
@@ -1973,6 +1976,18 @@ void getBooleanComparisonPredicate( const OUString& 
_rExpression, const bool _bV
 }
 }
 
+simple::ISQLParser* createSQLParser(
+const Reference< XComponentContext >& rxContext,
+const IParseContext* _pContext )
+{
+return new OSimpleSQLParser(rxContext, _pContext);
+}
+
+simple::IDataAccessCharSet* createCharsetHelper( )
+{
+return new ODataAccessCharSet;
+}
+
 }   // namespace dbtools
 
 namespace connectivity
diff --git a/connectivity/source/simpledbt/charset_s.cxx 
b/connectivity/source/simpledbt/charset_s.cxx
index 2843b67..261a46a 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licen

Re: DocumentEventListener problem

2015-04-14 Thread Stephan Bergmann


On 04/13/2015 06:06 PM, Michael Stahl wrote:

On 12.04.2015 22:53, Piet van Oostrum wrote:

I am trying to program a Global DocumentEventListener in Python.
Then on a certain event (e.g. File Open), I want to analyse/print the paragraph 
structure of the document.

I am running LibreOffice on port 2002. I am using the internal Python from 
LibreOffice, but I run the script externally, from a Terminal.

This is on Mac OS X 10.10, and LO 4.4.2.2.

The listener works and gives output until I start an Enumeration, for example 
enumerating the paragraphs. After the first element LO hangs completely, and 
the only way out is to kill it. I have tried also with enumerationg the 
TextFields in the document and it also hangs.

So I am wondering if I do something illegal or unsupported, or that I have hit 
a bug.


looks like a deadlock, quite easy to reproduce, hope Stephan has some
time to look at it:


There's nothing special here.  LO's main thread 1 in 
SfxBaseModel::postEvent_Impl (frame 19) is illegally issuing 
css.document.XDocumentEventListener::documentEventOccured calls with the 
solar mutex locked.  The python process, while synchronously executing 
that documentEventOccured call, first issues a bunch of asynchronous 
release requests and then a synchronous 
css.document.XDocumentEventBroadcaster::addDocumentEventListener 
request.  One of the asyncronous release requests, executed on LO's 
thread 2, blocks waiting on the solar mutex.  And on the LO side, the 
incoming synchronous addDocumentEventListener request blocks waiting on 
the preceding asynchronous release requests to finish (which is how 
synchronous and asynchronous UNO requests work).


The bad news is that trying to fix the bad LO thread 1 call stack by 
sticking a SolarMutexReleaser into SfxBaseModel::postEvent_Impl would 
cause lots of new crashes and deadlocks to pop up.  (For example, that 
temporary release of the solar mutex would cause a mismatch in the order 
in which the solar mutex and 
sd::framework::ChangeRequestQueueProcessor::maMutex get locked, causing 
JunitTest_forms_complex to deadlock.)

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

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - sw/source

2015-04-14 Thread Noel Grandin

 sw/source/uibase/inc/workctrl.hxx|4 +++-
 sw/source/uibase/ribbar/workctrl.cxx |   12 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit e8eed1d31dedd28cfe649d18d09de3b77add6f10
Author: Noel Grandin 
Date:   Tue Apr 14 15:53:01 2015 +0200

wrap field in VclPtr

Change-Id: Ica765d313edaf45eefeee49b2c40b1b595fa9daf

diff --git a/sw/source/uibase/inc/workctrl.hxx 
b/sw/source/uibase/inc/workctrl.hxx
index 31638e2..ba68c1f 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -114,7 +114,7 @@ class SwScrollNaviPopup;
 
 class SwScrollNaviToolBox : public ToolBox
 {
-SwScrollNaviPopup *m_pNaviPopup;
+VclPtr m_pNaviPopup;
 
 virtual voidMouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 virtual voidRequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
@@ -125,6 +125,8 @@ public:
 , m_pNaviPopup(pNaviPopup)
 {
 }
+virtual ~SwScrollNaviToolBox();
+virtual void dispose() SAL_OVERRIDE;
 };
 
 class SwScrollNaviPopup : public SfxPopupWindow
diff --git a/sw/source/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index a6c9415..8fe62f9 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -510,6 +510,17 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 return 0;
 }
 
+SwScrollNaviToolBox::~SwScrollNaviToolBox()
+{
+disposeOnce();
+}
+
+void SwScrollNaviToolBox::dispose()
+{
+m_pNaviPopup.disposeAndClear();
+ToolBox::dispose();
+}
+
 void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 {
 ToolBox::MouseButtonUp(rMEvt);
@@ -522,7 +533,6 @@ void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& 
rHEvt )
 SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(true));
 SetItemText(NID_PREV, SwScrollNaviPopup::GetQuickHelpText(false));
 ToolBox::RequestHelp( rHEvt );
-
 }
 
 OUString SwScrollNaviPopup::GetQuickHelpText(bool bNext)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - libreofficekit/qa sd/qa

2015-04-14 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   15 +++
 sd/qa/unit/tiledrendering/tiledrendering.cxx|   26 
 2 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit 7b68534ab0d322522ee5f64250526050187b6a9c
Author: Miklos Vajna 
Date:   Tue Apr 14 15:07:41 2015 +0200

gtktiledviewer: can use gtk_toggle_tool_button_new_from_stock() for these

Change-Id: I3c1163f9757a4592692bb8a920d1dc679bf53699

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index ae867fe..7715875 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -294,29 +294,24 @@ int main( int argc, char* argv[] )
 #endif
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
-pEnableEditing = gtk_toggle_tool_button_new();
-gtk_tool_button_set_label(GTK_TOOL_BUTTON(pEnableEditing), "Editing");
+pEnableEditing = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_EDIT);
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pEnableEditing, -1);
 g_signal_connect(G_OBJECT(pEnableEditing), "toggled", 
G_CALLBACK(toggleEditing), NULL);
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
-pBold = gtk_toggle_tool_button_new();
-gtk_tool_button_set_label(GTK_TOOL_BUTTON(pBold), "Bold");
+pBold = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD);
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pBold, -1);
 g_signal_connect(G_OBJECT(pBold), "toggled", G_CALLBACK(toggleToolItem), 
NULL);
 lcl_registerToolItem(pBold, ".uno:Bold");
-pItalic = gtk_toggle_tool_button_new();
-gtk_tool_button_set_label(GTK_TOOL_BUTTON(pItalic), "Italic");
+pItalic = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC);
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pItalic, -1);
 g_signal_connect(G_OBJECT(pItalic), "toggled", G_CALLBACK(toggleToolItem), 
NULL);
 lcl_registerToolItem(pItalic, ".uno:Italic");
-pUnderline = gtk_toggle_tool_button_new();
-gtk_tool_button_set_label(GTK_TOOL_BUTTON(pUnderline), "Underline");
+pUnderline = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_UNDERLINE);
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pUnderline, -1);
 g_signal_connect(G_OBJECT(pUnderline), "toggled", 
G_CALLBACK(toggleToolItem), NULL);
 lcl_registerToolItem(pUnderline, ".uno:Underline");
-pStrikethrough = gtk_toggle_tool_button_new();
-gtk_tool_button_set_label(GTK_TOOL_BUTTON(pStrikethrough), 
"Strikethrough");
+pStrikethrough = 
gtk_toggle_tool_button_new_from_stock(GTK_STOCK_STRIKETHROUGH);
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pStrikethrough, -1);
 g_signal_connect(G_OBJECT(pStrikethrough), "toggled", 
G_CALLBACK(toggleToolItem), NULL);
 lcl_registerToolItem(pStrikethrough, ".uno:Strikeout");
commit 7d82dfd5d2c7610199a243c1eaa1e1a69e279527
Author: Miklos Vajna 
Date:   Tue Apr 14 14:29:44 2015 +0200

Add SdXImpressDocument::resetSelection() testcase.

Change-Id: I5bd6965bde1a5dcbe26abc197a67e09c06a2bb21

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 16ec351..7e3cf19 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -44,6 +44,7 @@ public:
 void testPostMouseEvent();
 void testSetTextSelection();
 void testSetGraphicSelection();
+void testResetSelection();
 #endif
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
@@ -53,6 +54,7 @@ public:
 CPPUNIT_TEST(testPostMouseEvent);
 CPPUNIT_TEST(testSetTextSelection);
 CPPUNIT_TEST(testSetGraphicSelection);
+CPPUNIT_TEST(testResetSelection);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -243,6 +245,30 @@ void SdTiledRenderingTest::testSetGraphicSelection()
 CPPUNIT_ASSERT(aShapeBefore.getHeight() < aShapeAfter.getHeight());
 }
 
+void SdTiledRenderingTest::testResetSelection()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+uno::Reference 
xDrawPage(pXImpressDocument->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+xShape->setString("Aaa bbb.");
+// Create a selection on the second word.
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pActualPage = pViewShell->GetActualPage();
+SdrObject* pObject = pActualPage->GetObj(0);
+SdrView* pView = pViewShell->GetView();
+pView->SdrBeginTextEdit(pObject);
+CPPUNIT_ASSERT(pView->GetTextEditObject());
+EditView& rEditView = pView->GetTextEditOutlinerView()->GetEditView();
+ESelection aWordSelection(0, 4, 0, 7);
+rEditView.SetSelection(aWordSelection);
+// Did we indeed manage to select the second word?
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), rEditView.GetSelected

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

2015-04-14 Thread Caolán McNamara

 sw/source/filter/ww8/wrtw8esh.cxx |   47 +-
 1 file changed, 26 insertions(+), 21 deletions(-)

New commits:
commit 1c67b7f39971e6b7291e93b36f77c8593fd586c8
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 14:28:59 2015 +0100

fix crash on export of novell606043-1.odt to doc

Change-Id: I91478cf0a9b128f96dab5be67d018af46d75bd4f

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 880c3e3..97131c0 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -367,30 +367,35 @@ bool WW8Export::MiserableFormFieldExportHack(const 
SwFrmFmt& rFrmFmt)
 OSL_ENSURE(bWrtWW8, "Not allowed");
 if (!bWrtWW8)
 return false;
-bool bHack = false;
 const SdrObject *pObject = rFrmFmt.FindRealSdrObject();
-if (pObject && pObject->GetObjInventor() == FmFormInventor)
+if (!pObject || pObject->GetObjInventor() != FmFormInventor)
+return false;
+
+const SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObject);
+if (!pFormObj)
+return false;
+
+uno::Reference< awt::XControlModel > xControlModel =
+pFormObj->GetUnoControlModel();
+uno::Reference< lang::XServiceInfo > xInfo(xControlModel,
+uno::UNO_QUERY);
+uno::Reference xPropSet(xControlModel, 
uno::UNO_QUERY);
+if (!xInfo.is())
+return false;
+
+if (xInfo->supportsService("com.sun.star.form.component.ComboBox"))
 {
-if (const SdrUnoObj *pFormObj = PTR_CAST(SdrUnoObj,pObject))
-{
-uno::Reference< awt::XControlModel > xControlModel =
-pFormObj->GetUnoControlModel();
-uno::Reference< lang::XServiceInfo > xInfo(xControlModel,
-uno::UNO_QUERY);
-uno::Reference xPropSet(xControlModel, 
uno::UNO_QUERY);
-if (xInfo->supportsService("com.sun.star.form.component.ComboBox"))
-{
-DoComboBox(xPropSet);
-bHack = true;
-}
-else if 
(xInfo->supportsService("com.sun.star.form.component.CheckBox"))
-{
-DoCheckBox(xPropSet);
-bHack = true;
-}
-}
+DoComboBox(xPropSet);
+return true;
 }
-return bHack;
+
+if (xInfo->supportsService("com.sun.star.form.component.CheckBox"))
+{
+DoCheckBox(xPropSet);
+return true;
+}
+
+return false;
 }
 
 void WW8Export::DoComboBox(uno::Reference xPropSet)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 86578, which changed state.

Bug 86578 Summary: Text frame and coincident image frame style transparency and 
color fill corruption in Writer 4.4
https://bugs.documentfoundation.org/show_bug.cgi?id=86578

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

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

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 3 commits - basctl/source cui/source

2015-04-14 Thread Noel Grandin

 basctl/source/basicide/basobj2.cxx |2 +-
 cui/source/options/optinet2.cxx|4 +---
 cui/source/tabpages/autocdlg.cxx   |2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 734e4dc9f2676f59ed264abd16aae9afdef5ed84
Author: Noel Grandin 
Date:   Tue Apr 14 15:31:10 2015 +0200

loplugin:cstylecast

Change-Id: I3607afd9f553b9b3246dd67aca93e932625861a7

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b74c37e..3a82df4 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -732,7 +732,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
 nSelEntryPos == APPLY_NUMBERING)
 {
 ScopedVclPtrInstance< SvxCharacterMap > pMapDlg(this);
-ImpUserData* pUserData = 
(ImpUserData*)m_pCheckLB->FirstSelected()->GetUserData();
+ImpUserData* pUserData = 
static_cast(m_pCheckLB->FirstSelected()->GetUserData());
 pMapDlg->SetCharFont(*pUserData->pFont);
 pMapDlg->SetChar( (*pUserData->pString)[0] );
 if(RET_OK == pMapDlg->Execute())
commit acf245c0e83c1039becc84cb59e534bdb78d98d6
Author: Noel Grandin 
Date:   Tue Apr 14 15:20:19 2015 +0200

wrap dialog subclass in ScopedVclPtrInstance

Change-Id: I79b982ffa121cc38c467f79bd56d498abd4f8cac

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 16edfe7..53b1ee2 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -836,12 +836,10 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl)
 // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around 
between
 // invocations. Seems clearer to my little brain that way.
 
-TSAURLsDialog* pTSAURLsDlg = new TSAURLsDialog(this);
+ScopedVclPtrInstance pTSAURLsDlg(this);
 
 pTSAURLsDlg->Execute();
 
-delete pTSAURLsDlg;
-
 return 0;
 }
 
commit d320bc8a6fa60bf28d80fd7b76a94134c64abdd6
Author: Noel Grandin 
Date:   Tue Apr 14 15:14:36 2015 +0200

calling static member function through member call syntax

Change-Id: I29e8faa03f668a7471b47e7aca3c2400f034c3b6

diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 8505061..43d1be3 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -243,7 +243,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel 
>& rxLimitToDocument,
 SbMethod* pMethod = NULL;
 
 ScopedVclPtrInstance< MacroChooser > pChooser( nullptr, true );
-if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() )
+if ( bChooseOnly || !SvtModuleOptions::IsBasicIDE() )
 pChooser->SetMode(MacroChooser::ChooseOnly);
 
 if ( !bChooseOnly && rxLimitToDocument.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/experimental

2015-04-14 Thread Siqi Liu

 android/experimental/LOAndroid3/res/values/strings.xml 
   |3 +
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |   17 ++
 
android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java 
  |   13 +++
 3 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit bbfe124bfb37ac6b99f4016da02bd105c26177d0
Author: Siqi Liu 
Date:   Tue Apr 14 15:10:15 2015 +0200

disable saving on .tmp files.

Change-Id: I80af505d0dd9a71eda5d640dd336a034288a574d

diff --git a/android/experimental/LOAndroid3/res/values/strings.xml 
b/android/experimental/LOAndroid3/res/values/strings.xml
index ffce3d8..d7a430e 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -8,6 +8,7 @@
 LibreOffice Viewer is a document viewer 
based on LibreOffice.
 http://www.libreoffice.org
 This release was supplied by $VENDOR.
+This file is read-only, saving is 
disabled.
 
 Show License
 Show Notice
@@ -34,6 +35,8 @@
 
 Local documents
 Local file system
+
+
 Bold
 Underline
 Italic
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index e0d4098..8f4e480 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -70,6 +70,11 @@ public class LibreOfficeMainActivity extends 
ActionBarActivity {
 // Inflate the menu; this adds items to the action bar if it is 
present.
 getMenuInflater().inflate(R.menu.main, menu);
 mToolbarController.setOptionMenu(menu);
+
+if (mTempFile != null) {
+mToolbarController.disableMenuItem(R.id.action_save, true);
+Toast.makeText(this, 
getString(R.string.temp_file_saving_disabled), Toast.LENGTH_LONG).show();
+}
 return super.onCreateOptionsMenu(menu);
 }
 
@@ -124,6 +129,12 @@ public class LibreOfficeMainActivity extends 
ActionBarActivity {
 
 mMainHandler = new Handler();
 
+setContentView(R.layout.activity_main);
+
+Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+setSupportActionBar(toolbar);
+mToolbarController = new ToolbarController(this, 
getSupportActionBar(), toolbar);
+
 if (getIntent().getData() != null) {
 if 
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
 if (copyFileToTemp() && mTempFile != null) {
@@ -138,12 +149,6 @@ public class LibreOfficeMainActivity extends 
ActionBarActivity {
 mInputFile = DEFAULT_DOC_PATH;
 }
 
-setContentView(R.layout.activity_main);
-
-Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-setSupportActionBar(toolbar);
-mToolbarController = new ToolbarController(this, 
getSupportActionBar(), toolbar);
-
 toolbar.setNavigationOnClickListener(new View.OnClickListener() {
 @Override
 public void onClick(View view) {
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
index 1201b40..dde1a61 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ToolbarController.java
@@ -38,6 +38,19 @@ public class ToolbarController {
 switchToViewMode();
 }
 
+public void disableMenuItem(final int menuItemId, final boolean disabled) {
+LOKitShell.getMainHandler().post(new Runnable() {
+public void run() {
+MenuItem menuItem = mOptionsMenu.findItem(menuItemId);
+if (menuItem != null) {
+menuItem.setEnabled(!disabled);
+} else {
+Log.e(LOGTAG, "MenuItem not found.");
+}
+}
+});
+}
+
 public void onToggleStateChanged(int type, boolean pressed) {
 MenuItem menuItem = null;
 Bitmap icon = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 3 commits - canvas/source sfx2/source svtools/source vcl/source

2015-04-14 Thread Michael Meeks

 canvas/source/directx/dx_devicehelper.hxx |4 ++--
 sfx2/source/dialog/templdlg.cxx   |9 +++--
 sfx2/source/sidebar/SidebarController.cxx |1 -
 svtools/source/brwbox/brwbox1.cxx |   12 +++-
 vcl/source/window/toolbox2.cxx|3 +++
 5 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit bd5c762e0702ad341bf3a87bb29c0218ffd957ab
Author: Michael Meeks 
Date:   Tue Apr 14 14:11:02 2015 +0100

More missing lifecycle pieces.

Change-Id: I45ea68d75b03389a1ac0cdb74486c3701c1730a8

diff --git a/canvas/source/directx/dx_devicehelper.hxx 
b/canvas/source/directx/dx_devicehelper.hxx
index 08669ba..da6091f 100644
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -28,7 +28,7 @@
 #include "dx_bitmap.hxx"
 
 #include 
-
+#include 
 #include 
 
 class OutputDevice;
@@ -105,7 +105,7 @@ namespace dxcanvas
  */
 com::sun::star::rendering::XGraphicDevice* mpDevice;
 HDCmnHDC;
-VclPtr mpOutDev;
+VclPtr   mpOutDev;
 };
 
 typedef ::rtl::Reference< com::sun::star::rendering::XGraphicDevice > 
DeviceRef;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 7cbc5be..b5cd56c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -769,6 +769,8 @@ 
SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 delete pIdle;
 if ( m_pDeletionWatcher )
 m_pDeletionWatcher->signal();
+aFmtLb.disposeAndClear();
+aFilterLb.disposeAndClear();
 }
 
 namespace SfxTemplate
@@ -2064,8 +2066,8 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
 : SfxCommonTemplateDialog_Impl( pB, pDlgWindow, true ),
   m_pFloat  ( pDlgWindow ),
   m_bZoomIn ( false ),
-  m_aActionTbL  ( new DropToolBox_Impl(pDlgWindow, this) ),
-  m_aActionTbR  ( new ToolBox(pDlgWindow, SfxResId( TB_ACTION )) )
+  m_aActionTbL  ( VclPtrInstance(pDlgWindow, this) ),
+  m_aActionTbR  ( VclPtrInstance (pDlgWindow, SfxResId( 
TB_ACTION )  ) )
 {
 pDlgWindow->FreeResource();
 Initialize();
@@ -2160,6 +2162,9 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 
 SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
 {
+m_pFloat.clear();
+m_aActionTbL.disposeAndClear();
+m_aActionTbR.disposeAndClear();
 }
 
 void SfxTemplateDialog_Impl::LoadedFamilies()
diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index b23d356..7153322 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -66,7 +66,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
 pDataWin = 0;
 pVScroll = 0;
 
-pDataWin = new BrowserDataWin( this );
+pDataWin = VclPtr::Create( this ).get();
 pCols = new BrowserColumns;
 m_pImpl.reset( new ::svt::BrowseBoxImpl() );
 
@@ -117,7 +117,7 @@ BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, 
BrowserMode nMode )
 :Control( pParent, nBits | WB_3DLOOK )
 ,DragSourceHelper( this )
 ,DropTargetHelper( this )
-,aHScroll( new ScrollBar(this, WinBits( WB_HSCROLL )) )
+,aHScroll( VclPtr::Create(this, WinBits( WB_HSCROLL )) )
 {
 ConstructImpl( nMode );
 }
@@ -153,7 +153,7 @@ void BrowseBox::dispose()
 Hide();
 getDataWindow()->pHeaderBar.disposeAndClear();
 getDataWindow()->pCornerWin.disposeAndClear();
-pDataWin.clear();
+pDataWin.disposeAndClear();
 pVScroll.disposeAndClear();
 aHScroll.disposeAndClear();
 
@@ -2282,10 +2282,12 @@ void BrowseBox::SetMode( BrowserMode nMode )
 
 WinBits nVScrollWinBits =
 WB_VSCROLL | ( ( nMode & BROWSER_THUMBDRAGGING ) ? WB_DRAG : 0 );
-pVScroll = ( nMode & BROWSER_TRACKING_TIPS ) == BROWSER_TRACKING_TIPS
+pVScroll = VclPtr(
+( nMode & BROWSER_TRACKING_TIPS ) == BROWSER_TRACKING_TIPS
 ? new BrowserScrollBar( this, nVScrollWinBits,
 static_cast( 
pDataWin.get() ) )
-: new ScrollBar( this, nVScrollWinBits );
+: new ScrollBar( this, nVScrollWinBits ),
+SAL_NO_ACQUIRE);
 pVScroll->SetLineSize( 1 );
 pVScroll->SetPageSize(1);
 pVScroll->SetScrollHdl( LINK( this, BrowseBox, ScrollHdl ) );
commit ae5f75ab0515f8ee63813ec9284fbfb2124f0a5d
Author: Michael Meeks 
Date:   Tue Apr 14 13:42:45 2015 +0100

Allow a common op. on a disposed toolbox.

Change-Id: I4da1f4daaf94456bc951b1d7a96cb28cb7fba0e9

diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 3b1ad8f..8394aae 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -937,6 +937,9 @@ sal_uInt16 ToolBox::GetItemId( const Point& rPos ) const
 
 sal_uInt16 ToolBox::GetItemId(const OUString &rCommand) const
 {
+if (!mpData)
+retu

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

2015-04-14 Thread Caolán McNamara

 editeng/source/items/borderline.cxx   |1 +
 sw/source/filter/ww8/WW8TableInfo.cxx |8 ++--
 sw/source/filter/ww8/wrtww8.cxx   |   12 ++--
 sw/source/filter/ww8/ww8atr.cxx   |3 ---
 4 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 70b74121f06ac1892c81584919c5ee8c359d6b73
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 13:58:18 2015 +0100

fix MAXTABLECELLS related crash on export of ooo106020-1.odt to doc

word has a limit of MAXTABLECELLS cells in a row, we were clipping
the rowspan container to that max, but not the cell container

Change-Id: I5274dc7febd47e6c8c8e5337f638972b65239922

diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx 
b/sw/source/filter/ww8/WW8TableInfo.cxx
index 13efc75..c38d516 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -144,6 +144,8 @@ TableBoxVectorPtr 
WW8TableNodeInfoInner::getTableBoxesOfRow()
 const SwTableBoxes & rTblBoxes = pTabLine->GetTabBoxes();
 
 sal_uInt8 nBoxes = rTblBoxes.size();
+if (nBoxes > MAXTABLECELLS)
+nBoxes = MAXTABLECELLS;
 for ( sal_uInt8 n = 0; n < nBoxes; n++ )
 {
 pResult->push_back(rTblBoxes[n]);
@@ -244,7 +246,7 @@ WidthsPtr 
WW8TableNodeInfoInner::getColumnWidthsBasedOnAllRows()
 const SwTableLine *pCurrentLine = rTableLines[nLineIndex];
 const SwTableBoxes & rTabBoxes = pCurrentLine->GetTabBoxes();
 size_t nBoxes = rTabBoxes.size();
-if ( nBoxes > MAXTABLECELLS )
+if (nBoxes > MAXTABLECELLS)
 nBoxes = MAXTABLECELLS;
 
 sal_uInt32 nSeparatorPosition = 0;
@@ -298,7 +300,7 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow()
 pWidths = WidthsPtr(new Widths);
 // number of cell written
 sal_uInt32 nBoxes = rTabBoxes.size();
-if ( nBoxes > MAXTABLECELLS )
+if (nBoxes > MAXTABLECELLS)
 nBoxes = MAXTABLECELLS;
 
 for (sal_uInt32 n = 0; n < nBoxes; n++)
@@ -1432,6 +1434,8 @@ CellInfoMultiSet::const_iterator 
WW8TableCellGridRow::end() const
 
 void WW8TableCellGridRow::setTableBoxVector(TableBoxVectorPtr pTableBoxVector)
 {
+if (pTableBoxVector->size() > MAXTABLECELLS)
+pTableBoxVector->resize(MAXTABLECELLS);
 m_pTableBoxVector = pTableBoxVector;
 }
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index f779521..695a189 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2205,8 +2205,7 @@ void WW8AttributeOutput::TableDefinition( 
ww8::WW8TableNodeInfoInner::Pointer_t
 pTableTextNodeInfoInner->getTableBoxesOfRow();
 // number of cell written
 sal_uInt32 nBoxes = pTableBoxes->size();
-if (nBoxes > ww8::MAXTABLECELLS)
-nBoxes = ww8::MAXTABLECELLS;
+assert(nBoxes <= ww8::MAXTABLECELLS);
 
 // sprm header
 m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTable );
@@ -2272,14 +2271,7 @@ void WW8AttributeOutput::TableDefinition( 
ww8::WW8TableNodeInfoInner::Pointer_t
 ww8::TableBoxVector::const_iterator aIt;
 ww8::TableBoxVector::const_iterator aItEnd = pTableBoxes->end();
 
-#if OSL_DEBUG_LEVEL > 1
-size_t nRowSpans = pRowSpans->size();
-size_t nTableBoxes = pTableBoxes->size();
-(void) nRowSpans;
-(void) nTableBoxes;
-#endif
-
-for( aIt = pTableBoxes->begin(); aIt != aItEnd; ++aIt, ++aItRowSpans)
+for (aIt = pTableBoxes->begin(); aIt != aItEnd; ++aIt, ++aItRowSpans)
 {
 sal_uInt16 npOCount = m_rWW8Export.pO->size();
 
commit 0de25f95910c308337855ff5bab7e3917b1f62fe
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 13:22:01 2015 +0100

fix assert on saving fdo70092-1.odt to .doc

Change-Id: Ib2e969ca54da16b29ec20338148ee51810cb3c47

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 1e768da..b4a8f6c 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -259,6 +259,7 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle, 
double const fWidth)
 
 // Double lines
 case DOUBLE:
+case DOUBLE_THIN:
 return fWidth / 3.0;
 
 case THINTHICK_MEDIUMGAP:
commit b11077a0d272e45d3483adb972582b0887cb7a41
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 13:16:13 2015 +0100

SwRTFWriter::OutRTFBorder is gone, so no merging needed anymore

Change-Id: Ie60c09d7b7c626a0a7624e4c833d72eb5d0d5965

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4ebf690..a9ba08a 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -4211,9 +4211,6 @@ void WW8AttributeOutput::FormatFillGradient( const 
XFillGradientItem& /*rFillGra
 WW8_BRCVer9 WW8Export::TranslateBorderLine(const SvxBorderLine& rLine,
 sal_uInt16 nDist, bool bShadow)
 {
-// M.M. This function writes out border lines to the word for

[Libreoffice-commits] core.git: solenv/bin

2015-04-14 Thread Siqi Liu

 solenv/bin/native-code.py |4 
 1 file changed, 4 insertions(+)

New commits:
commit d0113938fc1d3996921c683c1fd2ce244083cb02
Author: Siqi Liu 
Date:   Tue Apr 14 14:31:31 2015 +0200

add missing services to allow writer to save.

Change-Id: Ica21cefb705f4140b9f298e09be04b4950407b78

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index f48c8e0..adb7eaa 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -271,10 +271,14 @@ writer_constructor_list = [
 "com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation",
 # sw/util/sw.component
 "com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation",
+"com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisImporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation",
+"com_sun_star_comp_Writer_XMLOasisMetaExporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation",
+"com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation",
+"com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation",
 # sw/util/swd.component
 "com_sun_star_comp_writer_FormatDetector_get_implementation",
 # writerfilter/util/writerfilter.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests sw/qa

2015-04-14 Thread Bjoern Michaelsen

 qadevOOo/tests/java/ifc/chart/_XChartDataArray.java |   17 -
 sw/qa/python/check_table.py |   20 ++--
 2 files changed, 22 insertions(+), 15 deletions(-)

New commits:
commit 4c28e293fcc4a7ea4fecf5498b347d24c2d091b1
Author: Bjoern Michaelsen 
Date:   Tue Apr 14 02:33:21 2015 +0200

also test get/setData for labelless tables

Change-Id: I61f7eaaad92b2a7b543fbb8f16f5b695700e8073

diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java 
b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
index 21af50f..2cfaedb 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
@@ -136,9 +136,12 @@ public class _XChartDataArray extends MultiMethodTest {
 bResult = true;
 double[][] _data = oObj.getData();
 data = _data;
-
-for (int i = 0; i < rowDscs.length; i++) {
-for (int j = 0; j < colDscs.length; j++)
+if(rowDscs.length != 0 && rowDscs.length != data.length)
+bResult = false;
+if(colDscs.length != 0 && colDscs.length != data[0].length)
+bResult = false;
+for (int i = 0; i < data.length; i++) {
+for (int j = 0; j < data[i].length; j++)
 data[i][j] = i * (j + 1);
 }
 oObj.setData(data);
@@ -211,8 +214,12 @@ public class _XChartDataArray extends MultiMethodTest {
 
 double[][] _data = oObj.getData();
 data = _data;
-for (int i = 0; i < rowDscs.length; i++) {
-for (int j = 0; j < colDscs.length; j++) {
+if(rowDscs.length != 0 && rowDscs.length != data.length)
+bResult = false;
+if(colDscs.length != 0 && colDscs.length != data[0].length)
+bResult = false;
+for (int i = 0; i < data.length; i++) {
+for (int j = 0; j < data[i].length; j++) {
 bResult &= data[i][j] == _data[i][j];
 }
 }
commit 9d130fd1f3ce7c1efb72dd9933a9a41b2cb1407f
Author: Bjoern Michaelsen 
Date:   Tue Apr 14 01:49:34 2015 +0200

have a nonsymetric test table to better catch transpose errors

Change-Id: If36ec5ed78a3e0b7a9037eaa1903772f1d228bce

diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index ab3adde..95db0b4 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -314,34 +314,34 @@ class CheckTable(unittest.TestCase):
 xDoc = CheckTable._uno.openEmptyWriterDoc()
 # insert table
 xTable = xDoc.createInstance("com.sun.star.text.TextTable")
-xTable.initialize(3, 3)
+xTable.initialize(4, 3)
 xCursor = xDoc.Text.createTextCursor()
 xDoc.Text.insertTextContent(xCursor, xTable, False)
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = False
 # roundtrip
-xTable.Data = ((1,2,3), (4,5,6), (7,8,9))
-self.assertEqual( xTable.Data, ((1,2,3), (4,5,6), (7,8,9)))
+xTable.Data = ((1,2,3), (4,5,6), (7,8,9), (10,11,12))
+self.assertEqual( xTable.Data, ((1,2,3), (4,5,6), (7,8,9), (10,11,12)))
 # missing row
 with self.assertRaises(Exception):
-xTable.Data = ((1,2,3), (4,5,6))
+xTable.Data = ((1,2,3), (4,5,6), (7,8,9))
 # missing column
 with self.assertRaises(Exception):
-xTable.Data = ((1,2), (4,5), (7,8))
+xTable.Data = ((1,2), (4,5), (7,8), (10,11))
 # with labels
 xTable.ChartColumnAsLabel = True
 xTable.ChartRowAsLabel = True
-self.assertEqual( xTable.Data, ((5,6), (8,9)))
-xTable.Data = ((55,66), (88,99))
+self.assertEqual( xTable.Data, ((5,6), (8,9), (11,12)))
+xTable.Data = ((55,66), (88,99), (,1212))
 xTable.ChartColumnAsLabel = True
 xTable.ChartRowAsLabel = False
-self.assertEqual( xTable.Data, ((2,3), (55,66), (88,99)))
+self.assertEqual( xTable.Data, ((2,3), (55,66), (88,99), (,1212)))
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = True
-self.assertEqual( xTable.Data, ((4,55,66), (7,88,99)))
+self.assertEqual( xTable.Data, ((4,55,66), (7,88,99), (10,,1212)))
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = False
-self.assertEqual( xTable.Data, ((1,2,3), (4,55,66), (7,88,99)))
+self.assertEqual( xTable.Data, ((1,2,3), (4,55,66), (7,88,99), 
(10,,1212)))
 xDoc.dispose()
 
 if __name__ == '__main__':
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New version of Spanish dictionaries (0.8)

2015-04-14 Thread Andras Timar

On Tue, Apr 14, 2015 at 7:01 AM, Adolfo Jayme Barrientos
 wrote:
> 2015-04-13 2:51 GMT-05:00 Jacobo Aragunde Pérez:
>> El 11/04/15 a las 19:57, Ricardo Palomares Martínez escribió:
>>> LibreOffice is using es_ANY edition. I have to admit that I don't
>>> understand very well the process of updating the dictionary through
>>> Gerrit outlined here:
>>>
>>> https://wiki.documentfoundation.org/Development/Dictionaries#Adding.2FUpdating_bundled_Dictionaries
>
> For the record, there was a typo in the instructions outlined in that
> wiki page, which I’ve already fixed. Sorry for any confusion!
>
>> You would have to clone the dictionaries repository, overwrite the
>> Spanish dictionary there with the new version, and push the changes. I
>> can do it for you this time :)
>
> Jacobo’s commit was pushed as
> http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=cbf6d67e


- Spanish spelling dictionary, hyphenation rules,
and thesaurus
+ Español (España y América Latina): Ortografía,
separación y sinónimos

This prevents localization (other than Spanish) of description.

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

Re: New version of Spanish dictionaries (0.8)

2015-04-14 Thread Adolfo Jayme Barrientos

2015-04-13 2:51 GMT-05:00 Jacobo Aragunde Pérez:
> El 11/04/15 a las 19:57, Ricardo Palomares Martínez escribió:
>> LibreOffice is using es_ANY edition. I have to admit that I don't
>> understand very well the process of updating the dictionary through
>> Gerrit outlined here:
>>
>> https://wiki.documentfoundation.org/Development/Dictionaries#Adding.2FUpdating_bundled_Dictionaries

For the record, there was a typo in the instructions outlined in that
wiki page, which I’ve already fixed. Sorry for any confusion!

> You would have to clone the dictionaries repository, overwrite the
> Spanish dictionary there with the new version, and push the changes. I
> can do it for you this time :)

Jacobo’s commit was pushed as
http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=cbf6d67e

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

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 2 commits - include/sfx2 sfx2/source sw/inc sw/source vcl/source

2015-04-14 Thread Michael Meeks

 include/sfx2/sidebar/ControlFactory.hxx|5 +++--
 sfx2/source/sidebar/ControlFactory.cxx |8 
 sfx2/source/sidebar/Deck.cxx   |   13 ++---
 sfx2/source/sidebar/Panel.cxx  |2 +-
 sfx2/source/sidebar/SidebarChildWindow.cxx |4 ++--
 sfx2/source/sidebar/SidebarController.cxx  |   15 +--
 sfx2/source/sidebar/SidebarController.hxx  |2 +-
 sfx2/source/sidebar/TabBar.cxx |   10 +++---
 sfx2/source/sidebar/TabBar.hxx |2 +-
 sw/inc/AnnotationWin.hxx   |2 +-
 sw/inc/SidebarWin.hxx  |2 +-
 sw/source/uibase/docvw/AnnotationWin.cxx   |4 ++--
 vcl/source/window/builder.cxx  |2 +-
 13 files changed, 39 insertions(+), 32 deletions(-)

New commits:
commit dc2ec59cb3ca6825510ad9c5953330eba3dc8cb2
Author: Michael Meeks 
Date:   Tue Apr 14 13:19:03 2015 +0100

Unwind lifecycle mistake in VclBuilder.

Change-Id: I46e1b2fac3e49e1ef1a0aa7de7fc8e8cb90ddcf8

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5574b03..dc06f34 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1770,7 +1770,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 SAL_WARN_IF(!pWindow, "vcl.layout", "probably need to implement " << 
name.getStr() << " or add a make" << name.getStr() << " function");
 if (pWindow)
 {
-VclPtr< vcl::Window > xWindow( pWindow, SAL_NO_ACQUIRE );
+VclPtr< vcl::Window > xWindow( pWindow );
 pWindow->SetHelpId(m_sHelpRoot + id);
 SAL_INFO("vcl.layout", "for " << name.getStr() <<
 ", created " << pWindow << " child of " <<
commit 6f9c00dfe02cdc62ad1b9798a0d007e1303a96e6
Author: Michael Meeks 
Date:   Tue Apr 14 11:52:19 2015 +0100

Sidebar lifecycle - dispose panel if we fail to construct it properly.

Change-Id: I5e46e72227ac8532aed10758e1ccbb2b452ba8d4

diff --git a/include/sfx2/sidebar/ControlFactory.hxx 
b/include/sfx2/sidebar/ControlFactory.hxx
index a078e00..142f249 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 class ToolBox;
 
@@ -39,9 +40,9 @@ class SFX2_DLLPUBLIC ControlFactory
 public:
 /** Create the menu button for the task bar.
 */
-static CheckBox* CreateMenuButton (vcl::Window* pParentWindow);
+static VclPtr CreateMenuButton (vcl::Window* pParentWindow);
 
-static ImageRadioButton* CreateTabItem (vcl::Window* pParentWindow);
+static VclPtr CreateTabItem (vcl::Window* pParentWindow);
 };
 
 
diff --git a/sfx2/source/sidebar/ControlFactory.cxx 
b/sfx2/source/sidebar/ControlFactory.cxx
index 23e17a6..d8a49b3 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -25,14 +25,14 @@
 
 namespace sfx2 { namespace sidebar {
 
-CheckBox* ControlFactory::CreateMenuButton (vcl::Window* pParentWindow)
+VclPtr ControlFactory::CreateMenuButton (vcl::Window* pParentWindow)
 {
-return new MenuButton(pParentWindow);
+return VclPtr(new MenuButton(pParentWindow), SAL_NO_ACQUIRE);
 }
 
-ImageRadioButton* ControlFactory::CreateTabItem (vcl::Window* pParentWindow)
+VclPtr ControlFactory::CreateTabItem (vcl::Window* 
pParentWindow)
 {
-return new TabItem(pParentWindow);
+return VclPtr(new TabItem(pParentWindow), 
SAL_NO_ACQUIRE);
 }
 
 } } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index a44217c..bbdac3e 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -48,11 +48,11 @@ Deck::Deck (
   maIcon(),
   mnMinimalWidth(0),
   maPanels(),
-  mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, 
rCloserAction)),
-  mpScrollClipWindow(new vcl::Window(this)),
-  mpScrollContainer(new ScrollContainerWindow(mpScrollClipWindow.get())),
-  mpFiller(new vcl::Window(this)),
-  mpVerticalScrollBar(new ScrollBar(this))
+  mpTitleBar(VclPtr::Create(rDeckDescriptor.msTitle, this, 
rCloserAction)),
+  mpScrollClipWindow(VclPtr::Create(this)),
+  
mpScrollContainer(VclPtr::Create(mpScrollClipWindow.get())),
+  mpFiller(VclPtr::Create(this)),
+  mpVerticalScrollBar(VclPtr::Create(this))
 {
 SetBackground(Wallpaper());
 
@@ -88,13 +88,12 @@ void Deck::dispose()
 // without updating maPanels.
 for (size_t i = 0; i < aPanels.size(); i++)
 aPanels[i].disposeAndClear();
-maPanels.clear();
 
+mpTitleBar.disposeAndClear();
 mpFiller.disposeAndClear();
 mpVerticalScrollBar.disposeAndClear();
 mpScrollContainer.disposeAndClear();
 mpScrollClipWindow.disposeAndClear();
-mpTitleBar.disposeAndClear();
 
 vcl::Window::dispose();
 }
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 8be4f28..c0246e5 100644

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

2015-04-14 Thread Miklos Vajna

 sd/qa/unit/tiledrendering/data/shape.odp |binary
 sd/qa/unit/tiledrendering/tiledrendering.cxx |   24 
 2 files changed, 24 insertions(+)

New commits:
commit 87b682500f481b61399609b24a4a695fda93f552
Author: Miklos Vajna 
Date:   Tue Apr 14 12:44:29 2015 +0200

Add SdXImpressDocument::setGraphicSelection() testcase.

Change-Id: Ifdf3ef84cd886b338536629fb36ebba694916d6a

diff --git a/sd/qa/unit/tiledrendering/data/shape.odp 
b/sd/qa/unit/tiledrendering/data/shape.odp
new file mode 100644
index 000..f734761
Binary files /dev/null and b/sd/qa/unit/tiledrendering/data/shape.odp differ
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 1b87768..16ec351 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -43,6 +43,7 @@ public:
 void testPostKeyEvent();
 void testPostMouseEvent();
 void testSetTextSelection();
+void testSetGraphicSelection();
 #endif
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
@@ -51,6 +52,7 @@ public:
 CPPUNIT_TEST(testPostKeyEvent);
 CPPUNIT_TEST(testPostMouseEvent);
 CPPUNIT_TEST(testSetTextSelection);
+CPPUNIT_TEST(testSetGraphicSelection);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -219,6 +221,28 @@ void SdTiledRenderingTest::testSetTextSelection()
 // The new selection must include the ending dot, too -- but not the first 
word.
 CPPUNIT_ASSERT_EQUAL(OUString("bbb."), rEditView.GetSelected());
 }
+
+void SdTiledRenderingTest::testSetGraphicSelection()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("shape.odp");
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pPage = pViewShell->GetActualPage();
+SdrObject* pObject = pPage->GetObj(0);
+// Make sure the rectangle has 8 handles: at each corner and at the center 
of each edge.
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pObject->GetHdlCount());
+// Take the bottom center one.
+SdrHdl* pHdl = pObject->GetHdl(6);
+CPPUNIT_ASSERT_EQUAL(HDL_LOWER, pHdl->GetKind());
+Rectangle aShapeBefore = pObject->GetSnapRect();
+// Resize.
+pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_START, 
convertMm100ToTwip(pHdl->GetPos().getX()), 
convertMm100ToTwip(pHdl->GetPos().getY()));
+pXImpressDocument->setGraphicSelection(LOK_SETGRAPHICSELECTION_END, 
convertMm100ToTwip(pHdl->GetPos().getX()), 
convertMm100ToTwip(pHdl->GetPos().getY() + 1000));
+Rectangle aShapeAfter = pObject->GetSnapRect();
+// Check that a resize happened, but aspect ratio is not kept.
+CPPUNIT_ASSERT_EQUAL(aShapeBefore.getWidth(), aShapeAfter.getWidth());
+CPPUNIT_ASSERT(aShapeBefore.getHeight() < aShapeAfter.getHeight());
+}
+
 #endif
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-14 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36ff8bf48b9384b91f2999bc18b567864226125d
Author: Miklos Vajna 
Date:   Tue Apr 14 14:03:37 2015 +0300

WaE: implicit conversion (IntegralCast) from bool to 'int'

Change-Id: I228c0bca3133e94b28db2540dbd41e8b4fd1eee9

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 0e8ad7e..ae867fe 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -135,7 +135,7 @@ static void signalCommand(LOKDocView* /*pLOKDocView*/, 
char* pPayload, gpointer
 if (g_aCommandNameToolItems.find(aKey) != 
g_aCommandNameToolItems.end())
 {
 GtkToolItem* pItem = g_aCommandNameToolItems[aKey];
-bool bEdit = aValue == "true";
+gboolean bEdit = aValue == "true";
 if 
(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(pItem)) != bEdit)
 {
 // Avoid invoking lok_docview_post_command().
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Adding a linker to library in makefile

2015-04-14 Thread Miklos Vajna

Hi,

On Mon, Apr 13, 2015 at 04:29:19AM +, Andy Mendoza 
 wrote:
> Where do I put this linker in the makefiles?

mysqlcppconn is an external library already known by the build system,
you probably want to use that.

See e.g. mysqlc/Library_mysqlc.mk on how to link to it.

Regards,

Miklos


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

Re: DocumentEventListener problem

2015-04-14 Thread Michael Stahl

On 13.04.2015 18:06, Michael Stahl wrote:
> looks like a deadlock, quite easy to reproduce, hope Stephan has some
> time to look at it:
> 

i forgot to attach the self contained reproducer based on Piet's code,
it connects to pipe named "ms"



import uno
import unohelper

from com.sun.star.document import XDocumentEventListener
#import PYUNO.DemoBase as DemoBase 

listener = None
globalBroadcaster =  None

class MyEventListener(XDocumentEventListener, unohelper.Base):
# XDocumentEventListener
def documentEventOccured(self, event):
globalBroadcaster.removeDocumentEventListener(self)
print("Event name: {}".format(event.EventName))
if event.EventName == "OnLoadFinished":
doc = event.Source
print("Document: Title: {} Location: {}".format(doc.Title, doc.Location))
showportions(doc)
globalBroadcaster.addDocumentEventListener(self)

# parent-interface XDocumentEventListener
def disposing(self, event):
pass

def showportions(doc):
if doc.supportsService("com.sun.star.text.TextDocument"):
parenum = doc.Text.createEnumeration()
while parenum.hasMoreElements():
para = parenum.nextElement()
print("get para: {}".format(para.String))

#and in main (after setting up the connection):
#
def foo(context):
global globalBroadcaster
#context = XSCRIPTCONTEXT.getComponentContext()
globalBroadcaster = context.getValueByName(
'/singletons/com.sun.star.frame.theGlobalEventBroadcaster')
listener = MyEventListener()
globalBroadcaster.addDocumentEventListener(listener)

xLocalContext = uno.getComponentContext()

xUnoResolver = xLocalContext.ServiceManager.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", xLocalContext)

context = xUnoResolver.resolve("uno:%s;urp;StarOffice.ComponentContext" % "pipe,name=ms")

foo(context)

import time
time.sleep(10)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-04-14 Thread Jan Holesovsky

 editeng/source/editeng/impedit2.cxx |   10 +++
 sc/source/ui/inc/gridwin.hxx|8 ++
 sc/source/ui/inc/output.hxx |4 +
 sc/source/ui/view/gridwin.cxx   |  108 +---
 sc/source/ui/view/output2.cxx   |   33 +--
 5 files changed, 147 insertions(+), 16 deletions(-)

New commits:
commit 771bb58c1c547a874c80d05be59f73cbf68343df
Author: Jan Holesovsky 
Date:   Tue Apr 14 12:08:39 2015 +0200

editeng tiled editing: Don't overwrite bInSelection.

Setting bInSelection in MouseButtonUp() feels wrong, and against of its 
other
handling elsewhere.  Also it breaks the selection handling in the tiled
rendering case - on further redraw, selections may disappear.

But it has been so since the initial check-in of the OOo code, so I have no
idea what corner case I might break by deleting this, so let's guard the
behavior by isTiledReneding() for now.

Change-Id: I7f7b237f9f0f427e317266e05481bac439c3c8ad

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 7fc5c43..7d4f1c8 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -567,7 +567,15 @@ bool ImpEditEngine::MouseButtonUp( const MouseEvent& 
rMEvt, EditView* pView )
 {
 GetSelEngine().SetCurView( pView );
 GetSelEngine().SelMouseButtonUp( rMEvt );
-bInSelection = false;
+
+// in the tiled rendering case, setting bInSelection here has unexpected
+// consequences - further tiles painting removes the selection
+// FIXME I believe resetting bInSelection should not be here even in the
+// non-tiled-rendering case, but it has been here since 2000 (and before)
+// so who knows what corner case it was supposed to solve back then
+if (!pView->pImpEditView->isTiledRendering())
+bInSelection = false;
+
 // Special treatments
 EditSelection aCurSel( pView->pImpEditView->GetEditSelection() );
 if ( !aCurSel.HasRange() )
commit 3f04bfef9e12e947f336aaa441d784f6c77f8e6a
Author: Jan Holesovsky 
Date:   Tue Apr 14 12:05:00 2015 +0200

sc tiled editing: Implement long-touch to select word in overflowing text.

Normally, the text overflowing from other cells is completely ignored by 
Calc,
and the user always works with the underlying cells.

On Android / mobile, it is though more natural to be able to select the text
directly; so implement a compromise:

* tap places the text cursor, so that the user can write into the
  cells hidden by the text too
* long-tap selects the word in the text, even if the text 'just' overflows
  from another cell

Change-Id: Ibe8666301ff1df0414c0206c1f3336842485433b

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 259844e..0221e60 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -278,6 +278,14 @@ class ScGridWindow : public vcl::Window, public 
DropTargetHelper, public DragSou
 sal_uInt16  HitPageBreak( const Point& rMouse, ScRange* pSource = 
NULL,
 SCCOLROW* pBreak = NULL, SCCOLROW* pPrev = 
NULL );
 
+/** The cell may be covered by text that overflows from a previous cell.
+
+@return if true, the given cell is covered by (overflowing) text and
+rTextStartPosX returns the column where the text that overflows
+starts.
+*/
+boolIsCellCoveredByText(SCsCOL nPosX, SCsROW nPosY, SCTAB 
nTab, SCsCOL &rTextStartPosX);
+
 voidPasteSelection( const Point& rPosPixel );
 
 voidSelectForContextMenu( const Point& rPosPixel, SCsCOL 
nCellX, SCsROW nCellY );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 2b0ca4c..838318e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1657,6 +1657,72 @@ void ScGridWindow::MouseButtonDown( const MouseEvent& 
rMEvt )
 nNestedButtonState = SC_NESTEDBUTTON_NONE;
 }
 
+bool ScGridWindow::IsCellCoveredByText(SCsCOL nPosX, SCsROW nPosY, SCTAB nTab, 
SCsCOL &rTextStartPosX)
+{
+ScDocument* pDoc = pViewData->GetDocument();
+
+// find the first non-empty cell (this, or to the left)
+ScRefCellValue aCell;
+SCsCOL nNonEmptyX = nPosX;
+for (; nNonEmptyX >= 0; --nNonEmptyX)
+{
+aCell.assign(*pDoc, ScAddress(nNonEmptyX, nPosY, nTab));
+if (!aCell.isEmpty())
+break;
+}
+
+// the inital cell already contains text
+if (nNonEmptyX == nPosX)
+{
+rTextStartPosX = nNonEmptyX;
+return true;
+}
+
+// to the left, there is no cell that would contain (potentially
+// overrunning) text
+if (nNonEmptyX < 0 || pDoc->HasAttrib(nNonEmptyX, nPosY, nTab, nPosX, 
nPosY, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED))
+return false;
+
+double nPPTX = pViewData->GetPPTX();
+double nPPTY = pViewData->GetPPTY

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

2015-04-14 Thread Katarina Behrens

 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b12c44133549e0694e5e10bd98e9677209b89c6a
Author: Katarina Behrens 
Date:   Tue Apr 14 12:06:11 2015 +0200

Related tdf#87862: some HIG tweaks to slide transition panel

Change-Id: Ifed4f53d1b831a0cf9f05fb148e6752d19f717f6

diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui 
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index 878b44c..bdf03bc 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -73,6 +73,7 @@
   
 True
 False
+12
 
   
 True
@@ -259,6 +260,7 @@
   
 True
 False
+6
 12
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

2015-04-14 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/e80c86301be02004e96a936a17ea99acf8a9db96/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 5 commits - include/LibreOfficeKit libreofficekit/qa libreofficekit/source sfx2/source

2015-04-14 Thread Miklos Vajna

 include/LibreOfficeKit/LibreOfficeKitGtk.h  |1 
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   72 ++--
 libreofficekit/source/gtk/lokdocview.cxx|   20 +
 sfx2/source/control/unoctitm.cxx|2 
 4 files changed, 88 insertions(+), 7 deletions(-)

New commits:
commit 4dbff9ece8599365d65feb98403266d23633cd79
Author: Miklos Vajna 
Date:   Tue Apr 14 11:37:27 2015 +0200

SfxDispatchController_Impl::InterceptLOKStateChangeEvent: fix typo

Without this, the strikethrough event is not sent to LOK clients, i.e.
the strikethrough button in gtktiledviewer did not change to the toggled
state when the cursor entered an area marked as strikethrough.

Change-Id: I0b2d3acc50cdfff88675ceb14cf653b6622797e7

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f8c8ed0..141fa1d 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1054,7 +1054,7 @@ void 
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
 if (aEvent.FeatureURL.Path == "Bold" ||
 aEvent.FeatureURL.Path == "Italic" ||
 aEvent.FeatureURL.Path == "Underline" ||
-aEvent.FeatureURL.Path == "StrikeOut")
+aEvent.FeatureURL.Path == "Strikeout")
 {
 
 OUStringBuffer aBuffer;
commit d01e4adfec33464594680140ce38c757885de343
Author: Miklos Vajna 
Date:   Tue Apr 14 11:33:12 2015 +0200

gtktiledviewer: add underline and strikethrough

Change-Id: I457deb8d544b97874701dec37d8baee237ce4ebb

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 5bf1bdb..0e8ad7e 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -34,6 +34,8 @@ static GtkWidget* pDocView;
 static GtkToolItem* pEnableEditing;
 static GtkToolItem* pBold;
 static GtkToolItem* pItalic;
+static GtkToolItem* pUnderline;
+static GtkToolItem* pStrikethrough;
 std::map g_aToolItemCommandNames;
 std::map g_aCommandNameToolItems;
 bool g_bToolItemBroadcast = true;
@@ -153,6 +155,7 @@ void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
 LOKDocView* pLOKDocView = LOK_DOCVIEW(pDocView);
 GtkToolItem* pItem = GTK_TOOL_ITEM(pWidget);
 const std::string& rString = g_aToolItemCommandNames[pItem];
+g_info("toggleToolItem: lok_docview_post_command('%s')", 
rString.c_str());
 lok_docview_post_command(pLOKDocView, rString.c_str());
 }
 }
@@ -307,6 +310,16 @@ int main( int argc, char* argv[] )
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pItalic, -1);
 g_signal_connect(G_OBJECT(pItalic), "toggled", G_CALLBACK(toggleToolItem), 
NULL);
 lcl_registerToolItem(pItalic, ".uno:Italic");
+pUnderline = gtk_toggle_tool_button_new();
+gtk_tool_button_set_label(GTK_TOOL_BUTTON(pUnderline), "Underline");
+gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pUnderline, -1);
+g_signal_connect(G_OBJECT(pUnderline), "toggled", 
G_CALLBACK(toggleToolItem), NULL);
+lcl_registerToolItem(pUnderline, ".uno:Underline");
+pStrikethrough = gtk_toggle_tool_button_new();
+gtk_tool_button_set_label(GTK_TOOL_BUTTON(pStrikethrough), 
"Strikethrough");
+gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pStrikethrough, -1);
+g_signal_connect(G_OBJECT(pStrikethrough), "toggled", 
G_CALLBACK(toggleToolItem), NULL);
+lcl_registerToolItem(pStrikethrough, ".uno:Strikeout");
 
 gtk_box_pack_start( GTK_BOX(pVBox), pToolbar, FALSE, FALSE, 0 ); // Adds 
to top.
 
commit 6a488e1fde2705e5e51129825ebfe654f6f673e1
Author: Miklos Vajna 
Date:   Tue Apr 14 11:19:27 2015 +0200

gtktiledviewer: add toggleToolItem() to avoid copy&paste

Change-Id: If2553d96472e6ced9b2fad4c202d0793a1fce3bc

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 976e523..5bf1bdb 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -11,6 +11,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -33,6 +34,8 @@ static GtkWidget* pDocView;
 static GtkToolItem* pEnableEditing;
 static GtkToolItem* pBold;
 static GtkToolItem* pItalic;
+std::map g_aToolItemCommandNames;
+std::map g_aCommandNameToolItems;
 bool g_bToolItemBroadcast = true;
 static GtkWidget* pVBox;
 // GtkComboBox requires gtk 2.24 or later
@@ -43,6 +46,12 @@ static GtkComboBoxText* pPartSelector;
 static LibreOfficeKit* pOffice;
 static char* pFileName;
 
+static void lcl_registerToolItem(GtkToolItem* pItem, const std::string& rName)
+{
+g_aToolItemCommandNames[pItem] = rName;
+g_aCommandNameToolItems[rName] = pItem;
+}
+
 const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 5.0 };
 
 void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
@@ -121,14 +130,9 @@ stat

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

2015-04-14 Thread Caolán McNamara

 dev/null   |binary
 include/svx/xgrad.hxx  |6 +-
 sw/qa/extras/odfimport/data/fdo90130-1.odt |binary
 sw/qa/extras/odfimport/data/fdo90130-2.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx   |   12 +++-
 sw/source/core/unocore/unoframe.cxx|   20 
 6 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit bc892b04144d82507ccd59953c9f4da357c2e7b4
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 10:14:42 2015 +0100

Related: tdf#90130 gradient transparency goes missing

Change-Id: I0af8eb24dab7bb9f5831bec68f9a22ba88c2be19

diff --git a/sw/qa/extras/odfimport/data/fdo90130.odt 
b/sw/qa/extras/odfimport/data/fdo90130-1.odt
similarity index 100%
rename from sw/qa/extras/odfimport/data/fdo90130.odt
rename to sw/qa/extras/odfimport/data/fdo90130-1.odt
diff --git a/sw/qa/extras/odfimport/data/fdo90130-2.odt 
b/sw/qa/extras/odfimport/data/fdo90130-2.odt
new file mode 100644
index 000..6cf08950
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo90130-2.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index e2af675..a8a3742 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -559,7 +559,7 @@ DECLARE_ODFIMPORT_TEST(fdo81223, "fdo81223.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xfeff), nValue);
 }
 
-DECLARE_ODFIMPORT_TEST(fdo90130, "fdo90130.odt")
+DECLARE_ODFIMPORT_TEST(fdo90130_1, "fdo90130-1.odt")
 {
 uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
@@ -569,6 +569,16 @@ DECLARE_ODFIMPORT_TEST(fdo90130, "fdo90130.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00ff), nValue);
 }
 
+DECLARE_ODFIMPORT_TEST(fdo90130_2, "fdo90130-2.odt")
+{
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+uno::Reference xFrame(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+sal_Int32 nValue(0);
+xFrame->getPropertyValue("BackColorTransparency") >>= nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(50), nValue);
+}
+
 DECLARE_ODFIMPORT_TEST(testBnc800714, "bnc800714.fodt")
 {
 // Document's second paragraph wants to be together with the third one, 
but:
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index aa65873..99ee1d4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -449,20 +449,24 @@ bool 
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 }
 }
 
-if(pXFillTransparenceItem)
+if (pXFillTransparenceItem)
 {
-const XGradient aNullGrad(RGB_Color(COL_BLACK), 
RGB_Color(COL_WHITE));
 XFillTransparenceItem aXFillTransparenceItem;
-
 aXFillTransparenceItem.PutValue(*pXFillTransparenceItem);
 rToSet.Put(aXFillTransparenceItem);
 }
-else if (aXFillStyleItem.GetValue() == drawing::FillStyle_SOLID && 
pColTrans)
+else if (pColTrans)
 {
-// Fill style is set to solid, but no fill transparency is given.
-// On the other hand, we have a BackColorTransparency, so use that.
-aBrush.PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
-setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
+// No fill transparency is given.  On the other hand, we have a
+// BackColorTransparency, so use that.
+sal_Int8 nGraphicTransparency(0);
+*pColTrans >>= nGraphicTransparency;
+rToSet.Put(XFillTransparenceItem(nGraphicTransparency));
+if (aXFillStyleItem.GetValue() == drawing::FillStyle_SOLID)
+{
+aBrush.PutValue(*pColTrans, MID_BACK_COLOR_TRANSPARENCY);
+setSvxBrushItemAsFillAttributesToTargetSet(aBrush, rToSet);
+}
 }
 
 if(pXGradientStepCountItem)
commit 97730d49d31c5a7d680122c11640e290170e5f66
Author: CaolÃ¡n McNamara 
Date:   Tue Apr 14 09:24:41 2015 +0100

saw at least one of these unused by eye, search for more

Change-Id: I0f863f2463c8ba1b387d5834c6ff42fb467ce796

diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index 9231f91..9f5011e 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -27,11 +27,7 @@
 
 class Gradient;
 
-
-// class XGradient
-
-
-class SVX_DLLPUBLIC XGradient
+class SVX_DLLPUBLIC SAL_WARN_UNUSED XGradient
 {
 protected:
 css::awt::GradientStyle  eStyle;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/experimental

2015-04-14 Thread Tomaž Vajngerl

 
android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
 |6 +++
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java  
   |3 +
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java   
   |4 +-
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |3 -
 android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java 
   |3 +
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElementImplRequirement.java
 |4 ++
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CommonCanvasElement.java
  |   13 +++
 android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/Cursor.java
   |   18 ++
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
 |6 +++
 
android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java
|2 -
 
android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/DocumentOverlayView.java
 |   16 
 11 files changed, 73 insertions(+), 5 deletions(-)

New commits:
commit c92ceb544c0c48902b604eccd8748b139480fcca
Author: TomaÅ¾ Vajngerl 
Date:   Tue Apr 14 18:07:07 2015 +0900

android: add comments

Change-Id: I30f8180dd9cf9c94eedca61926ab706f241142df

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 26ab856..bd4da2c 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -415,10 +415,16 @@ public class InvalidationHandler implements 
Document.MessageCallback {
 return mState;
 }
 
+/**
+ * A key event happend (i.e. user started typing.
+ */
 public void keyEvent() {
 mKeyEvent = true;
 }
 
+/**
+ * The states the overlay.
+ */
 public enum OverlayState {
 /**
  * State where the overlay is empty
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
index c4f628c..111ad10 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
@@ -12,6 +12,9 @@ import android.widget.TextView;
 
 import java.io.File;
 
+/**
+ * The about dialog.
+ */
 public class LOAbout {
 
 private static final String DEFAULT_DOC_PATH = "/assets/example.odt";
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
index d9a20d8..d76e672 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
@@ -21,7 +21,9 @@ import org.libreoffice.canvas.SelectionHandle;
 import org.mozilla.gecko.gfx.ComposedTileLayer;
 import org.mozilla.gecko.gfx.LayerView;
 
-
+/**
+ * Common static LOKit functions, functions to send events.
+ */
 public class LOKitShell {
 private static final String LOGTAG = LOKitShell.class.getSimpleName();
 
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1a8c970..e0d4098 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -19,7 +19,6 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import org.libreoffice.overlay.DocumentOverlay;
-
 import org.mozilla.gecko.ZoomConstraints;
 import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.LayerView;
@@ -178,8 +177,6 @@ public class LibreOfficeMainActivity extends 
ActionBarActivity {
 
 // create TextCursorLayer
 mDocumentOverlay = new DocumentOverlay(mAppContext, layerView);
-
-
 }
 
 private boolean copyFileToTemp() {
diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
index 142877b..5532d7f 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/ThumbnailCreator.java
@@ -16,6 +16,9 @@ import android.widget.ImageView;
 
 import java.lang.ref.WeakReference;
 
+/**
+ * Create thumbnails for the parts of the document.
+ */
 public class

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

2015-04-14 Thread Katarina Behrens

 sd/uiconfig/simpress/ui/slidetransitionspanel.ui |  210 ---
 1 file changed, 110 insertions(+), 100 deletions(-)

New commits:
commit 98c9887e8dfe7ea8babd6d77fc81349e1739c0d5
Author: Katarina Behrens 
Date:   Tue Apr 14 10:16:39 2015 +0200

tdf#87862: Rearrange lower half of slide transition panel

Change-Id: I2e020061516602171cf1f0732f138afa91b97f47

diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui 
b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
index ce54b19..878b44c 100644
--- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
+++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui
@@ -70,91 +70,63 @@
 6
 12
 
-  
+  
 True
 False
-vertical
-12
 
-  
+  
 True
 False
-6
-
-  
-True
-False
-Speed:
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-True
-
-  Slow
-  Medium
-  Fast
-
-  
-  
-False
-True
-1
-  
-
+end
+Speed:
   
   
-False
-True
-0
+0
+0
   
 
 
-  
+  
 True
 False
-6
-
-  
-True
-False
-Sound:
-  
-  
-False
-True
-0
-  
-
-
-  
-True
-False
-True
-
-  No sound
-  Stop previous 
sound
-  Other sound...
-
-  
-  
-False
-True
-1
-  
-
+True
+
+  Slow
+  Medium
+  Fast
+
   
   
-False
-True
-1
+1
+0
+  
+
+
+  
+True
+False
+end
+Sound:
+  
+  
+0
+1
+  
+
+
+  
+True
+False
+True
+
+  No sound
+  Stop previous sound
+  Other sound...
+
+  
+  
+1
+1
   
 
 
@@ -163,16 +135,17 @@
 True
 True
 False
-12
 0
 True
   
   
-False
-True
-2
+1
+2
   
 
+
+

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - 2 commits - include/vcl vcl/source

2015-04-14 Thread Michael Meeks

 include/vcl/builder.hxx   |7 ---
 vcl/source/control/lstbox.cxx |8 
 vcl/source/window/builder.cxx |   30 +++---
 vcl/source/window/window.cxx  |   31 ---
 4 files changed, 39 insertions(+), 37 deletions(-)

New commits:
commit ca7fa9bdad7b07955cd1783d2e58f06cb0533703
Author: Michael Meeks 
Date:   Tue Apr 14 10:07:27 2015 +0100

Use VclPtr in VclBuilder to get construction referencing right.

Change-Id: I2100de7c599c3d2c241e336d369fc5998e23af16

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 17410c2b..3479124 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -45,6 +45,7 @@ class VCL_DLLPUBLIC VclBuilder
 {
 public:
 typedef std::map stringmap;
+/// These functions return a vcl::Window with a reference count of one.
 typedef vcl::Window* (*customMakeWidget)(vcl::Window *pParent, stringmap 
&rVec);
 
 public:
@@ -340,12 +341,12 @@ private:
 css::uno::Reference m_xFrame;
 
 private:
-vcl::Window *insertObject(vcl::Window *pParent,
+VclPtr insertObject(vcl::Window *pParent,
 const OString &rClass, const OString &rID,
 stringmap &rProps, stringmap &rPangoAttributes,
 stringmap &rAtkProps);
 
-vcl::Window *makeObject(vcl::Window *pParent,
+VclPtr makeObject(vcl::Window *pParent,
 const OString &rClass, const OString &rID,
 stringmap &rVec);
 
@@ -364,7 +365,7 @@ private:
 voidhandleTranslations(xmlreader::XmlReader &reader);
 
 voidhandleChild(vcl::Window *pParent, xmlreader::XmlReader 
&reader);
-vcl::Window* handleObject(vcl::Window *pParent, xmlreader::XmlReader 
&reader);
+VclPtr handleObject(vcl::Window *pParent, 
xmlreader::XmlReader &reader);
 voidhandlePacking(vcl::Window *pCurrent, vcl::Window *pParent, 
xmlreader::XmlReader &reader);
 voidapplyPackingProperty(vcl::Window *pCurrent, vcl::Window 
*pParent, xmlreader::XmlReader &reader);
 voidcollectProperty(xmlreader::XmlReader &reader, const OString 
&rID, stringmap &rVec);
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 01ac564..966ddbb 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -132,19 +132,19 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits 
nStyle )
 }
 }
 
-mpFloatWin = new ImplListBoxFloatingWindow( this );
+mpFloatWin = VclPtr::Create( this );
 mpFloatWin->SetAutoWidth( true );
 mpFloatWin->SetPopupModeEndHdl( LINK( this, ListBox, 
ImplPopupModeEndHdl ) );
 mpFloatWin->GetDropTarget()->addDropTargetListener(xDrop);
 
-mpImplWin = new ImplWin( this, (nStyle & 
(WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER );
+mpImplWin = VclPtr::Create( this, (nStyle & 
(WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER );
 mpImplWin->buttonDownSignal.connect( boost::bind( 
&ListBox::ImplClickButtonHandler, this, _1 ));
 mpImplWin->userDrawSignal.connect( boost::bind( 
&ListBox::ImplUserDrawHandler, this, _1 ) );
 mpImplWin->Show();
 mpImplWin->GetDropTarget()->addDropTargetListener(xDrop);
 mpImplWin->SetEdgeBlending(GetEdgeBlending());
 
-mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
+mpBtn = VclPtr::Create( this, WB_NOLIGHTBORDER | WB_RECTSTYLE 
);
 ImplInitDropDownButton( mpBtn );
 mpBtn->buttonDownSignal.connect( boost::bind( 
&ListBox::ImplClickButtonHandler, this, _1 ));
 mpBtn->Show();
@@ -154,7 +154,7 @@ void ListBox::ImplInit( vcl::Window* pParent, WinBits 
nStyle )
 vcl::Window* pLBParent = this;
 if ( mpFloatWin )
 pLBParent = mpFloatWin;
-mpImplLB = new ImplListBox( pLBParent, nStyle&(~WB_BORDER) );
+mpImplLB = VclPtr::Create( pLBParent, nStyle&(~WB_BORDER) );
 mpImplLB->SetSelectHdl( LINK( this, ListBox, ImplSelectHdl ) );
 mpImplLB->SetScrollHdl( LINK( this, ListBox, ImplScrollHdl ) );
 mpImplLB->SetCancelHdl( LINK( this, ListBox, ImplCancelHdl ) );
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e4097ed..5574b03 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1266,7 +1266,7 @@ void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window 
*pScrollParent, vcl::Wind
 extern "C" { static void SAL_CALL thisModule() {} }
 #endif
 
-vcl::Window *VclBuilder::makeObject(vcl::Window *pParent, const OString &name, 
const OString &id,
+VclPtr VclBuilder::makeObject(vcl::Window *pParent, const OString 
&name, const OString &id,
 stringmap &rMap)
 {
 bool bIsPlaceHolder = name.isEmpty();
@@ -1308,7 +1308,7 @@ vcl::Window *VclBuilder::makeObject(vcl::Window *pParent, 
const OString &name, c
 }
 
 if (bIsPlaceHolder || name == "GtkTreeSelection")
-return NULL;
+return null

[Bug 46504] Bibisect regressions in LibreOffice

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=46504

--- Comment #7 from Tor Lillqvist  ---
Amol, how do you explain that your suggested patch in comment #4 is exactly the
same that Abeer Sethi suggested three days earlier in
https://bugs.documentfoundation.org/show_bug.cgi?id=42982#c3 ?

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

[Bug 42982] improve UNO API error reporting

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=42982

--- Comment #13 from Tor Lillqvist  ---
Abeer, if you continue doing these patches (please do!), just a minor nit:
Please avoid exclamation marks in the exception messages. (Just my personal
taste...)

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

[Libreoffice-commits] core.git: Branch 'feature/vclptr' - sc/source sd/source sw/source

2015-04-14 Thread Michael Meeks

 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx  |   10 ++--
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx  |2 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx |   10 ++--
 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx |2 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx   |   10 ++--
 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx   |2 
 sc/source/ui/sidebar/ScPanelFactory.cxx  |   46 +--
 sd/source/ui/sidebar/AllMasterPagesSelector.cxx  |7 +-
 sd/source/ui/sidebar/AllMasterPagesSelector.hxx  |2 
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx  |7 +-
 sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx  |2 
 sd/source/ui/sidebar/PanelFactory.cxx|   14 ++---
 sd/source/ui/sidebar/RecentMasterPagesSelector.cxx   |7 +-
 sd/source/ui/sidebar/RecentMasterPagesSelector.hxx   |2 
 sw/source/uibase/sidebar/PagePropertyPanel.cxx   |   12 ++--
 sw/source/uibase/sidebar/PagePropertyPanel.hxx   |2 
 sw/source/uibase/sidebar/SwPanelFactory.cxx  |8 +--
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx   |   12 ++--
 sw/source/uibase/sidebar/WrapPropertyPanel.hxx   |2 
 19 files changed, 73 insertions(+), 86 deletions(-)

New commits:
commit 0baadcea83272588f5a4d1d3a003986afe211a23
Author: Michael Meeks 
Date:   Tue Apr 14 07:49:22 2015 +0100

Re-work app side-bar code to manage objects correctly.

Change-Id: Ie0eb8fe41a9fd4f996f724c47d20d6edecba3672

diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx 
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 7bd1fbf..75d054c 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -218,7 +218,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, 
void*, EMPTYARG)
 return 0;
 }
 
-AlignmentPropertyPanel* AlignmentPropertyPanel::Create (
+VclPtr AlignmentPropertyPanel::Create (
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
 SfxBindings* pBindings)
@@ -230,10 +230,10 @@ AlignmentPropertyPanel* AlignmentPropertyPanel::Create (
 if (pBindings == NULL)
 throw lang::IllegalArgumentException("no SfxBindings given to 
AlignmentPropertyPanel::Create", NULL, 2);
 
-return new AlignmentPropertyPanel(
-pParent,
-rxFrame,
-pBindings);
+return VclPtr(
+new AlignmentPropertyPanel(
+pParent, rxFrame, pBindings),
+SAL_NO_ACQUIRE);
 }
 
 void AlignmentPropertyPanel::DataChanged(
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx 
b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index e41aab3..207b110 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -39,7 +39,7 @@ class AlignmentPropertyPanel
 public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
 {
 public:
-static AlignmentPropertyPanel* Create(
+static VclPtr Create(
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
 SfxBindings* pBindings);
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx 
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 2ca87de..4410c79 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -235,7 +235,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, 
void*, EMPTYARG)
 return 0;
 }
 
-CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create (
+VclPtr CellAppearancePropertyPanel::Create (
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
 SfxBindings* pBindings)
@@ -247,10 +247,10 @@ CellAppearancePropertyPanel* 
CellAppearancePropertyPanel::Create (
 if (pBindings == NULL)
 throw lang::IllegalArgumentException("no SfxBindings given to 
CellAppearancePropertyPanel::Create", NULL, 2);
 
-return new CellAppearancePropertyPanel(
-pParent,
-rxFrame,
-pBindings);
+return VclPtr(
+new CellAppearancePropertyPanel(
+pParent, rxFrame, pBindings),
+SAL_NO_ACQUIRE);
 }
 
 void CellAppearancePropertyPanel::DataChanged(
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx 
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index d31b0e2..8bdf1b4 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -50,7 +50,7 @@ private:
 friend class CellBorderStyleControl;
 
 public:
-static CellAppearancePropertyPanel* Create(
+static VclPtr Create(
 vcl::Window* pParent,
 const css::uno::Reference& rxFrame,
 SfxBindings* pBindings);
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx 
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index fb70ac6..6ef

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

2015-04-14 Thread David Tardon

 lotuswordpro/source/filter/lwptablelayout.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 25c25f855169c98c30f3f7868fd1ad430e159ddc
Author: David Tardon 
Date:   Tue Apr 14 09:54:12 2015 +0200

tdf#90028 avoid crash if style is not found

Change-Id: I4ffc8cdcb67ecb4c4afa641c9219dd465fe13d29

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 90897ad..99d8b18 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1201,13 +1201,17 @@ void LwpTableLayout::PostProcessParagraph(XFCell 
*pCell, sal_uInt16 nRowID, sal_
 }
 
 XFParaStyle * pStyle = 
pXFStyleManager->FindParaStyle(pXFPara->GetStyleName());
-if (pStyle->GetNumberRight()  || bColorMod)
+if ((pStyle && pStyle->GetNumberRight()) || bColorMod)
 {
 XFParaStyle* pOverStyle = new XFParaStyle;
-*pOverStyle = *pStyle;
 
-if (pStyle->GetNumberRight())
-pOverStyle->SetAlignType(enumXFAlignEnd);
+if (pStyle)
+{
+*pOverStyle = *pStyle;
+
+if (pStyle->GetNumberRight())
+pOverStyle->SetAlignType(enumXFAlignEnd);
+}
 
 if (bColorMod)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: DocumentEventListener problem

2015-04-14 Thread Piet van Oostrum

Michael Stahl wrote:

 > On 12.04.2015 22:53, Piet van Oostrum wrote:
 > > I am trying to program a Global DocumentEventListener in Python.
 > > Then on a certain event (e.g. File Open), I want to analyse/print the 
 > > paragraph structure of the document.
 > > 
 > > I am running LibreOffice on port 2002. I am using the internal Python from 
 > > LibreOffice, but I run the script externally, from a Terminal.
 > > 
 > > This is on Mac OS X 10.10, and LO 4.4.2.2.
 > > 
 > > The listener works and gives output until I start an Enumeration, for 
 > > example enumerating the paragraphs. After the first element LO hangs 
 > > completely, and the only way out is to kill it. I have tried also with 
 > > enumerationg the TextFields in the document and it also hangs.
 > > 
 > > So I am wondering if I do something illegal or unsupported, or that I have 
 > > hit a bug.
 > 
 > looks like a deadlock, quite easy to reproduce, hope Stephan has some
 > time to look at it:

Yes, it seems to lock a mutex without releasing it. Therefore the first 
paragraph succeeds, but the second blocks because then the mutex is already 
locked (that's how I estimate the situation).
This also happens with other sets of objects, for example, enumerating the 
textfields, or accessing the masterfields. The latter doesn't use an 
enumeration, but it still blocks:

def showmasterfields(doc):
masters = doc.getTextFieldMasters()
names = masters.ElementNames
print("Masters: {}".format(names))
for name in names:
print("Get master {}".format(name))
master = masters.getByName(name)
print(master)

The strange thing is that it only happens in a listener. When I use it 
stand-alone it runs without problems, for example:

doc = Desktop.CurrentComponent
showportions(doc)
showfields(doc)
showmasterfields(doc)

-- 
Piet van Oostrum 
WWW: http://pietvanoostrum.com/
PGP key: [8DAE142BE17999C4]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-04-14 Thread Miklos Vajna

 sw/source/filter/ww8/docxattributeoutput.cxx |   14 ++
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit ef0340bdafabd51598ad7cf3c647cd35ea09f4e9
Author: Miklos Vajna 
Date:   Tue Apr 14 09:40:51 2015 +0200

DocxAttributeOutput::m_postponedVMLDrawing: use std::unique_ptr<>

Change-Id: I2534601941c6bf838855a378c540771335daf5f9

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ddf822f..9ebf5eb 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1602,8 +1602,8 @@ void DocxAttributeOutput::StartRunProperties()
 OSL_ASSERT( !m_pPostponedDiagrams );
 m_pPostponedDiagrams.reset(new std::list());
 
-OSL_ASSERT( m_postponedVMLDrawing == NULL );
-m_postponedVMLDrawing = new std::list< PostponedDrawing >;
+OSL_ASSERT( !m_pPostponedVMLDrawings );
+m_pPostponedVMLDrawings.reset(new std::list());
 
 assert(!m_postponedDMLDrawing);
 m_postponedDMLDrawing = new std::list< PostponedDrawing >;
@@ -4710,17 +4710,16 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, 
const Size& rSize, const S
  */
 void DocxAttributeOutput::WritePostponedVMLDrawing()
 {
-if(m_postponedVMLDrawing == NULL)
+if (!m_pPostponedVMLDrawings)
 return;
 
-for( std::list< PostponedDrawing >::iterator it = 
m_postponedVMLDrawing->begin();
- it != m_postponedVMLDrawing->end();
+for( std::list< PostponedDrawing >::iterator it = 
m_pPostponedVMLDrawings->begin();
+ it != m_pPostponedVMLDrawings->end();
  ++it )
 {
 m_rExport.SdrExporter().writeVMLDrawing(it->object, *(it->frame), 
*(it->point));
 }
-delete m_postponedVMLDrawing;
-m_postponedVMLDrawing = NULL;
+m_pPostponedVMLDrawings.reset(0);
 }
 
 void DocxAttributeOutput::WritePostponedCustomShape()
@@ -8282,7 +8281,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
&rExport, FSHelperPtr pSeri
   m_startedHyperlink( false ),
   m_nHyperLinkCount(0),
   m_nFieldsInHyperlink( 0 ),
-  m_postponedVMLDrawing(NULL),
   m_postponedDMLDrawing(NULL),
   m_postponedMath( NULL ),
   m_postponedChart( NULL ),
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6005344..093a56b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -848,7 +848,7 @@ private:
 const SwFrmFmt* frame;
 const Point* point;
 };
-std::list< PostponedDrawing >* m_postponedVMLDrawing;
+std::unique_ptr< std::list > m_pPostponedVMLDrawings;
 std::list< PostponedDrawing >* m_postponedDMLDrawing;
 std::unique_ptr< std::list > m_pPostponedCustomShape;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: docs/doxygen

2015-04-14 Thread Fridrich Štrba

 docs/doxygen/doxygen.cfg | 2412 ++-
 1 file changed, 1548 insertions(+), 864 deletions(-)

New commits:
commit e472822686929a373ed30d32fd6ae82ec56b44f0
Author: Fridrich Å trba 
Date:   Tue Apr 14 09:40:43 2015 +0200

Run doxygen -u on the doxygen.cfg file

Change-Id: If9d2e9b2c5ca371ab308d0fcacf3c9dfbd256649

diff --git a/docs/doxygen/doxygen.cfg b/docs/doxygen/doxygen.cfg
index b806e63..1d7251c 100644
--- a/docs/doxygen/doxygen.cfg
+++ b/docs/doxygen/doxygen.cfg
@@ -1,107 +1,129 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.9.1
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#   TAG = value [value, ...]
-# For lists items can also be appended using:
-#   TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---
 # Project related configuration options
 #---
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all 
text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See 
http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING  = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME   = libvisio
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
 
 PROJECT_NUMBER =
 
-# Using the PROJECT_BRIEF tag one can provide an optional one line description 
for a project that appears at the top of each page and should give viewer a 
quick idea about the purpose of the project. Keep the description short.
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
 
 PROJECT_BRIEF  =
 
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
 PROJECT_LOGO   =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY   = ./
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output

[Bug 46504] Bibisect regressions in LibreOffice

2015-04-14 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=46504

Tor Lillqvist  changed:

   What|Removed |Added

   Assignee|holaniamo...@gmail.com  |libreoffice-b...@lists.free
   ||desktop.org

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

98 matches

Mail list logo