LibreOffice Gerrit News for core on 2015-05-28

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ tdf#90888:Shrink the properties sidebar sections in Calc
  in https://gerrit.libreoffice.org/15935 from Rishabh Kumar
  about module sc
+ tdf#87862: Rearranging the lower half of slide transition tab
  in https://gerrit.libreoffice.org/15929 from Rishabh Kumar
  about module sd
+ Bug 91489 - CONDITIONAL FORMATTING: Crash on select Icon Set from dialog
  in https://gerrit.libreoffice.org/15928 from Philippe Jung
  about module sc
+ Implemented formula group count statistic
  in https://gerrit.libreoffice.org/15927 from Benjamin Ni
  about module sc
+ tdf#58122 FILESAVE: XLSX - Cell RTL direction state not saved
  in https://gerrit.libreoffice.org/15920 from Priyanka Gaikwad
  about module sc
+ tdf#91634: Image hyperlink is not export after roundtrip.
  in https://gerrit.libreoffice.org/15919 from Yogesh Bharate
  about module oox, sc
 End of freshness 

+ [WIP] new clang plugin: loopvartoosmall
  in https://gerrit.libreoffice.org/15930 from Noel Grandin
  about module UnoControls, accessibility, basegfx, compilerplugins, l10ntools, 
registry, shell, sot, svl, tools, unoidl, unotools, vcl
+ new uno sidebar api
  in https://gerrit.libreoffice.org/15856 from Laurent Godard
  about module dbaccess, include, offapi, sfx2, vcl
+ return and use std::vector from OInterfaceContainerHelper
  in https://gerrit.libreoffice.org/15747 from Noel Grandin
  about module UnoControls, chart2, comphelper, cppuhelper, dbaccess, desktop, 
embedserv, include, sc, sd, sfx2, svx, toolkit, ucb


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

+ Resolves tdf#67712 form controls and draw objects
  in https://gerrit.libreoffice.org/15523 from Henry Castro
+ unit test for pie chart label inside placement for the best fit case
  in https://gerrit.libreoffice.org/15934 from Andras Timar
+ Coding style: removing the scope resolution operator in xDocShRef declara
  in https://gerrit.libreoffice.org/15907 from Robert Antoni Buj i Gelonch
+ Remove B3IRange, it's not used anywhere
  in https://gerrit.libreoffice.org/15812 from Zsolt Bölöny
+ Remove B3IPoint, it's not used anywhere
  in https://gerrit.libreoffice.org/15813 from Zsolt Bölöny
+ tdf#90338 related: ignore empty shape handles struct
  in https://gerrit.libreoffice.org/15923 from Andras Timar
+ B3IVector is not used anywhere
  in https://gerrit.libreoffice.org/15808 from Zsolt Bölöny
+ drop useless field bIsDebug
  in https://gerrit.libreoffice.org/15911 from Takeshi Abe
+ tdf#88675 Fix display names for hicontrast and tango_testing
  in https://gerrit.libreoffice.org/14574 from Tobias Lippert
+ convert EXTTEXTINPUT constants to scoped enum
  in https://gerrit.libreoffice.org/15904 from Noel Grandin
+ convert DLGWINDOW constants to scoped enum
  in https://gerrit.libreoffice.org/15903 from Noel Grandin
+ tdf#90338 tdf#84254 DrawingML export fix
  in https://gerrit.libreoffice.org/15918 from Andras Timar


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

+ add kde5 build of vcl
  in https://gerrit.libreoffice.org/15327 from Jonathan Riddell


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

+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/15768 from Joren De Cuyper
+ tdf#76334 push viewbox properties to the CustomShapeProperties
  in https://gerrit.libreoffice.org/15753 from Joren De Cuyper
+ Add very initial support for Visual Studio 2015
  in https://gerrit.libreoffice.org/15644 from Jesús Corrius
+ tdf#90494: Change gradient angle diagonally by choosing option.
  in https://gerrit.libreoffice.org/15180 from Heena Gupta
+ Rendering support for  multiStop GradientFill (OOXML LINEAR)
  in https://gerrit.libreoffice.org/12056 from Vinaya Mandke
+ Resolves tdf#83365 Other: Access across spreadsheet returns Err:504
  in https://gerrit.libreoffice.org/15363 from Henry Castro
+ tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri
  in https://gerrit.libreoffice.org/15611 from Marcos Paulo de Souza
+ tdf#90494-Add new Attribute for exporting gradient angle diagonally
  in https://gerrit.libreoffice.org/15323 from Heena Gupta
+ preserve whitespaces here, tdf#88137, tdf#89254
  in https://gerrit.libreoffice.org/15375 from Markus Mohrhard
+ added currency dropdown menu may have some erors
  in https://gerrit.libreoffice.org/15274 from rajat vijay
+ tdf#90222: replace ScaList in scaddins with a std container
  in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ tdf#64575 Photo Album: Better Image Layout
  in https://gerrit.libreoffice.org/14912 from Enes Ateş
+ WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind
  in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius
+ Fixed all  postfix

LibreOffice Gerrit News for submodules on 2015-05-28

[gerrit]

Moin!



~~ Project dictionaries ~~

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

+ Lightproof: do not return invalid nBehindEndOfSentencePosition
  in https://gerrit.libreoffice.org/15857 from Németh László


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

None

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

None

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

None

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

Nothing moved in the project for the last 25 hours

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/libreoffice

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

[Henry Castro]

 sc/qa/unit/data/ods/move-cell-anchored-shapes.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |  166 ++
 sc/qa/unit/ucalc.cxx  |  100 +
 sc/qa/unit/ucalc.hxx  |2 
 sc/source/core/data/drwlayer.cxx  |   59 +++
 svx/source/svdraw/svdoashp.cxx|1 
 6 files changed, 328 insertions(+)

New commits:
commit 487880b6882ec01c1b4679eae60bec484272a86b
Author: Henry Castro 
Date:   Fri Apr 24 16:55:01 2015 -0400

Resolves tdf#67712 form controls and draw objects

anchored to cell but changes position after reopening

Also included tdf#68797 "FILEOPEN lost position of lines
anchored to cell". It was marked as duplicate but the
step to reproduce are different.

Conflicts:
sc/qa/unit/subsequent_filters-test.cxx

Conflicts:
sc/qa/unit/subsequent_export-test.cxx

Change-Id: Ia1c4010f118749256077a0ecad6ca16b867d22f7
Reviewed-on: https://gerrit.libreoffice.org/15523
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/sc/qa/unit/data/ods/move-cell-anchored-shapes.ods 
b/sc/qa/unit/data/ods/move-cell-anchored-shapes.ods
new file mode 100644
index 000..9ad1568
Binary files /dev/null and b/sc/qa/unit/data/ods/move-cell-anchored-shapes.ods 
differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 3f0ea90..c194e31 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -22,6 +22,7 @@
 #include "helper/xpath.hxx"
 #include "helper/shared_test_impl.hxx"
 
+#include "userdat.hxx"
 #include "docsh.hxx"
 #include "patattr.hxx"
 #include "scitems.hxx"
@@ -145,6 +146,7 @@ public:
 void testSheetRunParagraphProperty();
 void testHiddenShape();
 void testHyperlinkXLSX();
+void testMoveCellAnchoredShapes();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -200,6 +202,7 @@ public:
 CPPUNIT_TEST(testSheetRunParagraphProperty);
 CPPUNIT_TEST(testHiddenShape);
 CPPUNIT_TEST(testHyperlinkXLSX);
+CPPUNIT_TEST(testMoveCellAnchoredShapes);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2655,6 +2658,169 @@ void ScExportTest::testHyperlinkXLSX()
 assertXPath(pDoc, "/r:Relationships/r:Relationship", "Target", 
"#Sheet2!A1");
 }
 
+void ScExportTest::testMoveCellAnchoredShapes()
+{
+ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", 
xDocSh.Is());
+
+// There are two cell-anchored objects on the first sheet.
+ScDocument& rDoc = xDocSh->GetDocument();
+
+CPPUNIT_ASSERT_MESSAGE("There should be at least one sheet.", 
rDoc.GetTableCount() > 0);
+
+ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
+SdrPage* pPage = pDrawLayer->GetPage(0);
+CPPUNIT_ASSERT_MESSAGE("draw page for sheet 1 should exist.", pPage);
+SdrObject* pObj = pPage->GetObj(0);
+CPPUNIT_ASSERT_MESSAGE("Failed to get drawing object.", pObj);
+
+// Check cell anchor state
+ScAnchorType oldType = ScDrawLayer::GetAnchorType(*pObj);
+CPPUNIT_ASSERT_MESSAGE( "Failed to get anchor type", oldType == SCA_CELL );
+
+// Get anchor data
+ScDrawObjData* pData = ScDrawLayer::GetObjData(pObj, false);
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", 
pData);
+CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated 
upon import.", !pData->maLastRect.IsEmpty());
+
+ScAddress aDataStart = pData->maStart;
+ScAddress aDataEnd   = pData->maEnd;
+
+// Get non rotated anchor data
+ScDrawObjData* pNData = ScDrawLayer::GetNonRotatedObjData( pObj );
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve non rotated user data for this 
object.", pNData);
+CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated 
upon import.", !pNData->maLastRect.IsEmpty());
+
+ScAddress aNDataStart = pNData->maStart;
+ScAddress aNDataEnd   = pNData->maEnd;
+CPPUNIT_ASSERT_EQUAL(aDataStart, aNDataStart);
+CPPUNIT_ASSERT_EQUAL(aDataEnd , aNDataEnd);
+
+// Insert 2 rows.
+rDoc.InsertRow(ScRange( 0, aDataStart.Row() - 1, 0, MAXCOL, 
aDataStart.Row(), 0));
+
+// Get anchor data
+pData = ScDrawLayer::GetObjData(pObj, false);
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve user data for this object.", 
pData);
+CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated 
upon import.", !pData->maLastRect.IsEmpty());
+
+// Get non rotated anchor data
+pNData = ScDrawLayer::GetNonRotatedObjData( pObj );
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve non rotated user data for this 
object.", pNData);
+CPPUNIT_ASSERT_MESSAGE("Bounding rectangle should have been calculated 
upon import.", !pNData->maLastRect.IsEmpty());
+
+// Check if data has moved to new rows
+CPPUNIT_ASSERT_EQUAL( pDat

Crash test update

[Crashtest VM]

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


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx  |2 ++
 svx/source/svdraw/svdotextdecomposition.cxx |4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 573fd33418bb0d2caf1a83ad14c65150fa76ccc5
Author: matteocam 
Date:   Wed May 27 18:54:45 2015 -0400

(Not working) Trying to set overflowing para in next box

Change-Id: I2901f6e8f4efe33e7c80c3de3e9e4f73ceefbf31

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7cdc878..a9f5857 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1962,6 +1962,8 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 // Trying to copy stuff right away
 
 if (pEditStatus->IsPageOverflow()) {
+SdrOutliner& rOutliner = ImpGetDrawOutliner();
+mpOverflowingText = rOutliner.GetOverflowingParaObject();
 SdrTextObj *pNextTextObj = GetNextLinkInChain();
 impCopyTextInTextObj(pNextTextObj);
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index de34777..7ff01f8 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 
@@ -748,7 +749,8 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 // XXX: experimental code 27/5/15
 //OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only 
first para
 //pNextTextObj->SetOutlinerParaObject(*someText);
-pNextTextObj->SetText("Bukowski, were are thou?");
+//pNextTextObj->SetText("Bukowski, were are thou?");
+pNextTextObj->SetText(mpOverflowingText->GetTextObject().GetText(0));
 //rOutliner.Insert("Bukowski, were are thou?");
 //rOutliner.Clear();
 //rOutliner.SetStatusEventHdl1(Link());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx  |7 +--
 svx/source/svdraw/svdotextdecomposition.cxx |2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 160d35600f9ede4bd354db4f4f0203f2f396f86a
Author: matteocam 
Date:   Wed May 27 18:38:36 2015 -0400

Insert fixed string when chaining occurs

Change-Id: I0a16523810d2aea20e4abc181494e5bac8b7c091

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b9190ce..7cdc878 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1960,8 +1960,11 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 fprintf(stderr, "[CHAINING] Need for Chaining is %s\n",
 pEditStatus->IsPageOverflow() ? "TRUE" : "FALSE");
 // Trying to copy stuff right away
-SdrTextObj *pNextTextObj = GetNextLinkInChain();
-impCopyTextInTextObj(pNextTextObj);
+
+if (pEditStatus->IsPageOverflow()) {
+SdrTextObj *pNextTextObj = GetNextLinkInChain();
+impCopyTextInTextObj(pNextTextObj);
+}
 
 }
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 06f1c27..de34777 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -742,7 +742,7 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 // trying to copy text in obj 1
 //SdrText* pText = getActiveText();
 
-SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner();
+//SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner();
 //rOutliner.SetUpdateMode(true);
 
//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 // XXX: experimental code 27/5/15
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |   44 ++--
 1 file changed, 10 insertions(+), 34 deletions(-)

New commits:
commit 6245235e4af04b4e2f0e5878874146c73dd5a75b
Author: matteocam 
Date:   Wed May 27 18:22:14 2015 -0400

Insert fixed string live

Change-Id: I3c3bb5a30546409863b09207cd97dc59aea34b04

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index c9149e1..06f1c27 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -742,41 +742,17 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 // trying to copy text in obj 1
 //SdrText* pText = getActiveText();
 
-Rectangle &aNextRect = pNextTextObj->aRect;
 SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner();
-rOutliner.SetPaperSize(
-Size(
-aNextRect.Right()-aNextRect.Left(),
-aNextRect.Bottom()-aNextRect.Top()
-)
- );
-rOutliner.SetUpdateMode(true);
-
rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
-
+//rOutliner.SetUpdateMode(true);
+
//rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 // XXX: experimental code 27/5/15
-OutlinerParaObject *someText = rOutliner.CreateParaObject();
+//OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only 
first para
+//pNextTextObj->SetOutlinerParaObject(*someText);
+pNextTextObj->SetText("Bukowski, were are thou?");
+//rOutliner.Insert("Bukowski, were are thou?");
+//rOutliner.Clear();
+//rOutliner.SetStatusEventHdl1(Link());
 
-rOutliner.SetText(*someText);  // XXX: copies overflown text
-
-// clean up code and such
-Size aNewSize(rOutliner.CalcTextSize());
-// create OutlinerParaObject for pNextTextObj
-OutlinerParaObject* pNewParaObject=rOutliner.CreateParaObject();
-rOutliner.Clear();
-rOutliner.SetStatusEventHdl1(Link());
-
-aNewSize.Width()++; // because of possible rounding errors
-aNewSize.Width()+=GetTextLeftDistance()+GetTextRightDistance();
-aNewSize.Height()+=GetTextUpperDistance()+GetTextLowerDistance();
-
-Rectangle aNewRect(aNextRect);
-aNewRect.SetSize(aNewSize);
-pNextTextObj->ImpJustifyRect(aNewRect);
-if (aNewRect!=aNextRect) {
-pNextTextObj->SetLogicRect(aNewRect);
-}
-// Set text object's string
-pNextTextObj->SetOutlinerParaObject( pNewParaObject );
 
 }
 
@@ -1475,8 +1451,8 @@ void 
SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
 
 void SdrTextObj::impDecomposeChainedTextPrimitive(
 drawinglayer::primitive2d::Primitive2DSequence& rTarget,
-const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& 
rSdrChainedTextPrimitive,
-const drawinglayer::geometry::ViewInformation2D& aViewInformation) 
const
+const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& 
/*rSdrChainedTextPrimitive*/,
+const drawinglayer::geometry::ViewInformation2D& /*aViewInformation*/) 
const
 {
 // FIXME(matteocam)
 /* fprintf(stderr, "Object #0 = %p, Object #1 = %p\n",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 sw/qa/extras/globalfilter/globalfilter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be01d68420086fc36ecf26b5f597ba7c6b29b369
Author: Julien Nabet 
Date:   Wed May 27 23:51:56 2015 +0200

skip SkipImages unit test on MacOs

In fact concerns MacOs TB 10.10_61
If someone wants to revert it go ahead but in this case, please:
either fix the problem
or disable this TB for the moment
Thank you

Change-Id: Ie8da48a9b117d7d24cbf27b5b5e8773f79464a31

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index b1abdec..c7af47e 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -43,7 +43,7 @@ public:
 CPPUNIT_TEST(testCharHighlight);
 CPPUNIT_TEST(testMSCharBackgroundEditing);
 CPPUNIT_TEST(testCharBackgroundToHighlighting);
-#if !defined(WNT)
+#if !defined(WNT) && !defined(MACOSX)
 CPPUNIT_TEST(testSkipImages);
 #endif
 CPPUNIT_TEST_SUITE_END();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 chart2/qa/extras/xshape/chart2xshape.cxx  |9 
 chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |  336 ++
 chart2/qa/extras/xshape/data/xlsx/tdf90839-1.xlsx |binary
 3 files changed, 345 insertions(+)

New commits:
commit 312cab50e057a85cbfd773e928eda3aadd69060c
Author: Andras Timar 
Date:   Wed May 27 21:49:44 2015 +0200

unit test for pie chart label inside placement for the best fit case

Change-Id: I7e6f8383ead96f585915afb119b8ee460967c0bc
related: tdf#90839
Reviewed-on: https://gerrit.libreoffice.org/15934
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx 
b/chart2/qa/extras/xshape/chart2xshape.cxx
index 143fe61..f48cdc9 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -29,10 +29,12 @@ public:
 
 void testFdo75075();
 void testPropertyMappingBarChart();
+void testPieChartLabels1();
 
 CPPUNIT_TEST_SUITE(Chart2XShapeTest);
 CPPUNIT_TEST(testFdo75075);
 CPPUNIT_TEST(testPropertyMappingBarChart);
+CPPUNIT_TEST(testPieChartLabels1);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -87,6 +89,13 @@ void Chart2XShapeTest::testPropertyMappingBarChart()
 compareAgainstReference("property-mapping-bar.xml");
 }
 
+void Chart2XShapeTest::testPieChartLabels1()
+{
+// inside placement for the best fit case
+load("chart2/qa/extras/xshape/data/xlsx/", "tdf90839-1.xlsx");
+compareAgainstReference("tdf90839-1.xml");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2XShapeTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
new file mode 100644
index 000..ca8a971
--- /dev/null
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -0,0 +1,336 @@
+
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+   
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+
+   
+   
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
+
+ 
+ 
+ 
+
+   
+   
+
+ 
+  
+   
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
+
+ 
+ 
+ 
+
+   
+  
+  
+   
+   
+   
+  
+ 
+
+
+ 
+ 
+ 
+
+   
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
+
+ 
+ 
+ 
+
+   
+   
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
+
+ 
+ 
+ 
+
+   
+   
+
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+   
+   
+   
+  
+ 
+
+
+ 
+ 
+  

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |   10 --
 svx/source/svdraw/svdotxed.cxx  |4 +---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 73b8f3ecc83833ea782e149d2da8bb345e28b29f
Author: matteocam 
Date:   Wed May 27 17:28:19 2015 -0400

Experiment: put back updateMode as true but fixed pointer problem

Change-Id: I53f3f8974ace58da276c16cd456328e64dbe80af

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 26a533b..c9149e1 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -750,9 +750,15 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 aNextRect.Bottom()-aNextRect.Top()
 )
  );
-//rOutliner.SetUpdateMode(true);
+rOutliner.SetUpdateMode(true);
 
rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
-rOutliner.SetText(*mpOverflowingText);  // XXX: copies overflown text
+
+// XXX: experimental code 27/5/15
+OutlinerParaObject *someText = rOutliner.CreateParaObject();
+
+rOutliner.SetText(*someText);  // XXX: copies overflown text
+
+// clean up code and such
 Size aNewSize(rOutliner.CalcTextSize());
 // create OutlinerParaObject for pNextTextObj
 OutlinerParaObject* pNewParaObject=rOutliner.CreateParaObject();
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 840fbe3..1471711 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -265,7 +265,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* 
pPaperMax, Rectangle* p
 void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
 {
 OutlinerParaObject* pNewText = NULL;
-OutlinerParaObject* pNextText = NULL;
 
 if(rOutl.IsModified())
 {
@@ -279,8 +278,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
 // set non overflow part of text to current box
 pNewText = rOutl.GetNonOverflowingParaObject(); // empty text obj. 
if 1st para is overflowing
 // set overflowing text for SdrChainedTextPrimitive2D
-pNextText = rOutl.GetOverflowingParaObject();
-mpOverflowingText = pNextText;
+mpOverflowingText = rOutl.GetOverflowingParaObject();
 // TODO: factor the lines of code above in a single function
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 4cbd012869f87f68fa5f50e528fda81fcbb8609e
Author: Stephan Bergmann 
Date:   Wed May 27 22:58:09 2015 +0200

loplugin:stringconstant

Change-Id: I8d5a1b82e7c552385ed22818e5e1a0a962fff2e4

diff --git a/sc/source/filter/xcl97/xcl97rec.cxx 
b/sc/source/filter/xcl97/xcl97rec.cxx
index f3e0af3..c128183 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -,7 +,7 @@ bool transformURL(const OUString& rOldURL, OUString& 
rNewURL, ScDocument* pDoc)
 if (nResult & SCA_VALID)
 {
 OUString aString = aRange.Format(nResult, pDoc, 
formula::FormulaGrammar::CONV_XL_OOX);
-rNewURL = OUString("#") + aString;
+rNewURL = "#" + aString;
 return true;
 }
 else
@@ -1120,7 +1120,7 @@ bool transformURL(const OUString& rOldURL, OUString& 
rNewURL, ScDocument* pDoc)
 if(nResult & SCA_VALID)
 {
 OUString aString = aAddress.Format(nResult, pDoc, 
formula::FormulaGrammar::CONV_XL_OOX);
-rNewURL = OUString("#") + aString;
+rNewURL = "#" + aString;
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b98822fa68b1acb5c566a73b688fa30459e3c691
Author: matteocam 
Date:   Wed May 27 16:47:12 2015 -0400

Experiment: with impCopyTextInTextObj but not setting updateMode true

Change-Id: I43a55267c087b349686613e87062edc54d87a4fa

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 50469a4..26a533b 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -750,7 +750,7 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj 
*pNextTextObj) const
 aNextRect.Bottom()-aNextRect.Top()
 )
  );
-rOutliner.SetUpdateMode(true);
+//rOutliner.SetUpdateMode(true);
 
rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 rOutliner.SetText(*mpOverflowingText);  // XXX: copies overflown text
 Size aNewSize(rOutliner.CalcTextSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

[matteocam]

 svx/source/svdraw/svdotext.cxx |   19 +++
 1 file changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 80beb86011a47f7133403a71656d5a3ccdb58ef5
Author: matteocam 
Date:   Wed May 27 16:42:14 2015 -0400

Experiment: push text immediately after overflow with impCopyTextInTextObj

Change-Id: I6b4cc853f55ce63f7901160fecd118559036bec5

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 178f0b9..b9190ce 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1959,23 +1959,10 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 SetToBeChained( pEditStatus->IsPageOverflow() );
 fprintf(stderr, "[CHAINING] Need for Chaining is %s\n",
 pEditStatus->IsPageOverflow() ? "TRUE" : "FALSE");
+// Trying to copy stuff right away
+SdrTextObj *pNextTextObj = GetNextLinkInChain();
+impCopyTextInTextObj(pNextTextObj);
 
-/*
- *  XXX: I can see problems with circular chains here:
- *If there is such a circular chain we get back
- *to the first box and so on...
-*/
-
-//if ( IsRecursiveChaining() ) {
-// set non overflowing text
-
-/*
- * XXX: what's with the Outliner?
- * It may be that we are calling it in the wrong moment.
- * But if we don't call it here, where?
-*/
-
-//}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79167] UI: Opening the new "navigate by" for choosing the object to go back&forth opens the "big" navigation window, too

[bugzilla-daemon]

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

Yousuf (Jay) Philips  changed:

   What|Removed |Added

 CC||philip...@hotmail.com
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=89
   ||566

--- Comment #9 from Yousuf (Jay) Philips  ---
In bug 89566, i've suggested the reorganization of the navigator
window/sidebar, which included the inclusion of the navigation window buttons
into the window/sidebar by having it as a drop down (attachment 113625), so it
might be useful to include the same drop down as a control in the toolbar.

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

Re: QtCreator for LibreOffice - first integration

[Arnaud Versini]

Hi Michel,

A good mug investment ;-)

