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

[Stephan Bergmann]

 sc/inc/stlalgorithm.hxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4ce261f9f68ee710a883604181299b13cd14ae7b
Author: Stephan Bergmann 
Date:   Wed Mar 5 08:56:57 2014 +0100

Avoid bogus MSVC 2012 (at least) "unreferenced formal parameter" warning

Change-Id: I3c1243e449e0b7851e415cf7543483d16c5ac7ec

diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index bda11bf..19945c2 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -62,7 +62,11 @@ public:
 AlignedAllocator(const AlignedAllocator<_Type2,_Alignment>&) {}
 
 void construct(T* p, const value_type& val) { new(p) value_type(val); }
-void destroy(T* p) { p->~value_type(); }
+void destroy(T* p)
+{
+p->~value_type();
+(void)p; // avoid bogus MSVC '12 "unreferenced formal parameter" 
warning
+}
 
 size_type max_size() const
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] FILESAVE: Empty custom properties are lost while saving in .doc format

[Tarun Kumar]

Hi Michael

Many thanks for the review.

i'm not sure whether it is better or worse to store e.g. an Author 
property that is empty; have you thought about this? ..


[Tarun] In most of the big organizations, workflow systems require some 
of the custom properties to be present which are later populated via the 
system. For example. Once a document is prepared, it is sent for review 
to an employee. Once the Review is done online through the system, 
Reviewer (and Review_date) property is populated by the system 
automatically. Similarly, once a document is approved, Approver (and 
Approved_date) property is populated by the system. To make the document 
(and other systems) compatible with each other, these properties are to 
be created first and these system can then update the properties.


I am going to provide git patch and will also revert back to on the 
email (once done)


Regards,
Tarun

On 03/04/2014 01:51 AM, Michael Stahl wrote:

On 26/02/14 08:07, Tarun Kumar wrote:

Hi,

The Bug is filed and accepted at: 
https://bugs.freedesktop.org/show_bug.cgi?id=75243

Steps to reproduce:
1. Open Writer and use a document .doc
2. Add it a custom property. Don't enter any value for the property
3. Save it and close Writer
4. Open again Writer and use same document recently saved.
5. Custom property is lost.

hi Tarun,

agreed, custom properties should be saved even if empty.


Attached is a patch that solves the problem. Patch is also attached to the bug.
Please consider this patch for inclusion.

great, your patch fixes the problem!

looking at sfx2/source/doc/docinf.cxx there are numerous calls (affected
by your patch) to the function SetStringValue with static ID, and i'm
not sure whether it is better or worse to store e.g. an Author property
that is empty; have you thought about this?



also, could you please create the patch with "git commit" and put the
bug ID "fdo#75243" in the first line of the commit message, and then
"git format-patch HEAD~".


I declare that this and my further patches are under LGPLv3+ / MPL license.


great, feel free to add yourself to
  https://wiki.documentfoundation.org/Development/Developers

regrads,
  michael


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

[Libreoffice-commits] core.git: basegfx/source include/basegfx unusedcode.easy

[Noel Grandin]

 basegfx/source/polygon/b2dpolygontools.cxx  |   43 
 basegfx/source/polygon/b2dpolypolygontools.cxx  |   18 ++
 basegfx/source/polygon/b3dpolypolygontools.cxx  |7 +++
 include/basegfx/polygon/b2dpolypolygontools.hxx |5 ++
 unusedcode.easy |3 +
 5 files changed, 76 insertions(+)

New commits:
commit 1f6cce7e52c5007457d1a39263efe54ee87e9fab
Author: Noel Grandin 
Date:   Wed Mar 5 09:33:59 2014 +0200

Revert "remove unused code in basegfx"

Some of this code is used by Windows.

This reverts commit b96724560f119b1b9ab8b5e1ee1759fd9b2db203.

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index dc511b9..5a3dfcd 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3134,6 +3134,49 @@ namespace basegfx
 }
 
 
+// comparators with tolerance for 2D Polygons
+
+bool equal(const B2DPolygon& rCandidateA, const B2DPolygon& 
rCandidateB, const double& rfSmallValue)
+{
+const sal_uInt32 nPointCount(rCandidateA.count());
+
+if(nPointCount != rCandidateB.count())
+return false;
+
+const bool bClosed(rCandidateA.isClosed());
+
+if(bClosed != rCandidateB.isClosed())
+return false;
+
+const bool 
bAreControlPointsUsed(rCandidateA.areControlPointsUsed());
+
+if(bAreControlPointsUsed != rCandidateB.areControlPointsUsed())
+return false;
+
+for(sal_uInt32 a(0); a < nPointCount; a++)
+{
+const B2DPoint aPoint(rCandidateA.getB2DPoint(a));
+
+if(!aPoint.equal(rCandidateB.getB2DPoint(a), rfSmallValue))
+return false;
+
+if(bAreControlPointsUsed)
+{
+const basegfx::B2DPoint 
aPrev(rCandidateA.getPrevControlPoint(a));
+
+if(!aPrev.equal(rCandidateB.getPrevControlPoint(a), 
rfSmallValue))
+return false;
+
+const basegfx::B2DPoint 
aNext(rCandidateA.getNextControlPoint(a));
+
+if(!aNext.equal(rCandidateB.getNextControlPoint(a), 
rfSmallValue))
+return false;
+}
+}
+
+return true;
+}
+
 // snap points of horizontal or vertical edges to discrete values
 B2DPolygon snapPointsOfHorizontalOrVerticalEdges(const B2DPolygon& 
rCandidate)
 {
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx 
b/basegfx/source/polygon/b2dpolypolygontools.cxx
index 91fb9bd..d7b2b5f 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -497,6 +497,24 @@ namespace basegfx
 return aRetval;
 }
 
+bool containsOnlyHorizontalAndVerticalEdges(const B2DPolyPolygon& 
rCandidate)
+{
+if(rCandidate.areControlPointsUsed())
+{
+return false;
+}
+
+for(sal_uInt32 a(0); a < rCandidate.count(); a++)
+{
+
if(!containsOnlyHorizontalAndVerticalEdges(rCandidate.getB2DPolygon(a)))
+{
+return false;
+}
+}
+
+return true;
+}
+
 B2DPolyPolygon createSevenSegmentPolyPolygon(sal_Char nNumber, bool 
bLitSegments)
 {
 // config here
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx 
b/basegfx/source/polygon/b3dpolypolygontools.cxx
index 45bcddc..33c0c67 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -505,6 +505,13 @@ namespace basegfx
 return true;
 }
 
+bool equal(const B3DPolyPolygon& rCandidateA, const B3DPolyPolygon& 
rCandidateB)
+{
+const double fSmallValue(fTools::getSmallValue());
+
+return equal(rCandidateA, rCandidateB, fSmallValue);
+}
+
 /// converters for com::sun::star::drawing::PolyPolygonShape3D
 B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon(
 const com::sun::star::drawing::PolyPolygonShape3D& 
rPolyPolygonShape3DSource,
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx 
b/include/basegfx/polygon/b2dpolypolygontools.hxx
index c21489a..e92fe5a 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -287,6 +287,11 @@ namespace basegfx
 */
 BASEGFX_DLLPUBLIC B2DPolyPolygon 
snapPointsOfHorizontalOrVerticalEdges(const B2DPolyPolygon& rCandidate);
 
+/** returns true if the Polygon only contains horizontal or vertical 
edges
+so that it could be represented by RegionBands
+*/
+BASEGFX_DLLPUBLIC bool containsOnlyHorizontalAnd

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

[Markus Mohrhard]

 sc/qa/unit/data/contentCSV/financial-functions.csv |   55 +
 sc/qa/unit/data/ods/functions.ods  |binary
 sc/qa/unit/helper/csv_handler.hxx  |2 
 sc/qa/unit/subsequent_filters-test.cxx |3 +
 4 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 8c443f5c03d5202a7ef0c2738a21c74c36ef06a2
Author: Markus Mohrhard 
Date:   Wed Mar 5 08:10:33 2014 +0100

integrate the financial-functions test

Change-Id: I1d7ccbf4ceb3e825737a6c0af228767dc3fbce2d

diff --git a/sc/qa/unit/helper/csv_handler.hxx 
b/sc/qa/unit/helper/csv_handler.hxx
index 1223ef6..fc2e011 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -167,7 +167,7 @@ public:
 std::cout << "CSVValue: " << nValue << std::endl;
 std::cout << "result: " << (int)(aValue == nValue) << 
std::endl;
 #endif //DEBUG_CSV_HANDLER
-CPPUNIT_ASSERT_MESSAGE(createErrorMessage(mnCol, mnRow, mnTab, 
nValue, aValue).getStr(), aValue == nValue);
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(createErrorMessage(mnCol, 
mnRow, mnTab, nValue, aValue).getStr(), nValue, aValue, 1e-10);
 }
 }
 ++mnCol;
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 4df450c..636b864 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -402,6 +402,9 @@ void ScFiltersTest::testFunctionsODS()
 // statistical functions
 createCSVPath(OUString("statistical-functions."), aCSVFileName);
 testFile(aCSVFileName, pDoc, 5);
+// financial functions
+createCSVPath("financial-functions.", aCSVFileName);
+testFile(aCSVFileName, pDoc, 6);
 
 xDocSh->DoClose();
 }
commit 35f39285991043a70f65c796c38624c9c51ec4b1
Author: Ken Biondi 
Date:   Wed Mar 5 08:16:01 2014 +0100

add import test for financial functions

Change-Id: Idda4de746db0c959ad31a6937a4aee877417e436

diff --git a/sc/qa/unit/data/contentCSV/financial-functions.csv 
b/sc/qa/unit/data/contentCSV/financial-functions.csv
new file mode 100644
index 000..814df6b
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/financial-functions.csv
@@ -0,0 +1,55 @@
+16.9
+20.5479452054794
+930
+375
+71
+92
+110
+37026
+2
+2
+-57.5412415342252
+-11135.2321307508,-937.5
+-3669.73551569782
+-934.107123420898,-68.2782711809783
+1075
+1721.80586824866
+0.0372448979591837
+1.125,1.125
+1.02,1.1
+79.4907946994012
+5.99195013802694
+0.0535426673707582
+0.10112312546402
+-4234
+1124.76
+0.0812374805252615
+-352.973422514773
+0.113321028236252
+-300
+4.02068710841898
+0.941647376706893
+0.127303166959042
+0.052500319868356
+-12.0207780851554
+49.432121038173
+99.8782860147214
+99.8782860147214
+0.0448731663302424
+-715.955334437392
+-350.992937038239
+95.0428743993921
+99.79583
+99.984498875557
+-35019.3680845542
+0.00770147248823279
+1014.42026586264
+0.074569931823542
+553.571428571429
+1.33
+0.094151493565943
+98.45
+0.0914169629253423
+8603.80245372397
+0.194818475056105
+332.570918796713
diff --git a/sc/qa/unit/data/ods/functions.ods 
b/sc/qa/unit/data/ods/functions.ods
index 9a1cb46..97d3b16 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and 
b/sc/qa/unit/data/ods/functions.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

ape  changed:

   What|Removed |Added

 Depends on||75718

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #107 from ape  ---
I added the bug 75718 ‘function does not work Edit> Fill> Series> AutoFill’,
because the important ‘AutoFill’ function has stopped working in
LibreOffice-4.2.x. This is a regression to LibreOffice-4.1.5.

-- 
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 Gerrit News for core on 2014-03-05

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ fdo#74929 Chart grid is getting lost
  in https://gerrit.libreoffice.org/8159 from Priyanka Gaikwad
  about module chart2, oox
+ fdo39440 the sSymName parameter is now passed by reference
  in https://gerrit.libreoffice.org/8450 from Mihai Varga
  about module sc
+ Moved the linked files from sw/source/ui to a new sw/source/core/uibase d
  in https://gerrit.libreoffice.org/8447 from Roopak T J
  about module sw
+ Git: ignore autogen, doxygen and gdb config files
  in https://gerrit.libreoffice.org/8437 from Jan-Marek Glogowski
  about module build
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
  in https://gerrit.libreoffice.org/8098 from Umesh Kadam
  about module chart2, oox
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
  in https://gerrit.libreoffice.org/8360 from Umesh Kadam
  about module chart2, include, offapi, oox, xmloff
 End of freshness 

+ Converted group by [number|date] pivot table dlg to .ui
  in https://gerrit.libreoffice.org/8382 from Katarina Behrens
  about module sc
+ de-macroize XINTERFACE_COMMON_IMPL
  in https://gerrit.libreoffice.org/8455 from Norbert Thiebaud
  about module include, ucb
+ de-macroize XINTERFACE_DECL
  in https://gerrit.libreoffice.org/8454 from Norbert Thiebaud
  about module build, include, ucb, ucbhelper, xmlhelp
+ give an identifier to the app_bundle itself
  in https://gerrit.libreoffice.org/7485 from Christian Lohmaier
  about module solenv
+ Add window title and frame into placeedit.ui
  in https://gerrit.libreoffice.org/8453 from Olivier Hallot
  about module svtools
+ fdo#73596 [DOCX] Index:distance between columns
  in https://gerrit.libreoffice.org/8444 from Vinaya Mandke
  about module sw, writerfilter


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

+ FDO#75755: Change string "..." to "Servers..."
  in https://gerrit.libreoffice.org/8452 from Olivier Hallot
+ Clarify autogen.sh messages
  in https://gerrit.libreoffice.org/8446 from Jan-Marek Glogowski
+ fdo#54938: Convert some places to use cppu::supportsService
  in https://gerrit.libreoffice.org/8445 from Marcos Paulo de Souza


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

+ [bug 39440] - cppcheck cleanlines - variable passed by reference
  in https://gerrit.libreoffice.org/8408 from Mihai Varga


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

+ fd0#74150:Numbered list getting display after RT -table-within-table-1.do
  in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji
+ fdo#74111 3D Rotation is wrong after Round trip for pie chart
  in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
  in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
  in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ sa/l add release_assert() and assert that stay even in release code
  in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud
+ fdo#69407: On transparent frames, shadows are painted in foreground.
  in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR
+ add a header to provide posix compatible wrapper for platform lacking
  in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud
+ WIP fdo#72987 Use firebird backup format for .odb
  in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ sw/export docx: add unit test for document with header and section(s)
  in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer
+ fix for exporting of text watermark to DOCX
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ WIP: fdo#33980 Preserve selection across all slide sorters.
  in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffi

MSI Editing / Documentation for the Community

[AJ]

Hello,

I am trying to coordinate documentation on editing the MSI file using ORCA
or other MSI editor in order to create a custom installer package(s).
 Since there is not any official documentation for this I was hoping that
those with expertise in this area would be willing to work with me in
defining fields and options and I will work to create the
information/documentation in an easy to use format.  This is a pretty
regularly requested item from what I can see and I am looking to help
myself while giving back to the community.  Please let me know if you can
help.

Thank You,

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

[Libreoffice-commits] core.git: cui/source drawinglayer/source editeng/source include/xmloff offapi/com sc/qa sc/source sw/source xmloff/source

[Kohei Yoshida]

 cui/source/tabpages/border.cxx|1 
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |  120 +++---
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx   |4 
 editeng/source/items/borderline.cxx   |5 
 editeng/source/items/frmitems.cxx |2 
 include/xmloff/xmltoken.hxx   |1 
 offapi/com/sun/star/table/BorderLineStyle.idl |   10 -
 sc/qa/unit/subsequent_export-test.cxx |4 
 sc/source/filter/excel/xistyle.cxx|2 
 sc/source/filter/html/htmlexp.cxx |1 
 sc/source/filter/lotus/lotattr.cxx|2 
 sc/source/filter/oox/stylesbuffer.cxx |4 
 sc/source/ui/view/tabvwsha.cxx|2 
 sw/source/core/layout/paintfrm.cxx|  117 -
 xmloff/source/core/xmltoken.cxx   |1 
 xmloff/source/style/bordrhdl.cxx  |5 
 16 files changed, 208 insertions(+), 73 deletions(-)

New commits:
commit 2c62596cf264ef10749d8bfdb2bb2ebef2d98fbc
Author: Kohei Yoshida 
Date:   Mon Mar 3 17:58:11 2014 -0500

fdo#75260: Correctly draw double lines for both Writer and Calc.

Fix all sorts of incorrect double line handling in drawinglayer in order to
draw thick-thin double line types correctly.  Also change handling of border
lines in writer tables. There are still some outstanding issues but it's
much better than how it was before.

Also realized that Word and Excel handle simple thin double lines 
differently;
Word varies widths of all of the lines and the gap whereas Excel only has 
one
fixed size for its double line.  For this reason I decided to add a separate
double line type (DOUBLE_THIN) to handle Excel's double line.

Change-Id: Iaaa353b6e4f998b524262bea59260b4333e0cdb4

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 3f8881b..fd7b905 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1045,6 +1045,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
 
 // Double lines
 { DOUBLE,  10, &sameColor, &sameColor, &sameDistColor },
