[Libreoffice-commits] core.git: chart2/source connectivity/source oox/source package/source sc/source svl/source vcl/generic vcl/osx vcl/source vcl/unx xmloff/source

[Noel Grandin]

 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |2 -
 chart2/source/view/charttypes/AreaChart.cxx|2 -
 chart2/source/view/charttypes/BarChart.cxx |2 -
 chart2/source/view/charttypes/CandleStickChart.cxx |2 -
 chart2/source/view/charttypes/NetChart.cxx |2 -
 connectivity/source/drivers/file/FResultSet.cxx|2 -
 connectivity/source/drivers/mork/MResultSet.cxx|2 -
 oox/source/drawingml/textparagraph.cxx |2 -
 package/source/zippackage/ZipPackageFolder.cxx |2 -
 sc/source/filter/xml/XMLExportDataPilot.cxx|2 -
 svl/source/passwordcontainer/passwordcontainer.cxx |6 ++---
 vcl/generic/app/gendisp.cxx|4 +--
 vcl/generic/fontmanager/fontcache.cxx  |2 -
 vcl/generic/fontmanager/fontmanager.cxx|6 ++---
 vcl/generic/print/common_gfx.cxx   |   12 
+-
 vcl/generic/print/glyphset.cxx |2 -
 vcl/osx/clipboard.cxx  |4 +--
 vcl/source/gdi/pdfwriter_impl.cxx  |6 ++---
 vcl/unx/generic/app/sm.cxx |4 +--
 vcl/unx/generic/dtrans/X11_selection.cxx   |6 ++---
 vcl/unx/generic/window/salframe.cxx|8 +++---
 xmloff/source/chart/SchXMLTableContext.cxx |2 -
 22 files changed, 41 insertions(+), 41 deletions(-)

New commits:
commit d203948fdb780c7af5777fcc26ad88bac1bd714e
Author: Noel Grandin 
Date:   Wed Jun 10 13:51:56 2015 +0200

convert 'it.begin() == it.end()' to 'it.empty()'