QtCreator seems pretty fast compared to KDEvelop for parsing LibreOffice
project, perhaps it uses libclang, I don't know, but really good. I'll tell
you if I got any trouble with Qt-Creator and LO :-)


Really good to have this integration !

Cheers

2015-05-27 19:23 GMT+02:00 Michel Renon :

> Hi Bjoern,
>
> Le 27/05/2015 18:27, Bjoern Michaelsen a écrit :
>
>> Hi Michel,
>>
>> On Mon, May 25, 2015 at 01:04:04PM +0200, Michel Renon wrote:
>>
>>> I worked on using QtCreator IDE for LibreOffice :
>>> https://gerrit.libreoffice.org/15804
>>>
>>
>> That very awesome!
>>
>>  Here is an album of screenshots (similar to Bjoern's video with
>>> KDevelop) :
>>>
>>> http://imgur.com/0z53TxF,qhImiuH,PhZlDZv,stXNCr7,2z03uah,NZYfoIi,mdF4xlT,WX8zNl2
>>>
>>
>> Seeing that is on Linux, do you know ny chance if that stuff works on
>> Windows
>> too?
>>
>
> Absolutely no idea :-(
> I don't have any recent windows machine to test
> (just an old netbook with XP...)
>
>
> Cheers,
> Michel
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>



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

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

[Stephan Bergmann]

 libreofficekit/source/gtk/lokdocview.cxx |   39 ---
 1 file changed, 21 insertions(+), 18 deletions(-)

New commits:
commit 5af7ca55a3d06ab23df715346c9b24d1333907be
Author: Stephan Bergmann 
Date:   Wed May 27 20:51:09 2015 +0200

loplugin:staticmethods

Change-Id: Idb1072ecedd9ab0315d67e296da6d306c098b183

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index b6ec892..e3c03db 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -38,6 +38,26 @@
 // We know that VirtualDevices use a DPI of 96.
 static const int DPI = 96;
 
+namespace {
+
+/// Sets rWidth and rHeight from a "width, height" string.
+void payloadToSize(const char* pPayload, long& rWidth, long& rHeight)
+{
+rWidth = rHeight = 0;
+gchar** ppCoordinates = g_strsplit(pPayload, ", ", 2);
+gchar** ppCoordinate = ppCoordinates;
+if (!*ppCoordinate)
+return;
+rWidth = atoi(*ppCoordinate);
+++ppCoordinate;
+if (!*ppCoordinate)
+return;
+rHeight = atoi(*ppCoordinate);
+g_strfreev(ppCoordinates);
+}
+
+}
+
 /// Holds data used by LOKDocView only.
 struct LOKDocView_Impl
 {
@@ -170,8 +190,6 @@ struct LOKDocView_Impl
  * the tiles that intersect with pPartial.
  */
 void renderDocument(GdkRectangle* pPartial);
-/// Sets rWidth and rHeight from a "width, height" string.
-static void payloadToSize(const char* pPayload, long& rWidth, long& 
rHeight);
 /// Returns the GdkRectangle of a width,height,x,y string.
 static GdkRectangle payloadToRectangle(const char* pPayload);
 /// Returns the GdkRectangles of a w,h,x,y;w2,h2,x2,y2;... string.
@@ -846,21 +864,6 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* 
pPartial)
 }
 }
 
-void LOKDocView_Impl::payloadToSize(const char* pPayload, long& rWidth, long& 
rHeight)
-{
-rWidth = rHeight = 0;
-gchar** ppCoordinates = g_strsplit(pPayload, ", ", 2);
-gchar** ppCoordinate = ppCoordinates;
-if (!*ppCoordinate)
-return;
-rWidth = atoi(*ppCoordinate);
-++ppCoordinate;
-if (!*ppCoordinate)
-return;
-rHeight = atoi(*ppCoordinate);
-g_strfreev(ppCoordinates);
-}
-
 GdkRectangle LOKDocView_Impl::payloadToRectangle(const char* pPayload)
 {
 GdkRectangle aRet;
@@ -1033,7 +1036,7 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 break;
 case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
 {
-LOKDocView_Impl::payloadToSize(pCallback->m_aPayload.c_str(), 
m_nDocumentWidthTwips, m_nDocumentHeightTwips);
+payloadToSize(pCallback->m_aPayload.c_str(), m_nDocumentWidthTwips, 
m_nDocumentHeightTwips);
 }
 break;
 case LOK_CALLBACK_SET_PART:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 include/oox/export/shapes.hxx |   13 +++
 oox/source/export/drawingml.cxx   |   32 -
 oox/source/export/shapes.cxx  |   79 +++
 sc/qa/unit/data/xlsx/hyperlink.xlsx   |binary
 sc/qa/unit/subsequent_export-test.cxx |   15 
 sc/source/filter/excel/xeescher.cxx   |4 -
 sc/source/filter/inc/xcl97esc.hxx |2 
 sc/source/filter/inc/xcl97rec.hxx |4 -
 sc/source/filter/inc/xeescher.hxx |2 
 sc/source/filter/xcl97/xcl97esc.cxx   |   14 ++--
 sc/source/filter/xcl97/xcl97rec.cxx   |  114 +-
 sc/source/ui/view/tabvwsh3.cxx|   38 ---
 12 files changed, 251 insertions(+), 66 deletions(-)

New commits:
commit 4a882796f0f22f365ce28612b4553115ca76f256
Author: Markus Mohrhard 
Date:   Wed May 27 20:33:26 2015 +0200

disable more annoying log output

Change-Id: I9f50b991defe7e241a66a0d52af24c9912508d26

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 55e87e9..c7af2b8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -626,8 +626,8 @@ void DrawingML::WriteOutline( Reference 
rXPropSet )
 cap = "rnd";
 }
 
-DBG(fprintf(stderr, "dash dots: %d dashes: %d dotlen: %d 
dashlen: %d distance: %d\n",
-int( aLineDash.Dots ), int( aLineDash.Dashes ), 
int( aLineDash.DotLen ), int( aLineDash.DashLen ), int( aLineDash.Distance )));
+SAL_INFO("oox.shape", "dash dots: " << aLineDash.Dots << " 
dashes: " << aLineDash.Dashes
+<< " dotlen: " << aLineDash.DotLen << " dashlen: " << 
aLineDash.DashLen <<  " distance: " <<  aLineDash.Distance);
 }
 /* fallthru intended */
 case drawing::LineStyle_SOLID:
@@ -778,7 +778,7 @@ OUString DrawingML::WriteImage( const OUString& rURL, bool 
bRelPathToMedia )
 
 if ( index != -1 )
 {
-DBG(fprintf (stderr, "begin: %ld %s\n", long( sizeof( aURLBegin ) ), 
USS( rURL ) + RTL_CONSTASCII_LENGTH( aURLBegin ) ));
+SAL_INFO("oox.shape", "begin: " << sizeof( aURLBegin ) << " " <<  USS( 
rURL ) + RTL_CONSTASCII_LENGTH( aURLBegin ));
 Graphic aGraphic = GraphicObject( 
aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin)) ).GetTransformedGraphic ();
 
 return WriteImage( aGraphic , bRelPathToMedia );
@@ -960,7 +960,7 @@ void DrawingML::WriteBlipMode( Reference< XPropertySet > 
rXPropSet, const OUStri
 if (GetProperty( rXPropSet, "FillBitmapMode" ) )
 mAny >>= eBitmapMode;
 
-DBG(fprintf(stderr, "fill bitmap mode: %d\n", eBitmapMode));
+SAL_INFO("oox.shape", "fill bitmap mode: " << int(eBitmapMode));
 
 switch (eBitmapMode)
 {
@@ -1008,7 +1008,7 @@ void DrawingML::WriteBlipFill( Reference< XPropertySet > 
rXPropSet, const OUStri
 {
 if ( !sBitmapURL.isEmpty() )
 {
-DBG(fprintf (stderr, "URL: %s\n", OUStringToOString( sBitmapURL, 
RTL_TEXTENCODING_UTF8 ).getStr() ));
+SAL_INFO("oox.shape", "URL: " << sBitmapURL);
 
 mpFS->startElementNS( nXmlNamespace , XML_blipFill, FSEND );
 
@@ -1135,7 +1135,7 @@ void DrawingML::WriteTransformation( const Rectangle& 
rRect,
 
 void DrawingML::WriteShapeTransformation( Reference< XShape > rXShape, 
sal_Int32 nXmlNamespace, bool bFlipH, bool bFlipV, bool bSuppressRotation  )
 {
-DBG(fprintf(stderr,  "write shape transformation\n" ));
+SAL_INFO("oox.shape",  "write shape transformation");
 
 sal_Int32 nRotation=0;
 awt::Point aPos = rXShape->getPosition();
@@ -1352,7 +1352,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 if( GETAD( CharColor ) )
 {
 sal_uInt32 color = *static_cast(mAny.getValue());
-DBG(fprintf(stderr, "run color: %x auto: %x\n", static_cast( color ), static_cast( COL_AUTO )));
+SAL_INFO("oox.shape", "run color: " << color << " auto: " << COL_AUTO);
 
 if( color == COL_AUTO )  // nCharColor depends to the background color
 {
@@ -1445,7 +1445,7 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 if( GETA( TextPortionType ) )
 {
 aFieldType = OUString( *static_cast(mAny.getValue()) 
);
-DBG(fprintf (stderr, "field type: %s\n", USS(aFieldType) ));
+SAL_INFO("oox.shape", "field type: " << aFieldType);
 }
 
 if( aFieldType == "TextField" )
@@ -1459,7 +1459,7 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 if( rXPropSet.is() )
 {
 OUString aFieldKind( rXTextField->getPresentation( true ) );
-DBG(fprintf (stderr, "field kind: %s\n", USS(aFieldKind) ));
+SAL_INFO("oox.shape", "field kind: " << aFieldKind);
 if( aFieldKind == "Page" )
 {
 return "slidenum";
@@ -1626,7 +1626,7 @@ void DrawingML::WriteP

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

[Andrzej Hunt]

 libreofficekit/source/gtk/lokdocview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 176c27f1946ae889910dd154742f2416b481569d
Author: Andrzej Hunt 
Date:   Wed May 27 19:30:07 2015 +0100

loplugin:staticmethods

Change-Id: I8a6a6dcac8355796b984f6b37b791596fe9dca02

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index ebb09e7..b6ec892 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -171,7 +171,7 @@ struct LOKDocView_Impl
  */
 void renderDocument(GdkRectangle* pPartial);
 /// Sets rWidth and rHeight from a "width, height" string.
-void payloadToSize(const char* pPayload, long& rWidth, long& rHeight);
+static void payloadToSize(const char* pPayload, long& rWidth, long& 
rHeight);
 /// Returns the GdkRectangle of a width,height,x,y string.
 static GdkRectangle payloadToRectangle(const char* pPayload);
 /// Returns the GdkRectangles of a w,h,x,y;w2,h2,x2,y2;... string.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Robert Antoni Buj Gelonch]

 sd/qa/unit/import-tests.cxx |   66 ++--
 1 file changed, 33 insertions(+), 33 deletions(-)

New commits:
commit c52bc46136d24557ca142ee2d143be1ee7a0f4cf
Author: Robert Antoni Buj Gelonch 
Date:   Tue May 26 11:40:17 2015 +0200

Coding style: removing the scope resolution operator in xDocShRef 
declarations

Change-Id: Ie88d2f3d6af3553976ebe0d299c4e9f31443cda6
Signed-off-by: Stephan Bergmann 

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 440271e..111f1d8 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -200,7 +200,7 @@ void SdImportTest::testDocumentLayout()
 {
 int nUpdateMe = -1; // index of test we want to update; supposedly 
only when the test is created
 
-::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc( 
"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ), 
aFilesToCompare[i].nFormat );
+sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc( 
"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ), 
aFilesToCompare[i].nFormat );
 if( aFilesToCompare[i].nExportType >= 0 )
 xDocShRef = saveAndReload( xDocShRef, 
aFilesToCompare[i].nExportType );
 compareWithShapesDump( xDocShRef,
@@ -211,7 +211,7 @@ void SdImportTest::testDocumentLayout()
 
 void SdImportTest::testSmoketest()
 {
-::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"), PPTX);
+sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"), PPTX);
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -239,7 +239,7 @@ void SdImportTest::testSmoketest()
 
 void SdImportTest::testN759180()
 {
-::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/n759180.pptx"), PPTX);
+sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/n759180.pptx"), PPTX);
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -277,7 +277,7 @@ void SdImportTest::testN759180()
 
 void SdImportTest::testN862510_1()
 {
-::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_1.pptx"), PPTX );
+sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_1.pptx"), PPTX );
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -302,7 +302,7 @@ void SdImportTest::testN862510_1()
 
 void SdImportTest::testN862510_2()
 {
-::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_2.pptx"), PPTX );
+sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_2.pptx"), PPTX );
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -321,7 +321,7 @@ void SdImportTest::testN862510_2()
 
 void SdImportTest::testN862510_4()
 {
-::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_4.pptx"), PPTX );
+sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n862510_4.pptx"), PPTX );
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -346,7 +346,7 @@ void SdImportTest::testN862510_4()
 
 void SdImportTest::testN828390_2()
 {
-::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_2.pptx"), PPTX );
+sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_2.pptx"), PPTX );
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -366,7 +366,7 @@ void SdImportTest::testN828390_2()
 void SdImportTest::testN828390_3()
 {
 bool bPassed = true;
-::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_3.pptx"), PPTX );
+sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/pptx/n828390_3.pptx"), PPTX );
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -398,7 +398,7 @@ void SdImportTest::testN828390_3()
 
 void SdImportTest::testMasterPageStyleParent()
 {
-::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/odp/masterpage_style_parent.odp"), ODP );
+sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc("/sd/qa/unit/data/odp/masterpage_style_parent.odp"), ODP );
 
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
@@ -437,7 +437,7 @@ void SdImportTest::testMasterPageStyleParent()
 
 void SdImportTest::testN778859()
 {
-::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"),

broken grabbag handling

[Markus Mohrhard]

Hey,

so I just traced back a regression to
bc0a9076aa43a0782bcf81e55d3f84f6af0f68e8 and realized that the whole
concept is flawed as long as we are not at the same time export the theme
color file.

Do you plan to fix that or are you ok with me disabling the whole grabbag
based color export? It might improve the MSO compatibility a little bit for
the price that LibreOffice itself can't handle the exported file anymore as
we have no mapping for the theme colors during the next import.

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

Re: QtCreator for LibreOffice - first integration

[Michel Renon]

Hi Bjoern,

Le 27/05/2015 18:27, Bjoern Michaelsen a écrit :

Hi Michel,

On Mon, May 25, 2015 at 01:04:04PM +0200, Michel Renon wrote:

I worked on using QtCreator IDE for LibreOffice :
https://gerrit.libreoffice.org/15804


That very awesome!


Here is an album of screenshots (similar to Bjoern's video with KDevelop) :
http://imgur.com/0z53TxF,qhImiuH,PhZlDZv,stXNCr7,2z03uah,NZYfoIi,mdF4xlT,WX8zNl2


Seeing that is on Linux, do you know ny chance if that stuff works on Windows
too?


Absolutely no idea :-(
I don't have any recent windows machine to test
(just an old netbook with XP...)


Cheers,
Michel


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

Re: QtCreator for LibreOffice - first integration

[Bjoern Michaelsen]

Hi Michel,

On Mon, May 25, 2015 at 01:04:04PM +0200, Michel Renon wrote:
> I worked on using QtCreator IDE for LibreOffice :
> https://gerrit.libreoffice.org/15804

That very awesome!

> Here is an album of screenshots (similar to Bjoern's video with KDevelop) :
> http://imgur.com/0z53TxF,qhImiuH,PhZlDZv,stXNCr7,2z03uah,NZYfoIi,mdF4xlT,WX8zNl2

Seeing that is on Linux, do you know ny chance if that stuff works on Windows
too?


Best,

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

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

[Caolán McNamara]

 sw/source/ui/fldui/fldref.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cf851cda7c943548d0ce60d0b4836ccbf6e76698
Author: Caolán McNamara 
Date:   Wed May 27 17:24:13 2015 +0100

Resolves: tdf#91403 no wrtshell during initial layout

(cherry picked from commit ff44502d836880d2bdb057e7fdfd9b5abeb87842)

Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index cef1991..4a7ee1e 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -198,9 +198,12 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
 
 // fill up with the sequence types
 SwWrtShell *pSh = GetWrtShell();
-if(!pSh)
+if (!pSh)
 pSh = ::GetActiveWrtShell();
 
+if (!pSh)
+return;
+
 const sal_uInt16 nFieldTypeCnt = pSh->GetFieldTypeCount(RES_SETEXPFLD);
 
 for (sal_uInt16 n = 0; n < nFieldTypeCnt; ++n)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/fldui/fldref.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ff44502d836880d2bdb057e7fdfd9b5abeb87842
Author: Caolán McNamara 
Date:   Wed May 27 17:24:13 2015 +0100

Resolves: tdf#91403 no wrtshell during initial layout

Change-Id: I0d0b8027e07f9dc2dfff584abd026d1b496d93dd

diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 994ae8f..16f2182 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -198,9 +198,12 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
 
 // fill up with the sequence types
 SwWrtShell *pSh = GetWrtShell();
-if(!pSh)
+if (!pSh)
 pSh = ::GetActiveWrtShell();
 
+if (!pSh)
+return;
+
 const size_t nFieldTypeCnt = pSh->GetFieldTypeCount(RES_SETEXPFLD);
 
 OSL_ENSURE( nFieldTypeCnt < static_cast(REFFLDFLAG), 
" - Item index will overlap flags!" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Consolidating debugging levels (via Easy Hacks)

[Markus Mohrhard]

Hey,

On Tue, May 26, 2015 at 11:52 AM, Bjoern Michaelsen <
bjoern.michael...@canonical.com> wrote:

> Hi,
>
> we still have multiple othogonal and confusing debug levels in LibreOffice,
> that can interact in funky ways, the most common ones being
> OSL_DEBUG_LEVEL and
> DBG_UTL.
>
> I'd like to propose to consolidate these into _one_ general debug level
> with no
> funky interaction. As such, I'd like to work towards the following
> (ideally via
> Easy Hacks):
> - Disable all current code that is enabled by OSL_DEBUG_LEVEL > 1 by
> enclosing
>   them in "#if 0" (or alternatively: triggered by an explicit define for
> the
>   area of code e.g. say DEBUG_SW_LAYOUT)
> - Once that is done, make OSL_DEBUG_LEVEL = 2 and DBG_UTL equivalent.
>
> The goal is to have three general debug levels on one axis:
> - level 0: release build
> - level 1: additional debug code, but binary compatible with level 0 (same
>library interface, comparable to OSL_DEBUG_LEVEL = 1)
> - level 2: additional debug code, binary incompatible with level 1 and 2
> (aka DBG_UTL)
>
> Everything beyond that should either be "#if 0"'ed or "#ifdef
> DEBUG_${MODULE}_${AREA}".
>
> Opinions? If there are no objections, I would file Easy Hacks for that.
>
>

So just some comments from someone who uses dbgutil a lot and is quite
annoyed by unrelated log output. (actually I just removed a ton of log
output in dbgutil builds that should have either be hidden behind a
OSL_DEBUG_LEVEL or behind SAL_INFO)

IMHO dbgutil and the log levels should be orthogonal. dbgutil is a mode
where we include binary incompatible code and can enable additional asserts
that should not be included in a release build. dbgutil is something that
is generally useful for developers. However log output should be limited to
what is really essential by default. E.g. enabling SAL_WARN with dbgutil is
not too bad as long as SAL_WARN is used responsibly.

So to summarize it I think a solution that makes the log output orthogonal
to the assert and binary incompatibility is necessary. If you provide that
orthogonality as build option (current solution) or runtime option (the
SAL_INFO way) is not that important.

Feel free to ignore my comments. It does not affect me anymore and I just
wanted to share the opinion of someone who is not a fan of global log
output but used dbgutil a lot.

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

Re: ZuluJDK 8 is not recognized as a valid JRE

[Stephan Bergmann]

On 05/23/2015 12:08 PM, Stephan Bergmann wrote:

On 05/23/2015 10:26 AM, Kenneth Jaeger wrote:

When querying the ZuluJDK JVM using a simple program
System.getProperty("java.version") and java.jvm.version both
return a value of "Azul Systems, Inc."  I am guessing this is
why LibreOffice cannot detect the ZuluJDK.  I only see IBM,
Oracle and Sun in the list for valid Windows JRE vendors.


Yeah, it might just be a matter of adding an entry to the vendor map in
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx, assuming the JRE's
structure isn't too different from other JREs, so LO's assumptions about
how it is organized are satisfied.

Did you try that out and do a build?  If not, I can give that a try
sometime next week.


Needed a little more adaption to make it work, 
 
"Support Azul Zulu JRE (at least on Windows)."


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

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp

[Miklos Vajna]

 loolwsd/LOOLSession.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8d054fa4719fa3f320c5ddea6d16a955a104dd2
Author: Miklos Vajna 
Date:   Wed May 27 17:34:10 2015 +0200

LOOLSession: PAGE_COUNT -> DOCUMENT_SIZE

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index c10d8dc..bdb4c48 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -732,8 +732,8 @@ extern "C"
 case LOK_CALLBACK_SEARCH_NOT_FOUND:
 srv->sendTextFrame("searchnotfound: " + std::string(pPayload));
 break;
-case LOK_CALLBACK_PAGE_COUNT_CHANGED:
-srv->sendTextFrame("pagecountchanged:");
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+srv->sendTextFrame("documentsizechanged:" + std::string(pPayload));
 break;
 case LOK_CALLBACK_SET_PART:
 srv->sendTextFrame("setpart: " + std::string(pPayload));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/LibreOfficeKit libreofficekit/source sw/source

[Miklos Vajna]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |8 
 libreofficekit/source/gtk/lokdocview.cxx |   25 +
 sw/source/core/view/viewsh.cxx   |   10 ++
 sw/source/uibase/uiview/view2.cxx|2 --
 4 files changed, 35 insertions(+), 10 deletions(-)

New commits:
commit 8cbb94a2b79dcaf9675125da800b64a85bae52dc
Author: Miklos Vajna 
Date:   Wed May 27 17:12:28 2015 +0200

lokdocview: handle LOK_CALLBACK_DOCUMENT_SIZE_CHANGED

Change-Id: Ib1b99221afbf9810bad5fd49fbf62c7a20fd28e4

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index f150279..ebb09e7 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -170,6 +170,8 @@ struct LOKDocView_Impl
  * the tiles that intersect with pPartial.
  */
 void renderDocument(GdkRectangle* pPartial);
+/// Sets rWidth and rHeight from a "width, height" string.
+void payloadToSize(const char* pPayload, long& rWidth, long& rHeight);
 /// Returns the GdkRectangle of a width,height,x,y string.
 static GdkRectangle payloadToRectangle(const char* pPayload);
 /// Returns the GdkRectangles of a w,h,x,y;w2,h2,x2,y2;... string.
@@ -844,6 +846,21 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* 
pPartial)
 }
 }
 
+void LOKDocView_Impl::payloadToSize(const char* pPayload, long& rWidth, long& 
rHeight)
+{
+rWidth = rHeight = 0;
+gchar** ppCoordinates = g_strsplit(pPayload, ", ", 2);
+gchar** ppCoordinate = ppCoordinates;
+if (!*ppCoordinate)
+return;
+rWidth = atoi(*ppCoordinate);
+++ppCoordinate;
+if (!*ppCoordinate)
+return;
+rHeight = atoi(*ppCoordinate);
+g_strfreev(ppCoordinates);
+}
+
 GdkRectangle LOKDocView_Impl::payloadToRectangle(const char* pPayload)
 {
 GdkRectangle aRet;
@@ -913,8 +930,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
 return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
 case LOK_CALLBACK_SEARCH_NOT_FOUND:
 return "LOK_CALLBACK_SEARCH_NOT_FOUND";
-case LOK_CALLBACK_PAGE_COUNT_CHANGED:
-return "LOK_CALLBACK_PAGE_COUNT_CHANGED";
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";
 case LOK_CALLBACK_SET_PART:
 return "LOK_CALLBACK_SET_PART";
 }
@@ -1014,9 +1031,9 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 searchNotFound(pCallback->m_aPayload);
 }
 break;
-case LOK_CALLBACK_PAGE_COUNT_CHANGED:
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
 {
-m_pDocument->pClass->getDocumentSize(m_pDocument, 
&m_nDocumentWidthTwips, &m_nDocumentHeightTwips);
+LOKDocView_Impl::payloadToSize(pCallback->m_aPayload.c_str(), 
m_nDocumentWidthTwips, m_nDocumentHeightTwips);
 }
 break;
 case LOK_CALLBACK_SET_PART:
commit 63a40c45018ad2e6f4a660a520a5907beb1d7801
Author: Miklos Vajna 
Date:   Wed May 27 17:12:00 2015 +0200

LOK: change PAGE_COUNT to a more generic DOCUMENT_SIZE

Change-Id: If94af4072c321358d7bd4d678eeed181dc0f44db

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index bbcd5b9..66237e4 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -143,12 +143,12 @@ typedef enum
 LOK_CALLBACK_SEARCH_NOT_FOUND,
 
 /**
- * Number of pages changed in the document.
+ * Size of the document changed.
  *
- * Clients should assume that data returned by an earlier
- * lok::Document::getDocumentSize() call is no longer valid.
+ * Payload format is "width, height", i.e. clients get the new size without
+ * having to do an explicit lok::Document::getDocumentSize() call.
  */
-LOK_CALLBACK_PAGE_COUNT_CHANGED,
+LOK_CALLBACK_DOCUMENT_SIZE_CHANGED,
 
 /**
  * The current part number is changed.
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 3c163d9..32fe222 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -78,6 +78,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #if !HAVE_FEATURE_DESKTOP
 #include 
@@ -989,6 +990,15 @@ void SwViewShell::SizeChgNotify()
 const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
 OUString sDisplay = rNum.GetNumStr( nVirtNum );
 PageNumNotify( this, pCnt->GetPhyPageNum(), nVirtNum, sDisplay 
);
+
+if (isTiledRendering())
+{
+Size aDocSize = GetDocSize();
+std::stringstream ss;
+ss << aDocSize.Width() + 2L * DOCUMENTBORDER << ", " << 
aDocSize.Height() + 2L * DOCUMENTBORDER;
+OString sRect = ss.str().c_str();
+libreOfficeKitCallback(LOK_CALLBACK_DOCUMENT_SIZE_CHANGED, 
sRect.getStr

[Libreoffice-commits] core.git: jvmfwk/distributions jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |3 +++
 jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx |3 ++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx   |1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0f95f8ffd7a3685ca53876005a9c96f2e2e7bc99
Author: Stephan Bergmann 
Date:   Wed May 27 17:29:39 2015 +0200

Support Azul Zulu JRE (at least on Windows)

( also offers it for 
Linux
and Mac OS X, so it could be added to more javavendors_*.xml if need be; I 
only
checked it actually works with a Windows 64-bit LO build)

Change-Id: If549a0d5bf1459eba2f6ba2bd545cfd55a20cea6

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 4f76089..b1ad4e4 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -32,6 +32,9 @@
   
 1.5.0
   
+  
+1.6.0
+  
  
 
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 07f9c0c..c84525e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -55,7 +55,8 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
 "/bin/client/jvm.dll",
 "/bin/hotspot/jvm.dll",
 "/bin/classic/jvm.dll",
-"/bin/jrockit/jvm.dll"
+"/bin/jrockit/jvm.dll",
+"/bin/server/jvm.dll" // needed by Azul
 #elif defined UNX
 #ifdef MACOSX
 "/../../../../../Frameworks/JavaVM.framework/JavaVM"  //as of  1.6.0_22
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index ef81466..b2e3aca 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -50,6 +50,7 @@ BEGIN_VENDOR_MAP()
 VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
 VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
 #endif
+VENDOR_MAP_ENTRY("Azul Systems, Inc.", OtherInfo)
 END_VENDOR_MAP()
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jvmfwk/plugins jvmfwk/source

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |3 
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx|7 --
 jvmfwk/source/fwkbase.cxx   |   61 
 jvmfwk/source/fwkutil.hxx   |9 --
 4 files changed, 29 insertions(+), 51 deletions(-)

New commits:
commit f9d2bfec02042c5391cb838786577ad32365a56b
Author: Stephan Bergmann 
Date:   Wed May 27 17:24:02 2015 +0200

fprintf -> SAL_INFO

Change-Id: I4808e89cf5b90c99df3d4c4474c578a8c8f611a6

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 18c7280..4094600 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -28,9 +28,6 @@
 # include 
 #endif
 
-#if OSL_DEBUG_LEVEL > 0
-#include 
-#endif
 #include 
 
 #include "boost/scoped_array.hpp"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index ee4d6d0..ef81466 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -61,11 +61,8 @@ bool isVendorSupported(const OUString& sVendor)
 if (sVendor.equalsAscii(gVendorMap[pos].sVendorName))
 return true;
 }
-#if OSL_DEBUG_LEVEL >= 2
-OString sVendorName = OUStringToOString(sVendor, 
osl_getThreadTextEncoding());
-fprintf(stderr, "[Java frameworksunjavaplugin.so]sunjavaplugin does not 
support vendor: %s.\n",
-sVendorName.getStr());
-#endif
+SAL_INFO(
+"jfw.level2", "sunjavaplugin does not support vendor: " << sVendor);
 return false;
 }
 
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 9c79344..0a7e414 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -239,11 +239,9 @@ std::vector VendorSettings::getSupportedVendors()
 OString sParam =
 OUStringToOString(sValue, osl_getThreadTextEncoding());
 vecParams.push_back(sParam);
-#if OSL_DEBUG_LEVEL >=2
-OString sParamName = OUStringToOString(sName, 
osl_getThreadTextEncoding());
-fprintf(stderr,"[Java framework] Using bootstrap parameter %s"
-" = %s.\n", sParamName.getStr(), sParam.getStr());
-#endif
+SAL_INFO(
+"jfw.level2",
+"Using bootstrap parameter " << sName << " = " << sParam);
 }
 else
 break;
@@ -270,10 +268,10 @@ OString BootParams::getClasspath()
 sCP))
 {
 sClassPath = OUStringToOString(sCP, osl_getThreadTextEncoding());
-#if OSL_DEBUG_LEVEL >=2
-fprintf(stderr,"[Java framework] Using bootstrap parameter "
-UNO_JAVA_JFW_CLASSPATH " = %s.\n", sClassPath.getStr());
-#endif
+SAL_INFO(
+"jfw.level2",
+"Using bootstrap parameter " UNO_JAVA_JFW_CLASSPATH " = "
+<< sClassPath);
 }
 
 OUString sEnvCP;
@@ -287,10 +285,10 @@ OString BootParams::getClasspath()
 char szSep[] = {SAL_PATHSEPARATOR,0};
 sClassPath += OString(szSep) + OString(pCp);
 }
-#if OSL_DEBUG_LEVEL >=2
-fprintf(stderr,"[Java framework] Using bootstrap parameter "
-UNO_JAVA_JFW_ENV_CLASSPATH " and class path is:\n %s.\n", pCp ? 
pCp : "");
-#endif
+SAL_INFO(
+"jfw.level2",
+"Using bootstrap parameter " UNO_JAVA_JFW_ENV_CLASSPATH
+" and class path is: " << (pCp ? pCp : ""));
 }
 
 return sClassPath;
@@ -326,11 +324,10 @@ OUString BootParams::getVendorSettings()
  UNO_JAVA_JFW_VENDOR_SETTINGS));
 }
 }
-#if OSL_DEBUG_LEVEL >=2
-OString sValue = OUStringToOString(sVendor, osl_getThreadTextEncoding());
-fprintf(stderr,"[Java framework] Using bootstrap parameter "
-UNO_JAVA_JFW_VENDOR_SETTINGS" = %s.\n", sValue.getStr());
-#endif
+SAL_INFO(
+"jfw.level2",
+"Using bootstrap parameter " UNO_JAVA_JFW_VENDOR_SETTINGS " = "
+<< sVendor);
 }
 return sVendor;
 }
@@ -372,10 +369,10 @@ OUString BootParams::getJREHome()
 JFW_E_ERROR,
 OString("[Java framework] Error in function 
BootParams::getJREHome() "
  "(fwkbase.cxx)."));
-#if OSL_DEBUG_LEVEL >=2
-fprintf(stderr,"[Java framework] Using bootstrap parameter "
-UNO_JAVA_JFW_ENV_JREHOME" with JAVA_HOME = %s.\n", pJRE);
-#endif
+SAL_INFO(
+"jfw.level2",
+"Using bootstrap parameter " UNO_JAVA_JFW_ENV_JREHOME
+" with JAVA_HOME = " << pJRE);
 }
 else if (getMode() == JFW_MODE_DIRECT
 && !bEnvJRE
@@ -388,14 +385,9 @@ OUString BootParams::getJREHome()
  " must be set in direct mode."));
 }
 
-#if OSL_DEBUG_LEVEL >=2
-if (bJRE == 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - writerfilter/source

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit c086933969e5edef80febe0e37a402798302ddb6
Author: Caolán McNamara 
Date:   Wed May 27 16:20:34 2015 +0100

Resolves: tdf#89731 numberingChange feature not available in writer

Change-Id: Ie779e78fc3c7ccf717117513d9187697c22cc51a
(cherry picked from commit 0123bbbc4d07fd7d6c233f67139984ab3cd4555d)

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c7066f6..d106b4a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4801,8 +4801,10 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const 
OUString& sAuthor )
 {
 if (!m_xAnnotationField.is())
 {
-assert( m_currentRedline.get());
-m_currentRedline->m_sAuthor = sAuthor;
+if (m_currentRedline.get())
+m_currentRedline->m_sAuthor = sAuthor;
+else
+SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
 }
 else
 m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor));
@@ -4818,8 +4820,10 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const 
OUString& sDate )
 {
 if (!m_xAnnotationField.is())
 {
-assert( m_currentRedline.get());
-m_currentRedline->m_sDate = sDate;
+if (m_currentRedline.get())
+m_currentRedline->m_sDate = sDate;
+else
+SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
 }
 else
 m_xAnnotationField->setPropertyValue("DateTimeValue", 
uno::makeAny(ConversionHelper::ConvertDateStringToDateTime(sDate)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0123bbbc4d07fd7d6c233f67139984ab3cd4555d
Author: Caolán McNamara 
Date:   Wed May 27 16:20:34 2015 +0100

Resolves: tdf#89731 numberingChange feature not available in writer

Change-Id: Ie779e78fc3c7ccf717117513d9187697c22cc51a

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c7066f6..d106b4a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4801,8 +4801,10 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( const 
OUString& sAuthor )
 {
 if (!m_xAnnotationField.is())
 {
-assert( m_currentRedline.get());
-m_currentRedline->m_sAuthor = sAuthor;
+if (m_currentRedline.get())
+m_currentRedline->m_sAuthor = sAuthor;
+else
+SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
 }
 else
 m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor));
@@ -4818,8 +4820,10 @@ void DomainMapper_Impl::SetCurrentRedlineDate( const 
OUString& sDate )
 {
 if (!m_xAnnotationField.is())
 {
-assert( m_currentRedline.get());
-m_currentRedline->m_sDate = sDate;
+if (m_currentRedline.get())
+m_currentRedline->m_sDate = sDate;
+else
+SAL_INFO("writerfilter.dmapper", "numberingChange not 
implemented");
 }
 else
 m_xAnnotationField->setPropertyValue("DateTimeValue", 
uno::makeAny(ConversionHelper::ConvertDateStringToDateTime(sDate)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: organizing our "crasher" bugs ?

[Bjoern Michaelsen]

Hi,

On Wed, May 27, 2015 at 04:36:01PM +0200, Bjoern Michaelsen wrote:
> Hi,
> 
> On Wed, May 27, 2015 at 03:25:24PM +0100, Caolán McNamara wrote:
> > What would work ideally for me is to someone get the subset of all
> > crashes that are ~100% reproducible under Linux and ordered by the
> > number of steps required to reproduce. Any ideas on how to generate that
> > subset ?

Another hint of a good, clean, solvable bug is a limited number of comments:

 
https://bugs.documentfoundation.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&columnlist=product%2Ccomponent%2Cassigned_to%2Cshort_desc%2Cchangeddate%2Cop_sys%2Clongdescs.count&list_id=539737&product=LibreOffice&query_format=advanced&resolution=---&short_desc=crash&short_desc_type=allwordssubstr

once you have more than 10 comments on a bug, there is a high chance of some
"can reproduce on $foo", "cant reproduce on $bar" ping-pong going on.

Best,

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

[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source include/basegfx

[Zsolt Bölöny]

 basegfx/Library_basegfx.mk |1 
 basegfx/source/point/b3ipoint.cxx  |   69 ---
 include/basegfx/point/b3ipoint.hxx |  128 -
 3 files changed, 198 deletions(-)

New commits:
commit bda06661d863e588eed57ce34bf03d58b0d52b6a
Author: Zsolt Bölöny 
Date:   Tue May 19 00:20:56 2015 +0200

Remove B3IPoint, it's not used anywhere

Change-Id: I7031c126179bbceebc40dcbdab5a0570db5bc29f
Reviewed-on: https://gerrit.libreoffice.org/15813
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 974d3b3..68cfe1c 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
 basegfx/source/point/b2dpoint \
 basegfx/source/point/b2ipoint \
 basegfx/source/point/b3dpoint \
-basegfx/source/point/b3ipoint \
 basegfx/source/polygon/b2dlinegeometry \
 basegfx/source/polygon/b2dpolygon \
 basegfx/source/polygon/b2dpolygonclipper \
diff --git a/basegfx/source/point/b3ipoint.cxx 
b/basegfx/source/point/b3ipoint.cxx
deleted file mode 100644
index 7b50b20..000
--- a/basegfx/source/point/b3ipoint.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-#include 
-
-namespace basegfx
-{
-B3IPoint& B3IPoint::operator*=( const ::basegfx::B3DHomMatrix& rMat )
-{
-double fTempX(
-rMat.get(0, 0) * mnX +
-rMat.get(0, 1) * mnY +
-rMat.get(0, 2) * mnZ +
-rMat.get(0, 3));
-double fTempY(
-rMat.get(1, 0) * mnX +
-rMat.get(1, 1) * mnY +
-rMat.get(1, 2) * mnZ +
-rMat.get(1, 3));
-double fTempZ(
-rMat.get(2, 0) * mnX +
-rMat.get(2, 1) * mnY +
-rMat.get(2, 2) * mnZ +
-rMat.get(2, 3));
-
-if(!rMat.isLastLineDefault())
-{
-const double fOne(1.0);
-const double fTempM(
-rMat.get(3, 0) * mnX +
-rMat.get(3, 1) * mnY +
-rMat.get(3, 2) * mnZ +
-rMat.get(3, 3));
-
-if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
-{
-fTempX /= fTempM;
-fTempY /= fTempM;
-fTempZ /= fTempM;
-}
-}
-
-mnX = fround(fTempX);
-mnY = fround(fTempY);
-mnZ = fround(fTempZ);
-
-return *this;
-}
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b3ipoint.hxx 
b/include/basegfx/point/b3ipoint.hxx
deleted file mode 100644
index dcd2906..000
--- a/include/basegfx/point/b3ipoint.hxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
-#define INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
-
-#include 
-#include 
-
-namespace basegfx
-{
-class B3DHomMatrix;
-
-/** Base Point class with three sal_Int32 values
-
-This class derives all operators and common handling for
-a 3D data class fro

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - wizards/com

[Caolán McNamara]

 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e092c5b2a285db9447b5918a2f5c3ace02437113
Author: Caolán McNamara 
Date:   Wed May 27 15:39:12 2015 +0100

wrong comparison in letter wizard

the file name widget is empty when it shouldn't be.
the other wizards get this right

Change-Id: Icdb629e676a73fcf8d8be4352818abbef455bbaf
(cherry picked from commit a3727ad62b7c1a30f9b0531042cce5ce5b8c6089)

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index d8598ff..f4a16e2 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -123,7 +123,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.myConfig.cp_PrivateLetter.cp_Salutation = \
 self.resources.SalutationLabels[2]
 
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 xContainerWindow = self.myLetterDoc.xFrame.ContainerWindow
@@ -256,7 +256,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.lstBusinessStyleItemChanged()
 self.enableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 def optPrivOfficialLetterItemChanged(self):
@@ -273,7 +273,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 self.myLetterDoc.fillSenderWithUserData()
 
@@ -291,7 +291,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(False)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 def optSenderPlaceholderItemChanged(self):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a3727ad62b7c1a30f9b0531042cce5ce5b8c6089
Author: Caolán McNamara 
Date:   Wed May 27 15:39:12 2015 +0100

wrong comparison in letter wizard

the file name widget is empty when it shouldn't be.
the other wizards get this right

Change-Id: Icdb629e676a73fcf8d8be4352818abbef455bbaf

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
index d8598ff..f4a16e2 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
@@ -123,7 +123,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.myConfig.cp_PrivateLetter.cp_Salutation = \
 self.resources.SalutationLabels[2]
 
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 xContainerWindow = self.myLetterDoc.xFrame.ContainerWindow
@@ -256,7 +256,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.lstBusinessStyleItemChanged()
 self.enableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 def optPrivOfficialLetterItemChanged(self):
@@ -273,7 +273,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(True)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 self.myLetterDoc.fillSenderWithUserData()
 
@@ -291,7 +291,7 @@ class LetterWizardDialogImpl(LetterWizardDialog):
 self.disableBusinessPaper()
 self.disableSenderReceiver()
 self.setPossibleFooter(False)
-if self.myPathSelection.xSaveTextBox.Text.lower():
+if self.myPathSelection.xSaveTextBox.Text.lower() == "":
 self.myPathSelection.initializePath()
 
 def optSenderPlaceholderItemChanged(self):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: organizing our "crasher" bugs ?

[Bjoern Michaelsen]

Hi,

On Wed, May 27, 2015 at 03:25:24PM +0100, Caolán McNamara wrote:
> What would work ideally for me is to someone get the subset of all
> crashes that are ~100% reproducible under Linux and ordered by the
> number of steps required to reproduce. Any ideas on how to generate that
> subset ?

That might be hard to squeeze out of bugzilla as is. However, crasher bugs that
are bibisected can be assumed to be easily reproducable under Linux as of now
(as bibisect is Linux-only so far, although that is changing).

Here is a start:
https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_status=NEEDINFO&bug_status=PLEASETEST&columnlist=product%2Ccomponent%2Cassigned_to%2Cshort_desc%2Cchangeddate%2Cop_sys&list_id=539730&product=LibreOffice&query_based_on=&query_format=advanced&resolution=---&short_desc=crash&short_desc_type=allwordssubstr&status_whiteboard=bibisected&status_whiteboard_type=allwordssubstr

9 Calc, 4 Writer, 2 Impress, 1 Draw, 1 generic: 17 total

Best,

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

organizing our "crasher" bugs ?

[Caolán McNamara]

There are ~190 bugs with the word "crash" in the summary in the states
new/assigned/reopened/unconfirmed.

As with the coverity, import-testing, export-testing stuff I think it
would be helpful to start chewing into crashers in some systematic way
where progress can be measured. 190 isn't a vast number in the over all
scheme of things.

What would work ideally for me is to someone get the subset of all
crashes that are ~100% reproducible under Linux and ordered by the
number of steps required to reproduce. Any ideas on how to generate that
subset ?

C.

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

[Libreoffice-commits] online.git: loleaflet/README

[Miklos Vajna]

 loleaflet/README |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 36c94140ef1ef1b4442f48aeb7dcf0f41fef4fb2
Author: Miklos Vajna 
Date:   Wed May 27 16:08:58 2015 +0200

loleaflet: document ~/.npmrc prefix setting

diff --git a/loleaflet/README b/loleaflet/README
index 3b47342..48359c8 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -16,6 +16,12 @@ Alternatively, you can use the provided zip (as a normal 
user):
 
 unzip node_modules/modules.zip -d node_modules
 
+A third way is to use npm as a user, but set its prefix to a directory where
+you have write access. If you want that, you need to have an ~/.npmrc with the
+line e.g.
+
+prefix=/opt/npm
+
 Building
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/qa/cppunit/app/test_IconThemeInfo.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 622988dd849d8bc9344dbd56b7d9a6172095cf99
Author: Stephan Bergmann 
Date:   Wed May 27 16:06:44 2015 +0200

loplugin:unreffun

Change-Id: Ic0c4bd61aad4354f58cc60e8b584b9d63e397a3b

diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 
b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 416f8e2..812bfe5 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -53,6 +53,8 @@ class IconThemeInfoTest : public CppUnit::TestFixture
 CPPUNIT_TEST(ThemeIdIsDetectedFromFileNameWithUnderscore);
 CPPUNIT_TEST(ImagesZipIsNotValid);
 CPPUNIT_TEST(ImagesOxygenZipIsValid);
+CPPUNIT_TEST(DisplayNameForHicontrastIsHighContrast);
+CPPUNIT_TEST(DisplayNameForTango_testingIsTangoTesting);
 CPPUNIT_TEST(ExceptionIsThrownWhenIdCannotBeDetermined1);
 CPPUNIT_TEST(ExceptionIsThrownWhenIdCannotBeDetermined2);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 oox/source/export/shapes.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1a4eeac14b618714bb8be9755f508ee63ac4a422
Author: Andras Timar 
Date:   Wed May 27 12:47:29 2015 +0200

tdf#90338 related: ignore empty shape handles struct

Change-Id: I486564a124cfb0d13a8b20e89cf13e752ccb7237
Reviewed-on: https://gerrit.libreoffice.org/15923
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index fedeefb..2beec40 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -400,8 +400,12 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< 
XShape > xShape )
 rProp.Value >>= bFlipV;
 if ( rProp.Name == "AdjustmentValues" )
 nAdjustmentValuesIndex = i;
-else if ( rProp.Name == "Handles" ) {
-bHasHandles = true;
+else if ( rProp.Name == "Handles" )
+{
+uno::Sequence aHandles;
+rProp.Value >>= aHandles;
+if ( aHandles.getLength() )
+bHasHandles = true;
 if( !bIsDefaultObject )
 bPredefinedHandlesUsed = false;
 // TODO: update nAdjustmentsWhichNeedsToBeConverted here
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Caolán McNamara]

On Wed, 2015-05-27 at 06:21 +, Crashtest VM wrote:
> New crashtest update available at 
> http://dev-builds.libreoffice.org/crashtest/26092f54865645722aeed596af62d20918aa2046/

0 import failures, but don't get too excited yet I feel that maybe it
timed out on ooo43817-1.rtf seeing as I still see that one asserting for
me on --headless --convert-to pdf

C.

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

[Bug 91665] l10n: replace string lists that are groups of unrelated items by separate strings

[bugzilla-daemon]

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

David Tardon  changed:

   What|Removed |Added

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

-- 
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] online.git: 6 commits - loleaflet/Makefile loolwsd/configure.ac loolwsd/Connect.cpp loolwsd/loolwsd.spec.in

[Tor Lillqvist]

 loleaflet/Makefile  |8 
 loolwsd/Connect.cpp |3 +++
 loolwsd/configure.ac|2 +-
 loolwsd/loolwsd.spec.in |   17 ++---
 4 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit d54acdd6fb738f4632628482126f50355f08019b
Author: Tor Lillqvist 
Date:   Wed May 27 16:48:32 2015 +0300

Post-release bump to 1.0.21

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index fe29c25..4936d4a 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.20], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.21], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 3747129da5f56ed3c0b4052b68516af0d245b9ba
Author: Tor Lillqvist 
Date:   Wed May 27 16:47:50 2015 +0300

Bump version to 1.0.20

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 198a5a4..fe29c25 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.19], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.20], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit beb321d142353e42e90170ba69ca176f64f608cc
Author: Tor Lillqvist 
Date:   Wed May 27 16:30:06 2015 +0300

Revert attempts at sanity

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 9c9ad4a..78ed48b 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.4
+VERSION=1.0.6
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
@@ -10,16 +10,13 @@ all:
cd plugins/draw-$(DRAW_VERSION) && jake build
 
 .PHONY: dist
-dist: all Makefile loleaflet.spec
+dist: all
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
-   tar cf - dist/leaflet.js dist/leaflet.css dist/images \
-plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js 
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css 
plugins/draw-$(DRAW_VERSION)/dist/images \
-src/scrollbar \
-debug/document | (cd loleaflet-$(VERSION) && tar xf -)
+   tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document 
src/scrollbar | (cd loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
 
-loleaflet.spec: loleaflet.spec.in Makefile
+loleaflet.spec: loleaflet.spec.in
sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' loleaflet.spec
commit 6b91320f695626591aca4c8991038cbc9f8f834b
Author: Tor Lillqvist 
Date:   Wed May 27 16:29:57 2015 +0300

Intermediate non-working attempt at sanity

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index d594672..9c9ad4a 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,6 +1,6 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.2
+VERSION=1.0.4
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
@@ -14,7 +14,10 @@ dist: all Makefile loleaflet.spec
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
-   tar cf - dist/leaflet.js dist/leaflet.css dist/images 
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js 
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css 
plugins/draw-$(DRAW_VERSION)/dist/images debug/document | (cd 
loleaflet-$(VERSION) && tar xf -)
+   tar cf - dist/leaflet.js dist/leaflet.css dist/images \
+plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js 
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css 
plugins/draw-$(DRAW_VERSION)/dist/images \
+src/scrollbar \
+debug/document | (cd loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
 
commit 2e6719faafbb2ffdcc5174624d7f7ae30f23e94a
Author: Tor Lillqvist 
Date:   Wed May 27 16:28:22 2015 +0300

Tweak where the systemplate and child-root directories are put

They must be on the same file system where LO is installed, and the TDF
tarballs puts that in /opt, and on some Linuxes in default configuration 
/opt
is on a different file system from /home, so we should not really use
/home/lool.

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index c6dd746..5cc4dc5 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -58,18 +58,21 @@ make install DESTDIR=%{buildroot}
 setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
 
 getent group %{group} >/dev/null || groupadd -r %{group}
-getent passwd %{owner} >/dev/null || useradd -g %{group} -m -r %{owner}
+getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
 
 mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
 
-su - %{owner} -c 'mkdir -p lool-child-roots'
-
-su - %{owner} -c "rm -rf /ho

[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source include/basegfx

[Zsolt Bölöny]

 basegfx/Library_basegfx.mk   |1 
 basegfx/source/vector/b3ivector.cxx  |   41 -
 include/basegfx/vector/b3ivector.hxx |  248 ---
 3 files changed, 290 deletions(-)

New commits:
commit b37b5e115fc29b0fcc02bba73826a775d06a7f79
Author: Zsolt Bölöny 
Date:   Mon May 18 23:11:56 2015 +0200

B3IVector is not used anywhere

Change-Id: Ic439b33c974500f1b351b41a0e391ffec71007b3
Reviewed-on: https://gerrit.libreoffice.org/15808
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 0c1ff0f..974d3b3 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
 basegfx/source/vector/b2dvector \
 basegfx/source/vector/b2ivector \
 basegfx/source/vector/b3dvector \
-basegfx/source/vector/b3ivector \
 ))
 
 
diff --git a/basegfx/source/vector/b3ivector.cxx 
b/basegfx/source/vector/b3ivector.cxx
deleted file mode 100644
index 409198d..000
--- a/basegfx/source/vector/b3ivector.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-
-namespace basegfx
-{
-B3IVector& B3IVector::operator*=( const B3DHomMatrix& rMat )
-{
-mnX = fround( rMat.get(0,0)*mnX + rMat.get(0,1)*mnY + 
rMat.get(0,2)*mnZ );
-mnY = fround( rMat.get(1,0)*mnX + rMat.get(1,1)*mnY + 
rMat.get(1,2)*mnZ );
-mnZ = fround( rMat.get(2,0)*mnX + rMat.get(2,1)*mnY + 
rMat.get(2,2)*mnZ );
-
-return *this;
-}
-
-B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec )
-{
-B3IVector aRes( rVec );
-return aRes*=rMat;
-}
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/vector/b3ivector.hxx 
b/include/basegfx/vector/b3ivector.hxx
deleted file mode 100644
index 01a16f7..000
--- a/include/basegfx/vector/b3ivector.hxx
+++ /dev/null
@@ -1,248 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BASEGFX_VECTOR_B3IVECTOR_HXX
-#define INCLUDED_BASEGFX_VECTOR_B3IVECTOR_HXX
-
-#include 
-#include 
-
-namespace basegfx
-{
-class B3DHomMatrix;
-
-/** Base Point class with three sal_Int32 values
-
-This class derives all operators and common handling for
-a 3D data class from B3ITuple. All necessary extensions
-which are special for 3D Vectors are added here.
-
-@see B3ITuple
-*/
-class BASEGFX_DLLPUBLIC B3IVector : public ::basegfx::B3ITuple
-{
-public:
-/** Create a 3D Vector
-
-The vector is initialized to (0, 0, 0)
-*/
-B3IVector()
-:   B3ITuple()
-{}
-
-/** Create a 3D Vector
-
-@param nX
-This parameter is used to initialize the X-coordinate
-of the 3D Vector.
-
-@param nY
-This parameter is used to initialize the Y-coordinate
-of the 3D Vector.
-
-@param nZ
-This parameter is used to initialize the Z-coordinate
-of the 3D Vector.
-*/
-B3IVector(sal_Int32 n

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

[Zsolt Bölöny]

 basegfx/source/range/b3drange.cxx  |1 
 include/basegfx/range/b3drange.hxx |1 
 include/basegfx/range/b3irange.hxx |  230 -
 3 files changed, 232 deletions(-)

New commits:
commit 135ced89b2fd2de02aec2132783543242197d945
Author: Zsolt Bölöny 
Date:   Tue May 19 00:16:44 2015 +0200

Remove B3IRange, it's not used anywhere

Change-Id: I19a6835eaab2efba530d30f871f1b4509b683801
Reviewed-on: https://gerrit.libreoffice.org/15812
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basegfx/source/range/b3drange.cxx 
b/basegfx/source/range/b3drange.cxx
index b07fcb5..f779f18 100644
--- a/basegfx/source/range/b3drange.cxx
+++ b/basegfx/source/range/b3drange.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/include/basegfx/range/b3drange.hxx 
b/include/basegfx/range/b3drange.hxx
index cf96c16..3ce6925 100644
--- a/include/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
@@ -28,7 +28,6 @@
 
 namespace basegfx
 {
-class B3IRange;
 class B3DHomMatrix;
 
 class B3DRange
diff --git a/include/basegfx/range/b3irange.hxx 
b/include/basegfx/range/b3irange.hxx
deleted file mode 100644
index 5a51571..000
--- a/include/basegfx/range/b3irange.hxx
+++ /dev/null
@@ -1,230 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
-#define INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-namespace basegfx
-{
-class B3IRange
-{
-typedef ::basegfx::BasicRange< sal_Int32, Int32Traits > MyBasicRange;
-
-MyBasicRangemaRangeX;
-MyBasicRangemaRangeY;
-MyBasicRangemaRangeZ;
-
-public:
-B3IRange() {}
-
-explicit B3IRange(const B3ITuple& rTuple)
-:   maRangeX(rTuple.getX()),
-maRangeY(rTuple.getY()),
-maRangeZ(rTuple.getZ())
-{
-}
-
-B3IRange(sal_Int32 x1,
- sal_Int32 y1,
- sal_Int32 z1,
- sal_Int32 x2,
- sal_Int32 y2,
- sal_Int32 z2)
-:   maRangeX(x1),
-maRangeY(y1),
-maRangeZ(z1)
-{
-maRangeX.expand(x2);
-maRangeY.expand(y2);
-maRangeZ.expand(z2);
-}
-
-B3IRange(const B3ITuple& rTuple1,
- const B3ITuple& rTuple2)
-:   maRangeX(rTuple1.getX()),
-maRangeY(rTuple1.getY()),
-maRangeZ(rTuple1.getZ())
-{
-expand(rTuple2);
-}
-
-bool isEmpty() const
-{
-return maRangeX.isEmpty() || maRangeY.isEmpty() || 
maRangeZ.isEmpty();
-}
-
-void reset()
-{
-maRangeX.reset();
-maRangeY.reset();
-maRangeZ.reset();
-}
-
-bool operator==( const B3IRange& rRange ) const
-{
-return (maRangeX == rRange.maRangeX
-&& maRangeY == rRange.maRangeY
-&& maRangeZ == rRange.maRangeZ);
-}
-
-bool operator!=( const B3IRange& rRange ) const
-{
-return (maRangeX != rRange.maRangeX
-|| maRangeY != rRange.maRangeY
-|| maRangeZ != rRange.maRangeZ);
-}
-
-sal_Int32 getMinX() const
-{
-return maRangeX.getMinimum();
-}
-
-sal_Int32 getMinY() const
-{
-return maRangeY.getMinimum();
-}
-
-sal_Int32 getMinZ() const
-{
-return maRangeZ.getMinimum();
-}
-
-sal_Int32 getMaxX() const
-{
-return maRangeX.getMaximum();
-}
-
-sal_Int32 getMaxY() const
-{
-return maRangeY.getMaximum();
-}
-
-sal_Int32 getMaxZ() const
-{
-return maRangeZ.getMaximum();
-}
-
-sal_Int64 getWidth() const
-{
-return maRangeX.getRange();
-}
-
- 

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

[Takeshi Abe]

 starmath/inc/node.hxx|9 +
 starmath/source/node.cxx |   23 ---
 2 files changed, 1 insertion(+), 31 deletions(-)

New commits:
commit a6f611cb3d71edb7934c9ed44046ad621c2b7480
Author: Takeshi Abe 
Date:   Tue May 26 23:39:34 2015 +0900

drop useless field bIsDebug

Its last usage was gone with d82fc206c5d27191bc47adc486cf32442908f62d.

Change-Id: Ia891dd860edc305689804d02d4c74aa41804e484
Reviewed-on: https://gerrit.libreoffice.org/15911
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 89620a4..9b0045b 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -100,9 +100,7 @@ class SmNode : public SmRect
 RectHorAligneRectHorAlign;
 sal_uInt16  nFlags,
 nAttributes;
-boolbIsPhantom,
-bIsDebug;
-
+boolbIsPhantom;
 boolbIsSelected;
 
 protected:
@@ -132,7 +130,6 @@ public:
 sal_uInt16 &Flags() { return nFlags; }
 sal_uInt16 &Attributes() { return nAttributes; }
 
-bool IsDebug() const { return bIsDebug; }
 bool IsPhantom() const { return bIsPhantom; }
 void SetPhantom(bool bIsPhantom);
 void SetColor(const Color &rColor);
@@ -152,10 +149,6 @@ public:
 
 sal_uInt16 FindIndex() const;
 
-#if OSL_DEBUG_LEVEL
-void ToggleDebug() const;
-#endif
-
 void SetRectHorAlign(RectHorAlign eHorAlign, bool bApplyToSubTree 
= true );
 RectHorAlign GetRectHorAlign() const { return eRectHorAlign; }
 
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 311df24..bfe66dc 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -46,7 +46,6 @@ SmNode::SmNode(SmNodeType eNodeType, const SmToken 
&rNodeToken)
 , nFlags( 0 )
 , nAttributes( 0 )
 , bIsPhantom( false )
-, bIsDebug( false )
 , bIsSelected( false )
 , nAccIndex( -1 )
 , aParentNode( NULL )
@@ -256,11 +255,6 @@ void SmNode::PrepareAttributes()
 
 void SmNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
 {
-#if OSL_DEBUG_LEVEL > 1
-bIsDebug= true;
-#else
-bIsDebug= false;
-#endif
 bIsPhantom  = false;
 nFlags  = 0;
 nAttributes = 0;
@@ -300,23 +294,6 @@ sal_uInt16 SmNode::FindIndex() const
 }
 
 
-#if OSL_DEBUG_LEVEL > 1
-void  SmNode::ToggleDebug() const
-// toggle 'bIsDebug' in current subtree
-{
-SmNode *pThis = (SmNode *) this;
-
-pThis->bIsDebug = bIsDebug ? false : true;
-
-SmNode *pNode;
-sal_uInt16  nSize = GetNumSubNodes();
-for (sal_uInt16 i = 0; i < nSize; i++)
-if (NULL != (pNode = pThis->GetSubNode(i)))
-pNode->ToggleDebug();
-}
-#endif
-
-
 void SmNode::Move(const Point& rPosition)
 {
 if (rPosition.X() == 0  &&  rPosition.Y() == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1-buildfix1' created by Christian Lohmaier 
 at 2015-05-27 14:39 -0700

Tag libreoffice-4.4.4.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVZckoAAoJEPQ0oe+v7q6jaZIQAI+oEBJD0/wY0wBpVLYSdZl5
cJICxYrTbYmFgy++tJIzerDS/R+dcnT16/enj0TgecsQ7uYouTInzCvc+jPKr/RX
8pjlEZ3MnAqPkavEX9raODfBzmxAucjHQ1OgOeULHWty5nADjMAGtPoAhA8XYf8h
HqjRWzL4WPTMQTEC9dBIVvSodMhWOURVQMHAt9Bf4uuUip/D6NVLT8hjBACbEhc4
oOV2Lz6Wingih5DY8hecRslxLkuxlLk9SchH3vhvWwTbNe4Hvrc+YLTr0Ojl/04+
40DWTgGO5/cGprxHlfNegnat57j69ODlbyJXZ2Xh7lrTnorvNx/sIKkoOzesRudN
Dx1QBQqtkLUxa41K7Vm2BG/kPRPWnXod8zQoRadDJllVJ3nZNOsEbemoSRx6qrnD
A89X+/hVCY/P5+r/GWJjwHB/bPFz7SDsuN6OMFMJB6yFAttSo8Me19sDOD2DX7X1
YXxI8eWkXeM2swQDbDLKa8J8vEUAze8XhebtsR9s3iQ4/YnSVoh38BQpRj2zpl5j
Vr+gvjO19PHKaE6EVpJD6/as2HDsdGlxMWw4hJDusfqe6hs5258RAkHMKtRcBoYC
Rk++3LskKKnVkMKGqAwGB1SrgqTp3eUERzluZgYTy0e7f1RfT+SfTS/ELP10sqeC
Wc35MKFS85rkCD1kUxVL
=7pAG
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1-buildfix1' created by Christian Lohmaier 
 at 2015-05-27 14:39 -0700

Tag libreoffice-4.4.4.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVZckvAAoJEPQ0oe+v7q6js9EQAJfe+VfzuzjTIlgDGPgrhRsf
r/xAO+Y1LOH5zXjM0GP4AEQtwL9GNKXplfP6z23ffZHbCX4t1NZI8Wb22Fw8uIJi
aPDOEmsAtZMMPAjuPoDH7/YZYKwPIZ/p2dWcmTPqS+jECL34eZMk0WzsyMlqyc3t
M1mIYqy94yQMMv7kC1pp7e64NOeUZ9gn8Pe66Ty/9cGoHZs/MpuBGO7dd2HsRjhH
TWR8B2Yq18mxe8n2kHAwS86lnWN+/dz/Pp+WZxP2/I409XKKkKL3w8SwXvgW+mNx
g7RxWH7NLAQ8li7xND7v38StUEG81fOcv3U7X201bSsrcS99fdJ9LSXV/aBrshW6
z7SOdxdy/eKTlj+Wmj9NI4Uiy1SoLbGkcHBoSlrWb/468AHnurv9+XVWMLzzGFGh
2yyJYuQ5ztASCb7Y0F1Jtu8Em2g2ugBNZunnSXWj2zqiJSqgrtqvTBi/FyQTNcrl
JY4RNrPRFxbqPwc2MqXJhqUW6cYO/QnIyw+hKb84ec0v3ULEzvExyeYQ4F03vpRo
0hXhG6mhAFNGwrfeOgNmdosu8PR/sjDUx8roHXDeoMjGqgzJ39UV9txbWOQjanzY
IoYSp6FRxrOXzo6URi9AnKcTDTx1vxVMX90OH+2dqd2yHEcg7BYP3e4Z9eRvBb+v
OStmNAGRR7dmD21rZEZ2
=UGHm
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl vcl/qa vcl/source

[Tobias Lippert]

 include/vcl/IconThemeInfo.hxx |3 +++
 include/vcl/IconThemeSelector.hxx |4 
 vcl/qa/cppunit/app/test_IconThemeInfo.cxx |   24 
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |4 ++--
 vcl/source/app/IconThemeInfo.cxx  |   20 +++-
 vcl/source/app/IconThemeSelector.cxx  |7 ++-
 6 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit e586f2c7de035d2768f96e51b89c63e9377fd403
Author: Tobias Lippert 
Date:   Sat Feb 21 21:39:45 2015 +0100

tdf#88675 Fix display names for hicontrast and tango_testing

The special cases for the icon themes with the filenames
"images_hicontrast.zip" and "images_tango_testing.zip" are now handled.
They will be displayed as "High Contrast" and "Tango Testing"
respectively.

Change-Id: Ia3c2b8b57809db9c5ed132c42a412157e91b2599
Reviewed-on: https://gerrit.libreoffice.org/14574
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
(cherry picked from commit 2a0118a98fc39dfed56fb7904733f63f6a2d6fe8)
Reviewed-on: https://gerrit.libreoffice.org/15925
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx
index 8d9c0e3..f1f2fa9 100644
--- a/include/vcl/IconThemeInfo.hxx
+++ b/include/vcl/IconThemeInfo.hxx
@@ -29,6 +29,9 @@ class VCL_DLLPUBLIC IconThemeInfo {
 
 public:
 
+/** The name of the icon theme to use for high contrast mode */
+static const OUString HIGH_CONTRAST_ID;
+
 /** Construct an IconThemeInfo from the URL to a file.
  * This method will throw a std::runtime_error if the URL cannot be 
properly parsed.
  * Check the URL with UrlCanBeParsed() first.
diff --git a/include/vcl/IconThemeSelector.hxx 
b/include/vcl/IconThemeSelector.hxx
index 8f9d98b..990e3ec 100644
--- a/include/vcl/IconThemeSelector.hxx
+++ b/include/vcl/IconThemeSelector.hxx
@@ -76,10 +76,6 @@ private:
 static OUString
 ReturnFallback(const std::vector& installedThemes);
 
-/** The name of the icon theme to use for high contrast mode */
-static const OUString
-HIGH_CONTRAST_ICON_THEME_ID;
-
 /** The name of the icon theme which is used as fallback */
 static const OUString
 FALLBACK_ICON_THEME_ID;
diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 
b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 2a199d2..416f8e2 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -36,6 +36,12 @@ class IconThemeInfoTest : public CppUnit::TestFixture
 ThemeIdIsDetectedFromFileNameWithUnderscore();
 
 void
+DisplayNameForHicontrastIsHighContrast();
+
+void
+DisplayNameForTango_testingIsTangoTesting();
+
+void
 ExceptionIsThrownWhenIdCannotBeDetermined1();
 
 void
@@ -114,6 +120,24 @@ 
IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception was thrown", true, thrown);
 }
 
+void
+IconThemeInfoTest::DisplayNameForHicontrastIsHighContrast()
+{
+OUString id("hicontrast");
+OUString expected("High Contrast");
+OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id);
+CPPUNIT_ASSERT_EQUAL(expected, displayName);
+}
+
+void
+IconThemeInfoTest::DisplayNameForTango_testingIsTangoTesting()
+{
+OUString id("tango_testing");
+OUString expected("Tango Testing");
+OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id);
+CPPUNIT_ASSERT_EQUAL(expected, displayName);
+}
+
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeInfoTest);
 
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 40ff352..e32ccd2 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -80,7 +80,7 @@ IconThemeSelectorTest::GetFakeInstalledThemes()
 r.push_back(a);
 a.mThemeId = "oxygen";
 r.push_back(a);
-a.mThemeId = vcl::IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID;
+a.mThemeId = "hicontrast";
 r.push_back(a);
 return r;
 }
@@ -122,7 +122,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByHighContrastMode()
 std::vector themes = GetFakeInstalledThemes();
 OUString selected = s.SelectIconTheme(themes, "tango");
 CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by high contrast 
mode",
-vcl::IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID, selected);
+OUString("hicontrast"), selected);
 s.SetUseHighContrastTheme(false);
 selected = s.SelectIconTheme(themes, "tango");
 CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is no longer overridden by 
high contrast mode",
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 869eb85..f3d054b 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/Ico

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1-buildfix1' created by Christian Lohmaier 
 at 2015-05-27 14:39 -0700

Tag libreoffice-4.4.4.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVZckkAAoJEPQ0oe+v7q6jgEEP/1OLdhypRAudbJCIEj2PfMiW
AdObdU+gcjnzKMoDRFWt8OT18owS2gvkiDJbBku85G5AkZYnjFbw7c1UdBG7z6SK
cfiBapaE5+wXmzp5w8BAKqB61AJe/LVwGWkZwICWmaLd27t+1gQYklNwObyDsA7K
jFZnYkQmPMqUdHNMDLfILH1dPTvHMpT/pMx8oeWtWSFS+sGQeIzqt/36B3n1zkr7
+0Ed/hF3ZjgZPI7lKO6YyV3647jR7NigUahqbEMClgdPcmlhlKiwRVeY07Ui+dxM
Aci5P46eV5SCZutrrmXYL74QP5OMkulgLQ0RJmwxapZhcwMjyU/e+686Xjos01sM
G46I2ymA+2MAVoI9ROHhOjrrakR4k3Xc2cNlnci6GpN6swGFcaJCbcmJ0OjQvyfE
ONjjWC/trK86FP8EDv3MFSo8JUBw7MfAjpcmcX/hJ199d4vlTy0SCa27wSgK4Zzz
0/Dd/NCrUnbBV9R7gZ7sN0KdKe/jddQaDOEopAol2JzrDz32RiNSftxnz8EqKcg1
IadHJGSYTIsVlyGd4/OcfnGxN09SOi3u4JjCJqQw01s40IJRFIogiz+BE7t8O+zy
96SbyeGtz/0wpowB+xwM2OPWDxyCDp80d6lm7sT8xw5jZ1jb7lgK5VvazOJyo00+
ZKMIWEEcyb4//V4tX0uf
=zp+M
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1-buildfix1' created by Christian Lohmaier 
 at 2015-05-27 14:39 -0700

Tag libreoffice-4.4.4.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJVZckrAAoJEPQ0oe+v7q6j3fUQAJnlw4xYEPYdFb39KhBcWOBE
0wSUc7BLcJ0D18XSmWL4I51SzMy7hMkgHuaux4Qz1WRwHI/uLPNcqtxKIcHEmo0L
5f2AfGfNVqIdM2OC+1oNJvXkERTOSLhbKra1hLXrK9Y8ij45TxlVI6XllbYIMmeU
DKYzKSOSOwZ8EwNh4/J6TsUD32+L5vLY+xXZsn+9c6SSgcxeV+7KzIKDIB01zsRA
RJM+qFAYJKTCqVyARssum0H3ybfQzIobSr8uX7If/Mapa/QJBDk7x1PotWjtU4sv
/ZxcpRjOTZ+9iSUYEqeQIZ2q4lsXampoPSMmzogqohkzgdV2SP/UG8ZHqvByUCJE
se8oIT9RLaV8nhiENDqdVIYBTLKA1bByh8rc8hG+o3Tmml8f31JyimpxBhKGm3lj
GgSDp68SS56ch2xWzZORKu9pzW6eAeXfIDAvsrBqNQxqAc3/BCqv2tlHGdPiYMLv
+F21zm0nwDOpcq/q7QwhHxiMl4rNwr1CCNJu8en2Dz1giGJ5vpwDKFemtyfugUuQ
oXhEnK/qROKCb81bZrcrSN0cgWAmra6h3wfwoCuc6yY1zsgfYQA8EIIcg03dvmdf
v2N636u5rxU+TtznTna48Ot0bUXJp8hVJVuMV+DaTjVwtA7jlr+O56kinxhphO+2
rhjnrlYcDPuJIMna034/
=2Xjb
-END PGP SIGNATURE-

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

Michel Renon license statement

[Michel Renon]

All of my past & future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.


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

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

[Miklos Vajna]

 sw/source/uibase/uno/unotxdoc.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e3b0bae416b22f6dbf0a63efb645dadf75763a9c
Author: Miklos Vajna 
Date:   Wed May 27 15:16:58 2015 +0200

SwXTextDocument::initializeForTiledRendering: allow having different 
defaults

SetHardBlank() configures the gray background for non-breaking spaces.

Change-Id: I779503189085cc6537b776deb3d30cb93b316acd

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 21e932e..8c21898 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3165,6 +3165,11 @@ void SwXTextDocument::initializeForTiledRendering()
 return;
 pView->SetViewLayout(nColumns, bBookMode, true);
 
+// Tiled rendering defaults.
+SwViewOption aViewOption(*pViewShell->GetViewOptions());
+aViewOption.SetHardBlank(false);
+pViewShell->ApplyViewOptions(aViewOption);
+
 // Disable map mode, so that it's possible to send mouse event coordinates
 // directly in twips.
 SwEditWin& rEditWin = pDocShell->GetView()->GetEditWin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Umair Shahid license statement

[Umair Shahid]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.

-- 
Umair Shahid
http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - editeng/source filter/source sc/inc sc/source sdext/source sd/source svtools/source toolkit/source vcl/source

[Michael Meeks]

 editeng/source/editeng/impedit.hxx  |2 +-
 filter/source/graphicfilter/eos2met/eos2met.cxx |2 +-
 filter/source/graphicfilter/idxf/dxf2mtf.cxx|2 +-
 filter/source/svg/svgwriter.cxx |2 +-
 sc/inc/progress.hxx |4 
 sc/source/core/data/column2.cxx |   17 +
 sc/source/core/data/formulacell.cxx |8 ++--
 sc/source/core/tool/progress.cxx|   13 -
 sc/source/ui/docshell/sizedev.cxx   |2 +-
 sc/source/ui/view/gridwin4.cxx  |2 +-
 sd/source/filter/eppt/pptx-text.cxx |2 +-
 sdext/source/pdfimport/wrapper/wrapper.cxx  |6 +++---
 svtools/source/control/ctrlbox.cxx  |2 +-
 toolkit/source/awt/vclxtoolkit.cxx  |2 +-
 vcl/source/edit/texteng.cxx |2 +-
 vcl/source/edit/textview.cxx|2 +-
 vcl/source/filter/wmf/wmfwr.cxx |2 +-
 vcl/source/gdi/impanmvw.cxx |6 +++---
 18 files changed, 53 insertions(+), 25 deletions(-)

New commits:
commit f34c1e9ba7d831c42c89d3c59d501ce6cc858dbe
Author: Michael Meeks 
Date:   Tue May 26 16:02:50 2015 +0100

tdf#91416 - fix some incorrectly allocated VirtualDevices.

Change-Id: I9ebed313827986473c60e77b7e218b4c1b2487fe
(cherry picked from commit f849d96463d967214bc063f6de912a082272c395)

diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 93f2b8f..d08ee75 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1069,7 +1069,7 @@ inline EditSelection ImpEditEngine::CreateSel( const 
ESelection& rSel )
 inline VirtualDevice* ImpEditEngine::GetVirtualDevice( const MapMode& 
rMapMode, DrawModeFlags nDrawMode )
 {
 if ( !pVirtDev )
-pVirtDev = new VirtualDevice;
+pVirtDev = VclPtr::Create();
 
 if ( ( pVirtDev->GetMapMode().GetMapUnit() != rMapMode.GetMapUnit() ) ||
  ( pVirtDev->GetMapMode().GetScaleX() != rMapMode.GetScaleX() ) ||
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx 
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index abda124..3acff99 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -262,7 +262,7 @@ public:
 if( !pCompDev )
 {
 apDummyVDev.disposeAndClear();
-apDummyVDev.reset( new VirtualDevice );
+apDummyVDev.reset( VclPtr::Create() );
 pCompDev = apDummyVDev.get();
 }
 }
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx 
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index d02c389..3dd97e2 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -776,7 +776,7 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & 
rDXF, GDIMetaFile & rMTF
 const DXFLayer * pLayer;
 const DXFVPort * pVPort;
 
-pVirDev = new VirtualDevice;
+pVirDev = VclPtr::Create();
 pDXF= &rDXF;
 bStatus = true;
 
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 16f3fc9..56c5f76 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1652,7 +1652,7 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, 
SVGFontExport& rFontExport
 mbClipAttrChanged( false ),
 mbIsPlaceholderShape( false )
 {
-mpVDev = new VirtualDevice;
+mpVDev = VclPtr::Create();
 mpVDev->EnableOutput( false );
 maTargetMapMode = MAP_100TH_MM;
 maTextWriter.setVirtualDevice( mpVDev, maTargetMapMode );
diff --git a/sc/source/ui/docshell/sizedev.cxx 
b/sc/source/ui/docshell/sizedev.cxx
index 744266e..90bca78 100644
--- a/sc/source/ui/docshell/sizedev.cxx
+++ b/sc/source/ui/docshell/sizedev.cxx
@@ -39,7 +39,7 @@ ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* 
pDocSh )
 }
 else
 {
-pDevice = new VirtualDevice;
+pDevice = VclPtr::Create();
 pDevice->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
 bOwner = true;
 }
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index c175d02..bfda05a 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -498,7 +498,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 //  #i45033# For OLE inplace editing with different zoom factors,
 //  use a virtual device with 1/100th mm as text formatting reference
 
-xFmtVirtDev.reset( new VirtualDevice );
+xFmtVirtDev.reset( VclPtr::Create() );
 xFmtVirtDev->SetMapMode( MAP_100TH_MM );
 aOutputData.SetFmtDevice( xFmtVirtDev.get() );
 
diff --git a/sd/source/filter/eppt/pptx-text.cxx 
b/sd/source/filter/eppt/pptx-text.cxx
index cfbf7a6..a890199 100644
--- a/sd/source/fil

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source svtools/source svx/source svx/workben sw/qa sw/source

[Caolán McNamara]

 sc/inc/progress.hxx|   
 4 ++
 sc/source/core/data/column2.cxx|   
17 ++
 sc/source/core/data/formulacell.cxx|   
 8 +++-
 sc/source/core/tool/progress.cxx   |   
13 ---
 svtools/source/uno/wizard/unowizard.cxx|   
 2 -
 svx/source/accessibility/AccessibleTextHelper.cxx  |   
 6 +--
 svx/source/core/extedit.cxx|   
 2 -
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx  |   
10 ++---
 svx/source/dialog/_bmpmask.cxx |   
 2 -
 svx/source/dialog/imapwnd.hxx  |   
 2 -
 svx/source/dialog/svxruler.cxx |   
 2 -
 svx/source/engine3d/helperminimaldepth3d.cxx   |   
 2 -
 svx/source/engine3d/scene3d.cxx|   
 4 +-
 svx/source/engine3d/view3d.cxx |   
 2 -
 svx/source/fmcomp/fmgridif.cxx |   
 2 -
 svx/source/fmcomp/gridctrl.cxx |   
 4 +-
 svx/source/form/datanavi.cxx   |   
 4 +-
 svx/source/form/filtnav.cxx|   
 6 +--
 svx/source/form/fmpgeimp.cxx   |   
 2 -
 svx/source/form/fmscriptingenv.cxx |   
 4 +-
 svx/source/form/fmshimp.cxx|   
 2 -
 svx/source/form/fmundo.cxx |   
 2 -
 svx/source/form/fmvwimp.cxx|   
 4 --
 svx/source/form/formcontrolfactory.cxx |   
 2 -
 svx/source/form/formcontroller.cxx |   
 4 +-
 svx/source/form/formcontrolling.cxx|   
 6 +--
 svx/source/form/legacyformcontroller.cxx   |   
 2 -
 svx/source/gallery2/codec.hxx  |   
 4 +-
 svx/source/gallery2/galbrws2.cxx   |   
 2 -
 svx/source/sidebar/EmptyPanel.hxx  |   
 2 -
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx|   
 2 -
 svx/source/stbctrls/pszctrl.cxx|   
 2 -
 svx/source/stbctrls/selctrl.cxx|   
 2 -
 svx/source/svdraw/svddrgm1.hxx |   
12 +++
 svx/source/svdraw/svdhdl.cxx   |   
 2 -
 svx/source/svdraw/svdograf.cxx |   
 2 -
 svx/source/svdraw/svdoole2.cxx |   
 6 +--
 svx/source/svdraw/svdopath.cxx |   
 2 -
 svx/source/svdraw/svdotextdecomposition.cxx|   
 2 -
 svx/source/svdraw/svdotextpathdecomposition.cxx|   
 4 +-
 svx/source/svdraw/svdotxln.cxx |   
 2 -
 svx/source/svdraw/svdouno.cxx  |   
 2 -
 svx/source/svdraw/svdpage.cxx  |   
 2 -
 svx/source/table/accessibletableshape.cxx  |   
 2 -
 svx/source/table/propertyset.hxx   |   
 4 +-
 svx/source/table/svdotable.cxx |   
 2 -
 svx/source/table/tablecolumns.hxx  |   
 2 -
 svx/source/table/tablecontroller.cxx   |   
 2 -
 svx/source/table/tablelayouter.hxx |   
 2 -
 svx/source/table/tablemodel.hxx|   
 6 +--
 svx/source/table/tablerows.hxx |   
 2 -
 svx/source/table/tablertfimporter.cxx  |   
 6 +--
 svx/source/table/tableundo.hxx |   
 8 +---
 svx/source/table/viewcontactoftableobj.hxx |   
 2 -
 svx/source/tbxctrls/bulletsnumbering.cxx   |   
 2 -
 svx/source/tbxctrls/colrctrl.cxx   |   
 9 +
 svx/source/tbxctrls/extrusioncontrols.hxx  |   
 8 ++--
 svx/source/tbxctrls/fontworkgallery.

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

[László Németh]

 vcl/source/edit/texteng.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 77c47fc79c1c8096c19a81a0d320e75b84857144
Author: László Németh 
Date:   Wed May 27 14:26:56 2015 +0200

tdf#91544: fix freezing of Data source window

Change-Id: Ia445bedd57d99c534c9664a42fcb9cd766fcdc39

diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 812b9b5..bde1b0f 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1499,7 +1499,8 @@ void TextEngine::UpdateViews( TextView* pCurView )
 aNewPos.X() -= aOutSz.Width() - 1;
 aClipRect.SetPos( aNewPos );
 
-pView->GetWindow()->Invalidate( aClipRect );
+if (pView == pCurView)
+pView->GetWindow()->Invalidate( aClipRect );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |   15 ++-
 sd/source/ui/view/Outliner.cxx   |8 
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 436b4451c6f36ca23c966e2391cfcf94091b6db7
Author: Miklos Vajna 
Date:   Wed May 27 14:10:00 2015 +0200

CppunitTest_sd_tiledrendering: add search-not-found testcase

Fails without commit c0cc9a8622a2cd0e3ba07e15a79dd65ca910b233 (sd LOKit
callback for search not found, 2015-05-27).

Change-Id: I26ce4eab3d0bf3abc4a59d0dd21d5f2f5de78017

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 9889015..b41c427 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -74,13 +74,15 @@ private:
 #if !defined(WNT) && !defined(MACOSX)
 Rectangle m_aInvalidation;
 std::vector m_aSelection;
+bool m_bFound;
 sal_Int32 m_nPart;
 #endif
 };
 
 SdTiledRenderingTest::SdTiledRenderingTest()
 #if !defined(WNT) && !defined(MACOSX)
-: m_nPart(0)
+: m_bFound(true),
+m_nPart(0)
 #endif
 {
 }
@@ -167,6 +169,11 @@ void SdTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 }
 }
 break;
+case LOK_CALLBACK_SEARCH_NOT_FOUND:
+{
+m_bFound = false;
+}
+break;
 case LOK_CALLBACK_SET_PART:
 {
 OUString aPayload = OUString::createFromAscii(pPayload);
@@ -353,6 +360,12 @@ void SdTiledRenderingTest::testSearch()
 // Search for something on the second slide, and make sure that the 
set-part callback fired.
 lcl_search("bbb");
 CPPUNIT_ASSERT_EQUAL(static_cast(1), m_nPart);
+CPPUNIT_ASSERT_EQUAL(true, m_bFound);
+
+// This should trigger the not-found callback.
+Application::EnableHeadlessMode(false);
+lcl_search("ccc");
+CPPUNIT_ASSERT_EQUAL(false, m_bFound);
 }
 
 #endif
commit 9328df9598286a94f0cf097462045a3c0a5721fc
Author: Miklos Vajna 
Date:   Wed May 27 14:09:18 2015 +0200

sd tiled rendering: avoid showing wrap around dialog

Change-Id: Id977c3a17f5e34d086ee3b68fa9ad2969f9d24c2

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 24031ef..60873d0 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1098,6 +1098,14 @@ bool Outliner::ShowWrapArroundDialog()
 // Spell checking needs the dialog, too.
 bShowDialog = (meMode == SPELL);
 
+boost::shared_ptr pViewShell(mpWeakViewShell.lock());
+if (pViewShell && pViewShell->GetDoc()->isTiledRendering())
+{
+// Wrap around without asking anything.
+bShowDialog = false;
+bDoWrapArround = true;
+}
+
 if (bShowDialog)
 {
 // The question text depends on the search direction.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tobias Lippert]

 include/vcl/IconThemeInfo.hxx |3 +++
 include/vcl/IconThemeSelector.hxx |4 
 vcl/qa/cppunit/app/test_IconThemeInfo.cxx |   24 
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |4 ++--
 vcl/source/app/IconThemeInfo.cxx  |   20 +++-
 vcl/source/app/IconThemeSelector.cxx  |7 ++-
 6 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit 2a0118a98fc39dfed56fb7904733f63f6a2d6fe8
Author: Tobias Lippert 
Date:   Sat Feb 21 21:39:45 2015 +0100

tdf#88675 Fix display names for hicontrast and tango_testing

The special cases for the icon themes with the filenames
"images_hicontrast.zip" and "images_tango_testing.zip" are now handled.
They will be displayed as "High Contrast" and "Tango Testing"
respectively.

Change-Id: Ia3c2b8b57809db9c5ed132c42a412157e91b2599
Reviewed-on: https://gerrit.libreoffice.org/14574
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/include/vcl/IconThemeInfo.hxx b/include/vcl/IconThemeInfo.hxx
index 8d9c0e3..f1f2fa9 100644
--- a/include/vcl/IconThemeInfo.hxx
+++ b/include/vcl/IconThemeInfo.hxx
@@ -29,6 +29,9 @@ class VCL_DLLPUBLIC IconThemeInfo {
 
 public:
 
+/** The name of the icon theme to use for high contrast mode */
+static const OUString HIGH_CONTRAST_ID;
+
 /** Construct an IconThemeInfo from the URL to a file.
  * This method will throw a std::runtime_error if the URL cannot be 
properly parsed.
  * Check the URL with UrlCanBeParsed() first.
diff --git a/include/vcl/IconThemeSelector.hxx 
b/include/vcl/IconThemeSelector.hxx
index 8f9d98b..990e3ec 100644
--- a/include/vcl/IconThemeSelector.hxx
+++ b/include/vcl/IconThemeSelector.hxx
@@ -76,10 +76,6 @@ private:
 static OUString
 ReturnFallback(const std::vector& installedThemes);
 
-/** The name of the icon theme to use for high contrast mode */
-static const OUString
-HIGH_CONTRAST_ICON_THEME_ID;
-
 /** The name of the icon theme which is used as fallback */
 static const OUString
 FALLBACK_ICON_THEME_ID;
diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 
b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 2a199d2..416f8e2 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -36,6 +36,12 @@ class IconThemeInfoTest : public CppUnit::TestFixture
 ThemeIdIsDetectedFromFileNameWithUnderscore();
 
 void
+DisplayNameForHicontrastIsHighContrast();
+
+void
+DisplayNameForTango_testingIsTangoTesting();
+
+void
 ExceptionIsThrownWhenIdCannotBeDetermined1();
 
 void
@@ -114,6 +120,24 @@ 
IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception was thrown", true, thrown);
 }
 
+void
+IconThemeInfoTest::DisplayNameForHicontrastIsHighContrast()
+{
+OUString id("hicontrast");
+OUString expected("High Contrast");
+OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id);
+CPPUNIT_ASSERT_EQUAL(expected, displayName);
+}
+
+void
+IconThemeInfoTest::DisplayNameForTango_testingIsTangoTesting()
+{
+OUString id("tango_testing");
+OUString expected("Tango Testing");
+OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id);
+CPPUNIT_ASSERT_EQUAL(expected, displayName);
+}
+
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeInfoTest);
 
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 40ff352..e32ccd2 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -80,7 +80,7 @@ IconThemeSelectorTest::GetFakeInstalledThemes()
 r.push_back(a);
 a.mThemeId = "oxygen";
 r.push_back(a);
-a.mThemeId = vcl::IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID;
+a.mThemeId = "hicontrast";
 r.push_back(a);
 return r;
 }
@@ -122,7 +122,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByHighContrastMode()
 std::vector themes = GetFakeInstalledThemes();
 OUString selected = s.SelectIconTheme(themes, "tango");
 CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by high contrast 
mode",
-vcl::IconThemeSelector::HIGH_CONTRAST_ICON_THEME_ID, selected);
+OUString("hicontrast"), selected);
 s.SetUseHighContrastTheme(false);
 selected = s.SelectIconTheme(themes, "tango");
 CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is no longer overridden by 
high contrast mode",
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 9531bf4..da07e2c 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -13,8 +13,17 @@
 #include 
 #include 
 
+// constants for theme ids and display names. Only the theme id for hicontrast 
is used
+// outside of this class and hence made public.

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

[Stephan Bergmann]

 include/vcl/vclptr.hxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit 0cdab3fc10828233d202e064a175dc6442a4a473
Author: Stephan Bergmann 
Date:   Wed May 27 14:18:13 2015 +0200

The Mac libc++ version has problems as well,

...so remove the deleted address-of operator again for now

Change-Id: I3ded1d28bf2aeb170c70bcec865c09df1eefcb08

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 372b817..ad7d1e2 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -223,21 +223,6 @@ public:
 {
 return (m_rInnerRef > handle.m_rInnerRef);
 }
-
-/** Deleted address-of operator.
-
-To avoid confusion whether it returns the address of either the
-pointed-to raw object (for which to use VclPtr::get instead) or the
-wrapper itself (for which to use std::addressof instead).
-
-(Cannot be deleted at least with MSVC 12, as at least the innards of
-std::stable_sort on a std::vector>, as called from
-TaskPaneList::FindNextSplitter in vcl/source/window/taskpanelist.cxx
-require an address-of operator for VclPtr.)
- */
-#if !defined _MSC_VER
-void operator &() = delete;
-#endif
 }; // class VclPtr
 
 template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - loleaflet/Makefile loolwsd/configure.ac loolwsd/loolwsd.spec.in

[Tor Lillqvist]

 loleaflet/Makefile  |   10 --
 loolwsd/configure.ac|2 +-
 loolwsd/loolwsd.spec.in |4 +++-
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 05c650532593ab59673ed91dfcf88d0efc56d9b3
Author: Tor Lillqvist 
Date:   Wed May 27 15:13:25 2015 +0300

Post-release bump to 1.0.19

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index c4bf5a2..198a5a4 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.17], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.19], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 4109d1cb5db0b90579ebf720bd895fd09a1a2996
Author: Tor Lillqvist 
Date:   Wed May 27 15:12:21 2015 +0300

Avoid "cannot create directory: File exists" issues

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index d1166bc..c6dd746 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -62,7 +62,9 @@ getent passwd %{owner} >/dev/null || useradd -g %{group} -m 
-r %{owner}
 
 mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
 
-su - %{owner} -c 'mkdir lool-child-roots'
+su - %{owner} -c 'mkdir -p lool-child-roots'
+
+su - %{owner} -c "rm -rf /home/lool/lool-systemplate"
 
 # Figure out where LO is installed
 loroot=`rpm -ql %{sofficepackage} | grep '/soffice$' | sed -e 
's-/program/soffice--'`
commit 85e98d523116b0eefffaf0c9d70328b964a22a58
Author: Tor Lillqvist 
Date:   Wed May 27 14:45:53 2015 +0300

Don't put superfluous stuff in the tarball, and bump version to 1.0.2

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 3e7a928..d594672 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -1,24 +1,22 @@
 # Version number of loleaflet, no need to be in sync with the loolwsd one
 
-VERSION=1.0.0
+VERSION=1.0.2
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
 all:
-   rm -rf dist plugins/draw-$(DRAW_VERSION)/dist
-   mkdir dist plugins/draw-$(DRAW_VERSION)/dist
jake build
cd plugins/draw-$(DRAW_VERSION) && jake build
 
 .PHONY: dist
-dist: all
+dist: all Makefile loleaflet.spec
rm -rf loleaflet-$(VERSION)
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
-   tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document | (cd 
loleaflet-$(VERSION) && tar xf -)
+   tar cf - dist/leaflet.js dist/leaflet.css dist/images 
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.js 
plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css 
plugins/draw-$(DRAW_VERSION)/dist/images debug/document | (cd 
loleaflet-$(VERSION) && tar xf -)
tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION)
rm -rf loleaflet-$(VERSION)
 
-loleaflet.spec: loleaflet.spec.in
+loleaflet.spec: loleaflet.spec.in Makefile
sed -e 's/@PACKAGE_VERSION@/$(VERSION)/g' loleaflet.spec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/configure.ac

[Tor Lillqvist]

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

New commits:
commit 7e5f0afceedb739df05d8b53bc91154a71fc07fa
Author: Tor Lillqvist 
Date:   Wed May 27 14:38:41 2015 +0300

Post-release bump to 1.0.17

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 125954f..c4bf5a2 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.0.15], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.17], [libreoff...@collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/vclptr.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit a570e3070943845d3e52c1d0cd406b1a530bf0c4
Author: Stephan Bergmann 
Date:   Wed May 27 13:31:56 2015 +0200

Work around broken MSVC standard library

Change-Id: I9bbe6d231cc784f786dc5e31a641b8789fc35eb9

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index c1b1fb6..372b817 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -229,8 +229,15 @@ public:
 To avoid confusion whether it returns the address of either the
 pointed-to raw object (for which to use VclPtr::get instead) or the
 wrapper itself (for which to use std::addressof instead).
+
+(Cannot be deleted at least with MSVC 12, as at least the innards of
+std::stable_sort on a std::vector>, as called from
+TaskPaneList::FindNextSplitter in vcl/source/window/taskpanelist.cxx
+require an address-of operator for VclPtr.)
  */
+#if !defined _MSC_VER
 void operator &() = delete;
+#endif
 }; // class VclPtr
 
 template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/window/winproc.cxx  |2 +-
 vcl/win/source/window/salframe.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a99a04d3f85f531f9243569939599d7b0a16d9e7
Author: Caolán McNamara 
Date:   Wed May 27 12:16:30 2015 +0100

EndExtTextInput::Complete->EndExtTextInputFlags::Complete

Change-Id: I5039d68aad2849664a42b1a8c04f3703c98d4d8b

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index d447ea5..a56f94d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1856,7 +1856,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl)
 // TrackingMode is ended in ImplHandleLoseFocus
 #ifdef _WIN32
 // To avoid problems with the Unix IME
-pFocusWin->EndExtTextInput( EndExtTextInput::Complete );
+pFocusWin->EndExtTextInput( EndExtTextInputFlags::Complete );
 #endif
 
 // XXX #102010# hack for accessibility: do not close the menu,
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 42f12b2..287f0be 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2285,7 +2285,7 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, 
EndExtTextInputFlags nFlags
 if ( hIMC )
 {
 DWORD nIndex;
-if ( nFlags & EndExtTextInput::Complete )
+if ( nFlags & EndExtTextInputFlags::Complete )
 nIndex = CPS_COMPLETE;
 else
 nIndex = CPS_CANCEL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 6234320af092c8191081c19ef29a539496723d24
Author: Caolán McNamara 
Date:   Wed May 27 12:06:36 2015 +0100

fix build

Change-Id: Ie620107c7ce3ca7a3235adc296daf964a78f0540

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index c51ee4a..af9830c 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -446,7 +446,7 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 int32_t nCharPos = pHbGlyphInfos[i].cluster;
 
 // tdf#89231 if it's just a missing non-breaking space, then 
use a normal space
-if (!nGlyphIndex && (SalLayoutFlags::ForFallback & 
rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
+if (!nGlyphIndex && (SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags) 
&& nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
 {
 nGlyphIndex = rFont.GetGlyphIndex(' ');
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/bundled

[Tor Lillqvist]

 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b3ea72955d4c9cefa7a3db2dba1a938dc0a1cb61
Author: Tor Lillqvist 
Date:   Wed May 27 14:06:50 2015 +0300

Update from LO master

diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index ba4db82..bbcd5b9 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -148,7 +148,14 @@ typedef enum
  * Clients should assume that data returned by an earlier
  * lok::Document::getDocumentSize() call is no longer valid.
  */
-LOK_CALLBACK_PAGE_COUNT_CHANGED
+LOK_CALLBACK_PAGE_COUNT_CHANGED,
+
+/**
+ * The current part number is changed.
+ *
+ * Payload is a single 0-based integer.
+ */
+LOK_CALLBACK_SET_PART
 }
 LibreOfficeKitCallbackType;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1' created by Christian Lohmaier 
 at 2015-05-27 11:56 -0700

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

iQIcBAABAgAGBQJVZaL1AAoJEPQ0oe+v7q6jXG0P/RFvkdakclr3XibCoxzcjWho
N5cDHgTX1eN/3S3R7pKu5hs4rSV0J5bh9UahefwmvHjwapzaFwd1lP6hKMz3hV0K
Frf9R8IqvIGZptgAUho5usK6e4O7yV1vSLuMHiykQHKcml0VLsWL6zrj6m8w7cPP
wo0vNCBB8fG/dRjU+8foU0ohKTngX9VRT2u5cNHbVlv2syHGwgsAm3iAs61Yu7ZT
U+4Onlu7fCqM13dC2JJ4rnzxiKai88+Ejs+zPowEwJttCgnQdmCOPfAHcqTgkGQ1
qfIzYwA/GA5EC3EIxh6GlclrQwdHvex5+/X5oWE1zuUk70cD+vXL/Y26ODOPOBDu
tufkM6yI8EBF0XUZVYEt9sVQhdhLTRw34l8l0UA80uzld2JxK1HumWxNH5xReCWU
xz/A1VnceBZZPNxvaiUK3j2QtbVHEZtOHjcn5x04va3RFEMSsZWyvykpm6IfSiK2
mzKMznGF5X7S+5i9gJtSJvbjAJqj3OjZT3vcf9kuHn/ixWjBlK38bsEvNzGZRAiz
EdB9IPJJ6hC/T41tokbKSlL7rZuehAX7/30C5W2o8yaVqahhdUmrFqh3cdVq6lye
AoaOqQ/IrAAqHz+Yf4lg4RtIxbw+As4yu1/0KiZk36IsN4z4QKxc7Kz61ESEZz0W
TEY3mw1Zn2MIC9+LSvIW
=6YTl
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1' created by Christian Lohmaier 
 at 2015-05-27 11:56 -0700

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

iQIcBAABAgAGBQJVZaLvAAoJEPQ0oe+v7q6jiikQAMQE16G1iFuuNN+o7BwJADby
A9alUy230S3kC/Z+o6EjQmHwG/pQe2sXLB8M/p253b6RuwXbRSuRyPAJbDjgQIA4
46fEk+FBSftTCaiAFpIPMuK7EFi4xhaw/gW3aRl5U8zVnZYnqU0bO8Kp79YfEgnq
AcsefS8E3et17M7TKk0VYbxyfnQx/vbQ1md76rhIn24Z+8oSS34uXN9IJR1zCGsR
C+2AhVxtwNJ3VKs7NueelAKs7/+C3KuKjrfrxy0QxXssXuobPozKt7ljppOJkD3P
TM7JoKAWQ+Ae97UIWCAblRtRQQqsSnrAaQfGPtgRj+w23RwOXRRMgTCG7dfEnAka
orI6EkAwbtoUyWyZDrJnHCaPFvvKAiNCoh+4c+g2vOf8sDOzoxwNFSW4dbDFNkUo
9hwFxYbdXzNGiHXmbrCL9bAylz4Zo/Ysi6iogQs02aluRV1zRkPQZjFvmsdyYkPF
5kr75i3jj/vWnxO7Eiqo8vKL6855q5r3XfEmaM0rYpet68YHkpTA4/g3zkwYJwbr
NoRbxBMSBkR7yfh6FCyyPi2QIupT7amOs0YmOO6A/x4X8sEbFwF14y0GCKQN9n5v
mRj78nb4Anv8N2XhqXXvFGrm4AqDY9GdEopHicKL80Cl2Sl20le1uIWtIyYh9nQx
4/NfMadPVhQXlq5hyXhu
=xSQm
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1' created by Christian Lohmaier 
 at 2015-05-27 11:56 -0700

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

iQIcBAABAgAGBQJVZaLyAAoJEPQ0oe+v7q6jHNUP/2mwd1DHGGLYgAGZwEy2/qej
gchMk+lMjGwYCBqiU0sfE6pNlRSyUOpBpmX1reTjjm6AOgZMRF8NpAoDxYDKrDxk
hh7iM/fAcgTZSaOJomdmLg+RYb05gCpyL+Z/lEMmJ4H4CR+st8+RGHzI1A+OnjOz
jDdQNHGflgAcYMIfQR8lCfHusrQ0zpR98sbPvmvnRyXAET31OyqG1yWYfTdnQKMk
tBBv1U+igcnO/JEAcfu/OT6zjzLGMqkO6grmp8xaRBSS1FXeuogvXAb7QIaIG1Ml
ggFoeEM5EeMFkvPx5t8z7IHZsXx1atzZSBHfXb9r1NtyR29nvLSSOjFi3G6gvkQA
o9UEC/5VM3ipNtARr3vusKtQUOQImNwAznX0a3FMY5rBxdUxuNckQoVRwSu+miMN
JZwPJh9eG3fMHHT9XtgNVd84xQR7PekXyUftSAolhTGWaRNTy+zI4bEfSIIaPif6
xbvtZabDzern7yXNWNN61Lu7xvtflOJnIKt4LDRw6MXgIxyHetd8Q8u//YdrCXDp
sfmOX/vyFf+inkIsDP2S+XFgH1N3aP69Bo2IaWxyjLuSzaIjfUyrujV6CmbjKAXg
7i3f3FRiKREASrR/x4+FBA+8HCzikn4fgmBTsSfCcIhpH9JggzSZJmArKAk1tYnY
HybCcRmyFhB52p+Fmk5R
=vxXh
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

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

New commits:
commit b0d95a2dbdb052ccc8d3eb5f588fd4d3e7fb65dd
Author: Christian Lohmaier 
Date:   Wed May 27 12:57:32 2015 +0200

bump product version to 4.4.4.1.0+

Change-Id: Ib27c40fdd5813bc7c86358bb140aac69e62f6d49

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.1' created by Christian Lohmaier 
 at 2015-05-27 11:56 -0700

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

iQIcBAABAgAGBQJVZaLrAAoJEPQ0oe+v7q6jgUYP/i5pN64cyBg4BfAyPYW/by1Z
MXCP/8EF+BAx+T6otyyWNg3RhS9bM6lA0kBSS+c5ohOx8b9mWmBzLwRhjE3KXEID
gE5lbCR9g19WdBQFF+uZz9M85DEOs+Ha2b6zMa321NeQCYOs/8K6mgDl1FxG1+oW
yE7AkuG6cgDtT5FM52UuVdTn5+Ac2LzZvyI86PVyQrusucBi9LnrzoUwvgkkT14s
kNmDKYTFSwPXIAPtgWOcwzG7FOOXBzBE62oQbeFbmYamnJWbYTk9Sj2OXz5FvImd
VUByc7y98m2hA74YwYF+RTwJIN1SFhYjLhgy2RKZEJX1DNYszEZACDlProkP+bM+
EgebDNWtvgee5ceKuvH+jHdl1Q4HtjcBLZuFou5jAdbhBxDyPj38ShK0xDVNEbG4
Cxb3e8y9dSnuEsQOKBkztRSEraofaoljt5m9BpegYTtoMnJ584aJyZZDAEwma2u6
O8qzhuBGzeCmMN/b8eg4qJ9P4N/iVp4b77DXSo9AkNrwPDpHMtUBjvEH2dYA5rcb
jxiU5Xrf0+rngByS4K9hT9S5ivUlDRD5NX5Zne9wdaPJQJS4q8xrF01Sm3Ycyhe+
rBAZKlO7B0LrNwda09Vg6FlnaUbxHqy/hdQUVosHHsr8A3mSYIG2uAGenqJFUO1A
V+nR3F4GrBb9RzfZZwfC
=zV4p
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

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

New commits:
commit 3461bf722e803faa3822b02937c5e7e768990483
Author: Christian Lohmaier 
Date:   Wed May 27 12:54:43 2015 +0200

bump product version to 4.4.5.0.0+

Change-Id: If5a016ca56eb0da4643b2cf8d21253c62552fc75

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

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

[Christian Lohmaier]

New branch 'libreoffice-4-4-4' available with the following commits:
commit 98bf0346327cd3cdfa9fd68cd972ff21e4881e7c
Author: Christian Lohmaier 
Date:   Wed May 27 12:46:59 2015 +0200

Branch libreoffice-4-4-4

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

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

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

Change-Id: Id76197a07d84aceabc4c02994bcf8c541065b396

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

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

[Christian Lohmaier]

New branch 'libreoffice-4-4-4' available with the following commits:
commit 426a53208aa26b7671ebd99b538d63991fb030c0
Author: Christian Lohmaier 
Date:   Wed May 27 12:46:30 2015 +0200

Branch libreoffice-4-4-4

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

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

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

Change-Id: I2c7fac6ff6c3140c31d9e6c70157496710fa322a

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

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

[Christian Lohmaier]

New branch 'libreoffice-4-4-4' available with the following commits:
commit 393e77a510ed54f8ae400d7f8e94713619fdb4bd
Author: Christian Lohmaier 
Date:   Wed May 27 12:46:31 2015 +0200

Branch libreoffice-4-4-4

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

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

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

Change-Id: Iee1bebe9bc83d0b7866e8c210233267ff3054b37

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

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

[Christian Lohmaier]

New branch 'libreoffice-4-4-4' available with the following commits:
commit ff4811de0977fc6c881cd1176f4efa9244a5ee6d
Author: Christian Lohmaier 
Date:   Wed May 27 12:46:30 2015 +0200

Branch libreoffice-4-4-4

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

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

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

Change-Id: I3c87b5aeae5281cace32e1a10e02f892f0d6da27

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

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

[Thorsten Behrens]

 drawinglayer/source/attribute/fillgradientattribute.cxx|4 
 drawinglayer/source/attribute/fillgraphicattribute.cxx |4 
 drawinglayer/source/attribute/fillhatchattribute.cxx   |4 
 drawinglayer/source/attribute/lineattribute.cxx|4 
 drawinglayer/source/attribute/linestartendattribute.cxx|4 
 drawinglayer/source/attribute/sdrfillattribute.cxx |4 
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx  |4 
 drawinglayer/source/attribute/sdrlightingattribute3d.cxx   |4 
 drawinglayer/source/attribute/sdrlineattribute.cxx |4 
 drawinglayer/source/attribute/sdrlinestartendattribute.cxx |4 
 drawinglayer/source/attribute/sdrsceneattribute3d.cxx  |4 
 drawinglayer/source/attribute/sdrshadowattribute.cxx   |4 
 drawinglayer/source/attribute/strokeattribute.cxx  |4 
 13 files changed, 52 insertions(+)

New commits:
commit daa47bd04a32fa278bd0e1f6aa098c939e9339c1
Author: Thorsten Behrens 
Date:   Sun May 24 11:53:59 2015 +0200

Fix tdf#87509 - default sdr attribute is special object.

The drawinglayer attributes signal defaultness by object identity, not
value equalness. That should fix a number of subtle cache and redraw
problems.

Change-Id: I049ffda228a48db71cef108571805c6e41e4b149
(cherry picked from commit 551c204740a37c8dbc7acd35bc9fe683ade3fe80)
Reviewed-on: https://gerrit.libreoffice.org/15922
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx 
b/drawinglayer/source/attribute/fillgradientattribute.cxx
index 2689d07..497817e 100644
--- a/drawinglayer/source/attribute/fillgradientattribute.cxx
+++ b/drawinglayer/source/attribute/fillgradientattribute.cxx
@@ -142,6 +142,10 @@ namespace drawinglayer
 
 bool FillGradientAttribute::operator==(const FillGradientAttribute& 
rCandidate) const
 {
+// tdf#87509 default attr is always != non-default attr, even with 
same values
+if(rCandidate.isDefault() != isDefault())
+return false;
+
 return rCandidate.mpFillGradientAttribute == 
mpFillGradientAttribute;
 }
 
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx 
b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index bd7b98e..89422be 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -120,6 +120,10 @@ namespace drawinglayer
 
 bool FillGraphicAttribute::operator==(const FillGraphicAttribute& 
rCandidate) const
 {
+// tdf#87509 default attr is always != non-default attr, even with 
same values
+if(rCandidate.isDefault() != isDefault())
+return false;
+
 return rCandidate.mpFillGraphicAttribute == mpFillGraphicAttribute;
 }
 
diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx 
b/drawinglayer/source/attribute/fillhatchattribute.cxx
index 9e3adc7..f54db08 100644
--- a/drawinglayer/source/attribute/fillhatchattribute.cxx
+++ b/drawinglayer/source/attribute/fillhatchattribute.cxx
@@ -131,6 +131,10 @@ namespace drawinglayer
 
 bool FillHatchAttribute::operator==(const FillHatchAttribute& 
rCandidate) const
 {
+// tdf#87509 default attr is always != non-default attr, even with 
same values
+if(rCandidate.isDefault() != isDefault())
+return false;
+
 return rCandidate.mpFillHatchAttribute == mpFillHatchAttribute;
 }
 
diff --git a/drawinglayer/source/attribute/lineattribute.cxx 
b/drawinglayer/source/attribute/lineattribute.cxx
index 6cf96e1..6d22e56 100644
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
@@ -118,6 +118,10 @@ namespace drawinglayer
 
 bool LineAttribute::operator==(const LineAttribute& rCandidate) const
 {
+// tdf#87509 default attr is always != non-default attr, even with 
same values
+if(rCandidate.isDefault() != isDefault())
+return false;
+
 return rCandidate.mpLineAttribute == mpLineAttribute;
 }
 
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx 
b/drawinglayer/source/attribute/linestartendattribute.cxx
index f11e66f..f3a0822 100644
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
@@ -110,6 +110,10 @@ namespace drawinglayer
 
 bool LineStartEndAttribute::operator==(const LineStartEndAttribute& 
rCandidate) const
 {
+// tdf#87509 default attr is always != non-default attr, even with 
same values
+if(rCandidate.isDefault() != isDefault())
+return false;
+
 return rCandidate.mpLineStar

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

[Miklos Vajna]

 sd/qa/unit/tiledrendering/data/dummy.odp |binary
 sd/qa/unit/tiledrendering/tiledrendering.cxx |   36 ++-
 2 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit a0576aec8381ca8ea36d60c925e871587702c268
Author: Miklos Vajna 
Date:   Wed May 27 11:59:00 2015 +0200

CppunitTest_sd_tiledrendering: add part switching testcase

Fails with the last hunk of commit
67a37be9969d8b5a0bc8ae081bc1aba697ea6ba5 (sd: fix LOK search result
highlight when result is not on the current slide, 2015-05-26) reverted.

Change-Id: I5f8b57784ad1de1434113af7f94c9fde8672b4d5

diff --git a/sd/qa/unit/tiledrendering/data/dummy.odp 
b/sd/qa/unit/tiledrendering/data/dummy.odp
index e559de6..12cd679 100644
Binary files a/sd/qa/unit/tiledrendering/data/dummy.odp and 
b/sd/qa/unit/tiledrendering/data/dummy.odp differ
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index a55b026..9889015 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -37,6 +37,7 @@ static const char* DATA_DIRECTORY = 
"/sd/qa/unit/tiledrendering/data/";
 class SdTiledRenderingTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
 {
 public:
+SdTiledRenderingTest();
 virtual void setUp() SAL_OVERRIDE;
 virtual void tearDown() SAL_OVERRIDE;
 
@@ -73,9 +74,17 @@ private:
 #if !defined(WNT) && !defined(MACOSX)
 Rectangle m_aInvalidation;
 std::vector m_aSelection;
+sal_Int32 m_nPart;
 #endif
 };
 
+SdTiledRenderingTest::SdTiledRenderingTest()
+#if !defined(WNT) && !defined(MACOSX)
+: m_nPart(0)
+#endif
+{
+}
+
 void SdTiledRenderingTest::setUp()
 {
 test::BootstrapFixture::setUp();
@@ -158,6 +167,12 @@ void SdTiledRenderingTest::callbackImpl(int nType, const 
char* pPayload)
 }
 }
 break;
+case LOK_CALLBACK_SET_PART:
+{
+OUString aPayload = OUString::createFromAscii(pPayload);
+m_nPart = aPayload.toInt32();
+}
+break;
 }
 }
 
@@ -306,6 +321,16 @@ void SdTiledRenderingTest::testResetSelection()
 CPPUNIT_ASSERT(!pView->GetTextEditObject());
 }
 
+static void lcl_search(const OUString& rKey)
+{
+uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
+{
+{"SearchItem.SearchString", uno::makeAny(rKey)},
+{"SearchItem.Backward", uno::makeAny(false)}
+}));
+comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
+}
+
 void SdTiledRenderingTest::testSearch()
 {
 SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
@@ -314,12 +339,7 @@ void SdTiledRenderingTest::testSearch()
 uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
 xShape->setString("Aaa bbb.");
 
-uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
-{
-{"SearchItem.SearchString", uno::makeAny(OUString("bbb"))},
-{"SearchItem.Backward", uno::makeAny(false)}
-}));
-comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
+lcl_search("bbb");
 
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 SdrView* pView = pViewShell->GetView();
@@ -329,6 +349,10 @@ void SdTiledRenderingTest::testSearch()
 
 // Did the selection callback fire?
 CPPUNIT_ASSERT_EQUAL(static_cast(1), m_aSelection.size());
+
+// Search for something on the second slide, and make sure that the 
set-part callback fired.
+lcl_search("bbb");
+CPPUNIT_ASSERT_EQUAL(static_cast(1), m_nPart);
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Resignation from the ESC

[Bjoern Michaelsen]

Hi Markus,

On Mon, May 25, 2015 at 12:02:48PM +0200, Markus Mohrhard wrote:
> so I hereby resign from the ESC effective immediately.

Im very sorry to hear that. A big thank you for the work you did on the
product, the project and the ESC -- all of it has been awesome and a very
welcome contribution. I hope there is a chance we might see more of that one
day: I am certain you would be very welcome on the ESC again anytime.

Best,

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

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

Bug 88056 Summary: [FILE OPEN/SAVE] field Insert ▸ Field ▸ Page Title not saved 
/ reloaded
https://bugs.documentfoundation.org/show_bug.cgi?id=88056

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools svtools/source svtools/uiconfig

[Szymon Kłos]

 include/svtools/PlaceEditDialog.hxx  |2 
 include/svtools/ServerDetailsControls.hxx|7 -
 svtools/source/dialogs/PlaceEditDialog.cxx   |   40 +-
 svtools/source/dialogs/ServerDetailsControls.cxx |   54 ++--
 svtools/uiconfig/ui/placeedit.ui |  142 ---
 5 files changed, 106 insertions(+), 139 deletions(-)

New commits:
commit b219a225edc79b9440082396c2e2d385daa5538e
Author: Szymon Kłos 
Date:   Wed May 27 12:12:14 2015 +0200

CMIS types moved level up to the service type listbox

Change-Id: I8177669e74a452c6022f17ff84b9bfe2c1dddfb7

diff --git a/include/svtools/PlaceEditDialog.hxx 
b/include/svtools/PlaceEditDialog.hxx
index a3e4c2c..9bd32eb 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -21,6 +21,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
diff --git a/include/svtools/ServerDetailsControls.hxx 
b/include/svtools/ServerDetailsControls.hxx
index 83444ea..2c7f1b2 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -116,27 +116,26 @@ class CmisDetailsContainer : public DetailsContainer
 private:
 OUString m_sUsername;
 com::sun::star::uno::Reference< 
com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
-std::vector< OUString > m_aServerTypesURLs;
 std::vector< OUString > m_aRepoIds;
 OUString m_sRepoId;
+OUString m_sBinding;
 
 VclPtr   m_pEDBinding;
 VclPtrm_pLBRepository;
 VclPtr m_pBTRepoRefresh;
-VclPtrm_pLBServerType;
 VclPtr   m_pEDPath;
 
 public:
-CmisDetailsContainer( VclBuilderContainer* pBuilder );
+CmisDetailsContainer( VclBuilderContainer* pBuilder, OUString sBinding 
);
 virtual ~CmisDetailsContainer( ) { };
 
+virtual void show( bool bShow = true );
 virtual INetURLObject getUrl( ) SAL_OVERRIDE;
 virtual bool setUrl( const INetURLObject& rUrl ) SAL_OVERRIDE;
 virtual void setUsername( const OUString& rUsername ) SAL_OVERRIDE;
 
 private:
 void selectRepository( );
-DECL_LINK ( SelectServerTypeHdl, void * );
 DECL_LINK ( RefreshReposHdl, void * );
 DECL_LINK ( SelectRepoHdl, void * );
 };
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx 
b/svtools/source/dialogs/PlaceEditDialog.cxx
index 90fdea7..886aefd 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -10,10 +10,13 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 
+using namespace com::sun::star::uno;
+
 PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent)
 : ModalDialog(pParent, "PlaceEditDialog", "svt/ui/placeedit.ui")
 , m_xCurrentDetails()
@@ -136,10 +139,39 @@ void PlaceEditDialog::InitDetails( )
 xSmbDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
 m_aDetailsContainers.push_back(xSmbDetails);
 
-// Create CMIS control
-std::shared_ptr 
xCmisDetails(std::make_shared(this));
-xCmisDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) );
-m_aDetailsContainers.push_back(xCmisDetails);
+// Create CMIS controls for each server type
+
+Reference< XComponentContext > xContext = 
::comphelper::getProcessComponentContext();
+
+// Load the ServerType entries
+bool bSkipGDrive = OUString( GDRIVE_CLIENT_ID ).isEmpty() ||
+   OUString( GDRIVE_CLIENT_SECRET ).isEmpty();
+bool bSkipAlfresco = OUString( ALFRESCO_CLOUD_CLIENT_ID ).isEmpty() ||
+   OUString( ALFRESCO_CLOUD_CLIENT_SECRET ).isEmpty();
+bool bSkipOneDrive= OUString( ONEDRIVE_CLIENT_ID ).isEmpty() ||
+   OUString( ONEDRIVE_CLIENT_SECRET ).isEmpty();
+
+
+Sequence< OUString > aTypesUrlsList( 
officecfg::Office::Common::Misc::CmisServersUrls::get( xContext ) );
+Sequence< OUString > aTypesNamesList( 
officecfg::Office::Common::Misc::CmisServersNames::get( xContext ) );
+
+unsigned int nPos = 0;
+for ( sal_Int32 i = 0; i < aTypesUrlsList.getLength( ) && 
aTypesNamesList.getLength( ); ++i )
+{
+OUString sUrl = aTypesUrlsList[i];
+if ( !( sUrl == GDRIVE_BASE_URL && bSkipGDrive ) &&
+ !( sUrl.startsWith( ALFRESCO_CLOUD_BASE_URL ) && bSkipAlfresco ) 
&&
+ !( sUrl == ONEDRIVE_BASE_URL && bSkipOneDrive ) )
+{
+m_pLBServerType->InsertEntry( aTypesNamesList[i]);
+
+std::shared_ptr 
xCmisDetails(std::make_shared(this, sUrl));
+xCmisDetails->setChangeHdl( LINK( this, PlaceEditDialog, EditHdl ) 
);
+m_aDetailsContainers.push_back(xCmisDetails);
+
+nPos++;
+}
+}
 
 // Set default to first value
 m_pLBServerType->SelectEntryPos( 0 );
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx 
b/svtools/source/dialogs/Serv

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

[Bjoern Michaelsen]

 sw/source/core/crsr/crsrsh.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 813faac457bb9bd76d826cfc2ae4bf61f6e583b4
Author: Bjoern Michaelsen 
Date:   Wed May 27 11:40:28 2015 +0200

tdf#91145: Set Cell Background Color in Table Broken in Writer 5.0

- iterate over PaMs, not over Shells
- regression from 0ed7c8b55a026d7d98f9c994ad5e8626dd9504b2

Change-Id: I33ea486d416a7e64fd97938ce09492209c102c88

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 98dc7fd..9a027c1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -909,12 +909,12 @@ void SwCrsrShell::ClearMark()
 // is there any GetMark?
 if( m_pTableCrsr )
 {
-std::vector vShells;
-for(SwViewShell& rShell : GetRingContainer())
-if(&rShell != this)
-vShells.push_back(&rShell);
-for(SwViewShell* pShell : vShells)
-delete pShell;
+std::vector vCrsrs;
+for(auto& rCrsr : m_pCurCrsr->GetRingContainer())
+if(&rCrsr != m_pCurCrsr)
+vCrsrs.push_back(&rCrsr);
+for(auto pCrsr : vCrsrs)
+delete pCrsr;
 m_pTableCrsr->DeleteMark();
 
 m_pCurCrsr->DeleteMark();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 include/LibreOfficeKit/LibreOfficeKitGtk.h  |1 
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   14 -
 libreofficekit/source/gtk/lokdocview.cxx|   21 +++-
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit c7ec6acf92af4ded4119da6abdddace39fe0
Author: Miklos Vajna 
Date:   Wed May 27 11:30:04 2015 +0200

lokdocview: fix not updated part selector when search changes part

Change-Id: I337eed47c56dbbbebda4d7fe716eab6177936dc0

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index cce580f..320121e 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -40,6 +40,7 @@ struct _LOKDocViewClass
   void (* edit_changed)  (LOKDocView* pView, gboolean was_edit);
   void (* command_changed) (LOKDocView* pView, char* new_state);
   void (* search_not_found) (LOKDocView* pView, char* new_state);
+  void (* part_changed) (LOKDocView* pView, int new_part);
 };
 
 guint   lok_docview_get_type(void);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 188d662..5fbd337 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -45,6 +45,8 @@ static GtkWidget* pVBox;
 // GtkComboBox requires gtk 2.24 or later
 #if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION 
> 2
 static GtkComboBoxText* pPartSelector;
+/// Should the part selector avoid calling lok::Document::setPart()?
+static bool g_bPartSelectorBroadcast = true;
 #endif
 GtkWidget* pFindbar;
 GtkWidget* pFindbarEntry;
@@ -238,6 +240,15 @@ static void signalSearch(LOKDocView* /*pLOKDocView*/, 
char* /*pPayload*/, gpoint
 gtk_label_set_text(GTK_LABEL(pFindbarLabel), "Search key not found");
 }
 
+static void signalPart(LOKDocView* /*pLOKDocView*/, int nPart, gpointer 
/*pData*/)
+{
+#if GTK_CHECK_VERSION(2,24,0)
+g_bPartSelectorBroadcast = false;
+gtk_combo_box_set_active(GTK_COMBO_BOX(pPartSelector), nPart);
+g_bPartSelectorBroadcast = true;
+#endif
+}
+
 /// User clicked on a cmmand button -> inform LOKDocView.
 static void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
 {
@@ -285,7 +296,7 @@ static void changePart( GtkWidget* pSelector, gpointer /* 
pItem */ )
 {
 int nPart = gtk_combo_box_get_active( GTK_COMBO_BOX(pSelector) );
 
-if ( pDocView )
+if (g_bPartSelectorBroadcast && pDocView)
 {
 lok_docview_set_part( LOK_DOCVIEW(pDocView), nPart );
 }
@@ -436,6 +447,7 @@ int main( int argc, char* argv[] )
 g_signal_connect(pDocView, "edit-changed", G_CALLBACK(signalEdit), NULL);
 g_signal_connect(pDocView, "command-changed", G_CALLBACK(signalCommand), 
NULL);
 g_signal_connect(pDocView, "search-not-found", G_CALLBACK(signalSearch), 
NULL);
+g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
 
 // Input handling.
 g_signal_connect(pWindow, "key-press-event", G_CALLBACK(signalKey), 
pDocView);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index c04fa3e..f150279 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -194,6 +194,8 @@ struct LOKDocView_Impl
 void commandChanged(const std::string& rPayload);
 /// Search did not find any matches.
 void searchNotFound(const std::string& rPayload);
+/// LOK decided to change parts, need to update UI.
+void setPart(const std::string& rPayload);
 };
 
 namespace {
@@ -1019,7 +1021,7 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 break;
 case LOK_CALLBACK_SET_PART:
 {
-renderDocument(0);
+setPart(pCallback->m_aPayload);
 }
 break;
 default:
@@ -1066,6 +1068,7 @@ enum
 EDIT_CHANGED,
 COMMAND_CHANGED,
 SEARCH_NOT_FOUND,
+PART_CHANGED,
 LAST_SIGNAL
 };
 
@@ -1081,6 +1084,12 @@ void LOKDocView_Impl::searchNotFound(const std::string& 
rString)
 g_signal_emit(m_pDocView, docview_signals[SEARCH_NOT_FOUND], 0, 
rString.c_str());
 }
 
+void LOKDocView_Impl::setPart(const std::string& rString)
+{
+g_signal_emit(m_pDocView, docview_signals[PART_CHANGED], 0, 
std::stoi(rString));
+renderDocument(0);
+}
+
 static void lok_docview_class_init( gpointer ptr )
 {
 LOKDocViewClass* pClass = static_cast(ptr);
@@ -1115,6 +1124,16 @@ static void lok_docview_class_init( gpointer ptr )
  g_cclosure_marshal_VOID__STRING,
  G_TYPE_NONE, 1,
  G_TYPE_STRING);
+pClass->part_changed = 0;
+docview_signals[PART_CHANGED] =
+g_signal_new("part-changed",
+ G_TYPE_FROM_CLASS(gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(LOKDocViewC

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

[Bjoern Michaelsen]

 sw/source/core/crsr/crsrsh.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit adce9bf3ad0f12490fc3c8ae429045579642886c
Author: Bjoern Michaelsen 
Date:   Wed May 27 11:40:28 2015 +0200

tdf#91145: Set Cell Background Color in Table Broken in Writer 5.0

- iterate over PaMs, not over Shells
- regression from 0ed7c8b55a026d7d98f9c994ad5e8626dd9504b2

Change-Id: I33ea486d416a7e64fd97938ce09492209c102c88

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 702ec9d..46d3e7c 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -908,12 +908,12 @@ void SwCrsrShell::ClearMark()
 // is there any GetMark?
 if( m_pTableCrsr )
 {
-std::vector vShells;
-for(SwViewShell& rShell : GetRingContainer())
-if(&rShell != this)
-vShells.push_back(&rShell);
-for(SwViewShell* pShell : vShells)
-delete pShell;
+std::vector vCrsrs;
+for(auto& rCrsr : m_pCurCrsr->GetRingContainer())
+if(&rCrsr != m_pCurCrsr)
+vCrsrs.push_back(&rCrsr);
+for(auto pCrsr : vCrsrs)
+delete pCrsr;
 m_pTableCrsr->DeleteMark();
 
 m_pCurCrsr->DeleteMark();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source dbaccess/source framework/source sc/source svtools/source svx/source sw/source

[Stephan Bergmann]

 cui/source/dialogs/dlgname.cxx  |4 ++--
 dbaccess/source/ui/app/AppSwapWindow.cxx|2 +-
 framework/source/classes/fwktabwindow.cxx   |2 +-
 sc/source/ui/sidebar/CellLineStyleControl.cxx   |2 +-
 svtools/source/control/filectrl.cxx |2 +-
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |2 +-
 svx/source/sidebar/text/TextUnderlineControl.cxx|2 +-
 sw/source/ui/config/mailconfigpage.cxx  |2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c986e271adcc0a3d3feffade6f0191f1c155640f
Author: Stephan Bergmann 
Date:   Wed May 27 11:40:22 2015 +0200

Fix accidental mis-uses of VclPtr address-of operator

Change-Id: I3a82423378d3198a25f90ddfbf42af55d85c96fb
(cherry picked from commit 668408fa1c69eaf0f0a37f24e2ec8b4a38fe3db7, w/o the
accidentally included sw/htmlexport-swobjects.patch)

diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 60849f1..b16f852 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -41,7 +41,7 @@ SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const 
OUString& rName, const
 pFtDescription->SetText( rDesc );
 pEdtName->SetText( rName );
 pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-ModifyHdl(&pEdtName);
+ModifyHdl(pEdtName.get());
 pEdtName->SetModifyHdl(LINK(this, SvxNameDialog, ModifyHdl));
 }
 
@@ -82,7 +82,7 @@ SvxObjectNameDialog::SvxObjectNameDialog(
 
 // activate name
 pEdtName->SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-ModifyHdl(&pEdtName);
+ModifyHdl(pEdtName.get());
 pEdtName->SetModifyHdl(LINK(this, SvxObjectNameDialog, ModifyHdl));
 }
 
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx 
b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 05f9a06..d365473 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -118,7 +118,7 @@ void OApplicationSwapWindow::clearSelection()
 SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(nPos);
 if ( pEntry )
 m_aIconControl->InvalidateEntry(pEntry);
-m_aIconControl->GetClickHdl().Call(&m_aIconControl);
+m_aIconControl->GetClickHdl().Call(m_aIconControl.get());
 }
 
 void OApplicationSwapWindow::createIconAutoMnemonics( MnemonicGenerator& 
_rMnemonics )
diff --git a/framework/source/classes/fwktabwindow.cxx 
b/framework/source/classes/fwktabwindow.cxx
index 9e16a6f..e6cc7e3 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -338,7 +338,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, 
const uno::Sequence< bea
 void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
 {
 m_aTabCtrl->SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
-ActivatePageHdl( &m_aTabCtrl );
+ActivatePageHdl( m_aTabCtrl.get() );
 }
 
 void FwkTabWindow::RemovePage( sal_Int32 nIndex )
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx 
b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 9ef1f83..3098858 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -118,7 +118,7 @@ void CellLineStyleControl::SetAllNoSel()
 
 IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl)
 {
-if(pControl == &maCellLineStyleValueSet)
+if(pControl == maCellLineStyleValueSet.get())
 {
 const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectItemId());
 SvxLineItem aLineItem(SID_FRAME_LINESTYLE);
diff --git a/svtools/source/control/filectrl.cxx 
b/svtools/source/control/filectrl.cxx
index ab07a4a..53291cd 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -246,7 +246,7 @@ void FileControl::ImplBrowseFile( )
 if ( aObj.GetProtocol() == INetProtocol::File )
 aNewText = aObj.PathToFileName();
 SetText( aNewText );
-maEdit->GetModifyHdl().Call( &maEdit );
+maEdit->GetModifyHdl().Call( maEdit.get() );
 }
 }
 }
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx 
b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 45137f2..70acce2 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -308,7 +308,7 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, 
pControl)
 {
 mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
 
-if(pControl == &maVSSpacing)
+if(pControl == maVSSpacing.get())
 {
 sal_uInt16 iPos = maVSSpacing->GetSelectItemId();
 short nKern = 0;
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx 
b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 690578b..b861deb 100644
--- a/svx/source/sidebar/text/TextUnd

[Libreoffice-commits] core.git: sw/htmlexport-swobjects.patch

[Stephan Bergmann]

 sw/htmlexport-swobjects.patch |   79 --
 1 file changed, 79 deletions(-)

New commits:
commit 6c15627ef04718328f3ae1e2a56f5d84f714766f
Author: Stephan Bergmann 
Date:   Wed May 27 11:43:44 2015 +0200

Remove accidentally pushed file

Change-Id: I22e2215495b1c2d042434edd3aad557e2f849a15

diff --git a/sw/htmlexport-swobjects.patch b/sw/htmlexport-swobjects.patch
deleted file mode 100644
index 35e440a..000
--- a/sw/htmlexport-swobjects.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
-index 23cdef1..69803cd 100644
 a/sw/CppunitTest_sw_htmlexport.mk
-+++ b/sw/CppunitTest_sw_htmlexport.mk
-@@ -15,23 +15,48 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sw_htmlexport, \
- sw/qa/extras/htmlexport/htmlexport \
- ))
- 
-+$(eval $(call gb_CppunitTest_set_componentfile,sw_htmlexport,sw/util/sw))
-+
-+$(eval $(call gb_CppunitTest_use_library_objects,sw_htmlexport,sw))
-+
- $(eval $(call gb_CppunitTest_use_libraries,sw_htmlexport, \
-+$(call gb_Helper_optional,AVMEDIA,avmedia) \
-+basegfx \
- comphelper \
- cppu \
-   cppuhelper \
-+drawinglayer \
-+editeng \
-   i18nlangtag \
-+i18nutil \
-+lng \
- sal \
--sw \
-+salhelper \
-+  sax \
-+sb \
-+sfx \
-+sot \
-+svl \
-+svt \
-+svx \
-+svxcore \
- test \
-+tk \
-   tl \
-+ucbhelper \
- unotest \
- utl \
-+$(if $(filter TRUE,$(DISABLE_SCRIPTING)),, \
-+vbahelper) \
- vcl \
-+xmlreader \
-+xo \
-   $(gb_UWINAPI) \
- ))
- 
- $(eval $(call gb_CppunitTest_use_externals,sw_htmlexport,\
-   boost_headers \
-+  icuuc \
- libxml2 \
- ))
- 
-@@ -71,7 +96,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
-   sc/util/scfilt \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
--sw/util/sw \
- sw/util/swd \
- sw/util/msword \
- sfx2/util/sfx \
-diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
-index 2db20ef..d9a8d15 100644
 a/sw/qa/extras/htmlexport/htmlexport.cxx
-+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
-@@ -32,6 +32,12 @@ public:
- m_eUnit(FUNIT_NONE)
- {}
- 
-+void setUp() SAL_OVERRIDE
-+{
-+SwModelTestBase::setUp();
-+SwGlobals::ensure();
-+}
-+
- private:
- bool mustCalcLayoutOf(const char* filename) SAL_OVERRIDE
- {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source dbaccess/source framework/source include/vcl sc/source svtools/source svx/source sw/htmlexport-swobjects.patch sw/source

[Stephan Bergmann]

 cui/source/dialogs/dlgname.cxx  |4 
 dbaccess/source/ui/app/AppSwapWindow.cxx|2 
 dbaccess/source/ui/dlg/advancedsettings.cxx |   36 ---
 framework/source/classes/fwktabwindow.cxx   |2 
 include/vcl/vclptr.hxx  |8 +
 sc/source/ui/sidebar/CellLineStyleControl.cxx   |2 
 svtools/source/control/filectrl.cxx |2 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |2 
 svx/source/sidebar/text/TextUnderlineControl.cxx|2 
 sw/htmlexport-swobjects.patch   |   79 
 sw/source/ui/config/mailconfigpage.cxx  |2 
 11 files changed, 116 insertions(+), 25 deletions(-)

New commits:
commit 9549fb88f0d00c384b291645df45f4af5d6e8a8a
Author: Stephan Bergmann 
Date:   Wed May 27 11:40:36 2015 +0200

Prevent accidental mis-uses of VclPtr address-of operator

Change-Id: Ie3588d502e9545ea64bf836b2a0bdc0caead2247

diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx 
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 2fe3186..c09ebab 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include "advancedsettings.hxx"
 #include "advancedsettingsdlg.hxx"
 #include "moduledbu.hxx"
@@ -169,22 +173,22 @@ namespace dbaui
 
 // for easier maintenance, write the table in this form, then copy it 
to m_aBooleanSettings
 BooleanSettingDesc aSettings[] = {
-{ &m_pIsSQL92Check, "usesql92",
DSID_SQL92CHECK,false },
-{ &m_pAppendTableAlias, "append",  
DSID_APPEND_TABLE_ALIAS,false },
-{ &m_pAsBeforeCorrelationName,  "useas",   
DSID_AS_BEFORE_CORRNAME,false },
-{ &m_pEnableOuterJoin,  "useoj",   
DSID_ENABLEOUTERJOIN,   false },
-{ &m_pIgnoreDriverPrivileges,   "ignoreprivs", 
DSID_IGNOREDRIVER_PRIV, false },
-{ &m_pParameterSubstitution,"replaceparams",   
DSID_PARAMETERNAMESUBST,false },
-{ &m_pSuppressVersionColumn,"displayver",  
DSID_SUPPRESSVERSIONCL, true  },
-{ &m_pCatalog,  "usecatalogname",  
DSID_CATALOG,   false },
-{ &m_pSchema,   "useschemaname",   
DSID_SCHEMA,false },
-{ &m_pIndexAppendix,"createindex", 
DSID_INDEXAPPENDIX, false },
-{ &m_pDosLineEnds,  "eol", 
DSID_DOSLINEENDS,   false },
-{ &m_pCheckRequiredFields,  "ignorecurrency",  
DSID_CHECK_REQUIRED_FIELDS, false },
-{ &m_pIgnoreCurrency,   "inputchecks", 
DSID_IGNORECURRENCY,false },
-{ &m_pEscapeDateTime,   "useodbcliterals", 
DSID_ESCAPE_DATETIME,   false },
-{ &m_pPrimaryKeySupport,"primarykeys", 
DSID_PRIMARY_KEY_SUPPORT,   false },
-{ &m_pRespectDriverResultSetType,   "resulttype",  
DSID_RESPECTRESULTSETTYPE,  false }
+{ std::addressof(m_pIsSQL92Check), "usesql92", 
   DSID_SQL92CHECK,false },
+{ std::addressof(m_pAppendTableAlias), "append",   
   DSID_APPEND_TABLE_ALIAS,false },
+{ std::addressof(m_pAsBeforeCorrelationName),  "useas",
   DSID_AS_BEFORE_CORRNAME,false },
+{ std::addressof(m_pEnableOuterJoin),  "useoj",
   DSID_ENABLEOUTERJOIN,   false },
+{ std::addressof(m_pIgnoreDriverPrivileges),   "ignoreprivs",  
   DSID_IGNOREDRIVER_PRIV, false },
+{ std::addressof(m_pParameterSubstitution),
"replaceparams",   DSID_PARAMETERNAMESUBST,false },
+{ std::addressof(m_pSuppressVersionColumn),"displayver",   
   DSID_SUPPRESSVERSIONCL, true  },
+{ std::addressof(m_pCatalog),  
"usecatalogname",  DSID_CATALOG,   false },
+{ std::addressof(m_pSchema),   
"useschemaname",   DSID_SCHEMA,false },
+{ std::addressof(m_pIndexAppendix),"createindex",  
   DSID_INDEXAPPENDIX, false },
+{ std::addressof(m_pDosLineEnds),  "eol",  
   DSID_DOSLINEENDS,   false },
+{ std::addressof(m_pCheckRequiredFields),  
"ignorecurrency",  DSID_CHECK_REQUIRED_FIELDS, false },
+{ std::addressof(m_pIgnoreCurrency),   "inputchecks",  
   DSID_IGNORECURRENCY,false },
+{ std::addressof(m_pEscapeDateTime),   

[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp

[Miklos Vajna]

 loolwsd/LOOLSession.cpp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6453f130c0a4295e5749946c4014d1deb361d4f5
Author: Miklos Vajna 
Date:   Wed May 27 11:36:05 2015 +0200

LOOLSession: handle LOK_CALLBACK_SET_PART

diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 96e4dd4..c10d8dc 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -735,6 +735,9 @@ extern "C"
 case LOK_CALLBACK_PAGE_COUNT_CHANGED:
 srv->sendTextFrame("pagecountchanged:");
 break;
+case LOK_CALLBACK_SET_PART:
+srv->sendTextFrame("setpart: " + std::string(pPayload));
+break;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/generic/glyphs/gcach_layout.cxx |6 ++
 vcl/source/outdev/font.cxx  |5 -
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 6feb828757477669325ebd8bc4491b7e4d1283dc
Author: Caolán McNamara 
Date:   Tue May 26 15:45:30 2015 +0100

Resolves: tdf#89231 if no font has 0x202F fallback to a normal space

Change-Id: I2325c0b09ccf66ee15597251ad027b295de5502f
(cherry picked from commit f76ecc3e9ce51b35fc18db55b808270079a3652b)
Reviewed-on: https://gerrit.libreoffice.org/15912
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index b29627d..c51ee4a 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -445,6 +445,12 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 int32_t nGlyphIndex = pHbGlyphInfos[i].codepoint;
 int32_t nCharPos = pHbGlyphInfos[i].cluster;
 
+// tdf#89231 if it's just a missing non-breaking space, then 
use a normal space
+if (!nGlyphIndex && (SalLayoutFlags::ForFallback & 
rArgs.mnFlags) && nCharPos >= 0 && rArgs.mpStr[nCharPos] == 0x202F)
+{
+nGlyphIndex = rFont.GetGlyphIndex(' ');
+}
+
 // if needed request glyph fallback by updating LayoutArgs
 if (!nGlyphIndex)
 {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index b04a318..068b2bb 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -2080,7 +2080,10 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( 
SalLayout* pSalLayout, ImplLay
 if( nFallbackLevel < MAX_FALLBACK-1)
 {
 // ignore fallback font if it is the same as the original font
-if( mpFontEntry->maFontSelData.mpFontData == 
aFontSelData.mpFontData )
+// unless we are looking for a substituion for 0x202F, in which
+// case we'll just use a normal space
+if( mpFontEntry->maFontSelData.mpFontData == 
aFontSelData.mpFontData &&
+aMissingCodes.indexOf(0x202F) == -1 )
 {
 mpFontCache->Release( pFallbackFont );
 continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/CppunitTest_sw_rtfexport.mk  |   31 ---
 sw/qa/extras/inc/swmodeltestbase.hxx|6 ++
 sw/qa/extras/rtfexport/data/tdf90421.fodt   |8 +++
 sw/qa/extras/rtfexport/rtfexport.cxx|   23 
 sw/source/filter/ww8/rtfattributeoutput.cxx |   74 +++-
 sw/source/filter/ww8/rtfattributeoutput.hxx |3 +
 6 files changed, 81 insertions(+), 64 deletions(-)

New commits:
commit dbf24ea9aa010fe51da8d580a1403c8ecd9f0b04
Author: Miklos Vajna 
Date:   Tue Apr 21 17:00:57 2015 +0200

tdf#90421 RTF export: ignore hyperlinks without an URL

Commit fe444d1f74abe417962be0bcd3340f40f2446b58 (fdo#62536: sw: fix
AutoCorrect bold/underline on existing AUTOFMT, 2013-06-20) adds an
empty inet format hint on the text node during autocorrection, on export
we can safely ignore that to provide well-formed output.

(cherry picked from commit 7d42346ba77c9c4df241ea40eaf550993ca18783)

Change-Id: Iafae941a13e29dcc7d8b4bade5ce94a486b59638
Reviewed-on: https://gerrit.libreoffice.org/15906
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index 88f371b..b47c906 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -48,36 +48,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\
 $(eval $(call gb_CppunitTest_use_ure,sw_rtfexport))
 $(eval $(call gb_CppunitTest_use_vcl,sw_rtfexport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
-   basic/util/sb \
-comphelper/util/comphelp \
-configmgr/source/configmgr \
-embeddedobj/util/embobj \
-filter/source/config/cache/filterconfig1 \
-filter/source/storagefilterdetect/storagefd \
-framework/util/fwk \
-i18npool/util/i18npool \
-linguistic/source/lng \
-package/source/xstor/xstor \
-package/util/package2 \
-sax/source/expatwrap/expwrap \
-sfx2/util/sfx \
-starmath/util/sm \
-svl/source/fsstor/fsstorage \
-svtools/util/svt \
-sw/util/msword \
-sw/util/sw \
-sw/util/swd \
-toolkit/util/tk \
-ucb/source/core/ucb1 \
-ucb/source/ucp/file/ucpfile1 \
-unotools/util/utl \
-unoxml/source/service/unoxml \
-   uui/util/uui \
-writerfilter/util/writerfilter \
-xmloff/util/xo \
-   oox/util/oox \
-))
+$(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport))
 
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 760afc2..4cd9919 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -264,6 +264,7 @@ protected:
 header();
 preTest(filename);
 load(mpTestDocumentPath, filename);
+postLoad(filename);
 reload(mpFilter, filename);
 postTest(filename);
 verify();
@@ -313,6 +314,11 @@ protected:
 {
 }
 
+/// Override this function if some special file-specific setup is needed 
during export test: after load, but before save.
+virtual void postLoad(const char* /*pFilename*/)
+{
+}
+
 /**
  * Override this function if some special filename-specific teardown is 
needed
  */
diff --git a/sw/qa/extras/rtfexport/data/tdf90421.fodt 
b/sw/qa/extras/rtfexport/data/tdf90421.fodt
new file mode 100644
index 000..a0da4b8
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf90421.fodt
@@ -0,0 +1,8 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:

Re: Consolidating debugging levels (via Easy Hacks)

[Bjoern Michaelsen]

Hi,

On Wed, May 27, 2015 at 01:21:49AM +0200, Thorsten Behrens wrote:
> should that be 2?

Hmm, no?

Currently we have OSL_DEBUG_LEVEL and DBG_UTIL mostly orthogonal: You can build
a OSL_DEBUG_LEVEL=3 without DBG_UTIL or OSL_DEBUG_LEVEL=0 with DBG_UTIL.
A quick "git grep -h OSL_DEBUG_LEVEL|sort|uniq" shows OSL_DEBUG_LEVEL up to at
least 6 being used:

> #if OSL_DEBUG_LEVEL > 5

This opens a set of at least 14 build scenarios: OSL_DEBUG_LEVEL 0,1,2,3,4,5,6
with DBG_UTIL and without DBG_UTIL each.

I assume that the higher OSL_DEBUG_LEVELs have not been tested on both DBG_UTIL
and without it. Actually I would bet that one of those 14 build scenarios is
broken right now because someone implicitly assumed DBG_UTIL to be set or not.

My goal would be in the first step to kill all OSL_DEBUG_LEVELs over 1, just
keeping OSL_DEBUG_LEVEL 0 and 1 and the orthogonal DBG_UTIL. That would be four
build scenarios ( OSL_DEBUG_LEVEL/DBG_UTIL: 0/off, 1/off, 0/on, 1/on).

In a second step, I'd then kill the "0/on" build scenario, and possibly remove
the "DBG_UTL" define by renaming the remaining build scenarios as follows
"0/off" -> 0, "1/off" -> 1, "1/on" -> 2.

Debug code beyond that is usually very slow, big or spammy on with debug
messages to stderr: It might make sense to enable those for a specific code
areas, but not with a global switch.

Best,

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source include/editeng include/xmloff offapi/com sd/source xmloff/inc xmloff/source

[Katarina Behrens]

 editeng/source/items/flditem.cxx|2 -
 editeng/source/uno/unofield.cxx |9 
 include/editeng/flditem.hxx |2 -
 include/xmloff/txtimp.hxx   |1 
 include/xmloff/xmltoken.hxx |1 
 offapi/com/sun/star/text/textfield/Type.idl |2 -
 sd/source/ui/app/sdmod2.cxx |6 +
 sd/source/ui/app/strings.src|   10 +
 sd/source/ui/inc/strings.hrc|2 +
 sd/source/ui/unoidl/unomodel.cxx|6 +
 xmloff/inc/txtflde.hxx  |1 
 xmloff/inc/txtfldi.hxx  |   22 +++
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/text/txtflde.cxx  |   16 ++
 xmloff/source/text/txtfldi.cxx  |   31 
 xmloff/source/text/txtimp.cxx   |2 +
 16 files changed, 111 insertions(+), 3 deletions(-)

New commits:
commit 42b521f800a08b11432cf906ce1bdf9fcbfffdeb
Author: Katarina Behrens 
Date:   Wed Apr 22 23:31:43 2015 +0200

tdf#88056: Implement ODF import/export of page title field

to/from loext namespace, since new tag's needed for the new field
and it isn't approved by ODF-TC yet

Change-Id: I70ceb4e16e1199663520dbdf3beae31423bc81d0
Reviewed-on: https://gerrit.libreoffice.org/15485
Tested-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 57f1e2a..4e144ed 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -117,7 +117,7 @@ SvxFieldData* SvxFieldData::Create(const 
uno::Reference& xTe
 return new SvxPageField();
 case text::textfield::Type::PAGES:
 return new SvxPagesField();
-case text::textfield::Type::PAGE_TITLE:
+case text::textfield::Type::PAGE_NAME:
 return new SvxPageTitleField();
 case text::textfield::Type::DOCINFO_TITLE:
 return new SvxFileField();
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 7c7cae9..b507d3b 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -504,6 +504,9 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const 
throw()
 case text::textfield::Type::PRESENTATION_DATE_TIME:
 pData = new SvxDateTimeField();
 break;
+case text::textfield::Type::PAGE_NAME:
+pData = new SvxPageTitleField();
+break;
 };
 
 return pData;
@@ -606,6 +609,8 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( 
sal_Bool bShowCommand )
 return OUString("Footer");
 case text::textfield::Type::PRESENTATION_DATE_TIME:
 return OUString("DateTime");
+case text::textfield::Type::PAGE_NAME:
+return OUString("PageName");
 default:
 return OUString("Unknown");
 }
@@ -853,6 +858,10 @@ uno::Sequence< OUString > SAL_CALL 
SvxUnoTextField::getSupportedServiceNames()
 pServices[2] = "com.sun.star.presentation.TextField.DateTime";
 pServices[3] = "com.sun.star.presentation.textfield.DateTime";
 break;
+case text::textfield::Type::PAGE_NAME:
+pServices[2] = "com.sun.star.text.TextField.PageName";
+pServices[3] = "com.sun.star.text.textfield.PageName";
+break;
 default:
 aSeq.realloc(0);
 }
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index e35e503..554a2b1 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -194,7 +194,7 @@ public:
 class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData
 {
 public:
-SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData, 
com::sun::star::text::textfield::Type::PAGE_TITLE )
+SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData, 
com::sun::star::text::textfield::Type::PAGE_NAME )
 SvxPageTitleField();
 
 virtual SvxFieldData*   Clone() const SAL_OVERRIDE;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 592c834..96df6f1 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -210,6 +210,7 @@ enum XMLTextPElemTokens
 XML_TOK_TEXT_SEQUENCE_REF,
 XML_TOK_TEXT_NOTE_REF,
 XML_TOK_TEXT_SHEET_NAME,
+XML_TOK_TEXT_PAGE_NAME,
 XML_TOK_TEXT_BIBLIOGRAPHY_MARK,
 XML_TOK_TEXT_ANNOTATION,
 XML_TOK_TEXT_ANNOTATION_END,
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 9639326..21b584d 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1368,6 +1368,7 @@ namespace xmloff { namespace token {
 XML_PAGE_HEIGHT,
 XML_PAGE_MASTER,
 XML_PAGE_MASTER_NAME,
+XML_PAGE_NAME,
 XML_PAGE_NU

[Libreoffice-commits] core.git: 5 commits - forms/source include/svtools include/vcl sc/source sd/source svtools/source svx/source sw/inc sw/source toolkit/source vcl/headless vcl/inc vcl/osx vcl/sour

[Noel Grandin]

 forms/source/richtext/richtextcontrol.cxx  |2 
 forms/source/richtext/richtextimplcontrol.cxx  |2 
 forms/source/richtext/richtextimplcontrol.hxx  |2 
 forms/source/richtext/richtextvclcontrol.cxx   |2 
 forms/source/richtext/richtextvclcontrol.hxx   |2 
 include/svtools/brwbox.hxx |2 
 include/svtools/editbrowsebox.hxx  |2 
 include/svtools/filectrl.hxx   |2 
 include/svtools/headbar.hxx|4 -
 include/vcl/button.hxx |   18 ++---
 include/vcl/combobox.hxx   |2 
 include/vcl/dialog.hxx |2 
 include/vcl/edit.hxx   |2 
 include/vcl/fixed.hxx  |   14 ++--
 include/vcl/group.hxx  |4 -
 include/vcl/imgctrl.hxx|4 -
 include/vcl/lstbox.hxx |2 
 include/vcl/scrbar.hxx |2 
 include/vcl/spin.hxx   |2 
 include/vcl/spinfld.hxx|2 
 include/vcl/tabpage.hxx|2 
 include/vcl/vclmedit.hxx   |2 
 include/vcl/window.hxx |   81 +++--
 sc/source/ui/view/gridwin.cxx  |2 
 sd/source/ui/slidesorter/shell/SlideSorter.cxx |2 
 sd/source/ui/view/sdwindow.cxx |2 
 svtools/source/brwbox/brwbox2.cxx  |6 -
 svtools/source/brwbox/ebbcontrols.cxx  |2 
 svtools/source/control/filectrl.cxx|2 
 svtools/source/control/headbar.cxx |   10 +--
 svx/source/fmcomp/gridcell.cxx |2 
 sw/inc/SidebarWin.hxx  |2 
 sw/source/core/view/viewsh.cxx |2 
 sw/source/uibase/docvw/PostItMgr.cxx   |2 
 sw/source/uibase/docvw/SidebarTxtControl.cxx   |2 
 sw/source/uibase/docvw/SidebarTxtControl.hxx   |2 
 sw/source/uibase/docvw/SidebarWin.cxx  |2 
 sw/source/uibase/docvw/edtwin.cxx  |2 
 toolkit/source/awt/vclxtabpagecontainer.cxx|2 
 toolkit/source/awt/vclxwindow.cxx  |4 -
 toolkit/source/awt/vclxwindows.cxx |8 +-
 vcl/headless/svpframe.cxx  |2 
 vcl/inc/headless/svpframe.hxx  |2 
 vcl/inc/osx/salframe.h |2 
 vcl/inc/salframe.hxx   |2 
 vcl/inc/unx/gtk/gtkframe.hxx   |4 -
 vcl/inc/unx/i18n_ic.hxx|4 -
 vcl/inc/unx/salframe.h |2 
 vcl/inc/win/salframe.h |2 
 vcl/inc/window.h   |3 
 vcl/osx/salframe.cxx   |2 
 vcl/source/control/button.cxx  |   61 +-
 vcl/source/control/combobox.cxx|   10 +--
 vcl/source/control/edit.cxx|   10 +--
 vcl/source/control/fixed.cxx   |   40 ++--
 vcl/source/control/group.cxx   |   22 +++---
 vcl/source/control/imgctrl.cxx |   12 +--
 vcl/source/control/lstbox.cxx  |   10 +--
 vcl/source/control/scrbar.cxx  |4 -
 vcl/source/control/spinbtn.cxx |4 -
 vcl/source/control/spinfld.cxx |8 +-
 vcl/source/control/tabctrl.cxx |2 
 vcl/source/edit/vclmedit.cxx   |   14 ++--
 vcl/source/window/clipping.cxx |   34 ++
 vcl/source/window/dialog.cxx   |4 -
 vcl/source/window/dlgctrl.cxx  |   44 ++---
 vcl/source/window/event.cxx|4 -
 vcl/source/window/floatwin.cxx |2 
 vcl/source/window/mouse.cxx|8 +-
 vcl/source/window/tabpage.cxx  |2 
 vcl/source/window/toolbox.cxx  |2 
 vcl/source/window/window.cxx   |   10 +--
 vcl/source/window/window2.cxx  |4 -
 vcl/source/window/winproc.cxx  |4 -
 vcl/unx/generic/app/i18n_ic.cxx|2 
 vcl/unx/generic/window/salframe.cxx|2 
 vcl/unx/gtk/window/gtksalframe.cxx |6 -
 vcl/win/source/window/salframe.cxx |8 +-
 78 files changed, 289 insertions(+), 284 deletions(-)

New commits:
commit 66854d697f973f36e1b87808001e0936dae6
Author: Noel Grandin 
Date:   Wed May 27 09:37:41 2015 +0200

convert WINDOW_DRAW flags to scoped enum

Change-Id: I9400a286fab18d683b4c109007961685f01b6da3

diff --git a/forms/source/richtext/richtextcontrol.cxx 
b/forms/source/richtext/richtextcontrol.cxx
index 03d7087..b775f64 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/r

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 9 commits - include/LibreOfficeKit libreofficekit/source sd/source solenv/gdb sw/qa sw/source

[Miklos Vajna]

 include/LibreOfficeKit/LibreOfficeKitEnums.h   |9 +++
 libreofficekit/source/gtk/lokdocview.cxx   |   29 +---
 sd/source/ui/view/drviews1.cxx |6 ++
 solenv/gdb/libreoffice/sw.py   |2 
 sw/qa/extras/tiledrendering/data/search.odt|binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   55 +++
 sw/source/core/crsr/findtxt.cxx|   58 +++--
 7 files changed, 138 insertions(+), 21 deletions(-)

New commits:
commit 3cd822d98d766a0528e94419874ff9c79c9feb6b
Author: Miklos Vajna 
Date:   Fri May 22 13:34:47 2015 +0100

lokdocview: it's enough to query the document size once

Change-Id: Id99c9f1a814bc5f935eeb4e301ef3014ccb0bd07
(cherry picked from commit 124c937f3bd6a7538dc6664ab9556fcfb3f27088)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 904760d..7b2d4c9 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -50,6 +50,8 @@ struct LOKDocView_Impl
 
 LibreOfficeKit* m_pOffice;
 LibreOfficeKitDocument* m_pDocument;
+long m_nDocumentWidthTwips;
+long m_nDocumentHeightTwips;
 /// View or edit mode.
 bool m_bEdit;
 /// Position and size of the visible cursor.
@@ -237,6 +239,8 @@ LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView)
 m_fZoom(1),
 m_pOffice(0),
 m_pDocument(0),
+m_nDocumentWidthTwips(0),
+m_nDocumentHeightTwips(0),
 m_bEdit(false),
 m_aVisibleCursor({0, 0, 0, 0}),
 m_bCursorOverlayVisible(false),
@@ -743,11 +747,8 @@ void LOKDocView_Impl::renderDocument(GdkRectangle* 
pPartial)
 {
 const int nTileSizePixels = 256;
 
-// Get document size and find out how many rows / columns we need.
-long nDocumentWidthTwips, nDocumentHeightTwips;
-m_pDocument->pClass->getDocumentSize(m_pDocument, &nDocumentWidthTwips, 
&nDocumentHeightTwips);
-long nDocumentWidthPixels = twipToPixel(nDocumentWidthTwips);
-long nDocumentHeightPixels = twipToPixel(nDocumentHeightTwips);
+long nDocumentWidthPixels = twipToPixel(m_nDocumentWidthTwips);
+long nDocumentHeightPixels = twipToPixel(m_nDocumentHeightTwips);
 // Total number of rows / columns in this document.
 guint nRows = ceil((double)nDocumentHeightPixels / nTileSizePixels);
 guint nColumns = ceil((double)nDocumentWidthPixels / nTileSizePixels);
@@ -1172,6 +1173,7 @@ SAL_DLLPUBLIC_EXPORT gboolean lok_docview_open_document( 
LOKDocView* pDocView, c
 {
 
pDocView->m_pImpl->m_pDocument->pClass->initializeForRendering(pDocView->m_pImpl->m_pDocument);
 
pDocView->m_pImpl->m_pDocument->pClass->registerCallback(pDocView->m_pImpl->m_pDocument,
 &LOKDocView_Impl::callbackWorker, pDocView);
+
pDocView->m_pImpl->m_pDocument->pClass->getDocumentSize(pDocView->m_pImpl->m_pDocument,
 &pDocView->m_pImpl->m_nDocumentWidthTwips, 
&pDocView->m_pImpl->m_nDocumentHeightTwips);
 g_timeout_add(600, &LOKDocView_Impl::handleTimeout, pDocView);
 pDocView->m_pImpl->renderDocument(0);
 }
commit d6ea25d094258402a27c74a0938e014236c822b7
Author: Miklos Vajna 
Date:   Tue May 26 17:00:20 2015 +0200

lokdocview: handle LOK_CALLBACK_SET_PART

Change-Id: I47fc389590d581155074fec63cca79bea3596860
(cherry picked from commit 96041179d4aa5e0eb543c3c5da8e493beb0ed133)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 3203b48..904760d 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -910,6 +910,8 @@ const char* LOKDocView_Impl::callbackTypeToString(int nType)
 return "LOK_CALLBACK_SEARCH_NOT_FOUND";
 case LOK_CALLBACK_PAGE_COUNT_CHANGED:
 return "LOK_CALLBACK_PAGE_COUNT_CHANGED";
+case LOK_CALLBACK_SET_PART:
+return "LOK_CALLBACK_SET_PART";
 }
 return 0;
 }
@@ -1009,6 +1011,11 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* 
pCallback)
 m_pDocument->pClass->getDocumentSize(m_pDocument, 
&m_nDocumentWidthTwips, &m_nDocumentHeightTwips);
 }
 break;
+case LOK_CALLBACK_SET_PART:
+{
+renderDocument(0);
+}
+break;
 default:
 g_assert(false);
 break;
@@ -1203,7 +1210,6 @@ SAL_DLLPUBLIC_EXPORT int lok_docview_get_part( 
LOKDocView* pDocView )
 SAL_DLLPUBLIC_EXPORT void lok_docview_set_part( LOKDocView* pDocView, int 
nPart)
 {
 pDocView->m_pImpl->m_pDocument->pClass->setPart( 
pDocView->m_pImpl->m_pDocument, nPart );
-pDocView->m_pImpl->renderDocument(0);
 }
 
 SAL_DLLPUBLIC_EXPORT char* lok_docview_get_part_name( LOKDocView* pDocView, 
int nPart )
commit 05e4e065b04f1d0e120802f9f74d1017f16431c6
Author: Miklos Vajna 
Date:   Sat May 23 10:44:07 2015 +0100

lokdocview: update doc size on LOK_CALLBACK_PAGE_COUNT_CHANGED

No need to do any actual rendering, the invalidation callback takes c

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

[Henry Castro]

 sd/source/ui/view/Outliner.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c0cc9a8622a2cd0e3ba07e15a79dd65ca910b233
Author: Henry Castro 
Date:   Wed May 27 10:37:03 2015 +0200

sd LOKit callback for search not found

Change-Id: Ide13a989005169cd6e8663f308d15f0e5984bd86

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 277efb1..24031ef 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -70,6 +70,7 @@
 #include "framework/FrameworkHelper.hxx"
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -1056,7 +1057,12 @@ void Outliner::ShowEndOfSearchDialog()
 if (mbStringFound)
 aString = SD_RESSTR(STR_END_SEARCHING);
 else
+{
 aString = SD_RESSTR(STR_STRING_NOTFOUND);
+
mpDrawDocument->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+  
mpSearchItem->GetSearchString().toUtf8().getStr());
+
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

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

New commits:
commit 3be7e611833f520bd05af7fbdf4aff96f3b13c78
Author: Miklos Vajna 
Date:   Wed May 27 10:46:09 2015 +0200

SwLayIdle::ShowIdle: improve comment

Change-Id: Ibaa03580a39d11e0758c5e02959bed7f14d27790

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 26f43ee..fa4c289 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2111,7 +2111,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData )
 {
 Rectangle aRect( 0, 0, 5, 5 );
 aRect = pWin->PixelToLogic( aRect );
-// OD 2004-04-23 #116347#
+// Depending on if idle layout is in progress or not, draw a "red 
square" or a "green square".
 pWin->Push( PushFlags::FILLCOLOR|PushFlags::LINECOLOR );
 pWin->SetFillColor( eColorData );
 pWin->SetLineColor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - i18npool/source

[Juergen Funk]

 i18npool/source/breakiterator/breakiterator_th.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 489c46007447a4cae76379c4b3153957998afd65
Author: Juergen Funk 
Date:   Wed May 27 09:34:25 2015 +0200

Include missing in Windows build

for the std::min we need the header 

Change-Id: I83d815e1fe8a7221c0eade58df5af887d5a9795a
Reviewed-on: https://gerrit.libreoffice.org/15921
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx 
b/i18npool/source/breakiterator/breakiterator_th.cxx
index 08a9400..a685427 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -21,6 +21,7 @@
 #include 
 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

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

New commits:
commit 790e6302c004be5d52990061a1a68369d75ecb1a
Author: Tor Lillqvist 
Date:   Wed May 27 10:30:39 2015 +0300

WaE: implicit conversion of NULL constant to 'nullptr_t'

Change-Id: Icc449f0ef2dff9d1f6eae97b7b4a594a81afadd5

diff --git a/sw/source/core/unocore/unochart.cxx 
b/sw/source/core/unocore/unochart.cxx
index 969fdbc..161ee5f 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2463,7 +2463,7 @@ void SAL_CALL SwChartDataSequence::dispose(  )
 if (pLclRegisteredIn && pLclRegisteredIn->HasWriterListeners())
 {
 pLclRegisteredIn->Remove(this);
-pTableCrsr = NULL;
+pTableCrsr = nullptr;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Consolidating debugging levels (via Easy Hacks)

[Stephan Bergmann]

On 05/26/2015 11:52 AM, Bjoern Michaelsen wrote:

we still have multiple othogonal and confusing debug levels in LibreOffice,
that can interact in funky ways, the most common ones being OSL_DEBUG_LEVEL and
DBG_UTL.


What are the funky interactions between OSL_DEBUG_LEVEL and DBG_UTIL?


I'd like to propose to consolidate these into _one_ general debug level with no
funky interaction. As such, I'd like to work towards the following (ideally via
Easy Hacks):
- Disable all current code that is enabled by OSL_DEBUG_LEVEL > 1 by enclosing
   them in "#if 0" (or alternatively: triggered by an explicit define for the
   area of code e.g. say DEBUG_SW_LAYOUT)


"#if 0" blocks will very likely get removed as unused code over time. 
That means, for current OSL_DEBUG_LEVEL>N code that is worth keeping 
(and cannot be replaced with plain SAL_INFO calls anyway), it would each 
need some specific #ifdef DEBUG_FOO.  Not sure whether it is better or 
worse to have an add-hoc array of DEBUG_FOO triggers or to have an 
add-hoc array of OSL_DEBUG_LEVEL>N triggers.

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