+{ DOUBLE_THIN, 10, &sameColor, &sameColor, &sameDistColor },
 { THINTHICK_SMALLGAP,  20, &sameColor, &sameColor, &sameDistColor },
 { THINTHICK_MEDIUMGAP,  0, &sameColor, &sameColor, &sameDistColor },
 { THINTHICK_LARGEGAP,   0, &sameColor, &sameColor, &sameDistColor },
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 290c87a..67efa09 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+namespace drawinglayer {
+
 namespace {
 
 void moveLine(basegfx::B2DPolygon& rPoly, double fGap, const 
basegfx::B2DVector& rVector)
@@ -44,10 +46,46 @@ void moveLine(basegfx::B2DPolygon& rPoly, double fGap, 
const basegfx::B2DVector&
 }
 }
 
+primitive2d::Primitive2DReference makeHairLinePrimitive(
+const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd, const 
basegfx::B2DVector& rVector,
+const basegfx::BColor& rColor, double fGap)
+{
+basegfx::B2DPolygon aPolygon;
+aPolygon.append(rStart);
+aPolygon.append(rEnd);
+moveLine(aPolygon, fGap, rVector);
+
+return primitive2d::Primitive2DReference(new 
primitive2d::PolygonHairlinePrimitive2D(aPolygon, rColor));
 }
 
-namespace drawinglayer
+primitive2d::Primitive2DReference makeSolidLinePrimitive(
+const basegfx::B2DPolyPolygon& rClipRegion, const basegfx::B2DPoint& 
rStart, const basegfx::B2DPoint& rEnd,
+const basegfx::B2DVector& rVector, const basegfx::BColor& rColor, double 
fLineWidth, double fGap)
 {
+const basegfx::B2DVector aPerpendicular = 
basegfx::getPerpendicular(rVector);
+const basegfx::B2DVector aLineWidthOffset = ((fLineWidth + 1.0) * 0.5) * 
aPerpendicular;
+
+basegfx::B2DPolygon aPolygon;
+aPolygon.append(rStart + aLineWidthOffset);
+aPolygon.append(rEnd + aLineWidthOffset);
+aPolygon.append(rEnd - aLineWidthOffset);
+aPolygon.append(rStart - aLineWidthOffset);
+aPolygon.setClosed(true);
+
+moveLine(aPolygon, fGap, rVector);
+
+basegfx::B2DPolyPolygon aClipped =
+basegfx::tools::clipPolygonOnPolyPolygon(aPolygon, rClipRegion, true, 
false);
+
+if (aClipped.count())
+aPolygon = aClipped.getB2DPolygon(0);
+
+return primitive2d::Primitive2DReference(
+new 
primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPolygon), 
rColor));
+}
+
+}
+
 // fdo#49438: heuristic pseudo hack
 static bool lcl_UseHairline(double const fW,
 basegfx::B2DPoint c

[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - cui/source drawinglayer/source editeng/source include/xmloff sc/qa sc/source xmloff/source

[Kohei Yoshida]

 cui/source/tabpages/border.cxx  |1 +
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |4 ++--
 editeng/source/items/borderline.cxx |5 +
 editeng/source/items/frmitems.cxx   |2 +-
 include/xmloff/xmltoken.hxx |1 +
 sc/qa/unit/subsequent_export-test.cxx   |4 ++--
 sc/source/filter/excel/xistyle.cxx  |2 +-
 sc/source/filter/html/htmlexp.cxx   |1 +
 sc/source/filter/lotus/lotattr.cxx  |2 +-
 sc/source/filter/oox/stylesbuffer.cxx   |2 +-
 sc/source/ui/view/tabvwsha.cxx  |2 +-
 xmloff/source/core/xmltoken.cxx |1 +
 xmloff/source/style/bordrhdl.cxx|5 +
 13 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit 97c8db9ab9b0d9285fa190ed0b9ee90d4ff2e071
Author: Kohei Yoshida 
Date:   Tue Mar 4 21:18:04 2014 -0500

Use DOUBLE_THIN in lieu of DOUBLE for Calc's double border line type.

Change-Id: I2161fe63ff1e9b8aa9dc33153efd108913f91347

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 3f8881b..fd7b905 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1045,6 +1045,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
 
 // Double lines
 { DOUBLE,  10, &sameColor, &sameColor, &sameDistColor },
+{ DOUBLE_THIN, 10, &sameColor, &sameColor, &sameDistColor },
 { THINTHICK_SMALLGAP,  20, &sameColor, &sameColor, &sameDistColor },
 { THINTHICK_MEDIUMGAP,  0, &sameColor, &sameColor, &sameDistColor },
 { THINTHICK_LARGEGAP,   0, &sameColor, &sameColor, &sameDistColor },
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 4605aee..e7c5e76 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -297,13 +297,13 @@ namespace drawinglayer
 switch (rSource.getStyle())
 {
 case table::BorderLineStyle::SOLID:
-case table::BorderLineStyle::DOUBLE:
+case table::BorderLineStyle::DOUBLE_THIN:
 {
 const basegfx::BColor aLineColor =
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 double nThick = rtl::math::round(rSource.getLeftWidth());
 
-bool bDouble = rSource.getStyle() == 
table::BorderLineStyle::DOUBLE;
+bool bDouble = rSource.getStyle() == 
table::BorderLineStyle::DOUBLE_THIN;
 
 basegfx::B2DPolygon aTarget;
 
diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 2da1753..b919e58 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -316,6 +316,10 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( 
SvxBorderStyle nStyle )
 1.0/3.0, 1.0/3.0, 1.0/3.0 );
 break;
 
+case DOUBLE_THIN:
+aImpl = BorderWidthImpl(CHANGE_DIST, 10.0, 10.0, 1.0);
+break;
+
 case THINTHICK_SMALLGAP:
 aImpl = BorderWidthImpl( CHANGE_LINE1, 1.0,
 THINTHICK_SMALLGAP_line2, THINTHICK_SMALLGAP_gap );
@@ -429,6 +433,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle 
nStyle, sal_uInt16 nOut, sa
 static const SvxBorderStyle aDoubleStyles[] =
 {
 DOUBLE,
+DOUBLE_THIN,
 THINTHICK_SMALLGAP,
 THINTHICK_MEDIUMGAP,
 THINTHICK_LARGEGAP,
diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index e844320..57bd705 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1834,7 +1834,7 @@ SvxBoxItem::LineToSvxLine(const 
::com::sun::star::table::BorderLine2& rLine, Svx
 rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) 
: rLine.LineWidth );
 // fdo#46112: double does not necessarily mean symmetric
 // for backwards compatibility
-bGuessWidth = (DOUBLE == nStyle) &&
+bGuessWidth = ((DOUBLE == nStyle || DOUBLE_THIN == nStyle)) &&
 (rLine.InnerLineWidth > 0) && (rLine.OuterLineWidth > 0);
 }
 
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 225e374..39a6dc9 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -647,6 +647,7 @@ namespace xmloff { namespace token {
 XML_DOTTED,
 XML_DOUBLE,
 XML_DOUBLE_SIDED,
+XML_DOUBLE_THIN,
 XML_DOWN,
 XML_DRAFT,
 XML_DRAW,
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/u

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

[Norbert Thiebaud]

 lotuswordpro/source/filter/lwpdrawobj.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit fb052ae6174e4c96157ef6973f02c1d3cd4d9ba2
Author: Norbert Thiebaud 
Date:   Tue Mar 4 19:27:13 2014 -0600

array initializers are problematic apparently

Change-Id: Id3e3787635996d90f7673748c17601963523ad8d

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index a50ec14..ee811ef 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -646,7 +646,6 @@ XFFrame* LwpDrawPolygon::CreateStandardDrawObj(const  
OUString& rStyleName)
  */
 LwpDrawRectangle::LwpDrawRectangle(SvStream * pStream, DrawingOffsetAndScale* 
pTransData)
 : LwpDrawObj(pStream, pTransData)
-, m_aVector{}
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 lotuswordpro/source/filter/lwpdrawobj.cxx |3 ++-
 lotuswordpro/source/filter/lwpfont.cxx|3 ++-
 lotuswordpro/source/filter/lwpfont.hxx|   20 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 943f28299e073c28657c5c0eb8bbdc9a33417ce0
Author: Norbert Thiebaud 
Date:   Tue Mar 4 18:55:17 2014 -0600

coverity#738705: Unitialized scalar field

Change-Id: I7a85167f1a2b54913ac8168a6b677a7012eb7aef

diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx 
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 1f13b8e..a50ec14 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -645,7 +645,8 @@ XFFrame* LwpDrawPolygon::CreateStandardDrawObj(const  
OUString& rStyleName)
  * @param   pStream   The memory stream which contains the lwp-sdw draw objects
  */
 LwpDrawRectangle::LwpDrawRectangle(SvStream * pStream, DrawingOffsetAndScale* 
pTransData)
-: LwpDrawObj(pStream, pTransData)
+: LwpDrawObj(pStream, pTransData)
+, m_aVector{}
 {
 }
 
commit f7f3c49f4852054c8db1ba141524eb936cbe5efa
Author: Norbert Thiebaud 
Date:   Tue Mar 4 18:32:50 2014 -0600

coverity#738706: Unitialized scalar field

Change-Id: I467a4201b33d3a7562c4fa896b3f9cb5cafeac54

diff --git a/lotuswordpro/source/filter/lwpfont.cxx 
b/lotuswordpro/source/filter/lwpfont.cxx
index 321ca0d..607feab 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -359,7 +359,8 @@ sal_Bool LwpFontNameEntry::IsBackgroundColorOverridden()
 //}
 
 LwpFontNameManager::LwpFontNameManager()
-:m_pFontNames(NULL)
+: m_nCount(0)
+, m_pFontNames(NULL)
 {}
 
 LwpFontNameManager::~LwpFontNameManager()
commit e244600209fe9f33027216369f13b6a5fbd93c13
Author: Norbert Thiebaud 
Date:   Tue Mar 4 18:27:49 2014 -0600

coverity#738707: Unitialized scalar field

Change-Id: I02a9d6ee6151c6a8c3ee61c3c7dcf1dc432b453f

diff --git a/lotuswordpro/source/filter/lwpfont.hxx 
b/lotuswordpro/source/filter/lwpfont.hxx
index 2adcf51..82d866b 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -180,7 +180,15 @@ public:
 class LwpFontAttrEntry
 {
 public:
-LwpFontAttrEntry(){}
+LwpFontAttrEntry()
+ : m_nAttrBits(0)
+ , m_nAttrOverrideBits(0)
+ , m_nAttrApplyBits(0)
+ , m_nAttrOverrideBits2(0)
+ , m_nAttrApplyBits2(0)
+ , m_nCase(0)
+ , m_nUnder(0)
+{}
 ~LwpFontAttrEntry(){}
 public:
 void Read(LwpObjectStream *pStrm);
commit 51f74e362b364e51f13f3abaa00df1aa01c81cef
Author: Norbert Thiebaud 
Date:   Tue Mar 4 18:24:07 2014 -0600

coverity#738708: Unitialized scalar field

Change-Id: I9c5c36a41131f55faf2b31b347b0df4eb5cc21e2

diff --git a/lotuswordpro/source/filter/lwpfont.hxx 
b/lotuswordpro/source/filter/lwpfont.hxx
index 408b314..2adcf51 100644
--- a/lotuswordpro/source/filter/lwpfont.hxx
+++ b/lotuswordpro/source/filter/lwpfont.hxx
@@ -110,7 +110,15 @@ private:
 class LwpFontNameEntry
 {
 public:
-LwpFontNameEntry(){}
+LwpFontNameEntry()
+: m_nOverrideBits(0)
+, m_nApplyBits(0)
+, m_nPointSize(0)
+, m_nOverstrike(0)
+, m_nTightness(0)
+, m_nFaceName(0)
+, m_nAltFaceName(0)
+{}
 ~LwpFontNameEntry(){}
 public:
 void Read(LwpObjectStream *pStrm);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - offapi/com

[Kohei Yoshida]

 offapi/com/sun/star/table/BorderLineStyle.idl |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 469c903848fe745dbf5e0c995ac9802615870c73
Author: Kohei Yoshida 
Date:   Tue Mar 4 19:42:31 2014 -0500

Add a new double line type to deal with Excel's double border type.

Change-Id: Id5fba7a6f6882cfaf560a95ae714ad759f425113

diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl 
b/offapi/com/sun/star/table/BorderLineStyle.idl
index 7613272..0c37c67 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -41,7 +41,8 @@ constants BorderLineStyle
  */
 const short DASHED = 2;
 
-/** Double border line.
+/** Double border line. Widths of the lines and the gap are all equal,
+and vary equally with the total width.
  */
 const short DOUBLE = 3;
 
@@ -95,9 +96,14 @@ constants BorderLineStyle
  */
 const short FINE_DASHED = 14;
 
+/** Double border line consisting of two fixed thin lines separated by a
+variable gap.
+ */
+const short DOUBLE_THIN = 15;
+
 /** Maximum valid border line style value.
  */
-const short BORDER_LINE_STYLE_MAX = 14;
+const short BORDER_LINE_STYLE_MAX = 15;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - editeng/source

[Kohei Yoshida]

 editeng/source/items/borderline.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 215ee25d872188bbc27f4f9eadcc0d2b1a12b122
Author: Kohei Yoshida 
Date:   Tue Mar 4 19:34:06 2014 -0500

Bring this back. Apparently Word's double border behaves this way.

While Excel's double border doesn't.

Change-Id: I2b450591914fa90dc4619a9ea776978e8a23e45e

diff --git a/editeng/source/items/borderline.cxx 
b/editeng/source/items/borderline.cxx
index 9ddd8fa..2da1753 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -309,7 +309,11 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( 
SvxBorderStyle nStyle )
 // Double lines
 
 case DOUBLE:
-aImpl = BorderWidthImpl(CHANGE_DIST, 10.0, 10.0, 1.0);
+aImpl = BorderWidthImpl(
+CHANGE_LINE1 | CHANGE_LINE2 | CHANGE_DIST,
+// fdo#46112 fdo#38542 fdo#43249:
+// non-constant witdths must sum to 1
+1.0/3.0, 1.0/3.0, 1.0/3.0 );
 break;
 
 case THINTHICK_SMALLGAP:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 filter/qa/cppunit/xslt-test.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4fcd5534348adcb61ab85b93478c272b8d9e8f8c
Author: Michael Stahl 
Date:   Tue Mar 4 23:40:35 2014 +0100

filter: sigh... fix the xslt test to run on WNT too

Change-Id: Iadd5034418e077bf051b23cda70f070c52840645

diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index db8fe7d..3708e31 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -77,6 +77,7 @@ void XsltFilterTest::testXsltCopyNew()
 OUString tempURL;
 osl::File::RC rc = osl::File::createTempFile(0, &tempFile, &tempURL);
 CPPUNIT_ASSERT(osl::FileBase::E_None == rc);
+osl_closeFile(tempFile); // close it so xSFA can open it on WNT
 
 OUString source(
 getURLFromSrc("/filter/source/xsltfilter/xsltfilter.component"));
@@ -131,6 +132,7 @@ void XsltFilterTest::testXsltCopyOld()
 OUString tempURL;
 osl::File::RC rc = osl::File::createTempFile(0, &tempFile, &tempURL);
 CPPUNIT_ASSERT(osl::FileBase::E_None == rc);
+osl_closeFile(tempFile); // close it so xSFA can open it on WNT
 
 OUString source(
 getURLFromSrc("/filter/source/xsltfilter/xsltfilter.component"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - embeddedobj/source include/svtools sc/source svtools/source sw/source vcl/README

[Jan Holesovsky]

 embeddedobj/source/msole/olepersist.cxx |   11 +--
 include/svtools/transfer.hxx|   10 +-
 sc/source/ui/view/viewfun5.cxx  |7 ++-
 svtools/source/misc/transfer.cxx|6 --
 sw/source/ui/dochdl/swdtflvr.cxx|7 ++-
 vcl/README  |   11 +++
 6 files changed, 41 insertions(+), 11 deletions(-)

New commits:
commit a94e973bf5b5d0755a53881867961691633a4cbd
Author: Jan Holesovsky 
Date:   Tue Mar 4 22:49:08 2014 +0100

OLE: Turn an OSL_ENSURE() into a real condition.

This is part of some STAMPIT workaround; no idea what it is, but for sure it
causes problems with PowerPoint OLE in Writer - so let's avoid updating if 
it
is not "STAMPIT".

Change-Id: I266b419ba3461c547f7ee8e447ef64a47a8511e8

diff --git a/embeddedobj/source/msole/olepersist.cxx 
b/embeddedobj/source/msole/olepersist.cxx
index 915a89a..264b920 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -888,13 +888,12 @@ void OleEmbeddedObject::OnViewChanged_Impl()
 // - if the verb execution is in progress and the view is changed the 
object will be stored
 // after the execution, so there is no need to send the notification.
 // - the STAMPIT object can never be active.
-if ( m_aVerbExecutionController.CanDoNotification()
-  && m_pOleComponent && m_nUpdateMode == 
embed::EmbedUpdateModes::ALWAYS_UPDATE )
+if (m_aVerbExecutionController.CanDoNotification() &&
+m_pOleComponent && m_nUpdateMode == 
embed::EmbedUpdateModes::ALWAYS_UPDATE &&
+(MimeConfigurationHelper::ClassIDsEqual(m_aClassID, 
MimeConfigurationHelper::GetSequenceClassID(0x852ee1c9, 0x9058, 0x44ba, 0x8c, 
0x6c, 0x0c, 0x5f, 0xc6, 0x6b, 0xdb, 0x8d)) ||
+ MimeConfigurationHelper::ClassIDsEqual(m_aClassID, 
MimeConfigurationHelper::GetSequenceClassID(0xcf1b4491, 0xbea3, 0x4c9f, 0xa7, 
0x0f, 0x22, 0x1b, 0x1e, 0xca, 0xef, 0x3e)))
+   )
 {
-OSL_ENSURE( MimeConfigurationHelper::ClassIDsEqual( m_aClassID, 
MimeConfigurationHelper::GetSequenceClassID( 0x852ee1c9, 0x9058, 0x44ba, 
0x8c,0x6c,0x0c,0x5f,0xc6,0x6b,0xdb,0x8d ) )
-|| MimeConfigurationHelper::ClassIDsEqual( m_aClassID, 
MimeConfigurationHelper::GetSequenceClassID( 0xcf1b4491, 0xbea3, 0x4c9f, 
0xa7,0x0f,0x22,0x1b,0x1e,0xca,0xef,0x3e ) ),
-"Expected to be triggered for STAMPIT only! Please contact 
developers!\n" );
-
 // The view is changed while the object is in running state, save the 
new object
 m_xCachedVisualRepresentation = uno::Reference< io::XStream >();
 SaveObject_Impl();
commit a6560b114af3c9a37a664d82b1ed36761e5d23ac
Author: Jan Holesovsky 
Date:   Tue Mar 4 22:41:18 2014 +0100

EMF+: Add info about logging.

Change-Id: I72f2c7436df4f1189673d7ccce0d4ac47d338a31

diff --git a/vcl/README b/vcl/README
index c1fc0bf..76ee2bb 100644
--- a/vcl/README
+++ b/vcl/README
@@ -141,3 +141,14 @@ rendering:
 
 another interesting part is actual rendering into canvas bitmap and
 using that bitmap later in code using vcl API.
+
+EMF+ implementation has some extensive logging, best if you do a dbgutil
+build, and then
+
+export SAL_LOG=+INFO.cppcanvas.emf+INFO.vcl.emf
+
+before running LibreOffice; it will give you lots of useful hints.
+
+You can also fallback to EMF (from EMF+) rendering via
+
+export EMF_PLUS_DISABLE=1
commit be4f7ea3f6c8bddba3ca1ae3d9d9e67449bbc3cb
Author: Jan Holesovsky 
Date:   Tue Mar 4 20:41:02 2014 +0100

OLE preview: Limit the GDI metafile size to 10 actions.

Excel can copy huge metafiles to the clipboard, with over 3 million of
actions, which are 1) unusable, and 2) crash LibreOffice because of their
size.

So let's just limit the size of metafiles to be under 10 actions,
otherwise use the 'OLE' bitmap.

Change-Id: I6a50471e6fe6ab9417592c011bf78cad6247236b

diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 8980e88..969312b 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -321,7 +321,15 @@ public:
 sal_BoolGetBitmapEx( SotFormatStringId nFormat, 
BitmapEx& rBmp );
 sal_BoolGetBitmapEx( const 
::com::sun::star::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp );
 
-sal_BoolGetGDIMetaFile( SotFormatStringId nFormat, 
GDIMetaFile& rMtf );
+/** Return as GDI metafile.
+
+@param nMaxAction Allows you to limit the amount of actions; defaults 
to 0 which means no limit.
+
+Whet you eg. Ctrl+a in Excel, you can get the entire sheet as
+metafile, with over 3 million (!) actions; which is just too large for
+any reasonable handling - and you need to set a limit.
+*/
+sal_BoolGetGDIMetaFile( SotFormatStringId nFormat, 
GDIMetaFile& rMtf, size_t nMaxActions = 0 

Re: Current Build from Git: Writer-Wizards don't run

[Caolán McNamara]

On Mon, 2014-03-03 at 20:36 +0100, Andreas Mantke wrote:
> The letter wizard doesn't show up.

With
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5fa18dc21644f2a719bf39ec948a586fa8837b6a
 in place to search for the right dir things seem to work ok again.

C.


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

Re: Current Build from Git: Writer-Wizards don't run

[Caolán McNamara]

On Mon, 2014-03-03 at 20:36 +0100, Andreas Mantke wrote:
> Hi Stephan,
> 
> Am 03.03.2014 12:02, schrieb Stephan Bergmann:
> > On 03/02/2014 05:45 PM, Andreas Mantke wrote:
> >> I build LibreOffice from the current master on my openSuSE 12.3-x64 and
> >> the Writer wizzards don't run anymore.
> >
> > Fixed with
> > 
> > "Wizards should look for templates in Template_internal, not
> > Template_user."

Hmm, is the order of nodes under the Template Internal Paths not
actually retained by configmgr ? Looks like they are put into a map with
an OUString key ?, i.e. wizards can't guarantee that the "common"
element will really be the first entry even though "common" is placed
first in the .xcu

C.

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

[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - sw/source

[Kohei Yoshida]

 sw/source/core/layout/paintfrm.cxx |   60 -
 1 file changed, 47 insertions(+), 13 deletions(-)

New commits:
commit d6e371953d28a9bf5f3d164fa27375e6cf5da975
Author: Kohei Yoshida 
Date:   Tue Mar 4 16:26:57 2014 -0500

Limit application of offset values to avoid overlapping borders.

They show up when exporting to PDF.  It's quite ugly.

Change-Id: Ib1efb68d9481dca06fafe1aab293dac5aa54e8ea

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 3ea8ad8..b090ae1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2260,6 +2260,10 @@ struct SwLineEntry
 SwTwips mnEndPos;
 SwTwips mnOffset;
 
+bool mbOffsetPerp;
+bool mbOffsetStart;
+bool mbOffsetEnd;
+
 svx::frame::Style maAttribute;
 
 enum OverlapType { NO_OVERLAP, OVERLAP1, OVERLAP2, OVERLAP3 };
@@ -2281,6 +2285,9 @@ SwLineEntry::SwLineEntry( SwTwips nKey,
 mnStartPos( nStartPos ),
 mnEndPos( nEndPos ),
 mnOffset( 0 ),
+mbOffsetPerp(false),
+mbOffsetStart(false),
+mbOffsetEnd(false),
 maAttribute( rAttribute )
 {
 }
@@ -2489,19 +2496,38 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) const
 FindStylesForLine( aStart, aEnd, aStyles, bHori );
 
 // Account for double line thicknesses for the top- and left-most 
borders.
-if (bHori)
-{
-aStart.Y() -= rEntry.mnOffset;
-aEnd.Y() -= rEntry.mnOffset;
-aStart.X() -= rEntry.mnOffset;
-aEnd.X() += rEntry.mnOffset;
-}
-else
+if (rEntry.mnOffset)
 {
-aStart.X() -= rEntry.mnOffset;
-aEnd.X() -= rEntry.mnOffset;
-aStart.Y() -= rEntry.mnOffset;
-aEnd.Y() += rEntry.mnOffset;
+if (bHori)
+{
+if (rEntry.mbOffsetPerp)
+{
+// Apply offset in perpendicular direction.
+aStart.Y() -= rEntry.mnOffset;
+aEnd.Y() -= rEntry.mnOffset;
+}
+if (rEntry.mbOffsetStart)
+// Apply offset at the start of a border.
+aStart.X() -= rEntry.mnOffset;
+if (rEntry.mbOffsetEnd)
+// Apply offset at the end of a border.
+aEnd.X() += rEntry.mnOffset;
+}
+else
+{
+if (rEntry.mbOffsetPerp)
+{
+// Apply offset in perpendicular direction.
+aStart.X() -= rEntry.mnOffset;
+aEnd.X() -= rEntry.mnOffset;
+}
+if (rEntry.mbOffsetStart)
+// Apply offset at the start of a border.
+aStart.Y() -= rEntry.mnOffset;
+if (rEntry.mbOffsetEnd)
+// Apply offset at the end of a border.
+aEnd.Y() += rEntry.mnOffset;
+}
 }
 
 SwRect aRepaintRect( aStart, aEnd );
@@ -2778,10 +2804,18 @@ void calcOffsetForDoubleLine( SwLineEntryMap& rLines )
 SwLineEntrySet aNewSet;
 const SwLineEntrySet& rSet = it->second;
 SwLineEntrySet::iterator itSet = rSet.begin(), itSetEnd = 
rSet.end();
-for (; itSet != itSetEnd; ++itSet)
+size_t nEntryCount = rSet.size();
+for (size_t i = 0; itSet != itSetEnd; ++itSet, ++i)
 {
 SwLineEntry aLine = *itSet;
 aLine.mnOffset = 
static_cast(aLine.maAttribute.Dist());
+aLine.mbOffsetPerp = true;
+
+if (i == 0)
+aLine.mbOffsetStart = true;
+if (i == nEntryCount - 1)
+aLine.mbOffsetEnd = true;
+
 aNewSet.insert(aLine);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: undefined reference to `xmlXPathNodeSetSort@LIBXML2_2.4.30 error while running 'make'

[Sandeep K Chaudhary]

On Tue, Mar 4, 2014 at 1:00 PM, Michael Stahl  wrote:

> On 04/03/14 06:59, Sandeep K Chaudhary wrote:
> > Hi Michael,
> >
> > thanks for the reply !
> >
> > Here is the o/p for the three grep commands, and 'make l10ntools
> > PARALLELISM=1 VERBOSE=t'
> >
> > sandeep@ubuntu:~/libreoffice$ grep LIBXML config_host.mk
> > 
> > export LIBXML_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2
> > export LIBXML_JAR=
> > export LIBXML_LIBS=$(gb_SPACE)-L/usr/local/lib -lxml2
> > export SYSTEM_LIBXML=TRUE
> > sandeep@ubuntu:~/libreoffice$ grep LIBXSLT config_host.mk
> > 
> > export LIBXSLT_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2
> > export LIBXSLT_LIBS=$(gb_SPACE)-L/usr/local/lib -lxslt -lxml2
> > export LIBXSLT_MAJOR=
> > export SYSTEM_LIBXSLT=TRUE
> > export SYSTEM_LIBXSLT_FOR_BUILD=TRUE
> > sandeep@ubuntu:~/libreoffice$ grep LIBEXSLT config_host.mk
> > 
> > export LIBEXSLT_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2
> > export LIBEXSLT_LIBS=$(gb_SPACE)-L/usr/local/lib -lexslt -lxslt -lxml2
>
> i wonder why you've got these /usr/local paths in there - do you have
> some custom built libxml2/libxslt installed in /usr/local, or does
> "xml2-config --libs" really output that on Ubuntu?  (which would be
> surprising, but then again, it's Ubuntu...)
>

Yes, I have custom built libxml2 installed. It's required for my work. What
should be the workaround?


>
> > sandeep@ubuntu:~/libreoffice$ make l10ntools PARALLELISM=1 VERBOSE=t
> > cd /home/sandeep/libreoffice/l10ntools && /usr/bin/make -j 1 -r
> > [build PKG] icu
> > make[1]: Entering directory `/home/sandeep/libreoffice/l10ntools'
> > /home/sandeep/libreoffice/solenv/gbuild/Package.mk:81: *** Something
> > depends on package icu which does not exist..  Stop.
> > make[1]: Leaving directory `/home/sandeep/libreoffice/l10ntools'
> > make: *** [l10ntools] Error 2
>
> hmmm that was not enlightening, try:
>  make l10ntools.all PARALLELISM=1 VERBOSE=t LDFLAGS="-Wl,--trace"
>
> I will try that. I am not on my computer right now. Will try this, and
> report back.


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

Re: undefined reference to `xmlXPathNodeSetSort@LIBXML2_2.4.30 error while running 'make'

[Michael Stahl]

On 04/03/14 06:59, Sandeep K Chaudhary wrote:
> Hi Michael,
> 
> thanks for the reply ! 
> 
> Here is the o/p for the three grep commands, and 'make l10ntools
> PARALLELISM=1 VERBOSE=t'
> 
> sandeep@ubuntu:~/libreoffice$ grep LIBXML config_host.mk
> 
> export LIBXML_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2  
> export LIBXML_JAR=
> export LIBXML_LIBS=$(gb_SPACE)-L/usr/local/lib -lxml2  
> export SYSTEM_LIBXML=TRUE
> sandeep@ubuntu:~/libreoffice$ grep LIBXSLT config_host.mk
> 
> export LIBXSLT_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2  
> export LIBXSLT_LIBS=$(gb_SPACE)-L/usr/local/lib -lxslt -lxml2  
> export LIBXSLT_MAJOR=
> export SYSTEM_LIBXSLT=TRUE
> export SYSTEM_LIBXSLT_FOR_BUILD=TRUE
> sandeep@ubuntu:~/libreoffice$ grep LIBEXSLT config_host.mk
> 
> export LIBEXSLT_CFLAGS=$(gb_SPACE)-isystem/usr/local/include/libxml2  
> export LIBEXSLT_LIBS=$(gb_SPACE)-L/usr/local/lib -lexslt -lxslt -lxml2 

i wonder why you've got these /usr/local paths in there - do you have
some custom built libxml2/libxslt installed in /usr/local, or does
"xml2-config --libs" really output that on Ubuntu?  (which would be
surprising, but then again, it's Ubuntu...)

> sandeep@ubuntu:~/libreoffice$ make l10ntools PARALLELISM=1 VERBOSE=t
> cd /home/sandeep/libreoffice/l10ntools && /usr/bin/make -j 1 -r
> [build PKG] icu
> make[1]: Entering directory `/home/sandeep/libreoffice/l10ntools'
> /home/sandeep/libreoffice/solenv/gbuild/Package.mk:81: *** Something
> depends on package icu which does not exist..  Stop.
> make[1]: Leaving directory `/home/sandeep/libreoffice/l10ntools'
> make: *** [l10ntools] Error 2

hmmm that was not enlightening, try:
 make l10ntools.all PARALLELISM=1 VERBOSE=t LDFLAGS="-Wl,--trace"


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

[Libreoffice-commits] core.git: Branch 'private/kohei/double-border-fix' - sw/source

[Kohei Yoshida]

 sw/source/core/layout/paintfrm.cxx |   69 ++---
 1 file changed, 65 insertions(+), 4 deletions(-)

New commits:
commit f3ef8e147787d0dd6a3ca656ad694a49e218a66e
Author: Kohei Yoshida 
Date:   Tue Mar 4 14:05:12 2014 -0500

Offset top- and left-most borders of a table to account for double lines.

Change-Id: I99eb00740910f2acf244f2be0637ca26858c76b1

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index db8ef0d..3ea8ad8 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2258,6 +2258,7 @@ struct SwLineEntry
 SwTwips mnKey;
 SwTwips mnStartPos;
 SwTwips mnEndPos;
+SwTwips mnOffset;
 
 svx::frame::Style maAttribute;
 
@@ -2279,6 +2280,7 @@ SwLineEntry::SwLineEntry( SwTwips nKey,
 :   mnKey( nKey ),
 mnStartPos( nStartPos ),
 mnEndPos( nEndPos ),
+mnOffset( 0 ),
 maAttribute( rAttribute )
 {
 }
@@ -2361,6 +2363,8 @@ class SwTabFrmPainter
 svx::frame::Style*,
 bool bHori ) const;
 
+void AdjustTopLeftFrames();
+
 public:
 SwTabFrmPainter( const SwTabFrm& rTabFrm );
 
@@ -2371,6 +2375,7 @@ SwTabFrmPainter::SwTabFrmPainter( const SwTabFrm& rTabFrm 
)
 : mrTabFrm( rTabFrm )
 {
 HandleFrame( rTabFrm );
+AdjustTopLeftFrames();
 }
 
 void SwTabFrmPainter::HandleFrame( const SwLayoutFrm& rLayoutFrm )
@@ -2479,6 +2484,26 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) const
 aEnd.Y() = rEntry.mnEndPos;
 }
 
+svx::frame::Style aStyles[ 7 ];
+aStyles[ 0 ] = rEntryStyle;
+FindStylesForLine( aStart, aEnd, aStyles, bHori );
+
+// Account for double line thicknesses for the top- and left-most 
borders.
+if (bHori)
+{
+aStart.Y() -= rEntry.mnOffset;
+aEnd.Y() -= rEntry.mnOffset;
+aStart.X() -= rEntry.mnOffset;
+aEnd.X() += rEntry.mnOffset;
+}
+else
+{
+aStart.X() -= rEntry.mnOffset;
+aEnd.X() -= rEntry.mnOffset;
+aStart.Y() -= rEntry.mnOffset;
+aEnd.Y() += rEntry.mnOffset;
+}
+
 SwRect aRepaintRect( aStart, aEnd );
 
 // the repaint rectangle has to be moved a bit for the centered 
lines:
@@ -2499,10 +2524,6 @@ void SwTabFrmPainter::PaintLines(OutputDevice& rDev, 
const SwRect& rRect) const
 continue;
 }
 
-svx::frame::Style aStyles[ 7 ];
-aStyles[ 0 ] = rEntryStyle;
-FindStylesForLine( aStart, aEnd, aStyles, bHori );
-
 // subsidiary lines
 const Color* pTmpColor = 0;
 if (0 == aStyles[ 0 ].GetWidth())
@@ -2742,6 +2763,46 @@ void SwTabFrmPainter::FindStylesForLine( const Point& 
rStartPoint,
 }
 }
 
+namespace {
+
+void calcOffsetForDoubleLine( SwLineEntryMap& rLines )
+{
+SwLineEntryMap aNewLines;
+SwLineEntryMap::iterator it = rLines.begin(), itEnd = rLines.end();
+bool bFirst = true;
+for (; it != itEnd; ++it)
+{
+if (bFirst)
+{
+// First line needs to be offset to account for double line 
thickness.
+SwLineEntrySet aNewSet;
+const SwLineEntrySet& rSet = it->second;
+SwLineEntrySet::iterator itSet = rSet.begin(), itSetEnd = 
rSet.end();
+for (; itSet != itSetEnd; ++itSet)
+{
+SwLineEntry aLine = *itSet;
+aLine.mnOffset = 
static_cast(aLine.maAttribute.Dist());
+aNewSet.insert(aLine);
+}
+
+aNewLines.insert(SwLineEntryMap::value_type(it->first, aNewSet));
+}
+else
+aNewLines.insert(SwLineEntryMap::value_type(it->first, 
it->second));
+
+bFirst = false;
+}
+rLines.swap(aNewLines);
+}
+
+}
+
+void SwTabFrmPainter::AdjustTopLeftFrames()
+{
+calcOffsetForDoubleLine(maHoriLines);
+calcOffsetForDoubleLine(maVertLines);
+}
+
 // special case: #i9860#
 // first line in follow table without repeated headlines
 static bool lcl_IsFirstRowInFollowTableWithoutRepeatedHeadlines(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx  |   13 +++--
 chart2/source/view/main/OpenGLRender.cxx |   24 
 chart2/source/view/main/OpenGLRender.hxx |2 --
 3 files changed, 35 insertions(+), 4 deletions(-)

New commits:
commit fc6543e04d22afc66fc1282cf6cc74822f4e8ae3
Author: Markus Mohrhard 
Date:   Tue Mar 4 21:33:17 2014 +0100

remove mfAlpha again

The concept with separate alpha will result in nasty alpha bugs.

Change-Id: I9c18d2a850aeed2bf14f43d247029204013d3c93

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 579a8a2..82285c7 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -444,21 +444,23 @@ void DummyCircle::render()
 SAL_WARN("chart2.opengl", "render DummyCircle");
 debugProperties(maProperties);
 DummyChart* pChart = getRootShape();
-std::map::const_iterator itr = 
maProperties.find("FillColor");
+
+sal_uInt8 nAlpha = 255;
+std::map::const_iterator itr = 
maProperties.find("FillTransparence");
 if(itr != maProperties.end())
 {
-sal_Int32 nColor = itr->second.get();
-pChart->m_GLRender.SetColor(nColor, 255);
+sal_Int32 nTrans = itr->second.get();
+nAlpha = static_cast(nTrans & 0xFF);
 }
-else
-SAL_WARN("chart2.opengl", "missing color");
 
-itr = maProperties.find("FillTransparence");
+itr = maProperties.find("FillColor");
 if(itr != maProperties.end())
 {
-sal_Int32 nTrans = itr->second.get();
-pChart->m_GLRender.SetTransparency(nTrans&0xFF);
+sal_Int32 nColor = itr->second.get();
+pChart->m_GLRender.SetColor(nColor, nAlpha);
 }
+else
+SAL_WARN("chart2.opengl", "missing color");
 
 pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
   maSize.Width, maSize.Height);
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index b150df2..a2565a5 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1555,11 +1555,7 @@ void OpenGLRender::SetChartTransparencyGradient(long 
transparencyGradient)
 m_BackgroundColor[15] = 0.0;
 }
 }
-void OpenGLRender::SetTransparency(sal_uInt32 transparency)
-{
-m_fAlpha = (float)transparency / 255.0;
-m_2DColor = glm::vec4(m_2DColor.r, m_2DColor.g, m_2DColor.b, m_fAlpha);
-}
+
 void OpenGLRender::GeneratePieSegment2D(double fInnerRadius, double 
fOutterRadius, double nAngleStart, double nAngleWidth)
 {
 double nAngleStep = 1;
diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index 5d6b091..2610804 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -184,7 +184,6 @@ public:
 #endif
 
 void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, sal_uInt8 
nAlpha);
-void SetTransparency(sal_uInt32 transparency);
 private:
 GLint LoadShaders(const OUString& rVertexShaderName, const OUString& 
rFragmentShaderName);
 int CreateTextureObj(int width, int height);
@@ -287,7 +286,6 @@ private:
 GLuint m_DebugVertexID;
 GLuint m_DebugColorID;
 #endif
-float m_fAlpha;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 57f2c561ce747ba11ae623935ccc2a5d594945c2
Author: Peilin 
Date:   Mon Mar 3 16:15:29 2014 +0800

add black bubble edge and modify transparence

Change-Id: If18e74c2cec00d29bddaffbbd21991749490493a

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 88b6ad9..579a8a2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -453,6 +453,13 @@ void DummyCircle::render()
 else
 SAL_WARN("chart2.opengl", "missing color");
 
+itr = maProperties.find("FillTransparence");
+if(itr != maProperties.end())
+{
+sal_Int32 nTrans = itr->second.get();
+pChart->m_GLRender.SetTransparency(nTrans&0xFF);
+}
+
 pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
   maSize.Width, maSize.Height);
 pChart->m_GLRender.RenderBubble2FBO(GL_TRUE);
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 35a4b87..b150df2 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1043,6 +1043,7 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y, 
float directionX, float d
 int OpenGLRender::RenderBubble2FBO(int)
 {
 CHECK_GL_ERROR();
+glm::vec4 edgeColor = glm::vec4(0.0, 0.0, 0.0, 1.0);
 size_t listNum = m_Bubble2DShapePointList.size();
 for (size_t i = 0; i < listNum; i++)
 {
@@ -1081,7 +1082,30 @@ int OpenGLRender::RenderBubble2FBO(int)
 glDrawArrays(

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

[Markus Mohrhard]

 chart2/source/view/main/DummyXShape.cxx  |   13 +++--
 chart2/source/view/main/OpenGLRender.cxx |   24 
 chart2/source/view/main/OpenGLRender.hxx |2 --
 3 files changed, 35 insertions(+), 4 deletions(-)

New commits:
commit 0b2637dda47690da69f748119081151f41fe4133
Author: Markus Mohrhard 
Date:   Tue Mar 4 21:33:17 2014 +0100

remove mfAlpha again

The concept with separate alpha will result in nasty alpha bugs.

Change-Id: I9c18d2a850aeed2bf14f43d247029204013d3c93

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 036b306..493eb83 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -505,21 +505,23 @@ void DummyCircle::render()
 SAL_WARN("chart2.opengl", "render DummyCircle");
 debugProperties(maProperties);
 DummyChart* pChart = getRootShape();
-std::map::const_iterator itr = 
maProperties.find("FillColor");
+
+sal_uInt8 nAlpha = 255;
+std::map::const_iterator itr = 
maProperties.find("FillTransparence");
 if(itr != maProperties.end())
 {
-sal_Int32 nColor = itr->second.get();
-pChart->m_GLRender.SetColor(nColor, 255);
+sal_Int32 nTrans = itr->second.get();
+nAlpha = static_cast(nTrans & 0xFF);
 }
-else
-SAL_WARN("chart2.opengl", "missing color");
 
-itr = maProperties.find("FillTransparence");
+itr = maProperties.find("FillColor");
 if(itr != maProperties.end())
 {
-sal_Int32 nTrans = itr->second.get();
-pChart->m_GLRender.SetTransparency(nTrans&0xFF);
+sal_Int32 nColor = itr->second.get();
+pChart->m_GLRender.SetColor(nColor, nAlpha);
 }
+else
+SAL_WARN("chart2.opengl", "missing color");
 
 pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
   maSize.Width, maSize.Height);
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 396ac94..55ce9d5 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1552,11 +1552,7 @@ void OpenGLRender::SetChartTransparencyGradient(long 
transparencyGradient)
 m_BackgroundColor[15] = 0.0;
 }
 }
-void OpenGLRender::SetTransparency(sal_uInt32 transparency)
-{
-m_fAlpha = (float)transparency / 255.0;
-m_2DColor = glm::vec4(m_2DColor.r, m_2DColor.g, m_2DColor.b, m_fAlpha);
-}
+
 void OpenGLRender::GeneratePieSegment2D(double fInnerRadius, double 
fOutterRadius, double nAngleStart, double nAngleWidth)
 {
 double nAngleStep = 1;
diff --git a/chart2/source/view/main/OpenGLRender.hxx 
b/chart2/source/view/main/OpenGLRender.hxx
index ab1da1e..ca999e2 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -191,7 +191,6 @@ public:
 #endif
 
 void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, sal_uInt8 
nAlpha);
-void SetTransparency(sal_uInt32 transparency);
 private:
 GLint LoadShaders(const OUString& rVertexShaderName, const OUString& 
rFragmentShaderName);
 int CreateTextureObj(int width, int height);
@@ -294,7 +293,6 @@ private:
 GLuint m_DebugVertexID;
 GLuint m_DebugColorID;
 #endif
-float m_fAlpha;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1c8fb3bd1137c1ab922b840bef5748abbbe6531e
Author: Peilin 
Date:   Mon Mar 3 16:15:29 2014 +0800

add black bubble edge and modify transparence

Change-Id: If18e74c2cec00d29bddaffbbd21991749490493a

diff --git a/chart2/source/view/main/DummyXShape.cxx 
b/chart2/source/view/main/DummyXShape.cxx
index 8d4ac25..036b306 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -514,6 +514,13 @@ void DummyCircle::render()
 else
 SAL_WARN("chart2.opengl", "missing color");
 
+itr = maProperties.find("FillTransparence");
+if(itr != maProperties.end())
+{
+sal_Int32 nTrans = itr->second.get();
+pChart->m_GLRender.SetTransparency(nTrans&0xFF);
+}
+
 pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y,
   maSize.Width, maSize.Height);
 pChart->m_GLRender.RenderBubble2FBO(GL_TRUE);
diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index bf7bcdd..396ac94 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -1044,6 +1044,7 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y, 
float directionX, float d
 int OpenGLRender::RenderBubble2FBO(int)
 {
 CHECK_GL_ERROR();
+glm::vec4 edgeColor = glm::vec4(0.0, 0.0, 0.0, 1.0);
 size_t listNum = m_Bubble2DShapePointList.size();
 for (size_t i = 0; i < listNum; i++)
 {
@@ -1082,7 +1083,30 @@ int OpenGLRender::RenderBubble2FBO(int)
 glDrawArrays(

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

[Caolán McNamara]

 filter/qa/cppunit/xslt-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 62d6252d2cde33f6ef0e627c3192a63d43ba2a87
Author: Caolán McNamara 
Date:   Tue Mar 4 20:34:53 2014 +

I imagine this should have a SAL_CALL decoration

Change-Id: I04d50eb44156e4b2476c237848491cda73b9ef0a

diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index ecb044b..db8fe7d 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -57,7 +57,7 @@ struct Listener : public 
::cppu::WeakImplHelper1
 
 Listener() : m_bDone(false) {}
 
-virtual void disposing(const lang::EventObject&) throw() SAL_OVERRIDE {}
+virtual void SAL_CALL disposing(const lang::EventObject&) throw() 
SAL_OVERRIDE {}
 virtual void SAL_CALL started() throw() SAL_OVERRIDE { m_bDone = false; }
 virtual void SAL_CALL closed() throw() SAL_OVERRIDE { m_bDone = true; }
 virtual void SAL_CALL terminated() throw() SAL_OVERRIDE { m_bDone = true; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Oliver-Rainer Wittmann]

 sw/inc/IDocumentMarkAccess.hxx  |2 
 sw/inc/undobj.hxx   |2 
 sw/source/core/bastyp/index.cxx |7 ++-
 sw/source/core/crsr/bookmrk.cxx |   69 
 sw/source/core/doc/docbm.cxx|   69 +---
 sw/source/core/inc/MarkManager.hxx  |2 
 sw/source/core/inc/bookmrk.hxx  |4 +
 sw/source/core/inc/crossrefbookmark.hxx |1 
 sw/source/core/txtnode/ndtxt.cxx|6 ++
 sw/source/core/undo/undobj.cxx  |   32 +-
 sw/source/core/undo/unredln.cxx |6 +-
 vcl/source/app/settings.cxx |8 +--
 12 files changed, 147 insertions(+), 61 deletions(-)

New commits:
commit b229d16cd94d31eb8cad043b54d2d421cf92ef70
Author: Oliver-Rainer Wittmann 
Date:   Tue Mar 4 14:02:37 2014 +

Related: #i123480# correct the previous made refactoring

(cherry picked from commit aa46680dd96539848bf8bef0293e2a614172515d)

Conflicts:
sw/source/core/undo/undobj.cxx

Change-Id: I4689d5fe02ab2c814e15a1c11ebd3ad11d6e56c8

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 1dcd5ca..39e3fe0 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -115,7 +115,7 @@ public:
 
 // Save and set Redline data.
 static bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
-  bool bDelRange = true );
+  bool bDelRange = true, bool bCopyNext = true );
 static bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
 static void SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData );
 static bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 2e75e42..e22fe52 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -46,7 +46,9 @@ public:
 SwComparePosition eCmpPos,
 const SwPosition& rSttPos,
 const SwPosition& rEndPos,
-SwRangeRedline& rRedl );
+SwRangeRedline& rRedl,
+sal_Bool bCopyNext );
+
 ~SwRedlineSaveData();
 
 void RedlineToDoc( SwPaM& rPam );
@@ -847,7 +849,7 @@ void SwUndoSaveSection::SaveSection(
 }
 
 pRedlSaveData = new SwRedlineSaveDatas;
-if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, true ))
+if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, true, true ))
 delete pRedlSaveData, pRedlSaveData = 0;
 
 nStartPos = rRange.aStart.GetIndex();
@@ -912,9 +914,10 @@ SwRedlineSaveData::SwRedlineSaveData(
 SwComparePosition eCmpPos,
 const SwPosition& rSttPos,
 const SwPosition& rEndPos,
-SwRangeRedline& rRedl )
+SwRangeRedline& rRedl,
+sal_Bool bCopyNext )
 : SwUndRng( rRedl )
-, SwRedlineData( rRedl.GetRedlineData(), true )
+, SwRedlineData( rRedl.GetRedlineData(), bCopyNext )
 {
 assert( POS_OUTSIDE == eCmpPos ||
 !rRedl.GetContentIdx() ); // "Redline with Content"
@@ -925,6 +928,7 @@ SwRedlineSaveData::SwRedlineSaveData(
 nEndNode = rEndPos.nNode.GetIndex();
 nEndCntnt = rEndPos.nContent.GetIndex();
 break;
+
 case POS_OVERLAP_BEHIND:// Pos1 overlaps Pos2 at the end
 nSttNode = rSttPos.nNode.GetIndex();
 nSttCntnt = rSttPos.nContent.GetIndex();
@@ -996,7 +1000,8 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
 bool SwUndo::FillSaveData(
 const SwPaM& rRange,
 SwRedlineSaveDatas& rSData,
-bool bDelRange )
+bool bDelRange,
+bool bCopyNext )
 {
 rSData.DeleteAndDestroyAll();
 
@@ -1009,6 +1014,7 @@ bool SwUndo::FillSaveData(
 for ( ; n < rTbl.size(); ++n )
 {
 SwRangeRedline* pRedl = rTbl[n];
+
 const SwComparePosition eCmpPos =
 ComparePosition( *pStt, *pEnd, *pRedl->Start(), *pRedl->End() );
 if ( eCmpPos != POS_BEFORE
@@ -1016,12 +1022,14 @@ bool SwUndo::FillSaveData(
  && eCmpPos != POS_COLLIDE_END
  && eCmpPos != POS_COLLIDE_START )
 {
-pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd, *pRedl );
+pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd, *pRedl, 
bCopyNext );
 rSData.push_back( pNewData );
 }
 }
 if( !rSData.empty() && bDelRange )
+{
 rRange.GetDoc()->DeleteRedline( rRange, false, USHRT_MAX );
+}
 return !rSData.empty();
 }
 
@@ -1041,12 +1049,13 @@ bool SwUndo::FillSaveDataForFmt(
 SwRangeRedline* pRedl = rTbl[n];
 if ( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
 {
-const SwPosition *pRStt = pRedl->Start(), *pREnd = pRedl->End();
-
-SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, *pRStt, 
*pREnd );
-if ( POS_BEFORE != eCmpPos && POS_BEHIND != eCmpPos && 
POS_COLLIDE_END != eCmpPos && POS_COLLIDE_START != eCmpPos )
+const Sw

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 77/0c0e6b910129710b4be5cb9e9bae39bfa6bd5a

[Caolán McNamara]

 77/0c0e6b910129710b4be5cb9e9bae39bfa6bd5a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b08c2a35c5d3a39fd5a9eab2bcb5fb746e37e13f
Author: Caolán McNamara 
Date:   Tue Mar 4 20:28:36 2014 +

Notes added by 'git notes add'

diff --git a/77/0c0e6b910129710b4be5cb9e9bae39bfa6bd5a 
b/77/0c0e6b910129710b4be5cb9e9bae39bfa6bd5a
new file mode 100644
index 000..156aa72
--- /dev/null
+++ b/77/0c0e6b910129710b4be5cb9e9bae39bfa6bd5a
@@ -0,0 +1 @@
+merged as: 70cd94991fd2d2156ee5946b09b9db4584870eff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 oox/source/drawingml/shapepropertymap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 467ca9e9e175e328c9d99b94625110a4b6ce591d
Author: Markus Mohrhard 
Date:   Tue Mar 4 21:26:00 2014 +0100

better safe than sorry

Change-Id: I1e22f166381b3bc8122b3bbef7fc760705e402d1

diff --git a/oox/source/drawingml/shapepropertymap.cxx 
b/oox/source/drawingml/shapepropertymap.cxx
index 446282b..f14b653 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -63,7 +63,7 @@ ShapePropertyInfo::ShapePropertyInfo( const sal_Int32* 
pnPropertyIds,
 mbNamedFillBitmapUrl( bNamedFillBitmapUrl )
 {
 assert(pnPropertyIds);
-for(size_t i = 0;; ++i)
+for(size_t i = 0; i < PROP_COUNT; ++i) // normally we should not reach 
PROP_COUNT but it prevents infinite loops if we hit a bug
 {
 if(pnPropertyIds[i] == PROP_END_LIST)
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/46680dd96539848bf8bef0293e2a614172515d

[Caolán McNamara]

 aa/46680dd96539848bf8bef0293e2a614172515d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f7e4735dffb1c2a7a1898c020c421e0ea86cc8f
Author: Caolán McNamara 
Date:   Tue Mar 4 20:28:17 2014 +

Notes added by 'git notes add'

diff --git a/aa/46680dd96539848bf8bef0293e2a614172515d 
b/aa/46680dd96539848bf8bef0293e2a614172515d
new file mode 100644
index 000..5ed2617
--- /dev/null
+++ b/aa/46680dd96539848bf8bef0293e2a614172515d
@@ -0,0 +1 @@
+merged as: 22e8005134a76d53f622d572069e772cc49405c8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 filter/qa/cppunit/xslt-test.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8af7a8953248dd184cd620b934ee6abc147f4076
Author: Michael Stahl 
Date:   Tue Mar 4 21:16:23 2014 +0100

filter: don't wait forever if the xslt test fails

Change-Id: I38b5372b141629341d4b4285ff634679d657fbd2

diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index 67efde9..ecb044b 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -63,6 +63,7 @@ struct Listener : public 
::cppu::WeakImplHelper1
 virtual void SAL_CALL terminated() throw() SAL_OVERRIDE { m_bDone = true; }
 virtual void SAL_CALL error(const uno::Any& e) throw() SAL_OVERRIDE
 {
+m_bDone = true; // set on error too, otherwise main thread waits 
forever
 SAL_WARN("filter.xslt", "exception " << e);
 CPPUNIT_FAIL("exception while in XSLT");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/qa/extras/chart2import.cxx  |   10 ++-
 dev/null   |binary
 include/oox/drawingml/shapepropertymap.hxx |8 +++--
 oox/source/drawingml/chart/objectformatter.cxx |   35 -
 oox/source/drawingml/shapepropertymap.cxx  |   15 +++---
 oox/source/helper/propertymap.cxx  |7 +
 oox/source/token/properties.pl |1 
 7 files changed, 50 insertions(+), 26 deletions(-)

New commits:
commit 20a7a705b572f02049ebe76b2e8cc84c4f4b3d05
Author: Markus Mohrhard 
Date:   Tue Mar 4 21:10:10 2014 +0100

in the old design all lists needed to be the same size, fdo75200

We did not crash in the invalid memory access because the lists were
continuous in memory and we would just pick the next id. However it
crashed when trying to map some of the ids to non existant strings. This
commit also removes the need for the earlier fix for this bug that just
hit the problem behind some checks much later in the call chain.

Change-Id: Ic6658987815c4e84ed2449934c310e30dcd0ed4c

diff --git a/include/oox/drawingml/shapepropertymap.hxx 
b/include/oox/drawingml/shapepropertymap.hxx
index c2c6896..29b0ba2 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 
+#include 
+
 namespace oox { class ModelObjectHelper; }
 
 namespace oox {
@@ -70,7 +72,7 @@ enum ShapePropertyId
 
 struct OOX_DLLPUBLIC ShapePropertyInfo
 {
-const sal_Int32*mpnPropertyIds; /// Pointer to array of 
property identifiers for all SHAPEPROP properties.
+std::vector maPropertyIds;
 boolmbNamedLineMarker;  /// True = use named line 
marker instead of explicit line marker.
 boolmbNamedLineDash;/// True = use named line dash 
instead of explicit line dash.
 boolmbNamedFillGradient;/// True = use named fill 
gradient instead of explicit fill gradient.
@@ -85,8 +87,8 @@ struct OOX_DLLPUBLIC ShapePropertyInfo
 bool bNamedFillGradient,
 bool bNamedFillBitmapUrl );
 
-bool has( ShapePropertyId ePropId ) const { return mpnPropertyIds[ 
ePropId ] >= 0; }
-sal_Int32operator[]( ShapePropertyId ePropId ) const { return 
mpnPropertyIds[ ePropId ]; }
+bool has( ShapePropertyId ePropId ) const { return 
maPropertyIds.size() > size_t(ePropId) && maPropertyIds[ ePropId ] >= 0; }
+sal_Int32operator[]( ShapePropertyId ePropId ) const { return 
maPropertyIds[ ePropId ]; }
 };
 
 
diff --git a/oox/source/drawingml/chart/objectformatter.cxx 
b/oox/source/drawingml/chart/objectformatter.cxx
index 297ad7b..adcc3f3 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -469,7 +469,8 @@ static const sal_Int32 spnCommonPropIds[] =
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
 PROP_FillStyle, PROP_FillColor, PROP_FillTransparence, PROP_INVALID, 
PROP_FillGradientName,
 PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, 
PROP_FillBitmapSizeY,
-PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint
+PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint,
+PROP_END_LIST
 };
 
 /** Property identifiers for linear data series, to be used in 
ShapePropertyInfo. */
@@ -479,17 +480,37 @@ static const sal_Int32 spnLinearPropIds[] =
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
 PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID,
-PROP_INVALID, PROP_INVALID, PROP_INVALID
+PROP_INVALID, PROP_INVALID, PROP_INVALID,
+PROP_END_LIST
 };
 
 /** Property identifiers for filled data series, to be used in 
ShapePropertyInfo. */
 static const sal_Int32 spnFilledPropIds[] =
 {
-PROP_BorderStyle, PROP_BorderWidth, PROP_BorderColor, 
PROP_BorderTransparency, PROP_BorderDashName,
-PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, PROP_INVALID, 
PROP_INVALID, PROP_INVALID,
-PROP_FillStyle, PROP_Color, PROP_Transparency, PROP_GradientName,
-PROP_FillBitmapName, PROP_FillBitmapMode, PROP_FillBitmapSizeX, 
PROP_FillBitmapSizeY,
-PROP_FillBitmapPositionOffsetX, PROP_FillBitmapPositionOffsetY, 
PROP_FillBitmapRectanglePoint
+PROP_BorderStyle,
+PROP_BorderWidth,
+PROP_BorderColor,
+PROP_BorderTransparency,
+PROP_BorderDashName,
+PROP_INVALID,
+PROP_INVALID,
+PROP_INVALID,
+PROP_INVALID,
+PROP_INVALID,
+PROP_INVALID,
+PROP_INVALID,
+PROP_FillStyle,
+PROP_Color,
+PROP_Transparency,
+PROP_GradientName,
+PROP_FillBitmapName,
+PROP_Fil

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

[Olivier Hallot]

 fpicker/source/office/iodlg.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b455abb0138a3f296e0d9a833c0d3c205295d78a
Author: Olivier Hallot 
Date:   Tue Mar 4 14:27:52 2014 -0300

FDO#75755: Change string "..." to "Servers..."

Change string "..." to "Servers..." in filepicker, to allow better 
understandng of the remote acess to file services.

Change-Id: I8ffca698b40d23b1c876223ef98f9bcb181791a4
Reviewed-on: https://gerrit.libreoffice.org/8452
Tested-by: Marcos Paulo de Souza 
Reviewed-by: Marcos Paulo de Souza 

diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 1a6b3a9..822ce92 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -97,8 +97,8 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
 {
 HelpID = 
"fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_CONNECT_TO_SERVER";
 Pos = MAP_APPFONT ( 94 , 6 ) ;
-Size = MAP_APPFONT ( 12 , 12 ) ;
-Text [ en-US ] = "..." ;
+Size = MAP_APPFONT ( 50 , 12 ) ;
+Text [ en-US ] = "Servers..." ;
 QuickHelpText [ en-US ] = "Connect To Server" ;
 };
 Control CTL_EXPLORERFILE_FILELIST
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 writerfilter/source/dmapper/TablePropertiesHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 092228636e781fc8409264398a1645d4a983777d
Author: Stephan Bergmann 
Date:   Tue Mar 4 19:20:50 2014 +0100

Silence bogus MSVC warning

Change-Id: If4e126e7993a1d3ca6162becf37b84b2de6c2dde

diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx 
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 3824d3b..4b48b7c 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -113,7 +113,7 @@ namespace dmapper {
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if( pProperties.get())
 {
-sal_Int32 nToken;
+sal_Int32 nToken = sal_Int32();
 switch( nSprmId )
 {
 case NS_ooxml::LN_CT_TrPr_ins:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - distro-configs/CPOSX.conf icon-themes/galaxy

[Tor Lillqvist]

 distro-configs/CPOSX.conf |   20 +
 icon-themes/galaxy/brand_cp/about.svg |  179 +++
 icon-themes/galaxy/brand_cp/backing_left.png  |binary
 icon-themes/galaxy/brand_cp/backing_right.png |binary
 icon-themes/galaxy/brand_cp/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand_cp/backing_rtl_right.png |binary
 icon-themes/galaxy/brand_cp/backing_space.png |binary
 icon-themes/galaxy/brand_cp/flat_logo.svg |  335 ++
 icon-themes/galaxy/brand_cp/intro.png |binary
 9 files changed, 534 insertions(+)

New commits:
commit dd17ba62b8b5d9f23ece257b235c305503f94d2b
Author: Tor Lillqvist 
Date:   Tue Mar 4 14:00:20 2014 +0200

Add CPOSX.conf and the CP icon theme (from cp-4.1)

diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf
new file mode 100644
index 000..c1dea82
--- /dev/null
+++ b/distro-configs/CPOSX.conf
@@ -0,0 +1,20 @@
+--with-vendor=Collabora
+--with-branding=icon-themes/galaxy/brand_cp
+--without-junit
+--with-help
+--with-helppack-integration
+--enable-extension-integration
+--disable-online-update
+--disable-odk
+--enable-epm
+--with-macosx-sdk=10.8
+--with-macosx-version-min-required=10.6
+--enable-ext-wiki-publisher
+--enable-report-builder
+--enable-ext-nlpsolver
+--enable-ext-numbertext
+--enable-ext-ct2n
+--enable-ext-google-docs
+--enable-ext-languagetool
+--enable-release-build
+--with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US 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 sv ta te tr uk vi zh-CN zh-TW
diff --git a/icon-themes/galaxy/brand_cp/about.svg 
b/icon-themes/galaxy/brand_cp/about.svg
new file mode 100644
index 000..64ea4c4
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp/about.svg
@@ -0,0 +1,179 @@
+
+
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";
+version="1.1" width="486" height="500">
+  
+
+  
+  
+
+
+  
+
+
+  
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
diff --git a/icon-themes/galaxy/brand_cp/backing_left.png 
b/icon-themes/galaxy/brand_cp/backing_left.png
new file mode 100644
index 000..034bdd4
Binary files /dev/null and b/icon-themes/galaxy/brand_cp/backing_left.png differ
diff --git a/icon-themes/galaxy/brand_cp/backing_right.png 
b/icon-themes/galaxy/brand_cp/backing_right.png
new file mode 100644
index 000..312f6e2
Binary files /dev/null and b/icon-themes/galaxy/brand_cp/backing_right.png 
differ
diff --git a/icon-themes/galaxy/brand_cp/backing_rtl_left.png 
b/icon-themes/galaxy/brand_cp/backing_rtl_left.png
new file mode 100644
index 000..034bdd4
Binary files /dev/null and b/icon-themes/galaxy/brand_cp/backing_rtl_left.png 
differ
diff --git a/icon-themes/galaxy/brand_cp/backing_rtl_right.png 
b/icon-themes/galaxy/brand_cp/backing_rtl_right.png
new file mode 100644
index 000..312f6e2
Binary files /dev/null and b/icon-themes/galaxy/brand_cp/backing_rtl_right.png 
differ
diff --git a/icon-themes/galaxy/brand_cp/backing_space.png 
b/icon-themes/galaxy/brand_cp/backing_space.png
new file mode 100644
index 000..09f2839
Binary files /dev/null and b/icon-themes/galaxy/brand_cp/backing_space.png 
differ
diff --git a/icon-themes/galaxy/brand_cp/flat_logo.svg 
b/icon-themes/galaxy/brand_cp/flat_logo.svg
new file mode 100644
index 000..27f1d6a
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp/flat_logo.svg
@@ -0,0 +1,335 @@
+
+
+http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" width="486px"
+height="80px" viewBox="0 0 486 80" enable-background="new 0 0 486 80" 
xml:space="preserve">
+http://www.w3.org/1999/02/22-rdf-syntax-ns#"; 
xmlns:cc="http://creativecommons.org/ns#"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:svg="http://www.w3.org/2000/svg"; display="none">
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+
+http://www.w3.org/1999/02/22-rdf-syntax-ns#"; 
xmlns:cc="http://creativecommons.org/ns#"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:svg="http://www.w3.org/2000/svg";>
+   
+   
+   
+   
+

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx   |   26 
 writerfilter/source/doctok/resources.xmi   |   77 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   40 +++-
 writerfilter/source/rtftok/rtfsprm.cxx |   20 --
 writerfilter/source/rtftok/rtfsprm.hxx |9 ++
 5 files changed, 47 insertions(+), 125 deletions(-)

New commits:
commit e1e50f7b31a481f399318cb63efcae6c1d62f6f3
Author: Miklos Vajna 
Date:   Tue Mar 4 18:57:27 2014 +0100

writerfilter: convert sprm:P{DxaRight,DxaLeft,DxaLeft1}

Change-Id: Iffb80e9844132aeeaf3e338c4817b44520e40f3a

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 39ce894..ccc6a85 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -973,7 +973,7 @@ static bool ExchangeLeftRight( const PropertyMapPtr 
rContext, DomainMapper_Impl*
 return bExchangeLeftRight;
 }
 
-void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, 
SprmType eSprmType )
+void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, 
SprmType /*eSprmType*/ )
 {
 OSL_ENSURE(rContext.get(), "PropertyMap has to be valid!");
 if(!rContext.get())
@@ -1065,30 +1065,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 case NS_ooxml::LN_CT_PPrBase_suppressLineNumbers:
 rContext->Insert(PROP_PARA_LINE_NUMBER_COUNT, uno::makeAny( nIntValue 
? false : true) );
 break;
-case 0x845d://right margin Asian - undocumented
-case 0x845e://left margin Asian - undocumented
-case 16:  // sprmPDxaRight - right margin
-case NS_sprm::LN_PDxaRight:   // sprmPDxaRight - right margin
-case 17:
-case NS_sprm::LN_PDxaLeft:   // sprmPDxaLeft
-{
-bool bExchangeLeftRight = ExchangeLeftRight( rContext, m_pImpl );
-if( NS_sprm::LN_PDxaLeft == nSprmId || 0x17 == nSprmId|| 
(bExchangeLeftRight && nSprmId == 0x845d) || ( !bExchangeLeftRight && nSprmId 
== 0x845e))
-rContext->Insert(
- eSprmType == SPRM_DEFAULT ? PROP_PARA_LEFT_MARGIN 
: PROP_LEFT_MARGIN,
- uno::makeAny( 
ConversionHelper::convertTwipToMM100( nIntValue ) ));
-else if(eSprmType == SPRM_DEFAULT)
-rContext->Insert(
- PROP_PARA_RIGHT_MARGIN,
- uno::makeAny( 
ConversionHelper::convertTwipToMM100(nIntValue ) ));
-}
-//TODO: what happens to the right margins in numberings?
-break;
-case NS_sprm::LN_PDxaLeft1:// sprmPDxaLeft1
-rContext->Insert(
- eSprmType == SPRM_DEFAULT ? 
PROP_PARA_FIRST_LINE_INDENT : PROP_FIRST_LINE_OFFSET,
- uno::makeAny( 
ConversionHelper::convertTwipToMM100(nIntValue ) ));
-break;
 case NS_ooxml::LN_inTbl:
 break;
 case NS_ooxml::LN_tblDepth:
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 4d0b7dd..7c955d1 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -7,68 +7,6 @@
 
   
 
-
-
-  
-
-  
-  
-
-  0x840E
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPDxaRight
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x840F
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPDxaLeft
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
 
 
   
@@ -317,21 +255,6 @@
   
 
 
-
-
-  
-
-  
-  
-
-  0x8460
-  
-
-  
-
-  
-
-
 
   
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6dbe1fb..60966e6 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -81,7 +81,7 @@ static Id lcl_getParagraphBorder(sal_uInt32 nIndex)
 }
 
 static void lcl_putNestedAttribute(RTFSprms& rSprms, Id nParent, Id nId, 
RTFValue::Pointer_t pValue,
-bool bOverwrite = true, bool bAt

[Libreoffice-commits] core.git: filter/CppunitTest_filter_xslt.mk

[Michael Stahl]

 filter/CppunitTest_filter_xslt.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bfdd18eb35f5c8bf7f713910ec35b853c7456969
Author: Michael Stahl 
Date:   Tue Mar 4 19:15:55 2014 +0100

filter: and we learn that BootstrapFixture requires boost headers

Change-Id: I58d592a863ed96fee85e4c8838663791c76854da

diff --git a/filter/CppunitTest_filter_xslt.mk 
b/filter/CppunitTest_filter_xslt.mk
index 4302228..181f482 100644
--- a/filter/CppunitTest_filter_xslt.mk
+++ b/filter/CppunitTest_filter_xslt.mk
@@ -18,6 +18,8 @@ $(eval $(call gb_CppunitTest_use_ure,filter_xslt))
 
 $(eval $(call gb_CppunitTest_use_configuration,filter_xslt))
 
+$(eval $(call gb_CppunitTest_use_external,filter_xslt,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_libraries,filter_xslt, \
comphelper \
test \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Can XML been imported/transformed with API

[Michael Stahl]

On 21/02/14 15:02, Fernand Vanrie wrote:
> 
> In the past there was some code (below originated from the Hanja
> Hermione website) to work with this JAXThelper i tried  the same code
> but now using com.sun.star.comp.documentconversion./LibXSLTTransformer/
> 
> No errors but i end up with a empty "out.txt" file

>   Dim aNamed(6) As New com.sun.star.beans.NamedValue
>   aNamed(0).Name = "StylesheetURL"
>   aNamed(0).Value = "file:///C:/yourXSLT.xsl"
>   aNamed(1).Name = "SourceURL"
>   aNamed(1).Value = "file:///C:/usr/yourcontent.xml"
>   aNamed(2).Name = "TargetURL"
>   aNamed(2).Value = "file:///C:/out.txt"
>   aNamed(3).Name = "SourceBaseURL"
>   aNamed(3).Value = "file:///C:/"
>   aNamed(4).Name = "TargetBaseURL"
>   aNamed(4).Value = "file:///C:/"
>   aNamed(5).Name = "SystemType"
>   aNamed(5).Value = ""
>   aNamed(6).Name = "PublicType"
>   aNamed(6).Value = ""
>   
>   oStreamListener = CreateUnoListener( "Stream_", _
> "com.sun.star.io.XStreamListener" )
>   
>   oJAXHelper = CreateUnoService( _
>   "om.sun.star.comp.documentconversion./LibXSLTTransformer/ " )
>   oJAXHelper.initialize(aNamed)

this call does nothing since LO 4.0 commit
ca0ea73a4ab104031a16b5bac7a9bb6e57c77ba0
has changed the LibXSLTTransformer::initialize to expect the parameters
in a nested Sequence; i've added a fall-back on master (commit
6967da019b69767a15116de101d33a16b95c8a44) that lets this run again (both
nested and non-nested parameters), will backport to 4.2/4.1 too.


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

Re: undefined reference to `xmlXPathNodeSetSort@LIBXML2_2.4.30 error while running 'make'

[Michael Stahl]

On 03/03/14 21:13, Sandeep K Chaudhary wrote:
> Hi guys,
> 
> I started with building libreoffice on Ubuntu 12.10 but I am getting
> below error while running 'make'. Steps before this went fine as
> suggested in the wiki. Please tell me what should I do.

> 
> /usr/lib/gcc/x86_64-linux-gnu/4.7/../../../x86_64-linux-gnu/libexslt.so:
> undefined reference to `xmlUTF8Size@LIBXML2_2.5.9'

> collect2: error: ld returned 1 exit status
> make[1]: *** [/home/sandeep/libreoffice/workdir/LinkTarget/Executable/uiex]

not sure what could cause this... what do the following print:

 grep LIBXML config_host.mk

 grep LIBXSLT config_host.mk

 grep LIBEXSLT config_host.mk

also can you paste the failing command when running:

 make l10ntools PARALLELISM=1 VERBOSE=t

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

[Libreoffice-commits] core.git: filter/CppunitTest_filter_xslt.mk filter/Module_filter.mk filter/qa filter/source

[Michael Stahl]

 filter/CppunitTest_filter_xslt.mk   |   43 +
 filter/Module_filter.mk |4 
 filter/qa/cppunit/data/xslt/copy.xslt   |9 +
 filter/qa/cppunit/xslt-test.cxx |  190 
 filter/source/xsltfilter/LibXSLTTransformer.cxx |5 
 5 files changed, 250 insertions(+), 1 deletion(-)

New commits:
commit 6967da019b69767a15116de101d33a16b95c8a44
Author: Michael Stahl 
Date:   Tue Mar 4 17:59:45 2014 +0100

filter: make LibXSLTTransformer init backward compatible

As reported by Fernand Vanrie, initializing the XSLT service can fail
because the LibXSLTTransformer::initialize was changed to require
the parameters as a nested Sequence; accept previous parameter
convention as a fall-back.

(regression from ca0ea73a4ab104031a16b5bac7a9bb6e57c77ba0)

Change-Id: I136e6e6338f11ffecf9f856f0736d1d0e6b17c3f

diff --git a/filter/CppunitTest_filter_xslt.mk 
b/filter/CppunitTest_filter_xslt.mk
new file mode 100644
index 000..4302228
--- /dev/null
+++ b/filter/CppunitTest_filter_xslt.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_xslt))
+
+$(eval $(call gb_CppunitTest_use_api,filter_xslt,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_xslt))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_xslt))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_xslt, \
+   comphelper \
+   test \
+   unotest \
+   cppuhelper \
+   cppu \
+   sal \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,filter_xslt,\
+   configmgr/source/configmgr \
+   filter/source/xsltfilter/xsltfilter \
+   i18npool/util/i18npool \
+   ucb/source/core/ucb1 \
+   ucb/source/ucp/file/ucpfile1 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_xslt, \
+   filter/qa/cppunit/xslt-test \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 403184a..e5d67e7 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -77,6 +77,10 @@ $(eval $(call gb_Module_add_targets,filter,\
 ))
 endif
 
+$(eval $(call gb_Module_add_check_targets,filter,\
+CppunitTest_filter_xslt \
+))
+
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_pict_test \
diff --git a/filter/qa/cppunit/data/xslt/copy.xslt 
b/filter/qa/cppunit/data/xslt/copy.xslt
new file mode 100644
index 000..d46172a
--- /dev/null
+++ b/filter/qa/cppunit/data/xslt/copy.xslt
@@ -0,0 +1,9 @@
+
+http://www.w3.org/1999/XSL/Transform";>
+
+
+   
+
+
+
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
new file mode 100644
index 000..67efde9
--- /dev/null
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -0,0 +1,190 @@
+/* -*- 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/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+
+using namespace std;
+using namespace ::com::sun::star;
+
+
+namespace {
+
+class XsltFilterTest
+: public test::BootstrapFixture
+{
+public:
+void testXsltCopyOld();
+void testXsltCopyNew();
+
+CPPUNIT_TEST_SUITE(XsltFilterTest);
+CPPUNIT_TEST(testXsltCopyOld);
+CPPUNIT_TEST(testXsltCopyNew);
+CPPUNIT_TEST_SUITE_END();
+};
+
+struct Listener : public ::cppu::WeakImplHelper1
+{
+bool m_bDone;
+
+Listener() : m_bDone(false) {}
+
+virtual void disposing(const lang::EventObject&) throw() SAL_OVERRIDE {}
+virtual void SAL_CALL started() throw() SAL_OVERRIDE { m_bDone = false; }
+virtual void SAL_CALL closed() throw() SAL_OVERRIDE { m_bDone = true; }
+virtual void SAL_CALL terminated() throw() SAL_OVERRIDE { m_bDone = true; }
+virtual void SAL_CALL error(const uno::Any& e) throw() SAL_OVERRIDE
+{
+SAL_WARN("filter.xslt", "exception " << e);
+CPPUNIT_FAIL("exception while in XSLT");
+}
+};
+
+void XsltFilterTest::testXsltCopyNew()
+{
+OUString tempDirURL;
+osl_getTempDirURL(&tempDirURL.pData);
+oslFileHandle tempFile;
+OUString tempURL;
+osl::File::RC rc = osl::File::createTempFile(0, &tempFile, &tempURL);
+CPPUNIT_ASSERT(osl:

Re: Current Build from Git: Writer-Wizards don't run

[Stephan Bergmann]

On 03/04/2014 02:05 PM, Caolán McNamara wrote:

On Mon, 2014-03-03 at 20:36 +0100, Andreas Mantke wrote:

Hi Stephan,

Am 03.03.2014 12:02, schrieb Stephan Bergmann:

On 03/02/2014 05:45 PM, Andreas Mantke wrote:

I build LibreOffice from the current master on my openSuSE 12.3-x64 and
the Writer wizzards don't run anymore.


Fixed with

"Wizards should look for templates in Template_internal, not
Template_user."


Hmm, is the order of nodes under the Template Internal Paths not
actually retained by configmgr ? Looks like they are put into a map with
an OUString key ?, i.e. wizards can't guarantee that the "common"
element will really be the first entry even though "common" is placed
first in the .xcu


Right, /org.openoffice.Office.Paths/Template/InternalPaths is a set, and 
the order in which its elements are reported by configmgr is 
unspecified.  Still, at least the two elements given in 
officecfg/registry/data/org/openoffice/Office/Paths.xcu,







would both result in the same effective path generated via


sLetterPath = self.sTemplatePath + "/../common/wizard/letter"


(wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py), so I'm 
still not sure what is broken for Andreas.  (But 
 
"actively search for wizards dir in all internal templates" is surely an 
improvement in any event.)


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

[Libreoffice-commits] core.git: autogen.sh

[Jan-Marek Glogowski]

 autogen.sh |   38 +++---
 1 file changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 806f4d8e9a5237ee6c70b1f0433bf12601db1260
Author: Jan-Marek Glogowski 
Date:   Tue Mar 4 11:49:46 2014 +

Clarify autogen.sh messages

Actually warn the user, if we ignore provided configuration files.

Also add an extended header to explain the expected behaviour.

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

diff --git a/autogen.sh b/autogen.sh
index a2a9675..f15dd91a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,18 @@
 :
+#
+# This script checks various configure parameters and uses three files:
+#   * autogen.input (ro)
+#   * autogen.lastrun (rw)
+#   * autogen.lastrun.bak (rw)
+#
+# If _no_ parmeters:
+#   Read args from autogen.input or autogen.lastrun
+# Else
+#   Backup autogen.lastrun as autogen.lastrun.bak
+#   Write autogen.lastrun with new commandline args
+#
+# Run configure with checked args
+#
 eval 'exec perl -S $0 ${1+"$@"}'
 if 0;
 
@@ -65,13 +79,13 @@ sub read_args($)
 chomp();
 # migrate from the old system
 if ( substr($_, 0, 1) eq "'" ) {
-print "Migrating options from the old autogen.lastrun format, 
using:\n";
+print STDERR "Migrating options from the old autogen.lastrun 
format, using:\n";
 my @opts;
 @opts = split(/'/);
 foreach my $opt (@opts) {
 if ( substr($opt, 0, 1) eq "-" ) {
 push @lst, $opt;
-print "  $opt\n";
+print STDERR "  $opt\n";
 }
 }
 } elsif ( substr($_, 0, 1) eq "#" ) {
@@ -142,13 +156,31 @@ my $lastrun = "autogen.lastrun";
 
 if (!@ARGV) {
 if (-f $input) {
-warn "Ignoring $lastrun, using $input.\n" if (-f $lastrun);
+if (-f $lastrun) {
+print STDERR 

Re: [PATCH] FILESAVE: Empty custom properties are lost while saving in .doc format

[Michael Stahl]

On 26/02/14 08:07, Tarun Kumar wrote:
> Hi,
> 
> The Bug is filed and accepted at: 
> https://bugs.freedesktop.org/show_bug.cgi?id=75243
> 
> Steps to reproduce:
> 1. Open Writer and use a document .doc
> 2. Add it a custom property. Don't enter any value for the property
> 3. Save it and close Writer
> 4. Open again Writer and use same document recently saved.
> 5. Custom property is lost.

hi Tarun,

agreed, custom properties should be saved even if empty.

> Attached is a patch that solves the problem. Patch is also attached to the 
> bug.
> Please consider this patch for inclusion.

great, your patch fixes the problem!

looking at sfx2/source/doc/docinf.cxx there are numerous calls (affected
by your patch) to the function SetStringValue with static ID, and i'm
not sure whether it is better or worse to store e.g. an Author property
that is empty; have you thought about this?

also, could you please create the patch with "git commit" and put the
bug ID "fdo#75243" in the first line of the commit message, and then
"git format-patch HEAD~".

> I declare that this and my further patches are under LGPLv3+ / MPL license.

great, feel free to add yourself to
 https://wiki.documentfoundation.org/Development/Developers

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

[Libreoffice-commits] core.git: dictionaries

[David Tardon]

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

New commits:
commit 62a18e8ec17b5ee389a2c82866d69d1130351282
Author: David Tardon 
Date:   Tue Mar 4 16:33:32 2014 +0100

Updated core
Project: dictionaries  2f78ad29c9bdf6393cddde39716032bfdab7c9fb

diff --git a/dictionaries b/dictionaries
index b480c59..2f78ad2 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b480c59b2cc6cd6d73f561db435c52568faea4bf
+Subproject commit 2f78ad29c9bdf6393cddde39716032bfdab7c9fb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Current Build from Git: Writer-Wizards don't run

[Stephan Bergmann]

On 03/03/2014 08:36 PM, Andreas Mantke wrote:

Am 03.03.2014 12:02, schrieb Stephan Bergmann:

On 03/02/2014 05:45 PM, Andreas Mantke wrote:

I build LibreOffice from the current master on my openSuSE 12.3-x64 and
the Writer wizzards don't run anymore.


Fixed with

"Wizards should look for templates in Template_internal, not
Template_user."


created a new build from the current git pull (Build ID:
04c7f741f831d87c31b38de5f4074456ad91fb3d) and get the following messages
once I run LibreOffice from command line and call the letter wizard:

[...]

The letter wizard doesn't show up.


Odd.  Are you sure the one-line change from 
 
to wizards/com/sun/star/wizards/ui/WizardDialog.py did find its way into 
your 
/home//libreoffice/libogitrepo/gerritgit/libo3/instdir/program/wizards/ui/WizardDialog.py 
during the re-build?


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

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

[Marcos Paulo de Souza]

 starmath/source/ElementsDockingWindow.cxx |   43 ++
 1 file changed, 26 insertions(+), 17 deletions(-)

New commits:
commit c3126202c429f512231272fb934e8334777c5231
Author: Marcos Paulo de Souza 
Date:   Tue Mar 4 12:04:20 2014 -0300

Fix fdo#65585: Elements Dock: Operators have bad order

Change-Id: Idf29f37032a851632760758d443d73f04bbbae69

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 79e1e5c..aaaba71 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -116,26 +116,35 @@ const sal_uInt16 SmElementsControl::aFunctions[][2] =
 
 const sal_uInt16 SmElementsControl::aOperators[][2] =
 {
-{RID_LIMX, RID_LIMX_HELP}, {RID_SUMX, RID_SUMX_HELP}, {RID_PRODX, 
RID_PRODX_HELP},
-{RID_COPRODX, RID_COPRODX_HELP}, {RID_INTX, RID_INTX_HELP}, {RID_IINTX, 
RID_IINTX_HELP},
-{RID_IIINTX, RID_IIINTX_HELP}, {RID_LINTX, RID_LINTX_HELP}, {RID_LLINTX, 
RID_LLINTX_HELP},
-{RID_LLLINTX, RID_LLLINTX_HELP},
+{RID_LIMX, RID_LIMX_HELP}, {RID_LIM_FROMX, RID_LIM_FROMX_HELP},
+{RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP},
 {0x, 0},
-{RID_LIM_FROMX, RID_LIM_FROMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP}, 
{RID_PROD_FROMX, RID_PROD_FROMX_HELP},
-{RID_COPROD_FROMX, RID_COPROD_FROMX_HELP}, {RID_INT_FROMX, 
RID_INT_FROMX_HELP},
-{RID_IINT_FROMX, RID_IINT_FROMX_HELP}, {RID_IIINT_FROMX, 
RID_IIINT_FROMX_HELP},
-{RID_LINT_FROMX, RID_LINT_FROMX_HELP}, {RID_LLINT_FROMX, 
RID_LLINT_FROMX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
+{RID_SUMX, RID_SUMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP},
+{RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP},
 {0x, 0},
-{RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_SUM_TOX, RID_SUM_TOX_HELP}, 
{RID_PROD_TOX, RID_PROD_TOX_HELP},
-{RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_INT_TOX, RID_INT_TOX_HELP}, 
{RID_IINT_TOX, RID_IINT_TOX_HELP},
-{RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_LINT_TOX, RID_LINT_TOX_HELP}, 
{RID_LLINT_TOX, RID_LLINT_TOX_HELP},
-{RID_LLLINT_TOX, RID_LLLINT_TOX_HELP},
+{RID_PRODX, RID_PRODX_HELP}, {RID_PROD_FROMX, RID_PROD_FROMX_HELP},
+{RID_PROD_TOX, RID_PROD_TOX_HELP}, {RID_PROD_FROMTOX, 
RID_PROD_FROMTOX_HELP},
 {0x, 0},
-{RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP}, {RID_SUM_FROMTOX, 
RID_SUM_FROMTOX_HELP},
-{RID_PROD_FROMTOX, RID_PROD_FROMTOX_HELP}, {RID_COPROD_FROMTOX, 
RID_COPROD_FROMTOX_HELP},
-{RID_INT_FROMTOX, RID_INT_FROMTOX_HELP}, {RID_IINT_FROMTOX, 
RID_IINT_FROMTOX_HELP},
-{RID_IIINT_FROMTOX, RID_IIINT_FROMTOX_HELP}, {RID_LINT_FROMTOX, 
RID_LINT_FROMTOX_HELP},
-{RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP}, {RID_LLLINT_FROMTOX, 
RID_LLLINT_FROMTOX_HELP}
+{RID_COPRODX, RID_COPRODX_HELP}, {RID_COPROD_FROMX, RID_COPROD_FROMX_HELP},
+{RID_COPROD_TOX, RID_COPROD_TOX_HELP}, {RID_COPROD_FROMTOX, 
RID_COPROD_FROMTOX_HELP},
+{0x, 0},
+{RID_INTX, RID_INTX_HELP}, {RID_INT_FROMX, RID_INT_FROMX_HELP},
+{RID_INT_TOX, RID_INT_TOX_HELP}, {RID_INT_FROMTOX, RID_INT_FROMTOX_HELP},
+{0x, 0},
+{RID_IINTX, RID_IINTX_HELP}, {RID_IINT_FROMX, RID_IINT_FROMX_HELP},
+{RID_IINT_TOX, RID_IINT_TOX_HELP}, {RID_IINT_FROMTOX, 
RID_IINT_FROMTOX_HELP},
+{0x, 0},
+{RID_IIINTX, RID_IIINTX_HELP}, {RID_IIINT_FROMX, RID_IIINT_FROMX_HELP},
+{RID_IIINT_TOX, RID_IIINT_TOX_HELP}, {RID_IIINT_FROMTOX, 
RID_IIINT_FROMTOX_HELP},
+{0x, 0},
+{RID_LINTX, RID_LINTX_HELP}, {RID_LINT_FROMX, RID_LINT_FROMX_HELP},
+{RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LINT_FROMTOX, 
RID_LINT_FROMTOX_HELP},
+{0x, 0},
+{RID_LLINTX, RID_LINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP},
+{RID_LLINT_TOX, RID_LINT_TOX_HELP}, {RID_LLINT_FROMTOX, 
RID_LLINT_FROMTOX_HELP},
+{0x, 0},
+{RID_LLLINTX, RID_LINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP},
+{RID_LLLINT_TOX, RID_LINT_TOX_HELP}, {RID_LLLINT_FROMTOX, 
RID_LLLINT_FROMTOX_HELP},
 };
 
 const sal_uInt16 SmElementsControl::aAttributes[][2] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 filter/source/svg/svgfilter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5cab4411c98b128fcc26f25194151af0658ddcac
Author: Stephan Bergmann 
Date:   Tue Mar 4 16:03:47 2014 +0100

warning C4310: cast truncates constant value

Change-Id: Id5535ec71c47ad29283607d1d1b9f3a502e34fe1

diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index e0e698a..5039305 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -270,7 +270,7 @@ bool 
SVGFilter::isStreamGZip(uno::Reference xInput)
 if (nBytes == 2)
 {
 const sal_Int8* pBuffer = aBuffer.getConstArray();
-if (pBuffer[0] == (sal_Int8)0x1F && pBuffer[1] == (sal_Int8)0x8B)
+if (pBuffer[0] == 0x1F && static_cast(pBuffer[1]) == 0x8B)
 return true;
 }
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

Miklos Vajna  changed:

   What|Removed |Added

 CC||vmik...@collabora.co.uk

--- Comment #2 from Miklos Vajna  ---
writerfilter::dmapper::PropertyMap is one such class:

http://opengrok.libreoffice.org/xref/core/writerfilter/source/dmapper/PropertyMap.hxx#91

-- 
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 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

Markus Mohrhard  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Whiteboard||EasyHack DifficultyBeginner
   ||SkillCpp TopicCleanup
 CC||libreoffice@lists.freedeskt
   ||op.org
 Ever confirmed|0   |1

--- Comment #1 from Markus Mohrhard  ---
Making it an Easy Hack.

-- 
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 'libreoffice-4-2' - writerfilter/source

[Michael Stahl]

 writerfilter/source/dmapper/DomainMapper.cxx  |4 ++--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   21 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |7 ++-
 3 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit 9a32be03681a595ce075e6fc6d6c60494a70a2fb
Author: Michael Stahl 
Date:   Sun Mar 2 00:32:17 2014 +0100

fdo#47811: RTF import: fix Database field content

1. the Database field master does not have a "Content" property
2. SetFieldContent was called once for every chunk of text in the field
   result, always overwriting the previous value; accumulate the text.

Change-Id: I63cfda19e2e416c52d100d9071796305a5d813c6
(cherry picked from commit e24ae38c8ef233e4b44840058e35959194724743)
Reviewed-on: https://gerrit.libreoffice.org/8442
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 4b6ed8e..2532942 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3827,7 +3827,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, 
size_t len)
 else if( m_pImpl->IsOpenField() && m_pImpl->IsFieldResultAsString())
  /*depending on the success of the field insert operation this 
result will be
   set at the field or directly inserted into the text*/
-m_pImpl->SetFieldResult( sText );
+m_pImpl->AppendFieldResult(sText);
 else
 {
 if (pContext == 0)
@@ -3930,7 +3930,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 else if( m_pImpl->IsOpenField() && 
m_pImpl->IsFieldResultAsString())
 /*depending on the success of the field insert operation this 
result will be
   set at the field or directly inserted into the text*/
-m_pImpl->SetFieldResult( sText );
+m_pImpl->AppendFieldResult(sText);
 else
 {
 if (pContext == 0)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c7302cf..8822882 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3304,7 +3304,6 @@ void DomainMapper_Impl::CloseFieldCommand()
 // uno::makeAny( pContext->GetCommand().copy( 
nIndex + 1 )));
 uno::Reference< text::XDependentTextField > 
xDependentField( xFieldInterface, uno::UNO_QUERY_THROW );
 xDependentField->attachTextFieldMaster( xMaster );
-m_bSetUserFieldContent = true;
 }
 break;
 case FIELD_MERGEREC : break;
@@ -3538,8 +3537,18 @@ bool DomainMapper_Impl::IsFieldResultAsString()
 return bRet;
 }
 
+void DomainMapper_Impl::AppendFieldResult(OUString const& rString)
+{
+assert(!m_aFieldStack.empty());
+FieldContextPtr pContext = m_aFieldStack.top();
+SAL_WARN_IF(!pContext.get(), "writerfilter.dmapper", "no field context");
+if (pContext.get())
+{
+pContext->AppendResult(rString);
+}
+}
 
-void DomainMapper_Impl::SetFieldResult( OUString& rResult )
+void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
 {
 #ifdef DEBUG_DOMAINMAPPER
 dmapper_logger->startElement("setFieldResult");
@@ -3595,9 +3604,10 @@ void DomainMapper_Impl::SetFieldResult( OUString& 
rResult )
 }
 }
 }
-catch( const uno::Exception& )
+catch (const uno::Exception& e)
 {
-
+SAL_WARN("writerfilter.dmapper",
+"DomainMapper_Impl::SetFieldResult: exception: " << e.Message);
 }
 }
 }
@@ -3641,6 +3651,9 @@ void DomainMapper_Impl::PopFieldContext()
 if( !pContext->IsCommandCompleted() )
 CloseFieldCommand();
 
+if (!pContext->GetResult().isEmpty())
+SetFieldResult(pContext->GetResult());
+
 //insert the field, TC or TOC
 uno::Reference< text::XTextAppend >  xTextAppend;
 if (!m_aTextAppendStack.empty())
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 4686baa..6792be2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -124,6 +124,7 @@ class FieldContext
 ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > 
 m_xStartRange;
 
 OUString 
m_sCommand;
+OUString m_sResult;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > 
 m_xTextField;
 ::com::sun::star::uno::Reference< ::com::sun::star::text::XForm

[Libreoffice-commits] core.git: m4/ax_boost_iostreams.m4

[David Tardon]

 m4/ax_boost_iostreams.m4 |  116 +++
 1 file changed, 116 insertions(+)

New commits:
commit 227d07ecd2d04971aee9a07722583dcde59506b6
Author: David Tardon 
Date:   Tue Mar 4 15:47:03 2014 +0100

add autoconf macro for Boost.Iostreams

... fixing build with system boost

Change-Id: I50eee3e349e99f751439893c577d66ebb46107c2

diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
new file mode 100644
index 000..9d73626
--- /dev/null
+++ b/m4/ax_boost_iostreams.m4
@@ -0,0 +1,116 @@
+# ===
+#http://www.gnu.org/software/autoconf-archive/ax_boost_iostreams.html
+# ===
+#
+# SYNOPSIS
+#
+#   AX_BOOST_IOSTREAMS
+#
+# DESCRIPTION
+#
+#   Test for IOStreams library from the Boost C++ libraries. The macro
+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
+#   available at .
+#
+#   This macro calls:
+#
+# AC_SUBST(BOOST_IOSTREAMS_LIB)
+#
+#   And sets:
+#
+# HAVE_BOOST_IOSTREAMS
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg 
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 20
+
+AC_DEFUN([AX_BOOST_IOSTREAMS],
+[
+   AC_ARG_WITH([boost-iostreams],
+   AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
+   [use the IOStreams library from boost - it is possible to 
specify a certain library for the linker
+e.g. 
--with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
+[
+if test "$withval" = "no"; then
+   want_boost="no"
+elif test "$withval" = "yes"; then
+want_boost="yes"
+ax_boost_user_iostreams_lib=""
+else
+   want_boost="yes"
+   ax_boost_user_iostreams_lib="$withval"
+   fi
+],
+[want_boost="yes"]
+   )
+
+   if test "x$want_boost" = "xyes"; then
+AC_REQUIRE([AC_PROG_CC])
+   CPPFLAGS_SAVED="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+   export CPPFLAGS
+
+   LDFLAGS_SAVED="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+   export LDFLAGS
+
+AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
+  ax_cv_boost_iostreams,
+[AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include 

+   
 @%:@include 
+   
]],
+  [[std::string  input = "Hello World!";
+namespace io = 
boost::iostreams;
+
io::filtering_istream  in(boost::make_iterator_range(input));
+return 
0;
+   ]])],
+ ax_cv_boost_iostreams=yes, 
ax_cv_boost_iostreams=no)
+ AC_LANG_POP([C++])
+   ])
+   if test "x$ax_cv_boost_iostreams" = "xyes"; then
+   AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the 
Boost::IOStreams library is available])
+BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+if test "x$ax_boost_user_iostreams_lib" = "x"; then
+for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* 
$BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' 
-e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 
's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do
+ ax_lib=${libextension}
+   AC_CHECK_LIB($ax_lib, exit,
+ [BOOST_IOSTREAMS_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
+ [link_iostreams="no"])
+   done
+if test "x$link_iostreams" != "xyes"; then
+for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* 
$BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 
's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` 
; do
+ ax_lib=${libextension}
+   AC_CHECK_LIB($ax_lib, exit,
+ [BOOS

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

[Michael Stahl]

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

New commits:
commit 1609eb8d6e9b8d9b4d82be5c46656d4d43256125
Author: Michael Stahl 
Date:   Sat Mar 1 23:13:39 2014 +0100

fdo#47811: fix setPropertyValue("Name") of Database fieldmaster

This one is assigning to the wrong pType variable.

(regression from CWS swwarnings)

Change-Id: I9a74734d22313f215ed69c9a57edf7eb035736ea
(cherry picked from commit c06f686fe001392ceb7f606f5dc3c775997cc7de)
Reviewed-on: https://gerrit.libreoffice.org/8441
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/unocore/unofield.cxx 
b/sw/source/core/unocore/unofield.cxx
index 11f347f..f49595c 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -652,7 +652,7 @@ throw (beans::UnknownPropertyException, 
beans::PropertyVetoException,
 case RES_DBFLD :
 {
 rValue >>= m_pImpl->m_sParam3;
-pType = GetFldType();
+pType2 = GetFldType();
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ww8import/data/bnc821208.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx  |9 +
 sw/source/filter/ww8/ww8par2.cxx  |5 +
 3 files changed, 14 insertions(+)

New commits:
commit e88ee8aa307ecec1cc22cda56b97dcfd8b838ce8
Author: Miklos Vajna 
Date:   Tue Mar 4 14:47:13 2014 +0100

bnc#821208 DOC import: don't overwrite WW8Num* character styles

In general we're overwriting styles on import in case we're not pasting.
But these WW8Num* character styles are in general not from the document,
they are created because Writer needs a character style for each
numbering level to handle what's in the DOC file.

So, in case there is a character style with the same name as our
"character style for numbering" styles, prefer the later ones, as that's
intended most likely.

Change-Id: I675f867722360aca765bb96b0b43ea47deab9847

diff --git a/sw/qa/extras/ww8import/data/bnc821208.doc 
b/sw/qa/extras/ww8import/data/bnc821208.doc
new file mode 100755
index 000..d89d711
Binary files /dev/null and b/sw/qa/extras/ww8import/data/bnc821208.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 0c3e1fc..cc107e0 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -234,6 +234,15 @@ DECLARE_WW8IMPORT_TEST(testListNolevel, "list-nolevel.doc")
 CPPUNIT_ASSERT_EQUAL(OUString("1."), aText);
 }
 
+DECLARE_WW8IMPORT_TEST(testBnc821208, "bnc821208.doc")
+{
+// WW8Num1z0 earned a Symbol font, turning numbers into rectangles.
+uno::Reference 
xPropertyState(getStyles("CharacterStyles")->getByName("WW8Num1z0"), 
uno::UNO_QUERY);
+beans::PropertyState ePropertyState = 
xPropertyState->getPropertyState("CharFontName");
+// This was beans::PropertyState_DIRECT_VALUE.
+CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index c5ac5b8..4d89649 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3736,6 +3736,11 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti 
eSti, sal_uInt16 nThisSty
 }
 
 bool bImport = !bStyExist || pIo->mbNewDoc; // import content ?
+
+// Do not override character styles the list import code created earlier.
+if (bImport && bStyExist && rSI.GetOrgWWName().startsWith("WW8Num"))
+bImport = false;
+
 bool bOldNoImp = pIo->bNoAttrImport;
 rSI.bImportSkipped = !bImport;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/source

[Michael Stahl]

 writerfilter/CppunitTest_writerfilter_misc.mk |   36 +++
 writerfilter/Module_writerfilter.mk   |1 
 writerfilter/qa/cppunittests/misc/misc.cxx|  162 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |  224 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 
 5 files changed, 356 insertions(+), 70 deletions(-)

New commits:
commit 50945ba67bf6dec66b1ed33011316e0fc9197572
Author: Michael Stahl 
Date:   Sat Mar 1 22:05:51 2014 +0100

writerfilter: salvage a field parameter parsing train wreck

Field parameters get horribly maimed by lcl_ExtractParameter which
clearly has never worked in its 7 years of existence (and looking at the
inanity at the call sites makes one wonder what the author was smoking).

The format is actually quite annoying, since spaces between parameters
are optional.

The old RTF filter was at least able to parse "PAGEREF bookmark" fields,
so this fixes such regressions (related: rhbz#1065629).

(cherry picked from commit 3dc548476c7e88f7a67cc38daf622631a34e34dd)

Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx

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

diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk 
b/writerfilter/CppunitTest_writerfilter_misc.mk
new file mode 100644
index 000..1cdcd80
--- /dev/null
+++ b/writerfilter/CppunitTest_writerfilter_misc.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_misc))
+
+$(eval $(call gb_CppunitTest_use_api,writerfilter_misc,\
+   offapi \
+   udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_external,writerfilter_misc,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_libraries,writerfilter_misc, \
+   writerfilter \
+   cppu \
+   sal \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,writerfilter_misc, \
+   $$(INCLUDE) \
+   -I$(SRCDIR)/writerfilter/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_misc, \
+   writerfilter/qa/cppunittests/misc/misc \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk 
b/writerfilter/Module_writerfilter.mk
index 783b6ca..2fcb9e6 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
 
 $(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
 CppunitTest_writerfilter_rtftok \
+CppunitTest_writerfilter_misc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx 
b/writerfilter/qa/cppunittests/misc/misc.cxx
new file mode 100644
index 000..f7031b4
--- /dev/null
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -0,0 +1,162 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+#include 
+
+
+using namespace std;
+
+
+namespace writerfilter { namespace dmapper {
+
+SAL_DLLPUBLIC_IMPORT // export just for test
+boost::tuple, vector >
+lcl_SplitFieldCommand(const OUString& rCommand);
+
+} }
+
+
+namespace {
+
+class WriterfilterMiscTest
+: public ::CppUnit::TestFixture
+{
+public:
+virtual void setUp();
+virtual void tearDown();
+
+void testFieldParameters();
+
+CPPUNIT_TEST_SUITE(WriterfilterMiscTest);
+CPPUNIT_TEST(testFieldParameters);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void WriterfilterMiscTest::setUp()
+{
+}
+
+void WriterfilterMiscTest::tearDown()
+{
+}
+
+void WriterfilterMiscTest::testFieldParameters()
+{
+using writerfilter::dmapper::lcl_SplitFieldCommand;
+boost::tuple, vector > result;
+
+result = lcl_SplitFieldCommand("PAGEREF last_page");
+CPPUNIT_ASSERT_EQUAL(OUString("PAGEREF"), boost::get<0>(result));
+CPPUNIT_ASSERT_EQUAL(size_t(1), boost::get<1>(result).size());
+CPPUNIT_ASSERT_EQUAL(OUString("last_page"), boost::get<1>(result)[0]);
+CPPUNIT_ASSERT(boost::get<2>(result).empty());
+
+result = lcl_SplitFieldCommand(" PAGEREF last_page ");
+CPPUNIT_ASSERT_EQUAL(OUString("PAGEREF"), boost::get<0>(result));
+CPPUNIT_ASSERT_EQ

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

[Miklos Vajna]

 sw/source/core/docnode/nodedump.cxx |   42 
 1 file changed, 24 insertions(+), 18 deletions(-)

New commits:
commit c09fc2c69510cd53da897011192ce1ed727dd12f
Author: Miklos Vajna 
Date:   Tue Mar 4 11:13:45 2014 +0100

sw: include contents of char styles in doc model xml dump

Change-Id: Ie62d808e9b498ef7125d603f20594ab1bb665a50

diff --git a/sw/source/core/docnode/nodedump.cxx 
b/sw/source/core/docnode/nodedump.cxx
index 26aa735..2d0cd2b 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -286,24 +287,6 @@ void SwStartNode::dumpAsXml( xmlTextWriterPtr w )
 // writer.endElement(); - it is a start node, so don't end, will make xml 
better nested
 }
 
-void SwCharFmts::dumpAsXml(xmlTextWriterPtr w)
-{
-WriterHelper writer(w);
-if (size())
-{
-writer.startElement("swcharfmts");
-for (size_t i = 0; i < size(); ++i)
-{
-SwCharFmt* pFmt = static_cast(GetFmt(i));
-writer.startElement("swcharfmt");
-OString aName = OUStringToOString(pFmt->GetName(), 
RTL_TEXTENCODING_UTF8);
-writer.writeFormatAttribute("name", "%s", 
BAD_CAST(aName.getStr()));
-writer.endElement();
-}
-writer.endElement();
-}
-}
-
 void lcl_dumpSfxItemSet(WriterHelper& writer, const SfxItemSet* pSet)
 {
 SfxItemIter aIter(*pSet);
@@ -333,6 +316,9 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 case RES_CHRATR_ROTATE: pWhich = "character rotation"; oValue = 
OString::number(static_cast(pItem)->GetValue()); 
break;
 case RES_PARATR_OUTLINELEVEL: pWhich = "paragraph outline level"; 
oValue = OString::number(static_cast(pItem)->GetValue()); 
break;
 case RES_PARATR_NUMRULE: pWhich = "paragraph numbering rule"; 
oValue = OUStringToOString(static_cast(pItem)->GetValue(), RTL_TEXTENCODING_UTF8); break;
+case RES_CHRATR_FONT: pWhich = "character font"; oValue = 
OUStringToOString(static_cast(pItem)->GetFamilyName(), 
RTL_TEXTENCODING_UTF8); break;
+case RES_CHRATR_BACKGROUND: pWhich = "character background"; break;
+case RES_CHRATR_CTL_FONT: pWhich = "character ctl font"; break;
 }
 if (pWhich)
 writer.writeFormatAttribute("which", "%s", BAD_CAST(pWhich));
@@ -343,6 +329,26 @@ void lcl_dumpSfxItemSet(WriterHelper& writer, const 
SfxItemSet* pSet)
 }
 }
 
+void SwCharFmts::dumpAsXml(xmlTextWriterPtr w)
+{
+WriterHelper writer(w);
+if (size())
+{
+writer.startElement("swcharfmts");
+for (size_t i = 0; i < size(); ++i)
+{
+SwCharFmt* pFmt = static_cast(GetFmt(i));
+writer.startElement("swcharfmt");
+OString aName = OUStringToOString(pFmt->GetName(), 
RTL_TEXTENCODING_UTF8);
+writer.writeFormatAttribute("name", "%s", 
BAD_CAST(aName.getStr()));
+
+lcl_dumpSfxItemSet(writer, &pFmt->GetAttrSet());
+writer.endElement();
+}
+writer.endElement();
+}
+}
+
 void SwTxtFmtColls::dumpAsXml(xmlTextWriterPtr w)
 {
 WriterHelper writer(w);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sw/inc sw/source

[Oliver-Rainer Wittmann]

 sw/inc/IDocumentMarkAccess.hxx   |2 
 sw/inc/ndtxt.hxx |2 
 sw/source/core/bastyp/index.cxx  |   12 +++--
 sw/source/core/crsr/bookmrk.cxx  |   62 +++-
 sw/source/core/crsr/crossrefbookmark.cxx |2 
 sw/source/core/doc/docbm.cxx |   68 ---
 sw/source/core/inc/MarkManager.hxx   |2 
 sw/source/core/inc/bookmrk.hxx   |   11 +++--
 sw/source/core/inc/crossrefbookmark.hxx  |6 +-
 sw/source/core/txtnode/ndtxt.cxx |6 ++
 sw/source/core/undo/undobj.cxx   |   31 +-
 11 files changed, 145 insertions(+), 59 deletions(-)

New commits:
commit aa46680dd96539848bf8bef0293e2a614172515d
Author: Oliver-Rainer Wittmann 
Date:   Tue Mar 4 14:02:37 2014 +

123480: correct the previous made refactoring (revision 1572577)

diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index fd6e376..a9a0251 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -54,7 +54,8 @@ public:
 SwComparePosition eCmpPos,
 const SwPosition& rSttPos,
 const SwPosition& rEndPos,
-SwRedline& rRedl );
+SwRedline& rRedl,
+sal_Bool bCopyNext );
 
 ~SwRedlineSaveData();
 
@@ -1000,9 +1001,10 @@ SwRedlineSaveData::SwRedlineSaveData(
 SwComparePosition eCmpPos,
 const SwPosition& rSttPos,
 const SwPosition& rEndPos,
-SwRedline& rRedl )
+SwRedline& rRedl,
+sal_Bool bCopyNext )
 : SwUndRng( rRedl )
-, SwRedlineData( rRedl.GetRedlineData(), sal_True )
+, SwRedlineData( rRedl.GetRedlineData(), bCopyNext )
 {
 ASSERT( POS_OUTSIDE == eCmpPos || !rRedl.GetContentIdx(), "Redline mit 
Content" );
 
@@ -1012,6 +1014,7 @@ SwRedlineSaveData::SwRedlineSaveData(
 nEndNode = rEndPos.nNode.GetIndex();
 nEndCntnt = rEndPos.nContent.GetIndex();
 break;
+
 case POS_OVERLAP_BEHIND:// Pos1 ueberlappt Pos2 am Ende
 nSttNode = rSttPos.nNode.GetIndex();
 nSttCntnt = rSttPos.nContent.GetIndex();
@@ -1083,6 +1086,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
 rDoc.SetRedlineMode_intern( eOld );
 }
 
+
 sal_Bool SwUndo::FillSaveData(
 const SwPaM& rRange,
 SwRedlineSaveDatas& rSData,
@@ -1103,6 +1107,7 @@ sal_Bool SwUndo::FillSaveData(
 for ( ; n < rTbl.Count(); ++n )
 {
 SwRedline* pRedl = rTbl[n];
+
 const SwComparePosition eCmpPos =
 ComparePosition( *pStt, *pEnd, *pRedl->Start(), *pRedl->End() );
 if ( eCmpPos != POS_BEFORE
@@ -1110,22 +1115,26 @@ sal_Bool SwUndo::FillSaveData(
  && eCmpPos != POS_COLLIDE_END
  && eCmpPos != POS_COLLIDE_START )
 {
-pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd, *pRedl );
+pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd, *pRedl, 
bCopyNext );
 rSData.Insert( pNewData, rSData.Count() );
 }
 }
-
 if ( rSData.Count() && bDelRange )
+{
 rRange.GetDoc()->DeleteRedline( rRange, false, USHRT_MAX );
+}
 return 0 != rSData.Count();
 }
 
+
 sal_Bool SwUndo::FillSaveDataForFmt(
 const SwPaM& rRange,
 SwRedlineSaveDatas& rSData )
 {
 if ( rSData.Count() )
+{
 rSData.DeleteAndDestroy( 0, rSData.Count() );
+}
 
 SwRedlineSaveData* pNewData;
 const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End();
@@ -1137,12 +1146,13 @@ sal_Bool SwUndo::FillSaveDataForFmt(
 SwRedline* pRedl = rTbl[n];
 if ( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
 {
-const SwPosition *pRStt = pRedl->Start(), *pREnd = pRedl->End();
-
-SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, *pRStt, 
*pREnd );
-if ( POS_BEFORE != eCmpPos && POS_BEHIND != eCmpPos && 
POS_COLLIDE_END != eCmpPos && POS_COLLIDE_START != eCmpPos )
+const SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, 
*pRedl->Start(), *pRedl->End() );
+if ( eCmpPos != POS_BEFORE
+ && eCmpPos != POS_BEHIND
+ && eCmpPos != POS_COLLIDE_END
+ && eCmpPos != POS_COLLIDE_START )
 {
-pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd, 
*pRedl );
+pNewData = new SwRedlineSaveData( eCmpPos, *pStt, *pEnd, 
*pRedl, sal_True );
 rSData.Insert( pNewData, rSData.Count() );
 }
 
@@ -1151,6 +1161,7 @@ sal_Bool SwUndo::FillSaveDataForFmt(
 return 0 != rSData.Count();
 }
 
+
 void SwUndo::SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData )
 {
 RedlineMode_t eOld = rDoc.GetRedlineMode();
commit 770c0e6b910129710b4be5cb9e9bae39bfa6bd5a
Author: Oliver-Rainer Wittmann 
Date:   Tue Mar 4 12:35:01 2014 +

124338: assure sorted mark containers when updating  instances due 
to inserted characters

diff -

[Bug 70414] create VSProject files for code editing in MSVS from gbuild

[bugzilla-daemon]

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

--- Comment #16 from vv...@yandex.ru ---
Hello all!

When I try to execute /opt/lo/bin/make vs2012-ide-integration
, I am getting strange error:

Vort@Vort-PC /cygdrive/e/_Projects/libreoffice-build
$ /opt/lo/bin/make vs2012-ide-integration
cd E:/_Projects/libreoffice-core && (LC_MESSAGES=C /opt/lo/bin/make
cmd="/opt/lo/bin/make -npf Makefile.gbuild all" cmd || true) |
E:/_Projects/libreoffice-core/bin/gbuild-to-ide --ide vs2012
make[1]: *** No rule to make target `cmd'.  Stop.
Solution LibreOffice:

What I need to do to fix this?

-- 
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 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

Marcos Souza  changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

--- Comment #63 from Marcos Souza  ---
Thanks a lot Alexandre and other guys who helped to solve this!

And thanks to Stephan who helped us!

-- 
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: wizards/com

[Caolán McNamara]

 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |2 -
 wizards/com/sun/star/wizards/ui/WizardDialog.py   |   12 --
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 5fa18dc21644f2a719bf39ec948a586fa8837b6a
Author: Caolán McNamara 
Date:   Tue Mar 4 13:31:41 2014 +

actively search for wizards dir in all internal templates

Change-Id: I4ef6da4d9d1931917e0aaa6e110fd273bd917b26

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index 76866e7..d8598ff 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -752,7 +752,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 return None
 
 def initializeTemplates(self, xMSF):
-sLetterPath = self.sTemplatePath + "/../common/wizard/letter"
+sLetterPath = self.sTemplatePath + "/wizard/letter"
 self.BusinessFiles = \
 FileAccess.getFolderTitles(
 xMSF, "bus", sLetterPath, self.resources.dictBusinessTemplate)
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.py 
b/wizards/com/sun/star/wizards/ui/WizardDialog.py
index 4e41fdf..e107c63 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.py
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.py
@@ -22,6 +22,7 @@ from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, 
UIConsts, \
 ItemListenerProcAdapter
 from ..common.Resource import Resource
 from ..common.HelpIds import HelpIds
+from ..common.FileAccess import FileAccess
 
 from com.sun.star.lang import NoSuchMethodException
 from com.sun.star.frame import TerminationVetoException
@@ -125,10 +126,17 @@ class WizardDialog(UnoDialog2):
 def initializePaths(self):
 xPropertySet = \
 self.xMSF.createInstance("com.sun.star.util.PathSettings")
-self.sTemplatePath = \
-xPropertySet.getPropertyValue("Template_internal")[0]
 self.sUserTemplatePath = \
 xPropertySet.getPropertyValue("Template_writable")
+myFA = FileAccess(self.xMSF)
+aInternalPaths = xPropertySet.getPropertyValue("Template_internal")
+self.sTemplatePath = ""
+for path in aInternalPaths:
+if myFA.exists(path + "/wizard", False):
+self.sTemplatePath = path
+break
+if self.sTemplatePath == "":
+raise Exception("could not find wizard templates")
 
 def addRoadmap(self):
 try:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #62 from Commit Notification 
 ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=4d6560f5066d143552cba861aaadc2f49b4357d4

fdo#54938: Convert some places to use cppu::supportsService



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: chart2/source editeng/source extensions/source framework/source include/ucbhelper mysqlc/source reportdesign/source sccomp/source scripting/source svx/source ucb/source

[Marcos Paulo de Souza]

 chart2/source/model/main/PageBackground.hxx |8 +-
 editeng/source/accessibility/AccessibleContextBase.cxx  |   24 --
 extensions/source/bibliography/framectr.cxx |5 -
 extensions/source/plugin/base/manager.cxx   |9 --
 extensions/source/plugin/inc/plugin/impl.hxx|3 
 framework/source/uielement/popuptoolbarcontroller.cxx   |   37 
--
 include/ucbhelper/macros.hxx|   12 ---
 mysqlc/source/mysqlc_driver.cxx |2 
 mysqlc/source/mysqlc_resultset.cxx  |2 
 reportdesign/source/core/api/Shape.cxx  |1 
 sccomp/source/solver/solver.cxx |   10 --
 scripting/source/provider/URIHelper.cxx |   10 --
 svx/source/unodraw/unoshape.cxx |2 
 ucb/source/ucp/file/bc.cxx  |   20 -
 ucb/source/ucp/file/prov.cxx|   14 +--
 xmlhelp/source/treeview/tvfactory.cxx   |9 --
 xmlsecurity/source/component/certificatecontainer.cxx   |6 -
 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx |9 --
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |   12 ---
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |   14 ---
 xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx  |   13 ---
 21 files changed, 62 insertions(+), 160 deletions(-)

New commits:
commit 4d6560f5066d143552cba861aaadc2f49b4357d4
Author: Marcos Paulo de Souza 
Date:   Tue Mar 4 08:41:53 2014 -0300

fdo#54938: Convert some places to use cppu::supportsService

The last cases are non obvious, so it's pratically done

Change-Id: Icae1da8e238f516eaed0f7fbdf96fff778eac547
Reviewed-on: https://gerrit.libreoffice.org/8445
Reviewed-by: Marcos Paulo de Souza 
Tested-by: Marcos Paulo de Souza 

diff --git a/chart2/source/model/main/PageBackground.hxx 
b/chart2/source/model/main/PageBackground.hxx
index 7070037..f4b0b58 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -19,11 +19,12 @@
 #ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_PAGEBACKGROUND_HXX
 #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_PAGEBACKGROUND_HXX
 
+#include 
 #include 
 #include 
 #include "MutexContainer.hxx"
 #include "OPropertySet.hxx"
-#include 
+#include 
 
 #include "ServiceMacros.hxx"
 #include "ModifyListenerHelper.hxx"
@@ -34,10 +35,11 @@ namespace chart
 
 namespace impl
 {
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper4<
 ::com::sun::star::util::XCloneable,
 ::com::sun::star::util::XModifyBroadcaster,
-::com::sun::star::util::XModifyListener >
+::com::sun::star::util::XModifyListener,
+::com::sun::star::lang::XServiceInfo >
 PageBackground_Base;
 }
 
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 15958e9..e0ff20c 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -465,11 +466,7 @@ void SAL_CALL 
AccessibleContextBase::removeAccessibleEventListener (
 }
 }
 
-
-
-
 //=  XServiceInfo  
-
 OUString SAL_CALL AccessibleContextBase::getImplementationName (void)
 throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
@@ -477,27 +474,12 @@ OUString SAL_CALL 
AccessibleContextBase::getImplementationName (void)
 return OUString("AccessibleContextBase");
 }
 
-
-
-
-sal_Bool SAL_CALL
- AccessibleContextBase::supportsService (const OUString& sServiceName)
+sal_Bool SAL_CALL AccessibleContextBase::supportsService (const OUString& 
sServiceName)
 throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
-ThrowIfDisposed ();
-//  Iterate over all supported service names and return true if on of them
-//  matches the given name.
-uno::Sequence< OUString > aSupportedServices (
-getSupportedServiceNames ());
-for (int i=0; i SAL_CALL
AccessibleContextBase::getSupportedServiceNames (void)
 throw (::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/extensions/source/bibliography/framectr.cxx 
b/extensions/source/bibliography/framectr.cxx
index 45e6faf..440d19b 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -46,6 +45,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -208,7 +209,7 @@ O

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

[Stephan Bergmann]

 sal/osl/unx/profile.cxx|   13 ++--
 sal/qa/osl/profile/osl_old_testprofile.cxx |   43 -
 2 files changed, 16 insertions(+), 40 deletions(-)

New commits:
commit 8f210c26c53cf5480819d983e57977d531422ff1
Author: Stephan Bergmann 
Date:   Tue Mar 4 13:47:20 2014 +0100

coverity#706154 is about call to strcpy, not osl_ProfileGenerateExtension

...and the call to strcpy isn't even necessary.  This includes a revert of
430237b3fa16bda228ff82b93228f28894568671 "coverity#706154: Dest buffer too
small."

Change-Id: I51186da6e7d80438b01d49e24a1fa47877078516

diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 53f0757..2ee461e 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -2020,26 +2020,21 @@ static sal_Bool 
osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
 
 sal_Char pszBakFile[PATH_MAX];
 sal_Char pszTmpFile[PATH_MAX];
-sal_Char pszIniFile[PATH_MAX];
 
 pszBakFile[0] = '\0';
 pszTmpFile[0] = '\0';
-pszIniFile[0] = '\0';
 
-osl_ProfileGenerateExtension(pProfile->m_FileName, "bak", pszBakFile, 
PATH_MAX - 1);
-
-strcpy(pszIniFile, pProfile->m_FileName);
-
-osl_ProfileGenerateExtension(pProfile->m_FileName, "tmp", pszTmpFile, 
PATH_MAX - 1);
+osl_ProfileGenerateExtension(pProfile->m_FileName, "bak", pszBakFile, 
PATH_MAX);
+osl_ProfileGenerateExtension(pProfile->m_FileName, "tmp", pszTmpFile, 
PATH_MAX);
 
 /* unlink bak */
 unlink( pszBakFile );
 
 /* rename ini bak */
-rename( pszIniFile, pszBakFile );
+rename( pProfile->m_FileName, pszBakFile );
 
 /* rename tmp ini */
-rename( pszTmpFile, pszIniFile );
+rename( pszTmpFile, pProfile->m_FileName );
 
 return bRet;
 }
commit 3dcf6647109feeaa199e64d30a71407e225be582
Author: Stephan Bergmann 
Date:   Tue Mar 4 13:46:16 2014 +0100

Fix CppunitTest_sal_osl_profile

Change-Id: Ie66636881a2e4c754bd95f9d1d72e0b4fc2828df

diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx 
b/sal/qa/osl/profile/osl_old_testprofile.cxx
index 5bdeded..cc8fe8c 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -23,10 +23,8 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
 
-#include 
 #include 
-
-
+#include 
 
 namespace osl_Profile
 {
@@ -42,36 +40,19 @@ namespace osl_Profile
 
 void oldtests::test_profile(void)
 {
-oslProfile hProfile;
-rtl_uString* ustrProfileName=0;
-rtl_uString* ustrProfileName2=0;
-
-rtl_uString_newFromAscii(&ustrProfileName,"//./tmp/soffice.ini");
-
rtl_uString_newFromAscii(&ustrProfileName2,"//./tmp/not_existing_path/soffice.ini");
-
+rtl::OUString baseUrl;
+CPPUNIT_ASSERT(rtl::Bootstrap::get("UserInstallation", baseUrl));
 
 // successful write
-hProfile = osl_openProfile( ustrProfileName, 0 );
-if (hProfile != 0)
-{
-if (! osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ))
-printf( "### cannot write into init file!\n" );
-
-osl_closeProfile( hProfile );
-}
-
-// unsuccessful write
-hProfile = osl_openProfile( ustrProfileName2, 0 );
-if (hProfile != 0)
-{
-if (osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ))
-printf( "### unexpected success writing into test2.ini!\n" );
-
-osl_closeProfile( hProfile );
-}
-
-rtl_uString_release(ustrProfileName);
-rtl_uString_release(ustrProfileName2);
+oslProfile hProfile = osl_openProfile( rtl::OUString(baseUrl + 
"/soffice.ini").pData, osl_Profile_WRITELOCK );
+CPPUNIT_ASSERT(hProfile != 0);
+CPPUNIT_ASSERT_MESSAGE(
+"cannot write into init file",
+osl_writeProfileBool( hProfile, "testsection", "testbool", 1 ));
+CPPUNIT_ASSERT(osl_closeProfile( hProfile ));
+
+// unsuccessful open
+CPPUNIT_ASSERT_EQUAL(oslProfile(0), osl_openProfile( rtl::OUString(baseUrl 
+ "/not_existing_path/soffice.ini").pData, osl_Profile_WRITELOCK ));
 }
 
 } // namespace osl_Profile
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenGrok problems

[Cedric Bosdonnat]

opengrok is up again with updated indexes.

--
Cedric

On Tue, 2014-03-04 at 22:59 +1100, Chris Sherlock wrote:
> Thank you :-) I really appreciate it
> 
> Sorry if that sounded off-hand, it wasn't intentional.
> 
> Chris
> 
> On 04/03/2014, at 10:10 PM, Cedric Bosdonnat  wrote:
> 
> > On Tue, 2014-03-04 at 21:46 +1100, Chris Sherlock wrote:
> >> Actually, I just went to the home screen, in file path typed in
> >> outdev.hxx, and I got the following error:
> > 
> > I know... I'm trying to fix it.
> > 
> > --
> > Cedric
> > 
> > 
> 


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

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

[Stephan Bergmann]

 framework/inc/services.h |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7d3909b493773d49c491ff54a8607eab8b14e0ce
Author: Stephan Bergmann 
Date:   Tue Mar 4 13:15:45 2014 +0100

Remove unused SERVICENAME_FRAMECONTROLLER

Change-Id: I603d5bd978b7e7a6737ab90c6de1be5c02bbf311

diff --git a/framework/inc/services.h b/framework/inc/services.h
index c1cc237..2ae3e01 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -37,7 +37,6 @@ namespace framework{
 #define SERVICENAME_POPUPMENUCONTROLLERFACTORY  
DECLARE_ASCII("com.sun.star.frame.PopupMenuControllerFactory" )
 #define SERVICENAME_POPUPMENUCONTROLLER 
DECLARE_ASCII("com.sun.star.frame.PopupMenuController"   )
 #define SERVICENAME_MENUBARFACTORY  
DECLARE_ASCII("com.sun.star.ui.UIElementFactory" )
-#define SERVICENAME_FRAMECONTROLLER 
DECLARE_ASCII("com.sun.star.frame.Controller"   )
 #define SERVICENAME_TOOLBARFACTORY  
DECLARE_ASCII("com.sun.star.ui.ToolBarFactory"   )
 #define SERVICENAME_TOOLBARCONTROLLERFACTORY
DECLARE_ASCII("com.sun.star.frame.ToolbarControllerFactory" )
 #define SERVICENAME_LICENSE SERVICENAME_JOB
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Ref issue 75489, what is intended purpose for the "non visible" buttons that now show on context menu of each toolbar?

[Stefan Knorr]

Hi Stuart,

On 2 March 2014 16:47, V Stuart Foote  wrote:
> With 4.2 we've added a function to show on each toolbar's context menu those 
> buttons that have NOT been selected as visible for each toolbar.

Iirc, Mirek was the one who pushed for such buttons most.
CC'ing him (he should be subscribed anyway, but...).

> Also,  these buttons on the context menu show as active, and take a button 
> click. However, they seem to not have been connected to any action.

I think that is a (major) bug in the implementation. Thanks for bringing this
up!

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

Re: OpenGrok problems

[Chris Sherlock]

Thank you :-) I really appreciate it

Sorry if that sounded off-hand, it wasn't intentional.

Chris

On 04/03/2014, at 10:10 PM, Cedric Bosdonnat  wrote:

> On Tue, 2014-03-04 at 21:46 +1100, Chris Sherlock wrote:
>> Actually, I just went to the home screen, in file path typed in
>> outdev.hxx, and I got the following error:
> 
> I know... I'm trying to fix it.
> 
> --
> Cedric
> 
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - bin/findunusedcode unusedcode.easy vcl/source

[Caolán McNamara]

 bin/findunusedcode   |1 +
 unusedcode.easy  |   31 ++-
 vcl/source/edit/vclmedit.cxx |1 +
 3 files changed, 8 insertions(+), 25 deletions(-)

New commits:
commit e8da8b3a1a0e21c1601e93f8c0267e524f406da1
Author: Caolán McNamara 
Date:   Tue Mar 4 11:53:40 2014 +

Resolves: fdo#75229 missing object:state-changed:focused

in multiline edits, focus remains stuck on internal
TextWindow instead of being placed on container MultiLineEdit

regression from b755fb8c0f6b1282f62c12f378c0a5ecac64d490 which
removed it with no explanation

Change-Id: I9d6bd546e341651442538bf40de6c43c521868d7

diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 5300e91..3ab4618 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -908,6 +908,7 @@ void TextWindow::Command( const CommandEvent& rCEvt )
 
 void TextWindow::GetFocus()
 {
+Window::GetFocus();
 if ( !mbActivePopup )
 {
 bool bGotoCursor = !mpExtTextView->IsReadOnly();
commit 9b59e888d9c2cc307c1579598d69570124d868b1
Author: Caolán McNamara 
Date:   Tue Mar 4 09:24:53 2014 +

callcatcher consider sdk bin dir too

Change-Id: I754345b637bb71a822c9ea4f1edf6e344172b467

diff --git a/bin/findunusedcode b/bin/findunusedcode
index 4aaf9cc..22727cf 100755
--- a/bin/findunusedcode
+++ b/bin/findunusedcode
@@ -41,6 +41,7 @@ make
 
 callanalyse \
   instdir/program/* \
+  instdir/sdk/bin/* \
   workdir/LinkTarget/*/* workdir/LinkTarget/*/*/* \
   workdir/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
   > unusedcode.all
diff --git a/unusedcode.easy b/unusedcode.easy
index 038e022..eb79e40 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+AstDeclaration::setName(rtl::OString const&)
 BigInt::BigInt(unsigned int)
 CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
 Chart2ExportTest::testFdo74115WallGradientFill()
@@ -7,11 +8,6 @@ DocxSdrExport::getFlyFrameGraphic()
 DocxSdrExport::setFlyFrameGraphic(bool)
 DocxSdrExport::setFrameBtLr(bool)
 EditEngine::IsIdleFormatterActive() const
-EditSelection::IsInvalid() const
-FileStream::FileStream()
-FileStream::close()
-FileStream::createTempFile(rtl::OString const&)
-FileStream::write(void const*, unsigned long)
 GDriveDocument::GDriveDocument(GDriveSession*)
 GDriveFolder::GDriveFolder(GDriveSession*)
 GDriveProperty::GDriveProperty()
@@ -26,11 +22,6 @@ MenuBar::RemoveMenuBarButton(unsigned short)
 MenuBar::SetMenuBarButtonHighlightHdl(unsigned short, Link const&)
 OAuth2Handler::OAuth2Handler()
 OAuth2Handler::getAccessToken()
-Options::Options()
-Options::getInputFiles()
-Options::getOption(rtl::OString const&) const
-Options::getProgramName() const
-Options::isValid(rtl::OString const&) const
 OutputDevice::GetCanvas() const
 OutputDevice::LogicToLogic(basegfx::B2DPolyPolygon const&, MapMode const&, 
MapMode const&)
 OutputDevice::LogicToPixel(Region const&, MapMode const&) const
@@ -52,6 +43,7 @@ SfxBindings::GetSlot(unsigned short)
 SfxBindings::GetSystemWindow() const
 SfxDispatcher::IsOnTop(SfxShell const&)
 SfxGrabBagItem::SetGrabBag(std::map, std::allocator > > const&)
+SfxInt64Item::SetValue(long)
 SfxItemPool::GetMasterPool() const
 SimpleErrorHandler::SimpleErrorHandler()
 SmFontPickList::Contains(Font const&) const
@@ -101,10 +93,6 @@ ThumbnailView::DeselectItem(unsigned short)
 ThumbnailView::GetItemText(unsigned short) const
 ThumbnailView::SetColor(Color const&)
 ToolBox::GetItemExpand(unsigned short) const
-TypeManager::TypeManager()
-TypeManager::decompose(rtl::OUString const&, bool, rtl::OUString*, int*, 
std::vector >*, 
rtl::Reference*) const
-TypeManager::foundAtPrimaryProvider(rtl::OUString const&) const
-TypeManager::loadProvider(rtl::OUString const&, bool)
 
UnoApiTest::closeDocument(com::sun::star::uno::Reference)
 VclMultiLineEdit::IsRightToLeft() const
 VclMultiLineEdit::SetTextSelectable(bool)
@@ -228,13 +216,6 @@ basegfx::tools::equal(basegfx::B3DPolyPolygon const&, 
basegfx::B3DPolyPolygon co
 canvas::createSurfaceProxyManager(boost::shared_ptr 
const&)
 chart::ChartModelHelper::setPageSize(com::sun::star::awt::Size const&, 
com::sun::star::uno::Reference const&)
 
chart::ModifyListenerCallBack::startListening(com::sun::star::uno::Reference
 const&)
-codemaker::ExceptionTree::add(rtl::OString const&, rtl::Reference 
const&)
-codemaker::convertString(rtl::OUString const&)
-codemaker::cpp::scopedCppName(rtl::OString const&, bool)
-codemaker::cpp::translateUnoToCppIdentifier(rtl::OString const&, rtl::OString 
const&, codemaker::cpp::IdentifierTranslationMode, rtl::OString const*)
-codemaker::cpp::translateUnoToCppType(codemaker::UnoType::Sort, rtl::OUString 
const&)
-codemaker::java::translateUnoToJavaIdentifier(rtl::OString const&, 
rtl::OString const&)
-codemaker::java::translateUnoToJavaType(codemaker::UnoType::Sort, rtl::OString 
const&, bool)
 
comphelper::detail::ConfigurationWrapper::getGroupReadWr

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

[Adam Co]

 sw/qa/extras/ooxmlexport/data/fdo65655.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   16 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   10 --
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit d8a395033c7d0c924ce5898b2e9b301dbde80b44
Author: Adam Co 
Date:   Tue Jun 11 18:21:27 2013 +0300

fdo#65655 : fix for Different_Odd_And_Even_Pages flag ignored

Signed-off-by: Miklos Vajna 

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

(cherry picked from commit db23f89b76cb61b215bcae5495eadba2b5ceace2)
Signed-off-by: Michael Stahl 

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

Change-Id: Icf9949bb00aa905d22aedfd8f2b297dfa89dfedb

diff --git a/sw/qa/extras/ooxmlexport/data/fdo65655.docx 
b/sw/qa/extras/ooxmlexport/data/fdo65655.docx
new file mode 100644
index 000..5fe9451
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo65655.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1372151..21fa482 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -78,6 +78,7 @@ public:
 void testCp115();
 void testFdo70812();
 void testBnc837302();
+void testFdo65655();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -140,6 +141,7 @@ void Test::run()
 {"cp115.odt", &Test::testCp115},
 {"fdo70812.docx", &Test::testFdo70812},
 {"bnc837302.docx", &Test::testBnc837302},
+{"fdo65655.docx", &Test::testFdo65655},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -813,6 +815,20 @@ void Test::testBnc837302()
 CPPUNIT_ASSERT_EQUAL(OUString(), aProperty);
 }
 
+void Test::testFdo65655()
+{
+// The problem was that the DOCX had a non-blank odd footer and a blank 
even footer
+// The 'Different Odd & Even Pages' was turned on
+// However - LO assumed that because the 'even' footer is blank - it 
should ignore the 'Different Odd & Even Pages' flag
+// So it did not import it and did not export it
+uno::Reference 
xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+sal_Bool bValue = false;
+xPropertySet->getPropertyValue("HeaderIsShared") >>= bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+xPropertySet->getPropertyValue("FooterIsShared") >>= bValue;
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 131559f..b0cde8d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1404,7 +1404,10 @@ void 
DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
 uno::makeAny(sal_True) );
 // if a left header is available then header are not shared
 bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
-if( bLeft && m_pSettingsTable->GetEvenAndOddHeaders())
+
+// If the 'Different Even & Odd Pages' flag is turned on - do not 
ignore it
+// Even if the 'Even' header is blank - the flag should be 
imported (so it would look in LO like in Word)
+if( m_pSettingsTable->GetEvenAndOddHeaders())
 
xPageStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_HEADER_IS_SHARED), 
uno::makeAny( false ));
 
 //set the interface
@@ -1446,7 +1449,10 @@ void 
DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
 uno::makeAny(sal_True) );
 // if a left header is available then footer is not shared
 bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
-if( bLeft && m_pSettingsTable->GetEvenAndOddHeaders())
+
+// If the 'Different Even & Odd Pages' flag is turned on - do not 
ignore it
+// Even if the 'Even' footer is blank - the flag should be 
imported (so it would look in LO like in Word)
+if( m_pSettingsTable->GetEvenAndOddHeaders())
 
xPageStyle->setPropertyValue(rPropNameSupplier.GetName(PROP_FOOTER_IS_SHARED), 
uno::makeAny( false ));
 //set the interface
 uno::Reference< text::XText > xFooterText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #61 from Marcos Souza  ---
Stephan, these are the last cases that needs conversion to supportsService(and
maybe to inherit the XServiceInfo):

./dbaccess/source/inc/apitools.hxx: Needs to be converted to
cppu::supportsService at line 80.
./reportdesign/source/core/sdr/RptObject.cxx: Needs to be converted to
cppu::supportsService at line 421.
./comphelper/source/misc/servicedecl.cxx: Needs to be converted to
cppu::supportsService at line 80.
./comphelper/source/misc/servicedecl.cxx: Needs to be converted to
cppu::supportsService at line 136.
./basctl/source/dlged/dlgedobj.cxx: Needs to be converted to
cppu::supportsService at line 638.
./chart2/source/inc/ServiceMacros.hxx: Needs to be converted to
cppu::supportsService at line 70

These headers are used in a lot of places, so this can be a little difficult to
do now.

What you suggests, to leave thia as it is?

Thanks!

-- 
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: Changes to 'refs/tags/cp-4.2-branch-point'

[Michael Stahl]

Tag 'cp-4.2-branch-point' created by Jan Holesovsky  at 
2014-03-04 11:44 -0800

distro/collabora/cp-4.2 branch point

Changes since libreoffice-4-2-milestone-5-740:
---
 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 'distro/collabora/cp-4.2'

[Michael Stahl]

New branch 'distro/collabora/cp-4.2' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sal/Library_sal.mk  |2 
 sal/osl/unx/profile.c   | 2212 
 sal/osl/unx/profile.cxx | 2212 
 3 files changed, 2213 insertions(+), 2213 deletions(-)

New commits:
commit b15b51b76997c5b4cce5fa3d70df99acc1a5439a
Author: Stephan Bergmann 
Date:   Tue Mar 4 12:17:41 2014 +0100

sal/osl/unx: profile.c -> profile.cxx (to facilitate further fixes)

Change-Id: I3de66f499d20e7765b530890f746ccfe322252ac

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 6b16426..bda3dd346 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/module \
sal/osl/unx/process \
sal/osl/unx/process_impl \
+   sal/osl/unx/profile \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
@@ -172,7 +173,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/mutex \
sal/osl/unx/nlsupport \
sal/osl/unx/pipe \
-   sal/osl/unx/profile \
sal/osl/unx/readwrite_helper \
sal/osl/unx/security \
sal/osl/unx/socket \
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.cxx
similarity index 99%
rename from sal/osl/unx/profile.c
rename to sal/osl/unx/profile.cxx
index 906109b..53f0757 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.cxx
@@ -135,7 +135,7 @@ static void osl_ProfileGenerateExtension(const sal_Char* 
pszFileName, const sal_
 static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, 
oslProfileOption Flags);
 
 /* implemented in file.c */
-extern oslFileError FileURLToPath( char *, size_t, rtl_uString* );
+extern "C" oslFileError FileURLToPath( char *, size_t, rtl_uString* );
 
 oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, 
oslProfileOption Options)
 {
@@ -151,7 +151,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const 
sal_Char *pszProfileName, o
 {
 osl_TFile*pFile;
 osl_TProfileImpl* pProfile;
-sal_Bool bRet = sal_False;
+bool bRet = false;
 
 #ifdef TRACE_OSL_PROFILE
 OSL_TRACE("In  osl_openProfile");
@@ -1288,7 +1288,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, 
oslProfileOption Flags)
 
 static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
 {
-sal_Bool bRet = sal_True;
+bool bRet = true;
 #ifdef TRACE_OSL_PROFILE
 OSL_TRACE("In  osl_OslProfile_rewindFile");
 #endif
@@ -1881,7 +1881,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, 
osl_TProfileImpl* pProfile)
 if (! addEntry(pProfile, 
&pProfile->m_Sections[pProfile->m_NoSections - 1],
i, pStr, pChar - pStr))
 {
-OSL_ASSERT(0);
+OSL_ASSERT(false);
 continue;
 }
 
@@ -1892,7 +1892,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, 
osl_TProfileImpl* pProfile)
 
 if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1))
 {
-OSL_ASSERT(0);
+OSL_ASSERT(false);
 continue;
 }
 
@@ -1987,7 +1987,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, 
sal_Bool bCleanup)
 static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
 {
 osl_TFile* pFile=0;
-sal_Char* pszExtension = "tmp";
+sal_Char const * pszExtension = "tmp";
 sal_Char pszTmpName[PATH_MAX];
 oslProfileOption PFlags=0;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenGrok problems

[Cedric Bosdonnat]

On Tue, 2014-03-04 at 21:46 +1100, Chris Sherlock wrote:
> Actually, I just went to the home screen, in file path typed in
> outdev.hxx, and I got the following error:

I know... I'm trying to fix it.

--
Cedric


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

Re: OpenGrok problems

[Chris Sherlock]

Actually, I just went to the home screen, in file path typed in outdev.hxx, and 
I got the following error:

org.apache.lucene.store.LockObtainFailedException: Lock obtain timed out: 
NativeFSLock@/srv/opengrok/data/spellIndex/core/write.lock: 
java.io.FileNotFoundException: /srv/opengrok/data/spellIndex/core/write.lock 
(Permission denied) at org.apache.lucene.store.Lock.obtain(Lock.java:84) at 
org.apache.lucene.index.IndexWriter.init(IndexWriter.java:1045) at 
org.apache.lucene.index.IndexWriter.(IndexWriter.java:868) at 
org.apache.lucene.search.spell.SpellChecker.setSpellIndex(SpellChecker.java:142)
 at org.apache.lucene.search.spell.SpellChecker.(SpellChecker.java:110) at 
org.apache.lucene.search.spell.SpellChecker.(SpellChecker.java:124) at 
org.apache.jsp.search_jsp._jspService(search_jsp.java:687) at 
org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) at 
javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at 
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:374) 
at org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342) at 
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267) at 
javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
 at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
 at 
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
 at 
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
 at 
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128) 
at 
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) 
at 
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
 at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:286) 
at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190) at 
org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291) at 
org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769) at 
org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698) at 
org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891)
 at 
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690)
 at java.lang.Thread.run(Thread.java:804) Caused by: 
java.io.FileNotFoundException: /srv/opengrok/data/spellIndex/core/write.lock 
(Permission denied) at java.io.RandomAccessFile.(RandomAccessFile.java:252) at 
org.apache.lucene.store.NativeFSLock.obtain(NativeFSLockFactory.java:222) at 
org.apache.lucene.store.Lock.obtain(Lock.java:95) ... 27 more
Lock obtain timed out: 
NativeFSLock@/srv/opengrok/data/spellIndex/core/write.lock: 
java.io.FileNotFoundException: /srv/opengrok/data/spellIndex/core/write.lock 
(Permission denied)


Sent from my iPad

On 04/03/2014, at 8:06 PM, Cedric Bosdonnat  wrote:

> Hi again Chris,
> 
> Could the error you saw be something like this?
> 
> - %< -
> Mar 03, 2014 10:29:29 AM org.opensolaris.opengrok.search.Results 
> prettyPrintHTML
> WARNING: An error occured while creating summary of 
> /core/icon-themes/tango/cmd/lc_exportdirecttopdf.xcf.bz2
> java.io.FileNotFoundException: 
> /var/opengrok/data/xref/core/icon-themes/tango/cmd/lc_exportdirecttopdf.xcf.bz2.gz
>  (No such file or directory)
>at java.io.FileInputStream.(FileInputStream.java:157)
>at java.io.FileInputStream.(FileInputStream.java:112)
>at 
> org.opensolaris.opengrok.search.Results.prettyPrintHTML(Results.java:116)
>at org.apache.jsp.search_jsp._jspService(search_jsp.java:892)
>at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
>at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
>at 
> org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:374)
>at 
> org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
>at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
>at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
>at 
> org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
>at 
> org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
>at 
> org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
>at 
> org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
>at 
> org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
>at 
> org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
>at 
> org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
>at 
> org.apache.catalina.connector.Coy

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

[Tor Lillqvist]

 fpicker/source/aqua/ControlHelper.mm |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9a06a6e6499e275c3b277cd88878522757a5de37
Author: Tor Lillqvist 
Date:   Tue Mar 4 11:58:34 2014 +0200

Avoid potentially sending message to deallocated instance

The m_pFilterControl is always added to the m_aActiveControls list
(see createFilterControl()), so it has been released by the loop over
the list. So make sure to call setTarget before the loop.

For some reason this doesn't normally cause sending a message to a
deallocated instance, though. (I only noticed it when experimenting
with if-zeroing out the creation of the user pane.) I guess this might
mean that we actually have a leak here, if the controls in the list
don't actually get deallocated by the release messages in the loop?

Change-Id: If691f8d35bab606ce8a61f677d8e495e72a23148

diff --git a/fpicker/source/aqua/ControlHelper.mm 
b/fpicker/source/aqua/ControlHelper.mm
index 025639a..08a3971 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -78,6 +78,10 @@ ControlHelper::~ControlHelper()
 [m_pUserPane release];
 }
 
+if (m_pFilterControl != NULL) {
+[m_pFilterControl setTarget:nil];
+}
+
 for(std::list::iterator control = m_aActiveControls.begin(); 
control != m_aActiveControls.end(); ++control) {
 NSControl* pControl = (*control);
 NSString* sLabelName = m_aMapListLabels[pControl];
@@ -93,10 +97,6 @@ ControlHelper::~ControlHelper()
 [pControl release];
 }
 
-if (m_pFilterControl != NULL) {
-[m_pFilterControl setTarget:nil];
-}
-
 [pool release];
 
 DBG_PRINT_EXIT(CLASS_NAME, __func__);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bug 73552 - Set name of CSV import sheet to something friendly

[voilavoil...@yahoo.in]

diff file submitted on bugzilla: 
https://bugassistant.libreoffice.org/attachment.cgi?id=93826




On Saturday, 1 March 2014 2:10 PM, "voilavoil...@yahoo.in" 
 wrote:

diff file submitted on bugzilla: 
https://bugassistant.libreoffice.org/attachment.cgi?id=93826



On Friday, 28 February 2014 10:18 PM, "voilavoil...@yahoo.in" 
 wrote:

diff file submitted on bugzilla: 
https://bugassistant.libreoffice.org/attachment.cgi?id=93826




On Friday, 28 February 2014 8:58 PM, Eike Rathke  wrote:

Hi voilavoila28,


On Friday, 2014-02-28 05:28:35 +0800, voilavoil...@yahoo.in wrote:

> 0001-Set-name-of-CSV-import-sheet-to-something-friendly.patch

There was no patch attached to your mail.

If possible we'd prefer a patch submission to gerrit, see
https://wiki.documentfoundation.org/Development/gerrit

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Bug 73552 - Set name of CSV import sheet to something friendly

[voilavoil...@yahoo.in]

diff file submitted on bugzilla: 
https://bugassistant.libreoffice.org/attachment.cgi?id=93826




On Friday, 28 February 2014 10:18 PM, "voilavoil...@yahoo.in" 
 wrote:
 
diff file submitted on bugzilla: 
https://bugassistant.libreoffice.org/attachment.cgi?id=93826




On Friday, 28 February 2014 8:58 PM, Eike Rathke  wrote:
 
Hi voilavoila28,


On Friday, 2014-02-28 05:28:35 +0800, voilavoil...@yahoo.in wrote:

> 0001-Set-name-of-CSV-import-sheet-to-something-friendly.patch

There was no patch attached to your mail.

If possible we'd prefer a patch submission to gerrit, see
https://wiki.documentfoundation.org/Development/gerrit

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Ref issue 75489, what is intended purpose for the "non visible" buttons that now show on context menu of each toolbar?

[V Stuart Foote]

Here is a mixed UX and Dev question... 

As submitted by a vigilant user,  "OfficeUser" (Norbert N.), https://bugs.freedesktop.org/show_bug.cgi?id=75489";>fdo#74589  raises 
an interesting UI question, introduced for 4.2,  what is intended purpose for 
the "non visible" buttons  that now show on context menu of each toolbar?

Through the 4.1 releases, toolbar context menus provide only the 'visible 
buttons' and 'customize toolbar' (as well as dock, dock all, lock, and close).

With 4.2 we've added a function to show on each toolbar's context menu those 
buttons that have NOT been selected as visible for each toolbar. 

Also,  these buttons on the context menu show as active, and take a button 
click. However, they seem to not have been connected to any action.

Same behavior for all  the 4.2.x builds, as well as for 4.3.0 builds of master.

Did something not get finished, or was just forgotten?   Seems we should either 
complete their implementation, or could set them unclickable, or even remove 
them as a UX distraction.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - fpicker/source

[Tor Lillqvist]

 fpicker/source/aqua/ControlHelper.mm |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 02a67e46c99f90cbfda417b771f4dc3f29849e17
Author: Tor Lillqvist 
Date:   Tue Mar 4 11:58:34 2014 +0200

Avoid potentially sending message to deallocated instance

The m_pFilterControl is always added to the m_aActiveControls list
(see createFilterControl()), so it has been released by the loop over
the list. So make sure to call setTarget before the loop.

For some reason this doesn't normally cause sending a message to a
deallocated instance, though. (I only noticed it when experimenting
with if-zeroing out the creation of the user pane.) I guess this might
mean that we actually have a leak here, if the controls in the list
don't actually get deallocated by the release messages in the loop?

Change-Id: If691f8d35bab606ce8a61f677d8e495e72a23148

diff --git a/fpicker/source/aqua/ControlHelper.mm 
b/fpicker/source/aqua/ControlHelper.mm
index c627d9b..78a2a50 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -78,6 +78,10 @@ ControlHelper::~ControlHelper()
 [m_pUserPane release];
 }
 
+if (m_pFilterControl != NULL) {
+[m_pFilterControl setTarget:nil];
+}
+
 for(std::list::iterator control = m_aActiveControls.begin(); 
control != m_aActiveControls.end(); ++control) {
 NSControl* pControl = (*control);
 NSString* sLabelName = m_aMapListLabels[pControl];
@@ -93,10 +97,6 @@ ControlHelper::~ControlHelper()
 [pControl release];
 }
 
-if (m_pFilterControl != NULL) {
-[m_pFilterControl setTarget:nil];
-}
-
 [pool release];
 
 DBG_PRINT_EXIT(CLASS_NAME, __func__);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 93/8c867ce8820104a116ca46ffe683a9a69c285d

[Stephan Bergmann]

 93/8c867ce8820104a116ca46ffe683a9a69c285d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 408c5dfb1c1ecc39ae4784cf7603c9dde9390db7
Author: Stephan Bergmann 
Date:   Tue Mar 4 10:39:17 2014 +0100

Notes added by 'git notes add'

diff --git a/93/8c867ce8820104a116ca46ffe683a9a69c285d 
b/93/8c867ce8820104a116ca46ffe683a9a69c285d
new file mode 100644
index 000..fa8c401
--- /dev/null
+++ b/93/8c867ce8820104a116ca46ffe683a9a69c285d
@@ -0,0 +1 @@
+reject: half-baked clean-up of published mail API (e.g., consolidates 
Simple{Command,System}Mail but keeps needless queryMailClient indirection; 
consolidates XSimpleMailMessage{,2} but needlessly keeps it an interface 
instead of a struct); probably does more harm than good
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f3a79ea8c3a2949845a14f323b9399a74ef3f607
Author: Miklos Vajna 
Date:   Tue Mar 4 10:12:20 2014 +0100

CppunitTest_sw_ooxmlsdrexport: make this failure a bit more readable

Change-Id: Ia71f5ea712ad16d6eef3af1136613d38cd27b581

diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index a1c378b..d3e6f6b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -201,7 +201,8 @@ DECLARE_OOXMLEXPORT_TEST(testDmlRectangleRelsize, 
"dml-rectangle-relsize.docx")
 {
 // This was around 19560, as we did not read wp14:pctHeight for
 // drawinglayer shapes and the fallback data was invalid.
-CPPUNIT_ASSERT(getShape(1)->getSize().Height >= 20992);
+OString aMessage("Height is only " + 
OString::number(getShape(1)->getSize().Height));
+CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), getShape(1)->getSize().Height >= 
20992);
 
 // This was around 0: relative size of 0% was imported as 0, not "fall 
back to absolute size".
 CPPUNIT_ASSERT(getShape(2)->getSize().Height > 300);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OpenGrok problems

[Cedric Bosdonnat]

Hi again Chris,

Could the error you saw be something like this?

- %< -
Mar 03, 2014 10:29:29 AM org.opensolaris.opengrok.search.Results prettyPrintHTML
WARNING: An error occured while creating summary of 
/core/icon-themes/tango/cmd/lc_exportdirecttopdf.xcf.bz2
java.io.FileNotFoundException: 
/var/opengrok/data/xref/core/icon-themes/tango/cmd/lc_exportdirecttopdf.xcf.bz2.gz
 (No such file or directory)
at java.io.FileInputStream.(FileInputStream.java:157)
at java.io.FileInputStream.(FileInputStream.java:112)
at 
org.opensolaris.opengrok.search.Results.prettyPrintHTML(Results.java:116)
at org.apache.jsp.search_jsp._jspService(search_jsp.java:892)
at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at 
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:374)
at 
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
at org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at 
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
at 
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
at 
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:128)
at 
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
at 
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
at 
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:286)
at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:190)
at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291)
at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:769)
at 
org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:698)
at 
org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:891)
at 
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:690)
at java.lang.Thread.run(Thread.java:804)
- %< -

In which case that could be normal: it seems the indexes haven't managed to be 
refreshed since Feb. 26. I'll try to get that fixed properly.

--
Cedric

On Tue, 2014-03-04 at 09:53 +0100, Cedric Bosdonnat wrote:
> Hi Chris,
> 
> On Tue, 2014-03-04 at 12:42 +1100, Chris Sherlock wrote:
> > Sorry if this is the wrong list, but who looks after 
> > opengrok.libreoffice.org? Currently search isn't working, it gives some 
> > sort of error.
> 
> thanks for the notification. I'll have a look at it... opengrok index
> updating is somehow having problems these days.
> 
> Regards,
> 
> --
> Cedric
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

Re: OpenGrok problems

[Cedric Bosdonnat]

Hi Chris,

On Tue, 2014-03-04 at 12:42 +1100, Chris Sherlock wrote:
> Sorry if this is the wrong list, but who looks after 
> opengrok.libreoffice.org? Currently search isn't working, it gives some sort 
> of error.

thanks for the notification. I'll have a look at it... opengrok index
updating is somehow having problems these days.

Regards,

--
Cedric

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

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

[Andras Timar]

 scp2/source/ooo/registryitem_ooo.ulf |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 0529742403ad5522d69e0d45046e9156a23efd10
Author: Andras Timar 
Date:   Tue Mar 4 09:42:38 2014 +0100

remove unused strings

Change-Id: I5de065e1701da119e15934a07d0e63d538a9f53c

diff --git a/scp2/source/ooo/registryitem_ooo.ulf 
b/scp2/source/ooo/registryitem_ooo.ulf
index 2756686..d4b5aa4 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -16,17 +16,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-[STR_REG_VAL_NEW]
-en-US = "&New"
-
 [STR_REG_VAL_INSTALL]
 en-US = "&Install"
 
 [STR_REG_VAL_SO60_CONFIGFILE]
 en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
 
-[STR_REG_VAL_SO50_TEMPLATE_OOO]
-en-US = "StarOffice 5.0 Template"
-
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
 en-US = "LibreOffice"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/np_sdk sal/textenc sw/source vcl/generic vcl/source

[Takeshi Abe]

 external/np_sdk/npsdk/npwin.cxx  |1 +
 sal/textenc/convertsimple.cxx|2 ++
 sal/textenc/handleundefinedunicodetotextchar.cxx |2 ++
 sw/source/core/access/accfield.cxx   |3 +++
 sw/source/core/access/accnotexthyperlink.cxx |3 +++
 sw/source/core/crsr/overlayrangesoutline.cxx |3 ++-
 sw/source/ui/dialog/wordcountwrapper.cxx |2 ++
 vcl/generic/app/geninst.cxx  |2 ++
 vcl/source/app/IconThemeInfo.cxx |3 ++-
 vcl/source/app/IconThemeScanner.cxx  |3 +++
 vcl/source/gdi/gdimetafiletools.cxx  |2 ++
 11 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 8e65dd0897d38e850988a37eb8f1b1c70ccb42cf
Author: Takeshi Abe 
Date:   Tue Mar 4 14:01:24 2014 +0900

Add mode lines

Change-Id: Iae71a0779839015b7c853f93703fe263f84a591a

diff --git a/external/np_sdk/npsdk/npwin.cxx b/external/np_sdk/npsdk/npwin.cxx
index 9021c63..bbabd97 100644
--- a/external/np_sdk/npsdk/npwin.cxx
+++ b/external/np_sdk/npsdk/npwin.cxx
@@ -356,3 +356,4 @@ jref NPN_GetJavaPeer(NPP instance)
 #endif
 } //end of extern "C"
 
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx
index c917f17..6f5b500 100644
--- a/sal/textenc/convertsimple.cxx
+++ b/sal/textenc/convertsimple.cxx
@@ -664,3 +664,5 @@ sal_Size sal::detail::textenc::convertUnicodeToChar(
 *pSrcCvtChars = nSrcChars - (pEndSrcBuf-pSrcBuf);
 return (nDestBytes - (pEndDestBuf-pDestBuf));
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx 
b/sal/textenc/handleundefinedunicodetotextchar.cxx
index 22f1baa..6ea1dad 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.cxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.cxx
@@ -171,3 +171,5 @@ bool sal::detail::textenc::handleUndefinedUnicodeToTextChar(
 
 return true;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfield.cxx 
b/sw/source/core/access/accfield.cxx
index c6e2d2d..49584c1 100644
--- a/sw/source/core/access/accfield.cxx
+++ b/sw/source/core/access/accfield.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -310,3 +311,5 @@ void SAL_CALL SwAccessibleField::removeEventListener(
 }
 }
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accnotexthyperlink.cxx 
b/sw/source/core/access/accnotexthyperlink.cxx
index 40d684b..5e59cc2 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -235,3 +236,5 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid(  )
 return sal_True;
 return sal_False;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/overlayrangesoutline.cxx 
b/sw/source/core/crsr/overlayrangesoutline.cxx
index ed8e352..724e0bf 100644
--- a/sw/source/core/crsr/overlayrangesoutline.cxx
+++ b/sw/source/core/crsr/overlayrangesoutline.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -103,4 +104,4 @@ namespace sw
 } // end of namespace overlay
 } // end of namespace sdr
 
-// eof
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx 
b/sw/source/ui/dialog/wordcountwrapper.cxx
index cf8734b..78cf4ee 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -45,3 +45,5 @@ void SwWordCountWrapper::SetCounts(const SwDocStat &rCurrCnt, 
const SwDocStat &r
 {
 pAbstDlg->SetCounts(rCurrCnt, rDocStat);
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 432fdf6..7d9d1b5 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -129,3 +129,5 @@ SalGenericInstance::~SalGenericInstance()
 ::tools::SolarMutex::SetSolarMutex( 0 );
 delete mpSalYieldMutex;
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 89a1b4e..5e18348 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -177,4 +178,4 @@ IconThemeInfo::IconThemeIsInVector(const 
std::vector& themes
 
 } // end namespace vcl
 
-
+/* vim:set shiftwidth=4 softtabstop=4 expan

[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann]

 configure.ac |  107 +--
 1 file changed, 53 insertions(+), 54 deletions(-)

New commits:
commit 3a8c38fa3f7c0c17f0d0dc688df742ab2a7b7a42
Author: Stephan Bergmann 
Date:   Tue Mar 4 08:56:33 2014 +0100

Use CXXFLAGS_CXX11 when detecting Clang plugin headers

...which is necessary for recent Clang trunk towards 3.5, which is 
implemented
in C++11 now, and should not hurt for older versions.  Required to move the
plugin check after the check that determines CXXFLAGS_CXX11.

Change-Id: I73aff79e09749e9d7c6ea813422f35c1b8475041

diff --git a/configure.ac b/configure.ac
index 9284af5..3676db5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5659,60 +5659,6 @@ fi
 AC_CONFIG_HEADERS([config_host/config_probes.h])
 
 dnl ===
-dnl Compiler plugins
-dnl ===
-
-COMPILER_PLUGINS=
-# currently only Clang
-if test "$COM_GCC_IS_CLANG" = "TRUE"; then
-if test -n "$enable_compiler_plugins"; then
-compiler_plugins="$enable_compiler_plugins"
-elif test -n "$ENABLE_DBGUTIL"; then
-compiler_plugins=test
-else
-compiler_plugins=no
-fi
-if test "$compiler_plugins" != "no"; then
-dnl The prefix where Clang resides, override to where Clang resides if
-dnl using a source build:
-if test -z "$CLANGDIR"; then
-CLANGDIR=/usr
-fi
-AC_LANG_PUSH([C++])
-save_CPPFLAGS=$CPPFLAGS
-save_CXX=$CXX
-# compiler plugins must be built with "native" bitness of clang
-# because they link against clang libraries
-CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//`
-CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include 
-I$CLANGDIR/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS 
-D__STDC_LIMIT_MACROS"
-AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
-[COMPILER_PLUGINS=TRUE],
-[
-if test "$compiler_plugins" = "yes"; then
-AC_MSG_ERROR([Cannot find Clang headers to build compiler 
plugins.])
-else
-AC_MSG_WARN([Cannot find Clang headers to build compiler 
plugins, plugins disabled])
-add_warning "Cannot find Clang headers to build compiler 
plugins, plugins disabled."
-fi
-])
-CXX=$save_CXX
-CPPFLAGS=$save_CPPFLAGS
-AC_LANG_POP([C++])
-fi
-else
-if test "$enable_compiler_plugins" = "yes"; then
-AC_MSG_ERROR([Compiler plugins are currently supported only with the 
Clang compiler.])
-fi
-fi
-AC_SUBST(COMPILER_PLUGINS)
-AC_SUBST(CLANGDIR)
-
-# Plugin to help linker.
-# Add something like LD_PLUGIN=/usr/lib64/LLVMgold.so to your autogen.input.
-# This makes --enable-lto build with clang work.
-AC_SUBST(LD_PLUGIN)
-
-dnl ===
 dnl Set the MinGW sys-root
 dnl ===
 if test "$WITH_MINGW" = "yes"; then
@@ -6620,6 +6566,59 @@ fi
 AC_SUBST(HAVE_GCC_FNO_DEFAULT_INLINE)
 AC_SUBST(HAVE_GCC_FNO_ENFORCE_EH_SPECS)
 
+dnl ===
+dnl Compiler plugins
+dnl ===
+
+COMPILER_PLUGINS=
+# currently only Clang
+if test "$COM_GCC_IS_CLANG" = "TRUE"; then
+if test -n "$enable_compiler_plugins"; then
+compiler_plugins="$enable_compiler_plugins"
+elif test -n "$ENABLE_DBGUTIL"; then
+compiler_plugins=test
+else
+compiler_plugins=no
+fi
+if test "$compiler_plugins" != "no"; then
+dnl The prefix where Clang resides, override to where Clang resides if
+dnl using a source build:
+if test -z "$CLANGDIR"; then
+CLANGDIR=/usr
+fi
+AC_LANG_PUSH([C++])
+save_CPPFLAGS=$CPPFLAGS
+save_CXX=$CXX
+# compiler plugins must be built with "native" bitness of clang
+# because they link against clang libraries
+CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//`
+CPPFLAGS="$CPPFLAGS $CXXFLAGS_CXX11 -I$CLANGDIR/include 
-I$CLANGDIR/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS 
-D__STDC_LIMIT_MACROS"
+AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
+[COMPILER_PLUGINS=TRUE],
+[
+if test "$compiler_plugins" = "yes"; then
+AC_MSG_ERROR([Cannot find Clang headers to build compiler 
plugins.])
+else
+AC_MSG_WARN([Cannot find Clang headers to build compiler 
plugins, plugins disabled])
+add_warning "Cannot find Clang headers to build compiler 
plugins, plugins disabled."
+fi
+])
+CXX=$save_CXX
+CPPFLAGS=$save_CPPFLAGS
+AC_LANG_POP([C+