Change-Id: I244a9eb6bce6b1c649653ec38ebb9a39f8b4c145
Reviewed-on: https://gerrit.libreoffice.org/16212
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx 
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index f7f5fcc..a039467 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -241,7 +241,7 @@ void ChartTypeDialogController::adjustParameterToMainType( 
ChartTypeParameter& r
 }
 if(!bFoundSomeMatch)
 {
-if(rMap.begin()!=rMap.end())
+if(!rMap.empty())
 rParameter = (*rMap.begin()).second;
 else
 rParameter = ChartTypeParameter();
diff --git a/chart2/source/view/charttypes/AreaChart.cxx 
b/chart2/source/view/charttypes/AreaChart.cxx
index 7763f2c..0a9e7e7 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -644,7 +644,7 @@ struct FormerPoint
 
 void AreaChart::createShapes()
 {
-if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
+if( m_aZSlots.empty() ) //no series
 return;
 
 if( m_nDimension == 2 && ( m_bArea || !m_bCategoryXAxis ) )
diff --git a/chart2/source/view/charttypes/BarChart.cxx 
b/chart2/source/view/charttypes/BarChart.cxx
index 6184d01..9ad2ee4 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -413,7 +413,7 @@ void BarChart::adaptOverlapAndGapwidthForGroupBarsPerAxis()
 
 void BarChart::createShapes()
 {
-if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
+if( m_aZSlots.empty() ) //no series
 return;
 
 
OSL_ENSURE(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is(),"BarChart 
is not proper initialized");
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx 
b/chart2/source/view/charttypes/CandleStickChart.cxx
index c3621ce..8c974fb 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -77,7 +77,7 @@ void CandleStickChart::addSeries( VDataSeries* pSeries, 
sal_Int32 /* zSlot */, s
 
 void CandleStickChart::createShapes()
 {
-if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
+if( m_aZSlots.empty() ) //no series
 return;
 
 if( m_nDimension!=2 )
diff --git a/chart2/source/view/charttypes/NetChart.cxx 
b/chart2/source/view/charttypes/NetChart.cxx
index 5bd2623..2cc8d1e 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -344,7 +344,7 @@ struct FormerPoint
 
 void NetChart::createShapes()
 {
-if( m_aZSlots.begin() == m_aZSlots.end() ) //no series
+if( m_aZSlots.empty() ) //no series
 return;
 
 if( m_bArea )
diff --git a/connectivity/source/drivers/file/FResultSet.cxx 
b/connectivity/source/drivers/file/FResultSet.cxx
index ce34129..e59c6d2 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.c

[Libreoffice-commits] core.git: framework/qa qadevOOo/runner qadevOOo/tests sc/qa sfx2/qa toolkit/qa vcl/qa

[Noel Grandin]

 framework/qa/complex/XUserInputInterception/EventTest.java   | 
   4 -
 framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 
   6 -
 qadevOOo/runner/lib/MultiMethodTest.java | 
   6 +
 qadevOOo/runner/util/DesktopTools.java   | 
   4 -
 qadevOOo/runner/util/utils.java  | 
  19 +++-
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java  | 
   6 -
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java | 
  14 +--
 qadevOOo/tests/java/ifc/awt/_XImageProducer.java | 
   2 
 qadevOOo/tests/java/ifc/awt/_XItemListener.java  | 
   2 
 qadevOOo/tests/java/ifc/awt/_XRadioButton.java   | 
   2 
 qadevOOo/tests/java/ifc/awt/_XScrollBar.java | 
   8 +-
 qadevOOo/tests/java/ifc/awt/_XSpinField.java | 
  18 ++--
 qadevOOo/tests/java/ifc/awt/_XSpinValue.java | 
   8 +-
 qadevOOo/tests/java/ifc/awt/_XTextComponent.java | 
   4 -
 qadevOOo/tests/java/ifc/awt/_XTextListener.java  | 
   2 
 qadevOOo/tests/java/ifc/awt/_XTopWindow.java | 
   2 
 qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java | 
   5 -
 qadevOOo/tests/java/ifc/awt/_XWindow.java| 
  16 ++--
 qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java| 
   4 -
 qadevOOo/tests/java/ifc/container/_XContainer.java   | 
   4 -
 qadevOOo/tests/java/ifc/container/_XIndexAccess.java | 
   2 
 qadevOOo/tests/java/ifc/document/_XEventBroadcaster.java | 
   6 -
 qadevOOo/tests/java/ifc/form/_XChangeBroadcaster.java| 
   6 -
 qadevOOo/tests/java/ifc/form/_XFormController.java   | 
   8 +-
 qadevOOo/tests/java/ifc/form/_XLoadable.java | 
   6 -
 qadevOOo/tests/java/ifc/form/_XReset.java| 
   6 -
 qadevOOo/tests/java/ifc/form/_XSubmit.java   | 
   2 
 qadevOOo/tests/java/ifc/form/_XUpdateBroadcaster.java| 
  20 ++---
 qadevOOo/tests/java/ifc/form/submission/_XSubmission.java| 
   2 
 qadevOOo/tests/java/ifc/frame/_XComponentLoader.java | 
   6 -
 qadevOOo/tests/java/ifc/frame/_XDispatch.java| 
   6 -
 qadevOOo/tests/java/ifc/frame/_XDispatchRecorder.java| 
   4 -
 qadevOOo/tests/java/ifc/frame/_XDispatchRecorderSupplier.java| 
   4 -
 qadevOOo/tests/java/ifc/frame/_XFrame.java   | 
   9 +-
 qadevOOo/tests/java/ifc/frame/_XFrameLoader.java | 
  10 +-
 qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java   | 
   2 
 qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java  | 
   3 
 qadevOOo/tests/java/ifc/io/_XActiveDataControl.java  | 
   2 
 qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java   | 
   2 
 qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java  | 
  18 ++--
 qadevOOo/tests/java/ifc/system/_XSystemShellExecute.java | 
   2 
 qadevOOo/tests/java/ifc/task/_XJobExecutor.java  | 
   2 
 qadevOOo/tests/java/ifc/text/_XDocumentIndex.java| 
   2 
 qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster.java | 
   4 -
 qadevOOo/tests/java/ifc/text/_XPagePrintable.java| 
   4 -
 qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java| 
   5 -
 qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java   | 
   2 
 qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java | 
   4 -
 qadevOOo/tests/java/ifc/view/_XPrintJobBroadcaster.java  | 
   4 -
 qadevOOo/tests/java/mod/_basctl/AccessibleShape.java | 
   6 -
 qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java   | 
  40 +++---
 qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java | 
  34 ++--
 qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java| 
   4 -
 qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java  | 
   2 
 qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java  | 
  31 ++-
 qadevOOo/tests/java/mod/_forms/OTimeControl.java | 
   2 
 qadevOOo/tests/java/mod/_fwk/DispatchRecord

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

[Stephan Bergmann]

 sc/inc/externalrefmgr.hxx|1 -
 sc/source/ui/docshell/externalrefmgr.cxx |   11 ---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit c82c94b40157c08bbbc524b2dc02714cbe82dc65
Author: Stephan Bergmann 
Date:   Thu Jun 11 08:46:23 2015 +0200

loplugin:staticmethods

Change-Id: If54b3017296f5bcea01b3b0d24d9ac821f6a24e9

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 792c005..cd94c73 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -794,7 +794,6 @@ private:
  */
 void transformUnsavedRefToSavedRef( SfxObjectShell* pShell );
 
-void insertRefCell(RefCellMap::iterator& itr, ScFormulaCell* pCell);
 private:
 ScDocument* mpDoc;
 
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index 442ff2f..042201d 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2038,7 +2038,10 @@ void ScExternalRefManager::refreshAllRefCells(sal_uInt16 
nFileId)
 pVShell->PaintGrid();
 }
 
-void ScExternalRefManager::insertRefCell(RefCellMap::iterator& itr, 
ScFormulaCell* pCell)
+namespace {
+
+void insertRefCellByIterator(
+ScExternalRefManager::RefCellMap::iterator& itr, ScFormulaCell* pCell)
 {
 if (pCell)
 {
@@ -2047,6 +2050,8 @@ void 
ScExternalRefManager::insertRefCell(RefCellMap::iterator& itr, ScFormulaCel
 }
 }
 
+}
+
 void ScExternalRefManager::insertRefCell(sal_uInt16 nFileId, const ScAddress& 
rCell)
 {
 RefCellMap::iterator itr = maRefCells.find(nFileId);
@@ -2062,7 +2067,7 @@ void ScExternalRefManager::insertRefCell(sal_uInt16 
nFileId, const ScAddress& rC
 itr = r.first;
 }
 
-insertRefCell(itr, mpDoc->GetFormulaCell(rCell));
+insertRefCellByIterator(itr, mpDoc->GetFormulaCell(rCell));
 }
 
 void ScExternalRefManager::insertRefCellFromTemplate( ScFormulaCell* 
pTemplateCell, ScFormulaCell* pCell )
@@ -2073,7 +2078,7 @@ void ScExternalRefManager::insertRefCellFromTemplate( 
ScFormulaCell* pTemplateCe
 for (RefCellMap::iterator itr = maRefCells.begin(); itr != 
maRefCells.end(); ++itr)
 {
 if (itr->second.find(pTemplateCell) != itr->second.end())
-insertRefCell(itr, pCell);
+insertRefCellByIterator(itr, pCell);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Changing mindset of core LO developers to the status of master -- was test infrastructure ideas appreciated ...

[David Ostrovsky]

On Wed, Wed Jun 10 12:22:53 PDT 2015, Norbert Thiebaud wrot

> All that being said, none of that matter if the culture does not
> follow. no amount of CI can make people care.. what set the tone is
> the core developer group, the rest of us looks around how it is done
> and emulate the behavior.

Nothing causes more pain, frustration and disappointment than
unfulfilled expectations.

I expect that master is always green. My definition of green is:

  $ make check

with --enable-werror is passing on all three platforms: Linux|Mac|Win
64.

I thought that the same expectation is _consensus_ among core LO
developers. My definition of core LO developers: payed developer who is
working full time on LO.

So as master was broken again (my definition of broken is compiling
and/or linking was broken on some platforms, not to mention passing of
tests) I entered #libreoffice-dev channel on freenode and asked:

_david_: "Master is broken again. Is that too much to expect that the
master is green?"

One of LO core developers (see my definition of "core developers" above)
answered:

_lo_core_developer_: "Yes, it's. The purpose of master is to be always
broken."

That's boolshit, of course. Fix that mindset first, before saying or
doing anything else.


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

Re: why a master-tested branch is important and incentives for CI over no-CI (was: test infrastructure ideas appreciated ...)

[Bjoern Michaelsen]

Hi,

On Wed, Jun 10, 2015 at 06:01:54PM -0500, Norbert Thiebaud wrote:
> No today you cannot, as there is no guarantee that the intersection of
> the set of the commit built by each tinderbox is non-empty.
> In fact the odds that that set is non empty during a given work-day is
> pretty low.

Yes, that is the infrastructure challenge in this. However, it should be
solvable, if:

a/ the requirement of updates on the last-known-good-everywhere state is
   roughly 'once in 24 hours' (more frequent updates are nice, but not
   essential)

b/ if tinderboxes are taught to build the latest commit that was marked green
   on another platform, if there is one. Only if there is no such commit it will
   try to create one by building the latest and greatest.
 
> as I said earlier a tag (or a branch which is the same thing
> fundamentally) defeat parallelism.

How so? The tinderboxes would use git-notes as you suggested. Only after that a
cronjob would regulary update a branch to the latest all-green commit to make
the info as easily accessible (the git-notes could still be around). From the
technical point of view, all that is trivial so lets not rathole too much on it
here.

So in total, there are two things needed for this:
1/ Make tinderboxes find at least one commit each day that they all did build
   and test and marked as green.

--> This is a technical challenge. It should be solvable with e.g. git-notes.

2/ Make the last-known-good-everywhere state the default base for new and
   casual contributors in our documentation and culture (allowing those who want
   to work on master directly without CI to continue to do so).

--> This is a _cultural_ challenge. Its rather trivial from the technical side
once 1/ is done. There might be multiple ways to communicate the results of
1/, we should use whatever works best to reach the broader audience of new
contributors.

Anyway: 1/ is the technical/infrastructure challenge to attack first and it
seems we agree on that. So lets not dig too deep into 2/ for now, which is
trivial from the technical side.

Best,

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

LibreOffice Gerrit News for submodules on 2015-06-11

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

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

+ improving upload script
  in https://gerrit.libreoffice.org/16198 from dennisroczek


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

None

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

None

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

None

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 Gerrit News for core on 2015-06-11

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ tdf#91378-Empty Custom Properties are lost while saving in .pptx format
  in https://gerrit.libreoffice.org/15966 from Heena Gupta
  about module oox, sax, sd
+ improve lo-commit-stat script
  in https://gerrit.libreoffice.org/16207 from dennisroczek
  about module bin
+ tdf#91634: Image hyperlink is not export after roundtrip.
  in https://gerrit.libreoffice.org/15919 from Yogesh Bharate
  about module oox, sc
+ tdf#61908:XLSX formula cell range is not exported for MMULT.
  in https://gerrit.libreoffice.org/16033 from Yogesh Bharate
  about module sc
 End of freshness 

+ calc mapmode: Refactor DrawBackground to use logic units
  in https://gerrit.libreoffice.org/16224 from Krisztian Pinter
  about module sc
+ spelling Change-Id: I5ccbb5a2b31192cea96fbb0f4ab926af86e94c9d
  in https://gerrit.libreoffice.org/16223 from Antoine
  about module dbaccess, qadevOOo, sc
+ Cleanup crossplatform cairo
  in https://gerrit.libreoffice.org/16218 from Mox Soini
  about module canvas, include, vcl
+ WIP convert most std::list usage to std::vector
  in https://gerrit.libreoffice.org/16151 from Noel Grandin
  about module animations, basegfx, basic, binaryurp, canvas, chart2, 
codemaker, configmgr, connectivity, cppu, cui, dbaccess, desktop, extensions, 
filter, forms, fpicker, framework, helpcompiler, hwpfilter, idl, include, 
l10ntools, mysqlc, odk, oox, package, reportdesign, rsc, sal, sc, scripting, 
sd, sdext, sfx2, sot, stoc, svl, svtools, svx, sw, toolkit, tools, ucb, 
unotools, vcl, xmloff, xmlsecurity
+ convert 'it.begin() == it.end()' to 'it.empty()'
  in https://gerrit.libreoffice.org/16212 from Noel Grandin
  about module chart2, connectivity, oox, package, sc, svl, vcl, xmloff
+ 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
+ cppcheck: variableScope
  in https://gerrit.libreoffice.org/16208 from Takeshi Abe
  about module starmath
+ rtf: skip binary data also in skip-group mode
  in https://gerrit.libreoffice.org/16206 from Thorsten Behrens
  about module writerfilter
+ Uno api sidebar unit test tdf#91806
  in https://gerrit.libreoffice.org/16180 from Laurent Godard
  about module include, sfx2, unotest
+ java:remove more unnecessary catch/re-throw
  in https://gerrit.libreoffice.org/16203 from Noel Grandin
  about module qadevOOo, sc, unotest
+ tdf#91812: toolbar and sidebar colour buttons now update each other
  in https://gerrit.libreoffice.org/16093 from Katarina Behrens
  about module svx
+ speed up Java unit tests by removing sleeps
  in https://gerrit.libreoffice.org/16201 from Noel Grandin
  about module framework, qadevOOo, sc, sfx2, toolkit, vcl
+ java:regulatize the order of 'final' and public/private
  in https://gerrit.libreoffice.org/16202 from Noel Grandin
  about module android, bean, dbaccess, desktop, forms, javaunohelper, jurt, 
jvmfwk, nlpsolver, odk, qadevOOo, reportbuilder, ridljar, scripting, smoketest, 
sw, swext, testtools, toolkit, ucb, wizards, xmerge


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

+ tdf#91613 restore functionality of clicking to .uno:Size status bar eleme
  in https://gerrit.libreoffice.org/16221 from Andras Timar
+ harden build enviroment on mac with LODE
  in https://gerrit.libreoffice.org/16222 from Norbert Thiebaud
+ Android: download documents from ownCloud.
  in https://gerrit.libreoffice.org/16192 from Jacobo Aragunde Pérez
+ Android: add menu entry for document provider settings
  in https://gerrit.libreoffice.org/16195 from Jacobo Aragunde Pérez
+ Android: improve error handling in ownCloud provider.
  in https://gerrit.libreoffice.org/16197 from Jacobo Aragunde Pérez
+ Android: document providers listen to changes in preferences.
  in https://gerrit.libreoffice.org/16196 from Jacobo Aragunde Pérez
+ CppunitTest_sw_uiwriter: enable on Windows
  in https://gerrit.libreoffice.org/16185 from Miklos Vajna
+ Android: setup ownCloud provider with user-defined settings
  in https://gerrit.libreoffice.org/16194 from Jacobo Aragunde Pérez
+ Android: settings activity for document providers
  in https://gerrit.libreoffice.org/16193 from Jacobo Aragunde Pérez
+ tdf#91727 - Unwind non-dispatch of idle handlers.
  in https://gerrit.libreoffice.org/16205 from Michael Meeks
+ Android: initial implementation of ownCloud provider.
  in https://gerrit.libreoffice.org/16191 from Jacobo Aragunde Pérez
+ tdf#89972: also copy external reference status
  in https://gerrit.libreoffice.org/16066 from Mike Kaganski
+ tdf#89972: unit test: check proper external ref manager registration
  in https://gerrit.libreoffice.org/16210 from Mike Kaganski
+ Added Test for Export to Picture
  in https://gerrit.libreoffice.o

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

[Andras Timar]

 sw/source/uibase/uiview/view2.cxx |   53 ++
 1 file changed, 53 insertions(+)

New commits:
commit a2716e53c140b09d886591a3d6611ee8f166e417
Author: Andras Timar 
Date:   Thu Jun 11 00:01:38 2015 +0200

tdf#91613 restore functionality of clicking to .uno:Size status bar element

... in Writer.

This (partially) reverts commit ebabf6d1fa648d62dd63529e9fe64dcb631caee8.
I did not see the point to open Fields dialog by default, but other uses
are fully valid.

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

diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index 02b58fb..498a262 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1487,6 +1487,26 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
 rSet.DisableItem( SID_ATTR_ZOOMSLIDER );
 }
 break;
+case SID_ATTR_POSITION:
+case SID_ATTR_SIZE:
+{
+if( !rShell.IsFrmSelected() && !rShell.IsObjSelected() )
+SwBaseShell::_SetFrmMode( FLY_DRAG_END );
+else
+{
+FlyMode eFrameMode = SwBaseShell::GetFrmMode();
+if ( eFrameMode == FLY_DRAG_START || eFrameMode == 
FLY_DRAG )
+{
+if ( nWhich == SID_ATTR_POSITION )
+rSet.Put( SfxPointItem( SID_ATTR_POSITION,
+
rShell.GetAnchorObjDiff()));
+else
+rSet.Put( SvxSizeItem( SID_ATTR_SIZE,
+   rShell.GetObjSize()));
+}
+}
+}
+break;
 case SID_TABLE_CELL:
 
 if( rShell.IsFrmSelected() || rShell.IsObjSelected() )
@@ -1777,6 +1797,39 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
 }
 break;
 
+case SID_ATTR_SIZE:
+{
+sal_uInt16 nId = 0;
+if( rSh.IsCrsrInTable() )
+nId = FN_FORMAT_TABLE_DLG;
+else if( rSh.GetCurTOX() )
+nId = FN_INSERT_MULTI_TOX;
+else if( rSh.GetCurrSection() )
+nId = FN_EDIT_REGION;
+else
+{
+const SwNumRule* pNumRule = rSh.GetNumRuleAtCurrCrsrPos();
+if( pNumRule )  // cursor in numbering
+{
+if( pNumRule->IsAutoRule() )
+nId = FN_NUMBER_BULLETS;
+else
+{
+// start dialog of the painter
+nId = 0;
+}
+}
+else if( rSh.IsFrmSelected() )
+nId = FN_FORMAT_FRAME_DLG;
+else if( rSh.IsObjSelected() )
+nId = SID_ATTR_TRANSFORM;
+}
+if( nId )
+GetViewFrame()->GetDispatcher()->Execute(nId,
+SfxCallMode::SYNCHRON | SfxCallMode::RECORD );
+}
+break;
+
 case FN_STAT_SELMODE:
 {
 if ( pArgs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Norbert Thiebaud]

 configure.ac |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 5fc0cbbc1254223fedf0f78c5e7539219b228697
Author: Norbert Thiebaud 
Date:   Tue Jun 9 20:05:32 2015 -0500

harden build enviroment on mac with LODE

mac build really does not like finding extra stuff in the PATH
or in /usr/local/bin
as this is prone to happen with macport/fink/etc..
or somethings just due to some other 'ported to mac' pre-canned
binaries..
for instance one has found a python3 in /usr/local/bin
which confused configure to believe it was ok to use
'system python', which break on mac.

This patch sanitize PATH during ./autogen.sh, when running
in a LODE environment.
it leave only LODE_HOME/opt/bin:/usr/bin:/bin:/usr/sbin:/sbin  and 
optionally
the path where git is located if that is not /usr/bin
(it is quite common depending on how one installed git, to haev it in 
/usr/local/git/bin
for instance)

This is strictly a 'nanny' patch.. but it should not impact anyone
that is not ( on Mac and using LODE ).

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

diff --git a/configure.ac b/configure.ac
index d214864..879b370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,26 @@ add_warning()
 echo "$COLORWARN $@" >> warn
 }
 
+dnl Some Mac User have the bad habbit of letting a lot fo crap
+dnl accumulate in their PATH and even adding stuff in /usr/local/bin
+dnl that confuse the build.
+dnl For the ones that use LODE, let's be nice and protect them
+dnl from themselves
+
+mac_sanitize_path()
+{
+mac_path="$LODE_HOME/opt/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+dnl a common but nevertheless necessary thing that may be in a fancy
+dnl path location is git, so make sure we have it
+mac_git_path=`which git 2>/dev/null`
+if test -n "$mac_git_path" -a -x "$mac_git_path" -a "$mac_git_path" != 
"/usr/bin/git" ; then
+mac_path="$mac_path:`dirname $mac_git_path`"
+fi
+PATH="$mac_path"
+unset mac_path
+unset git_mac_path
+}
+
 echo ""
 echo "*"
 echo "*   Running ${PACKAGE_NAME} build configuration."
@@ -667,6 +687,10 @@ darwin*) # Mac OS X or iOS
 test_cups=no
 else
 _os=Darwin
+if test -n "$LODE_HOME" ; then
+mac_sanitize_path
+AC_MSG_NOTICE([sanitized the PATH to $PATH])
+fi
 INSTROOTSUFFIX=/$PRODUCTNAME.app/Contents
 SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/src/layer/tile/TileLayer.js |9 -
 loleaflet/src/map/Map.js  |4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ba6663d4457932e604cd1e0dfba0e3218dce10e6
Author: Henry Castro 
Date:   Wed Jun 10 21:59:09 2015 -0400

loleaflet: Added onkeyup event.

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 24363c3..70750ec 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -81,7 +81,8 @@ L.TileLayer = L.GridLayer.extend({
var events = {
viewreset: this._viewReset,
moveend: this._move,
-   keypress: this._onKeyPress
+   keypress: this._onKeyPress,
+   keyup: this._onKeyUp
};
 
if (!this.options.updateWhenIdle) {
@@ -713,6 +714,12 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   _onKeyUp: function (e) {
+   if (this._cursorMarker) {
+   this._postKeyboardEvent('up', e.originalEvent.charCode, 
this._toUNOKeyCode(e.originalEvent.keyCode));
+   }
+   },
+
_onUpdateCursor: function () {
if (this._cursorVisible && this._cursorBounds ) {
if (this._cursorMarker)
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 72a9c49..06b31b4 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -582,7 +582,7 @@ L.Map = L.Evented.extend({
var onOff = remove ? 'off' : 'on';
 
L.DomEvent[onOff](this._container, 'click dblclick mousedown 
mouseup ' +
-   'mouseover mouseout mousemove contextmenu keypress', 
this._handleDOMEvent, this);
+   'mouseover mouseout mousemove contextmenu keypress 
keyup', this._handleDOMEvent, this);
 
if (this.options.trackResize) {
L.DomEvent[onOff](window, 'resize', this._onResize, 
this);
@@ -635,7 +635,7 @@ L.Map = L.Evented.extend({
var data = {
originalEvent: e
};
-   if (e.type !== 'keypress') {
+   if (e.type !== 'keypress' && e.type !== 'keyup') {
data.containerPoint = target instanceof L.Marker ?

this.latLngToContainerPoint(target.getLatLng()) : 
this.mouseEventToContainerPoint(e);
data.layerPoint = 
this.containerPointToLayerPoint(data.containerPoint);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: Q: How to get the path of all opened spreadsheet documents

[Zhang, William]

Hi Andrew and Fernand,

Thanks a lot for your help.

With your hint, I’ve found a way to get file path for all opened spreadsheet 
documents with Java, my code is as follow.
---
String ooExeFolder = "/usr/lib64/libreoffice/program";
XComponentContext xContext = 
BootstrapSocketConnector.bootstrap(ooExeFolder);
XMultiComponentFactory xMCF = xContext.getServiceManager();
Object desktop = 
xMCF.createInstanceWithContext("com.sun.star.frame.Desktop", xContext);
XDesktop xDesktop = 
(XDesktop)UnoRuntime.queryInterface(XDesktop.class, desktop);
XEnumeration xenum  = xDesktop.getComponents().createEnumeration();

 while(xenum.hasMoreElements()) {
  Object obj = xenum.nextElement();
  XComponent x = 
(XComponent)UnoRuntime.queryInterface(XComponent.class, obj);
  XModel xm = 
(XModel)UnoRuntime.queryInterface(XModel.class, x);
  if (xm != null) {
  String url = xm.getURL(); //url is what I want
  System.out.println(url);
  }
 }

Best Regards
William

-
From: SOS [mailto:s...@pmg.be]
Sent: 2015年6月11日 0:52
To: Zhang, William; us...@global.libreoffice.org
Subject: Re: Q: How to get the path of all opened spreadsheet documents


 Zhang

in basic i use this function

Function TaskonDesktop(DocPath as String) as Boolean

Dim oComponents as Object

' Search if one of the active Components ist the one that you search for
oComponents = StarDesktop.Components.CreateEnumeration
While oComponents.HasmoreElements
oComponent = oComponents.NextElement
'printUCase(oComponent.URL) & " - " & UCase(converttoURL(DocPath)
If UCase(oComponent.URL) = UCase(converttoURL(DocPath)) then
TaskonDesktop = True
Exit Function
End If
Wend
TaskonDesktop = False
End Function


hope it helps

Fernand


From: Andrew Douglas Pitonyak [mailto:and...@pitonyak.org]
Sent: 2015年6月8日 19:20
To: Zhang, William
Cc: libreoffice@lists.freedesktop.org
Subject: Re: Q: How to get the path of all opened spreadsheet documents


Calc documents implement the following service:

com.sun.star.sheet.SpreadsheetDocument

Using that with the examples below based on a write document:


'**
'// Count the total number of open componets.
'// This includes all document types as well
'// as things such as the Basic IDE and help windows.
'**
Function numberOfOpenComponents As Integer
  Dim i As Integer
  Dim oDocs
  Dim oDoc
  i = 0

  oDocs = StarDesktop.getComponents().createEnumeration()
  Do While oDocs.hasMoreElements()
oDoc = oDocs.nextElement()
i = i + 1
  Loop
  numberOfOpenComponents = i
End Function

'**
'// Count number of open Write documents.
'**
Function countOpenWriteDocs() As Integer
  countOpenWriteDocs = countTypedComponents("com.sun.star.text.TextDocument")
End Function

'**
'// Count number of documents that are open with the specified service type.
'**
Function countTypedComponents(serviceName$) As Integer
  Dim i As Integer
  Dim oDocs
  Dim oDoc
  i = 0

  oDocs = StarDesktop.getComponents().createEnumeration()
  Do While oDocs.hasMoreElements()
oDoc = oDocs.nextElement()
If oDoc.supportsService(serviceName) Then
  i = i + 1
End If
  Loop
  countTypedComponents = i
End Function

'**
'// Return true if the specified document is a Write document.
'**
Function isWriteDocument(oDoc) As Boolean
  If IsNull(oDoc) Then
isWriteDocument = False
  ElseIf IsEmpty(oDoc) Then
isWriteDocument = False
  ElseIf  oDoc.supportsService("com.sun.star.text.TextDocument") Then
isWriteDocument = True
  Else
isWriteDocument = False
  End If
End Function



On 06/07/2015 09:21 PM, Zhang, William wrote:

Hi Andrew,



Thanks a lot for your reply.



Q1: In your case do you only care about documents that have been saved... 
Ignoring n

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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit b35ee177580a9bf9a28572bb5af02abe07faec06
Author: matteocam 
Date:   Wed Jun 10 19:21:31 2015 -0400

Getting nonoverflowing text from edit outliner if in edit mode

Change-Id: I7cc613046194054b60718d89bcfe209eaaaf66c5

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 9fff4c0..5bcfbe3 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -731,8 +731,12 @@ void SdrTextObj::impDecomposeContourTextPrimitive(
 OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject(SdrOutliner 
*pOutliner) const
 {
 NonOverflowingText *pNonOverflowingTxt;
-pNonOverflowingTxt =
-pOutliner->GetNonOverflowingText();
+if (pEdtOutl != NULL)
+pNonOverflowingTxt =
+pEdtOutl->GetNonOverflowingText();
+else
+pNonOverflowingTxt =
+pOutliner->GetNonOverflowingText();
 
 pOutliner->Clear();
 //pOutliner->SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: why a master-tested branch is important and incentives for CI over no-CI (was: test infrastructure ideas appreciated ...)

[Norbert Thiebaud]

On Wed, Jun 10, 2015 at 3:40 PM, Bjoern Michaelsen
 wrote:
>
> Of course, you can collect the data of last-known-good manually

No today you cannot, as there is no guarantee that the intersection of
the set of the commit built by each tinderbox is non-empty.
In fact the odds that that set is non empty during a given work-day is
pretty low.

> -- but pulling
> from a branch is one of the most basic and simple operations of git.

and git log --show-notes --grep "jenkins:all_green"
is not that hard either to find a commit

Heck, if it is too hard to learn basic tooling, we can even add it to ./g
./g green

as I said earlier a tag (or a branch which is the same thing
fundamentally) defeat parallelism.
___
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' - include/svx svx/source

[matteocam]

 include/svx/svdotext.hxx|7 -
 svx/source/svdraw/svdotext.cxx  |   12 +-
 svx/source/svdraw/svdotextdecomposition.cxx |  138 +++-
 svx/source/svdraw/svdotxed.cxx  |2 
 4 files changed, 86 insertions(+), 73 deletions(-)

New commits:
commit 2e66cafe5bdef5a0c64c190b0b73a7db61dcc3a1
Author: matteocam 
Date:   Wed Jun 10 18:43:29 2015 -0400

Passed right outliner around

Change-Id: I7eeb193e53926093e91393667ab9c788ebebda9d

diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 964ee43..0552029 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -608,9 +608,10 @@ public:
 const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& 
rSdrChainedTextPrimitive,
 const drawinglayer::geometry::ViewInformation2D& aViewInformation) 
const;
 
-void impMoveChainedTextToNextLink(SdrTextObj *pNextTextObj) const;
-OutlinerParaObject *impGetNonOverflowingParaObject() const;
-void impLeaveOnlyNonOverflowingText() const;
+void impMoveChainedTextToNextLink(SdrOutliner *pOutliner, SdrTextObj 
*pNextTextObj) const;
+OutlinerParaObject *impGetOverflowingParaObject(SdrOutliner *pOutliner, 
SdrTextObj *pNextTextObj) const;
+void impLeaveOnlyNonOverflowingText(SdrOutliner *pOutliner) const;
+OutlinerParaObject *impGetNonOverflowingParaObject(SdrOutliner *pOutliner) 
const;
 
 // Handler for Chained Text
 DECL_LINK(ImpDecomposeChainedText,bool*);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index bf46cb9..82b883f 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1958,11 +1958,10 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
 
 void SdrTextObj::onOverflowStatusEvent( bool bIsPageOverflow )
 {
-// FIXME: Should have a IsChainable or something.
-if (IsAutoGrowWidth() || IsAutoGrowHeight() || IsAutoFit())
+if (!IsChainable())
 return;
 
-if ( GetNextLinkInChain() != NULL ) // is this a chainable object?
+if ( GetNextLinkInChain() != NULL ) // is there anything to transfer text 
to?
 {
 // set whether there is need for chaining
 // (used in EndTextEdit to crop the overflowing part)
@@ -1973,17 +1972,18 @@ void SdrTextObj::onOverflowStatusEvent( bool 
bIsPageOverflow )
 
 // Pushes text in next link on the fly
 if ( bIsPageOverflow ) {
+SdrOutliner &aDrawOutliner = ImpGetDrawOutliner();
 if (pEdtOutl != NULL)
 mpOverflowingText = pEdtOutl->GetOverflowingText();
 else
-mpOverflowingText = ImpGetDrawOutliner().GetOverflowingText();
+mpOverflowingText = aDrawOutliner.GetOverflowingText();
 
 SdrTextObj *pNextTextObj = GetNextLinkInChain();
 
-impLeaveOnlyNonOverflowingText();
+impLeaveOnlyNonOverflowingText(&aDrawOutliner);
 
 // Transfer overflowing text
-impMoveChainedTextToNextLink(pNextTextObj);
+impMoveChainedTextToNextLink(&aDrawOutliner, pNextTextObj);
 }
 
 }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 88f6136..9fff4c0 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -732,36 +732,36 @@ OutlinerParaObject 
*SdrTextObj::impGetNonOverflowingParaObject(SdrOutliner *pOut
 {
 NonOverflowingText *pNonOverflowingTxt;
 pNonOverflowingTxt =
-rOutliner.GetNonOverflowingText();
+pOutliner->GetNonOverflowingText();
 
-pOutliner.Clear();
-//pOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
+pOutliner->Clear();
+//pOutliner->SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
 
 if (pNonOverflowingTxt->mPreOverflowingTxt == "" &&
 pNonOverflowingTxt->mpHeadParas != NULL) {
 // Only (possibly empty) paragraphs before overflowing one
-pOutliner.SetText(*pNonOverflowingTxt->mpHeadParas);
+pOutliner->SetText(*pNonOverflowingTxt->mpHeadParas);
 } else { // We have to include the non-overflowing lines from the overfl. 
para
 
 // first make a ParaObject for the strings
-Paragraph *pTmpPara0 = pOutliner.GetParagraph(0);
-pOutliner.SetText(pNonOverflowingTxt->mPreOverflowingTxt, pTmpPara0);
-OutlinerParaObject *pPObj = pOutliner.CreateParaObject();
-pOutliner.Clear();
-//pOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
+Paragraph *pTmpPara0 = pOutliner->GetParagraph(0);
+pOutliner->SetText(pNonOverflowingTxt->mPreOverflowingTxt, pTmpPara0);
+OutlinerParaObject *pPObj = pOutliner->CreateParaObject();
+pOutliner->Clear();
+//pOutliner->SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
 
 if (pNonOverflowingTxt->mpHeadParas != NULL)
-pOutliner

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

[László Németh]

 vcl/win/source/gdi/salnativewidgets-luna.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6758a1b16461bea4fe787aa8634fbd602f51d474
Author: László Németh 
Date:   Wed Jun 10 23:49:39 2015 +0200

tdf#91645 don't change selected menu title text color in Aero theme

(cherry-picked from commit c8344322a7af75b84dd3ca8f78b05543a976dfd5)

Change-Id: I99a935ac7c1aee881bca77f95bd5d1a45d8901ea
Reviewed-on: https://gerrit.libreoffice.org/16220
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index c680e4b..7d545b0 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1546,6 +1546,7 @@ void WinSalGraphics::updateSettingsNative( AllSettings& 
rSettings )
 // in aero menuitem highlight text is drawn in the same color as normal
 aStyleSettings.SetMenuHighlightTextColor( 
aStyleSettings.GetMenuTextColor() );
 aStyleSettings.SetMenuBarRolloverTextColor( aMenuBarTextColor );
+aStyleSettings.SetMenuBarHighlightTextColor( aMenuBarTextColor );
 pSVData->maNWFData.mnMenuFormatBorderX = 2;
 pSVData->maNWFData.mnMenuFormatBorderY = 2;
 pSVData->maNWFData.maMenuBarHighlightTextColor = aMenuBarTextColor;
___
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 |   78 
 1 file changed, 35 insertions(+), 43 deletions(-)

New commits:
commit e921d44aba6d1c224ae03ceedd4938988ef9d6d3
Author: matteocam 
Date:   Wed Jun 10 16:39:07 2015 -0400

Drafting changes for passing outliner

Change-Id: Ia3ff27cce807679b3698a2d3d8d761930af0ecd5

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 3e9e262..88f6136 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -728,44 +728,38 @@ void SdrTextObj::impDecomposeContourTextPrimitive(
 rTarget = aConverter.getPrimitive2DSequence();
 }
 
-OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject() const
+OutlinerParaObject *SdrTextObj::impGetNonOverflowingParaObject(SdrOutliner 
*pOutliner) const
 {
 NonOverflowingText *pNonOverflowingTxt;
-// Cut non overflowing text
-if (pEdtOutl != NULL)
-pNonOverflowingTxt =
-pEdtOutl->GetNonOverflowingText();
-else
-pNonOverflowingTxt =
-ImpGetDrawOutliner().GetNonOverflowingText();
+pNonOverflowingTxt =
+rOutliner.GetNonOverflowingText();
 
-SdrOutliner &rOutliner = ImpGetDrawOutliner();
-rOutliner.Clear();
-//rOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
+pOutliner.Clear();
+//pOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
 
 if (pNonOverflowingTxt->mPreOverflowingTxt == "" &&
 pNonOverflowingTxt->mpHeadParas != NULL) {
 // Only (possibly empty) paragraphs before overflowing one
-rOutliner.SetText(*pNonOverflowingTxt->mpHeadParas);
+pOutliner.SetText(*pNonOverflowingTxt->mpHeadParas);
 } else { // We have to include the non-overflowing lines from the overfl. 
para
 
 // first make a ParaObject for the strings
-Paragraph *pTmpPara0 = rOutliner.GetParagraph(0);
-rOutliner.SetText(pNonOverflowingTxt->mPreOverflowingTxt, pTmpPara0);
-OutlinerParaObject *pPObj = rOutliner.CreateParaObject();
-rOutliner.Clear();
-//rOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
+Paragraph *pTmpPara0 = pOutliner.GetParagraph(0);
+pOutliner.SetText(pNonOverflowingTxt->mPreOverflowingTxt, pTmpPara0);
+OutlinerParaObject *pPObj = pOutliner.CreateParaObject();
+pOutliner.Clear();
+//pOutliner.SetStyleSheet( 0, pEdtOutl->GetStyleSheet(0));
 
 if (pNonOverflowingTxt->mpHeadParas != NULL)
-rOutliner.SetText(*pNonOverflowingTxt->mpHeadParas);
+pOutliner.SetText(*pNonOverflowingTxt->mpHeadParas);
 
-rOutliner.AddText(*pPObj);
+pOutliner.AddText(*pPObj);
 }
 
- return rOutliner.CreateParaObject();
+ return pOutliner.CreateParaObject();
 }
 
-void SdrTextObj::impLeaveOnlyNonOverflowingText() const
+void SdrTextObj::impLeaveOnlyNonOverflowingText(SdrOutliner *pOutliner) const
 {
 OutlinerParaObject *pNewText = impGetNonOverflowingParaObject();
 // we need this when we are in editing mode
@@ -776,33 +770,31 @@ void SdrTextObj::impLeaveOnlyNonOverflowingText() const
 }
 
 
-void SdrTextObj::impMoveChainedTextToNextLink(SdrTextObj *pNextTextObj) const
+void SdrTextObj::impMoveChainedTextToNextLink(SdrOutliner *pOutliner, 
SdrTextObj *pNextTextObj) const
 {
 // prevent copying text in same box
 if ( this ==  pNextTextObj )
 return;
 
-SdrOutliner &rOutliner = ImpGetDrawOutliner();
-
-
//rOutliner.SetChainingEventHdl(LINK(this,SdrTextObj,ImpDecomposeChainedText));
+
//pOutliner.SetChainingEventHdl(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 
 if (mpOverflowingText != NULL) {
 // XXX: Not sure if necessary
-rOutliner.Clear();
+pOutliner.Clear();
 
 OutlinerParaObject *pCurTxt = pNextTextObj->GetOutlinerParaObject();
-rOutliner.SetText(*pCurTxt);
+pOutliner.SetText(*pCurTxt);
 
 // Get text of first paragraph of destination box
-Paragraph *pOldPara0 = rOutliner.GetParagraph(0);
+Paragraph *pOldPara0 = pOutliner.GetParagraph(0);
 OUString aOldPara0Txt;
 if (pOldPara0)
-aOldPara0Txt = rOutliner.GetText(pOldPara0);
+aOldPara0Txt = pOutliner.GetText(pOldPara0);
 
 // Get other paras of destination box (from second on)
 OutlinerParaObject *pOldParasTail = NULL;
-if (rOutliner.GetParagraphCount() > 1)
-pOldParasTail = rOutliner.CreateParaObject(1);
+if (pOutliner.GetParagraphCount() > 1)
+pOldParasTail = pOutliner.CreateParaObject(1);
 
 // Create ParaObject appending old first para in the dest. box
 //   to last part of overflowing text
@@ -810,39 +802,39 @@ void SdrTextObj::impMoveChainedTextToNextLink(SdrTextObj 
*pNextTextObj) const
 OutlinerParaObject *pJoiningPara = NULL;
 
 if (pOld

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

[László Németh]

 vcl/win/source/gdi/salnativewidgets-luna.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c8344322a7af75b84dd3ca8f78b05543a976dfd5
Author: László Németh 
Date:   Wed Jun 10 23:49:39 2015 +0200

tdf#91645 don't change selected menu title text color in Aero theme

Change-Id: I99a935ac7c1aee881bca77f95bd5d1a45d8901ea

diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index c680e4b..7d545b0 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1546,6 +1546,7 @@ void WinSalGraphics::updateSettingsNative( AllSettings& 
rSettings )
 // in aero menuitem highlight text is drawn in the same color as normal
 aStyleSettings.SetMenuHighlightTextColor( 
aStyleSettings.GetMenuTextColor() );
 aStyleSettings.SetMenuBarRolloverTextColor( aMenuBarTextColor );
+aStyleSettings.SetMenuBarHighlightTextColor( aMenuBarTextColor );
 pSVData->maNWFData.mnMenuFormatBorderX = 2;
 pSVData->maNWFData.mnMenuFormatBorderY = 2;
 pSVData->maNWFData.maMenuBarHighlightTextColor = aMenuBarTextColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: test-infra proposal: master-tested branch

[Bjoern Michaelsen]

Hi,

On Wed, Jun 10, 2015 at 10:02:12PM +0100, Wols Lists wrote:
> Would it make sense to have a server dedicated to Heisenbugs?
> If a test triggers a heisenbug, disable it on most of them 

That makes sense -- thus the suggestion to have 'master-tested' run e.g. make
check multiple -- say 10 times. If there is a new Heisenbug affecting a test,
it will be disabled and thus will not hurt CI testing.

> ... but try to
> instrument the heisenbug tester up the wazoo so that when it fails, there's a
> pile of logs to try and work out what went wrong.

In theory yes, in practice hunting most Heisenbugs is not too effective. For
example, we still have over 300 bisected regressions. And quite a few of them
will have the same root cause as some Heisenbug: However, in general it is much
easier to fix a well triaged regression than cutting through the haze and
finding the one precious hint hidden in piles and piles of logs.

Best,

Bjoern

P.S.:
If the Heisenbug is a regression and half-way reliable reproducable (say
reliable failure in ten runs) it should be (bi)bisectable. It then depends on
the test: If its a test using pure UNO, it should be possible to bibisect
without rebuilding LibreOffice on every step. If it is using more than UNO,
bibisecting wont work and one has to build LibreOffice on every step.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-0' - source/sl

[Andras Timar]

 source/sl/svx/source/items.po |  118 +-
 1 file changed, 59 insertions(+), 59 deletions(-)

New commits:
commit 623644358c81d64fd5076bc43ee928fec067ab12
Author: Andras Timar 
Date:   Wed Jun 10 23:17:47 2015 +0200

tdf#91982 fix Slovenian translation

Change-Id: I3e441b4391a4558ef1c216ed38863210a1046add

diff --git a/source/sl/svx/source/items.po b/source/sl/svx/source/items.po
index 7fd268d..c99605b 100644
--- a/source/sl/svx/source/items.po
+++ b/source/sl/svx/source/items.po
@@ -269,7 +269,7 @@ msgstr ""
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"1\n"
+"Scale\n"
 "itemlist.text"
 msgid "Scale"
 msgstr "Merilo"
@@ -278,7 +278,7 @@ msgstr "Merilo"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"2\n"
+"Brush\n"
 "itemlist.text"
 msgid "Brush"
 msgstr "Čopič"
@@ -287,7 +287,7 @@ msgstr "Čopič"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"3\n"
+"Tab stops\n"
 "itemlist.text"
 msgid "Tab stops"
 msgstr "Tabulatorska mesta"
@@ -296,7 +296,7 @@ msgstr "Tabulatorska mesta"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"4\n"
+"Character\n"
 "itemlist.text"
 msgid "Character"
 msgstr "Znak"
@@ -305,7 +305,7 @@ msgstr "Znak"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"5\n"
+"Font\n"
 "itemlist.text"
 msgid "Font"
 msgstr "Pisava"
@@ -314,7 +314,7 @@ msgstr "Pisava"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"6\n"
+"Font posture\n"
 "itemlist.text"
 msgid "Font posture"
 msgstr "Drža pisave"
@@ -323,7 +323,7 @@ msgstr "Drža pisave"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"7\n"
+"Font weight\n"
 "itemlist.text"
 msgid "Font weight"
 msgstr "Debelina pisave"
@@ -332,7 +332,7 @@ msgstr "Debelina pisave"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"8\n"
+"Shadowed\n"
 "itemlist.text"
 msgid "Shadowed"
 msgstr "Osenčeno"
@@ -341,7 +341,7 @@ msgstr "Osenčeno"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"9\n"
+"Individual words\n"
 "itemlist.text"
 msgid "Individual words"
 msgstr "Posamezne besede"
@@ -350,7 +350,7 @@ msgstr "Posamezne besede"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"10\n"
+"Outline\n"
 "itemlist.text"
 msgid "Outline"
 msgstr "Oris"
@@ -359,7 +359,7 @@ msgstr "Oris"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"11\n"
+"Strikethrough\n"
 "itemlist.text"
 msgid "Strikethrough"
 msgstr "Prečrtano"
@@ -368,7 +368,7 @@ msgstr "Prečrtano"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"12\n"
+"Underline\n"
 "itemlist.text"
 msgid "Underline"
 msgstr "Podčrtano"
@@ -377,7 +377,7 @@ msgstr "Podčrtano"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"13\n"
+"Font size\n"
 "itemlist.text"
 msgid "Font size"
 msgstr "Velikost pisave"
@@ -386,7 +386,7 @@ msgstr "Velikost pisave"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"14\n"
+"Rel. Font size\n"
 "itemlist.text"
 msgid "Rel. Font size"
 msgstr "Relativna velikost pisave"
@@ -395,7 +395,7 @@ msgstr "Relativna velikost pisave"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"15\n"
+"Font color\n"
 "itemlist.text"
 msgid "Font color"
 msgstr "Barva pisave"
@@ -404,7 +404,7 @@ msgstr "Barva pisave"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"16\n"
+"Kerning\n"
 "itemlist.text"
 msgid "Kerning"
 msgstr "Spodsekavanje"
@@ -413,7 +413,7 @@ msgstr "Spodsekavanje"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"17\n"
+"Effects\n"
 "itemlist.text"
 msgid "Effects"
 msgstr "Učinki"
@@ -422,7 +422,7 @@ msgstr "Učinki"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"18\n"
+"Language\n"
 "itemlist.text"
 msgid "Language"
 msgstr "Jezik"
@@ -431,7 +431,7 @@ msgstr "Jezik"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"19\n"
+"Position\n"
 "itemlist.text"
 msgid "Position"
 msgstr "Položaj"
@@ -440,7 +440,7 @@ msgstr "Položaj"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"20\n"
+"Blinking\n"
 "itemlist.text"
 msgid "Blinking"
 msgstr "Utripanje"
@@ -449,7 +449,7 @@ msgstr "Utripanje"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"21\n"
+"Character set color\n"
 "itemlist.text"
 msgid "Character set color"
 msgstr "Barva nabora znakov"
@@ -458,7 +458,7 @@ msgstr "Barva nabora znakov"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"22\n"
+"Overline\n"
 "itemlist.text"
 msgid "Overline"
 msgstr "Nadčrtano"
@@ -467,7 +467,7 @@ msgstr "Nadčrtano"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"23\n"
+"Paragraph\n"
 "itemlist.text"
 msgid "Paragraph"
 msgstr "Odstavek"
@@ -476,7 +476,7 @@ msgstr "Odstavek"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"24\n"
+"Alignment\n"
 "itemlist.text"
 msgid "Alignment"
 msgstr "Poravnava"
@@ -485,7 +485,7 @@ msgstr "Poravnava"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"25\n"
+"Line spacing\n"
 "itemlist.text"
 msgid "Line spacing"
 msgstr "Razmik med vrsticami"
@@ -494,7 +494,7 @@ msgstr "Razmik med vrsticami"
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
-"26\n"
+"Page Break\n"
 "itemlist.text"
 msgid "Page Break"
 msgs

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

[Andras Timar]

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

New commits:
commit 5fef3481f1695a3849563faeb80ceed7fadde186
Author: Andras Timar 
Date:   Wed Jun 10 23:17:47 2015 +0200

Updated core
Project: translations  623644358c81d64fd5076bc43ee928fec067ab12

tdf#91982 fix Slovenian translation

Change-Id: I3e441b4391a4558ef1c216ed38863210a1046add

diff --git a/translations b/translations
index 25f7f74..6236443 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 25f7f74c2a5e5aa5ba45c69d26d1efe52da9ea98
+Subproject commit 623644358c81d64fd5076bc43ee928fec067ab12
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source cui/source dbaccess/source include/svtools include/svx sc/source sd/source sfx2/source svtools/source svx/source sw/source

[Caolán McNamara]

 basctl/source/basicide/moduldl2.cxx |   10 ++--
 cui/source/customize/acccfg.cxx |9 +---
 cui/source/customize/cfg.cxx|6 +-
 cui/source/customize/macropg.cxx|4 -
 cui/source/dialogs/thesdlg.cxx  |4 -
 cui/source/dialogs/thesdlg_impl.hxx |2 
 cui/source/options/optHeaderTabListbox.cxx  |6 +-
 cui/source/options/optlingu.cxx |   14 +++---
 cui/source/tabpages/autocdlg.cxx|8 +--
 dbaccess/source/ui/app/AppDetailView.cxx|   37 +++--
 dbaccess/source/ui/app/AppDetailView.hxx|2 
 dbaccess/source/ui/control/listviewitems.cxx|4 -
 dbaccess/source/ui/inc/listviewitems.hxx|2 
 dbaccess/source/ui/misc/WNameMatch.cxx  |4 -
 include/svtools/svlbitm.hxx |8 +--
 include/svtools/treelistbox.hxx |6 +-
 include/svx/ctredlin.hxx|2 
 include/svx/fontlb.hxx  |2 
 sc/source/ui/miscdlgs/solveroptions.cxx |4 -
 sd/source/ui/animations/CustomAnimationList.cxx |   10 ++--
 sfx2/source/dialog/templdlg.cxx |7 ---
 svtools/source/contnr/svimpbox.cxx  |2 
 svtools/source/contnr/svlbitm.cxx   |   24 ---
 svtools/source/contnr/treelistbox.cxx   |   52 
 svtools/source/uno/treecontrolpeer.cxx  |   30 -
 svx/source/dialog/ctredlin.cxx  |4 -
 svx/source/dialog/docrecovery.cxx   |4 -
 svx/source/dialog/fontlb.cxx|4 -
 svx/source/form/filtnav.cxx |   12 ++---
 svx/source/inc/docrecovery.hxx  |2 
 sw/source/uibase/inc/conttree.hxx   |2 
 sw/source/uibase/utlui/content.cxx  |   10 ++--
 sw/source/uibase/utlui/glbltree.cxx |6 +-
 33 files changed, 138 insertions(+), 165 deletions(-)

New commits:
commit 88b104f44acff8087dfe3833bb91c63604ced98b
Author: Caolán McNamara 
Date:   Wed Jun 10 21:32:54 2015 +0100

coverity#1302618 deref of NULL

on examination this PreparePaint virtual is only called from
SvTreeListBox::PaintEntry1

and PaintEntry1 is only called from SvImpLBox::Paint in a

for(sal_uInt16 n=0; n< nCount && pEntry; n++)
{
/*long nMaxRight=*/
pView->PaintEntry1

loop so pEntry always exists given that test. Re-jig things
so these families of method take a reference instead of a pointer
so verifying it cannot be NULL and a whole pile of else paths
fall away

Change-Id: Ied40acb1c2263c21b4447832f8cb86f64ed9e80d

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 822c065..8218920 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -114,19 +114,19 @@ public:
 SvLBoxString( pEntry, nFlags, rTxt ) {}
 
 virtual void Paint(const Point& rPos, SvTreeListBox& rDev, 
vcl::RenderContext& rRenderContext,
-   const SvViewDataEntry* pView, const SvTreeListEntry* 
pEntry) SAL_OVERRIDE;
+   const SvViewDataEntry* pView, const SvTreeListEntry& 
rEntry) SAL_OVERRIDE;
 };
 
 void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, 
vcl::RenderContext& rRenderContext,
-  const SvViewDataEntry* /*pView*/, const 
SvTreeListEntry* pEntry)
+  const SvViewDataEntry* /*pView*/, const 
SvTreeListEntry& rEntry)
 {
 // Change text color if library is read only:
 bool bReadOnly = false;
-if (pEntry && pEntry->GetUserData())
+if (rEntry.GetUserData())
 {
-ScriptDocument 
aDocument(static_cast(pEntry->GetUserData())->GetDocument());
+ScriptDocument 
aDocument(static_cast(rEntry.GetUserData())->GetDocument());
 
-OUString aLibName = static_cast(pEntry->GetItem(1))->GetText();
+OUString aLibName = static_cast(rEntry.GetItem(1))->GetText();
 Reference 
xModLibContainer(aDocument.getLibraryContainer(E_SCRIPTS), UNO_QUERY);
 Reference 
xDlgLibContainer(aDocument.getLibraryContainer(E_DIALOGS), UNO_QUERY);
 bReadOnly = (xModLibContainer.is() && 
xModLibContainer->hasByName(aLibName) && 
xModLibContainer->isLibraryReadOnly(aLibName))
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index b3511e9..b91f003 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -625,7 +625,7 @@ public:
 virtual ~SfxAccCfgLBoxString_Impl();
 
 virtual void Paint(const Point& aPos, SvTreeListBox& rDevice, 
vcl::RenderContext& rRenderContext,
-   const SvViewDataEntry* pView, const SvTreeListEntry* 
pEntry) SAL_OVERRIDE;
+   const SvViewDataEntry* pView, 

Re: test-infra proposal: master-tested branch

[Wols Lists]

On 10/06/15 20:22, Norbert Thiebaud wrote:
> - a test auto-induced one: when a test is unstable and produce random
> failures based on circumstances... the infamous 'heisenbugs'
> and heisenbug can be a systemic/design problem or can be a real bug
> that is hard to trigger. either way these are not useful, and in fact
> harmful in a ci context; because the human nature is 'If you can't
> reproduce it is not a bug'
> so the later category of real hard to trigger bug is always labeled
> 'systemic error' and ignored anyway... and it make people numb to
> errors...
> For automated testing, trust is paramount: heisenbug test failure are
> the enemy, false non-failure is bad but actually less painful

Would it make sense to have a server dedicated to Heisenbugs? If a test
triggers a heisenbug, disable it on most of them but try to instrument
the heisenbug tester up the wazoo so that when it fails, there's a pile
of logs to try and work out what went wrong.

And of course, it doesn't spam failure reports generally unless someone
asks for them (the person to whom the bug is assigned should get them,
of course), but it does save those logs for forensic analysis.

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

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

[Michael Stahl]

 sw/qa/extras/odfexport/odfexport.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit dc4d9481f36a18db1dfe3b931780edbe32266e5f
Author: Michael Stahl 
Date:   Wed Jun 10 22:47:48 2015 +0200

tdf#90640: add a unit test for this

Change-Id: I72aecb66d0de4ba2bc3a44f664aab8170ffb3d0f

diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 9960e49..68c0e5a 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -184,6 +184,17 @@ DECLARE_ODFEXPORT_TEST(testFramebackgrounds, 
"framebackgrounds.odt")
 CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, 
"FillBitmapTile"));
 aGradientxTextFrame = getProperty(xTextFrame, 
"FillTransparenceGradient");
 CPPUNIT_ASSERT_EQUAL(css::awt::GradientStyle_LINEAR, 
aGradientxTextFrame.Style);
+
+if (xmlDocPtr pXmlDoc = parseExport("content.xml"))
+{
+// check that there are 3 background-image elements
+assertXPath(pXmlDoc, "//style:style[@style:parent-style-name='Frame' 
and 
@style:family='graphic']/style:graphic-properties[@draw:fill='bitmap']/style:background-image[@style:repeat='stretch']",
 3);
+// tdf#90640: check that one of them is 55% opaque
+assertXPath(pXmlDoc, "//style:style[@style:parent-style-name='Frame' 
and @style:family='graphic']/style:graphic-properties[@draw:fill='bitmap' and 
@fo:background-color='transparent' and 
@draw:opacity='55%']/style:background-image[@style:repeat='stretch' and 
@draw:opacity='55%']", 1);
+// tdf#90640: check that one of them is 43% opaque
+// (emulated - hopefully not with rounding errors)
+assertXPath(pXmlDoc, "//style:style[@style:parent-style-name='Frame' 
and @style:family='graphic']/style:graphic-properties[@draw:fill='bitmap' and 
@fo:background-color='transparent' and 
@draw:opacity-name='Transparency_20_1']/style:background-image[@style:repeat='stretch'
 and @draw:opacity='43%']", 1);
+}
 }
 
 DECLARE_ODFEXPORT_TEST(testFdo38244, "fdo38244.odt")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: why a master-tested branch is important and incentives for CI over no-CI (was: test infrastructure ideas appreciated ...)

[Bjoern Michaelsen]

On Wed, Jun 10, 2015 at 10:40:29PM +0200, Bjoern Michaelsen wrote:
> Having an easy-to-pull and CI-verified-only pull branch called
> 'master-tested' should help setting these.

Eh, easy-to-pull and CI-verified-only push branch of-course.

Best,

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

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

[Stephan Bergmann]

 editeng/source/items/frmitems.cxx |6 +++---
 editeng/source/items/paraitem.cxx |2 +-
 editeng/source/items/textitem.cxx |   18 +-
 include/svl/poolitem.hxx  |5 -
 svx/source/items/pageitem.cxx |2 +-
 5 files changed, 14 insertions(+), 19 deletions(-)

New commits:
commit f222de1de0f4be3ee01162aa3c62ca928dc8476f
Author: Stephan Bergmann 
Date:   Wed Jun 10 22:40:41 2015 +0200

Remove unnecessary Bool2Any

(It feels better to use explicitly bool-typed css::uno::makeAny(x) 
rather
than implicitly typed css::uno::makeAny(x) or css::uno::Any(x), in case x 
is not
already of type bool.)

Change-Id: I282b3764bb207aeae9f13cc981e68e8ef2b8ab93

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index d872838..357eb8b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -468,7 +468,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 break;
 
 case MID_FIRST_AUTO:
-rVal = Bool2Any(IsAutoFirst());
+rVal = css::uno::makeAny(IsAutoFirst());
 break;
 
 default:
@@ -1206,7 +1206,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) const
 return false;
 }
 
-rVal = Bool2Any( bValue );
+rVal = css::uno::makeAny( bValue );
 return true;
 }
 
@@ -3600,7 +3600,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 break;
 
 case MID_GRAPHIC_TRANSPARENT:
-rVal = Bool2Any( aColor.GetTransparency() == 0xff );
+rVal = css::uno::makeAny( aColor.GetTransparency() == 0xff );
 break;
 
 case MID_GRAPHIC_URL:
diff --git a/editeng/source/items/paraitem.cxx 
b/editeng/source/items/paraitem.cxx
index 452704b..c1402d9 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -655,7 +655,7 @@ boolSvxHyphenZoneItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) con
 switch(nMemberId)
 {
 case  MID_IS_HYPHEN:
-rVal = Bool2Any(bHyphen);
+rVal = css::uno::makeAny(bHyphen);
 break;
 case MID_HYPHEN_MIN_LEAD:
 rVal <<= (sal_Int16)nMinLead;
diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index 0c9fbad..69d4d38 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -547,7 +547,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 switch( nMemberId )
 {
 case MID_ITALIC:
-rVal = Bool2Any(GetBoolValue());
+rVal = css::uno::makeAny(GetBoolValue());
 break;
 case MID_POSTURE:
 rVal <<= (awt::FontSlant)GetValue();// values from 
awt::FontSlant and FontItalic are equal
@@ -699,7 +699,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 
nMemberId ) const
 switch( nMemberId )
 {
 case MID_BOLD   :
-rVal = Bool2Any(GetBoolValue());
+rVal = css::uno::makeAny(GetBoolValue());
 break;
 case MID_WEIGHT:
 {
@@ -1349,7 +1349,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) const
 switch(nMemberId)
 {
 case MID_TEXTLINED:
-rVal = Bool2Any(GetBoolValue());
+rVal = css::uno::makeAny(GetBoolValue());
 break;
 case MID_TL_STYLE:
 rVal <<= (sal_Int16)(GetValue());
@@ -1358,7 +1358,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) const
 rVal <<= (sal_Int32)( mColor.GetColor() );
 break;
 case MID_TL_HASCOLOR:
-rVal = Bool2Any( !mColor.GetTransparency() );
+rVal = css::uno::makeAny( !mColor.GetTransparency() );
 break;
 }
 return true;
@@ -1565,7 +1565,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) const
 switch(nMemberId)
 {
 case MID_CROSSED_OUT:
-rVal = Bool2Any(GetBoolValue());
+rVal = css::uno::makeAny(GetBoolValue());
 break;
 case MID_CROSS_OUT:
 rVal <<= (sal_Int16)(GetValue());
@@ -1880,7 +1880,7 @@ bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) c
 {
 case MID_GRAPHIC_TRANSPARENT:
 {
-rVal <<= Bool2Any (aColor.GetTransparency() == 0xff);
+rVal <<= css::uno::makeAny(aColor.GetTransparency() == 0xff);
 break;
 }
 default:
@@ -2445,7 +2445,7 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) const
 rVal <<= (sal_Int8)(nProp);
 break;
 case MID_AUTO_ESC:
-rVal = Bool2Any(DFLT_ESC_AUTO_SUB == nEsc || DFLT_ESC_AUTO_SUPER 
== nEsc);
+rVal = css::uno::makeAny(DFLT_ESC_AUTO_SUB == nEsc || 
DFLT_ESC_AUTO_SUPER == 

why a master-tested branch is important and incentives for CI over no-CI (was: test infrastructure ideas appreciated ...)

[Bjoern Michaelsen]

Hi,

On Wed, Jun 10, 2015 at 02:22:53PM -0500, Norbert Thiebaud wrote:
> We can get all that merely with git-notes I think.
> iow instead of a separate brnch, just annotate or even maiybe maintain
> a tag on master to indicate the last 'green master' in the sens you gave.

Yes, and I consider tinderboxes git-noting master commits actually one sensible
way of implementing this. Once that is done, a bot looking at all the git-notes
and pulling/forwarding a 'master-tested' branch to whatever was the last commit
known-good on all platforms with whatever level of testing we want should be a
trivial cronjob.

Of course, you can collect the data of last-known-good manually -- but pulling
from a branch is one of the most basic and simple operations of git. If we want
to enable and encourage user to use this, we should make it as accessible as
possible.

> Today the jenkins tinderbox operate like their ancestor: they jump
> around moving forward.. but not every commit get built.
> and since they are not all in sync it is hard to garantee that you
> will find a given commit that has been validated for all conf.
> _but_ with more hardware comming online, I want to move to a more
> 'bibisect build model' where _every commit get built.

Im quite concerned that this actually encourages further unhealthy behaviour:
It might encourage users to 'just push to master, if it breaks I get a bibisect
for free'. In other words it encourages sloppiness with direct untested pushes
to master.

> Linux box will have to ramp up too.. but that is usually not that much
> a problem.. cloud based stuff are fairly competitive for that need.
> So we can be more reactive with resource capacity for linux.

If we are aiming for having a commit tested on all platforms, it might make
sense to have tinderboxes only jump to the latest commit of master if there is
no commit tested on other platforms, but not yet on the platform of this
tinderbox. E.g. if a Windows tinderbox sees:

   mastercommit: untested on all platforms
   master^   commit: untested on all platforms
   master^^  commit: untested on all platforms
   master^^^ commit: green on windows, untested elsewhere

it would testbuild master^^^ to help gain knowledge about the newest commit
building everywhere. 

The important thing about the master-tested proposal is the following:

If you base your change on the head of the master-tested branch, you should
always be able get reliable and painfree per-commit/per-branch premerge testing
of your work. If you use per-commit/per-branch premerge testing of your work,
you should ~never be responsible for breaking CI for everyone[1]. You are in a
safe sandbox, you are never annoyed by others breaking master and you never
have to race to fix stuff because your change broke master for everyone.

If you a wild buckeroo who loves the excitement, you can still pull from master
and push to master without any CI. However, when you break master doing that,
_you_ are responsible that master-tested is struck, _you_ will be in 
firefighting
mode and _you_ are responsible for any mess that follows from that, e.g. by
follow-up cherry-picks. You will be on your own in this and those who prefer to
have their stuff tested (who are using master-tested) are shielded from the
damage you have done. The first to break master is responsible for all
follow-ups until it is fixed again on all platforms (and thus for CI).

In this thread, we are discussing getting more tests, while we in general fail
at a much more fundamental level: namely running the tests we already have
regularly. The above two models allow you to pick your poison, but unlike now,
it shields those who run proper tests from the damages of those dont. It thus
creates a balance: if those working directly on master get too reckless, more
people will switch to just base on master-tested and gerrit and leave the
madness to those few who prefer it. As such, this balance should create a 
virtuous
circle improving the quality for those working on master directly and for those
working on master-trusted. That is a stark contrast to the vicious circle we
experience right now[2].

> All that being said, none of that matter if the culture does not
> follow. no amount of CI can make people care.. what set the tone is
> the core developer group, the rest of us looks around how it is done
> and emulate the behavior.

As discussed above, I think there are some technical incentives to nudge the
culture in the right direction. Having an easy-to-pull and CI-verified-only
pull branch called 'master-tested' should help setting these.

Best,

Bjoern

[1] Modulo a rare cherry-picking to master applied, but broke in a subtile way
without causing a merge-conflict.
[2] Which is that 20-50% of the time, the extra effort you put into running
premerge CI tests, you are punished and frustrated by them failing because
of preexisting problems on master. There thus is ~no incentive to use
premerge CI.
__

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

[Mike Kaganski]

 sc/inc/externalrefmgr.hxx|7 ++
 sc/inc/formulacell.hxx   |3 ++
 sc/source/core/data/formulacell.cxx  |   18 +++
 sc/source/ui/docshell/externalrefmgr.cxx |   35 ++-
 4 files changed, 57 insertions(+), 6 deletions(-)

New commits:
commit 17282387d650e843e0f5a28611d91597ccd09970
Author: Mike Kaganski 
Date:   Thu Jun 4 06:47:38 2015 +1000

tdf#89972: also copy external reference status

fixes regression from commit 4467c67dc8bf17c67c70985c0d0ea64636884f9f,
where the new optimized code path failed to properly register
ScFormulaCell with ScExternalRefManager.
Introduces a new public method in ScExternalRefManager: insertRefCellAsTmpl
that registers a formula cell to listen to the same external references
as template cell
Introduces new property to ScFormulaCell: mbIsExtRef
that indicates that some external references are referenced by this cell

Also introduces new method ScExternalRefManager::hasCellExternalReference
(for use in unit test, will be posted immediately)

Change-Id: Iee07d7b51949fd31953b5fa662a213052eb85181
Reviewed-on: https://gerrit.libreoffice.org/16066
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 369066b..792c005 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -699,6 +699,12 @@ public:
 bool containsUnsavedReferences() const { return 
!maUnsavedDocShells.empty(); }
 
 void insertRefCell(sal_uInt16 nFileId, const ScAddress& rCell);
+/**
+ * Add a cell to reference the same files as the template cell.
+ */
+void insertRefCellFromTemplate( ScFormulaCell* pTemplateCell, 
ScFormulaCell* pCell );
+
+bool hasCellExternalReference(const ScAddress& rCell);
 
 void enableDocTimer( bool bEnable );
 
@@ -788,6 +794,7 @@ private:
  */
 void transformUnsavedRefToSavedRef( SfxObjectShell* pShell );
 
+void insertRefCell(RefCellMap::iterator& itr, ScFormulaCell* pCell);
 private:
 ScDocument* mpDoc;
 
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 8e84e00..66f4c9b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -143,6 +143,7 @@ private:
 boolbNeedListening : 1; // Listeners need to be re-established 
after UpdateReference
 boolmbNeedsNumberFormat : 1; // set the calculated number 
format as hard number format
 boolmbPostponedDirty : 1;   // if cell needs to be set dirty 
later
+boolmbIsExtRef   : 1; // has references in 
ScExternalRefManager; never cleared after set
 
 enum ScInterpretTailParameter
 {
@@ -426,6 +427,8 @@ public:
 void SyncSharedCode();
 
 bool IsPostponedDirty() const { return mbPostponedDirty;}
+
+void SetIsExtRef() { mbIsExtRef = true; }
 };
 
 #endif
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 33499ba..6352dce 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -608,6 +608,7 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const 
ScAddress& rPos ) :
 bNeedListening(false),
 mbNeedsNumberFormat(false),
 mbPostponedDirty(false),
+mbIsExtRef(false),
 aPos(rPos)
 {
 SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this);
@@ -638,7 +639,8 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const 
ScAddress& rPos,
 bNeedListening( false ),
 mbNeedsNumberFormat( false ),
 mbPostponedDirty(false),
-aPos( rPos )
+mbIsExtRef(false),
+aPos(rPos)
 {
 SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this);
 
@@ -672,7 +674,8 @@ ScFormulaCell::ScFormulaCell(
 bNeedListening( false ),
 mbNeedsNumberFormat( false ),
 mbPostponedDirty(false),
-aPos( rPos )
+mbIsExtRef(false),
+aPos(rPos)
 {
 SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this);
 assert(pArray); // Never pass a NULL pointer here.
@@ -721,7 +724,8 @@ ScFormulaCell::ScFormulaCell(
 bNeedListening( false ),
 mbNeedsNumberFormat( false ),
 mbPostponedDirty(false),
-aPos( rPos )
+mbIsExtRef(false),
+aPos(rPos)
 {
 SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this);
 
@@ -770,7 +774,8 @@ ScFormulaCell::ScFormulaCell(
 bNeedListening( false ),
 mbNeedsNumberFormat( false ),
 mbPostponedDirty(false),
-aPos( rPos )
+mbIsExtRef(false),
+aPos(rPos)
 {
 SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this);
 
@@ -801,7 +806,8 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, 
ScDocument& rDoc, cons
 bNeedListening( false ),
 mbNeedsNumberFormat( false ),
 mbPostponedDirty(false),
-aPos( rPos )
+mbIsExtRef(false),
+aPos(rPos)
 {
 SAL_INFO( "

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

[Mike Kaganski]

 sc/qa/unit/data/ods/external-ref-cache.ods |binary
 sc/qa/unit/helper/qahelper.cxx |   19 ++-
 sc/qa/unit/subsequent_filters-test.cxx |7 ++-
 3 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit b3566715c181913c8efa8b1bce8941a760748689
Author: Mike Kaganski 
Date:   Wed Jun 10 23:51:41 2015 +1000

tdf#89972: unit test: check proper external ref manager registration

depends on gerrit#16066

Change-Id: I3dde8acfbf0170d0c2cd3ef0b626f3b286922b65
Reviewed-on: https://gerrit.libreoffice.org/16210
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/qa/unit/data/ods/external-ref-cache.ods 
b/sc/qa/unit/data/ods/external-ref-cache.ods
index b83ba07..c4c1be8 100644
Binary files a/sc/qa/unit/data/ods/external-ref-cache.ods and 
b/sc/qa/unit/data/ods/external-ref-cache.ods differ
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 96307e1..654df89 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -591,21 +591,30 @@ ScDocShellRef ScBootstrapFixture::loadDoc(
 ScBootstrapFixture::ScBootstrapFixture( const OUString& rsBaseString ) : 
m_aBaseString( rsBaseString ) {}
 ScBootstrapFixture::~ScBootstrapFixture() {}
 
+namespace {
+OUString EnsureSeparator(const OUStringBuffer& rFilePath)
+{
+return (rFilePath.getLength() == 0) || (rFilePath[rFilePath.getLength() - 
1] != '/') ?
+OUString("/") :
+OUString("");
+}
+}
+
 void ScBootstrapFixture::createFileURL(
 const OUString& aFileBase, const OUString& aFileExtension, OUString& 
rFilePath)
 {
-OUString aSep("/");
 OUStringBuffer aBuffer( getSrcRootURL() );
-aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
-aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
+aBuffer.append(EnsureSeparator(aBuffer)).append(m_aBaseString);
+aBuffer.append(EnsureSeparator(aBuffer)).append(aFileExtension);
+
aBuffer.append(EnsureSeparator(aBuffer)).append(aFileBase).append(aFileExtension);
 rFilePath = aBuffer.makeStringAndClear();
 }
 
 void ScBootstrapFixture::createCSVPath(const OUString& aFileBase, OUString& 
rCSVPath)
 {
 OUStringBuffer aBuffer( getSrcRootPath());
-aBuffer.append(m_aBaseString).append("/contentCSV/");
-aBuffer.append(aFileBase).append("csv");
+aBuffer.append(EnsureSeparator(aBuffer)).append(m_aBaseString);
+
aBuffer.append(EnsureSeparator(aBuffer)).append("contentCSV/").append(aFileBase).append("csv");
 rCSVPath = aBuffer.makeStringAndClear();
 }
 
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index a110cb56..4ac4bf8 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include "externalrefmgr.hxx"
 
 
 #include 
@@ -2909,6 +2910,10 @@ void ScFiltersTest::testExternalRefCacheODS()
 CPPUNIT_ASSERT_EQUAL(OUString("text"), rDoc.GetString(ScAddress(1,2,0)));
 CPPUNIT_ASSERT_EQUAL(OUString("text"), rDoc.GetString(ScAddress(1,3,0)));
 
+// Both cells A6 and A7 should be registered with scExternalRefManager 
properly
+CPPUNIT_ASSERT_EQUAL(true, 
rDoc.GetExternalRefManager()->hasCellExternalReference(ScAddress(0, 5, 0)));
+CPPUNIT_ASSERT_EQUAL(true, 
rDoc.GetExternalRefManager()->hasCellExternalReference(ScAddress(0, 6, 0)));
+
 xDocSh->DoClose();
 }
 
@@ -3067,7 +3072,7 @@ void ScFiltersTest::testRefStringXLSX()
 }
 
 ScFiltersTest::ScFiltersTest()
-  : ScBootstrapFixture( "/sc/qa/unit/data" )
+  : ScBootstrapFixture( "sc/qa/unit/data" )
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Throw exceptions disabled temporarily disabled since 2002! (transactionManager.cxx)

[julien2412]

Hello,

Giving a try to https://bugs.documentfoundation.org/show_bug.cgi?id=91988, I
haven't reproduced the crash but had some warn logs.
Looking at the source, I read this:
256 // Help programmer to find
out, why this exception is thrown!
257 SAL_WARN( "fwk",
"TransactionManager...: Owner instance not correctly initialized yet. Call
was rejected! Normally it's an algorithm error ... wrong use of class!" );
258 //ATTENTION: temp. disabled
- till all bad code positions are detected and changed! */
259 // throw
css::uno::RuntimeException( "TransactionManager...\nOwner instance not right
initialized yet. Call was rejected! Normally it's an algorithm error ...
wrong usin of class!\n", css::uno::Reference< css::uno::XInterface >() );

The funny thing is:
julien@julienPC:~/compile-libreoffice/libreoffice$ git log --follow -S
'ATTENTION: temp. disabled'
framework/source/fwi/threadhelp/transactionmanager.cxx
commit 3642f95267df77a383e44cde754e2724e0a70733
Author: Andreas Schlüns 
Date:   Thu May 2 10:41:31 2002 +

#99021# fix static inline problem by outlining

2002!!?

There are other "throw" instructions disabled in this part, see
http://opengrok.libreoffice.org/xref/core/framework/source/fwi/threadhelp/transactionmanager.cxx#250

Should we enable them to get crashes and retrieve bugs early?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Throw-exceptions-disabled-temporarily-disabled-since-2002-transactionManager-cxx-tp4151175.html
Sent from the Dev mailing list archive at Nabble.com.
___
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' - editeng/source include/editeng svx/source

[matteocam]

 editeng/source/editeng/editeng.cxx  |5 +
 editeng/source/editeng/impedit.hxx  |2 +-
 editeng/source/editeng/impedit3.cxx |   16 ++--
 editeng/source/outliner/outliner.cxx|5 +
 include/editeng/editeng.hxx |1 +
 include/editeng/outliner.hxx|1 +
 svx/source/svdraw/svdotextdecomposition.cxx |   26 --
 7 files changed, 23 insertions(+), 33 deletions(-)

New commits:
commit c6391cf90e9885d4bf92d44733047f40c8ad5e18
Author: matteocam 
Date:   Wed Jun 10 16:09:59 2015 -0400

Checking overflowing and cutting text in impChainedTextDecomposition

Change-Id: I0d28e46770269e4703cec193d510036b8a036286

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 6aaf967..82881af 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2794,6 +2794,11 @@ void EditEngine::ClearOverflowingParaNum() {
 pImpEditEngine->ClearOverflowingParaNum();
 }
 
+bool EditEngine::IsPageOverflow() {
+pImpEditEngine->CheckPageOverflow();
+return pImpEditEngine->IsPageOverflow();
+}
+
 EFieldInfo::EFieldInfo()
 {
 pFieldItem = NULL;
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 578371d..9b8d675 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -737,7 +737,7 @@ public:
 const Size& GetMaxAutoPaperSize() const { return 
aMaxAutoPaperSize; }
 voidSetMaxAutoPaperSize( const Size& rSz )  { 
aMaxAutoPaperSize = rSz; }
 
-bool IsPageOverflow( const Size aCurPaperSize, const Size aPrevPaperSize ) 
const;
+bool IsPageOverflow( ) const;
 
 voidFormatDoc();
 voidFormatFullDoc();
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 6e06ac2..91c6d58 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -353,21 +353,9 @@ void ImpEditEngine::FormatFullDoc()
 FormatDoc();
 }
 
-bool ImpEditEngine::IsPageOverflow( const Size aCurPaperSize, const Size 
aPrevPaperSize ) const
+bool ImpEditEngine::IsPageOverflow( ) const
 {
-const bool bTextGrowX=(aStatus.GetControlWord() & 
EE_STAT_TEXTWIDTHCHANGED) !=0;
-const bool bTextGrowY=(aStatus.GetControlWord() & 
EE_STAT_TEXTHEIGHTCHANGED) !=0;
-
-const bool bPageExpansionX = ( aPrevPaperSize.Width() != 0 ) && // XXX
-( aCurPaperSize.Width() > aPrevPaperSize.Width() );
-const bool bPageExpansionY = ( aPrevPaperSize.Height() != 0 ) && // XXX
-( aCurPaperSize.Height() > aPrevPaperSize.Height() 
);
-
-// Has text size changed (in the right vertical direction) AND
-//  is this change an expansion?
-return ( bTextGrowY && !IsVertical() && bPageExpansionY ) ||
-   ( bTextGrowX && IsVertical() &&  bPageExpansionX );
-
+return mbNeedsChainingHandling;
 }
 
 void ImpEditEngine::FormatDoc()
diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 9e3e8f6..a4c285b 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -2089,6 +2089,11 @@ bool Outliner::HasParaFlag( const Paragraph* pPara, 
sal_uInt16 nFlag ) const
 return pPara && pPara->HasFlag( nFlag );
 }
 
+bool Outliner::IsPageOverflow()
+{
+return pEditEngine->IsPageOverflow();
+}
+
 NonOverflowingText *Outliner::GetNonOverflowingText() const
 {
 /* XXX:
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 1f9fafb..ede68be 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -604,6 +604,7 @@ public:
 sal_Int32 GetOverflowingParaNum() const;
 sal_Int32 GetOverflowingLineNum() const;
 void ClearOverflowingParaNum();
+bool IsPageOverflow();
 };
 
 #endif // INCLUDED_EDITENG_EDITENG_HXX
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 0105caf3..76f0157 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -763,6 +763,7 @@ public:
 NonOverflowingText *GetNonOverflowingText() const;
 OverflowingText *GetOverflowingText() const;
 void ClearOverflowingParaNum();
+bool IsPageOverflow();
 
 virtual voidDepthChangedHdl();
 voidSetDepthChangedHdl(const Link& 
rLink){aDepthChangedHdl=rLink;}
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index dfaa1d8..3e9e262 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1605,22 +1605,6 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
 
 // Text
 const OutlinerParaObject* pOutlinerParaObject = 
rSdrChainedTextPrimitive.getSdrText()->GetOutlinerParaObject();
-
-// FIXME
-  

Re: Looking for help for clipboard in Math

[Regina Henschel]

Hi Michael,

a short status report:

Michael Stahl schrieb:

On 06.06.2015 22:03, Regina Henschel wrote:

Hi Michael,

thank-you for looking at my problems.

Michael Stahl schrieb:

On 05.06.2015 01:44, Regina Henschel wrote:

Hi all,

I struggle with the clipboard. My goal is to import MathML in module
Math from clipboard, similar as it is imported from file. But I'm stuck.
Therefore some questions:

[skipped a lot of text]

Helpful comments. Looking around I think, the connection to the OS is
done in /main/dtrans/source/win32/

I have found the table m_TranslTable, which refers the SOT_FORMATSTR_IDs
from exchange.cxx. I'll try what happens, when I add the MathML format
there too. I had already added it in exchange.cxx, but that was not
enough to be recognized. [I need some time for that. I will report back,
when I have finished.]


that sounds plausible.



I have added the MathML format to m_TranslTable and now I get the 
clipboard content. In addition I have added debug outputs for MimeType 
and HumanPresentableName.


With all that I see:

The MathML-content from Microsoft MathInputPanel can be detected in 
clipboard and the stream contains a complete MathML content, so if saved 
to file it would result in a valid MathML file.


The same is true for copying an equation from Microsoft Word 2010. Among 
15 detected clipboard formats, I can get the correct one by using the 
new introduced SOT_FORMATSTR_ID.


The clipboard format from MathCast is not a real MathML content, but it 
is MimeType = text/plain;charset=windows1252 and HumanPresentableName = 
OEM/ANSI Text. So importing that is a different problem and has to wait 
until the import of valid MathML is successful.


For your tips about XML-parsing I need some more time.

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

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

[Jesús Corrius]

 configure.ac |   37 +++--
 1 file changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 85f75042f6d62bf3da182311c4396392d9730521
Author: Jesús Corrius 
Date:   Wed May 6 13:17:14 2015 +0200

Add very initial support for Visual Studio 2015

The new compiler is not detected automatically yet.
You have to use --with-visual-studio=2015 to enable it.

Change-Id: I0ef8cda7b2d99389b39fd7f8c2e142453ced99ed
Reviewed-on: https://gerrit.libreoffice.org/15644
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/configure.ac b/configure.ac
index cdef0fe..d214864 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2028,25 +2028,24 @@ AC_ARG_WITH(
 [with_doxygen=yes])
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=2013],
+AS_HELP_STRING([--with-visual-studio=<2013/2015>],
 [Specify which Visual Studio version to use in case several are
- installed. If not specified, the order of preference is 2013 
(including
- Express editions). Not very useful at the moment, as currently only
- 2013 is supported, anyway.])
+ installed. If not specified, only 2013 is detected automatically
+ because 2015 support is currently experimental.])
 [
-  Usage: --with-visual-studio=2013
+  Usage: --with-visual-studio=<2013/2015>
 ],
 ,)
 
 AC_ARG_WITH(windows-sdk,
-AS_HELP_STRING([--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)>],
+AS_HELP_STRING([--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)/10>],
 [Specify which Windows SDK, or "Windows Kit", version to use
  in case the one that came with the selected Visual Studio
  is not what you want for some reason. Note that not all compiler/SDK
  combinations are supported. The intent is that this option should not
  be needed.])
 [
-  Usage: --with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)>
+  Usage: 
--with-windows-sdk=<7.1(A)/8.0(A)/8.1(A)/10>
 ],
 ,)
 
@@ -3392,6 +3391,8 @@ map_vs_year_to_version()
 case $1 in
 2013)
 vsversion=12.0;;
+2015)
+vsversion=14.0;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -3415,7 +3416,7 @@ vs_versions_to_check()
 
 find_msvs()
 {
-# Find Visual Studio 2013
+# Find Visual Studio 2013/2015
 # Args: $1 (optional) : versions to check, in the order of preference
 # Return value: $vstest
 
@@ -3439,7 +3440,7 @@ find_msvs()
 
 find_msvc()
 {
-# Find Visual C++ 2013
+# Find Visual C++ 2013/2015
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
 
@@ -3466,6 +3467,10 @@ find_msvc()
 vcyear=2013
 vcnum=120
 ;;
+14.0)
+vcyear=2015
+vcnum=140
+;;
 esac
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$vcnumwithdot/Setup/VC/ProductDir
 if test -n "$regvalue" -a "$regvalue" = "$vctest" ; then
@@ -3486,7 +3491,7 @@ if test "$_os" = "WINNT"; then
 if test -n "$with_visual_studio"; then
 AC_MSG_ERROR([No Visual Studio $with_visual_studio 
installation found])
 else
-AC_MSG_ERROR([No Visual Studio 2013 installation found])
+AC_MSG_ERROR([No Visual Studio 2013/2015 installation found])
 fi
 fi
 
@@ -3615,6 +3620,10 @@ if test "$_os" = "WINNT"; then
 COMEX=15
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.1A 8.1 8.0 7.1A"
 ;;
+140)
+COMEX=19
+WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0A 8.1A 8.1 8.0 7.1A"
+;;
 esac
 
 # The expectation is that --with-windows-sdk should not need to be 
used
@@ -5163,6 +5172,14 @@ find_winsdk_version()
 return
 fi
 ;;
+10)
+reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows 
Kits/Installed Roots/KitsRoot10"
+if test -n "$regvalue"; then
+winsdktest=$regvalue
+winsdklibsubdir=10.0.10056.0
+return
+fi
+;;
 esac
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: test-infra proposal: master-tested branch (was: test infrastructure ideas appreciated ...)

[Norbert Thiebaud]

On Wed, Jun 10, 2015 at 8:04 AM, Bjoern Michaelsen
 wrote:
> Hi,
> As such, here is one idea for infrastructure:
> - Create a branch master-tested

We can get all that merely with git-notes I think.
iow instead of a separate brnch, just annotate or even maiybe maintain
a tag on master
to indicate the last 'green master' in the sens you gave.

Today the jenkins tinderbox operate like their ancestor: they jump
around moving forward.. but not every commit get built.
and since they are not all in sync it is hard to garantee that you
will find a given commit that has been validated for all conf.
_but_ with more hardware comming online, I want to move to a more
'bibisect build model' where _every commit get built.
then I can have a matrix job so that we know the overall result of the
build of a given commit for all configs..
like we do for gerrit today.
and when a given commit will ge found all-green we annotate it as such
in git notes
(git notes is more flexible than a tag, because that allow us to do
the build somewhat out-of-order without pain,
for instance to allow 2 or more 'set' of builder to work side by
side.. each set move forward so can do incremental, but that means
that
they can _report_ out of order... so managing a tag would be extra pain.

regular fast turn around tinderbox would still be in the mix to have
quick alert of a breaker on a given platform

TDF is beefing up the infrastructure.. we have 2 nice and beefy 1U
that are on purchase order that will become windows builder.
We are consolidating owned and lent MAC resources to improve network
bandwidth and stability, but I intend to push for the purchase of
MacPro.
(I got one myself and it perform quite well.. to the point that it is
cost-effective compared to mac mini, especially the more recent
models)
Linux box will have to ramp up too.. but that is usually not that much
a problem.. cloud based stuff are fairly competitive for that need.
So we can be more reactive with resource capacity for linux.

The one thing that everybody can pitch in to help is this:

There are 3 kind of failure in ci:

- a user induced one (that are the one we are looking for): a change
that make something not build or fail test(s)
- a infra induced one: the slave bot misbehave for some reason, are
fails despite the fact there is nothing wrong really. For these I try
to have them repported as 'unstable' rather then 'Fails'
as much as possible...
- a test auto-induced one: when a test is unstable and produce random
failures based on circumstances... the infamous 'heisenbugs'
and heisenbug can be a systemic/design problem or can be a real bug
that is hard to trigger. either way these are not useful, and in fact
harmful in a ci context; because the human nature is 'If you can't
reproduce it is not a bug'
so the later category of real hard to trigger bug is always labeled
'systemic error' and ignored anyway... and it make people numb to
errors...
For automated testing, trust is paramount: heisenbug test failure are
the enemy, false non-failure is bad but actually less painful

Today we have different categories of tests but mostly based on
time-to-run versus 'stability'
what I would like to see is a 'ci' target in which we had all the
tests that _shall_ and _will_ pass unless there is a code bug, no
exceptions.
Of course time-to-run is important, but that is not the first
criteria. time-to-run can be mitigated relatively easily with 'money'
but stability and trust in CI cannot.

If and when we have the nice-to-have problem of having so many test
that it becomes impractical to run them all all-the-time, we'll
conceive a 2/3 staged approach
where we still get a fast turn around for run of the mills problems,
and then deeper testing at a lower frequency.


All that being said, none of that matter if the culture does not
follow. no amount of CI can make people care.. what set the tone is
the core developer group, the rest of us looks around how it is done
and emulate the behavior.
So we really need the core group of developer to lead by example wrt
to taking the state of master seriously... that include for instance
the fire and forget 'one-liner that can't possibly break anything' on
Friday 5pm..
That include pro-actively revert-fix-resubmit stuff, when a breakage
is not obvious... that include use gerrit more, especially for stuff
that are not super time sensitive... iow does it really matter if this
patch land in 5 hours or tomorrow rather than right now ? There is no
hard and fast rule for that that would be flexible enough to
accommodate real-world situations... but the only alternative to
self-best-effort are pretty much black-and-white all-or-nothing
machine enforced rules.. which is really not desirable.


PS: just to give an idea about the state of master. I built recently
bibisect for windows covering the 5.0 dev period.. iow from the
libreoffice-4-4-branch-point to the current head of the
libreoffice-5-0 branch
that covered 10820 commits of which 2168 where not _bu

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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 8157aeab46e3bf0afd3f71c3946518826a1dd793
Author: matteocam 
Date:   Wed Jun 10 14:50:53 2015 -0400

Experiment: cutting paras from impDecomposeChainedText

Change-Id: Ic2d013b9f3d986b7c4bf95a5ada46db16c7e1e3d

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index fdb85f9..dfaa1d8 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1586,6 +1586,7 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
 // prepare outliner
 const SfxItemSet& rTextItemSet = 
rSdrChainedTextPrimitive.getSdrText()->GetItemSet();
 SdrOutliner& rOutliner = ImpGetDrawOutliner();
+
 SdrTextVertAdjust eVAdj = GetTextVerticalAdjust(rTextItemSet);
 SdrTextHorzAdjust eHAdj = GetTextHorizontalAdjust(rTextItemSet);
 const sal_uInt32 nOriginalControlWord(rOutliner.GetControlWord());
@@ -1601,8 +1602,27 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
 // add one to rage sizes to get back to the old Rectangle and outliner 
measurements
 const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 
1L));
 const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1L));
+
+// Text
 const OutlinerParaObject* pOutlinerParaObject = 
rSdrChainedTextPrimitive.getSdrText()->GetOutlinerParaObject();
+
+// FIXME
+// Experiment: cutting all paragraphs after first (if any)
+rOutliner.SetText(*pOutlinerParaObject);
+pOutlinerParaObject = rOutliner.CreateParaObject(0,1);
+
+
+
+// FIXME(matteocam)
+// Experiment: setting only the non overflowing text
+// Question: XXX: How do you know there is an overflow in the first place 
here??
+// Question: what is the page size set at the end of these procedure. Is 
the "real" text size anywhere?
+
+// Sub-experiment: removing the second paragraph if present
+
+
 OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with 
no OutlinerParaObject (!)");
+
 const bool bVerticalWritintg(pOutlinerParaObject->IsVertical());
 const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 sw/source/core/crsr/viscrs.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 533a5fdad3854b89a252216bb78a38ba3222964b
Author: Henry Castro 
Date:   Wed Jun 10 14:16:09 2015 -0400

Revert sw: LOK_CALLBACK_CURSOR_VISIBLE callback.

Already fixed by Miklos Vajna.

Change-Id: I848f2296c5f5a4d250308ed3a851c46524181340

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 7241185..38cb79e 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -90,10 +90,7 @@ void SwVisCrsr::Show()
 
 // display at all?
 if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) || 
m_pCrsrShell->isTiledRendering() )
-{
-m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, 
OString::boolean(true).getStr());
 _SetPosAndShow();
-}
 }
 }
 
@@ -105,9 +102,6 @@ void SwVisCrsr::Hide()
 
 if( m_aTextCrsr.IsVisible() )  // Shouldn't the flags be in effect?
 m_aTextCrsr.Hide();
-
-if( m_pCrsrShell->isTiledRendering() )
-m_pCrsrShell->libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, 
OString::boolean(false).getStr());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 android/source/res/values/strings.xml  
|4 +
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java 
|8 +-
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java 
|   27 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 78ecdbc2f69b9d812cf879f662e7c1277d3c9b07
Author: Jacobo Aragunde Pérez 
Date:   Tue Feb 10 16:17:12 2015 +

Android: improve error handling in ownCloud provider.

This provider now throws exceptions with properly internationalized
messages to be shown to the user.

Change-Id: I0464bffe14cab24d50180cb5e2e62ce746bcba74
Reviewed-on: https://gerrit.libreoffice.org/16197
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index d2970b2..94ba49f 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -49,6 +49,10 @@
 Local file system
 ownCloud
 
+Cannot connect to ownCloud 
server. Check your configuration.
+Cannot log into ownCloud server. 
Check your configuration.
+Unspecified error connecting to 
ownCloud server. Check your configuration and/or try later.
+
 
 Bold
 Underline
diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
index a8d1a06..ce10ab6 100644
--- a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
+++ b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
@@ -69,8 +69,7 @@ public class OwnCloudFile implements IFile {
 RemoteOperationResult result = refreshOperation.execute(provider
 .getClient());
 if (!result.isSuccess()) {
-throw new RuntimeException(result.getLogMessage(),
-result.getException());
+throw 
provider.buildRuntimeExceptionForResultCode(result.getCode());
 }
 for (Object obj : result.getData()) {
 RemoteFile child = (RemoteFile) obj;
@@ -104,7 +103,10 @@ public class OwnCloudFile implements IFile {
 File downFolder = provider.getCacheDir();
 DownloadRemoteFileOperation operation = new 
DownloadRemoteFileOperation(
 file.getRemotePath(), downFolder.getAbsolutePath());
-operation.execute(provider.getClient());
+RemoteOperationResult result = operation.execute(provider.getClient());
+if (!result.isSuccess()) {
+throw 
provider.buildRuntimeExceptionForResultCode(result.getCode());
+}
 return new File(downFolder.getAbsolutePath() + file.getRemotePath());
 }
 
diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
index 827c0af..66e4633 100644
--- 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
@@ -18,6 +18,7 @@ import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
 import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import 
com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
@@ -78,8 +79,7 @@ public class OwnCloudProvider implements IDocumentProvider,
 uri.getPath());
 RemoteOperationResult result = refreshOperation.execute(client);
 if (!result.isSuccess()) {
-throw new RuntimeException(result.getLogMessage(),
-result.getException());
+throw buildRuntimeExceptionForResultCode(result.getCode());
 }
 if (result.getData().size() > 0) {
 return new OwnCloudFile(this, (RemoteFile) 
result.getData().get(0));
@@ -113,6 +113,29 @@ public class OwnCloudProvider implements IDocumentProvider,
 }
 
 /**
+ * Build the proper RuntimeException for some error result.
+ *
+ * @param code Result code got from some RemoteOperationResult.
+ * @return exception with the proper internationalized error message.
+ */
+protected RuntimeException buildRuntimeExceptionForResultCode(ResultCode 
code) {
+int errorMessage;
+switch (code) {
+case WRONG_CONNECTION:  // SocketException
+case FILE_NOT_FOUND:// HTTP 404
+errorMessage = R.string.owncloud_wrong_connection;

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

[Jacobo Aragunde Pérez]

 android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java   
   |   14 +++
 
android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
 |   27 ++
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java 
   |   42 --
 3 files changed, 77 insertions(+), 6 deletions(-)

New commits:
commit f8a4e1aab608538567562d97e6da60f015337c47
Author: Jacobo Aragunde Pérez 
Date:   Mon Feb 9 20:20:11 2015 +0100

Android: document providers listen to changes in preferences.

With this patch, document providers are able to listen to changes in
their preferences and update their internal state accordingly. Now
ownCloud provider can see its server updated without restarting the
application.

Change-Id: I833c7ec9fc97be58bdc8ac2cbf4384a33c2b400e
Reviewed-on: https://gerrit.libreoffice.org/16196
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java
index 3d462e6..612eaa6 100644
--- 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java
+++ 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java
@@ -9,11 +9,15 @@
 
 package org.libreoffice.storage;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.libreoffice.storage.local.LocalDocumentsDirectoryProvider;
 import org.libreoffice.storage.local.LocalDocumentsProvider;
 import org.libreoffice.storage.owncloud.OwnCloudProvider;
 
 import android.content.Context;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 
 /**
  * Keeps the instances of the available IDocumentProviders in the system.
@@ -103,4 +107,14 @@ public final class DocumentProviderFactory {
 public IDocumentProvider getDefaultProvider() {
 return providers[0];
 }
+
+public Set getChangeListeners() {
+Set listeners =
+new HashSet();
+for (IDocumentProvider provider : providers) {
+if (provider instanceof OnSharedPreferenceChangeListener)
+listeners.add((OnSharedPreferenceChangeListener) provider);
+}
+return listeners;
+}
 }
diff --git 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
index d17fe51..e98534a 100644
--- 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
+++ 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
@@ -9,11 +9,15 @@
 
 package org.libreoffice.storage;
 
+import java.util.Set;
+
 import org.libreoffice.R;
 
 import android.app.Activity;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
 
 public class DocumentProviderSettingsActivity extends Activity {
 
@@ -21,6 +25,8 @@ public class DocumentProviderSettingsActivity extends 
Activity {
 public static final String KEY_PREF_OWNCLOUD_USER_NAME = "pref_user_name";
 public static final String KEY_PREF_OWNCLOUD_PASSWORD = "pref_password";
 
+private Set listeners;
+
 @Override
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
@@ -30,6 +36,27 @@ public class DocumentProviderSettingsActivity extends 
Activity {
 .replace(android.R.id.content, new 
SettingsFragment()).commit();
 }
 
+@Override
+protected void onResume() {
+super.onResume();
+
+listeners = DocumentProviderFactory.getInstance().getChangeListeners();
+for (OnSharedPreferenceChangeListener listener : listeners) {
+PreferenceManager.getDefaultSharedPreferences(this)
+.registerOnSharedPreferenceChangeListener(listener);
+}
+}
+
+@Override
+protected void onPause() {
+super.onPause();
+
+for (OnSharedPreferenceChangeListener listener : listeners) {
+PreferenceManager.getDefaultSharedPreferences(this)
+.unregisterOnSharedPreferenceChangeListener(listener);
+}
+}
+
 public static class SettingsFragment extends PreferenceFragment {
 @Override
 public void onCreate(Bundle savedInstanceState) {
diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
index a94e1ad..827c0af 100644
--- 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
@@ -10,6 +10,7 @@ import org.libreoffi

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

[Jacobo Aragunde Pérez]

 android/source/res/menu/view_menu.xml |2 ++
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |5 
+
 2 files changed, 7 insertions(+)

New commits:
commit ba44368da5933040080da611aa1722491f89df69
Author: Jacobo Aragunde Pérez 
Date:   Mon Feb 9 14:10:29 2015 +0100

Android: add menu entry for document provider settings

Change-Id: Ic48275fe2e7d83fd5e77171f4f5740a527dec7e2
Reviewed-on: https://gerrit.libreoffice.org/16195
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git a/android/source/res/menu/view_menu.xml 
b/android/source/res/menu/view_menu.xml
index 32825b5..b89ff30 100644
--- a/android/source/res/menu/view_menu.xml
+++ b/android/source/res/menu/view_menu.xml
@@ -10,6 +10,8 @@
   android:title="@string/menu_sort_az"/>
 
+
 
diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 76842ec..a8f4276 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -53,6 +53,7 @@ import org.libreoffice.LibreOfficeMainActivity;
 import org.libreoffice.R;
 import org.libreoffice.SettingsActivity;
 import org.libreoffice.storage.DocumentProviderFactory;
+import org.libreoffice.storage.DocumentProviderSettingsActivity;
 import org.libreoffice.storage.IDocumentProvider;
 import org.libreoffice.storage.IFile;
 
@@ -461,6 +462,10 @@ public class LibreOfficeUIActivity extends 
ActionBarActivity implements ActionBa
 case R.id.action_settings:
 startActivity(new Intent(getApplicationContext(), 
SettingsActivity.class));
 return true;
+case R.id.menu_storage_preferences:
+startActivity(new Intent(this, 
DocumentProviderSettingsActivity.class));;
+break;
+
 default:
 return super.onOptionsItemSelected(item);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 
android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
 |5 ++
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java 
   |   19 +++---
 2 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 79f5d4465c7a2446f3d54bca56f9987f322d59e8
Author: Jacobo Aragunde Pérez 
Date:   Mon Feb 9 14:04:59 2015 +0100

Android: setup ownCloud provider with user-defined settings

Change-Id: I4ad4dd12854ca9f332055a50131959f60f7da504
Reviewed-on: https://gerrit.libreoffice.org/16194
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
index bb04855..d17fe51 100644
--- 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
+++ 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
@@ -16,6 +16,11 @@ import android.os.Bundle;
 import android.preference.PreferenceFragment;
 
 public class DocumentProviderSettingsActivity extends Activity {
+
+public static final String KEY_PREF_OWNCLOUD_SERVER = "pref_server_url";
+public static final String KEY_PREF_OWNCLOUD_USER_NAME = "pref_user_name";
+public static final String KEY_PREF_OWNCLOUD_PASSWORD = "pref_password";
+
 @Override
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
index db2b698..a94e1ad 100644
--- 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
@@ -4,11 +4,14 @@ import java.io.File;
 import java.net.URI;
 
 import org.libreoffice.R;
+import org.libreoffice.storage.DocumentProviderSettingsActivity;
 import org.libreoffice.storage.IDocumentProvider;
 import org.libreoffice.storage.IFile;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.net.Uri;
+import android.preference.PreferenceManager;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
@@ -26,12 +29,20 @@ public class OwnCloudProvider implements IDocumentProvider {
 private OwnCloudClient client;
 private File cacheDir;
 
-// TODO: these must be configurable
-final private String serverUrl = "http://10.0.2.2/owncloud";; //emulator 
host machine
-final private String userName = "admin";
-final private String password = "admin";
+private String serverUrl;
+private String userName;
+private String password;
 
 public OwnCloudProvider(Context context) {
+// read preferences
+SharedPreferences preferences = 
PreferenceManager.getDefaultSharedPreferences(context);
+serverUrl = preferences.getString(
+DocumentProviderSettingsActivity.KEY_PREF_OWNCLOUD_SERVER, "");
+userName = preferences.getString(
+DocumentProviderSettingsActivity.KEY_PREF_OWNCLOUD_USER_NAME, 
"");
+password = preferences.getString(
+DocumentProviderSettingsActivity.KEY_PREF_OWNCLOUD_PASSWORD, 
"");
+
 Uri serverUri = Uri.parse(serverUrl);
 client = OwnCloudClientFactory.createOwnCloudClient(serverUri,
 context, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jacobo Aragunde Pérez]

 android/source/AndroidManifest.xml.in  
   |8 ++
 android/source/res/values/strings.xml  
   |8 ++
 android/source/res/xml/documentprovider_preferences.xml
   |   26 +++
 
android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
 |   37 ++
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java  
   |3 
 5 files changed, 82 insertions(+)

New commits:
commit d5c9d1dec60085f97eb07402eefcc3fd7a989877
Author: Jacobo Aragunde Pérez 
Date:   Mon Feb 9 12:37:46 2015 +0100

Android: settings activity for document providers

Creates an activity to manage the settings of any document provider
that needs them, and populated it with the settings required by the
ownCloud implementation.

The settings screen is not yet plugged to the document browser UI but
can be launched with this command:

  adb shell am start -a android.intent.action.MAIN \
  -n org.libreoffice/.storage.DocumentProviderSettingsActivity

Change-Id: I83cff641fa61078f2bddbb98262af989c06985a9
Reviewed-on: https://gerrit.libreoffice.org/16193
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git a/android/source/AndroidManifest.xml.in 
b/android/source/AndroidManifest.xml.in
index 06b8089..b459182 100644
--- a/android/source/AndroidManifest.xml.in
+++ b/android/source/AndroidManifest.xml.in
@@ -106,6 +106,14 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index d978413..d2970b2 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -57,4 +57,12 @@
 Show keyboard
 Save
 
+
+Storage provider settings
+ownCloud settings
+Server URL
+URL and port of the ownCloud 
server.
+User name
+Password
+
 
diff --git a/android/source/res/xml/documentprovider_preferences.xml 
b/android/source/res/xml/documentprovider_preferences.xml
new file mode 100644
index 000..a359d14
--- /dev/null
+++ b/android/source/res/xml/documentprovider_preferences.xml
@@ -0,0 +1,26 @@
+
+
+http://schemas.android.com/apk/res/android";>
+
+http://"; />
+
+
+
+
diff --git 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
new file mode 100644
index 000..bb04855
--- /dev/null
+++ 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderSettingsActivity.java
@@ -0,0 +1,37 @@
+/* -*- 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/.
+ */
+
+package org.libreoffice.storage;
+
+import org.libreoffice.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+public class DocumentProviderSettingsActivity extends Activity {
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+// Display the fragment as the main content.
+getFragmentManager().beginTransaction()
+.replace(android.R.id.content, new 
SettingsFragment()).commit();
+}
+
+public static class SettingsFragment extends PreferenceFragment {
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+
+// Load the preferences from an XML resource
+addPreferencesFromResource(R.xml.documentprovider_preferences);
+}
+}
+}
diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 7ac40e4..76842ec 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -108,7 +108,10 @@ public class LibreOfficeUIActivity extends 
ActionBarActivity implements ActionBa
 DocumentProviderFactory.initialize(this);
 documentProviderFactory = DocumentProviderFactory.getInstance();
 
+PreferenceManager.setDefaultValues(this, 
R.xml.documentprovider_preferences, false);
+
 readPreferences();
+
 // init UI and populate with contents from the provider
 createUI();
 switchToDocumentProvider(documentProviderFactory.getDefaultProvider());
___
Libreoffic

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

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.2' created by Christian Lohmaier 
 at 2015-06-10 18:09 -0700

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

iQIcBAABAgAGBQJVeG89AAoJEPQ0oe+v7q6jwpgQAJ+RenQM2FfYJWQstZrs28pc
cGLYDUQFDYqVsssBKE/UcXvC4Jbd7OMHK2tEdyqihYkVoAT+21F7YPpdMubezurY
95E9VXKrVwpD782+3xn9sXSHz8+tY2BkoMT66bdjm3b0+i3klan3AjJWGBrlKygO
crNyd9Qu17wtbq8Seyq9WS7inrxLYak2IphbnqJqZ6R9YwMHFskmItMcAP0+Apnc
tq+O5cgVnvQKvbMvMhDri393BkC8787jVF+aHZarhiBWijJXWCsWx4itzzScJauD
wcGCjTsV0QnQsmPo8SZROviytp8H9pxKy58TrdX9X1sJtdHexTh4CJRUQ83LQb6n
QtgYguoCRWQpaPJ6oXSxYfNh1X2Anr5+7aC83nJzoMi0QtixWfib1Dy/wNOt3ZKd
5VzIjA4cLzFRxYgluw/YFtoeAm10Wm9FAE461htahSPW5mJOCS6+ubHSUXtyzumc
hnTnd+guOwsfipGB0VhzPuipwntElwdNeUCbP0h4EDOCWoe+oxmNGoYgW3G9T3F2
6INBHgG5/kQd2t1iJ7k3glanlDLTAJlo7uaeBLJo/XVf9tJ3LMFBv3q54gyypiKW
WoguVGFNGz0yDmxYEoFKzuNLzizduunbH/wI2Gf0fiIsGisCyLzy2SvjDufeHXWO
Fwspn6B1wTZ0vIyCpn2e
=2NZT
-END PGP SIGNATURE-

Changes since cp-4.4-branch-point-213:
---
 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 8bc7e6af135d7201681c456c24439f64a4bec054
Author: Christian Lohmaier 
Date:   Wed Jun 10 19:10:23 2015 +0200

bump product version to 4.4.4.2.0+

Change-Id: I99a8df3d3a6b7a7062f49588f687c8685c335012

diff --git a/configure.ac b/configure.ac
index 717424c..878f59c 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.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.4.2.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] help.git: Changes to 'refs/tags/libreoffice-4.4.4.2'

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.2' created by Christian Lohmaier 
 at 2015-06-10 18:09 -0700

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

iQIcBAABAgAGBQJVeG82AAoJEPQ0oe+v7q6j7l4QAIP9Dn0dCkQ58v8CpOis6G1y
LjdgFJw0izRWW3Gl1PHodsj6Q91ij99SBcZpaJ+GcjZzLjhUP/I27P9eZ+bIF11A
fnK2/jcq8zolmL1NCJUE6LUZzhHlsFyT003JLUun2OvE3ORCIWNdLEu3ftnhDZd4
QCk8ur0oykFM2ICWMMyNRE16cbv9LGjerzJSztqDFf1hFAY05ogtRqhUOIac5+Cc
XQhKUgudDlPqNdHcgxXTxZaizLupfcUvc+BYSaJDkWZ7FuEZ3DcAPSkKdruPN7BA
kYmAc4rkgxTsaYGl0aGG2UaBVOTYZtqd/Jcy+Zy2IzW6A5GkQQ7c6IOEz26FRWNl
T+AlV16bTk6PLGlyM2diy9UYL3l3WRDsjA97ht/Lw8hFuDpPUliRLKGJ0o+jWRBk
DlPonP/Yrn4afJYqaupOQYoEUkHwJVkdKkWhXEroildmNIFJgfQlKft2ld7vy1Ka
2JLXIUsLo+K8/NDVfprID/Th11DNJfYBlC0pkDibjPvBKJEQSdZRMp0EPtpzN16M
ntsBQJyRUFpTYsw+8rOoJFZcVQ5esFFQFjMb8T7BSzzXbH7ZF+6FV6icgafB6HuA
ie+g71+kXn6t5XstrxrUdXneXpvqb7x3VmXsCg77KtV1tDViWviGNWe55AbfXt4W
/EHkgKNT0Mw1nw5HO+jz
=McXa
-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.2'

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.2' created by Christian Lohmaier 
 at 2015-06-10 18:09 -0700

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

iQIcBAABAgAGBQJVeG86AAoJEPQ0oe+v7q6jG18QAJFpNRfAlzswFl3aBhLLxcYI
0yXBQra9QlkfRwnijwg0Xk4Iaz7Di0FJDdvtkI1Gxs+Bw3N3fgPzxnQU9VkyzGH2
vHoH6QU+TG99z5spG6Bzhh9z7bfUThB27QRhx4qtTULvcrPK/xeCI9ET6xxxQ/vt
5dJtSUOFQVcZ1IGm/tEUn34yuAGW1AVhHNrzWPABGT5E2Iqigq4ZvpmJeaNOoyXD
maSbdyyC/g9IncoePXVyQQyatQiTIOWoi6FH+pg7LL0jggQSRbqQQNTTdRQ+ZGwD
jSQcmYN83CtaWv7L4DRmt4YlS+cOLvct5SIUOWlOffOiJPYm1240Swy99KKuJtxv
wrURPG8kKDE/8gX7seP02IYyPDIMxCpZanf/H9dXBT7YhJf8OOGHKDnoHmeEuxhd
RRukeC0g34FU9wJz0obOssxmN65+dZD+cHJMQzp8uNZWgE93+YFOi5Cil8fYRkrv
HX/F/mV1hG8orXAiT4OsfaS+wFOZvRC/HyrSBm0I8RRoXwoXvM89ulhOgOUyTDYu
7L68g/78XTV5auhgostmVQ3GKvEuS+dKBIPm0LmeAxZODLTTe36qP5MdNORuFEZb
tvtXLOJI0x//IRBzaQezOepkQBuFQkPZHQ22PAsoctpcX+mxt13CTLqbLTijHQ0Z
AviBx3G8UjcOBsRjLeV/
=KcbH
-END PGP SIGNATURE-

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

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

[Jacobo Aragunde Pérez]

 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java 
|   11 ++-
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java 
|   32 ++
 2 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit d6f9e415375f53eba7c5e147c7ff30c03a6db731
Author: Jacobo Aragunde Pérez 
Date:   Tue Jan 27 12:44:42 2015 +

Android: download documents from ownCloud.

Documents are downloaded to the private cache directory of the app,
and opened from there. That directory is cleared and created again
every time the application starts up.

Change-Id: I5c05c8ae750b6ced3b419c67d84063e8ee3d84aa
Reviewed-on: https://gerrit.libreoffice.org/16192
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
index 8e6d6cf..a8d1a06 100644
--- a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
+++ b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
@@ -10,6 +10,7 @@ import java.util.List;
 import org.libreoffice.storage.IFile;
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.DownloadRemoteFileOperation;
 import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
 import com.owncloud.android.lib.resources.files.RemoteFile;
 
@@ -97,8 +98,14 @@ public class OwnCloudFile implements IFile {
 
 @Override
 public File getDocument() {
-// TODO Auto-generated method stub
-return null;
+if (isDirectory()) {
+return null;
+}
+File downFolder = provider.getCacheDir();
+DownloadRemoteFileOperation operation = new 
DownloadRemoteFileOperation(
+file.getRemotePath(), downFolder.getAbsolutePath());
+operation.execute(provider.getClient());
+return new File(downFolder.getAbsolutePath() + file.getRemotePath());
 }
 
 @Override
diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
index 7bd78e3..db2b698 100644
--- 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
@@ -1,5 +1,6 @@
 package org.libreoffice.storage.owncloud;
 
+import java.io.File;
 import java.net.URI;
 
 import org.libreoffice.R;
@@ -23,6 +24,7 @@ import com.owncloud.android.lib.resources.files.RemoteFile;
 public class OwnCloudProvider implements IDocumentProvider {
 
 private OwnCloudClient client;
+private File cacheDir;
 
 // TODO: these must be configurable
 final private String serverUrl = "http://10.0.2.2/owncloud";; //emulator 
host machine
@@ -36,6 +38,13 @@ public class OwnCloudProvider implements IDocumentProvider {
 client.setCredentials(OwnCloudCredentialsFactory.newBasicCredentials(
 userName, password));
 
+// make sure cache directory exists, and clear it
+// TODO: probably we should do smarter cache management
+cacheDir = new File(context.getCacheDir(), "ownCloud");
+if (cacheDir.exists()) {
+deleteRecursive(cacheDir);
+}
+cacheDir.mkdirs();
 }
 
 @Override
@@ -73,4 +82,27 @@ public class OwnCloudProvider implements IDocumentProvider {
 return client;
 }
 
+/**
+ * Used by OwnCloudFiles to get the cache directory they should download
+ * files to.
+ *
+ * @return cache directory.
+ */
+protected File getCacheDir() {
+return cacheDir;
+}
+
+/**
+ * Deletes files and recursively deletes directories.
+ *
+ * @param file
+ *File or directory to be deleted.
+ */
+private void deleteRecursive(File file) {
+if (file.isDirectory()) {
+for (File child : file.listFiles())
+deleteRecursive(child);
+}
+file.delete();
+}
 }
___
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.2'

[Christian Lohmaier]

Tag 'libreoffice-4.4.4.2' created by Christian Lohmaier 
 at 2015-06-10 18:09 -0700

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

iQIcBAABAgAGBQJVeG8yAAoJEPQ0oe+v7q6jSZMP/jWB20jgi2rADU8pJpWOdCcA
b8LbRwnWlKsA3M8KkufvVjGFAYU87zxrULJxGiJ5duYtsWtm/5pkIH0Et/evg3GC
6radA+bDxbjjiTFWCZgEzsPWv5DJQC1skHwuYpBUtRcwKqltNMMRXE94plVJB2qi
BRdbz2u1vIfcdZtmV8jTqBe/SSNL1KNbtwwtHHUhPdsKW0AoRF0hS60WBM1WIqYa
tSNBnUPv2bOSwPpl54VzQ8Y8dCocNULV3dn14Vs/NzM+DduZ6YJUxEUd6A3GmJPq
rs3Hk1NEAHvw53bd2KQOIfJuciwm5oBqeZnOA4Uuhw5AtraK3grkcEf1giXtBNIT
V7PUDDBwDBcIQ8RrQq1L0zfdzO5dtmFz+NLXshV6i80D04VTgRdWmIFrGMNqh+GG
nUmsxOsNQkBI8Y0mh+JjNw/6D0+pxBheb6Rphu5kbsqN5dqNUC3cNSqAgNKSaY0y
DyhjMN35zlxpuWjwwWXcVYluWFd52fpSbFJ4MwV2q1TtD0TZpEHwBCeVqeXfTeXI
aLjp9kcA5uHghL5KL97RvFzt3bvxDKzdXsSLJrwFVkUheljv0b+A1/5fx290iIqj
p1xpARCwMt4Be2PspQs017BawTkxjw6G9B11RqRHPYJxKDLT7c+/oWIf6y7anKVG
L3gdFXHSrqOOBIYtraJp
=BX30
-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] online.git: 2 commits - loleaflet/src

[Jan Holesovsky]

 loleaflet/src/layer/tile/GridLayer.js |   29 +
 loleaflet/src/layer/tile/TileLayer.js |   71 +++---
 2 files changed, 61 insertions(+), 39 deletions(-)

New commits:
commit 73974f7397414b0931b80729ea716387f3c6a130
Author: Jan Holesovsky 
Date:   Wed Jun 10 18:58:34 2015 +0200

Fix JavaScript part of the tiles invalidation.

Now it is possible to type in in some cases, but for the full functionality,
tuning together with the server is necessary.

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 21c4959..acbf219 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -552,7 +552,11 @@ L.GridLayer = L.Layer.extend({
var tile = this._tiles[key];
if (!tile) { return; }
 
-   this._tileCache[key] = tile.el.src;
+   // FIXME: this _tileCache is used for prev/next slide; but it is
+   // dangerous in connection with typing / invalidation, so let's
+   // comment it out for now
+   //this._tileCache[key] = tile.el.src;
+
L.DomUtil.remove(tile.el);
delete this._tiles[key];
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index efe6414..24363c3 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -154,30 +154,40 @@ L.TileLayer = L.GridLayer.extend({

this._twipsToLatLng(bottomRightTwips));
this._onUpdateCursor();
}
-   else if (textMsg.startsWith('invalidatetiles:') && 
!textMsg.match('EMPTY')) {
-   strTwips = textMsg.match(/\d+/g);
-   var topLeftTwips = new L.Point(parseInt(strTwips[0]), 
parseInt(strTwips[1]));
-   var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
-   var bottomRightTwips = topLeftTwips.add(offset);
-
-   this._map._fadeAnimated = false;
-
-   for (var key in this._tiles) {
-   var coords = this._tiles[key].coords;
-   var point1 = this._coordsToTwips(coords);
-   var point2 = new L.Point(point1.x + 
this._tileWidthTwips, point1.y + this._tileHeightTwips);
-   var bounds = new L.Bounds(point1, point2);
-   if (bounds.contains(topLeftTwips) || 
bounds.contains(bottomRightTwips)) {
-   this._map.socket.send('tile ' +
-   'part=' + coords.part + ' ' +
-   'width=' + this._tileSize + ' ' 
+
-   'height=' + this._tileSize + ' 
' +
-   'tileposx=' + point1.x + ' '
+
-   'tileposy=' + point1.y + ' ' +
-   'tilewidth=' + 
this._tileWidthTwips + ' ' +
-   'tileheight=' + 
this._tileHeightTwips);
+   else if (textMsg.startsWith('invalidatetiles:')) {
+   if (textMsg.match('EMPTY')) {
+   // invalidate everything
+   this.redraw();
+   for (var key in this._tiles) {
+   this._addTile(this._tiles[key].coords);
}
}
+   else {
+   strTwips = textMsg.match(/\d+/g);
+
+   // convert to bounds
+   var topLeftTwips = new 
L.Point(parseInt(strTwips[0]), parseInt(strTwips[1]));
+   var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
+   var bottomRightTwips = topLeftTwips.add(offset);
+   var invalidateBounds = new 
L.Bounds(topLeftTwips, bottomRightTwips);
+
+   // FIXME - we want the fading when zooming, but 
not when
+   // typing; we need to modify this so that we 
fade only
+   // the tiles that do not exist yet
+   this._map._fadeAnimated = false;
+
+   for (var key in this._tiles) {
+   var coords = this._tiles[key].coords;
+   var point1 = 
this._coordsToTwips(coords);
+   var point2 = new L.Point(point1.x + 
this._tileWidthTwips, point1.y + this._tileHeightTwips);
+  

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

[Jacobo Aragunde Pérez]

 android/source/AndroidManifest.xml.in  
|1 
 android/source/res/values/strings.xml  
|1 
 android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java   
|   10 
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java 
|  113 ++
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java 
|   76 ++
 5 files changed, 199 insertions(+), 2 deletions(-)

New commits:
commit 69773f54bbac08953f0fbce16eecea0816e04338
Author: Jacobo Aragunde Pérez 
Date:   Wed Jan 21 13:05:41 2015 +

Android: initial implementation of ownCloud provider.

This implementation can connect to a local server and browser its
contents, but cannot download and open the documents yet.

TODO:

* Download and open documents.
* UI to configure server, user and password.
* Implement filtering to show only the documents of the desired type.
* Improve error handling.

Change-Id: I54a2e2e1d3e8ec8d824d75639e176ca452551f3e
Reviewed-on: https://gerrit.libreoffice.org/16191
Reviewed-by: Jacobo Aragunde Pérez 
Tested-by: Jacobo Aragunde Pérez 

diff --git a/android/source/AndroidManifest.xml.in 
b/android/source/AndroidManifest.xml.in
index 9364ea8..06b8089 100644
--- a/android/source/AndroidManifest.xml.in
+++ b/android/source/AndroidManifest.xml.in
@@ -9,6 +9,7 @@
 
 
 
+
 
 
 Local documents
 Local file system
+ownCloud
 
 
 Bold
diff --git 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java
index 9aa1973..3d462e6 100644
--- 
a/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java
+++ 
b/android/source/src/java/org/libreoffice/storage/DocumentProviderFactory.java
@@ -11,6 +11,7 @@ package org.libreoffice.storage;
 
 import org.libreoffice.storage.local.LocalDocumentsDirectoryProvider;
 import org.libreoffice.storage.local.LocalDocumentsProvider;
+import org.libreoffice.storage.owncloud.OwnCloudProvider;
 
 import android.content.Context;
 
@@ -30,8 +31,7 @@ public final class DocumentProviderFactory {
  */
 private static DocumentProviderFactory instance = null;
 
-private IDocumentProvider[] providers = {
-new LocalDocumentsDirectoryProvider(), new 
LocalDocumentsProvider() };
+private IDocumentProvider[] providers;
 
 private String[] providerNames;
 
@@ -52,6 +52,12 @@ public final class DocumentProviderFactory {
 instance = new DocumentProviderFactory();
 
 // initialize document providers list
+instance.providers = new IDocumentProvider[3];
+instance.providers[0] = new LocalDocumentsDirectoryProvider();
+instance.providers[1] = new LocalDocumentsProvider();
+instance.providers[2] = new OwnCloudProvider(context);
+
+// initialize document provider names list
 instance.providerNames = new String[instance.providers.length];
 for (int i = 0; i < instance.providers.length; i++) {
 instance.providerNames[i] = context.getString(instance
diff --git 
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java 
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
new file mode 100644
index 000..8e6d6cf
--- /dev/null
+++ b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudFile.java
@@ -0,0 +1,113 @@
+package org.libreoffice.storage.owncloud;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.libreoffice.storage.IFile;
+
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.lib.resources.files.ReadRemoteFolderOperation;
+import com.owncloud.android.lib.resources.files.RemoteFile;
+
+/**
+ * Implementation of IFile for ownCloud servers.
+ */
+public class OwnCloudFile implements IFile {
+
+private OwnCloudProvider provider;
+private RemoteFile file;
+
+private String name;
+private String parentPath;
+
+protected OwnCloudFile(OwnCloudProvider provider, RemoteFile file) {
+this.provider = provider;
+this.file = file;
+
+// get name and parent from path
+File localFile = new File(file.getRemotePath());
+this.name = localFile.getName();
+this.parentPath = localFile.getParent();
+}
+
+@Override
+public URI getUri() {
+return URI.create(file.getRemotePath());
+}
+
+@Override
+public String getName() {
+return name;
+}
+
+@Override
+public boolean isDirectory() {
+return file.getMimeType().equals("DIR");
+}
+
+@Override
+public long getSize() {
+retu

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

[Miklos Vajna]

 sw/inc/dbmgr.hxx|   10 +++-
 sw/source/core/doc/docnew.cxx   |6 ++
 sw/source/uibase/app/applab.cxx |2 
 sw/source/uibase/dbui/dbmgr.cxx |  100 +++-
 4 files changed, 114 insertions(+), 4 deletions(-)

New commits:
commit b8b4ac9e6e8f03fb84bddb714d3c5908a45153b1
Author: Miklos Vajna 
Date:   Wed Jun 10 19:04:04 2015 +0200

sw: remove embedded data source on location deregistration

Change-Id: I5b2a24fee50a25a41ba26787f7e30409348d7808

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 5bf1542..0b809f9 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -184,6 +184,7 @@ struct SwMergeDescriptor
 struct SwDBManager_Impl;
 class SwConnectionDisposedListener_Impl;
 class AbstractMailMergeDlg;
+class SwDoc;
 
 class SW_DLLPUBLIC SwDBManager
 {
@@ -205,6 +206,9 @@ friend class SwConnectionDisposedListener_Impl;
 /// Name of the embedded database that's included in the current document.
 OUString m_sEmbeddedName;
 
+/// The document that owns this manager.
+SwDoc* m_pDoc;
+
 SAL_DLLPRIVATE SwDSParam*  FindDSData(const SwDBData& rData, bool 
bCreate);
 SAL_DLLPRIVATE SwDSParam*  FindDSConnection(const OUString& 
rSource, bool bCreate);
 
@@ -222,7 +226,7 @@ friend class SwConnectionDisposedListener_Impl;
 SAL_DLLPRIVATE bool  ToNextRecord(SwDSParam* pParam);
 
 public:
-SwDBManager();
+SwDBManager(SwDoc* pDoc);
 ~SwDBManager();
 
 enum DBConnURITypes {
@@ -421,6 +425,10 @@ public:
 const 
css::uno::Reference& xStorage,
 const OUString& rStreamRelPath,
 const OUString& rOwnURL);
+
+SwDoc* getDoc() const;
+/// Stop reacting to removed database registrations.
+void releaseRevokeListener();
 };
 
 #endif
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index ef6b904..939f270 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -343,7 +343,7 @@ SwDoc::SwDoc()
 
 #if HAVE_FEATURE_DBCONNECTIVITY
 // Create DBManager
-mpDBManager = new SwDBManager;
+mpDBManager = new SwDBManager(this);
 #endif
 
 // create TOXTypes
@@ -543,7 +543,11 @@ SwDoc::~SwDoc()
 // On load, SwDBManager::setEmbeddedName() may register a data source.
 // If we have an embedded one, then sDataSoure points to the registered 
name, so revoke it here.
 if (!mpDBManager->getEmbeddedName().isEmpty() && 
!maDBData.sDataSource.isEmpty())
+{
+// Remove the revoke listener here first, so that we don't remove the 
data source from the document.
+mpDBManager->releaseRevokeListener();
 SwDBManager::RevokeDataSource(maDBData.sDataSource);
+}
 
 DELETEZ( mpDBManager );
 #endif
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 2521c99..4858f89 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -159,7 +159,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
 
 #if HAVE_FEATURE_DBCONNECTIVITY
 // Create DB-Manager
-boost::scoped_ptr pDBManager(new SwDBManager);
+boost::scoped_ptr pDBManager(new SwDBManager(0));
 #endif
 
 // Read SwLabItem from Config
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 6dc0bb4..48077f6 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -204,11 +204,90 @@ public:
 
 };
 
+/// Listens to removed data sources, and if it's one that's embedded into this 
document, triggers embedding removal.
+class SwDataSourceRemovedListener : public 
cppu::WeakImplHelper
+{
+uno::Reference m_xDatabaseContext;
+SwDBManager* m_pDBManager;
+
+public:
+SwDataSourceRemovedListener(SwDBManager& rDBManager);
+virtual ~SwDataSourceRemovedListener();
+virtual void SAL_CALL registeredDatabaseLocation(const 
sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
+virtual void SAL_CALL revokedDatabaseLocation(const 
sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
+virtual void SAL_CALL changedDatabaseLocation(const 
sdb::DatabaseRegistrationEvent& rEvent) throw (uno::RuntimeException, 
std::exception) SAL_OVERRIDE;
+virtual void SAL_CALL disposing(const lang::EventObject& rObject) throw 
(uno::RuntimeException, std::exception) SAL_OVERRIDE;
+void Dispose();
+};
+
+SwDataSourceRemovedListener::SwDataSourceRemovedListener(SwDBManager& 
rDBManager)
+: m_pDBManager(&rDBManager)
+{
+uno::Reference 
xComponentContext(comphelper::getProcessComponentContext());
+m_xDatabaseContext = sdb::DatabaseContext::create(xComponentContext);
+m_xDatabaseContext->addDatabaseRegistrationsListener(this);
+}
+
+SwDataSourceRemovedListener::~SwDataSourceRemovedListener()
+{
+if (m_

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

[Eike Rathke]

 sc/source/core/tool/token.cxx |  277 --
 1 file changed, 163 insertions(+), 114 deletions(-)

New commits:
commit 17c9cfef1a1bf48489fc856d59c6776a47ef0f77
Author: Eike Rathke 
Date:   Mon Jun 8 15:33:51 2015 +0200

check bounds in RPN tokens, tdf#90694 related and others

Listeners are set up from references in RPN, so check those for bounds
to catch also references resulting from named expressions, database
ranges, tables, ... and references in the token code array that are not
referenced in RPN.

(cherry picked from commit 4baf76ddb39580678cf14019900be78bb9071d7b)

Windows MSVC: cannot specify explicit initializer for arrays

(cherry picked from commit 883ebe0283dc6bdf62f08191dede2a249f777f63)

c42897ba6bb520c931f63e56d0f453ed14cfaa3d

Change-Id: I54770b45818f4c0541a39815278d3271a77b345d
Reviewed-on: https://gerrit.libreoffice.org/16155
Reviewed-by: Caolán McNamara 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 9500a28..1462a8b 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -113,6 +113,34 @@ namespace
 rRef.SetAbsTab(0);
 }
 
+struct TokenPointerRange
+{
+FormulaToken**  mpStart;
+FormulaToken**  mpStop;
+
+TokenPointerRange() : mpStart(NULL), mpStop(NULL) {}
+TokenPointerRange( FormulaToken** p, sal_uInt16 n ) :
+mpStart(p), mpStop( p + static_cast(n)) {}
+};
+struct TokenPointers
+{
+TokenPointerRange maPointerRange[2];
+
+TokenPointers( FormulaToken** pCode, sal_uInt16 nLen, FormulaToken** 
pRPN, sal_uInt16 nRPN )
+{
+maPointerRange[0] = TokenPointerRange( pCode, nLen);
+maPointerRange[1] = TokenPointerRange( pRPN, nRPN);
+}
+
+static bool skipToken( size_t i, const FormulaToken* const * pp )
+{
+// Handle all tokens in RPN, and code tokens only if they have a
+// reference count of 1, which means they are not referenced in
+// RPN.
+return i == 0 && (*pp)->GetRef() > 1;
+}
+};
+
 } // namespace
 
 // Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
@@ -3670,28 +3698,35 @@ void checkBounds(
 void ScTokenArray::CheckRelativeReferenceBounds(
 const sc::RefUpdateContext& rCxt, const ScAddress& rPos, SCROW nGroupLen, 
std::vector& rBounds ) const
 {
-FormulaToken** p = pCode;
-FormulaToken** pEnd = p + static_cast(nLen);
-for (; p != pEnd; ++p)
+TokenPointers aPtrs( pCode, nLen, pRPN, nRPN);
+for (size_t j=0; j<2; ++j)
 {
-switch ((*p)->GetType())
+FormulaToken** p = aPtrs.maPointerRange[j].mpStart;
+FormulaToken** pEnd = aPtrs.maPointerRange[j].mpStop;
+for (; p != pEnd; ++p)
 {
-case svSingleRef:
-{
-formula::FormulaToken* pToken = *p;
-checkBounds(rCxt, rPos, nGroupLen, *pToken->GetSingleRef(), 
rBounds);
-}
-break;
-case svDoubleRef:
+if (TokenPointers::skipToken(j,p))
+continue;
+
+switch ((*p)->GetType())
 {
-formula::FormulaToken* pToken = *p;
-const ScComplexRefData& rRef = *pToken->GetDoubleRef();
-checkBounds(rCxt, rPos, nGroupLen, rRef.Ref1, rBounds);
-checkBounds(rCxt, rPos, nGroupLen, rRef.Ref2, rBounds);
+case svSingleRef:
+{
+formula::FormulaToken* pToken = *p;
+checkBounds(rCxt, rPos, nGroupLen, 
*pToken->GetSingleRef(), rBounds);
+}
+break;
+case svDoubleRef:
+{
+formula::FormulaToken* pToken = *p;
+const ScComplexRefData& rRef = *pToken->GetDoubleRef();
+checkBounds(rCxt, rPos, nGroupLen, rRef.Ref1, rBounds);
+checkBounds(rCxt, rPos, nGroupLen, rRef.Ref2, rBounds);
+}
+break;
+default:
+;
 }
-break;
-default:
-;
 }
 }
 }
@@ -3699,29 +3734,36 @@ void ScTokenArray::CheckRelativeReferenceBounds(
 void ScTokenArray::CheckRelativeReferenceBounds(
 const ScAddress& rPos, SCROW nGroupLen, const ScRange& rRange, 
std::vector& rBounds ) const
 {
-FormulaToken** p = pCode;
-FormulaToken** pEnd = p + static_cast(nLen);
-for (; p != pEnd; ++p)
+TokenPointers aPtrs( pCode, nLen, pRPN, nRPN);
+for (size_t j=0; j<2; ++j)
 {
-switch ((*p)->GetType())
+FormulaToken** p = aPtrs.maPointerRange[j].mpStart;
+FormulaToken** p

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

[Eike Rathke]

 sc/source/core/tool/sharedformula.cxx |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit ce73f4befb90dbcc80964cec656127a6210b4d18
Author: Eike Rathke 
Date:   Fri Jun 5 15:51:46 2015 +0200

tdf#90694 reset group area listeners when splitting group

(cherry picked from commit 2f6a06856ad8df0c11a112d1e457b408e9a7af1d)

tdf#90694 reset group area listeners on correct top

Follow-up on 2f6a06856ad8df0c11a112d1e457b408e9a7af1d, rTop is top of
created group, listening needs to be ended on original (previous) group.

(cherry picked from commit 5d6448a5131488eac3a6af16bff06140663c3db4)

1f975a0a6c85e649aa07ce5c6e97bc6e917ff9ce

Change-Id: Ib3e85e1f7e12447fc2998711663ea1e9d1b322e5
Reviewed-on: https://gerrit.libreoffice.org/16105
Reviewed-by: Caolán McNamara 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/sharedformula.cxx 
b/sc/source/core/tool/sharedformula.cxx
index b1cd80d..84025b9 100644
--- a/sc/source/core/tool/sharedformula.cxx
+++ b/sc/source/core/tool/sharedformula.cxx
@@ -55,12 +55,24 @@ void SharedFormulaUtil::splitFormulaCellGroup(const 
CellStoreType::position_type
 }
 
 xGroup->mnLength = nRow - xGroup->mpTopCell->aPos.Row();
+ScFormulaCell& rPrevTop = *sc::formula_block::at(*aPos.first->data, 
aPos.second - xGroup->mnLength);
+
+#if USE_FORMULA_GROUP_LISTENER
+// At least group area listeners will have to be adapted. As long as
+// there's no update mechanism and no separated handling of group area and
+// other listeners, all listeners of this group's top cell are to be reset.
+if (nLength2)
+{
+rPrevTop.EndListeningTo( rPrevTop.GetDocument(), NULL, ScAddress( 
ScAddress::UNINITIALIZED));
+rPrevTop.SetNeedsListening(true);
+}
+#endif
+
 if (xGroup->mnLength == 1)
 {
 // The top group consists of only one cell. Ungroup this.
 ScFormulaCellGroupRef xNone;
-ScFormulaCell& rPrev = *sc::formula_block::at(*aPos.first->data, 
aPos.second-1);
-rPrev.SetCellGroup(xNone);
+rPrevTop.SetCellGroup(xNone);
 }
 
 // Apply the lower group object to the lower cells.
___
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' - sw/source

[Philippe Jung]

 sw/source/core/txtnode/thints.cxx |   40 +-
 1 file changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 677b373427d3db8d751600b8c540a6afe07f142e
Author: Philippe Jung 
Date:   Tue Jun 2 17:43:19 2015 +0200

tdf#91228 Fix Writer crash

Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash

This is because m_pAnchoredFly is not updated.

JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if "LockModify"ed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.

Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl 

Conflicts:
sw/source/core/txtnode/thints.cxx

Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2
(cherry picked from commit 7ea3a2b5747f148cbdc9a065728cefff1a660bd7)
Reviewed-on: https://gerrit.libreoffice.org/16050
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/core/txtnode/thints.cxx 
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..37b0c26 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1277,19 +1277,44 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 {
 SwTxtFlyCnt *pFly = (SwTxtFlyCnt *)pAttr;
 SwFrmFmt* pFmt = pAttr->GetFlyCnt().GetFrmFmt();
+
+// In order to maintain data coherency, if the hint is a fly
+// moved from a text node to another, we have to remove it from
+// the first textnode then to add it to the new (this) textnode
+const SwFmtAnchor* pAnchor = 0;
+pFmt->GetItemState( RES_ANCHOR, false,
+reinterpret_cast(&pAnchor) );
+
+SwIndex aIdx( this, pAttr->GetStart() );
+
+bool bChangeFlyParentNode( false );
+if (pAnchor &&
+pAnchor->GetAnchorId() == FLY_AS_CHAR &&
+pAnchor->GetCntntAnchor() &&
+pAnchor->GetCntntAnchor()->nNode != *this)
+{
+
assert(pAnchor->GetCntntAnchor()->nNode.GetNode().IsTxtNode());
+SwTxtNode* textNode = 
pAnchor->GetCntntAnchor()->nNode.GetNode().GetTxtNode();
+
+if ( textNode->IsModifyLocked() )
+{
+//  Fly parent has changed but the FlyFormat is 
locked, so it will
+//  not be updated by SetAnchor (that calls Modify 
that updates
+//  relationships)
+textNode->RemoveAnchoredFly( pFmt );
+bChangeFlyParentNode = true;
+}
+}
+
 if( !(nsSetAttrMode::SETATTR_NOTXTATRCHR & nInsMode) )
 {
+
 // Wir muessen zuerst einfuegen, da in SetAnchor()
 // dem FlyFrm GetStart() uebermittelt wird.
 //JP 11.05.98: falls das Anker-Attribut schon richtig
 // gesetzt ist, dann korrigiere dieses nach dem Einfuegen
 // des Zeichens. Sonst muesste das immer  ausserhalb
 // erfolgen (Fehleranfaellig !)
-const SwFmtAnchor* pAnchor = 0;
-pFmt->GetItemState( RES_ANCHOR, false,
-(const SfxPoolItem**)&pAnchor );
-
-SwIndex aIdx( this, pAttr->GetStart() );
 const OUString c(GetCharOfTxtAttr(*pAttr));
 OUString const ins( InsertText(c, aIdx, nInsertFlags) );
 if (ins.isEmpty())
@@ -1353,6 +1378,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, 
const SetAttrMode nMode )
 return false;
 }
 }
+
+// Finish relationships update now that SetAnchor has fixed 
part of it.
+if (bChangeFlyParentNode)
+AddAnchoredFly( pFmt );
+
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/msfilter/escherex.cxx   |   47 ++---
 include/filter/msfilter/escherex.hxx  |   12 
 oox/source/export/vmlexport.cxx   |   81 +-
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   10 +--
 sw/source/filter/ww8/rtfsdrexport.cxx |   79 +
 5 files changed, 136 insertions(+), 93 deletions(-)

New commits:
commit b04e1e79e64cb7bb3106fd08a019c27b09bdd5c6
Author: Caolán McNamara 
Date:   Wed Jun 10 15:34:44 2015 +0100

Prop_pSegmentInfo is totally misunderstood apparently

digging into the crash on export of kde216114-1.odt
reveals various horrors

Change-Id: I0d24fe303d561a00a08098b306d10fd8273af928

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 93b2d95..1e298dc 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3253,85 +3253,92 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
.WriteUInt16( nElementSize );
 for ( j = 0; j < nElements; j++ )
 {
+// The segment type is stored 
in the upper 3 bits
+// and segment count is stored 
in the lower 13
+// bits.
+//
+// If the segment type is 
msopathEscape, the lower 13 bits
+// are divided in a 5 bit 
escape code and 8 bit
+// vertex count (not segment 
count!)
 sal_uInt16 nVal = 
(sal_uInt16)aSegments[ j ].Count;
 switch( aSegments[ j ].Command 
)
 {
-case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::UNKNOWN :
-case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::LINETO : break;
-case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::MOVETO :
-{
-nVal = 0x4000;
-}
-break;
+case 
css::drawing::EnhancedCustomShapeSegmentCommand::UNKNOWN :
+case 
css::drawing::EnhancedCustomShapeSegmentCommand::LINETO :
+break;
+case 
css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO :
+nVal = (msopathMoveTo 
<< 13);
+break;
 case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CURVETO :
 {
-nVal |= 0x2000;
+nVal |= 
(msopathCurveTo << 13);
 }
 break;
 case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::CLOSESUBPATH :
 {
-nVal = 0x6001;
+nVal = 1;
+nVal |= (msopathClose 
<< 13);
 }
 break;
 case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH :
 {
-nVal = 0x8000;
+nVal = (msopathEnd << 
13);
 }
 break;
 case 
com::sun::star::drawing::EnhancedCustomShapeSegmentCommand::NOFILL :
 {
-nVal = 0xaa00;
+   

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

[Miklos Vajna]

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

New commits:
commit 6cca91f7ada91701443225061a5dd0ae81a98b8e
Author: Miklos Vajna 
Date:   Wed Jun 10 18:49:56 2015 +0200

CppunitTest_sw_uiwriter: enable on Windows

I hope that the underlying problem is fixed now by commit
670100fcfbb39d3dbe4afdb27fbced26d7b14283 (Remove FastLoader
optimization, 2015-06-10).

Change-Id: I1cb577ec1f50a45b40683031e79c0999338a2926

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 518ec6b..5c9313d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1056,7 +1056,7 @@ void SwUiWriterTest::testTdf90883TableBoxGetCoordinates()
 
 void SwUiWriterTest::testEmbeddedDataSource()
 {
-#if !defined(WNT) && !defined(MACOSX)
+#if !defined(MACOSX)
 // Initially no data source.
 uno::Reference 
xComponentContext(comphelper::getProcessComponentContext());
 uno::Reference xDatabaseContext = 
sdb::DatabaseContext::create(xComponentContext);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

announcing ./logerrit testfeature

[Bjoern Michaelsen]

Hi,

I just added './logerrit testfeature':

 
https://github.com/LibreOffice/core/commit/ef4fd9c52f16e6d242f999dd87170e6cac07230d

If you are on a feature branch, with:

 ./logerrit testfeature

you can trigger a gerrit test build on all platforms of the feature branch you
are currently on in the state it is pushed to gerrit. You can also explicitly
specify a branch:

 ./logerrit testfeature $featurebranch

The implementation is somewhat cumbersome, doing a clone and checkout to a
tempdir and then rm -rf'ing that. As such it is intended mostly as an
inspiration for your own script-foo, rather than as the canonical way to test a
feature branch. Have fun!

Best,

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

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

[Stephan Bergmann]

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

New commits:
commit d0b7be0fa509394dca054246b00b62ea7df77934
Author: Stephan Bergmann 
Date:   Wed Jun 10 18:37:59 2015 +0200

syntax errors, still

(i.e., parentheses do need to be quoted in BERs, but do not forget to escape
brakets in configure.ac m4)

Change-Id: Ifabb68ede318e5c95a54c420cd06e238fefbd82f

diff --git a/configure.ac b/configure.ac
index 452c28d..cdef0fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11300,7 +11300,7 @@ int main(int argc, char **argv) {
 #   vptr for 'QObjectPrivate'
 save_CXX=$CXX
 CXX=$(printf %s "$CXX" \
-| sed -e 's/-fno-sanitize-recover(=[0-9A-Za-z,_-]*)*//')
+| sed -e 's/-fno-sanitize-recover\(=[[0-9A-Za-z,_-]]*\)*//')
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
 save_LIBS=$LIBS
___
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/idle.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ed0de57db80eae4fef8b226d956e012370fec15
Author: Stephan Bergmann 
Date:   Wed Jun 10 18:32:58 2015 +0200

-Werror,-Winconsistent-missing-override

Change-Id: I2d1aa79a67bf130c3844b3bccb34a1761e8e4dfc

diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
index 258fd48..2e853b7 100644
--- a/include/vcl/idle.hxx
+++ b/include/vcl/idle.hxx
@@ -32,7 +32,7 @@ public:
 Idle( const sal_Char *pDebugName = NULL );
 Idle( const Idle& rIdle );
 
-virtual voidStart();
+virtual voidStart() SAL_OVERRIDE;
 
 /// Make it possible to associate a callback with this idle handler
 /// of course, you can also sub-class and override 'Invoke'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/qa/extras/uiwriter/uiwriter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7fd168ad47c0cb3afcbf09aa1b5bd9f76e4e5cb2
Author: Stephan Bergmann 
Date:   Wed Jun 10 18:29:26 2015 +0200

loplugin:salbool

Change-Id: I030321e8cb905be78b68f9e404926e22723632ef

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index acc31ae..518ec6b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -891,8 +891,8 @@ void SwUiWriterTest::testExportToPicture()
 utl::TempFile aTempFile;
 uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
 xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
-sal_Bool extchk = aTempFile.IsValid();
-CPPUNIT_ASSERT_EQUAL(sal_Bool(true), extchk);
+bool extchk = aTempFile.IsValid();
+CPPUNIT_ASSERT_EQUAL(true, extchk);
 osl::File tmpFile(aTempFile.GetURL());
 tmpFile.open(sal_uInt32(osl_File_OpenFlag_Read));
 sal_uInt64 val;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 include/tools/time.hxx  |4 +++-
 include/vcl/idle.hxx|8 ++--
 include/vcl/scheduler.hxx   |   16 ++--
 include/vcl/timer.hxx   |2 +-
 svtools/source/graphic/grfcache.cxx |1 +
 svx/source/svdraw/svdetc.cxx|1 +
 vcl/qa/cppunit/timer.cxx|   26 +-
 vcl/source/app/idle.cxx |   25 -
 vcl/source/app/scheduler.cxx|   15 ++-
 vcl/source/app/timer.cxx|2 +-
 vcl/source/window/window.cxx|2 ++
 11 files changed, 80 insertions(+), 22 deletions(-)

New commits:
commit 48c2815dd20cf20eeec8bb4e003000f4a3d13291
Author: Michael Meeks 
Date:   Wed Jun 10 12:08:00 2015 +0100

tdf#91727 - Unwind non-dispatch of idle handlers.

This clobbers the functionality from commit:

06d731428ef6cf93c7333e8228bfb6088853b52f

make idle timers actually activate only when idle

Since now all rendering and re-sizing is done in idle handlers it
does effectively the opposite of what was intended. A better solution
would allow special-casing the processing of just rendering,
re-sizing and window management to spin for eg. progress bar
rendering.

Also add helpful debugging labels to the idle & timeouts.

Also cleanup the Idle vs. Scheduler handling.

Also ensure that starting an Idle triggers a mainloop wakeup.

Also add a unit test.

Change-Id: Ifb0756714378fdb790be599b93c7a3ac1f9209e6

diff --git a/include/tools/time.hxx b/include/tools/time.hxx
index 2b950b8..e25b2de 100644
--- a/include/tools/time.hxx
+++ b/include/tools/time.hxx
@@ -123,7 +123,9 @@ public:
 { return (nTime <= rTime.nTime); }
 
 static Time GetUTCOffset();
-static sal_uInt64 GetSystemTicks();   // Elapsed time
+
+/// Elapsed time since epoch in milliseconds
+static sal_uInt64 GetSystemTicks();
 
 voidConvertToUTC()   { *this -= Time::GetUTCOffset(); }
 voidConvertToLocalTime() { *this += Time::GetUTCOffset(); }
diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
index b66a889..258fd48 100644
--- a/include/vcl/idle.hxx
+++ b/include/vcl/idle.hxx
@@ -29,14 +29,18 @@ protected:
 Link maIdleHdl;  // Callback Link
 
 public:
-Idle();
+Idle( const sal_Char *pDebugName = NULL );
 Idle( const Idle& rIdle );
 
+virtual voidStart();
+
 /// Make it possible to associate a callback with this idle handler
 /// of course, you can also sub-class and override 'Invoke'
 voidSetIdleHdl( const Link& rLink ) { maIdleHdl 
= rLink; }
 const Link& GetIdleHdl() const { return maIdleHdl; }
-virtual voidInvoke() SAL_OVERRIDE;
+virtual void Invoke() SAL_OVERRIDE;
+virtual bool ReadyForSchedule( bool bTimer ) SAL_OVERRIDE;
+virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 
nTime ) SAL_OVERRIDE;
 Idle&   operator=( const Idle& rIdle );
 };
 
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index dfa1483..6c4e211 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -52,23 +52,27 @@ enum class SchedulerPriority {
 class VCL_DLLPUBLIC Scheduler
 {
 protected:
-ImplSchedulerData*  mpSchedulerData;// Pointer to element in scheduler 
list
-SchedulerPriority   mePriority; // Scheduler priority
-boolmbActive;   // Currently in the scheduler
+ImplSchedulerData*  mpSchedulerData;/// Pointer to element in 
scheduler list
+const sal_Char *mpDebugName;/// Useful for debugging
+SchedulerPriority   mePriority; /// Scheduler priority
+boolmbActive;   /// Currently in the scheduler
 
 friend struct ImplSchedulerData;
 virtual void SetDeletionFlags();
-virtual bool ReadyForSchedule( bool bTimer ) { return !bTimer; }
-virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 
nTime );
+virtual bool ReadyForSchedule( bool bTimer ) = 0;
+virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 
nTime ) = 0;
 
 public:
-Scheduler();
+Scheduler( const sal_Char *pDebugName = NULL );
 Scheduler( const Scheduler& rScheduler );
 virtual ~Scheduler();
 
 void SetPriority( SchedulerPriority ePriority );
 SchedulerPriority GetPriority() const { return mePriority; }
 
+voidSetDebugName( const sal_Char *pDebugName ) { mpDebugName = 
pDebugName; }
+const sal_Char *GetDebugName() { return mpDebugName; }
+
 // Call handler
 virtual voidInvoke() = 0;
 
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index 458ad4e..8835291 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -38,7 +38,7 @@ private:
 static void InitSystemTimer();
 
 public:
-Timer();
+T

Re: Mac OS X and pkg-config

[Norbert Thiebaud]

On Wed, Jun 10, 2015 at 8:06 AM, Michael Stahl  wrote:
> On 10.06.2015 11:43, Khaled Hosny wrote:
>> On Tue, Jun 09, 2015 at 12:36:41PM +0300, Tor Lillqvist wrote:
 Some of us work on other opensource projects on our Mac machines which
 happen to need MacPorts or HomeBrew.

 Having LibreOffice simply say "I refuse to build on this machine because
 you've already installed some other stuff" is not very friendly.

>>>
>>> But neither is it very useful to have the already small set of OS X -based
>>> developers split into those who use a pure upstream way to build, those who
>>> use HomeBrew libjpeg but bundled Python, those who use MacPorts Python and
>>> libjpeg, etc.
>>
>> No, that what I want to achieve, what I want is to make sure LibreOffice
>> builds the same way regardless of the presence or absence of pkg-config
>> on Mac OS X, so that is no longer needs to stop the build if one is
>> found.
>
> i've slightly improved the error message now to "Please modify your PATH
> variable so that $PKG_CONFIG is no longer found by configure scripts."
> with commit
> ada6281a5bd74d0ff6ae578d57f39f65b7c25103 so it's at least obvious what
> to do.
>
> but since we already have PATH in config_host.mk it would perhaps be
> possible to detect which directory the pkg-config is found in and
> automatically filter that out of $PATH (unless it's something that
> cannot be removed like /usr/bin).  would that be an improvement for you,
> and/or would anybody object to that?

Actually, yesterday, working with a colunteer to solve a 'python on
mac' problem, I prepared a patch that does just that:
on mac it santized the PATH to leave only what is normally on factory
default and the path to find git (which may not be in /usr/bin)
I made that patch contingent to using LODE to not impose it on
everybod.. as I suppose someone out-there will have
a legitimate reason to have a more complex PATH
I could alter my patch to make it the default for all mac with a
--disable-sanitize-path option for people that really want to shoot
themselves in the foot.

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

[Libreoffice-commits] core.git: logerrit

[Bjoern Michaelsen]

 logerrit |   36 
 1 file changed, 36 insertions(+)

New commits:
commit ef4fd9c52f16e6d242f999dd87170e6cac07230d
Author: Bjoern Michaelsen 
Date:   Wed Jun 10 17:51:29 2015 +0200

add ./logerrit testfeature

- ./logerrit testfeature will trigger a testbuild of the
  current feature branch as it is on gerrit
- ./logerrit testfeature $BRANCH will do the same for $BRANCH
- cloning to a tempdir and rm -rf'ing around isnt ideal, so
  consider this as a template for your own scripting

Change-Id: I50a3c80748af82d855522f245ddbff227c8adab2

diff --git a/logerrit b/logerrit
index 9e7f2b8..a88c56f 100755
--- a/logerrit
+++ b/logerrit
@@ -52,6 +52,7 @@ case "$1" in
 echo " (yes, this modifies your 
last commit)"
 echo " (yes, this modifies your 
last commit)"
 echo " nextchange [BRANCH] reset branch to the remote 
to start with the next change"
+echo " testfeature [BRANCH]trigger a test of a feature 
branch on gerrit"
 echo "Note: drafts are only visibly to yourself and those that you 
explicitly add as reviewers."
 echo
 echo " --- for reviewers:"
@@ -203,6 +204,41 @@ case "$1" in
 shift
 ssh ${GERRITHOST?} gerrit query project:core $@
 ;;
+testfeature)
+BRANCH=$2
+if test -z "$BRANCH"
+then
+BRANCH=`git symbolic-ref HEAD 2> /dev/null`
+BRANCH="${BRANCH##refs/heads/}"
+if test -z "$BRANCH"
+then
+echo "no branch specified, and could not guess the current 
branch"
+exit 1
+fi
+echo "no branch specified, guessing current branch $BRANCH"
+fi
+BRANCH="${BRANCH##feature/}"
+WORKDIR=`mktemp -d`
+if test -z "$WORKDIR"
+then
+echo "could no create work directory."
+exit 1
+fi
+echo workdir at $WORKDIR
+git clone -s `dirname $0` $WORKDIR/core
+pushd $WORKDIR/core
+echo "noop commit: trigger test build for branch feature/$BRANCH" > 
../commitmsg
+echo >> ../commitmsg
+echo "branch is at:" >> ../commitmsg
+git log -1|sed -e "s/Change-Id:/XX:/" >> ../commitmsg
+git fetch git://gerrit.libreoffice.org/core.git feature/$BRANCH && \
+git checkout -b featuretst FETCH_HEAD && \
+cp -a .git-hooks/* .git/hooks
+git commit --allow-empty -F ../commitmsg && \
+git push $GERRITURL HEAD:refs/for/feature/$BRANCH
+popd
+rm -rf $WORKDIR/core
+;;
 *)
 ssh ${GERRITHOST?} gerrit $@
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 5 commits - include/LibreOfficeKit libreofficekit/Executable_gtktiledviewer.mk libreofficekit/Library_libreofficekitgtk.mk libre

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit cbd5da28e3e297ad534cf0c8fdd29036b3dfb081
Author: Pranav Kant 
Date:   Wed Jun 10 20:59:18 2015 +0530

gtktiledviewer: Replace deprecated Gtk functions

Change-Id: I354aa987f8e732945fb552d855a3416c782bb508

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index b1fd637..3b3645f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -57,7 +57,7 @@ const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 
5.0 };
 
 static void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
 {
-const char *sName = gtk_tool_button_get_stock_id( GTK_TOOL_BUTTON(pButton) 
);
+const char *sName = gtk_tool_button_get_icon_name( 
GTK_TOOL_BUTTON(pButton) );
 
 float fZoom = 0;
 float fCurrentZoom = 0;
@@ -67,7 +67,7 @@ static void changeZoom( GtkWidget* pButton, gpointer /* pItem 
*/ )
 fCurrentZoom = lok_doc_view_get_zoom( LOK_DOC_VIEW(pDocView) );
 }
 
-if ( strcmp(sName, "gtk-zoom-in") == 0)
+if ( strcmp(sName, "zoom-in-symbolic") == 0)
 {
 for ( unsigned int i = 0; i < sizeof( fZooms ) / sizeof( fZooms[0] ); 
i++ )
 {
@@ -78,11 +78,11 @@ static void changeZoom( GtkWidget* pButton, gpointer /* 
pItem */ )
 }
 }
 }
-else if ( strcmp(sName, "gtk-zoom-100") == 0)
+else if ( strcmp(sName, "zoom-original-symbolic") == 0)
 {
 fZoom = 1;
 }
-else if ( strcmp(sName, "gtk-zoom-out") == 0)
+else if ( strcmp(sName, "zoom-out-symbolic") == 0)
 {
 for ( unsigned int i = 0; i < sizeof( fZooms ) / sizeof( fZooms[0] ); 
i++ )
 {
@@ -351,22 +351,25 @@ int main( int argc, char* argv[] )
 gtk_window_set_default_size(GTK_WINDOW(pWindow), 1024, 768);
 g_signal_connect( pWindow, "destroy", G_CALLBACK(gtk_main_quit), NULL );
 
-pVBox = gtk_vbox_new( FALSE, 0 );
+pVBox = gtk_box_new( GTK_ORIENTATION_VERTICAL, 0 );
 gtk_container_add( GTK_CONTAINER(pWindow), pVBox );
 
 // Toolbar
 GtkWidget* pToolbar = gtk_toolbar_new();
 gtk_toolbar_set_style( GTK_TOOLBAR(pToolbar), GTK_TOOLBAR_ICONS );
 
-GtkToolItem* pZoomIn = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_IN );
+GtkToolItem* pZoomIn = gtk_tool_button_new( NULL, NULL );
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomIn), 
"zoom-in-symbolic");
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomIn, 0);
 g_signal_connect( G_OBJECT(pZoomIn), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
-GtkToolItem* pZoom1 = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_100 );
+GtkToolItem* pZoom1 = gtk_tool_button_new( NULL, NULL );
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoom1), 
"zoom-original-symbolic");
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoom1, -1);
 g_signal_connect( G_OBJECT(pZoom1), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
-GtkToolItem* pZoomOut = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_OUT 
);
+GtkToolItem* pZoomOut = gtk_tool_button_new( NULL, NULL );
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomOut), 
"zoom-out-symbolic");
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomOut, -1);
 g_signal_connect( G_OBJECT(pZoomOut), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
@@ -389,27 +392,38 @@ int main( int argc, char* argv[] )
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartModeSelectorToolItem, -1 );
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
-pEnableEditing = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_EDIT);
+pEnableEditing = gtk_toggle_tool_button_new();
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pEnableEditing), 
"insert-text-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pEnableEditing, -1);
 g_signal_connect(G_OBJECT(pEnableEditing), "toggled", 
G_CALLBACK(toggleEditing), NULL);
-GtkToolItem* pFindButton = gtk_tool_button_new_from_stock(GTK_STOCK_FIND);
+
+GtkToolItem* pFindButton = gtk_tool_button_new( NULL, NULL);
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindButton), 
"edit-find-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pFindButton, -1);
 g_signal_connect(G_OBJECT(pFindButton), "clicked", 
G_CALLBACK(toggleFindbar), NULL);
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
-pBold = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD);
+
+pBold = gtk_toggle_tool_button_new();
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pBold), 
"format-text-bold-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pBold, -1);
 g_signal_connect(G_OBJECT(pBold), "toggled", G_CALLBACK(toggleToolItem), 
NULL);
 lcl_registerToolItem(pBold, ".uno:Bold");
-pItalic = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC);
+
+pItalic = gtk_toggle_tool_button_

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

[Stephan Bergmann]

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

New commits:
commit bee2423eff85ebc5f0255596bcf7bec2596307a9
Author: Stephan Bergmann 
Date:   Wed Jun 10 17:53:45 2015 +0200

syntax errors, still

Change-Id: I8ed4b4d221040ddf5f51d7e01134c855fc85a641

diff --git a/configure.ac b/configure.ac
index 0595b16..452c28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11300,7 +11300,7 @@ int main(int argc, char **argv) {
 #   vptr for 'QObjectPrivate'
 save_CXX=$CXX
 CXX=$(printf %s "$CXX" \
-| sed -e 's/-fno-sanitize-recover\(=[0-9A-Za-z,_-]*\)*//')
+| sed -e 's/-fno-sanitize-recover(=[0-9A-Za-z,_-]*)*//')
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
 save_LIBS=$LIBS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - libreofficekit/qa

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   52 +---
 1 file changed, 34 insertions(+), 18 deletions(-)

New commits:
commit ddbdd9004790ea691f762e7196a76a944de9772e
Author: Pranav Kant 
Date:   Wed Jun 10 20:59:18 2015 +0530

gtktiledviewer: Replace deprecated Gtk functions

Change-Id: I354aa987f8e732945fb552d855a3416c782bb508

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index b1fd637..65acb50 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -57,7 +57,7 @@ const float fZooms[] = { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 3.0, 
5.0 };
 
 static void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
 {
-const char *sName = gtk_tool_button_get_stock_id( GTK_TOOL_BUTTON(pButton) 
);
+const char *sName = gtk_tool_button_get_icon_name( 
GTK_TOOL_BUTTON(pButton) );
 
 float fZoom = 0;
 float fCurrentZoom = 0;
@@ -67,7 +67,7 @@ static void changeZoom( GtkWidget* pButton, gpointer /* pItem 
*/ )
 fCurrentZoom = lok_doc_view_get_zoom( LOK_DOC_VIEW(pDocView) );
 }
 
-if ( strcmp(sName, "gtk-zoom-in") == 0)
+if ( strcmp(sName, "zoom-in-symbolic") == 0)
 {
 for ( unsigned int i = 0; i < sizeof( fZooms ) / sizeof( fZooms[0] ); 
i++ )
 {
@@ -78,11 +78,11 @@ static void changeZoom( GtkWidget* pButton, gpointer /* 
pItem */ )
 }
 }
 }
-else if ( strcmp(sName, "gtk-zoom-100") == 0)
+else if ( strcmp(sName, "zoom-original-symbolic") == 0)
 {
 fZoom = 1;
 }
-else if ( strcmp(sName, "gtk-zoom-out") == 0)
+else if ( strcmp(sName, "zoom-out-symbolic") == 0)
 {
 for ( unsigned int i = 0; i < sizeof( fZooms ) / sizeof( fZooms[0] ); 
i++ )
 {
@@ -351,22 +351,25 @@ int main( int argc, char* argv[] )
 gtk_window_set_default_size(GTK_WINDOW(pWindow), 1024, 768);
 g_signal_connect( pWindow, "destroy", G_CALLBACK(gtk_main_quit), NULL );
 
-pVBox = gtk_vbox_new( FALSE, 0 );
+pVBox = gtk_box_new( GTK_ORIENTATION_VERTICAL, 0 );
 gtk_container_add( GTK_CONTAINER(pWindow), pVBox );
 
 // Toolbar
 GtkWidget* pToolbar = gtk_toolbar_new();
 gtk_toolbar_set_style( GTK_TOOLBAR(pToolbar), GTK_TOOLBAR_ICONS );
 
-GtkToolItem* pZoomIn = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_IN );
+GtkToolItem* pZoomIn = gtk_tool_button_new( NULL, NULL );
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomIn), 
"zoom-in-symbolic");
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomIn, 0);
 g_signal_connect( G_OBJECT(pZoomIn), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
-GtkToolItem* pZoom1 = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_100 );
+GtkToolItem* pZoom1 = gtk_tool_button_new( NULL, NULL );
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoom1), 
"zoom-original-symbolic");
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoom1, -1);
 g_signal_connect( G_OBJECT(pZoom1), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
-GtkToolItem* pZoomOut = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_OUT 
);
+GtkToolItem* pZoomOut = gtk_tool_button_new( NULL, NULL );
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomOut), 
"zoom-out-symbolic");
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomOut, -1);
 g_signal_connect( G_OBJECT(pZoomOut), "clicked", G_CALLBACK(changeZoom), 
NULL );
 
@@ -392,24 +395,34 @@ int main( int argc, char* argv[] )
 pEnableEditing = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_EDIT);
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pEnableEditing, -1);
 g_signal_connect(G_OBJECT(pEnableEditing), "toggled", 
G_CALLBACK(toggleEditing), NULL);
-GtkToolItem* pFindButton = gtk_tool_button_new_from_stock(GTK_STOCK_FIND);
+
+GtkToolItem* pFindButton = gtk_tool_button_new( NULL, NULL);
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindButton), 
"edit-find-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pFindButton, -1);
 g_signal_connect(G_OBJECT(pFindButton), "clicked", 
G_CALLBACK(toggleFindbar), NULL);
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
-pBold = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_BOLD);
+
+pBold = gtk_toggle_tool_button_new();
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pBold), 
"format-text-bold-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pBold, -1);
 g_signal_connect(G_OBJECT(pBold), "toggled", G_CALLBACK(toggleToolItem), 
NULL);
 lcl_registerToolItem(pBold, ".uno:Bold");
-pItalic = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ITALIC);
+
+pItalic = gtk_toggle_tool_button_new();
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pItalic), 
"format-text-italic-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pItalic, -1);
 g_signal_connect(G_OBJECT(pItalic), "toggled

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

[Michael Stahl]

 sw/inc/calbck.hxx  |   12 ++--
 sw/source/core/attr/calbck.cxx |   14 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 2676ee8ededce1aab9888bb3be0b6146e4624dfb
Author: Michael Stahl 
Date:   Wed Jun 10 17:20:50 2015 +0200

sw: fix GCC undefined reference to `typeinfo for sw::LegacyModifyHint'

Stop pointlessly inlining these virtual functions.

Change-Id: I11d123bc704ec6cf54925a13d139fce70cc59566

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index db28e0b..a19ee55 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -115,17 +115,9 @@ public:
 // should be called only from SwModify the client is registered in
 // mba: IMHO this method should be pure virtual
 // DO NOT USE IN NEW CODE! use SwClientNotify instead.
-virtual void Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* 
pNewValue )
-{ CheckRegistration( pOldValue, pNewValue ); }
+virtual void Modify(const SfxPoolItem* pOldValue, const SfxPoolItem* 
pNewValue);
 // when overriding this, you MUST call SwClient::SwClientModify() in the 
override!
-virtual void SwClientNotify( const SwModify&, const SfxHint& rHint) 
SAL_OVERRIDE
-{
-if(typeid(rHint) == typeid(sw::LegacyModifyHint))
-{
-auto pLegacyHint(static_cast(&rHint));
-Modify(pLegacyHint->m_pOld, pLegacyHint->m_pNew);
-}
-};
+virtual void SwClientNotify(const SwModify&, const SfxHint& rHint) 
SAL_OVERRIDE;
 
 // in case an SwModify object is destroyed that itself is registered in 
another SwModify,
 // its SwClient objects can decide to get registered to the latter instead 
by calling this method
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index f3a4aa0..d836db2 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -57,6 +57,20 @@ void SwClient::CheckRegistration( const SfxPoolItem* pOld, 
const SfxPoolItem* )
 }
 }
 
+void SwClient::SwClientNotify(const SwModify&, const SfxHint& rHint)
+{
+if (typeid(rHint) == typeid(sw::LegacyModifyHint))
+{
+auto pLegacyHint(static_cast(&rHint));
+Modify(pLegacyHint->m_pOld, pLegacyHint->m_pNew);
+}
+};
+
+void SwClient::Modify(SfxPoolItem const*const pOldValue, SfxPoolItem 
const*const pNewValue)
+{
+CheckRegistration( pOldValue, pNewValue );
+}
+
 SwModify::~SwModify()
 {
 OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/inc/calbck.hxx  |2 +-
 sw/inc/unocrsr.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5ca824f4c7f6bea7f2caf51715aa865250d1288
Author: Stephan Bergmann 
Date:   Wed Jun 10 17:28:56 2015 +0200

Revert "There's SAL_DLLPUBLIC_RTTI for that"

This reverts commit 8761ab9b5ec7860eb5bc7d05271da081f66a452b; thinko, as the
RTTI needs to be visible with GCC too in the test code.

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 828ce46..db28e0b 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -65,7 +65,7 @@ template class SwIterator;
 namespace sw
 {
 class ClientIteratorBase;
-struct SAL_DLLPUBLIC_RTTI LegacyModifyHint SAL_FINAL: SfxHint
+struct SW_DLLPUBLIC LegacyModifyHint SAL_FINAL: SfxHint
 {
 LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : 
m_pOld(pOld), m_pNew(pNew) {};
 virtual ~LegacyModifyHint();
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 06f0b0a..32006a4 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -24,7 +24,7 @@
 
 namespace sw
 {
-struct SAL_DLLPUBLIC_RTTI DocDisposingHint SAL_FINAL : public SfxHint
+struct SW_DLLPUBLIC DocDisposingHint SAL_FINAL : public SfxHint
 {
 DocDisposingHint() {}
 virtual ~DocDisposingHint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos]

 include/svtools/RemoteFilesDialog.hxx|7 -
 include/svtools/breadcrumb.hxx   |   62 +++
 svtools/Library_svt.mk   |1 
 svtools/source/control/breadcrumb.cxx|  142 +++
 svtools/source/dialogs/RemoteFilesDialog.cxx |  118 --
 5 files changed, 209 insertions(+), 121 deletions(-)

New commits:
commit c5813bf98886e7de2d92cb9d43bcd3cff58d01c9
Author: Szymon Kłos 
Date:   Wed Jun 10 17:24:12 2015 +0200

added a new mode of showing path in the breadcrumb

Change-Id: I0819f2346ee3412d044c2d6c7d3bbc2dd9231ed5

diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx
index 86be5d2..29858d6 100644
--- a/include/svtools/breadcrumb.hxx
+++ b/include/svtools/breadcrumb.hxx
@@ -19,6 +19,12 @@
 
 #include 
 
+enum SvtBreadcrumbMode
+{
+ONLY_CURRENT_PATH = 0,
+ALL_VISITED = 1
+};
+
 class SVT_DLLPUBLIC Breadcrumb : public VclHBox
 {
 private:
@@ -28,9 +34,12 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox
 OUString m_sRootName;
 OUString m_sClickedURL;
 
+SvtBreadcrumbMode m_eMode;
+
 Link<> m_aClickHdl;
 
 void appendField();
+void clearFields( unsigned int nStartIndex );
 
 DECL_LINK ( ClickLinkHdl, FixedHyperlink* );
 
@@ -45,6 +54,7 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox
 
 void SetRootName( const OUString& rURL );
 void SetURL( const OUString& rURL );
+void SetMode( SvtBreadcrumbMode eMode );
 };
 
 #endif
diff --git a/svtools/source/control/breadcrumb.cxx 
b/svtools/source/control/breadcrumb.cxx
index ba2ed5d..c7cbc00 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -11,6 +11,7 @@
 
 Breadcrumb::Breadcrumb( vcl::Window* pParent, WinBits nWinStyle ) : VclHBox( 
pParent, nWinStyle )
 {
+m_eMode = SvtBreadcrumbMode::ONLY_CURRENT_PATH;
 set_spacing( 6 );
 appendField(); // root
 }
@@ -56,6 +57,8 @@ void Breadcrumb::SetURL( const OUString& rURL )
 unsigned int nPos = 0;
 unsigned int i;
 
+bool bClear = ( m_eMode == SvtBreadcrumbMode::ONLY_CURRENT_PATH );
+
 m_aLinks[0]->SetText( m_sRootName );
 m_aLinks[0]->Show();
 m_aLinks[0]->Enable( true );
@@ -71,6 +74,13 @@ void Breadcrumb::SetURL( const OUString& rURL )
 unsigned int nEnd = sPath.indexOf( '/', nPos + 1 );
 OUString sLabel = OUString( sPath.getStr() + nPos + 1, nEnd - nPos - 1 
);
 
+if( m_eMode == SvtBreadcrumbMode::ALL_VISITED )
+{
+if( m_aLinks[i]->GetText() != sLabel )
+bClear = true;
+}
+
+
 m_aLinks[i]->SetText( sLabel );
 m_aLinks[i]->SetURL( INetURLObject::GetScheme( aURL.GetProtocol() )
 + aURL.GetHost()
@@ -85,13 +95,21 @@ void Breadcrumb::SetURL( const OUString& rURL )
 m_aLinks[i - 1]->Enable( false );
 m_aSeparators[i - 1]->Hide();
 
-for( ; i < m_aLinks.size(); i++ )
+if( bClear )
 {
-m_aLinks[i]->Hide();
-m_aSeparators[i]->Hide();
+clearFields( i );
+}
+else
+{
+for( ; i < m_aLinks.size(); i++ )
+m_aLinks[i]->Enable( true );
 }
 }
 
+void Breadcrumb::SetMode( SvtBreadcrumbMode eMode )
+{
+m_eMode = eMode;
+}
 
 void Breadcrumb::appendField()
 {
@@ -104,6 +122,15 @@ void Breadcrumb::appendField()
 m_aSeparators[m_aLinks.size() - 1]->Hide();
 }
 
+void Breadcrumb::clearFields( unsigned int nStartIndex )
+{
+for( unsigned int i = nStartIndex; i < m_aLinks.size(); i++ )
+{
+m_aLinks[i]->Hide();
+m_aSeparators[i]->Hide();
+}
+}
+
 IMPL_LINK ( Breadcrumb, ClickLinkHdl, FixedHyperlink*, pLink )
 {
 m_sClickedURL = pLink->GetURL();
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index b85f1e8..663d719 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -120,6 +120,7 @@ RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent, 
WinBits nBits)
 m_pPath = VclPtr::Create( 
get("breadcrumb_container") );
 m_pPath->set_hexpand(true);
 m_pPath->SetClickHdl( LINK( this, RemoteFilesDialog, SelectBreadcrumbHdl ) 
);
+m_pPath->SetMode( SvtBreadcrumbMode::ALL_VISITED );
 m_pPath->Show();
 
 m_pContainer = VclPtr::Create( 
get("container") );
commit e097ae0f42a6e2f57a51ba22844941c2cf7b0efc
Author: Szymon Kłos 
Date:   Wed Jun 10 15:55:01 2015 +0200

the breadcrumb class moved to the new file

Change-Id: I283080522090766682b1d6c7911466898b11758a

diff --git a/include/svtools/RemoteFilesDialog.hxx 
b/include/svtools/RemoteFilesDialog.hxx
index 2e30efc..c6bf8d8 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/include/svtools/RemoteFilesDialog.hxx
@@ -15,6 +15,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ 

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

[Katarina Behrens]

 editeng/source/items/textitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72c7b9829d86e9d9feb6ddc96b3e6a4f26d32f21
Author: Katarina Behrens 
Date:   Wed Jun 10 16:52:55 2015 +0200

Bool2Any wants to get bool instead of sal_uInt8

which is what GetTransparency() returns. Iow, do what SvxBrushItem
does :)

Change-Id: Ief65ab75d8c0955c1ec264611a70dcc693412170

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index d031f10..0c9fbad 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1880,7 +1880,7 @@ bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, 
sal_uInt8 nMemberId ) c
 {
 case MID_GRAPHIC_TRANSPARENT:
 {
-rVal <<= Bool2Any (aColor.GetTransparency());
+rVal <<= Bool2Any (aColor.GetTransparency() == 0xff);
 break;
 }
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mac OS X and pkg-config

[Khaled Hosny]

On Wed, Jun 10, 2015 at 04:49:25PM +0200, Stephan Bergmann wrote:
> On 06/10/2015 11:41 AM, Khaled Hosny wrote:
> >I’m not saying we should use pkg-config on Mac, all I’m asking for is
> >what kind of breakages are expected when pkg-config is found, because I
> >didn’t experience any, to find better way to fix it. That better way
> >might be to set PKG_CONFIG_LIBDIR to an empty value (and may be
> >PKG_CONFIG_PATH as well), it may be something else, but I need to know
> >what is the actual breakage that I need to fix.
> 
> I guess nobody kept track of all the various problems that got reported over
> time and were tracked down to polluted environments on Mac OS X (let alone
> the ones never even reported in the first place).
> 
> Your goal of trying to make the build experience easier is laudable, but I
> fear that your assumption that there is a simple, robust fix to shield the
> LO build from polluted environments is wrong.
> 
> Using presence of pkg-config as a canary to detect polluted environments was
> probably born out of pragmatism.  I guess that there are further problems
> with polluted environments beyond presence of pkg-config.

OK.

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

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

[Noel Grandin]

 avmedia/source/framework/mediacontrol.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9a5323655355a01be582a556a99e410c4064ebe4
Author: Noel Grandin 
Date:   Wed Jun 10 16:58:54 2015 +0200

tdf#90077 fix freeze when enabling media toolbar in Impress

Change-Id: I402bd7319d31859510a06644eb7dc786d56b312e
Reviewed-on: https://gerrit.libreoffice.org/16213
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/avmedia/source/framework/mediacontrol.cxx 
b/avmedia/source/framework/mediacontrol.cxx
index 0338135..e98776a 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -597,7 +597,6 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
 IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
 {
 update();
-maIdle.Start();
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Varun]

 sw/qa/extras/uiwriter/uiwriter.cxx |   69 +
 1 file changed, 69 insertions(+)

New commits:
commit c979a944c7a00a35293d1de3c32b06f90e0bfa5f
Author: Varun 
Date:   Tue Jun 9 03:48:32 2015 +0530

Added Test for Export to Picture

Change-Id: I62d44e29cd4376f17270cef548d2cec6f4b621b9
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index f48dd91..acc31ae 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -51,6 +51,7 @@
 #include "com/sun/star/util/SearchAlgorithms.hpp"
 #include "com/sun/star/i18n/TransliterationModulesExtra.hpp"
 #include "com/sun/star/sdbcx/XTablesSupplier.hpp"
+#include 
 
 static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
 
@@ -90,6 +91,7 @@ public:
 void testTdf68183();
 void testCp1000115();
 void testTdf90003();
+void testExportToPicture();
 void testSearchWithTransliterate();
 void testTableBackgroundColor();
 void testTdf90362();
@@ -130,6 +132,7 @@ public:
 CPPUNIT_TEST(testTdf68183);
 CPPUNIT_TEST(testCp1000115);
 CPPUNIT_TEST(testTdf90003);
+CPPUNIT_TEST(testExportToPicture);
 CPPUNIT_TEST(testSearchWithTransliterate);
 CPPUNIT_TEST(testTableBackgroundColor);
 CPPUNIT_TEST(testTdf90362);
@@ -872,6 +875,32 @@ void SwUiWriterTest::testTdf90003()
 assertXPath(pXmlDoc, "//Special[@nType='POR_FLY']", 0);
 }
 
+void SwUiWriterTest::testExportToPicture()
+{
+createDoc();
+uno::Sequence aFilterData =
+{
+beans::PropertyValue("PixelWidth", sal_Int32(0), 
uno::makeAny(sal_Int32(610)), beans::PropertyState_DIRECT_VALUE),
+beans::PropertyValue("PixelHeight", sal_Int32(0), 
uno::makeAny(sal_Int32(610)), beans::PropertyState_DIRECT_VALUE)
+};
+uno::Sequence aDescriptor =
+{
+beans::PropertyValue("FilterName", sal_Int32(0), 
uno::makeAny(OUString("writer_png_Export")), beans::PropertyState_DIRECT_VALUE),
+beans::PropertyValue("FilterData", sal_Int32(0), 
uno::makeAny(aFilterData), beans::PropertyState_DIRECT_VALUE)
+};
+utl::TempFile aTempFile;
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+xStorable->storeToURL(aTempFile.GetURL(), aDescriptor);
+sal_Bool extchk = aTempFile.IsValid();
+CPPUNIT_ASSERT_EQUAL(sal_Bool(true), extchk);
+osl::File tmpFile(aTempFile.GetURL());
+tmpFile.open(sal_uInt32(osl_File_OpenFlag_Read));
+sal_uInt64 val;
+CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, tmpFile.getSize(val));
+CPPUNIT_ASSERT(val > 100);
+aTempFile.EnableKillingFile();
+}
+
 void SwUiWriterTest::testSearchWithTransliterate()
 {
 SwDoc* pDoc = createDoc();
commit 4deaf89bbeadf0395810ab5f1213aecf2b078c8b
Author: Varun 
Date:   Tue Jun 9 04:01:32 2015 +0530

Added Test for tdf#91145 Set Cell Background Color

Change-Id: I7c41f1d596946706dde4adbeb5434ae0be58b04b

Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 57af4a8..f48dd91 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -91,6 +91,7 @@ public:
 void testCp1000115();
 void testTdf90003();
 void testSearchWithTransliterate();
+void testTableBackgroundColor();
 void testTdf90362();
 void testUndoCharAttribute();
 void testTdf86639();
@@ -130,6 +131,7 @@ public:
 CPPUNIT_TEST(testCp1000115);
 CPPUNIT_TEST(testTdf90003);
 CPPUNIT_TEST(testSearchWithTransliterate);
+CPPUNIT_TEST(testTableBackgroundColor);
 CPPUNIT_TEST(testTdf90362);
 CPPUNIT_TEST(testUndoCharAttribute);
 CPPUNIT_TEST(testTdf86639);
@@ -904,6 +906,44 @@ void SwUiWriterTest::testSearchWithTransliterate()
 CPPUNIT_ASSERT_EQUAL(1,(int)case2);
 }
 
+void SwUiWriterTest::testTableBackgroundColor()
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SwInsertTableOptions TableOpt(tabopts::DEFAULT_BORDER, 0);
+pWrtShell->InsertTable(TableOpt, 3, 3); //Inserting Table
+//Checking Rows and Columns of Inserted Table
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getColumns()->getCount());
+pWrtShell->SttDoc();
+pWrtShell->SelTableRow(); //Selecting First Row
+pWrtShell->ClearMark();
+//Modifying the color of Table Box
+Color colour = sal_Int32(0xFF00FF);
+pWrtShell->SetBoxBackground(SvxBrushItem(colour, 
sal_Int16(RES_BACKGROUND)));
+//Checking cells for background color only A1 should be modified
+uno::Reference xCell;
+   xCell = xTable->getCellByName("A1");
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF00FF), getProperty(xCell, 
"BackColor"));
+xCell = xTable->getCellByName("A2");
+CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), getProper

Re: Mac OS X and pkg-config

[Stephan Bergmann]

On 06/10/2015 11:41 AM, Khaled Hosny wrote:

I’m not saying we should use pkg-config on Mac, all I’m asking for is
what kind of breakages are expected when pkg-config is found, because I
didn’t experience any, to find better way to fix it. That better way
might be to set PKG_CONFIG_LIBDIR to an empty value (and may be
PKG_CONFIG_PATH as well), it may be something else, but I need to know
what is the actual breakage that I need to fix.


I guess nobody kept track of all the various problems that got reported 
over time and were tracked down to polluted environments on Mac OS X 
(let alone the ones never even reported in the first place).


Your goal of trying to make the build experience easier is laudable, but 
I fear that your assumption that there is a simple, robust fix to shield 
the LO build from polluted environments is wrong.


Using presence of pkg-config as a canary to detect polluted environments 
was probably born out of pragmatism.  I guess that there are further 
problems with polluted environments beyond presence of pkg-config.

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

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

[Stephan Bergmann]

 sw/inc/calbck.hxx  |2 +-
 sw/inc/unocrsr.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8761ab9b5ec7860eb5bc7d05271da081f66a452b
Author: Stephan Bergmann 
Date:   Wed Jun 10 16:11:30 2015 +0200

There's SAL_DLLPUBLIC_RTTI for that

Change-Id: I1937374b56b506681876d100112852b68f099038

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index db28e0b..828ce46 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -65,7 +65,7 @@ template class SwIterator;
 namespace sw
 {
 class ClientIteratorBase;
-struct SW_DLLPUBLIC LegacyModifyHint SAL_FINAL: SfxHint
+struct SAL_DLLPUBLIC_RTTI LegacyModifyHint SAL_FINAL: SfxHint
 {
 LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : 
m_pOld(pOld), m_pNew(pNew) {};
 virtual ~LegacyModifyHint();
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 32006a4..06f0b0a 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -24,7 +24,7 @@
 
 namespace sw
 {
-struct SW_DLLPUBLIC DocDisposingHint SAL_FINAL : public SfxHint
+struct SAL_DLLPUBLIC_RTTI DocDisposingHint SAL_FINAL : public SfxHint
 {
 DocDisposingHint() {}
 virtual ~DocDisposingHint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/owncloud-android-lib

[Jacobo Aragunde Pérez]

 external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2e6ed9befe172bcbfb14d5386bf3e0f151d0d666
Author: Jacobo Aragunde Pérez 
Date:   Wed Jun 10 14:26:10 2015 +

Android: fix ownCloud lib build

The build relied on the presence of ANDROID_HOME envvar, now we pass
it explicitly.

Change-Id: If33ee2c6a22435151aad244378ee5aaf7b3cc913

diff --git 
a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk 
b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
index 21081c4..679981b 100644
--- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
+++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk
@@ -18,6 +18,7 @@ $(call 
gb_ExternalProject_get_state_target,owncloud_android_lib,build) :
$(ICECREAM_RUN) "$(ANT)" \
-q \
-f build.xml \
+   -Dsdk.dir=$(ANDROID_SDK_HOME) \
release \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 editeng/source/items/textitem.cxx |   45 ++
 include/editeng/colritem.hxx  |2 +
 include/editeng/unotext.hxx   |1 
 svx/source/unodraw/unoprov.cxx|1 
 svx/source/unodraw/unoshap2.cxx   |1 
 5 files changed, 50 insertions(+)

New commits:
commit 321f4925a79b74cfd0aea2221a74dd2717e6b8b2
Author: Katarina Behrens 
Date:   Tue Jun 9 11:53:12 2015 +0200

tdf#88055: Don't export transparent background colour as white

The fix is twofold:
1. retrieve transparency from colour in SvxBackgroundColorItem
(add QueryValue, PutValue methods, use additional memberID to
retrieve alpha channel as a bool property)
2. add CharBackTransparent bool property to Draw [text] shapes,
xmloff needs it to be able to output 'transparent' string instead of
'#XXYYZZ' colour code in ODF format

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

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index fa29b6a..d031f10 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1871,6 +1871,51 @@ SfxPoolItem* SvxBackgroundColorItem::Create(SvStream& 
rStrm, sal_uInt16 ) const
 return new SvxBackgroundColorItem( rStrm, Which() );
 }
 
+bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) 
const
+{
+nMemberId &= ~CONVERT_TWIPS;
+Color aColor = SvxColorItem::GetValue();
+
+switch( nMemberId )
+{
+case MID_GRAPHIC_TRANSPARENT:
+{
+rVal <<= Bool2Any (aColor.GetTransparency());
+break;
+}
+default:
+{
+rVal <<= (sal_Int32)(aColor.GetColor());
+break;
+}
+}
+return true;
+}
+
+bool SvxBackgroundColorItem::PutValue( const uno::Any& rVal, sal_uInt8 
nMemberId )
+{
+nMemberId &= ~CONVERT_TWIPS;
+sal_Int32 nColor = 0;
+Color aColor = SvxColorItem::GetValue();
+
+switch( nMemberId )
+{
+case MID_GRAPHIC_TRANSPARENT:
+{
+aColor.SetTransparency( Any2Bool( rVal ) ? 0xff : 0 );
+SvxColorItem::SetValue( aColor );
+break;
+}
+default:
+{
+if(!(rVal >>= nColor))
+return false;
+SvxColorItem::SetValue( Color(nColor) );
+break;
+}
+}
+return true;
+}
 
 // class SvxColorItem 
 
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 64d8a56..dadd495 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -83,6 +83,8 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public 
SvxColorItem
 
 virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE;
 virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
+virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) 
const SAL_OVERRIDE;
+virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId = 
0) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index f3d2396..2bc45c2 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -91,6 +91,7 @@ class SvxItemPropertySet;
 { OUString(UNO_NAME_EDIT_CHAR_LOCALE),  EE_CHAR_LANGUAGE,   
::cppu::UnoType::get(),0, MID_LANG_LOCALE }, \
 { OUString(UNO_NAME_EDIT_CHAR_COLOR),   EE_CHAR_COLOR,  
::cppu::UnoType::get(),0, 0 }, \
 { OUString("CharBackColor"),EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, 0 }, \
+{ OUString("CharBackTransparent"),  EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT),  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
 { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE),   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_STYLE }, \
 { OUString("CharUnderlineColor"),   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 2d092a0..80bf3e7 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -588,6 +588,7 @@ SfxItemPropertyMapEntry const * 
ImplGetSvxControlShapePropertyMap()
 { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0,  
cppu::UnoType::get(),0, 0 },
 { OUString(UNO_NAME_EDIT_CHAR_COLOR),   0,  
cppu::UnoType::get(),0, 0 },
 { OUString("CharBackColor"),0,  
cppu::UnoType::get(),0, 0 },
+{ OUString("CharBackTransparent"),  0,  
cppu::UnoType::get(), 0, 0 },
 { OUString("CharR

Re: Mac OS X and pkg-config

[Stephan Bergmann]

On 06/10/2015 03:35 PM, Khaled Hosny wrote:

but since we already have PATH in config_host.mk it would perhaps be
possible to detect which directory the pkg-config is found in and
automatically filter that out of $PATH (unless it's something that
cannot be removed like /usr/bin).  would that be an improvement for you,
and/or would anybody object to that?



I think setting PKG_CONFIG_* environment variables to empty values will
make pkg-config not find any installed libraries, so if we can do that
for LibreOffice build shell (or whatever it is called) on Mac OS X
(either by default or only when pkg-config is found) it should make its
presence an non concern for LibreOffice build.


I don't like any of that tweaking of env vars in the build system.  It 
makes matters more opaque instead of more transparent.


And while presence of pkg-config on the PATH might be a good heuristic 
to detect that the environment has been contaminated by MacPorts or 
their like, is polluting PATH the only thing those do (and which we 
would thus need to counter), or are they also polluting in other ways 
that subtly influence the build (and then cause headaches)?

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2682 ++--
 1 file changed, 1362 insertions(+), 1320 deletions(-)

New commits:
commit 81950f6a41d7f4512cb29c04c0151aec59e80e98
Author: Christian Lohmaier 
Date:   Wed Jun 10 16:21:19 2015 +0200

update credits

Change-Id: I6e9f15f7b696093a8a018cb8b4c8557817122d8a

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 0e53f0e..aa42998 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 
 
 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:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   739
+   630
501
-   30058
-   9077
+   21525
+   22435
true
true

 
  view2
- 3676
- 3471
+ 3709
+ 3475
  501
- 739
- 30558
- 9814
+ 630
+ 22024
+ 23063
  0
  0
  false
@@ -83,7 +83,7 @@
false
0

-   2811305
+   2977262
false

true
@@ -302,58 +302,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -362,19 +362,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -383,24 +383,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1008,7 +1008,7 @@

   
  Credits
-1058 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-05-26 10:47:30.
+1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-10 15:47:52.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1035,18 +1035,18 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 17219Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 17299Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 9142Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 9342Joined: 
2000-10-04
   
  
  
   
-   Tor 
LillqvistCommits: 6907Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 6920Joined: 
2010-03-23
   
  

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1514 ++--
 1 file changed, 758 insertions(+), 756 deletions(-)

New commits:
commit 21b8b24368368829f592bdc2d6795c6890ec21de
Author: Christian Lohmaier 
Date:   Wed Jun 10 16:18:40 2015 +0200

update credits

Change-Id: Ie118da55da73b0dfcc7d13db9f7b6ff6a0960f5b

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 77efed6..aa42998 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   686
+   630
501
21525
22435
@@ -16,9 +16,9 @@
  3709
  3475
  501
- 686
+ 630
  22024
- 23119
+ 23063
  0
  0
  false
@@ -83,7 +83,7 @@
false
0

-   2899311
+   2977262
false

true
@@ -305,16 +305,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -386,21 +386,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1008,7 +1008,7 @@

   
  Credits
-1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-08 13:21:01.
+1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-10 15:47:52.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1035,18 +1035,18 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 17277Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 17299Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 9258Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 9342Joined: 
2000-10-04
   
  
  
   
-   Tor 
LillqvistCommits: 6915Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 6920Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5360Joined: 
2009-06-19
@@ -1055,15 +1055,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   Michael 
StahlCommits: 4580Joined: 
2008-06-16
+   Michael 
StahlCommits: 4585Joined: 
2008-06-16
   
  
  
   
-   Miklos 
VajnaCommits: 4507Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 4523Joined: 
2010-07-29
   
   
-   *Noel GrandinCommits: 
3892J

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1514 ++--
 1 file changed, 758 insertions(+), 756 deletions(-)

New commits:
commit d9856608f45cf810f1cae8b837d84a189b3c3eb5
Author: Christian Lohmaier 
Date:   Wed Jun 10 16:16:34 2015 +0200

update credits

Change-Id: If711d2f1c7a5d586746d4f27dabc8e441c38a2aa

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 77efed6..aa42998 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   686
+   630
501
21525
22435
@@ -16,9 +16,9 @@
  3709
  3475
  501
- 686
+ 630
  22024
- 23119
+ 23063
  0
  0
  false
@@ -83,7 +83,7 @@
false
0

-   2899311
+   2977262
false

true
@@ -305,16 +305,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -386,21 +386,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1008,7 +1008,7 @@

   
  Credits
-1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-08 13:21:01.
+1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-10 15:47:52.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1035,18 +1035,18 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 17277Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 17299Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 9258Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 9342Joined: 
2000-10-04
   
  
  
   
-   Tor 
LillqvistCommits: 6915Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 6920Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5360Joined: 
2009-06-19
@@ -1055,15 +1055,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   Michael 
StahlCommits: 4580Joined: 
2008-06-16
+   Michael 
StahlCommits: 4585Joined: 
2008-06-16
   
  
  
   
-   Miklos 
VajnaCommits: 4507Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 4523Joined: 
2010-07-29
   
   
-   *Noel GrandinCommits: 
3892J

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 1514 ++--
 1 file changed, 758 insertions(+), 756 deletions(-)

New commits:
commit 62751ab180bdebc0af03d114519cada7f0e7fd40
Author: Christian Lohmaier 
Date:   Wed Jun 10 16:14:39 2015 +0200

update credits

Change-Id: Ife3131eac8c653bb851f44f05be618289b5c5116

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 77efed6..aa42998 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/4.4.3.2$Linux_X86_64
 
LibreOffice_project/88805f81e9fe61362df02b9941de8e38a9b5fd162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   686
+   630
501
21525
22435
@@ -16,9 +16,9 @@
  3709
  3475
  501
- 686
+ 630
  22024
- 23119
+ 23063
  0
  0
  false
@@ -83,7 +83,7 @@
false
0

-   2899311
+   2977262
false

true
@@ -305,16 +305,16 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -386,21 +386,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1008,7 +1008,7 @@

   
  Credits
-1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-08 13:21:01.
+1062 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2015-06-10 15:47:52.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1035,18 +1035,18 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 17277Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 17299Joined: 
2000-10-10
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Stephan 
BergmannCommits: 9258Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 9342Joined: 
2000-10-04
   
  
  
   
-   Tor 
LillqvistCommits: 6915Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 6920Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5360Joined: 
2009-06-19
@@ -1055,15 +1055,15 @@
Frank Schoenheit 
[fs]Commits: 5008Joined: 2000-09-19
   
   
-   Michael 
StahlCommits: 4580Joined: 
2008-06-16
+   Michael 
StahlCommits: 4585Joined: 
2008-06-16
   
  
  
   
-   Miklos 
VajnaCommits: 4507Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 4523Joined: 
2010-07-29
   
   
-   *Noel GrandinCommits: 
3892J

Re: test infrastructure ideas appreciated ...

[Michael Meeks]

On Wed, 2015-06-10 at 09:35 -0400, Kohei Yoshida wrote:
> I am happy to see that you and I are on the same term on the majority of the
> points. But let me nitpick on a few points below.

:-)

> > My yard-stick would be that if writing the unit-test takes longer than
> > finding & fixing the bug - then we have a problem, 
> 
> While I think I agree with the general point you are trying to make here, I
> would have to slightly disagree with how you chose to word it.

=)

> By this wording, if a bug fix takes a mere 5 minute, or even 30 minute

So - of course, its well worth spending that time.

> I personally would still spend a few hours writing a test for a bug I fixed in
> 10 to 30 minutes, because, even if the fix took less than an hour today, the
> same fix at some arbitrary point in the future may take days or weeks just
> because the code may look totally different by then.

Yep; makes sense; so if people have the dedication to do that - that's
great. I like to try to persist at writing tests to the bitter end - it
often gives a far better understanding of the real fix. Then again -
there are some areas where it is just too expensive currently. eg.
layout - though I hope (with some investment) we can fix that so they
become almost easy =) My hope is that if we approach this from several
sides: improved automation, improved ease of testing, more & better test
infrastructure, and also your idea of highlighting unit-testing heros
(who perhaps fix fewer bugs per unit time, but they stay fixed) - then
we can make a real difference.

> Anyway, I just wanted to make these points clear. I hope you didn't
> mind my nitpicking.

I love your precision =) ( and passion for testing ), we need more of
that.

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 93 commits - android/source bean/com bean/test compilerplugins/clang configure.ac dbaccess/source download.lst extensions/source

[Pranav Kant]

Rebased ref, commits from common ancestor:
commit cdc44d3c06b08c46f02e089eff1c329f6e7b07f9
Author: Pranav Kant 
Date:   Wed Jun 10 16:57:19 2015 +0530

lokdocview, gtktiledviewer: Remove gtk version checks

We already have the global ENABLE_GTK3 guard for RHEL5 baseline.

Change-Id: Id814a4063861a1e750952b44686ed24864c0394f

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index f389f7d..b1fd637 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -40,12 +40,9 @@ std::map g_aToolItemCommandNames;
 std::map g_aCommandNameToolItems;
 bool g_bToolItemBroadcast = true;
 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;
 GtkWidget* pFindbarLabel;
@@ -117,7 +114,6 @@ static void toggleEditing(GtkWidget* /*pButton*/, gpointer 
/*pItem*/)
 /// Toggle the visibility of the findbar.
 static void toggleFindbar(GtkWidget* /*pButton*/, gpointer /*pItem*/)
 {
-#if GTK_CHECK_VERSION(2,18,0) // we need gtk_widget_get_visible()
 if (gtk_widget_get_visible(pFindbar))
 {
 gtk_widget_hide(pFindbar);
@@ -127,7 +123,6 @@ static void toggleFindbar(GtkWidget* /*pButton*/, gpointer 
/*pItem*/)
 gtk_widget_show_all(pFindbar);
 gtk_widget_grab_focus(pFindbarEntry);
 }
-#endif
 }
 
 /// Get the visible area of the scrolled window
@@ -151,13 +146,11 @@ static void getVisibleAreaTwips(GdkRectangle* pArea)
 static gboolean signalKey(GtkWidget* pWidget, GdkEventKey* pEvent, gpointer 
pData)
 {
 LOKDocView* pLOKDocView = LOK_DOC_VIEW(pDocView);
-#if GTK_CHECK_VERSION(2,18,0) // we need gtk_widget_get_visible()
 if (!gtk_widget_get_visible(pFindbar) && 
bool(lok_doc_view_get_edit(pLOKDocView)))
 {
 lok_doc_view_post_key(pWidget, pEvent, pData);
 return TRUE;
 }
-#endif
 return FALSE;
 }
 
@@ -263,11 +256,9 @@ static void signalSearch(LOKDocView* /*pLOKDocView*/, 
char* /*pPayload*/, gpoint
 
 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.
@@ -283,8 +274,6 @@ static void toggleToolItem(GtkWidget* pWidget, gpointer 
/*pData*/)
 }
 }
 
-// GtkComboBox requires gtk 2.24 or later
-#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION 
> 2
 static void populatePartSelector()
 {
 gtk_list_store_clear( GTK_LIST_STORE(
@@ -342,7 +331,6 @@ static void changePartMode( GtkWidget* pSelector, gpointer 
/* pItem */ )
 lok_doc_view_set_partmode( LOK_DOC_VIEW(pDocView), ePartMode );
 }
 }
-#endif
 
 int main( int argc, char* argv[] )
 {
@@ -385,8 +373,6 @@ int main( int argc, char* argv[] )
 GtkToolItem* pSeparator1 = gtk_separator_tool_item_new();
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pSeparator1, -1);
 
-// GtkComboBox requires gtk 2.24 or later
-#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION 
> 2
 GtkToolItem* pPartSelectorToolItem = gtk_tool_item_new();
 GtkWidget* pComboBox = gtk_combo_box_text_new();
 gtk_container_add( GTK_CONTAINER(pPartSelectorToolItem), pComboBox );
@@ -401,7 +387,6 @@ int main( int argc, char* argv[] )
 GtkWidget* pPartModeComboBox = gtk_combo_box_text_new();
 gtk_container_add( GTK_CONTAINER(pPartModeSelectorToolItem), 
pPartModeComboBox );
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartModeSelectorToolItem, -1 );
-#endif
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
 pEnableEditing = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_EDIT);
@@ -490,15 +475,11 @@ int main( int argc, char* argv[] )
 g_error("main: lok_doc_view_open_document() failed");
 assert(lok_doc_view_get_document(LOK_DOC_VIEW(pDocView)));
 
-// GtkComboBox requires gtk 2.24 or later
-#if ( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION 
> 2
 populatePartSelector();
 populatePartModeSelector( GTK_COMBO_BOX_TEXT(pPartModeComboBox) );
 // Connect these signals after populating the selectors, to avoid 
re-rendering on setting the default part/partmode.
 g_signal_connect(G_OBJECT(pPartModeComboBox), "changed", 
G_CALLBACK(changePartMode), 0);
-
 g_signal_connect(G_OBJECT(pPartSelector), "changed", 
G_CALLBACK(changePart), 0);
-#endif
 
 gtk_main();
 
diff --git a/libreofficekit/source/gtk/lokdocview.c

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

[Henry Castro]

 sc/source/ui/cctrl/dpcontrol.cxx |5 -
 sc/source/ui/view/gridwin4.cxx   |   14 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit afc22f0e32fac7258bef7523c19b33b69620f294
Author: Henry Castro 
Date:   Thu May 14 14:53:23 2015 -0400

sc tiled editing: Corrected dropdown button offset

Also includes:

sc tiled editing: Mapping has to be turned off after drawing the buttons.

Otherwise the redlines are on wrong positions in the tiled rendering case.

Also - we are actually never call with something else than MAP_PIXEL, so
let's kill the resetting of the mapmode; let's see if some obscure corner 
case
bites us here.

Change-Id: I8da07dd5448b8863df3148882ec50e6746760cca

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index e2c3457..f020024 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -95,9 +95,6 @@ void ScDPFieldButton::setPopupLeft(bool b)
 
 void ScDPFieldButton::draw()
 {
-bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
-mpOutDev->EnableMapMode(false);
-
 if (mbBaseButton)
 {
 // Background
@@ -144,8 +141,6 @@ void ScDPFieldButton::draw()
 
 if (mbPopupButton)
 drawPopupButton();
-
-mpOutDev->EnableMapMode(bOldMapEnablaed);
 }
 
 void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index bfda05a..3919ca5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -756,12 +756,24 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
 if ( bLogicText )
 aOutputData.DrawStrings(true);  // in logic MapMode if bLogicText 
is set
 aOutputData.DrawEdit(true);
-pContentDev->SetMapMode(MAP_PIXEL);
+
+// the buttons are painted in absolute coordinates
+if (bIsTiledRendering)
+{
+// Tiled offset nScrX, nScrY
+MapMode aMap( MAP_PIXEL );
+aMap.SetOrigin(Point(nScrX, nScrY));
+pContentDev->SetMapMode(aMap);
+}
+else
+pContentDev->SetMapMode(MAP_PIXEL);
 
 // Autofilter- und Pivot-Buttons
 
 DrawButtons(nX1, nX2, rTableInfo, pContentDev);  // Pixel
 
+pContentDev->SetMapMode(MAP_PIXEL);
+
 aOutputData.DrawClipMarks();
 
 //  Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch 
bei !bGridFirst
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Philippe Jung]

 sd/inc/app.hrc |  204 ++---
 sd/source/ui/func/fusnapln.cxx |1 
 2 files changed, 112 insertions(+), 93 deletions(-)

New commits:
commit 35fe915b7cf508356a88897d520b89fc986407fb
Author: Philippe Jung 
Date:   Wed Jun 10 15:47:52 2015 +0200

Fix sd ID conflicts and duplicates

Fix the following cases:
- two names for same ID in sd/inc/app.hrc. Two ID defined.
- ID defined in include/sfx2/sfxsids.hrc and redefined in
  sd/inc/app.hrc. Only the sfx2 ID is kept
- ID defined in include/svx/svxids.hrc and redefined in
  sd/inc/app.hrc. Only the svx ID is kept

Change-Id: I21c7c25cb6db3c43ea2f9aac5aac75fabe61eaf0
Reviewed-on: https://gerrit.libreoffice.org/16209
Reviewed-by: Philippe Jung 
Tested-by: Philippe Jung 

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 4f3d82e..747a95d 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -63,66 +63,74 @@
 #define HID_SD_CELL_STYLE_LAST_COLUMN   (HID_SD_START + 
199)
 
 #define SID_PAGESETUP   (SID_SD_START+2)
+// FREE
 #define SID_COPYOBJECTS (SID_SD_START+4)
 #define SID_MANAGE_LINKS(SID_SD_START+5)
+// FREE
 #define SID_CONVERT_TO_3D_LATHE (SID_SD_START+8)
 #define SID_DRAWINGMODE (SID_SD_START+9)
 #define SID_OUTLINEMODE (SID_SD_START+10)
 #define SID_DIAMODE (SID_SD_START+11)
+// FREE
 #define SID_INSERTPAGE  (SID_SD_START+14)
 #define SID_INSERTFILE  (SID_SD_START+15)
 #define SID_INSERTSYMBOL(SID_SD_START+16)
 #define SID_ZOOM_PANNING(SID_SD_START+17)
 #define SID_PRESENTATION_END(SID_SD_START+18)
+// FREE
 #define SID_POSITION(SID_SD_START+22)
 #define SID_MIRROR  (SID_SD_START+23)
 #define SID_CONVERT (SID_SD_START+24)
+// FREE
 #define SID_COMBINE (SID_SD_START+26)
 #define SID_NAME_GROUP  (SID_SD_START+27)
 #define SID_DRAWTBX_CONNECTORS  (SID_SD_START+28)
 #define SID_TEXTALIGNMENT   (SID_SD_START+29)
-#define SID_BEZIER_ELIMINATE_POINTS (SID_SD_START+30)
+// In svxids.hrc: SID_BEZIER_ELIMINATE_POINTS   (SID_SD_START+30)
 #define SID_MOREFRONT   (SID_SD_START+31)
 #define SID_MOREBACK(SID_SD_START+32)
-
 // #i68101#
 #define SID_OBJECT_TITLE_DESCRIPTION(SID_SD_START+33)
-
 #define SID_VERTICAL(SID_SD_START+34)
 #define SID_HORIZONTAL  (SID_SD_START+35)
 #define SID_CHANGEBEZIER(SID_SD_START+36)
 #define SID_CHANGEPOLYGON   (SID_SD_START+37)
 #define SID_CAPTUREPOINT(SID_SD_START+38)
-#define SID_RULER   (SID_SD_START+40)
-#define SID_INSERTLAYER (SID_SD_START+43)
-#define SID_EDIT_OUTLINER   (SID_SD_START+44)
-#define SID_SWITCHPAGE  (SID_SD_START+45)
-#define SID_MODIFYPAGE  (SID_SD_START+46)
-#define SID_SWITCHLAYER (SID_SD_START+47)
-#define SID_MODIFYLAYER (SID_SD_START+48)
-#define SID_PAGEMODE(SID_SD_START+49)
-#define SID_LAYERMODE   (SID_SD_START+50)
-#define SID_DRAW_MEASURELINE(SID_SD_START+51)
-#define SID_STARTAPP(SID_SD_START+52)
-#define SID_MASTERPAGE  (SID_SD_START+53)
-#define SID_TOOL_CONNECTOR  (SID_SD_START+58)
+#define SID_INSERTLAYER (SID_SD_START+39)
+// In svxids.hrc: SID_RULER (SID_SD_START+40)
+#define SID_EDIT_OUTLINER   (SID_SD_START+41)
+#define SID_SWITCHPAGE  (SID_SD_START+42)
+#define SID_MODIFYPAGE  (SID_SD_START+43)
+#define SID_SWITCHLAYER (SID_SD_START+44)
+#define SID_MODIFYLAYER (SID_SD_START+45)
+#define SID_PAGEMODE(SID_SD_START+46)
+#define SID_LAYERMODE   (SID_SD_START+47)
+#define SID_DRAW_MEASURELINE(SID_SD_START+48)
+#define SID_STARTAPP(SID_SD_START+49)
+#define SID_MASTERPAGE  (SID_SD_START+50)
+// FREE
+#define SID_TOOL_CONNECTOR  (SID_SD_START+61)
 #define SID_ANIMATION_OBJECTS   (SID_SD_START+62)
 #define SID_ANIMATION_EFFECTS   (SID_SD_START+63)
 #define SID_PRESENTATION_LAYOUT (SID_SD_START+64)
-#define SID_BEZIER_CONVERT  (SID_SD_START+65)
-#define SID_BEZIER_EDGE (SID_SD_START+66)
-#define SID_BEZIER_SYMMTR   (SID_SD_START+67)
+// In 

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4-4' - source/ca source/de source/es source/ja source/kn source/nb source/nn source/pt-BR source/sq source/zh-CN source/zh-TW

[Christian Lohmaier]

 source/ca/dbaccess/source/ui/dlg.po|5 -
 source/ca/dbaccess/uiconfig/ui.po  |   26 
++---
 source/ca/sc/source/ui/src.po  |   14 +
 source/ca/sc/uiconfig/scalc/ui.po  |9 +--
 source/ca/sfx2/source/appl.po  |6 +-
 source/ca/svx/source/dialog.po |   10 +--
 source/ca/svx/uiconfig/ui.po   |7 +-
 source/de/filter/uiconfig/ui.po|6 +-
 source/de/helpcontent2/source/text/shared/01.po|8 +-
 source/de/helpcontent2/source/text/shared/optionen.po  |6 +-
 source/de/helpcontent2/source/text/simpress/01.po  |6 +-
 source/de/sc/source/ui/StatisticsDialogs.po|8 +-
 source/de/sc/uiconfig/scalc/ui.po  |   14 ++---
 source/es/helpcontent2/source/text/shared/autopi.po|6 +-
 source/es/helpcontent2/source/text/simpress/01.po  |6 +-
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po  |6 +-
 source/es/sd/source/ui/app.po  |8 +-
 source/es/wizards/source/formwizard.po |6 +-
 source/ja/cui/uiconfig/ui.po   |8 +-
 source/ja/sw/uiconfig/swriter/ui.po|8 +-
 source/kn/readlicense_oo/docs.po   |   10 +--
 source/nb/sfx2/uiconfig/ui.po  |8 +-
 source/nn/chart2/source/controller/dialogs.po  |   10 +--
 source/nn/cui/uiconfig/ui.po   |   10 +--
 source/nn/formula/source/core/resource.po  |4 -
 source/nn/helpcontent2/source/text/shared/00.po|   14 ++---
 source/nn/helpcontent2/source/text/shared/01.po|   22 

 source/nn/helpcontent2/source/text/shared/04.po|8 +-
 source/nn/helpcontent2/source/text/simpress/guide.po   |6 +-
 source/nn/instsetoo_native/inc_openoffice/windows/msi_languages.po |6 +-
 source/nn/officecfg/registry/data/org/openoffice/Office/UI.po  |6 +-
 source/nn/sc/source/ui/src.po  |   10 +--
 source/nn/sd/source/ui/app.po  |6 +-
 source/nn/svx/source/accessibility.po  |   27 
+-
 source/nn/svx/source/dialog.po |   26 
-
 source/nn/svx/source/engine3d.po   |   10 +--
 source/nn/svx/source/sidebar/area.po   |   14 ++---
 source/nn/svx/source/svdraw.po |6 +-
 source/nn/uui/source.po|   10 +--
 source/pt-BR/helpcontent2/source/text/scalc/01.po  |6 +-
 source/sq/svx/source/dialog.po |6 +-
 source/sq/sw/source/uibase/utlui.po|6 +-
 source/zh-CN/chart2/uiconfig/ui.po |   14 ++---
 source/zh-CN/sd/source/ui/app.po   |   10 +--
 source/zh-TW/cui/uiconfig/ui.po|   10 +--
 45 files changed, 210 insertions(+), 228 deletions(-)

New commits:
commit 7d6a448e730d8dc31df13d6485d9271cce0c5e7c
Author: Christian Lohmaier 
Date:   Wed Jun 10 14:54:00 2015 +0200

update translations for 4.4.4 rc2

and force-fix errors using pocheck

Change-Id: I91c3f5e288a82a2f1beb40cf797636decc2fd41b

diff --git a/source/ca/dbaccess/source/ui/dlg.po 
b/source/ca/dbaccess/source/ui/dlg.po
index 40e99f8..123bfab 100644
--- a/source/ca/dbaccess/source/ui/dlg.po
+++ b/source/ca/dbaccess/source/ui/dlg.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2015-01-07 11:08+0100\n"
-"PO-Revision-Date: 2015-03-31 21:01+\n"
+"PO-Revision-Date: 2015-06-01 11:32+\n"
 "Last-Translator: Joan \n"
 "Language-Team: LANGUAGE \n"
 "Language: ca\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.1\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1427835712.00\n"
+"X-POOTLE-MTIME: 1433158372.00\n"
 
 #: AutoControls.src
 msgctxt ""
@@ -602,7 +602,6 @@ msgid "Set up a connection to an ODBC database"
 msgstr "Estableix una connexió a una base de dades ODBC"
 
 #: dbadminsetup.src
-#, fuzzy
 msgctxt ""
 "dbadminsetup.src\n"
 "STR_ODBC_HELPTEXT\n"
diff --git a/source/ca/dbacce

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

[Henry Castro]

 sc/source/ui/cctrl/dpcontrol.cxx |5 -
 sc/source/ui/view/gridwin4.cxx   |   14 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 63f47a9a08974cd9b3f18d96019794b97aec1e91
Author: Henry Castro 
Date:   Thu May 14 14:53:23 2015 -0400

sc tiled editing: Corrected dropdown button offset

Also includes:

sc tiled editing: Mapping has to be turned off after drawing the buttons.

Otherwise the redlines are on wrong positions in the tiled rendering case.

Also - we are actually never call with something else than MAP_PIXEL, so
let's kill the resetting of the mapmode; let's see if some obscure corner 
case
bites us here.

Change-Id: I8da07dd5448b8863df3148882ec50e6746760cca

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index e2c3457..f020024 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -95,9 +95,6 @@ void ScDPFieldButton::setPopupLeft(bool b)
 
 void ScDPFieldButton::draw()
 {
-bool bOldMapEnablaed = mpOutDev->IsMapModeEnabled();
-mpOutDev->EnableMapMode(false);
-
 if (mbBaseButton)
 {
 // Background
@@ -144,8 +141,6 @@ void ScDPFieldButton::draw()
 
 if (mbPopupButton)
 drawPopupButton();
-
-mpOutDev->EnableMapMode(bOldMapEnablaed);
 }
 
 void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index bfda05a..3919ca5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -756,12 +756,24 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
 if ( bLogicText )
 aOutputData.DrawStrings(true);  // in logic MapMode if bLogicText 
is set
 aOutputData.DrawEdit(true);
-pContentDev->SetMapMode(MAP_PIXEL);
+
+// the buttons are painted in absolute coordinates
+if (bIsTiledRendering)
+{
+// Tiled offset nScrX, nScrY
+MapMode aMap( MAP_PIXEL );
+aMap.SetOrigin(Point(nScrX, nScrY));
+pContentDev->SetMapMode(aMap);
+}
+else
+pContentDev->SetMapMode(MAP_PIXEL);
 
 // Autofilter- und Pivot-Buttons
 
 DrawButtons(nX1, nX2, rTableInfo, pContentDev);  // Pixel
 
+pContentDev->SetMapMode(MAP_PIXEL);
+
 aOutputData.DrawClipMarks();
 
 //  Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch 
bei !bGridFirst
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sc/source/ui/cctrl/dpcontrol.cxx |7 ---
 sc/source/ui/view/gridwin4.cxx   |3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 342d84218c17da40d0a4f96bc3b07b536d64517a
Author: Jan Holesovsky 
Date:   Wed Jun 10 15:01:15 2015 +0200

sc tiled editing: Mapping has to be turned off after drawing the buttons.

Otherwise the redlines are on wrong positions in the tiled rendering case.

Also - we are actually never call with something else than MAP_PIXEL, so
let's kill the resetting of the mapmode; let's see if some obscure corner 
case
bites us here.

Change-Id: I8da07dd5448b8863df3148882ec50e6746760cca

diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 90d8783..f020024 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -95,11 +95,6 @@ void ScDPFieldButton::setPopupLeft(bool b)
 
 void ScDPFieldButton::draw()
 {
-bool bOldMapEnabled = mpOutDev->IsMapModeEnabled();
-
-if (mpOutDev->GetMapMode().GetMapUnit() != MAP_PIXEL )
-mpOutDev->EnableMapMode(false);
-
 if (mbBaseButton)
 {
 // Background
@@ -146,8 +141,6 @@ void ScDPFieldButton::draw()
 
 if (mbPopupButton)
 drawPopupButton();
-
-mpOutDev->EnableMapMode(bOldMapEnabled);
 }
 
 void ScDPFieldButton::getPopupBoundingBox(Point& rPos, Size& rSize) const
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index c8f234b..a5042cd 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -763,6 +763,7 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const 
ScTableInfo& rTableI
 aOutputData.DrawStrings(true);  // in logic MapMode if bLogicText 
is set
 aOutputData.DrawEdit(true);
 
+// the buttons are painted in absolute coordinates
 if (bIsTiledRendering)
 {
 // Tiled offset nScrX, nScrY
@@ -777,6 +778,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const 
ScTableInfo& rTableI
 
 DrawButtons(nX1, nX2, rTableInfo, pContentDev);  // Pixel
 
+pContentDev->SetMapMode(MAP_PIXEL);
+
 aOutputData.DrawClipMarks();
 
 //  Szenario / ChangeTracking muss auf jeden Fall nach DrawGrid sein, auch 
bei !bGridFirst
___
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' - translations

[Christian Lohmaier]

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

New commits:
commit 8dea51be0566cf0dfcc315e1f95b4b55315fcdf4
Author: Christian Lohmaier 
Date:   Wed Jun 10 14:54:00 2015 +0200

Updated core
Project: translations  7d6a448e730d8dc31df13d6485d9271cce0c5e7c

update translations for 4.4.4 rc2

and force-fix errors using pocheck

Change-Id: I91c3f5e288a82a2f1beb40cf797636decc2fd41b

diff --git a/translations b/translations
index 856ea51..7d6a448 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 856ea51b121540813da12661061955c4e0250d0c
+Subproject commit 7d6a448e730d8dc31df13d6485d9271cce0c5e7c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mac OS X and pkg-config

[Khaled Hosny]

On Wed, Jun 10, 2015 at 03:06:48PM +0200, Michael Stahl wrote:
> On 10.06.2015 11:43, Khaled Hosny wrote:
> > On Tue, Jun 09, 2015 at 12:36:41PM +0300, Tor Lillqvist wrote:
> >>> Some of us work on other opensource projects on our Mac machines which
> >>> happen to need MacPorts or HomeBrew.
> >>>
> >>> Having LibreOffice simply say "I refuse to build on this machine because
> >>> you've already installed some other stuff" is not very friendly.
> >>>
> >>
> >> But neither is it very useful to have the already small set of OS X -based
> >> developers split into those who use a pure upstream way to build, those who
> >> use HomeBrew libjpeg but bundled Python, those who use MacPorts Python and
> >> libjpeg, etc.
> > 
> > No, that what I want to achieve, what I want is to make sure LibreOffice
> > builds the same way regardless of the presence or absence of pkg-config
> > on Mac OS X, so that is no longer needs to stop the build if one is
> > found.
> 
> i've slightly improved the error message now to "Please modify your PATH
> variable so that $PKG_CONFIG is no longer found by configure scripts."
> with commit
> ada6281a5bd74d0ff6ae578d57f39f65b7c25103 so it's at least obvious what
> to do.
> 
> but since we already have PATH in config_host.mk it would perhaps be
> possible to detect which directory the pkg-config is found in and
> automatically filter that out of $PATH (unless it's something that
> cannot be removed like /usr/bin).  would that be an improvement for you,
> and/or would anybody object to that?
> 
> also, it is theoretically possible to export PKG_CONFIG="" or something
> like that to override it in our bundled external libraries, but whether
> that will actually work for every single one would require testing; i
> can easily imagine hard-coded fallbacks and whatnot.

I think setting PKG_CONFIG_* environment variables to empty values will
make pkg-config not find any installed libraries, so if we can do that
for LibreOffice build shell (or whatever it is called) on Mac OS X
(either by default or only when pkg-config is found) it should make its
presence an non concern for LibreOffice build.

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

Re: test infrastructure ideas appreciated ...

[Kohei Yoshida]

Hi Michael,

I am happy to see that you and I are on the same term on the majority of the
points. But let me nitpick on a few points below.

> On June 10, 2015 at 6:47 AM Michael MeeksSo - AFAICS -every- bug-fix is potentially unit-testable - it is just a
> matter of the cost to implement that: "stop world, spend months writing
> large test infrastructure" etc. ;-) is possible just not really
> feasible.

While this is correct in the literal sense of the words, and I fully agree, let
me drill down deeper and add a little bit of clarification.

When I said something was "technically unit-testable", I was implying that
writing a unit test is just a matter of adding a new test case to an existing
test infrastructure.  Saying that everything is technically unit-testable as
long as one is willing to write a new test infra/framework when one doesn't
exist is, while factually correct, would end up confusing the issue, and is
slightly beside the point I was trying to make in my earlier post.

>   My yard-stick would be that if writing the unit-test takes longer than
> finding & fixing the bug - then we have a problem, 

While I think I agree with the general point you are trying to make here, I
would have to slightly disagree with how you chose to word it.

By this wording, if a bug fix takes a mere 5 minute, or even 30 minute, which
can very well happen especially when a bug is in the area you just refactored,
you have a reason not to write a test if you think writing one would take more
than 30 minutes, which is often the case.

I personally would still spend a few hours writing a test for a bug I fixed in
10 to 30 minutes, because, even if the fix took less than an hour today, the
same fix at some arbitrary point in the future may take days or weeks just
because the code may look totally different by then.  I've personally
experienced that first hand during my Calc core refactoring work, so I know that
can happen in real life.

Anyway, I just wanted to make these points clear. I hope you didn't mind my
nitpicking.

Cheers!

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

Re: Mac OS X and pkg-config

[Khaled Hosny]

On Wed, Jun 10, 2015 at 02:56:59PM +0200, Michael Stahl wrote:
> On 10.06.2015 13:30, Khaled Hosny wrote:
> > So why Mac OS X is treated differently, what is so special about it?
> 
> Mac OS X is an actual operating system with an actual SDK that defines
> the stable and supported interfaces of the platform.  GNU/Linux on the
> other hand is a random collection of packages with mostly undocumented
> stability and support properties.  i don't believe that making
> developer's lives harder in the long term by allowing them to treat Mac
> OS X as a random collection of packages is worth any short term benefit.

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

Re: OSX uiwriter stacktrace needed

[Stephan Bergmann]

On 06/09/2015 02:54 PM, Bjoern Michaelsen wrote:

However, OSX seems to be reliably broken now according to the tinderboxes.
If someone manages to provide a backtrace, I would appreciate that, so I can
investigate what broke and fix it.


should be fixed now with 
 
"Ensure single RTTI symbol instance" (which also re-enables the test)


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

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

[Stephan Bergmann]

 sw/inc/calbck.hxx  |3 ++-
 sw/inc/unocrsr.hxx |5 +++--
 sw/qa/extras/uiwriter/uiwriter.cxx |6 --
 sw/source/core/attr/calbck.cxx |1 +
 sw/source/core/unocore/unocrsr.cxx |2 ++
 5 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 54253f382e77483b2831af82cf90e2afb0cd55db
Author: Stephan Bergmann 
Date:   Wed Jun 10 15:24:18 2015 +0200

Ensure single RTTI symbol instance

...to make typeid comparison in sw::UnoCursorPointer::SwClientNotify work 
also
under the Itanium C++ ABI/libc++ semantics (as used on Mac OS X), not only 
the
less strict GCC/libstc++ semantics (as typically used on Linux).  This 
caused
CppunitTest_sw_uiwriter's testUnoCursorPointer to fail on Mac OS X.
(DocDisposingHint and LegacyModifyHint need to be SW_DLLPUBLIC even though 
they
are nominally only used inside the sw library, because they are also used 
from
the CppunitTest_sw_uiwriter test code.)

Change-Id: Ideceade22ca3049ae287aea468de93c72bee5fdc

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index ce8bd7a..db28e0b 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -65,9 +65,10 @@ template class SwIterator;
 namespace sw
 {
 class ClientIteratorBase;
-struct LegacyModifyHint SAL_FINAL: SfxHint
+struct SW_DLLPUBLIC LegacyModifyHint SAL_FINAL: SfxHint
 {
 LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : 
m_pOld(pOld), m_pNew(pNew) {};
+virtual ~LegacyModifyHint();
 const SfxPoolItem* m_pOld;
 const SfxPoolItem* m_pNew;
 };
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 6f382ef..32006a4 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -24,9 +24,10 @@
 
 namespace sw
 {
-struct DocDisposingHint SAL_FINAL : public SfxHint
+struct SW_DLLPUBLIC DocDisposingHint SAL_FINAL : public SfxHint
 {
-DocDisposingHint() {};
+DocDisposingHint() {}
+virtual ~DocDisposingHint();
 };
 }
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 1545605..57af4a8 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -96,9 +96,7 @@ public:
 void testTdf86639();
 void testTdf90883TableBoxGetCoordinates();
 void testEmbeddedDataSource();
-#if 0
 void testUnoCursorPointer();
-#endif
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -137,9 +135,7 @@ public:
 CPPUNIT_TEST(testTdf86639);
 CPPUNIT_TEST(testTdf90883TableBoxGetCoordinates);
 CPPUNIT_TEST(testEmbeddedDataSource);
-#if 0
 CPPUNIT_TEST(testUnoCursorPointer);
-#endif
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1030,7 +1026,6 @@ void SwUiWriterTest::testEmbeddedDataSource()
 #endif
 }
 
-#if 0
 void SwUiWriterTest::testUnoCursorPointer()
 {
 auto xDocComponent(loadFromDesktop(
@@ -1049,7 +1044,6 @@ void SwUiWriterTest::testUnoCursorPointer()
 xDocComponent->dispose();
 CPPUNIT_ASSERT(!static_cast(pCursor));
 }
-#endif
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 127a774..f3a4aa0 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 
+sw::LegacyModifyHint::~LegacyModifyHint() {}
 
 TYPEINIT0( SwClient );
 
diff --git a/sw/source/core/unocore/unocrsr.cxx 
b/sw/source/core/unocore/unocrsr.cxx
index bca0bb7..04f30ce 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+sw::DocDisposingHint::~DocDisposingHint() {}
+
 IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
 
 SwUnoCrsr::SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 include/svx/nbdtmg.hxx  |1 
 sd/source/ui/func/fuolbull.cxx  |   16 +
 sd/source/ui/inc/View.hxx   |3 -
 sd/source/ui/view/drviewsf.cxx  |3 -
 sd/source/ui/view/sdview.cxx|7 +---
 svx/source/sidebar/nbdtmg.cxx   |2 -
 sw/source/uibase/shells/textsh1.cxx |2 -
 sw/source/uibase/shells/txtnum.cxx  |   61 +++-
 8 files changed, 33 insertions(+), 62 deletions(-)

New commits:
commit 172a96e5246c7847313838464c671dccfd564ab8
Author: Maxim Monastirsky 
Date:   Wed Jun 10 15:21:43 2015 +0300

bSwitchOff is always false now

Change-Id: Ic79c0f1cf2816da60962f67c57efb75685d984f1

diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index bbee427..c4befa0 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -265,7 +265,7 @@ void 
FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
 }
 else
 {
-mpView->ChangeMarkedObjectsBulletsNumbering( bToggle, nSId == 
FN_SVX_SET_BULLET, bInMasterView ? 0 : pNumRule, false );
+mpView->ChangeMarkedObjectsBulletsNumbering( bToggle, nSId == 
FN_SVX_SET_BULLET, bInMasterView ? 0 : pNumRule );
 }
 if ( bInMasterView )
 {
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 14a0ab0..d7945c4 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -244,8 +244,7 @@ public:
 void ChangeMarkedObjectsBulletsNumbering(
 const bool bToggle,
 const bool bHandleBullets,
-const SvxNumRule* pNumRule,
-const bool bSwitchOff);
+const SvxNumRule* pNumRule);
 
 void SetPossibilitiesDirty() { bPossibilitiesDirty = true; }
 void SetMoveAllowed( bool bSet ) { bMoveAllowed = bSet; }
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 291accf..b424cf7 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1326,8 +1326,7 @@ bool View::ShouldToggleOn(
 void View::ChangeMarkedObjectsBulletsNumbering(
 const bool bToggle,
 const bool bHandleBullets,
-const SvxNumRule* pNumRule,
-const bool bSwitchOff )
+const SvxNumRule* pNumRule )
 {
 SdrModel* pSdrModel = GetModel();
 vcl::Window* pWindow = dynamic_cast< vcl::Window* 
>(GetFirstOutputDevice());
@@ -1337,9 +1336,7 @@ void View::ChangeMarkedObjectsBulletsNumbering(
 const bool bUndoEnabled = pSdrModel->IsUndoEnabled();
 SdrUndoGroup* pUndoGroup = bUndoEnabled ? new SdrUndoGroup(*pSdrModel) : 0;
 
-const bool bToggleOn =
-!bSwitchOff
-&& ShouldToggleOn( bToggle, bHandleBullets );
+const bool bToggleOn = ShouldToggleOn( bToggle, bHandleBullets );
 
 boost::scoped_ptr 
pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel));
 boost::scoped_ptr pOutlinerView(new 
OutlinerView(pOutliner.get(), pWindow));
commit 71b35212265bb93b10ca35ab964a36e6b6cc552b
Author: Maxim Monastirsky 
Date:   Wed Jun 10 15:15:56 2015 +0300

tdf#88290 Adapt the numbering popup to more than 8 items

The items count of NumberingTypeMgr is limited by 8, but
some languages have more items, so remove that limitation.

Also fix the behavior of the 10th item. The old sidebar
popup had a "None" item, whose id was 10 (defined by
DEFAULT_NONE from include/svx/nbdtmg.hxx), and that causes
now the 10th item to behave as on/off toggle. Since we
don't have a "None" item anymore, get rid of that behavior
completely.

Change-Id: I5546ca637f9951cc093a7bbf8fda11dc35341d4e

diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 7695e5c..d400a87 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -27,7 +27,6 @@
 namespace svx { namespace sidebar {
 
 #define DEFAULT_BULLET_TYPES8
-#define DEFAULT_NONE10
 #define DEFAULT_NUM_VALUSET_COUNT   8
 #define DEFAULT_NUMBERING_CACHE_FORMAT_VERSION  0x10
 
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 2ee2ddb..bbee427 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -182,17 +182,12 @@ void 
FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
 
 sal_uInt16 nIdx = pItem->GetValue();
 bool bToggle = false;
-bool bSwitchOff = false;
 if( nIdx == (sal_uInt16)0x )
 {
 // If the nIdx is (sal_uInt16)0x, means set bullet status to on/off
 nIdx = 1;
 bToggle = true;
 }
-else if (nIdx == DEFAULT_NONE)
-{
-bSwitchOff = true;
-}
 nIdx--;
 
 sal_uInt32 nNumItemId = SID_ATTR_NUMBERING_RULE;
@@ -266,18 +261,11 @@ void 
FuOutlineBullet::SetCurrentBulletsNumbering(SfxRequest& rReq)
 
 if ( pOLV )
 {
-if ( bSwitchOff )
-{
-pOLV->SwitchOffBulletsNumbering( true );
-}
-else
-  

Re: Mac OS X and pkg-config

[Michael Stahl]

On 10.06.2015 11:43, Khaled Hosny wrote:
> On Tue, Jun 09, 2015 at 12:36:41PM +0300, Tor Lillqvist wrote:
>>> Some of us work on other opensource projects on our Mac machines which
>>> happen to need MacPorts or HomeBrew.
>>>
>>> Having LibreOffice simply say "I refuse to build on this machine because
>>> you've already installed some other stuff" is not very friendly.
>>>
>>
>> But neither is it very useful to have the already small set of OS X -based
>> developers split into those who use a pure upstream way to build, those who
>> use HomeBrew libjpeg but bundled Python, those who use MacPorts Python and
>> libjpeg, etc.
> 
> No, that what I want to achieve, what I want is to make sure LibreOffice
> builds the same way regardless of the presence or absence of pkg-config
> on Mac OS X, so that is no longer needs to stop the build if one is
> found.

i've slightly improved the error message now to "Please modify your PATH
variable so that $PKG_CONFIG is no longer found by configure scripts."
with commit
ada6281a5bd74d0ff6ae578d57f39f65b7c25103 so it's at least obvious what
to do.

but since we already have PATH in config_host.mk it would perhaps be
possible to detect which directory the pkg-config is found in and
automatically filter that out of $PATH (unless it's something that
cannot be removed like /usr/bin).  would that be an improvement for you,
and/or would anybody object to that?

also, it is theoretically possible to export PKG_CONFIG="" or something
like that to override it in our bundled external libraries, but whether
that will actually work for every single one would require testing; i
can easily imagine hard-coded fallbacks and whatnot.


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

test-infra proposal: master-tested branch (was: test infrastructure ideas appreciated ...)

[Bjoern Michaelsen]

Hi,

On Wed, Jun 03, 2015 at 02:33:23PM +0100, Michael Meeks wrote:
>   Constructive thoughts appreciated in reply here.

Soo, looking at tests, regressions and infra for that, lets first have a look
at the "regression pipeline". There are four stages a regression goes through:

1/ regression gets introduced by a code change
2/ regression is found by manual or automatic testing
3/ regression is triaged by QA/bibisect etc.
4/ regression is fixed by development

Looking at those, we are doing quite well with 3/ these days: the last ESC
notes have 597 open regressions and 335 of those are bibisected, with the
number of bibisected open regressions slowly raising over time.

We are also doing quite well in general with 2/: We find critical issues
quickly and quick enough to fix them in time on the relevant branches of our
release schedule. We could be better at finding non-critical bugs, however
as we see in later stages (3/ and 4/), its not as if we run a risk of those
being depleted of work anytime soon.

On the other hand, both 1/ and 4/ seem to be our real pain points: We are still
creating too much regressions and are too slow at fixing them. As others have
noted these are mostly cultural problems, and not really easily attackable with
a infrastructure/throw-money-at-it approach.

However, there are _some_ things that can be improved and can be done so with
infra/money. While we cant have machines write good tests, we can have machines
_run_ the tests we have regularly in the first place. Looking at the
time-broken number from our tinderboxes, it is obvious that this isnt done at
all as much as we can.

Thanks to Norbert we have a very good test infrastructure, that allows us to
test each and every commit, if we desire to do so. In the least, it allows us
to test branches on all platforms before merge/rebase/cherry-pick (see: [1]).

As master has to build on all platforms and also pass all tests on all
platforms for it to really be useful, both of those scenarios are severely
hampered by master being broken far too often. If we want to make contributors
embrace test-driven development -- or at least work in the direction, one
essential prerequisite is a rocksolid base that has no false positives.

As such, here is one idea for infrastructure:
- Create a branch master-tested
- have some tinderboxes run a full build and all tests (best, say ten times)
  on all platforms (possibly for both dbgutil and non-dbgutil) on master
- once all platforms have build and tested a commit from master that way and it
  is all green, master-tested is forwarded to that commit
- nobody ever pushes or can push directly to master-tested, only to master
- the frequency/granularity of master-tested being updated does have to be
  super-fast: ~once daily if master is healthy should be enough

With that, both branches and individual commits have a known good base to build
upon and use our tests and CI to the fullest. The latter would work trivially
for developers using gerrit, e.g.:
 git checkout -b mywork master-tested
 git commit -m "did stuff"
 git push logerrit HEAD:refs/for/master
at which point Norberts CI would kick in and the cherry-pick would still go to
master once reviewed.

For feature branches it would work too, e.g.:
 git rebase master-tested
 git push logerrit HEAD:feature/foo
 git commit --allow-empty -c "testbuild of branch"
 git push logerrit HEAD:refs/for/feature/foo
 git reset --hard HEAD^ # delete the noop commit
And the CI would happily build and test the branch on a known good base.

Norberts CI is _very_ helpful for individual commits and feature branches, _if_
master is stable. I use it in the latter way quite regularly.
- Once master was in a good state on all platforms by chance and it helped me
  find a problem on OSX before pushing to master.
- Once master was in a bad state, which I knew as I found out when I ran 'make
  check' on every commit of my branch as per [1]. The OSX build failed, but in
  a very similar way as the already broken master. As such, I gave up in
  frustration[2] and pushed to master as-is ... which stacked another
  (platformdependant) breakage on top of the existing instability and made life
  a misery for everyone else giving an honest try at using tests and CI. What a
  vicious cycle.

Having master-tested might help us a lot in having more of the first and less
of the second.

Best,

Bjoern

[1] 
https://skyfromme.wordpress.com/2015/05/26/death-or-glory-vs-continuous-integration/
[2] https://gerrit.libreoffice.org/#/c/16179/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Mac OS X and pkg-config

[Michael Stahl]

On 10.06.2015 13:30, Khaled Hosny wrote:
> On Wed, Jun 10, 2015 at 01:17:07PM +0200, David Tardon wrote:
>> On Tue, Jun 09, 2015 at 04:30:45PM +0200, Michael Stahl wrote:
>>> On 09.06.2015 16:20, Thorsten Behrens wrote:
 Tor Lillqvist wrote:
> But neither is it very useful to have the already small set of OS X -based
> developers split into those who use a pure upstream way to build, those 
> who
> use HomeBrew libjpeg but bundled Python, those who use MacPorts Python and
> libjpeg, etc.
>
 Maybe. But is that really so different on Linux (where we seem to
 cope)? And I guess Khaled's intention is to rather grow the pool of
 Mac hackers, by removing one very early point of frustration ...
>>>
>>> we cope with this on Linux mainly because we have distribution package
>>> maintainers who actually work on having our build system pick up
>>> $random_distro_of_the_week's inconsistently packaged system libraries
>>> properly.
>>
>> ... and even so we fail to ensure that system headers/libs are not used
>> if one configures without them. E.g., as soon as one installs system
>> boost (or mdds, or glm, or...), it will be used no matter what value
>> SYSTEM_BOOST contains. Simply because -I/usr/include is in include path
>> before -I$W/UnpackedTarball/boost. But we do not seem to care overly
>> about this...

well that's a bug that needs fixing anyway.  -I/usr/include shouldn't be
on the command line because it's a default search path already.

i don't see a bare /usr/include in my config_host.mk, any idea where
that is coming from?

> So why Mac OS X is treated differently, what is so special about it?

Mac OS X is an actual operating system with an actual SDK that defines
the stable and supported interfaces of the platform.  GNU/Linux on the
other hand is a random collection of packages with mostly undocumented
stability and support properties.  i don't believe that making
developer's lives harder in the long term by allowing them to treat Mac
OS X as a random collection of packages is worth any short term benefit.


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

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

[Michael Stahl]

 pyuno/source/module/pyuno_runtime.cxx |   44 --
 1 file changed, 44 deletions(-)

New commits:
commit 4baaa084fc9b8180809c223cbe192d78e383431d
Author: Michael Stahl 
Date:   Wed Jun 10 13:07:17 2015 +0200

pyuno: remove obsolete LC_NUMERIC to "C" mangling code

The CPython changelog says for version 2.4:

- Python no longer relies on the LC_NUMERIC locale setting to be
  the "C" locale; as a result, it no longer tries to prevent changing
  the LC_NUMERIC category.

(cherry picked from commit 1ee5e1a17cbd50f84990fb43fac7e8c811e604a9)

Conflicts:
pyuno/source/module/pyuno_runtime.cxx

Change-Id: I6d63c4dedca48c99bf81135d69285d9116a19740

diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index 96bc9ae..e0f58ae 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -982,26 +981,6 @@ Any Runtime::extractUnoException( const PyRef & excType, 
const PyRef &excValue,
 }
 
 
-static const char * g_NUMERICID = "pyuno.lcNumeric";
-static ::std::vector< OString > g_localeList;
-
-static const char *ensureUnlimitedLifetime( const char *str )
-{
-int size = g_localeList.size();
-int i;
-for( i = 0 ; i < size ; i ++ )
-{
-if( 0 == strcmp( g_localeList[i].getStr(), str ) )
-break;
-}
-if( i == size )
-{
-g_localeList.push_back( str );
-}
-return g_localeList[i].getStr();
-}
-
-
 PyThreadAttach::PyThreadAttach( PyInterpreterState *interp)
 throw ( com::sun::star::uno::RuntimeException )
 {
@@ -1009,35 +988,18 @@ PyThreadAttach::PyThreadAttach( PyInterpreterState 
*interp)
 if( !tstate  )
 throw RuntimeException( "Couldn't create a pythreadstate" );
 PyEval_AcquireThread( tstate);
-// set LC_NUMERIC to "C"
-const char * oldLocale =
-ensureUnlimitedLifetime( setlocale( LC_NUMERIC, 0 )  );
-setlocale( LC_NUMERIC, "C" );
-PyRef locale( // python requires C locale
-PyLong_FromVoidPtr( (void*)oldLocale ), SAL_NO_ACQUIRE);
-PyDict_SetItemString(
-PyThreadState_GetDict(), g_NUMERICID, locale.get() );
 }
 
 PyThreadAttach::~PyThreadAttach()
 {
-PyObject *value =
-PyDict_GetItemString( PyThreadState_GetDict( ), g_NUMERICID );
-if( value )
-setlocale( LC_NUMERIC, static_cast(PyLong_AsVoidPtr( 
value )) );
 PyThreadState_Clear( tstate );
 PyEval_ReleaseThread( tstate );
 PyThreadState_Delete( tstate );
-
 }
 
 PyThreadDetach::PyThreadDetach() throw ( com::sun::star::uno::RuntimeException 
)
 {
 tstate = PyThreadState_Get();
-PyObject *value =
-PyDict_GetItemString( PyThreadState_GetDict( ), g_NUMERICID );
-if( value )
-setlocale( LC_NUMERIC, static_cast(PyLong_AsVoidPtr( 
value )) );
 PyEval_ReleaseThread( tstate );
 }
 
@@ -1047,12 +1009,6 @@ PyThreadDetach::PyThreadDetach() throw ( 
com::sun::star::uno::RuntimeException )
 PyThreadDetach::~PyThreadDetach()
 {
 PyEval_AcquireThread( tstate );
-// PyObject *value =
-// PyDict_GetItemString( PyThreadState_GetDict( ), g_NUMERICID );
-
-// python requires C LC_NUMERIC locale,
-// always set even when it is already "C"
-setlocale( LC_NUMERIC, "C" );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

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

New commits:
commit ada6281a5bd74d0ff6ae578d57f39f65b7c25103
Author: Michael Stahl 
Date:   Wed Jun 10 14:40:57 2015 +0200

configure: make the error message for pkg-config on Mac more actionable

Change-Id: Ia7f99123625df28cd5459ee6d488e02b20d386f0

diff --git a/configure.ac b/configure.ac
index 178c663..0595b16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5079,7 +5079,7 @@ if test $_os = Darwin; then
 if test "$enable_bogus_pkg_config" = "yes"; then
 AC_MSG_RESULT([yes, user-approved from unknown origin.])
 else
-AC_MSG_ERROR([yes, from unknown origin. This *will* break the 
build. Please remove or hide $PKG_CONFIG])
+AC_MSG_ERROR([yes, from unknown origin. This *will* break the 
build. Please modify your PATH variable so that $PKG_CONFIG is no longer found 
by configure scripts.])
 fi
 fi
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sfx2/source/doc/objstor.cxx |3 +--
 sw/source/uibase/dbui/dbmgr.cxx |6 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 4897f10beab678494a7c2dfdc140c424154e9f8c
Author: Miklos Vajna 
Date:   Wed Jun 10 14:22:26 2015 +0200

SfxObjectShell::CopyStoragesOfUnknownMediaType: still try to copy Base 
streams

When Base is embedded in a Writer document, we still need this when the
document is saved for the first time after embedding.

Change-Id: I1103da01838abd4ac1b03dc4d44e10db3ce650bc

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 826d024..2c16494 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3484,12 +3484,11 @@ bool SfxObjectShell::CopyStoragesOfUnknownMediaType( 
const uno::Reference< embed
 case SotClipboardFormatId::STARCALC_8:
 case SotClipboardFormatId::STARCHART_8:
 case SotClipboardFormatId::STARMATH_8:
-case SotClipboardFormatId::STARBASE_8:
 break;
 
 default:
 {
-OSL_ENSURE( aSubElements[nInd] == 
"Configurations2" || !xTarget->hasByName( aSubElements[nInd] ),
+OSL_ENSURE( aSubElements[nInd] == 
"Configurations2" || nFormat == SotClipboardFormatId::STARBASE_8 || 
!xTarget->hasByName( aSubElements[nInd] ),
 "The target storage is an output 
storage, the element should not exist in the target!\n" );
 
 if ( !xTarget->hasByName( aSubElements[nInd] ) )
commit 23c467fd7a1932015ef209f9db49acd167fd713f
Author: Miklos Vajna 
Date:   Wed Jun 10 14:20:28 2015 +0200

SwDBManager::LoadAndRegisterDataSource: restore lost hunk

Accidently removed in commit f01f31201f9b26b3071ab25f9a5a3a0311ff7423
(SwDBManager: extract StoreEmbeddedDataSource() from registration code,
2015-06-09).

Change-Id: I27e47249b92b8fd19dcd09a1226f5e80184ea8db

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index ccd1372..6dc0bb4 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2611,6 +2611,12 @@ OUString SwDBManager::LoadAndRegisterDataSource(const 
DBConnURITypes type, const
 uno::Reference xStorage = 
pDocShell->GetStorage();
 
 SwDBManager::StoreEmbeddedDataSource(xStore, xStorage, 
aStreamRelPath, aOwnURL);
+
+// Refer to the sub-storage name in the document settings, so
+// we can load it again next time the file is imported.
+uno::Reference 
xFactory(pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference 
xPropertySet(xFactory->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
+xPropertySet->setPropertyValue("EmbeddedDatabaseName", 
uno::makeAny(aStreamRelPath));
 }
 }
 xDBContext->registerObject( sFind, xNewInstance );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits